summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorBug Magnet <marco.nikic@mullvad.net>2025-11-14 12:47:47 +0100
committerEmīls <emils@mullvad.net>2025-11-17 16:38:22 +0100
commitde813a8cb42bcccd1a6ce360aa01ff8fc52e12dc (patch)
tree7c6a3af50205af3350d7fc3d91ad34a7210c07cc
parentbdf6bd59962d815038b5a2ef3eb9704ad4bf3ff5 (diff)
downloadmullvadvpn-ios-release-2025.9.tar.xz
mullvadvpn-ios-release-2025.9.zip
Remove Optional display for account-token when includedios/2025.9-build4ios-release-2025.9
-rw-r--r--ios/MullvadVPN/View controllers/ProblemReport/ProblemReportInteractor.swift6
-rw-r--r--ios/MullvadVPN/View controllers/ProblemReport/ProblemReportViewController+ViewManagement.swift5
2 files changed, 9 insertions, 2 deletions
diff --git a/ios/MullvadVPN/View controllers/ProblemReport/ProblemReportInteractor.swift b/ios/MullvadVPN/View controllers/ProblemReport/ProblemReportInteractor.swift
index 985c8b4599..c2daf88f70 100644
--- a/ios/MullvadVPN/View controllers/ProblemReport/ProblemReportInteractor.swift
+++ b/ios/MullvadVPN/View controllers/ProblemReport/ProblemReportInteractor.swift
@@ -48,8 +48,10 @@ final class ProblemReportInteractor: @unchecked Sendable {
) {
let logString = self.consolidatedLog.string
let accountToken =
- if isUserLoggedIn() && includeAccountTokenInLogs {
- "\naccount-token: \(String(describing: tunnelManager.deviceState.accountData?.identifier))"
+ if isUserLoggedIn() && includeAccountTokenInLogs,
+ let token = tunnelManager.deviceState.accountData?.identifier
+ {
+ "\naccount-token: \(token)"
} else { "" }
if logString.isEmpty {
diff --git a/ios/MullvadVPN/View controllers/ProblemReport/ProblemReportViewController+ViewManagement.swift b/ios/MullvadVPN/View controllers/ProblemReport/ProblemReportViewController+ViewManagement.swift
index cf37eddbff..7035325c2d 100644
--- a/ios/MullvadVPN/View controllers/ProblemReport/ProblemReportViewController+ViewManagement.swift
+++ b/ios/MullvadVPN/View controllers/ProblemReport/ProblemReportViewController+ViewManagement.swift
@@ -78,6 +78,11 @@ extension ProblemReportViewController {
userPrivacyLabel.pinEdgesToSuperviewMargins(PinnableEdges([.top(0), .trailing(0), .bottom(10)]))
}
+ let constraint = verticalStackView.heightAnchor.constraint(greaterThanOrEqualToConstant: 44)
+ NSLayoutConstraint.activate(
+ [constraint]
+ )
+
self.reduceAnonymityWarningView = reduceAnonymityWarningView
return verticalStackView