init

Author: ahmedAlaaInstabug

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

@@ -19,6 +19,7 @@
 import com.instabug.flutter.modules.RepliesApi;
 import com.instabug.flutter.modules.SessionReplayApi;
 import com.instabug.flutter.modules.SurveysApi;
+import com.instabug.library.internal.crossplatform.InternalCore;
 
 import java.util.concurrent.Callable;
 
@@ -35,6 +36,7 @@ public class InstabugFlutterPlugin implements FlutterPlugin, ActivityAware {
     @SuppressLint("StaticFieldLeak")
     private static Activity activity;
 
+
     /**
      * Embedding v1
      */

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

@@ -6,13 +6,16 @@
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.util.Log;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
+
 import com.instabug.flutter.generated.InstabugPigeon;
 import com.instabug.flutter.util.ArgsRegistry;
 import com.instabug.flutter.util.Reflection;
 import com.instabug.flutter.util.ThreadManager;
+import com.instabug.flutter.util.privateViews.ScreenshotCaptor;
 import com.instabug.library.Feature;
 import com.instabug.library.Instabug;
 import com.instabug.library.InstabugColorTheme;
@@ -21,13 +24,17 @@
 import com.instabug.library.Platform;
 import com.instabug.library.ReproConfigurations;
 import com.instabug.library.featuresflags.model.IBGFeatureFlag;
+import com.instabug.library.internal.crossplatform.InternalCore;
 import com.instabug.library.internal.module.InstabugLocale;
 import com.instabug.library.invocation.InstabugInvocationEvent;
 import com.instabug.library.model.NetworkLog;
+import com.instabug.library.screenshot.instacapture.ScreenshotRequest;
 import com.instabug.library.ui.onboarding.WelcomeMessage;
+
 import io.flutter.FlutterInjector;
 import io.flutter.embedding.engine.loader.FlutterLoader;
 import io.flutter.plugin.common.BinaryMessenger;
+
 import org.jetbrains.annotations.NotNull;
 import org.json.JSONObject;
 
@@ -92,7 +99,9 @@ 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) {
@@ -441,4 +450,24 @@ public void networkLog(@NonNull Map<String, Object> data) {
     public void willRedirectToStore() {
         Instabug.willRedirectToStore();
     }
+
+    public static void setScreenshotCaptor(ScreenshotCaptor screenshotCaptor,InternalCore internalCore) {
+        internalCore._setScreenshotCaptor(new com.instabug.library.screenshot.ScreenshotCaptor() {
+            @Override
+            public void capture(@NonNull ScreenshotRequest screenshotRequest) {
+                screenshotCaptor.capture(new ScreenshotCaptor.CapturingCallback() {
+                    @Override
+                    public void onCapturingFailure(Throwable throwable) {
+                        screenshotRequest.getListener().onCapturingFailure(throwable);
+                    }
+
+                    @Override
+                    public void onCapturingSuccess(Bitmap bitmap) {
+                        screenshotRequest.getListener().onCapturingSuccess(bitmap);
+                    }
+                });
+            }
+        });
+    }
+
 }

packages/instabug_flutter/android/src/main/java/com/instabug/flutter/util/privateViews/ScreenshotCaptor.java

@@ -0,0 +1,13 @@
+package com.instabug.flutter.util.privateViews;
+
+import android.graphics.Bitmap;
+
+public interface ScreenshotCaptor {
+    public  void capture(CapturingCallback listener);
+
+    public interface CapturingCallback {
+        public  void onCapturingFailure(Throwable throwable);
+
+        public  void onCapturingSuccess(Bitmap bitmap);
+    }
+}

packages/instabug_flutter/android/src/test/java/com/instabug/flutter/InstabugApiTest.java

@@ -36,8 +36,10 @@
 import com.instabug.library.ReproConfigurations;
 import com.instabug.library.ReproMode;
 import com.instabug.library.featuresflags.model.IBGFeatureFlag;
+import com.instabug.library.internal.crossplatform.InternalCore;
 import com.instabug.library.invocation.InstabugInvocationEvent;
 import com.instabug.library.model.NetworkLog;
+import com.instabug.library.screenshot.ScreenshotCaptor;
 import com.instabug.library.ui.onboarding.WelcomeMessage;
 
 import org.json.JSONObject;
@@ -59,6 +61,7 @@
 import java.util.concurrent.Callable;
 
 import io.flutter.plugin.common.BinaryMessenger;
+
 import org.mockito.verification.VerificationMode;
 
 public class InstabugApiTest {
@@ -349,11 +352,11 @@ public void testClearAllExperiments() {
 
     @Test
     public void testAddFeatureFlags() {
-       Map<String,String > featureFlags = new HashMap<>();
-        featureFlags.put("key1","variant1");
+        Map<String, String> featureFlags = new HashMap<>();
+        featureFlags.put("key1", "variant1");
         api.addFeatureFlags(featureFlags);
-        List<IBGFeatureFlag> flags=new ArrayList<IBGFeatureFlag>();
-        flags.add(new IBGFeatureFlag("key1","variant1"));
+        List<IBGFeatureFlag> flags = new ArrayList<IBGFeatureFlag>();
+        flags.add(new IBGFeatureFlag("key1", "variant1"));
         mInstabug.verify(() -> Instabug.addFeatureFlags(flags));
     }
 
@@ -598,4 +601,12 @@ public void testWillRedirectToStore() {
         api.willRedirectToStore();
         mInstabug.verify(Instabug::willRedirectToStore);
     }
+
+    @Test
+    public void testSetScreenshotCaptor() {
+        InternalCore internalCore = spy(InternalCore.INSTANCE);
+
+        InstabugApi.setScreenshotCaptor(any(), internalCore);
+        verify(internalCore)._setScreenshotCaptor(any(ScreenshotCaptor.class));
+    }
 }

packages/instabug_flutter/example/ios/Podfile.lock

@@ -8,26 +8,28 @@ PODS:
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)
+  - Instabug (from `https://ios-releases.instabug.com/custom/feature-flutter-private-views-base/13.4.2/Instabug.podspec`)
   - instabug_flutter (from `.symlinks/plugins/instabug_flutter/ios`)
   - OCMock (= 3.6)
 
 SPEC REPOS:
   trunk:
-    - Instabug
     - OCMock
 
 EXTERNAL SOURCES:
   Flutter:
     :path: Flutter
+  Instabug:
+    :podspec: https://ios-releases.instabug.com/custom/feature-flutter-private-views-base/13.4.2/Instabug.podspec
   instabug_flutter:
     :path: ".symlinks/plugins/instabug_flutter/ios"
 
 SPEC CHECKSUMS:
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  Instabug: 7a71890217b97b1e32dbca96661845396b66da2f
+  Instabug: 7aacd5099c11ce96bc49dda40eba0963c06acccc
   instabug_flutter: a2df87e3d4d9e410785e0b1ffef4bc64d1f4b787
   OCMock: 5ea90566be239f179ba766fd9fbae5885040b992
 
-PODFILE CHECKSUM: 8f7552fd115ace1988c3db54a69e4a123c448f84
+PODFILE CHECKSUM: 02e3295e1482e04d2cbd38390c8ea91a5c0c2ff1
 
 COCOAPODS: 1.14.3

packages/instabug_private_views/CHANGELOG.md

@@ -1,3 +1,7 @@
-## 0.0.1
+# Changelog
 
-* TODO: Describe initial release.
+## [UnReleased](https://github.com/Instabug/)
+
+### Added
+
+- Add support for masking private views during screen capturing ([#527](https://github.com/Instabug/Instabug-Flutter/pull/527)).

packages/instabug_private_views/README.md

@@ -35,7 +35,7 @@ void main() {
     invocationEvents: [InvocationEvent.floatingButton],
   );
 
-  ReproSteps.enablePrivateViews();
+  ReproSteps.enableMaskingPrivateViews();
   
   runApp(MyApp());
   

packages/instabug_private_views/android/src/main/java/com/instabug/instabug_private_views/InstabugPrivateViewsPlugin.java

@@ -82,7 +82,7 @@ public void onDetachedFromActivity() {
 
     private void register(BinaryMessenger messenger, FlutterRenderer renderer) {
         privateViewManager = new PrivateViewManager(new InstabugPrivateViewPigeon.InstabugPrivateViewFlutterApi(messenger), new PixelCopyCaptureManager(), new BoundryCaptureManager(renderer));
-        InstabugPrivateView instabugPrivateView=new InstabugPrivateView(messenger,privateViewManager, InternalCore.INSTANCE);
+        InstabugPrivateView.init(messenger,privateViewManager);
 
     }
 }

packages/instabug_private_views/android/src/main/java/com/instabug/instabug_private_views/modules/InstabugPrivateView.java

@@ -2,31 +2,38 @@
 
 import androidx.annotation.NonNull;
 
+import com.instabug.flutter.generated.InstabugLogPigeon;
+import com.instabug.flutter.modules.InstabugApi;
+import com.instabug.flutter.modules.InstabugLogApi;
+import com.instabug.flutter.util.privateViews.ScreenshotCaptor;
 import com.instabug.instabug_private_views.generated.InstabugPrivateViewPigeon;
 import com.instabug.library.internal.crossplatform.InternalCore;
-import com.instabug.library.screenshot.ScreenshotCaptor;
 import com.instabug.library.screenshot.instacapture.ScreenshotRequest;
 
 import io.flutter.plugin.common.BinaryMessenger;
 
 public class InstabugPrivateView implements InstabugPrivateViewPigeon.InstabugPrivateViewHostApi {
     PrivateViewManager privateViewManager;
-    private final InternalCore internalCore;
 
-    public InstabugPrivateView(BinaryMessenger messenger, PrivateViewManager privateViewManager, InternalCore internalCore) {
+    public static void init(BinaryMessenger messenger, PrivateViewManager privateViewManager) {
+        final InstabugPrivateView api = new InstabugPrivateView(messenger,privateViewManager);
+        InstabugPrivateViewPigeon.InstabugPrivateViewHostApi.setup(messenger, api);
+    }
+
+    public InstabugPrivateView(BinaryMessenger messenger, PrivateViewManager privateViewManager) {
         this.privateViewManager = privateViewManager;
-        this.internalCore = internalCore;
         InstabugPrivateViewPigeon.InstabugPrivateViewHostApi.setup(messenger, this);
 
     }
 
     @Override
     public void init() {
-        internalCore._setScreenshotCaptor(new ScreenshotCaptor() {
+        InstabugApi.setScreenshotCaptor(new ScreenshotCaptor() {
             @Override
-            public void capture(@NonNull ScreenshotRequest screenshotRequest) {
-                privateViewManager.mask(screenshotRequest.getListener());
+            public void capture(CapturingCallback listener) {
+                privateViewManager.mask(listener);
+
             }
-        });
+        },InternalCore.INSTANCE);
     }
 }

packages/instabug_private_views/android/src/main/java/com/instabug/instabug_private_views/modules/PrivateViewManager.java

@@ -10,19 +10,19 @@
 import androidx.annotation.VisibleForTesting;
 
 import com.instabug.flutter.util.ThreadManager;
+import com.instabug.flutter.util.privateViews.ScreenshotCaptor;
 import com.instabug.instabug_private_views.generated.InstabugPrivateViewPigeon;
 import com.instabug.instabug_private_views.model.ScreenshotResult;
 import com.instabug.instabug_private_views.modules.capturing.CaptureManager;
 import com.instabug.instabug_private_views.modules.capturing.ScreenshotResultCallback;
-import com.instabug.library.screenshot.ScreenshotCaptor;
 
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicReference;
 
-public  class PrivateViewManager {
+public class PrivateViewManager {
     private static final String THREAD_NAME = "IBG-Flutter-Screenshot";
     public static final String EXCEPTION_MESSAGE = "IBG-Flutter-Screenshot: error capturing screenshot";