From aac0b7c52f842b369f754a9845a8c104614de7d6 Mon Sep 17 00:00:00 2001
From: Shridhar Goel <35566748+ShridharGoel@users.noreply.github.com>
Date: Sun, 20 Jan 2019 01:47:52 +0530
Subject: [PATCH] Fix #2312: Prevent crash when internet connection is not
 available (#2320)

* Fixes crash when internet connection is not available

* Fixes crash when internet connection is not available

* Remove unused imports
---
 .../fr/free/nrw/commons/media/MediaDetailPagerFragment.java | 6 ++++++
 .../java/fr/free/nrw/commons/upload/UploadActivity.java     | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java
index 2ef99fbd6..1dadd0537 100644
--- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java
@@ -42,6 +42,8 @@ import fr.free.nrw.commons.explore.SearchActivity;
 import fr.free.nrw.commons.kvstore.BasicKvStore;
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
 import fr.free.nrw.commons.utils.ImageUtils;
+import fr.free.nrw.commons.utils.NetworkUtils;
+import fr.free.nrw.commons.utils.ViewUtil;
 import timber.log.Timber;
 
 import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
@@ -176,6 +178,10 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple
                 return true;
             case R.id.menu_download_current_image:
                 // Download
+                if (!NetworkUtils.isInternetConnectionEstablished(getActivity())) {
+                    ViewUtil.showShortSnackbar(getView(), R.string.no_internet);
+                    return false;
+                }
                 downloadMedia(m);
                 return true;
             case R.id.menu_set_as_wallpaper:
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java
index 43fa1a4ea..77cf81183 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java
@@ -58,6 +58,7 @@ import fr.free.nrw.commons.kvstore.JsonKvStore;
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
 import fr.free.nrw.commons.nearby.Place;
 import fr.free.nrw.commons.utils.DialogUtil;
+import fr.free.nrw.commons.utils.NetworkUtils;
 import fr.free.nrw.commons.utils.PermissionUtils;
 import fr.free.nrw.commons.utils.StringUtils;
 import fr.free.nrw.commons.utils.ViewUtil;
@@ -534,6 +535,10 @@ public class UploadActivity extends AuthenticatedActivity implements UploadView,
     private void configureNavigationButtons() {
         // Navigation next / previous for each image as we're collecting title + description
         next.setOnClickListener(v -> {
+            if (!NetworkUtils.isInternetConnectionEstablished(this)) {
+                ViewUtil.showShortSnackbar(cardLayout, R.string.no_internet);
+                return;
+            }
             setTitleAndDescriptions();
             presenter.handleNext(descriptionsAdapter.getTitle(),
                     descriptionsAdapter.getDescriptions());