Skip to content

Commit 17ce573

Browse files
author
Ali Abdelfattah
authored
Merge branch 'release/10.8' into fix/ios-autolinking
2 parents e433907 + c660677 commit 17ce573

File tree

138 files changed

+72354
-68544
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+72354
-68544
lines changed

‎CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
## master
1+
## v10.8.0 (2021-08-04)
22

3+
* Bumps Instabug native SDKs to v10.8
4+
* Adds string keys for the discard attachment prompt dialog.
35
* Fixes Autolinking on iOS.
46

57
## v10.4.0 (2021-05-10)

‎android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ android {
2929
dependencies {
3030
implementation 'com.android.support:multidex:1.0.3'
3131
implementation 'com.facebook.react:react-native:+'
32-
api('com.instabug.library:instabug:10.4.3.4') {
32+
api('com.instabug.library:instabug:10.8.1') {
3333
exclude group: 'com.android.support:appcompat-v7'
3434
}
3535
testImplementation 'org.mockito:mockito-core:1.10.19'

‎android/src/main/java/com/instabug/reactlibrary/ArgsRegistry.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,11 @@ static void registerCustomTextPlaceHolderKeysArgs(Map<String, Object> args) {
200200
args.put("betaWelcomeMessageFinishStepContent", InstabugCustomTextPlaceHolder.Key.BETA_WELCOME_MESSAGE_FINISH_STEP_CONTENT);
201201
args.put("liveWelcomeMessageTitle", InstabugCustomTextPlaceHolder.Key.LIVE_WELCOME_MESSAGE_TITLE);
202202
args.put("liveWelcomeMessageContent", InstabugCustomTextPlaceHolder.Key.LIVE_WELCOME_MESSAGE_CONTENT);
203+
args.put("discardAlertTitle", InstabugCustomTextPlaceHolder.Key.REPORT_DISCARD_DIALOG_TITLE);
204+
args.put("discardAlertMessage", InstabugCustomTextPlaceHolder.Key.REPORT_DISCARD_DIALOG_BODY);
205+
args.put("discardAlertCancel", InstabugCustomTextPlaceHolder.Key.REPORT_DISCARD_DIALOG_NEGATIVE_ACTION);
206+
args.put("discardAlertAction", InstabugCustomTextPlaceHolder.Key.REPORT_DISCARD_DIALOG_POSITIVE_ACTION);
207+
args.put("addAttachmentButtonTitleStringName", InstabugCustomTextPlaceHolder.Key.REPORT_ADD_ATTACHMENT_HEADER);
203208
}
204209

205210
static void registerInstabugReportTypesArgs(Map<String, Object> args) {

‎android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,12 @@ public class RNInstabugReactnativeModule extends ReactContextBaseJavaModule {
228228
private final String REPORT_QUESTION_DESCRIPTION = "reportQuestionDescription";
229229
private final String REQUEST_FEATURE_DESCRIPTION = "requestFeatureDescription";
230230

231+
private final String REPORT_DISCARD_DIALOG_TITLE = "discardAlertTitle";
232+
private final String REPORT_DISCARD_DIALOG_BODY = "discardAlertMessage";
233+
private final String REPORT_DISCARD_DIALOG_NEGATIVE_ACTION = "discardAlertCancel";
234+
private final String REPORT_DISCARD_DIALOG_POSITIVE_ACTION = "discardAlertAction";
235+
private final String REPORT_ADD_ATTACHMENT_HEADER = "addAttachmentButtonTitleStringName";
236+
231237
private Application androidApplication;
232238
private Instabug mInstabug;
233239
private InstabugInvocationEvent invocationEvent;
@@ -2309,6 +2315,16 @@ private InstabugCustomTextPlaceHolder.Key getStringToKeyConstant(String key) {
23092315
return InstabugCustomTextPlaceHolder.Key.REPORT_QUESTION_DESCRIPTION;
23102316
case REQUEST_FEATURE_DESCRIPTION:
23112317
return InstabugCustomTextPlaceHolder.Key.REQUEST_FEATURE_DESCRIPTION;
2318+
case REPORT_DISCARD_DIALOG_TITLE:
2319+
return InstabugCustomTextPlaceHolder.Key.REPORT_DISCARD_DIALOG_TITLE;
2320+
case REPORT_DISCARD_DIALOG_BODY:
2321+
return InstabugCustomTextPlaceHolder.Key.REPORT_DISCARD_DIALOG_BODY;
2322+
case REPORT_DISCARD_DIALOG_NEGATIVE_ACTION:
2323+
return InstabugCustomTextPlaceHolder.Key.REPORT_DISCARD_DIALOG_NEGATIVE_ACTION;
2324+
case REPORT_DISCARD_DIALOG_POSITIVE_ACTION:
2325+
return InstabugCustomTextPlaceHolder.Key.REPORT_DISCARD_DIALOG_POSITIVE_ACTION;
2326+
case REPORT_ADD_ATTACHMENT_HEADER:
2327+
return InstabugCustomTextPlaceHolder.Key.REPORT_ADD_ATTACHMENT_HEADER;
23122328
default:
23132329
return null;
23142330
}
@@ -2484,6 +2500,12 @@ public Map<String, Object> getConstants() {
24842500
constants.put(REPORT_QUESTION_DESCRIPTION, REPORT_QUESTION_DESCRIPTION);
24852501
constants.put(REQUEST_FEATURE_DESCRIPTION, REQUEST_FEATURE_DESCRIPTION);
24862502

2503+
constants.put(REPORT_DISCARD_DIALOG_TITLE, REPORT_DISCARD_DIALOG_TITLE);
2504+
constants.put(REPORT_DISCARD_DIALOG_BODY, REPORT_DISCARD_DIALOG_BODY);
2505+
constants.put(REPORT_DISCARD_DIALOG_NEGATIVE_ACTION, REPORT_DISCARD_DIALOG_NEGATIVE_ACTION);
2506+
constants.put(REPORT_DISCARD_DIALOG_POSITIVE_ACTION, REPORT_DISCARD_DIALOG_POSITIVE_ACTION);
2507+
constants.put(REPORT_ADD_ATTACHMENT_HEADER, REPORT_ADD_ATTACHMENT_HEADER);
2508+
24872509
return constants;
24882510
}
24892511
}

‎android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativePackage.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import com.instabug.library.visualusersteps.State;
1919
import com.instabug.reactlibrary.utils.InstabugUtil;
2020
import com.instabug.reactlibrary.utils.MainThreadHandler;
21+
import com.instabug.apm.APM;
2122

2223
import android.graphics.Color;
2324

@@ -67,6 +68,8 @@ public RNInstabugReactnativePackage(String androidApplicationToken, Application
6768
if(offset != null)
6869
BugReporting.setFloatingButtonOffset(offset);
6970

71+
// Temporarily disabling APM hot launches
72+
APM.setHotAppLaunchEnabled(false);
7073
}
7174

7275
public RNInstabugReactnativePackage(String androidApplicationToken, Application androidApplication,

‎index.d.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,12 @@ export enum strings {
432432
reportBugDescription,
433433
reportFeedbackDescription,
434434
reportQuestionDescription,
435-
requestFeatureDescription
435+
requestFeatureDescription,
436+
discardAlertTitle,
437+
discardAlertMessage,
438+
discardAlertCancel,
439+
discardAlertAction,
440+
addAttachmentButtonTitleStringName
436441
}
437442

438443
interface Report {

‎index.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1074,7 +1074,12 @@ const InstabugModule = {
10741074
reportBugDescription: Instabug.reportBugDescription,
10751075
reportFeedbackDescription: Instabug.reportFeedbackDescription,
10761076
reportQuestionDescription: Instabug.reportQuestionDescription,
1077-
requestFeatureDescription: Instabug.requestFeatureDescription
1077+
requestFeatureDescription: Instabug.requestFeatureDescription,
1078+
discardAlertTitle: Instabug.discardAlertTitle,
1079+
discardAlertMessage: Instabug.discardAlertMessage,
1080+
discardAlertCancel: Instabug.discardAlertCancel,
1081+
discardAlertAction: Instabug.discardAlertAction,
1082+
addAttachmentButtonTitleStringName: Instabug.addAttachmentButtonTitleStringName
10781083
},
10791084

10801085
};

‎ios/Instabug.xcframework/Info.plist

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,39 +5,39 @@
55
<key>AvailableLibraries</key>
66
<array>
77
<dict>
8-
<key>BitcodeSymbolMapsPath</key>
9-
<string>BCSymbolMaps</string>
108
<key>DebugSymbolsPath</key>
119
<string>dSYMs</string>
1210
<key>LibraryIdentifier</key>
13-
<string>ios-arm64_armv7</string>
11+
<string>ios-arm64_i386_x86_64-simulator</string>
1412
<key>LibraryPath</key>
1513
<string>Instabug.framework</string>
1614
<key>SupportedArchitectures</key>
1715
<array>
1816
<string>arm64</string>
19-
<string>armv7</string>
17+
<string>i386</string>
18+
<string>x86_64</string>
2019
</array>
2120
<key>SupportedPlatform</key>
2221
<string>ios</string>
22+
<key>SupportedPlatformVariant</key>
23+
<string>simulator</string>
2324
</dict>
2425
<dict>
26+
<key>BitcodeSymbolMapsPath</key>
27+
<string>BCSymbolMaps</string>
2528
<key>DebugSymbolsPath</key>
2629
<string>dSYMs</string>
2730
<key>LibraryIdentifier</key>
28-
<string>ios-arm64_i386_x86_64-simulator</string>
31+
<string>ios-arm64_armv7</string>
2932
<key>LibraryPath</key>
3033
<string>Instabug.framework</string>
3134
<key>SupportedArchitectures</key>
3235
<array>
3336
<string>arm64</string>
34-
<string>i386</string>
35-
<string>x86_64</string>
37+
<string>armv7</string>
3638
</array>
3739
<key>SupportedPlatform</key>
3840
<string>ios</string>
39-
<key>SupportedPlatformVariant</key>
40-
<string>simulator</string>
4141
</dict>
4242
</array>
4343
<key>CFBundlePackageType</key>

0 commit comments

Comments
 (0)