mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 12:23:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix #2312: Prevent crash when internet connection is not available (#2320)

Browse source 
* Fixes crash when internet connection is not available

* Fixes crash when internet connection is not available

* Remove unused imports
This commit is contained in:
Shridhar Goel 2019-01-20 01:47:52 +05:30 • committed by Vivek Maskara
parent 071eab6302
commit aac0b7c52f
2 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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:

5
app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java
View file

@ -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());