Update time conversions.

signalapp · Jul 29, 2021 · bae68a1 · bae68a1
1 parent 16f1128
commit bae68a1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java
@@ -47,6 +47,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Manages the observable datasets available in {@link MediaSendActivity}.
@@ -673,7 +674,7 @@ private void sendMessages(@NonNull List<Recipient> recipients, @NonNull String b
                                                                 Collections.emptyList(),
                                                                 System.currentTimeMillis(),
                                                                 -1,
-                                                                recipient.getExpireMessages() * 1000,
+                                                                TimeUnit.SECONDS.toMillis(recipient.getExpireMessages()),
                                                                 isViewOnce(),
                                                                 ThreadDatabase.DistributionTypes.DEFAULT,
                                                                 null,

diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java
@@ -169,6 +169,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Takes data about a decrypted message, transforms it into user-presentable data, and writes that
@@ -1331,7 +1332,7 @@ private long handleSynchronizeSentMediaMessage(@NonNull SentTranscriptMessage me
     OutgoingMediaMessage mediaMessage = new OutgoingMediaMessage(recipients, message.getMessage().getBody().orNull(),
         syncAttachments,
         message.getTimestamp(), -1,
-        message.getMessage().getExpiresInSeconds() * 1000,
+        TimeUnit.SECONDS.toMillis(message.getMessage().getExpiresInSeconds()),
         viewOnce,
         ThreadDatabase.DistributionTypes.DEFAULT, quote.orNull(),
         sharedContacts.or(Collections.emptyList()),