remove access_network_state permission requirement

open-keychain · Sep 14, 2014 · eb770ac · eb770ac
1 parent a0033d4
commit eb770ac
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 30 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -31,8 +31,9 @@
         android:minSdkVersion="8"
         android:targetSdkVersion="19" />
 
-    <application
-        android:allowBackup="false" >
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <application android:allowBackup="false" >
         <activity
             android:name="edu.cmu.cylab.starslinger.exchange.ExchangeActivity"
             android:label="@string/lib_name"

diff --git a/README.md b/README.md
@@ -40,7 +40,6 @@ Add Secure Exchange to your Android App
 Modify your `AndroidManifest.xml` to include required permissions.
 
 	...
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
 	...
 

diff --git a/src/edu/cmu/cylab/starslinger/exchange/WebEngine.java b/src/edu/cmu/cylab/starslinger/exchange/WebEngine.java
@@ -41,9 +41,6 @@
 import org.apache.http.params.HttpParams;
 import org.apache.http.params.HttpProtocolParams;
 
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
 import android.os.SystemClock;
 import android.text.TextUtils;
 import android.util.Log;
@@ -62,37 +59,13 @@ public class WebEngine extends ConnectionEngine {
     private String mUrlSuffix = ExchangeConfig.HTTPURL_SUFFIX;
     private HttpClient mHttpClient;
 
-    private ConnectivityManager mConnectivityManager;
-
     public void setHost(String host) {
         mHost = host;
     }
 
-    public boolean isOnline() {
-        if (mCtx != null) {
-            boolean connected = false;
-            if (mConnectivityManager == null) {
-                mConnectivityManager = (ConnectivityManager) mCtx
-                        .getSystemService(Context.CONNECTIVITY_SERVICE);
-            }
-
-            NetworkInfo networkInfo = mConnectivityManager.getActiveNetworkInfo();
-            connected = networkInfo != null && networkInfo.isAvailable()
-                    && networkInfo.isConnected();
-            return connected;
-        } else {
-            return true;
-        }
-    }
-
     private byte[] doPost(String uri, byte[] requestBody) throws ExchangeException {
         mCancelable = false;
 
-        if (!isOnline()) {
-            throw new ExchangeException(
-                    mCtx.getString(R.string.error_CorrectYourInternetConnection));
-        }
-
         // sets up parameters
         HttpParams params = new BasicHttpParams();
         HttpProtocolParams.setVersion(params, HttpVersion.HTTP_1_1);
@@ -123,13 +96,15 @@ private byte[] doPost(String uri, byte[] requestBody) throws ExchangeException {
         } catch (HttpResponseException e) {
             // this subclass of java.io.IOException contains useful data for
             // users, do not swallow, handle properly
+            e.printStackTrace();
             statCode = e.getStatusCode();
             statMsg = e.getLocalizedMessage();
             error = (String.format(mCtx.getString(R.string.error_HttpCode), statCode) + ", \'"
                     + statMsg + "\'");
         } catch (java.io.IOException e) {
             // just show a simple Internet connection error, so as not to
             // confuse users
+            e.printStackTrace();
             error = mCtx.getString(R.string.error_CorrectYourInternetConnection);
         } catch (RuntimeException e) {
             error = e.getLocalizedMessage() + " (" + e.getClass().getSimpleName() + ")";