From 14a02a85111af7756aea245ae05b6a41d78cde16 Mon Sep 17 00:00:00 2001 From: jubb Date: Wed, 5 May 2021 17:46:53 +1000 Subject: [PATCH] fix: proper sending of join URL and removing server timestamp in proto parsing --- .../org/session/libsession/messaging/open_groups/OpenGroupV2.kt | 2 +- .../messaging/sending_receiving/pollers/OpenGroupV2Poller.kt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupV2.kt b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupV2.kt index 561989e318..29965079cf 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupV2.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupV2.kt @@ -39,7 +39,7 @@ data class OpenGroupV2( } - fun toJoinUrl(): String = "$server/$id?public_key=$publicKey" + fun toJoinUrl(): String = "$server/$room?public_key=$publicKey" fun toJson(): Map = mapOf( "room" to room, diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupV2Poller.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupV2Poller.kt index e5e9f94377..311e213592 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupV2Poller.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupV2Poller.kt @@ -97,7 +97,6 @@ class OpenGroupV2Poller(private val openGroups: List, private val e builder.source = senderPublicKey builder.sourceDevice = 1 builder.content = message.toProto().toByteString() - builder.serverTimestamp = message.serverID ?: 0 builder.timestamp = message.sentTimestamp val envelope = builder.build() val job = MessageReceiveJob(envelope.toByteArray(), isBackgroundPoll, message.serverID, serverRoomId)