Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't pre-check network state, just try and read. Gets rid of a nasty permission

Browse Source
This commit is contained in:
Ciaran Gultnieks 2011-01-26 23:22:43 +00:00
parent 4be4b8ddaa
commit b30fc71500
2 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AndroidManifest.xml
View File

@ -38,7 +38,6 @@
</application> </application>
<uses-permission android:name="android.permission.INTERNET" /> <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" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
</manifest> </manifest>

16
src/org/fdroid/fdroid/FDroid.java
View File

@ -29,13 +29,10 @@ import android.app.AlertDialog;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.app.TabActivity; import android.app.TabActivity;
import android.app.AlertDialog.Builder; import android.app.AlertDialog.Builder;
import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; 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), pd = ProgressDialog.show(this, getString(R.string.process_wait_title),
getString(R.string.process_update_msg), true); getString(R.string.process_update_msg), true);
pd.setIcon(android.R.drawable.ic_dialog_info); 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() { new Thread() {
public void run() { public void run() {
boolean success = RepoXMLHandler.doUpdates(FDroid.this, db); boolean success = RepoXMLHandler.doUpdates(FDroid.this, db);
update_handler.sendEmptyMessage(success ? 0 : 1); update_handler.sendEmptyMessage(success ? 0 : 1);
} }
}.start(); }.start();
return true;
} else {
pd.dismiss();
Toast.makeText(FDroid.this, getString(R.string.connection_error),
Toast.LENGTH_LONG).show();
return false;
}
} }
/* /*