3 files changed, 4 insertions, 3 deletions
diff --git a/src/org/thialfihar/android/apg/EditKeyActivity.java b/src/org/thialfihar/android/apg/EditKeyActivity.java
index b1e37e8a1..9bd6d3f36 100644
--- a/src/org/thialfihar/android/apg/EditKeyActivity.java
+++ b/src/org/thialfihar/android/apg/EditKeyActivity.java
@@ -115,7 +115,7 @@ public class EditKeyActivity extends BaseActivity implements OnClickListener {
         Toast.makeText(this, "Warning: Key editing is still kind of beta.", Toast.LENGTH_LONG).show();
     }
 
-    public long getMasterKeyId() {
+    private long getMasterKeyId() {
         if (mKeys.getEditors().getChildCount() == 0) {
             return 0;
         }
@@ -243,6 +243,7 @@ public class EditKeyActivity extends BaseActivity implements OnClickListener {
                 newPassPhrase = oldPassPhrase;
             }
             Apg.buildSecretKey(this, mUserIds, mKeys, oldPassPhrase, newPassPhrase, this);
+            Apg.setCachedPassPhrase(getMasterKeyId(), newPassPhrase);
         } catch (NoSuchProviderException e) {
             error = e.getMessage();
         } catch (NoSuchAlgorithmException e) {
diff --git a/src/org/thialfihar/android/apg/PublicKeyListActivity.java b/src/org/thialfihar/android/apg/PublicKeyListActivity.java
index 67bc608ad..a04d933d7 100644
--- a/src/org/thialfihar/android/apg/PublicKeyListActivity.java
+++ b/src/org/thialfihar/android/apg/PublicKeyListActivity.java
@@ -53,7 +53,7 @@ public class PublicKeyListActivity extends BaseActivity {
     protected int mSelectedItem = -1;
     protected int mTask = 0;
 
-    private String mImportFilename = Constants.path.app_dir + "/pubring.gpg";
+    private String mImportFilename = Constants.path.app_dir + "/";
     private String mExportFilename = Constants.path.app_dir + "/pubexport.asc";
 
     @Override
diff --git a/src/org/thialfihar/android/apg/SecretKeyListActivity.java b/src/org/thialfihar/android/apg/SecretKeyListActivity.java
index a69fc5b9c..b1857dc6c 100644
--- a/src/org/thialfihar/android/apg/SecretKeyListActivity.java
+++ b/src/org/thialfihar/android/apg/SecretKeyListActivity.java
@@ -54,7 +54,7 @@ public class SecretKeyListActivity extends BaseActivity implements OnChildClickL
     protected int mSelectedItem = -1;
     protected int mTask = 0;
 
-    private String mImportFilename = Constants.path.app_dir + "/secring.gpg";
+    private String mImportFilename = Constants.path.app_dir + "/";
     private String mExportFilename = Constants.path.app_dir + "/secexport.asc";
 
     @Override