cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pass through data correctly in new remote activities

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-07-26 00:46:08 +02:00
parent 553682582c
commit 93d7b3bdf3
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RequestKeyPermissionActivity.java
View File

@@ -163,7 +163,9 @@ public class RequestKeyPermissionActivity extends FragmentActivity {
return; return;
} }
activity.setResult(Activity.RESULT_OK); Intent passthroughData = activity.getIntent().getParcelableExtra(
RemoteSecurityTokenOperationActivity.EXTRA_DATA);
activity.setResult(RESULT_OK, passthroughData);
activity.finish(); activity.finish();
} }

5
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/dialog/RemoteDeduplicateActivity.java
View File

@@ -50,6 +50,7 @@ import android.widget.TextView;
import com.mikepenz.materialdrawer.util.KeyboardUtil; import com.mikepenz.materialdrawer.util.KeyboardUtil;
import org.sufficientlysecure.keychain.R; 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.KeyLoader.KeyInfo;
import org.sufficientlysecure.keychain.remote.ui.dialog.RemoteDeduplicatePresenter.RemoteDeduplicateView; import org.sufficientlysecure.keychain.remote.ui.dialog.RemoteDeduplicatePresenter.RemoteDeduplicateView;
import org.sufficientlysecure.keychain.ui.dialog.CustomAlertDialogBuilder; import org.sufficientlysecure.keychain.ui.dialog.CustomAlertDialogBuilder;
@@ -171,7 +172,9 @@ public class RemoteDeduplicateActivity extends FragmentActivity {
return; return;
} }
activity.setResult(RESULT_OK, null); Intent passthroughData = activity.getIntent().getParcelableExtra(
RemoteSecurityTokenOperationActivity.EXTRA_DATA);
activity.setResult(RESULT_OK, passthroughData);
activity.finish(); activity.finish();
} }