Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,10 @@ class PushRegistrationWorker @AssistedInject constructor(
buildRequest: (T) -> Req,
sendBatchRequest: suspend (Collection<Req>) -> List<Res>,
): List<Pair<T, kotlin.Result<Unit>>> {
if (items.isEmpty()) {
return emptyList()
}

val results = ArrayList<Pair<T, kotlin.Result<Unit>>>(items.size)

val batchRequestItems = mutableListOf<T>()
Expand Down
4 changes: 3 additions & 1 deletion scripts/build-and-release.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')):
Expand Down