diff options
| author | srowen <srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57> | 2011-05-30 23:19:03 +0400 |
|---|---|---|
| committer | srowen <srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57> | 2011-05-30 23:19:03 +0400 |
| commit | 2d286ac33fa58b4f3dfc4db36f36d82bf99987ea (patch) | |
| tree | 65825c6cbce9d8e9f37249704bb126966a7055de | |
| parent | b397d6d77dbdf76d89b627c72811a2153f443d79 (diff) | |
| download | zxing-android-embedded-2d286ac33fa58b4f3dfc4db36f36d82bf99987ea.tar.xz | |
Issue 851 NPE for invalid network type
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1804 59b500cc-1b3d-0410-9834-0bbf25fbcc57
| -rw-r--r-- | src/com/google/zxing/client/android/wifi/WifiActivity.java | 5 |
1 files 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 |