Skip to content

Commit bbb8cd2

Browse files
committed
Make EmbeddedBrowserActivity.onActivityResult() safer
1 parent 9d36b52 commit bbb8cd2

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

src/main/java/org/medicmobile/webapp/mobile/EmbeddedBrowserActivity.java

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -150,19 +150,22 @@ public void onReceiveValue(String result) {
150150
}
151151

152152
@Override protected void onActivityResult(int requestCode, int resultCode, Intent i) {
153-
trace(this, "onActivityResult() :: requestCode=%s, resultCode=%s", requestCode, resultCode);
154-
if((requestCode & NON_SIMPRINTS_FLAGS) == NON_SIMPRINTS_FLAGS) {
155-
switch(requestCode) {
156-
case GRAB_PHOTO:
157-
photoGrabber.process(requestCode, resultCode, i);
158-
return;
153+
try {
154+
trace(this, "onActivityResult() :: requestCode=%s, resultCode=%s", requestCode, resultCode);
155+
if((requestCode & NON_SIMPRINTS_FLAGS) == NON_SIMPRINTS_FLAGS) {
156+
switch(requestCode) {
157+
case GRAB_PHOTO:
158+
photoGrabber.process(requestCode, resultCode, i);
159+
return;
160+
}
161+
} else {
162+
String js = simprints.process(requestCode, i);
163+
trace(this, "Execing JS: %s", js);
164+
evaluateJavascript(js);
159165
}
160-
} else try {
161-
String js = simprints.process(requestCode, i);
162-
trace(this, "Execing JS: %s", js);
163-
evaluateJavascript(js);
164166
} catch(Exception ex) {
165-
warn(ex, "Unhandled intent %s (%s) with requestCode=%s & resultCode=%s", i, i == null ? null : i.getAction(), requestCode, resultCode);
167+
String action = i == null ? null : i.getAction();
168+
warn(ex, "Problem handling intent %s (%s) with requestCode=%s & resultCode=%s", i, action, requestCode, resultCode);
166169
}
167170
}
168171

0 commit comments

Comments
 (0)