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

Invitation protocol was proceeding after confirmation timed out.

Browse Source 
Both sides now close the connection after exchanging confirmation
results unless both results are positive.
This commit is contained in:
akwizgran
2013-05-16 15:10:16 +01:00
parent 91ccdfd8d7
commit 1692e5a695
5 changed files with 48 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
briar-android/src/net/sf/briar/android/invitation/AddContactActivity.java
View File

@@ -288,9 +288,11 @@ implements InvitationListener {
if(code == remoteConfirmationCode) {
localMatched = true;
if(remoteMatched) setView(new ContactDetailsView(this));
else if(remoteCompared) setView(new CodesDoNotMatchView(this));
else setView(new WaitForContactView(this));
task.localConfirmationSucceeded();
} else {
localMatched = false;
setView(new CodesDoNotMatchView(this));
task.localConfirmationFailed();
}
@@ -353,6 +355,7 @@ implements InvitationListener {
runOnUiThread(new Runnable() {
public void run() {
remoteCompared = true;
remoteMatched = false;
if(localMatched)
setView(new CodesDoNotMatchView(AddContactActivity.this));
}