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

Add private message to list right away, so eliminate need for an event

Browse Source
This commit is contained in:
Torsten Grote
2016-06-01 17:19:09 -03:00
parent b26acdf228
commit 9d826631e9
1 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,7 +47,6 @@ import org.briarproject.api.event.EventListener;
import org.briarproject.api.event.ForumInvitationReceivedEvent; import org.briarproject.api.event.ForumInvitationReceivedEvent;
import org.briarproject.api.event.IntroductionRequestReceivedEvent; import org.briarproject.api.event.IntroductionRequestReceivedEvent;
import org.briarproject.api.event.IntroductionResponseReceivedEvent; import org.briarproject.api.event.IntroductionResponseReceivedEvent;
import org.briarproject.api.event.MessageStateChangedEvent;
import org.briarproject.api.event.MessagesAckedEvent; import org.briarproject.api.event.MessagesAckedEvent;
import org.briarproject.api.event.MessagesSentEvent; import org.briarproject.api.event.MessagesSentEvent;
import org.briarproject.api.event.PrivateMessageReceivedEvent; import org.briarproject.api.event.PrivateMessageReceivedEvent;
@@ -63,7 +62,6 @@ import org.briarproject.api.messaging.PrivateMessageFactory;
import org.briarproject.api.messaging.PrivateMessageHeader; import org.briarproject.api.messaging.PrivateMessageHeader;
import org.briarproject.api.plugins.ConnectionRegistry; import org.briarproject.api.plugins.ConnectionRegistry;
import org.briarproject.api.sync.GroupId; import org.briarproject.api.sync.GroupId;
import org.briarproject.api.sync.Message;
import org.briarproject.api.sync.MessageId; import org.briarproject.api.sync.MessageId;
import org.briarproject.util.StringUtils; import org.briarproject.util.StringUtils;
@@ -88,7 +86,6 @@ import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING; import static java.util.logging.Level.WARNING;
import static org.briarproject.android.contact.ConversationItem.IncomingItem; import static org.briarproject.android.contact.ConversationItem.IncomingItem;
import static org.briarproject.android.contact.ConversationItem.OutgoingItem; import static org.briarproject.android.contact.ConversationItem.OutgoingItem;
import static org.briarproject.api.sync.ValidationManager.State.DELIVERED;
public class ConversationActivity extends BriarActivity public class ConversationActivity extends BriarActivity
implements EventListener, OnClickListener, implements EventListener, OnClickListener,
@@ -98,14 +95,13 @@ public class ConversationActivity extends BriarActivity
Logger.getLogger(ConversationActivity.class.getName()); Logger.getLogger(ConversationActivity.class.getName());
@Inject @Inject
protected AndroidNotificationManager notificationManager; AndroidNotificationManager notificationManager;
@Inject @Inject
protected ConnectionRegistry connectionRegistry; protected ConnectionRegistry connectionRegistry;
@Inject @Inject
@CryptoExecutor @CryptoExecutor
protected Executor cryptoExecutor; protected Executor cryptoExecutor;
private Map<MessageId, byte[]> bodyCache = new HashMap<>();
private ConversationAdapter adapter; private ConversationAdapter adapter;
private CircleImageView toolbarAvatar; private CircleImageView toolbarAvatar;
private ImageView toolbarStatus; private ImageView toolbarStatus;
@@ -122,7 +118,7 @@ public class ConversationActivity extends BriarActivity
@Inject @Inject
protected volatile EventBus eventBus; protected volatile EventBus eventBus;
@Inject @Inject
protected volatile PrivateMessageFactory privateMessageFactory; volatile PrivateMessageFactory privateMessageFactory;
@Inject @Inject
protected volatile IntroductionManager introductionManager; protected volatile IntroductionManager introductionManager;
@Inject @Inject
@@ -133,6 +129,7 @@ public class ConversationActivity extends BriarActivity
private volatile String contactName = null; private volatile String contactName = null;
private volatile byte[] contactIdenticonKey = null; private volatile byte[] contactIdenticonKey = null;
private volatile boolean connected = false; private volatile boolean connected = false;
private volatile Map<MessageId, byte[]> bodyCache = new HashMap<>();
@Override @Override
public void onCreate(Bundle state) { public void onCreate(Bundle state) {
@@ -147,10 +144,13 @@ public class ConversationActivity extends BriarActivity
// Custom Toolbar // Custom Toolbar
Toolbar tb = (Toolbar) findViewById(R.id.toolbar); Toolbar tb = (Toolbar) findViewById(R.id.toolbar);
toolbarAvatar = (CircleImageView) tb.findViewById(R.id.contactAvatar); if (tb != null) {
toolbarStatus = (ImageView) tb.findViewById(R.id.contactStatus); toolbarAvatar =
toolbarTitle = (TextView) tb.findViewById(R.id.contactName); (CircleImageView) tb.findViewById(R.id.contactAvatar);
setSupportActionBar(tb); toolbarStatus = (ImageView) tb.findViewById(R.id.contactStatus);
toolbarTitle = (TextView) tb.findViewById(R.id.contactName);
setSupportActionBar(tb);
}
ActionBar ab = getSupportActionBar(); ActionBar ab = getSupportActionBar();
if (ab != null) { if (ab != null) {
ab.setDisplayShowHomeEnabled(true); ab.setDisplayShowHomeEnabled(true);
@@ -171,8 +171,11 @@ public class ConversationActivity extends BriarActivity
content = (EditText) findViewById(R.id.contentView); content = (EditText) findViewById(R.id.contentView);
sendButton = (ImageButton) findViewById(R.id.sendButton); sendButton = (ImageButton) findViewById(R.id.sendButton);
sendButton.setEnabled(false); // Enabled after loading the conversation if (sendButton != null) {
sendButton.setOnClickListener(this); // Enabled after loading the conversation
sendButton.setEnabled(false);
sendButton.setOnClickListener(this);
}
} }
@Override @Override
@@ -236,7 +239,7 @@ public class ConversationActivity extends BriarActivity
@Override @Override
public void onBackPressed() { public void onBackPressed() {
// FIXME disabled exit transition, because it doesn't work for some reason // FIXME disabled exit transition, because it doesn't work for some reason #318
//supportFinishAfterTransition(); //supportFinishAfterTransition();
finish(); finish();
} }
@@ -479,15 +482,6 @@ public class ConversationActivity extends BriarActivity
loadMessageBody(h); loadMessageBody(h);
markMessageReadIfNew(h); markMessageReadIfNew(h);
} }
} else if (e instanceof MessageStateChangedEvent) {
MessageStateChangedEvent m = (MessageStateChangedEvent) e;
if (m.getState() == DELIVERED &&
m.getMessage().getGroupId().equals(groupId)) {
if (m.isLocal()) {
LOG.info("Message added, reloading");
loadMessages();
}
}
} else if (e instanceof MessagesSentEvent) { } else if (e instanceof MessagesSentEvent) {
MessagesSentEvent m = (MessagesSentEvent) e; MessagesSentEvent m = (MessagesSentEvent) e;
if (m.getContactId().equals(contactId)) { if (m.getContactId().equals(contactId)) {
@@ -615,8 +609,9 @@ public class ConversationActivity extends BriarActivity
@Override @Override
public void run() { public void run() {
try { try {
storeMessage(privateMessageFactory.createPrivateMessage( storeMessage(privateMessageFactory
groupId, timestamp, null, "text/plain", body)); .createPrivateMessage(groupId, timestamp, null,
"text/plain", body), body);
} catch (FormatException e) { } catch (FormatException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
@@ -624,7 +619,7 @@ public class ConversationActivity extends BriarActivity
}); });
} }
private void storeMessage(final PrivateMessage m) { private void storeMessage(final PrivateMessage m, final byte[] body) {
runOnDbThread(new Runnable() { runOnDbThread(new Runnable() {
@Override @Override
public void run() { public void run() {
@@ -634,6 +629,16 @@ public class ConversationActivity extends BriarActivity
long duration = System.currentTimeMillis() - now; long duration = System.currentTimeMillis() - now;
if (LOG.isLoggable(INFO)) if (LOG.isLoggable(INFO))
LOG.info("Storing message took " + duration + " ms"); LOG.info("Storing message took " + duration + " ms");
PrivateMessageHeader h = new PrivateMessageHeader(
m.getMessage().getId(),
m.getMessage().getTimestamp(), m.getContentType(),
true, false, false, false);
ConversationMessageItem item =
(ConversationMessageItem) ConversationItem.from(h);
item.setBody(body);
bodyCache.put(m.getMessage().getId(), body);
addConversationItem(item);
} catch (DbException e) { } catch (DbException e) {
if (LOG.isLoggable(WARNING)) if (LOG.isLoggable(WARNING))
LOG.log(WARNING, e.toString(), e); LOG.log(WARNING, e.toString(), e);