diff options
Diffstat (limited to 'Source/Android/app/src/main/java')
2 files changed, 6 insertions, 6 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java index 43880bd0ba..aa90056141 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java @@ -12,6 +12,7 @@ import android.view.Surface; import android.widget.Toast; import androidx.annotation.Keep; +import androidx.core.util.Pair; import androidx.fragment.app.FragmentManager; import org.dolphinemu.dolphinemu.activities.EmulationActivity; @@ -20,7 +21,6 @@ import org.dolphinemu.dolphinemu.utils.CompressCallback; import org.dolphinemu.dolphinemu.utils.Log; import java.lang.ref.WeakReference; -import java.util.LinkedHashMap; import java.util.concurrent.Semaphore; /** @@ -400,7 +400,7 @@ public final class NativeLibrary */ public static native void RefreshWiimotes(); - public static native LinkedHashMap<String, String> GetLogTypeNames(); + public static native Pair<String, String>[] GetLogTypeNames(); public static native void ReloadLoggerConfig(); diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt index 6de39ed1e9..eba71c42fa 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt @@ -1946,8 +1946,8 @@ class SettingsFragmentPresenter( ) { SettingsAdapter.clearLog() }) sl.add(HeaderSetting(context, R.string.log_types, 0)) - for ((key, value) in LOG_TYPE_NAMES) { - sl.add(LogSwitchSetting(key, value, "")) + for (logType in LOG_TYPE_NAMES) { + sl.add(LogSwitchSetting(logType.first, logType.second, "")) } } @@ -2468,11 +2468,11 @@ class SettingsFragmentPresenter( fun setAllLogTypes(value: Boolean) { val settings = fragmentView.settings - for ((key) in LOG_TYPE_NAMES) { + for (logType in LOG_TYPE_NAMES) { AdHocBooleanSetting( Settings.FILE_LOGGER, Settings.SECTION_LOGGER_LOGS, - key, + logType.first, false ).setBoolean(settings!!, value) } |