Merge pull request #587 from Instabug/dev

Release: v15.0.1

Author: ahmedAlaaInstabug

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [15.0.1](https://github.com/Instabug/Instabug-Flutter/compare/v14.3.0...15.0.1)
+
+### Added
+
+- Add support for xCode 16. ([#574](https://github.com/Instabug/Instabug-Flutter/pull/574))
+
+- Add support for BugReporting user consents. ([#573](https://github.com/Instabug/Instabug-Flutter/pull/573))
+
+### Changed
+
+- Bump Instabug iOS SDK to v15.1.1 ([#581](https://github.com/Instabug/Instabug-Flutter/pull/581)). [See release notes](https://github.com/Instabug/Instabug-iOS/releases/tag/15.1.1).
+
+- Bump Instabug Android SDK to v15.0.1 ([#581](https://github.com/Instabug/Instabug-Flutter/pull/581)). [See release notes](https://github.com/Instabug/Instabug-Android/releases/tag/v15.0.1).
+
 ## [14.3.1](https://github.com/Instabug/Instabug-Flutter/compare/v14.3.0...14.3.1) (May 20, 2025)
 
 ### Changed
@@ -19,12 +33,10 @@
 
 - Bump Instabug Android SDK to v14.3.0 ([#569](https://github.com/Instabug/Instabug-Flutter/pull/569)). [See release notes](https://github.com/Instabug/Instabug-Android/releases/tag/v14.3.0).
 
-
 ### Fixed
 
 - Fixed an issue with `SetReproStepsConfig` on Android platform ([#543](https://github.com/Instabug/Instabug-Flutter/pull/543)).
 
-
 ## [14.1.0](https://github.com/Instabug/Instabug-Flutter/compare/v14.0.0...v14.1.0) (January 2, 2025)
 
 ### Changed

android/build.gradle

@@ -1,5 +1,5 @@
 group 'com.instabug.flutter'
-version '14.3.1'
+version '15.0.1'
 
 buildscript {
     repositories {
@@ -47,7 +47,7 @@ android {
 }
 
 dependencies {
-    api 'com.instabug.library:instabug:14.3.1.6803970-SNAPSHOT'
+    api 'com.instabug.library:instabug:15.0.1'
     testImplementation 'junit:junit:4.13.2'
     testImplementation "org.mockito:mockito-inline:3.12.1"
     testImplementation "io.mockk:mockk:1.13.13"

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

@@ -186,4 +186,26 @@ public void setCommentMinimumCharacterCount(@NonNull Long limit, @Nullable List<
     }
         BugReporting.setCommentMinimumCharacterCount(limit.intValue(), reportTypesArray);
     }
+
+    @Override
+public void addUserConsents(String key, String description, Boolean mandatory, Boolean checked, String actionType) {
+        ThreadManager.runOnMainThread(new Runnable() {
+        @Override
+        public void run() {
+            String mappedActionType;
+            try {
+                if (actionType==null) {
+                    mappedActionType = null;
+                }
+                else {
+                    mappedActionType = ArgsRegistry.userConsentActionType.get(actionType);
+                }
+
+                BugReporting.addUserConsent(key, description, mandatory, checked, mappedActionType);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    });
+}
 }

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

@@ -75,6 +75,12 @@ public T get(Object key) {
         put("Position.bottomRight", InstabugVideoRecordingButtonPosition.BOTTOM_RIGHT);
     }};
 
+    public static final ArgsMap<String> userConsentActionType = new ArgsMap<String>() {{
+        put("UserConsentActionType.dropAutoCapturedMedia",  com.instabug.bug.userConsent.ActionType.DROP_AUTO_CAPTURED_MEDIA);
+        put("UserConsentActionType.dropLogs",  com.instabug.bug.userConsent.ActionType.DROP_LOGS);
+        put("UserConsentActionType.noChat",  com.instabug.bug.userConsent.ActionType.NO_CHAT);
+    }};
+
     public static ArgsMap<WelcomeMessage.State> welcomeMessageStates = new ArgsMap<WelcomeMessage.State>() {{
         put("WelcomeMessageMode.live", WelcomeMessage.State.LIVE);
         put("WelcomeMessageMode.beta", WelcomeMessage.State.BETA);

android/src/test/java/com/instabug/flutter/BugReportingApiTest.java

@@ -27,7 +27,7 @@
 import java.util.List;
 
 import io.flutter.plugin.common.BinaryMessenger;
-
+import com.instabug.bug.userConsent.ActionType;
 
 public class BugReportingApiTest {
     private final BinaryMessenger mMessenger = mock(BinaryMessenger.class);
@@ -194,4 +194,19 @@ public void testSetCommentMinimumCharacterCount() {
 
         mBugReporting.verify(() -> BugReporting.setCommentMinimumCharacterCount(limit.intValue(), BugReporting.ReportType.BUG, BugReporting.ReportType.QUESTION));
     }
+
+    @Test
+    public void TestAddUserConsents() {
+
+               final String key = "testKey";
+               final String description = "Consent description";
+               final boolean mandatory = true;
+               final boolean checked = true;
+               final String actionType = "UserConsentActionType.dropAutoCapturedMedia";
+
+
+               api.addUserConsents(key, description, mandatory, checked, actionType);
+
+               mBugReporting.verify(()->BugReporting.addUserConsent(key, description, mandatory, checked,"drop_auto_captured_media"));
+    }
 }

example/ios/InstabugTests/ApmApiTests.m

@@ -1,8 +1,8 @@
 #import <XCTest/XCTest.h>
 #import "OCMock/OCMock.h"
 #import "ApmApi.h"
-#import "Instabug/IBGAPM.h"
-#import "Instabug/Instabug.h"
+#import "InstabugSDK/IBGAPM.h"
+#import "InstabugSDK/InstabugSDK.h"
 #import "IBGAPM+PrivateAPIs.h"
 
 @interface ApmApiTests : XCTestCase

example/ios/InstabugTests/BugReportingApiTests.m

@@ -1,7 +1,7 @@
 #import <XCTest/XCTest.h>
 #import "OCMock/OCMock.h"
 #import "BugReportingApi.h"
-#import "Instabug/IBGBugReporting.h"
+#import "InstabugSDK/IBGBugReporting.h"
 
 @interface BugReportingApiTests : XCTestCase
 
@@ -174,5 +174,26 @@ - (void)testSetCommentMinimumCharacterCountGivenNoReportTypes {
 
     OCMVerify([self.mBugReporting setCommentMinimumCharacterCountForReportTypes:IBGBugReportingReportTypeBug | IBGBugReportingReportTypeFeedback | IBGBugReportingReportTypeQuestion withLimit:limit.intValue]);
 }
-
+- (void)testAddUserConsentWithKey {
+  NSString *key = @"testKey";
+  NSString *description = @"Consent description";
+  NSNumber *mandatory = @1;
+  NSNumber *checked = @0;
+  NSString *actionType= @"UserConsentActionType.dropAutoCapturedMedia";
+  FlutterError *error;
+    IBGActionType mappedActionType =  IBGActionTypeDropAutoCapturedMedia;
+
+  [self.api addUserConsentsKey:key
+                                  description:description
+                                    mandatory:mandatory
+                                      checked:checked
+                                   actionType:actionType
+                         error: &error
+                                   ];
+  OCMVerify([self.mBugReporting addUserConsentWithKey:key
+                                        description:description
+                                          mandatory:[mandatory boolValue]
+                                            checked:[checked boolValue]
+                                         actionType:mappedActionType]);
+}
 @end

example/ios/InstabugTests/CrashReportingApiTests.m

@@ -1,8 +1,8 @@
 #import <XCTest/XCTest.h>
 #import "OCMock/OCMock.h"
 #import "CrashReportingApi.h"
-#import "Instabug/IBGCrashReporting.h"
-#import "Instabug/Instabug.h"
+#import "InstabugSDK/IBGCrashReporting.h"
+#import "InstabugSDK/InstabugSDK.h"
 #import "Util/Instabug+Test.h"
 #import "Util/IBGCrashReporting+CP.h"
 

example/ios/InstabugTests/FeatureRequestsApiTests.m

@@ -1,7 +1,7 @@
 #import <XCTest/XCTest.h>
 #import "OCMock/OCMock.h"
 #import "FeatureRequestsApi.h"
-#import "Instabug/IBGFeatureRequests.h"
+#import "InstabugSDK/IBGFeatureRequests.h"
 
 @interface FeatureRequestsApiTests : XCTestCase
 

example/ios/InstabugTests/InstabugApiTests.m

@@ -2,7 +2,7 @@
 #import <XCTest/XCTest.h>
 #import "OCMock/OCMock.h"
 #import "InstabugApi.h"
-#import "Instabug/Instabug.h"
+#import "InstabugSDK/InstabugSDK.h"
 #import "Util/Instabug+Test.h"
 #import "IBGNetworkLogger+CP.h"
 #import "Flutter/Flutter.h"