feat: public api for dismiss message (#420)

customerio · Aug 9, 2024 · 8bfc37d · 8bfc37d
1 parent 3ae7655
commit 8bfc37d
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 15 deletions.
diff --git a/messaginginapp/api/messaginginapp.api b/messaginginapp/api/messaginginapp.api
@@ -21,9 +21,11 @@ public final class io/customer/messaginginapp/ModuleMessagingInApp : io/customer
 	public synthetic fun getModuleConfig ()Lio/customer/sdk/core/module/CustomerIOModuleConfig;
 	public fun getModuleName ()Ljava/lang/String;
 	public fun initialize ()V
+	public static final fun instance ()Lio/customer/messaginginapp/ModuleMessagingInApp;
 }
 
 public final class io/customer/messaginginapp/ModuleMessagingInApp$Companion {
+	public final fun instance ()Lio/customer/messaginginapp/ModuleMessagingInApp;
 }
 
 public final class io/customer/messaginginapp/databinding/ActivityGistBinding : androidx/viewbinding/ViewBinding {
@@ -37,7 +39,7 @@ public final class io/customer/messaginginapp/databinding/ActivityGistBinding :
 }
 
 public final class io/customer/messaginginapp/di/DIGraphMessagingInAppKt {
-	public static final fun inAppMessaging (Lio/customer/sdk/core/di/SDKComponent;)Lio/customer/messaginginapp/ModuleMessagingInApp;
+	public static final fun inAppMessaging (Lio/customer/sdk/CustomerIOInstance;)Lio/customer/messaginginapp/ModuleMessagingInApp;
 }
 
 public final class io/customer/messaginginapp/domain/InAppMessageReducerKt {

diff --git a/messaginginapp/src/main/java/io/customer/messaginginapp/ModuleMessagingInApp.kt b/messaginginapp/src/main/java/io/customer/messaginginapp/ModuleMessagingInApp.kt
@@ -90,5 +90,11 @@ class ModuleMessagingInApp(
 
     companion object {
         const val MODULE_NAME: String = "MessagingInApp"
+
+        @JvmStatic
+        fun instance(): ModuleMessagingInApp {
+            return SDKComponent.modules[MODULE_NAME] as? ModuleMessagingInApp
+                ?: throw IllegalStateException("ModuleMessagingInApp not initialized")
+        }
     }
 }
diff --git a/messaginginapp/src/main/java/io/customer/messaginginapp/di/DIGraphMessagingInApp.kt b/messaginginapp/src/main/java/io/customer/messaginginapp/di/DIGraphMessagingInApp.kt
@@ -6,6 +6,7 @@ import io.customer.messaginginapp.provider.GistApi
 import io.customer.messaginginapp.provider.GistApiProvider
 import io.customer.messaginginapp.provider.GistInAppMessagesProvider
 import io.customer.messaginginapp.provider.InAppMessagesProvider
+import io.customer.sdk.CustomerIOInstance
 import io.customer.sdk.core.di.SDKComponent
 
 internal val SDKComponent.gistApiProvider: GistApi
@@ -14,9 +15,9 @@ internal val SDKComponent.gistApiProvider: GistApi
 internal val SDKComponent.gistProvider: InAppMessagesProvider
     get() = newInstance<InAppMessagesProvider> { GistInAppMessagesProvider(gistApiProvider) }
 
-fun SDKComponent.inAppMessaging(): ModuleMessagingInApp {
-    return modules[ModuleMessagingInApp.MODULE_NAME] as? ModuleMessagingInApp
-        ?: throw IllegalStateException("ModuleMessagingInApp not initialized")
+@Suppress("UnusedReceiverParameter")
+fun CustomerIOInstance.inAppMessaging(): ModuleMessagingInApp {
+    return ModuleMessagingInApp.instance()
 }
 
 internal val SDKComponent.inAppMessagingManager: InAppMessagingManager

diff --git a/messaginginapp/src/test/java/io/customer/messaginginapp/ModuleMessagingInAppTest.kt b/messaginginapp/src/test/java/io/customer/messaginginapp/ModuleMessagingInAppTest.kt
@@ -9,7 +9,6 @@ import io.customer.commontest.extensions.attachToSDKComponent
 import io.customer.commontest.extensions.random
 import io.customer.commontest.util.ScopeProviderStub
 import io.customer.messaginginapp.di.gistProvider
-import io.customer.messaginginapp.di.inAppMessaging
 import io.customer.messaginginapp.provider.InAppMessagesProvider
 import io.customer.messaginginapp.testutils.core.JUnitTest
 import io.customer.messaginginapp.type.InAppEventListener
@@ -144,7 +143,7 @@ internal class ModuleMessagingInAppTest : JUnitTest() {
         module.initialize()
 
         // call dismissMessage on the CustomerIO instance
-        SDKComponent.inAppMessaging().dismissMessage()
+        ModuleMessagingInApp.instance().dismissMessage()
 
         // verify that the module's dismissMessage method was called
         assertCalledOnce { inAppMessagesProviderMock.dismissMessage() }

diff --git a/messagingpush/api/messagingpush.api b/messagingpush/api/messagingpush.api
@@ -115,10 +115,6 @@ public final class io/customer/messagingpush/data/model/CustomerIOParsedPushPayl
 	public synthetic fun newArray (I)[Ljava/lang/Object;
 }
 
-public final class io/customer/messagingpush/di/DiGraphMessagingPushKt {
-	public static final fun pushMessaging (Lio/customer/sdk/core/di/SDKComponent;)Lio/customer/messagingpush/ModuleMessagingPushFCM;
-}
-
 public final class io/customer/messagingpush/processor/PushMessageProcessor$Companion {
 	public static final field RECENT_MESSAGES_MAX_SIZE I
 	public final fun getRecentMessagesQueue ()Ljava/util/concurrent/LinkedBlockingDeque;

diff --git a/messagingpush/src/main/java/io/customer/messagingpush/di/DiGraphMessagingPush.kt b/messagingpush/src/main/java/io/customer/messagingpush/di/DiGraphMessagingPush.kt
@@ -45,8 +45,3 @@ internal val SDKComponent.pushMessageProcessor: PushMessageProcessor
             deepLinkUtil = deepLinkUtil
         )
     }
-
-fun SDKComponent.pushMessaging(): ModuleMessagingPushFCM {
-    return modules[ModuleMessagingPushFCM.MODULE_NAME] as? ModuleMessagingPushFCM
-        ?: throw IllegalStateException("ModuleMessagingPushFCM not initialized")
-}