diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index a36723a73e..1be48202b0 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -37,6 +37,8 @@ ED46533B1785E5DD0063856F /* placemark-yellow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = ED4653371785E5D10063856F /* placemark-yellow@2x.png */; }; ED48BBB117BE6EA8003E7E92 /* MWMApi.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED48BBB017BE6EA8003E7E92 /* MWMApi.mm */; }; ED48BBB217BE6EA8003E7E92 /* MWMApi.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED48BBB017BE6EA8003E7E92 /* MWMApi.mm */; }; + ED48BBC617C3C0F9003E7E92 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED48BBC517C3C0F9003E7E92 /* Security.framework */; }; + ED48BBC717C3C105003E7E92 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED48BBC517C3C0F9003E7E92 /* Security.framework */; }; ED8676FE16A0793800D9A02A /* 22x29-pro.png in Resources */ = {isa = PBXBuildFile; fileRef = ED8676FA16A0793800D9A02A /* 22x29-pro.png */; }; ED8676FF16A0793800D9A02A /* 44x58-pro.png in Resources */ = {isa = PBXBuildFile; fileRef = ED8676FB16A0793800D9A02A /* 44x58-pro.png */; }; ED86770016A0793800D9A02A /* 64-pro.png in Resources */ = {isa = PBXBuildFile; fileRef = ED8676FC16A0793800D9A02A /* 64-pro.png */; }; @@ -1400,6 +1402,7 @@ ED4653371785E5D10063856F /* placemark-yellow@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "placemark-yellow@2x.png"; sourceTree = ""; }; ED48BBAF17BE6EA8003E7E92 /* MWMApi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMApi.h; sourceTree = ""; }; ED48BBB017BE6EA8003E7E92 /* MWMApi.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMApi.mm; sourceTree = ""; }; + ED48BBC517C3C0F9003E7E92 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; ED8676FA16A0793800D9A02A /* 22x29-pro.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "22x29-pro.png"; sourceTree = ""; }; ED8676FB16A0793800D9A02A /* 44x58-pro.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "44x58-pro.png"; sourceTree = ""; }; ED8676FC16A0793800D9A02A /* 64-pro.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "64-pro.png"; sourceTree = ""; }; @@ -2128,6 +2131,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + ED48BBC617C3C0F9003E7E92 /* Security.framework in Frameworks */, EDBB18B816972B0600AF0742 /* libzlib.a in Frameworks */, ED8B1A2116772AB4003CAD0A /* MessageUI.framework in Frameworks */, EEFC0BBF12B5656A002914FF /* libfreetype.a in Frameworks */, @@ -2163,6 +2167,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + ED48BBC717C3C105003E7E92 /* Security.framework in Frameworks */, FAFCF64F169C9E8100BD77D2 /* MessageUI.framework in Frameworks */, EDBB18B916972B3000AF0742 /* libzlib.a in Frameworks */, FAFB08FB151215EE0041901D /* libfreetype.a in Frameworks */, @@ -2244,6 +2249,7 @@ 29B97314FDCFA39411CA2CEA /* Maps */ = { isa = PBXGroup; children = ( + ED48BBC517C3C0F9003E7E92 /* Security.framework */, CB252D6816FF82C8001E41E9 /* Statistics */, FA36B8011540388B004560CC /* Bookmarks */, FA34BEC71338D6DB00FFB2A7 /* Common */, diff --git a/iphone/Maps/Statistics/Flurry.h b/iphone/Maps/Statistics/Flurry.h index 66bfb3f737..171fa649be 100755 --- a/iphone/Maps/Statistics/Flurry.h +++ b/iphone/Maps/Statistics/Flurry.h @@ -31,8 +31,8 @@ */ typedef enum { FlurryLogLevelNone = 0, //No output - FlurryLogLevelCriticalOnly, //Default, outputs only critical log events - FlurryLogLevelDebug, //Debug level, outputs critical and main log events + FlurryLogLevelCriticalOnly, //Default, outputs only crytical log events + FlurryLogLevelDebug, //Debug level, outputs crytical and main log events FlurryLogLevelAll //Highest level, outputs all log events } FlurryLogLevel; @@ -102,7 +102,7 @@ typedef enum { * @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 * @@ -118,7 +118,7 @@ typedef enum { * @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 FlurryLogLevelCriticalOnly. + * 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. * @@ -229,7 +229,7 @@ typedef enum { * * @param apiKey The API key for this project. * @param options passed launchOptions from the applicatin's didFinishLaunchingWithOptions:(NSDictionary *)launchOptions - + */ + (void) startSession:(NSString *)apiKey withOptions:(id)options; @@ -620,7 +620,7 @@ typedef enum { * * 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. @@ -654,7 +654,7 @@ typedef enum { * @endcode * * After starting the location manager, you can set the location with Flurry. You can implement - * CLLocationManagerDelegate to be aware of when the location is updated. Below is an example + * CLLocationManagerDelegate to be aware of when the location is updated. Below is an example * of how to use this method, after you have recieved a location update from the locationManager. * * @code diff --git a/iphone/Maps/Statistics/libFlurry.a b/iphone/Maps/Statistics/libFlurry.a index 55d4148c5a..3774262742 100755 Binary files a/iphone/Maps/Statistics/libFlurry.a and b/iphone/Maps/Statistics/libFlurry.a differ