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

[ios] Updated Flurry to 6.0.0

Browse source
This commit is contained in:
Alex Zolotarev 2015-01-30 18:40:30 +03:00
parent f875913bff
commit 071a1aa924
5 changed files with 45 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -75,7 +75,7 @@
97D40C0A184D031900A1D572 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97D40C09184D031900A1D572 /* Images.xcassets */; };
97D807BE18A93C8800D416E0 /* iAd.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97C98651186C5EF000AF7E9E /* iAd.framework */; };
97DD585518A8EAFA0079837E /* libAarkiSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 97DD585218A8EAFA0079837E /* libAarkiSDK.a */; };
97DD585C18A8EB130079837E /* libFlurry_5.4.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 97DD585A18A8EB120079837E /* libFlurry_5.4.0.a */; };
97DD585C18A8EB130079837E /* libFlurry_6.0.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 97DD585A18A8EB120079837E /* libFlurry_6.0.0.a */; };
97DEA09618D75BB000C5F963 /* ContextViews.mm in Sources */ = {isa = PBXBuildFile; fileRef = 97DEA09518D75BB000C5F963 /* ContextViews.mm */; };
97ECD871183620CE00F77A46 /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97ECD870183620CE00F77A46 /* AdSupport.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
97ECD87818362B3D00F77A46 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97ECD87718362B3D00F77A46 /* CoreTelephony.framework */; };
@ -318,7 +318,7 @@
97DD585218A8EAFA0079837E /* libAarkiSDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libAarkiSDK.a; sourceTree = "<group>"; };
97DD585318A8EAFA0079837E /* Aarki.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Aarki.h; sourceTree = "<group>"; };
97DD585418A8EAFA0079837E /* AarkiContact.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AarkiContact.h; sourceTree = "<group>"; };
97DD585A18A8EB120079837E /* libFlurry_5.4.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libFlurry_5.4.0.a; sourceTree = "<group>"; };
97DD585A18A8EB120079837E /* libFlurry_6.0.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libFlurry_6.0.0.a; sourceTree = "<group>"; };
97DD585B18A8EB120079837E /* Flurry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Flurry.h; sourceTree = "<group>"; };
97DEA09018D706C300C5F963 /* Common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Common.h; sourceTree = "<group>"; };
97DEA09418D75BB000C5F963 /* ContextViews.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContextViews.h; sourceTree = "<group>"; };
@ -528,7 +528,7 @@
46F26D1F10F626CB00ECCA39 /* QuartzCore.framework in Frameworks */,
EEB7E22211E9079400080A68 /* CoreLocation.framework in Frameworks */,
97DD585518A8EAFA0079837E /* libAarkiSDK.a in Frameworks */,
97DD585C18A8EB130079837E /* libFlurry_5.4.0.a in Frameworks */,
97DD585C18A8EB130079837E /* libFlurry_6.0.0.a in Frameworks */,
FA87151B12B1518F00592DAF /* SystemConfiguration.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@ -853,7 +853,7 @@
97C9851C186AE3C500AF7E9E /* Reachability.m */,
CB252D6B16FF82C8001E41E9 /* Statistics.h */,
CB252D6C16FF82C8001E41E9 /* Statistics.mm */,
97DD585A18A8EB120079837E /* libFlurry_5.4.0.a */,
97DD585A18A8EB120079837E /* libFlurry_6.0.0.a */,
97DD585B18A8EB120079837E /* Flurry.h */,
97DD585218A8EAFA0079837E /* libAarkiSDK.a */,
97DD585318A8EAFA0079837E /* Aarki.h */,

60
iphone/Maps/Statistics/Flurry.h
View file

@ -36,6 +36,14 @@ typedef enum {
FlurryLogLevelAll //Highest level, outputs all log events
} FlurryLogLevel;
typedef enum {
FlurryEventFailed = 0,
FlurryEventRecorded,
FlurryEventUniqueCountExceeded,
FlurryEventParamsCountExceeded,
FlurryEventLogCountExceeded,
FlurryEventLoggingDelayed
} FlurryEventRecordStatus;
@interface Flurry : NSObject {
}
@ -141,19 +149,6 @@ typedef enum {
*/
+ (void)setSessionContinueSeconds:(int)seconds;
/*!
* @brief Send data over a secure transport.
* @since 3.0
*
* This is an optional method that sends data over an SSL connection when enabled. The
* default value is @c NO.
*
* @note This method must be called prior to invoking #startSession:.
*
* @param value @c YES to send data over secure connection.
*/
+ (void)setSecureTransportEnabled:(BOOL)value;
/*!
* @brief Enable automatic collection of crash reports.
* @since 4.1
@ -234,6 +229,25 @@ typedef enum {
+ (void) startSession:(NSString *)apiKey withOptions:(id)options;
/*!
* @brief Start a Flurry session for the project denoted by @c apiKey.
* @since 6.0.0
*
* @code
* - (BOOL) application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
{
// Optional Flurry startup methods
[Flurry activeSessionExists:@"YOUR_API_KEY" withOptions:launchOptions];
// ....
}
* @endcode
*
* @param apiKey The API key for this project.
* @param options passed launchOptions from the applicatin's didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
*/
+ (BOOL) activeSessionExists;
/*!
* @brief Pauses a Flurry session left running in background.
* @since 4.2.2
@ -349,8 +363,10 @@ typedef enum {
*
* @param eventName Name of the event. For maximum effectiveness, we recommend using a naming scheme
* that can be easily understood by non-technical people in your business domain.
*
* @return enum FlurryEventRecordStatus for the recording status of the logged event.
*/
+ (void)logEvent:(NSString *)eventName;
+ (FlurryEventRecordStatus)logEvent:(NSString *)eventName;
/*!
* @brief Records a custom parameterized event specified by @c eventName with @c parameters.
@ -393,8 +409,10 @@ typedef enum {
* @param eventName Name of the event. For maximum effectiveness, we recommend using a naming scheme
* that can be easily understood by non-technical people in your business domain.
* @param parameters An immutable copy of map containing Name-Value pairs of parameters.
*
* @return enum FlurryEventRecordStatus for the recording status of the logged event.
*/
+ (void)logEvent:(NSString *)eventName withParameters:(NSDictionary *)parameters;
+ (FlurryEventRecordStatus)logEvent:(NSString *)eventName withParameters:(NSDictionary *)parameters;
/*!
* @brief Records an app exception. Commonly used to catch unhandled exceptions.
@ -482,9 +500,11 @@ typedef enum {
*
* @param eventName Name of the event. For maximum effectiveness, we recommend using a naming scheme
* that can be easily understood by non-technical people in your business domain.
* @param timed Specifies the event will be timed.
* @param timed Specifies the event will be timed..
*
* @return enum FlurryEventRecordStatus for the recording status of the logged event.
*/
+ (void)logEvent:(NSString *)eventName timed:(BOOL)timed;
+ (FlurryEventRecordStatus)logEvent:(NSString *)eventName timed:(BOOL)timed;
/*!
* @brief Records a custom parameterized timed event specified by @c eventName with @c parameters.
@ -529,9 +549,11 @@ typedef enum {
* @param eventName Name of the event. For maximum effectiveness, we recommend using a naming scheme
* that can be easily understood by non-technical people in your business domain.
* @param parameters An immutable copy of map containing Name-Value pairs of parameters.
* @param timed Specifies the event will be timed.
* @param timed Specifies the event will be timed..
*
* @return enum FlurryEventRecordStatus for the recording status of the logged event.
*/
+ (void)logEvent:(NSString *)eventName withParameters:(NSDictionary *)parameters timed:(BOOL)timed;
+ (FlurryEventRecordStatus)logEvent:(NSString *)eventName withParameters:(NSDictionary *)parameters timed:(BOOL)timed;
/*!
* @brief Ends a timed event specified by @c eventName and optionally updates parameters with @c parameters.

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

@ -75,16 +75,6 @@
{
}
- (id)init
{
self = [super init];
if (self.enabled)
[Flurry setSecureTransportEnabled:true];
return self;
}
- (BOOL)enabled
{
#ifdef DEBUG

BIN
iphone/Maps/Statistics/libFlurry_5.4.0.a
View file

Binary file not shown.

BIN
iphone/Maps/Statistics/libFlurry_6.0.0.a Executable file
View file

Binary file not shown.