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

Move push_presence_preference to Contacts settings

Browse source
This commit is contained in:
Benoit Martins 2023-05-16 16:56:22 +02:00
parent 0357a601d6
commit dbc93b7cf0
4 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Classes/LinphoneAppDelegate.m
View file

@ -64,7 +64,7 @@
- (void)applicationDidEnterBackground:(UIApplication *)application {
LOGI(@"%@", NSStringFromSelector(_cmd));
if([LinphoneManager.instance lpConfigBoolForKey:@"account_push_presence_preference"]){
linphone_core_set_consolidated_presence([LinphoneManager getLc], LinphoneConsolidatedPresenceBusy);
linphone_core_set_consolidated_presence([LinphoneManager getLc], LinphoneConsolidatedPresenceOffline);
}
if (linphone_core_get_global_state(LC) != LinphoneGlobalOff) {
[LinphoneManager.instance enterBackgroundMode];

23
Classes/LinphoneCoreSettingsStore.m
View file

@ -155,7 +155,6 @@
// default values
{
[self setBool:NO forKey:@"account_pushnotification_preference"];
[self setBool:YES forKey:@"account_push_presence_preference"];
[self setBool:NO forKey:@"account_bundle_mode_preference"];
[self setObject:@"" forKey:@"account_mandatory_username_preference"];
[self setObject:@"" forKey:@"account_mandatory_domain_preference"];
@ -187,9 +186,6 @@
BOOL pushEnabled = linphone_account_params_get_push_notification_allowed(accountParams);
[self setBool:pushEnabled forKey:@"account_pushnotification_preference"];
BOOL pushPresenceEnabled = linphone_account_params_get_publish_enabled(accountParams);
[self setBool:pushPresenceEnabled forKey:@"account_push_presence_preference"];
BOOL bundleModeEnabled = linphone_account_params_rtp_bundle_enabled(accountParams);
[self setBool:bundleModeEnabled forKey:@"account_bundle_mode_preference"];
@ -528,8 +524,11 @@
}
// contacts section
if (linphone_core_ldap_available(LC)) {
[self transformLdapToKeys:nil];
{
[self setInteger:[lm lpConfigIntForKey:@"account_push_presence_preference" withDefault:1] forKey:@"account_push_presence_preference"];
if (linphone_core_ldap_available(LC)) {
[self transformLdapToKeys:nil];
}
}
// advanced section
@ -622,7 +621,6 @@
if (username && [username length] > 0 && domain && [domain length] > 0) {
int expire = [self integerForKey:@"account_expire_preference"];
BOOL pushnotification = [self boolForKey:@"account_pushnotification_preference"];
BOOL publishPrensence = [self boolForKey:@"account_push_presence_preference"];
BOOL bundlemode = [self boolForKey:@"account_bundle_mode_preference"];
NSString *prefix = [self stringForKey:@"account_prefix_preference"];
BOOL use_prefix = [self boolForKey:@"apply_international_prefix_for_calls_and_chats"];
@ -707,9 +705,6 @@
linphone_account_params_set_push_notification_allowed(newAccountParams, pushnotification);
linphone_account_params_set_remote_push_notification_allowed(newAccountParams, pushnotification);
linphone_account_params_set_publish_enabled(newAccountParams, publishPrensence);
[LinphoneManager.instance lpConfigSetBool:publishPrensence forKey:@"account_push_presence_preference"];
linphone_account_params_set_register_enabled(newAccountParams, is_enabled);
linphone_account_params_set_avpf_mode(newAccountParams, use_avpf);
linphone_account_params_set_expires(newAccountParams, expire);
@ -1094,7 +1089,13 @@
}
// contacts section
BOOL push_presence = [self boolForKey:@"account_push_presence_preference"];
if (push_presence) {
linphone_core_set_consolidated_presence([LinphoneManager getLc], LinphoneConsolidatedPresenceOnline);
} else {
linphone_core_set_consolidated_presence([LinphoneManager getLc], LinphoneConsolidatedPresenceOffline);
}
[lm lpConfigSetInt:push_presence forKey:@"account_push_presence_preference"];
BOOL ldap_changed = NO;
for (NSString *key in self->changedDict) {

10
Settings/InAppSettings.bundle/Account.plist
View file

@ -44,16 +44,6 @@
<key>DefaultValue</key>
<false/>
</dict>
<dict>
<key>Title</key>
<string>Push Presence</string>
<key>Key</key>
<string>account_push_presence_preference</string>
<key>Type</key>
<string>PSToggleSwitchSpecifier</string>
<key>DefaultValue</key>
<true/>
</dict>
<dict>
<key>AutocapitalizationType</key>
<string>None</string>

10
Settings/InAppSettings.bundle/Contacts.plist
View file

@ -4,6 +4,16 @@
<dict>
<key>PreferenceSpecifiers</key>
<array>
<dict>
<key>Title</key>
<string>Push Presence</string>
<key>Key</key>
<string>account_push_presence_preference</string>
<key>Type</key>
<string>PSToggleSwitchSpecifier</string>
<key>DefaultValue</key>
<true/>
</dict>
<dict>
<key>Title</key>
<string>LDAP configs</string>