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

Bug 752905 - Move the Prompt:Show handler out of handleGeckoMessage. r=margaret

Browse Source
This commit is contained in:
Kartikaya Gupta
2012-06-13 17:12:15 -04:00
parent 60eff89c12
commit d3d020b9e7
3 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mobile/android/base/PromptService.java
View File

@@ -41,7 +41,7 @@ import org.json.JSONArray;
import org.json.JSONObject;
import android.text.InputType;
public class PromptService implements OnClickListener, OnCancelListener, OnItemClickListener {
public class PromptService implements OnClickListener, OnCancelListener, OnItemClickListener, GeckoEventResponder {
private static final String LOGTAG = "GeckoPromptService";
private PromptInput[] mInputs;
@@ -81,6 +81,8 @@ public class PromptService implements OnClickListener, OnCancelListener, OnItemC
mIconSize = (int)TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
ICON_SIZE,
res.getDisplayMetrics());
GeckoAppShell.registerGeckoEventListener("Prompt:Show", this);
}
private class PromptButton {
@@ -172,6 +174,28 @@ public class PromptService implements OnClickListener, OnCancelListener, OnItemC
}
}
// GeckoEventListener implementation
public void handleMessage(String event, final JSONObject message) {
GeckoAppShell.getHandler().post(new Runnable() {
public void run() {
processMessage(message);
}
});
}
// GeckoEventResponder implementation
public String getResponse() {
// we only handle one kind of message in handleMessage, and this is the
// response we provide for that message
String promptServiceResult = "";
try {
promptServiceResult = waitForReturn();
} catch (InterruptedException e) {
Log.i(LOGTAG, "showing prompt ", e);
}
return promptServiceResult;
}
public void Show(String aTitle, String aText, PromptButton[] aButtons, PromptListItem[] aMenuList, boolean aMultipleSelection) {
AlertDialog.Builder builder = new AlertDialog.Builder(GeckoApp.mAppContext);
if (!aTitle.equals("")) {
@@ -318,7 +342,7 @@ public class PromptService implements OnClickListener, OnCancelListener, OnItemC
} catch(Exception ex) { }
}
public void processMessage(JSONObject geckoObject) {
private void processMessage(JSONObject geckoObject) {
String title = "";
try {
title = geckoObject.getString("title");