users get directly onto the ssh-key selection screen rather than having to do it manually

1 files changed, 12 insertions, 3 deletions

diff --git a/app/src/main/java/com/zeapo/pwdstore/UserPreference.java b/app/src/main/java/com/zeapo/pwdstore/UserPreference.java
index fa4ee9c9..f811efea 100644
--- a/app/src/main/java/com/zeapo/pwdstore/UserPreference.java
+++ b/app/src/main/java/com/zeapo/pwdstore/UserPreference.java
@@ -41,6 +41,11 @@ public class UserPreference extends ActionBarActivity implements Preference.OnPr
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        if (getIntent() != null) {
+            if (getIntent().getStringExtra("operation").equals("get_ssh_key")) {
+                getSshKey();
+            }
+        }
 
         getFragmentManager().beginTransaction()
                 .replace(android.R.id.content, new PrefsFragment()).commit();
@@ -63,6 +68,12 @@ public class UserPreference extends ActionBarActivity implements Preference.OnPr
         return super.onOptionsItemSelected(item);
     }
 
+    public void getSshKey() {
+        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+        intent.setType("*/*");
+        startActivityForResult(intent, 1);
+    }
+
     @Override
     public boolean onPreferenceClick(Preference pref) {
         if (pref.getKey().equals("openpgp_key_id")) {
@@ -70,9 +81,7 @@ public class UserPreference extends ActionBarActivity implements Preference.OnPr
             intent.putExtra("Operation", "GET_KEY_ID");
             startActivityForResult(intent, 0);
         } else if (pref.getKey().equals("ssh_key")) {
-            Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
-            intent.setType("*/*");
-            startActivityForResult(intent, 1);
+            getSshKey();
         }
         return true;
     }