diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-04-03 22:49:08 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-04-03 22:49:08 +0200 |
| commit | 2620e0bfc8cbbdfb304629dbcf8d3a9d2d0b35ae (patch) | |
| tree | 1a8cec63a37b7de2deca4e17ece247333171eab9 /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java | |
| parent | dedcfd8a7243a8ff5740ad706bc749d57ee8b5e8 (diff) | |
| download | open-keychain-2620e0bfc8cbbdfb304629dbcf8d3a9d2d0b35ae.tar.gz open-keychain-2620e0bfc8cbbdfb304629dbcf8d3a9d2d0b35ae.tar.bz2 open-keychain-2620e0bfc8cbbdfb304629dbcf8d3a9d2d0b35ae.zip | |
db-overhaul: more work on new provider
specifics:
- secret keys are preserved when a new public key is inserted
- started work to give virtual columns a representation in the contract
class
- streamline ProviderHelper methods. the getUnifiedData method relies
on a api level 11 method, not sure yet how to fix/workaround that...
- many more small things work as they did before
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java')
| -rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java index 1b81c8b3b..dc9fa6235 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java @@ -107,7 +107,7 @@ public class ShareQrCodeDialogFragment extends DialogFragment { long masterKeyId = ProviderHelper.getMasterKeyId(getActivity(), dataUri); // get public keyring as ascii armored string ArrayList<String> keyringArmored = ProviderHelper.getKeyRingsAsArmoredString( - getActivity(), dataUri, new long[] { masterKeyId }); + getActivity(), new long[] { masterKeyId }); // TODO: binary? |