Skip to content

Commit 0a6aee8

Browse files
antonargunovantonargunov
authored
Merge pull request #169 from antonargunov/master
version 0.5.14
2 parents 2f1d90d + 3148237 commit 0a6aee8

Some content is hidden

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

43 files changed

+1859
-456
lines changed

‎BranchUnityTestBed/.vs/BranchUnityTestBed/xs/UserPrefs.xml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Properties StartupConfiguration="{67E3F5FC-88EF-55B2-4156-39D21A59D4E6}|">
2-
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/Branch/Demo/Scripts/BranchDemo.cs">
2+
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/Branch/Branch.cs">
33
<Files>
4-
<File FileName="Assets/Branch/Branch.cs" Line="1" Column="1" />
5-
<File FileName="Assets/Branch/Demo/Scripts/BranchDemo.cs" Line="1" Column="1" />
4+
<File FileName="Assets/Branch/Branch.cs" Line="10" Column="45" />
5+
<File FileName="Assets/Branch/Demo/Scripts/BranchDemo.cs" Line="46" Column="49" />
66
</Files>
77
<Pads>
88
<Pad Id="ProjectPad">
@@ -11,10 +11,9 @@
1111
<Node name="Assets" expanded="True">
1212
<Node name="Branch" expanded="True">
1313
<Node name="Demo" expanded="True">
14-
<Node name="Scripts" expanded="True">
15-
<Node name="BranchDemo.cs" selected="True" />
16-
</Node>
14+
<Node name="Scripts" expanded="True" />
1715
</Node>
16+
<Node name="Branch.cs" selected="True" />
1817
</Node>
1918
</Node>
2019
</Node>
@@ -24,7 +23,7 @@
2423
</MonoDevelop.Ide.Workbench>
2524
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
2625
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
27-
<MonoDevelop.Ide.ItemProperties.Assembly-CSharp PreferredExecutionTarget="a736a61b-29e0-4831-b296-84f28eefa8c5" />
26+
<MonoDevelop.Ide.ItemProperties.Assembly-CSharp PreferredExecutionTarget="283f9da4-8581-4953-8c47-7a39f3f56e04" />
2827
<MonoDevelop.Ide.DebuggingService.Breakpoints>
2928
<BreakpointStore />
3029
</MonoDevelop.Ide.DebuggingService.Breakpoints>

‎BranchUnityTestBed/.vs/BranchUnityTestBed/xs/sqlite3/storage.ide‎

0 Bytes
Binary file not shown.

‎BranchUnityTestBed/Assets/Branch/Branch.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
public class Branch : MonoBehaviour {
99

10-
public static string sdkVersion = "0.5.13";
10+
public static string sdkVersion = "0.5.14";
1111

1212
public delegate void BranchCallbackWithParams(Dictionary<string, object> parameters, string error);
1313
public delegate void BranchCallbackWithUrl(string url, string error);

‎BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleSearchAds.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
2323
- (void)useDefaultAppleSearchAdsConfig;
2424

2525
// Apple suggests a longer delay, however this is detrimental to app launch times
26-
// typically less than 1s delay, up to 14s delay on first app start
26+
// typically less than 3s delay, up to 14s delay on first app start
2727
- (void)useLongWaitAppleSearchAdsConfig;
2828

2929
// Checks Apple Search Ads and updates preferences

‎BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCConfig.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
BOOL const BNC_API_PINNED = NO;
1313
NSString * const BNC_API_VERSION = @"v1";
1414
NSString * const BNC_LINK_URL = @"https://bnc.lt";
15-
NSString * const BNC_SDK_VERSION = @"0.30.1";
15+
NSString * const BNC_SDK_VERSION = @"0.31.0";

‎BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCDeviceInfo.h‎

Lines changed: 45 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,42 +8,57 @@
88

99
#if __has_feature(modules)
1010
@import Foundation;
11-
@import CoreGraphics;
1211
#else
1312
#import <Foundation/Foundation.h>
14-
#import <CoreGraphics/CoreGraphics.h>
1513
#endif
1614

1715
@interface BNCDeviceInfo : NSObject
1816

19-
//---------Properties-------------//
20-
@property (atomic, copy, readonly) NSString *hardwareId;
21-
@property (atomic, copy, readonly) NSString *hardwareIdType;
22-
@property (atomic, readonly) BOOL isRealHardwareId;
23-
@property (atomic, copy, readonly) NSString *vendorId; //!< VendorId can be nil initially and non-nil later.
24-
@property (atomic, copy, readonly) NSString *brandName;
25-
@property (atomic, copy, readonly) NSString *modelName;
26-
@property (atomic, copy, readonly) NSString *osName;
27-
@property (atomic, copy, readonly) NSString *osVersion;
28-
@property (atomic, copy, readonly) NSNumber *screenWidth;
29-
@property (atomic, copy, readonly) NSNumber *screenHeight;
30-
@property (atomic, readonly) BOOL isAdTrackingEnabled;
31-
32-
@property (atomic, copy, readonly) NSString *extensionType;
33-
@property (atomic, copy, readonly) NSString *branchSDKVersion;
34-
@property (atomic, copy, readonly) NSString *applicationVersion;
35-
@property (atomic, assign, readonly) CGFloat screenScale;
36-
@property (atomic, copy, readonly) NSString* adId;
37-
@property (atomic, assign, readonly) BOOL unidentifiedDevice;
38-
39-
@property (atomic, copy, readonly) NSString* country; //!< The iso2 Country name (us, in,etc).
40-
@property (atomic, copy, readonly) NSString* language; //!< The iso2 language code (en, ml).
41-
@property (atomic, copy, readonly) NSString* localIPAddress; //!< The current local IP address.
42-
@property (atomic, copy, readonly) NSArray<NSString*> *allIPAddresses; //!< All local IP addresses.
43-
//----------Methods----------------//
4417
+ (BNCDeviceInfo *)getInstance;
45-
+ (NSString*) userAgentString; // Warning: Has an implied lock on main thread on first call.
46-
+ (NSString*) systemBuildVersion;
4718

48-
- (NSDictionary*) v2dictionary;
19+
- (void)registerPluginName:(NSString *)name version:(NSString *)version;
20+
21+
- (NSDictionary *) v2dictionary;
22+
23+
/*
24+
Everything below this line should be private. Thread safety is the callee's responsibility!
25+
26+
Currently BNCServerInterface.updateDeviceInfoToMutableDictionary and unit tests use these.
27+
*/
28+
29+
- (void)checkAdvertisingIdentifier;
30+
31+
@property (nonatomic, copy, readwrite) NSString *hardwareId;
32+
@property (nonatomic, copy, readwrite) NSString *hardwareIdType;
33+
@property (nonatomic, assign, readwrite) BOOL isRealHardwareId;
34+
35+
@property (nonatomic, copy, readwrite) NSString *advertiserId;
36+
@property (nonatomic, copy, readwrite) NSString *vendorId;
37+
@property (nonatomic, assign, readwrite) BOOL isAdTrackingEnabled;
38+
@property (nonatomic, assign, readwrite) BOOL unidentifiedDevice;
39+
- (NSString *)localIPAddress;
40+
- (NSString *)connectionType;
41+
42+
@property (nonatomic, copy, readwrite) NSString *brandName;
43+
@property (nonatomic, copy, readwrite) NSString *modelName;
44+
@property (nonatomic, copy, readwrite) NSString *osName;
45+
@property (nonatomic, copy, readwrite) NSString *osVersion;
46+
@property (nonatomic, copy, readwrite) NSString *osBuildVersion;
47+
@property (nonatomic, copy, readwrite) NSString *extensionType;
48+
@property (nonatomic, copy, readwrite) NSNumber *cpuType;
49+
@property (nonatomic, copy, readwrite) NSNumber *screenWidth;
50+
@property (nonatomic, copy, readwrite) NSNumber *screenHeight;
51+
@property (nonatomic, copy, readwrite) NSNumber *screenScale;
52+
@property (nonatomic, copy, readwrite) NSString *carrierName;
53+
@property (nonatomic, copy, readwrite) NSString *locale;
54+
@property (nonatomic, copy, readwrite) NSString *country; //!< The iso2 Country name (us, in,etc).
55+
@property (nonatomic, copy, readwrite) NSString *language; //!< The iso2 language code (en, ml).
56+
- (NSString *)userAgentString;
57+
58+
@property (nonatomic, copy, readwrite) NSString *applicationVersion;
59+
@property (nonatomic, copy, readwrite) NSString *pluginName;
60+
@property (nonatomic, copy, readwrite) NSString *pluginVersion;
61+
@property (nonatomic, copy, readwrite) NSString *branchSDKVersion;
62+
63+
4964
@end

0 commit comments

Comments
 (0)