summaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorHarsh Shandilya <me@msfjarvis.dev>2020-12-10 22:47:18 +0530
committerGitHub <noreply@github.com>2020-12-10 22:47:18 +0530
commitce2e657108187a34416cfbfc0c5d2fc8bb9277f3 (patch)
tree850810300c35213d54f8acccb1cbe474002f6829 /app/src/main/res
parentc02ad427be3652298f4a07a5f1a0d68e4ac44c45 (diff)
Better guidance for users to deal with host key changes (#1242)
* Provide actionable guidance for host key mismatches Signed-off-by: Harsh Shandilya <me@msfjarvis.dev> * Update changelog Signed-off-by: Harsh Shandilya <me@msfjarvis.dev> * Hide host key clear button after use Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/activity_git_clone.xml13
-rw-r--r--app/src/main/res/values/strings.xml2
2 files changed, 14 insertions, 1 deletions
diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml
index 1e59b462..04b8338c 100644
--- a/app/src/main/res/layout/activity_git_clone.xml
+++ b/app/src/main/res/layout/activity_git_clone.xml
@@ -11,7 +11,7 @@
android:background="?android:attr/windowBackground"
android:padding="@dimen/activity_horizontal_margin"
tools:background="@color/white"
- tools:context="dev.msfjarvis.aps.git.GitServerConfigActivity">
+ tools:context="dev.msfjarvis.aps.ui.git.config.GitServerConfigActivity">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@@ -120,5 +120,16 @@
android:text="@string/crypto_save"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/auth_mode_group" />
+
+ <com.google.android.material.button.MaterialButton
+ android:id="@+id/clear_host_key_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
+ android:text="@string/clear_saved_host_key"
+ android:visibility="gone"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/auth_mode_group"
+ tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 03a1689e..a57d0454 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -398,5 +398,7 @@
<string name="pref_proxy_settings">HTTP(S) proxy settings</string>
<string name="invalid_proxy_url">Invalid URL</string>
<string name="oreo_autofill_password_fill_and_conditional_save_support">Fill and save passwords (saving requires that no accessibility services are enabled)</string>
+ <string name="clear_saved_host_key">Clear saved host key</string>
+ <string name="clear_saved_host_key_success">Successfully cleared saved host key!</string>
</resources>