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

[alohalytics][ios] Better check for valid background task.

Browse source
This commit is contained in:
Alex Zolotarev 2015-06-23 15:39:00 +03:00
parent 6d22e4c6ae
commit 774d6a833c
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
3party/Alohalytics/src/apple/alohalytics_objc.mm
View file

@ -276,8 +276,10 @@ static alohalytics::TStringMap ParseLaunchOptions(NSDictionary * options) {
// Need it to effectively upload data when app goes into background.
static UIBackgroundTaskIdentifier sBackgroundTaskId = UIBackgroundTaskInvalid;
static void EndBackgroundTask() {
[[UIApplication sharedApplication] endBackgroundTask:sBackgroundTaskId];
sBackgroundTaskId = UIBackgroundTaskInvalid;
if (sBackgroundTaskId != UIBackgroundTaskInvalid) {
[[UIApplication sharedApplication] endBackgroundTask:sBackgroundTaskId];
sBackgroundTaskId = UIBackgroundTaskInvalid;
}
}
static void OnUploadFinished(alohalytics::ProcessingResult result) {
if (Stats::Instance().DebugMode()) {
@ -289,9 +291,7 @@ static void OnUploadFinished(alohalytics::ProcessingResult result) {
}
ALOG(str);
}
if (sBackgroundTaskId != UIBackgroundTaskInvalid) {
EndBackgroundTask();
}
EndBackgroundTask();
}
// Quick check if device has any active connection.
@ -453,9 +453,7 @@ bool IsConnectionActive() {
+ (void)applicationWillEnterForeground:(NSNotificationCenter *)notification {
Stats::Instance().LogEvent("$applicationWillEnterForeground");
if (sBackgroundTaskId != UIBackgroundTaskInvalid) {
EndBackgroundTask();
}
EndBackgroundTask();
}
+ (void)applicationDidEnterBackground:(NSNotification *)notification {