Remove remaining usage of sshPrivateKeyPassword

Author: gujjwal00

app/src/androidTest/java/com/gaurav/avnc/ui/vnc/LoginFragmentTest.kt

@@ -143,22 +143,6 @@ class LoginFragmentTest {
         assertEquals(SAMPLE_PASSWORD, p.sshPassword)
     }
 
-    // We no longer save Private Key password. It is always asked from user and a message is shown to users
-    // who have previously saved key password.
-    @Test
-    fun sshKeyPasswordMigrationMessage() = Scenario(ServerProfile(sshPrivateKeyPassword = "foo")).use { scenario ->
-        scenario.triggerLoginInfoRequest(LoginInfo.Type.SSH_KEY_PASSWORD)
-        onView(withId(R.id.password)).inDialog().checkWillBeDisplayed().doTypeText(SAMPLE_PASSWORD)
-        onView(withId(R.id.remember)).inDialog().checkIsNotDisplayed()
-        onView(withId(R.id.pk_password_msg)).inDialog().checkIsDisplayed()
-        onView(withText(android.R.string.ok)).inDialog().checkIsDisplayed().doClick()
-
-        val l = scenario.waitForLoginInfo()
-        val p = scenario.triggerLoginSave()
-        assertEquals(SAMPLE_PASSWORD, l.password)
-        assertEquals("", p.sshPrivateKeyPassword) // Saved password should have been cleared
-    }
-
     /**
      * If login information is already available in profile,
      * [VncViewModel] should provide it without triggering login dialog.

app/src/main/java/com/gaurav/avnc/ui/vnc/LoginFragment.kt

@@ -69,7 +69,6 @@ class LoginFragment : DialogFragment() {
 
         if (loginType == LoginInfo.Type.SSH_KEY_PASSWORD) {
             binding.passwordLayout.setHint(R.string.hint_key_password)
-            binding.pkPasswordMsg.isVisible = viewModel.profile.sshPrivateKeyPassword.isNotBlank()
         }
 
         setupAutoComplete()
@@ -112,14 +111,14 @@ class LoginFragment : DialogFragment() {
                 p.password = l.password
             }
             LoginInfo.Type.SSH_PASSWORD -> p.sshPassword = l.password
-            LoginInfo.Type.SSH_KEY_PASSWORD -> p.sshPrivateKeyPassword = "" /* key password is not saved anymore */
+            LoginInfo.Type.SSH_KEY_PASSWORD -> Unit /* Key password is not saved in profile */
         }
     }
 
     private fun onOk() {
         loginInfo.password = getRealPassword(loginInfo.password)
         viewModel.loginInfoRequest.offerResponse(loginInfo)
-        if (binding.remember.isChecked || binding.pkPasswordMsg.isVisible /* to forget saved password */)
+        if (binding.remember.isChecked)
             saveLoginInfo(loginInfo)
     }
 

app/src/main/java/com/gaurav/avnc/viewmodel/PrefsViewModel.kt

@@ -117,7 +117,6 @@ class PrefsViewModel(app: Application) : BaseViewModel(app) {
             it.password = ""
             it.sshPassword = ""
             it.sshPrivateKey = ""
-            it.sshPrivateKeyPassword = ""
         }
     }
 }

app/src/main/res/layout/fragment_credential.xml

@@ -70,18 +70,5 @@
             android:layout_margin="@dimen/margin_small"
             android:text="@string/title_remember"
             android:textAppearance="@style/TextAppearance.MaterialComponents.Body2" />
-
-        <TextView
-            android:id="@+id/pk_password_msg"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="@dimen/margin_normal"
-            android:drawablePadding="@dimen/padding_small"
-            android:text="@string/msg_pk_password_not_saved"
-            android:visibility="gone"
-            app:drawableStartCompat="@drawable/ic_info"
-            app:drawableTint="@color/material_on_background_disabled"
-            tools:visibility="visible" />
-
     </LinearLayout>
 </layout>

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

@@ -87,7 +87,6 @@
     <string name="msg_invalid_vnc_uri">VNC URI غير صالح</string>
     <string name="msg_copied_to_clipboard">تم النسخ</string>
     <string name="msg_tap_to_select_a_key">انقر لتحديد مفتاح:</string>
-    <string name="msg_pk_password_not_saved">لقد توقف AVNC عن حفظ كلمات مرور المفاتيح الخاصة لتحسين الأمان.</string>
     <string name="msg_button_up_delay_help">يمكن أن يساعد تأخير عمليات النقر في بعض الحالات النادرة إذا كان التطبيق لا يستجيب للنقرات.</string>
     <string name="msg_wake_on_lan_help">يمكن استخدام التشغيل عبر شبكة LAN لتشغيل الكمبيوتر عن بُعد.\n\nقم أولاً بتكوين WoL على الكمبيوتر البعيد، ثم قم بتفعيلها في AVNC.\nبمجرد تفعيلها، سيتم إرسال حزمة WoL السحرية تلقائيًا قبل الاتصال بهذا الخادم.</string>
     <string name="msg_drag_gesture_help">تعيين إجراء لهذه الإيماءة سيؤدي إلى تغيير التعرف على الضغط المطول: \n\n<b>اضغط مع الاستمرار ثم حرر</b> → الضغط المطول\n<b>الضغط المطول والتمرير</b> → اضغط مع الاستمرار ثم مرر</string>

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

@@ -72,7 +72,6 @@
     <string name="msg_required">Vyžadováno</string>
     <string name="msg_invalid_mac_address">Neplatná MAC adresa</string>
     <string name="msg_invalid_vnc_uri">Neplatné VNC URI</string>
-    <string name="msg_pk_password_not_saved">Pro zlepšení bezpečnosti už AVNC neukládá osobní klíč.</string>
     <string name="msg_button_up_delay_help">Zpoždění události může pomoci v některých vzácných případech, pokud aplikace nereaguje na kliknutí.</string>
     <string name="msg_tap_to_select_a_key">Klepněte pro výběr klíče:</string>
     <string name="msg_gesture_style_help"><b>Dotyková obrazovka</b>\nAkce v bodu dotyku\n\n<b>Dotyková plocha</b>\nAkce na pozici ukazatele</string>

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

@@ -198,7 +198,6 @@
     <string name="msg_zoom_locked">Zoom gesperrt</string>
     <string name="msg_zoom_unlocked">Zoom entsperrt</string>
     <string name="hint_send_text_to_server">Text an den Server senden</string>
-    <string name="msg_pk_password_not_saved">Zur Verbesserung der Sicherheit speichert AVNC keine privaten Schlüsselpasswörter mehr.</string>
     <string name="tip_toolbar_usage">Wischen Sie vom Rand nach innen, um die Symbolleiste zu öffnen. Verwenden Sie sie, um die Tastatur zu öffnen, den Gestenstil zu ändern oder den Zoom zurückzusetzen.</string>
     <string name="tip_session_end">Um eine Sitzung zu beenden, tippen Sie auf die Navigationsschaltfläche „Zurück“, so als würden Sie von einem laufenden Video zurückgehen.</string>
     <string name="msg_viewer_tips_label">Ein paar Tipps für den Anfang</string>

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

@@ -104,7 +104,6 @@
     <string name="title_source_code">Codice sorgente</string>
     <string name="msg_about_app">Un client VNC veloce e sicuro. Visualizza e controlla da remoto qualsiasi dispositivo che esegue un server VNC.\n\n\nAVNC è un software open source e copyleft —realizzato con l\'aiuto di molti collaboratori.</string>
     <string name="msg_server_profile_added">Server aggiunto</string>
-    <string name="msg_pk_password_not_saved">AVNC non salva la password della chiave privata per migliorare la sicurezza.</string>
     <string name="msg_copied_to_clipboard">Copiato</string>
     <string name="title_unknown_ssh_host">Host SSH sconosciuto</string>
     <string name="title_continue">Continua</string>

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

@@ -202,7 +202,6 @@
     <string name="hint_ssh_port">SSH 호스트</string>
     <string name="msg_zoom_locked">줌 잠금</string>
     <string name="msg_viewer_tips_label">시작할 수 있는 몇 가지 팁</string>
-    <string name="msg_pk_password_not_saved">AVNC는 보안 향상을 위해 더 이상 개인 키 비밀번호를 저장하지 않습니다.</string>
     <string name="tip_toolbar_usage">가장자리에서 스와이프 인하여 도구 모음을 엽니다. 키보드를 열거나 제스처 스타일을 변경하거나 줌을 재설정하는 데 사용합니다.</string>
     <string name="desc_lock_zoom_btn">잠금 줌</string>
     <string name="pref_toolbar_open_with_swipe">가장자리에서 열리도록 스와이프 인</string>

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

@@ -153,7 +153,6 @@
     <string name="msg_about_app">Ātrs un drošs VNC klients. Pārraugiet un kontrolējiet jebkuru attālo ierīci, kurā darbojas VNC serveris.\n\n\nAVNC ir atvērtā koda un kopēttieši lietotne, kas izstrādāta ar daudzu dalībnieku palīdzību.</string>
     <string name="msg_pip_not_supported">Netiek atbalstīts šajā ierīcē</string>
     <string name="msg_invalid_key_file">Nederīga privātās atslēgas datne</string>
-    <string name="msg_pk_password_not_saved">AVNC vairs neuzglabā privāto atslēgu paroles, lai uzlabotu drošību.</string>
     <string name="msg_button_up_delay_help">Klikšķu notikumu aizkavēšana var palīdzēt dažos retos gadījumos, kad lietotne nereaģē uz klikšķiem.</string>
     <string name="msg_wake_on_lan_help">Pamodināt, kas atrodas vietējā tīkla zonā - Wake-on-LAN (WoL), var izmantot, lai attālināti ieslēgtu datoru.
 \n