Bump version to 5.18.5

app/build.gradle

@@ -58,14 +58,14 @@ protobuf {
 }
 
 def canonicalVersionCode = 886
-def canonicalVersionName = "5.18.4"
+def canonicalVersionName = "5.18.5"
 
 def postFixSize = 100
-def abiPostFix = ['universal'   : 0,
-                  'armeabi-v7a' : 1,
-                  'arm64-v8a'   : 2,
-                  'x86'         : 3,
-                  'x86_64'      : 4]
+def abiPostFix = ['universal'   : 5,
+                  'armeabi-v7a' : 6,
+                  'arm64-v8a'   : 7,
+                  'x86'         : 8,
+                  'x86_64'      : 9]
 
 def keystores = [ 'debug'  : loadKeystoreProperties('keystore.debug.properties') ]
 

app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java

@@ -47,6 +47,7 @@ import java.util.LinkedList;
 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 @@ class MediaSendViewModel extends ViewModel {
                                                                 Collections.emptyList(),
                                                                 System.currentTimeMillis(),
                                                                 -1,
-                                                                recipient.getExpireMessages() * 1000,
+                                                                TimeUnit.SECONDS.toMillis(recipient.getExpireMessages()),
                                                                 isViewOnce(),
                                                                 ThreadDatabase.DistributionTypes.DEFAULT,
                                                                 null,

app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java

@@ -169,6 +169,7 @@ import java.util.List;
 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 @@ public final class MessageContentProcessor {
     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()),