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

Merge branch '2354-show-confirmation-toast-after-unlinking' into 'master'

Browse Source 
Show confirmation toast after unlinking mailbox

Closes #2354

See merge request briar/briar!1703
This commit is contained in:
Torsten Grote
2022-08-17 17:01:33 +00:00
parent 2c295fb096 617a6db84c
commit 7aafbdd715
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxActivity.java
View File

@@ -3,6 +3,7 @@ package org.briarproject.briar.android.mailbox;
import android.os.Bundle;
import android.view.MenuItem;
import android.widget.ProgressBar;
import android.widget.Toast;
import org.briarproject.bramble.api.mailbox.MailboxPairingState;
import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
@@ -23,6 +24,7 @@ import androidx.lifecycle.ViewModelProvider;
import static android.view.View.INVISIBLE;
import static android.view.View.VISIBLE;
import static android.widget.Toast.LENGTH_LONG;
import static org.briarproject.briar.android.util.UiUtils.showFragment;
@MethodsNotNullByDefault
@@ -215,6 +217,8 @@ public class MailboxActivity extends BriarActivity {
dialog -> supportFinishAfterTransition());
builder.show();
} else {
Toast.makeText(this, R.string.mailbox_status_unlink_success,
LENGTH_LONG).show();
supportFinishAfterTransition();
}
}

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

@@ -665,6 +665,7 @@
<string name="mailbox_status_unlink_dialog_warning">If you unlink your Mailbox, you won\'t be able to receive messages while Briar is offline.</string>
<string name="mailbox_status_unlink_no_wipe_title">Your Mailbox has been unlinked</string>
<string name="mailbox_status_unlink_no_wipe_message">Next time you have access to your Mailbox device, please open the Mailbox app and tap the \"Unlink\" button to complete the process.\n\nIf you no longer have access to your Mailbox device, don\'t worry. Your data is encrypted so it will remain secure even if you don\'t complete the process.</string>
<string name="mailbox_status_unlink_success">Your Mailbox has been unlinked</string>
<string name="mailbox_error_notification_channel_title">Briar Mailbox problem</string>
<string name="mailbox_error_notification_title">Briar Mailbox is unavailable</string>