mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 11:08:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge 3.16.x into master

Browse source
This commit is contained in:
Benjamin Reis 2017-05-10 16:54:41 +02:00
parent f5cc2ec5ef
commit 814c8bee2c
6 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitmodules vendored
View file

@ -111,3 +111,4 @@
[submodule "submodules/ortp"]
path = submodules/ortp
url = git://git.linphone.org/ortp.git

2
Classes/LinphoneAppDelegate.m
View file

@ -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

5
Classes/LinphoneUI/UIAvatarPresence.m
View file

@ -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;

2
linphone-Info.plist
View file

@ -53,7 +53,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1</string>
<string>3</string>
<key>ITSAppUsesNonExemptEncryption</key>
<true/>
<key>ITSEncryptionExportComplianceCode</key>

2
submodules/cmake-builder

@ -1 +1 @@
Subproject commit 320aaf24736e099a2a779da63746426cc6913849
Subproject commit f4f42b62af68963d1652b752cfdae942d4c39c39

2
submodules/linphone

@ -1 +1 @@
Subproject commit ca33437b36f50072dff825dfc79e054b87dc3feb
Subproject commit bb29521ab0f778db37a9297577df533c73a556bf