@@ -2,18 +2,17 @@ package org.wordpress.android.util
2
2
3
3
import android.content.Context
4
4
import android.content.Intent
5
- import android.net.Uri
6
5
import android.os.Build
7
6
import android.provider.Settings
8
7
import androidx.annotation.RequiresApi
9
8
import androidx.appcompat.app.AppCompatDelegate
9
+ import androidx.core.net.toUri
10
10
import androidx.core.os.LocaleListCompat
11
11
import org.wordpress.android.WordPress.Companion.getContext
12
12
import org.wordpress.android.analytics.AnalyticsTracker
13
13
import org.wordpress.android.fluxc.store.AccountStore
14
14
import org.wordpress.android.fluxc.store.SiteStore
15
15
import org.wordpress.android.fluxc.utils.AppLogWrapper
16
- import org.wordpress.android.ui.prefs.AppPrefsWrapper
17
16
import org.wordpress.android.ui.reader.services.update.ReaderUpdateLogic.UpdateTask
18
17
import org.wordpress.android.ui.reader.services.update.ReaderUpdateServiceStarter
19
18
import org.wordpress.android.util.analytics.AnalyticsUtils
@@ -26,7 +25,6 @@ import javax.inject.Inject
26
25
* https://developer.android.com/guide/topics/resources/app-languages
27
26
*/
28
27
class PerAppLocaleManager @Inject constructor(
29
- private val appPrefsWrapper : AppPrefsWrapper ,
30
28
private val appLogWrapper : AppLogWrapper ,
31
29
private val siteStore : SiteStore ,
32
30
private val accountStore : AccountStore ,
@@ -49,22 +47,7 @@ class PerAppLocaleManager @Inject constructor(
49
47
// on pre-Android 13 devices
50
48
val appLocale = LocaleListCompat .forLanguageTags(languageCode.replace(" _" , " -" ))
51
49
AppCompatDelegate .setApplicationLocales(appLocale)
52
- }
53
-
54
- /* *
55
- * Previously the app locale was stored in SharedPreferences, so here we migrate to AndroidX per-app language prefs.
56
- * This was added in our Jan 2025 release and can be removed after a few subsequent releases.
57
- */
58
- fun performMigrationIfNecessary () {
59
- val previousLanguage = appPrefsWrapper.getPrefString(OLD_LOCALE_PREF_KEY_STRING , " " )
60
- if (previousLanguage?.isNotEmpty() == true ) {
61
- appLogWrapper.d(
62
- AppLog .T .SETTINGS ,
63
- " PerAppLocaleManager: performing migration to AndroidX per-app language prefs"
64
- )
65
- setCurrentLocaleByLanguageCode(previousLanguage)
66
- appPrefsWrapper.removePref(OLD_LOCALE_PREF_KEY_STRING )
67
- }
50
+ appLogWrapper.d(AppLog .T .SETTINGS , " Language changed to $languageCode " )
68
51
}
69
52
70
53
/* *
@@ -76,7 +59,7 @@ class PerAppLocaleManager @Inject constructor(
76
59
fun openAppLanguageSettings (context : Context ) {
77
60
Intent ().also { intent ->
78
61
intent.setAction(Settings .ACTION_APP_LOCALE_SETTINGS )
79
- intent.setData(Uri .parse (" package:" + context.packageName))
62
+ intent.setData((" package:" + context.packageName).toUri( ))
80
63
context.startActivity(intent)
81
64
}
82
65
}
@@ -116,9 +99,4 @@ class PerAppLocaleManager @Inject constructor(
116
99
fun resetApplicationLocale () {
117
100
AppCompatDelegate .setApplicationLocales(LocaleListCompat .getEmptyLocaleList())
118
101
}
119
-
120
- companion object {
121
- // Key previously used for saving the language selection to shared preferences
122
- private const val OLD_LOCALE_PREF_KEY_STRING : String = " language-pref"
123
- }
124
102
}
0 commit comments