Merge pull request #21 from vileda/master

fixed barcode scanner crash bug
fNordeingang · Oct 22, 2011 · ad35759 · ad35759
2 parents 6eff03c + c609059
commit ad35759
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/org/fNordeingang/fNordeingangActivity.java b/src/org/fNordeingang/fNordeingangActivity.java
@@ -74,12 +74,12 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     Log.w("requestCode: ", Integer.toString(requestCode));
     Log.w("resultCode: ", Integer.toString(resultCode));
     if(requestCode == IntentIntegrator.REQUEST_CODE) {
-      IntentResult result = IntentIntegrator.parseActivityResult(requestCode, resultCode, data);
-      Log.w("code: ", result.getContents());
-      Log.w("format: ", result.getFormat());
       try {
+        IntentResult result = IntentIntegrator.parseActivityResult(requestCode, resultCode, data);
+        Log.w("code: ", result.getContents());
+        Log.w("format: ", result.getFormat());
         articleDialog((new ServiceClient()).getArticleInfo(result.getContents()).getJSONObject("eanArticle").getString("detailname"));
-      } catch(JSONException e) {
+      } catch(Throwable e) {
         e.printStackTrace();
       }
     }