made essential changes

Author: kbhardwaj123

app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java

@@ -238,18 +238,18 @@ private void setAchievements() {
                                         // achievements calculator to fail in some cases, for more details
                                         // refer Issue: #3295
                                         if (numberOfEdits <= 150000) {
-                                            showSnackBarWithRetry();
+                                            showSnackBarWithRetry(false);
                                         } else {
-                                            showSnackBarUltimateAchievementWithRetry();
+                                            showSnackBarWithRetry(true);
                                         }
                                     }
                                 },
                                 t -> {
                                     Timber.e(t, "Fetching achievements statistics failed");
                                     if (numberOfEdits <= 150000) {
-                                        showSnackBarWithRetry();
+                                        showSnackBarWithRetry(false);
                                     } else {
-                                        showSnackBarUltimateAchievementWithRetry();
+                                        showSnackBarWithRetry(true);
                                     }
                                 }
                         ));
@@ -275,7 +275,7 @@ private void setWikidataEditCount() {
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(edits -> {
-                    numberOfEdits += edits;
+                    numberOfEdits = edits;
                     wikidataEditsText.setText(String.valueOf(edits));
                 }, e -> {
                     Timber.e("Error:" + e);
@@ -285,22 +285,20 @@ private void setWikidataEditCount() {
     /**
      * Shows a snack bar which has an action button which on click dismisses the snackbar and invokes the
      * listener passed
+     * @param tooManyAchievements if this value is true it means that the number of achievements of the 
+     * user are so high that it wrecks havoc with the Achievements calculator due to which request may time 
+     * out. Well this is the Ultimate Achievement
      */
-    private void showSnackBarWithRetry() {
-        progressBar.setVisibility(View.GONE);
-        ViewUtil.showDismissibleSnackBar(findViewById(android.R.id.content),
-                R.string.achievements_fetch_failed, R.string.retry, view -> setAchievements());
-    }
-
-    /**
-     * Shows a snack bar which tells the users that their wiki edit count is so high that it (in some cases)
-     * wreks havoc with the Achievements calculator due to which request may time out
-     * Well this is the Ultimate Achievement 
-     */
-    private void showSnackBarUltimateAchievementWithRetry() {
-        progressBar.setVisibility(View.GONE);
-        ViewUtil.showDismissibleSnackBar(findViewById(android.R.id.content),
-                R.string.achievements_fetch_failed_ultimate_achievement, R.string.retry, view -> setAchievements());
+    private void showSnackBarWithRetry(boolean tooManyAchievements) {
+        if (tooManyAchievements) {
+            progressBar.setVisibility(View.GONE);
+            ViewUtil.showDismissibleSnackBar(findViewById(android.R.id.content),
+                    R.string.achievements_fetch_failed_ultimate_achievement, R.string.retry, view -> setAchievements());
+        } else {
+            progressBar.setVisibility(View.GONE);
+            ViewUtil.showDismissibleSnackBar(findViewById(android.R.id.content),
+                    R.string.achievements_fetch_failed, R.string.retry, view -> setAchievements());
+        }
     }
 
     /**

app/src/main/res/values/strings.xml

@@ -459,7 +459,7 @@ Upload your first media by tapping on the add button.</string>
   <string name="display_location_permission_title">Display location permission</string>
   <string name="display_location_permission_explanation">Ask for location permission when needed for nearby notification card view feature.</string>
   <string name="achievements_fetch_failed">Something went wrong, We could not fetch your achievements</string>
-  <string name="achievements_fetch_failed_ultimate_achievement">Congratulations!, Your achievements are so high that they break out achievements calculator. This is the Ultimate Achievement.</string>
+  <string name="achievements_fetch_failed_ultimate_achievement">Congratulations! You've made so many contributions our achievements calculation system can't cope. This is the ultimate achievement.</string>
   <string name="ends_on">Ends on:</string>
   <string name="display_campaigns">Display campaigns</string>
   <string name="display_campaigns_explanation">See the ongoing campaigns</string>