organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

[Android] Fix backurl usage #5543

Merged
blackboxembedded merged 1 commit from backurl_fix into master 2023-10-07 14:16:56 +00:00
Conversation 0 Commits 1 Files changed 1 +13 -10
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
android/app/src/main/java/app/organicmaps/intent/Factory.java
View file

@ -202,22 +202,25 @@ public class Factory
{
final ParsingResult result = Framework.nativeParseAndSetApiUrl(getUrl());
// TODO: Kernel recognizes "mapsme://", "mwm://" and "mapswithme://" schemas only!!!
final Uri uri = Uri.parse(getUrl());
if (uri.isHierarchical())
{
final String backUrl = uri.getQueryParameter("backurl");
if (!TextUtils.isEmpty(backUrl))
{
final Intent intent = target.getIntent();
if (intent != null)
intent.putExtra(MwmActivity.EXTRA_BACK_URL, backUrl);
}
}
// TODO: Kernel recognizes "om://", "mapsme://", "mwm://" and "mapswithme://" schemas only!!!
if (result.getUrlType() == ParsingResult.TYPE_INCORRECT)
return Map.showMapForUrl(getUrl());
if (!result.isSuccess())
return false;
final Uri uri = Uri.parse(getUrl());
final String backUrl = uri.getQueryParameter("backurl");
if (!TextUtils.isEmpty(backUrl))
{
Intent intent = target.getIntent();
if (intent != null)
intent.putExtra(MwmActivity.EXTRA_BACK_URL, backUrl);
}
switch (result.getUrlType())
{
case ParsingResult.TYPE_INCORRECT: