aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2013-09-13 10:09:59 +0200
committerSamuel Tardieu <sam@rfc1149.net>2013-09-13 10:09:59 +0200
commit0baeffee1cadd7324638fa2ce5e2f94c282219a5 (patch)
tree53f3cdfed24172f31c092b7e1faec83b75d71faa /main
parentc357bd791a6ed01f27dd59d677da8d2559471713 (diff)
parenta65fb31691babe571e9cc533bb51843f66e736a6 (diff)
downloadcgeo-0baeffee1cadd7324638fa2ce5e2f94c282219a5.zip
cgeo-0baeffee1cadd7324638fa2ce5e2f94c282219a5.tar.gz
cgeo-0baeffee1cadd7324638fa2ce5e2f94c282219a5.tar.bz2
Merge branch 'release' into upstream
Diffstat (limited to 'main')
-rw-r--r--main/src/cgeo/geocaching/LogCacheActivity.java16
1 files changed, 5 insertions, 11 deletions
diff --git a/main/src/cgeo/geocaching/LogCacheActivity.java b/main/src/cgeo/geocaching/LogCacheActivity.java
index 8c3ef44..98fee37 100644
--- a/main/src/cgeo/geocaching/LogCacheActivity.java
+++ b/main/src/cgeo/geocaching/LogCacheActivity.java
@@ -3,6 +3,7 @@ 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;
@@ -346,22 +347,15 @@ public class LogCacheActivity extends AbstractLoggingActivity implements DateDia
boolean expired = DateUtils.daysSince(eventDate.getTime()) >= 0;
if (cache.hasOwnLog(LogType.WILL_ATTEND) || expired) {
- if (cache.hasOwnLog(LogType.ATTENDED)) {
- typeSelected = LogType.NOTE;
- }
- else {
- typeSelected = LogType.ATTENDED;
- }
- }
- else {
+ typeSelected = cache.hasOwnLog(LogType.ATTENDED) ? LogType.NOTE : LogType.ATTENDED;
+ } else {
typeSelected = LogType.WILL_ATTEND;
}
- }
- else {
+ } else {
if (cache.isFound()) {
typeSelected = LogType.NOTE;
} else {
- typeSelected = LogType.FOUND_IT;
+ typeSelected = cache.getType() == CacheType.WEBCAM ? LogType.WEBCAM_PHOTO_TAKEN : LogType.FOUND_IT;
}
}
text = null;