Skip to content
Snippets Groups Projects
Commit 671a1841 authored by Ahmed Shehata's avatar Ahmed Shehata
Browse files

Merge branch 'sftp_hotfix' into 'development'

Sftp hotfix

See merge request elixxir/client-android!63
parents f2ed6ccf 0f685881
No related branches found
No related tags found
2 merge requests!64v2.8b604,!63Sftp hotfix
...@@ -37,11 +37,7 @@ object Ssh : SshClient { ...@@ -37,11 +37,7 @@ object Ssh : SshClient {
// BouncyCastle is deprecated in Android P+ // BouncyCastle is deprecated in Android P+
SecurityUtils.setRegisterBouncyCastle(false) SecurityUtils.setRegisterBouncyCastle(false)
val ssh = SSHClient(Config).apply { val ssh = SSHClient(Config).apply {
if (BuildConfig.DEBUG) {
addHostKeyVerifier(PromiscuousVerifier()) addHostKeyVerifier(PromiscuousVerifier())
} else {
addHostKeyVerifier(UserConsentVerifier())
}
connect(credentials.host, credentials.port.toInt()) connect(credentials.host, credentials.port.toInt())
} }
......
...@@ -620,7 +620,7 @@ ...@@ -620,7 +620,7 @@
<string name="chats_show_mix_pending_message">The mix for this msg will be available shortly, please check again later</string> <string name="chats_show_mix_pending_message">The mix for this msg will be available shortly, please check again later</string>
<string name="chats_no_results_found_message">was not found in your connections or in a chat. Click below to search for them as a new connection.</string> <string name="chats_no_results_found_message">was not found in your connections or in a chat. Click below to search for them as a new connection.</string>
<string name="sftp_login_title">Login to your SFTP</string> <string name="sftp_login_title">Login to your SFTP</string>
<string name="stfp_login_body">Login to your server. Your credentials will be automatically and securely saved locally on your device.</string> <string name="stfp_login_body">Login to your server. Your credentials will be saved to secure storage locally on your device. Your backups are encrypted and protected by your backup password which is stored separately from these credentials.\n\nPlease Note: at this time, host key fingerprint checking is not implemented. If the server\'s fingerprint changes you will not be notified.</string>
<string name="sftp_login_host_hint">Host</string> <string name="sftp_login_host_hint">Host</string>
<string name="sftp_login_username_hint">Username</string> <string name="sftp_login_username_hint">Username</string>
<string name="sftp_login_password_hint">Password</string> <string name="sftp_login_password_hint">Password</string>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment