Guard against a few rare errors from Play logs

zxing · Nov 2, 2017 · 7eae23f · 7eae23f
1 parent 49d90b6
commit 7eae23f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/android/src/com/google/zxing/client/android/CaptureActivityHandler.java b/android/src/com/google/zxing/client/android/CaptureActivityHandler.java
@@ -122,13 +122,15 @@ public void handleMessage(Message message) {
         }
 
         // Needed for default Android browser / Chrome only apparently
-        switch (browserPackageName) {
+        if (browserPackageName != null) {
-          case "com.android.browser":
+          switch (browserPackageName) {
-          case "com.android.chrome":
+            case "com.android.browser":
-            intent.setPackage(browserPackageName);
+            case "com.android.chrome":
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+              intent.setPackage(browserPackageName);
-            intent.putExtra(Browser.EXTRA_APPLICATION_ID, browserPackageName);
+              intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            break;
+              intent.putExtra(Browser.EXTRA_APPLICATION_ID, browserPackageName);
+              break;
+          }
         }
 
         try {

diff --git a/android/src/com/google/zxing/client/android/result/ResultHandler.java b/android/src/com/google/zxing/client/android/result/ResultHandler.java
@@ -201,7 +201,7 @@ final void addContact(String[] names,
     // Only use the first name in the array, if present.
     Intent intent = new Intent(Intent.ACTION_INSERT_OR_EDIT, ContactsContract.Contacts.CONTENT_URI);
     intent.setType(ContactsContract.Contacts.CONTENT_ITEM_TYPE);
-    putExtra(intent, ContactsContract.Intents.Insert.NAME, names != null ? names[0] : null);
+    putExtra(intent, ContactsContract.Intents.Insert.NAME, names != null && names.length > 0 ? names[0] : null);
 
     putExtra(intent, ContactsContract.Intents.Insert.PHONETIC_NAME, pronunciation);
 
@@ -270,7 +270,7 @@ final void addContact(String[] names,
     if (note != null) {
       aggregatedNotes.append('\n').append(note);
     }
-    if (geo != null) {
+    if (geo != null && geo.length >= 2) {
       aggregatedNotes.append('\n').append(geo[0]).append(',').append(geo[1]);
     }
 

diff --git a/core/src/main/java/com/google/zxing/client/result/VCardResultParser.java b/core/src/main/java/com/google/zxing/client/result/VCardResultParser.java
@@ -196,7 +196,11 @@ static List<List<String>> matchVCardPrefixedField(CharSequence prefix,
         if ("uri".equals(valueType)) {
           // Don't actually support dereferencing URIs, but use scheme-specific part not URI
           // as value, to support tel: and mailto:
-          element = URI.create(element).getSchemeSpecificPart();
+          try {
+            element = URI.create(element).getSchemeSpecificPart();
+          } catch (IllegalArgumentException iae) {
+            // ignore
+          }
         }
         if (metadata == null) {
           List<String> match = new ArrayList<>(1);