Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-15 04:18:53 +01:00
Code Issues Projects Releases Wiki Activity

Remove non-functional uninstall panic action

Browse Source 
Fixes #1109
This commit is contained in:
Torsten Grote
2018-09-27 18:33:45 -03:00
parent de8d1b7d96
commit bd983d9796
4 changed files with 20 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
briar-android/src/main/res/values/strings.xml
View File

@@ -398,6 +398,7 @@
<string name="panic_app_setting_none">None</string>
<string name="dialog_title_connect_panic_app">Confirm Panic App</string>
<string name="dialog_message_connect_panic_app">Are you sure that you want to allow %1$s to trigger destructive panic button actions?</string>
<string name="panic_setting_destructive_action">Destructive Actions</string>
<string name="panic_setting_signout_title">Sign Out</string>
<string name="panic_setting_signout_summary">Sign out of Briar if a panic button is pressed</string>
<string name="purge_setting_title">Delete Account</string>

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

@@ -2,30 +2,29 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android">
<ListPreference
android:icon="@android:drawable/ic_menu_close_clear_cancel"
android:key="pref_key_panic_app"
android:summary="@string/panic_app_setting_summary"
android:title="@string/panic_app_setting_title"/>
<SwitchPreference
android:defaultValue="true"
android:key="pref_key_lock"
android:summary="@string/panic_setting_signout_summary"
android:title="@string/panic_setting_signout_title"/>
<SwitchPreference
android:defaultValue="false"
android:enabled="false"
android:key="pref_key_purge"
android:summary="@string/purge_setting_summary"
android:title="@string/purge_setting_title"/>
<PreferenceCategory
android:layout="@layout/preferences_category"
android:title="@string/panic_setting_destructive_action">
<SwitchPreference
android:defaultValue="false"
android:enabled="false"
android:key="pref_key_uninstall"
android:summary="@string/uninstall_setting_summary"
android:title="@string/uninstall_setting_title"/>
<ListPreference
android:icon="@android:drawable/ic_menu_close_clear_cancel"
android:key="pref_key_panic_app"
android:summary="@string/panic_app_setting_summary"
android:title="@string/panic_app_setting_title"/>
<SwitchPreference
android:defaultValue="false"
android:enabled="false"
android:key="pref_key_purge"
android:summary="@string/purge_setting_summary"
android:title="@string/purge_setting_title"/>
</PreferenceCategory>
</PreferenceScreen>