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

refresh list after pull and removal

Browse source
This commit is contained in:
Zeapo 2014-08-09 01:25:56 +01:00
parent fca8ab5bd6
commit 265ac86903
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -59,6 +59,7 @@ public class GitAsyncTask extends AsyncTask<GitCommand, Integer, Integer> {
Log.i("GIT_ASYNC", result + ""); Log.i("GIT_ASYNC", result + "");
this.dialog.dismiss(); this.dialog.dismiss();
if (finishOnEnd) { if (finishOnEnd) {
this.activity.setResult(Activity.RESULT_OK);
this.activity.finish(); this.activity.finish();
} }
} }

7
app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
View file

@ -102,14 +102,14 @@ public class PasswordStore extends Activity implements ToCloneOrNot.OnFragmentI
case R.id.git_push: case R.id.git_push:
intent = new Intent(this, GitHandler.class); intent = new Intent(this, GitHandler.class);
intent.putExtra("Operation", GitHandler.REQUEST_PUSH); intent.putExtra("Operation", GitHandler.REQUEST_PUSH);
startActivity(intent); startActivityForResult(intent, GitHandler.REQUEST_PUSH);
this.leftActivity = true; this.leftActivity = true;
return true; return true;
case R.id.git_pull: case R.id.git_pull:
intent = new Intent(this, GitHandler.class); intent = new Intent(this, GitHandler.class);
intent.putExtra("Operation", GitHandler.REQUEST_PULL); intent.putExtra("Operation", GitHandler.REQUEST_PULL);
startActivity(intent); startActivityForResult(intent, GitHandler.REQUEST_PULL);
this.leftActivity = true; this.leftActivity = true;
return true; return true;
@ -253,6 +253,9 @@ public class PasswordStore extends Activity implements ToCloneOrNot.OnFragmentI
protected void onActivityResult(int requestCode, int resultCode, protected void onActivityResult(int requestCode, int resultCode,
Intent data) { Intent data) {
if (resultCode == RESULT_CANCELED)
refreshListAdapter();
if (resultCode == RESULT_OK) { if (resultCode == RESULT_OK) {
refreshListAdapter(); refreshListAdapter();

2
app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
View file

@ -452,7 +452,7 @@ public class PgpHandler extends Activity {
git.rm().addFilepattern(getIntent().getExtras().getString("FILE_PATH").replace(PasswordRepository.getWorkTree() + "/", "")), git.rm().addFilepattern(getIntent().getExtras().getString("FILE_PATH").replace(PasswordRepository.getWorkTree() + "/", "")),
git.commit().setMessage("[ANDROID PwdStore] Remove " + getIntent().getExtras().getString("FILE_PATH") + " from store.") git.commit().setMessage("[ANDROID PwdStore] Remove " + getIntent().getExtras().getString("FILE_PATH") + " from store.")
); );
setResult(RESULT_OK); setResult(RESULT_CANCELED);
finish(); finish();
} }
}) })