From b74ed4643453cd089ec885bb3f56169629f8cacf Mon Sep 17 00:00:00 2001
From: Ashley Hughes <spirit.returned@gmail.com>
Date: Sat, 8 Feb 2014 15:35:44 +0000
Subject: disable export if unsaved

---
 .../java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java  | 8 ++++++--
 OpenPGP-Keychain/src/main/res/values/strings.xml                  | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
index d53a1f836..66f23e22e 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
@@ -332,8 +332,12 @@ public class EditKeyActivity extends ActionBarActivity implements EditorListener
             cancelClicked();
             return true;
         case R.id.menu_key_edit_export_file:
-            mExportHelper.showExportKeysDialog(mDataUri, Id.type.secret_key, Constants.path.APP_DIR
-                    + "/secexport.asc");
+            if (needsSaving()) {
+                Toast.makeText(this, R.string.error_save_first, Toast.LENGTH_LONG).show();
+            } else {
+                mExportHelper.showExportKeysDialog(mDataUri, Id.type.secret_key, Constants.path.APP_DIR
+                        + "/secexport.asc");
+            }
             return true;
         case R.id.menu_key_edit_delete: {
             // Message is received after key is deleted
diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 69a941b02..64c9be32d 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -286,6 +286,7 @@
     <string name="error_nfc_needed">NFC is not available on your device!</string>
     <string name="error_nothing_import">Nothing to import!</string>
     <string name="error_expiry_must_come_after_creation">expiry date must come after creation date</string>
+    <string name="error_save_first">please save the keyring first</string>
 
     <!-- progress dialogs, usually ending in '…' -->
     <string name="progress_done">done.</string>
-- 
cgit v1.2.3