return key ids from PassphraseDialogActivity, accept null userids

4 files changed, 5 insertions, 7 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
index 9730cd74d..57a11de21 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
@@ -85,8 +85,8 @@ public class CertifyActionsParcel implements Parcelable {
         public CertifyAction(long masterKeyId, List<String> userIds,
                 List<WrappedUserAttribute> attributes) {
             mMasterKeyId = masterKeyId;
-            mUserIds = new ArrayList<>(userIds);
-            mUserAttributes = new ArrayList<>(attributes);
+            mUserIds = userIds == null ? null : new ArrayList<>(userIds);
+            mUserAttributes = attributes == null ? null : new ArrayList<>(attributes);
         }
     }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
index e1467ec61..6ac7630bf 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
@@ -31,7 +31,6 @@ import android.os.Bundle;
 import android.os.Message;
 import android.os.Messenger;
 import android.os.Parcel;
-import android.os.Parcelable;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.CursorLoader;
 import android.support.v4.content.Loader;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
index 29621662f..b06cf0abd 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
@@ -63,6 +63,7 @@ import org.sufficientlysecure.keychain.util.Preferences;
  */
 public class PassphraseDialogActivity extends FragmentActivity {
     public static final String MESSAGE_DATA_PASSPHRASE = "passphrase";
+    public static final String EXTRA_KEY_ID = "key_id";
 
     public static final String EXTRA_SUBKEY_ID = "secret_key_id";
 
@@ -413,6 +414,8 @@ public class PassphraseDialogActivity extends FragmentActivity {
                 // also return passphrase back to activity
                 Intent returnIntent = new Intent();
                 returnIntent.putExtra(MESSAGE_DATA_PASSPHRASE, passphrase);
+                returnIntent.putExtra(EXTRA_KEY_ID, mSecretRing.getMasterKeyId());
+                returnIntent.putExtra(EXTRA_SUBKEY_ID, mSubKeyId);
                 getActivity().setResult(RESULT_OK, returnIntent);
             }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java
index c8eceea50..b4890ac4e 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java
@@ -128,10 +128,6 @@ public abstract class KeySpinner extends TintSpinner implements LoaderManager.Lo
         }
     }
 
-    public long getSelectedKeyId() {
-        return mSelectedKeyId;
-    }
-
     public void setSelectedKeyId(long selectedKeyId) {
         this.mSelectedKeyId = selectedKeyId;
     }