From 2a2aa93cb5b88a91dd7879e29b6dd5117beaabb7 Mon Sep 17 00:00:00 2001 From: Chumva Date: Wed, 20 Mar 2019 21:29:20 +0200 Subject: [PATCH] Make updateCards private --- .../plus/routepreparationmenu/MapRouteInfoMenu.java | 12 ++++-------- .../MapRouteInfoMenuFragment.java | 6 ------ 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java index 69662baaeb..eb85384ccc 100644 --- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java +++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java @@ -391,13 +391,9 @@ public class MapRouteInfoMenu implements IRouteInformationListener, CardListener WeakReference fragmentRef = findMenuFragment(); MapRouteInfoMenuFragment fragment = fragmentRef != null ? fragmentRef.get() : null; if (fragmentRef != null && fragment.isVisible()) { - if (setRouteCalculationInProgress(true)) { - fragment.updateRouteCalculationProgress(0); - fragment.updateControlButtons(); - fragment.updateInfo(); - } else { - fragment.updateCards(); - } + fragment.updateRouteCalculationProgress(0); + fragment.updateControlButtons(); + fragment.updateInfo(); } } @@ -496,7 +492,7 @@ public class MapRouteInfoMenu implements IRouteInformationListener, CardListener updateCards(); } - public void updateCards() { + private void updateCards() { MapActivity mapActivity = getMapActivity(); if (mapActivity == null) { return; diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenuFragment.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenuFragment.java index 2e10a439b0..6cd3fe71ed 100644 --- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenuFragment.java +++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenuFragment.java @@ -807,12 +807,6 @@ public class MapRouteInfoMenuFragment extends BaseOsmAndFragment { } } - public void updateCards() { - if (menu != null) { - menu.updateCards(); - } - } - public void updateLayout() { if (menu != null) { runLayoutListener();