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

Don't automatically respond to declined introduction.

Browse Source
This commit is contained in:
akwizgran
2018-04-28 00:11:45 +01:00
parent e8f33c0e6e
commit 6e42377b74
4 changed files with 71 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationActivity.java
View File

@@ -575,10 +575,6 @@ public class ConversationActivity extends BriarActivity
@Override
public void onSuccess(String contactName) {
runOnUiThreadUnlessDestroyed(() -> {
// If the other introducee declined, we can no longer
// respond to the request
if (!m.isIntroducer() && !m.wasAccepted())
markRequestAnswered(m.getSessionId());
ConversationItem item = ConversationItem
.from(ConversationActivity.this, contactName, m);
addConversationItem(item);
@@ -631,26 +627,6 @@ public class ConversationActivity extends BriarActivity
});
}
private void markRequestAnswered(SessionId sessionId) {
int size = adapter.getItemCount();
for (int i = 0; i < size; i++) {
ConversationItem item = adapter.getItemAt(i);
if (item instanceof ConversationRequestItem) {
ConversationRequestItem req = (ConversationRequestItem) item;
if (req.getSessionId().equals(sessionId)
&& !req.wasAnswered()) {
LOG.info("Marking request answered");
req.setAnswered(true);
int position = adapter.findItemPosition(req);
if (position != INVALID_POSITION)
adapter.notifyItemChanged(position, req);
// There shouldn't be more than one unanswered request
return;
}
}
}
}
private void markMessages(Collection<MessageId> messageIds,
boolean sent, boolean seen) {
runOnUiThreadUnlessDestroyed(() -> {