From 7469b865b64e8e7f91a749188fc3647cdbd72322 Mon Sep 17 00:00:00 2001 From: zeapo Date: Sun, 19 Oct 2014 22:42:07 +0200 Subject: users get directly onto the ssh-key selection screen rather than having to do it manually --- app/src/main/java/com/zeapo/pwdstore/UserPreference.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'app/src/main/java/com/zeapo/pwdstore/UserPreference.java') 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; } -- cgit v1.2.3