kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
zeapo 2014-10-19 22:42:07 +02:00
parent 01a1522194
commit 7469b865b6
4 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/com/zeapo/pwdstore/GitHandler.java
View file

@ -651,6 +651,7 @@ public class GitHandler extends ActionBarActivity {
public void onClick(DialogInterface dialog, int id) {
try {
Intent intent = new Intent(getApplicationContext(), UserPreference.class);
intent.putExtra("operation", "get_ssh_key");
startActivityForResult(intent, GET_SSH_KEY_FROM_CLONE);
} catch (Exception e) {
System.out.println("Exception caught :(");

1
app/src/main/java/com/zeapo/pwdstore/PasswordFragment.java
View file

@ -82,7 +82,6 @@ public class PasswordFragment extends Fragment{
if (item.getType() == PasswordItem.TYPE_CATEGORY) {
passListStack.push((ArrayList<PasswordItem>) recyclerAdapter.getValues().clone());
scrollPosition.push(recyclerView.getVerticalScrollbarPosition());
Log.d("FRAG", scrollPosition.peek() + "");
recyclerView.scrollToPosition(0);
recyclerAdapter.clear();
recyclerAdapter.addAll(PasswordRepository.getPasswords(item.getFile()));

15
app/src/main/java/com/zeapo/pwdstore/UserPreference.java
View file

@ -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;
}

2
app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java
View file

@ -89,6 +89,8 @@ public class PasswordRecyclerAdapter extends RecyclerView.Adapter<PasswordRecycl
listener.onFragmentInteraction(pass);
}
});
}
// Return the size of your dataset (invoked by the layout manager)