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

MESSENGER-2762 Initial Merge

Browse Source
This commit is contained in:
Frank Rotermund
2022-03-17 15:51:23 +01:00
parent ecae8d618f
commit c2108a2178
384 changed files with 17708 additions and 1928 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Riot/Modules/KeyVerification/User/SessionStatus/UserVerificationSessionStatusViewController.swift
View File

@@ -2,6 +2,7 @@
// $ createScreen.sh SessionStatus UserVerificationSessionStatus
/*
Copyright 2020 New Vector Ltd
Copyright (c) 2021 BWI GmbH
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -129,6 +130,11 @@ final class UserVerificationSessionStatusViewController: UIViewController {
self.verifyButton.layer.masksToBounds = true
self.manuallyVerifyButton.setTitle(VectorL10n.userVerificationSessionDetailsVerifyActionCurrentUserManually, for: .normal)
if BuildSettings.disableSelfUserVerification {
self.verifyButton.isHidden = true
self.manuallyVerifyButton.isHidden = true
}
}
private func render(viewState: UserVerificationSessionStatusViewState) {
@@ -154,7 +160,7 @@ final class UserVerificationSessionStatusViewController: UIViewController {
self.untrustedSessionContainerView.isHidden = viewData.isDeviceTrusted
self.manuallyVerifyButton.isHidden = !viewData.isCurrentUser
self.manuallyVerifyButton.isHidden = !viewData.isCurrentUser || BuildSettings.disableSelfUserVerification
if viewData.isDeviceTrusted {
badgeImage = Asset.Images.encryptionTrusted.image