diff options
author | zeapo <mohamed@zenadi.com> | 2014-12-16 23:25:55 +0100 |
---|---|---|
committer | zeapo <mohamed@zenadi.com> | 2014-12-16 23:27:30 +0100 |
commit | 47bb25adcbded5e05d4be60bf4eba3bf380f559c (patch) | |
tree | f80fc721969da486d6f7b7720296a18f3957b435 | |
parent | f154dc30a4113665c2187be313477a236a790dc7 (diff) |
fix the the git fields and a small refactorv1.2.0.10
-rw-r--r-- | app/build.gradle | 8 | ||||
-rw-r--r-- | app/src/main/AndroidManifest.xml | 2 | ||||
-rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/PasswordStore.java | 2 | ||||
-rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/UserPreference.java | 11 | ||||
-rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/git/GitAsyncTask.java (renamed from app/src/main/java/com/zeapo/pwdstore/GitAsyncTask.java) | 4 | ||||
-rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/git/GitHandler.java (renamed from app/src/main/java/com/zeapo/pwdstore/GitHandler.java) | 4 | ||||
-rw-r--r-- | app/src/main/res/layout/activity_git_clone.xml | 14 | ||||
-rw-r--r-- | app/src/main/res/menu/git_clone.xml | 2 |
8 files changed, 24 insertions, 23 deletions
diff --git a/app/build.gradle b/app/build.gradle index e1354b19..4f271f46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,13 +4,13 @@ apply plugin: 'eclipse' android { compileSdkVersion 21 - buildToolsVersion "21.1.1" + buildToolsVersion "21.1.2" defaultConfig { applicationId "com.zeapo.pwdstore" minSdkVersion 15 targetSdkVersion 21 - versionCode 29 - versionName "1.2.0.9" + versionCode 30 + versionName "1.2.0.10" } compileOptions { @@ -25,7 +25,7 @@ android { } dependencies { - compile "com.android.support:appcompat-v7:21.0.2" + compile "com.android.support:appcompat-v7:21.0.3" compile "com.android.support:recyclerview-v7:21.0.2" //compile fileTree(dir: 'libs', include: ['*.jar']) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2532e569..4a124c94 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,7 +11,7 @@ <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> </activity> - <activity android:name=".GitHandler" + <activity android:name=".git.GitHandler" android:parentActivityName=".PasswordStore"> <meta-data android:name="android.PARENT_ACTIVITY1" android:value="com.zeapo.pwdstore.PasswordStore" /> diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java index 860fc63f..8e502cc3 100644 --- a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java +++ b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java @@ -18,6 +18,8 @@ import android.view.MenuItem; import android.view.View; import com.zeapo.pwdstore.crypto.PgpHandler; +import com.zeapo.pwdstore.git.GitAsyncTask; +import com.zeapo.pwdstore.git.GitHandler; import com.zeapo.pwdstore.utils.PasswordItem; import com.zeapo.pwdstore.utils.PasswordRecyclerAdapter; import com.zeapo.pwdstore.utils.PasswordRepository; diff --git a/app/src/main/java/com/zeapo/pwdstore/UserPreference.java b/app/src/main/java/com/zeapo/pwdstore/UserPreference.java index ff81632c..89c1cd36 100644 --- a/app/src/main/java/com/zeapo/pwdstore/UserPreference.java +++ b/app/src/main/java/com/zeapo/pwdstore/UserPreference.java @@ -1,35 +1,26 @@ package com.zeapo.pwdstore; -import android.app.Activity; import android.app.AlertDialog; import android.content.DialogInterface; import android.content.Intent; -import android.content.SharedPreferences; import android.net.Uri; import android.os.Bundle; import android.preference.Preference; -import android.preference.PreferenceActivity; import android.preference.PreferenceFragment; -import android.preference.PreferenceManager; import android.support.v7.app.ActionBarActivity; import android.util.Log; -import android.view.Menu; import android.view.MenuItem; import com.zeapo.pwdstore.crypto.PgpHandler; +import com.zeapo.pwdstore.git.GitHandler; import com.zeapo.pwdstore.utils.PasswordRepository; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.eclipse.jgit.api.CloneCommand; -import org.eclipse.jgit.lib.Repository; import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.net.URI; public class UserPreference extends ActionBarActivity implements Preference.OnPreferenceClickListener { private final static int IMPORT_SSH_KEY = 1; diff --git a/app/src/main/java/com/zeapo/pwdstore/GitAsyncTask.java b/app/src/main/java/com/zeapo/pwdstore/git/GitAsyncTask.java index ddb3a060..add18278 100644 --- a/app/src/main/java/com/zeapo/pwdstore/GitAsyncTask.java +++ b/app/src/main/java/com/zeapo/pwdstore/git/GitAsyncTask.java @@ -1,4 +1,4 @@ -package com.zeapo.pwdstore; +package com.zeapo.pwdstore.git; import android.app.Activity; import android.app.AlertDialog; @@ -6,6 +6,8 @@ import android.app.ProgressDialog; import android.content.DialogInterface; import android.os.AsyncTask; +import com.zeapo.pwdstore.PasswordStore; +import com.zeapo.pwdstore.R; import com.zeapo.pwdstore.utils.PasswordRepository; import org.apache.commons.io.FileUtils; diff --git a/app/src/main/java/com/zeapo/pwdstore/GitHandler.java b/app/src/main/java/com/zeapo/pwdstore/git/GitHandler.java index 497543b1..85872d65 100644 --- a/app/src/main/java/com/zeapo/pwdstore/GitHandler.java +++ b/app/src/main/java/com/zeapo/pwdstore/git/GitHandler.java @@ -1,4 +1,4 @@ -package com.zeapo.pwdstore; +package com.zeapo.pwdstore.git; import android.app.Activity; import android.app.AlertDialog; @@ -26,6 +26,8 @@ import com.jcraft.jsch.JSch; import com.jcraft.jsch.JSchException; import com.jcraft.jsch.Session; import com.jcraft.jsch.UserInfo; +import com.zeapo.pwdstore.R; +import com.zeapo.pwdstore.UserPreference; import com.zeapo.pwdstore.utils.PasswordRepository; import org.eclipse.jgit.api.CloneCommand; diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml index de3f0b0e..07d57934 100644 --- a/app/src/main/res/layout/activity_git_clone.xml +++ b/app/src/main/res/layout/activity_git_clone.xml @@ -6,7 +6,7 @@ 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.git.GitHandler" android:background="@android:color/white"> <LinearLayout android:layout_width="match_parent" @@ -73,7 +73,8 @@ android:layout_toEndOf="@+id/label_server_user" android:layout_toRightOf="@+id/label_server_user" android:layout_alignParentRight="true" - android:layout_alignParentEnd="true"/> + android:layout_alignParentEnd="true" + android:inputType="textWebEmailAddress"/> </RelativeLayout> <RelativeLayout android:layout_width="match_parent" @@ -100,7 +101,8 @@ 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" /> + android:layout_toStartOf="@+id/label_server_port" + android:inputType="textWebEmailAddress" /> <TextView android:layout_width="wrap_content" @@ -116,7 +118,8 @@ android:layout_height="wrap_content" android:hint="@string/server_port_hint" android:id="@+id/server_port" - android:layout_alignParentRight="true"/> + android:layout_alignParentRight="true" + android:inputType="number"/> </RelativeLayout> @@ -145,7 +148,8 @@ android:layout_toEndOf="@+id/label_server_path" android:layout_toRightOf="@+id/label_server_path" android:layout_alignParentRight="true" - android:layout_alignParentEnd="true"/> + android:layout_alignParentEnd="true" + android:inputType="textWebEmailAddress"/> </RelativeLayout> diff --git a/app/src/main/res/menu/git_clone.xml b/app/src/main/res/menu/git_clone.xml index e414f0b9..4a240712 100644 --- a/app/src/main/res/menu/git_clone.xml +++ b/app/src/main/res/menu/git_clone.xml @@ -1,7 +1,7 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" xmlns:pwstore="http://schemas.android.com/apk/res-auto" - tools:context="com.zeapo.pwdstore.GitHandler" > + tools:context="com.zeapo.pwdstore.git.GitHandler" > <item android:id="@+id/user_pref" android:title="@string/action_settings" android:orderInCategory="100" |