From bc1bbc2f7011afba13c483409c368019c87512f8 Mon Sep 17 00:00:00 2001 From: KotlinGeekDev Date: Thu, 30 May 2024 16:01:22 +0100 Subject: [PATCH 1/2] Update to up-connector to v2.3.1. The JVM toolchain and Kotlin downgrade in 2.4.0 may not be good for Amethyst now. Will upgrade when everything has checked out. --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 44f70139a..90369520a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -36,7 +36,7 @@ secp256k1KmpJniAndroid = "0.15.0" securityCryptoKtx = "1.1.0-alpha06" spotless = "6.25.0" translate = "17.0.2" -unifiedpush = "2.2.0" +unifiedpush = "2.3.1" urlDetector = "0.1.23" vico-charts = "1.14.0" zelory = "3.0.1" From 8ae7f31c3d1e2872b2e0a6cc3348aa596daeaf79 Mon Sep 17 00:00:00 2001 From: KotlinGeekDev Date: Thu, 30 May 2024 16:04:30 +0100 Subject: [PATCH 2/2] Refactor getSavedDistributor(). It uses UnifiedPush.getSavedDistributor underneath to preserve pre-API change behaviour. --- .../amethyst/service/notifications/PushDistributorHandler.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushDistributorHandler.kt b/app/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushDistributorHandler.kt index d7a28413f..3a33a77f0 100644 --- a/app/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushDistributorHandler.kt +++ b/app/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushDistributorHandler.kt @@ -56,7 +56,7 @@ object PushDistributorHandler : PushDistributorActions { } override fun getSavedDistributor(): String { - return unifiedPush.getDistributor(appContext) + return unifiedPush.getSavedDistributor(appContext) ?: "" } fun savedDistributorExists(): Boolean = getSavedDistributor().isNotEmpty()