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

Try to close connection if contact exchange fails.

Browse Source
This commit is contained in:
akwizgran
2019-05-24 13:14:53 +01:00
parent f1e5c2dd66
commit d80c77f466
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeViewModel.java
View File

@@ -66,15 +66,26 @@ class ContactExchangeViewModel extends AndroidViewModel {
remoteAuthor = contact.getAuthor(); remoteAuthor = contact.getAuthor();
succeeded.postValue(true); succeeded.postValue(true);
} catch (ContactExistsException e) { } catch (ContactExistsException e) {
tryToClose(conn);
duplicateAuthor = e.getRemoteAuthor(); duplicateAuthor = e.getRemoteAuthor();
succeeded.postValue(false); succeeded.postValue(false);
} catch (DbException | IOException e) { } catch (DbException | IOException e) {
tryToClose(conn);
logException(LOG, WARNING, e); logException(LOG, WARNING, e);
succeeded.postValue(false); succeeded.postValue(false);
} }
}); });
} }
private void tryToClose(DuplexTransportConnection conn) {
try {
conn.getReader().dispose(true, true);
conn.getWriter().dispose(true);
} catch (IOException e) {
logException(LOG, WARNING, e);
}
}
@UiThread @UiThread
@Nullable @Nullable
Author getRemoteAuthor() { Author getRemoteAuthor() {