Merge pull request #136 from aryaveer0710/master

Fixed WindowServiceNew.<init> crash

Author: pvsvamsi

android/src/main/java/in/jvapps/system_alert_window/BubbleActivity.java

@@ -36,8 +36,6 @@
 
 public class BubbleActivity extends AppCompatActivity {
 
-    private  LinearLayout bubbleLayout;
-    private HashMap<String, Object> paramsMap;
     private FlutterView flutterView;
 
     private Context mContext;

android/src/main/java/in/jvapps/system_alert_window/SystemAlertWindowPlugin.java

@@ -20,7 +20,7 @@
 import io.flutter.plugin.common.BasicMessageChannel;
 import io.flutter.plugin.common.JSONMessageCodec;
 
-public class SystemAlertWindowPlugin implements FlutterPlugin, ActivityAware,BasicMessageChannel.MessageHandler {
+public class SystemAlertWindowPlugin implements FlutterPlugin, ActivityAware, BasicMessageChannel.MessageHandler {
 
     private boolean isInitialized;
 
@@ -79,7 +79,6 @@ public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBindin
         messenger = new BasicMessageChannel<>(flutterPluginBinding.getBinaryMessenger(), Constants.MESSAGE_CHANNEL,
                 JSONMessageCodec.INSTANCE);
         messenger.setMessageHandler(this);
-        Commons.messenger = messenger;
     }
 
     @Override
@@ -97,12 +96,19 @@ public void onAttachedToActivity(@NonNull ActivityPluginBinding activityPluginBi
         LogUtils.getInstance().d(TAG, "Initializing on attached to activity");
         if (methodCallHandler != null) {
             methodCallHandler.setActivity(activityPluginBinding.getActivity());
-            FlutterEngineGroup enn = new FlutterEngineGroup(context);
-            DartExecutor.DartEntrypoint dEntry = new DartExecutor.DartEntrypoint(
-                    FlutterInjector.instance().flutterLoader().findAppBundlePath(),
-                    "overlayMain");
-            FlutterEngine engine = enn.createAndRunEngine(context, dEntry);
-            FlutterEngineCache.getInstance().put(Constants.FLUTTER_CACHE_ENGINE, engine);
+                try {
+                    FlutterEngine existingEngine = FlutterEngineCache.getInstance().get(Constants.FLUTTER_CACHE_ENGINE);
+                    if(existingEngine==null){
+                    FlutterEngineGroup enn = new FlutterEngineGroup(context);
+                    DartExecutor.DartEntrypoint dEntry = new DartExecutor.DartEntrypoint(
+                            FlutterInjector.instance().flutterLoader().findAppBundlePath(),
+                            "overlayMain");
+                    FlutterEngine engine = enn.createAndRunEngine(context, dEntry);
+                    FlutterEngineCache.getInstance().put(Constants.FLUTTER_CACHE_ENGINE, engine);
+                    }
+                } catch (Exception e) {
+                    LogUtils.getInstance().e(TAG, "Error initializing FlutterEngine: " + e.getMessage());
+                }
 
         }
         this.pluginBinding = activityPluginBinding;

android/src/main/java/in/jvapps/system_alert_window/services/WindowServiceNew.java

@@ -64,8 +64,6 @@ public class WindowServiceNew extends Service implements View.OnTouchListener {
 
     private float offsetY;
     private boolean moving;
-    private BasicMessageChannel<Object> overlayMessageChannel = new BasicMessageChannel(FlutterEngineCache.getInstance().get(Constants.FLUTTER_CACHE_ENGINE).getDartExecutor(), Constants.MESSAGE_CHANNEL, JSONMessageCodec.INSTANCE);
-
     @SuppressLint("UnspecifiedImmutableFlag")
     @Override
     public void onCreate() {
@@ -189,7 +187,6 @@ private void createWindow(HashMap<String, Object> paramsMap) {
         flutterView.setFocusable(true);
         flutterView.setFocusableInTouchMode(true);
         flutterView.setBackgroundColor(Color.TRANSPARENT);
-        overlayMessageChannel.setMessageHandler((message, reply) -> Commons.messenger.send(message));
         flutterView.setOnTouchListener(this);
         try {
             windowManager.addView(flutterView, params);

android/src/main/java/in/jvapps/system_alert_window/utils/Commons.java

@@ -34,8 +34,6 @@ public static Map<String, Object> getMapFromObject(@NonNull Map<String, Object>
     public static List<Map<String, Object>> getMapListFromObject(@NonNull Map<String, Object> map, String key) {
         return (List<Map<String, Object>>) map.get(key);
     }
-    public static BasicMessageChannel<Object> messenger = null;
-
 
     public static boolean getIsClicksDisabled(@NonNull Map<String, Object> paramsMap) {
         Object isDisableClicksObj = paramsMap.get(KEY_IS_DISABLE_CLICKS);

lib/system_alert_window.dart

@@ -100,11 +100,12 @@ class SystemAlertWindow {
         .invokeMethod('updateSystemWindow', [notificationTitle, notificationBody, params, Commons.getSystemWindowPrefMode(prefMode)]);
   }
 
-  /// Broadcast data to overlay app
+  /// Broadcast data to system window
   static Future sendMessageToOverlay(dynamic data) async {
     return await _overlayMessageChannel.send(data);
   }
 
+  /// Read data in  system window
   static Stream<dynamic> get overlayListener {
     _overlayMessageChannel.setMessageHandler((message) async {
       _controller.add(message);