Bump version to 5.42.8

app/build.gradle

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

app/src/main/java/org/thoughtcrime/securesms/components/SendButton.kt

@@ -95,15 +95,10 @@ class SendButton(context: Context, attributeSet: AttributeSet?) : AppCompatImage
 
   fun resetAvailableTransports(isMediaMessage: Boolean) {
     availableSendTypes = MessageSendType.getAllAvailable(context, isMediaMessage)
-
+    activeMessageSendType = null
-    if (!availableSendTypes.contains(activeMessageSendType)) {
+    defaultTransportType = MessageSendType.TransportType.SMS
-      Log.w(TAG, "[resetAvailableTransports] The active send type is no longer available. Unsetting.")
+    defaultSubscriptionId = null
-      setSendType(null)
+    onSelectionChanged(newType = selectedSendType, isManualSelection = false)
-    } else {
-      defaultTransportType = MessageSendType.TransportType.SMS
-      defaultSubscriptionId = null
-      onSelectionChanged(newType = selectedSendType, isManualSelection = false)
-    }
   }
 
   fun disableTransportType(type: MessageSendType.TransportType) {

app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageHeaderViewHolder.java

@@ -183,7 +183,12 @@ final class MessageHeaderViewHolder extends RecyclerView.ViewHolder implements G
         if (expiresUpdater != null) {
           expiresUpdater.cancel();
         }
-        expiresUpdater = new CountDownTimer(messageRecord.getExpiresIn(), TimeUnit.SECONDS.toMillis(1)) {
+
+        long elapsed    = System.currentTimeMillis() - messageRecord.getExpireStarted();
+        long remaining  = messageRecord.getExpiresIn() - elapsed;
+        long updateRate = (remaining < TimeUnit.HOURS.toMillis(1)) ? TimeUnit.SECONDS.toMillis(1) : TimeUnit.MINUTES.toMillis(1);
+
+        expiresUpdater = new CountDownTimer(remaining, updateRate) {
           @Override
           public void onTick(long millisUntilFinished) {
             int    expirationTime = Math.max((int) (TimeUnit.MILLISECONDS.toSeconds(millisUntilFinished)), 1);