From a1efb24228774d786f22f7ee0440fdde0dda54ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Tue, 8 Apr 2014 22:25:42 +0200 Subject: Introduce ProviderHelper.NotFoundException, remove dead code --- .../keychain/ui/dialog/ShareQrCodeDialogFragment.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java index b6ff139df..d2d21093e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java @@ -33,6 +33,7 @@ import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.pgp.PgpKeyHelper; import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings; import org.sufficientlysecure.keychain.provider.ProviderHelper; +import org.sufficientlysecure.keychain.util.Log; import org.sufficientlysecure.keychain.util.QrCodeUtils; import java.util.ArrayList; @@ -106,7 +107,12 @@ public class ShareQrCodeDialogFragment extends DialogFragment { mText.setText(R.string.share_qr_code_dialog_start); // TODO works, but - long masterKeyId = ProviderHelper.getMasterKeyId(getActivity(), dataUri); + long masterKeyId = 0; + try { + masterKeyId = ProviderHelper.getMasterKeyId(getActivity(), dataUri); + } catch (ProviderHelper.NotFoundException e) { + Log.e(Constants.TAG, "key not found!", e); + } // get public keyring as ascii armored string ArrayList keyringArmored = ProviderHelper.getKeyRingsAsArmoredString( getActivity(), new long[] { masterKeyId }); -- cgit v1.2.3