mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Being paranoid -- what if model string is null?

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1227 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2010-03-01 11:46:21 +00:00
parent 508697a318
commit 1a12e1d03e
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
android/src/com/google/zxing/client/android/HelpActivity.java
View file

@ -93,14 +93,16 @@ public final class HelpActivity extends Activity {
private void checkBuggyDevice() { private void checkBuggyDevice() {
String model = Build.MODEL; String model = Build.MODEL;
Log.i(TAG, "Build model is " + model); Log.i(TAG, "Build model is " + model);
for (String buggyModelSubstring : BUGGY_MODEL_SUBSTRINGS) { if (model != null) {
if (model.contains(buggyModelSubstring)) { for (String buggyModelSubstring : BUGGY_MODEL_SUBSTRINGS) {
AlertDialog.Builder builder = new AlertDialog.Builder(this); if (model.contains(buggyModelSubstring)) {
builder.setMessage(R.string.msg_buggy); AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setPositiveButton(R.string.button_ok, groupsListener); builder.setMessage(R.string.msg_buggy);
builder.setNegativeButton(R.string.button_cancel, null); builder.setPositiveButton(R.string.button_ok, groupsListener);
builder.create().show(); builder.setNegativeButton(R.string.button_cancel, null);
break; builder.create().show();
break;
}
} }
} }
} }