Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain

11 files changed, 26 insertions, 33 deletions

diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java
index 2bfa796c7..cc240a67b 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java
@@ -139,7 +139,7 @@ public class ExportHelper {
 
         intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
 
-        // Message is received after exporting is done in ApgService
+        // Message is received after exporting is done in KeychainIntentService
         KeychainIntentServiceHandler exportHandler = new KeychainIntentServiceHandler(mActivity,
                 mActivity.getString(R.string.progress_exporting),
                 ProgressDialog.STYLE_HORIZONTAL,
@@ -151,7 +151,7 @@ public class ExportHelper {
                                 }
         }) {
             public void handleMessage(Message message) {
-                // handle messages by standard ApgHandler first
+                // handle messages by standard KeychainIntentServiceHandler first
                 super.handleMessage(message);
 
                 if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobProvider.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobProvider.java
index 6ac61e157..aa30e845d 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobProvider.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobProvider.java
@@ -38,7 +38,7 @@ import java.util.List;
 import java.util.UUID;
 
 public class KeychainServiceBlobProvider extends ContentProvider {
-    private static final String STORE_PATH = Constants.Path.APP_DIR + "/ApgBlobs";
+    private static final String STORE_PATH = Constants.Path.APP_DIR + "/KeychainBlobs";
 
     private KeychainServiceBlobDatabase mBlobDatabase = null;
 
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
index e26ee3c76..bd3a0421b 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
@@ -855,7 +855,7 @@ public class KeychainIntentService extends IntentService
         if (this.mIsCanceled) {
             return;
         }
-        Log.e(Constants.TAG, "ApgService Exception: ", e);
+        Log.e(Constants.TAG, "KeychainIntentService Exception: ", e);
         e.printStackTrace();
 
         Bundle data = new Bundle();
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java
index dff4e9d72..5dc06c16d 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java
@@ -327,11 +327,11 @@ public class CertifyKeyActivity extends ActionBarActivity implements
 
         intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
 
-        // Message is received after signing is done in ApgService
+        // Message is received after signing is done in KeychainIntentService
         KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this,
                 getString(R.string.progress_signing), ProgressDialog.STYLE_SPINNER) {
             public void handleMessage(Message message) {
-                // handle messages by standard ApgHandler first
+                // handle messages by standard KeychainIntentServiceHandler first
                 super.handleMessage(message);
 
                 if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
@@ -380,11 +380,11 @@ public class CertifyKeyActivity extends ActionBarActivity implements
 
         intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
 
-        // Message is received after uploading is done in ApgService
+        // Message is received after uploading is done in KeychainIntentService
         KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this,
                 getString(R.string.progress_exporting), ProgressDialog.STYLE_HORIZONTAL) {
             public void handleMessage(Message message) {
-                // handle messages by standard ApgHandler first
+                // handle messages by standard KeychainIntentServiceHandler first
                 super.handleMessage(message);
 
                 if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
index 3e389c034..9b3b00c19 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
@@ -443,8 +443,7 @@ public class DecryptActivity extends DrawerActivity {
         getDecryptionKeyFromInputStream();
 
         // if we need a symmetric passphrase or a passphrase to use a secret key ask for it
-        if (mSecretKeyId == Id.key.symmetric
-                || PassphraseCacheService.getCachedPassphrase(this, mSecretKeyId) == null) {
+        if (mAssumeSymmetricEncryption || PassphraseCacheService.getCachedPassphrase(this, mSecretKeyId) == null) {
             showPassphraseDialog();
         } else {
             if (mDecryptTarget == Id.target.file) {
@@ -494,6 +493,7 @@ public class DecryptActivity extends DrawerActivity {
      * TODO: Rework function, remove global variables
      */
     private void getDecryptionKeyFromInputStream() {
+        mAssumeSymmetricEncryption = false;
         InputStream inStream = null;
         if (mContentUri != null) {
             try {
@@ -517,13 +517,6 @@ public class DecryptActivity extends DrawerActivity {
                 Log.e(Constants.TAG, "File not found!", e);
                 AppMsg.makeText(this, getString(R.string.error_file_not_found, e.getMessage()),
                         AppMsg.STYLE_ALERT).show();
-            } finally {
-                try {
-                    if (inStream != null) {
-                        inStream.close();
-                    }
-                } catch (Exception e) {
-                }
             }
         } else {
             inStream = new ByteArrayInputStream(mMessage.getText().toString().getBytes());
@@ -540,7 +533,6 @@ public class DecryptActivity extends DrawerActivity {
                 if (mSecretKeyId == Id.key.none) {
                     throw new PgpGeneralException(getString(R.string.error_no_secret_key_found));
                 }
-                mAssumeSymmetricEncryption = false;
             } catch (NoAsymmetricEncryptionException e) {
                 if (inStream.markSupported()) {
                     inStream.reset();
@@ -553,6 +545,7 @@ public class DecryptActivity extends DrawerActivity {
                 mAssumeSymmetricEncryption = true;
             }
         } catch (Exception e) {
+            Log.e(Constants.TAG, "error while reading decryption key from input stream", e);
             AppMsg.makeText(this, getString(R.string.error_message, e.getMessage()),
                     AppMsg.STYLE_ALERT).show();
         }
@@ -638,11 +631,11 @@ public class DecryptActivity extends DrawerActivity {
 
         intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
 
-        // Message is received after encrypting is done in ApgService
+        // Message is received after encrypting is done in KeychainIntentService
         KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this,
                 getString(R.string.progress_decrypting), ProgressDialog.STYLE_HORIZONTAL) {
             public void handleMessage(Message message) {
-                // handle messages by standard ApgHandler first
+                // handle messages by standard KeychainIntentServiceHandler first
                 super.handleMessage(message);
 
                 if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
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 092a502e1..6eb5b9d2d 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
@@ -180,7 +180,7 @@ public class EditKeyActivity extends ActionBarActivity {
 
                     serviceIntent.putExtra(KeychainIntentService.EXTRA_DATA, data);
 
-                    // Message is received after generating is done in ApgService
+                    // Message is received after generating is done in KeychainIntentService
                     KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(
                             this, getResources().getQuantityString(R.plurals.progress_generating, 1),
                             ProgressDialog.STYLE_HORIZONTAL, true,
@@ -197,7 +197,7 @@ public class EditKeyActivity extends ActionBarActivity {
 
                         @Override
                         public void handleMessage(Message message) {
-                            // handle messages by standard ApgHandler first
+                            // handle messages by standard KeychainIntentServiceHandler first
                             super.handleMessage(message);
 
                             if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
@@ -540,11 +540,11 @@ public class EditKeyActivity extends ActionBarActivity {
 
             intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
 
-            // Message is received after saving is done in ApgService
+            // Message is received after saving is done in KeychainIntentService
             KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this,
                     getString(R.string.progress_saving), ProgressDialog.STYLE_HORIZONTAL) {
                 public void handleMessage(Message message) {
-                    // handle messages by standard ApgHandler first
+                    // handle messages by standard KeychainIntentServiceHandler first
                     super.handleMessage(message);
 
                     if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
index 4ccfd393f..4f18f69d7 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
@@ -597,11 +597,11 @@ public class EncryptActivity extends DrawerActivity {
 
         intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
 
-        // Message is received after encrypting is done in ApgService
+        // Message is received after encrypting is done in KeychainIntentService
         KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this,
                 getString(R.string.progress_encrypting), ProgressDialog.STYLE_HORIZONTAL) {
             public void handleMessage(Message message) {
-                // handle messages by standard ApgHandler first
+                // handle messages by standard KeychainIntentServiceHandler first
                 super.handleMessage(message);
 
                 if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index 05bfc613e..834509f53 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -363,7 +363,7 @@ public class ImportKeysActivity extends DrawerActivity implements ActionBar.OnNa
      * Import keys with mImportData
      */
     public void importKeys() {
-        // Message is received after importing is done in ApgService
+        // Message is received after importing is done in KeychainIntentService
         KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(
                 this,
                 getString(R.string.progress_importing),
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
index 2c8f66488..0e231e6a8 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
@@ -98,11 +98,11 @@ public class UploadKeyActivity extends ActionBarActivity {
 
         intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
 
-        // Message is received after uploading is done in ApgService
+        // Message is received after uploading is done in KeychainIntentService
         KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this,
                 getString(R.string.progress_exporting), ProgressDialog.STYLE_HORIZONTAL) {
             public void handleMessage(Message message) {
-                // handle messages by standard ApgHandler first
+                // handle messages by standard KeychainIntentServiceHandler first
                 super.handleMessage(message);
 
                 if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
index b067010df..b4c38184c 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
@@ -87,11 +87,11 @@ public class DeleteFileDialogFragment extends DialogFragment {
                         false,
                         null);
 
-                // Message is received after deleting is done in ApgService
+                // Message is received after deleting is done in KeychainIntentService
                 KeychainIntentServiceHandler saveHandler =
                         new KeychainIntentServiceHandler(activity, deletingDialog) {
                     public void handleMessage(Message message) {
-                        // handle messages by standard ApgHandler first
+                        // handle messages by standard KeychainIntentHandler first
                         super.handleMessage(message);
 
                         if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java
index e5b6003b1..1ef178f15 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java
@@ -256,11 +256,11 @@ public class SectionView extends LinearLayout implements OnClickListener, Editor
                     }
                 });
 
-        // Message is received after generating is done in ApgService
+        // Message is received after generating is done in KeychainIntentService
         KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(mActivity,
                 mGeneratingDialog) {
             public void handleMessage(Message message) {
-                // handle messages by standard ApgHandler first
+                // handle messages by standard KeychainIntentServiceHandler first
                 super.handleMessage(message);
 
                 if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {