From 055fb59ec34a986ea9f5620554b51c438d809361 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 8 Sep 2014 14:32:55 +0200
Subject: Properly handle uneditable key types in EditKeyFragment

More specifically, return an OperationResultParcel for stripped and
divert-to-card keys, with an appropriate error message in the log.

part of #828
---
 OpenKeychain/src/main/res/values/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 24effb7f1..2a89f15bc 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -756,6 +756,11 @@
     <string name="msg_con_warn_delete_public">"Exception deleting public cache file"</string>
     <string name="msg_con_warn_delete_secret">"Exception deleting secret cache file"</string>
 
+    <!-- Other messages used in OperationLogs -->
+    <string name="msg_ek_error_divert">"editing of nfc keys is not (yet) supported"</string>
+    <string name="msg_ek_error_dummy">"cannot edit keyring with stripped master key!"</string>
+    <string name="msg_ek_error_not_found">"key not found"</string>
+
     <!-- PassphraseCache -->
     <string name="passp_cache_notif_click_to_clear">"Click to clear cached passphrases"</string>
     <string name="passp_cache_notif_n_keys">"OpenKeychain has cached %d passphrases"</string>
-- 
cgit v1.2.3


From ceea2667e8544b58acfc59f8d3284f4dcbd7cf7a Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 8 Sep 2014 14:50:16 +0200
Subject: introduce SingletonResult for... singleton results

---
 OpenKeychain/src/main/res/values/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 2a89f15bc..64affdfde 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -757,9 +757,9 @@
     <string name="msg_con_warn_delete_secret">"Exception deleting secret cache file"</string>
 
     <!-- Other messages used in OperationLogs -->
-    <string name="msg_ek_error_divert">"editing of nfc keys is not (yet) supported"</string>
-    <string name="msg_ek_error_dummy">"cannot edit keyring with stripped master key!"</string>
-    <string name="msg_ek_error_not_found">"key not found"</string>
+    <string name="msg_ek_error_divert">"Editing of nfc keys is not (yet) supported!"</string>
+    <string name="msg_ek_error_dummy">"Cannot edit keyring with stripped master key!"</string>
+    <string name="msg_ek_error_not_found">"Key not found!"</string>
 
     <!-- PassphraseCache -->
     <string name="passp_cache_notif_click_to_clear">"Click to clear cached passphrases"</string>
-- 
cgit v1.2.3