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

Address review comments for detecting duplicate (pending) contacts

Browse Source
This commit is contained in:
Torsten Grote
2019-10-16 11:15:14 -03:00
parent aa0937e6aa
commit 397afbfec0
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/NicknameFragment.java
View File

@@ -120,8 +120,10 @@ public class NicknameFragment extends BaseFragment {
viewModel.getAddContactResult().observe(this, result -> {
if (result == null) return;
if (result.hasError()) handleException(name, result.getException());
else showPendingContactListActivity();
if (result.hasError())
handleException(name, requireNonNull(result.getException()));
else
showPendingContactListActivity();
});
viewModel.addContact(name);
}
@@ -133,7 +135,7 @@ public class NicknameFragment extends BaseFragment {
finish();
}
private void handleException(String name, @Nullable Exception e) {
private void handleException(String name, Exception e) {
if (e instanceof ContactExistsException) {
ContactExistsException ce = (ContactExistsException) e;
handleExistingContact(name, ce.getRemoteAuthor());