From e314c401e7f75e7bbdaf3c74d096c5229d8a0922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Fri, 1 May 2015 00:32:20 +0200 Subject: [PATCH] Fix possible NPE when using a TextView --- .../fdroid/views/swap/ConfirmReceiveSwapFragment.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/ConfirmReceiveSwapFragment.java b/F-Droid/src/org/fdroid/fdroid/views/swap/ConfirmReceiveSwapFragment.java index d4326b6e3..0f1b6204b 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/swap/ConfirmReceiveSwapFragment.java +++ b/F-Droid/src/org/fdroid/fdroid/views/swap/ConfirmReceiveSwapFragment.java @@ -71,9 +71,10 @@ public class ConfirmReceiveSwapFragment extends Fragment implements ProgressList super.onResume(); newRepoConfig = new NewRepoConfig(getActivity(), getActivity().getIntent()); if (newRepoConfig.isValidRepo()) { - ((TextView) getView().findViewById(R.id.text_description)).setText( - getString(R.string.swap_confirm_connect, newRepoConfig.getHost()) - ); + TextView tv = (TextView) getView().findViewById(R.id.text_description); + if (tv != null) { + tv.setText(getString(R.string.swap_confirm_connect, newRepoConfig.getHost())); + } } else { // TODO: Show error message on screen (not in popup). // TODO: I don't think we want to continue with this at all if the repo config is invalid,