[ios] Updated myTracker to v1.5.3.

14 files changed, 99 insertions, 134 deletions

diff --git a/iphone/Maps/MyTrackerSDK.framework/Headers/MRMyTracker.h b/iphone/Maps/MyTrackerSDK.framework/Headers/MRMyTracker.h
index 154948c567..c8a1a60ba0 100644
--- a/iphone/Maps/MyTrackerSDK.framework/Headers/MRMyTracker.h
+++ b/iphone/Maps/MyTrackerSDK.framework/Headers/MRMyTracker.h
@@ -1,49 +1,57 @@
 //
 //  MRMyTracker.h
-//  myTrackerSDK 1.4.9
+//  myTrackerSDK 1.5.3
 //
-//  Created by Igor Glotov on 22.07.14.
-//  Copyright © 2014 Mail.ru Group. All rights reserved.
+//  Created by Timur Voloshin on 17.06.16.
+//  Copyright © 2016 Mail.ru Group. All rights reserved.
 //
 
-
 #import <Foundation/Foundation.h>
-#import <MyTrackerSDK/MRTracker.h>
-
-extern NSString * const MYTRACKER_VERSION_STRING;
 
-@class MRTracker;
-@class MRTrackerParams;
+@class MRMyTrackerParams;
 
 @interface MRMyTracker : NSObject
 
-+ (BOOL)debugMode;
-+ (void)setDebugMode:(BOOL)enable;
++ (void)setDebugMode:(BOOL)enabled;
+
++ (BOOL)isDebugMode;
+
++ (void)setEnabled:(BOOL)enabled;
+
++ (BOOL)isEnabled;
+
++ (NSString *)trackerVersion;
+
++ (MRMyTrackerParams *)trackerParams;
+
++ (void)createTracker:(NSString *)trackerId;
 
-+ (MRTracker *)createTracker:(NSString *)trackerId;
 + (void)setupTracker;
 
-+ (MRTrackerParams *)getTrackerParams;
++ (void)trackEventWithName:(NSString *)name;
+
++ (void)trackEventWithName:(NSString *)name eventParams:(NSDictionary<NSString *, NSString *> *)eventParams;
 
 + (void)trackLoginEvent;
-+ (void)trackLoginEventWithParams:(NSDictionary *)eventParams;
+
++ (void)trackLoginEventWithParams:(NSDictionary<NSString *, NSString *> *)eventParams;
 
 + (void)trackInviteEvent;
-+ (void)trackInviteEventWithParams:(NSDictionary *)eventParams;
+
++ (void)trackInviteEventWithParams:(NSDictionary<NSString *, NSString *> *)eventParams;
 
 + (void)trackRegistrationEvent;
-+ (void)trackRegistrationEventWithParams:(NSDictionary *)eventParams;
 
-//SKProduct*
-//SKPaymentTransaction*
-+ (void) trackPurchaseWithProduct:(id)product transaction:(id)transaction;
-+ (void) trackPurchaseWithProduct:(id)product transaction:(id)transaction eventParams:(NSDictionary *)eventParams;
++ (void)trackRegistrationEventWithParams:(NSDictionary<NSString *, NSString *> *)eventParams;
+
++ (void)trackPurchaseWithProduct:(id)product transaction:(id)transaction;
+
++ (void)trackPurchaseWithProduct:(id)product transaction:(id)transaction eventParams:(NSDictionary<NSString *, NSString *> *)eventParams;
+
++ (void)trackLevelAchieved;
 
-+ (void) trackLevelAchieved;
-+ (void) trackLevelAchieved:(NSNumber*)level;
-+ (void) trackLevelAchieved:(NSNumber*)level eventParams:(NSDictionary *)eventParams;
++ (void)trackLevelAchievedWithLevel:(NSNumber *)level;
 
-+ (void)trackEvent:(NSString*)name;
-+ (void)trackEvent:(NSString*)name eventParams:(NSDictionary*)eventParams;
++ (void)trackLevelAchievedWithLevel:(NSNumber *)level eventParams:(NSDictionary<NSString *, NSString *> *)eventParams;
 
 @end
diff --git a/iphone/Maps/MyTrackerSDK.framework/Headers/MRMyTrackerParams.h b/iphone/Maps/MyTrackerSDK.framework/Headers/MRMyTrackerParams.h
new file mode 100644
index 0000000000..54a61cdddc
--- /dev/null
+++ b/iphone/Maps/MyTrackerSDK.framework/Headers/MRMyTrackerParams.h
@@ -0,0 +1,49 @@
+//
+//  MRMyTrackerParams.h
+//  myTrackerSDK 1.5.3
+//
+//  Created by Timur Voloshin on 17.06.16.
+//  Copyright © 2016 Mail.ru Group. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@class MRTrackerParams;
+typedef enum
+{
+	MRGenderUnspecified=-1,
+	MRGenderUnknown,
+	MRGenderMale,
+	MRGenderFemale
+} MRGender;
+
+typedef enum
+{
+	MRLocationTrackingModeNone,
+	MRLocationTrackingModeCached,
+	MRLocationTrackingModeActive
+} MRLocationTrackingMode;
+
+@interface MRMyTrackerParams : NSObject
+
+@property(nonatomic, readonly, copy) NSString *trackerId;
+@property(nonatomic) BOOL trackLaunch;
+@property(nonatomic) NSTimeInterval launchTimeout;
+@property(nonatomic) MRLocationTrackingMode locationTrackingMode;
+@property(nonatomic) BOOL trackEnvironment;
+
+@property(nonatomic) MRGender gender;
+@property(nonatomic) NSNumber *age;
+@property(nonatomic, copy) NSString *language;
+
+@property(nonatomic, copy) NSString *mrgsAppId;
+@property(nonatomic, copy) NSString *mrgsUserId;
+@property(nonatomic, copy) NSString *mrgsDeviceId;
+@property(nonatomic) NSArray<NSString *> *icqIds;
+@property(nonatomic) NSArray<NSString *> *okIds;
+@property(nonatomic) NSArray<NSString *> *vkIds;
+@property(nonatomic) NSArray<NSString *> *emails;
+@property(nonatomic) NSArray<NSString *> *customUserIds;
+
+- (instancetype)initWithParams:(MRTrackerParams *)trackerParams;
+@end
\ No newline at end of file
diff --git a/iphone/Maps/MyTrackerSDK.framework/Headers/MRTracker.h b/iphone/Maps/MyTrackerSDK.framework/Headers/MRTracker.h
deleted file mode 100644
index cd557e08e2..0000000000
--- a/iphone/Maps/MyTrackerSDK.framework/Headers/MRTracker.h
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-//  MRTracker.h
-//  myTrackerSDK 1.4.9
-//
-//  Created by Igor Glotov on 22.07.14.
-//  Copyright © 2014 Mail.ru Group. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <MyTrackerSDK/MRTrackerParams.h>
-
-@interface MRTracker : NSObject
-
-+ (BOOL)debugMode;
-+ (void)setDebugMode:(BOOL)enable;
-
-- (MRTrackerParams *)getTrackerParams;
-
-- (void)setup;
-- (BOOL)isInitialized;
-
-- (void)trackEvent:(NSString *)name;
-- (void)trackEvent:(NSString *)name eventParams:(NSDictionary *)eventParams;
-
-- (void)trackLoginEvent;
-- (void)trackLoginEventWithParams:(NSDictionary *)eventParams;
-
-- (void)trackInviteEvent;
-- (void)trackInviteEventWithParams:(NSDictionary *)eventParams;
-
-- (void)trackRegistrationEvent;
-- (void)trackRegistrationEventWithParams:(NSDictionary *)eventParams;
-
-- (void) trackPurchaseWithProduct:(id)product transaction:(id)transaction;
-- (void) trackPurchaseWithProduct:(id)product transaction:(id)transaction eventParams:(NSDictionary *)eventParams;
-
--(void) trackLevelAchieved;
--(void) trackLevelAchieved:(NSNumber*)level;
--(void) trackLevelAchieved:(NSNumber*)level eventParams:(NSDictionary *)eventParams;
-
-@end
diff --git a/iphone/Maps/MyTrackerSDK.framework/Headers/MRTrackerParams.h b/iphone/Maps/MyTrackerSDK.framework/Headers/MRTrackerParams.h
deleted file mode 100644
index 9fbf819233..0000000000
--- a/iphone/Maps/MyTrackerSDK.framework/Headers/MRTrackerParams.h
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-//  MRTrackerParams.h
-//  myTrackerSDK 1.4.9
-//
-//  Created by Igor Glotov on 20.03.15.
-//  Copyright © 2015 Mail.ru Group. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-typedef enum{
-    MRLocationTrackingNone = 0,
-    MRLocationTrackingCached,
-    MRLocationTrackingActive
-} MRLocationTracking;
-
-
-@interface MRTrackerParams : NSObject
-
-- (instancetype)initWithTrackerId:(NSString *)trackerId;
-@property (strong, nonatomic) NSString *trackerId;
-@property (nonatomic) BOOL trackAppLaunch;
-
-//Timeout for assuming app was started again - 30..7200 sec.,  default - 30 sec.
-@property (nonatomic) NSTimeInterval launchTimeout;
-
-//default = MRLocationTrackingActive
-@property (nonatomic) MRLocationTracking locationTracking;
-
-- (void)setLanguage:(NSString *)lang;
-- (void)setAge:(NSNumber *)age;
-//User gender (0 - unkown, 1 - male, 2 - female)
-- (void)setGender:(NSNumber *)gender;
-
-@end
diff --git a/iphone/Maps/MyTrackerSDK.framework/Headers/MyTrackerSDK.h b/iphone/Maps/MyTrackerSDK.framework/Headers/MyTrackerSDK.h
index 6491f1b433..89691d2036 100644
--- a/iphone/Maps/MyTrackerSDK.framework/Headers/MyTrackerSDK.h
+++ b/iphone/Maps/MyTrackerSDK.framework/Headers/MyTrackerSDK.h
@@ -1,6 +1,6 @@
 //
 //  MyTrackerSDK.h
-//  myTrackerSDK 1.4.9
+//  myTrackerSDK 1.5.3
 //
 //  Created by Anton Bulankin on 05.10.15.
 //  Copyright © 2015 Mail.ru Group. All rights reserved.
@@ -9,5 +9,4 @@
 #import <UIKit/UIKit.h>
 
 #import <MyTrackerSDK/MRMyTracker.h>
-#import <MyTrackerSDK/MRTracker.h>
-#import <MyTrackerSDK/MRTrackerParams.h>
+#import <MyTrackerSDK/MRMyTrackerParams.h>
diff --git a/iphone/Maps/MyTrackerSDK.framework/Info.plist b/iphone/Maps/MyTrackerSDK.framework/Info.plist
index 13d7695862..4d25b2175e 100644
--- a/iphone/Maps/MyTrackerSDK.framework/Info.plist
+++ b/iphone/Maps/MyTrackerSDK.framework/Info.plist
diff --git a/iphone/Maps/MyTrackerSDK.framework/MyTrackerSDK b/iphone/Maps/MyTrackerSDK.framework/MyTrackerSDK
index d5f475bdae..3c01c531ed 100644
--- a/iphone/Maps/MyTrackerSDK.framework/MyTrackerSDK
+++ b/iphone/Maps/MyTrackerSDK.framework/MyTrackerSDK
diff --git a/iphone/Maps/MyTrackerSDK.framework/_CodeSignature/CodeDirectory b/iphone/Maps/MyTrackerSDK.framework/_CodeSignature/CodeDirectory
index 63fce42725..bbe50f059b 100644
--- a/iphone/Maps/MyTrackerSDK.framework/_CodeSignature/CodeDirectory
+++ b/iphone/Maps/MyTrackerSDK.framework/_CodeSignature/CodeDirectory
diff --git a/iphone/Maps/MyTrackerSDK.framework/_CodeSignature/CodeRequirements b/iphone/Maps/MyTrackerSDK.framework/_CodeSignature/CodeRequirements
index 01ab302e75..71660179dc 100644
--- a/iphone/Maps/MyTrackerSDK.framework/_CodeSignature/CodeRequirements
+++ b/iphone/Maps/MyTrackerSDK.framework/_CodeSignature/CodeRequirements
diff --git a/iphone/Maps/MyTrackerSDK.framework/_CodeSignature/CodeRequirements-1 b/iphone/Maps/MyTrackerSDK.framework/_CodeSignature/CodeRequirements-1
index d4175da93f..12365bc427 100644
--- a/iphone/Maps/MyTrackerSDK.framework/_CodeSignature/CodeRequirements-1
+++ b/iphone/Maps/MyTrackerSDK.framework/_CodeSignature/CodeRequirements-1
diff --git a/iphone/Maps/MyTrackerSDK.framework/_CodeSignature/CodeResources b/iphone/Maps/MyTrackerSDK.framework/_CodeSignature/CodeResources
index 8da2458234..5a850d2037 100644
--- a/iphone/Maps/MyTrackerSDK.framework/_CodeSignature/CodeResources
+++ b/iphone/Maps/MyTrackerSDK.framework/_CodeSignature/CodeResources
@@ -6,23 +6,19 @@
 	<dict>
 		<key>Headers/MRMyTracker.h</key>
 		<data>
-		zBrY/xfaNRJi9DP6cLiU0O3xNqs=
+		ZOJNkS8uvXgAzimS1mVsBQ0ri6o=
 		</data>
-		<key>Headers/MRTracker.h</key>
+		<key>Headers/MRMyTrackerParams.h</key>
 		<data>
-		MSR6pNKgWiTe6zhIyVh3IsxZgtU=
-		</data>
-		<key>Headers/MRTrackerParams.h</key>
-		<data>
-		/EZZih95Fe5mtFc4bQvFYvTfea8=
+		THlgCnIUz+flAkADF975uc+PUrw=
 		</data>
 		<key>Headers/MyTrackerSDK.h</key>
 		<data>
-		nGrp/FOp6eCYWbXeLQIn/fIKxBY=
+		V8VSjw5+CRFiXm9cZuPBKQ4ZGTc=
 		</data>
 		<key>Info.plist</key>
 		<data>
-		IHUAm0q1yJVCnxK6P/RfCIe89Ow=
+		0+aacR2gDEd9r3S+djeRYSsnebg=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -35,44 +31,33 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			zBrY/xfaNRJi9DP6cLiU0O3xNqs=
-			</data>
-			<key>hash2</key>
-			<data>
-			vq7pAKiRXh76Yd/wPTJOAdM7S8ANLEX2tbMk7ejOvLQ=
-			</data>
-		</dict>
-		<key>Headers/MRTracker.h</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			MSR6pNKgWiTe6zhIyVh3IsxZgtU=
+			ZOJNkS8uvXgAzimS1mVsBQ0ri6o=
 			</data>
 			<key>hash2</key>
 			<data>
-			vCSyzVxl7hyPhl9DRMHIFI8WYEWDlHZKiRDXQPsU9+I=
+			6i2d3PnRb+OMTl4NQL9EMepX1+W5CZ4A1kUAXUVjR84=
 			</data>
 		</dict>
-		<key>Headers/MRTrackerParams.h</key>
+		<key>Headers/MRMyTrackerParams.h</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			/EZZih95Fe5mtFc4bQvFYvTfea8=
+			THlgCnIUz+flAkADF975uc+PUrw=
 			</data>
 			<key>hash2</key>
 			<data>
-			qIC0Sq2/OcuhHYemFKaUFWAZeMugy04GSDauvRJKsSQ=
+			aByBumFVsYvUSWvWauvVs/ZjNk6zdQqMR9UR+wZpqmo=
 			</data>
 		</dict>
 		<key>Headers/MyTrackerSDK.h</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			nGrp/FOp6eCYWbXeLQIn/fIKxBY=
+			V8VSjw5+CRFiXm9cZuPBKQ4ZGTc=
 			</data>
 			<key>hash2</key>
 			<data>
-			ZBoJhnbSQWKcScYG7YXVvYQ3ZaEQLofkcdMNKfehif0=
+			LVha2tT3k8QUkDevr5W/7+24+Dtbf0YjUmkt8cRZyHc=
 			</data>
 		</dict>
 		<key>Modules/module.modulemap</key>
diff --git a/iphone/Maps/MyTrackerSDK.framework/_CodeSignature/CodeSignature b/iphone/Maps/MyTrackerSDK.framework/_CodeSignature/CodeSignature
index 1452d49aa0..fe01bc74bb 100644
--- a/iphone/Maps/MyTrackerSDK.framework/_CodeSignature/CodeSignature
+++ b/iphone/Maps/MyTrackerSDK.framework/_CodeSignature/CodeSignature
diff --git a/iphone/Maps/Statistics/Statistics.mm b/iphone/Maps/Statistics/Statistics.mm
index 0ead4ee3c5..476be88b90 100644
--- a/iphone/Maps/Statistics/Statistics.mm
+++ b/iphone/Maps/Statistics/Statistics.mm
@@ -5,7 +5,7 @@
 #import "3party/Alohalytics/src/alohalytics_objc.h"
 #import "Flurry.h"
 #import <MyTrackerSDK/MRMyTracker.h>
-#import <MyTrackerSDK/MRTrackerParams.h>
+#import <MyTrackerSDK/MRMyTrackerParams.h>
 #import <FBSDKCoreKit/FBSDKCoreKit.h>
 
 #include "platform/settings.hpp"
@@ -90,7 +90,7 @@ char const * kStatisticsEnabledSettingsKey = "StatisticsEnabled";
 #ifdef DEBUG
     [MRMyTracker setDebugMode:YES];
 #endif
-    [MRMyTracker getTrackerParams].trackAppLaunch = YES;
+    [MRMyTracker trackerParams].trackLaunch = YES;
     [MRMyTracker setupTracker];
 
     [Alohalytics setup:@(ALOHALYTICS_URL) withLaunchOptions:launchOptions];
diff --git a/iphone/Maps/main.mm b/iphone/Maps/main.mm
index cd72cd2f24..7a3dba22b6 100644
--- a/iphone/Maps/main.mm
+++ b/iphone/Maps/main.mm
@@ -45,7 +45,7 @@ void setMarketingSender()
       eventParams[key] = value;
       [myTrackerEvent appendString:[NSString stringWithFormat:@"_%@_%@", key, value]];
     }
-    [MRMyTracker trackEvent:myTrackerEvent eventParams:nil];
+    [MRMyTracker trackEventWithName:myTrackerEvent];
   });
 }