diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2013-06-22 17:51:57 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2013-06-22 17:51:57 +0200 |
| commit | b7e3e9a9a98278c472e52ceb2c1b68611b241cb8 (patch) | |
| tree | c7b1a36c141f9f1de935777b89c21a94d5c4d315 | |
| parent | 2cf756cce8991c92d1b5f3ceba4c1cf92e4c73ea (diff) | |
| download | cgeo-b7e3e9a9a98278c472e52ceb2c1b68611b241cb8.zip cgeo-b7e3e9a9a98278c472e52ceb2c1b68611b241cb8.tar.gz cgeo-b7e3e9a9a98278c472e52ceb2c1b68611b241cb8.tar.bz2 | |
close #2915: add a closeout status message for sdk < 7
| -rw-r--r-- | main/res/values/strings.xml | 1 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/StatusFragment.java | 2 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/network/StatusUpdater.java | 9 |
3 files changed, 11 insertions, 1 deletions
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index 5f56ebb..eed3ecf 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -1062,6 +1062,7 @@ <string name="status_new_rc" tools:ignore="UnusedResources">New release candidate available.\nClick to install.</string> <string name="status_geocaching_change" tools:ignore="UnusedResources">Recent changes on geocaching.com broke c:geo.\nWe are working on it, check again soon.</string> <string name="status_geocaching_livemap" tools:ignore="UnusedResources">Recent changes on geocaching.com broke the live map feature.\nWe are working on it, check again soon.</string> + <string name="status_closeout_warning" tools:ignore="UnusedResources">You appear to be using a version of Android older than 2.1. Future releases of c:geo might no longer be available for your device.</string> <string name="clipboard_copy_ok">Copied to clipboard</string> <plurals name="days_ago"> 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 1953e1d..93ae1ee 100644 --- a/main/src/cgeo/geocaching/network/StatusUpdater.java +++ b/main/src/cgeo/geocaching/network/StatusUpdater.java @@ -8,6 +8,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; @@ -26,6 +28,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; + } } private void requestUpdate() { |