felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-23 18:12:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflicts

Browse Source
This commit is contained in:
Arnfried Griesert
2023-03-20 07:33:28 +01:00
parent e5d97ed154
commit c61ddcf39a
8 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/KeyVerification/Device/SelfVerifyWait/KeyVerificationSelfVerifyWaitViewController.swift
+3 -5
View File
@@ -123,16 +123,14 @@ final class KeyVerificationSelfVerifyWaitViewController: UIViewController {
self.cancelBarButtonItem = cancelBarButtonItem
}
self.title = BWIL10n.deviceVerificationSelfVerifyWaitTitle // $$$ 1.10.5 does not have this line but the following...
// self.titleLabel.text = VectorL10n.deviceVerificationSelfVerifyOpenOnOtherDeviceTitle(AppInfo.current.displayName)
self.title = BWIL10n.deviceVerificationSelfVerifyWaitTitle
self.titleLabel.text = BWIL10n.deviceVerificationSelfVerifyWaitTitle
self.informationLabel.text = BWIL10n.deviceVerificationSelfVerifyWaitInformation
self.desktopClientImageView.image = Asset.Images.monitor.image.withRenderingMode(.alwaysTemplate)
self.mobileClientImageView.image = Asset.Images.smartphone.image.withRenderingMode(.alwaysTemplate)
self.additionalInformationLabel.text = nil // bwi: hidden text
self.recoverSecretsAdditionalInformationLabel.text = BWIL10n.deviceVerificationSelfVerifyWaitRecoverSecretsAdditionalInformation
}
@@ -167,7 +165,7 @@ final class KeyVerificationSelfVerifyWaitViewController: UIViewController {
private func renderLoaded(viewData: KeyVerificationSelfVerifyWaitViewData) {
self.activityPresenter.removeCurrentActivityIndicator(animated: true)
self.title = viewData.isNewSignIn ? VectorL10n.deviceVerificationSelfVerifyWaitNewSignInTitle : BWIL10n.deviceVerificationSelfVerifyWaitTitle // $$$ 1.10.5 does not have this line
self.title = viewData.isNewSignIn ? VectorL10n.deviceVerificationSelfVerifyWaitNewSignInTitle : BWIL10n.deviceVerificationSelfVerifyWaitTitle
self.cancelBarButtonItem?.title = viewData.isNewSignIn ? VectorL10n.skip : VectorL10n.cancel
let hideRecoverSecrets: Bool