From 2d286ac33fa58b4f3dfc4db36f36d82bf99987ea Mon Sep 17 00:00:00 2001 From: srowen Date: Mon, 30 May 2011 19:19:03 +0000 Subject: Issue 851 NPE for invalid network type git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1804 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- src/com/google/zxing/client/android/wifi/WifiActivity.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/com/google/zxing/client/android/wifi/WifiActivity.java b/src/com/google/zxing/client/android/wifi/WifiActivity.java index 56488098..0654d868 100644 --- a/src/com/google/zxing/client/android/wifi/WifiActivity.java +++ b/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 -- cgit v1.2.3