From f6b7f9e29fc84fb5877dcca05aa290c88954ad39 Mon Sep 17 00:00:00 2001 From: Andreas Date: Fri, 22 Apr 2022 18:34:53 +0200 Subject: [PATCH] Enable verbose logging in dev flavor by default (#6979) (cherry picked from commit 9d77052d9c36d18ef421074589b40b0fa37e51af) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/App.kt # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt --- .../kanade/tachiyomi/data/preference/PreferencesHelper.kt | 4 +++- .../tachiyomi/ui/setting/SettingsAdvancedController.kt | 2 +- .../java/eu/kanade/tachiyomi/util/system/BuildConfig.kt | 6 ++++++ 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 app/src/main/java/eu/kanade/tachiyomi/util/system/BuildConfig.kt diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt index ca3ffbe1e..552f31753 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt @@ -7,6 +7,7 @@ import androidx.core.content.edit import androidx.core.net.toUri import androidx.preference.PreferenceManager import com.fredporciuncula.flow.preferences.FlowSharedPreferences +import eu.kanade.tachiyomi.BuildConfig import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.data.track.TrackService @@ -28,6 +29,7 @@ import java.text.SimpleDateFormat import java.util.Locale import eu.kanade.tachiyomi.data.preference.PreferenceKeys as Keys import eu.kanade.tachiyomi.data.preference.PreferenceValues as Values +import eu.kanade.tachiyomi.util.system.isDevFlavor class PreferencesHelper(val context: Context) { @@ -330,7 +332,7 @@ class PreferencesHelper(val context: Context) { if (DeviceUtil.isMiui) Values.ExtensionInstaller.LEGACY else Values.ExtensionInstaller.PACKAGEINSTALLER, ) - fun verboseLogging() = prefs.getBoolean(Keys.verboseLogging, false) + fun verboseLogging() = prefs.getBoolean(Keys.verboseLogging, isDevFlavor) fun autoClearChapterCache() = prefs.getBoolean(Keys.autoClearChapterCache, false) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt index da76c3c65..80ab6a248 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt @@ -87,7 +87,7 @@ class SettingsAdvancedController : SettingsController() { key = Keys.verboseLogging titleRes = R.string.pref_verbose_logging summaryRes = R.string.pref_verbose_logging_summary - defaultValue = false + defaultValue = isDevFlavor onChange { activity?.toast(R.string.requires_app_restart) diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/BuildConfig.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/BuildConfig.kt new file mode 100644 index 000000000..cd74287fa --- /dev/null +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/BuildConfig.kt @@ -0,0 +1,6 @@ +package eu.kanade.tachiyomi.util.system + +import eu.kanade.tachiyomi.BuildConfig + +val isDevFlavor: Boolean + get() = BuildConfig.FLAVOR == "dev"