Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-23 16:19:54 +01:00
Code Issues Projects Releases Wiki Activity

Use SwitchPreferenceCompat for panic preferences

Browse Source 
Addresses #1991
This commit is contained in:
Torsten Grote
2021-03-26 13:52:50 -03:00
parent 6ed95e145e
commit 371d49a213
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
briar-android/src/main/java/org/briarproject/briar/android/panic/PanicPreferencesFragment.java
View File

@@ -20,7 +20,7 @@ import javax.annotation.Nullable;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.preference.ListPreference; import androidx.preference.ListPreference;
import androidx.preference.PreferenceFragmentCompat; import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.SwitchPreference; import androidx.preference.SwitchPreferenceCompat;
import info.guardianproject.panic.PanicResponder; import info.guardianproject.panic.PanicResponder;
import static android.app.Activity.RESULT_CANCELED; import static android.app.Activity.RESULT_CANCELED;
@@ -40,7 +40,7 @@ public class PanicPreferencesFragment extends PreferenceFragmentCompat
Logger.getLogger(PanicPreferencesFragment.class.getName()); Logger.getLogger(PanicPreferencesFragment.class.getName());
private PackageManager pm; private PackageManager pm;
private SwitchPreference lockPref, purgePref; private SwitchPreferenceCompat lockPref, purgePref;
private ListPreference panicAppPref; private ListPreference panicAppPref;
@Override @Override
@@ -51,9 +51,9 @@ public class PanicPreferencesFragment extends PreferenceFragmentCompat
private void updatePreferences() { private void updatePreferences() {
pm = getActivity().getPackageManager(); pm = getActivity().getPackageManager();
lockPref = (SwitchPreference) findPreference(KEY_LOCK); lockPref = (SwitchPreferenceCompat) findPreference(KEY_LOCK);
panicAppPref = (ListPreference) findPreference(KEY_PANIC_APP); panicAppPref = (ListPreference) findPreference(KEY_PANIC_APP);
purgePref = (SwitchPreference) findPreference(KEY_PURGE); purgePref = (SwitchPreferenceCompat) findPreference(KEY_PURGE);
// check for connect/disconnect intents from panic trigger apps // check for connect/disconnect intents from panic trigger apps
if (PanicResponder.checkForDisconnectIntent(getActivity())) { if (PanicResponder.checkForDisconnectIntent(getActivity())) {

15
briar-android/src/main/res/xml/panic_preferences.xml
View File

@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<SwitchPreference <SwitchPreferenceCompat
android:defaultValue="true" android:defaultValue="true"
android:key="pref_key_lock" android:key="pref_key_lock"
android:summary="@string/panic_setting_signout_summary" android:summary="@string/panic_setting_signout_summary"
android:title="@string/panic_setting_signout_title" android:title="@string/panic_setting_signout_title"
app:iconSpaceReserved="false"/> app:iconSpaceReserved="false"
app:singleLineTitle="false" />
<PreferenceCategory <PreferenceCategory
android:layout="@layout/preferences_category" android:layout="@layout/preferences_category"
@@ -18,15 +18,16 @@
android:icon="@android:drawable/ic_menu_close_clear_cancel" android:icon="@android:drawable/ic_menu_close_clear_cancel"
android:key="pref_key_panic_app" android:key="pref_key_panic_app"
android:summary="@string/panic_app_setting_summary" android:summary="@string/panic_app_setting_summary"
android:title="@string/panic_app_setting_title"/> android:title="@string/panic_app_setting_title" />
<SwitchPreference <SwitchPreferenceCompat
android:defaultValue="false" android:defaultValue="false"
android:enabled="false" android:enabled="false"
android:key="pref_key_purge" android:key="pref_key_purge"
android:summary="@string/purge_setting_summary" android:summary="@string/purge_setting_summary"
android:title="@string/purge_setting_title" android:title="@string/purge_setting_title"
app:iconSpaceReserved="false"/> app:iconSpaceReserved="false"
app:singleLineTitle="false" />
</PreferenceCategory> </PreferenceCategory>