Merge pull request #359 from gezb/301

Fix for issue #301 - include Apache commons lang library

1 files changed, 9 insertions, 7 deletions

diff --git a/src/cgeo/geocaching/cgeoadvsearch.java b/src/cgeo/geocaching/cgeoadvsearch.java
index 1849faa..c7b98f5 100644
--- a/src/cgeo/geocaching/cgeoadvsearch.java
+++ b/src/cgeo/geocaching/cgeoadvsearch.java
@@ -4,6 +4,8 @@ import java.util.HashMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.apache.commons.lang3.StringUtils;
+
 import android.app.SearchManager;
 import android.content.Intent;
 import android.content.res.Configuration;
@@ -245,7 +247,7 @@ public class cgeoadvsearch extends AbstractActivity {
 		final String latText = latView.getText().toString();
 		final String lonText = lonView.getText().toString();
 
-		if (latText == null || latText.length() == 0 || lonText == null || lonText.length() == 0) {
+		if (StringUtils.isEmpty(latText) || StringUtils.isEmpty(lonText)) {
 			latView.setText(cgBase.formatLatitude(geo.latitudeNow, true));
 			lonView.setText(cgBase.formatLongitude(geo.longitudeNow, true));
 		} else {
@@ -295,7 +297,7 @@ public class cgeoadvsearch extends AbstractActivity {
 		// find caches by coordinates
 		String keyText = ((EditText) findViewById(R.id.keyword)).getText().toString();
 
-		if (keyText == null || keyText.length() == 0) {
+		if (StringUtils.isBlank(keyText)) {
 			helpDialog(res.getString(R.string.warn_search_help_title), res.getString(R.string.warn_search_help_keyword));
 			return;
 		}
@@ -330,7 +332,7 @@ public class cgeoadvsearch extends AbstractActivity {
 	private void findByAddressFn() {
 		final String addText = ((EditText) findViewById(R.id.address)).getText().toString();
 
-		if (addText == null || addText.length() == 0) {
+		if (StringUtils.isBlank(addText)) {
 			helpDialog(res.getString(R.string.warn_search_help_title), res.getString(R.string.warn_search_help_address));
 			return;
 		}
@@ -363,7 +365,7 @@ public class cgeoadvsearch extends AbstractActivity {
 	public void findByUsernameFn() {
 		final String usernameText = ((EditText) findViewById(R.id.username)).getText().toString();
 
-		if (usernameText == null || usernameText.length() == 0) {
+		if (StringUtils.isBlank(usernameText)) {
 			helpDialog(res.getString(R.string.warn_search_help_title), res.getString(R.string.warn_search_help_user));
 			return;
 		}
@@ -398,7 +400,7 @@ public class cgeoadvsearch extends AbstractActivity {
 	private void findByOwnerFn() {
 		final String usernameText = ((EditText) findViewById(R.id.owner)).getText().toString();
 
-		if (usernameText == null || usernameText.length() == 0) {
+		if (StringUtils.isBlank(usernameText)) {
 			helpDialog(res.getString(R.string.warn_search_help_title), res.getString(R.string.warn_search_help_user));
 			return;
 		}
@@ -433,7 +435,7 @@ public class cgeoadvsearch extends AbstractActivity {
 	private void findByGeocodeFn() {
 		final String geocodeText = ((EditText) findViewById(R.id.geocode)).getText().toString();
 
-		if (geocodeText == null || geocodeText.length() == 0 || geocodeText.equalsIgnoreCase("GC")) {
+		if (StringUtils.isBlank(geocodeText) || geocodeText.equalsIgnoreCase("GC")) {
 			helpDialog(res.getString(R.string.warn_search_help_title), res.getString(R.string.warn_search_help_gccode));
 			return;
 		}
@@ -464,7 +466,7 @@ public class cgeoadvsearch extends AbstractActivity {
 	private void findTrackableFn() {
 		final String trackableText = ((EditText) findViewById(R.id.trackable)).getText().toString();
 
-		if (trackableText == null || trackableText.length() == 0 || trackableText.equalsIgnoreCase("TB")) {
+		if (StringUtils.isBlank(trackableText)|| trackableText.equalsIgnoreCase("TB")) {
 			helpDialog(res.getString(R.string.warn_search_help_title), res.getString(R.string.warn_search_help_tb));
 			return;
 		}