diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/res/values-fr/strings.xml | 3 | ||||
| -rw-r--r-- | main/res/values/strings.xml | 3 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/cgeo.java | 3 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/network/StatusUpdater.java | 14 |
4 files changed, 1 insertions, 22 deletions
diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml index f1030ea..964e924 100644 --- a/main/res/values-fr/strings.xml +++ b/main/res/values-fr/strings.xml @@ -958,9 +958,6 @@ <string name="status_new_release">Nouvelle version disponible.\nCliquer pour installer.</string> <string name="status_new_nightly">Nouvelle version de test disponible.\nCliquer pour installer.</string> <string name="status_new_rc">Nouvelle version candidate disponible.\nCliquer pour installer.</string> - <string name="status_default_developer_build">Version de développement</string> - <string name="status_default_nightly">Version de test.\nMerci de signaler les problèmes.\n</string> - <string name="status_rc">Version candidate.\nMerci de signaler les problèmes.\n"</string> <string name="status_geocaching_change">Des changements récents sur geocaching.com ont cassé c:geo.\nNous sommes en train de nous en occuper.</string> <string name="status_geocaching_livemap">Des changements récents sur geocaching.com ont cassé la carte active.\nNous sommes en train de nous en occuper.</string> diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index 78b92db..b85683e 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -982,9 +982,6 @@ <string name="status_new_release">New release available.\nClick to install.</string> <string name="status_new_nightly">New nightly build available.\nClick to install.</string> <string name="status_new_rc">New release candidate available.\nClick to install.</string> - <string name="status_default_developer_build">You are running a developer build</string> - <string name="status_default_nightly">You are running a nightly build.\nPlease report issues.\n</string> - <string name="status_rc">You are running a release candidate.\nPlease report issues.\n"</string> <string name="status_geocaching_change">Recent changes on geocaching.com broke c:geo.\nWe are working on it, check again soon.</string> <string name="status_geocaching_livemap">Recent changes on geocaching.com broke the live map feature.\nWe are working on it, check again soon.</string> diff --git a/main/src/cgeo/geocaching/cgeo.java b/main/src/cgeo/geocaching/cgeo.java index a23e232..f3e1fe1 100644 --- a/main/src/cgeo/geocaching/cgeo.java +++ b/main/src/cgeo/geocaching/cgeo.java @@ -9,7 +9,6 @@ import cgeo.geocaching.geopoint.Geopoint; import cgeo.geocaching.geopoint.HumanDistance; import cgeo.geocaching.geopoint.IConversion; import cgeo.geocaching.maps.CGeoMap; -import cgeo.geocaching.network.StatusUpdater; import cgeo.geocaching.network.StatusUpdater.Status; import cgeo.geocaching.ui.Formatter; import cgeo.geocaching.utils.GeoDirHandler; @@ -189,7 +188,7 @@ public class cgeo extends AbstractActivity { @Override public void handleMessage(final Message msg) { final Status data = (Status) msg.obj; - updateDisplay(data != null && data.message != null ? data : StatusUpdater.defaultStatus()); + updateDisplay(data != null && data.message != null ? data : null); } 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 c2e86f7..6c31c5d 100644 --- a/main/src/cgeo/geocaching/network/StatusUpdater.java +++ b/main/src/cgeo/geocaching/network/StatusUpdater.java @@ -48,7 +48,6 @@ public class StatusUpdater extends MemorySubject<StatusUpdater.Status> implement @Override public void run() { - notifyObservers(defaultStatus()); Looper.prepare(); new PeriodicHandler(1800000L) { @Override @@ -59,17 +58,4 @@ public class StatusUpdater extends MemorySubject<StatusUpdater.Status> implement Looper.loop(); } - public static Status defaultStatus() { - switch (Version.getVersionKind()) { - case RELEASE_CANDIDATE: - return new Status(null, "status_default_rc", null, null); - case NIGHTLY_BUILD: - return new Status(null, "status_default_nightly", null, null); - case DEVELOPER_BUILD: - return new Status(null, "status_default_developer_build", null, null); - default: - return null; - } - } - } |