pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

review fixes 1

Browse source
This commit is contained in:
Dmitry Yunitsky 2016-02-05 18:14:17 +03:00 • committed by Sergey Yershov
parent 85ec93a1c7
commit bb17fd36e2
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
android/src/com/mapswithme/maps/editor/AuthFragment.java
View file

@ -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);
}

4
android/src/com/mapswithme/maps/editor/OsmAuthFragment.java
View file

@ -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,