Skip to content

Commit 5802163

Browse files
ethanneffethanneff
authored
Merge pull request #400 from BranchMetrics/more-fixes
More fixes
2 parents f67eb65 + 03259d0 commit 5802163

File tree

107 files changed

+3244
-1418
lines changed

Some content is hidden

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

107 files changed

+3244
-1418
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ node_modules
99
.installed
1010
.gradle/
1111
.idea/
12+
tmp/
1213
cordova-ionic-phonegap-branch-deep-linking.iml
1314
local.properties
1415
out/

‎CHANGELOG.md

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,39 @@
11
# CHANGELOG
22
Questions? [Contact us](https://support.branch.io/support/tickets/new)
33

4+
## [v2.6.18](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/releases/tag/v2.6.18) (2017-11-10)
5+
6+
- **Completed Changes**
7+
- Merge pull request #391 from BranchMetrics/fix-associated-domainsfix: corrected the duplication of custom link domains in the iOS enti… ([f67eb](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/commit/f67eb65fdde31e1c0f04a4d0c5fd72880ba4bdba))
8+
9+
- **Closed Issues**
10+
- Cold Start ([#397](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/issues/397))
11+
- Cannot resolve module 'cordova/exec' in branch.js ([#396](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/issues/396))
12+
- iOS distribution error, applinks not supported ([#395](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/issues/395))
13+
- ios - Terminating app due to uncaught exception 'NSUnknownKeyException', reason: '[<BranchUniversalObject 0x1c42ece80> setValue:forUndefinedKey:]: this class is not key value coding-compliant for the key integer.' ([#390](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/issues/390))
14+
15+
## [v2.6.17](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/releases/tag/v2.6.17) (2017-11-09)
16+
17+
- **Completed Changes**
18+
- Merge branch 'master' into fix-associated-domains ([24919](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/commit/24919563eab3a83469683cee1d6a4eb6f31b0be8))
19+
- fix: corrected the duplication of custom link domains in the iOS entitlements ([99901](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/commit/999016b1eb9e6e4332574cb33aea6e7abdc51521))
20+
- Merge pull request #388 from BranchMetrics/updatesUpdates ([eb064](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/commit/eb06417ac73780a37cee7aa8877bb04b7d807d84))
21+
22+
- **Closed Issues**
23+
- Getting Error: Cannot read property '$' of undefined while building android apk ([#389](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/issues/389))
24+
- Android app not receiving Branch link data ([#387](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/issues/387))
25+
426
## [v2.6.16](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/releases/tag/v2.6.16) (2017-10-31)
527

628
- **Completed Changes**
29+
- chore: relocated known issues in contributing ([82371](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/commit/823718b93d2f456098d6c77981eaf41c3438d018))
30+
- chore: updated the changelog ([a452c](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/commit/a452c23e051f247c36d4c4881cc99b14d97523c8))
31+
- chore: updated npm version to 2.6.17 ([212d3](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/commit/212d380bd4148e5326b06618abe4a99416a38ebe))
32+
- fix: updated android to 2.13.1Hot fix : Referral params are not returned when initSession is called mutiple times while an init session is in progress ([aec99](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/commit/aec99398eaef6cdb38143e5372ff6c03fe6f7f87))
733
- docs: added testing steps to updating the sdk ([15374](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/commit/15374b0824e7315f87afed891df76418f570ff3c))
834
- Merge pull request #385 from BranchMetrics/bulkylots of fixes ([b1185](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/commit/b11855a0c8cd670dccd076ccc69e0635e5d99c15))
935

1036
- **Closed Issues**
11-
- Android app not receiving Branch link data ([#387](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/issues/387))
1237
- Unable to get working with phonegap build ([#386](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/issues/386))
1338
- Branch Deep Linking not working in Android ([#384](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/issues/384))
1439
- What is "ios-team-release"? where can I take it from? ([#383](https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking/issues/383))

‎CONTRIBUTING.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@
6565
- **[optional]** Update [Android](https://github.com/BranchMetrics/android-branch-deep-linking/releases) and [iOS](https://github.com/BranchMetrics/ios-branch-deep-linking/releases) SDKs
6666

6767
```sh
68-
./src/scripts/npm/updateNativeSdk.sh -a 2.5.9 -i 0.13.5
68+
./src/scripts/npm/updateNativeSdk.sh -a 2.5.9
69+
./src/scripts/npm/updateNativeSdk.sh -i 0.13.5
6970
```
7071

7172
- **[optional]** Update `CHANGELOG.md`

‎package.json

Lines changed: 2 additions & 6 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.17",
5+
"version": "2.6.19",
66
"homepage": "https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking",
77
"repository": {
88
"type": "git",
@@ -56,12 +56,8 @@
5656
"gulp": "^3.9.1",
5757
"gulp-standard": "^10.1.0",
5858
"husky": "^0.14.3",
59-
"mkpath": "^1.0.0",
60-
"node-version-compare": "^1.0.1",
6159
"npm-check-updates": "^2.12.1",
62-
"plist": "^2.1.0",
6360
"semantic-release": "^7.0.1",
64-
"validate-commit-msg": "^2.14.0",
65-
"xml2js": "^0.4.18"
61+
"validate-commit-msg": "^2.14.0"
6662
}
6763
}

‎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.17">
27+
version="2.6.19">
2828

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

‎plugin.xml

Lines changed: 10 additions & 4 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.17">
27+
version="2.6.19">
2828

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

@@ -93,6 +93,8 @@ SOFTWARE.
9393
<header-file src="src/ios/dependencies/Fabric/Fabric+FABKits.h" />
9494
<header-file src="src/ios/dependencies/Fabric/Fabric.h" />
9595

96+
<header-file src="src/ios/dependencies/Branch-SDK/BNCAvailability.h" />
97+
<source-file src="src/ios/dependencies/Branch-SDK/BNCAvailability.m" />
9698
<header-file src="src/ios/dependencies/Branch-SDK/BNCCallbacks.h" />
9799
<header-file src="src/ios/dependencies/Branch-SDK/BNCCommerceEvent.h" />
98100
<source-file src="src/ios/dependencies/Branch-SDK/BNCCommerceEvent.m" />
@@ -114,6 +116,7 @@ SOFTWARE.
114116
<source-file src="src/ios/dependencies/Branch-SDK/BNCError.m" />
115117
<header-file src="src/ios/dependencies/Branch-SDK/BNCFabricAnswers.h" />
116118
<source-file src="src/ios/dependencies/Branch-SDK/BNCFabricAnswers.m" />
119+
<header-file src="src/ios/dependencies/Branch-SDK/BNCFieldDefines.h" />
117120
<header-file src="src/ios/dependencies/Branch-SDK/BNCLinkCache.h" />
118121
<source-file src="src/ios/dependencies/Branch-SDK/BNCLinkCache.m" />
119122
<header-file src="src/ios/dependencies/Branch-SDK/BNCLinkData.h" />
@@ -124,13 +127,12 @@ SOFTWARE.
124127
<source-file src="src/ios/dependencies/Branch-SDK/BNCLog.m" />
125128
<header-file src="src/ios/dependencies/Branch-SDK/BNCPreferenceHelper.h" />
126129
<source-file src="src/ios/dependencies/Branch-SDK/BNCPreferenceHelper.m" />
130+
<header-file src="src/ios/dependencies/Branch-SDK/BNCSpotlightService.h" />
131+
<source-file src="src/ios/dependencies/Branch-SDK/BNCSpotlightService.m" />
127132
<header-file src="src/ios/dependencies/Branch-SDK/BNCStrongMatchHelper.h" />
128133
<source-file src="src/ios/dependencies/Branch-SDK/BNCStrongMatchHelper.m" />
129134
<header-file src="src/ios/dependencies/Branch-SDK/BNCSystemObserver.h" />
130135
<source-file src="src/ios/dependencies/Branch-SDK/BNCSystemObserver.m" />
131-
<header-file src="src/ios/dependencies/Branch-SDK/BNCXcode7Support.h" />
132-
<source-file src="src/ios/dependencies/Branch-SDK/BNCXcode7Support.m" />
133-
<header-file src="src/ios/dependencies/Branch-SDK/Branch-SDK-Prefix.pch" />
134136
<header-file src="src/ios/dependencies/Branch-SDK/Branch.h" />
135137
<source-file src="src/ios/dependencies/Branch-SDK/Branch.m" />
136138
<header-file src="src/ios/dependencies/Branch-SDK/BranchActivityItemProvider.h" />
@@ -146,6 +148,10 @@ SOFTWARE.
146148
<header-file src="src/ios/dependencies/Branch-SDK/BranchContentPathProperties.h" />
147149
<source-file src="src/ios/dependencies/Branch-SDK/BranchContentPathProperties.m" />
148150
<header-file src="src/ios/dependencies/Branch-SDK/BranchDeepLinkingController.h" />
151+
<header-file src="src/ios/dependencies/Branch-SDK/BranchDelegate.h" />
152+
<source-file src="src/ios/dependencies/Branch-SDK/BranchDelegate.m" />
153+
<header-file src="src/ios/dependencies/Branch-SDK/BranchEvent.h" />
154+
<source-file src="src/ios/dependencies/Branch-SDK/BranchEvent.m" />
149155
<header-file src="src/ios/dependencies/Branch-SDK/BranchLinkProperties.h" />
150156
<source-file src="src/ios/dependencies/Branch-SDK/BranchLinkProperties.m" />
151157
<header-file src="src/ios/dependencies/Branch-SDK/BranchShareLink.h" />

‎src/android/dependencies/Branch.jar

20.1 KB
Binary file not shown.

‎src/ios/BranchSDK.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,10 +439,10 @@ - (void)createBranchUniversalObject:(CDVInvokedUrlCommand*)command
439439
NSString *indexingMode = [properties valueForKey:key];
440440
// Default contentIndexMode is always public
441441
if ([indexingMode isEqualToString:@"private"]) {
442-
branchUniversalObj.contentIndexMode = ContentIndexModePrivate;
442+
branchUniversalObj.contentIndexMode = BranchContentIndexModePrivate;
443443
}
444444
else {
445-
branchUniversalObj.contentIndexMode = ContentIndexModePublic;
445+
branchUniversalObj.contentIndexMode = BranchContentIndexModePublic;
446446
}
447447
}
448448
else if ([key isEqualToString:@"canonicalIdentifier"]) {

‎src/ios/dependencies/Branch-SDK/BNCXcode7Support.h renamed to ‎src/ios/dependencies/Branch-SDK/BNCAvailability.h

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,30 @@
11
//
2-
// BNCXcode7Support.h
3-
// Branch-TestBed
2+
// BNCAvailability.h
3+
// Branch-SDK
44
//
55
// Created by Edward on 10/26/16.
66
// Copyright © 2016 Branch Metrics. All rights reserved.
77
//
88

9-
#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED < 100000
10-
#warning Warning: Compiling with Xcode 7 support
11-
9+
#if __has_feature(modules)
1210
@import Foundation;
11+
#else
12+
#import <Foundation/Foundation.h>
13+
#endif
1314

14-
@interface NSLocale (BranchXcode7Support)
15-
- (NSString*) countryCode;
16-
- (NSString*) languageCode;
17-
@end
15+
#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_10_0
16+
#warning Warning: Compiling with pre-iOS 10 / Xcode 7 support.
1817

1918
typedef NSString * UIActivityType;
2019
typedef NSString * UIApplicationOpenURLOptionsKey;
2120

2221
#endif
22+
23+
#ifndef NS_STRING_ENUM
24+
#define NS_STRING_ENUM
25+
#endif
26+
27+
@interface NSLocale (BranchAvailability)
28+
- (NSString*) countryCode;
29+
- (NSString*) languageCode;
30+
@end

‎src/ios/dependencies/Branch-SDK/BNCXcode7Support.m renamed to ‎src/ios/dependencies/Branch-SDK/BNCAvailability.m

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
//
2-
// BNCXcode7Support.m
3-
// Branch-TestBed
2+
// BNCAvailability.m
3+
// Branch-SDK
44
//
55
// Created by Edward on 10/26/16.
66
// Copyright © 2016 Branch Metrics. All rights reserved.
77
//
88

9-
10-
#import "BNCXcode7Support.h"
11-
9+
#import "BNCAvailability.h"
1210

1311
#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED < 100000
1412
// Usually nothing goes here.

0 commit comments

Comments
 (0)