From 24c17c066c297aa3a1fd3091245e8f70b73fc81b Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Thu, 9 Oct 2014 18:17:52 +0200 Subject: fix #4409: NPE when trying to edit WP coordinates Some clipboard data cannot be coerced to text, including an empty clipboard. --- main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main/src/cgeo/geocaching/ui') diff --git a/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java b/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java index f2a8c7d..283b7fd 100644 --- a/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java +++ b/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java @@ -178,7 +178,7 @@ public class CoordinatesInputDialog extends DialogFragment { final Button buttonClipboard = ButterKnife.findById(v, R.id.clipboard); try { @SuppressWarnings("unused") - final Geopoint geopoint = new Geopoint(ClipboardUtils.getText()); + final Geopoint geopoint = new Geopoint(StringUtils.defaultString(ClipboardUtils.getText())); buttonClipboard.setOnClickListener(new ClipboardListener()); buttonClipboard.setVisibility(View.VISIBLE); } catch (final ParseException e) { @@ -519,7 +519,7 @@ public class CoordinatesInputDialog extends DialogFragment { @Override public void onClick(final View v) { try { - gp = new Geopoint(ClipboardUtils.getText()); + gp = new Geopoint(StringUtils.defaultString(ClipboardUtils.getText())); updateGUI(); } catch (final ParseException e) { } -- cgit v1.1