feat: support hybrid mode

Author: ahmedAlaaInstabug

analysis_options.yaml

@@ -2,7 +2,7 @@ include: package:lint/analysis_options_package.yaml
 
 analyzer:
   exclude:
-#    - "example/**"
+    - "example/**"
     - "**/*.g.dart"
 
 linter:

android/src/main/java/com/instabug/flutter/InstabugFlutterPlugin.java

@@ -3,9 +3,7 @@
 import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
-import android.content.Intent;
 import android.graphics.Bitmap;
-import android.nfc.Tag;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -27,13 +25,11 @@
 
 import java.util.concurrent.Callable;
 
-import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.embedding.engine.plugins.activity.ActivityAware;
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
 import io.flutter.embedding.engine.renderer.FlutterRenderer;
 import io.flutter.plugin.common.BinaryMessenger;
-import io.flutter.plugin.common.PluginRegistry;
 
 public class InstabugFlutterPlugin implements FlutterPlugin, ActivityAware {
     private static final String TAG = InstabugFlutterPlugin.class.getName();
@@ -42,17 +38,21 @@ public class InstabugFlutterPlugin implements FlutterPlugin, ActivityAware {
 
     public InstabugFlutterPigeon.InstabugFlutterApi instabugFlutterApi;
 
+    private boolean isLastScreenInstabug = false;
     Application.ActivityLifecycleCallbacks callbacks = new Application.ActivityLifecycleCallbacks() {
         @Override
         public void onActivityCreated(@NonNull Activity activity, @Nullable Bundle savedInstanceState) {
-            if (activity == flutterActivity) {
-                Log.v(TAG, "onActivityCreated");
-            }
+
         }
 
         @Override
         public void onActivityStarted(@NonNull Activity activity) {
+            if (isLastScreenInstabug) {
+                isLastScreenInstabug = false;
+                return;
+            }
 
+            isLastScreenInstabug = activity.getComponentName().getClassName().contains("com.instabug.");
             if (activity == flutterActivity) {
                 Log.v(TAG, "onActivityStarted");
                 ThreadManager.runOnMainThread(new Runnable() {
@@ -80,16 +80,12 @@ public void onActivityResumed(@NonNull Activity activity) {
 
         @Override
         public void onActivityPaused(@NonNull Activity activity) {
-            if (activity == flutterActivity) {
-                Log.v(TAG, "onActivityPaused");
-            }
+
         }
 
         @Override
         public void onActivityStopped(@NonNull Activity activity) {
-            if (activity == flutterActivity) {
-                Log.v(TAG, "onActivityStopped");
-            }
+
 
         }
 
@@ -104,7 +100,6 @@ public void onActivityDestroyed(@NonNull Activity activity) {
         }
     };
 
-    PluginRegistry.ActivityResultListener resultListener;
     private InstabugApi instabugApi;
 
     @Override
@@ -120,34 +115,13 @@ public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
     @Override
     public void onAttachedToActivity(@NonNull ActivityPluginBinding binding) {
         flutterActivity = binding.getActivity();
-        initOnActivityResultListener(binding);
+        initOnActivityResultListener();
     }
 
-    private void initOnActivityResultListener(@NonNull ActivityPluginBinding binding) {
-
+    private void initOnActivityResultListener() {
         Application app = flutterActivity.getApplication();
-
         app.unregisterActivityLifecycleCallbacks(callbacks);
         app.registerActivityLifecycleCallbacks(callbacks);
-
-//        if (resultListener != null) {
-//            binding.removeActivityResultListener(resultListener);
-//        }
-
-//        resultListener = new PluginRegistry.ActivityResultListener() {
-//            @Override
-//            public boolean onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-//                Log.v(TAG, "onActivityResult");
-//
-//
-//
-//
-//                return false;
-//            }
-//        };
-//
-//
-//        binding.addActivityResultListener(resultListener);
     }
 
 
@@ -160,7 +134,7 @@ public void onDetachedFromActivityForConfigChanges() {
     @Override
     public void onReattachedToActivityForConfigChanges(@NonNull ActivityPluginBinding binding) {
         flutterActivity = binding.getActivity();
-        initOnActivityResultListener(binding);
+        initOnActivityResultListener();
     }
 
     @Override

android/src/main/java/com/instabug/flutter/modules/InstabugApi.java

@@ -369,7 +369,7 @@ public void setReproStepsConfig(@Nullable String bugMode, @Nullable String crash
     @Override
     public void reportScreenChange(@NonNull String screenName) {
         try {
-            lastScreenChanged=screenName;
+            lastScreenChanged = screenName;
             Method method = Reflection.getMethod(Class.forName("com.instabug.library.Instabug"), "reportScreenChange",
                     Bitmap.class, String.class);
             if (method != null) {
@@ -387,7 +387,7 @@ public void reportScreenChange(@NonNull String screenName) {
     }
 
     public void  reportLastScreenChange(){
-        if(lastScreenChanged!=null){
+        if(lastScreenChanged != null){
             reportScreenChange(lastScreenChanged);
         }
     }