Skip to content

Commit 5e0b2dc

Browse files
AliAbdelfattahAliAbdelfattah
committed
Merge branch 'master' into e2e/setup
2 parents d1a113d + 018081b commit 5e0b2dc

File tree

137 files changed

+4754
-3034
lines changed

Some content is hidden

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

137 files changed

+4754
-3034
lines changed

‎.github/auto-assign-issues.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
assignees:
2-
- alyezz
2+
- AliAbdelfattah

‎CHANGELOG.md‎

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,36 @@
1+
## master
2+
3+
* Fixes various bugs and improvements in automatic sourcemap upload scripts.
4+
5+
## v8.6.1 (2019-08-26)
6+
7+
* Introducing our new logo and branding. Meet the new Instabug: the platform for Real-Time Contextual Insights.
8+
* Updates native SDK dependencies to 8.6.1.
9+
* Adds the `enabled` key to `Instabug.reproStepsMode` enum to be able to use it with `Instabug.setReproStepsMode` API.
10+
11+
## v8.5.6 (2019-08-21)
12+
13+
* Fixes an issue that crashes the SDK when calling `Instabug.onReportSubmitHandler` on iOS.
14+
* Fixes an issue with passing empty string value to `Instabug.setUserAttribute`.
15+
16+
## v8.5.5 (2019-08-17)
17+
18+
* Fixes an issue with the email validation when reporting a bug on Android.
19+
* Fixes an issue with the crash reporting which prevented the report from being submitted on Android.
20+
21+
## v8.5.4 (2019-08-10)
22+
23+
* Hot Fixes an issue with `Instabug.setFloatingButtonEdge` and `Instabug.setEnabledAttachmentTypes` causing the app to crash.
24+
25+
## v8.5.3 (2019-08-08)
26+
27+
* Fixes hang/crash issues on iOS 9 devices
28+
* Fixes string mappings for addVideoMessage and conversationsHeaderTitle in iOS.
29+
30+
## v8.5.2 (2019-08-04)
31+
32+
* Fixes an issue that would cause Android to throw ArrayIndexOutOfBoundsException.
33+
134
## v8.5.1 (2019-07-22)
235

336
* Fixes an issue that would cause Instabug.framework to appear twice when using CocoaPods.
@@ -59,5 +92,3 @@
5992
* Added new OnReportSubmitHandler API
6093
* Fixed linking script
6194
* Api Name Changes
62-
63-

‎InstabugSample/App.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ export default class App extends Component<{}> {
5555
<TouchableOpacity style={styles.button} onPress={()=>this.sendFeedback()}>
5656
<Text style={styles.text}> SEND FEEDBACK </Text>
5757
</TouchableOpacity>
58+
<TouchableOpacity style={styles.button} onPress={()=>this.startNewConversation()}>
59+
<Text style={styles.text}> ASK A QUESTION </Text>
60+
</TouchableOpacity>
5861
<TouchableOpacity style={styles.button} onPress={()=>this.sendCrashReport()}>
5962
<Text style={styles.text}> THROW HANDLED EXCEPTION </Text>
6063
</TouchableOpacity>
61-
<TouchableOpacity style={styles.button} onPress={()=>this.startNewConversation()}>
62-
<Text style={styles.text}> START A NEW CONVERSATION </Text>
63-
</TouchableOpacity>
6464
<TouchableOpacity style={styles.button} onPress={()=>this.showNpsSurvey()}>
6565
<Text style={styles.text}> SHOW NPS SURVEY </Text>
6666
</TouchableOpacity>
@@ -184,7 +184,7 @@ export default class App extends Component<{}> {
184184
}
185185

186186
startNewConversation() {
187-
Chats.show();
187+
BugReporting.showWithOptions(BugReporting.reportType.question);
188188
}
189189

190190
showUnreadMessagesCount() {

‎InstabugSample/__tests__/instabugUtils.spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ describe('Test global error handler', () => {
6161
Platform.OS = 'android';
6262
Instabug._isOnReportHandlerSet = jest.fn(() => true);
6363
const handler = global.ErrorUtils.getGlobalHandler();
64-
IBGEventEmitter.addListener(IBGConstants.SEND_UNHANDLED_CRASH, (actual) => {
64+
IBGEventEmitter.addListener(Instabug, IBGConstants.SEND_UNHANDLED_CRASH, (actual) => {
6565
const expected = {
6666
message: 'TypeError - This is a type error.',
6767
os: 'android',

‎InstabugSample/ios/InstabugSample.xcodeproj/project.pbxproj‎

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@
1414
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
1515
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
1616
39B75062AA5F42B6E4C8E3C7 /* libPods-InstabugSampleTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7A03A15E2685C1231729CA8B /* libPods-InstabugSampleTests.a */; };
17+
BAD36E1C22F08B27007F5E74 /* InstabugBugReportingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BAD36E1B22F08B27007F5E74 /* InstabugBugReportingTests.m */; };
18+
BAD36E1E22F0906A007F5E74 /* IBGConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = BAD36E1D22F0906A007F5E74 /* IBGConstants.m */; };
19+
BAD36E2D22F1955C007F5E74 /* InstabugChatsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BAD36E2C22F1955C007F5E74 /* InstabugChatsTests.m */; };
20+
BAD36E2F22F19788007F5E74 /* InstabugFeatureRequestsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BAD36E2E22F19788007F5E74 /* InstabugFeatureRequestsTests.m */; };
21+
BAD36E3122F19973007F5E74 /* InstabugRepliesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BAD36E3022F19973007F5E74 /* InstabugRepliesTests.m */; };
22+
BAD36E3322F19B1B007F5E74 /* InstabugSurveysTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BAD36E3222F19B1B007F5E74 /* InstabugSurveysTests.m */; };
1723
C006102922E9EBCA00EDC852 /* libOCMock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C006102822E9EBCA00EDC852 /* libOCMock.a */; };
1824
/* End PBXBuildFile section */
1925

@@ -41,12 +47,23 @@
4147
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = InstabugSample/main.m; sourceTree = "<group>"; };
4248
499132AD8910CB4D10684C0B /* Pods-InstabugSample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-InstabugSample.release.xcconfig"; path = "Target Support Files/Pods-InstabugSample/Pods-InstabugSample.release.xcconfig"; sourceTree = "<group>"; };
4349
52BA9869FB340D2E128C8413 /* Pods-InstabugSample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-InstabugSample.debug.xcconfig"; path = "Target Support Files/Pods-InstabugSample/Pods-InstabugSample.debug.xcconfig"; sourceTree = "<group>"; };
50+
62941153FBCA702BE7DDD700 /* Pods-InstabugSampleTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-InstabugSampleTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-InstabugSampleTests/Pods-InstabugSampleTests.release.xcconfig"; sourceTree = "<group>"; };
51+
6520812BE77D6515D82803F8 /* Pods-InstabugSample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-InstabugSample.release.xcconfig"; path = "Pods/Target Support Files/Pods-InstabugSample/Pods-InstabugSample.release.xcconfig"; sourceTree = "<group>"; };
4452
6AADF551224449E100BEC5F2 /* Pods-InstabugSampleTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-InstabugSampleTests.release.xcconfig"; path = "Target Support Files/Pods-InstabugSampleTests/Pods-InstabugSampleTests.release.xcconfig"; sourceTree = "<group>"; };
4553
736C2E3EDEA69CCD5B8A53AE /* Instabug.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Instabug.framework; path = "../node_modules/instabug-reactnative/ios/Instabug.framework"; sourceTree = "<group>"; };
4654
7A03A15E2685C1231729CA8B /* libPods-InstabugSampleTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-InstabugSampleTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
55+
87F5729F702507D704C7BDC1 /* Pods-InstabugSample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-InstabugSample.debug.xcconfig"; path = "Pods/Target Support Files/Pods-InstabugSample/Pods-InstabugSample.debug.xcconfig"; sourceTree = "<group>"; };
4756
A0EF1FBF0176E13B30EA2D29 /* libPods-InstabugSample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-InstabugSample.a"; sourceTree = BUILT_PRODUCTS_DIR; };
4857
B5BDF7C4EF0BC367832D3796 /* Pods-InstabugSampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-InstabugSampleTests.debug.xcconfig"; path = "Target Support Files/Pods-InstabugSampleTests/Pods-InstabugSampleTests.debug.xcconfig"; sourceTree = "<group>"; };
58+
BAD36E1B22F08B27007F5E74 /* InstabugBugReportingTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = InstabugBugReportingTests.m; sourceTree = "<group>"; };
59+
BAD36E1D22F0906A007F5E74 /* IBGConstants.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IBGConstants.m; sourceTree = "<group>"; };
60+
BAD36E1F22F09390007F5E74 /* IBGConstants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IBGConstants.h; sourceTree = "<group>"; };
61+
BAD36E2C22F1955C007F5E74 /* InstabugChatsTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = InstabugChatsTests.m; sourceTree = "<group>"; };
62+
BAD36E2E22F19788007F5E74 /* InstabugFeatureRequestsTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = InstabugFeatureRequestsTests.m; sourceTree = "<group>"; };
63+
BAD36E3022F19973007F5E74 /* InstabugRepliesTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = InstabugRepliesTests.m; sourceTree = "<group>"; };
64+
BAD36E3222F19B1B007F5E74 /* InstabugSurveysTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = InstabugSurveysTests.m; sourceTree = "<group>"; };
4965
C006102822E9EBCA00EDC852 /* libOCMock.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libOCMock.a; path = usr/lib/libOCMock.a; sourceTree = "<group>"; };
66+
C74E4010ABE7AFC7DB5E79DC /* Pods-InstabugSampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-InstabugSampleTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-InstabugSampleTests/Pods-InstabugSampleTests.debug.xcconfig"; sourceTree = "<group>"; };
5067
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
5168
/* End PBXFileReference section */
5269

@@ -76,6 +93,13 @@
7693
children = (
7794
00E356F21AD99517003FC87E /* InstabugSampleTests.m */,
7895
00E356F01AD99517003FC87E /* Supporting Files */,
96+
BAD36E1B22F08B27007F5E74 /* InstabugBugReportingTests.m */,
97+
BAD36E1D22F0906A007F5E74 /* IBGConstants.m */,
98+
BAD36E1F22F09390007F5E74 /* IBGConstants.h */,
99+
BAD36E2C22F1955C007F5E74 /* InstabugChatsTests.m */,
100+
BAD36E2E22F19788007F5E74 /* InstabugFeatureRequestsTests.m */,
101+
BAD36E3022F19973007F5E74 /* InstabugRepliesTests.m */,
102+
BAD36E3222F19B1B007F5E74 /* InstabugSurveysTests.m */,
79103
);
80104
path = InstabugSampleTests;
81105
sourceTree = "<group>";
@@ -152,6 +176,10 @@
152176
499132AD8910CB4D10684C0B /* Pods-InstabugSample.release.xcconfig */,
153177
B5BDF7C4EF0BC367832D3796 /* Pods-InstabugSampleTests.debug.xcconfig */,
154178
6AADF551224449E100BEC5F2 /* Pods-InstabugSampleTests.release.xcconfig */,
179+
87F5729F702507D704C7BDC1 /* Pods-InstabugSample.debug.xcconfig */,
180+
6520812BE77D6515D82803F8 /* Pods-InstabugSample.release.xcconfig */,
181+
C74E4010ABE7AFC7DB5E79DC /* Pods-InstabugSampleTests.debug.xcconfig */,
182+
62941153FBCA702BE7DDD700 /* Pods-InstabugSampleTests.release.xcconfig */,
155183
);
156184
path = Pods;
157185
sourceTree = "<group>";
@@ -213,6 +241,9 @@
213241
CreatedOnToolsVersion = 6.2;
214242
TestTargetID = 13B07F861A680F5B00A75B9A;
215243
};
244+
13B07F861A680F5B00A75B9A = {
245+
DevelopmentTeam = Q93WTAKPYJ;
246+
};
216247
};
217248
};
218249
buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "InstabugSample" */;
@@ -375,7 +406,13 @@
375406
isa = PBXSourcesBuildPhase;
376407
buildActionMask = 2147483647;
377408
files = (
409+
BAD36E1E22F0906A007F5E74 /* IBGConstants.m in Sources */,
410+
BAD36E3322F19B1B007F5E74 /* InstabugSurveysTests.m in Sources */,
411+
BAD36E2F22F19788007F5E74 /* InstabugFeatureRequestsTests.m in Sources */,
412+
BAD36E1C22F08B27007F5E74 /* InstabugBugReportingTests.m in Sources */,
413+
BAD36E2D22F1955C007F5E74 /* InstabugChatsTests.m in Sources */,
378414
00E356F31AD99517003FC87E /* InstabugSampleTests.m in Sources */,
415+
BAD36E3122F19973007F5E74 /* InstabugRepliesTests.m in Sources */,
379416
);
380417
runOnlyForDeploymentPostprocessing = 0;
381418
};
@@ -521,14 +558,15 @@
521558
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
522559
CURRENT_PROJECT_VERSION = 1;
523560
DEAD_CODE_STRIPPING = NO;
561+
DEVELOPMENT_TEAM = Q93WTAKPYJ;
524562
INFOPLIST_FILE = InstabugSample/Info.plist;
525563
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
526564
OTHER_LDFLAGS = (
527565
"$(inherited)",
528566
"-ObjC",
529567
"-lc++",
530568
);
531-
PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
569+
PRODUCT_BUNDLE_IDENTIFIER = org.reactjs.native.example.InstabugSamplelu2;
532570
PRODUCT_NAME = InstabugSample;
533571
VERSIONING_SYSTEM = "apple-generic";
534572
};
@@ -540,14 +578,15 @@
540578
buildSettings = {
541579
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
542580
CURRENT_PROJECT_VERSION = 1;
581+
DEVELOPMENT_TEAM = Q93WTAKPYJ;
543582
INFOPLIST_FILE = InstabugSample/Info.plist;
544583
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
545584
OTHER_LDFLAGS = (
546585
"$(inherited)",
547586
"-ObjC",
548587
"-lc++",
549588
);
550-
PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
589+
PRODUCT_BUNDLE_IDENTIFIER = org.reactjs.native.example.InstabugSamplelu2;
551590
PRODUCT_NAME = InstabugSample;
552591
VERSIONING_SYSTEM = "apple-generic";
553592
};

‎InstabugSample/ios/InstabugSampleTests/IBGConstants.h‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
//
2+
// IBGConstants.h
3+
// InstabugSample
4+
//
5+
// Created by Salma Ali on 7/30/19.
6+
// Copyright © 2019 Facebook. All rights reserved.
7+
//
8+
9+
#ifndef IBGConstants_h
10+
#define IBGConstants_h
11+
12+
extern NSTimeInterval const EXPECTATION_TIMEOUT;
13+
14+
#endif /* IBGConstants_h */

‎InstabugSample/ios/InstabugSampleTests/IBGConstants.m‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
//
2+
// IBGConstants.m
3+
// InstabugSampleTests
4+
//
5+
// Created by Salma Ali on 7/30/19.
6+
// Copyright © 2019 Facebook. All rights reserved.
7+
//
8+
9+
#import <Foundation/Foundation.h>
10+
11+
NSTimeInterval const EXPECTATION_TIMEOUT = 10;

0 commit comments

Comments
 (0)