TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-18 22:28:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move group message to group after accepting new identity key

Browse Source 
Fixes #2739
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2015-12-10 04:34:20 -08:00
parent 3efcb5dfa1
commit e32736359b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
View File

@ -326,7 +326,7 @@ public class PushDecryptJob extends ContextJob {
Pair<Long, Long> messageAndThreadId; Pair<Long, Long> messageAndThreadId;
if (smsMessageId.isPresent()) { if (smsMessageId.isPresent() && !message.getGroupInfo().isPresent()) {
messageAndThreadId = database.updateBundleMessageBody(masterSecret, smsMessageId.get(), body); messageAndThreadId = database.updateBundleMessageBody(masterSecret, smsMessageId.get(), body);
} else { } else {
IncomingTextMessage textMessage = new IncomingTextMessage(envelope.getSource(), IncomingTextMessage textMessage = new IncomingTextMessage(envelope.getSource(),
@ -336,6 +336,8 @@ public class PushDecryptJob extends ContextJob {
textMessage = new IncomingEncryptedMessage(textMessage, body); textMessage = new IncomingEncryptedMessage(textMessage, body);
messageAndThreadId = database.insertMessageInbox(masterSecret, textMessage); messageAndThreadId = database.insertMessageInbox(masterSecret, textMessage);
if (smsMessageId.isPresent()) database.deleteMessage(smsMessageId.get());
} }
MessageNotifier.updateNotification(context, masterSecret.getMasterSecret().orNull(), messageAndThreadId.second); MessageNotifier.updateNotification(context, masterSecret.getMasterSecret().orNull(), messageAndThreadId.second);