From b21ab59210ab795ba3a842523cef368d4dad272a Mon Sep 17 00:00:00 2001 From: SessionHero01 <180888785+SessionHero01@users.noreply.github.com> Date: Wed, 26 Nov 2025 08:56:46 +1100 Subject: [PATCH 1/4] Bump release to 1.29.3 --- app/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 32f90cc83c..3744e8b8f2 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -26,8 +26,8 @@ configurations.configureEach { exclude(module = "commons-logging") } -val canonicalVersionCode = 431 -val canonicalVersionName = "1.29.2" +val canonicalVersionCode = 432 +val canonicalVersionName = "1.29.3" val postFixSize = 10 val abiPostFix = mapOf( From 8c476863f372f55ccbdabd48e98be970f7a91454 Mon Sep 17 00:00:00 2001 From: SessionHero01 <180888785+SessionHero01@users.noreply.github.com> Date: Wed, 26 Nov 2025 09:12:16 +1100 Subject: [PATCH 2/4] Fix build script to remove old versions of fdroid releases --- scripts/build-and-release.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/build-and-release.py b/scripts/build-and-release.py index baa2386433..cc020f0368 100755 --- a/scripts/build-and-release.py +++ b/scripts/build-and-release.py @@ -151,9 +151,11 @@ def update_fdroid(build: BuildResult, fdroid_workspace: str, creds: BuildCredent # Make sure there are only last three versions of APKs all_apk_versions_and_ctime = [(re.search(r'session-(.+?)-', os.path.basename(name)).group(1), os.path.getmtime(name)) - for name in glob.glob(os.path.join(fdroid_workspace, 'repo/session-*-arm64-v8a.apk'))] + for name in glob.glob(os.path.join(fdroid_workspace, 'repo/session-*-arm64-v8a*.apk'))] + # Sort by ctime DESC all_apk_versions_and_ctime.sort(key=lambda x: x[0], reverse=True) + # Remove all but the last three versions for version, _ in all_apk_versions_and_ctime[KEEP_FDROID_VERSIONS:]: for apk in glob.glob(os.path.join(fdroid_workspace, f'repo/session-{version}-*.apk')): From b0961b305629d390ded0e80625f93e9b54ae6461 Mon Sep 17 00:00:00 2001 From: SessionHero01 <180888785+SessionHero01@users.noreply.github.com> Date: Wed, 26 Nov 2025 09:12:44 +1100 Subject: [PATCH 3/4] Remove empty sub/unsub API requests (#1722) (cherry picked from commit 82f7adbf4925e833af76207cbe33f7e4e9484193) --- .../securesms/notifications/PushRegistrationHandler.kt | 1 - .../securesms/notifications/PushRegistrationWorker.kt | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationHandler.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationHandler.kt index 3208180414..da7ac580a4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationHandler.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationHandler.kt @@ -47,7 +47,6 @@ class PushRegistrationHandler @Inject constructor( @param:ManagerScope private val scope: CoroutineScope, @param:PushNotificationModule.PushProcessingSemaphore private val semaphore: Semaphore, - private val storage: StorageProtocol, private val pushRegistrationDatabase: PushRegistrationDatabase, ) : OnAppStartupComponent { diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationWorker.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationWorker.kt index 68b8f9a2f8..5a7a57c7de 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationWorker.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationWorker.kt @@ -24,7 +24,6 @@ import org.session.libsession.database.userAuth import org.session.libsession.messaging.sending_receiving.notifications.Response import org.session.libsession.snode.SwarmAuth import org.session.libsession.utilities.ConfigFactoryProtocol -import org.session.libsession.utilities.TextSecurePreferences import org.session.libsignal.exceptions.NonRetryableException import org.session.libsignal.utilities.AccountId import org.session.libsignal.utilities.IdPrefix @@ -172,6 +171,10 @@ class PushRegistrationWorker @AssistedInject constructor( buildRequest: (T) -> Req, sendBatchRequest: suspend (Collection) -> List, ): List>> { + if (items.isEmpty()) { + return emptyList() + } + val results = ArrayList>>(items.size) val batchRequestItems = mutableListOf() From a4a2813409de35d1a24b984d290591870284e2f4 Mon Sep 17 00:00:00 2001 From: SessionHero01 <180888785+SessionHero01@users.noreply.github.com> Date: Wed, 26 Nov 2025 09:57:02 +1100 Subject: [PATCH 4/4] Fixed compile issues after cherry-picking --- .../securesms/notifications/PushRegistrationHandler.kt | 2 +- .../securesms/notifications/PushRegistrationWorker.kt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationHandler.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationHandler.kt index da7ac580a4..2e904cec1d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationHandler.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationHandler.kt @@ -13,7 +13,6 @@ import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.filterNotNull import kotlinx.coroutines.flow.flatMapLatest -import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.onStart import kotlinx.coroutines.launch import kotlinx.coroutines.sync.Semaphore @@ -47,6 +46,7 @@ class PushRegistrationHandler @Inject constructor( @param:ManagerScope private val scope: CoroutineScope, @param:PushNotificationModule.PushProcessingSemaphore private val semaphore: Semaphore, + private val storage: StorageProtocol, private val pushRegistrationDatabase: PushRegistrationDatabase, ) : OnAppStartupComponent { diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationWorker.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationWorker.kt index 5a7a57c7de..97302d8337 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationWorker.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationWorker.kt @@ -24,6 +24,7 @@ import org.session.libsession.database.userAuth import org.session.libsession.messaging.sending_receiving.notifications.Response import org.session.libsession.snode.SwarmAuth import org.session.libsession.utilities.ConfigFactoryProtocol +import org.session.libsession.utilities.TextSecurePreferences import org.session.libsignal.exceptions.NonRetryableException import org.session.libsignal.utilities.AccountId import org.session.libsignal.utilities.IdPrefix