Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use DownloadManager if it was disabled

Browse Source 
Fixes #442.
This commit is contained in:
Daniel Martí 2015-10-21 23:29:45 +02:00
parent 3311043e80
commit 8307015d8d
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
F-Droid/src/org/fdroid/fdroid/net/AsyncDownloaderFromAndroid.java
View File

@ -294,6 +294,10 @@ public class AsyncDownloaderFromAndroid implements AsyncDownloader {
DownloadManager dm = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE); DownloadManager dm = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
DownloadManager.Query query = new DownloadManager.Query(); DownloadManager.Query query = new DownloadManager.Query();
Cursor c = dm.query(query); Cursor c = dm.query(query);
if (c == null) {
// TODO: same as above.
return -1;
}
int columnUniqueDownloadId = c.getColumnIndex(DownloadManager.COLUMN_DESCRIPTION); int columnUniqueDownloadId = c.getColumnIndex(DownloadManager.COLUMN_DESCRIPTION);
int columnId = c.getColumnIndex(DownloadManager.COLUMN_ID); int columnId = c.getColumnIndex(DownloadManager.COLUMN_ID);

16
F-Droid/src/org/fdroid/fdroid/net/DownloaderFactory.java
View File

@ -1,6 +1,8 @@
package org.fdroid.fdroid.net; package org.fdroid.fdroid.net;
import android.app.DownloadManager;
import android.content.Context; import android.content.Context;
import android.database.Cursor;
import android.os.Build; import android.os.Build;
import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.Utils;
@ -75,7 +77,19 @@ public class DownloaderFactory {
} }
private static boolean hasDownloadManager(Context context) { private static boolean hasDownloadManager(Context context) {
return context.getSystemService(Context.DOWNLOAD_SERVICE) != null; DownloadManager dm = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
if (dm == null) {
// Service was not found
return false;
}
DownloadManager.Query query = new DownloadManager.Query();
Cursor c = dm.query(query);
if (c == null) {
// Download Manager was disabled
return false;
}
c.close();
return true;
} }
/** /**