corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 773393 - Make the ActivityHandlerHelper a static member of GeckoAppShell. r=mfinkle

Browse Source
This commit is contained in:
Kartikaya Gupta
2012-07-13 14:08:19 -04:00
parent 9d1521274e
commit 2f32c1f3ff
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -128,6 +128,8 @@ public class GeckoAppShell
public static GfxInfoThread sGfxInfoThread = null;
static ActivityHandlerHelper sActivityHelper = new ActivityHandlerHelper();
/* The Android-side API: API methods that Android calls */
// Initialization methods
@@ -1370,13 +1372,11 @@ public class GeckoAppShell
}
public static String showFilePickerForExtensions(String aExtensions) {
return GeckoApp.mAppContext.mActivityHelper.showFilePicker(
GeckoApp.mAppContext, getMimeTypeFromExtensions(aExtensions));
return sActivityHelper.showFilePicker(GeckoApp.mAppContext, getMimeTypeFromExtensions(aExtensions));
}
public static String showFilePickerForMimeType(String aMimeType) {
return GeckoApp.mAppContext.mActivityHelper.showFilePicker(
GeckoApp.mAppContext, aMimeType);
return sActivityHelper.showFilePicker(GeckoApp.mAppContext, aMimeType);
}
public static void performHapticFeedback(boolean aIsLongPress) {
@@ -2289,8 +2289,7 @@ public class GeckoAppShell
/* Called by JNI from AndroidBridge */
public static void showFilePickerAsync(String aMimeType, long id) {
if (!GeckoApp.mAppContext.mActivityHelper.showFilePicker(
GeckoApp.mAppContext, aMimeType, new AsyncResultHandler(id))) {
if (!sActivityHelper.showFilePicker(GeckoApp.mAppContext, aMimeType, new AsyncResultHandler(id))) {
GeckoAppShell.notifyFilePickerResult("", id);
}
}