aboutsummaryrefslogtreecommitdiffstats
path: root/main/src/cgeo/geocaching/network/Network.java
diff options
context:
space:
mode:
Diffstat (limited to 'main/src/cgeo/geocaching/network/Network.java')
-rw-r--r--main/src/cgeo/geocaching/network/Network.java23
1 files changed, 13 insertions, 10 deletions
diff --git a/main/src/cgeo/geocaching/network/Network.java b/main/src/cgeo/geocaching/network/Network.java
index bb5a949..8d79aed 100644
--- a/main/src/cgeo/geocaching/network/Network.java
+++ b/main/src/cgeo/geocaching/network/Network.java
@@ -203,17 +203,20 @@ public abstract class Network {
}
private static Parameters cacheHeaders(final File cacheFile) {
- if (cacheFile != null && cacheFile.exists()) {
- final String etag = LocalStorage.getSavedHeader(cacheFile, "etag");
- if (etag != null) {
- return new Parameters("If-None-Match", etag);
- } else {
- final String lastModified = LocalStorage.getSavedHeader(cacheFile, "last-modified");
- if (lastModified != null) {
- return new Parameters("If-Modified-Since", lastModified);
- }
- }
+ if (cacheFile == null || !cacheFile.exists()) {
+ return null;
+ }
+
+ final String etag = LocalStorage.getSavedHeader(cacheFile, "etag");
+ if (etag != null) {
+ return new Parameters("If-None-Match", etag);
+ }
+
+ final String lastModified = LocalStorage.getSavedHeader(cacheFile, "last-modified");
+ if (lastModified != null) {
+ return new Parameters("If-Modified-Since", lastModified);
}
+
return null;
}