Skip to content

Commit 9a58cb3

Browse files
ethanneffethanneff
authored
Merge pull request #359 from BranchMetrics/fix-stuff
Fix stuff
2 parents 487133a + 146974f commit 9a58cb3

File tree

79 files changed

+4182
-1587
lines changed

Some content is hidden

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

79 files changed

+4182
-1587
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ before_script:
1313
- curl -Lo travis_after_all.py https://git.io/vLSON
1414
- npm prune
1515
script:
16-
- npm run prerelease
16+
- npm run validate
1717
after_success:
1818
- python travis_after_all.py
1919
- npm run semantic-release

‎gulpfile.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ function genNpmPluginXML () {
6262

6363
files = files.concat(emitFiles(head + 'Fabric/'))
6464
files = files.concat(emitFiles(head + 'Branch-SDK/'))
65-
files = files.concat(emitFiles(head + 'Branch-SDK/Requests/'))
65+
files = files.concat(emitFiles(head + 'Branch-SDK/Networking/'))
66+
files = files.concat(emitFiles(head + 'Branch-SDK/Networking/Requests/'))
6667

6768
xml = xml.replace('<!--[Branch Framework Reference]-->', newLineIndent + files.join(newLineIndent))
6869

‎package.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "branch-cordova-sdk",
33
"description": "Branch Metrics Cordova SDK",
44
"main": "src/branch.js",
5-
"version": "2.6.7",
5+
"version": "2.6.8",
66
"homepage": "https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking",
77
"repository": {
88
"type": "git",
@@ -38,30 +38,30 @@
3838
"scripts": {
3939
"changelog": "node ./src/scripts/npm/updateChangeLog -reset=true",
4040
"commitmsg": "validate-commit-msg",
41-
"precommit": "npm-check --skip-unused && gulp prod",
41+
"validate": "gulp prod",
42+
"dependencies": "ncu -u",
43+
"precommit": "gulp prod",
4244
"postcommit": "semantic-release pre --verifyRelease='./src/scripts/npm/updateNpmVersion' || true",
43-
"prerelease": "gulp prod",
44-
"dependencies": "npm-check -u",
4545
"semantic-release": "semantic-release pre && npm publish && semantic-release post"
4646
},
4747
"dependencies": {
4848
"mkpath": "^1.0.0",
4949
"node-version-compare": "^1.0.1",
5050
"plist": "^2.1.0",
5151
"request": "^2.81.0",
52-
"xml2js": "^0.4.17"
52+
"xml2js": "^0.4.18"
5353
},
5454
"devDependencies": {
5555
"cordova": "^7.0.1",
5656
"gulp": "^3.9.1",
57-
"gulp-standard": "^10.0.0",
57+
"gulp-standard": "^10.1.0",
5858
"husky": "^0.14.3",
5959
"mkpath": "^1.0.0",
6060
"node-version-compare": "^1.0.1",
61-
"npm-check": "^5.4.5",
61+
"npm-check-updates": "^2.12.1",
6262
"plist": "^2.1.0",
63-
"semantic-release": "^6.3.6",
63+
"semantic-release": "^7.0.1",
6464
"validate-commit-msg": "^2.14.0",
65-
"xml2js": "^0.4.17"
65+
"xml2js": "^0.4.18"
6666
}
6767
}

‎plugin.template.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ SOFTWARE.
2424
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
2525
xmlns:android="http://schemas.android.com/apk/res/android"
2626
id="branch-cordova-sdk"
27-
version="2.6.7">
27+
version="2.6.8">
2828

2929
<!-- DO NOT EDIT THIS FILE. MAKE ALL CHANGES TO plugin.template.xml INSTEAD -->
3030

‎plugin.xml‎

Lines changed: 43 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ SOFTWARE.
2424
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
2525
xmlns:android="http://schemas.android.com/apk/res/android"
2626
id="branch-cordova-sdk"
27-
version="2.6.7">
27+
version="2.6.8">
2828

2929
<!-- DO NOT EDIT THIS FILE. MAKE ALL CHANGES TO plugin.template.xml INSTEAD -->
3030

@@ -99,6 +99,8 @@ SOFTWARE.
9999
<source-file src="src/ios/dependencies/Branch-SDK/BNCConfig.m" />
100100
<header-file src="src/ios/dependencies/Branch-SDK/BNCContentDiscoveryManager.h" />
101101
<source-file src="src/ios/dependencies/Branch-SDK/BNCContentDiscoveryManager.m" />
102+
<header-file src="src/ios/dependencies/Branch-SDK/BNCCrashlyticsWrapper.h" />
103+
<source-file src="src/ios/dependencies/Branch-SDK/BNCCrashlyticsWrapper.m" />
102104
<header-file src="src/ios/dependencies/Branch-SDK/BNCDebug.h" />
103105
<source-file src="src/ios/dependencies/Branch-SDK/BNCDebug.m" />
104106
<header-file src="src/ios/dependencies/Branch-SDK/BNCDeepLinkViewControllerInstance.h" />
@@ -115,16 +117,12 @@ SOFTWARE.
115117
<source-file src="src/ios/dependencies/Branch-SDK/BNCLinkCache.m" />
116118
<header-file src="src/ios/dependencies/Branch-SDK/BNCLinkData.h" />
117119
<source-file src="src/ios/dependencies/Branch-SDK/BNCLinkData.m" />
120+
<header-file src="src/ios/dependencies/Branch-SDK/BNCLocalization.h" />
121+
<source-file src="src/ios/dependencies/Branch-SDK/BNCLocalization.m" />
118122
<header-file src="src/ios/dependencies/Branch-SDK/BNCLog.h" />
119123
<source-file src="src/ios/dependencies/Branch-SDK/BNCLog.m" />
120124
<header-file src="src/ios/dependencies/Branch-SDK/BNCPreferenceHelper.h" />
121125
<source-file src="src/ios/dependencies/Branch-SDK/BNCPreferenceHelper.m" />
122-
<header-file src="src/ios/dependencies/Branch-SDK/BNCServerInterface.h" />
123-
<source-file src="src/ios/dependencies/Branch-SDK/BNCServerInterface.m" />
124-
<header-file src="src/ios/dependencies/Branch-SDK/BNCServerRequestQueue.h" />
125-
<source-file src="src/ios/dependencies/Branch-SDK/BNCServerRequestQueue.m" />
126-
<header-file src="src/ios/dependencies/Branch-SDK/BNCServerResponse.h" />
127-
<source-file src="src/ios/dependencies/Branch-SDK/BNCServerResponse.m" />
128126
<header-file src="src/ios/dependencies/Branch-SDK/BNCStrongMatchHelper.h" />
129127
<source-file src="src/ios/dependencies/Branch-SDK/BNCStrongMatchHelper.m" />
130128
<header-file src="src/ios/dependencies/Branch-SDK/BNCSystemObserver.h" />
@@ -162,35 +160,44 @@ SOFTWARE.
162160
<header-file src="src/ios/dependencies/Branch-SDK/NSString+Branch.h" />
163161
<source-file src="src/ios/dependencies/Branch-SDK/NSString+Branch.m" />
164162

165-
<header-file src="src/ios/dependencies/Branch-SDK/Requests/BNCServerRequest.h" />
166-
<source-file src="src/ios/dependencies/Branch-SDK/Requests/BNCServerRequest.m" />
167-
<header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchCloseRequest.h" />
168-
<source-file src="src/ios/dependencies/Branch-SDK/Requests/BranchCloseRequest.m" />
169-
<header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchCreditHistoryRequest.h" />
170-
<source-file src="src/ios/dependencies/Branch-SDK/Requests/BranchCreditHistoryRequest.m" />
171-
<header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchInstallRequest.h" />
172-
<source-file src="src/ios/dependencies/Branch-SDK/Requests/BranchInstallRequest.m" />
173-
<header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchLoadRewardsRequest.h" />
174-
<source-file src="src/ios/dependencies/Branch-SDK/Requests/BranchLoadRewardsRequest.m" />
175-
<header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchLogoutRequest.h" />
176-
<source-file src="src/ios/dependencies/Branch-SDK/Requests/BranchLogoutRequest.m" />
177-
<header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchOpenRequest.h" />
178-
<source-file src="src/ios/dependencies/Branch-SDK/Requests/BranchOpenRequest.m" />
179-
<header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchRedeemRewardsRequest.h" />
180-
<source-file src="src/ios/dependencies/Branch-SDK/Requests/BranchRedeemRewardsRequest.m" />
181-
<header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchRegisterViewRequest.h" />
182-
<source-file src="src/ios/dependencies/Branch-SDK/Requests/BranchRegisterViewRequest.m" />
183-
<header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchSetIdentityRequest.h" />
184-
<source-file src="src/ios/dependencies/Branch-SDK/Requests/BranchSetIdentityRequest.m" />
185-
<header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchShortUrlRequest.h" />
186-
<source-file src="src/ios/dependencies/Branch-SDK/Requests/BranchShortUrlRequest.m" />
187-
<header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchShortUrlSyncRequest.h" />
188-
<source-file src="src/ios/dependencies/Branch-SDK/Requests/BranchShortUrlSyncRequest.m" />
189-
<header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchSpotlightUrlRequest.h" />
190-
<source-file src="src/ios/dependencies/Branch-SDK/Requests/BranchSpotlightUrlRequest.m" />
191-
<header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchUserCompletedActionRequest.h" />
192-
<source-file src="src/ios/dependencies/Branch-SDK/Requests/BranchUserCompletedActionRequest.m" />
193-
<header-file src="src/ios/dependencies/Branch-SDK/Requests/PromoViewHandler.h" />
163+
<header-file src="src/ios/dependencies/Branch-SDK/Networking/BNCNetworkService.h" />
164+
<source-file src="src/ios/dependencies/Branch-SDK/Networking/BNCNetworkService.m" />
165+
<header-file src="src/ios/dependencies/Branch-SDK/Networking/BNCNetworkServiceProtocol.h" />
166+
<header-file src="src/ios/dependencies/Branch-SDK/Networking/BNCServerInterface.h" />
167+
<source-file src="src/ios/dependencies/Branch-SDK/Networking/BNCServerInterface.m" />
168+
<header-file src="src/ios/dependencies/Branch-SDK/Networking/BNCServerRequest.h" />
169+
<source-file src="src/ios/dependencies/Branch-SDK/Networking/BNCServerRequest.m" />
170+
<header-file src="src/ios/dependencies/Branch-SDK/Networking/BNCServerRequestQueue.h" />
171+
<source-file src="src/ios/dependencies/Branch-SDK/Networking/BNCServerRequestQueue.m" />
172+
<header-file src="src/ios/dependencies/Branch-SDK/Networking/BNCServerResponse.h" />
173+
<source-file src="src/ios/dependencies/Branch-SDK/Networking/BNCServerResponse.m" />
174+
175+
<header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchCloseRequest.h" />
176+
<source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchCloseRequest.m" />
177+
<header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchCreditHistoryRequest.h" />
178+
<source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchCreditHistoryRequest.m" />
179+
<header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchInstallRequest.h" />
180+
<source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchInstallRequest.m" />
181+
<header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchLoadRewardsRequest.h" />
182+
<source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchLoadRewardsRequest.m" />
183+
<header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchLogoutRequest.h" />
184+
<source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchLogoutRequest.m" />
185+
<header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchOpenRequest.h" />
186+
<source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchOpenRequest.m" />
187+
<header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchRedeemRewardsRequest.h" />
188+
<source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchRedeemRewardsRequest.m" />
189+
<header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchRegisterViewRequest.h" />
190+
<source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchRegisterViewRequest.m" />
191+
<header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchSetIdentityRequest.h" />
192+
<source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchSetIdentityRequest.m" />
193+
<header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchShortUrlRequest.h" />
194+
<source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchShortUrlRequest.m" />
195+
<header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchShortUrlSyncRequest.h" />
196+
<source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchShortUrlSyncRequest.m" />
197+
<header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchSpotlightUrlRequest.h" />
198+
<source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchSpotlightUrlRequest.m" />
199+
<header-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchUserCompletedActionRequest.h" />
200+
<source-file src="src/ios/dependencies/Branch-SDK/Networking/Requests/BranchUserCompletedActionRequest.m" />
194201

195202
</platform>
196203
</plugin>

src/android/dependencies/Branch-2.10.3.jar renamed to src/android/dependencies/Branch-2.11.1.jar

247 KB
Binary file not shown.

‎src/branch.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,13 @@ Branch.prototype.disableGlobalListenersWarnings = function () {
3737

3838
Branch.prototype.initSession = function (deepLinkDataListener) {
3939
// private method to filter out +clicked_branch_link = false in deep link callback
40-
var previous = ''
40+
var previous = 0
4141
var deepLinkDataParser = function (deepLinkData) {
4242
var isBranchLink = '+clicked_branch_link'
4343
var isNonBranchLink = '+non_branch_link'
4444
// TODO: figure out why iOS SDK passes data twice on Ionic 2 terminated and no network connection
45-
var isNewData = JSON.stringify(deepLinkData) !== previous
45+
var dataLength = JSON.stringify(deepLinkData).length
46+
var isNewData = dataLength !== previous
4647
var isBranchLinkClick = deepLinkData.hasOwnProperty(isBranchLink) && deepLinkData[isBranchLink] === true
4748
var isNonBranchLinkClick = deepLinkData.hasOwnProperty(isNonBranchLink)
4849

@@ -51,7 +52,7 @@ Branch.prototype.initSession = function (deepLinkDataListener) {
5152
// to Branch.initSession(function(data) {})
5253
deepLinkDataListener(deepLinkData)
5354
}
54-
previous = JSON.stringify(deepLinkData)
55+
previous = dataLength
5556
}
5657

5758
if (!disableGlobalListenersWarnings && !deepLinkDataListener && !window.DeepLinkHandler) {

‎src/ios/AppDelegate+BranchSdk.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
#import <Branch/Branch.h>
1717
#endif
1818

19-
@interface AppDelegate (BranchSdk)
19+
@interface AppDelegate (BranchSDK)
2020

2121
- (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray * _Nullable))restorationHandler;
2222

2323
@end
2424

25-
@implementation AppDelegate (BranchSdk)
25+
@implementation AppDelegate (BranchSDK)
2626

2727
// Respond to URI scheme links
2828
- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options {

‎src/ios/dependencies/Branch-SDK/BNCConfig.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
NSString * const BNC_API_BASE_URL = @"https://api.branch.io";
1212
NSString * const BNC_API_VERSION = @"v1";
1313
NSString * const BNC_LINK_URL = @"https://bnc.lt";
14-
NSString * const BNC_SDK_VERSION = @"0.16.2";
14+
NSString * const BNC_SDK_VERSION = @"0.17.9";

‎src/ios/dependencies/Branch-SDK/BNCContentDiscoveryManager.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,12 @@
3737

3838
- (void)indexContentWithTitle:(NSString *)title description:(NSString *)description publiclyIndexable:(BOOL)publiclyIndexable type:(NSString *)type thumbnailUrl:(NSURL *)thumbnailUrl keywords:(NSSet *)keywords userInfo:(NSDictionary *)userInfo expirationDate:(NSDate *)expirationDate callback:(callbackWithUrl)callback;
3939

40+
- (void)indexContentWithTitle:(NSString *)title description:(NSString *)description canonicalId:(NSString *)canonicalId publiclyIndexable:(BOOL)publiclyIndexable type:(NSString *)type thumbnailUrl:(NSURL *)thumbnailUrl keywords:(NSSet *)keywords userInfo:(NSDictionary *)userInfo expirationDate:(NSDate *)expirationDate callback:(callbackWithUrl)callback;
4041

4142

4243
/* This one has a different callback, which includes the spotlightIdentifier, and requires a different signature
4344
It cannot be part of the stack of method signatures above, because of the different callback type.*/
44-
- (void)indexContentWithTitle:(NSString *)title description:(NSString *)description publiclyIndexable:(BOOL)publiclyIndexable type:(NSString *)type thumbnailUrl:(NSURL *)thumbnailUrl keywords:(NSSet *)keywords userInfo:(NSDictionary *)userInfo expirationDate:(NSDate *)expirationDate callback:(callbackWithUrl)callback spotlightCallback:(callbackWithUrlAndSpotlightIdentifier)spotlightCallback;
45+
- (void)indexContentWithTitle:(NSString *)title description:(NSString *)description canonicalId:(NSString *)canonicalId publiclyIndexable:(BOOL)publiclyIndexable type:(NSString *)type thumbnailUrl:(NSURL *)thumbnailUrl keywords:(NSSet *)keywords userInfo:(NSDictionary *)userInfo expirationDate:(NSDate *)expirationDate callback:(callbackWithUrl)callback spotlightCallback:(callbackWithUrlAndSpotlightIdentifier)spotlightCallback;
4546

4647

4748
@end

0 commit comments

Comments
 (0)