From 2c929441a791889b9fdd2342702118563442ef7d Mon Sep 17 00:00:00 2001
From: knuthy <knuthy@gmail.com>
Date: Mon, 29 Sep 2014 21:47:29 +0200
Subject: a simple solution to resolve #13

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

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/menu/pwdstore.xml b/app/src/main/res/menu/pwdstore.xml
index 65bc0272..a3f44f73 100644
--- a/app/src/main/res/menu/pwdstore.xml
+++ b/app/src/main/res/menu/pwdstore.xml
@@ -17,7 +17,7 @@
 
     <item android:id="@+id/referesh"
         android:title="Refresh list"
-        android:showAsAction="ifRoom"
+        android:showAsAction="never"
         android:icon="@drawable/ico_sync"/>
 
     <item android:id="@+id/user_pref"
-- 
cgit v1.2.3


From 2fd688bd27431bb60248701f43dbab0fcec4f0c2 Mon Sep 17 00:00:00 2001
From: knuthy <knuthy@gmail.com>
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/res')

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 @@
                 <ProgressBar
                     android:id="@+id/pbLoading"
                     android:layout_width="match_parent"
-                    android:layout_height="2dp"
+                    android:layout_height="8dp"
                     android:layout_marginTop="8dp"
                     android:layout_marginBottom="8dp"
                     style="?android:attr/progressBarStyleHorizontal"
-- 
cgit v1.2.3


From cc2883fe1b99c12f9e40295131c5d8e3ecaf16f9 Mon Sep 17 00:00:00 2001
From: knuthy <knuthy@gmail.com>
Date: Tue, 30 Sep 2014 00:46:58 +0200
Subject: a first draft, not complete yet

---
 app/src/main/res/drawable/bottom_line.xml      |  14 ++
 app/src/main/res/layout/activity_git_clone.xml | 185 +++++++++++++++++++++----
 app/src/main/res/values/strings.xml            |  13 +-
 3 files changed, 183 insertions(+), 29 deletions(-)
 create mode 100644 app/src/main/res/drawable/bottom_line.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/drawable/bottom_line.xml b/app/src/main/res/drawable/bottom_line.xml
new file mode 100644
index 00000000..c24a04df
--- /dev/null
+++ b/app/src/main/res/drawable/bottom_line.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/holo_orange_dark"/>
+        </shape>
+    </item>
+
+    <item android:bottom="2dp">
+        <shape android:shape="rectangle">
+            <solid android:color="#FFFFFF" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml
index b427ac8d..7aa9eea9 100644
--- a/app/src/main/res/layout/activity_git_clone.xml
+++ b/app/src/main/res/layout/activity_git_clone.xml
@@ -1,46 +1,175 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context="com.zeapo.pwdstore.GitHandler">
+    tools:context="com.zeapo.pwdstore.GitHandler"
+    android:orientation="vertical">
 
-    <LinearLayout
-        android:orientation="vertical"
-        android:layoutDirection="ltr"
+    <TextView
         android:layout_width="fill_parent"
-        android:layout_height="match_parent">
-        <LinearLayout
-            android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/server_name"
+        android:textStyle="bold"
+        style="@android:style/TextAppearance.Large"
+        android:gravity="left"
+        android:paddingBottom="6dp"
+        android:textColor="@android:color/holo_orange_dark"
+        android:background="@drawable/bottom_line"/>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_gravity="center_vertical">
+
+
+        <TextView
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
-            <Spinner
-                android:id="@+id/clone_protocol"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"></Spinner>
-            <EditText
-                android:hint="Repository URI"
-                android:id="@+id/clone_uri"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:inputType="textWebEmailAddress"/>
-        </LinearLayout>
+            android:text="@string/server_protocol"
+            android:id="@+id/label_server_protocol"
+            android:layout_centerVertical="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true" />
 
         <Spinner
+            android:id="@+id/clone_protocol"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toEndOf="@+id/label_server_protocol"
+            android:layout_toRightOf="@+id/label_server_protocol" />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_gravity="center_vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/server_url"
+            android:id="@+id/label_server_url"
+            android:layout_centerVertical="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true" />
+
+        <EditText
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/server_url_hint"
+            android:id="@+id/server_url"
+            android:layout_toEndOf="@+id/label_server_url"
+            android:layout_toRightOf="@+id/label_server_url"
+            android:layout_toLeftOf="@+id/label_server_port"
+            android:layout_toStartOf="@+id/label_server_port" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=":"
+            android:id="@+id/label_server_port"
+            android:layout_centerVertical="true"
+            android:layout_toLeftOf="@+id/server_port"
+            android:layout_toStartOf="@+id/server_port" />
+        <EditText
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:hint="@string/server_port_hint"
+            android:id="@+id/server_port"
+            android:layout_alignParentRight="true"/>
+
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_gravity="center_vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/server_path"
+            android:id="@+id/label_server_path"
+            android:layout_centerVertical="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true" />
+
+        <EditText
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:id="@+id/connection_mode"></Spinner>
+            android:hint="@string/server_path_hint"
+            android:layout_toEndOf="@+id/label_server_path"
+            android:layout_toRightOf="@+id/label_server_path"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"/>
+    </RelativeLayout>
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_gravity="center_vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/server_user"
+            android:id="@+id/label_server_user"
+            android:layout_centerVertical="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true" />
 
-        <Button
-            android:id="@+id/clone_button"
-            android:text="Clone!"
+        <EditText
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:onClick="cloneRepository"/>
-        </LinearLayout>
+            android:hint="@string/server_user_hint"
+            android:id="@+id/editText"
+            android:layout_toEndOf="@+id/label_server_user"
+            android:layout_toRightOf="@+id/label_server_user"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"/>
+    </RelativeLayout>
+
+
+    <TextView
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/server_resulting_url"
+        android:textStyle="bold"
+        style="@android:style/TextAppearance.Large"
+        android:gravity="left"
+        android:paddingBottom="6dp"
+        android:textColor="@android:color/holo_orange_dark"
+        android:background="@drawable/bottom_line"/>
+
+    <EditText
+        android:hint="Repository URI"
+        android:id="@+id/clone_uri"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inputType="textWebEmailAddress"/>
+
+    <Spinner
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/connection_mode"
+        android:layout_column="1"
+        android:layout_row="2"/>
+
+    <Button
+        android:id="@+id/clone_button"
+        android:text="Clone!"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:onClick="cloneRepository"
+        android:layout_column="1"
+        android:layout_row="4"/>
 
 
-</RelativeLayout>
+</LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 78e25d2b..7e7e120b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -18,7 +18,18 @@
     <string name="clone_fragment_text">Welcome to Password Store\n\n In this screen you can either create a new repository or clone your git repository onto your device.</string>
     <string name="clone">Clone existing</string>
     <string name="initialize">Create new</string>
-    <string name="hello_blank_fragment">Hello blank fragment</string>
+
+    <string name="server_name">Server</string>
+    <string name="server_protocol">Protocol</string>
+    <string name="server_url">Server URL</string>
+    <string name="server_url_hint">server.com</string>
+    <string name="server_port_hint">22</string>
+    <string name="server_path">Repo path</string>
+    <string name="server_path_hint">/path/to/pass</string>
+    <string name="server_user">Username</string>
+    <string name="server_user_hint">git_username</string>
+
+    <string name="server_resulting_url">Resulting URL</string>
 
     <!-- PGP Handler -->
     <string name="title_activity_pgp_handler">PgpHandler</string>
-- 
cgit v1.2.3


From ff3c3f94d1066b568921c8879076b0348d8410e9 Mon Sep 17 00:00:00 2001
From: knuthy <knuthy@gmail.com>
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/res')

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" />
     </RelativeLayout>
 
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_gravity="center_vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/server_user"
+            android:id="@+id/label_server_user"
+            android:layout_centerVertical="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true" />
+
+        <EditText
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/server_user_hint"
+            android:id="@+id/server_user"
+            android:layout_toEndOf="@+id/label_server_user"
+            android:layout_toRightOf="@+id/label_server_user"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"/>
+    </RelativeLayout>
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -105,36 +130,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/server_path_hint"
+            android:id="@+id/server_path"
             android:layout_toEndOf="@+id/label_server_path"
             android:layout_toRightOf="@+id/label_server_path"
             android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true"/>
     </RelativeLayout>
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_gravity="center_vertical">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/server_user"
-            android:id="@+id/label_server_user"
-            android:layout_centerVertical="true"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true" />
-
-        <EditText
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/server_user_hint"
-            android:id="@+id/editText"
-            android:layout_toEndOf="@+id/label_server_user"
-            android:layout_toRightOf="@+id/label_server_user"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentEnd="true"/>
-    </RelativeLayout>
 
 
     <TextView
-- 
cgit v1.2.3


From 34999c2bd5cb324f6cef5a4fae080cd4311878ce Mon Sep 17 00:00:00 2001
From: knuthy <knuthy@gmail.com>
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/res')

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"/>
     </RelativeLayout>
 
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/red_rectangle"
+        android:textColor="@android:color/white"
+        android:visibility="gone"
+        android:id="@+id/warn_url"/>
 
     <TextView
         android:layout_width="fill_parent"
@@ -156,21 +163,37 @@
         android:layout_height="wrap_content"
         android:inputType="textWebEmailAddress"/>
 
-    <Spinner
+
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/connection_mode"
-        android:layout_column="1"
-        android:layout_row="2"/>
+        android:orientation="horizontal"
+        android:layout_gravity="center_vertical">
+
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/connection_mode"
+            android:id="@+id/label_connection_mode"
+            android:layout_centerVertical="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true" />
+
+        <Spinner
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/connection_mode"
+            android:layout_toEndOf="@+id/label_connection_mode"
+            android:layout_toRightOf="@+id/label_connection_mode" />
+    </RelativeLayout>
 
     <Button
         android:id="@+id/clone_button"
         android:text="Clone!"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:onClick="cloneRepository"
-        android:layout_column="1"
-        android:layout_row="4"/>
+        android:onClick="cloneRepository"/>
 
 
 </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7e7e120b..c35514ec 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -30,6 +30,9 @@
     <string name="server_user_hint">git_username</string>
 
     <string name="server_resulting_url">Resulting URL</string>
+    <string name="connection_mode">Authentication Mode</string>
+
+    <string name="warn_malformed_url_port">When using custom ports, provide an absolute path (starts with "/")</string>
 
     <!-- PGP Handler -->
     <string name="title_activity_pgp_handler">PgpHandler</string>
-- 
cgit v1.2.3


From c11e6eab84b228d42219c770106ce9b9f363e25d Mon Sep 17 00:00:00 2001
From: knuthy <knuthy@gmail.com>
Date: Thu, 2 Oct 2014 00:16:52 +0200
Subject: improved support of explicitly given port

---
 app/app-release.apk                                | Bin 1724017 -> 1724217 bytes
 .../main/java/com/zeapo/pwdstore/GitHandler.java   |  31 ++++++++++++++++-----
 app/src/main/res/layout/activity_git_clone.xml     |  14 +++++-----
 3 files changed, 31 insertions(+), 14 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/app-release.apk b/app/app-release.apk
index bede96f0..4273d0b8 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 644632cb..651b23d7 100644
--- a/app/src/main/java/com/zeapo/pwdstore/GitHandler.java
+++ b/app/src/main/java/com/zeapo/pwdstore/GitHandler.java
@@ -67,6 +67,7 @@ public class GitHandler extends Activity {
     private File localDir;
     private String hostname;
     private String username;
+    private String port;
 
     private SharedPreferences settings;
 
@@ -163,7 +164,7 @@ public class GitHandler extends Activity {
                 };
 
                 server_url.setText(settings.getString("git_remote_server", ""));
-                server_port.setText("" + settings.getInt("git_remote_server_port", 22));
+                server_port.setText(settings.getString("git_remote_server_port", ""));
                 server_user.setText(settings.getString("git_remote_username", ""));
                 server_path.setText(settings.getString("git_remote_location", ""));
 
@@ -209,9 +210,11 @@ public class GitHandler extends Activity {
                             + ":";
             if (server_port.getText().toString().equals("22")) {
                 hostname += server_path.getText().toString();
+
+                ((TextView) findViewById(R.id.warn_url)).setVisibility(View.GONE);
             } else {
                 TextView warn_url = (TextView) findViewById(R.id.warn_url);
-                if (!server_path.getText().toString().matches("/.*")) {
+                if (!server_path.getText().toString().matches("/.*") && !server_port.getText().toString().isEmpty()) {
                     warn_url.setText(R.string.warn_malformed_url_port);
                     warn_url.setVisibility(View.VISIBLE);
                 } else {
@@ -242,13 +245,17 @@ public class GitHandler extends Activity {
                 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));
+
+                TextView warn_url = (TextView) findViewById(R.id.warn_url);
+                if (!server_path.getText().toString().matches("/.*") && !server_port.getText().toString().isEmpty()) {
+                    warn_url.setText(R.string.warn_malformed_url_port);
+                    warn_url.setVisibility(View.VISIBLE);
+                } else {
+                    warn_url.setVisibility(View.GONE);
+                }
             }
         }
     }
@@ -358,7 +365,8 @@ public class GitHandler extends Activity {
     public void cloneRepository(View view) {
         localDir = new File(getApplicationContext().getFilesDir().getAbsoluteFile() + "/store");
 
-        hostname = ((TextView) findViewById(R.id.clone_uri)).getText().toString();
+        hostname = ((EditText) findViewById(R.id.clone_uri)).getText().toString();
+        port = ((EditText) findViewById(R.id.server_port)).getText().toString();
         // don't ask the user, take off the protocol that he puts in
         hostname = hostname.replaceFirst("^.+://", "");
         ((TextView) findViewById(R.id.clone_uri)).setText(hostname);
@@ -368,6 +376,13 @@ public class GitHandler extends Activity {
         if (!protocol.equals("ssh://")) {
             hostname = protocol + hostname;
         } else {
+
+            // if the port is explicitly given, jgit requires the ssh://
+            if (!port.isEmpty())
+                hostname = protocol + hostname;
+
+            Log.i("GIT", "> " + port);
+
             // did he forget the username?
             if (!hostname.matches("^.+@.+")) {
                 new AlertDialog.Builder(this).
@@ -433,11 +448,13 @@ public class GitHandler extends Activity {
         // remember the settings
         SharedPreferences.Editor editor = settings.edit();
 
+        // TODO this is not pretty, use the information obtained earlier
         editor.putString("git_remote_server", hostname.split("@")[1].split(":")[0]);
         editor.putString("git_remote_location", hostname.split("@")[1].split(":")[1]);
         editor.putString("git_remote_username", hostname.split("@")[0]);
         editor.putString("git_remote_protocol", protocol);
         editor.putString("git_remote_auth", connectionMode);
+        editor.putString("git_remote_port", port);
         editor.commit();
 
         CloneCommand cmd = Git.cloneRepository().
diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml
index 12182238..a173f6f6 100644
--- a/app/src/main/res/layout/activity_git_clone.xml
+++ b/app/src/main/res/layout/activity_git_clone.xml
@@ -137,13 +137,6 @@
             android:layout_alignParentEnd="true"/>
     </RelativeLayout>
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/red_rectangle"
-        android:textColor="@android:color/white"
-        android:visibility="gone"
-        android:id="@+id/warn_url"/>
 
     <TextView
         android:layout_width="fill_parent"
@@ -163,6 +156,13 @@
         android:layout_height="wrap_content"
         android:inputType="textWebEmailAddress"/>
 
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/red_rectangle"
+        android:textColor="@android:color/white"
+        android:visibility="gone"
+        android:id="@+id/warn_url"/>
 
     <RelativeLayout
         android:layout_width="match_parent"
-- 
cgit v1.2.3