diff --git a/amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushDistributorHandler.kt b/amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushDistributorHandler.kt index 2bb1fdda0..8f832704e 100644 --- a/amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushDistributorHandler.kt +++ b/amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushDistributorHandler.kt @@ -89,14 +89,14 @@ object PushDistributorHandler : PushDistributorActions { override fun saveDistributor(distributor: String) { unifiedPush.saveDistributor(appContext(), distributor) - unifiedPush.registerApp(appContext()) + unifiedPush.register(appContext()) } override fun removeSavedDistributor() { - unifiedPush.safeRemoveDistributor(appContext()) + unifiedPush.removeDistributor(appContext()) } fun forceRemoveDistributor(context: Context) { - unifiedPush.forceRemoveDistributor(context) + UnifiedPush.removeDistributor(context) } } diff --git a/amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushMessageReceiver.kt b/amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushMessageReceiver.kt index 33b3ffdc7..eed9a8c81 100644 --- a/amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushMessageReceiver.kt +++ b/amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushMessageReceiver.kt @@ -34,7 +34,10 @@ import com.vitorpamplona.quartz.nip59Giftwrap.wraps.GiftWrapEvent import kotlinx.coroutines.CancellationException import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch +import org.unifiedpush.android.connector.FailedReason import org.unifiedpush.android.connector.MessagingReceiver +import org.unifiedpush.android.connector.data.PushEndpoint +import org.unifiedpush.android.connector.data.PushMessage class PushMessageReceiver : MessagingReceiver() { companion object { @@ -48,10 +51,10 @@ class PushMessageReceiver : MessagingReceiver() { override fun onMessage( context: Context, - message: ByteArray, + message: PushMessage, instance: String, ) { - val messageStr = message.decodeToString() + val messageStr = message.content.decodeToString() Log.d(TAG, "New message $messageStr for Instance: $instance") scope.launch { try { @@ -81,10 +84,10 @@ class PushMessageReceiver : MessagingReceiver() { override fun onNewEndpoint( context: Context, - endpoint: String, + endpoint: PushEndpoint, instance: String, ) { - val sanitizedEndpoint = if (endpoint.endsWith("?up=1")) endpoint.dropLast(5) else endpoint + val sanitizedEndpoint = if (endpoint.url.endsWith("?up=1")) endpoint.url.dropLast(5) else endpoint.url if (sanitizedEndpoint != pushHandler.getSavedEndpoint()) { Log.d(TAG, "New endpoint provided:- $endpoint for Instance: $instance ${pushHandler.getSavedEndpoint()} $sanitizedEndpoint") pushHandler.setEndpoint(sanitizedEndpoint) @@ -102,6 +105,7 @@ class PushMessageReceiver : MessagingReceiver() { override fun onRegistrationFailed( context: Context, + reason: FailedReason, instance: String, ) { Log.d(TAG, "Registration failed for Instance: $instance") diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/pip/PipVideoActivity.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/pip/PipVideoActivity.kt index 8a1ff7d23..3cde5e550 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/pip/PipVideoActivity.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/pip/PipVideoActivity.kt @@ -67,11 +67,6 @@ class PipVideoActivity : ComponentActivity() { super.finish() } - override fun onBackPressed() { - super.onBackPressed() - finishAndRemoveTask() - } - override fun onUserLeaveHint() { super.onUserLeaveHint() finishAndRemoveTask() diff --git a/amethyst/src/test/java/com/vitorpamplona/amethyst/ui/components/MediaCompressorTest.kt b/amethyst/src/test/java/com/vitorpamplona/amethyst/ui/components/MediaCompressorTest.kt index 3716170c4..5b07e82f2 100644 --- a/amethyst/src/test/java/com/vitorpamplona/amethyst/ui/components/MediaCompressorTest.kt +++ b/amethyst/src/test/java/com/vitorpamplona/amethyst/ui/components/MediaCompressorTest.kt @@ -81,7 +81,7 @@ class MediaCompressorTest { ) // Verify - verify(exactly = 0) { VideoCompressor.start(any(), any(), any(), any(), any(), any(), any()) } + verify(exactly = 0) { VideoCompressor.start(any(), any(), any(), any(), any(), any()) } coVerify(exactly = 0) { Compressor.compress(any(), any(), any(), any()) } } @@ -102,7 +102,7 @@ class MediaCompressorTest { ) // Verify - verify(exactly = 0) { VideoCompressor.start(any(), any(), any(), any(), any(), any(), any()) } + verify(exactly = 0) { VideoCompressor.start(any(), any(), any(), any(), any(), any()) } coVerify(exactly = 0) { Compressor.compress(any(), any(), any(), any()) } } @@ -115,7 +115,7 @@ class MediaCompressorTest { val uri = mockk() val contentType = "video" - every { VideoCompressor.start(any(), any(), any(), any(), any(), any(), any()) } returns Unit + every { VideoCompressor.start(any(), any(), any(), any(), any(), any()) } returns Unit // Execution MediaCompressor().compress( @@ -126,7 +126,7 @@ class MediaCompressorTest { ) // Verify - verify(exactly = 1) { VideoCompressor.start(any(), any(), any(), any(), any(), any(), any()) } + verify(exactly = 1) { VideoCompressor.start(any(), any(), any(), any(), any(), any()) } } @Test diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ac89c22fb..af738062c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,56 +2,56 @@ accompanistAdaptive = "0.37.3" activityCompose = "1.10.1" agp = "8.11.0" -android-compileSdk = "35" +android-compileSdk = "36" android-minSdk = "26" -android-targetSdk = "35" +android-targetSdk = "36" androidKotlinGeohash = "b481c6a64e" androidxJunit = "1.2.1" -appcompat = "1.7.0" -audiowaveform = "1.1.1" +appcompat = "1.7.1" +audiowaveform = "1.1.2" benchmark = "1.3.4" benchmarkJunit4 = "1.3.4" biometricKtx = "1.2.0-alpha05" coil = "3.2.0" -composeBom = "2025.05.00" +composeBom = "2025.06.01" coreKtx = "1.16.0" espressoCore = "3.6.1" -firebaseBom = "33.13.0" -fragmentKtx = "1.8.6" -gms = "4.4.2" -jacksonModuleKotlin = "2.19.0" +firebaseBom = "33.16.0" +fragmentKtx = "1.8.8" +gms = "4.4.3" +jacksonModuleKotlin = "2.19.1" jna = "5.17.0" jtorctl = "0.4.5.7" junit = "4.13.2" -kotlin = "2.1.0" +kotlin = "2.2.0" kotlinxCollectionsImmutable = "0.4.0" -kotlinxSerialization = "1.8.1" -kotlinxSerializationPlugin = "2.0.0" +kotlinxSerialization = "1.9.0" +kotlinxSerializationPlugin = "2.2.0" languageId = "17.0.6" -lazysodiumAndroid = "5.1.0" -lifecycleRuntimeKtx = "2.9.0" -lightcompressor = "1.3.2" +lazysodiumAndroid = "5.2.0" +lifecycleRuntimeKtx = "2.9.1" +lightcompressor = "1.3.3" markdown = "e1151c8" media3 = "1.7.1" -mockk = "1.14.2" +mockk = "1.14.4" kotlinx-coroutines-test = "1.10.2" navigationCompose = "2.9.0" -okhttp = "5.0.0-alpha.14" +okhttp = "5.0.0-alpha.17" runner = "1.6.2" rfc3986 = "0.1.2" -secp256k1KmpJniAndroid = "0.17.3" -securityCryptoKtx = "1.1.0-alpha07" -spotless = "6.25.0" -torAndroid = "0.4.8.12" +secp256k1KmpJniAndroid = "0.18.0" +securityCryptoKtx = "1.1.0-beta01" +spotless = "7.0.4" +torAndroid = "0.4.8.16.2" translate = "17.0.3" -unifiedpush = "2.3.1" +unifiedpush = "3.0.10" urlDetector = "0.1.23" -vico-charts = "2.1.2" +vico-charts = "2.1.3" zelory = "3.0.1" -zoomable = "2.7.0" +zoomable = "2.8.1" zxing = "3.5.3" zxingAndroidEmbedded = "4.3.0" -windowCoreAndroid = "1.3.0" +windowCoreAndroid = "1.4.0" androidxCamera = "1.4.2" [libraries]