From 93d7b3bdf3f6ef4f15b0d4212e569f1fa4e5331b Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Wed, 26 Jul 2017 00:46:08 +0200
Subject: [PATCH] pass through data correctly in new remote activities

---
 .../keychain/remote/ui/RequestKeyPermissionActivity.java     | 4 +++-
 .../keychain/remote/ui/dialog/RemoteDeduplicateActivity.java | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RequestKeyPermissionActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RequestKeyPermissionActivity.java
index 0296e9b48..9f68ab48b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RequestKeyPermissionActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RequestKeyPermissionActivity.java
@@ -163,7 +163,9 @@ public class RequestKeyPermissionActivity extends FragmentActivity {
                         return;
                     }
 
-                    activity.setResult(Activity.RESULT_OK);
+                    Intent passthroughData = activity.getIntent().getParcelableExtra(
+                            RemoteSecurityTokenOperationActivity.EXTRA_DATA);
+                    activity.setResult(RESULT_OK, passthroughData);
                     activity.finish();
                 }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/dialog/RemoteDeduplicateActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/dialog/RemoteDeduplicateActivity.java
index 3872ce352..6597e91e1 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/dialog/RemoteDeduplicateActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/dialog/RemoteDeduplicateActivity.java
@@ -50,6 +50,7 @@ import android.widget.TextView;
 
 import com.mikepenz.materialdrawer.util.KeyboardUtil;
 import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.remote.ui.RemoteSecurityTokenOperationActivity;
 import org.sufficientlysecure.keychain.remote.ui.dialog.KeyLoader.KeyInfo;
 import org.sufficientlysecure.keychain.remote.ui.dialog.RemoteDeduplicatePresenter.RemoteDeduplicateView;
 import org.sufficientlysecure.keychain.ui.dialog.CustomAlertDialogBuilder;
@@ -171,7 +172,9 @@ public class RemoteDeduplicateActivity extends FragmentActivity {
                         return;
                     }
 
-                    activity.setResult(RESULT_OK, null);
+                    Intent passthroughData = activity.getIntent().getParcelableExtra(
+                            RemoteSecurityTokenOperationActivity.EXTRA_DATA);
+                    activity.setResult(RESULT_OK, passthroughData);
                     activity.finish();
                 }