Refactoring: simplify variable computation

1 files changed, 3 insertions, 14 deletions

diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java
index 6f14db6..fc39fff 100644
--- a/main/src/cgeo/geocaching/maps/CGeoMap.java
+++ b/main/src/cgeo/geocaching/maps/CGeoMap.java
@@ -1050,22 +1050,11 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto
 
                         // check if map moved or zoomed
                         //TODO Portree Use Rectangle inside with bigger search window. That will stop reloading on every move
-                        boolean moved = false;
-
-                        if (liveChanged) {
-                            moved = true;
-                        } else if (isLiveEnabled && !downloaded) {
-                            moved = true;
-                        } else if (viewport == null) {
-                            moved = true;
-                        } else if (zoomNow != zoom) {
-                            moved = true;
-                        } else if (mapMoved(viewport, viewportNow) && (cachesCnt <= 0 || CollectionUtils.isEmpty(caches) || !viewport.includes(viewportNow))) {
-                            moved = true;
-                        }
+                        final boolean moved = liveChanged || (isLiveEnabled && !downloaded) || (viewport == null) || zoomNow != zoom ||
+                                (mapMoved(viewport, viewportNow) && (cachesCnt <= 0 || CollectionUtils.isEmpty(caches) || !viewport.includes(viewportNow)));
 
                         // update title on any change
-                        if (moved || zoomNow != zoom || !viewportNow.equals(viewport)) {
+                        if (moved || !viewportNow.equals(viewport)) {
                             displayHandler.sendEmptyMessage(UPDATE_TITLE);
                         }
                         zoom = zoomNow;