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 734382 - Don't show the list of activities if there is only one. r=blassey

Browse Source
This commit is contained in:
Mounir Lamouri 2012-03-14 19:35:47 +01:00
parent 3a65042252
commit cf3d9177fa
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
mobile/android/base/GeckoApp.java
View File

@ -2453,13 +2453,18 @@ abstract public class GeckoApp
}
}
private String mImageFilePath = "";
private SynchronousQueue<String> mFilePickerResult = new SynchronousQueue<String>();
public String showFilePicker(String aMimeType) {
private Intent getFilePickerIntent(String aMimeType) {
ArrayList<Intent> intents = new ArrayList<Intent>();
PromptService.PromptListItem[] items = getItemsAndIntentsForFilePicker(aMimeType, intents);
if (intents.size() == 0) {
Log.i(LOGTAG, "no activities for the file picker!");
return null;
}
if (intents.size() == 1)
return intents.get(0);
GeckoAppShell.getHandler().post(new FilePickerPromptRunnable(getFilePickerTitle(aMimeType), items));
String promptServiceResult = "";
@ -2467,7 +2472,7 @@ abstract public class GeckoApp
promptServiceResult = PromptService.waitForReturn();
} catch (InterruptedException e) {
Log.e(LOGTAG, "showing prompt failed: ", e);
return "";
return null;
}
int itemId = -1;
@ -2475,14 +2480,25 @@ abstract public class GeckoApp
itemId = new JSONObject(promptServiceResult).getInt("button");
if (itemId == -1) {
return "";
return null;
}
} catch (org.json.JSONException e) {
Log.e(LOGTAG, "result from promptservice was invalid: ", e);
return "";
return null;
}
Intent intent = intents.get(itemId);
return intents.get(itemId);
}
private String mImageFilePath = "";
private SynchronousQueue<String> mFilePickerResult = new SynchronousQueue<String>();
public String showFilePicker(String aMimeType) {
Intent intent = getFilePickerIntent(aMimeType);
if (intent == null) {
return "";
}
if (intent.getAction().equals(android.provider.MediaStore.ACTION_IMAGE_CAPTURE)) {
startActivityForResult(intent, CAMERA_IMAGE_CAPTURE_REQUEST);