From f48bd5faa01c191f355fd5ebdc2e98f0579b591f Mon Sep 17 00:00:00 2001
From: zeapo <mohamed@zenadi.com>
Date: Wed, 17 Dec 2014 22:55:45 +0100
Subject: git tasks refactoring (clone working)

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/res/values/strings.xml')

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 86885674..1167c5af 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -41,7 +41,7 @@
     <!-- Git Async Task -->
     <string name="running_dialog_text">Running command...</string>
     <string name="jgit_error_dialog_title">Internal exception occurred</string>
-    <string name="jgit_error_dialog_text">Message from jgit: /n</string>
+    <string name="jgit_error_dialog_text">Message from jgit: \n</string>
 
     <!-- Git Handler -->
     <string name="read_only_dialog_text">You are about to use a read-only repository, you will not be able to push to it</string>
-- 
cgit v1.2.3


From 1c2b000847b73c482154f5ccc15cf2cfb9865c4d Mon Sep 17 00:00:00 2001
From: zeapo <mohamed@zenadi.com>
Date: Sun, 4 Jan 2015 18:58:59 +0100
Subject: some tweak, and forgot strings

---
 app/src/androidTest/java/com/zeapo/pwdstore/GitActivityClone.java | 3 +--
 app/src/main/java/com/zeapo/pwdstore/UserPreference.java          | 3 ++-
 app/src/main/res/values/strings.xml                               | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'app/src/main/res/values/strings.xml')

diff --git a/app/src/androidTest/java/com/zeapo/pwdstore/GitActivityClone.java b/app/src/androidTest/java/com/zeapo/pwdstore/GitActivityClone.java
index efe67d8b..10d33472 100644
--- a/app/src/androidTest/java/com/zeapo/pwdstore/GitActivityClone.java
+++ b/app/src/androidTest/java/com/zeapo/pwdstore/GitActivityClone.java
@@ -79,7 +79,6 @@ public class GitActivityClone extends ActivityInstrumentationTestCase2<GitActivi
         gitActivity.runOnUiThread(new Runnable() {
             public void run() {
                 protocolSpinner.setSelection(0); // ssh://
-                connectionModeSpinner.setSelection(1); // user/pwd
             }
         });
 
@@ -92,11 +91,11 @@ public class GitActivityClone extends ActivityInstrumentationTestCase2<GitActivi
         solo.clearEditText(server_url);
         solo.enterText(server_url, "192.168.1.28");
 
-
         mInstrumentation.waitForIdleSync();
 
         gitActivity.runOnUiThread(new Runnable() {
             public void run() {
+                connectionModeSpinner.setSelection(1); // user/pwd
                 ((Button) gitActivity.findViewById(R.id.clone_button)).performClick();
             }
         });
diff --git a/app/src/main/java/com/zeapo/pwdstore/UserPreference.java b/app/src/main/java/com/zeapo/pwdstore/UserPreference.java
index 65c7e484..43198738 100644
--- a/app/src/main/java/com/zeapo/pwdstore/UserPreference.java
+++ b/app/src/main/java/com/zeapo/pwdstore/UserPreference.java
@@ -10,6 +10,7 @@ import android.preference.PreferenceFragment;
 import android.support.v7.app.ActionBarActivity;
 import android.util.Log;
 import android.view.MenuItem;
+import android.widget.Toast;
 
 import com.zeapo.pwdstore.crypto.PgpHandler;
 import com.zeapo.pwdstore.git.GitActivity;
@@ -153,7 +154,7 @@ public class UserPreference extends ActionBarActivity implements Preference.OnPr
                 {
                     try {
                         copySshKey(data.getData());
-                        Log.i("PREF", "Got key");
+                        Toast.makeText(this, this.getResources().getString(R.string.ssh_key_success_dialog_title), Toast.LENGTH_LONG).show();
                         setResult(RESULT_OK);
                         finish();
                     } catch (IOException e)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1167c5af..1d5ac4a5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -108,6 +108,7 @@
     <string name="pref_password_dialog_title">Set the time you want the password to be in clipboard</string>
     <string name="pref_copy_title">Automatically Copy Password</string>
     <string name="pref_copy_dialog_title">Automatically copy the password to the clipboard after decryption was successful.</string>
+    <string name="ssh_key_success_dialog_title" translatable="false">SSH-key imported</string>
     <string name="ssh_key_error_dialog_title">Error while trying to import the ssh-key</string>
     <string name="ssh_key_error_dialog_text">Message : \n</string>
     <string name="pref_recursive_filter">Recursive filtering</string>
-- 
cgit v1.2.3


From 6922652173e05433bb9524b036baafb96c91ca1b Mon Sep 17 00:00:00 2001
From: zeapo <mohamed@zenadi.com>
Date: Sun, 4 Jan 2015 21:47:38 +0100
Subject: set title when cloning/editing the server info

---
 app/src/main/java/com/zeapo/pwdstore/git/GitActivity.java | 1 +
 app/src/main/res/values/strings.xml                       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'app/src/main/res/values/strings.xml')

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 6307fd0d..637d2052 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/GitActivity.java
+++ b/app/src/main/java/com/zeapo/pwdstore/git/GitActivity.java
@@ -79,6 +79,7 @@ public class GitActivity extends ActionBarActivity {
             case REQUEST_CLONE:
             case EDIT_SERVER:
                 setContentView(R.layout.activity_git_clone);
+                setTitle(R.string.title_activity_git_clone);
 
                 final Spinner protcol_spinner = (Spinner) findViewById(R.id.clone_protocol);
                 final Spinner connection_mode_spinner = (Spinner) findViewById(R.id.connection_mode);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1d5ac4a5..8cf8d140 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,7 +12,7 @@
     <string name="dialog_delete_msg">Target directory already exist. Current version support only a single store. Do you want to delete the current password store directory?</string>
     <string name="dialog_delete">Delete directory</string>
     <string name="dialog_do_not_delete">Cancel</string>
-    <string name="title_activity_git_clone">Clone repository</string>
+    <string name="title_activity_git_clone">Repository information</string>
     
     <!-- Password Store -->
     <string name="creation_dialog_text">Please clone or create a new repository below before trying to add a password or any synchronization operation.</string>
-- 
cgit v1.2.3