diff --git a/CHANGES.rst b/CHANGES.rst index c3f73e9ee..1913a5a3e 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,57 @@ Changes to be released in next version ================================================= +✨ Features + * + +🙌 Improvements + * + +🐛 Bugfix + * Navigation: Unable to open a room from a room list (#3863). + +⚠️ API Changes + * + +🗣 Translations + * + +🧱 Build + * + +Others + * + +Changes in 1.1.5 (2021-01-18) +================================================= + +✨ Features + * + +🙌 Improvements + * + +🐛 Bugfix + * + +⚠️ API Changes + * + +🗣 Translations + * + +🧱 Build + * + +Others + * + +Improvements: + * Upgrade MatrixKit version ([v0.13.7](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.13.7)). + +Changes in 1.1.4 (2021-01-15) +================================================= + ✨ Features * Change Pin inside the app (#3881) * AuthVC: Add social login (#3846). @@ -14,6 +65,7 @@ Changes to be released in next version 🐛 Bugfix * Crash report cannot be submitted (on small phones) (#3819) * Prevent navigation controller from pushing same view controller (#3924) + * AuthVC: Fix recaptcha view cropping (#3940). ⚠️ API Changes * @@ -27,6 +79,9 @@ Changes to be released in next version Others * +Improvements: + * Upgrade MatrixKit version ([v0.13.6](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.13.6)). + Changes in 1.1.3 (2020-12-18) ================================================= diff --git a/Podfile b/Podfile index 177c8627b..6e1b85b08 100644 --- a/Podfile +++ b/Podfile @@ -11,7 +11,7 @@ use_frameworks! # - `{ {kit spec hash} => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for each repo. Used by Fastfile during CI # # Warning: our internal tooling depends on the name of this variable name, so be sure not to change it -$matrixKitVersion = '= 0.13.4' +$matrixKitVersion = '= 0.13.7' # $matrixKitVersion = :local # $matrixKitVersion = {'develop' => 'develop'} diff --git a/Podfile.lock b/Podfile.lock index d0d853a25..49a5b351b 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -60,35 +60,35 @@ PODS: - MatomoTracker (7.2.2): - MatomoTracker/Core (= 7.2.2) - MatomoTracker/Core (7.2.2) - - MatrixKit (0.13.4): + - MatrixKit (0.13.7): - Down (~> 0.9.3) - DTCoreText (~> 1.6.23) - HPGrowingTextView (~> 1.1) - libPhoneNumber-iOS (~> 0.9.13) - - MatrixKit/Core (= 0.13.4) - - MatrixSDK (= 0.17.6) - - MatrixKit/AppExtension (0.13.4): + - MatrixKit/Core (= 0.13.7) + - MatrixSDK (= 0.17.9) + - MatrixKit/AppExtension (0.13.7): - Down (~> 0.9.3) - DTCoreText (~> 1.6.23) - DTCoreText/Extension - HPGrowingTextView (~> 1.1) - libPhoneNumber-iOS (~> 0.9.13) - - MatrixSDK (= 0.17.6) - - MatrixKit/Core (0.13.4): + - MatrixSDK (= 0.17.9) + - MatrixKit/Core (0.13.7): - Down (~> 0.9.3) - DTCoreText (~> 1.6.23) - HPGrowingTextView (~> 1.1) - libPhoneNumber-iOS (~> 0.9.13) - - MatrixSDK (= 0.17.6) - - MatrixSDK (0.17.6): - - MatrixSDK/Core (= 0.17.6) - - MatrixSDK/Core (0.17.6): + - MatrixSDK (= 0.17.9) + - MatrixSDK (0.17.9): + - MatrixSDK/Core (= 0.17.9) + - MatrixSDK/Core (0.17.9): - AFNetworking (~> 4.0.0) - GZIP (~> 1.3.0) - libbase58 (~> 0.1.4) - OLMKit (~> 3.1.0) - Realm (= 10.1.4) - - MatrixSDK/JingleCallStack (0.17.6): + - MatrixSDK/JingleCallStack (0.17.9): - JitsiMeetSDK (= 2.11.0) - MatrixSDK/Core - OLMKit (3.1.0): @@ -127,8 +127,8 @@ DEPENDENCIES: - KeychainAccess (~> 4.2.1) - KTCenterFlowLayout (~> 1.3.1) - MatomoTracker (~> 7.2.2) - - MatrixKit (= 0.13.4) - - MatrixKit/AppExtension (= 0.13.4) + - MatrixKit (= 0.13.7) + - MatrixKit/AppExtension (= 0.13.7) - MatrixSDK - MatrixSDK/JingleCallStack - OLMKit @@ -199,8 +199,8 @@ SPEC CHECKSUMS: LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d Logging: beeb016c9c80cf77042d62e83495816847ef108b MatomoTracker: a59ec4da0f580be57bdc6baa708a71a86532a832 - MatrixKit: 8dec5df9b3bb6621b8411ec37f93a0e3abe01db8 - MatrixSDK: 43d329b4070301f714808f02872ec1747c2f9b7d + MatrixKit: 5214861622113013cd845dd4695fa22ac136f78c + MatrixSDK: f476628589fe9436f7d70aa344dc97ea4bfa6881 OLMKit: 4ee0159d63feeb86d836fdcfefe418e163511639 ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d Realm: 80f4fb2971ccb9adc27a47d0955ae8e533a7030b @@ -212,6 +212,6 @@ SPEC CHECKSUMS: zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb -PODFILE CHECKSUM: 198d9f0614bcf132a6aa31bdf8c1beb0360fdea7 +PODFILE CHECKSUM: abba9027331fc1ad0d02f325a3bd5d20dd57d03b COCOAPODS: 1.10.0 diff --git a/Riot.xcodeproj/project.pbxproj b/Riot.xcodeproj/project.pbxproj index 43e16caf4..be3a0e85f 100644 --- a/Riot.xcodeproj/project.pbxproj +++ b/Riot.xcodeproj/project.pbxproj @@ -7559,7 +7559,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1.1.4; + CURRENT_PROJECT_VERSION = 1.1.6; DEFINES_MODULE = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -7579,7 +7579,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 1.1.4; + MARKETING_VERSION = 1.1.6; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -7618,7 +7618,7 @@ CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 1.1.4; + CURRENT_PROJECT_VERSION = 1.1.6; DEFINES_MODULE = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -7631,7 +7631,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 1.1.4; + MARKETING_VERSION = 1.1.6; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; diff --git a/Riot/Assets/en.lproj/Vector.strings b/Riot/Assets/en.lproj/Vector.strings index b75374e3f..c7dfdf2cf 100644 --- a/Riot/Assets/en.lproj/Vector.strings +++ b/Riot/Assets/en.lproj/Vector.strings @@ -1159,7 +1159,7 @@ Tap the + to start adding people."; "device_verification_self_verify_wait_title" = "Complete security"; "device_verification_self_verify_wait_new_sign_in_title" = "Verify this login"; "device_verification_self_verify_wait_information" = "Verify this session from one of your other sessions, granting it access to encrypted messages.\n\nUse the latest Element on your other devices:"; -"device_verification_self_verify_wait_additional_information" = "This works with Element and other cross-signing capable Matrix cients."; +"device_verification_self_verify_wait_additional_information" = "This works with Element and other cross-signing capable Matrix clients."; "device_verification_self_verify_wait_recover_secrets_without_passphrase" = "Use Recovery Key"; "device_verification_self_verify_wait_recover_secrets_with_passphrase" = "Use Recovery Passphrase or Key"; "device_verification_self_verify_wait_recover_secrets_additional_information" = "If you can't access an existing session"; diff --git a/Riot/Generated/Strings.swift b/Riot/Generated/Strings.swift index 19f642213..3a8e00d9b 100644 --- a/Riot/Generated/Strings.swift +++ b/Riot/Generated/Strings.swift @@ -982,7 +982,7 @@ internal enum VectorL10n { internal static var deviceVerificationSelfVerifyStartWaiting: String { return VectorL10n.tr("Vector", "device_verification_self_verify_start_waiting") } - /// This works with Element and other cross-signing capable Matrix cients. + /// This works with Element and other cross-signing capable Matrix clients. internal static var deviceVerificationSelfVerifyWaitAdditionalInformation: String { return VectorL10n.tr("Vector", "device_verification_self_verify_wait_additional_information") } diff --git a/Riot/Modules/Authentication/AuthenticationViewController.m b/Riot/Modules/Authentication/AuthenticationViewController.m index eb47f6090..76667cb58 100644 --- a/Riot/Modules/Authentication/AuthenticationViewController.m +++ b/Riot/Modules/Authentication/AuthenticationViewController.m @@ -1162,6 +1162,8 @@ static const CGFloat kAuthInputContainerViewMinHeightConstraintConstant = 150.0; - (void)refreshContentViewHeightConstraint { + [self.view layoutIfNeeded]; + // Refresh content view height by considering the options container display. CGFloat constant = self.optionsContainer.frame.origin.y + 10; @@ -1175,6 +1177,18 @@ static const CGFloat kAuthInputContainerViewMinHeightConstraintConstant = 150.0; self.authInputContainerViewMinHeightConstraint.constant = 0; self.authInputContainerViewHeightConstraint.constant = 0; } + + // FIX: When authInputsView present recaptcha the height is not taken into account, add it manually here. + AuthInputsView *authInputsview; + if ([self.authInputsView isKindOfClass:AuthInputsView.class]) + { + authInputsview = (AuthInputsView*)self.authInputsView; + + if (!authInputsview.recaptchaContainer.hidden) + { + constant+=authInputsview.frame.size.height; + } + } if (!self.optionsContainer.isHidden) { diff --git a/Riot/Modules/Authentication/Views/TermsView.swift b/Riot/Modules/Authentication/Views/TermsView.swift index 5371b343e..4936c231a 100644 --- a/Riot/Modules/Authentication/Views/TermsView.swift +++ b/Riot/Modules/Authentication/Views/TermsView.swift @@ -19,8 +19,8 @@ import Reusable final class TermsView: UIView, NibOwnerLoadable, UITableViewDelegate, UITableViewDataSource { - @IBOutlet weak var tableView: UITableView! - @IBOutlet weak var acceptButton: UIButton! + @IBOutlet private weak var tableView: UITableView! + @IBOutlet private weak var acceptButton: UIButton! @objc weak var delegate: MXKAuthInputsViewDelegate? @@ -59,12 +59,6 @@ final class TermsView: UIView, NibOwnerLoadable, UITableViewDelegate, UITableVie commonInit() } - override func layoutSubviews() { - super.layoutSubviews() - - acceptButton.layer.cornerRadius = 5 - } - private func commonInit() { tableView.delegate = self @@ -75,6 +69,9 @@ final class TermsView: UIView, NibOwnerLoadable, UITableViewDelegate, UITableVie acceptButton.clipsToBounds = true acceptButton.setTitle(NSLocalizedString("accept", tableName: "Vector", comment: ""), for: .normal) acceptButton.setTitle(NSLocalizedString("accept", tableName: "Vector", comment: ""), for: .highlighted) + + acceptButton.layer.masksToBounds = true + acceptButton.layer.cornerRadius = 5 customizeViewRendering() } diff --git a/Riot/Modules/Authentication/Views/TermsView.xib b/Riot/Modules/Authentication/Views/TermsView.xib index c947e9bba..622341524 100644 --- a/Riot/Modules/Authentication/Views/TermsView.xib +++ b/Riot/Modules/Authentication/Views/TermsView.xib @@ -1,11 +1,9 @@ - - - - + + - + @@ -20,14 +18,15 @@ - - + + -