From 8f77809313da8a70d1de84332784bd0a28a77217 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=97=D0=B0=D1=86=D0=B5=D0=BF=D0=B8=D0=BD?= Date: Fri, 10 Jul 2020 11:04:30 +0300 Subject: [PATCH] [android] Review fixes --- .../maps/bookmarks/BookmarksCatalogFragment.java | 11 ++++++----- .../InvalidSubscriptionAlertDialogCallback.java | 5 +++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java index 43cd8f4dce..3071a64c56 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java @@ -355,7 +355,7 @@ public class BookmarksCatalogFragment extends BaseWebViewMwmFragment private static class WebViewBookmarksCatalogClient extends WebViewClient { private static final String SUBSCRIBE_PATH_SEGMENT = "subscribe"; - private static final String VIEW_ON_MAP_SEGMENT = "map"; + private static final String VIEW_ON_MAP_PATH_SEGMENT = "map"; private final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.BILLING); private final String TAG = WebViewBookmarksCatalogClient.class.getSimpleName(); @@ -377,7 +377,8 @@ public class BookmarksCatalogFragment extends BaseWebViewMwmFragment if (fragment == null) return false; - boolean result = fragment.downloadBookmark(url); + if (fragment.downloadBookmark(url)) + return true; Uri uri = Uri.parse(url); List pathSegments = uri.getPathSegments(); @@ -386,14 +387,14 @@ public class BookmarksCatalogFragment extends BaseWebViewMwmFragment if (TextUtils.equals(each, SUBSCRIBE_PATH_SEGMENT)) return handleSubscriptionUri(uri); - if (TextUtils.equals(each, VIEW_ON_MAP_SEGMENT)) + if (TextUtils.equals(each, VIEW_ON_MAP_PATH_SEGMENT)) return handleViewOnMapUri(fragment, uri); } - return result; + return false; } - private Boolean handleViewOnMapUri(@NonNull BookmarksCatalogFragment fragment, @NonNull Uri uri) + private boolean handleViewOnMapUri(@NonNull BookmarksCatalogFragment fragment, @NonNull Uri uri) { String serverId = uri.getQueryParameter(PurchaseUtils.SERVER_ID); if (TextUtils.isEmpty(serverId)) diff --git a/android/src/com/mapswithme/maps/bookmarks/InvalidSubscriptionAlertDialogCallback.java b/android/src/com/mapswithme/maps/bookmarks/InvalidSubscriptionAlertDialogCallback.java index 659027e144..edb9f0ef58 100644 --- a/android/src/com/mapswithme/maps/bookmarks/InvalidSubscriptionAlertDialogCallback.java +++ b/android/src/com/mapswithme/maps/bookmarks/InvalidSubscriptionAlertDialogCallback.java @@ -23,8 +23,9 @@ class InvalidSubscriptionAlertDialogCallback implements AlertDialogCallback @Override public void onAlertDialogPositiveClick(int requestCode, int which) { - BookmarksAllSubscriptionActivity.startForResult(mFragment, PurchaseUtils.REQ_CODE_PAY_CONTINUE_SUBSCRIPTION, - Statistics.ParamValue.POPUP); + BookmarksAllSubscriptionActivity.startForResult(mFragment, + PurchaseUtils.REQ_CODE_PAY_CONTINUE_SUBSCRIPTION, + Statistics.ParamValue.POPUP); } @Override