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

Refactor and add real shard payload to return shard activity and view model

Browse Source
This commit is contained in:
ameba23
2021-04-16 12:00:40 +02:00
parent f4d667f50a
commit 708262c512
19 changed files with 135 additions and 1354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -675,13 +675,13 @@
<!-- recovery from the secret owner's POV -->
<string name="recovery_explainer">You need to meet your trusted contacts in-person to receive pieces by scanning QR codes</string>
<string name="recovery_explainer">You need to meet your trusted contacts in-person to receive pieces</string>
<string name="recovery_begin">Begin</string>
<string name="recovery_failed_to_receive">Failed to receive backup piece</string>
<string name="recovery_helpful_suggestions">Please check that bluetooth is swtiched on and that no-one but your trusted contact is able to scan the QR code</string>
<string name="recovery_retry">Retry</string>
<string name="recovery_recovered_shards">Recovered backup pieces:</string>
<string name="recovery_scan_qr_code">Scan QR code</string>
<string name="recovery_scan_qr_code">Show QR code</string>
<string name="recovery_recovering_account">Recovering account…</string>
<string name="recovery_shard_received">Account backup piece received</string>
<string name="recovery_account_recovered">Account recovered</string>

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

@@ -96,7 +96,7 @@
app:iconSpaceReserved="false">
<intent
android:targetClass="org.briarproject.briar.android.socialbackup.recover.CustodianReturnShardActivity"
android:targetClass="org.briarproject.briar.android.socialbackup.DistributedBackupActivity"
android:targetPackage="@string/app_package" />
</Preference>