From 15d6e46ec2cc4d8757a9a8ad1237b8da995709be Mon Sep 17 00:00:00 2001 From: LooKeR Date: Sat, 21 Dec 2024 16:38:06 +0530 Subject: [PATCH 1/2] Properly setup Service::onTimeout --- .../kotlin/com/looker/droidify/service/DownloadService.kt | 6 ++++++ .../main/kotlin/com/looker/droidify/service/SyncService.kt | 6 ++++++ .../main/kotlin/com/looker/sync/fdroid/v2/EntrySyncable.kt | 2 -- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/looker/droidify/service/DownloadService.kt b/app/src/main/kotlin/com/looker/droidify/service/DownloadService.kt index fe71c38f..9c0d0a9b 100644 --- a/app/src/main/kotlin/com/looker/droidify/service/DownloadService.kt +++ b/app/src/main/kotlin/com/looker/droidify/service/DownloadService.kt @@ -188,6 +188,12 @@ class DownloadService : ConnectionService() { } } + override fun onTimeout(startId: Int) { + super.onTimeout(startId) + onDestroy() + stopSelf() + } + override fun onDestroy() { super.onDestroy() cancelTasks(null) diff --git a/app/src/main/kotlin/com/looker/droidify/service/SyncService.kt b/app/src/main/kotlin/com/looker/droidify/service/SyncService.kt index c1710d81..1f6201ce 100644 --- a/app/src/main/kotlin/com/looker/droidify/service/SyncService.kt +++ b/app/src/main/kotlin/com/looker/droidify/service/SyncService.kt @@ -216,6 +216,12 @@ class SyncService : ConnectionService() { } } + override fun onTimeout(startId: Int) { + super.onTimeout(startId) + onDestroy() + stopSelf() + } + override fun onDestroy() { super.onDestroy() downloadConnection.unbind(this) diff --git a/sync/fdroid/src/main/kotlin/com/looker/sync/fdroid/v2/EntrySyncable.kt b/sync/fdroid/src/main/kotlin/com/looker/sync/fdroid/v2/EntrySyncable.kt index 2a5632d8..d78927c6 100644 --- a/sync/fdroid/src/main/kotlin/com/looker/sync/fdroid/v2/EntrySyncable.kt +++ b/sync/fdroid/src/main/kotlin/com/looker/sync/fdroid/v2/EntrySyncable.kt @@ -16,8 +16,6 @@ import com.looker.sync.fdroid.v2.model.Entry import com.looker.sync.fdroid.v2.model.IndexV2 import com.looker.sync.fdroid.v2.model.IndexV2Diff import kotlinx.coroutines.CoroutineDispatcher -import kotlinx.coroutines.async -import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.json.Json From c7849df0ca79bb326644bc67eebf94b446a4c0dd Mon Sep 17 00:00:00 2001 From: LooKeR Date: Sat, 21 Dec 2024 16:53:10 +0530 Subject: [PATCH 2/2] Upgrade sdk to 25 --- build-logic/structure/src/main/kotlin/DefaultConfig.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-logic/structure/src/main/kotlin/DefaultConfig.kt b/build-logic/structure/src/main/kotlin/DefaultConfig.kt index 23c6c913..67a72306 100644 --- a/build-logic/structure/src/main/kotlin/DefaultConfig.kt +++ b/build-logic/structure/src/main/kotlin/DefaultConfig.kt @@ -1,8 +1,8 @@ object DefaultConfig { // Update [release_build.yml] along with this - const val buildTools: String = "34.0.0" + const val buildTools: String = "35.0.0" const val appId = "com.looker.droidify" - const val compileSdk = 34 + const val compileSdk = 35 const val minSdk = 23 // Check for TODOs before update const val versionCode = 630