Make EmbeddedBrowserActivity.onActivityResult() safer

medic · Dec 11, 2017 · bbb8cd2 · bbb8cd2
1 parent 9d36b52
commit bbb8cd2
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/src/main/java/org/medicmobile/webapp/mobile/EmbeddedBrowserActivity.java b/src/main/java/org/medicmobile/webapp/mobile/EmbeddedBrowserActivity.java
@@ -150,19 +150,22 @@ public void onReceiveValue(String result) {
 	}
 
 	@Override protected void onActivityResult(int requestCode, int resultCode, Intent i) {
-		trace(this, "onActivityResult() :: requestCode=%s, resultCode=%s", requestCode, resultCode);
-		if((requestCode & NON_SIMPRINTS_FLAGS) == NON_SIMPRINTS_FLAGS) {
-			switch(requestCode) {
-				case GRAB_PHOTO:
-					photoGrabber.process(requestCode, resultCode, i);
-					return;
+		try {
+			trace(this, "onActivityResult() :: requestCode=%s, resultCode=%s", requestCode, resultCode);
+			if((requestCode & NON_SIMPRINTS_FLAGS) == NON_SIMPRINTS_FLAGS) {
+				switch(requestCode) {
+					case GRAB_PHOTO:
+						photoGrabber.process(requestCode, resultCode, i);
+						return;
+				}
+			} else {
+				String js = simprints.process(requestCode, i);
+				trace(this, "Execing JS: %s", js);
+				evaluateJavascript(js);
 			}
-		} else try {
-			String js = simprints.process(requestCode, i);
-			trace(this, "Execing JS: %s", js);
-			evaluateJavascript(js);
 		} catch(Exception ex) {
-			warn(ex, "Unhandled intent %s (%s) with requestCode=%s & resultCode=%s", i, i == null ? null : i.getAction(), requestCode, resultCode);
+			String action = i == null ? null : i.getAction();
+			warn(ex, "Problem handling intent %s (%s) with requestCode=%s & resultCode=%s", i, action, requestCode, resultCode);
 		}
 	}