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

Address first round of review feedback for mailbox pairing UI

Browse Source
This commit is contained in:
Torsten Grote
2022-02-21 14:01:32 -03:00
parent a567301e49
commit 4390c810d1
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
briar-android/src/main/java/org/briarproject/briar/android/mailbox/ErrorFragment.java
View File

@@ -56,6 +56,7 @@ public class ErrorFragment extends FinalFragment {
@Nullable ViewGroup container,
@Nullable Bundle savedInstanceState) {
View v = super.onCreateView(inflater, container, savedInstanceState);
// Do not hijack back button events, but let the activity process them
onBackPressedCallback.remove();
buttonView.setText(R.string.try_again_button);
buttonView.setOnClickListener(view -> {

3
briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxStatusFragment.java
View File

@@ -61,7 +61,8 @@ public class MailboxStatusFragment extends Fragment {
long lastSuccess = state.mailboxStatus.getTimeOfLastSuccess();
String lastConnectionText;
if (lastSuccess < 0) {
lastConnectionText = getString(R.string.pref_lock_timeout_never);
lastConnectionText =
getString(R.string.mailbox_status_connected_never);
} else {
lastConnectionText = formatDate(requireContext(), lastSuccess);
}