diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-12-05 15:51:15 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-12-05 15:51:15 +0100 |
commit | 5c54ab1a0d9eaee7dc5599978d4f15ad7bc64937 (patch) | |
tree | a03465ba8ba3edde479683d40a0d460741a3f4fd /OpenKeychain | |
parent | a278382c285fa5656d27b1507cd9026940fa6900 (diff) | |
parent | 38698bd891caa97e3b97d13640654b74b35a9a38 (diff) | |
download | open-keychain-5c54ab1a0d9eaee7dc5599978d4f15ad7bc64937.tar.gz open-keychain-5c54ab1a0d9eaee7dc5599978d4f15ad7bc64937.tar.bz2 open-keychain-5c54ab1a0d9eaee7dc5599978d4f15ad7bc64937.zip |
Merge branch 'development' into keybase-proofs
Diffstat (limited to 'OpenKeychain')
6 files changed, 10 insertions, 12 deletions
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" > <include layout="@layout/actionbar_include_done_button" /> 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 --> <h2>A wrong primary user id is shown when searching on a Keyserver</h2> <p>Unfortunately, this is a bug in the SKS Keyserver software. Its machine-readable output returns the user ids in an arbitrary order. Read the <a href="https://bitbucket.org/skskeyserver/sks-keyserver/issue/28/primary-uid-in-machine-readable-index">related bug report</a> for more information.</p> -<h2>How do I activate OpenKeychain in K9-Mail?</h2> -<p>To use OpenKeychain with K9-Mail, you want to follow these steps:</p> +<h2>How do I activate OpenKeychain in K-9 Mail?</h2> +<p>To use OpenKeychain with K-9 Mail, you want to follow these steps:</p> <ol> - <li>Open K9-Mail and long-tap on the account you want to use OpenKeychain with.</li> + <li>Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.</li> <li>Select "Account settings" and scroll to the very bottom and click "Cryptography".</li> <li>Click on "OpenPGP Provider" and select OpenKeychain from the list.</li> </ol> |