diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-04 14:34:59 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-04 14:34:59 +0200 |
| commit | b1c3bfa1571ad374070074e09bfef56f8d37901d (patch) | |
| tree | 980fd6a8a54f0e6b197a8da90db87543fce480da | |
| parent | 4872fd5b2d0a674f651a1f68d21b556690444364 (diff) | |
| download | open-keychain-b1c3bfa1571ad374070074e09bfef56f8d37901d.tar.gz open-keychain-b1c3bfa1571ad374070074e09bfef56f8d37901d.tar.bz2 open-keychain-b1c3bfa1571ad374070074e09bfef56f8d37901d.zip | |
Safeslinger: get all bytes
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyShareFragment.java | 14 |
1 files changed, 12 insertions, 2 deletions
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<byte[]> 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: |