Incorrect timestamp

libsession/src/main/java/org/session/libsession/messaging/groups/GroupManagerV2.kt

@@ -54,7 +54,8 @@ interface GroupManagerV2 {
         groupName: String,
         authData: ByteArray,
         inviter: AccountId,
-        inviteMessageHash: String?
+        inviteMessageHash: String,
+        inviteMessageTimestamp: Long,
     )
 
     suspend fun handlePromotion(
@@ -62,7 +63,8 @@ interface GroupManagerV2 {
         groupName: String,
         adminKey: ByteArray,
         promoter: AccountId,
-        promoteMessageHash: String?
+        promoteMessageHash: String,
+        promoteMessageTimestamp: Long,
     )
 
     suspend fun respondToInvitation(groupId: AccountId, approved: Boolean): Unit?

libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt

@@ -229,8 +229,8 @@ object MessageSender {
             if (destination is Destination.Contact && message is VisibleMessage && !isSelfSend()) {
                 SnodeModule.shared.broadcaster.broadcast("messageFailed", message.sentTimestamp!!)
             }
-            throw error
         }
+
         try {
             val snodeMessage = buildWrappedMessageToSnode(destination, message, isSyncMessage)
             // TODO: this might change in future for config messages
@@ -273,10 +273,10 @@ object MessageSender {
                 runCatching { it.await() }
             }
 
-            val firstSuccess = sendTaskResults.firstOrNull { it.isSuccess }
+            val firstSuccess = sendTaskResults.firstOrNull { it.isSuccess }?.getOrNull()
 
             if (firstSuccess != null) {
-                message.serverHash = firstSuccess.getOrThrow().hash
+                message.serverHash = firstSuccess.hash
                 handleSuccessfulMessageSend(message, destination, isSyncMessage)
             } else {
                 // If all tasks failed, throw the first exception
@@ -284,6 +284,7 @@ object MessageSender {
             }
         } catch (exception: Exception) {
             handleFailure(exception)
+            throw exception
         }
     }
 

libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt

@@ -665,7 +665,8 @@ private fun handlePromotionMessage(message: GroupUpdated) {
                     groupName = promotion.name,
                     adminKey = keyPair.secretKey,
                     promoter = adminId,
-                    promoteMessageHash = message.serverHash
+                    promoteMessageHash = message.serverHash!!,
+                    promoteMessageTimestamp = message.sentTimestamp!!,
                 )
         } catch (e: Exception) {
             Log.e("GroupUpdated", "Failed to handle promotion message", e)
@@ -708,7 +709,8 @@ private fun MessageReceiver.handleNewLibSessionClosedGroupMessage(message: Group
                     groupName = invite.name,
                     authData = invite.memberAuthData.toByteArray(),
                     inviter = adminId,
-                    inviteMessageHash = message.serverHash
+                    inviteMessageHash = message.serverHash!!,
+                    inviteMessageTimestamp = message.sentTimestamp!!,
                 )
         } catch (e: Exception) {
             Log.e("GroupUpdated", "Failed to handle invite message", e)