diff --git a/CHANGES_BWI.md b/CHANGES_BWI.md index 0a075822a..0d4c3ebc3 100644 --- a/CHANGES_BWI.md +++ b/CHANGES_BWI.md @@ -1,3 +1,25 @@ +Changes in BWI project 2.2.0 (2022-12-16) +=================================================== + + +Upstream merge ✨: + +- v1.9.14 + +Features ✨: + +Improvements 🙌: +- Text and screen changes for crosssigning (#3418) + +Bugfix 🐛: +- Poll not usable after logging out and back in. (#7070) + +Translations 🗣 : + +SDK API changes ⚠️: + ++Build 🧱: + Changes in BWI project 2.1.0 (2022-12-14) =================================================== diff --git a/Config/BWIBuildSettings.swift b/Config/BWIBuildSettings.swift index bea8e888e..6c8a515e8 100644 --- a/Config/BWIBuildSettings.swift +++ b/Config/BWIBuildSettings.swift @@ -77,7 +77,7 @@ class BWIBuildSettings: NSObject { // Location Sharing // (this disables error messages when map laoding failed) var locationSharingSSLProblemWorkaround = true - var locationSharingEnabled = true + var locationSharingEnabled = false // Integration check var forcedPinProtection = true @@ -128,7 +128,7 @@ class BWIBuildSettings: NSObject { var bwiAutoCreateAliasOnRoomCreation = true - var bwiLocationShareButtonVisible = true + var bwiLocationShareButtonVisible = false var bwiUseCustomPersonalNotesAvatar = true var bwiBetterIgnoredUsers = true var bwiSettingsShowInAppNotifications = false @@ -403,7 +403,7 @@ class BWIBuildSettings: NSObject { var authScreenShowSocialLoginSection = false // MARK: - Cross-signing (bwi=true) - var disableSelfUserVerification = false + var disableSelfUserVerification = true // MARK: - Antivirus scan (bwi=true) diff --git a/Podfile.lock b/Podfile.lock index 8b16f0e83..a8db3503f 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -21,13 +21,13 @@ PODS: - Down (0.11.0) - DSBottomSheet (0.3.0) - DSWaveformImage (6.1.1) - - DTCoreText (1.6.26): - - DTCoreText/Core (= 1.6.26) + - DTCoreText (1.6.27): + - DTCoreText/Core (= 1.6.27) - DTFoundation/Core (~> 1.7.5) - DTFoundation/DTAnimatedGIF (~> 1.7.5) - DTFoundation/DTHTMLParser (~> 1.7.5) - DTFoundation/UIKit (~> 1.7.5) - - DTCoreText/Core (1.6.26): + - DTCoreText/Core (1.6.27): - DTFoundation/Core (~> 1.7.5) - DTFoundation/DTAnimatedGIF (~> 1.7.5) - DTFoundation/DTHTMLParser (~> 1.7.5) @@ -95,7 +95,7 @@ PODS: - Sentry/Core (7.15.0) - SideMenu (6.5.0) - SwiftBase32 (0.9.0) - - SwiftFormat/CLI (0.50.2) + - SwiftFormat/CLI (0.50.7) - SwiftGen (6.6.2) - SwiftJWT (3.6.200): - BlueCryptor (~> 1.0) @@ -103,7 +103,7 @@ PODS: - BlueRSA (~> 1.0) - KituraContracts (~> 1.2) - LoggerAPI (~> 1.7) - - SwiftLint (0.49.1) + - SwiftLint (0.50.3) - SwiftyBeaver (1.9.5) - UICollectionViewLeftAlignedLayout (1.0.2) - UICollectionViewRightAlignedLayout (0.0.3) @@ -218,7 +218,7 @@ SPEC CHECKSUMS: Down: b6ba1bc985c9d2f4e15e3b293d2207766fa12612 DSBottomSheet: ca0ac37eb5af2dd54663f86b84382ed90a59be2a DSWaveformImage: 3c718a0cf99291887ee70d1d0c18d80101d3d9ce - DTCoreText: ec749e013f2e1f76de5e7c7634642e600a7467ce + DTCoreText: ac297b565abd3b12390d33cd6e076d875f0c0a5e DTFoundation: a53f8cda2489208cbc71c648be177f902ee17536 DTTJailbreakDetection: 5e356c5badc17995f65a83ed9483f787a0057b71 FLEX: e51461dd6f0bfb00643c262acdfea5d5d12c596b @@ -245,10 +245,10 @@ SPEC CHECKSUMS: Sentry: 63ca44f5e0c8cea0ee5a07686b02e56104f41ef7 SideMenu: f583187d21c5b1dd04c72002be544b555a2627a2 SwiftBase32: 9399c25a80666dc66b51e10076bf591e3bbb8f17 - SwiftFormat: 710117321c55c82675c0dc03055128efbb13c38f + SwiftFormat: 4fcf72ee44c7198255108c22ed7135c38a36ba6b SwiftGen: 1366a7f71aeef49954ca5a63ba4bef6b0f24138c SwiftJWT: 88c412708f58c169d431d344c87bc79a87c830ae - SwiftLint: 32ee33ded0636d0905ef6911b2b67bbaeeedafa5 + SwiftLint: 77f7cb2b9bb81ab4a12fcc86448ba3f11afa50c6 SwiftyBeaver: 84069991dd5dca07d7069100985badaca7f0ce82 UICollectionViewLeftAlignedLayout: 830bf6fa5bab9f9b464f62e3384f9d2e00b3c0f6 UICollectionViewRightAlignedLayout: 823eef8c567eba4a44c21bc2ffcb0d0d5f361e2d diff --git a/Riot/Assets/new_features.html b/Riot/Assets/new_features.html index a0dd5739f..c45e16df5 100644 --- a/Riot/Assets/new_features.html +++ b/Riot/Assets/new_features.html @@ -26,6 +26,19 @@ +
+

+ Version 2.2.0 +

+ +

+ Bugfixes +

+

+
+

Version 2.1.0 diff --git a/Riot/Generated/BWIStrings.swift b/Riot/Generated/BWIStrings.swift index f75ea4a65..34627eb2c 100644 --- a/Riot/Generated/BWIStrings.swift +++ b/Riot/Generated/BWIStrings.swift @@ -811,6 +811,18 @@ public class BWIL10n: NSObject { public static var keyVerificationVerifiedThisSessionInformation: String { return BWIL10n.tr("Bwi", "key_verification_verified_this_session_information") } + /// Stattdessen mit Emojis vergleichen + public static var keyVerificationVerifyQrCodeCannotScanAction: String { + return BWIL10n.tr("Bwi", "key_verification_verify_qr_code_cannot_scan_action") + } + /// Scanne den Code mit einem anderen Gerät oder umgekehrt. + public static var keyVerificationVerifyQrCodeInformationOtherDevice: String { + return BWIL10n.tr("Bwi", "key_verification_verify_qr_code_information_other_device") + } + /// Diese Anmeldung verifizieren + public static var keyVerificationVerifyQrCodeTitle: String { + return BWIL10n.tr("Bwi", "key_verification_verify_qr_code_title") + } /// public static var locationSharingCopyrightLabel: String { return BWIL10n.tr("Bwi", "location_sharing_copyright_label") diff --git a/Riot/Modules/KeyVerification/Common/ScanConfirmation/KeyVerificationScanConfirmationViewController.storyboard b/Riot/Modules/KeyVerification/Common/ScanConfirmation/KeyVerificationScanConfirmationViewController.storyboard index 16d4f87cb..b6b9edafa 100644 --- a/Riot/Modules/KeyVerification/Common/ScanConfirmation/KeyVerificationScanConfirmationViewController.storyboard +++ b/Riot/Modules/KeyVerification/Common/ScanConfirmation/KeyVerificationScanConfirmationViewController.storyboard @@ -1,9 +1,11 @@ - - + + + + - + @@ -11,13 +13,13 @@ - + - + @@ -31,18 +33,18 @@ - + - - + + - +