Browse Source

Merge branch 'bugfix/88-fix-hostname-prefix-handling' into 'develop'

#88: Fix hostname scheme prefix handling

Closes #88

See merge request funkwhale/funkwhale-android!87
bugfix/46-adjust-now-playing-top-margin
Ryan Harg 3 years ago
parent
commit
2706dcaa8e
  1. 2
      app/src/main/java/audio/funkwhale/ffa/activities/LoginActivity.kt
  2. 1
      changes/changelog.d/88.bugfix

2
app/src/main/java/audio/funkwhale/ffa/activities/LoginActivity.kt

@ -121,7 +121,7 @@ class LoginActivity : AppCompatActivity() {
if (hostname.isEmpty()) { if (hostname.isEmpty()) {
return getString(R.string.login_error_hostname) return getString(R.string.login_error_hostname)
} }
if (!cleartext && hostname.startsWith("http")) { if (!cleartext && hostname.startsWith("http://")) {
return getString(R.string.login_error_hostname_https) return getString(R.string.login_error_hostname_https)
} }
return null return null

1
changes/changelog.d/88.bugfix

@ -0,0 +1 @@
Fix handling of hostname 'https://' scheme prefix (#88)
Loading…
Cancel
Save