From 878922cf1103d59afbdc2968731e2eda4276fa2d Mon Sep 17 00:00:00 2001 From: Mohamed Zenadi Date: Sat, 14 Mar 2015 19:24:19 +0100 Subject: update sdk version --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index cca0569e..fae29ce9 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.0.0' + classpath 'com.android.tools.build:gradle:1.1.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -20,8 +20,8 @@ allprojects { } ext { - compileSdkVersion = 21 - buildToolsVersion = "21.1.2" + compileSdkVersion = 22 + buildToolsVersion = "22" } subprojects { subproject -> afterEvaluate{ -- cgit v1.2.3 From cff4fcb707068eaa5faac8d938887747786ea7d7 Mon Sep 17 00:00:00 2001 From: Mohamed Zenadi Date: Sat, 14 Mar 2015 23:38:44 +0100 Subject: version bump and some style update --- app/build.gradle | 18 +++---- .../java/com/zeapo/pwdstore/PasswordStore.java | 16 ++++++ .../java/com/zeapo/pwdstore/crypto/PgpHandler.java | 2 +- app/src/main/res/drawable/bottom_line.xml | 2 +- app/src/main/res/layout/activity_git_clone.xml | 5 +- .../main/res/layout/fragment_to_clone_or_not.xml | 61 ++++++++++++++++++---- app/src/main/res/values/styles.xml | 2 +- 7 files changed, 83 insertions(+), 23 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d1022a07..ae88309a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,14 +3,14 @@ apply from: 'copyLibs.gradle' // enable 'copyLibs.gradle' script plugin apply plugin: 'eclipse' android { - compileSdkVersion 21 + compileSdkVersion 22 buildToolsVersion "21.1.2" defaultConfig { applicationId "com.zeapo.pwdstore" minSdkVersion 15 - targetSdkVersion 21 - versionCode 32 - versionName "1.2.0.12" + targetSdkVersion 22 + versionCode 33 + versionName "1.2.0.13" } compileOptions { @@ -25,17 +25,17 @@ android { } dependencies { - compile "com.android.support:appcompat-v7:21.0.3" - compile "com.android.support:recyclerview-v7:21.0.2" + compile "com.android.support:appcompat-v7:22.0.0" + compile "com.android.support:recyclerview-v7:22.0.0" //compile fileTree(dir: 'libs', include: ['*.jar']) compile project(':libraries:openpgp-api-lib') - compile 'org.eclipse.jgit:org.eclipse.jgit:3.6.0.201411121045-m1' + compile 'org.eclipse.jgit:org.eclipse.jgit:3.6.2.201501210735-r' compile 'org.apache.commons:commons-io:1.3.2' - compile 'com.jayway.android.robotium:robotium-solo:5.2.1' + compile 'com.jayway.android.robotium:robotium-solo:5.3.1' } tasks.findAll { // make all tasks whose name starts with 'assemble'... it.name.startsWith 'assemble' }.each { // ... depending on 'copyDependenciesIntoLibs' task from 'copyLibs.gradle' script plugin it.dependsOn copyDependenciesIntoLibs -} +} \ No newline at end of file diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java index 74b134aa..073c24da 100644 --- a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java +++ b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java @@ -176,6 +176,18 @@ public class PasswordStore extends ActionBarActivity { return super.onOptionsItemSelected(item); } + public void openSettings(View view) { + Intent intent; + + try { + intent = new Intent(this, UserPreference.class); + startActivity(intent); + } catch (Exception e) { + System.out.println("Exception caught :("); + e.printStackTrace(); + } + } + public void getClone(View view){ Intent intent = new Intent(this, GitActivity.class); intent.putExtra("Operation", GitActivity.REQUEST_CLONE); @@ -284,6 +296,8 @@ public class PasswordStore extends ActionBarActivity { fragmentTransaction.addToBackStack("passlist"); + getSupportActionBar().show(); + fragmentTransaction.replace(R.id.main_layout, plist, "PasswordsList"); fragmentTransaction.commit(); } @@ -293,6 +307,8 @@ public class PasswordStore extends ActionBarActivity { fragmentManager.popBackStack(); } + getSupportActionBar().hide(); + ToCloneOrNot cloneFrag = new ToCloneOrNot(); fragmentTransaction.replace(R.id.main_layout, cloneFrag, "ToCloneOrNot"); fragmentTransaction.commit(); 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 1dfa2047..6915ebd4 100644 --- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java +++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java @@ -190,7 +190,7 @@ public class PgpHandler extends ActionBarActivity implements OpenPgpServiceConne @Override public void run() { Toast.makeText(PgpHandler.this, - "onError id:" + error.getErrorId() + "\n\n" + error.getMessage(), + "Error from OpenKeyChain : " + error.getMessage(), Toast.LENGTH_LONG).show(); Log.e(Constants.TAG, "onError getErrorId:" + error.getErrorId()); Log.e(Constants.TAG, "onError getMessage:" + error.getMessage()); diff --git a/app/src/main/res/drawable/bottom_line.xml b/app/src/main/res/drawable/bottom_line.xml index a28cc6d3..323b03e0 100644 --- a/app/src/main/res/drawable/bottom_line.xml +++ b/app/src/main/res/drawable/bottom_line.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml index d53a2201..d923350a 100644 --- a/app/src/main/res/layout/activity_git_clone.xml +++ b/app/src/main/res/layout/activity_git_clone.xml @@ -8,6 +8,7 @@ android:paddingBottom="@dimen/activity_vertical_margin" tools:context="com.zeapo.pwdstore.git.GitActivity" android:background="@android:color/white"> + + + + + + + +