kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-08-03 18:56:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Pause download service if no network (#783)

Browse Source 
* Add setupTableDrawerAdapter() function to simply KiwixMobileActivity.onCreate().

BUG: #565

*  Pause DownloadService if network is not available

* Revert changes to KiwixMobileActivity.java

* Negation on the network availability condition.

(cherry picked from commit 873218352f083c9d5dd2eff2f8cb597b52c33dbc)
This commit is contained in:
qinyin 2018-07-01 20:44:02 +02:00 committed by Abdul Wadood
parent 10fdfc6f96
commit 97afab67db
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/kiwix/kiwixmobile/downloader/DownloadService.java
View File

@ -142,8 +142,7 @@ public class DownloadService extends Service {
if (intent == null) { if (intent == null) {
return START_NOT_STICKY; return START_NOT_STICKY;
} }
String log = intent.getAction(); String log = intent.getAction() + " : ";
log += " : ";
if (intent.hasExtra(NOTIFICATION_ID)) { if (intent.hasExtra(NOTIFICATION_ID)) {
log += intent.getIntExtra(NOTIFICATION_ID, -3); log += intent.getIntExtra(NOTIFICATION_ID, -3);
} }
@ -567,7 +566,8 @@ public class DownloadService extends Service {
break; break;
} }
if (MainActivity.wifiOnly && !NetworkUtils.isWiFi(getApplicationContext())) { if (MainActivity.wifiOnly && !NetworkUtils.isWiFi(getApplicationContext()) ||
!NetworkUtils.isNetworkAvailable(getApplicationContext())) {
pauseDownload(chunk.getNotificationID()); pauseDownload(chunk.getNotificationID());
} }