From 814c8bee2c3504ad982df999546aa216a67bebf8 Mon Sep 17 00:00:00 2001 From: Benjamin Reis Date: Wed, 10 May 2017 16:54:41 +0200 Subject: [PATCH] merge 3.16.x into master --- .gitmodules | 1 + Classes/LinphoneAppDelegate.m | 2 +- Classes/LinphoneUI/UIAvatarPresence.m | 5 +++-- linphone-Info.plist | 2 +- submodules/cmake-builder | 2 +- submodules/linphone | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index 1702fc8f8..d3b85a979 100644 --- a/.gitmodules +++ b/.gitmodules @@ -111,3 +111,4 @@ [submodule "submodules/ortp"] path = submodules/ortp url = git://git.linphone.org/ortp.git + diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m index 4fb3d38a5..03265eebc 100644 --- a/Classes/LinphoneAppDelegate.m +++ b/Classes/LinphoneAppDelegate.m @@ -306,7 +306,7 @@ [LinphoneManager.instance setProviderDelegate:self.del]; } - if (state == UIApplicationStateBackground) { + if (state != UIApplicationStateActive) { // we've been woken up directly to background; if (!start_at_boot || !background_mode) { // autoboot disabled or no background, and no push: do nothing and wait for a real launch diff --git a/Classes/LinphoneUI/UIAvatarPresence.m b/Classes/LinphoneUI/UIAvatarPresence.m index 2074bbde6..dc626f94f 100644 --- a/Classes/LinphoneUI/UIAvatarPresence.m +++ b/Classes/LinphoneUI/UIAvatarPresence.m @@ -57,10 +57,11 @@ INIT_WITH_COMMON_CF { _friend ? linphone_presence_model_get_basic_status(linphone_friend_get_presence_model(_friend)) : LinphonePresenceBasicStatusClosed; const LinphonePresenceModel *model = _friend ? linphone_friend_get_presence_model(_friend) : NULL; - LinphonePresenceActivity *activity = model ? linphone_presence_model_get_activity(model):NULL; + LinphonePresenceActivity *activity = model ? linphone_presence_model_get_activity(model) : NULL; LOGE(@"Friend %s status is now %s/%s since %@", _friend ? linphone_friend_get_name(_friend) : "NULL", - basic == LinphonePresenceBasicStatusOpen ? "open" : "closed", activity? linphone_presence_activity_to_string(activity):"Unknown", + basic == LinphonePresenceBasicStatusOpen ? "open" : "closed", + activity ? linphone_presence_activity_to_string(activity) : "Unknown", [NSDate dateWithTimeIntervalSince1970:linphone_presence_model_get_timestamp(model)]); NSString *imageName; diff --git a/linphone-Info.plist b/linphone-Info.plist index 6d7f9c68c..e9132b7e5 100644 --- a/linphone-Info.plist +++ b/linphone-Info.plist @@ -53,7 +53,7 @@ CFBundleVersion - 1 + 3 ITSAppUsesNonExemptEncryption ITSEncryptionExportComplianceCode diff --git a/submodules/cmake-builder b/submodules/cmake-builder index 320aaf247..f4f42b62a 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 320aaf24736e099a2a779da63746426cc6913849 +Subproject commit f4f42b62af68963d1652b752cfdae942d4c39c39 diff --git a/submodules/linphone b/submodules/linphone index ca33437b3..bb29521ab 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit ca33437b36f50072dff825dfc79e054b87dc3feb +Subproject commit bb29521ab0f778db37a9297577df533c73a556bf