wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1070099 - "apk file downloaded in Firefox cannot be opened from Android download manager" [r=margaret.leibovic]

Browse Source
This commit is contained in:
Wes Johnston 2014-09-29 14:31:00 -07:00
parent 47119791d1
commit d04312842e
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mobile/android/base/GeckoAppShell.java
View File

@ -139,7 +139,12 @@ public class GeckoAppShell
private static final Queue<GeckoEvent> PENDING_EVENTS = new ConcurrentLinkedQueue<GeckoEvent>();
private static final Map<String, String> ALERT_COOKIES = new ConcurrentHashMap<String, String>();
private static final String DEFAULT_MIME_TYPE = "application/octet-stream";
@SuppressWarnings("serial")
private static final List<String> UNKNOWN_MIME_TYPES = new ArrayList<String>(3) {{
add("application/octet-stream"); // This will be used as a default mime type for unknown files
add("application/unknown");
add("application/octet-stream"); // Github uses this for APK files
}};
private static volatile boolean locationHighAccuracyEnabled;
@ -1802,18 +1807,29 @@ public class GeckoAppShell
@WrapElementForJNI
public static void scanMedia(final String aFile, String aMimeType) {
String mimeType = aMimeType;
if (UNKNOWN_MIME_TYPES.contains(mimeType)) {
// If this is a generic undefined mimetype, erase it so that we can try to determine
// one from the file extension below.
mimeType = "";
}
// If the platform didn't give us a mimetype, try to guess one from the filename
if (TextUtils.isEmpty(aMimeType)) {
if (TextUtils.isEmpty(mimeType)) {
int extPosition = aFile.lastIndexOf(".");
if (extPosition > 0 && extPosition < aFile.length() - 1) {
aMimeType = getMimeTypeFromExtension(aFile.substring(extPosition+1));
mimeType = getMimeTypeFromExtension(aFile.substring(extPosition+1));
}
}
// addCompletedDownload will throw if it received any null parameters. Use a default mimeType if
// we still don't have one.
if (TextUtils.isEmpty(aMimeType)) {
aMimeType = DEFAULT_MIME_TYPE;
// addCompletedDownload will throw if it received any null parameters. Use aMimeType or a default
// if we still don't have one.
if (TextUtils.isEmpty(mimeType)) {
if (TextUtils.isEmpty(aMimeType)) {
mimeType = UNKNOWN_MIME_TYPES.get(0);
} else {
mimeType = aMimeType;
}
}
if (AppConstants.ANDROID_DOWNLOADS_INTEGRATION) {