From 2bdb4d18a222ae65fc800db7800a9f979915cd87 Mon Sep 17 00:00:00 2001 From: Harris Date: Mon, 31 May 2021 14:24:43 +1000 Subject: [PATCH 1/2] fix: property name for json deserialisation --- .../libsession/messaging/open_groups/OpenGroupAPIV2.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt index 0566eeeba0..158b61e7ee 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt @@ -1,5 +1,6 @@ package org.session.libsession.messaging.open_groups +import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.databind.PropertyNamingStrategy import com.fasterxml.jackson.databind.annotation.JsonNaming import com.fasterxml.jackson.databind.type.TypeFactory @@ -60,9 +61,11 @@ object OpenGroupAPIV2 { data class CompactPollRequest(val roomID: String, val authToken: String, val fromDeletionServerID: Long?, val fromMessageServerID: Long?) data class CompactPollResult(val messages: List, val deletions: List, val moderators: List) - @JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy::class) - data class MessageDeletion - @JvmOverloads constructor(val id: Long = 0, val deletedMessageServerID: Long = 0 + data class MessageDeletion( + @JsonProperty("id") + val id: Long = 0, + @JsonProperty("deleted_message_id") + val deletedMessageServerID: Long = 0 ) { companion object { From b8a85c35c46d62dc52b0ca17f68e8020b182005b Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Mon, 31 May 2021 14:31:36 +1000 Subject: [PATCH 2/2] Update version number --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 66de3a66d4..6d2b81e0be 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -143,8 +143,8 @@ dependencies { testImplementation 'org.robolectric:shadows-multidex:4.2' } -def canonicalVersionCode = 179 -def canonicalVersionName = "1.10.11" +def canonicalVersionCode = 180 +def canonicalVersionName = "1.10.12" def postFixSize = 10 def abiPostFix = ['armeabi-v7a' : 1,