diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2013-06-22 18:37:08 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2013-06-22 18:37:08 +0200 |
| commit | ec9af65d1d5130b0c046c58b964dfd04944eb218 (patch) | |
| tree | 78da645e466adb2b51ec32ac5f1a2a1f9757eb91 /main/src/cgeo | |
| parent | e30e955b3a9800ea783f36f64c42bfc19c795658 (diff) | |
| parent | 213818180224cfea540e078708215f27be09d7d6 (diff) | |
| download | cgeo-ec9af65d1d5130b0c046c58b964dfd04944eb218.zip cgeo-ec9af65d1d5130b0c046c58b964dfd04944eb218.tar.gz cgeo-ec9af65d1d5130b0c046c58b964dfd04944eb218.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
main/res/values-fr/strings.xml
main/res/values/strings.xml
send2cgeo/send2cgeo.user.js
Diffstat (limited to 'main/src/cgeo')
| -rw-r--r-- | main/src/cgeo/geocaching/StatusFragment.java | 2 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/network/StatusUpdater.java | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/main/src/cgeo/geocaching/StatusFragment.java b/main/src/cgeo/geocaching/StatusFragment.java index 5a9a5b4..e0e714a 100644 --- a/main/src/cgeo/geocaching/StatusFragment.java +++ b/main/src/cgeo/geocaching/StatusFragment.java @@ -57,7 +57,7 @@ public class StatusFragment extends Fragment { @Override public void handleMessage(final Message msg) { final Status data = (Status) msg.obj; - updateDisplay(data != null && data.message != null ? data : null); + updateDisplay(data != null && data.message != null ? data : Status.defaultStatus()); } private void updateDisplay(final Status data) { diff --git a/main/src/cgeo/geocaching/network/StatusUpdater.java b/main/src/cgeo/geocaching/network/StatusUpdater.java index bfc77ba..d54f706 100644 --- a/main/src/cgeo/geocaching/network/StatusUpdater.java +++ b/main/src/cgeo/geocaching/network/StatusUpdater.java @@ -9,6 +9,8 @@ import cgeo.geocaching.utils.Version; import org.json.JSONException; import org.json.JSONObject; +import android.os.Build.VERSION; +import android.os.Build.VERSION_CODES; import android.os.Looper; import java.util.Locale; @@ -27,6 +29,13 @@ public class StatusUpdater extends MemorySubject<StatusUpdater.Status> implement this.icon = icon; this.url = url; } + + final static public Status closeoutStatus = + new Status("", "status_closeout_warning", "attribute_abandonedbuilding", "http://www.cgeo.org/closeout/"); + + final static public Status defaultStatus() { + return VERSION.SDK_INT < VERSION_CODES.ECLAIR_MR1 ? closeoutStatus : null; + } } @Override |