Merge pull request #158 from antonargunov/master

version 0.5.10

Author: antonargunov

BranchUnityTestBed/Assets/Branch/Branch.cs

@@ -7,7 +7,7 @@
 
 public class Branch : MonoBehaviour {
 
-	public static string sdkVersion = "0.5.9";
+	public static string sdkVersion = "0.5.10";
 
     public delegate void BranchCallbackWithParams(Dictionary<string, object> parameters, string error);
     public delegate void BranchCallbackWithUrl(string url, string error);
@@ -272,10 +272,6 @@ public static void delayInitToCheckForSearchAds() {
         _delayInitToCheckForSearchAds();
     }
 
-    public static void setAppleSearchAdsDebugMode() {
-        _setAppleSearchAdsDebugMode();
-    }
-
     #endregion
 
     #region User Action methods
@@ -549,9 +545,6 @@ private static void _getAutoInstance() {}
     [DllImport ("__Internal")]
     private static extern void _delayInitToCheckForSearchAds();
 
-    [DllImport ("__Internal")]
-    private static extern void _setAppleSearchAdsDebugMode();
-
     [DllImport ("__Internal")]
     private static extern void _userCompletedAction(string action);
 
@@ -694,8 +687,6 @@ private static void _setTrackingDisabled(bool value) {
 
     private static void _delayInitToCheckForSearchAds() {}
 
-    private static void _setAppleSearchAdsDebugMode() {}
-
     private static void _userCompletedAction(string action) {
         BranchAndroidWrapper.userCompletedAction(action);
     }
@@ -824,8 +815,6 @@ private static void _setTrackingDisabled(bool value) { }
 
     private static void _delayInitToCheckForSearchAds() { }
 
-    private static void _setAppleSearchAdsDebugMode() { }
-
     private static void _userCompletedAction(string action) { }
 
     private static void _userCompletedActionWithState(string action, string stateDict) { }

BranchUnityTestBed/Assets/Branch/BranchEnums.cs

@@ -29,9 +29,13 @@ public enum BranchEventType {
 	ADD_PAYMENT_INFO,
 	PURCHASE,
 	SPEND_CREDITS,
+    SUBSCRIBE,
+    START_TRIAL,
+    CLICK_AD,
+    VIEW_AD,
 
-	// Content events
-	SEARCH,
+    // Content events
+    SEARCH,
 	VIEW_ITEM,
 	VIEW_ITEMS,
 	RATE,
@@ -41,7 +45,10 @@ public enum BranchEventType {
 	COMPLETE_REGISTRATION,
 	COMPLETE_TUTORIAL,
 	ACHIEVE_LEVEL,
-	UNLOCK_ACHIEVEMENT
+	UNLOCK_ACHIEVEMENT,
+    INVITE,
+    LOGIN,
+    RESERVE
 }
 
 public enum BranchContentSchema {

BranchUnityTestBed/Assets/Branch/BranchEvent.cs

@@ -18,6 +18,11 @@ public BranchEvent(BranchEventType branchEventType) {
 		AddData("event_name", branchEventType.ToString ());
 	}
 
+    // Set the alias
+    public void SetAlias(string alias) {
+        AddData("customer_event_alias", alias);
+    }
+
 	// Set the transaction id associated with this event if there in any
 	public void SetTransactionID(string transactionID) {
 		AddData ("transaction_id", transactionID);

BranchUnityTestBed/Assets/Branch/Demo/Scripts/BranchDemo.cs

@@ -164,6 +164,7 @@ public void OnBtn_RefreshRewards() {
 	public void OnBtn_SendBuyEvent() {
         BranchEvent e = new BranchEvent (BranchEventType.PURCHASE);
 
+        e.SetAlias("my_alias");
         e.SetAffiliation("my_affilation");
         e.SetCoupon("my_coupon");
         e.SetCurrency(BranchCurrencyType.USD);
@@ -205,6 +206,7 @@ public void OnBtn_SimualteLogout() {
 	public void OnBtn_SendComplexEvent() {
         BranchEvent e = new BranchEvent("MY_COMPLEX_EVENT");
 
+        e.SetAlias("my_alias");
         e.SetAffiliation("my_affilation");
         e.SetCoupon("my_coupon");
         e.SetCurrency(BranchCurrencyType.USD);

BranchUnityTestBed/Assets/Branch/Editor/BranchPostProcessBuild.cs

@@ -189,7 +189,11 @@ public static void ChangeXcodeProject(string pathToBuiltProject) {
 			proj.AddFrameworkToProject(target, "Security.framework", false);
 		}
 
-		#else
+        if (!proj.ContainsFramework(target, "WebKit.framework")) {
+            proj.AddFrameworkToProject(target, "WebKit.framework", false);
+        }
+
+#else
 
 		if (!proj.HasFramework("AdSupport.framework")) {
 			proj.AddFrameworkToProject(target, "AdSupport.framework", false);
@@ -207,9 +211,9 @@ public static void ChangeXcodeProject(string pathToBuiltProject) {
 			proj.AddFrameworkToProject(target, "Security.framework", false);
 		}
 
-		#endif
+#endif
 
-		File.WriteAllText(pathToProject, proj.WriteToString());
+        File.WriteAllText(pathToProject, proj.WriteToString());
 	}
 }
 #endif

BranchUnityTestBed/Assets/Branch/Resources/BranchData.asset

@@ -0,0 +1,27 @@
+//
+//  BNCAppleReceipt.h
+//  Branch
+//
+//  Created by Ernest Cho on 7/11/19.
+//  Copyright © 2019 Branch, Inc. All rights reserved.
+//
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface BNCAppleReceipt : NSObject
+
++ (BNCAppleReceipt *)instance;
+
+// this is only available on builds from Apple
+- (nullable NSString *)installReceipt;
+- (BOOL)isTestFlight;
+
+@end
+
+NS_ASSUME_NONNULL_END

BranchUnityTestBed/Assets/Plugins/Branch/iOS/Branch-SDK/Branch-SDK/BNCAppleReceipt.h

@@ -0,0 +1,56 @@
+//
+//  BNCAppleReceipt.m
+//  Branch
+//
+//  Created by Ernest Cho on 7/11/19.
+//  Copyright © 2019 Branch, Inc. All rights reserved.
+//
+
+#import "BNCAppleReceipt.h"
+
+@interface BNCAppleReceipt()
+@property (nonatomic, copy, readwrite) NSString *receipt;
+@property (nonatomic, assign, readwrite) BOOL isSandboxReceipt;
+@end
+
+@implementation BNCAppleReceipt
+
++ (BNCAppleReceipt *)instance {
+    static BNCAppleReceipt *singleton;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        singleton = [[BNCAppleReceipt alloc] init];
+    });
+    return singleton;
+}
+
+- (instancetype)init {
+    self = [super init];
+    if (self) {
+        [self readReceipt];
+    }
+    return self;
+}
+
+- (void)readReceipt {
+    NSURL *receiptURL = [[NSBundle mainBundle] appStoreReceiptURL];
+    if (receiptURL) {
+        self.isSandboxReceipt = [receiptURL.lastPathComponent isEqualToString:@"sandboxReceipt"];
+    }
+    
+    NSData *receiptData = [NSData dataWithContentsOfURL:receiptURL];
+    if (receiptData) {
+        self.receipt = [receiptData base64EncodedStringWithOptions:0];
+    }
+}
+
+- (nullable NSString *)installReceipt {
+    return self.receipt;
+}
+
+- (BOOL)isTestFlight {
+    // sandbox receipts are from testflight
+    return self.isSandboxReceipt;
+}
+
+@end