From a4c99799a2da60f87805cb9d774cb439a162dcb4 Mon Sep 17 00:00:00 2001 From: 0x330a <92654767+0x330a@users.noreply.github.com> Date: Wed, 28 Feb 2024 17:33:56 +1100 Subject: [PATCH 1/8] build: update build version --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ca8b3e6d5d..c8a4711d57 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -31,8 +31,8 @@ configurations.all { exclude module: "commons-logging" } -def canonicalVersionCode = 360 -def canonicalVersionName = "1.17.5" +def canonicalVersionCode = 367 +def canonicalVersionName = "1.17.6" def postFixSize = 10 def abiPostFix = ['armeabi-v7a' : 1, From 1aec56b93614be493de29c34dbd47f925e079d42 Mon Sep 17 00:00:00 2001 From: 0x330a <92654767+0x330a@users.noreply.github.com> Date: Wed, 28 Feb 2024 17:51:15 +1100 Subject: [PATCH 2/8] feat: add new config enabled timestamp --- .../libsession/messaging/messages/ExpirationConfiguration.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/ExpirationConfiguration.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/ExpirationConfiguration.kt index 696f27799b..256dcf2315 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/ExpirationConfiguration.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/ExpirationConfiguration.kt @@ -1,6 +1,7 @@ package org.session.libsession.messaging.messages import network.loki.messenger.libsession_util.util.ExpiryMode +import org.session.libsession.snode.SnodeAPI data class ExpirationConfiguration( val threadId: Long = -1, @@ -10,7 +11,7 @@ data class ExpirationConfiguration( val isEnabled = expiryMode.expirySeconds > 0 companion object { - val isNewConfigEnabled = true /* TODO: System.currentTimeMillis() > 1_676_851_200_000 // 13/02/2023 */ + val isNewConfigEnabled = SnodeAPI.nowWithOffset >= 1710284400 } } From c2ab92e14d2146e64313da7e84a8461add63eb28 Mon Sep 17 00:00:00 2001 From: 0x330a <92654767+0x330a@users.noreply.github.com> Date: Wed, 28 Feb 2024 17:51:15 +1100 Subject: [PATCH 3/8] feat: add new config enabled timestamp --- .../libsession/messaging/messages/ExpirationConfiguration.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/ExpirationConfiguration.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/ExpirationConfiguration.kt index 696f27799b..1c1545359b 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/ExpirationConfiguration.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/ExpirationConfiguration.kt @@ -1,6 +1,7 @@ package org.session.libsession.messaging.messages import network.loki.messenger.libsession_util.util.ExpiryMode +import org.session.libsession.snode.SnodeAPI data class ExpirationConfiguration( val threadId: Long = -1, @@ -10,7 +11,7 @@ data class ExpirationConfiguration( val isEnabled = expiryMode.expirySeconds > 0 companion object { - val isNewConfigEnabled = true /* TODO: System.currentTimeMillis() > 1_676_851_200_000 // 13/02/2023 */ + val isNewConfigEnabled = SnodeAPI.nowWithOffset >= 171028440000 } } From b62656b1be735d9f1c9cdc836e7e8baf8718960b Mon Sep 17 00:00:00 2001 From: 0x330a <92654767+0x330a@users.noreply.github.com> Date: Wed, 28 Feb 2024 17:54:00 +1100 Subject: [PATCH 4/8] feat: add new config enabled timestamp --- .../libsession/messaging/messages/ExpirationConfiguration.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/ExpirationConfiguration.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/ExpirationConfiguration.kt index 1c1545359b..cc33379466 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/ExpirationConfiguration.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/ExpirationConfiguration.kt @@ -11,7 +11,7 @@ data class ExpirationConfiguration( val isEnabled = expiryMode.expirySeconds > 0 companion object { - val isNewConfigEnabled = SnodeAPI.nowWithOffset >= 171028440000 + val isNewConfigEnabled = SnodeAPI.nowWithOffset >= 1710284400000 } } From f88eab7323c344ab608af6972a640519eebf1b9b Mon Sep 17 00:00:00 2001 From: 0x330a <92654767+0x330a@users.noreply.github.com> Date: Wed, 28 Feb 2024 18:26:28 +1100 Subject: [PATCH 5/8] build: update build number --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index c8a4711d57..836d08c080 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -31,7 +31,7 @@ configurations.all { exclude module: "commons-logging" } -def canonicalVersionCode = 367 +def canonicalVersionCode = 368 def canonicalVersionName = "1.17.6" def postFixSize = 10 From 7bcf82374016bd03f4d9e50988a5f00ed9ae0a4c Mon Sep 17 00:00:00 2001 From: 0x330a <92654767+0x330a@users.noreply.github.com> Date: Mon, 4 Mar 2024 17:28:21 +1100 Subject: [PATCH 6/8] build: update build number --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 836d08c080..1e63207bf9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -31,8 +31,8 @@ configurations.all { exclude module: "commons-logging" } -def canonicalVersionCode = 368 -def canonicalVersionName = "1.17.6" +def canonicalVersionCode = 369 +def canonicalVersionName = "1.18.1" def postFixSize = 10 def abiPostFix = ['armeabi-v7a' : 1, From 3cba05e6680a4d399656a4328dadb896b9625329 Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 12 Mar 2024 11:32:47 +1030 Subject: [PATCH 7/8] Fix NPE on null display name --- .../org/thoughtcrime/securesms/database/Storage.kt | 2 +- .../messaging/messages/visible/Profile.kt | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt index 2760ee302f..584394a86c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt @@ -182,7 +182,7 @@ open class Storage( } override fun getUserProfile(): Profile { - val displayName = TextSecurePreferences.getProfileName(context)!! + val displayName = TextSecurePreferences.getProfileName(context) val profileKey = ProfileKeyUtil.getProfileKey(context) val profilePictureUrl = TextSecurePreferences.getProfilePictureURL(context) return Profile(displayName, profileKey, profilePictureUrl) diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Profile.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Profile.kt index ce6b61524c..9c95bbcfbd 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Profile.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Profile.kt @@ -4,10 +4,11 @@ import com.google.protobuf.ByteString import org.session.libsignal.utilities.Log import org.session.libsignal.protos.SignalServiceProtos -class Profile() { - var displayName: String? = null - var profileKey: ByteArray? = null +class Profile( + var displayName: String? = null, + var profileKey: ByteArray? = null, var profilePictureURL: String? = null +) { companion object { const val TAG = "Profile" @@ -25,12 +26,6 @@ class Profile() { } } - constructor(displayName: String, profileKey: ByteArray? = null, profilePictureURL: String? = null) : this() { - this.displayName = displayName - this.profileKey = profileKey - this.profilePictureURL = profilePictureURL - } - fun toProto(): SignalServiceProtos.DataMessage? { val displayName = displayName if (displayName == null) { From 3dee7ec6bde0254d642a213bf672390193c08d65 Mon Sep 17 00:00:00 2001 From: 0x330a <92654767+0x330a@users.noreply.github.com> Date: Wed, 13 Mar 2024 11:31:08 +1100 Subject: [PATCH 8/8] fix: disappearing viewmodel tests (#1432) --- .../DisappearingMessagesViewModelTest.kt | 8 +++++--- .../messaging/messages/ExpirationConfiguration.kt | 3 +-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/test/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessagesViewModelTest.kt b/app/src/test/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessagesViewModelTest.kt index a40d67a5a6..22679f311e 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessagesViewModelTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessagesViewModelTest.kt @@ -53,6 +53,7 @@ class DisappearingMessagesViewModelTest { @Mock lateinit var application: Application @Mock lateinit var textSecurePreferences: TextSecurePreferences @Mock lateinit var messageExpirationManager: SSKEnvironment.MessageExpirationManagerProtocol + @Mock lateinit var disappearingMessages: DisappearingMessages @Mock lateinit var threadDb: ThreadDatabase @Mock lateinit var groupDb: GroupDatabase @Mock lateinit var storage: Storage @@ -114,9 +115,9 @@ class DisappearingMessagesViewModelTest { isSelfAdmin = true, address = LOCAL_ADDRESS, isNoteToSelf = true, - expiryMode = ExpiryMode.NONE, + expiryMode = ExpiryMode.Legacy(0), isNewConfigEnabled = false, - persistedMode = ExpiryMode.NONE, + persistedMode = ExpiryMode.Legacy(0), showDebugOptions = false ) ) @@ -127,7 +128,7 @@ class DisappearingMessagesViewModelTest { UiState( OptionsCard( R.string.activity_disappearing_messages_timer, - typeOption(ExpiryMode.NONE, selected = true), + typeOption(ExpiryMode.NONE, selected = false), timeOption(ExpiryType.LEGACY, 12.hours), timeOption(ExpiryType.LEGACY, 1.days), timeOption(ExpiryType.LEGACY, 7.days), @@ -555,6 +556,7 @@ class DisappearingMessagesViewModelTest { application, textSecurePreferences, messageExpirationManager, + disappearingMessages, threadDb, groupDb, storage, diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/ExpirationConfiguration.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/ExpirationConfiguration.kt index cc33379466..8e3ab18b22 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/ExpirationConfiguration.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/ExpirationConfiguration.kt @@ -1,7 +1,6 @@ package org.session.libsession.messaging.messages import network.loki.messenger.libsession_util.util.ExpiryMode -import org.session.libsession.snode.SnodeAPI data class ExpirationConfiguration( val threadId: Long = -1, @@ -11,7 +10,7 @@ data class ExpirationConfiguration( val isEnabled = expiryMode.expirySeconds > 0 companion object { - val isNewConfigEnabled = SnodeAPI.nowWithOffset >= 1710284400000 + val isNewConfigEnabled = true } }