Version 2.1.5

APMServices.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'APMServices'
-  s.version          = '2.1.4'
+  s.version          = '2.1.5'
   s.summary          = 'app\'s miles® boosts your app\'s usage'
 
 # This description is used to generate tags and improve search results.

APMServices/Frameworks/APMServices.framework/Versions/A/Headers/APMGenerosity.h

@@ -8,6 +8,11 @@
 
 #import "APMModel.h"
 
+@class APMRule;
+
+#define APM_GENEROSITY_ELIGIBILITY_OFF 0
+#define APM_GENEROSITY_ELIGIBILITY_ON 1
+
 @interface APMGenerosity : APMModel<NSCoding, NSCopying>
 
 @property (nonatomic, assign) NSInteger generosityID;
@@ -23,9 +28,19 @@
 @property(nonatomic, assign) NSInteger generosityType;
 @property(nonatomic, strong) NSString *deeplinkUrl;
 @property(nonatomic, strong) NSString *frequency;
+@property(nonatomic, strong) NSArray *rules;
+@property(nonatomic, assign) NSInteger eligibility;
 
 -(id)initWithJSONObject:(NSDictionary*)jsonObject;
 -(BOOL)isActived;
 -(BOOL)isPlayable;
 
+-(BOOL)isMatchesTagId:(NSString*)tagId generositySuggested:(APMGenerosity*)generositySuggested;
+-(APMRule*)findRuleWithProperties:(NSDictionary*)properties;
+
+-(BOOL)isPlayableForChallengeWithTagId:(NSString*)tagId;
+-(BOOL)isPlayableForTrophyWithTagId:(NSString*)tagId;
+
+-(BOOL)isEligible;
+
 @end

APMServices/Frameworks/APMServices.framework/Versions/A/Headers/APMRule.h

+//
+//  APMRule.h
+//  APMServices
+//
+//  Created by Vincent Ducastel on 11/09/2018.
+//  Copyright (c) 2018 Moonmiles. All rights reserved.
+//
+
+#import "APMModel.h"
+
+#define APM_K_RULE_ID                           @"id"
+#define APM_K_RULE_ELIGIBILITY                  @"generosityEligibility"
+#define APM_K_RULE_FILTERS                      @"filters"
+
+#define APM_RULE_ELIGIBILITY_OFF 0
+#define APM_RULE_ELIGIBILITY_ON 1
+
+@interface APMRule : APMModel<NSCoding, NSCopying>
+
+@property (nonatomic, assign) NSInteger identifiant;
+@property (nonatomic, assign) NSInteger eligibility;
+@property (nonatomic, strong) NSArray* filters;
+
+-(id)initWithJSONObject:(NSDictionary*)jsonObject;
+-(BOOL)isEligible;
+
+@end

APMServices/Frameworks/APMServices.framework/Versions/A/Headers/APMServices.h

@@ -86,6 +86,7 @@
 -(void)viewDidDisappear:(BOOL)animated;
 
 //Services
+-(void)refreshSDK:(BOOL)force;
 -(void)registerAction:(APMAction*)action;
 -(void)removeActionWithActionName:(NSString*)actionName;
 -(NSDictionary*)getActionsForClassId:(NSString*)classId;
@@ -95,8 +96,9 @@
 -(void)triggerActions:(NSArray*)listActionName completion:(void (^)(NSMutableArray* listStatusActionName, NSError* error))completion;
 
 -(void)triggerAction:(NSString*)actionName;
+-(void)triggerAction:(NSString*)actionName properties:(NSMutableDictionary*)properties;
 -(void)triggerAction:(NSString*)actionName success:(void (^)(void))success failure:(void (^)(NSError* error))failure;
--(void)triggerAction:(NSString*)actionName policy:(NSInteger)policy success:(void (^)(void))success failure:(void (^)(NSError* error))failure;
+-(void)triggerAction:(NSString*)actionName policy:(NSInteger)policy properties:(NSMutableDictionary*)properties success:(void (^)(void))success failure:(void (^)(NSError* error))failure;
 
 -(BOOL)handleOpenURL:(NSURL*)url;
 

APMServices/Frameworks/APMServices.framework/Versions/A/Headers/APMServicesConfig.h

@@ -8,8 +8,8 @@
 
 // Version of API
 #define APM_API_VERSION @"3.0"
-#define APM_SERVICES_VERSION_NAME @"2.1.4"
-#define APM_SERVICES_VERSION_CODE @"2140"
+#define APM_SERVICES_VERSION_NAME @"2.1.5"
+#define APM_SERVICES_VERSION_CODE @"2150"
 
 //URL
 #define APM_URL_API_PROD @"https://api.appsmiles.eu/" //Url API prod

APMServices/Frameworks/APMServices.framework/Versions/A/Headers/APMServicesConfigPrivate.h

@@ -31,6 +31,7 @@
 #define APM_K_SERVICES_VERSION_NAME @"serviceVersionName"
 #define APM_K_SERVICES_VERSION_CODE @"serviceVersionCode"
 #define APM_K_SEGMENTS              @"segments"
+#define APM_K_USER_PROPERTIES       @"userProperties"
 #define APM_K_HEADER_PARTNER_ID     @"partnerID"
 
 // Common
@@ -135,6 +136,8 @@
 #define APM_K_GENEROSITY_TYPE               @"generosityType"
 #define APM_K_GENEROSITY_DEEPLINK_URL       @"generosityUrl"
 #define APM_K_GENEROSITY_FREQUENCY          @"generosityFrequency"
+#define APM_K_GENEROSITY_RULES              @"rules"
+#define APM_K_GENEROSITY_ELIGIBILITY        @"generosityEligibility"
 
 // Generosities
 #define APM_K_GENEROSITIES                  @"generosities"
@@ -248,6 +251,7 @@
 // Other keys
 #define APM_K_DATE  @"gmtDate"
 #define APM_K_PLACE @"localisation"
+#define APM_K_PROPERTIES @"properties"
 
 // Test keys
 #define APM_K_CODE  @"code"
@@ -389,6 +393,7 @@
 //Files
 #define APM_FILE_USER_SDK @"fr.moonmiles.appsmiles:userObject"
 #define APM_FILE_OLD_USER_SDK @"fr.moonmiles.appsmiles:oldUser"
+#define APM_FILE_USER_PROPERTIES_SDK @"fr.moonmiles.appsmiles:userProperties"
 #define APM_FILE_PROG_SDK @"fr.moonmiles.appsmiles:prog"
 #define APM_FILE_GENEROSITY_SDK @"fr.moonmiles.appsmiles:generosity"
 #define APM_FILE_GIFT_SDK @"fr.moonmiles.appsmiles:gift"

APMServices/Frameworks/APMServices.framework/Versions/A/Headers/APMServicesHeaders.h

@@ -70,6 +70,7 @@
 #import "APMTrophiesUtils.h"
 #import "APMCategoryTrophy.h"
 #import "APMTrophiesUtils.h"
+#import "APMUserPropertiesUtils.h"
 
 #import "APMWebServices.h"
 #import "APMServicesConfigPrivate.h"

APMServices/Frameworks/APMServices.framework/Versions/A/Headers/APMServicesUser.h

@@ -44,6 +44,6 @@
 +(void)userSavePushToken:(NSString*)pushToken userSavePushTokenSuccess:(void (^)(void))userSavePushTokenSuccess failure:(void (^)(NSError* error))failure;
 +(void)userDeleteWithUserDeleteSuccess:(void (^)(void))userDeleteSuccess failure:(void (^)(NSError* error))failure;
 +(void)userListWithPartnerClientIDs:(NSArray*)partnerClientIDs userListSuccess:(void (^)(NSArray* users))userListSuccess failure:(void (^)(NSError* error))failure;
-+(void)userRefreshDataWithUserRefreshDataSuccess:(void (^)())userRefreshDataSuccess failure:(void (^)(NSError* error))failure;
++(void)userRefreshDataWithUserRefreshDataSuccess:(void (^)(void))userRefreshDataSuccess failure:(void (^)(NSError* error))failure;
 
 @end

APMServices/Frameworks/APMServices.framework/Versions/A/Headers/APMServicesUtils.h

@@ -24,6 +24,7 @@
 +(NSString*)getAPMSchemeWithPartnerID:(NSString*)partnerID;
 +(UIImage*)getPartnerIcon;
 +(BOOL)emailValid:(NSString*)email;
++(NSRegularExpressionOptions)regexOptionsFromStrFlags:(NSString*)flags;
 +(NSMutableAttributedString*)getAttributedString:(NSString*)text withColor:(UIColor*)textColor andSize:(CGFloat)textSize andFont:(NSString*)textFont;
 +(NSMutableAttributedString*)getAttributedStringFromSimpleHtml:(NSString*)text color:(NSString*)color size:(NSString*)size font:(NSString*)font;
 +(NSString*)stringFromHtmlString:(NSString*)html;

APMServices/Frameworks/APMServices.framework/Versions/A/Headers/APMUserPropertiesUtils.h

+//
+//  APMUserPropertiesUtils.h
+//  APMServices
+//
+//  Created by Vincent Ducastel on 12/09/2018.
+//  Copyright © 2018 Moonmiles. All rights reserved.
+//
+
+@interface APMUserPropertiesUtils : NSObject
+
+@property(nonatomic, strong) NSMutableDictionary *userProperties;
+
++(APMUserPropertiesUtils *)sharedInstance;
+-(void)initInstance;
+
+-(void)addUserProperties:(NSDictionary*)userProperties;
+-(void)addUserProperty:(NSString*)userProperty forKey:(NSString*)key;
+-(void)removeUserProperty:(NSString*)key;
+-(void)removeUserProperties;
+
+-(void)resetAll;
+
+@end

APMServices/Frameworks/APMServices.framework/Versions/A/Headers/APMWebServices.h

@@ -92,7 +92,7 @@
 +(void)initCheckStore:(NSString*)partnerId userToken:(NSString*)userToken partnerClientId:(NSString*)partnerClientId email:(NSString*)email classId:(NSString*)classId tagId:(NSString*)tagId ids:(APMIdsFromTagId*)ids date:(NSString*)date generosity:(APMGenerosity*)generosity partnerLevel:(NSInteger)partnerLevel versions:(APMVersions*)versions success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
 +(void)initCheckStore:(NSString*)userToken params:(NSMutableDictionary*)params success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
 
-+(void)generosityStore:(NSString*)userToken partnerId:(NSString*)partnerId tagId:(NSString*)tagId date:(NSString*)date ids:(APMIdsFromTagId*)ids success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
++(void)generosityStore:(NSString*)userToken partnerId:(NSString*)partnerId tagId:(NSString*)tagId date:(NSString*)date ids:(APMIdsFromTagId*)ids properties:(NSDictionary*)properties success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
 +(void)generosityStore:(NSString*)userToken params:(NSDictionary*)params success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
 
 +(void)generosityList:(NSString*)userToken classId:(NSString*)classId success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;