mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Upgrade before displaying, prevent synchronization issues

This commit is contained in:
M66B 2015-11-21 10:53:03 +01:00
parent 5a76b33489
commit c0e48b95aa
2 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/eu/faircode/netguard/ActivityMain.java
View File

@ -83,6 +83,10 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
running = true;
boolean enabled = prefs.getBoolean("enabled", false);
boolean initialized = prefs.getBoolean("initialized", false);
// Upgrade
Receiver.upgrade(initialized, this);
if (enabled)
SinkholeService.start(this);
@ -180,7 +184,6 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
registerReceiver(packageChangedReceiver, intentFilter);
// First use
boolean initialized = prefs.getBoolean("initialized", false);
if (!initialized) {
// Create view
LayoutInflater inflater = LayoutInflater.from(this);
@ -215,9 +218,6 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
dialogFirst.show();
}
// Upgrade
Receiver.upgrade(initialized, this);
// Fill application list
updateApplicationList();
}

64
app/src/main/java/eu/faircode/netguard/Receiver.java
View File

@ -62,42 +62,44 @@ public class Receiver extends BroadcastReceiver {
}
public static void upgrade(boolean initialized, Context context) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
int oldVersion = prefs.getInt("version", -1);
int newVersion = Util.getSelfVersionCode(context);
Log.i(TAG, "Upgrading from version " + oldVersion + " to " + newVersion);
synchronized (context.getApplicationContext()) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
int oldVersion = prefs.getInt("version", -1);
int newVersion = Util.getSelfVersionCode(context);
Log.i(TAG, "Upgrading from version " + oldVersion + " to " + newVersion);
SharedPreferences.Editor editor = prefs.edit();
if (initialized) {
if (oldVersion < 38) {
Log.i(TAG, "Converting screen wifi/mobile");
SharedPreferences.Editor edit = prefs.edit();
edit.putBoolean("screen_wifi", prefs.getBoolean("unused", false));
edit.putBoolean("screen_other", prefs.getBoolean("unused", false));
edit.remove("unused");
edit.apply();
SharedPreferences.Editor editor = prefs.edit();
if (initialized) {
if (oldVersion < 38) {
Log.i(TAG, "Converting screen wifi/mobile");
SharedPreferences.Editor edit = prefs.edit();
edit.putBoolean("screen_wifi", prefs.getBoolean("unused", false));
edit.putBoolean("screen_other", prefs.getBoolean("unused", false));
edit.remove("unused");
edit.apply();
SharedPreferences unused = context.getSharedPreferences("unused", Context.MODE_PRIVATE);
SharedPreferences screen_wifi = context.getSharedPreferences("screen_wifi", Context.MODE_PRIVATE);
SharedPreferences screen_other = context.getSharedPreferences("screen_other", Context.MODE_PRIVATE);
SharedPreferences unused = context.getSharedPreferences("unused", Context.MODE_PRIVATE);
SharedPreferences screen_wifi = context.getSharedPreferences("screen_wifi", Context.MODE_PRIVATE);
SharedPreferences screen_other = context.getSharedPreferences("screen_other", Context.MODE_PRIVATE);
Map<String, ?> punused = unused.getAll();
SharedPreferences.Editor edit_screen_wifi = screen_wifi.edit();
SharedPreferences.Editor edit_screen_other = screen_other.edit();
for (String key : punused.keySet()) {
edit_screen_wifi.putBoolean(key, (Boolean) punused.get(key));
edit_screen_other.putBoolean(key, (Boolean) punused.get(key));
Map<String, ?> punused = unused.getAll();
SharedPreferences.Editor edit_screen_wifi = screen_wifi.edit();
SharedPreferences.Editor edit_screen_other = screen_other.edit();
for (String key : punused.keySet()) {
edit_screen_wifi.putBoolean(key, (Boolean) punused.get(key));
edit_screen_other.putBoolean(key, (Boolean) punused.get(key));
}
edit_screen_wifi.apply();
edit_screen_other.apply();
// TODO: delete unused
}
edit_screen_wifi.apply();
edit_screen_other.apply();
// TODO: delete unused
} else {
editor.putBoolean("whitelist_wifi", false);
editor.putBoolean("whitelist_other", false);
}
} else {
editor.putBoolean("whitelist_wifi", false);
editor.putBoolean("whitelist_other", false);
editor.putInt("version", newVersion);
editor.apply();
}
editor.putInt("version", newVersion);
editor.apply();
}
}