Rebase onto vector-im/riot-ios #304
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
Currently translated at 100.0% (5 of 5 strings) Translation: Riot iOS/Riot iOS (Dialogs) Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios-dialogs/ru/
Currently translated at 87.8% (722 of 822 strings) Translation: Riot iOS/Riot iOS Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/ru/
Currently translated at 100.0% (5 of 5 strings) Translation: Riot iOS/Riot iOS (Dialogs) Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios-dialogs/sq/
Currently translated at 93.2% (766 of 822 strings) Translation: Riot iOS/Riot iOS Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/sq/
Pasteboard: Fix a crash when passing a nil object to UIPasteboard
Currently translated at 93.7% (770 of 822 strings) Translation: Riot iOS/Riot iOS Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/ru/
…ith retrieved event equal to nil.
…d_crash RoomVC: Fix crash occurring when tap on an unsent media with retrieved event equal to nil
CocoaPods: Fix DTCoreText app extension issue
BF: Emoji Picker: Background color is not white
TODO: - Tests all screen - Set up Key Backup and Device verification - Disable message Reaction/Edition
TODO: handle the key backup in case of pwd change (presently only key export is supported)
# Conflicts: # Podfile.lock # Tchap.xcodeproj/project.pbxproj # Tchap/Modules/Room/DataSources/RoomDataSource.m # Tchap/Modules/Room/Members/RoomParticipantsViewController.m # Tchap/Modules/Room/RoomViewController.m # Tchap/Modules/Room/Settings/RoomSettingsViewController.m # Tchap/SupportingFiles/Tchap-Bridging-Header.h
until a new rebase is applied on Tchap-ios in order to go back on the develop branch
- remove "share without verifying" option - start directly the verification based on emojis (without mentioning the legacy verification) - change the strings to focus on user's devices verification - Update the strings displayed during the legacy verification screen - Adjust layout - Update message when verification is cancelled - Bug Fix - DeviceVerificationVerifyViewController: the waitingPartnerLabel label was never displayed - Update the incoming request display
* Bug Fix - The app may be stuck on the device verification screen This happens when several check of the pending room key requests are triggered simultaneously. For example when we resume the app after added a new device. This multiple requests involve an issue on the dialog handling (The screen is displayed, but the model lost its delegate) We fix this here by preventing the app from checking several times the pending requests
…re handled after verification Update sdk version (to get "MXCrypto: Only create one olm session at a time per device") #303
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.
#277