Rebase/element ios 1.11.1 #869
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Refactor encryption trust level
Deprecate MXLegacyCrypto
…n_icon Fix: Calculation of the frame for a component of a bubble
… suggestion module
…ds_suggestion_list Slash commands suggestion list
…on_emoji Disable accessibility for emojis during verification
…pectCollectionView`
Various bug fixes
…ation_for_oidc Hide deactivate account if the auth property is present on the WK.
…ing_to_3pid_changes Hide Add Email UI according to the 3 pid changes capability
…t_cell_for_oidc Manage account through MAS if available
Open MAS Web page when logging out from other sessions on OIDC authenticated homeservers
…out_confirmation_dialogues Sign out through MAS redirect confirmation alerts
yostyle
reviewed
Sep 12, 2023
Comment on lines
2593
to
2611
| UIWindow *window = [[UIApplication sharedApplication] keyWindow]; | ||
|
|
||
| if (!launchAnimationContainerView && window) | ||
| { | ||
| MXLogDebug(@"[AppDelegate] showLaunchAnimation"); | ||
|
|
||
| MXSession *mainSession = self.mxSessions.firstObject; | ||
| LaunchLoadingView *launchLoadingView = [LaunchLoadingView instantiateWithStartupProgress:mainSession.startupProgress]; | ||
|
|
||
| launchLoadingView.frame = window.bounds; | ||
| [launchLoadingView updateWithTheme:ThemeService.shared.theme]; | ||
| launchLoadingView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; | ||
|
|
||
| [window addSubview:launchLoadingView]; | ||
|
|
||
| launchAnimationContainerView = launchLoadingView; | ||
|
|
||
| [MXSDKOptions.sharedInstance.profiler startMeasuringTaskWithName:MXTaskProfileNameStartupLaunchScreen]; | ||
| } |
There was a problem hiding this comment.
on peut récupérer la mise à jour du code et le commenter
There was a problem hiding this comment.
Je ne pense pas. On n'a pas d'animation de lancement dans Tchap.
Comment on lines
5294
to
5353
| - (void)roomInputToolbarView:(MXKRoomInputToolbarView *)toolbarView sendCommand:(NSString *)commandText | ||
| { | ||
| // Create before sending the message in case of a discussion (direct chat) | ||
| MXWeakify(self); | ||
| [self createDiscussionIfNeeded:^(BOOL readyToSend) { | ||
| MXStrongifyAndReturnIfNil(self); | ||
|
|
||
| if (readyToSend) { | ||
| if (![self sendAsIRCStyleCommandIfPossible:commandText]) | ||
| { | ||
| // Display an error for unknown command | ||
| UIAlertController *alert = [UIAlertController alertControllerWithTitle:nil | ||
| message:[VectorL10n roomCommandErrorUnknownCommand] | ||
| preferredStyle:UIAlertControllerStyleAlert]; | ||
| [alert addAction:[UIAlertAction actionWithTitle:[VectorL10n ok] style:UIAlertActionStyleDefault handler:nil]]; | ||
| [self presentViewController:alert animated:YES completion:nil]; | ||
| } | ||
| } | ||
| }]; | ||
| } | ||
|
|
||
| - (void)roomInputToolbarViewShowSendMediaActions:(MXKRoomInputToolbarView *)toolbarView | ||
| { | ||
| NSMutableArray *actionItems = [NSMutableArray new]; | ||
| if (RiotSettings.shared.roomScreenAllowMediaLibraryAction) | ||
| { | ||
| [actionItems addObject:@(ComposerCreateActionPhotoLibrary)]; | ||
| } | ||
| if (RiotSettings.shared.roomScreenAllowStickerAction && !self.isNewDirectChat) | ||
| { | ||
| [actionItems addObject:@(ComposerCreateActionStickers)]; | ||
| } | ||
| if (RiotSettings.shared.roomScreenAllowFilesAction) | ||
| { | ||
| [actionItems addObject:@(ComposerCreateActionAttachments)]; | ||
| } | ||
| if (RiotSettings.shared.enableVoiceBroadcast && !self.isNewDirectChat) | ||
| { | ||
| [actionItems addObject:@(ComposerCreateActionVoiceBroadcast)]; | ||
| } | ||
| if (BuildSettings.pollsEnabled && self.displayConfiguration.sendingPollsEnabled && !self.isNewDirectChat) | ||
| { | ||
| [actionItems addObject:@(ComposerCreateActionPolls)]; | ||
| } | ||
| if (BuildSettings.locationSharingEnabled && !self.isNewDirectChat) | ||
| { | ||
| [actionItems addObject:@(ComposerCreateActionLocation)]; | ||
| } | ||
| if (RiotSettings.shared.roomScreenAllowCameraAction) | ||
| { | ||
| [actionItems addObject:@(ComposerCreateActionCamera)]; | ||
| } | ||
|
|
||
| self.composerCreateActionListBridgePresenter = [[ComposerCreateActionListBridgePresenter alloc] initWithActions:actionItems | ||
| wysiwygEnabled:RiotSettings.shared.enableWysiwygComposer | ||
| textFormattingEnabled:RiotSettings.shared.enableWysiwygTextFormatting]; | ||
| self.composerCreateActionListBridgePresenter.delegate = self; | ||
| [self.composerCreateActionListBridgePresenter presentFrom:self animated:YES]; | ||
| } | ||
| >>>>>>> v1.11.1 |
There was a problem hiding this comment.
On peut reprendre le code et le commenter
There was a problem hiding this comment.
Le code est présent et commenté.
Comment on lines
3159
to
3166
| else if (section == SECTION_TAG_ACCOUNT) | ||
| { | ||
| switch(row) { | ||
| case ACCOUNT_MANAGE_INDEX: | ||
| [self onManageAccountTap]; | ||
| break; | ||
| } | ||
| } |
There was a problem hiding this comment.
A commenter au lieu de supprimer
There was a problem hiding this comment.
Rajouté dans la Fix PR suivante #872
Comment on lines
4165
to
4169
| - (void)onManageAccountTap | ||
| { | ||
| NSURL *url = [NSURL URLWithString: self.mainSession.homeserverWellknown.authentication.account]; | ||
| if (url) { | ||
| [UIApplication.sharedApplication openURL:url options:@{} completionHandler:nil]; |
There was a problem hiding this comment.
A commenter au lieu de supprimer
There was a problem hiding this comment.
Rajouté dans la Fix PR suivante #872
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #865