From e1f21388adea34ea3680c4ed865595b4fc22f439 Mon Sep 17 00:00:00 2001
From: Bruno Muniz Azevedo Filho <bruno@elixxir.io>
Date: Wed, 3 Aug 2022 16:45:06 -0300
Subject: [PATCH] Fixes sftp copy
---
Sources/SFTPFeature/SFTPView.swift | 9 ++++++++-
Sources/Shared/AutoGenerated/Strings.swift | 4 +++-
Sources/Shared/Resources/en.lproj/Localizable.strings | 2 +-
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/Sources/SFTPFeature/SFTPView.swift b/Sources/SFTPFeature/SFTPView.swift
index 3e62e4ca..5653d85b 100644
--- a/Sources/SFTPFeature/SFTPView.swift
+++ b/Sources/SFTPFeature/SFTPView.swift
@@ -23,7 +23,7 @@ final class SFTPView: UIView {
paragraph.alignment = .left
paragraph.lineHeightMultiple = 1.15
- let attString = NSAttributedString(
+ let attString = NSMutableAttributedString(
string: Localized.AccountRestore.Sftp.subtitle,
attributes: [
.foregroundColor: Asset.neutralBody.color,
@@ -31,6 +31,13 @@ final class SFTPView: UIView {
.paragraphStyle: paragraph
])
+ attString.setAttributes(
+ attributes: [
+ .foregroundColor: Asset.neutralDark.color,
+ .font: Fonts.Mulish.bold.font(size: 12.0) as Any,
+ .paragraphStyle: paragraph
+ ], betweenCharacters: "*")
+
subtitleLabel.numberOfLines = 0
subtitleLabel.attributedText = attString
diff --git a/Sources/Shared/AutoGenerated/Strings.swift b/Sources/Shared/AutoGenerated/Strings.swift
index 1640774e..1f65eac1 100644
--- a/Sources/Shared/AutoGenerated/Strings.swift
+++ b/Sources/Shared/AutoGenerated/Strings.swift
@@ -218,7 +218,9 @@ public enum Localized {
public static let login = Localized.tr("Localizable", "accountRestore.sftp.login")
/// Password
public static let password = Localized.tr("Localizable", "accountRestore.sftp.password")
- /// Login to your server. Your credentials will be automatically and securely saved locally on your device.
+ /// Login to your server. Your credentials will be automatically and securely saved locally on your device. Your backups are encrypted and protected by your backup password which is stored separately from these credentials.
+ ///
+ /// *Please Note: at this time, host key fingerprint checking is not implemented. If the server's fingerprint changes you will not be notified.*
public static let subtitle = Localized.tr("Localizable", "accountRestore.sftp.subtitle")
/// Login to your SFTP
public static let title = Localized.tr("Localizable", "accountRestore.sftp.title")
diff --git a/Sources/Shared/Resources/en.lproj/Localizable.strings b/Sources/Shared/Resources/en.lproj/Localizable.strings
index 32235ed0..4172e91f 100644
--- a/Sources/Shared/Resources/en.lproj/Localizable.strings
+++ b/Sources/Shared/Resources/en.lproj/Localizable.strings
@@ -857,7 +857,7 @@
"accountRestore.sftp.title"
= "Login to your SFTP";
"accountRestore.sftp.subtitle"
-= "Login to your server. Your credentials will be automatically and securely saved locally on your device.";
+= "Login to your server. Your credentials will be automatically and securely saved locally on your device. Your backups are encrypted and protected by your backup password which is stored separately from these credentials.\n\n*Please Note: at this time, host key fingerprint checking is not implemented. If the server's fingerprint changes you will not be notified.*";
"accountRestore.sftp.host"
= "Host";
"accountRestore.sftp.username"
--
GitLab