From e3b2d8bd48f77b45860cca422001e79471b4ffe9 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 8 Nov 2015 13:05:55 +0100 Subject: [PATCH] Refresh UI after import --- app/src/main/java/eu/faircode/netguard/ActivityMain.java | 3 ++- .../main/java/eu/faircode/netguard/ActivitySettings.java | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/netguard/ActivityMain.java b/app/src/main/java/eu/faircode/netguard/ActivityMain.java index 72397554..b2c2772d 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivityMain.java +++ b/app/src/main/java/eu/faircode/netguard/ActivityMain.java @@ -352,7 +352,8 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences } else if ("whitelist_wifi".equals(name) || "whitelist_other".equals(name) || "whitelist_roaming".equals(name) || - "manage_system".equals(name)) + "manage_system".equals(name) || + "imported".equals(name)) updateApplicationList(); else if ("dark_theme".equals(name)) diff --git a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java index ae643188..151ca045 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java +++ b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java @@ -253,12 +253,17 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere Map settings = prefs.getAll(); for (String key : settings.keySet()) { Object value = settings.get(key); + + if ("imported".equals(key)) + continue; + if (value instanceof Boolean) { serializer.startTag(null, "setting"); serializer.attribute(null, "key", key); serializer.attribute(null, "type", "boolean"); serializer.attribute(null, "value", value.toString()); serializer.endTag(null, "setting"); + } else Log.e(TAG, "Unknown key=" + key); } @@ -279,6 +284,9 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere xmlImport(handler.mobile, getSharedPreferences("other", Context.MODE_PRIVATE)); xmlImport(handler.unused, getSharedPreferences("unused", Context.MODE_PRIVATE)); xmlImport(handler.roaming, getSharedPreferences("roaming", Context.MODE_PRIVATE)); + + // Refresh UI + prefs.edit().putBoolean("imported", true).apply(); } private void xmlImport(Map settings, SharedPreferences prefs) {