avoid NPEs

3 files changed, 6 insertions, 5 deletions

diff --git a/main/src/cgeo/geocaching/SearchActivity.java b/main/src/cgeo/geocaching/SearchActivity.java
index 9de279d..1606350 100644
--- a/main/src/cgeo/geocaching/SearchActivity.java
+++ b/main/src/cgeo/geocaching/SearchActivity.java
@@ -373,7 +373,7 @@ public class SearchActivity extends AbstractActionBarActivity implements Coordin
     }
 
     private void findByGeocodeFn() {
-        final String geocodeText = StringUtils.trim(geocodeEditText.getText().toString());
+        final String geocodeText = StringUtils.trimToEmpty(geocodeEditText.getText().toString());
 
         if (StringUtils.isBlank(geocodeText) || geocodeText.equalsIgnoreCase("GC")) {
             Dialogs.message(this, R.string.warn_search_help_title, R.string.warn_search_help_gccode);
@@ -384,7 +384,7 @@ public class SearchActivity extends AbstractActionBarActivity implements Coordin
     }
 
     private void findTrackableFn() {
-        final String trackableText = StringUtils.trim(trackableEditText.getText().toString());
+        final String trackableText = StringUtils.trimToEmpty(trackableEditText.getText().toString());
 
         if (StringUtils.isBlank(trackableText) || trackableText.equalsIgnoreCase("TB")) {
             Dialogs.message(this, R.string.warn_search_help_title, R.string.warn_search_help_tb);
diff --git a/main/src/cgeo/geocaching/location/GeopointParser.java b/main/src/cgeo/geocaching/location/GeopointParser.java
index 0496eb1..7790d91 100644
--- a/main/src/cgeo/geocaching/location/GeopointParser.java
+++ b/main/src/cgeo/geocaching/location/GeopointParser.java
@@ -119,7 +119,7 @@ class GeopointParser {
 
         // Nothing found with "N 52...", try to match string as decimal degree parts (i.e. multiple doubles)
         try {
-            final String[] items = StringUtils.split(text.trim());
+            final String[] items = StringUtils.split(StringUtils.trimToEmpty(text));
             if (items.length > 0 && items.length <= 2) {
                 final int index = (latlon == LatLon.LON ? items.length - 1 : 0);
                 final String textPart = items[index];
diff --git a/main/src/cgeo/geocaching/ui/AddressListAdapter.java b/main/src/cgeo/geocaching/ui/AddressListAdapter.java
index 691c8d2..455954a 100644
--- a/main/src/cgeo/geocaching/ui/AddressListAdapter.java
+++ b/main/src/cgeo/geocaching/ui/AddressListAdapter.java
@@ -9,6 +9,7 @@ import cgeo.geocaching.location.Geopoint;
 import cgeo.geocaching.location.Units;
 
 import org.apache.commons.lang3.StringUtils;
+import org.eclipse.jdt.annotation.NonNull;
 
 import android.app.Activity;
 import android.location.Address;
@@ -23,7 +24,7 @@ import java.util.ArrayList;
 public class AddressListAdapter extends ArrayAdapter<Address> {
 
     final private LayoutInflater inflater;
-    final private Geopoint location;
+    @NonNull final private Geopoint location;
 
     protected static final class ViewHolder extends AbstractViewHolder {
         @InjectView(R.id.label) protected TextView label;
@@ -72,7 +73,7 @@ public class AddressListAdapter extends ArrayAdapter<Address> {
     }
 
     private CharSequence getDistanceText(final Address address) {
-        if (location != null && address.hasLatitude() && address.hasLongitude()) {
+        if (address.hasLatitude() && address.hasLongitude()) {
             return Units.getDistanceFromKilometers(location.distanceTo(new Geopoint(address.getLatitude(), address.getLongitude())));
         }