Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 23:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into release/1.8.19/release

Browse source
This commit is contained in:
ismailgulek 2022-06-14 16:27:23 +03:00
commit 2b12058366
No known key found for this signature in database
GPG key ID: E96336D42D9470A9
6 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Riot/Modules/Settings/SettingsViewController.m
View file

@ -166,7 +166,6 @@ typedef NS_ENUM(NSUInteger, LABS_ENABLE)
{
LABS_ENABLE_RINGING_FOR_GROUP_CALLS_INDEX = 0,
LABS_ENABLE_THREADS_INDEX,
LABS_ENABLE_MESSAGE_BUBBLES_INDEX,
LABS_ENABLE_AUTO_REPORT_DECRYPTION_ERRORS,
LABS_USE_ONLY_LATEST_USER_AVATAR_AND_NAME_INDEX,
LABS_ENABLE_LIVE_LOCATION_SHARING
@ -515,9 +514,7 @@ ChangePasswordCoordinatorBridgePresenterDelegate>
if (BuildSettings.roomScreenAllowTimelineStyleConfiguration)
{
// NOTE: Message bubbles are under labs section atm
// [sectionUserInterface addRowWithTag:USER_INTERFACE_TIMELINE_STYLE_INDEX];
[sectionUserInterface addRowWithTag:USER_INTERFACE_TIMELINE_STYLE_INDEX];
}
[sectionUserInterface addRowWithTag:USER_INTERFACE_SHOW_REDACTIONS_IN_ROOM_HISTORY];
@ -587,7 +584,6 @@ ChangePasswordCoordinatorBridgePresenterDelegate>
Section *sectionLabs = [Section sectionWithTag:SECTION_TAG_LABS];
[sectionLabs addRowWithTag:LABS_ENABLE_RINGING_FOR_GROUP_CALLS_INDEX];
[sectionLabs addRowWithTag:LABS_ENABLE_THREADS_INDEX];
[sectionLabs addRowWithTag:LABS_ENABLE_MESSAGE_BUBBLES_INDEX];
[sectionLabs addRowWithTag:LABS_ENABLE_AUTO_REPORT_DECRYPTION_ERRORS];
[sectionLabs addRowWithTag:LABS_USE_ONLY_LATEST_USER_AVATAR_AND_NAME_INDEX];
if (BuildSettings.liveLocationSharingEnabled)
@ -2527,10 +2523,6 @@ ChangePasswordCoordinatorBridgePresenterDelegate>
cell = labelAndSwitchCell;
}
else if (row == LABS_ENABLE_MESSAGE_BUBBLES_INDEX)
{
cell = [self buildMessageBubblesCellForTableView:tableView atIndexPath:indexPath];
}
else if (row == LABS_ENABLE_AUTO_REPORT_DECRYPTION_ERRORS)
{
cell = [self buildAutoReportDecryptionErrorsCellForTableView:tableView atIndexPath:indexPath];

5
Riot/Utils/EventFormatter.m
View file

@ -139,6 +139,11 @@ static NSString *const kEventFormatterTimeFormat = @"HH:mm";
{
if (event.isRedactedEvent)
{
if (event.eventType == MXEventTypeReaction)
{
// do not show redacted reactions in the timeline
return nil;
}
// Check whether the event is a thread root or redacted information is required
if ((RiotSettings.shared.enableThreads && [mxSession.threadingService isEventThreadRoot:event])
|| self.settings.showRedactionsInRoomHistory)

2
Riot/Utils/UniversalLink.m
View file

@ -46,7 +46,7 @@
NSArray<NSString*> *fragments = [_url.fragment componentsSeparatedByString:@"?"];
// Extract path params
pathParams = [fragments[0] componentsSeparatedByString:@"/"];
pathParams = [[fragments[0] stringByRemovingPercentEncoding] componentsSeparatedByString:@"/"];
// Remove the first empty path param string
pathParams = [pathParams filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"length > 0"]];

1
changelog.d/6207.bugfix Normal file
View file

@ -0,0 +1 @@
Universal Link: Url decode url fragment before splitting up.

1
changelog.d/6293.bugfix Normal file
View file

@ -0,0 +1 @@
Room: Do not show redacted reactions in the timeline.

1
changelog.d/pr-6285.change Normal file
View file

@ -0,0 +1 @@
De-labs message bubbles