added support for unity

customerio · Sep 20, 2023 · 6d35e77 · 6d35e77
1 parent a317698
commit 6d35e77
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 1 deletion.
diff --git a/messaginginapp/api/messaginginapp.api b/messaginginapp/api/messaginginapp.api
@@ -28,9 +28,11 @@ public final class io/customer/messaginginapp/ModuleMessagingInApp : io/customer
 	public synthetic fun getModuleConfig ()Lio/customer/sdk/module/CustomerIOModuleConfig;
 	public fun getModuleName ()Ljava/lang/String;
 	public fun initialize ()V
+	public static final fun unityInstance ()Lio/customer/messaginginapp/ModuleMessagingInApp;
 }
 
 public final class io/customer/messaginginapp/ModuleMessagingInApp$Companion {
+	public final fun unityInstance ()Lio/customer/messaginginapp/ModuleMessagingInApp;
 }
 
 public final class io/customer/messaginginapp/databinding/ActivityGistBinding : androidx/viewbinding/ViewBinding {

diff --git a/messaginginapp/src/main/java/io/customer/messaginginapp/ModuleMessagingInApp.kt b/messaginginapp/src/main/java/io/customer/messaginginapp/ModuleMessagingInApp.kt
@@ -64,6 +64,9 @@ internal constructor(
 
     companion object {
         const val moduleName: String = "MessagingInApp"
+
+        @JvmStatic
+        fun unityInstance() = ModuleMessagingInApp()
     }
 
     fun dismissMessage() {

diff --git a/messagingpush/api/messagingpush.api b/messagingpush/api/messagingpush.api
@@ -53,9 +53,11 @@ public final class io/customer/messagingpush/ModuleMessagingPushFCM : io/custome
 	public synthetic fun getModuleConfig ()Lio/customer/sdk/module/CustomerIOModuleConfig;
 	public fun getModuleName ()Ljava/lang/String;
 	public fun initialize ()V
+	public static final fun unityInstance ()Lio/customer/messagingpush/ModuleMessagingPushFCM;
 }
 
 public final class io/customer/messagingpush/ModuleMessagingPushFCM$Companion {
+	public final fun unityInstance ()Lio/customer/messagingpush/ModuleMessagingPushFCM;
 }
 
 public abstract interface class io/customer/messagingpush/data/communication/CustomerIOPushNotificationCallback {

diff --git a/messagingpush/src/main/java/io/customer/messagingpush/CustomerIOCloudMessagingReceiver.kt b/messagingpush/src/main/java/io/customer/messagingpush/CustomerIOCloudMessagingReceiver.kt
@@ -4,6 +4,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.google.android.gms.cloudmessaging.CloudMessagingReceiver
+import com.google.firebase.messaging.RemoteMessage
 import io.customer.messagingpush.di.pushMessageProcessor
 import io.customer.messagingpush.extensions.getSDKInstanceOrNull
 import io.customer.messagingpush.processor.PushMessageProcessor
@@ -30,5 +31,7 @@ class CustomerIOCloudMessagingReceiver : BroadcastReceiver() {
         val sdkInstance = context.getSDKInstanceOrNull() ?: return
 
         sdkInstance.diGraph.pushMessageProcessor.processGCMMessageIntent(intent = intent)
+
+        CustomerIOFirebaseMessagingService.onMessageReceived(context, RemoteMessage(intent.extras))
     }
 }
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/ModuleMessagingPushFCM.kt b/messagingpush/src/main/java/io/customer/messagingpush/ModuleMessagingPushFCM.kt
@@ -62,5 +62,8 @@ internal constructor(
 
     companion object {
         internal const val MODULE_NAME = "MessagingPushFCM"
+
+        @JvmStatic
+        fun unityInstance() = ModuleMessagingPushFCM()
     }
 }
diff --git a/sdk/api/sdk.api b/sdk/api/sdk.api
@@ -21,6 +21,8 @@ public final class io/customer/sdk/CustomerIO : io/customer/sdk/CustomerIOInstan
 	public fun track (Ljava/lang/String;)V
 	public fun track (Ljava/lang/String;Ljava/util/Map;)V
 	public fun trackMetric (Ljava/lang/String;Lio/customer/sdk/data/request/MetricEvent;Ljava/lang/String;)V
+	public static final fun unityInstance (Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)Lio/customer/sdk/CustomerIO;
+	public static final fun unityInstance (Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;)Lio/customer/sdk/CustomerIO;
 }
 
 public final class io/customer/sdk/CustomerIO$Builder {
@@ -46,6 +48,9 @@ public final class io/customer/sdk/CustomerIO$Builder {
 
 public final class io/customer/sdk/CustomerIO$Companion {
 	public final fun instance ()Lio/customer/sdk/CustomerIO;
+	public final fun unityInstance (Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)Lio/customer/sdk/CustomerIO;
+	public final fun unityInstance (Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;)Lio/customer/sdk/CustomerIO;
+	public static synthetic fun unityInstance$default (Lio/customer/sdk/CustomerIO$Companion;Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;ILjava/lang/Object;)Lio/customer/sdk/CustomerIO;
 }
 
 public final class io/customer/sdk/CustomerIOActivityLifecycleCallbacks : android/app/Application$ActivityLifecycleCallbacks {

diff --git a/sdk/src/main/java/io/customer/sdk/CustomerIO.kt b/sdk/src/main/java/io/customer/sdk/CustomerIO.kt
@@ -176,6 +176,29 @@ class CustomerIO internal constructor(
             return instance
                 ?: throw IllegalStateException("CustomerIO.Builder::build() must be called before obtaining CustomerIO instance")
         }
+
+        @JvmStatic
+        @JvmOverloads
+        fun unityInstance(
+            context: Context,
+            siteId: String,
+            apiKey: String,
+            modules: List<CustomerIOModule<*>> = emptyList()
+        ): CustomerIO {
+            return try {
+                instance()
+            } catch (ex: Exception) {
+                Builder(
+                    siteId = siteId,
+                    apiKey = apiKey,
+                    appContext = context.applicationContext as Application
+                ).apply {
+                    for (module in modules) {
+                        addCustomerIOModule(module)
+                    }
+                }.build()
+            }
+        }
     }
 
     class Builder @JvmOverloads constructor(
@@ -371,6 +394,7 @@ class CustomerIO internal constructor(
 
             client.postInitialize()
 
+            diGraph.logger.debug("[DEV] CustomerIO build with siteId: $siteId, apiKey: $apiKey, modules: ${modules.size}")
             return client
         }
     }

diff --git a/sdk/src/main/java/io/customer/sdk/CustomerIOConfig.kt b/sdk/src/main/java/io/customer/sdk/CustomerIOConfig.kt
@@ -50,7 +50,7 @@ data class CustomerIOConfig(
          * SDK constants to avoid repetitive configuration values
          */
         object SDKConstants {
-            val LOG_LEVEL_DEFAULT = CioLogLevel.ERROR
+            val LOG_LEVEL_DEFAULT = CioLogLevel.DEBUG
         }
 
         /**