pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Don’t cancel routing when building status code NEED_MORE_MAPS

Browse source
This commit is contained in:
Roman Romanov 2017-01-25 14:46:50 +04:00 • committed by Vladimir Byko-Ianko
parent a613b2e59f
commit 56755fd80a
4 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/src/com/mapswithme/maps/routing/BaseRoutingErrorDialogFragment.java
View file

@ -41,6 +41,7 @@ abstract class BaseRoutingErrorDialogFragment extends BaseMwmDialogFragment
private boolean mCancelRoute = true;
boolean mCancelled;
boolean mNeedMoreMaps;
void beforeDialogCreated(AlertDialog.Builder builder) {}
void bindGroup(View view) {}
@ -85,9 +86,12 @@ abstract class BaseRoutingErrorDialogFragment extends BaseMwmDialogFragment
@Override
public void onDismiss(DialogInterface dialog)
{
if (mCancelled && mCancelRoute)
if (!mNeedMoreMaps && mCancelled && mCancelRoute)
RoutingController.get().cancel();
if (mNeedMoreMaps && mCancelled)
RoutingController.get().finishBuild();
super.onDismiss(dialog);
}

5
android/src/com/mapswithme/maps/routing/ResultCodesHelper.java
View file

@ -111,4 +111,9 @@ class ResultCodesHelper
resultCode == NEED_MORE_MAPS ||
(resultCode == ROUTE_NOT_FOUND && missingCount > 0));
}
static boolean isNeedMoreMaps(int resultCode)
{
return resultCode == NEED_MORE_MAPS;
}
}

13
android/src/com/mapswithme/maps/routing/RoutingController.java
View file

@ -123,11 +123,7 @@ public class RoutingController
mContainsCachedResult = true;
if (mLastResultCode == ResultCodesHelper.NO_ERROR)
{
mCachedRoutingInfo = Framework.nativeGetRouteFollowingInfo();
setBuildState(BuildState.BUILT);
mLastBuildProgress = 100;
}
finishBuild();
processRoutingEvent();
}
@ -135,6 +131,13 @@ public class RoutingController
}
};
void finishBuild()
{
mCachedRoutingInfo = Framework.nativeGetRouteFollowingInfo();
setBuildState(BuildState.BUILT);
mLastBuildProgress = 100;
}
@SuppressWarnings("FieldCanBeLocal")
private final Framework.RoutingProgressListener mRoutingProgressListener = new Framework.RoutingProgressListener()
{

2
android/src/com/mapswithme/maps/routing/RoutingErrorDialogFragment.java
View file

@ -34,6 +34,8 @@ public class RoutingErrorDialogFragment extends BaseRoutingErrorDialogFragment
if (ResultCodesHelper.isDownloadable(mResultCode, mMissingMaps.size()))
builder.setPositiveButton(R.string.download, null);
mNeedMoreMaps = ResultCodesHelper.isNeedMoreMaps(mResultCode);
}
private View addMessage(View frame)