From f272e4dde2c05de64681a0e089387ef9c54bd7c7 Mon Sep 17 00:00:00 2001
From: vexofp <vexofp@gmail.com>
Date: Fri, 5 Apr 2019 18:14:38 -0400
Subject: Authentication using OpenKeystore SSH API (#486)

* Implemented OpenKeystore SSH API as a new authentication option

* Fix formatting problems

Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>

* Addressed review comments.

Removed leftover debugging code.
Wrapped excessively long lines.
Added missing new parameter to Javadoc.

* Merge remote-tracking branch 'upstream/master' into gpg-ssh-key
---
 app/src/main/res/values/arrays.xml  | 1 +
 app/src/main/res/values/strings.xml | 4 ++++
 2 files changed, 5 insertions(+)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 44698c41..77b93647 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -3,6 +3,7 @@
     <string-array name="connection_modes" translatable="false">
         <item>ssh-key</item>
         <item>username/password</item>
+        <item>OpenKeychain</item>
     </string-array>
     <string-array name="clone_protocols" translatable="false">
         <item>ssh://</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ba0fed4c..cc4888ca 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -252,4 +252,8 @@
     <string name="crypto_extra_edit_hint">username: something other extra content</string>
     <string name="get_last_changed_failed">Failed to get last changed date</string>
     <string name="hotp_pending">Tap copy to calculate HOTP</string>
+    <string name="openkeychain_ssh_api_connect_fail">Failed to connect to OpenKeychain SSH API service.</string>
+    <string name="no_ssh_api_provider">No SSH API provider found. Is OpenKeychain installed?</string>
+    <string name="ssh_api_pending_intent_failed">SSH API pending intent failed</string>
+    <string name="ssh_api_unknown_error">Unknown SSH API Error</string>
 </resources>
-- 
cgit v1.2.3