Merge pull request #64 from zeapo/feature/external_repo

clean up

1 files changed, 11 insertions, 6 deletions

diff --git a/app/src/main/java/com/zeapo/pwdstore/git/GitActivity.java b/app/src/main/java/com/zeapo/pwdstore/git/GitActivity.java
index ba05b939..0db20811 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/GitActivity.java
+++ b/app/src/main/java/com/zeapo/pwdstore/git/GitActivity.java
@@ -130,6 +130,13 @@ public class GitActivity extends ActionBarActivity {
                                     connection_mode_spinner.setSelection(1);
                                     connection_mode_spinner.setEnabled(false);
                                 }
+
+                                // however, if we have some saved that, that's more important!
+                                if (connectionMode.equals("ssh-key")) {
+                                    connection_mode_spinner.setSelection(0);
+                                } else {
+                                    connection_mode_spinner.setSelection(1);
+                                }
                             }
 
                             @Override
@@ -145,12 +152,6 @@ public class GitActivity extends ActionBarActivity {
                     protcol_spinner.setSelection(1);
                 }
 
-                if (connectionMode.equals("ssh-key")) {
-                    connection_mode_spinner.setSelection(0);
-                } else {
-                    connection_mode_spinner.setSelection(1);
-                }
-
                 // init the server information
                 final EditText server_url = ((EditText) findViewById(R.id.server_url));
                 final EditText server_port = ((EditText) findViewById(R.id.server_port));
@@ -594,6 +595,10 @@ public class GitActivity extends ActionBarActivity {
             GitOperation op;
 
             switch (requestCode) {
+                case REQUEST_CLONE:
+                    setResult(RESULT_OK);
+                    finish();
+                    return;
                 case REQUEST_PULL:
                     op = new PullOperation(localDir, activity).setCommand();
                     break;