From 58055acce3505bc790c2330c73dcd495e4cc3224 Mon Sep 17 00:00:00 2001 From: fba Date: Sat, 20 May 2017 16:42:24 +0200 Subject: [PATCH] Few fixes --- .../org/kiwix/kiwixmobile/downloader/DownloadFragment.java | 5 +++-- .../org/kiwix/kiwixmobile/zim_manager/ZimManageActivity.java | 2 +- .../zim_manager/library_view/LibraryFragment.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/kiwix/kiwixmobile/downloader/DownloadFragment.java b/app/src/main/java/org/kiwix/kiwixmobile/downloader/DownloadFragment.java index 6a8992e3e..7fa771762 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/downloader/DownloadFragment.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/downloader/DownloadFragment.java @@ -82,7 +82,7 @@ public class DownloadFragment extends Fragment { } } - public static void showNoWiFiWarning(Context context) { + public static void showNoWiFiWarning(Context context, Runnable yesAction) { new AlertDialog.Builder(context) .setTitle(R.string.wifi_only_title) .setMessage(R.string.wifi_only_msg) @@ -92,6 +92,7 @@ public class DownloadFragment extends Fragment { .putBoolean(KiwixSettingsActivity.PREF_WIFI_ONLY, false) .apply(); KiwixMobileActivity.wifiOnly = false; + yesAction.run(); }) .setNegativeButton(R.string.no, (dialog, i) -> {}) .show(); @@ -208,7 +209,7 @@ public class DownloadFragment extends Fragment { int newPlayPauseState = LibraryFragment.mService.downloadStatus.get(mKeys[position]) == DownloadService.PLAY ? DownloadService.PAUSE : DownloadService.PLAY; if (newPlayPauseState == DownloadService.PLAY && KiwixMobileActivity.wifiOnly && !NetworkUtils.isWiFi(getContext())) { - showNoWiFiWarning(getContext()); + showNoWiFiWarning(getContext(), () -> {setPlayState(pause, position, newPlayPauseState);}); return; } diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageActivity.java index 5b020c51c..7d7843b14 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageActivity.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageActivity.java @@ -83,7 +83,7 @@ public class ZimManageActivity extends AppCompatActivity { setUpToolbar(); if (DownloadService.ACTION_NO_WIFI.equals(getIntent().getAction())) { - DownloadFragment.showNoWiFiWarning(this); + DownloadFragment.showNoWiFiWarning(this, () -> {}); } // Create the adapter that will return a fragment for each of the three diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/library_view/LibraryFragment.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/library_view/LibraryFragment.java index 09eb262e8..007696c70 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/library_view/LibraryFragment.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/library_view/LibraryFragment.java @@ -261,7 +261,7 @@ public class LibraryFragment extends Fragment } if (KiwixMobileActivity.wifiOnly && !NetworkUtils.isWiFi(getContext())) { - DownloadFragment.showNoWiFiWarning(getContext()); + DownloadFragment.showNoWiFiWarning(getContext(), () -> {downloadFile((Book) parent.getAdapter().getItem(position));}); } else { downloadFile((Book) parent.getAdapter().getItem(position)); }