From b582d6516a312405a4bc402e2d85eceb187794c5 Mon Sep 17 00:00:00 2001 From: PetarVelikov Date: Fri, 17 Jan 2025 12:42:39 +0100 Subject: [PATCH] [AND-209] Revert public api changes. --- gradle/libs.versions.toml | 2 - .../android/stream-android-push-firebase.api | 42 ++--------- .../api/jvm/stream-android-push-firebase.api | 47 ------------- stream-android-push-firebase/build.gradle.kts | 2 - .../firebase/ChatFirebaseMessagingService.kt | 20 +----- .../firebase/FirebaseMessagingDelegate.kt | 28 ++++---- .../firebase/FirebasePushDeviceGenerator.kt | 70 +++++++++++++++++++ .../firebase/FirebasePushDeviceGenerator.kt | 62 ---------------- .../push/firebase/StreamRemoteMessage.kt | 30 -------- .../android/stream-android-push-huawei.api | 5 +- .../push/huawei/HuaweiPushDeviceGenerator.kt | 15 ++-- .../android/stream-android-push-xiaomi.api | 6 +- .../push/xiaomi/XiaomiPushDeviceGenerator.kt | 12 ++-- .../api/android/stream-android-push.api | 2 +- .../api/jvm/stream-android-push.api | 2 +- .../android/push/PushDeviceGenerator.kt | 6 +- 16 files changed, 114 insertions(+), 237 deletions(-) rename stream-android-push-firebase/src/{commonMain => androidMain}/kotlin/io/getstream/android/push/firebase/FirebaseMessagingDelegate.kt (75%) create mode 100644 stream-android-push-firebase/src/androidMain/kotlin/io/getstream/android/push/firebase/FirebasePushDeviceGenerator.kt delete mode 100644 stream-android-push-firebase/src/commonMain/kotlin/io/getstream/android/push/firebase/FirebasePushDeviceGenerator.kt delete mode 100644 stream-android-push-firebase/src/commonMain/kotlin/io/getstream/android/push/firebase/StreamRemoteMessage.kt diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 734c1c3..750d939 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,5 @@ [versions] activityKtx = "1.8.0" -firebaseMessaging = "2.1.0" firebaseMessagingVersion = "23.3.1" kotlinxCoroutinesCore = "1.9.0" startupRuntime = "1.1.1" @@ -38,7 +37,6 @@ mockitoKotlin = "4.1.0" [libraries] androidx-startup-runtime = { module = "androidx.startup:startup-runtime", version.ref = "startupRuntime" } androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "activityKtx" } -firebase-messaging = { module = "dev.gitlive:firebase-messaging", version.ref = "firebaseMessaging" } google-firebase-messaging = { module = "com.google.firebase:firebase-messaging", version.ref = "firebaseMessagingVersion" } stream-log = { group = "io.getstream", name = "stream-log", version.ref = "streamLog" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidxAppCompat" } diff --git a/stream-android-push-firebase/api/android/stream-android-push-firebase.api b/stream-android-push-firebase/api/android/stream-android-push-firebase.api index 7b79068..e67dac8 100644 --- a/stream-android-push-firebase/api/android/stream-android-push-firebase.api +++ b/stream-android-push-firebase/api/android/stream-android-push-firebase.api @@ -1,47 +1,15 @@ public final class io/getstream/android/push/firebase/FirebaseMessagingDelegate { public static final field INSTANCE Lio/getstream/android/push/firebase/FirebaseMessagingDelegate; - public static final fun handleRemoteMessage (Lio/getstream/android/push/firebase/StreamRemoteMessage;)Z + public static final fun handleRemoteMessage (Lcom/google/firebase/messaging/RemoteMessage;)Z public static final fun registerFirebaseToken (Ljava/lang/String;Ljava/lang/String;)V } public final class io/getstream/android/push/firebase/FirebasePushDeviceGenerator : io/getstream/android/push/PushDeviceGenerator { - public fun (Ldev/gitlive/firebase/messaging/FirebaseMessaging;Ljava/lang/String;)V - public fun (Ldev/gitlive/firebase/messaging/FirebaseMessaging;Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V - public synthetic fun (Ldev/gitlive/firebase/messaging/FirebaseMessaging;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun (Ljava/lang/String;)V - public fun generatePushDevice (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + public fun (Lcom/google/firebase/messaging/FirebaseMessaging;Ljava/lang/String;Landroid/content/Context;)V + public synthetic fun (Lcom/google/firebase/messaging/FirebaseMessaging;Ljava/lang/String;Landroid/content/Context;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (Ljava/lang/String;Landroid/content/Context;)V + public fun asyncGeneratePushDevice (Lkotlin/jvm/functions/Function1;)V public fun isValidForThisDevice ()Z public fun onPushDeviceGeneratorSelected ()V } -public final class io/getstream/android/push/firebase/StreamRemoteMessage { - public fun (Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JIII)V - public final fun component1 ()Ljava/util/Map; - public final fun component10 ()I - public final fun component11 ()I - public final fun component2 ()Ljava/lang/String; - public final fun component3 ()Ljava/lang/String; - public final fun component4 ()Ljava/lang/String; - public final fun component5 ()Ljava/lang/String; - public final fun component6 ()Ljava/lang/String; - public final fun component7 ()Ljava/lang/String; - public final fun component8 ()J - public final fun component9 ()I - public final fun copy (Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JIII)Lio/getstream/android/push/firebase/StreamRemoteMessage; - public static synthetic fun copy$default (Lio/getstream/android/push/firebase/StreamRemoteMessage;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JIIIILjava/lang/Object;)Lio/getstream/android/push/firebase/StreamRemoteMessage; - public fun equals (Ljava/lang/Object;)Z - public final fun getCollapseKey ()Ljava/lang/String; - public final fun getData ()Ljava/util/Map; - public final fun getFrom ()Ljava/lang/String; - public final fun getMessageId ()Ljava/lang/String; - public final fun getMessageType ()Ljava/lang/String; - public final fun getOriginalPriority ()I - public final fun getPriority ()I - public final fun getSenderId ()Ljava/lang/String; - public final fun getSentTime ()J - public final fun getTo ()Ljava/lang/String; - public final fun getTtl ()I - public fun hashCode ()I - public fun toString ()Ljava/lang/String; -} - diff --git a/stream-android-push-firebase/api/jvm/stream-android-push-firebase.api b/stream-android-push-firebase/api/jvm/stream-android-push-firebase.api index 7b79068..e69de29 100644 --- a/stream-android-push-firebase/api/jvm/stream-android-push-firebase.api +++ b/stream-android-push-firebase/api/jvm/stream-android-push-firebase.api @@ -1,47 +0,0 @@ -public final class io/getstream/android/push/firebase/FirebaseMessagingDelegate { - public static final field INSTANCE Lio/getstream/android/push/firebase/FirebaseMessagingDelegate; - public static final fun handleRemoteMessage (Lio/getstream/android/push/firebase/StreamRemoteMessage;)Z - public static final fun registerFirebaseToken (Ljava/lang/String;Ljava/lang/String;)V -} - -public final class io/getstream/android/push/firebase/FirebasePushDeviceGenerator : io/getstream/android/push/PushDeviceGenerator { - public fun (Ldev/gitlive/firebase/messaging/FirebaseMessaging;Ljava/lang/String;)V - public fun (Ldev/gitlive/firebase/messaging/FirebaseMessaging;Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V - public synthetic fun (Ldev/gitlive/firebase/messaging/FirebaseMessaging;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun (Ljava/lang/String;)V - public fun generatePushDevice (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - public fun isValidForThisDevice ()Z - public fun onPushDeviceGeneratorSelected ()V -} - -public final class io/getstream/android/push/firebase/StreamRemoteMessage { - public fun (Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JIII)V - public final fun component1 ()Ljava/util/Map; - public final fun component10 ()I - public final fun component11 ()I - public final fun component2 ()Ljava/lang/String; - public final fun component3 ()Ljava/lang/String; - public final fun component4 ()Ljava/lang/String; - public final fun component5 ()Ljava/lang/String; - public final fun component6 ()Ljava/lang/String; - public final fun component7 ()Ljava/lang/String; - public final fun component8 ()J - public final fun component9 ()I - public final fun copy (Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JIII)Lio/getstream/android/push/firebase/StreamRemoteMessage; - public static synthetic fun copy$default (Lio/getstream/android/push/firebase/StreamRemoteMessage;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JIIIILjava/lang/Object;)Lio/getstream/android/push/firebase/StreamRemoteMessage; - public fun equals (Ljava/lang/Object;)Z - public final fun getCollapseKey ()Ljava/lang/String; - public final fun getData ()Ljava/util/Map; - public final fun getFrom ()Ljava/lang/String; - public final fun getMessageId ()Ljava/lang/String; - public final fun getMessageType ()Ljava/lang/String; - public final fun getOriginalPriority ()I - public final fun getPriority ()I - public final fun getSenderId ()Ljava/lang/String; - public final fun getSentTime ()J - public final fun getTo ()Ljava/lang/String; - public final fun getTtl ()I - public fun hashCode ()I - public fun toString ()Ljava/lang/String; -} - diff --git a/stream-android-push-firebase/build.gradle.kts b/stream-android-push-firebase/build.gradle.kts index d7085ed..1bc5fe0 100644 --- a/stream-android-push-firebase/build.gradle.kts +++ b/stream-android-push-firebase/build.gradle.kts @@ -81,8 +81,6 @@ kotlin { dependencies { api(project(":stream-android-push")) implementation(project(":stream-android-push-delegate")) - - api(libs.firebase.messaging) implementation(libs.kotlinx.coroutines) implementation(libs.stream.log) } diff --git a/stream-android-push-firebase/src/androidMain/kotlin/io/getstream/android/push/firebase/ChatFirebaseMessagingService.kt b/stream-android-push-firebase/src/androidMain/kotlin/io/getstream/android/push/firebase/ChatFirebaseMessagingService.kt index b227caa..c8ee8b1 100644 --- a/stream-android-push-firebase/src/androidMain/kotlin/io/getstream/android/push/firebase/ChatFirebaseMessagingService.kt +++ b/stream-android-push-firebase/src/androidMain/kotlin/io/getstream/android/push/firebase/ChatFirebaseMessagingService.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2022 Stream.io Inc. All rights reserved. + * Copyright (c) 2014-2025 Stream.io Inc. All rights reserved. * * Licensed under the Stream License; * you may not use this file except in compliance with the License. @@ -25,7 +25,7 @@ internal class ChatFirebaseMessagingService : FirebaseMessagingService() { override fun onMessageReceived(remoteMessage: RemoteMessage) { logger.d { "[onFirebaseMessageReceived] remoteMessage: $remoteMessage" } try { - FirebaseMessagingDelegate.handleRemoteMessage(remoteMessage.toStreamRemoteMessage()) + FirebaseMessagingDelegate.handleRemoteMessage(remoteMessage) .also { when (it) { true -> logger.d { "[onFirebaseMessageReceived] message handled successfully" } @@ -47,19 +47,3 @@ internal class ChatFirebaseMessagingService : FirebaseMessagingService() { } } } - -private fun RemoteMessage.toStreamRemoteMessage(): StreamRemoteMessage { - return StreamRemoteMessage( - data = data, - senderId = senderId, - from = from, - to = to, - messageType = messageType, - messageId = messageId, - collapseKey = collapseKey, - sentTime = sentTime, - ttl = ttl, - priority = priority, - originalPriority = originalPriority - ) -} diff --git a/stream-android-push-firebase/src/commonMain/kotlin/io/getstream/android/push/firebase/FirebaseMessagingDelegate.kt b/stream-android-push-firebase/src/androidMain/kotlin/io/getstream/android/push/firebase/FirebaseMessagingDelegate.kt similarity index 75% rename from stream-android-push-firebase/src/commonMain/kotlin/io/getstream/android/push/firebase/FirebaseMessagingDelegate.kt rename to stream-android-push-firebase/src/androidMain/kotlin/io/getstream/android/push/firebase/FirebaseMessagingDelegate.kt index caecb0c..9bb2073 100644 --- a/stream-android-push-firebase/src/commonMain/kotlin/io/getstream/android/push/firebase/FirebaseMessagingDelegate.kt +++ b/stream-android-push-firebase/src/androidMain/kotlin/io/getstream/android/push/firebase/FirebaseMessagingDelegate.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2022 Stream.io Inc. All rights reserved. + * Copyright (c) 2014-2025 Stream.io Inc. All rights reserved. * * Licensed under the Stream License; * you may not use this file except in compliance with the License. @@ -15,41 +15,41 @@ */ package io.getstream.android.push.firebase +import com.google.firebase.messaging.RemoteMessage import io.getstream.android.push.PushDevice import io.getstream.android.push.PushProvider import io.getstream.android.push.delegate.PushDelegateProvider import io.getstream.log.StreamLog -import kotlin.jvm.JvmStatic /** * Helper class for delegating Firebase push messages to the Stream Chat SDK. */ public object FirebaseMessagingDelegate { + internal var fallbackProviderName: String? = null private val logger = StreamLog.getLogger("Push:Firebase") /** - * Handles [streamRemoteMessage] from Firebase. - * If the [streamRemoteMessage] wasn't sent from the Stream Server and doesn't contain the needed data, + * Handles [remoteMessage] from Firebase. + * If the [remoteMessage] wasn't sent from the Stream Server and doesn't contain the needed data, * return false to notify you that this remoteMessage needs to be handled by you. * - * @param streamRemoteMessage The message to be handled. - * @return True if the [streamRemoteMessage] was sent from the Stream Server and has been handled. + * @param remoteMessage The message to be handled. + * @return True if the [remoteMessage] was sent from the Stream Server and has been handled. */ @JvmStatic - public fun handleRemoteMessage(streamRemoteMessage: StreamRemoteMessage): Boolean { - logger.d { "[handleRemoteMessage] handling remote message: $streamRemoteMessage" } + public fun handleRemoteMessage(remoteMessage: RemoteMessage): Boolean { + logger.d { "[handleRemoteMessage] handling remote message: $remoteMessage" } return PushDelegateProvider.delegates.any { pushDelegate -> pushDelegate.handlePushMessage( - metadata = streamRemoteMessage.extractMetadata(), - payload = streamRemoteMessage.data + metadata = remoteMessage.extractMetadata(), + payload = remoteMessage.data ).also { handled -> if (handled) logger.d { "[handleRemoteMessage] message handled successfully by $pushDelegate" } } + }.also { handled -> + if (!handled) logger.d { "[handleRemoteMessage] message was not handled by any Push Delete" } } - .also { handled -> - if (!handled) logger.d { "[handleRemoteMessage] message was not handled by any Push Delegate" } - } } /** @@ -76,7 +76,7 @@ public object FirebaseMessagingDelegate { } } - private fun StreamRemoteMessage.extractMetadata(): Map { + private fun RemoteMessage.extractMetadata(): Map { return hashMapOf().apply { senderId?.also { put("firebase.sender_id", it) } from?.also { put("firebase.from", it) } diff --git a/stream-android-push-firebase/src/androidMain/kotlin/io/getstream/android/push/firebase/FirebasePushDeviceGenerator.kt b/stream-android-push-firebase/src/androidMain/kotlin/io/getstream/android/push/firebase/FirebasePushDeviceGenerator.kt new file mode 100644 index 0000000..15ba720 --- /dev/null +++ b/stream-android-push-firebase/src/androidMain/kotlin/io/getstream/android/push/firebase/FirebasePushDeviceGenerator.kt @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2014-2025 Stream.io Inc. All rights reserved. + * + * Licensed under the Stream License; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://github.com/GetStream/stream-android-push/blob/main/LICENSE + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.getstream.android.push.firebase + +import android.content.Context +import com.google.android.gms.common.ConnectionResult +import com.google.android.gms.common.GoogleApiAvailabilityLight +import com.google.firebase.messaging.FirebaseMessaging +import io.getstream.android.push.PushDevice +import io.getstream.android.push.PushDeviceGenerator +import io.getstream.android.push.PushProvider +import io.getstream.log.StreamLog + +/** + * Generator responsible for providing information needed to register Firebase push notifications provider + * + * @param firebaseMessaging The [FirebaseMessaging] instance used for retrieving the token. + * @param providerName The push provider name. + * @param context The context used to check if Firebase is available on this device. + */ +public class FirebasePushDeviceGenerator @JvmOverloads constructor( + private val firebaseMessaging: FirebaseMessaging = FirebaseMessaging.getInstance(), + private val providerName: String, + private val context: Context +) : PushDeviceGenerator { + + private val logger = StreamLog.getLogger("Push:Firebase") + + override fun isValidForThisDevice(): Boolean { + val isValidForThisDevice = + GoogleApiAvailabilityLight.getInstance().isGooglePlayServicesAvailable(context) == ConnectionResult.SUCCESS + logger.i { "Is Firebase available on on this device -> $isValidForThisDevice" } + return isValidForThisDevice + } + + override fun onPushDeviceGeneratorSelected() { + FirebaseMessagingDelegate.fallbackProviderName = providerName + } + + override fun asyncGeneratePushDevice(onPushDeviceGenerated: (pushDevice: PushDevice) -> Unit) { + logger.i { "Getting Firebase token" } + firebaseMessaging.token.addOnCompleteListener { + if (it.isSuccessful) { + logger.i { "Firebase returned token successfully" } + onPushDeviceGenerated( + PushDevice( + token = it.result, + pushProvider = PushProvider.FIREBASE, + providerName = providerName + ) + ) + } else { + logger.i { "Error: Firebase didn't returned token" } + } + } + } +} diff --git a/stream-android-push-firebase/src/commonMain/kotlin/io/getstream/android/push/firebase/FirebasePushDeviceGenerator.kt b/stream-android-push-firebase/src/commonMain/kotlin/io/getstream/android/push/firebase/FirebasePushDeviceGenerator.kt deleted file mode 100644 index f1f597a..0000000 --- a/stream-android-push-firebase/src/commonMain/kotlin/io/getstream/android/push/firebase/FirebasePushDeviceGenerator.kt +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2014-2022 Stream.io Inc. All rights reserved. - * - * Licensed under the Stream License; - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://github.com/GetStream/stream-android-push/blob/main/LICENSE - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package io.getstream.android.push.firebase - -import dev.gitlive.firebase.Firebase -import dev.gitlive.firebase.messaging.FirebaseMessaging -import dev.gitlive.firebase.messaging.messaging -import io.getstream.android.push.PushDevice -import io.getstream.android.push.PushDeviceGenerator -import io.getstream.android.push.PushProvider -import io.getstream.log.StreamLog -import kotlin.jvm.JvmOverloads - -/** - * Generator responsible for providing information needed to register Firebase push notifications provider - */ -public class FirebasePushDeviceGenerator @JvmOverloads constructor( - private val firebaseMessaging: FirebaseMessaging = Firebase.messaging, - private val providerName: String, - private val isValidForThisDevice: () -> Boolean = { true } -) : PushDeviceGenerator { - private val logger = StreamLog.getLogger("Push:Firebase") - - override fun isValidForThisDevice(): Boolean = - isValidForThisDevice.invoke().also { - logger.i { "Is Firebase available on this device -> $it" } - } - - override fun onPushDeviceGeneratorSelected() { - FirebaseMessagingDelegate.fallbackProviderName = providerName - } - - override suspend fun generatePushDevice(onPushDeviceGenerated: (pushDevice: PushDevice) -> Unit) { - logger.i { "Getting Firebase token" } - try { - val token = firebaseMessaging.getToken() - logger.i { "Firebase returned token successfully" } - onPushDeviceGenerated( - PushDevice( - token = token, - pushProvider = PushProvider.FIREBASE, - providerName = providerName - ) - ) - } catch (e: Exception) { - logger.i { "Error: Firebase didn't returned token, $e" } - } - } -} diff --git a/stream-android-push-firebase/src/commonMain/kotlin/io/getstream/android/push/firebase/StreamRemoteMessage.kt b/stream-android-push-firebase/src/commonMain/kotlin/io/getstream/android/push/firebase/StreamRemoteMessage.kt deleted file mode 100644 index a0c7645..0000000 --- a/stream-android-push-firebase/src/commonMain/kotlin/io/getstream/android/push/firebase/StreamRemoteMessage.kt +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2014-2024 Stream.io Inc. All rights reserved. - * - * Licensed under the Stream License; - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://github.com/GetStream/stream-android-push/blob/main/LICENSE - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package io.getstream.android.push.firebase - -public data class StreamRemoteMessage( - val data: Map, - val senderId: String?, - val from: String?, - val to: String?, - val messageType: String?, - val messageId: String?, - val collapseKey: String?, - val sentTime: Long, - val ttl: Int, - val priority: Int, - val originalPriority: Int -) diff --git a/stream-android-push-huawei/api/android/stream-android-push-huawei.api b/stream-android-push-huawei/api/android/stream-android-push-huawei.api index dfa9491..a992498 100644 --- a/stream-android-push-huawei/api/android/stream-android-push-huawei.api +++ b/stream-android-push-huawei/api/android/stream-android-push-huawei.api @@ -5,9 +5,8 @@ public final class io/getstream/android/push/huawei/HuaweiMessagingDelegate { } public final class io/getstream/android/push/huawei/HuaweiPushDeviceGenerator : io/getstream/android/push/PushDeviceGenerator { - public fun (Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V - public synthetic fun (Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun generatePushDevice (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + public fun (Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V + public fun asyncGeneratePushDevice (Lkotlin/jvm/functions/Function1;)V public fun isValidForThisDevice ()Z public fun onPushDeviceGeneratorSelected ()V } diff --git a/stream-android-push-huawei/src/androidMain/kotlin/io/getstream/android/push/huawei/HuaweiPushDeviceGenerator.kt b/stream-android-push-huawei/src/androidMain/kotlin/io/getstream/android/push/huawei/HuaweiPushDeviceGenerator.kt index ef68d3e..9dabb3f 100644 --- a/stream-android-push-huawei/src/androidMain/kotlin/io/getstream/android/push/huawei/HuaweiPushDeviceGenerator.kt +++ b/stream-android-push-huawei/src/androidMain/kotlin/io/getstream/android/push/huawei/HuaweiPushDeviceGenerator.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2022 Stream.io Inc. All rights reserved. + * Copyright (c) 2014-2025 Stream.io Inc. All rights reserved. * * Licensed under the Stream License; * you may not use this file except in compliance with the License. @@ -17,6 +17,8 @@ package io.getstream.android.push.huawei import android.content.Context import com.huawei.hms.aaid.HmsInstanceId +import com.huawei.hms.api.ConnectionResult.SUCCESS +import com.huawei.hms.api.HuaweiApiAvailability import io.getstream.android.push.PushDevice import io.getstream.android.push.PushDeviceGenerator import io.getstream.android.push.PushProvider @@ -30,24 +32,23 @@ import kotlinx.coroutines.launch * Generator responsible for providing information needed to register Huawei push notifications provider */ public class HuaweiPushDeviceGenerator( - context: Context, + private val context: Context, private val appId: String, - private val providerName: String, - private val isValidForThisDevice: () -> Boolean = { true } + private val providerName: String ) : PushDeviceGenerator { private val logger = StreamLog.getLogger("Push:Huawei") private val hmsInstanceId: HmsInstanceId = HmsInstanceId.getInstance(context) override fun isValidForThisDevice(): Boolean = - isValidForThisDevice.invoke().also { - logger.i { "Is Huawei available on this device -> $it" } + (HuaweiApiAvailability.getInstance().isHuaweiMobileServicesAvailable(context) == SUCCESS).also { + logger.i { "Is Huawei available on on this device -> $it" } } override fun onPushDeviceGeneratorSelected() { HuaweiMessagingDelegate.fallbackProviderName = providerName } - override suspend fun generatePushDevice(onPushDeviceGenerated: (pushDevice: PushDevice) -> Unit) { + override fun asyncGeneratePushDevice(onPushDeviceGenerated: (pushDevice: PushDevice) -> Unit) { logger.i { "Getting Huawei token" } @OptIn(DelicateCoroutinesApi::class) diff --git a/stream-android-push-xiaomi/api/android/stream-android-push-xiaomi.api b/stream-android-push-xiaomi/api/android/stream-android-push-xiaomi.api index 04a0411..6103ff8 100644 --- a/stream-android-push-xiaomi/api/android/stream-android-push-xiaomi.api +++ b/stream-android-push-xiaomi/api/android/stream-android-push-xiaomi.api @@ -11,9 +11,9 @@ public final class io/getstream/android/push/xiaomi/XiaomiMessagingDelegate { } public final class io/getstream/android/push/xiaomi/XiaomiPushDeviceGenerator : io/getstream/android/push/PushDeviceGenerator { - public fun (Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/xiaomi/channel/commonutils/android/Region;Lkotlin/jvm/functions/Function0;)V - public synthetic fun (Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/xiaomi/channel/commonutils/android/Region;Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun generatePushDevice (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + public fun (Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/xiaomi/channel/commonutils/android/Region;)V + public synthetic fun (Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/xiaomi/channel/commonutils/android/Region;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun asyncGeneratePushDevice (Lkotlin/jvm/functions/Function1;)V public fun isValidForThisDevice ()Z public fun onPushDeviceGeneratorSelected ()V } diff --git a/stream-android-push-xiaomi/src/androidMain/kotlin/io/getstream/android/push/xiaomi/XiaomiPushDeviceGenerator.kt b/stream-android-push-xiaomi/src/androidMain/kotlin/io/getstream/android/push/xiaomi/XiaomiPushDeviceGenerator.kt index 018b347..cf3861a 100644 --- a/stream-android-push-xiaomi/src/androidMain/kotlin/io/getstream/android/push/xiaomi/XiaomiPushDeviceGenerator.kt +++ b/stream-android-push-xiaomi/src/androidMain/kotlin/io/getstream/android/push/xiaomi/XiaomiPushDeviceGenerator.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2022 Stream.io Inc. All rights reserved. + * Copyright (c) 2014-2025 Stream.io Inc. All rights reserved. * * Licensed under the Stream License; * you may not use this file except in compliance with the License. @@ -37,23 +37,19 @@ public class XiaomiPushDeviceGenerator( private val appId: String, private val appKey: String, private val providerName: String, - private val region: Region = Region.Global, - private val isValidForThisDevice: () -> Boolean = { true } + private val region: Region = Region.Global ) : PushDeviceGenerator { private val logger = StreamLog.getLogger("Push:Xiaomi") private val appContext = context.applicationContext private var isAlreadyRegistered = AtomicBoolean(false) - override fun isValidForThisDevice(): Boolean = - isValidForThisDevice.invoke().also { - logger.i { "Is Firebase available on this device -> $it" } - } + override fun isValidForThisDevice(): Boolean = true override fun onPushDeviceGeneratorSelected() { XiaomiMessagingDelegate.fallbackProviderName = providerName } - override suspend fun generatePushDevice(onPushDeviceGenerated: (pushDevice: PushDevice) -> Unit) { + override fun asyncGeneratePushDevice(onPushDeviceGenerated: (pushDevice: PushDevice) -> Unit) { logger.i { "Getting Xiaomi token" } if (isAlreadyRegistered.compareAndSet(false, true)) { MiPushClient.setRegion(region) diff --git a/stream-android-push/api/android/stream-android-push.api b/stream-android-push/api/android/stream-android-push.api index a039248..5bd2d77 100644 --- a/stream-android-push/api/android/stream-android-push.api +++ b/stream-android-push/api/android/stream-android-push.api @@ -14,7 +14,7 @@ public final class io/getstream/android/push/PushDevice { } public abstract interface class io/getstream/android/push/PushDeviceGenerator { - public abstract fun generatePushDevice (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + public abstract fun asyncGeneratePushDevice (Lkotlin/jvm/functions/Function1;)V public abstract fun isValidForThisDevice ()Z public abstract fun onPushDeviceGeneratorSelected ()V } diff --git a/stream-android-push/api/jvm/stream-android-push.api b/stream-android-push/api/jvm/stream-android-push.api index a039248..5bd2d77 100644 --- a/stream-android-push/api/jvm/stream-android-push.api +++ b/stream-android-push/api/jvm/stream-android-push.api @@ -14,7 +14,7 @@ public final class io/getstream/android/push/PushDevice { } public abstract interface class io/getstream/android/push/PushDeviceGenerator { - public abstract fun generatePushDevice (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + public abstract fun asyncGeneratePushDevice (Lkotlin/jvm/functions/Function1;)V public abstract fun isValidForThisDevice ()Z public abstract fun onPushDeviceGeneratorSelected ()V } diff --git a/stream-android-push/src/commonMain/kotlin/io/getstream/android/push/PushDeviceGenerator.kt b/stream-android-push/src/commonMain/kotlin/io/getstream/android/push/PushDeviceGenerator.kt index ec78708..8b370f2 100644 --- a/stream-android-push/src/commonMain/kotlin/io/getstream/android/push/PushDeviceGenerator.kt +++ b/stream-android-push/src/commonMain/kotlin/io/getstream/android/push/PushDeviceGenerator.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2022 Stream.io Inc. All rights reserved. + * Copyright (c) 2014-2025 Stream.io Inc. All rights reserved. * * Licensed under the Stream License; * you may not use this file except in compliance with the License. @@ -31,6 +31,8 @@ public interface PushDeviceGenerator { /** * Asynchronously generates a [PushDevice] and calls [onPushDeviceGenerated] callback once it's ready + * + * @param onPushDeviceGenerated Callback that will be called once the [PushDevice] is generated */ - public suspend fun generatePushDevice(onPushDeviceGenerated: (pushDevice: PushDevice) -> Unit) + public fun asyncGeneratePushDevice(onPushDeviceGenerated: (pushDevice: PushDevice) -> Unit) }