Alawn/shadowsocks-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:shadowsocks/shadowsocks-android

Browse Source
This commit is contained in:
Max Lv
2013-01-08 21:21:35 +08:00
parent a5014a620b 26f8758404
commit e5ca4722f3
5 changed files with 100 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/github/shadowsocks/Shadowsocks.java
+5 -7
View File
@@ -176,12 +176,10 @@ public class Shadowsocks extends PreferenceActivity implements
isBypassAppsCheck = (CheckBoxPreference) findPreference("isBypassApps");
isRunningCheck = (CheckBoxPreference) findPreference("isRunning");
if (mProgressDialog == null)
if (mProgressDialog == null) {
mProgressDialog = ProgressDialog.show(this, "",
getString(R.string.initializing), true, true);
final SharedPreferences settings = PreferenceManager
.getDefaultSharedPreferences(this);
}
new Thread() {
@Override
@@ -197,14 +195,14 @@ public class Shadowsocks extends PreferenceActivity implements
versionName = "NONE";
}
if (!settings.getBoolean(versionName, false)) {
final SharedPreferences settings = PreferenceManager
.getDefaultSharedPreferences(Shadowsocks.this);
if (!settings.getBoolean(versionName, false)) {
Editor edit = settings.edit();
edit.putBoolean(versionName, true);
edit.commit();
reset();
}
handler.sendEmptyMessage(MSG_INITIAL_FINISH);