aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-10-30 12:48:06 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2014-10-30 12:48:06 +0100
commit26a4cf2a56bfabd01bc67517bf383351524a11df (patch)
treea1e597923ae8523969c00f584fb2e55cc723b360
parent18255e331b0d6ddb8f0d98fc4144efb2d3c6bb16 (diff)
downloadopen-keychain-26a4cf2a56bfabd01bc67517bf383351524a11df.tar.gz
open-keychain-26a4cf2a56bfabd01bc67517bf383351524a11df.tar.bz2
open-keychain-26a4cf2a56bfabd01bc67517bf383351524a11df.zip
Changelog 3.1.1
-rw-r--r--CHANGELOG4
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java2
-rw-r--r--OpenKeychain/src/main/res/raw/help_changelog.html6
3 files changed, 11 insertions, 1 deletions
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 -->
</head>
<body>
+<h2>3.1.1</h2>
+<ul>
+<li>Fix key export to files (they were written partially)</li>
+<li>Fix crash on Android 2.3</li>
+</ul>
+
<h2>3.1</h2>
<ul>
<li>Fix crash on Android 5</li>