Flurry updated to newest version v4.0.6 (updated 10/15/2012)

Related changes in FTProjectInitialization and FTTracking
ondrej-rafaj · Nov 1, 2012 · a97b3c1 · a97b3c1
1 parent 7038076
commit a97b3c1
Show file tree

Hide file tree

Showing 9 changed files with 627 additions and 178 deletions.
diff --git a/FTLibrary.xcodeproj/project.pbxproj b/FTLibrary.xcodeproj/project.pbxproj
@@ -375,7 +375,6 @@
 		4C9F74B1146AFF99007B68B1 /* libOAuth.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A56A634A1433679B000C666B /* libOAuth.a */; };
 		4C9F74B2146AFF99007B68B1 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C85BC1A13BA4B5000CB7FCA /* libz.dylib */; };
 		4C9F74B3146AFF99007B68B1 /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C85BC1913BA4B5000CB7FCA /* libxml2.dylib */; };
-		4C9F74B4146AFF9B007B68B1 /* libFlurryAnalytics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CE096931442111A00B31E11 /* libFlurryAnalytics.a */; };
 		4C9F7DFF14891E3800177894 /* FTISO8601DateFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C9F7DFD14891E3800177894 /* FTISO8601DateFormatter.h */; };
 		4C9F7E0014891E3800177894 /* FTISO8601DateFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C9F7DFE14891E3800177894 /* FTISO8601DateFormatter.m */; };
 		4C9F7E0114891E3800177894 /* FTISO8601DateFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C9F7DFE14891E3800177894 /* FTISO8601DateFormatter.m */; };
@@ -492,8 +491,6 @@
 		4CE0967E1440D83200B31E11 /* FTPhotoEditingView.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CE0967A1440D83200B31E11 /* FTPhotoEditingView.h */; };
 		4CE0967F1440D83200B31E11 /* FTPhotoEditingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE0967B1440D83200B31E11 /* FTPhotoEditingView.m */; };
 		4CE096811440D8BF00B31E11 /* libTestFlight.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CE096801440D8BF00B31E11 /* libTestFlight.a */; };
-		4CE096941442111A00B31E11 /* FlurryAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CE096921442111A00B31E11 /* FlurryAnalytics.h */; };
-		4CE096951442111A00B31E11 /* libFlurryAnalytics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CE096931442111A00B31E11 /* libFlurryAnalytics.a */; };
 		4CE77EDF1435D34500A5AEDA /* FTVerticalSlider.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CE77EDD1435D34500A5AEDA /* FTVerticalSlider.h */; };
 		4CE77EE01435D34500A5AEDA /* FTVerticalSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE77EDE1435D34500A5AEDA /* FTVerticalSlider.m */; };
 		4CE77EF11435E7C900A5AEDA /* JSON.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CE77EEE1435E7C900A5AEDA /* JSON.h */; };
@@ -557,6 +554,8 @@
 		93F6E7E51484F549002337ED /* FTTaskMaker.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F6E7E31484F549002337ED /* FTTaskMaker.m */; };
 		93F6E7F11484F751002337ED /* FTReachabilityManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 93F6E7EF1484F751002337ED /* FTReachabilityManager.h */; };
 		93F6E7F21484F751002337ED /* FTReachabilityManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F6E7F01484F751002337ED /* FTReachabilityManager.m */; };
+		A098C6C71642BFBB00CA53E3 /* libFlurry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A098C6C61642BFBB00CA53E3 /* libFlurry.a */; };
+		A098C6CA1642BFDE00CA53E3 /* Flurry.h in Headers */ = {isa = PBXBuildFile; fileRef = A098C6C91642BFDE00CA53E3 /* Flurry.h */; };
 		A56A62CE1433606E000C666B /* FTShare.h in Headers */ = {isa = PBXBuildFile; fileRef = A56A62CC1433606E000C666B /* FTShare.h */; };
 		A56A62CF1433606E000C666B /* FTShare.m in Sources */ = {isa = PBXBuildFile; fileRef = A56A62CD1433606E000C666B /* FTShare.m */; };
 		A56A63111433617B000C666B /* NSMutableURLRequest+Parameters.h in Headers */ = {isa = PBXBuildFile; fileRef = A56A62DA1433617B000C666B /* NSMutableURLRequest+Parameters.h */; };
@@ -1009,8 +1008,6 @@
 		4CE0967A1440D83200B31E11 /* FTPhotoEditingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FTPhotoEditingView.h; sourceTree = "<group>"; };
 		4CE0967B1440D83200B31E11 /* FTPhotoEditingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FTPhotoEditingView.m; sourceTree = "<group>"; };
 		4CE096801440D8BF00B31E11 /* libTestFlight.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libTestFlight.a; sourceTree = "<group>"; };
-		4CE096921442111A00B31E11 /* FlurryAnalytics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FlurryAnalytics.h; sourceTree = "<group>"; };
-		4CE096931442111A00B31E11 /* libFlurryAnalytics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libFlurryAnalytics.a; path = Thirdparty/Flurry/libFlurryAnalytics.a; sourceTree = "<group>"; };
 		4CE77EDD1435D34500A5AEDA /* FTVerticalSlider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FTVerticalSlider.h; sourceTree = "<group>"; };
 		4CE77EDE1435D34500A5AEDA /* FTVerticalSlider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FTVerticalSlider.m; sourceTree = "<group>"; };
 		4CE77EEE1435E7C900A5AEDA /* JSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSON.h; sourceTree = "<group>"; };
@@ -1077,6 +1074,8 @@
 		93F6E7E31484F549002337ED /* FTTaskMaker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FTTaskMaker.m; sourceTree = "<group>"; };
 		93F6E7EF1484F751002337ED /* FTReachabilityManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FTReachabilityManager.h; sourceTree = "<group>"; };
 		93F6E7F01484F751002337ED /* FTReachabilityManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FTReachabilityManager.m; sourceTree = "<group>"; };
+		A098C6C61642BFBB00CA53E3 /* libFlurry.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libFlurry.a; path = Thirdparty/Flurry/libFlurry.a; sourceTree = "<group>"; };
+		A098C6C91642BFDE00CA53E3 /* Flurry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Flurry.h; sourceTree = "<group>"; };
 		A56A62CC1433606E000C666B /* FTShare.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FTShare.h; sourceTree = "<group>"; };
 		A56A62CD1433606E000C666B /* FTShare.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FTShare.m; sourceTree = "<group>"; };
 		A56A62D61433617B000C666B /* jQueryInject.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = jQueryInject.txt; sourceTree = "<group>"; };
@@ -1163,8 +1162,8 @@
 				4C85BC3113BA4B5000CB7FCA /* QuartzCore.framework in Frameworks */,
 				4C85BC3213BA4B5000CB7FCA /* SystemConfiguration.framework in Frameworks */,
 				4CE096811440D8BF00B31E11 /* libTestFlight.a in Frameworks */,
-				4CE096951442111A00B31E11 /* libFlurryAnalytics.a in Frameworks */,
 				4C9F749F146AFF4C007B68B1 /* CoreGraphics.framework in Frameworks */,
+				A098C6C71642BFBB00CA53E3 /* libFlurry.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1195,7 +1194,6 @@
 				4C9F74B1146AFF99007B68B1 /* libOAuth.a in Frameworks */,
 				4C9F74B2146AFF99007B68B1 /* libz.dylib in Frameworks */,
 				4C9F74B3146AFF99007B68B1 /* libxml2.dylib in Frameworks */,
-				4C9F74B4146AFF9B007B68B1 /* libFlurryAnalytics.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1269,7 +1267,7 @@
 		4C03655013BA023A00E8FA09 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				4CE096931442111A00B31E11 /* libFlurryAnalytics.a */,
+				A098C6C61642BFBB00CA53E3 /* libFlurry.a */,
 				4CE096801440D8BF00B31E11 /* libTestFlight.a */,
 				A56A634A1433679B000C666B /* libOAuth.a */,
 				4C85BC1A13BA4B5000CB7FCA /* libz.dylib */,
@@ -1923,7 +1921,7 @@
 		4C85BB5813BA4AFD00CB7FCA /* Flurry */ = {
 			isa = PBXGroup;
 			children = (
-				4CE096921442111A00B31E11 /* FlurryAnalytics.h */,
+				A098C6C91642BFDE00CA53E3 /* Flurry.h */,
 			);
 			path = Flurry;
 			sourceTree = "<group>";
@@ -2956,7 +2954,6 @@
 				68D604A5143F0C7900C3C84E /* TestFlight.h in Headers */,
 				4CE0967C1440D83200B31E11 /* FTPhotoEditingElementView.h in Headers */,
 				4CE0967E1440D83200B31E11 /* FTPhotoEditingView.h in Headers */,
-				4CE096941442111A00B31E11 /* FlurryAnalytics.h in Headers */,
 				4CCF855914424E9F007F1043 /* FTFingerDrawingView.h in Headers */,
 				4CA29DE9144D7F13002F38BD /* FTBarButtonItem.h in Headers */,
 				4C01A662145770F200C1D01D /* FTPhotoHoldingView.h in Headers */,
@@ -3002,6 +2999,7 @@
 				93671A6F14FBC1D50000154D /* NSIndexPath+Tools.h in Headers */,
 				4C7F86211527A0BF003BB555 /* EEToolbarCenterButtonOverlay.h in Headers */,
 				4C7F86231527A0BF003BB555 /* UIToolbar+EEToolbarCenterButton.h in Headers */,
+				A098C6CA1642BFDE00CA53E3 /* Flurry.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/FTLibrary/FTProjectInitialization.m b/FTLibrary/FTProjectInitialization.m
@@ -7,7 +7,7 @@
 //
 
 #import "FTProjectInitialization.h"
-#import "FlurryAnalytics.h"
+#import "Flurry.h"
 #import "FTLang.h"
 
 
@@ -55,7 +55,7 @@ + (BOOL)isUsing:(FTProjectInitializationFunctionType)functionality {
 }
 
 + (void)enableFlurryWithApiKey:(NSString *)apiKey {
-	[FlurryAnalytics startSession:apiKey];
+	[Flurry startSession:apiKey];
 	[self setUsedFunctionality:FTProjectInitializationFunctionTypeTrackingFlurry];
 }
 

diff --git a/FTLibrary/FTTracking.h b/FTLibrary/FTTracking.h
@@ -7,8 +7,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "FlurryAnalytics.h"
-
 
 @interface FTTracking : NSObject
 

diff --git a/FTLibrary/FTTracking.m b/FTLibrary/FTTracking.m
@@ -9,14 +9,14 @@
 #import "FTTracking.h"
 #import "FTProjectInitialization.h"
 #import "FTError.h"
-
+#import "Flurry.h"
 
 @implementation FTTracking
 
 + (void)logEvent:(NSString *)event withParameters:(NSDictionary *)params {
 	BOOL ok = NO;
 	if ([FTProjectInitialization isUsing:FTProjectInitializationFunctionTypeTrackingFlurry]) {
-		[FlurryAnalytics logEvent:event withParameters:params];
+		[Flurry logEvent:event withParameters:params];
 		ok = YES;
 	}
 	if ([FTProjectInitialization isUsing:FTProjectInitializationFunctionTypeTrackingGoogle]) {
@@ -31,7 +31,7 @@ + (void)logEvent:(NSString *)event withParameters:(NSDictionary *)params {
 + (void)logEvent:(NSString *)event {
 	BOOL ok = NO;
 	if ([FTProjectInitialization isUsing:FTProjectInitializationFunctionTypeTrackingFlurry]) {
-		[FlurryAnalytics logEvent:event];
+		[Flurry logEvent:event];
 		ok = YES;
 	}
 	if ([FTProjectInitialization isUsing:FTProjectInitializationFunctionTypeTrackingGoogle]) {
@@ -47,11 +47,11 @@ + (void)logFacebookUserInfo:(NSDictionary *)info {
 	BOOL ok = NO;
 	if ([FTProjectInitialization isUsing:FTProjectInitializationFunctionTypeTrackingFlurry]) {
 		// Tracking user id
-		[FlurryAnalytics setUserID:[NSString stringWithFormat:@"fb-%@", [info objectForKey:@"id"]]];
+		[Flurry setUserID:[NSString stringWithFormat:@"fb-%@", [info objectForKey:@"id"]]];
 
 		// Tracking gender
 		NSString *g = [info objectForKey:@"gender"];
-		[FlurryAnalytics setGender:[g substringToIndex:1]];
+		[Flurry setGender:[g substringToIndex:1]];
 
 		// Tracking age
 		NSString *bd = [info objectForKey:@"birthday"];
@@ -60,7 +60,7 @@ + (void)logFacebookUserInfo:(NSDictionary *)info {
 		NSDate *bdDate = [df dateFromString:bd];
 		NSCalendar *defaultCal = [NSCalendar currentCalendar];
 		NSDateComponents *bdComponents = [defaultCal components:kCFCalendarUnitYear fromDate:bdDate toDate:[NSDate date] options:0];
-		[FlurryAnalytics setAge:bdComponents.year];
+		[Flurry setAge:bdComponents.year];
 
 		ok = YES;
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,8 +7,6 @@ @@
     //
     #import <Foundation/Foundation.h>
-    #import "FlurryAnalytics.h"
     @interface FTTracking : NSObject
@@ Expand Down @@