Skip to content

Commit

Permalink
Updated to iOS Flurry SDK 4.2.3
Browse files Browse the repository at this point in the history
This is a critical update for the new coming iOS7, where identification of devices through its MAC adress is no longer possible. Older versions will cause problems in some way or other the statistics if the app is run on a device with iOS7.
  • Loading branch information
joscandreu committed Aug 27, 2013
1 parent a6c3ca3 commit 6d1ddf3
Show file tree
Hide file tree
Showing 5 changed files with 84 additions and 9 deletions.
83 changes: 75 additions & 8 deletions iphone/Flurry/Flurry.h
Expand Up @@ -23,6 +23,20 @@
* @version 4.2.0
*
*/

/*!
* @brief Enum for setting up log output level.
* @since 4.2.2
*
*/
typedef enum {
FlurryLogLevelNone = 0, //No output
FlurryLogLevelCriticalOnly, //Default, outputs only crytical log events
FlurryLogLevelDebug, //Debug level, outputs crytical and main log events
FlurryLogLevelAll //Highest level, outputs all log events
} FlurryLogLevel;


@interface Flurry : NSObject {
}

Expand Down Expand Up @@ -58,7 +72,7 @@
* FAQ for the iPhone SDK is located at <a href="http://wiki.flurry.com/index.php?title=IPhone_FAQ">
* Support Center - iPhone FAQ</a>.
*
* @see #setDebugLogEnabled: for information on how to view debugging information on your console.
* @see #setLogLevel: for information on how to view debugging information on your console.
*
* @return The agent version of the Flurry SDK.
*
Expand All @@ -75,7 +89,7 @@
*
* @note This method must be called prior to invoking #startSession:.
*
* @see #setDebugLogEnabled: for information on how to view debugging information on your console. \n
* @see #setLogLevel: for information on how to view debugging information on your console. \n
* #logError:message:exception: for details on logging exceptions. \n
* #logError:message:error: for details on logging errors.
*
Expand All @@ -88,14 +102,30 @@
* @since 2.7
*
* This is an optional method that displays debug information related to the Flurry SDK.
* display information to the console. The default setting for this method is @c NO.
* display information to the console. The default setting for this method is @c NO
* which sets the log level to @c FlurryLogLevelCriticalOnly.
* When set to @c YES the debug log level is set to @c FlurryLogLevelDebug
*
* @note This method must be called prior to invoking #startSession:.
* @note This method must be called prior to invoking #startSession:. If the method, setLogLevel is called later in the code, debug logging will be automatically enabled.
*
* @param value @c YES to show debug logs, @c NO to omit debug logs.
*
*/
+ (void)setDebugLogEnabled:(BOOL)value;
+ (void)setDebugLogEnabled:(BOOL)value;

/*!
* @brief Generates debug logs to console.
* @since 4.2.2
*
* This is an optional method that displays debug information related to the Flurry SDK.
* display information to the console. The default setting for this method is @c FlurryLogLevelCritycalOnly.
*
* @note Its good practice to call this method prior to invoking #startSession:. If debug logging is disabled earlier, this method will enable it.
*
* @param value Log level
*
*/
+ (void)setLogLevel:(FlurryLogLevel)value;

/*!
* @brief Set the timeout for expiring a Flurry session.
Expand Down Expand Up @@ -149,7 +179,7 @@
* time specified in #setSessionContinueSeconds:. If the app is resumed in that period
* the session will continue, otherwise a new session will begin.
*
* Crash reporting will not be enabled. See #startSession:enableCrashReporting: for
* Crash reporting will not be enabled. See #setCrashReportingEnabled: for
* more information.
*
* @note If testing on a simulator, please be sure to send App to background via home
Expand Down Expand Up @@ -204,6 +234,31 @@
+ (void) startSession:(NSString *)apiKey withOptions:(id)options;


/*!
* @brief Pauses a Flurry session.
* @since 4.2.2
*
* This method is useful in case of #setBackgroundSessionEnabled: set to YES. It can be
* called when application finished all background tasks (such as playing music) to pause session.
* If the app is resumed before time specified in #setSessionContinueSeconds:,
* the session will continue, otherwise a new session will begin.
*
* @see #setSessionContinueSeconds: for details on setting a custom session timeout.
* @see #setBackgroundSessionEnabled: for details on setting a custom behaviour on resigning activity.
*
* @code
* - (void)allBackgroundTasksFinished
{
// ....
[Flurry pauseBackgroundSession];
// ....
}
* @endcode
*
*/
+ (void)pauseBackgroundSession;


/** @name Event and Error Logging
* Methods for reporting custom events and errors during the session.
*/
Expand Down Expand Up @@ -565,7 +620,7 @@
*
* Use this method to capture the gender of your user. Only use this method if you collect this
* information explictly from your user (i.e. - there is no need to set a default value). Allowable
* values are @c @"M" or @c @"F"
* values are @c @"m" or @c @"f"
*
* @note The gender is aggregated across all users of your app and not available on a per user
* basis.
Expand Down Expand Up @@ -637,7 +692,7 @@
* @param sendSessionReportsOnClose YES to send on close, NO to omit reporting on close.
*
*/
+ (void)setSessionReportsOnCloseEnabled:(BOOL)sendSessionReportsOnClose;
+ (void)setSessionReportsOnCloseEnabled:(BOOL)sendSessionReportsOnClose;

/*!
* @brief Set session to report when app is sent to the background.
Expand All @@ -650,6 +705,18 @@
*/
+ (void)setSessionReportsOnPauseEnabled:(BOOL)setSessionReportsOnPauseEnabled;

/*!
* @brief Set session to support background execution.
* @since 4.2.2
*
* Use this method finish session data when the app is paused. The default value is taken looking at the UIBackgroundModes of application's Info.plist.
* If UIBackgroundModes array is empty, equals @c NO, otherwise @c YES.
*
* @param setBackgroundSessionEnabled NO to finish on resigning active, YES to omit finishing.
*
*/
+ (void)setBackgroundSessionEnabled:(BOOL)setBackgroundSessionEnabled;

/*!
* @brief Enable custom event logging.
* @since 2.7
Expand Down
Binary file modified iphone/Flurry/libFlurry.a
Binary file not shown.
8 changes: 8 additions & 0 deletions iphone/iphoneflurry.xcodeproj/project.pbxproj
Expand Up @@ -28,6 +28,8 @@
24DD6CFA1134B3F500162E58 /* SgFlurryModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 24DD6CF81134B3F500162E58 /* SgFlurryModule.m */; };
24DE9E1111C5FE74003F90F6 /* SgFlurryModuleAssets.h in Headers */ = {isa = PBXBuildFile; fileRef = 24DE9E0F11C5FE74003F90F6 /* SgFlurryModuleAssets.h */; };
24DE9E1211C5FE74003F90F6 /* SgFlurryModuleAssets.m in Sources */ = {isa = PBXBuildFile; fileRef = 24DE9E1011C5FE74003F90F6 /* SgFlurryModuleAssets.m */; };
5577601C17CCBCE100CA09BF /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5577601B17CCBCE100CA09BF /* Security.framework */; };
5577601E17CCBCED00CA09BF /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5577601D17CCBCED00CA09BF /* AdSupport.framework */; };
AA747D9F0F9514B9006C5449 /* SgFlurry_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = AA747D9E0F9514B9006C5449 /* SgFlurry_Prefix.pch */; };
AACBBE4A0F95108600F1A2B1 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AACBBE490F95108600F1A2B1 /* Foundation.framework */; };
/* End PBXBuildFile section */
Expand All @@ -52,6 +54,8 @@
24DD6D1B1134B66800162E58 /* titanium.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = titanium.xcconfig; sourceTree = "<group>"; };
24DE9E0F11C5FE74003F90F6 /* SgFlurryModuleAssets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SgFlurryModuleAssets.h; path = Classes/SgFlurryModuleAssets.h; sourceTree = "<group>"; };
24DE9E1011C5FE74003F90F6 /* SgFlurryModuleAssets.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SgFlurryModuleAssets.m; path = Classes/SgFlurryModuleAssets.m; sourceTree = "<group>"; };
5577601B17CCBCE100CA09BF /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
5577601D17CCBCED00CA09BF /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; };
AA747D9E0F9514B9006C5449 /* SgFlurry_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SgFlurry_Prefix.pch; sourceTree = SOURCE_ROOT; };
AACBBE490F95108600F1A2B1 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
D2AAC07E0554694100DB518D /* libSgFlurry.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSgFlurry.a; sourceTree = BUILT_PRODUCTS_DIR; };
Expand All @@ -62,6 +66,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
5577601E17CCBCED00CA09BF /* AdSupport.framework in Frameworks */,
5577601C17CCBCE100CA09BF /* Security.framework in Frameworks */,
AACBBE4A0F95108600F1A2B1 /* Foundation.framework in Frameworks */,
1F575A74171C9122002A4915 /* libFlurry.a in Frameworks */,
);
Expand All @@ -81,6 +87,8 @@
0867D691FE84028FC02AAC07 /* iphoneflurry */ = {
isa = PBXGroup;
children = (
5577601D17CCBCED00CA09BF /* AdSupport.framework */,
5577601B17CCBCE100CA09BF /* Security.framework */,
1F575A70171C9122002A4915 /* Flurry */,
1F0FABF7142635F8009EF183 /* CoreLocation.framework */,
1F0FABF3142634E7009EF183 /* CoreLocation.framework */,
Expand Down
2 changes: 1 addition & 1 deletion iphone/manifest
@@ -1,4 +1,4 @@
version: 2.5
version: 2.6
description: Flurry for iOS
author: Tommy Leung
license: The MIT License (MIT)
Expand Down
Binary file added iphone/sg.flurry-iphone-2.6.zip
Binary file not shown.

0 comments on commit 6d1ddf3

Please sign in to comment.