From d3e0e823e3774832f13ea34861252534eec9896b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sat, 25 Oct 2014 03:06:39 +0200 Subject: [PATCH] Fix result passing --- .../org/sufficientlysecure/keychain/ui/KeyListFragment.java | 2 +- .../org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java index eba16e55d..8c6a62283 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java @@ -601,7 +601,7 @@ public class KeyListFragment extends LoaderFragment if (holder.mMasterKeyId != null) { Intent safeSlingerIntent = new Intent(getActivity(), SafeSlingerActivity.class); safeSlingerIntent.putExtra(SafeSlingerActivity.EXTRA_MASTER_KEY_ID, holder.mMasterKeyId); - startActivity(safeSlingerIntent); + startActivityForResult(safeSlingerIntent, 0); } } }); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java index a3ce65501..9c95b5b49 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java @@ -130,7 +130,6 @@ public class SafeSlingerActivity extends ActionBarActivity { } private void startExchange(long masterKeyId, int number) { - Log.d(Constants.TAG, "number: " + number); // retrieve public key blob and start SafeSlinger Uri uri = KeychainContract.KeyRingData.buildPublicKeyRingUri(masterKeyId); try {