diff --git a/.travis.yml b/.travis.yml index 2cf2f98f7..81ef10638 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,14 +4,14 @@ before_install: # Install base Android SDK - sudo apt-get update -qq - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm lib32z1 lib32stdc++6; fi - - wget http://dl.google.com/android/android-sdk_r23-linux.tgz - - tar xzf android-sdk_r23-linux.tgz + - wget http://dl.google.com/android/android-sdk_r23.0.2-linux.tgz + - tar xzf android-sdk_r23.0.2-linux.tgz - export ANDROID_HOME=$PWD/android-sdk-linux - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools # Install required Android components. #- echo "y" | android update sdk -a --filter build-tools-19.1.0,android-19,platform-tools,extra-android-support,extra-android-m2repository --no-ui --force - - ( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | android update sdk --no-ui --all --force --filter build-tools-19.1.0,android-19,platform-tools,extra-android-support,extra-android-m2repository + - ( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | android update sdk --no-ui --all --force --filter build-tools-21.1.1,build-tools-19.1.0,android-21,android-19,platform-tools,extra-android-support,extra-android-m2repository - ./prepare-tests.sh install: echo "Installation done" script: diff --git a/OpenKeychain-Test/build.gradle b/OpenKeychain-Test/build.gradle index bb6c3d181..f621428ed 100644 --- a/OpenKeychain-Test/build.gradle +++ b/OpenKeychain-Test/build.gradle @@ -1,14 +1,11 @@ buildscript { repositories { - mavenCentral() - // need this for com.novoda:gradle-android-test-plugin:0.9.9-SNAPSHOT below (0.9.3 in repos doesn't work!) - // run ./install-custom-gradle-test-plugin.sh to pull the thing into the local repository - mavenLocal() + jcenter() } dependencies { // NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information - classpath 'com.novoda:gradle-android-test-plugin:0.9.9-SNAPSHOT' + classpath 'com.novoda:gradle-android-test-plugin:0.10.0' } } @@ -51,16 +48,17 @@ android { } jacoco { - toolVersion = "0.7.0.201403182114" + toolVersion = "0.7.2.201409121644" } -coverageSourceDirs = [ + +def coverageSourceDirs = [ '../OpenKeychain/src/main/java', '../OpenKeychain/src/gen', '../OpenKeychain/build/source/apt/debug', '../OpenKeychain/build/source/generated/buildConfig/debug', '../OpenKeychain/build/source/generated/r/debug' - ] + ] jacocoTestReport { reports { diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index 6b957b622..6bea6954e 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -3,8 +3,8 @@ apply plugin: 'com.android.application' dependencies { // NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information - compile 'com.android.support:support-v4:19.1.0' - compile 'com.android.support:appcompat-v7:19.1.0' + compile 'com.android.support:support-v4:21.0.2' + compile 'com.android.support:appcompat-v7:21.0.2' compile project(':extern:openpgp-api-lib') compile project(':extern:openkeychain-api-lib') compile project(':extern:html-textview') @@ -23,12 +23,12 @@ dependencies { } android { - compileSdkVersion 19 - buildToolsVersion '19.1' + compileSdkVersion 21 + buildToolsVersion '21.1.1' defaultConfig { minSdkVersion 9 - targetSdkVersion 19 + targetSdkVersion 21 } /* diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 3af0bdf6c..100f584c1 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -15,7 +15,7 @@ Association of file types to Keychain ===================================== General remarks about file ending conventions: - - *.gpg for binary files + - *.gpg for binary files - *.asc for ascii armored files The actual content can be anything. The file ending only shows if it is binary or ascii encoded. diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java index 63cb6494d..869d2e71b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java @@ -456,7 +456,7 @@ public class PassphraseCacheService extends Service { Intent intent = new Intent(getApplicationContext(), PassphraseCacheService.class); intent.setAction(ACTION_PASSPHRASE_CACHE_CLEAR); builder.addAction( - R.drawable.abc_ic_clear_normal, + R.drawable.abc_ic_clear_mtrl_alpha, getString(R.string.passp_cache_notif_clear), PendingIntent.getService( getApplicationContext(), diff --git a/OpenKeychain/src/main/res/layout/actionbar_custom_view_done.xml b/OpenKeychain/src/main/res/layout/actionbar_custom_view_done.xml index 50134f4e7..b219038b2 100644 --- a/OpenKeychain/src/main/res/layout/actionbar_custom_view_done.xml +++ b/OpenKeychain/src/main/res/layout/actionbar_custom_view_done.xml @@ -19,7 +19,6 @@ android:layout_height="match_parent" android:dividerPadding="12dp" android:orientation="horizontal" - android:divider="@drawable/abc_list_divider_holo_light" android:showDividers="end" > diff --git a/OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml b/OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml index 1d0476361..e9047e759 100644 --- a/OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml +++ b/OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml @@ -18,7 +18,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:dividerPadding="12dp" - android:divider="@drawable/abc_list_divider_holo_light" android:orientation="horizontal" android:showDividers="middle"> diff --git a/OpenKeychain/src/main/res/raw/help_faq.html b/OpenKeychain/src/main/res/raw/help_faq.html index 6f8763f36..094065909 100644 --- a/OpenKeychain/src/main/res/raw/help_faq.html +++ b/OpenKeychain/src/main/res/raw/help_faq.html @@ -12,10 +12,10 @@ And don't add newlines before or after p tags because of transifex -->

A wrong primary user id is shown when searching on a Keyserver

Unfortunately, this is a bug in the SKS Keyserver software. Its machine-readable output returns the user ids in an arbitrary order. Read the related bug report for more information.

-

How do I activate OpenKeychain in K9-Mail?

-

To use OpenKeychain with K9-Mail, you want to follow these steps:

+

How do I activate OpenKeychain in K-9 Mail?

+

To use OpenKeychain with K-9 Mail, you want to follow these steps:

    -
  1. Open K9-Mail and long-tap on the account you want to use OpenKeychain with.
    2. +
  2. Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.
  3. Select "Account settings" and scroll to the very bottom and click "Cryptography".
  4. Click on "OpenPGP Provider" and select OpenKeychain from the list.
diff --git a/Resources/docs/passphrase1.png b/Resources/docs/passphrase1.png new file mode 100644 index 000000000..689025ec7 Binary files /dev/null and b/Resources/docs/passphrase1.png differ diff --git a/Resources/docs/passphrase2.png b/Resources/docs/passphrase2.png new file mode 100644 index 000000000..2fc80fd2b Binary files /dev/null and b/Resources/docs/passphrase2.png differ diff --git a/Resources/docs/passphrase3.png b/Resources/docs/passphrase3.png new file mode 100644 index 000000000..7f3dbca62 Binary files /dev/null and b/Resources/docs/passphrase3.png differ diff --git a/build.gradle b/build.gradle index 59f05e73a..17e112d68 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { repositories { - mavenCentral() + jcenter() } dependencies { @@ -11,7 +11,7 @@ buildscript { allprojects { repositories { - mavenCentral() + jcenter() } } diff --git a/prepare-tests.sh b/prepare-tests.sh index 027c76f84..623c4a233 100755 --- a/prepare-tests.sh +++ b/prepare-tests.sh @@ -10,16 +10,16 @@ if ! java -version 2>&1 | grep OpenJDK; then return fi -tmpdir="$(mktemp -d)" -( - cd "$tmpdir"; - git clone https://github.com/nenick/gradle-android-test-plugin.git - cd gradle-android-test-plugin - echo "rootProject.name = 'gradle-android-test-plugin-parent'" > settings.gradle - echo "include ':gradle-android-test-plugin'" >> settings.gradle - ./gradlew :gradle-android-test-plugin:install -) -rm -rf "$tmpdir" +#tmpdir="$(mktemp -d)" +#( +# cd "$tmpdir"; +# git clone https://github.com/nenick/gradle-android-test-plugin.git +# cd gradle-android-test-plugin +# echo "rootProject.name = 'gradle-android-test-plugin-parent'" > settings.gradle +# echo "include ':gradle-android-test-plugin'" >> settings.gradle +# ./gradlew :gradle-android-test-plugin:install +#) +#rm -rf "$tmpdir" echo -n "ok, adding tests to include list.. " if grep OpenKeychain-Test settings.gradle >/dev/null ; then