From 26a4cf2a56bfabd01bc67517bf383351524a11df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Thu, 30 Oct 2014 12:48:06 +0100 Subject: Changelog 3.1.1 --- CHANGELOG | 4 ++++ .../org/sufficientlysecure/keychain/provider/ProviderHelper.java | 2 +- OpenKeychain/src/main/res/raw/help_changelog.html | 6 ++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index f10977505..4180b1d56 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +## 3.1.1 + * Fix key export to files (they were written partially) + * Fix crash on Android 2.3 + ## 3.1 * Fix crash on Android 5 * New certify screen diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java index b18b919c3..05dc99c5e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java @@ -658,7 +658,7 @@ public class ProviderHelper { // first, mark all keys as not available ContentValues values = new ContentValues(); - values.put(Keys.HAS_SECRET, 0); + values.put(Keys.HAS_SECRET, SecretKeyType.UNAVAILABLE.getNum()); mContentResolver.update(uri, values, null, null); // then, mark exactly the keys we have available diff --git a/OpenKeychain/src/main/res/raw/help_changelog.html b/OpenKeychain/src/main/res/raw/help_changelog.html index 4488b0605..c365ff7a3 100644 --- a/OpenKeychain/src/main/res/raw/help_changelog.html +++ b/OpenKeychain/src/main/res/raw/help_changelog.html @@ -6,6 +6,12 @@ And don't add newlines before or after p tags because of transifex --> +

3.1.1

+ +

3.1