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

[android] Fixed crash in RoutingController.

Browse source
This commit is contained in:
Dmitry Yunitsky 2016-04-05 15:27:12 +03:00 • committed by Alex Zolotarev
parent ea55402a6f
commit 772089fd1b
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -97,7 +97,7 @@ public class RoutingController
private final Framework.RoutingListener mRoutingListener = new Framework.RoutingListener()
{
@Override
public void onRoutingEvent(final int resultCode, final String[] missingMaps)
public void onRoutingEvent(final int resultCode, @Nullable final String[] missingMaps)
{
Log.d(TAG, "onRoutingEvent(resultCode: " + resultCode + ")");

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

@ -7,6 +7,7 @@ import android.graphics.drawable.ColorDrawable;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.support.v7.app.AlertDialog;
import android.util.Pair;
@ -97,7 +98,18 @@ public class RoutingErrorDialogFragment extends BaseMwmDialogFragment
@Override
public void onClick(View v)
{
if (mListener == null || mListener.onDownload())
if (mListener == null)
{
dlg.dismiss();
return;
}
if (mMissingMaps.isEmpty())
{
mListener.onOk();
dlg.dismiss();
}
else if (mListener.onDownload())
dlg.dismiss();
}
});
@ -118,7 +130,7 @@ public class RoutingErrorDialogFragment extends BaseMwmDialogFragment
if (maps == null)
return;
for (String map: maps)
for (String map : maps)
mMissingMaps.add(CountryItem.fill(map));
}
@ -205,7 +217,7 @@ public class RoutingErrorDialogFragment extends BaseMwmDialogFragment
);
}
public static RoutingErrorDialogFragment create(int resultCode, String[] missingMaps)
public static RoutingErrorDialogFragment create(int resultCode, @Nullable String[] missingMaps)
{
Bundle args = new Bundle();
args.putInt(EXTRA_RESULT_CODE, resultCode);