Merge branch 'feature/4710_manual_verification' into 'develop'

MESSENGER-4710 remove any possibility to self verifiy with old device manager

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!147

Config/BWIBuildSettings.swift

@@ -438,8 +438,9 @@ class BWIBuildSettings: NSObject {
     var authScreenShowTestServerOptions = true
     var authScreenShowSocialLoginSection = false
 
-    // MARK: - Cross-signing  (bwi=true)
-    var disableSelfUserVerification = false
+    // MARK: - Self Verification not crosssigning  (bwi=true)
+    var disableSelfUserVerification = true
+    var disableCrosssigning = false
     var additionalSelfVerfificationAlert = false
     var showNoOtherDeviceError = false
     

Riot/Assets/de.lproj/Bwi.strings

@@ -619,6 +619,7 @@
 // MARK: - Device Manager
 "user_session_verified_session_description" = "Du hast deine Sitzung durch Eingabe des Wiederherstellungsschlüssels oder durch die Verifizierung mit einem anderen Gerät bestätigt. Dies bedeutet, dass du alle Schlüssel zum Entschlüsseln deiner Nachrichten hast und anderen bestätigst, dieser Sitzung zu vertrauen.";
 "user_session_button_view_all" = "Alle anzeigen (%d)";
+"user_verification_session_details_verify_action_current_user" = "Sitzung verifizieren";
 
 // MARK: - Voice Over
 "textfield_reveal_secret" = "Texteingabe anzeigen";

Riot/Assets/en.lproj/Bwi.strings

@@ -529,6 +529,7 @@
 // MARK: - Device Manager
 "user_session_verified_session_description" = "You have confirmed your session by entering the recovery key or verifying with another device. This means that you have all the keys to decrypt your messages and are confirming to others to trust this session.";
 "user_session_button_view_all" = "View all (%d)";
+"user_verification_session_details_verify_action_current_user" = "Verify session";
 
 // MARK: - Voice Over
 "textfield_reveal_secret" = "reveal text input";

Riot/Generated/BWIStrings.swift

@@ -1719,6 +1719,10 @@ public class BWIL10n: NSObject {
   public static var userSessionVerifiedSessionDescription: String { 
     return BWIL10n.tr("Bwi", "user_session_verified_session_description") 
   }
+  /// Sitzung verifizieren
+  public static var userVerificationSessionDetailsVerifyActionCurrentUser: String { 
+    return BWIL10n.tr("Bwi", "user_verification_session_details_verify_action_current_user") 
+  }
   /// Ansehen
   public static var view: String { 
     return BWIL10n.tr("Bwi", "view") 

Riot/Modules/KeyVerification/Common/KeyVerificationCoordinator.swift

@@ -137,7 +137,7 @@ final class KeyVerificationCoordinator: KeyVerificationCoordinatorType {
         case .incomingSASTransaction(let incomingSASTransaction):
             rootCoordinator = self.createDataLoadingScreenCoordinator(otherUserId: incomingSASTransaction.otherUserId, otherDeviceId: incomingSASTransaction.otherDeviceId)
         case .completeSecurity(let isNewSignIn):
-            if BWIBuildSettings.shared.disableSelfUserVerification {
+            if BWIBuildSettings.shared.disableCrosssigning {
                 let coordinator = self.createSecretsRecoveryCoordinator(with: .passphraseOrKey)
                 rootCoordinator = coordinator
             } else {

Riot/Modules/KeyVerification/User/SessionStatus/UserVerificationSessionStatusViewController.swift

@@ -175,7 +175,7 @@ final class UserVerificationSessionStatusViewController: UIViewController {
         
         if viewData.isCurrentUser {
             unstrustedInformationText = VectorL10n.userVerificationSessionDetailsAdditionalInformationUntrustedCurrentUser
-            verifyButtonTitle = VectorL10n.userVerificationSessionDetailsVerifyActionCurrentUser
+            verifyButtonTitle = BWIL10n.userVerificationSessionDetailsVerifyActionCurrentUser
         } else {
             unstrustedInformationText = VectorL10n.userVerificationSessionDetailsAdditionalInformationUntrustedOtherUser
             verifyButtonTitle = VectorL10n.userVerificationSessionDetailsVerifyActionOtherUser