Merge branch 'trunk' of github.com:wordpress-mobile/WordPress-Android…

… into ci/enable-dependency-cache-on-ci-v2
wordpress-mobile · Jan 7, 2025 · 1981089 · 1981089
2 parents 199394a + 108babf
commit 1981089
Show file tree

Hide file tree

Showing 49 changed files with 2,977 additions and 2,916 deletions.
diff --git a/WordPress/build.gradle b/WordPress/build.gradle
@@ -163,7 +163,7 @@ android {
         buildConfigField "boolean", "VOICE_TO_CONTENT", "false"
         buildConfigField "boolean", "READER_FLOATING_BUTTON", "false"
         buildConfigField "boolean", "ENABLE_SELF_HOSTED_USERS", "false"
-        buildConfigField "boolean", "GRAVATAR_QUICK_EDITOR", "true"
+        buildConfigField "boolean", "GRAVATAR_QUICK_EDITOR", "false"
 
         // Override these constants in jetpack product flavor to enable/ disable features
         buildConfigField "boolean", "ENABLE_SITE_CREATION", "true"

diff --git a/WordPress/src/main/java/org/wordpress/android/models/recommend/RecommendApiCallsProvider.kt b/WordPress/src/main/java/org/wordpress/android/models/recommend/RecommendApiCallsProvider.kt
@@ -12,8 +12,8 @@ import org.wordpress.android.models.recommend.RecommendApiCallsProvider.Recommen
 import org.wordpress.android.models.recommend.RecommendApiCallsProvider.RecommendCallResult.Success
 import org.wordpress.android.util.AppLog
 import org.wordpress.android.util.AppLog.T
-import org.wordpress.android.util.LocaleManagerWrapper
 import org.wordpress.android.util.NetworkUtilsWrapper
+import org.wordpress.android.util.PerAppLocaleManager
 import org.wordpress.android.util.RestClientProvider
 import org.wordpress.android.util.VolleyUtils
 import org.wordpress.android.util.analytics.AnalyticsUtils.RecommendAppSource
@@ -28,7 +28,7 @@ class RecommendApiCallsProvider @Inject constructor(
     private val analyticsUtilsWrapper: AnalyticsUtilsWrapper,
     private val networkUtilsWrapper: NetworkUtilsWrapper,
     private val restClientProvider: RestClientProvider,
-    private val localeManagerWrapper: LocaleManagerWrapper
+    private val perAppLocaleManager: PerAppLocaleManager
 ) {
     suspend fun getRecommendTemplate(
         appName: String,
@@ -38,7 +38,7 @@ class RecommendApiCallsProvider @Inject constructor(
             logErrorAndTrack(source, "getRecommendTemplate > No Network available")
             cont.resume(Failure(contextProvider.getContext().getString(R.string.no_network_message)))
         } else {
-            val language = localeManagerWrapper.getLanguage()
+            val language = perAppLocaleManager.getCurrentLocaleLanguageCode()
             val endPointPath = "/mobile/share-app-link?app=$appName&locale=$language"
 
             val listener = Listener { jsonObject ->

diff --git a/WordPress/src/main/java/org/wordpress/android/push/NotificationsProcessingService.java b/WordPress/src/main/java/org/wordpress/android/push/NotificationsProcessingService.java
@@ -44,7 +44,7 @@
 import org.wordpress.android.ui.quickstart.QuickStartTracker;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;
-import org.wordpress.android.util.LocaleManager;
+import org.wordpress.android.util.PerAppLocaleManager;
 import org.wordpress.android.util.analytics.AnalyticsUtils;
 import org.wordpress.android.util.analytics.AnalyticsUtils.AnalyticsCommentActionSource;
 import org.wordpress.android.util.analytics.AnalyticsUtils.QuickActionTrackPropertyValue;
@@ -97,6 +97,7 @@ public class NotificationsProcessingService extends Service {
     @Inject SystemNotificationsTracker mSystemNotificationsTracker;
     @Inject GCMMessageHandler mGCMMessageHandler;
     @Inject QuickStartTracker mQuickStartTracker;
+    @Inject PerAppLocaleManager mPerAppLocaleManager;
 
     /*
     * Use this if you want the service to handle a background note Like.
@@ -532,7 +533,7 @@ private void getNoteFromNoteId(String noteId, RestRequest.Listener listener,
             }
 
             HashMap<String, String> params = new HashMap<>();
-            params.put("locale", LocaleManager.getLanguage());
+            params.put("locale", mPerAppLocaleManager.getCurrentLocaleLanguageCode());
             WordPress.getRestClientUtils().getNotification(params, noteId, listener, errorListener);
         }
 

diff --git a/.../java/org/wordpress/android/ui/mysite/cards/sotw2023/WpSotw2023NudgeCardViewModelSlice.kt b/.../java/org/wordpress/android/ui/mysite/cards/sotw2023/WpSotw2023NudgeCardViewModelSlice.kt
@@ -12,7 +12,7 @@ import org.wordpress.android.ui.prefs.AppPrefsWrapper
 import org.wordpress.android.ui.utils.ListItemInteraction
 import org.wordpress.android.ui.utils.UiString.UiStringRes
 import org.wordpress.android.util.DateTimeUtilsWrapper
-import org.wordpress.android.util.LocaleManagerWrapper
+import org.wordpress.android.util.PerAppLocaleManager
 import org.wordpress.android.util.config.WpSotw2023NudgeFeatureConfig
 import org.wordpress.android.viewmodel.Event
 import java.time.Instant
@@ -22,7 +22,7 @@ class WpSotw2023NudgeCardViewModelSlice @Inject constructor(
     private val featureConfig: WpSotw2023NudgeFeatureConfig,
     private val appPrefsWrapper: AppPrefsWrapper,
     private val dateTimeUtilsWrapper: DateTimeUtilsWrapper,
-    private val localeManagerWrapper: LocaleManagerWrapper,
+    private val perAppLocaleManager: PerAppLocaleManager,
     private val tracker: WpSotw2023NudgeCardAnalyticsTracker,
 ) {
     private val _onNavigation = MutableLiveData<Event<SiteNavigationAction>>()
@@ -75,7 +75,7 @@ class WpSotw2023NudgeCardViewModelSlice @Inject constructor(
         val now = dateTimeUtilsWrapper.getInstantNow()
         val isDateEligible = now.isAfter(eventTime)
 
-        val currentLanguage = localeManagerWrapper.getLanguage()
+        val currentLanguage = perAppLocaleManager.getCurrentLocaleLanguageCode()
         val isLanguageEligible = currentLanguage.startsWith(TARGET_LANGUAGE, ignoreCase = true)
 
         return featureConfig.isEnabled() &&

diff --git a/...n/java/org/wordpress/android/ui/notifications/services/NotificationsUpdateJobService.java b/...n/java/org/wordpress/android/ui/notifications/services/NotificationsUpdateJobService.java
@@ -5,14 +5,21 @@
 
 import org.wordpress.android.ui.notifications.NotificationsListFragment;
 import org.wordpress.android.util.AppLog;
-import org.wordpress.android.util.LocaleManager;
+import org.wordpress.android.util.PerAppLocaleManager;
+
+import javax.inject.Inject;
+
+import dagger.hilt.android.AndroidEntryPoint;
 
 import static org.wordpress.android.ui.notifications.services.NotificationsUpdateServiceStarter.IS_TAPPED_ON_NOTIFICATION;
 
+@AndroidEntryPoint
 public class NotificationsUpdateJobService extends JobService
         implements NotificationsUpdateLogic.ServiceCompletionListener {
     private NotificationsUpdateLogic mNotificationsUpdateLogic;
 
+    @Inject PerAppLocaleManager mPerAppLocaleManager;
+
     @Override
     public boolean onStartJob(JobParameters params) {
         String noteId = null;
@@ -36,7 +43,10 @@ public boolean onStopJob(JobParameters params) {
     public void onCreate() {
         super.onCreate();
         AppLog.i(AppLog.T.NOTIFS, "notifications update job service > created");
-        mNotificationsUpdateLogic = new NotificationsUpdateLogic(LocaleManager.getLanguage(), this);
+        mNotificationsUpdateLogic = new NotificationsUpdateLogic(
+                mPerAppLocaleManager.getCurrentLocaleLanguageCode(),
+                this
+        );
     }
 
     @Override

diff --git a/...main/java/org/wordpress/android/ui/notifications/services/NotificationsUpdateService.java b/...main/java/org/wordpress/android/ui/notifications/services/NotificationsUpdateService.java
@@ -6,13 +6,20 @@
 
 import org.wordpress.android.ui.notifications.NotificationsListFragment;
 import org.wordpress.android.util.AppLog;
-import org.wordpress.android.util.LocaleManager;
+import org.wordpress.android.util.PerAppLocaleManager;
+
+import javax.inject.Inject;
+
+import dagger.hilt.android.AndroidEntryPoint;
 
 import static org.wordpress.android.ui.notifications.services.NotificationsUpdateServiceStarter.IS_TAPPED_ON_NOTIFICATION;
 
+@AndroidEntryPoint
 public class NotificationsUpdateService extends Service implements NotificationsUpdateLogic.ServiceCompletionListener {
     private NotificationsUpdateLogic mNotificationsUpdateLogic;
 
+    @Inject PerAppLocaleManager mPerAppLocaleManager;
+
     @Override
     public IBinder onBind(Intent intent) {
         return null;
@@ -22,7 +29,10 @@ public IBinder onBind(Intent intent) {
     public void onCreate() {
         super.onCreate();
         AppLog.i(AppLog.T.NOTIFS, "notifications update service > created");
-        mNotificationsUpdateLogic = new NotificationsUpdateLogic(LocaleManager.getLanguage(), this);
+        mNotificationsUpdateLogic = new NotificationsUpdateLogic(
+                mPerAppLocaleManager.getCurrentLocaleLanguageCode(),
+                this
+        );
     }
 
     @Override

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.kt
@@ -215,10 +215,9 @@ import org.wordpress.android.util.BuildConfigWrapper
 import org.wordpress.android.util.DateTimeUtilsWrapper
 import org.wordpress.android.util.DisplayUtils
 import org.wordpress.android.util.FluxCUtils
-import org.wordpress.android.util.LocaleManager
-import org.wordpress.android.util.LocaleManagerWrapper
 import org.wordpress.android.util.MediaUtils
 import org.wordpress.android.util.NetworkUtils
+import org.wordpress.android.util.PerAppLocaleManager
 import org.wordpress.android.util.PermissionUtils
 import org.wordpress.android.util.ReblogUtils
 import org.wordpress.android.util.ShortcutUtils
@@ -364,7 +363,7 @@ class EditPostActivity : AppCompatActivity(), EditorFragmentActivity, EditorImag
 
     @Inject lateinit var editorMedia: EditorMedia
 
-    @Inject lateinit var localeManagerWrapper: LocaleManagerWrapper
+    @Inject lateinit var perAppLocaleManager: PerAppLocaleManager
 
     @Inject internal lateinit var editPostRepository: EditPostRepository
 
@@ -2571,7 +2570,7 @@ class EditPostActivity : AppCompatActivity(), EditorFragmentActivity, EditorImag
          get() {
             val postType = if (isPage) "page" else "post"
             val featuredImageId = editPostRepository.featuredImageId.toInt()
-            val languageString = LocaleManager.getLanguage()
+            val languageString = perAppLocaleManager.getCurrentLocaleLanguageCode()
             val wpcomLocaleSlug = languageString.replace("_", "-").lowercase()
 
             // this.mIsXPostsCapable may return true for non-WP.com sites, but the app only supports xPosts for P2-based

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostUtils.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostUtils.java
@@ -29,7 +29,6 @@
 import org.wordpress.android.util.AppLog.T;
 import org.wordpress.android.util.DateTimeUtils;
 import org.wordpress.android.util.HtmlUtils;
-import org.wordpress.android.util.LocaleManager;
 import org.wordpress.android.util.SiteUtils;
 import org.wordpress.android.util.UrlUtils;
 import org.wordpress.android.util.analytics.AnalyticsUtils;
@@ -489,9 +488,9 @@ public static String getConflictedPostCustomStringForDialog(PostModel post) {
         String secondPart =
                 String.format(context.getString(R.string.dialog_confirm_load_remote_post_body_2),
                         getFormattedDateForLastModified(
-                                context, DateTimeUtils.timestampFromIso8601Millis(lastModified)),
+                                DateTimeUtils.timestampFromIso8601Millis(lastModified)),
                         getFormattedDateForLastModified(
-                                context, DateTimeUtils.timestampFromIso8601Millis(post.getRemoteLastModified())));
+                                DateTimeUtils.timestampFromIso8601Millis(post.getRemoteLastModified())));
         return firstPart + secondPart;
     }
 
@@ -505,24 +504,20 @@ public static UiStringText getCustomStringForAutosaveRevisionDialog(PostModel po
         String secondPart =
                 String.format(context.getString(R.string.dialog_confirm_autosave_body_second_part),
                         getFormattedDateForLastModified(
-                                context, DateTimeUtils.timestampFromIso8601Millis(lastModified)),
+                                DateTimeUtils.timestampFromIso8601Millis(lastModified)),
                         getFormattedDateForLastModified(
-                                context, DateTimeUtils.timestampFromIso8601Millis(post.getAutoSaveModified())));
+                                DateTimeUtils.timestampFromIso8601Millis(post.getAutoSaveModified())));
         return new UiStringText(firstPart + secondPart);
     }
 
     /**
      * E.g. Jul 2, 2013 @ 21:57
      */
-    public static String getFormattedDateForLastModified(Context context, long timeSinceLastModified) {
+    public static String getFormattedDateForLastModified(long timeSinceLastModified) {
         Date date = new Date(timeSinceLastModified);
 
-        DateFormat dateFormat = DateFormat.getDateInstance(
-                DateFormat.MEDIUM,
-                LocaleManager.getSafeLocale(context));
-        DateFormat timeFormat = DateFormat.getTimeInstance(
-                DateFormat.SHORT,
-                LocaleManager.getSafeLocale(context));
+        DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.MEDIUM);
+        DateFormat timeFormat = DateFormat.getTimeInstance(DateFormat.SHORT);
 
         dateFormat.setTimeZone(Calendar.getInstance().getTimeZone());
         timeFormat.setTimeZone(Calendar.getInstance().getTimeZone());

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppSettingsFragment.java
@@ -248,7 +248,7 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
         mLanguagePreference = (WPPreference) findPreference(getString(R.string.pref_key_language));
         mLanguagePreference.setOnPreferenceChangeListener(this);
         mLanguagePreference.setOnPreferenceClickListener(this);
-        mLanguagePreference.setSummary(PerAppLocaleManager.Companion.getCurrentLocaleDisplayName());
+        mLanguagePreference.setSummary(mPerAppLocaleManager.getCurrentLocaleDisplayName());
 
         return view;
     }

diff --git a/...c/main/java/org/wordpress/android/ui/reader/discover/interests/ReaderInterestsFragment.kt b/...c/main/java/org/wordpress/android/ui/reader/discover/interests/ReaderInterestsFragment.kt
@@ -16,7 +16,7 @@ import org.wordpress.android.ui.reader.discover.interests.ReaderInterestsViewMod
 import org.wordpress.android.ui.reader.discover.interests.ReaderInterestsViewModel.UiState.InitialLoadingUiState
 import org.wordpress.android.ui.reader.viewmodels.ReaderViewModel
 import org.wordpress.android.ui.utils.UiHelpers
-import org.wordpress.android.util.LocaleManager
+import org.wordpress.android.util.PerAppLocaleManager
 import org.wordpress.android.util.extensions.getSerializableExtraCompat
 import org.wordpress.android.viewmodel.observeEvent
 import org.wordpress.android.widgets.WPSnackbar
@@ -31,6 +31,9 @@ class ReaderInterestsFragment : Fragment(R.layout.reader_interests_fragment_layo
     private lateinit var viewModel: ReaderInterestsViewModel
     private var parentViewModel: ReaderViewModel? = null
 
+    @Inject
+    lateinit var perAppLocaleManager: PerAppLocaleManager
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         (requireActivity().application as WordPress).component().inject(this)
@@ -109,7 +112,7 @@ class ReaderInterestsFragment : Fragment(R.layout.reader_interests_fragment_layo
         }
 
         viewModel.start(
-            LocaleManager.getLanguage(),
+            perAppLocaleManager.getCurrentLocaleLanguageCode(),
             parentViewModel,
             entryPoint
         )

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/repository/ReaderPostRepository.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/repository/ReaderPostRepository.kt
@@ -22,7 +22,7 @@ import org.wordpress.android.ui.reader.services.post.ReaderPostServiceStarter
 import org.wordpress.android.ui.reader.sources.ReaderPostLocalSource
 import org.wordpress.android.ui.reader.utils.ReaderUtils
 import org.wordpress.android.util.AppLog
-import org.wordpress.android.util.LocaleManagerWrapper
+import org.wordpress.android.util.PerAppLocaleManager
 import org.wordpress.android.util.UrlUtils
 import java.util.Locale
 import javax.inject.Inject
@@ -32,7 +32,7 @@ import kotlin.coroutines.resumeWithException
 
 @Reusable
 class ReaderPostRepository @Inject constructor(
-    private val localeManagerWrapper: LocaleManagerWrapper,
+    private val perAppLocaleManager: PerAppLocaleManager,
     private val localSource: ReaderPostLocalSource,
     @Named(IO_THREAD) private val ioDispatcher: CoroutineDispatcher,
 ) {
@@ -93,7 +93,7 @@ class ReaderPostRepository @Inject constructor(
             sb.append("&before=").append(UrlUtils.urlEncode(beforeDate))
         }
         sb.append("&meta=site,likes")
-        sb.append("&lang=").append(localeManagerWrapper.getLanguage())
+        sb.append("&lang=").append(perAppLocaleManager.getCurrentLocaleLanguageCode())
 
         val listener = RestRequest.Listener { jsonObject: JSONObject? ->
             // remember when this tag was updated if newer posts were requested

diff --git a/...ss/src/main/java/org/wordpress/android/ui/reader/services/discover/ReaderDiscoverLogic.kt b/...ss/src/main/java/org/wordpress/android/ui/reader/services/discover/ReaderDiscoverLogic.kt
@@ -46,7 +46,7 @@ import org.wordpress.android.ui.reader.services.discover.ReaderDiscoverLogic.Dis
 import org.wordpress.android.ui.reader.services.discover.ReaderDiscoverLogic.DiscoverTasks.REQUEST_MORE
 import org.wordpress.android.util.AppLog
 import org.wordpress.android.util.AppLog.T.READER
-import org.wordpress.android.util.LocaleManagerWrapper
+import org.wordpress.android.util.PerAppLocaleManager
 import org.wordpress.android.util.config.ReaderDiscoverNewEndpointFeatureConfig
 import javax.inject.Inject
 
@@ -60,7 +60,7 @@ class ReaderDiscoverLogic @Inject constructor(
     private val getDiscoverCardsUseCase: GetDiscoverCardsUseCase,
     private val appPrefsWrapper: AppPrefsWrapper,
     private val readerDiscoverNewEndpointFeatureConfig: ReaderDiscoverNewEndpointFeatureConfig,
-    private val localeManagerWrapper: LocaleManagerWrapper,
+    private val perAppLocaleManager: PerAppLocaleManager,
 ) {
     enum class DiscoverTasks {
         REQUEST_MORE, REQUEST_FIRST_PAGE
@@ -120,7 +120,7 @@ class ReaderDiscoverLogic @Inject constructor(
                 AppLog.e(READER, volleyError)
                 resultListener.onUpdateResult(FAILED)
             }
-            params["_locale"] = localeManagerWrapper.getLanguage()
+            params["_locale"] = perAppLocaleManager.getCurrentLocaleLanguageCode()
             val endpoint = if (readerDiscoverNewEndpointFeatureConfig.isEnabled()) {
                 "read/streams/discover"
             } else {

diff --git a/...src/main/java/org/wordpress/android/ui/reader/services/search/ReaderSearchJobService.java b/...src/main/java/org/wordpress/android/ui/reader/services/search/ReaderSearchJobService.java
@@ -5,7 +5,7 @@
 
 import org.wordpress.android.ui.reader.services.ServiceCompletionListener;
 import org.wordpress.android.util.AppLog;
-import org.wordpress.android.util.LocaleManagerWrapper;
+import org.wordpress.android.util.PerAppLocaleManager;
 
 import javax.inject.Inject;
 
@@ -22,7 +22,7 @@
 public class ReaderSearchJobService extends JobService implements ServiceCompletionListener {
     private ReaderSearchLogic mReaderSearchLogic;
 
-    @Inject LocaleManagerWrapper mLocaleManagerWrapper;
+    @Inject PerAppLocaleManager mPerAppLocaleManager;
 
     @Override public boolean onStartJob(JobParameters params) {
         if (params.getExtras() != null && params.getExtras().getString(ARG_QUERY) != null) {
@@ -42,7 +42,7 @@ public class ReaderSearchJobService extends JobService implements ServiceComplet
     @Override
     public void onCreate() {
         super.onCreate();
-        mReaderSearchLogic = new ReaderSearchLogic(this, mLocaleManagerWrapper);
+        mReaderSearchLogic = new ReaderSearchLogic(this, mPerAppLocaleManager);
         AppLog.i(AppLog.T.READER, "reader search job service > created");
     }
 

diff --git a/...ress/src/main/java/org/wordpress/android/ui/reader/services/search/ReaderSearchLogic.java b/...ress/src/main/java/org/wordpress/android/ui/reader/services/search/ReaderSearchLogic.java
@@ -14,21 +14,21 @@
 import org.wordpress.android.ui.reader.ReaderEvents;
 import org.wordpress.android.ui.reader.services.ServiceCompletionListener;
 import org.wordpress.android.util.AppLog;
-import org.wordpress.android.util.LocaleManagerWrapper;
+import org.wordpress.android.util.PerAppLocaleManager;
 import org.wordpress.android.util.UrlUtils;
 
 import static org.wordpress.android.ui.reader.utils.ReaderUtils.getTagForSearchQuery;
 
 public class ReaderSearchLogic {
     private final ServiceCompletionListener mCompletionListener;
 
-    private final LocaleManagerWrapper mLocaleManagerWrapper;
+    private final PerAppLocaleManager mPerAppLocaleManager;
     private Object mListenerCompanion;
 
     public ReaderSearchLogic(@NonNull final ServiceCompletionListener listener,
-                             final @NonNull LocaleManagerWrapper localeManagerWrapper) {
+                             final @NonNull PerAppLocaleManager perAppLocaleManager) {
         mCompletionListener = listener;
-        mLocaleManagerWrapper = localeManagerWrapper;
+        mPerAppLocaleManager = perAppLocaleManager;
     }
 
     public void startSearch(@NonNull final String query, final int offset, Object companion) {
@@ -38,7 +38,7 @@ public void startSearch(@NonNull final String query, final int offset, Object co
                       + "&number=" + ReaderConstants.READER_MAX_SEARCH_RESULTS_TO_REQUEST
                       + "&offset=" + offset
                       + "&meta=site,likes"
-                      + "&lang=" + mLocaleManagerWrapper.getLanguage();
+                      + "&lang=" + mPerAppLocaleManager.getCurrentLocaleLanguageCode();
 
         RestRequest.Listener listener = jsonObject -> {
             if (jsonObject != null) {