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 pull request #3314 from vector-im/riot_3239

Browse source 
Timeline: Hide encrypted history (pre-invite)
This commit is contained in:
SBiOSoftWhare 2020-06-05 09:31:03 +02:00 committed by GitHub
commit 6067db76b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.rst
View file

@ -5,6 +5,7 @@ Improvements:
* PushNotificationService: Move all notification related code to a new class (PR #3100).
* Cross-signing: Bootstrap cross-sign on registration (and login if applicable). This action is now invisible to the user (#3292).
* Authentication: Redirect the webview (SSO) javascript logs to iOS native logs.
* Timeline: Hide encrypted history (pre-invite) (#3239).
Bug fix:
* CallVC: Declined calls now properly reset call view controller, thanks to @Legi429 (#2877).

3
Riot/AppDelegate.m
View file

@ -1806,6 +1806,9 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
// Get modular widget events in rooms histories
[[MXKAppSettings standardAppSettings] addSupportedEventTypes:@[kWidgetMatrixEventTypeString, kWidgetModularEventTypeString]];
// Hide undecryptable messages that were sent while the user was not in the room
[MXKAppSettings standardAppSettings].hidePreJointUndecryptableEvents = YES;
// Enable long press on event in bubble cells
[MXKRoomBubbleTableViewCell disableLongPressGestureOnEvent:NO];

3
Riot/Modules/Settings/Security/SecurityViewController.m
View file

@ -423,7 +423,6 @@ UIDocumentInteractionControllerDelegate>
{
case MXCrossSigningStateNotBootstrapped: // Action: Bootstrap
case MXCrossSigningStateCanCrossSign: // Action: Reset
case MXCrossSigningStateCanCrossSignAsynchronously: // Action: Reset
numberOfRowsInCrossSigningSection = CROSSSIGNING_FIRST_ACTION + 1;
break;
case MXCrossSigningStateCrossSigningExists: // Actions: Verify this session, Reset
@ -452,7 +451,6 @@ UIDocumentInteractionControllerDelegate>
crossSigningInformation = [NSBundle mxk_localizedStringForKey:@"security_settings_crosssigning_info_trusted"];
break;
case MXCrossSigningStateCanCrossSign:
case MXCrossSigningStateCanCrossSignAsynchronously:
crossSigningInformation = [NSBundle mxk_localizedStringForKey:@"security_settings_crosssigning_info_ok"];
break;
}
@ -487,7 +485,6 @@ UIDocumentInteractionControllerDelegate>
[self setUpcrossSigningButtonCellForBootstrap:buttonCell];
break;
case MXCrossSigningStateCanCrossSign: // Action: Reset
case MXCrossSigningStateCanCrossSignAsynchronously: // Action: Reset
[self setUpcrossSigningButtonCellForReset:buttonCell];
break;
case MXCrossSigningStateCrossSigningExists: // Actions: Verify this session, Reset