From: srowen <srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Mon, 1 Mar 2010 11:46:21 +0000 (+0000)
Subject: Being paranoid -- what if model string is null?
X-Git-Url: http://git.rot13.org/?p=zxing.git;a=commitdiff_plain;h=561e8abf469f9f017be78bf3da6a284c9e34eb0d

Being paranoid -- what if model string is null?

git-svn-id: http://zxing.googlecode.com/svn/trunk@1227 59b500cc-1b3d-0410-9834-0bbf25fbcc57
---

diff --git a/android/src/com/google/zxing/client/android/HelpActivity.java b/android/src/com/google/zxing/client/android/HelpActivity.java
index 443c12e5..612a0dfa 100644
--- a/android/src/com/google/zxing/client/android/HelpActivity.java
+++ b/android/src/com/google/zxing/client/android/HelpActivity.java
@@ -93,14 +93,16 @@ public final class HelpActivity extends Activity {
   private void checkBuggyDevice() {
     String model = Build.MODEL;
     Log.i(TAG, "Build model is " + model);
-    for (String buggyModelSubstring : BUGGY_MODEL_SUBSTRINGS) {
-      if (model.contains(buggyModelSubstring)) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setMessage(R.string.msg_buggy);
-        builder.setPositiveButton(R.string.button_ok, groupsListener);
-        builder.setNegativeButton(R.string.button_cancel, null);
-        builder.create().show();
-        break;
+    if (model != null) {
+      for (String buggyModelSubstring : BUGGY_MODEL_SUBSTRINGS) {
+        if (model.contains(buggyModelSubstring)) {
+          AlertDialog.Builder builder = new AlertDialog.Builder(this);
+          builder.setMessage(R.string.msg_buggy);
+          builder.setPositiveButton(R.string.button_ok, groupsListener);
+          builder.setNegativeButton(R.string.button_cancel, null);
+          builder.create().show();
+          break;
+        }
       }
     }
   }