Skip to content
Snippets Groups Projects
Commit e7a4a228 authored by Bruno Muniz's avatar Bruno Muniz :apple:
Browse files

Merge branch 'fix-sftp-copy' into 'development'

Fixes sftp copy

See merge request elixxir/client-ios!62
parents a13b40cc e1f21388
No related branches found
No related tags found
3 merge requests!71Releasing v1.1.5 (214),!67v1.1.5 b(203),!62Fixes sftp copy
...@@ -23,7 +23,7 @@ final class SFTPView: UIView { ...@@ -23,7 +23,7 @@ final class SFTPView: UIView {
paragraph.alignment = .left paragraph.alignment = .left
paragraph.lineHeightMultiple = 1.15 paragraph.lineHeightMultiple = 1.15
let attString = NSAttributedString( let attString = NSMutableAttributedString(
string: Localized.AccountRestore.Sftp.subtitle, string: Localized.AccountRestore.Sftp.subtitle,
attributes: [ attributes: [
.foregroundColor: Asset.neutralBody.color, .foregroundColor: Asset.neutralBody.color,
...@@ -31,6 +31,13 @@ final class SFTPView: UIView { ...@@ -31,6 +31,13 @@ final class SFTPView: UIView {
.paragraphStyle: paragraph .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.numberOfLines = 0
subtitleLabel.attributedText = attString subtitleLabel.attributedText = attString
......
...@@ -218,7 +218,9 @@ public enum Localized { ...@@ -218,7 +218,9 @@ public enum Localized {
public static let login = Localized.tr("Localizable", "accountRestore.sftp.login") public static let login = Localized.tr("Localizable", "accountRestore.sftp.login")
/// Password /// Password
public static let password = Localized.tr("Localizable", "accountRestore.sftp.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") public static let subtitle = Localized.tr("Localizable", "accountRestore.sftp.subtitle")
/// Login to your SFTP /// Login to your SFTP
public static let title = Localized.tr("Localizable", "accountRestore.sftp.title") public static let title = Localized.tr("Localizable", "accountRestore.sftp.title")
......
...@@ -857,7 +857,7 @@ ...@@ -857,7 +857,7 @@
"accountRestore.sftp.title" "accountRestore.sftp.title"
= "Login to your SFTP"; = "Login to your SFTP";
"accountRestore.sftp.subtitle" "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" "accountRestore.sftp.host"
= "Host"; = "Host";
"accountRestore.sftp.username" "accountRestore.sftp.username"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment