Enable URL Previews by default and remove from Labs.

element-hq · Sep 16, 2021 · 96ef61a · 96ef61a
1 parent e1d5a33
commit 96ef61a
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 29 deletions.
diff --git a/Riot/Assets/en.lproj/Vector.strings b/Riot/Assets/en.lproj/Vector.strings
@@ -451,6 +451,7 @@ Tap the + to start adding people.";
 
 "settings_user_settings" = "USER SETTINGS";
 "settings_sending_media" = "SENDING IMAGES AND VIDEOS";
+"settings_links" = "LINKS";
 "settings_notifications" = "NOTIFICATIONS";
 "settings_calls_settings" = "CALLS";
 "settings_discovery_settings" = "DISCOVERY";

diff --git a/Riot/Generated/Strings.swift b/Riot/Generated/Strings.swift
@@ -4426,6 +4426,10 @@ internal enum VectorL10n {
  internal static var settingsLabsVoiceMessages: String { 
  return VectorL10n.tr("Vector", "settings_labs_voice_messages") 
  }
+ /// LINKS
+ internal static var settingsLinks: String { 
+ return VectorL10n.tr("Vector", "settings_links") 
+ }
  /// Mark all messages as read
  internal static var settingsMarkAllAsRead: String { 
  return VectorL10n.tr("Vector", "settings_mark_all_as_read") 

diff --git a/Riot/Managers/Settings/RiotSettings.swift b/Riot/Managers/Settings/RiotSettings.swift
@@ -160,8 +160,7 @@ final class RiotSettings: NSObject {
  @UserDefault(key: "roomScreenAllowFilesAction", defaultValue: BuildSettings.roomScreenAllowFilesAction, storage: defaults)
  var roomScreenAllowFilesAction
 
- // labs prefix added to the key can be dropped when default value becomes true
- @UserDefault(key: "labsRoomScreenShowsURLPreviews", defaultValue: false, storage: defaults)
+ @UserDefault(key: "roomScreenShowsURLPreviews", defaultValue: true, storage: defaults)
  var roomScreenShowsURLPreviews
 
  // MARK: - Room Contextual Menu

diff --git a/Riot/Modules/Settings/SettingsViewController.m b/Riot/Modules/Settings/SettingsViewController.m
@@ -52,6 +52,7 @@
  SECTION_TAG_SIGN_OUT = 0,
  SECTION_TAG_USER_SETTINGS,
  SECTION_TAG_SENDING_MEDIA,
+ SECTION_TAG_LINKS,
  SECTION_TAG_SECURITY,
  SECTION_TAG_NOTIFICATIONS,
  SECTION_TAG_CALLS,
@@ -93,6 +94,12 @@
  SENDING_MEDIA_CONFIRM_SIZE_DESCRIPTION,
 };
 
+enum
+{
+ LINKS_SHOW_URL_PREVIEWS_INDEX = 0,
+ LINKS_SHOW_URL_PREVIEWS_DESCRIPTION_INDEX
+};
+
 enum
 {
  NOTIFICATION_SETTINGS_ENABLE_PUSH_INDEX = 0,
@@ -153,9 +160,7 @@
 
 enum
 {
- LABS_ENABLE_RINGING_FOR_GROUP_CALLS_INDEX = 0,
- LABS_SHOW_URL_PREVIEWS_INDEX,
- LABS_SHOW_URL_PREVIEWS_DESCRIPTION_INDEX
+ LABS_ENABLE_RINGING_FOR_GROUP_CALLS_INDEX = 0
 };
 
 enum
@@ -372,6 +377,12 @@ - (void)updateSections
  [tmpSections addObject:sectionMedia];
  }
 
+ Section *sectionLinks = [Section sectionWithTag:SECTION_TAG_LINKS];
+ [sectionLinks addRowWithTag:LINKS_SHOW_URL_PREVIEWS_INDEX];
+ [sectionLinks addRowWithTag:LINKS_SHOW_URL_PREVIEWS_DESCRIPTION_INDEX];
+ sectionLinks.headerTitle = NSLocalizedStringFromTable(@"settings_links", @"Vector", nil);
+ [tmpSections addObject:sectionLinks];
+
  Section *sectionSecurity = [Section sectionWithTag:SECTION_TAG_SECURITY];
  [sectionSecurity addRowWithTag:SECURITY_BUTTON_INDEX];
  sectionSecurity.headerTitle = NSLocalizedStringFromTable(@"settings_security", @"Vector", nil);
@@ -532,8 +543,6 @@ - (void)updateSections
  {
  Section *sectionLabs = [Section sectionWithTag:SECTION_TAG_LABS];
  [sectionLabs addRowWithTag:LABS_ENABLE_RINGING_FOR_GROUP_CALLS_INDEX];
- [sectionLabs addRowWithTag:LABS_SHOW_URL_PREVIEWS_INDEX];
- [sectionLabs addRowWithTag:LABS_SHOW_URL_PREVIEWS_DESCRIPTION_INDEX];
  sectionLabs.headerTitle = NSLocalizedStringFromTable(@"settings_labs", @"Vector", nil);
  if (sectionLabs.hasAnyRows)
  {
@@ -1871,6 +1880,31 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
  cell = infoCell;
  }
  }
+ else if (section == SECTION_TAG_LINKS)
+ {
+ if (row == LINKS_SHOW_URL_PREVIEWS_INDEX)
+ {
+ MXKTableViewCellWithLabelAndSwitch *labelAndSwitchCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath];
+
+ labelAndSwitchCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_show_url_previews", @"Vector", nil);
+ labelAndSwitchCell.mxkSwitch.on = RiotSettings.shared.roomScreenShowsURLPreviews;
+ labelAndSwitchCell.mxkSwitch.onTintColor = ThemeService.shared.theme.tintColor;
+ labelAndSwitchCell.mxkSwitch.enabled = YES;
+
+ [labelAndSwitchCell.mxkSwitch addTarget:self action:@selector(toggleEnableURLPreviews:) forControlEvents:UIControlEventValueChanged];
+
+ cell = labelAndSwitchCell;
+ }
+ else if (row == LINKS_SHOW_URL_PREVIEWS_DESCRIPTION_INDEX)
+ {
+ MXKTableViewCell *descriptionCell = [self getDefaultTableViewCell:tableView];
+ descriptionCell.textLabel.text = NSLocalizedStringFromTable(@"settings_show_url_previews_description", @"Vector", nil);
+ descriptionCell.textLabel.numberOfLines = 0;
+ descriptionCell.selectionStyle = UITableViewCellSelectionStyleNone;
+
+ cell = descriptionCell;
+ }
+ }
  else if (section == SECTION_TAG_NOTIFICATIONS)
  {
  if (row == NOTIFICATION_SETTINGS_ENABLE_PUSH_INDEX)
@@ -2396,28 +2430,6 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 
  cell = labelAndSwitchCell;
  }
- else if (row == LABS_SHOW_URL_PREVIEWS_INDEX)
- {
- MXKTableViewCellWithLabelAndSwitch *labelAndSwitchCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath];
-
- labelAndSwitchCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_show_url_previews", @"Vector", nil);
- labelAndSwitchCell.mxkSwitch.on = RiotSettings.shared.roomScreenShowsURLPreviews;
- labelAndSwitchCell.mxkSwitch.onTintColor = ThemeService.shared.theme.tintColor;
- labelAndSwitchCell.mxkSwitch.enabled = YES;
-
- [labelAndSwitchCell.mxkSwitch addTarget:self action:@selector(toggleEnableURLPreviews:) forControlEvents:UIControlEventValueChanged];
-
- cell = labelAndSwitchCell;
- }
- else if (row == LABS_SHOW_URL_PREVIEWS_DESCRIPTION_INDEX)
- {
- MXKTableViewCell *descriptionCell = [self getDefaultTableViewCell:tableView];
- descriptionCell.textLabel.text = NSLocalizedStringFromTable(@"settings_show_url_previews_description", @"Vector", nil);
- descriptionCell.textLabel.numberOfLines = 0;
- descriptionCell.selectionStyle = UITableViewCellSelectionStyleNone;
-
- cell = descriptionCell;
- }
  }
  else if (section == SECTION_TAG_FLAIR)
  {

diff --git a/changelog.d/4828.change b/changelog.d/4828.change
@@ -0,0 +1 @@
+URL Previews: Enable by default and remove from labs.