Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 25 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -401,22 +401,33 @@ jobs:
prepare_steps:
type: steps
default: []
api_endpoint:
type: string
dashboard_token_env:
type: string
working_directory: ~/project
executor:
name: node/default
steps:
- advanced-checkout/shallow-checkout
- run: git clone git@github.com:Instabug/Escape.git
- run:
working_directory: Escape
command: swift build -c release
- run:
working_directory: Escape/.build/release
command: cp -f Escape /usr/local/bin/escape
- steps: << parameters.prepare_steps >>
- install_node_modules
- run:
name: Build the SDK
command: yarn build
- run:
name: Authorize with NPM
command: echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
- run:
name: Publish new enterprise version
command: npm publish
name: Publish Custom Package with Escape
command: Escape react-native publish-custompackage
environment:
DASHBOARD_TOKEN: << parameters.dashboard_token_env >>
DASHBOARD_API_ENDPOINT: << parameters.api_endpoint >>

publish:
macos:
Expand All @@ -438,8 +449,11 @@ jobs:
working_directory: project
command: yarn build
- run:
name: Publish Official Package with Escape
working_directory: project
command: Escape react-native publish
environment:
DASHBOARD_API_ENDPOINT: api.instabug.com
publish_new_namespace:
working_directory: ~/project
executor:
Expand Down Expand Up @@ -562,6 +576,8 @@ workflows:
npm_package: '@instabug/react-native-nn'
android_package: nn
api_endpoint: st001009nn.instabug.com
api_endpoint: st001009nn.instabug.com
dashboard_token_env: ${NN_TOKEN}

- hold_release_injazat:
requires: *release_dependencies
Expand All @@ -581,6 +597,8 @@ workflows:
npm_package: '@instabug/react-native-injazat'
android_package: injazat
api_endpoint: st001013mec1.instabug.com
api_endpoint: st001013mec1.instabug.com
dashboard_token_env: ${INJAZAT_TOKEN}

# Dream11 tests
- hold_test_dream11:
Expand Down Expand Up @@ -622,3 +640,5 @@ workflows:
only: dream11
prepare_steps:
- prepare_dream11
api_endpoint: st001012dream11.instabug.com
dashboard_token_env: ${DREAM11_TOKEN}
28 changes: 28 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,33 @@
# Changelog

## [15.0.1](https://github.com/Instabug/Instabug-React-Native/compare/v14.3.0...v15.0.1)

### Added

- Add support enable/disable screenshot auto masking. ([#1389](https://github.com/Instabug/Instabug-React-Native/pull/1389))

- Add support for BugReporting user consents. ([#1383](https://github.com/Instabug/Instabug-React-Native/pull/1383))

- Add support for xCode 16. ([#1370](https://github.com/Instabug/Instabug-React-Native/pull/1370))

- Add support for network spans. ([#1394](https://github.com/Instabug/Instabug-React-Native/pull/1394))

- Add respect to backend network body limit. ([#1397](https://github.com/Instabug/Instabug-React-Native/pull/1397))

### Changed

- Bump Instabug iOS SDK to v15.1.1 ([#1402](https://github.com/Instabug/Instabug-React-Native/pull/1402)). [See release notes](https://github.com/Instabug/Instabug-iOS/releases/tag/15.1.1).

- Bump Instabug Android SDK to v15.0.1 ([#1402](https://github.com/Instabug/Instabug-React-Native/pull/1402)). [See release notes](https://github.com/Instabug/Instabug-Android/releases/tag/v15.0.1).

### Fixed

- Not sending the inComplete xhrRequest. ([#1365](https://github.com/Instabug/Instabug-React-Native/pull/1365))

- Added more search capabilities to the find-token.sh script. e.g., searching in .env file for react config. [#1366](https://github.com/Instabug/Instabug-React-Native/pull/1366)

- Updated the CHANGELOG on the dashboard for the enterprise users. [#1404](https://github.com/Instabug/Instabug-React-Native/pull/1404)

## [14.3.0](https://github.com/Instabug/Instabug-React-Native/compare/v14.1.0...14.3.0)

### Added
Expand Down
2 changes: 1 addition & 1 deletion RNInstabug.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Pod::Spec.new do |s|
s.homepage = package["homepage"]
s.source = { :git => "https://github.com/Instabug/Instabug-React-Native.git", :tag => 'v' + package["version"] }

s.platform = :ios, "9.0"
s.platform = :ios, "13.0"
s.source_files = "ios/**/*.{h,m,mm}"

s.dependency 'React-Core'
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ android {
minSdkVersion getExtOrDefault('minSdkVersion').toInteger()
targetSdkVersion getExtOrDefault('targetSdkVersion').toInteger()
versionCode 1
versionName "14.3.0"
versionName "15.0.1"
multiDexEnabled true
ndk {
abiFilters "armeabi-v7a", "x86"
Expand Down
2 changes: 1 addition & 1 deletion android/native.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project.ext.instabug = [
version: '14.3.0'
version: '15.0.1'
]

dependencies {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import com.instabug.library.invocation.util.InstabugVideoRecordingButtonPosition;
import com.instabug.library.sessionreplay.model.SessionMetadata;
import com.instabug.library.ui.onboarding.WelcomeMessage;
import com.instabug.library.MaskingType;

import java.util.ArrayList;
import java.util.HashMap;
Expand Down Expand Up @@ -60,6 +61,8 @@ static Map<String, Object> getAll() {
putAll(locales);
putAll(placeholders);
putAll(launchType);
putAll(autoMaskingTypes);
putAll(userConsentActionType);
}};
}

Expand Down Expand Up @@ -142,6 +145,12 @@ static Map<String, Object> getAll() {
put("reproStepsDisabled", ReproMode.Disable);
}};

static final ArgsMap<String> userConsentActionType = new ArgsMap<String>() {{
put("dropAutoCapturedMedia", com.instabug.bug.userConsent.ActionType.DROP_AUTO_CAPTURED_MEDIA);
put("dropLogs", com.instabug.bug.userConsent.ActionType.DROP_LOGS);
put("noChat", com.instabug.bug.userConsent.ActionType.NO_CHAT);
}};

static final ArgsMap<Integer> sdkLogLevels = new ArgsMap<Integer>() {{
put("sdkDebugLogsLevelNone", com.instabug.library.LogLevel.NONE);
put("sdkDebugLogsLevelError", com.instabug.library.LogLevel.ERROR);
Expand Down Expand Up @@ -253,5 +262,10 @@ static Map<String, Object> getAll() {
put(SessionMetadata.LaunchType.COLD,"cold");
put(SessionMetadata.LaunchType.WARM,"warm" );
}};

public static final ArgsMap<Integer> autoMaskingTypes = new ArgsMap<Integer>() {{
put("labels", MaskingType.LABELS);
put("textInputs", MaskingType.TEXT_INPUTS);
put("media", MaskingType.MEDIA);
put("none", MaskingType.MASK_NOTHING);
}};
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ final class Constants {
final static String IBG_ON_NEW_MESSAGE_HANDLER = "IBGonNewMessageHandler";
final static String IBG_ON_NEW_REPLY_RECEIVED_CALLBACK = "IBGOnNewReplyReceivedCallback";

final static String IBG_ON_NEW_W3C_FLAGS_UPDATE_RECEIVED_CALLBACK = "IBGOnNewW3CFlagsUpdateReceivedCallback";
final static String IBG_ON_FEATURES_UPDATED_CALLBACK = "IBGOnFeatureUpdatedCallback";
final static String IBG_NETWORK_LOGGER_HANDLER = "IBGNetworkLoggerHandler";

final static String IBG_ON_FEATURE_FLAGS_UPDATE_RECEIVED_CALLBACK = "IBGOnNewFeatureFlagsUpdateReceivedCallback";

final static String IBG_SESSION_REPLAY_ON_SYNC_CALLBACK_INVOCATION = "IBGSessionReplayOnSyncCallback";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import android.annotation.SuppressLint;
import android.annotation.TargetApi;
import androidx.annotation.Nullable;

import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.Callback;
Expand All @@ -21,6 +22,7 @@
import com.instabug.reactlibrary.utils.ArrayUtil;
import com.instabug.reactlibrary.utils.EventEmitterModule;
import com.instabug.reactlibrary.utils.MainThreadHandler;
import com.instabug.bug.userConsent.ActionType;

import java.util.ArrayList;

Expand Down Expand Up @@ -415,4 +417,30 @@ public void run() {
}
});
}

/**
* Adds a user consent item to the bug reporting
* @param key A unique identifier string for the consent item.
* @param description The text shown to the user describing the consent item.
* @param mandatory Whether the user must agree to this item before submitting a report.
* @param checked Whether the consent checkbox is pre-selected.
* @param actionType A string representing the action type to map to SDK behavior.
*/
@ReactMethod
public void addUserConsent(String key, String description, boolean mandatory, boolean checked, @Nullable String actionType) {
MainThreadHandler.runOnMainThread(new Runnable() {
@Override
public void run() {
try {
String mappedActionType = ArgsRegistry.userConsentActionType.get(actionType);
BugReporting.addUserConsent(key, description, mandatory, checked, mappedActionType);
} catch (Exception e) {
e.printStackTrace();
}
}
});

}


}
Loading