From 9b176a1a5f0153af305315d146bc6d0f913f11aa Mon Sep 17 00:00:00 2001
From: srowen <srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Mon, 30 May 2011 19:19:03 +0000
Subject: [PATCH] Issue 851 NPE for invalid network type

git-svn-id: https://zxing.googlecode.com/svn/trunk@1804 59b500cc-1b3d-0410-9834-0bbf25fbcc57
---
 .../com/google/zxing/client/android/wifi/WifiActivity.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/android/src/com/google/zxing/client/android/wifi/WifiActivity.java b/android/src/com/google/zxing/client/android/wifi/WifiActivity.java
index 56488098b..0654d8680 100644
--- a/android/src/com/google/zxing/client/android/wifi/WifiActivity.java
+++ b/android/src/com/google/zxing/client/android/wifi/WifiActivity.java
@@ -216,10 +216,9 @@ public final class WifiActivity extends Activity  {
     } else if ("WEP".equals(networkType)) {
       networkT = NetworkType.NETWORK_WEP;
     } else if ("nopass".equals(networkType)) {
-     networkT = NetworkType.NETWORK_NOPASS;
+      networkT = NetworkType.NETWORK_NOPASS;
     } else {
-      doError(R.string.wifi_type_incorrect);
-      return;
+      networkT = NetworkType.NETWORK_INVALID;
     }
 
     // This is not available before onCreate