AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #4543 from igrechuhin/MAPSME-2753

Browse source 
Updated frameworks.
This commit is contained in:
Vlad Mihaylenko 2016-10-21 17:29:58 +04:00 • committed by GitHub
commit 9905082d35
16 changed files with 148 additions and 202 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
iphone/Maps/MyTrackerSDK.framework/Headers/MRMyTracker.h
View file

@ -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) trackLevelAchieved;
+ (void) trackLevelAchieved:(NSNumber*)level;
+ (void) trackLevelAchieved:(NSNumber*)level eventParams:(NSDictionary *)eventParams;
+ (void)trackPurchaseWithProduct:(id)product transaction:(id)transaction;
+ (void)trackEvent:(NSString*)name;
+ (void)trackEvent:(NSString*)name eventParams:(NSDictionary*)eventParams;
+ (void)trackPurchaseWithProduct:(id)product transaction:(id)transaction eventParams:(NSDictionary<NSString *, NSString *> *)eventParams;
+ (void)trackLevelAchieved;
+ (void)trackLevelAchievedWithLevel:(NSNumber *)level;
+ (void)trackLevelAchievedWithLevel:(NSNumber *)level eventParams:(NSDictionary<NSString *, NSString *> *)eventParams;
@end

49
iphone/Maps/MyTrackerSDK.framework/Headers/MRMyTrackerParams.h Normal file
View file

@ -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

41
iphone/Maps/MyTrackerSDK.framework/Headers/MRTracker.h
View file

@ -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

35
iphone/Maps/MyTrackerSDK.framework/Headers/MRTrackerParams.h
View file

@ -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

5
iphone/Maps/MyTrackerSDK.framework/Headers/MyTrackerSDK.h
View file

@ -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>

BIN
iphone/Maps/MyTrackerSDK.framework/Info.plist
View file

Binary file not shown.

BIN
iphone/Maps/MyTrackerSDK.framework/MyTrackerSDK
View file

Binary file not shown.

BIN
iphone/Maps/MyTrackerSDK.framework/_CodeSignature/CodeDirectory
View file

Binary file not shown.

BIN
iphone/Maps/MyTrackerSDK.framework/_CodeSignature/CodeRequirements
View file

Binary file not shown.

BIN
iphone/Maps/MyTrackerSDK.framework/_CodeSignature/CodeRequirements-1
View file

Binary file not shown.

39
iphone/Maps/MyTrackerSDK.framework/_CodeSignature/CodeResources
View file

@ -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=
ZOJNkS8uvXgAzimS1mVsBQ0ri6o=
</data>
<key>hash2</key>
<data>
vq7pAKiRXh76Yd/wPTJOAdM7S8ANLEX2tbMk7ejOvLQ=
6i2d3PnRb+OMTl4NQL9EMepX1+W5CZ4A1kUAXUVjR84=
</data>
</dict>
<key>Headers/MRTracker.h</key>
<key>Headers/MRMyTrackerParams.h</key>
<dict>
<key>hash</key>
<data>
MSR6pNKgWiTe6zhIyVh3IsxZgtU=
THlgCnIUz+flAkADF975uc+PUrw=
</data>
<key>hash2</key>
<data>
vCSyzVxl7hyPhl9DRMHIFI8WYEWDlHZKiRDXQPsU9+I=
</data>
</dict>
<key>Headers/MRTrackerParams.h</key>
<dict>
<key>hash</key>
<data>
/EZZih95Fe5mtFc4bQvFYvTfea8=
</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>

BIN
iphone/Maps/MyTrackerSDK.framework/_CodeSignature/CodeSignature
View file

Binary file not shown.

117
iphone/Maps/PushNotifications/Pushwoosh.framework/Versions/A/Headers/PushNotificationManager.h
View file

@ -11,15 +11,8 @@
@class PushNotificationManager;
@class CLLocation;
typedef NS_ENUM(NSInteger, PWSupportedOrientations) {
PWOrientationPortrait = 1 << 0,
PWOrientationPortraitUpsideDown = 1 << 1,
PWOrientationLandscapeLeft = 1 << 2,
PWOrientationLandscapeRight = 1 << 3,
};
typedef void(^PushwooshGetTagsHandler)(NSDictionary *tags);
typedef void(^PushwooshErrorHandler)(NSError *error);
typedef void (^PushwooshGetTagsHandler)(NSDictionary *tags);
typedef void (^PushwooshErrorHandler)(NSError *error);
/**
`PushNotificationDelegate` protocol defines the methods that can be implemented in the delegate of the `PushNotificationManager` class' singleton object.
@ -34,14 +27,14 @@ typedef void(^PushwooshErrorHandler)(NSError *error);
@param token A token used for identifying the device with APS.
*/
- (void) onDidRegisterForRemoteNotificationsWithDeviceToken:(NSString *)token;
- (void)onDidRegisterForRemoteNotificationsWithDeviceToken:(NSString *)token;
/**
Sent to the delegate when Apple Push Service (APS) could not complete the registration process successfully.
@param error An NSError object encapsulating the information about the reason of the registration failure. Within this method you can define application's behaviour in case of registration failure.
*/
- (void) onDidFailToRegisterForRemoteNotificationsWithError:(NSError *)error;
- (void)onDidFailToRegisterForRemoteNotificationsWithError:(NSError *)error;
/**
Tells the delegate that the push manager has received a remote notification.
@ -53,7 +46,7 @@ typedef void(^PushwooshErrorHandler)(NSError *error);
The provider originates it as a JSON-defined dictionary that iOS converts to an NSDictionary object; the dictionary may contain only property-list objects plus NSNull.
@param onStart If the application was not active when the push notification was received, the application will be launched with this parameter equal to `YES`, otherwise the parameter will be `NO`.
*/
- (void) onPushReceived:(PushNotificationManager *)pushManager withNotification:(NSDictionary *)pushNotification onStart:(BOOL)onStart;
- (void)onPushReceived:(PushNotificationManager *)pushManager withNotification:(NSDictionary *)pushNotification onStart:(BOOL)onStart;
/**
Tells the delegate that the user has pressed OK on the push notification.
@ -73,7 +66,7 @@ typedef void(^PushwooshErrorHandler)(NSError *error);
}
*/
- (void) onPushAccepted:(PushNotificationManager *)pushManager withNotification:(NSDictionary *)pushNotification;
- (void)onPushAccepted:(PushNotificationManager *)pushManager withNotification:(NSDictionary *)pushNotification;
/**
Tells the delegate that the user has pressed OK on the push notification.
@ -93,7 +86,7 @@ typedef void(^PushwooshErrorHandler)(NSError *error);
@param onStart If the application was not active when the push notification was received, the application will be launched with this parameter equal to `YES`, otherwise the parameter will be `NO`.
*/
- (void) onPushAccepted:(PushNotificationManager *)pushManager withNotification:(NSDictionary *)pushNotification onStart:(BOOL)onStart;
- (void)onPushAccepted:(PushNotificationManager *)pushManager withNotification:(NSDictionary *)pushNotification onStart:(BOOL)onStart;
/**
Tells the delegate that the push manager has received tags from the server.
@ -107,28 +100,28 @@ typedef void(^PushwooshErrorHandler)(NSError *error);
}
*/
- (void) onTagsReceived:(NSDictionary *)tags;
- (void)onTagsReceived:(NSDictionary *)tags;
/**
Sent to the delegate when push manager could not complete the tags receiving process successfully.
@param error An NSError object that encapsulates information why receiving tags did not succeed.
*/
- (void) onTagsFailedToReceive:(NSError *)error;
- (void)onTagsFailedToReceive:(NSError *)error;
/**
Tells the delegate that In-App with specified code has been closed
@param code In-App code
*/
- (void) onInAppClosed:(NSString*)code;
- (void)onInAppClosed:(NSString *)code;
/**
Tells the delegate that In-App with specified code has been displayed
@param code In-App code
*/
- (void) onInAppDisplayed:(NSString*)code;
- (void)onInAppDisplayed:(NSString *)code;
@end
@ -154,16 +147,14 @@ typedef void(^PushwooshErrorHandler)(NSError *error);
@return Dictionary, that needs to be sent as the value for the tag
*/
+ (NSDictionary *) incrementalTagWithInteger:(NSInteger)delta;
+ (NSDictionary *)incrementalTagWithInteger:(NSInteger)delta;
@end
/**
`PushNotificationManager` class offers access to the singletone-instance of the push manager responsible for registering the device with the APS servers, receiving and processing push notifications.
*/
@interface PushNotificationManager : NSObject <SKPaymentTransactionObserver> {
NSObject<PushNotificationDelegate> *__unsafe_unretained delegate;
@interface PushNotificationManager : NSObject {
}
/**
@ -180,7 +171,7 @@ typedef void(^PushwooshErrorHandler)(NSError *error);
`PushNotificationDelegate` protocol delegate that would receive the information about events for push notification manager such as registering with APS services, receiving push notifications or working with the received notification.
Pushwoosh Runtime sets it to ApplicationDelegate by default
*/
@property (nonatomic, assign) NSObject<PushNotificationDelegate> *delegate;
@property (nonatomic, weak) NSObject<PushNotificationDelegate> *delegate;
/**
Show push notifications alert when push notification is received while the app is running, default is `YES`
@ -210,35 +201,33 @@ typedef void(^PushwooshErrorHandler)(NSError *error);
Registers for push notifications. By default registeres for "UIRemoteNotificationTypeBadge | UIRemoteNotificationTypeSound | UIRemoteNotificationTypeAlert" flags.
Automatically detects if you have "newsstand-content" in "UIBackgroundModes" and adds "UIRemoteNotificationTypeNewsstandContentAvailability" flag.
*/
- (void) registerForPushNotifications;
- (void)registerForPushNotifications;
/**
Unregisters from push notifications. You should call this method in rare circumstances only, such as when a new version of the app drops support for remote notifications. Users can temporarily prevent apps from receiving remote notifications through the Notifications section of the Settings app. Apps unregistered through this method can always re-register.
*/
- (void) unregisterForPushNotifications;
- (void)unregisterForPushNotifications;
- (id) initWithApplicationCode:(NSString *)appCode appName:(NSString *)appName;
- (id) initWithApplicationCode:(NSString *)appCode navController:(UIViewController *) navController appName:(NSString *)appName __attribute__((deprecated));
- (instancetype)initWithApplicationCode:(NSString *)appCode appName:(NSString *)appName;
- (id)initWithApplicationCode:(NSString *)appCode navController:(UIViewController *)navController appName:(NSString *)appName __attribute__((deprecated));
/**
Sends geolocation to the server for GeoFencing push technology. Called internally, please use `startLocationTracking` and `stopLocationTracking` functions.
@param location Location to be sent.
*/
- (void)sendLocation:(CLLocation *)location;
/**
Start location tracking.
*/
- (void) startLocationTracking;
- (void)startLocationTracking;
/**
Stops location tracking
*/
- (void) stopLocationTracking;
- (void)stopLocationTracking;
/**
Start iBeacon tracking.
*/
- (void) startBeaconTracking;
/**
Stops iBeacon tracking
*/
- (void) stopBeaconTracking;
/**
Send tags to server. Tag names have to be created in the Pushwoosh Control Panel. Possible tag types: Integer, String, Incremental (integer only), List tags (array of values).
@ -256,17 +245,17 @@ typedef void(^PushwooshErrorHandler)(NSError *error);
@param tags Dictionary representation of tags to send.
*/
- (void) setTags: (NSDictionary *) tags;
- (void)setTags:(NSDictionary *)tags;
/**
Send tags to server with completion block. If setTags succeeds competion is called with nil argument. If setTags fails completion is called with error.
*/
- (void) setTags: (NSDictionary *) tags withCompletion: (void(^)(NSError* error)) completion;
- (void)setTags:(NSDictionary *)tags withCompletion:(void (^)(NSError *error))completion;
/**
Get tags from the server. Calls delegate method `onTagsReceived:` or `onTagsFailedToReceive:` depending on the results.
*/
- (void) loadTags;
- (void)loadTags;
/**
Get tags from server. Calls delegate method if exists and handler (block).
@ -281,12 +270,12 @@ typedef void(^PushwooshErrorHandler)(NSError *error);
@param errorHandler The block is executed on the unsuccessful completion of the request. This block has no return value and takes one argument: the error that occurred during the request.
*/
- (void) loadTags: (PushwooshGetTagsHandler) successHandler error:(PushwooshErrorHandler) errorHandler;
- (void)loadTags:(PushwooshGetTagsHandler)successHandler error:(PushwooshErrorHandler)errorHandler;
/**
Informs the Pushwoosh about the app being launched. Usually called internally by SDK Runtime.
*/
- (void) sendAppOpen;
- (void)sendAppOpen;
/**
Sends current badge value to server. Called internally by SDK Runtime when `UIApplication` `setApplicationBadgeNumber:` is set. This function is used for "auto-incremeting" badges to work.
@ -294,14 +283,7 @@ typedef void(^PushwooshErrorHandler)(NSError *error);
@param badge Current badge value.
*/
- (void) sendBadges: (NSInteger) badge;
/**
Sends geolocation to the server for GeoFencing push technology. Called internally, please use `startLocationTracking` and `stopLocationTracking` functions.
@param location Location to be sent.
*/
- (void) sendLocation: (CLLocation *) location;
- (void)sendBadges:(NSInteger)badge;
/**
Sends in-app purchases to Pushwoosh. Use in paymentQueue:updatedTransactions: payment queue method (see example).
@ -314,7 +296,7 @@ typedef void(^PushwooshErrorHandler)(NSError *error);
@param transactions Array of SKPaymentTransaction items as received in the payment queue.
*/
- (void) sendSKPaymentTransactions:(NSArray *)transactions;
- (void)sendSKPaymentTransactions:(NSArray *)transactions;
/**
Tracks individual in-app purchase. See recommended `sendSKPaymentTransactions:` method.
@ -324,14 +306,14 @@ typedef void(^PushwooshErrorHandler)(NSError *error);
@param currencyCode currency of the price (ex: @"USD")
@param date time of the purchase (ex: [NSDate now])
*/
- (void) sendPurchase: (NSString *) productIdentifier withPrice:(NSDecimalNumber *)price currencyCode:(NSString *)currencyCode andDate:(NSDate *)date;
- (void)sendPurchase:(NSString *)productIdentifier withPrice:(NSDecimalNumber *)price currencyCode:(NSString *)currencyCode andDate:(NSDate *)date;
/**
Gets current push token.
@return Current push token. May be nil if no push token is available yet.
*/
- (NSString *) getPushToken;
- (NSString *)getPushToken;
/**
Gets HWID. Unique device identifier that used in all API calls with Pushwoosh.
@ -339,17 +321,16 @@ typedef void(^PushwooshErrorHandler)(NSError *error);
@return Unique device identifier.
*/
- (NSString *) getHWID;
- (NSString *)getHWID;
- (void) handlePushRegistration:(NSData *)devToken;
- (void) handlePushRegistrationString:(NSString *)deviceID;
- (void)handlePushRegistration:(NSData *)devToken;
- (void)handlePushRegistrationString:(NSString *)deviceID;
//internal
- (void) handlePushRegistrationFailure:(NSError *) error;
- (void)handlePushRegistrationFailure:(NSError *)error;
//if the push is received while the app is running. internal
- (BOOL) handlePushReceived:(NSDictionary *) userInfo;
- (BOOL)handlePushReceived:(NSDictionary *)userInfo;
/**
Gets APN payload from push notifications dictionary.
@ -380,7 +361,7 @@ typedef void(^PushwooshErrorHandler)(NSError *error);
@param pushNotification Push notifications dictionary as received in `onPushAccepted: withNotification: onStart:`
*/
- (NSDictionary *) getApnPayload:(NSDictionary *)pushNotification;
- (NSDictionary *)getApnPayload:(NSDictionary *)pushNotification;
/**
Gets custom JSON string data from push notifications dictionary as specified in Pushwoosh Control Panel.
@ -394,12 +375,12 @@ typedef void(^PushwooshErrorHandler)(NSError *error);
@param pushNotification Push notifications dictionary as received in `onPushAccepted: withNotification: onStart:`
*/
- (NSString *) getCustomPushData:(NSDictionary *)pushNotification;
- (NSString *)getCustomPushData:(NSDictionary *)pushNotification;
/**
The same as getCustomPushData but returns NSDictionary rather than JSON string (converts JSON string into NSDictionary).
*/
- (NSDictionary *) getCustomPushDataAsNSDict:(NSDictionary *)pushNotification;
- (NSDictionary *)getCustomPushDataAsNSDict:(NSDictionary *)pushNotification;
/**
Returns dictionary with enabled remove notificaton types.
@ -430,13 +411,13 @@ typedef void(^PushwooshErrorHandler)(NSError *error);
/**
Clears the notifications from the notification center.
*/
+ (void) clearNotificationCenter;
+ (void)clearNotificationCenter;
/**
Set User indentifier. This could be Facebook ID, username or email, or any other user ID.
This allows data and events to be matched across multiple user devices.
*/
- (void) setUserId: (NSString*) userId;
- (void)setUserId:(NSString *)userId;
/**
Move all events from oldUserId to newUserId if doMerge is true. If doMerge is false all events for oldUserId are removed.
@ -446,7 +427,7 @@ typedef void(^PushwooshErrorHandler)(NSError *error);
@param doMerge if false all events for oldUserId are removed, if true all events for oldUserId are moved to newUserId
@param completeion callback
*/
- (void) mergeUserId: (NSString*) oldUserId to: (NSString*) newUserId doMerge: (BOOL) doMerge completion: (void(^)(NSError* error)) completion;
- (void)mergeUserId:(NSString *)oldUserId to:(NSString *)newUserId doMerge:(BOOL)doMerge completion:(void (^)(NSError *error))completion;
/**
Post events for In-App Messages. This can trigger In-App message display as specified in Pushwoosh Control Panel.
@ -460,11 +441,11 @@ typedef void(^PushwooshErrorHandler)(NSError *error);
@param attributes NSDictionary of event attributes
@param completion function to call after posting event
*/
- (void) postEvent: (NSString*) event withAttributes: (NSDictionary*) attributes completion: (void(^)(NSError* error)) completion;
- (void)postEvent:(NSString *)event withAttributes:(NSDictionary *)attributes completion:(void (^)(NSError *error))completion;
/**
See `postEvent:withAttributes:completion:`
*/
- (void) postEvent: (NSString*) event withAttributes: (NSDictionary*) attributes;
- (void)postEvent:(NSString *)event withAttributes:(NSDictionary *)attributes;
@end

BIN
iphone/Maps/PushNotifications/Pushwoosh.framework/Versions/A/Pushwoosh
View file

Binary file not shown.

4
iphone/Maps/Statistics/Statistics.mm
View file

@ -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];

2
iphone/Maps/main.mm
View file

@ -45,7 +45,7 @@ void setMarketingSender()
eventParams[key] = value;
[myTrackerEvent appendString:[NSString stringWithFormat:@"_%@_%@", key, value]];
}
[MRMyTracker trackEvent:myTrackerEvent eventParams:nil];
[MRMyTracker trackEventWithName:myTrackerEvent];
});
}