1 files changed, 14 insertions, 26 deletions
diff --git a/main/src/cgeo/geocaching/LogCacheActivity.java b/main/src/cgeo/geocaching/LogCacheActivity.java
index 0f65a1d..2b05263 100644
--- a/main/src/cgeo/geocaching/LogCacheActivity.java
+++ b/main/src/cgeo/geocaching/LogCacheActivity.java
@@ -3,7 +3,6 @@ package cgeo.geocaching;
 import cgeo.geocaching.connector.ILoggingManager;
 import cgeo.geocaching.connector.ImageResult;
 import cgeo.geocaching.connector.LogResult;
-import cgeo.geocaching.enumerations.CacheType;
 import cgeo.geocaching.enumerations.LoadFlags;
 import cgeo.geocaching.enumerations.LogType;
 import cgeo.geocaching.enumerations.LogTypeTrackable;
@@ -341,25 +340,10 @@ public class LogCacheActivity extends AbstractLoggingActivity implements DateDia
     private void setDefaultValues() {
         date = Calendar.getInstance();
         rating = GCVote.NO_RATING;
-        if (cache.isEventCache()) {
-            final Date eventDate = cache.getHiddenDate();
-            boolean expired = DateUtils.isPastEvent(cache);
-
-            if (cache.hasOwnLog(LogType.WILL_ATTEND) || expired) {
-                typeSelected = cache.hasOwnLog(LogType.ATTENDED) ? LogType.NOTE : LogType.ATTENDED;
-            } else {
-                typeSelected = LogType.WILL_ATTEND;
-            }
-            // it this is an attended event log, use the event date by default instead of the current date
-            if (expired && typeSelected == LogType.ATTENDED) {
-                date.setTime(eventDate);
-            }
-        } else {
-            if (cache.isFound()) {
-                typeSelected = LogType.NOTE;
-            } else {
-                typeSelected = cache.getType() == CacheType.WEBCAM ? LogType.WEBCAM_PHOTO_TAKEN : LogType.FOUND_IT;
-            }
+        typeSelected = cache.getDefaultLogType();
+        // it this is an attended event log, use the event date by default instead of the current date
+        if (cache.isEventCache() && DateUtils.isPastEvent(cache) && typeSelected == LogType.ATTENDED) {
+            date.setTime(cache.getHiddenDate());
         }
         text = null;
         imageCaption = StringUtils.EMPTY;
@@ -531,16 +515,20 @@ public class LogCacheActivity extends AbstractLoggingActivity implements DateDia
                 final LogResult logResult = loggingManager.postLog(cache, typeSelected, date, log, logPwd, trackables);
 
                 if (logResult.getPostLogResult() == StatusCode.NO_ERROR) {
-                    final LogEntry logNow = new LogEntry(date.getTimeInMillis(), typeSelected, log);
-
-                    cache.getLogs().add(0, logNow);
-
+                    // update geocache in DB
                     if (typeSelected == LogType.FOUND_IT || typeSelected == LogType.ATTENDED) {
                         cache.setFound(true);
                         cache.setVisitedDate(new Date().getTime());
                     }
-
                     DataStore.saveChangedCache(cache);
+
+                    // update logs in DB
+                    ArrayList<LogEntry> newLogs = new ArrayList<LogEntry>(cache.getLogs());
+                    final LogEntry logNow = new LogEntry(date.getTimeInMillis(), typeSelected, log);
+                    newLogs.add(0, logNow);
+                    DataStore.saveLogsWithoutTransaction(cache.getGeocode(), newLogs);
+
+                    // update offline log in DB
                     cache.clearOfflineLog();
 
                     if (typeSelected == LogType.FOUND_IT) {
@@ -557,7 +545,7 @@ public class LogCacheActivity extends AbstractLoggingActivity implements DateDia
                         final String uploadedImageUrl = imageResult.getImageUri();
                         if (StringUtils.isNotEmpty(uploadedImageUrl)) {
                             logNow.addLogImage(new Image(uploadedImageUrl, imageCaption, imageDescription));
-                            DataStore.saveChangedCache(cache);
+                            DataStore.saveLogsWithoutTransaction(cache.getGeocode(), newLogs);
                         }
                         return imageResult.getPostResult();
                     }