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

little refactor and version bump

Browse source
This commit is contained in:
zeapo 2017-05-08 13:07:40 +02:00
parent 87a26c8808
commit 81c63e9402
3 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/build.gradle
View file

@ -9,8 +9,8 @@ android {
applicationId "com.zeapo.pwdstore" applicationId "com.zeapo.pwdstore"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 25 targetSdkVersion 25
versionCode 77 versionCode 78
versionName "1.2.0.57" versionName "1.2.0.58"
} }
compileOptions { compileOptions {
@ -58,10 +58,10 @@ android {
} }
dependencies { dependencies {
compile 'com.android.support:appcompat-v7:24.2.1' compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:recyclerview-v7:24.2.1' compile 'com.android.support:recyclerview-v7:25.3.1'
compile 'com.android.support:cardview-v7:24.2.1' compile 'com.android.support:cardview-v7:25.3.1'
compile 'com.android.support:design:24.2.1' compile 'com.android.support:design:25.3.1'
compile 'org.sufficientlysecure:openpgp-api:11.0' compile 'org.sufficientlysecure:openpgp-api:11.0'
compile 'com.nononsenseapps:filepicker:2.4.2' compile 'com.nononsenseapps:filepicker:2.4.2'
compile('org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r') { compile('org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r') {

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

@ -476,7 +476,7 @@ public class PasswordStore extends AppCompatActivity {
it.remove(); it.remove();
adapter.updateSelectedItems(position, selectedItems); adapter.updateSelectedItems(position, selectedItems);
commitAdd("[ANDROID PwdStore] Remove " + item + " from store."); commitChange("[ANDROID PwdStore] Remove " + item + " from store.");
deletePasswords(adapter, selectedItems); deletePasswords(adapter, selectedItems);
} }
}) })
@ -532,7 +532,7 @@ public class PasswordStore extends AppCompatActivity {
return PasswordRepository.getRepositoryDirectory(getApplicationContext()); return PasswordRepository.getRepositoryDirectory(getApplicationContext());
} }
private void commitAdd(final String message) { private void commitChange(final String message) {
new GitOperation(PasswordRepository.getRepositoryDirectory(activity), activity) { new GitOperation(PasswordRepository.getRepositoryDirectory(activity), activity) {
@Override @Override
public void execute() { public void execute() {
@ -556,18 +556,18 @@ public class PasswordStore extends AppCompatActivity {
settings.edit().putBoolean("repository_initialized", true).apply(); settings.edit().putBoolean("repository_initialized", true).apply();
break; break;
case PgpHandler.REQUEST_CODE_DECRYPT_AND_VERIFY: case PgpHandler.REQUEST_CODE_DECRYPT_AND_VERIFY:
// if went from decrypt->edit and user saved changes, we need to commitAdd // if went from decrypt->edit and user saved changes, we need to commitChange
if (data.getBooleanExtra("needCommit", false)) { if (data.getBooleanExtra("needCommit", false)) {
commitAdd(this.getResources().getString(R.string.edit_commit_text) + data.getExtras().getString("NAME")); commitChange(this.getResources().getString(R.string.edit_commit_text) + data.getExtras().getString("NAME"));
refreshListAdapter(); refreshListAdapter();
} }
break; break;
case PgpHandler.REQUEST_CODE_ENCRYPT: case PgpHandler.REQUEST_CODE_ENCRYPT:
commitAdd(this.getResources().getString(R.string.add_commit_text) + data.getExtras().getString("NAME") + this.getResources().getString(R.string.from_store)); commitChange(this.getResources().getString(R.string.add_commit_text) + data.getExtras().getString("NAME") + this.getResources().getString(R.string.from_store));
refreshListAdapter(); refreshListAdapter();
break; break;
case PgpHandler.REQUEST_CODE_EDIT: case PgpHandler.REQUEST_CODE_EDIT:
commitAdd(this.getResources().getString(R.string.edit_commit_text) + data.getExtras().getString("NAME")); commitChange(this.getResources().getString(R.string.edit_commit_text) + data.getExtras().getString("NAME"));
refreshListAdapter(); refreshListAdapter();
break; break;
case GitActivity.REQUEST_INIT: case GitActivity.REQUEST_INIT:
@ -622,7 +622,7 @@ public class PasswordStore extends AppCompatActivity {
// TODO this should show a warning to the user // TODO this should show a warning to the user
Log.e("Moving", "Something went wrong while moving."); Log.e("Moving", "Something went wrong while moving.");
} else { } else {
commitAdd("[ANDROID PwdStore] Moved " commitChange("[ANDROID PwdStore] Moved "
+ string.replace(PasswordRepository.getRepositoryDirectory(getApplicationContext()) + "/", "") + string.replace(PasswordRepository.getRepositoryDirectory(getApplicationContext()) + "/", "")
+ " to " + " to "
+ target.getAbsolutePath().replace(PasswordRepository.getRepositoryDirectory(getApplicationContext()) + "/", "") + target.getAbsolutePath().replace(PasswordRepository.getRepositoryDirectory(getApplicationContext()) + "/", "")

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

@ -3,6 +3,7 @@ package com.zeapo.pwdstore.git;
import android.app.Activity; import android.app.Activity;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.util.Log;
import com.zeapo.pwdstore.PasswordStore; import com.zeapo.pwdstore.PasswordStore;
import com.zeapo.pwdstore.R; import com.zeapo.pwdstore.R;
@ -38,6 +39,7 @@ public class GitAsyncTask extends AsyncTask<GitCommand, Integer, String> {
protected String doInBackground(GitCommand... commands) { protected String doInBackground(GitCommand... commands) {
Integer nbChanges = null; Integer nbChanges = null;
for (GitCommand command : commands) { for (GitCommand command : commands) {
Log.d("doInBackground", "Executing the command <" + command.toString() + ">");
try { try {
if (command instanceof StatusCommand) { if (command instanceof StatusCommand) {
// in case we have changes, we want to keep track of it // in case we have changes, we want to keep track of it