witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

[imdm] fix markAsRead method and prepare for beta v.

Browse source
This commit is contained in:
Brieuc Viel 2017-04-12 13:54:16 +02:00
parent 6a19baec92
commit 90aeeb4352
5 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Classes/Contact.m
View file

@ -197,8 +197,8 @@
if (_person) {
normSip = [self setOrCreateSipContactEntry:index withValue:sip];
NSDictionary *lDict = @{
(NSString *)kABPersonInstantMessageUsernameKey : normSip ? normSip : sip,
(NSString *)kABPersonInstantMessageServiceKey : LinphoneManager.instance.contactSipField
(NSString *) kABPersonInstantMessageUsernameKey : normSip ? normSip : sip, (NSString *)
kABPersonInstantMessageServiceKey : LinphoneManager.instance.contactSipField
};
ret = [self replaceInProperty:kABPersonInstantMessageProperty value:(__bridge CFTypeRef)(lDict) atIndex:index];
@ -358,8 +358,8 @@
CFErrorRef error = NULL;
NSDictionary *lDict = @{
(NSString *)kABPersonInstantMessageUsernameKey : value,
(NSString *)kABPersonInstantMessageServiceKey : [LinphoneManager instance].contactSipField
(NSString *) kABPersonInstantMessageUsernameKey : value, (NSString *)
kABPersonInstantMessageServiceKey : [LinphoneManager instance].contactSipField
};
if (![self replaceInProperty:kABPersonInstantMessageProperty value:(__bridge CFTypeRef)(lDict) atIndex:index]) {

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;

4
Classes/LinphoneUI/UIChatBubbleTextCell.m
View file

@ -150,8 +150,8 @@
[_messageText setAccessibilityLabel:@"Outgoing message"];
} else {
[_messageText setAccessibilityLabel:@"Incoming message"];
if (!([UIApplication sharedApplication].applicationState != UIApplicationStateBackground ||
[UIApplication sharedApplication].applicationState != UIApplicationStateInactive)) {
if (!([UIApplication sharedApplication].applicationState == UIApplicationStateBackground ||
[UIApplication sharedApplication].applicationState == UIApplicationStateInactive)) {
VIEW(ChatConversationView).markAsRead;
}
}

2
submodules/cmake-builder

@ -1 +1 @@
Subproject commit bc6df3cfa2c2f8cc54fb225735374c246b68721b
Subproject commit adfd9bf2811f94337364642d2115c93c8ef5d05f

2
submodules/linphone

@ -1 +1 @@
Subproject commit 0ea7e7cf0eb3b1ac9e1462a1126f8b1543f02ea3
Subproject commit 332351d294fd94acf78e947bae91bd7d7d143132