From 3edf7a57cc6643bba566ff6c1545685b53af705d Mon Sep 17 00:00:00 2001
From: srowen <srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Wed, 17 Oct 2012 07:59:12 +0000
Subject: [PATCH] Bandages for misc. exceptions seen in the wild

git-svn-id: https://zxing.googlecode.com/svn/trunk@2459 59b500cc-1b3d-0410-9834-0bbf25fbcc57
---
 .../com/google/zxing/client/android/HttpHelper.java | 12 +++++++++++-
 .../client/android/wifi/WifiConfigManager.java      | 13 ++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/android/src/com/google/zxing/client/android/HttpHelper.java b/android/src/com/google/zxing/client/android/HttpHelper.java
index d23cb59c8..047608e89 100644
--- a/android/src/com/google/zxing/client/android/HttpHelper.java
+++ b/android/src/com/google/zxing/client/android/HttpHelper.java
@@ -156,6 +156,8 @@ public final class HttpHelper {
           in.close();
         } catch (IOException ioe) {
           // continue
+        } catch (NullPointerException npe) {
+          // another apparent Android / Harmony bug; continue
         }
       }
     }
@@ -189,7 +191,15 @@ public final class HttpHelper {
         Log.w(TAG, "Bad URI? " + uri);
         throw new IOException(iae);
       }
-      switch (connection.getResponseCode()) {
+      int responseCode;
+      try {
+        responseCode = connection.getResponseCode();
+      } catch (NullPointerException npe) {
+        // this is maybe this Android bug: http://code.google.com/p/android/issues/detail?id=15554
+        Log.w(TAG, "Bad URI? " + uri);
+        throw new IOException(npe);
+      }
+      switch (responseCode) {
         case HttpURLConnection.HTTP_MULT_CHOICE:
         case HttpURLConnection.HTTP_MOVED_PERM:
         case HttpURLConnection.HTTP_MOVED_TEMP:
diff --git a/android/src/com/google/zxing/client/android/wifi/WifiConfigManager.java b/android/src/com/google/zxing/client/android/wifi/WifiConfigManager.java
index 8cf20302c..76eba19f6 100644
--- a/android/src/com/google/zxing/client/android/wifi/WifiConfigManager.java
+++ b/android/src/com/google/zxing/client/android/wifi/WifiConfigManager.java
@@ -82,13 +82,12 @@ public final class WifiConfigManager extends AsyncTask<WifiParsedResult,Object,O
       changeNetworkUnEncrypted(wifiManager, theWifiResult);
     } else {
       String password = theWifiResult.getPassword();
-      if (password == null || password.length() == 0) {
-        throw new IllegalArgumentException();
-      }
-      if (networkType == NetworkType.WEP) {
-        changeNetworkWEP(wifiManager, theWifiResult);
-      } else if (networkType == NetworkType.WPA) {
-        changeNetworkWPA(wifiManager, theWifiResult);
+      if (password != null && password.length() != 0) {
+        if (networkType == NetworkType.WEP) {
+          changeNetworkWEP(wifiManager, theWifiResult);
+        } else if (networkType == NetworkType.WPA) {
+          changeNetworkWPA(wifiManager, theWifiResult);
+        }
       }
     }
     return null;