Merge branch 'development' into 'master'

v2.8b604

See merge request elixxir/client-android!64

app/src/main/java/io/xxlabs/messenger/backup/cloud/sftp/login/SshClient.kt

@@ -37,11 +37,7 @@ object Ssh : SshClient {
             // BouncyCastle is deprecated in Android P+
             SecurityUtils.setRegisterBouncyCastle(false)
             val ssh = SSHClient(Config).apply {
-                if (BuildConfig.DEBUG) {
                 addHostKeyVerifier(PromiscuousVerifier())
-                } else {
-                    addHostKeyVerifier(UserConsentVerifier())
-                }
                 connect(credentials.host, credentials.port.toInt())
             }
 

app/src/main/java/io/xxlabs/messenger/backup/ui/list/RestoreListFragment.kt

 package io.xxlabs.messenger.backup.ui.list
 
+import android.content.Context
 import android.os.Bundle
 import android.view.View
 import androidx.activity.OnBackPressedCallback
@@ -30,8 +31,8 @@ class RestoreListFragment : BackupLocationsFragment() {
 
     /* UI */
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
         maybePreventBackNavigation()
     }
 
@@ -46,6 +47,7 @@ class RestoreListFragment : BackupLocationsFragment() {
                 override fun handleOnBackPressed() {
                     try {
                         if (backupViewModel.allowBackNavigation()) {
+                            isEnabled = false
                             requireActivity().onBackPressed()
                         } else {
                             requireActivity().finish()

app/src/main/java/io/xxlabs/messenger/ui/intro/registration/welcome/RegistrationWelcomeFragment.kt

@@ -42,7 +42,6 @@ class RegistrationWelcomeFragment : RegistrationFlowFragment() {
         )
     }
 
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,

app/src/main/res/values/strings.xml

@@ -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_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="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_username_hint">Username</string>
     <string name="sftp_login_password_hint">Password</string>