Fixes #2199

- Ensures 'not null' for trackable logs
- Ensures loadLogs never returns null, only empty List<>
- Three test-cases, surfacing the initial bug and the aspects of the fix

2 files changed, 4 insertions, 4 deletions

diff --git a/main/src/cgeo/geocaching/cgData.java b/main/src/cgeo/geocaching/cgData.java
index 773f08a..b822c2b 100644
--- a/main/src/cgeo/geocaching/cgData.java
+++ b/main/src/cgeo/geocaching/cgData.java
@@ -1915,14 +1915,14 @@ public class cgData {
     }
 
     public List<LogEntry> loadLogs(String geocode) {
+        List<LogEntry> logs = new ArrayList<LogEntry>();
+
         if (StringUtils.isBlank(geocode)) {
-            return null;
+            return logs;
         }
 
         init();
 
-        List<LogEntry> logs = new ArrayList<LogEntry>();
-
         Cursor cursor = database.rawQuery(
                 "SELECT cg_logs._id as cg_logs_id, type, author, log, date, found, friend, " + dbTableLogImages + "._id as cg_logImages_id, log_id, title, url FROM "
                         + dbTableLogs + " LEFT OUTER JOIN " + dbTableLogImages
diff --git a/main/src/cgeo/geocaching/cgTrackable.java b/main/src/cgeo/geocaching/cgTrackable.java
index c9b5623..7ed3424 100644
--- a/main/src/cgeo/geocaching/cgTrackable.java
+++ b/main/src/cgeo/geocaching/cgTrackable.java
@@ -191,7 +191,7 @@ public class cgTrackable implements ILogable {
     }
 
     public void setLogs(List<LogEntry> logs) {
-        this.logs = logs;
+        this.logs = logs != null ? logs : new ArrayList<LogEntry>();
     }
 
     @Override