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

@@ -1,10 +1,11 @@
 package com.instabug.flutter;
 
-import android.annotation.SuppressLint;
 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;
@@ -22,9 +23,11 @@
 import com.instabug.flutter.modules.RepliesApi;
 import com.instabug.flutter.modules.SessionReplayApi;
 import com.instabug.flutter.modules.SurveysApi;
+import com.instabug.flutter.util.ThreadManager;
 
 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;
@@ -35,10 +38,74 @@
 public class InstabugFlutterPlugin implements FlutterPlugin, ActivityAware {
     private static final String TAG = InstabugFlutterPlugin.class.getName();
 
-    private Activity activity;
+    private Activity flutterActivity;
+
+    public InstabugFlutterPigeon.InstabugFlutterApi instabugFlutterApi;
+
+    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 (activity == flutterActivity) {
+                Log.v(TAG, "onActivityStarted");
+                ThreadManager.runOnMainThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        try {
+                            if (instabugApi != null) {
+                                instabugApi.reportLastScreenChange();
+                            }
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
+                });
+
+            }
+
+        }
+
+        @Override
+        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");
+            }
+
+        }
+
+        @Override
+        public void onActivitySaveInstanceState(@NonNull Activity activity, @NonNull Bundle outState) {
+
+        }
+
+        @Override
+        public void onActivityDestroyed(@NonNull Activity activity) {
+
+        }
+    };
 
-   public static InstabugFlutterPigeon.InstabugFlutterApi instabugFlutterApi;
     PluginRegistry.ActivityResultListener resultListener;
+    private InstabugApi instabugApi;
 
     @Override
     public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) {
@@ -47,59 +114,58 @@ public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) {
 
     @Override
     public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
-        activity = null;
+        flutterActivity = null;
     }
 
     @Override
     public void onAttachedToActivity(@NonNull ActivityPluginBinding binding) {
-        activity = binding.getActivity();
+        flutterActivity = binding.getActivity();
         initOnActivityResultListener(binding);
-
-
     }
 
     private void initOnActivityResultListener(@NonNull ActivityPluginBinding binding) {
-        if(resultListener!=null) {
-            binding.removeActivityResultListener(resultListener);
-        }
-
-        resultListener = new PluginRegistry.ActivityResultListener() {
-            @Override
-            public boolean onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-                if (instabugFlutterApi != null) {
-                    instabugFlutterApi.reportLastScreenChange(new InstabugFlutterPigeon.InstabugFlutterApi.Reply<Void>() {
-                        @Override
-                        public void reply(Void reply) {
-
-                        }
-                    });
-                }
-
-
-                return false;
-            }
-        };
-
 
-        binding.addActivityResultListener(resultListener);
+        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);
     }
 
 
     @Override
     public void onDetachedFromActivityForConfigChanges() {
-        activity = null;
+        flutterActivity = null;
 
     }
 
     @Override
     public void onReattachedToActivityForConfigChanges(@NonNull ActivityPluginBinding binding) {
-        activity = binding.getActivity();
+        flutterActivity = binding.getActivity();
         initOnActivityResultListener(binding);
     }
 
     @Override
     public void onDetachedFromActivity() {
-        activity = null;
+        flutterActivity = null;
     }
 
     private void register(Context context, BinaryMessenger messenger, FlutterRenderer renderer) {
@@ -114,7 +180,7 @@ public Bitmap call() {
         BugReportingApi.init(messenger);
         CrashReportingApi.init(messenger);
         FeatureRequestsApi.init(messenger);
-        InstabugApi.init(messenger, context, screenshotProvider);
+        instabugApi = InstabugApi.init(messenger, context, screenshotProvider);
         InstabugLogApi.init(messenger);
         RepliesApi.init(messenger);
         SessionReplayApi.init(messenger);
@@ -126,7 +192,7 @@ public Bitmap call() {
     @Nullable
     private Bitmap takeScreenshot(FlutterRenderer renderer) {
         try {
-            final View view = activity.getWindow().getDecorView().getRootView();
+            final View view = flutterActivity.getWindow().getDecorView().getRootView();
 
             view.setDrawingCacheEnabled(true);
             final Bitmap bitmap = renderer.getBitmap();

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

@@ -59,6 +59,8 @@ public class InstabugApi implements InstabugPigeon.InstabugHostApi {
 
     private final InstabugPigeon.FeatureFlagsFlutterApi featureFlagsFlutterApi;
 
+    private String lastScreenChanged = null;
+
     public static InstabugApi init(BinaryMessenger messenger, Context context, Callable<Bitmap> screenshotProvider) {
         final InstabugPigeon.FeatureFlagsFlutterApi flutterApi = new InstabugPigeon.FeatureFlagsFlutterApi(messenger);
 
@@ -107,9 +109,7 @@ public Boolean isEnabled() {
 
     @NotNull
     @Override
-    public Boolean isBuilt() {
-        return Instabug.isBuilt();
-    }
+    public Boolean isBuilt() { return Instabug.isBuilt(); }
 
     @Override
     public void init(@NonNull String token, @NonNull List<String> invocationEvents, @NonNull String debugLogsLevel) {
@@ -369,6 +369,7 @@ public void setReproStepsConfig(@Nullable String bugMode, @Nullable String crash
     @Override
     public void reportScreenChange(@NonNull String screenName) {
         try {
+            lastScreenChanged=screenName;
             Method method = Reflection.getMethod(Class.forName("com.instabug.library.Instabug"), "reportScreenChange",
                     Bitmap.class, String.class);
             if (method != null) {
@@ -385,6 +386,12 @@ public void reportScreenChange(@NonNull String screenName) {
         }
     }
 
+    public void  reportLastScreenChange(){
+        if(lastScreenChanged!=null){
+            reportScreenChange(lastScreenChanged);
+        }
+    }
+
     @VisibleForTesting
     public Bitmap getBitmapForAsset(String assetName) {
         try {
@@ -518,10 +525,10 @@ public void willRedirectToStore() {
 
     @Override
     public void setNetworkLogBodyEnabled(@NonNull Boolean isEnabled) {
-                try {
+        try {
 //                    Instabug.setNetworkLogBodyEnabled(isEnabled);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 }

android/src/main/java/com/instabug/flutter/util/InstabugHybirdUtils.java

@@ -7,7 +7,7 @@ import com.instabug.crash.models.IBGNonFatalException
 import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
 
-class InstabugExampleMethodCallHandler(val activity:Activity) : MethodChannel.MethodCallHandler {
+class InstabugExampleMethodCallHandler : MethodChannel.MethodCallHandler {
 
     override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
         when (call.method) {
@@ -22,10 +22,6 @@ class InstabugExampleMethodCallHandler(val activity:Activity) : MethodChannel.Me
                 sendNativeFatalCrash()
                 result.success(null)
             }
-            "ahmed" -> {
-                com.instabug.flutter.util.InstabugHybirdUtils.startFlutterScreen(activity,android.content.Intent(activity,activity))
-                result.success(null)
-            }
             SEND_NATIVE_FATAL_HANG -> {
                 Log.d(TAG, "Sending native fatal hang for 3000 ms")
                 sendANR()

example/android/app/src/main/kotlin/com/example/InstabugSample/InstabugExampleMethodCallHandler.kt

@@ -1,7 +1,6 @@
 // ignore_for_file: avoid_classes_with_only_static_members
 
 import 'dart:async';
-import 'dart:io';
 
 // to maintain supported versions prior to Flutter 3.3
 // ignore: unnecessary_import
@@ -12,13 +11,11 @@ import 'dart:typed_data';
 import 'dart:ui';
 
 import 'package:flutter/material.dart';
-
 // to maintain supported versions prior to Flutter 3.3
 // ignore: unused_import
 import 'package:flutter/services.dart';
 import 'package:instabug_flutter/instabug_flutter.dart';
 import 'package:instabug_flutter/src/generated/instabug.api.g.dart';
-import 'package:instabug_flutter/src/utils/hybrid_utils.dart';
 import 'package:instabug_flutter/src/utils/enum_converter.dart';
 import 'package:instabug_flutter/src/utils/feature_flags_manager.dart';
 import 'package:instabug_flutter/src/utils/ibg_build_info.dart';
@@ -156,7 +153,6 @@ class Instabug {
     BugReporting.$setup();
     Replies.$setup();
     Surveys.$setup();
-    HybridUtils.$setup();
   }
 
   /// @nodoc