Merge pull request #120 from OneSignal/added_dist_trusty_travis

'dist:trusty' added to '.travis.yml' file
OneSignal · Aug 9, 2019 · 880c7e2 · 880c7e2
2 parents f154482 + 1b1ef04
commit 880c7e2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,7 @@
 os:
   - linux
 sudo: false
+dist: trusty
 addons:
   apt:
     # Flutter depends on /usr/lib/x86_64-linux-gnu/libstdc++.so.6 version GLIBCXX_3.4.18
@@ -16,4 +17,4 @@ script:
   - ./flutter/bin/flutter test
 cache:
   directories:
-    - $HOME/.pub-cache
+    - $HOME/.pub-cache
diff --git a/android/src/main/java/com/onesignal/flutter/OneSignalPlugin.java b/android/src/main/java/com/onesignal/flutter/OneSignalPlugin.java
@@ -30,7 +30,9 @@
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
 import io.flutter.plugin.common.MethodChannel.Result;
+import io.flutter.plugin.common.PluginRegistry;
 import io.flutter.plugin.common.PluginRegistry.Registrar;
+import io.flutter.view.FlutterNativeView;
 
 /** OnesignalPlugin */
 public class OneSignalPlugin
@@ -61,6 +63,18 @@ public static void registerWith(Registrar registrar) {
     plugin.channel.setMethodCallHandler(plugin);
     plugin.flutterRegistrar = registrar;
 
+    // Create a callback for the flutterRegistrar to connect the applications onDestroy
+    plugin.flutterRegistrar.addViewDestroyListener(new PluginRegistry.ViewDestroyListener() {
+      @Override
+      public boolean onViewDestroy(FlutterNativeView flutterNativeView) {
+        // Remove all handlers so they aren't triggered with wrong context
+        OneSignal.removeNotificationReceivedHandler();
+        OneSignal.removeNotificationOpenedHandler();
+        OneSignal.removeInAppMessageClickHandler();
+        return false;
+      }
+    });
+
     OneSignalTagsController.registerWith(registrar);
   }