Rename RestClientUtils#get to RestClientUtils#getWithLocale and creat…

…e RestClientUtils#get without adding Locale parameter automatically
wordpress-mobile · Mar 13, 2024 · 36a4ce7 · 36a4ce7
1 parent 2f25490
commit 36a4ce7
Show file tree

Hide file tree

Showing 16 changed files with 56 additions and 47 deletions.
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
@@ -51,7 +51,7 @@ class RecommendApiCallsProvider @Inject constructor(
                 cont.resume(Failure(errorMessage))
             }
 
-            restClientProvider.getRestClientUtilsV2().get(
+            restClientProvider.getRestClientUtilsV2().getWithLocale(
                 endPointPath,
                 listener,
                 errorListener

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/utils/NotificationsUtils.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/utils/NotificationsUtils.java
@@ -87,7 +87,7 @@ public static void getPushNotificationSettings(Context context, RestRequest.List
         if (!TextUtils.isEmpty(deviceID)) {
             settingsEndpoint += "?device_id=" + deviceID;
         }
-        WordPress.getRestClientUtilsV1_1().get(settingsEndpoint, listener, errorListener);
+        WordPress.getRestClientUtilsV1_1().getWithLocale(settingsEndpoint, listener, errorListener);
     }
 
     public static void registerDeviceForPushNotifications(final Context ctx, String token) {

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/InviteLinksApiCallsProvider.kt b/WordPress/src/main/java/org/wordpress/android/ui/people/InviteLinksApiCallsProvider.kt
@@ -39,7 +39,7 @@ class InviteLinksApiCallsProvider @Inject constructor(
             cont.resume(Failure(error))
         }
 
-        WordPress.getRestClientUtilsV1_1().get(
+        WordPress.getRestClientUtilsV1_1().getWithLocale(
             endPointPath,
             listener,
             errorListener

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/utils/PeopleUtils.java b/WordPress/src/main/java/org/wordpress/android/ui/people/utils/PeopleUtils.java
@@ -62,7 +62,7 @@ public void onErrorResponse(VolleyError volleyError) {
         params.put("order_by", "display_name");
         params.put("order", "ASC");
         String path = String.format(Locale.US, "sites/%d/users", site.getSiteId());
-        WordPress.getRestClientUtilsV1_1().get(path, params, null, listener, errorListener);
+        WordPress.getRestClientUtilsV1_1().getWithLocale(path, params, null, listener, errorListener);
     }
 
     public static void fetchAuthors(final SiteModel site, final int offset, final FetchUsersCallback callback) {
@@ -95,7 +95,7 @@ public static void fetchAuthors(final SiteModel site, final int offset, final Fe
         params.put("order", "ASC");
         params.put("authors_only", "true");
         String path = String.format(Locale.US, "sites/%d/users", site.getSiteId());
-        WordPress.getRestClientUtilsV1_1().get(path, params, null, listener, errorListener);
+        WordPress.getRestClientUtilsV1_1().getWithLocale(path, params, null, listener, errorListener);
     }
 
     public static void fetchRevisionAuthorsDetails(final SiteModel site, List<String> authors,
@@ -144,7 +144,7 @@ public void onErrorResponse(VolleyError volleyError) {
                             site.getSiteId(), authors.get(i)));
         }
 
-        WordPress.getRestClientUtilsV1_1().get("batch/", batchParams, null, listener, errorListener);
+        WordPress.getRestClientUtilsV1_1().getWithLocale("batch/", batchParams, null, listener, errorListener);
     }
 
     public static void fetchFollowers(final SiteModel site, final int page, final FetchFollowersCallback callback) {
@@ -195,7 +195,7 @@ public void onErrorResponse(VolleyError volleyError) {
         params.put("page", Integer.toString(page));
         params.put("type", isEmailFollower ? "email" : "wp_com");
         String path = String.format(Locale.US, "sites/%d/stats/followers", site.getSiteId());
-        WordPress.getRestClientUtilsV1_1().get(path, params, null, listener, errorListener);
+        WordPress.getRestClientUtilsV1_1().getWithLocale(path, params, null, listener, errorListener);
     }
 
     public static void fetchViewers(final SiteModel site, final int offset, final FetchViewersCallback callback) {
@@ -233,7 +233,7 @@ public void onErrorResponse(VolleyError volleyError) {
         params.put("number", Integer.toString(FETCH_LIMIT));
         params.put("page", Integer.toString(page));
         String path = String.format(Locale.US, "sites/%d/viewers", site.getSiteId());
-        WordPress.getRestClientUtilsV1_1().get(path, params, null, listener, errorListener);
+        WordPress.getRestClientUtilsV1_1().getWithLocale(path, params, null, listener, errorListener);
     }
 
     public static void updateRole(final SiteModel site, long personID, String newRole, final int localTableBlogId,

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/publicize/PublicizeActions.java b/WordPress/src/main/java/org/wordpress/android/ui/publicize/PublicizeActions.java
@@ -153,7 +153,7 @@ public void onErrorResponse(VolleyError volleyError) {
         };
 
         String path = "/me/keyring-connections";
-        WordPress.getRestClientUtilsV1_1().get(path, listener, errorListener);
+        WordPress.getRestClientUtilsV1_1().getWithLocale(path, listener, errorListener);
     }
 
     /*

diff --git a/...ss/src/main/java/org/wordpress/android/ui/publicize/services/PublicizeUpdateServicesV2.kt b/...ss/src/main/java/org/wordpress/android/ui/publicize/services/PublicizeUpdateServicesV2.kt
@@ -27,7 +27,7 @@ class PublicizeUpdateServicesV2 @Inject constructor(
         }
         val errorListener = RestRequest.ErrorListener { volleyError -> failure(volleyError) }
         val path = "sites/$siteId/external-services?type=publicize"
-        restClientProvider.getRestClientUtilsV2().get(path, listener, errorListener)
+        restClientProvider.getRestClientUtilsV2().getWithLocale(path, listener, errorListener)
     }
 
     /*
@@ -45,6 +45,6 @@ class PublicizeUpdateServicesV2 @Inject constructor(
         }
         val errorListener = RestRequest.ErrorListener { volleyError -> failure(volleyError) }
         val path = String.format(Locale.ROOT, "sites/%d/publicize-connections", siteId)
-        restClientProvider.getRestClientUtilsV1_1().get(path, listener, errorListener)
+        restClientProvider.getRestClientUtilsV1_1().getWithLocale(path, listener, errorListener)
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/actions/ReaderBlogActions.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/actions/ReaderBlogActions.java
@@ -398,10 +398,10 @@ public void onErrorResponse(VolleyError volleyError) {
         };
 
         if (hasBlogId) {
-            WordPress.getRestClientUtilsV1_1().get("read/sites/" + blogId, listener, errorListener);
+            WordPress.getRestClientUtilsV1_1().getWithLocale("read/sites/" + blogId, listener, errorListener);
         } else {
             WordPress.getRestClientUtilsV1_1()
-                     .get("read/sites/" + UrlUtils.urlEncode(UrlUtils.getHost(blogUrl)), listener, errorListener);
+                     .getWithLocale("read/sites/" + UrlUtils.urlEncode(UrlUtils.getHost(blogUrl)), listener, errorListener);
         }
     }
 
@@ -438,7 +438,7 @@ public void onErrorResponse(VolleyError volleyError) {
         } else {
             path = "read/feed/" + UrlUtils.urlEncode(feedUrl);
         }
-        WordPress.getRestClientUtilsV1_1().get(path, listener, errorListener);
+        WordPress.getRestClientUtilsV1_1().getWithLocale(path, listener, errorListener);
     }
 
     private static void handleUpdateBlogInfoResponse(JSONObject jsonObject, UpdateBlogInfoListener infoListener) {

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/actions/ReaderPostActions.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/actions/ReaderPostActions.java
@@ -159,7 +159,7 @@ public void onErrorResponse(VolleyError volleyError) {
             }
         };
         AppLog.d(T.READER, "updating post");
-        WordPress.getRestClientUtilsV1_2().get(path, null, null, listener, errorListener);
+        WordPress.getRestClientUtilsV1_2().getWithLocale(path, null, null, listener, errorListener);
     }
 
     private static void handleUpdatePostResponse(@NonNull final ReaderPost localPost,
@@ -320,7 +320,7 @@ public void onErrorResponse(VolleyError volleyError) {
         };
 
         AppLog.d(T.READER, "requesting post");
-        restClientUtils.get(path, null, null, listener, errorListener);
+        restClientUtils.getWithLocale(path, null, null, listener, errorListener);
     }
 
     private static String getTrackingPixelForPost(@NonNull ReaderPost post) {
@@ -417,7 +417,7 @@ public void onErrorResponse(VolleyError volleyError) {
                       + "?size_local=" + NUM_RELATED_POSTS_TO_REQUEST
                       + "&size_global=" + NUM_RELATED_POSTS_TO_REQUEST
                       + "&fields=" + ReaderSimplePost.SIMPLE_POST_FIELDS;
-        WordPress.getRestClientUtilsV1_2().get(path, null, null, listener, errorListener);
+        WordPress.getRestClientUtilsV1_2().getWithLocale(path, null, null, listener, errorListener);
     }
 
     private static void handleRelatedPostsResponse(final ReaderPost sourcePost,

diff --git a/.../src/main/java/org/wordpress/android/ui/reader/services/comment/ReaderCommentService.java b/.../src/main/java/org/wordpress/android/ui/reader/services/comment/ReaderCommentService.java
@@ -201,7 +201,7 @@ public void onErrorResponse(VolleyError volleyError) {
             }
         };
         AppLog.d(AppLog.T.READER, "updating comments");
-        WordPress.getRestClientUtilsV1_1().get(path, null, null, listener, errorListener);
+        WordPress.getRestClientUtilsV1_1().getWithLocale(path, null, null, listener, errorListener);
     }
 
     private static void handleUpdateCommentsResponse(final JSONObject jsonObject,

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
@@ -123,7 +123,7 @@ class ReaderDiscoverLogic @Inject constructor(
             } else {
                 "read/tags/cards"
             }
-            WordPress.getRestClientUtilsV2()[endpoint, params, null, listener, errorListener]
+            WordPress.getRestClientUtilsV2().getWithLocale(endpoint, params, null, listener, errorListener)
         }
     }
 

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/services/post/ReaderPostLogic.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/services/post/ReaderPostLogic.java
@@ -144,7 +144,7 @@ public void onErrorResponse(VolleyError volleyError) {
             }
         };
 
-        WordPress.getRestClientUtilsV1_2().get(sb.toString(), null, null, listener, errorListener);
+        WordPress.getRestClientUtilsV1_2().getWithLocale(sb.toString(), null, null, listener, errorListener);
     }
 
     private static void requestPostsForBlog(final long blogId,
@@ -174,7 +174,7 @@ public void onErrorResponse(VolleyError volleyError) {
             }
         };
         AppLog.d(AppLog.T.READER, "updating posts in blog " + blogId);
-        WordPress.getRestClientUtilsV1_2().get(path, null, null, listener, errorListener);
+        WordPress.getRestClientUtilsV1_2().getWithLocale(path, null, null, listener, errorListener);
     }
 
     private static void requestPostsForFeed(final long feedId,
@@ -203,7 +203,7 @@ public void onErrorResponse(VolleyError volleyError) {
         };
 
         AppLog.d(AppLog.T.READER, "updating posts in feed " + feedId);
-        WordPress.getRestClientUtilsV1_2().get(path, null, null, listener, errorListener);
+        WordPress.getRestClientUtilsV1_2().getWithLocale(path, null, null, listener, errorListener);
     }
 
     /*

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
@@ -55,7 +55,7 @@ public void onErrorResponse(VolleyError volleyError) {
 
         AppLog.d(AppLog.T.READER, "reader search service > starting search for " + query);
         EventBus.getDefault().post(new ReaderEvents.SearchPostsStarted(query, offset));
-        WordPress.getRestClientUtilsV1_2().get(path, null, null, listener, errorListener);
+        WordPress.getRestClientUtilsV1_2().getWithLocale(path, null, null, listener, errorListener);
     }
 
     private void handleSearchResponse(final String query, final int offset, final JSONObject jsonObject) {

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
@@ -120,7 +120,7 @@ public void onErrorResponse(VolleyError volleyError) {
         HashMap<String, String> params = new HashMap<>();
         params.put("locale", mLanguage);
         mClientUtilsProvider.getRestClientForTagUpdate()
-                            .get("read/menu", params, null, listener, errorListener);
+                            .getWithLocale("read/menu", params, null, listener, errorListener);
     }
 
     /**
@@ -279,7 +279,7 @@ private void fetchInterestTags() {
         HashMap<String, String> params = new HashMap<>();
         params.put("_locale", mLanguage);
         mClientUtilsProvider.getRestClientForInterestTags()
-                            .get("read/interests", params, null, listener, errorListener);
+                            .getWithLocale("read/interests", params, null, listener, errorListener);
     }
 
     private void handleInterestTagsResponse(final JSONObject jsonObject) {
@@ -316,7 +316,7 @@ public void onErrorResponse(VolleyError volleyError) {
         AppLog.d(AppLog.T.READER, "reader service > updating followed blogs. Page requested: " + page);
         // request using ?meta=site,feed to get extra info
         WordPress.getRestClientUtilsV1_2()
-                 .get("read/following/mine?number=100&page=" + page + "&meta=site%2Cfeed", listener, errorListener);
+                 .getWithLocale("read/following/mine?number=100&page=" + page + "&meta=site%2Cfeed", listener, errorListener);
     }
 
     private void handleFollowedBlogsResponse(final ReaderBlogList serverBlogs, final JSONObject jsonObject) {

diff --git a/...ss/src/main/java/org/wordpress/android/ui/reader/utils/PostSubscribersApiCallsProvider.kt b/...ss/src/main/java/org/wordpress/android/ui/reader/utils/PostSubscribersApiCallsProvider.kt
@@ -38,7 +38,7 @@ class PostSubscribersApiCallsProvider @Inject constructor(
             cont.resume(false)
         }
 
-        WordPress.getRestClientUtilsV1_1().get(
+        WordPress.getRestClientUtilsV1_1().getWithLocale(
             endPointPath,
             listener,
             errorListener
@@ -64,7 +64,7 @@ class PostSubscribersApiCallsProvider @Inject constructor(
             cont.resume(Failure(error))
         }
 
-        WordPress.getRestClientUtilsV1_1().get(
+        WordPress.getRestClientUtilsV1_1().getWithLocale(
             endPointPath,
             listener,
             errorListener

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/suggestion/service/SuggestionService.java b/WordPress/src/main/java/org/wordpress/android/ui/suggestion/service/SuggestionService.java
@@ -91,7 +91,7 @@ private void updateSuggestions(final long siteId) {
 
         AppLog.d(AppLog.T.SUGGESTION, "suggestion service > updating suggestions for siteId: " + siteId);
         String path = "/users/suggest" + "?site_id=" + siteId;
-        WordPress.getRestClientUtils().get(path, listener, errorListener);
+        WordPress.getRestClientUtils().getWithLocale(path, listener, errorListener);
     }
 
     private void handleSuggestionsUpdatedResponse(final long siteId, final JSONObject jsonObject) {
@@ -136,7 +136,7 @@ private void updateTags(final long siteId) {
 
         AppLog.d(AppLog.T.SUGGESTION, "suggestion service > updating tags for siteId: " + siteId);
         String path = "/sites/" + siteId + "/tags";
-        WordPress.getRestClientUtils().get(path, listener, errorListener);
+        WordPress.getRestClientUtils().getWithLocale(path, listener, errorListener);
     }
 
     private void handleTagsUpdatedResponse(final long siteId, final JSONObject jsonObject) {

diff --git a/libs/networking/src/main/java/org/wordpress/android/networking/RestClientUtils.java b/libs/networking/src/main/java/org/wordpress/android/networking/RestClientUtils.java
@@ -103,7 +103,7 @@ public RestClient getRestClient() {
 
     public void getCategories(long siteId, Listener listener, ErrorListener errorListener) {
         String path = String.format(Locale.US, "sites/%d/categories", siteId);
-        get(path, null, null, listener, errorListener);
+        getWithLocale(path, null, null, listener, errorListener);
     }
 
     /**
@@ -112,7 +112,7 @@ public void getCategories(long siteId, Listener listener, ErrorListener errorLis
      * <a href="https://developer.wordpress.com/docs/api/1/get/notifications/">api/1/get/notifications</a>
      */
     public void getNotifications(Map<String, String> params, Listener listener, ErrorListener errorListener) {
-        get("notifications", params, null, listener, errorListener);
+        getWithLocale("notifications", params, null, listener, errorListener);
     }
 
     /**
@@ -123,7 +123,7 @@ public void getNotification(Map<String, String> params, String noteId,
                                 Listener listener, ErrorListener errorListener) {
         params.put("fields", NOTIFICATION_FIELDS);
         String path = String.format(Locale.US, "notifications/%s/", noteId);
-        get(path, params, null, listener, errorListener);
+        getWithLocale(path, params, null, listener, errorListener);
     }
 
     /**
@@ -135,7 +135,7 @@ public void getNotification(String noteId, Listener listener, ErrorListener erro
         HashMap<String, String> params = new HashMap<>();
         params.put("fields", NOTIFICATION_FIELDS);
         String path = String.format("notifications/%s", noteId);
-        get(path, params, null, listener, errorListener);
+        getWithLocale(path, params, null, listener, errorListener);
     }
 
     /**
@@ -166,23 +166,23 @@ public void decrementUnreadCount(String noteId, String decrementAmount,
 
     public void getJetpackSettings(long siteId, Listener listener, ErrorListener errorListener) {
         String path = String.format(Locale.US, "jetpack-blogs/%d/rest-api/?path=/jetpack/v4/settings", siteId);
-        get(path, listener, errorListener);
+        getWithLocale(path, listener, errorListener);
     }
 
     public void getGeneralSettings(long siteId, Listener listener, ErrorListener errorListener) {
         String path = String.format(Locale.US, "sites/%d/settings", siteId);
-        get(path, listener, errorListener);
+        getWithLocale(path, listener, errorListener);
     }
 
     public void getJetpackMonitorSettings(long siteId, Listener listener, ErrorListener errorListener) {
         String path = String.format(Locale.US, "jetpack-blogs/%d", siteId);
-        get(path, listener, errorListener);
+        getWithLocale(path, listener, errorListener);
     }
 
 
     public void getJetpackModuleSettings(long siteId, Listener listener, ErrorListener errorListener) {
         String path = String.format(Locale.US, "sites/%d/jetpack/modules", siteId);
-        get(path, listener, errorListener);
+        getWithLocale(path, listener, errorListener);
     }
 
     public void setGeneralSiteSettings(long siteId, JSONObject params, Listener listener, ErrorListener errorListener) {
@@ -228,7 +228,7 @@ public void setJetpackModuleSettings(long siteId, String module, boolean active,
 
     public void getSitePurchases(long siteId, Listener listener, ErrorListener errorListener) {
         String path = String.format(Locale.US, "sites/%d/purchases", siteId);
-        get(path, listener, errorListener);
+        getWithLocale(path, listener, errorListener);
     }
 
     public void exportContentAll(long siteId, Listener listener, ErrorListener errorListener) {
@@ -238,7 +238,7 @@ public void exportContentAll(long siteId, Listener listener, ErrorListener error
 
     public void getSharingButtons(String siteId, Listener listener, ErrorListener errorListener) {
         String path = String.format("sites/%s/sharing-buttons", siteId);
-        get(path, listener, errorListener);
+        getWithLocale(path, listener, errorListener);
     }
 
     public void setSharingButtons(String siteId, JSONObject params, Listener listener, ErrorListener errorListener) {
@@ -249,29 +249,38 @@ public void setSharingButtons(String siteId, JSONObject params, Listener listene
     /**
      * Make GET request
      */
-    public Request<JSONObject> get(String path, Listener listener, ErrorListener errorListener) {
-        return get(path, null, null, listener, errorListener);
+    public Request<JSONObject> getWithLocale(final String path, final Listener listener,
+                                             final ErrorListener errorListener) {
+        return getWithLocale(path, null, null, listener, errorListener);
     }
 
     /**
-     * Make GET request with params
+     * Make GET request with params. Locale param is added automatically.
      */
-    public Request<JSONObject> get(String path, Map<String, String> params, RetryPolicy retryPolicy, Listener listener,
-                    ErrorListener errorListener) {
+    public Request<JSONObject> getWithLocale(final String path, final Map<String, String> params,
+                                             RetryPolicy retryPolicy, final Listener listener,
+                                             final ErrorListener errorListener) {
         // turn params into query string
         HashMap<String, String> paramsWithLocale = getRestLocaleParams(mContext);
         if (params != null) {
             paramsWithLocale.putAll(params);
         }
+        return get(path, paramsWithLocale, retryPolicy, listener, errorListener);
+    }
 
+    /**
+     * Make GET request with params.
+     */
+    public Request<JSONObject> get(final String path, final Map<String, String> params, RetryPolicy retryPolicy,
+                                   final Listener listener, final ErrorListener errorListener) {
         String realPath = getSanitizedPath(path);
         if (TextUtils.isEmpty(realPath)) {
             realPath = path;
         }
-        paramsWithLocale.putAll(getSanitizedParameters(path));
+        params.putAll(getSanitizedParameters(path));
 
         RestRequest request = mRestClient.makeRequest(Method.GET, mRestClient
-                        .getAbsoluteURL(realPath, paramsWithLocale), null, listener, errorListener);
+                .getAbsoluteURL(realPath, params), null, listener, errorListener);
 
         if (retryPolicy == null) {
             retryPolicy = new DefaultRetryPolicy(REST_TIMEOUT_MS, REST_MAX_RETRIES_GET, REST_BACKOFF_MULT);