Skip to content

Commit 0a00655

Browse files
Prepare for release 1.29.3 (#1723)
* Bump release to 1.29.3 * Fix build script to remove old versions of fdroid releases * Remove empty sub/unsub API requests (#1722) (cherry picked from commit 82f7adb) * Fixed compile issues after cherry-picking
2 parents dbde1fd + a4a2813 commit 0a00655

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ configurations.configureEach {
2626
exclude(module = "commons-logging")
2727
}
2828

29-
val canonicalVersionCode = 431
30-
val canonicalVersionName = "1.29.2"
29+
val canonicalVersionCode = 432
30+
val canonicalVersionName = "1.29.3"
3131

3232
val postFixSize = 10
3333
val abiPostFix = mapOf(

app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationHandler.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import kotlinx.coroutines.flow.emptyFlow
1313
import kotlinx.coroutines.flow.filter
1414
import kotlinx.coroutines.flow.filterNotNull
1515
import kotlinx.coroutines.flow.flatMapLatest
16-
import kotlinx.coroutines.flow.map
1716
import kotlinx.coroutines.flow.onStart
1817
import kotlinx.coroutines.launch
1918
import kotlinx.coroutines.sync.Semaphore

app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationWorker.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,10 @@ class PushRegistrationWorker @AssistedInject constructor(
172172
buildRequest: (T) -> Req,
173173
sendBatchRequest: suspend (Collection<Req>) -> List<Res>,
174174
): List<Pair<T, kotlin.Result<Unit>>> {
175+
if (items.isEmpty()) {
176+
return emptyList()
177+
}
178+
175179
val results = ArrayList<Pair<T, kotlin.Result<Unit>>>(items.size)
176180

177181
val batchRequestItems = mutableListOf<T>()

scripts/build-and-release.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,11 @@ def update_fdroid(build: BuildResult, fdroid_workspace: str, creds: BuildCredent
151151

152152
# Make sure there are only last three versions of APKs
153153
all_apk_versions_and_ctime = [(re.search(r'session-(.+?)-', os.path.basename(name)).group(1), os.path.getmtime(name))
154-
for name in glob.glob(os.path.join(fdroid_workspace, 'repo/session-*-arm64-v8a.apk'))]
154+
for name in glob.glob(os.path.join(fdroid_workspace, 'repo/session-*-arm64-v8a*.apk'))]
155+
155156
# Sort by ctime DESC
156157
all_apk_versions_and_ctime.sort(key=lambda x: x[0], reverse=True)
158+
157159
# Remove all but the last three versions
158160
for version, _ in all_apk_versions_and_ctime[KEEP_FDROID_VERSIONS:]:
159161
for apk in glob.glob(os.path.join(fdroid_workspace, f'repo/session-{version}-*.apk')):

0 commit comments

Comments
 (0)