organicmaps
diff --git a/‎android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java
Copy file name to clipboardExpand all lines: android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java
+33-19 b/‎android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java
Copy file name to clipboardExpand all lines: android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java
+33-19
@@ -8,6 +8,9 @@
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatDelegate;
+
+import java.util.Calendar;
+
 import app.organicmaps.Framework;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
@@ -30,30 +33,15 @@ public enum ThemeSwitcher
     @Override
     public void run()
     {
-      String nightTheme = MwmApplication.from(mContext).getString(R.string.theme_night);
-      String defaultTheme = MwmApplication.from(mContext).getString(R.string.theme_default);
-      String theme = defaultTheme;
-      Location last = LocationHelper.from(mContext).getSavedLocation();
-
       boolean navAuto = RoutingController.get().isNavigating() && ThemeUtils.isNavAutoTheme(mContext);
-
-      if (navAuto || ThemeUtils.isAutoTheme(mContext))
-      {
-        if (last == null)
-          theme = Config.getCurrentUiTheme(mContext);
-        else
-        {
-          long currentTime = System.currentTimeMillis() / 1000;
-          boolean day = Framework.nativeIsDayTime(currentTime, last.getLatitude(), last.getLongitude());
-          theme = (day ? defaultTheme : nightTheme);
-        }
-      }
-
-      setThemeAndMapStyle(theme);
+      // Cancel old checker
       UiThread.cancelDelayedTasks(mAutoThemeChecker);
 
       if (navAuto || ThemeUtils.isAutoTheme(mContext))
+      {
         UiThread.runLater(mAutoThemeChecker, CHECK_INTERVAL_MS);
+        setThemeAndMapStyle(calcAutoTheme());
+      }
     }
   };
 
@@ -157,4 +145,30 @@ private void SetMapStyle(MapStyle style)
     else
       MapStyle.mark(style);
   }
+
+  /**
+   * Determine light/dark theme based on time and location,
+   * or fall back to time-based (06:00-18:00) when there's no location fix
+   * @return theme_light/dark string
+   */
+  private String calcAutoTheme()
+  {
+    String defaultTheme = mContext.getResources().getString(R.string.theme_default);
+    String nightTheme = mContext.getResources().getString(R.string.theme_night);
+    Location last = LocationHelper.from(mContext).getSavedLocation();
+    boolean day;
+
+    if (last != null)
+    {
+      long currentTime = System.currentTimeMillis() / 1000;
+      day = Framework.nativeIsDayTime(currentTime, last.getLatitude(), last.getLongitude());
+    }
+    else
+    {
+      int currentHour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
+      day = (currentHour < 18 && currentHour > 6);
+    }
+
+    return (day ? defaultTheme : nightTheme);
+  }
 }