From a3a33938edc64ceedee6f504c3d4c18b6aa6abd4 Mon Sep 17 00:00:00 2001 From: "Black Box Embedded, LLC" <64652300+blackboxembedded@users.noreply.github.com> Date: Thu, 15 Jun 2023 02:05:59 -0600 Subject: [PATCH] [Android] backurl API fixes (#5322) --- android/src/app/organicmaps/intent/Factory.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/android/src/app/organicmaps/intent/Factory.java b/android/src/app/organicmaps/intent/Factory.java index 5da9d96b59..824ee36198 100644 --- a/android/src/app/organicmaps/intent/Factory.java +++ b/android/src/app/organicmaps/intent/Factory.java @@ -202,13 +202,6 @@ public class Factory { final ParsingResult result = Framework.nativeParseAndSetApiUrl(getUrl()); - // TODO: Kernel recognizes "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)) @@ -218,6 +211,13 @@ public class Factory intent.putExtra(MwmActivity.EXTRA_BACK_URL, backUrl); } + // Kernel recognizes "om://", "mapsme://", "mwm://" and "mapswithme://" schemes only!!! + if (result.getUrlType() == ParsingResult.TYPE_INCORRECT) + return Map.showMapForUrl(getUrl()); + + if (!result.isSuccess()) + return false; + switch (result.getUrlType()) { case ParsingResult.TYPE_INCORRECT: