Funkwhale/Otter-App-Android-Funkwhale
1
0
Fork 0
mirror of https://github.com/apognu/otter synced 2025-02-17 11:20:34 +01:00
Code Issues Releases Wiki Activity

Do not transform URLs to HTTPS now that we support cleartext connections.

Browse Source
This commit is contained in:
Antoine POPINEAU 2020-07-08 15:12:49 +02:00
parent 0facf09c94
commit de0a494b43
No known key found for this signature in database
GPG Key ID: A78AC64694F84063
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/github/apognu/otter/utils/Util.kt
View File

@ -5,7 +5,6 @@ import android.widget.Toast
import com.google.android.exoplayer2.util.Log
import com.preference.PowerPreference
import java.net.URI
import java.net.URL
fun Context?.toast(message: String, length: Int = Toast.LENGTH_SHORT) {
if (this != null) {
@ -35,9 +34,7 @@ fun mustNormalizeUrl(rawUrl: String): String {
val fallbackHost = PowerPreference.getFileByName(AppContext.PREFS_CREDENTIALS).getString("hostname")
val uri = URI(rawUrl).takeIf { it.host != null } ?: URI("$fallbackHost$rawUrl")
return uri.toURL().run {
URL("https", host, file)
}.toString()
return uri.toString()
}
fun toDurationString(duration: Long, showSeconds: Boolean = false): String {