From 6440a1ec765dab4780526f537f01bd05c86fb26f Mon Sep 17 00:00:00 2001 From: Roman Tsisyk Date: Sat, 4 Nov 2023 17:51:40 +0200 Subject: [PATCH] [android][drape] Don't show "location timeout" in NotFollowNoPosition Fixes #6098 Signed-off-by: Roman Tsisyk --- android/app/src/main/java/app/organicmaps/MwmActivity.java | 6 ++++++ drape_frontend/my_position_controller.cpp | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/android/app/src/main/java/app/organicmaps/MwmActivity.java b/android/app/src/main/java/app/organicmaps/MwmActivity.java index 4ae15c8234..9df9ac38e9 100644 --- a/android/app/src/main/java/app/organicmaps/MwmActivity.java +++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java @@ -1979,6 +1979,12 @@ public class MwmActivity extends BaseMwmFragmentActivity return; } + if (LocationState.nativeGetMode() == LocationState.NOT_FOLLOW_NO_POSITION) + { + Logger.d(LOCATION_TAG, "Don't show 'location timeout' error dialog in NOT_FOLLOW_NO_POSITION mode"); + return; + } + Logger.d(LOCATION_TAG, "services = " + LocationUtils.areLocationServicesTurnedOn(this)); // diff --git a/drape_frontend/my_position_controller.cpp b/drape_frontend/my_position_controller.cpp index 63f53ccb28..bd86bbc99a 100644 --- a/drape_frontend/my_position_controller.cpp +++ b/drape_frontend/my_position_controller.cpp @@ -659,7 +659,7 @@ void MyPositionController::ChangeMode(location::EMyPositionMode newMode) m_pendingTimer.Reset(); m_pendingStarted = true; } - else if (newMode != location::NotFollowNoPosition) + else { m_pendingStarted = false; } @@ -922,7 +922,7 @@ void MyPositionController::DeactivateRouting() void MyPositionController::CheckIsWaitingForLocation() { - if (IsWaitingForLocation() || m_mode == location::NotFollowNoPosition) + if (IsWaitingForLocation()) { CHECK_ON_TIMEOUT(m_locationWaitingNotifyId, kMaxPendingLocationTimeSec, CheckIsWaitingForLocation); if (m_pendingStarted && m_pendingTimer.ElapsedSeconds() >= kMaxPendingLocationTimeSec) -- 2.45.3