From 8cf4e25320dae710360e5a8d6c8ee92143db3fdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Thu, 4 Sep 2014 14:59:39 +0200 Subject: Safeslinger: more simplification --- .../keychain/ui/ViewKeyShareFragment.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'OpenKeychain') 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 14d147a24..72242a6cc 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyShareFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyShareFragment.java @@ -267,7 +267,8 @@ public class ViewKeyShareFragment extends LoaderFragment implements } private static byte[] getSlingedKeys(Intent data) { - ArrayList theirSecrets = new ArrayList(); + ByteArrayOutputStream out = new ByteArrayOutputStream(); + Bundle extras = data.getExtras(); if (extras != null) { byte[] d; @@ -275,21 +276,16 @@ public class ViewKeyShareFragment extends LoaderFragment implements do { d = extras.getByteArray(ExchangeConfig.extra.MEMBER_DATA + i); if (d != null) { - theirSecrets.add(d); + try { + out.write(d); + } catch (IOException e) { + Log.e(Constants.TAG, "IOException", e); + } i++; } } while (d != null); } - // concatenate keys - ByteArrayOutputStream out = new ByteArrayOutputStream(); - for (byte[] t : theirSecrets) { - try { - out.write(t); - } catch (IOException e) { - Log.e(Constants.TAG, "IOException", e); - } - } return out.toByteArray(); } -- cgit v1.2.3