From bd983d9796de6a7a9bc5e2233bd2665f309097c3 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Thu, 27 Sep 2018 18:33:45 -0300 Subject: [PATCH] Remove non-functional uninstall panic action Fixes #1109 --- .../panic/PanicPreferencesFragment.java | 20 +---------- .../android/panic/PanicResponderActivity.java | 14 +------- briar-android/src/main/res/values/strings.xml | 1 + .../src/main/res/xml/panic_preferences.xml | 35 +++++++++---------- 4 files changed, 20 insertions(+), 50 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicPreferencesFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicPreferencesFragment.java index 1927f177b..c9ffb2861 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicPreferencesFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicPreferencesFragment.java @@ -31,13 +31,12 @@ public class PanicPreferencesFragment extends PreferenceFragmentCompat public static final String KEY_LOCK = "pref_key_lock"; public static final String KEY_PANIC_APP = "pref_key_panic_app"; public static final String KEY_PURGE = "pref_key_purge"; - public static final String KEY_UNINSTALL = "pref_key_uninstall"; private static final Logger LOG = Logger.getLogger(PanicPreferencesFragment.class.getName()); private PackageManager pm; - private SwitchPreference lockPref, purgePref, uninstallPref; + private SwitchPreference lockPref, purgePref; private ListPreference panicAppPref; @Override @@ -49,7 +48,6 @@ public class PanicPreferencesFragment extends PreferenceFragmentCompat lockPref = (SwitchPreference) findPreference(KEY_LOCK); panicAppPref = (ListPreference) findPreference(KEY_PANIC_APP); purgePref = (SwitchPreference) findPreference(KEY_PURGE); - uninstallPref = (SwitchPreference) findPreference(KEY_UNINSTALL); // check for connect/disconnect intents from panic trigger apps if (PanicResponder.checkForDisconnectIntent(getActivity())) { @@ -99,12 +97,9 @@ public class PanicPreferencesFragment extends PreferenceFragmentCompat if (packageName.equals(Panic.PACKAGE_NAME_NONE)) { purgePref.setChecked(false); purgePref.setEnabled(false); - uninstallPref.setChecked(false); - uninstallPref.setEnabled(false); getActivity().setResult(Activity.RESULT_CANCELED); } else { purgePref.setEnabled(true); - uninstallPref.setEnabled(true); } return true; @@ -148,22 +143,11 @@ public class PanicPreferencesFragment extends PreferenceFragmentCompat if (sharedPreferences.getBoolean(KEY_PURGE, false)) { lockPref.setChecked(true); } - // disable uninstall if purging gets disabled - else { - uninstallPref.setChecked(false); - } - } - // enable purging and locking if uninstall gets enabled - if (key.equals(KEY_UNINSTALL) && - sharedPreferences.getBoolean(KEY_UNINSTALL, false)) { - lockPref.setChecked(true); - purgePref.setChecked(true); } // disable purging and uninstalling if locking gets disabled if (key.equals(KEY_LOCK) && !sharedPreferences.getBoolean(KEY_LOCK, true)) { purgePref.setChecked(false); - uninstallPref.setChecked(false); } } @@ -179,7 +163,6 @@ public class PanicPreferencesFragment extends PreferenceFragmentCompat // disable destructive panic actions purgePref.setEnabled(false); - uninstallPref.setEnabled(false); } else { // display connected panic app try { @@ -191,7 +174,6 @@ public class PanicPreferencesFragment extends PreferenceFragmentCompat // enable destructive panic actions purgePref.setEnabled(true); - uninstallPref.setEnabled(true); } catch (PackageManager.NameNotFoundException e) { // revert back to no app, just to be safe PanicResponder.setTriggerPackageName(getActivity(), diff --git a/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicResponderActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicResponderActivity.java index 52ac773f2..2e7319575 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicResponderActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicResponderActivity.java @@ -2,7 +2,6 @@ package org.briarproject.briar.android.panic; import android.content.Intent; import android.content.SharedPreferences; -import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.support.v7.preference.PreferenceManager; @@ -21,10 +20,8 @@ import info.guardianproject.panic.Panic; import info.guardianproject.panic.PanicResponder; import info.guardianproject.trustedintents.TrustedIntents; -import static android.content.Intent.ACTION_DELETE; import static org.briarproject.briar.android.panic.PanicPreferencesFragment.KEY_LOCK; import static org.briarproject.briar.android.panic.PanicPreferencesFragment.KEY_PURGE; -import static org.briarproject.briar.android.panic.PanicPreferencesFragment.KEY_UNINSTALL; public class PanicResponderActivity extends BriarActivity { @@ -59,16 +56,7 @@ public class PanicResponderActivity extends BriarActivity { LOG.info("Panic Trigger came from connected app"); // Performing panic responses - if (sharedPref.getBoolean(KEY_UNINSTALL, false)) { - LOG.info("Purging all data..."); - deleteAllData(); - - LOG.info("Uninstalling..."); - Intent uninstall = new Intent(ACTION_DELETE); - uninstall.setData( - Uri.parse("package:" + getPackageName())); - startActivity(uninstall); - } else if (sharedPref.getBoolean(KEY_PURGE, false)) { + if (sharedPref.getBoolean(KEY_PURGE, false)) { LOG.info("Purging all data..."); deleteAllData(); } diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml index 0bf72a38e..2a63f683f 100644 --- a/briar-android/src/main/res/values/strings.xml +++ b/briar-android/src/main/res/values/strings.xml @@ -398,6 +398,7 @@ None Confirm Panic App Are you sure that you want to allow %1$s to trigger destructive panic button actions? + Destructive Actions Sign Out Sign out of Briar if a panic button is pressed Delete Account diff --git a/briar-android/src/main/res/xml/panic_preferences.xml b/briar-android/src/main/res/xml/panic_preferences.xml index 024bd6a72..b19d36545 100644 --- a/briar-android/src/main/res/xml/panic_preferences.xml +++ b/briar-android/src/main/res/xml/panic_preferences.xml @@ -2,30 +2,29 @@ - - - + - + + + + + -- GitLab