[SCM] Multi-format 1D/2D barcode image processing library branch, upstream, updated. 24d4480bc48cf9eabf7b2bd2f528248b0e458809
vikrama
vikrama at 59b500cc-1b3d-0410-9834-0bbf25fbcc57
Wed Aug 4 01:32:15 UTC 2010
The following commit has been merged in the upstream branch:
commit 7b5a00af552036223d41b7a32851e2e0a26f2499
Author: vikrama <vikrama at 59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Thu Jun 17 04:33:59 2010 +0000
Add the nopass handling in the Android client.
TODO:
1. Document the encoding.
2. Test out the interaction with appspot.com with escaped semicolons and colons
git-svn-id: http://zxing.googlecode.com/svn/trunk@1440 59b500cc-1b3d-0410-9834-0bbf25fbcc57
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 82f43a3..344e3fd 100644
--- a/android/src/com/google/zxing/client/android/wifi/WifiActivity.java
+++ b/android/src/com/google/zxing/client/android/wifi/WifiActivity.java
@@ -45,12 +45,14 @@ public class WifiActivity extends Activity {
private ConnectedReceiver connectedReceiver;
public enum NetworkType {
- NETWORK_WEP, NETWORK_WPA,
+ NETWORK_WEP, NETWORK_WPA, NETWORK_NOPASS,
}
private int changeNetwork(NetworkSetting setting) {
// If the password is empty, this is an unencrypted network
- if (setting.getPassword() == null || setting.getPassword().length() == 0) {
+ if (setting.getPassword() == null || setting.getPassword().length() == 0 ||
+ setting.getNetworkType() == null ||
+ setting.getNetworkType() == NetworkType.NETWORK_NOPASS) {
return changeNetworkUnEncrypted(setting);
}
if (setting.getNetworkType() == NetworkType.NETWORK_WPA) {
@@ -157,6 +159,8 @@ public class WifiActivity extends Activity {
networkT = NetworkType.NETWORK_WPA;
} else if (networkType.contains("WEP")) {
networkT = NetworkType.NETWORK_WEP;
+ } else if (networkType.contains("nopass")) {
+ networkT = NetworkType.NETWORK_NOPASS;
} else {
// Got an incorrect network type
finish();
--
Multi-format 1D/2D barcode image processing library
More information about the Pkg-google-commits
mailing list