added locale param to /read/menu endpoint

wordpress-mobile · Jul 20, 2018 · 68c2526 · 68c2526
1 parent 5fd458f
commit 68c2526
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
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
@@ -27,6 +27,8 @@
 import org.wordpress.android.fluxc.store.AccountStore;
 import org.wordpress.android.fluxc.store.AccountStore.OnAccountChanged;
 import org.wordpress.android.fluxc.store.SiteStore;
+import org.wordpress.android.ui.reader.services.update.ReaderUpdateLogic;
+import org.wordpress.android.ui.reader.services.update.ReaderUpdateServiceStarter;
 import org.wordpress.android.util.AnalyticsUtils;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.LocaleManager;
@@ -36,6 +38,7 @@
 import org.wordpress.android.util.WPMediaUtils;
 import org.wordpress.android.util.WPPrefUtils;
 
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -368,6 +371,9 @@ private void changeLanguage(String languageCode) {
         startActivity(refresh);
         getActivity().setResult(LANGUAGE_CHANGED);
         getActivity().finish();
+
+        // update Reader tags as they need be localized - use the app context as the Activity is being finished
+        ReaderUpdateServiceStarter.startService(WordPress.getContext(), EnumSet.of(ReaderUpdateLogic.UpdateTask.TAGS));
     }
 
     private void updateLanguagePreference(String languageCode) {

diff --git a/...ress/src/main/java/org/wordpress/android/ui/reader/services/update/ReaderUpdateLogic.java b/...ress/src/main/java/org/wordpress/android/ui/reader/services/update/ReaderUpdateLogic.java
@@ -1,5 +1,6 @@
 package org.wordpress.android.ui.reader.services.update;
 
+import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 
 import com.android.volley.VolleyError;
@@ -23,8 +24,10 @@
 import org.wordpress.android.ui.reader.services.ServiceCompletionListener;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.JSONUtils;
+import org.wordpress.android.util.LocaleManager;
 
 import java.util.EnumSet;
+import java.util.HashMap;
 import java.util.Iterator;
 
 import javax.inject.Inject;
@@ -48,12 +51,14 @@ public enum UpdateTask {
     private EnumSet<UpdateTask> mCurrentTasks;
     private ServiceCompletionListener mCompletionListener;
     private Object mListenerCompanion;
+    private String mLanguage;
 
     @Inject AccountStore mAccountStore;
 
     public ReaderUpdateLogic(WordPress app, ServiceCompletionListener listener) {
         mCompletionListener = listener;
         app.component().inject(this);
+        mLanguage = LocaleManager.getLanguage(app);
     }
 
     public void performTasks(EnumSet<UpdateTask> tasks, Object companion) {
@@ -105,7 +110,9 @@ public void onErrorResponse(VolleyError volleyError) {
             }
         };
         AppLog.d(AppLog.T.READER, "reader service > updating tags");
-        WordPress.getRestClientUtilsV1_2().get("read/menu", null, null, listener, errorListener);
+        HashMap<String, String> params = new HashMap<>();
+        params.put("locale", mLanguage);
+        WordPress.getRestClientUtilsV1_2().get("read/menu", params, null, listener, errorListener);
     }
 
     private void handleUpdateTagsResponse(final JSONObject jsonObject) {

diff --git a/WordPress/src/main/java/org/wordpress/android/util/LocaleManager.java b/WordPress/src/main/java/org/wordpress/android/util/LocaleManager.java
@@ -73,7 +73,7 @@ public static boolean isSameLanguage(@NonNull String language) {
      * language code, else just return the device default language code.
      * @return The 2-letter language code (example "en")
      */
-    private static String getLanguage(Context context) {
+    public static String getLanguage(Context context) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         return prefs.getString(LANGUAGE_KEY, LanguageUtils.getCurrentDeviceLanguageCode());
     }