From b1c3bfa1571ad374070074e09bfef56f8d37901d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Thu, 4 Sep 2014 14:34:59 +0200 Subject: Safeslinger: get all bytes --- .../keychain/ui/ViewKeyShareFragment.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyShareFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyShareFragment.java index c5b16bfd5..bf1c1f9f6 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyShareFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyShareFragment.java @@ -54,8 +54,11 @@ import org.sufficientlysecure.keychain.util.Log; import org.sufficientlysecure.keychain.util.Notify; import org.sufficientlysecure.keychain.util.QrCodeUtils; +import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.nio.ByteBuffer; import java.util.ArrayList; +import java.util.Arrays; import edu.cmu.cylab.starslinger.exchange.ExchangeActivity; import edu.cmu.cylab.starslinger.exchange.ExchangeConfig; @@ -253,8 +256,15 @@ public class ViewKeyShareFragment extends LoaderFragment implements ArrayList theirSecrets = endExchange(data); Intent importIntent = new Intent(getActivity(), ImportKeysActivity.class); importIntent.setAction(ImportKeysActivity.ACTION_IMPORT_KEY); - // TODO - importIntent.putExtra(ImportKeysActivity.EXTRA_KEY_BYTES, theirSecrets.get(0)); + ByteArrayOutputStream out = new ByteArrayOutputStream(); + for (byte[] t : theirSecrets) { + try { + out.write(t); + } catch (IOException e) { + Log.e(Constants.TAG, "IOException", e); + } + } + importIntent.putExtra(ImportKeysActivity.EXTRA_KEY_BYTES, out.toByteArray()); startActivity(importIntent); break; case ExchangeActivity.RESULT_EXCHANGE_CANCELED: -- cgit v1.2.3