peter/micropub-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Two problems with prefixing with https://

Browse Source 
- matches tries to match full string
- fromLiteral escapes regex chars
- rewritten with startsWith
This commit is contained in:
Peter Stuifzand 2018-04-23 20:51:56 +02:00
parent 872a409046
commit 717d88fa93
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/stuifzand/micropub/auth/WebSigninActivity.kt
View File

@ -18,9 +18,9 @@ class WebSigninActivity : AppCompatActivity() {
setContentView(R.layout.activity_web_signin) setContentView(R.layout.activity_web_signin)
} }
fun startWebsignin(view : View) { fun startWebsignin(view: View) {
val url = profileUrl.text.toString(); 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<AccountAuthenticatorResponse>(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE); val parcelable = intent.getParcelableExtra<AccountAuthenticatorResponse>(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE);
WebsigninTask(this, parcelable).execute(me); WebsigninTask(this, parcelable).execute(me);
} }