Commit c90658d1 authored by Christophe Deschamps's avatar Christophe Deschamps
Browse files

Merge branch 'master' of gitlab.linphone.org:BC/public/linphone-iphone

parents 1390768f d42c8d00
Pipeline #30294 passed with stage
in 5 minutes and 5 seconds
......@@ -240,6 +240,11 @@ static UICompositeViewDescription *compositeDescription = nil;
completion:nil];
}
[self configureForRoom:self.editing];
// Resize the popup table depending on wether ephemeral messages are enabled or not.
CGRect popupFrame = _popupMenu.frame;
popupFrame.size.height = 44 * [_popupMenu numberOfRowsInSection:0];
_popupMenu.frame = popupFrame;
}
......@@ -1573,6 +1578,8 @@ void on_chat_room_conference_alert(LinphoneChatRoom *cr, const LinphoneEventLog
_popupMenu.layer.shadowRadius = 10;
_popupMenu.layer.masksToBounds = false;
_toggleMenuButton.hidden = false;
_popupMenu.tableFooterView = [UIView new];
[_popupMenu reloadData];
}
-(void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
......
......@@ -344,6 +344,7 @@
[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:@"ephemeral_feature" withDefault:NO] forKey:@"ephemeral_feature"];
}
// network section
......@@ -806,6 +807,7 @@
}
}
[lm lpConfigSetBool:[self boolForKey:@"auto_write_to_gallery_mode"] forKey:@"auto_write_to_gallery_preference"];
[lm lpConfigSetBool:[self boolForKey:@"ephemeral_feature"] forKey:@"ephemeral_feature"];
// network section
BOOL edgeOpt = [self boolForKey:@"edge_opt_preference"];
......
......@@ -60,6 +60,16 @@
<key>IASKTextAlignment</key>
<string>IASKUITextAlignmentRight</string>
</dict>
<dict>
<key>DefaultValue</key>
<false/>
<key>Key</key>
<string>ephemeral_feature</string>
<key>Title</key>
<string>Enable ephemeral messages (beta)</string>
<key>Type</key>
<string>PSToggleSwitchSpecifier</string>
</dict>
<dict>
<key>Type</key>
<string>PSGroupSpecifier</string>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment