From b30fc715008a838815401d6bbb1035933a9abc3b Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Wed, 26 Jan 2011 23:22:43 +0000
Subject: [PATCH] Don't pre-check network state, just try and read. Gets rid of
 a nasty permission

---
 AndroidManifest.xml               |  1 -
 src/org/fdroid/fdroid/FDroid.java | 28 +++++++---------------------
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0a8c049be..89aff2e00 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -38,7 +38,6 @@
 	</application>
 
 	<uses-permission android:name="android.permission.INTERNET" />
-	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
 </manifest> 
diff --git a/src/org/fdroid/fdroid/FDroid.java b/src/org/fdroid/fdroid/FDroid.java
index d9cb73734..3385ce371 100644
--- a/src/org/fdroid/fdroid/FDroid.java
+++ b/src/org/fdroid/fdroid/FDroid.java
@@ -29,13 +29,10 @@ import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.app.TabActivity;
 import android.app.AlertDialog.Builder;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -352,28 +349,17 @@ public class FDroid extends TabActivity implements OnItemClickListener {
 
     }
 
-    public boolean updateRepos() {
+    private void updateRepos() {
         pd = ProgressDialog.show(this, getString(R.string.process_wait_title),
                 getString(R.string.process_update_msg), true);
         pd.setIcon(android.R.drawable.ic_dialog_info);
 
-        // Check for connection first!
-        ConnectivityManager netstate = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
-        if (netstate.getNetworkInfo(1).getState() == NetworkInfo.State.CONNECTED
-                || netstate.getNetworkInfo(0).getState() == NetworkInfo.State.CONNECTED) {
-            new Thread() {
-                public void run() {
-                    boolean success = RepoXMLHandler.doUpdates(FDroid.this, db);
-                    update_handler.sendEmptyMessage(success ? 0 : 1);
-                }
-            }.start();
-            return true;
-        } else {
-            pd.dismiss();
-            Toast.makeText(FDroid.this, getString(R.string.connection_error),
-                    Toast.LENGTH_LONG).show();
-            return false;
-        }
+        new Thread() {
+            public void run() {
+                boolean success = RepoXMLHandler.doUpdates(FDroid.this, db);
+                update_handler.sendEmptyMessage(success ? 0 : 1);
+            }
+        }.start();
     }
 
     /*