From 2c929441a791889b9fdd2342702118563442ef7d Mon Sep 17 00:00:00 2001 From: knuthy Date: Mon, 29 Sep 2014 21:47:29 +0200 Subject: a simple solution to resolve #13 --- .../java/com/zeapo/pwdstore/PasswordStore.java | 39 +++++++++++++--------- .../zeapo/pwdstore/utils/PasswordRepository.java | 7 +++- 2 files changed, 30 insertions(+), 16 deletions(-) (limited to 'app/src/main/java') diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java index 4fadb65e..4d3ed8ee 100644 --- a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java +++ b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java @@ -10,19 +10,11 @@ import android.content.SharedPreferences; import android.net.Uri; import android.os.Bundle; import android.preference.PreferenceManager; -import android.text.InputType; import android.util.Log; import android.view.Menu; import android.view.MenuItem; import android.view.View; -import android.widget.AdapterView; -import android.widget.EditText; -import android.widget.ExpandableListView; -import android.widget.LinearLayout; - -import com.jcraft.jsch.JSch; -import com.jcraft.jsch.JSchException; -import com.jcraft.jsch.Session; + import com.zeapo.pwdstore.crypto.PgpHandler; import com.zeapo.pwdstore.utils.PasswordItem; import com.zeapo.pwdstore.utils.PasswordRepository; @@ -30,12 +22,6 @@ import com.zeapo.pwdstore.utils.PasswordRepository; import org.apache.commons.io.FileUtils; import org.eclipse.jgit.api.CommitCommand; import org.eclipse.jgit.api.Git; -import org.eclipse.jgit.revwalk.RevCommit; -import org.eclipse.jgit.transport.JschConfigSessionFactory; -import org.eclipse.jgit.transport.OpenSshConfig; -import org.eclipse.jgit.transport.SshSessionFactory; -import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider; -import org.eclipse.jgit.util.FS; import java.io.File; import java.io.IOException; @@ -91,6 +77,14 @@ public class PasswordStore extends Activity implements ToCloneOrNot.OnFragmentI int id = item.getItemId(); Intent intent; + AlertDialog.Builder initBefore = new AlertDialog.Builder(this) + .setMessage("Please clone or create a new repository below before trying to add a password or any synchronization operation.") + .setPositiveButton("OK", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialogInterface, int i) { + } + }); + switch (id) { case R.id.user_pref: try { @@ -104,6 +98,11 @@ public class PasswordStore extends Activity implements ToCloneOrNot.OnFragmentI return true; case R.id.menu_add_password: + if (PasswordRepository.isInitialized()) { + initBefore.show(); + break; + } + createPassword(getCurrentFocus()); break; @@ -111,6 +110,11 @@ public class PasswordStore extends Activity implements ToCloneOrNot.OnFragmentI // break; case R.id.git_push: + if (PasswordRepository.isInitialized()) { + initBefore.show(); + break; + } + intent = new Intent(this, GitHandler.class); intent.putExtra("Operation", GitHandler.REQUEST_PUSH); startActivityForResult(intent, GitHandler.REQUEST_PUSH); @@ -118,6 +122,11 @@ public class PasswordStore extends Activity implements ToCloneOrNot.OnFragmentI return true; case R.id.git_pull: + if (PasswordRepository.isInitialized()) { + initBefore.show(); + break; + } + intent = new Intent(this, GitHandler.class); intent.putExtra("Operation", GitHandler.REQUEST_PULL); startActivityForResult(intent, GitHandler.REQUEST_PULL); diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java index 289f9f43..3e40d4b9 100644 --- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java +++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java @@ -26,6 +26,7 @@ import static java.util.Collections.sort; public class PasswordRepository { private static Repository repository; + private static boolean initialized = false; protected PasswordRepository(){ } @@ -37,7 +38,7 @@ public class PasswordRepository { .readEnvironment() .findGitDir() .build(); - + initialized = true; } catch (Exception e) { e.printStackTrace(); return null; @@ -46,6 +47,10 @@ public class PasswordRepository { return repository; } + public static boolean isInitialized() { + return initialized; + } + public static void createRepository(File localDir) { localDir.delete(); -- cgit v1.2.3 From 2fd688bd27431bb60248701f43dbab0fcec4f0c2 Mon Sep 17 00:00:00 2001 From: knuthy Date: Mon, 29 Sep 2014 22:04:47 +0200 Subject: show toast on copy and dismiss dialog if error on openkeychain --- app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java | 12 ++++++++++++ app/src/main/res/layout/decrypt_layout.xml | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'app/src/main/java') diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java index 78902d8a..efeabc3e 100644 --- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java +++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java @@ -147,6 +147,9 @@ public class PgpHandler extends Activity implements OpenPgpServiceConnection.OnB case R.id.copy_password: ClipData clip = ClipData.newPlainText("pgp_handler_result_pm", ((TextView) findViewById(R.id.crypto_password_show)).getText()); clipboard.setPrimaryClip(clip); + showToast("Password copied to clipboard, you have " + + Integer.parseInt(settings.getString("general_show_time", "45")) + + " seconds to paste it somewhere."); } return super.onOptionsItemSelected(item); } @@ -387,10 +390,19 @@ public class PgpHandler extends Activity implements OpenPgpServiceConnection.OnB break; } case OpenPgpApi.RESULT_CODE_ERROR: { + // TODO show what kind of error it is + /* For example: + * No suitable key found -> no key in OpenKeyChain + * + * Check in open-pgp-lib how their definitions and error code + */ showToast("ERROR"); OpenPgpError error = result.getParcelableExtra(OpenPgpApi.RESULT_ERROR); handleError(error); + + // close the dialog + bindingDialog.dismiss(); break; } diff --git a/app/src/main/res/layout/decrypt_layout.xml b/app/src/main/res/layout/decrypt_layout.xml index 300e1d49..6169dd19 100644 --- a/app/src/main/res/layout/decrypt_layout.xml +++ b/app/src/main/res/layout/decrypt_layout.xml @@ -77,7 +77,7 @@ Date: Wed, 1 Oct 2014 11:13:40 +0200 Subject: corrected a nasty bug, resolves #18 --- app/app-debug.apk | Bin 1717832 -> 1722187 bytes app/app-release.apk | Bin 1717802 -> 1722048 bytes .../java/com/zeapo/pwdstore/PasswordStore.java | 8 +++++--- .../zeapo/pwdstore/utils/PasswordRepository.java | 6 +++++- 4 files changed, 10 insertions(+), 4 deletions(-) (limited to 'app/src/main/java') diff --git a/app/app-debug.apk b/app/app-debug.apk index e33901e3..bfc43cd3 100644 Binary files a/app/app-debug.apk and b/app/app-debug.apk differ diff --git a/app/app-release.apk b/app/app-release.apk index 677e0032..8bc3a101 100644 Binary files a/app/app-release.apk and b/app/app-release.apk differ diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java index 4d3ed8ee..a613b021 100644 --- a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java +++ b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java @@ -98,7 +98,7 @@ public class PasswordStore extends Activity implements ToCloneOrNot.OnFragmentI return true; case R.id.menu_add_password: - if (PasswordRepository.isInitialized()) { + if (!PasswordRepository.isInitialized()) { initBefore.show(); break; } @@ -110,7 +110,7 @@ public class PasswordStore extends Activity implements ToCloneOrNot.OnFragmentI // break; case R.id.git_push: - if (PasswordRepository.isInitialized()) { + if (!PasswordRepository.isInitialized()) { initBefore.show(); break; } @@ -122,7 +122,7 @@ public class PasswordStore extends Activity implements ToCloneOrNot.OnFragmentI return true; case R.id.git_pull: - if (PasswordRepository.isInitialized()) { + if (!PasswordRepository.isInitialized()) { initBefore.show(); break; } @@ -250,12 +250,14 @@ public class PasswordStore extends Activity implements ToCloneOrNot.OnFragmentI case 0: if(!localDir.equals(PasswordRepository.getWorkTree())) break; + PasswordRepository.setInitialized(false); ToCloneOrNot cloneFrag = new ToCloneOrNot(); fragmentTransaction.replace(R.id.main_layout, cloneFrag, "ToCloneOrNot"); fragmentTransaction.commit(); break; default: + PasswordRepository.setInitialized(true); PasswordFragment passFrag = new PasswordFragment(); Bundle args = new Bundle(); args.putString("Path", localDir.getAbsolutePath()); diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java index 3e40d4b9..24a1524c 100644 --- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java +++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java @@ -38,7 +38,6 @@ public class PasswordRepository { .readEnvironment() .findGitDir() .build(); - initialized = true; } catch (Exception e) { e.printStackTrace(); return null; @@ -51,6 +50,10 @@ public class PasswordRepository { return initialized; } + public static void setInitialized(boolean v) { + initialized = v; + } + public static void createRepository(File localDir) { localDir.delete(); @@ -71,6 +74,7 @@ public class PasswordRepository { .setName("master") .call(); + initialized = true; } catch (Exception e) { e.printStackTrace(); return; -- cgit v1.2.3 From ff3c3f94d1066b568921c8879076b0348d8410e9 Mon Sep 17 00:00:00 2001 From: knuthy Date: Wed, 1 Oct 2014 11:47:23 +0200 Subject: improves the clone screen --- app/app-debug.apk | Bin 1722187 -> 1722591 bytes app/app-release.apk | Bin 1722048 -> 1722615 bytes .../main/java/com/zeapo/pwdstore/GitHandler.java | 50 ++++++++++++++++---- app/src/main/res/layout/activity_git_clone.xml | 51 +++++++++++---------- 4 files changed, 68 insertions(+), 33 deletions(-) (limited to 'app/src/main/java') diff --git a/app/app-debug.apk b/app/app-debug.apk index bfc43cd3..f861a20a 100644 Binary files a/app/app-debug.apk and b/app/app-debug.apk differ diff --git a/app/app-release.apk b/app/app-release.apk index 8bc3a101..8d12a019 100644 Binary files a/app/app-release.apk and b/app/app-release.apk differ diff --git a/app/src/main/java/com/zeapo/pwdstore/GitHandler.java b/app/src/main/java/com/zeapo/pwdstore/GitHandler.java index c487ce0f..e0fa9755 100644 --- a/app/src/main/java/com/zeapo/pwdstore/GitHandler.java +++ b/app/src/main/java/com/zeapo/pwdstore/GitHandler.java @@ -9,6 +9,7 @@ import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; import android.text.InputType; +import android.view.KeyEvent; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -32,6 +33,7 @@ import org.apache.commons.io.FileUtils; import org.eclipse.jgit.api.GitCommand; import org.eclipse.jgit.api.PullCommand; import org.eclipse.jgit.api.PushCommand; +import org.eclipse.jgit.diff.Edit; import org.eclipse.jgit.errors.UnsupportedCredentialItem; import org.eclipse.jgit.transport.CredentialItem; import org.eclipse.jgit.transport.CredentialsProvider; @@ -80,7 +82,7 @@ public class GitHandler extends Activity { settings = PreferenceManager.getDefaultSharedPreferences(this.context); protocol = settings.getString("git_remote_protocol", "ssh://"); - connectionMode = settings.getString("git_remote_auth", "username/password"); + connectionMode = settings.getString("git_remote_auth", "ssh-key"); switch (getIntent().getExtras().getInt("Operation")) { case REQUEST_CLONE: @@ -139,6 +141,30 @@ public class GitHandler extends Activity { } }); + + // init the server information + EditText server_url = ((EditText) findViewById(R.id.server_url)); + EditText server_port = ((EditText) findViewById(R.id.server_port)); + EditText server_path = ((EditText) findViewById(R.id.server_path)); + EditText server_user = ((EditText) findViewById(R.id.server_user)); + + View.OnKeyListener updateListener = new View.OnKeyListener() { + @Override + public boolean onKey(View view, int i, KeyEvent keyEvent) { + updateURI(); + return false; + } + }; + + server_url.setText(settings.getString("git_remote_server", "")); + server_port.setText("" + settings.getInt("git_remote_server_port", 22)); + server_user.setText(settings.getString("git_remote_username", "")); + server_path.setText(settings.getString("git_remote_location", "")); + + server_url.setOnKeyListener(updateListener); + server_port.setOnKeyListener(updateListener); + server_user.setOnKeyListener(updateListener); + server_path.setOnKeyListener(updateListener); break; case REQUEST_PULL: authenticateAndRun("pullOperation"); @@ -152,23 +178,31 @@ public class GitHandler extends Activity { } - @Override - public void onResume() { - super.onResume(); - + public void updateURI() { EditText uri = (EditText) findViewById(R.id.clone_uri); + EditText server_url = ((EditText) findViewById(R.id.server_url)); + EditText server_port = ((EditText) findViewById(R.id.server_port)); + EditText server_path = ((EditText) findViewById(R.id.server_path)); + EditText server_user = ((EditText) findViewById(R.id.server_user)); + if (uri != null) { String hostname = - settings.getString("git_remote_username", "") + server_user.getText() + "@" + - settings.getString("git_remote_server", "").trim() + server_url.getText().toString().trim() + ":" + - settings.getString("git_remote_location", ""); + server_path.getText(); if (!hostname.equals("@:")) uri.setText(hostname); } } + @Override + public void onResume() { + super.onResume(); + updateURI(); + } + @Override public boolean onCreateOptionsMenu(Menu menu) { // Inflate the menu; this adds items to the action bar if it is present. diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml index 7aa9eea9..721980cb 100644 --- a/app/src/main/res/layout/activity_git_clone.xml +++ b/app/src/main/res/layout/activity_git_clone.xml @@ -44,6 +44,31 @@ android:layout_toRightOf="@+id/label_server_protocol" /> + + + + + + - - - - - - Date: Wed, 1 Oct 2014 23:20:51 +0200 Subject: Improved clone screen and added preliminary support for custom ports, fix #14 --- .../main/java/com/zeapo/pwdstore/GitHandler.java | 62 ++++++++++++++++++++-- app/src/main/res/layout/activity_git_clone.xml | 37 ++++++++++--- app/src/main/res/values/strings.xml | 3 ++ 3 files changed, 92 insertions(+), 10 deletions(-) (limited to 'app/src/main/java') diff --git a/app/src/main/java/com/zeapo/pwdstore/GitHandler.java b/app/src/main/java/com/zeapo/pwdstore/GitHandler.java index e0fa9755..644632cb 100644 --- a/app/src/main/java/com/zeapo/pwdstore/GitHandler.java +++ b/app/src/main/java/com/zeapo/pwdstore/GitHandler.java @@ -9,6 +9,7 @@ import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; import android.text.InputType; +import android.util.Log; import android.view.KeyEvent; import android.view.Menu; import android.view.MenuItem; @@ -48,6 +49,10 @@ import org.eclipse.jgit.util.FS; import java.io.File; import java.io.IOException; import java.lang.reflect.Method; +import java.net.URI; +import java.net.URL; +import java.util.regex.Matcher; +import java.util.regex.Pattern; // TODO move the messages to strings.xml @@ -147,6 +152,7 @@ public class GitHandler extends Activity { EditText server_port = ((EditText) findViewById(R.id.server_port)); EditText server_path = ((EditText) findViewById(R.id.server_path)); EditText server_user = ((EditText) findViewById(R.id.server_user)); + final EditText server_uri = ((EditText)findViewById(R.id.clone_uri)); View.OnKeyListener updateListener = new View.OnKeyListener() { @Override @@ -165,6 +171,15 @@ public class GitHandler extends Activity { server_port.setOnKeyListener(updateListener); server_user.setOnKeyListener(updateListener); server_path.setOnKeyListener(updateListener); + + server_uri.setOnKeyListener(new View.OnKeyListener() { + @Override + public boolean onKey(View view, int i, KeyEvent keyEvent) { + splitURI(); + return false; + } + }); + break; case REQUEST_PULL: authenticateAndRun("pullOperation"); @@ -178,7 +193,8 @@ public class GitHandler extends Activity { } - public void updateURI() { + /** Fills in the server_uri field with the information coming from other fields */ + private void updateURI() { EditText uri = (EditText) findViewById(R.id.clone_uri); EditText server_url = ((EditText) findViewById(R.id.server_url)); EditText server_port = ((EditText) findViewById(R.id.server_port)); @@ -190,13 +206,53 @@ public class GitHandler extends Activity { server_user.getText() + "@" + server_url.getText().toString().trim() - + ":" + - server_path.getText(); + + ":"; + if (server_port.getText().toString().equals("22")) { + hostname += server_path.getText().toString(); + } else { + TextView warn_url = (TextView) findViewById(R.id.warn_url); + if (!server_path.getText().toString().matches("/.*")) { + warn_url.setText(R.string.warn_malformed_url_port); + warn_url.setVisibility(View.VISIBLE); + } else { + warn_url.setVisibility(View.GONE); + } + hostname += server_port.getText().toString() + server_path.getText().toString(); + } if (!hostname.equals("@:")) uri.setText(hostname); } } + /** Splits the information in server_uri into the other fields */ + private void splitURI() { + EditText server_uri = (EditText) findViewById(R.id.clone_uri); + EditText server_url = ((EditText) findViewById(R.id.server_url)); + EditText server_port = ((EditText) findViewById(R.id.server_port)); + EditText server_path = ((EditText) findViewById(R.id.server_path)); + EditText server_user = ((EditText) findViewById(R.id.server_user)); + + String uri = server_uri.getText().toString(); + Pattern pattern = Pattern.compile("(.+)@([\\w\\d\\.]+):([\\d]+)*(.*)"); + Matcher matcher = pattern.matcher(uri); + if (matcher.find()) { + int count = matcher.groupCount(); + Log.i("GIT", ">> " + count); + if (count > 1) { + server_user.setText(matcher.group(1)); + server_url.setText(matcher.group(2)); + } + if (count == 3) { + server_path.setText(matcher.group(3)); + server_port.setText("22"); + } + if (count == 4) { + server_port.setText(matcher.group(3)); + server_path.setText(matcher.group(4)); + } + } + } + @Override public void onResume() { super.onResume(); diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml index 721980cb..12182238 100644 --- a/app/src/main/res/layout/activity_git_clone.xml +++ b/app/src/main/res/layout/activity_git_clone.xml @@ -137,6 +137,13 @@ android:layout_alignParentEnd="true"/> + - + android:orientation="horizontal" + android:layout_gravity="center_vertical"> + + + + + +