felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-05 07:27:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove lab setting for Jitsi calls

Browse Source
This commit is contained in:
ismailgulek
2021-04-06 17:25:37 +03:00
parent 1b164859cb
commit 5639a2bae6
4 changed files with 7 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Assets/Riot-Defaults.plist
-2
View File
@@ -20,8 +20,6 @@
<false/>
<key>syncLocalContacts</key>
<false/>
<key>createConferenceCallsWithJitsi</key>
<true/>
<key>enableRageShake</key>
<true/>
<key>maxAllowedMediaCacheSize</key>
Riot/Managers/Settings/RiotSettings.swift
-9
View File
@@ -27,7 +27,6 @@ final class RiotSettings: NSObject {
static let identityServerUrlString = "identityserverurl"
static let enableCrashReport = "enableCrashReport"
static let enableRageShake = "enableRageShake"
static let createConferenceCallsWithJitsi = "createConferenceCallsWithJitsi"
static let userInterfaceTheme = "userInterfaceTheme"
static let notificationsShowDecryptedContent = "showDecryptedContent"
static let pinRoomsWithMissedNotifications = "pinRoomsWithMissedNotif"
@@ -187,14 +186,6 @@ final class RiotSettings: NSObject {
// MARK: Labs
var createConferenceCallsWithJitsi: Bool {
get {
return defaults.bool(forKey: UserDefaultsKeys.createConferenceCallsWithJitsi)
} set {
defaults.set(newValue, forKey: UserDefaultsKeys.createConferenceCallsWithJitsi)
}
}
// MARK: Calls
/// Indicate if `allowStunServerFallback` settings has been set once.
Riot/Modules/Room/RoomViewController.m
+2 -3
View File
@@ -3616,9 +3616,8 @@ NSNotificationName const RoomViewControllerViewDidDisappearNotification = @"Room
[[AppDelegate theDelegate].callPresenter displayJitsiCallWithWidget:jitsiWidget];
}
// If enabled, create the conf using jitsi widget and open it directly
else if (RiotSettings.shared.createConferenceCallsWithJitsi
&& self.roomDataSource.room.summary.membersCount.joined > 2)
// Create the conf using jitsi widget and open it directly
else if (self.roomDataSource.room.summary.membersCount.joined > 2)
{
[self startActivityIndicator];
Riot/Modules/Settings/SettingsViewController.m
+5 -31
View File
@@ -140,11 +140,6 @@ enum
OTHER_REPORT_BUG_INDEX,
};
enum
{
LABS_USE_JITSI_WIDGET_INDEX = 0,
};
enum
{
SECURITY_BUTTON_INDEX = 0,
@@ -480,9 +475,11 @@ TableViewSectionsDelegate>
if (BuildSettings.settingsScreenShowLabSettings)
{
Section *sectionLabs = [Section sectionWithTag:SECTION_TAG_LABS];
[sectionLabs addRowWithTag:LABS_USE_JITSI_WIDGET_INDEX];
sectionLabs.headerTitle = NSLocalizedStringFromTable(@"settings_labs", @"Vector", nil);
[tmpSections addObject:sectionLabs];
if (sectionLabs.hasAnyRows)
{
[tmpSections addObject:sectionLabs];
}
}
if ([groupsDataSource numberOfSectionsInTableView:self.tableView] && groupsDataSource.joinedGroupsSection != -1)
@@ -2244,18 +2241,7 @@ TableViewSectionsDelegate>
}
else if (section == SECTION_TAG_LABS)
{
if (row == LABS_USE_JITSI_WIDGET_INDEX)
{
MXKTableViewCellWithLabelAndSwitch* labelAndSwitchCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath];
labelAndSwitchCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_labs_create_conference_with_jitsi", @"Vector", nil);
labelAndSwitchCell.mxkSwitch.on = RiotSettings.shared.createConferenceCallsWithJitsi;
labelAndSwitchCell.mxkSwitch.onTintColor = ThemeService.shared.theme.tintColor;
[labelAndSwitchCell.mxkSwitch addTarget:self action:@selector(toggleJitsiForConference:) forControlEvents:UIControlEventTouchUpInside];
cell = labelAndSwitchCell;
}
}
else if (section == SECTION_TAG_FLAIR)
{
@@ -2944,18 +2930,6 @@ TableViewSectionsDelegate>
}
}
- (void)toggleJitsiForConference:(id)sender
{
if (sender && [sender isKindOfClass:UISwitch.class])
{
UISwitch *switchButton = (UISwitch*)sender;
RiotSettings.shared.createConferenceCallsWithJitsi = switchButton.isOn;
[self.tableView reloadData];
}
}
- (void)togglePinRoomsWithMissedNotif:(id)sender
{
UISwitch *switchButton = (UISwitch*)sender;