From 499480f80b26668f1a8c3786ff9cb33bc4c1c55b Mon Sep 17 00:00:00 2001 From: knuthy Date: Mon, 29 Sep 2014 22:06:23 +0200 Subject: version bump and generated release and debug apk --- app/app-debug.apk | Bin 1717862 -> 1717832 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'app/app-debug.apk') diff --git a/app/app-debug.apk b/app/app-debug.apk index 4586e48c..e33901e3 100644 Binary files a/app/app-debug.apk and b/app/app-debug.apk differ -- cgit v1.2.3 From 7264494a02f40d840e1296ffd6c1544d4c7d915b Mon Sep 17 00:00:00 2001 From: knuthy 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/app-debug.apk') 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/app-debug.apk') 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" /> + + + + + + - - - - - -