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

[Android] Small improvements

Browse source 
Signed-off-by: S. Kozyr <s.trump@gmail.com>
This commit is contained in:
Sergiy Kozyr 2024-08-21 17:43:06 +03:00
parent 25537e33a9
commit d6286bb301
Signed by: strump
GPG key ID: C622E5563CAC205D
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java
View file

@ -35,8 +35,6 @@ public class OsmLoginFragment extends BaseMwmToolbarFragment
private TextInputEditText mLoginInput;
private TextInputEditText mPasswordInput;
private String mArgOAuth2Code;
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState)
@ -75,18 +73,18 @@ public class OsmLoginFragment extends BaseMwmToolbarFragment
mLostPasswordButton.setOnClickListener((v) -> Utils.openUrl(requireActivity(), Constants.Url.OSM_RECOVER_PASSWORD));
}
readArguments();
if (mArgOAuth2Code != null && !mArgOAuth2Code.isEmpty())
continueOAuth2Flow(mArgOAuth2Code);
String code = readOAuth2CodeFromArguments();
if (code != null && !code.isEmpty())
continueOAuth2Flow(code);
}
private void readArguments()
private String readOAuth2CodeFromArguments()
{
final Bundle arguments = getArguments();
if (arguments == null)
return;
return null;
mArgOAuth2Code = arguments.getString(OsmLoginActivity.EXTRA_OAUTH2CODE);
return arguments.getString(OsmLoginActivity.EXTRA_OAUTH2CODE);
}
private void login()
@ -110,7 +108,6 @@ public class OsmLoginFragment extends BaseMwmToolbarFragment
Utils.openUri(requireContext(), Uri.parse(OsmOAuth.nativeGetOAuth2Url()));
}
private void enableInput(boolean enable)
{
mPasswordInput.setEnabled(enable);
@ -160,11 +157,13 @@ public class OsmLoginFragment extends BaseMwmToolbarFragment
onAuthFail();
else
{
ThreadPool.getWorker().execute(() -> {
ThreadPool.getWorker().execute(() ->
{
// Finish OAuth2 auth flow and get username for UI.
final String oauthToken = OsmOAuth.nativeAuthWithOAuth2Code(oauth2code);
final String username = (oauthToken == null) ? null : OsmOAuth.nativeGetOsmUsername(oauthToken);
UiThread.run(() -> {
UiThread.run(() ->
{
processAuth(oauthToken, username);
});
});