Merge pull request #37 from apptentive/PBI-5217-removeobserver

PBI-5217 Support for removeObserver for survey and message callbacks
apptentive · Jul 12, 2023 · f33eb13 · f33eb13
2 parents 9f34879 + 393d744
commit f33eb13
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 34 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -37,6 +37,6 @@ android {
 }
 
 dependencies {
-    implementation 'com.apptentive:apptentive-kit-android:6.0.4'
+    implementation 'com.apptentive:apptentive-kit-android:6.0.5'
     testImplementation 'junit:junit:4.13.2'
 }
diff --git a/android/src/main/kotlin/com/apptentive/apptentive_flutter/ApptentiveFlutterPlugin.kt b/android/src/main/kotlin/com/apptentive/apptentive_flutter/ApptentiveFlutterPlugin.kt
@@ -5,6 +5,8 @@ package com.apptentive.apptentive_flutter
 import android.app.Activity
 import android.app.Application
 import apptentive.com.android.feedback.*
+import apptentive.com.android.feedback.model.EventNotification
+import apptentive.com.android.feedback.model.MessageCenterNotification
 import apptentive.com.android.util.*
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.embedding.engine.plugins.activity.ActivityAware
@@ -104,6 +106,7 @@ class ApptentiveFlutterPlugin : FlutterPlugin, MethodCallHandler, ActivityAware
       "setPushNotificationIntegration" -> setPushNotificationIntegration(call, result)
       "getUnreadMessageCount" -> getUnreadMessageCount(result)
       "registerListeners" -> registerListeners(result)
+      "unregisterListeners" -> unregisterListeners(result)
       "sendAttachmentText" -> sendAttachmentText(call, result)
       "handleRequestPushPermissions" -> { /* Only iOS. */ }
       else -> result.notImplemented()
@@ -319,50 +322,56 @@ class ApptentiveFlutterPlugin : FlutterPlugin, MethodCallHandler, ActivityAware
   // Register listeners for native callbacks:
   private fun registerListeners(result: Result) {
     try {
-      registerForSurveyListener()
-      registerForUnreadMessageListener()
+      Apptentive.eventNotificationObservable.observe(::surveyFinishedObserver)
+      Apptentive.messageCenterNotificationObservable.observe(::messageObserver)
       result.success(true)
     } catch(e: Exception) {
       result.error(ERROR_CODE, "Failed to register Apptentive listeners.", e.toString())
     }
   }
 
-  private fun registerForSurveyListener() {
-    Apptentive.eventNotificationObservable.observe { notification ->
-      val name = notification?.name
-      val interaction = notification?.interaction
-      val vendor = notification?.vendor
-      val interactionId = notification?.interactionId
-      val notificationText = "Name: \"$name\". Vendor: \"$vendor\". " +
-              "Interaction: \"$interaction\". Interaction ID: $interactionId"
-      Log.d(LogTags.EVENT_NOTIFICATION, notificationText)
-      when {
-        interaction == "Survey" && name == "submit" ->
-          activity?.runOnUiThread {
-            channel.invokeMethod("onSurveyFinished", mapOf("completed" to true))
-          }
-
-        interaction == "Survey" && name == "cancel" || name == "cancel_partial" ->
-          activity?.runOnUiThread {
-            channel.invokeMethod("onSurveyFinished", mapOf("completed" to false))
-          }
-      }
+  private fun unregisterListeners(result: Result) {
+    try {
+      Apptentive.eventNotificationObservable.removeObserver(::surveyFinishedObserver)
+      Apptentive.messageCenterNotificationObservable.removeObserver(::messageObserver)
+      result.success(true)
+    } catch(e: Exception) {
+      result.error(ERROR_CODE, "Failed to unregister Apptentive listeners.", e.toString())
     }
   }
 
-  private fun registerForUnreadMessageListener() {
-    Apptentive.messageCenterNotificationObservable.observe { notification ->
-      val notificationText =
-        "Can Show Message Center: ${notification?.canShowMessageCenter}. " +
-                "Unread Message Count: ${notification?.unreadMessageCount}. " +
-                "Person Name: ${notification?.personName}. " +
-                "Person Email: ${notification?.personEmail}"
+  private fun surveyFinishedObserver(notification: EventNotification?) {
+    val name = notification?.name
+    val interaction = notification?.interaction
+    val vendor = notification?.vendor
+    val interactionId = notification?.interactionId
+    val notificationText = "Name: \"$name\". Vendor: \"$vendor\". " +
+            "Interaction: \"$interaction\". Interaction ID: $interactionId"
+    Log.d(LogTags.EVENT_NOTIFICATION, notificationText)
+    when {
+      interaction == "Survey" && name == "submit" ->
+        activity?.runOnUiThread {
+          channel.invokeMethod("onSurveyFinished", mapOf("completed" to true))
+        }
 
-      Log.d(LogTags.MESSAGE_CENTER_NOTIFICATION, notificationText)
-      if (notification?.unreadMessageCount != 0) {
+      interaction == "Survey" && name == "cancel" || name == "cancel_partial" ->
         activity?.runOnUiThread {
-          channel.invokeMethod("onUnreadMessageCountChanged", mapOf("count" to notification?.unreadMessageCount))
+          channel.invokeMethod("onSurveyFinished", mapOf("completed" to false))
         }
+    }
+  }
+
+  private fun messageObserver(notification: MessageCenterNotification?) {
+    val notificationText =
+      "Can Show Message Center: ${notification?.canShowMessageCenter}. " +
+              "Unread Message Count: ${notification?.unreadMessageCount}. " +
+              "Person Name: ${notification?.personName}. " +
+              "Person Email: ${notification?.personEmail}"
+
+    Log.d(LogTags.MESSAGE_CENTER_NOTIFICATION, notificationText)
+    if (notification?.unreadMessageCount != 0) {
+      activity?.runOnUiThread {
+        channel.invokeMethod("onUnreadMessageCountChanged", mapOf("count" to notification?.unreadMessageCount))
       }
     }
   }

diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -153,7 +153,12 @@ class _MyAppState extends State<MyApp> {
                           },
                           child: Text('Register Listeners'),
                         ),
-
+                        OutlinedButton(
+                          onPressed: () {
+                            ApptentiveFlutter.unregisterListeners();
+                          },
+                          child: Text('Unregister Listeners'),
+                        ),
                         OutlinedButton(
                           onPressed: () {
                             if (integration_token != null) {

diff --git a/lib/apptentive_flutter.dart b/lib/apptentive_flutter.dart
@@ -180,6 +180,12 @@ class ApptentiveFlutter {
     return successful;
   }
 
+  // Unregister callback listeners
+  static Future<bool> unregisterListeners() async {
+    final bool successful = await _channel.invokeMethod('unregisterListeners', {});
+    return successful;
+  }
+
   static Future<bool> sendAttachmentText({required String message}) async {
     final bool successful = await _channel.invokeMethod('sendAttachmentText', {
       "message": message