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

MESSENGER fix some merge issues

Browse Source
This commit is contained in:
Frank Rotermund
2022-09-19 12:05:24 +02:00
parent 5d09c62e90
commit e6854a4e60
8 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/SetPinCode/EnterPinCode/EnterPinCodeViewController.swift
+7 -7
View File
@@ -268,8 +268,8 @@ final class EnterPinCodeViewController: UIViewController {
}
private func renderPinsDontMatch() {
let error = MXKErrorViewModel(title: NSLocalizedString("pin_protection_mismatch_error_title", tableName: "Vector", comment: ""),
message: NSLocalizedString("pin_protection_mismatch_error_message", tableName: "Vector", comment: ""))
let error = MXKErrorViewModel(title: VectorL10n.pinProtectionMismatchErrorTitle,
message: VectorL10n.pinProtectionMismatchErrorMessage)
self.activityPresenter.removeCurrentActivityIndicator(animated: true)
self.errorPresenter.presentError(from: self, for: error, animated: true) {
@@ -298,19 +298,19 @@ final class EnterPinCodeViewController: UIViewController {
}
private func renderWrongPinTooManyTimes() {
let error = MXKErrorViewModel(title: NSLocalizedString("pin_protection_mismatch_error_title", tableName: "Vector", comment: ""),
message: NSLocalizedString("pin_protection_mismatch_too_many_times_error_message", tableName: "Vector", comment: ""))
let error = MXKErrorViewModel(title: VectorL10n.pinProtectionMismatchErrorTitle,
message: VectorL10n.pinProtectionMismatchTooManyTimesErrorMessage)
self.activityPresenter.removeCurrentActivityIndicator(animated: true)
self.errorPresenter.presentError(from: self, for: error, animated: true, handler: nil)
}
private func renderForgotPin() {
let controller = UIAlertController(title: NSLocalizedString("pin_protection_reset_alert_title", tableName: "Vector", comment: ""),
message: NSLocalizedString("pin_protection_reset_alert_message", tableName: "Vector", comment: ""),
let controller = UIAlertController(title: VectorL10n.pinProtectionResetAlertTitle,
message: VectorL10n.pinProtectionResetAlertMessage,
preferredStyle: .alert)
let resetAction = UIAlertAction(title: NSLocalizedString("pin_protection_reset_alert_action_reset", tableName: "Vector", comment: ""), style: .default) { (_) in
let resetAction = UIAlertAction(title: VectorL10n.pinProtectionResetAlertActionReset, style: .default) { (_) in
self.viewModel.process(viewAction: .forgotPinAlertResetAction)
}