mirror of
https://github.com/oxen-io/session-android.git
synced 2024-12-28 02:37:46 +00:00
Move group message to group after accepting new identity key
Fixes #2739 // FREEBIE
This commit is contained in:
parent
3efcb5dfa1
commit
e32736359b
@ -326,7 +326,7 @@ public class PushDecryptJob extends ContextJob {
|
||||
|
||||
Pair<Long, Long> messageAndThreadId;
|
||||
|
||||
if (smsMessageId.isPresent()) {
|
||||
if (smsMessageId.isPresent() && !message.getGroupInfo().isPresent()) {
|
||||
messageAndThreadId = database.updateBundleMessageBody(masterSecret, smsMessageId.get(), body);
|
||||
} else {
|
||||
IncomingTextMessage textMessage = new IncomingTextMessage(envelope.getSource(),
|
||||
@ -336,6 +336,8 @@ public class PushDecryptJob extends ContextJob {
|
||||
|
||||
textMessage = new IncomingEncryptedMessage(textMessage, body);
|
||||
messageAndThreadId = database.insertMessageInbox(masterSecret, textMessage);
|
||||
|
||||
if (smsMessageId.isPresent()) database.deleteMessage(smsMessageId.get());
|
||||
}
|
||||
|
||||
MessageNotifier.updateNotification(context, masterSecret.getMasterSecret().orNull(), messageAndThreadId.second);
|
||||
|
Loading…
x
Reference in New Issue
Block a user