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

Improve MailboxStatusFragment and record check failures as well

Browse Source
This commit is contained in:
Torsten Grote
2022-04-18 10:16:38 -03:00
parent 174ca3cfb8
commit dea05c85a2
4 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxManagerImpl.java
View File

@@ -103,22 +103,32 @@ class MailboxManagerImpl implements MailboxManager {
MailboxProperties props = db.transactionWithNullableResult(true, MailboxProperties props = db.transactionWithNullableResult(true,
mailboxSettingsManager::getOwnMailboxProperties); mailboxSettingsManager::getOwnMailboxProperties);
success = api.checkStatus(props); success = api.checkStatus(props);
} catch (DbException | IOException | MailboxApi.ApiException e) { } catch (DbException e) {
logException(LOG, WARNING, e);
// we don't treat this is a failure to record
return false;
} catch (IOException | MailboxApi.ApiException e) {
// we record this as a failure
success = false; success = false;
logException(LOG, WARNING, e); logException(LOG, WARNING, e);
} }
if (success) { try {
try { recordCheckResult(success);
// we are only recording successful connections here } catch (DbException e) {
// as those update the UI and failures might be false negatives logException(LOG, WARNING, e);
db.transaction(false, txn ->
mailboxSettingsManager.recordSuccessfulConnection(txn,
clock.currentTimeMillis()));
} catch (DbException e) {
logException(LOG, WARNING, e);
}
} }
return success; return success;
} }
private void recordCheckResult(boolean success) throws DbException {
long now = clock.currentTimeMillis();
db.transaction(false, txn -> {
if (success) {
mailboxSettingsManager.recordSuccessfulConnection(txn, now);
} else {
mailboxSettingsManager.recordFailedConnectionAttempt(txn, now);
}
});
}
} }

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

@@ -100,7 +100,7 @@ public class MailboxStatusFragment extends Fragment {
.observe(getViewLifecycleOwner(), this::onMailboxStateChanged); .observe(getViewLifecycleOwner(), this::onMailboxStateChanged);
// TODO // TODO
// * detect problems and show them #2175 // * Implement UI for warning user when mailbox is unreachable #2175
// * add "Unlink" button confirmation dialog and functionality #2173 // * add "Unlink" button confirmation dialog and functionality #2173
Button unlinkButton = v.findViewById(R.id.unlinkButton); Button unlinkButton = v.findViewById(R.id.unlinkButton);
unlinkButton.setOnClickListener(view -> Toast.makeText(requireContext(), unlinkButton.setOnClickListener(view -> Toast.makeText(requireContext(),

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

@@ -19,22 +19,23 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.25" app:layout_constraintVertical_bias="0.25"
app:layout_constraintVertical_chainStyle="packed" app:layout_constraintVertical_chainStyle="packed"
app:srcCompat="@drawable/ic_check_circle_outline" tools:ignore="ContentDescription"
app:tint="@color/briar_brand_green" tools:srcCompat="@drawable/ic_help_outline_white"
tools:ignore="ContentDescription" /> tools:tint="@color/briar_orange_500" />
<TextView <TextView
android:id="@+id/statusTitleView" android:id="@+id/statusTitleView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="16dp" android:layout_margin="16dp"
android:text="@string/mailbox_status_connected_title" android:gravity="center"
android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6" android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
app:layout_constrainedWidth="true" app:layout_constrainedWidth="true"
app:layout_constraintBottom_toTopOf="@+id/checkButton" app:layout_constraintBottom_toTopOf="@+id/checkButton"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView" /> app:layout_constraintTop_toBottomOf="@+id/imageView"
tools:text="@string/mailbox_status_problem_title" />
<Button <Button
android:id="@+id/checkButton" android:id="@+id/checkButton"

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

@@ -643,7 +643,7 @@
<string name="tor_offline_button_check">Check connection settings</string> <string name="tor_offline_button_check">Check connection settings</string>
<string name="mailbox_status_title">Mailbox status</string> <string name="mailbox_status_title">Mailbox status</string>
<string name="mailbox_status_connected_title">Mailbox is running</string> <string name="mailbox_status_connected_title">Mailbox is running</string>
<string name="mailbox_status_problem_title">We are having trouble connecting to the mailbox</string> <string name="mailbox_status_problem_title">Briar is having trouble connecting to the Mailbox</string>
<string name="mailbox_status_failure_title">Mailbox is unavailable</string> <string name="mailbox_status_failure_title">Mailbox is unavailable</string>
<string name="mailbox_status_check_button">Check Connection</string> <string name="mailbox_status_check_button">Check Connection</string>
<!-- Example for string substitution: Last connection: 3min ago--> <!-- Example for string substitution: Last connection: 3min ago-->