From 717d88fa939b06d4ed320ca40b49f3afeac1ca37 Mon Sep 17 00:00:00 2001 From: Peter Stuifzand Date: Mon, 23 Apr 2018 20:51:56 +0200 Subject: [PATCH] Two problems with prefixing with https:// - matches tries to match full string - fromLiteral escapes regex chars - rewritten with startsWith --- .../main/java/eu/stuifzand/micropub/auth/WebSigninActivity.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/stuifzand/micropub/auth/WebSigninActivity.kt b/app/src/main/java/eu/stuifzand/micropub/auth/WebSigninActivity.kt index 3d926f1..60dec91 100644 --- a/app/src/main/java/eu/stuifzand/micropub/auth/WebSigninActivity.kt +++ b/app/src/main/java/eu/stuifzand/micropub/auth/WebSigninActivity.kt @@ -18,9 +18,9 @@ class WebSigninActivity : AppCompatActivity() { setContentView(R.layout.activity_web_signin) } - fun startWebsignin(view : View) { + fun startWebsignin(view: View) { val url = profileUrl.text.toString(); - val me = if (!url.matches(Regex.fromLiteral("^https?://"))) "https://$url" else url + val me = if (url.startsWith("https://") || url.startsWith("http://")) url else "https://$url" val parcelable = intent.getParcelableExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE); WebsigninTask(this, parcelable).execute(me); }