Bug fix commons-app#2042

* Added a snack with retry when api in AA fails
* Increased connection timeouts in okhttpclient builder

Author: ashishkumar468

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

@@ -185,6 +185,7 @@ void shareScreen(Bitmap bitmap) {
      * which then calls parseJson when results are fetched
      */
     private void setAchievements() {
+        progressBar.setVisibility(View.VISIBLE);
         if (checkAccount()) {
             compositeDisposable.add(mediaWikiApi
                     .getAchievements(Objects.requireNonNull(sessionManager.getCurrentAccount()).name)
@@ -195,17 +196,23 @@ private void setAchievements() {
                                 if (response != null) {
                                     setUploadCount(Achievements.from(response));
                                 } else {
-                                    onError();
+                                    showSnackBarWithRetry();
                                 }
                             },
                             t -> {
                                 Timber.e(t, "Fetching achievements statistics failed");
-                                onError();
+                                showSnackBarWithRetry();
                             }
                     ));
         }
     }
 
+    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 generic error toast when error occurs while loading achievements or uploads
      */

app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesController.java

@@ -36,7 +36,7 @@ List<Media> loadBookmarkedPictures() {
         for (Bookmark bookmark : bookmarks) {
             List<Media> tmpMedias = mediaWikiApi.searchImages(bookmark.getMediaName(), 0);
             for (Media m : tmpMedias) {
-                if (m.getCreator().equals(bookmark.getMediaCreator())) {
+                if (m.getCreator().trim().equals(bookmark.getMediaCreator().trim())) {
                     medias.add(m);
                     break;
                 }

app/src/main/java/fr/free/nrw/commons/di/NetworkingModule.java

@@ -9,6 +9,7 @@
 
 import java.io.File;
 
+import java.util.concurrent.TimeUnit;
 import javax.inject.Named;
 import javax.inject.Singleton;
 
@@ -30,9 +31,11 @@ public class NetworkingModule {
     @Singleton
     public OkHttpClient provideOkHttpClient(Context context) {
         File dir = new File(context.getCacheDir(), "okHttpCache");
-        return new OkHttpClient.Builder()
-                .cache(new Cache(dir, OK_HTTP_CACHE_SIZE))
-                .build();
+        return new OkHttpClient.Builder().connectTimeout(30, TimeUnit.SECONDS)
+            .writeTimeout(30, TimeUnit.SECONDS)
+            .readTimeout(30, TimeUnit.SECONDS)
+            .cache(new Cache(dir, OK_HTTP_CACHE_SIZE))
+            .build();
     }
 
     @Provides

app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java

@@ -271,7 +271,7 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
             menu.clear(); // see http://stackoverflow.com/a/8495697/17865
             inflater.inflate(R.menu.fragment_image_detail, menu);
             if (pager != null) {
-                MediaDetailProvider provider = (MediaDetailProvider) getParentFragment();
+                MediaDetailProvider provider = getMediaDetailProvider();
                 if(provider == null) {
                     return;
                 }

app/src/main/java/fr/free/nrw/commons/utils/ViewUtil.java

@@ -87,4 +87,24 @@ public static void displayPopupWindow(View anchorView, Context context, View pop
         popup.showAsDropDown(anchorView);
     }
 
+    /**
+     * A snack bar which has an action button which on click dismisses the snackbar and invokes the
+     * listener passed
+     */
+    public static void showDismissibleSnackBar(View view, int messageResourceId,
+        int actionButtonResourceId, View.OnClickListener onClickListener) {
+        if (view.getContext() == null) {
+            return;
+        }
+        ExecutorUtils.uiExecutor().execute(() -> {
+            Snackbar snackbar = Snackbar.make(view, view.getContext().getString(messageResourceId),
+                Snackbar.LENGTH_INDEFINITE);
+            snackbar.setAction(view.getContext().getString(actionButtonResourceId), v -> {
+                snackbar.dismiss();
+                onClickListener.onClick(v);
+            });
+            snackbar.show();
+        });
+    }
+
 }