Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-05-13 00:33:13 +02:00
commit 19b83dae40
2 changed files with 3 additions and 0 deletions

View file

@ -351,6 +351,7 @@ public class MapActivity extends AccessibleActivity {
{
showImportedGpx(new File(data.getPath()));
}
setIntent(null);
}
else if("google.navigation".equals(scheme) || "osmand.navigation".equals(scheme))
{
@ -376,6 +377,7 @@ public class MapActivity extends AccessibleActivity {
{
AccessibleToast.makeText(this, getString(R.string.navigation_intent_invalid, schemeSpecificPart), Toast.LENGTH_LONG).show(); //$NON-NLS-1$
}
setIntent(null);
}
}
}

View file

@ -76,6 +76,7 @@ public class GeoIntentActivity extends OsmandListActivity {
progress.setCancelable(true);
task.execute();
setIntent(null);
}
}