From 1b80c24ce6679f065b202a66316b8574405c0426 Mon Sep 17 00:00:00 2001
From: vikrama <vikrama@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Thu, 8 Jul 2010 05:12:51 +0000
Subject: [PATCH] Removed some commented code, and general code cleanup. 
 Turned many variables into finals.  Change the UI to display network name and
 type more clearly.

git-svn-id: http://zxing.googlecode.com/svn/trunk@1469 59b500cc-1b3d-0410-9834-0bbf25fbcc57
---
 android/AndroidManifest.xml                         | 13 ++++---------
 android/res/values-ar/strings.xml                   |  2 ++
 android/res/values-cs/strings.xml                   |  2 ++
 android/res/values-da/strings.xml                   |  2 ++
 android/res/values-de/strings.xml                   |  2 ++
 android/res/values-es/strings.xml                   |  2 ++
 android/res/values-fi/strings.xml                   |  2 ++
 android/res/values-fr/strings.xml                   |  2 ++
 android/res/values-hu/strings.xml                   |  2 ++
 android/res/values-it/strings.xml                   |  2 ++
 android/res/values-ja-rJP/strings.xml               |  2 ++
 android/res/values-nl/strings.xml                   |  2 ++
 android/res/values-pl/strings.xml                   |  2 ++
 android/res/values-pt/strings.xml                   |  2 ++
 android/res/values-ru/strings.xml                   |  2 ++
 android/res/values-sv/strings.xml                   |  2 ++
 android/res/values-zh-rCN/strings.xml               |  2 ++
 android/res/values-zh-rTW/strings.xml               |  2 ++
 android/res/values/strings.xml                      |  2 ++
 .../client/android/result/WifiResultHandler.java    |  8 ++++++--
 .../client/android/wifi/ConnectedReceiver.java      |  4 ++--
 .../zxing/client/android/wifi/NetworkUtil.java      |  8 ++++----
 .../zxing/client/android/wifi/WifiActivity.java     | 10 ++++------
 23 files changed, 56 insertions(+), 23 deletions(-)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index e1ba0db0..e6d04ae4 100755
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -100,11 +100,6 @@ versionName is 2.31, 2.4, or 3.0. -->
               android:label="@string/wa_name"
               android:screenOrientation="landscape"
               android:configChanges="orientation|keyboardHidden">
-<!--Do not broadcast this intent-->
-<!--      <intent-filter>-->
-<!--        <action android:name="com.google.zxing.client.android.WIFI_CONNECT"/>-->
-<!--        <category android:name="android.intent.category.DEFAULT"/>-->
-<!--      </intent-filter>-->
     </activity>
     <activity android:name=".share.ShareActivity"
               android:label="@string/share_name"
@@ -146,9 +141,9 @@ versionName is 2.31, 2.4, or 3.0. -->
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
   <!-- Wifi related  -->
-  <uses-permission android:name="android.permission.WRITE_SETTINGS"></uses-permission>
-  <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"></uses-permission>
-  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"></uses-permission>
-  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
+  <uses-permission android:name="android.permission.WRITE_SETTINGS" />
+  <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
 </manifest>
diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index 282b0703..ef8a716c 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -127,5 +127,7 @@
   <string name="wifi_modifying_network">تعديل شبكة</string>
   <string name="wifi_ssid_missing">اسم الشبكة مفقود</string>
   <string name="wifi_type_incorrect">شبكة نوع غير صحيح</string>
+  <string name="wifi_ssid_label">اسم الشبكة</string>
+  <string name="wifi_type_label">نوع</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index ebad2d1f..0c332747 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -127,5 +127,7 @@
   <string name="wifi_modifying_network">Úprava sítě</string>
   <string name="wifi_ssid_missing">Název sítě chybí</string>
   <string name="wifi_type_incorrect">Typ sítě nesprávné</string>
+  <string name="wifi_ssid_label">Jméno sítě</string>
+  <string name="wifi_type_label">Typ</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml
index 4fd447c3..2d0084e2 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -127,5 +127,7 @@
   <string name="wifi_modifying_network">Ændring Network</string>
   <string name="wifi_ssid_missing">Netværk navn mangler</string>
   <string name="wifi_type_incorrect">Netværk type forkert</string>
+  <string name="wifi_ssid_label">Netværksnavn</string>
+  <string name="wifi_type_label">Type</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index 5611682c..2b81626a 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -128,4 +128,6 @@
   <string name="wifi_modifying_network">Ändern Network</string>
   <string name="wifi_ssid_missing">Netzwerk-Name fehlt</string>
   <string name="wifi_type_incorrect">Netzwerk-Typ nicht korrekt</string>
+  <string name="wifi_ssid_label">Network Name</string>
+  <string name="wifi_type_label">Typ</string>
 </resources>
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index 4e2124d7..0de8733a 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -127,5 +127,7 @@
   <string name="wifi_modifying_network">Modificación de la Red</string>
   <string name="wifi_ssid_missing">Nombre de la red desaparecidas</string>
   <string name="wifi_type_incorrect">Red de tipo incorrecto</string>
+  <string name="wifi_ssid_label">Nombre de red</string>
+  <string name="wifi_type_label">Tipo</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml
index 7cdde77d..5a0a5333 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -127,5 +127,7 @@
   <string name="wifi_modifying_network">Muuttaminen Verkko</string>
   <string name="wifi_ssid_missing">Verkon nimi puuttuu</string>
   <string name="wifi_type_incorrect">Verkon tyyppi virheellinen</string>
+  <string name="wifi_ssid_label">Verkon nimi</string>
+  <string name="wifi_type_label">Tyyppi</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index 1f0ebfe1..4c1da33c 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -127,5 +127,7 @@
   <string name="wifi_modifying_network">Modification du réseau</string>
   <string name="wifi_ssid_missing">Le nom du réseau disparus</string>
   <string name="wifi_type_incorrect">Réseau de type incorrect</string>
+  <string name="wifi_ssid_label">Nom du réseau</string>
+  <string name="wifi_type_label">Type</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index 98da3260..a9168cd7 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -127,5 +127,7 @@
   <string name="wifi_modifying_network">Módosítása Hálózat</string>
   <string name="wifi_ssid_missing">A hálózat neve hiányzik</string>
   <string name="wifi_type_incorrect">Hálózati típusú hibás</string>
+  <string name="wifi_ssid_label">Hálózat neve</string>
+  <string name="wifi_type_label">Típusú</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index 3ed38c74..8a86d585 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -127,5 +127,7 @@
   <string name="wifi_modifying_network">Modifica della rete</string>
   <string name="wifi_ssid_missing">Nome della rete mancante</string>
   <string name="wifi_type_incorrect">Tipo di rete non corretto</string>
+  <string name="wifi_ssid_label">Nome di rete</string>
+  <string name="wifi_type_label">Tipo</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-ja-rJP/strings.xml b/android/res/values-ja-rJP/strings.xml
index 822b4be5..cabc6cdf 100644
--- a/android/res/values-ja-rJP/strings.xml
+++ b/android/res/values-ja-rJP/strings.xml
@@ -127,5 +127,7 @@
   <string name="wifi_modifying_network">ネットワークを変更する</string>
   <string name="wifi_ssid_missing">ネットワーク名を欠いて</string>
   <string name="wifi_type_incorrect">ネットワーク型不正</string>
+  <string name="wifi_ssid_label">ネットワーク名</string>
+  <string name="wifi_type_label">タイプ</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index 541f6666..4064592d 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -127,5 +127,7 @@
   <string name="wifi_modifying_network">Het wijzigen van Netwerk</string>
   <string name="wifi_ssid_missing">Netwerk naam ontbreekt</string>
   <string name="wifi_type_incorrect">Netwerk soort onjuiste</string>
+  <string name="wifi_ssid_label">Network Name</string>
+  <string name="wifi_type_label">Type</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index fe86873d..36fcb57d 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -127,5 +127,7 @@
   <string name="wifi_modifying_network">Modyfikowanie sieci</string>
   <string name="wifi_ssid_missing">Nazwa sieci brakuje</string>
   <string name="wifi_type_incorrect">Typ sieci nieprawidłowe</string>
+  <string name="wifi_ssid_label">Nazwa sieci</string>
+  <string name="wifi_type_label">Typ</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index 50737218..2729d576 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -127,5 +127,7 @@
   <string name="wifi_modifying_network">Modificando Rede</string>
   <string name="wifi_ssid_missing">Nome da rede em falta</string>
   <string name="wifi_type_incorrect">Rede de tipo incorreto</string>
+  <string name="wifi_ssid_label">Nome da Rede</string>
+  <string name="wifi_type_label">Tipo</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 67f2e2df..85045e57 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -127,5 +127,7 @@
   <string name="wifi_modifying_network">Изменение сети</string>
   <string name="wifi_ssid_missing">Сеть отсутствует имя</string>
   <string name="wifi_type_incorrect">Тип сети неправильный</string>
+  <string name="wifi_ssid_label">Имя сети</string>
+  <string name="wifi_type_label">Тип</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml
index 2cbd6292..8437c6df 100644
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@@ -127,5 +127,7 @@
   <string name="wifi_modifying_network">Modifiera nätverk</string>
   <string name="wifi_ssid_missing">Nätverksnamn saknas</string>
   <string name="wifi_type_incorrect">Nätverkstyp felaktig</string>
+  <string name="wifi_ssid_label">Nätverksnamn</string>
+  <string name="wifi_type_label">Typ</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-zh-rCN/strings.xml b/android/res/values-zh-rCN/strings.xml
index 95be73aa..ece2f946 100644
--- a/android/res/values-zh-rCN/strings.xml
+++ b/android/res/values-zh-rCN/strings.xml
@@ -127,5 +127,7 @@
   <string name="wifi_modifying_network">修改网络</string>
   <string name="wifi_ssid_missing">网络实名失踪</string>
   <string name="wifi_type_incorrect">网络类型不正确</string>
+  <string name="wifi_ssid_label">网络名称</string>
+  <string name="wifi_type_label">类型</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index d6e62475..2f41725f 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -127,5 +127,7 @@
   <string name="wifi_modifying_network">修改網絡</string>
   <string name="wifi_ssid_missing">網絡實名失踪</string>
   <string name="wifi_type_incorrect">網絡類型不正確</string>
+  <string name="wifi_ssid_label">網絡名稱</string>
+  <string name="wifi_type_label">類型</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index f19f8dcf..b2538f70 100755
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -127,5 +127,7 @@
   <string name="wifi_modifying_network">Modifying Network</string>
   <string name="wifi_ssid_missing">Network name missing</string>
   <string name="wifi_type_incorrect">Network type incorrect</string>
+  <string name="wifi_ssid_label">Network Name</string>
+  <string name="wifi_type_label">Type</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/src/com/google/zxing/client/android/result/WifiResultHandler.java b/android/src/com/google/zxing/client/android/result/WifiResultHandler.java
index 2ef26c26..fa5b7cab 100644
--- a/android/src/com/google/zxing/client/android/result/WifiResultHandler.java
+++ b/android/src/com/google/zxing/client/android/result/WifiResultHandler.java
@@ -28,9 +28,11 @@ import com.google.zxing.client.result.WifiParsedResult;
  * @author viki@google.com (Vikram Aggarwal)
  */
 public final class WifiResultHandler extends ResultHandler {
+  final Activity parent;
 
   public WifiResultHandler(Activity activity, ParsedResult result) {
     super(activity, result);
+    parent = activity;
   }
 
   @Override
@@ -61,8 +63,10 @@ public final class WifiResultHandler extends ResultHandler {
   public CharSequence getDisplayContents() {
     WifiParsedResult wifiResult = (WifiParsedResult) getResult();
     StringBuffer contents = new StringBuffer();
-    ParsedResult.maybeAppend(wifiResult.getSsid(), contents);
-    ParsedResult.maybeAppend(wifiResult.getNetworkEncryption(), contents);
+    final String wifiLabel = parent.getString(R.string.wifi_ssid_label);
+    ParsedResult.maybeAppend(wifiLabel + "\n" + wifiResult.getSsid(), contents);
+    final String typeLabel = parent.getString(R.string.wifi_type_label);
+    ParsedResult.maybeAppend(typeLabel + "\n" + wifiResult.getNetworkEncryption(), contents);
     return contents.toString();
   }
 
diff --git a/android/src/com/google/zxing/client/android/wifi/ConnectedReceiver.java b/android/src/com/google/zxing/client/android/wifi/ConnectedReceiver.java
index 167bb27f..c34fa917 100644
--- a/android/src/com/google/zxing/client/android/wifi/ConnectedReceiver.java
+++ b/android/src/com/google/zxing/client/android/wifi/ConnectedReceiver.java
@@ -35,7 +35,7 @@ final class ConnectedReceiver extends BroadcastReceiver {
   private final TextView statusView;
 
   ConnectedReceiver(Activity wifiActivity, TextView statusView) {
-    parent = wifiActivity;
+    this.parent = wifiActivity;
     this.statusView = statusView;
   }
 
@@ -43,7 +43,7 @@ final class ConnectedReceiver extends BroadcastReceiver {
   public void onReceive(Context context, Intent intent) {
     if (intent.getAction().equals(android.net.ConnectivityManager.CONNECTIVITY_ACTION)) {
       ConnectivityManager con = (ConnectivityManager) parent.getSystemService(Context.CONNECTIVITY_SERVICE);
-      NetworkInfo[] s = con.getAllNetworkInfo();
+      final NetworkInfo[] s = con.getAllNetworkInfo();
       for (NetworkInfo i : s){
         if (i.getTypeName().contentEquals("WIFI")){
           NetworkInfo.State state = i.getState();
diff --git a/android/src/com/google/zxing/client/android/wifi/NetworkUtil.java b/android/src/com/google/zxing/client/android/wifi/NetworkUtil.java
index b3740c89..4cc5c848 100644
--- a/android/src/com/google/zxing/client/android/wifi/NetworkUtil.java
+++ b/android/src/com/google/zxing/client/android/wifi/NetworkUtil.java
@@ -43,7 +43,7 @@ final class NetworkUtil {
     if (TextUtils.isEmpty(string)) {
       return "";
     }
-    int lastPos = string.length() - 1;
+    final int lastPos = string.length() - 1;
     if (lastPos < 0 || (string.charAt(0) == '"' && string.charAt(lastPos) == '"')) {
       return string;
     }
@@ -55,7 +55,7 @@ final class NetworkUtil {
       return false;
     }
     for (int i = key.length() - 1; i >= 0; i--) {
-      char c = key.charAt(i);
+      final char c = key.charAt(i);
       if (!(c >= '0' && c <= '9' || c >= 'A' && c <= 'F' || c >= 'a' && c <= 'f')) {
         return false;
       }
@@ -72,9 +72,9 @@ final class NetworkUtil {
     if (wepKey == null) {
       return false;
     }
-    int len = wepKey.length();
+    final int length = wepKey.length();
     // WEP-40, WEP-104, and some vendors using 256-bit WEP (WEP-232?)
-    return (len == 10 || len == 26 || len == 58) && isHex(wepKey);
+    return (length == 10 || length == 26 || length == 58) && isHex(wepKey);
   }
 
 }
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 bdeeb4c3..391dd662 100644
--- a/android/src/com/google/zxing/client/android/wifi/WifiActivity.java
+++ b/android/src/com/google/zxing/client/android/wifi/WifiActivity.java
@@ -52,8 +52,6 @@ public class WifiActivity extends Activity  {
   }
 
   private int changeNetwork(NetworkSetting setting) {
-    // All the ways this can be wrong:
-
     // If the SSID is empty, throw an error and return
     if (setting.getSsid() == null || setting.getSsid().length() == 0) {
       return doError(R.string.wifi_ssid_missing);
@@ -159,7 +157,7 @@ public class WifiActivity extends Activity  {
    * @param ssid
    */
   private WifiConfiguration findNetworkInExistingConfig(String ssid){
-    List <WifiConfiguration> existingConfigs = wifiManager.getConfiguredNetworks();
+    final List <WifiConfiguration> existingConfigs = wifiManager.getConfiguredNetworks();
     for (WifiConfiguration existingConfig : existingConfigs) {
       if (existingConfig.SSID.equals(ssid)) {
         return existingConfig;
@@ -172,15 +170,15 @@ public class WifiActivity extends Activity  {
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
 
-    Intent intent = getIntent();
+    final Intent intent = getIntent();
     if (intent == null || (!intent.getAction().equals(Intents.WifiConnect.ACTION))) {
       finish();
       return;
     }
 
-    String ssid = intent.getStringExtra(Intents.WifiConnect.SSID);
+    final String ssid = intent.getStringExtra(Intents.WifiConnect.SSID);
     String password = intent.getStringExtra(Intents.WifiConnect.PASSWORD);
-    String networkType = intent.getStringExtra(Intents.WifiConnect.TYPE);
+    final String networkType = intent.getStringExtra(Intents.WifiConnect.TYPE);
     setContentView(R.layout.network);
     statusView = (TextView) findViewById(R.id.networkStatus);
 
-- 
2.20.1