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

Add RemoteWipeSetupActivity to manifest and settings menu

Browse Source
This commit is contained in:
ameba23
2021-05-14 12:49:37 +02:00
parent f2f70fa110
commit f0d42e0d4f
3 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
briar-android/src/main/AndroidManifest.xml
View File

@@ -472,6 +472,15 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity
android:name="org.briarproject.briar.android.remotewipe.RemoteWipeSetupActivity"
android:label="@string/activity_name_remote_wipe"
android:parentActivityName="org.briarproject.briar.android.settings.SettingsActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="org.briarproject.briar.android.settings.SettingsActivity" />
</activity>
<activity <activity
android:name="org.briarproject.briar.android.logout.ExitActivity" android:name="org.briarproject.briar.android.logout.ExitActivity"
android:theme="@android:style/Theme.NoDisplay" /> android:theme="@android:style/Theme.NoDisplay" />

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

@@ -732,11 +732,16 @@
<!-- Remote Wipe --> <!-- Remote Wipe -->
<!-- settings menu -->
<string name="pref_remote_wipe_summary">Allow trusted contacts to activate an account wipe remotely</string>
<string name="pref_remote_wipe_title">Remote Wipe</string>
<!-- titles for the app bar --> <!-- titles for the app bar -->
<string name="title_select_wipers">Select Trusted Contacts</string> <string name="title_select_wipers">Select Trusted Contacts</string>
<!-- conversation --> <!-- conversation -->
<string name="remote_wipe_setup_received">You have been added a remote wiper.</string> <string name="remote_wipe_setup_received">You have been added a remote wiper.</string>
<string name="remote_wipe_setup_sent">You have added this contact as a remote wiper.</string> <string name="remote_wipe_setup_sent">You have added this contact as a remote wiper.</string>
<string name="activity_name_remote_wipe">Remote Wipe</string>
</resources> </resources>

11
briar-android/src/main/res/xml/settings.xml
View File

@@ -101,6 +101,17 @@
</Preference> </Preference>
<Preference
android:summary="@string/pref_remote_wipe_summary"
android:title="@string/pref_remote_wipe_title"
app:iconSpaceReserved="false">
<intent
android:targetClass="org.briarproject.briar.android.remotewipe.RemoteWipeSetupActivity"
android:targetPackage="@string/app_package" />
</Preference>
<SwitchPreference <SwitchPreference
android:enabled="false" android:enabled="false"
android:key="pref_key_lock" android:key="pref_key_lock"