1 files changed, 41 insertions, 38 deletions

diff --git a/src/cgeo/geocaching/cgData.java b/src/cgeo/geocaching/cgData.java
index ab24864..0c15718 100644
--- a/src/cgeo/geocaching/cgData.java
+++ b/src/cgeo/geocaching/cgData.java
@@ -17,6 +17,8 @@ import java.util.Locale;
 import java.util.Map.Entry;
 import java.util.Set;
 
+import org.apache.commons.lang3.StringUtils;
+
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.res.Resources;
@@ -26,6 +28,7 @@ import android.database.sqlite.SQLiteOpenHelper;
 import android.database.sqlite.SQLiteStatement;
 import android.os.Environment;
 import android.util.Log;
+import cgeo.geocaching.utils.CollectionUtils;
 
 public class cgData {
 
@@ -860,7 +863,7 @@ public class cgData {
 		int dataDetailed = 0;
 
 		try {
-			if (geocode != null && geocode.length() > 0) {
+			if (StringUtils.isNotBlank(geocode)) {
 				cursor = databaseRO.query(
 						dbTableCaches,
 						new String[]{"_id", "detailed", "detailedupdate", "updated"},
@@ -870,7 +873,7 @@ public class cgData {
 						null,
 						null,
 						"1");
-			} else if (guid != null && guid.length() > 0) {
+			} else if (StringUtils.isNotBlank(guid)) {
 				cursor = databaseRO.query(
 						dbTableCaches,
 						new String[]{"_id", "detailed", "detailedupdate", "updated"},
@@ -938,7 +941,7 @@ public class cgData {
 		long reason = 0;
 
 		try {
-			if (geocode != null && geocode.length() > 0) {
+			if (StringUtils.isNotBlank(geocode)) {
 				cursor = databaseRO.query(
 						dbTableCaches,
 						new String[]{"reason"},
@@ -948,7 +951,7 @@ public class cgData {
 						null,
 						null,
 						"1");
-			} else if (guid != null && guid.length() > 0) {
+			} else if (StringUtils.isNotBlank(guid)) {
 				cursor = databaseRO.query(
 						dbTableCaches,
 						new String[]{"reason"},
@@ -993,7 +996,7 @@ public class cgData {
 		int rel = 0;
 
 		try {
-			if (geocode != null && geocode.length() > 0) {
+			if (StringUtils.isNotBlank(geocode)) {
 				cursor = databaseRO.query(
 						dbTableCaches,
 						new String[]{"reliable_latlon"},
@@ -1003,7 +1006,7 @@ public class cgData {
 						null,
 						null,
 						"1");
-			} else if (guid != null && guid.length() > 0) {
+			} else if (StringUtils.isNotBlank(guid)) {
 				cursor = databaseRO.query(
 						dbTableCaches,
 						new String[]{"reliable_latlon"},
@@ -1042,7 +1045,7 @@ public class cgData {
 	}
 
 	public String getGeocodeForGuid(String guid) {
-		if (guid == null || guid.length() == 0) {
+		if (StringUtils.isBlank(guid)) {
 			return null;
 		}
 
@@ -1084,7 +1087,7 @@ public class cgData {
 	}
 
 	public String getCacheidForGeocode(String geocode) {
-		if (geocode == null || geocode.length() == 0) {
+		if (StringUtils.isBlank(geocode)) {
 			return null;
 		}
 
@@ -1273,7 +1276,7 @@ public class cgData {
 	public boolean saveAttributes(String geocode, ArrayList<String> attributes) {
 		init();
 
-		if (geocode == null || geocode.length() == 0 || attributes == null) {
+		if (StringUtils.isBlank(geocode) || attributes == null) {
 			return false;
 		}
 
@@ -1340,7 +1343,7 @@ public class cgData {
 	public boolean saveWaypoints(String geocode, ArrayList<cgWaypoint> waypoints, boolean drop) {
 		init();
 
-		if (geocode == null || geocode.length() == 0 || waypoints == null) {
+		if (StringUtils.isBlank(geocode) || waypoints == null) {
 			return false;
 		}
 
@@ -1388,7 +1391,7 @@ public class cgData {
 	public boolean saveOwnWaypoint(int id, String geocode, cgWaypoint waypoint) {
 		init();
 
-		if (((geocode == null || geocode.length() == 0) && id <= 0) || waypoint == null) {
+		if ((StringUtils.isBlank(geocode) && id <= 0) || waypoint == null) {
 			return false;
 		}
 
@@ -1447,7 +1450,7 @@ public class cgData {
 	public boolean saveSpoilers(String geocode, ArrayList<cgImage> spoilers) {
 		init();
 
-		if (geocode == null || geocode.length() == 0 || spoilers == null) {
+		if (StringUtils.isBlank(geocode) || spoilers == null) {
 			return false;
 		}
 
@@ -1483,7 +1486,7 @@ public class cgData {
 	public boolean saveLogs(String geocode, ArrayList<cgLog> logs, boolean drop) {
 		init();
 
-		if (geocode == null || geocode.length() == 0 || logs == null) {
+		if (StringUtils.isBlank(geocode) || logs == null) {
 			return false;
 		}
 
@@ -1508,7 +1511,7 @@ public class cgData {
 
 					long log_id = databaseRW.insert(dbTableLogs, null, values);
 
-					if ((oneLog.logImages != null) && (oneLog.logImages.size() > 0)) {
+					if (CollectionUtils.isNotEmpty(oneLog.logImages)) {
 						for (cgImage img : oneLog.logImages) {
 							values.clear();
 							values.put("log_id", log_id);
@@ -1534,7 +1537,7 @@ public class cgData {
 	public boolean saveLogCount(String geocode, HashMap<Integer, Integer> logCounts, boolean drop) {
 		init();
 
-		if (geocode == null || geocode.length() == 0 || logCounts == null || logCounts.isEmpty()) {
+		if (StringUtils.isBlank(geocode) || CollectionUtils.isEmpty(logCounts)) {
 			return false;
 		}
 
@@ -1681,13 +1684,13 @@ public class cgData {
 		Object[] geocodes = new Object[1];
 		Object[] guids = new Object[1];
 
-		if (geocode != null && geocode.length() > 0) {
+		if (StringUtils.isNotBlank(geocode)) {
 			geocodes[0] = geocode;
 		} else {
 			geocodes = null;
 		}
 
-		if (guid != null && guid.length() > 0) {
+		if (StringUtils.isNotBlank(guid)) {
 			guids[0] = guid;
 		} else {
 			guids = null;
@@ -1970,7 +1973,7 @@ public class cgData {
 	}
 
 	public ArrayList<String> loadAttributes(String geocode) {
-		if (geocode == null || geocode.length() == 0) {
+		if (StringUtils.isBlank(geocode)) {
 			return null;
 		}
 
@@ -2036,7 +2039,7 @@ public class cgData {
 	}
 
 	public ArrayList<cgWaypoint> loadWaypoints(String geocode) {
-		if (geocode == null || geocode.length() == 0) {
+		if (StringUtils.isBlank(geocode)) {
 			return null;
 		}
 
@@ -2101,7 +2104,7 @@ public class cgData {
 	}
 
 	public ArrayList<cgImage> loadSpoilers(String geocode) {
-		if (geocode == null || geocode.length() == 0) {
+		if (StringUtils.isBlank(geocode)) {
 			return null;
 		}
 
@@ -2196,7 +2199,7 @@ public class cgData {
 	}
 
 	public ArrayList<cgLog> loadLogs(String geocode) {
-		if (geocode == null || geocode.length() == 0) {
+		if (StringUtils.isBlank(geocode)) {
 			return null;
 		}
 
@@ -2239,7 +2242,7 @@ public class cgData {
 	}
 
 	public HashMap<Integer, Integer> loadLogCounts(String geocode) {
-		if (geocode == null || geocode.length() == 0) {
+		if (StringUtils.isBlank(geocode)) {
 			return null;
 		}
 
@@ -2309,7 +2312,7 @@ public class cgData {
 	}
 
 	public ArrayList<cgTrackable> loadInventory(String geocode) {
-		if (geocode == null || geocode.length() == 0) {
+		if (StringUtils.isBlank(geocode)) {
 			return null;
 		}
 
@@ -2345,7 +2348,7 @@ public class cgData {
 	}
 
 	public cgTrackable loadTrackable(String geocode) {
-		if (geocode == null || geocode.length() == 0) {
+		if (StringUtils.isBlank(geocode)) {
 			return null;
 		}
 
@@ -2694,7 +2697,7 @@ public class cgData {
 	}
 
 	public void markStored(String geocode, int listId) {
-		if (geocode == null || geocode.length() == 0) {
+		if (StringUtils.isBlank(geocode)) {
 			return;
 		}
 
@@ -2710,7 +2713,7 @@ public class cgData {
 	}
 
 	public boolean markDropped(String geocode) {
-		if (geocode == null || geocode.length() == 0) {
+		if (StringUtils.isBlank(geocode)) {
 			return false;
 		}
 
@@ -2732,7 +2735,7 @@ public class cgData {
 	}
 
 	public boolean markFound(String geocode) {
-		if (geocode == null || geocode.length() == 0) {
+		if (StringUtils.isBlank(geocode)) {
 			return false;
 		}
 
@@ -2863,7 +2866,7 @@ public class cgData {
 				cursor.close();
 			}
 
-			if (geocodes.size() > 0) {
+			if (CollectionUtils.isNotEmpty(geocodes)) {
 				String geocodeList = cgBase.implode(", ", geocodes.toArray());
 				databaseRW.execSQL("delete from " + dbTableCaches + " where geocode in (" + geocodeList + ")");
 				databaseRW.execSQL("delete from " + dbTableAttributes + " where geocode in (" + geocodeList + ")");
@@ -2882,10 +2885,10 @@ public class cgData {
 	}
 
 	public boolean saveLogOffline(String geocode, Date date, int type, String log) {
-		if (geocode == null || geocode.length() == 0) {
+		if (StringUtils.isBlank(geocode)) {
 			return false;
 		}
-		if (type <= 0 && (log == null || log.length() == 0)) {
+		if (type <= 0 && StringUtils.isBlank(log)) {
 			return false;
 		}
 
@@ -2920,7 +2923,7 @@ public class cgData {
 	}
 
 	public cgLog loadLogOffline(String geocode) {
-		if (geocode == null || geocode.length() == 0) {
+		if (StringUtils.isBlank(geocode)) {
 			return null;
 		}
 
@@ -2956,7 +2959,7 @@ public class cgData {
 	}
 
 	public void clearLogOffline(String geocode) {
-		if (geocode == null || geocode.length() == 0) {
+		if (StringUtils.isBlank(geocode)) {
 			return;
 		}
 
@@ -2966,7 +2969,7 @@ public class cgData {
 	}
 
 	public boolean hasLogOffline(String geocode) {
-		if (geocode == null || geocode.length() == 0) {
+		if (StringUtils.isBlank(geocode)) {
 			return false;
 		}
 
@@ -2985,7 +2988,7 @@ public class cgData {
 	}
 
 	public void saveVisitDate(String geocode) {
-		if (geocode == null || geocode.length() == 0) {
+		if (StringUtils.isBlank(geocode)) {
 			return;
 		}
 
@@ -3000,7 +3003,7 @@ public class cgData {
 	}
 
 	public void clearVisitDate(String geocode) {
-        if (geocode == null || geocode.length() == 0) {
+        if (StringUtils.isBlank(geocode)) {
             return;
         }
 
@@ -3107,7 +3110,7 @@ public class cgData {
 
 	public int createList(String name) {
 		int id = -1;
-		if (name == null || name.length() == 0) {
+		if (StringUtils.isBlank(name)) {
 			return id;
 		}
 
@@ -3161,7 +3164,7 @@ public class cgData {
 	}
 
 	public void moveToList(String geocode, int listId) {
-		if (geocode == null || geocode.length() == 0 || listId <= 0) {
+		if (StringUtils.isBlank(geocode) || listId <= 0) {
 			return;
 		}
 
@@ -3187,7 +3190,7 @@ public class cgData {
 
 	public boolean removeSearchedDestination(cgDestination destination) {
 		boolean success = true;
-		if(destination == null){
+		if (destination == null){
 			success = false;
 		} else{
 			init();