Merge branch 'main' into rehan/mbl-455-native-sdk-update

customerio · Sep 4, 2024 · 78ef900 · 78ef900
2 parents 3828bac + aa5af46
commit 78ef900
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 10 deletions.
diff --git a/android/src/main/kotlin/io/customer/customer_io/CustomerIOExtensions.kt b/android/src/main/kotlin/io/customer/customer_io/CustomerIOExtensions.kt
@@ -26,7 +26,12 @@ internal fun <R> MethodCall.invokeNative(
     try {
         @Suppress("UNCHECKED_CAST")
         val params = this.arguments as? Map<String, Any> ?: emptyMap()
-        result.success(performAction(params))
+        val actionResult = performAction(params)
+        if (actionResult is Unit) {
+            result.success(true)
+        } else {
+            result.success(actionResult)
+        }
     } catch (ex: Exception) {
         result.error(this.method, ex.localizedMessage, ex)
     }

diff --git a/apps/amiapp_flutter/lib/src/screens/dashboard.dart b/apps/amiapp_flutter/lib/src/screens/dashboard.dart
@@ -183,7 +183,9 @@ class _ActionList extends StatelessWidget {
 
   void _showPushPermissionStatus(BuildContext context) {
     Permission.notification.status.then((status) {
-      if (status.isGranted) {
+      if (!context.mounted) {
+        return;
+      } else if (status.isGranted) {
         context.showMessageDialog(_pushPermissionAlertTitle,
             'Push notifications are enabled on this device');
       } else if (status.isDenied) {
@@ -196,7 +198,9 @@ class _ActionList extends StatelessWidget {
 
   void _requestPushPermission(BuildContext context) {
     Permission.notification.request().then((status) {
-      if (status.isGranted) {
+      if (!context.mounted) {
+        return;
+      } else if (status.isGranted) {
         context.showSnackBar('Push notifications are enabled on this device');
       } else {
         _onPushPermissionPermanentlyDenied(context);

diff --git a/apps/amiapp_flutter/lib/src/screens/settings.dart b/apps/amiapp_flutter/lib/src/screens/settings.dart
@@ -70,7 +70,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
     super.initState();
   }
 
-  void _saveSettings() {
+  void _saveSettings(BuildContext context) {
     if (!_formKey.currentState!.validate()) {
       return;
     }
@@ -88,7 +88,9 @@ class _SettingsScreenState extends State<SettingsScreen> {
       debugModeEnabled: _featureDebugMode,
     );
     widget._customerIOSDK.saveConfigToPreferences(newConfig).then((success) {
-      if (success) {
+      if (!context.mounted) {
+        return;
+      } else if (success) {
         context.showSnackBar('Settings saved successfully');
         Navigator.of(context).pop();
         // Restart app here
@@ -118,7 +120,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
       _featureTrackDeviceAttributes =
           defaultConfig.deviceAttributesTrackingEnabled;
       _featureDebugMode = defaultConfig.debugModeEnabled;
-      _saveSettings();
+      _saveSettings(context);
     });
   }
 
@@ -127,7 +129,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
     final Sizes sizes = Theme.of(context).extension<Sizes>()!;
 
     return PopScope(
-      onPopInvoked: (bool didPop) {
+      onPopInvokedWithResult: (bool didPop, result) {
         if (widget.auth.signedIn == false) {
           context.go(Screen.login.location);
         }
@@ -166,9 +168,13 @@ class _SettingsScreenState extends State<SettingsScreen> {
                               onPressed: () {
                                 final clipboardData = ClipboardData(
                                     text: _deviceTokenValueController.text);
-                                Clipboard.setData(clipboardData).then((_) =>
+                                Clipboard.setData(clipboardData).then((_) {
+                                  if (context.mounted) {
                                     context.showSnackBar(
-                                        'Device Token copied to clipboard'));
+                                      'Device Token copied to clipboard',
+                                    );
+                                  }
+                                });
                               },
                             ),
                           ),
@@ -284,7 +290,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
                 style: FilledButton.styleFrom(
                   minimumSize: sizes.buttonDefault(),
                 ),
-                onPressed: () => _saveSettings(),
+                onPressed: () => _saveSettings(context),
                 child: Text(
                   'Save'.toUpperCase(),
                   semanticsLabel: 'Save Settings Button',