Fix main UI refresh when clearing all XPrivacy data

M66B · Aug 29, 2014 · 79bc42e · 79bc42e
1 parent 0be314d
commit 79bc42e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/biz/bokhorst/xprivacy/ActivityMain.java b/src/biz/bokhorst/xprivacy/ActivityMain.java
@@ -101,6 +101,7 @@ public class ActivityMain extends ActivityBase implements OnItemSelectedListener
 	private static final int ERROR_NON_MATCHING_UID = 0x103;
 
 	public static final Uri cProUri = Uri.parse("http://www.xprivacy.eu/");
+	public static final String cRefreshUI = "RefreshUI";
 
 	private static ExecutorService mExecutor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors(),
 			new PriorityThreadFactory());
@@ -360,6 +361,12 @@ protected void onNewIntent(Intent intent) {
 
 		if (Intent.ACTION_VIEW.equals(intent.getAction()))
 			Util.importProLicense(new File(intent.getData().getPath()));
+
+		// Handle clear XPrivacy data (needs UI refresh)
+		if (intent.hasExtra(cRefreshUI)) {
+			((EditText) findViewById(R.id.etFilter)).setText("");
+			recreate();
+		}
 	}
 
 	@Override

diff --git a/src/biz/bokhorst/xprivacy/ActivitySettings.java b/src/biz/bokhorst/xprivacy/ActivitySettings.java
@@ -521,11 +521,14 @@ private void clearDB() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						PrivacyManager.clear();
-						((EditText) ActivitySettings.this.findViewById(R.id.etFilter)).setText("");
-						recreate();
 						Toast.makeText(ActivitySettings.this, getString(R.string.msg_reboot), Toast.LENGTH_LONG)
 								.show();
 						finish();
+
+						// Refresh main UI
+						Intent intent = new Intent(ActivitySettings.this, ActivityMain.class);
+						intent.putExtra(ActivityMain.cRefreshUI, true);
+						startActivity(intent);
 					}
 				});
 		alertDialogBuilder.setNegativeButton(getString(android.R.string.cancel),