Minor changes of VFS_enabled_mode

This commit is contained in:
Benoit Martins 2022-12-05 16:45:21 +01:00 committed by QuentinArguillere
parent 5407a18b57
commit 952b27c94f
5 changed files with 34 additions and 26 deletions

View file

@ -445,7 +445,7 @@
[self setObject:maxSize==0 ? @"Always" : (maxSize==-1 ? @"Never" : @"Customize") forKey:@"auto_download_mode"];
[self setInteger:maxSize forKey:@"auto_download_incoming_files_max_size"];
[self setBool:[VFSUtil vfsEnabledWithGroupName:kLinphoneMsgNotificationAppGroupId] forKey:@"vfs_enabled_mode"];
[self setBool:[lm lpConfigBoolForKey:@"auto_write_to_gallery_preference" withDefault:YES] forKey:@"auto_write_to_gallery_mode"];
[self setBool:[lm lpConfigBoolForKey:@"auto_write_to_gallery_preference" withDefault:NO] forKey:@"auto_write_to_gallery_mode"];
}
// network section

View file

@ -544,19 +544,14 @@ void update_hash_cbs(LinphoneAccountCreator *creator, LinphoneAccountCreatorStat
[hiddenKeys addObject:@"auto_download_incoming_files_max_size"];
}
}else if ([@"vfs_enabled_mode" compare:notif.object] == NSOrderedSame) {
removeFromHiddenKeys = ![[notif.userInfo objectForKey:@"vfs_enabled_mode"] boolValue];
if(![LinphoneManager.instance lpConfigBoolForKey:@"auto_write_to_gallery_mode"]){
if(removeFromHiddenKeys){
[LinphoneManager.instance lpConfigSetBool:FALSE forKey:@"vfs_enabled_mode"];
[VFSUtil setVfsEnabbledWithEnabled:FALSE groupName:kLinphoneMsgNotificationAppGroupId];
if([LinphoneManager.instance lpConfigBoolForKey:@"auto_download_mode_is_never"]){
[keys addObject:@"auto_write_to_gallery_mode"];
}else{
[hiddenKeys addObject:@"auto_write_to_gallery_mode"];
}
}else{
[LinphoneManager.instance lpConfigSetBool:TRUE forKey:@"vfs_enabled_mode"];
[VFSUtil setVfsEnabbledWithEnabled:TRUE groupName:kLinphoneMsgNotificationAppGroupId];
removeFromHiddenKeys = [[notif.userInfo objectForKey:@"vfs_enabled_mode"] boolValue];
if(removeFromHiddenKeys){
[LinphoneManager.instance lpConfigSetBool:TRUE forKey:@"vfs_enabled_mode"];
[hiddenKeys addObject:@"auto_write_to_gallery_mode"];
[hiddenKeys addObject:@"vfs_enabled_mode"];
[keys addObject:@"vfs_enabled"];
}else{
if(![LinphoneManager.instance lpConfigBoolForKey:@"auto_download_mode_is_never"]){
[hiddenKeys addObject:@"auto_write_to_gallery_mode"];
}
}
@ -567,11 +562,9 @@ void update_hash_cbs(LinphoneAccountCreator *creator, LinphoneAccountCreatorStat
if(!removeFromHiddenKeys){
[LinphoneManager.instance lpConfigSetBool:TRUE forKey:@"auto_write_to_gallery_mode"];
[hiddenKeys addObject:@"auto_download_mode"];
[hiddenKeys addObject:@"vfs_enabled_mode"];
}else{
[LinphoneManager.instance lpConfigSetBool:FALSE forKey:@"auto_write_to_gallery_mode"];
[keys addObject:@"auto_download_mode"];
[keys addObject:@"vfs_enabled_mode"];
}
}
}
@ -826,6 +819,13 @@ void update_hash_cbs(LinphoneAccountCreator *creator, LinphoneAccountCreatorStat
if ([lm lpConfigBoolForKey:@"vfs_enabled_mode"]) {
[hiddenKeys addObject:@"auto_write_to_gallery_mode"];
[hiddenKeys addObject:@"vfs_enabled_mode"];
}else{
[hiddenKeys addObject:@"vfs_enabled"];
}
if ([lm lpConfigBoolForKey:@"auto_write_to_gallery_mode"]) {
[hiddenKeys addObject:@"auto_write_to_gallery_mode"];
}
return hiddenKeys;

View file

@ -116,6 +116,24 @@
<key>Type</key>
<string>PSToggleSwitchSpecifier</string>
</dict>
<dict>
<key>DefaultValue</key>
<false/>
<key>Key</key>
<string>vfs_enabled_mode</string>
<key>Title</key>
<string>Encrypt everything</string>
<key>Type</key>
<string>PSToggleSwitchSpecifier</string>
</dict>
<dict>
<key>DefaultValue</key>
<false/>
<key>Key</key>
<string>vfs_enabled</string>
<key>Title</key>
<string>File encryption is enabled</string>
</dict>
<dict>
<key>DefaultValue</key>
<true/>

View file

@ -30,16 +30,6 @@
<key>DefaultValue</key>
<false/>
<key>Key</key>
<string>vfs_enabled_mode</string>
<key>Title</key>
<string>Enable VFS</string>
<key>Type</key>
<string>PSToggleSwitchSpecifier</string>
</dict>
<dict>
<key>DefaultValue</key>
<true/>
<key>Key</key>
<string>auto_write_to_gallery_mode</string>
<key>Title</key>
<string>Auto write to gallery</string>