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

Downloader: Don't use DownloadManager if null

Browse Source 
If getSystemService(Context.DOWNLOAD_SERVICE) returns null, we should not go
ahead with using AsyncDownloaderFromAndroid. This would result in NPE and
crashes.

Fixes #442.
This commit is contained in:
Daniel Martí 2015-10-12 13:02:03 +02:00
parent 52e9e79fad
commit ed978ba785
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,12 +3,16 @@ package org.fdroid.fdroid.net;
import android.content.Context; import android.content.Context;
import android.os.Build; import android.os.Build;
import org.fdroid.fdroid.Utils;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.URL;
public class DownloaderFactory { public class DownloaderFactory {
private static final String TAG = "DownloaderFactory";
/** /**
* Downloads to a temporary file, which *you must delete yourself when * Downloads to a temporary file, which *you must delete yourself when
* you are done. It is stored in {@link Context#getCacheDir()} and starts * you are done. It is stored in {@link Context#getCacheDir()} and starts
@ -58,9 +62,11 @@ public class DownloaderFactory {
public static AsyncDownloader createAsync(Context context, URL url, File destFile, String title, String id, AsyncDownloader.Listener listener) public static AsyncDownloader createAsync(Context context, URL url, File destFile, String title, String id, AsyncDownloader.Listener listener)
throws IOException { throws IOException {
if (canUseDownloadManager(url)) { if (canUseDownloadManager(context, url)) {
Utils.debugLog(TAG, "Using AsyncDownloaderFromAndroid");
return new AsyncDownloaderFromAndroid(context, listener, title, id, url.toString(), destFile); return new AsyncDownloaderFromAndroid(context, listener, title, id, url.toString(), destFile);
} }
Utils.debugLog(TAG, "Using AsyncDownloadWrapper");
return new AsyncDownloadWrapper(create(context, url, destFile), listener); return new AsyncDownloadWrapper(create(context, url, destFile), listener);
} }
@ -68,15 +74,25 @@ public class DownloaderFactory {
return url.getHost().endsWith(".onion"); return url.getHost().endsWith(".onion");
} }
private static boolean hasDownloadManager(Context context) {
return context.getSystemService(Context.DOWNLOAD_SERVICE) != null;
}
/** /**
* Tests to see if we can use Android's DownloadManager to download the APK, instead of * Tests to see if we can use Android's DownloadManager to download the APK, instead of
* a downloader returned from DownloadFactory. * a downloader returned from DownloadFactory.
*
* We require ICE_CREAM_SANDWICH (4.0). The DownloadManager does exist on
* 2.3.X, but it lacks HTTPS support.
*/ */
private static boolean canUseDownloadManager(URL url) { private static boolean canUseDownloadManager(Context context, URL url) {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH && !isOnionAddress(url); if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
// No HTTPS support on 2.3, no DownloadManager on 2.2. Don't have
// 3.0 devices to test on, so require 4.0.
return false;
}
if (isOnionAddress(url)) {
// We support onion addresses through our own downloader.
return false;
}
return hasDownloadManager(context);
} }
} }