From bb17fd36e2e63b929f96e242fa0c283e7d10f2ba Mon Sep 17 00:00:00 2001 From: Dmitry Yunitsky Date: Fri, 5 Feb 2016 18:14:17 +0300 Subject: [PATCH] review fixes 1 --- .../com/mapswithme/maps/editor/AuthFragment.java | 15 ++++++++++----- .../mapswithme/maps/editor/OsmAuthFragment.java | 4 ++-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/android/src/com/mapswithme/maps/editor/AuthFragment.java b/android/src/com/mapswithme/maps/editor/AuthFragment.java index 5580f1c428..75699e1a23 100644 --- a/android/src/com/mapswithme/maps/editor/AuthFragment.java +++ b/android/src/com/mapswithme/maps/editor/AuthFragment.java @@ -116,17 +116,22 @@ public class AuthFragment extends BaseAuthFragment implements View.OnClickListen } else if (url.contains(OsmOAuth.URL_PARAM_VERIFIER)) { - UrlQuerySanitizer sanitizer = new UrlQuerySanitizer(); - sanitizer.setAllowUnregisteredParamaters(true); - sanitizer.parseUrl(url); - final String verifier = sanitizer.getValue(OsmOAuth.URL_PARAM_VERIFIER); - finishWebviewAuth(auth[1], auth[2], verifier); + finishWebviewAuth(auth[1], auth[2], getVerifierFromUrl(url)); dialog.cancel(); return true; } return false; } + + private String getVerifierFromUrl(String authUrl) + { + UrlQuerySanitizer sanitizer = new UrlQuerySanitizer(); + sanitizer.setAllowUnregisteredParamaters(true); + sanitizer.parseUrl(authUrl); + return sanitizer.getValue(OsmOAuth.URL_PARAM_VERIFIER); + } + }); webview.loadUrl(authUrl); } diff --git a/android/src/com/mapswithme/maps/editor/OsmAuthFragment.java b/android/src/com/mapswithme/maps/editor/OsmAuthFragment.java index 55f2d23b02..0179ad533f 100644 --- a/android/src/com/mapswithme/maps/editor/OsmAuthFragment.java +++ b/android/src/com/mapswithme/maps/editor/OsmAuthFragment.java @@ -20,9 +20,9 @@ import com.mapswithme.util.concurrency.UiThread; public class OsmAuthFragment extends BaseAuthFragment implements View.OnClickListener { - protected static class AuthToolbarController extends ToolbarController + private static class AuthToolbarController extends ToolbarController { - public AuthToolbarController(View root, Activity activity) + AuthToolbarController(View root, Activity activity) { super(root, activity); mToolbar.setNavigationIcon(Graphics.tint(activity,