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

Fix timer issue with sync messages from desktop.

Browse Source 
Related to #8068
This commit is contained in:
Greyson Parrelli 2018-08-03 14:08:16 -04:00
parent 7d210c8e0d
commit d42cecc32a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -680,12 +680,13 @@ public class PushDecryptJob extends ContextJob {
handleSynchronizeSentExpirationUpdate(message); handleSynchronizeSentExpirationUpdate(message);
} }
long threadId = DatabaseFactory.getThreadDatabase(context).getThreadIdFor(recipient); long threadId = DatabaseFactory.getThreadDatabase(context).getThreadIdFor(recipient);
boolean isGroup = recipient.getAddress().isGroup();
MessagingDatabase database; MessagingDatabase database;
long messageId; long messageId;
if (recipient.getAddress().isGroup()) { if (isGroup) {
OutgoingMediaMessage outgoingMediaMessage = new OutgoingMediaMessage(recipient, new SlideDeck(), body, message.getTimestamp(), -1, expiresInMillis, ThreadDatabase.DistributionTypes.DEFAULT, null, Collections.emptyList()); OutgoingMediaMessage outgoingMediaMessage = new OutgoingMediaMessage(recipient, new SlideDeck(), body, message.getTimestamp(), -1, expiresInMillis, ThreadDatabase.DistributionTypes.DEFAULT, null, Collections.emptyList());
outgoingMediaMessage = new OutgoingSecureMediaMessage(outgoingMediaMessage); outgoingMediaMessage = new OutgoingSecureMediaMessage(outgoingMediaMessage);
@ -704,7 +705,7 @@ public class PushDecryptJob extends ContextJob {
database.markExpireStarted(messageId, message.getExpirationStartTimestamp()); database.markExpireStarted(messageId, message.getExpirationStartTimestamp());
ApplicationContext.getInstance(context) ApplicationContext.getInstance(context)
.getExpiringMessageManager() .getExpiringMessageManager()
.scheduleDeletion(messageId, false, message.getExpirationStartTimestamp(), expiresInMillis); .scheduleDeletion(messageId, isGroup, message.getExpirationStartTimestamp(), expiresInMillis);
} }
return threadId; return threadId;