Fixed detekt warnings

Author: nbradbury

WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefsWrapper.kt

@@ -1,9 +1,7 @@
 package org.wordpress.android.ui.prefs
 
 import android.content.SharedPreferences
-import androidx.preference.PreferenceManager
 import com.google.gson.Gson
-import org.wordpress.android.WordPress.Companion.getContext
 import org.wordpress.android.fluxc.model.JetpackCapability
 import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask
 import org.wordpress.android.models.ReaderTag

WordPress/src/main/java/org/wordpress/android/ui/prefs/AppSettingsFragment.java

@@ -126,7 +126,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         ((WordPress) getActivity().getApplication()).component().inject(this);
         mDispatcher.register(this);
 
-        mIsPerAppLanguagePrefsEnabled = mLocaleHelper.isPerAppLanguagePrefsEnabled(getContext());
+        mIsPerAppLanguagePrefsEnabled = mLocaleHelper.isPerAppLanguagePrefsEnabled();
 
         addPreferencesFromResource(R.xml.app_settings);
 
@@ -652,7 +652,7 @@ private boolean handleAppLocalePickerClick() {
         // if per-app language preferences are enabled and the device is on API 33+, take the user to the
         // system app settings to change the language
         if (mIsPerAppLanguagePrefsEnabled && Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            startActivity(new Intent(Settings.ACTION_SETTINGS));
+            mLocaleHelper.openAppSettings(getContext());
             return true;
         } else if (getActivity() instanceof AppCompatActivity) {
             LocalePickerBottomSheet bottomSheet = LocalePickerBottomSheet.newInstance();

WordPress/src/main/java/org/wordpress/android/ui/prefs/ExperimentalFeaturesActivity.kt

@@ -39,12 +39,13 @@ import kotlinx.coroutines.flow.update
 import org.wordpress.android.R
 import org.wordpress.android.ui.compose.theme.AppThemeM3
 import org.wordpress.android.ui.compose.unit.Margin
+import org.wordpress.android.ui.prefs.language.LocaleHelper
 import org.wordpress.android.util.extensions.setContent
 
 val experimentalFeatures = listOf(
     Feature(key = "experimental_block_editor"),
     Feature(key = "experimental_block_editor_theme_styles"),
-    Feature(key = "experimental_per_app_language_prefs")
+    Feature(key = LocaleHelper.EXPERIMENTAL_PER_APP_LANGUAGE_PREF_KEY)
 )
 
 data class Feature(

WordPress/src/main/java/org/wordpress/android/ui/prefs/language/LocaleHelper.kt

@@ -1,6 +1,9 @@
 package org.wordpress.android.ui.prefs.language
 
 import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.provider.Settings
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.os.LocaleListCompat
 import org.wordpress.android.R
@@ -57,22 +60,47 @@ class LocaleHelper @Inject constructor(
      * Previously the app locale was stored in SharedPreferences, so here we migrate to AndroidX per-app language prefs
      */
     fun performMigrationIfNecessary(context: Context) {
-        if (isPerAppLanguagePrefsEnabled(context) && isApplicationLocaleEmpty()) {
+        if (isPerAppLanguagePrefsEnabled() && isApplicationLocaleEmpty()) {
             val languagePrefKey = context.getString(R.string.pref_key_language)
             val previousLanguage = appPrefsWrapper.prefs().getString(languagePrefKey, "")
             if (previousLanguage?.isNotEmpty() == true) {
-                appLogWrapper.d(AppLog.T.SETTINGS, "LocaleHelper: performing migration to AndroidX per-app language prefs")
+                appLogWrapper.d(
+                    AppLog.T.SETTINGS,
+                    "LocaleHelper: performing migration to AndroidX per-app language prefs"
+                )
                 setCurrentLocaleByLanguageCode(previousLanguage)
                 appPrefsWrapper.prefs().edit().remove(languagePrefKey).apply()
             } else {
-                appLogWrapper.d(AppLog.T.SETTINGS, "LocaleHelper: setting default locale")
+                appLogWrapper.d(
+                    AppLog.T.SETTINGS,
+                    "LocaleHelper: setting default locale"
+                )
                 setCurrentLocaleByLanguageCode(Locale.getDefault().language)
             }
         }
     }
 
-    fun isPerAppLanguagePrefsEnabled(context: Context): Boolean {
-        val prefKey = context.getString(R.string.experimental_per_app_language_prefs)
-        return appPrefsWrapper.getManualFeatureConfig(prefKey)
+    fun isPerAppLanguagePrefsEnabled(): Boolean {
+        return appPrefsWrapper.getManualFeatureConfig(EXPERIMENTAL_PER_APP_LANGUAGE_PREF_KEY)
+    }
+
+    /**
+     * Open the app settings screen so the user can change the app locale - note that
+     * the locale is only available in API 33+
+     */
+    fun openAppSettings(context: Context) {
+        Intent().also { intent ->
+            intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
+            intent.addCategory(Intent.CATEGORY_DEFAULT)
+            intent.setData(Uri.parse("package:" + context.packageName))
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY)
+            intent.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS)
+            context.startActivity(intent)
+        }
+    }
+
+    companion object {
+        const val EXPERIMENTAL_PER_APP_LANGUAGE_PREF_KEY = "experimental_per_app_language_prefs"
     }
 }