diff --git a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIClient.kt b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIClient.kt index 75bb756b..16b68d75 100644 --- a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIClient.kt +++ b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIClient.kt @@ -44,7 +44,7 @@ class SubsonicAPIClient( config.minimalProtocolVersion, PasswordHexInterceptor(config.password), PasswordMD5Interceptor(config.password), - config.enableLdapUserSupport + config.forcePlainTextPassword ) var onProtocolChange: (SubsonicAPIVersions) -> Unit = {} diff --git a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIVersions.kt b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIVersions.kt index d2717da2..1b7e6a66 100644 --- a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIVersions.kt +++ b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIVersions.kt @@ -35,8 +35,8 @@ enum class SubsonicAPIVersions(val subsonicVersions: String, val restApiVersion: @JvmStatic @Throws(IllegalArgumentException::class) fun getClosestKnownClientApiVersion(apiVersion: String): SubsonicAPIVersions { val versionComponents = apiVersion.split(".") - if (versionComponents.size < 2) - throw IllegalArgumentException("Unknown api version $apiVersion") + + require(versionComponents.size >= 2) { "Unknown api version $apiVersion" } try { val majorVersion = versionComponents[0].toInt() diff --git a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicClientConfiguration.kt b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicClientConfiguration.kt index ec0655ec..7b53d266 100644 --- a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicClientConfiguration.kt +++ b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicClientConfiguration.kt @@ -10,7 +10,7 @@ data class SubsonicClientConfiguration( val minimalProtocolVersion: SubsonicAPIVersions, val clientID: String, val allowSelfSignedCertificate: Boolean = false, - val enableLdapUserSupport: Boolean = false, + val forcePlainTextPassword: Boolean = false, val debug: Boolean = false, val isRealProtocolVersion: Boolean = false ) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/ActiveServerProvider.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/ActiveServerProvider.kt index bba08b76..991d6698 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/ActiveServerProvider.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/ActiveServerProvider.kt @@ -205,7 +205,7 @@ class ActiveServerProvider( password = "", jukeboxByDefault = false, allowSelfSignedCertificate = false, - ldapSupport = false, + forcePlainTextPassword = false, musicFolderId = "", minimumApiVersion = null, bookmarkSupport = false, diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/ServerSetting.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/ServerSetting.kt index 05e2ff1d..3b212fec 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/ServerSetting.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/ServerSetting.kt @@ -14,8 +14,11 @@ import androidx.room.PrimaryKey * @param password: The Password of the User * @param jukeboxByDefault: True if the JukeBox mode should be turned on for the server * @param allowSelfSignedCertificate: True if the server uses self-signed certificate - * @param ldapSupport: True if the server authenticates the user using old Ldap-like way + * @param forcePlainTextPassword: True if the server authenticates the user using old Ldap-like way * @param musicFolderId: The Id of the MusicFolder to be used with the server + * + * TODO: forcePlainTextPassword is still using the old column name. + * Could be updated on the next significant change to the DB scheme */ @Entity data class ServerSetting( @@ -29,7 +32,7 @@ data class ServerSetting( @ColumnInfo(name = "password") var password: String, @ColumnInfo(name = "jukeboxByDefault") var jukeboxByDefault: Boolean, @ColumnInfo(name = "allowSelfSignedCertificate") var allowSelfSignedCertificate: Boolean, - @ColumnInfo(name = "ldapSupport") var ldapSupport: Boolean, + @ColumnInfo(name = "ldapSupport") var forcePlainTextPassword: Boolean, @ColumnInfo(name = "musicFolderId") var musicFolderId: String?, @ColumnInfo(name = "minimumApiVersion") var minimumApiVersion: String?, @ColumnInfo(name = "chatSupport") var chatSupport: Boolean? = null, diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/di/MusicServiceModule.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/di/MusicServiceModule.kt index 7751557c..177676c7 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/di/MusicServiceModule.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/di/MusicServiceModule.kt @@ -54,7 +54,7 @@ val musicServiceModule = module { ), clientID = Constants.REST_CLIENT_ID, allowSelfSignedCertificate = server.allowSelfSignedCertificate, - enableLdapUserSupport = server.ldapSupport, + forcePlainTextPassword = server.forcePlainTextPassword, debug = BuildConfig.DEBUG, isRealProtocolVersion = server.minimumApiVersion != null ) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EditServerFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EditServerFragment.kt index 47e094cb..55cdce69 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EditServerFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EditServerFragment.kt @@ -277,7 +277,7 @@ class EditServerFragment : Fragment(), OnBackPressedHandler { userNameEditText!!.editText?.setText(currentServerSetting!!.userName) passwordEditText!!.editText?.setText(currentServerSetting!!.password) selfSignedSwitch!!.isChecked = currentServerSetting!!.allowSelfSignedCertificate - ldapSwitch!!.isChecked = currentServerSetting!!.ldapSupport + ldapSwitch!!.isChecked = currentServerSetting!!.forcePlainTextPassword jukeboxSwitch!!.isChecked = currentServerSetting!!.jukeboxByDefault updateColor(currentServerSetting!!.color) } @@ -331,7 +331,7 @@ class EditServerFragment : Fragment(), OnBackPressedHandler { currentServerSetting!!.userName = userNameEditText!!.editText?.text.toString() currentServerSetting!!.password = passwordEditText!!.editText?.text.toString() currentServerSetting!!.allowSelfSignedCertificate = selfSignedSwitch!!.isChecked - currentServerSetting!!.ldapSupport = ldapSwitch!!.isChecked + currentServerSetting!!.forcePlainTextPassword = ldapSwitch!!.isChecked currentServerSetting!!.jukeboxByDefault = jukeboxSwitch!!.isChecked } @@ -354,7 +354,7 @@ class EditServerFragment : Fragment(), OnBackPressedHandler { currentServerSetting!!.userName != userNameEditText!!.editText?.text.toString() || currentServerSetting!!.password != passwordEditText!!.editText?.text.toString() || currentServerSetting!!.allowSelfSignedCertificate != selfSignedSwitch!!.isChecked || - currentServerSetting!!.ldapSupport != ldapSwitch!!.isChecked || + currentServerSetting!!.forcePlainTextPassword != ldapSwitch!!.isChecked || currentServerSetting!!.jukeboxByDefault != jukeboxSwitch!!.isChecked } @@ -406,7 +406,7 @@ class EditServerFragment : Fragment(), OnBackPressedHandler { ), Constants.REST_CLIENT_ID, currentServerSetting!!.allowSelfSignedCertificate, - currentServerSetting!!.ldapSupport, + currentServerSetting!!.forcePlainTextPassword, BuildConfig.DEBUG ) val subsonicApiClient = SubsonicAPIClient(configuration) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/ServerSettingsModel.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/ServerSettingsModel.kt index 3e62541d..182ecb66 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/ServerSettingsModel.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/ServerSettingsModel.kt @@ -198,7 +198,7 @@ class ServerSettingsModel( password = "W7DumQ3ZUR89Se3", jukeboxByDefault = false, allowSelfSignedCertificate = false, - ldapSupport = false, + forcePlainTextPassword = false, musicFolderId = null, minimumApiVersion = "1.13.0", chatSupport = true, diff --git a/ultrasonic/src/main/res/layout/server_edit.xml b/ultrasonic/src/main/res/layout/server_edit.xml index ce3602c9..e025c7ff 100644 --- a/ultrasonic/src/main/res/layout/server_edit.xml +++ b/ultrasonic/src/main/res/layout/server_edit.xml @@ -156,7 +156,7 @@ a:layout_width="0dp" a:layout_height="wrap_content" a:layout_marginStart="5dp" - a:text="@string/settings.title.enable_ldap_users_support" + a:text="@string/settings.title.force_plain_text_password" app:layout_constraintBottom_toTopOf="@id/edit_ldap_description" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/edit_self_signed" /> @@ -167,7 +167,7 @@ a:layout_width="0dp" a:layout_height="wrap_content" a:layout_marginStart="5dp" - a:text="@string/settings.summary.enable_ldap_users_support" + a:text="@string/settings.summary.force_plain_text_password" app:layout_constraintBottom_toTopOf="@id/edit_jukebox" app:layout_constraintEnd_toStartOf="@id/edit_ldap" app:layout_constraintStart_toStartOf="parent" diff --git a/ultrasonic/src/main/res/values-cs/strings.xml b/ultrasonic/src/main/res/values-cs/strings.xml index 3116e7bf..58b67d1b 100644 --- a/ultrasonic/src/main/res/values-cs/strings.xml +++ b/ultrasonic/src/main/res/values-cs/strings.xml @@ -258,7 +258,7 @@ Černý Vzhled Povolit HTTPS certifikáty podepsané samé sebou - Vynutit ověření nešifrovaným heslem + Vynutit ověření nešifrovaným heslem Jména adresářů jako jména umělců Očekává jména hlavních adresářů obsahující jména umělců Procházet za použití ID3 tagů diff --git a/ultrasonic/src/main/res/values-de/strings.xml b/ultrasonic/src/main/res/values-de/strings.xml index 493dfa2b..6d93e4c6 100644 --- a/ultrasonic/src/main/res/values-de/strings.xml +++ b/ultrasonic/src/main/res/values-de/strings.xml @@ -306,8 +306,8 @@ Schwarz Thema Selbst-signierte HTTPS Zertifikate erlauben - LDAP Benutzeranmeldung aktivieren - Dies zwingt die App, das Kennwort immer unverschlüsselt zu senden. Hilfreich wenn der Subsonic Server keine Autorisierungs-API unterstützt. + Passwort als Klartext senden + Dies zwingt die App, das Kennwort immer unverschlüsselt zu senden. Hilfreich wenn der Subsonic Server keine Autorisierungs-API unterstützt. Nutze den Ordnernamen als Namen der Künstler*in Annehmen, dass der Ordner nach der Künstler*in benannt ist. Zeige mehr Song Details in der Wiedergabe (Genre, Jahr, Bitrate) diff --git a/ultrasonic/src/main/res/values-es/strings.xml b/ultrasonic/src/main/res/values-es/strings.xml index ff664883..77256758 100644 --- a/ultrasonic/src/main/res/values-es/strings.xml +++ b/ultrasonic/src/main/res/values-es/strings.xml @@ -306,8 +306,8 @@ Negro Tema Permir certificado HTTPS autofirmado - Forzar autenticación de contraseña plana - Esto obliga a la aplicación a enviar siempre la contraseña sin cifrar. Útil si el servidor Subsonic no admite la nueva API de autenticación para los usuarios. + Forzar autenticación de contraseña plana + Esto obliga a la aplicación a enviar siempre la contraseña sin cifrar. Útil si el servidor Subsonic no admite la nueva API de autenticación para los usuarios. Usar carpetas para el nombre del artista Se asume que la carpeta en el nivel mal alto es el nombre del artista del álbum Mostrar más detalles de la canción en reproduciendo ahora (género, año, bitrate) diff --git a/ultrasonic/src/main/res/values-fr/strings.xml b/ultrasonic/src/main/res/values-fr/strings.xml index 37fb31b7..53fae809 100644 --- a/ultrasonic/src/main/res/values-fr/strings.xml +++ b/ultrasonic/src/main/res/values-fr/strings.xml @@ -296,7 +296,6 @@ Noir Thème Autoriser le certificat HTTPS auto-signé - Activer la prise en charge des utilisateurs LDAP Utiliser les noms des dossiers pour les noms d\'artistes Dossier de niveau supérieur devient le nom de l\'artiste de l\'album Naviguer en utilisant les tags ID3 diff --git a/ultrasonic/src/main/res/values-hu/strings.xml b/ultrasonic/src/main/res/values-hu/strings.xml index 196075f6..071f982f 100644 --- a/ultrasonic/src/main/res/values-hu/strings.xml +++ b/ultrasonic/src/main/res/values-hu/strings.xml @@ -266,7 +266,6 @@ Fekete Téma Engedélyezze az önaláírt HTTPS tanúsítványt - Az LDAP-felhasználók támogatásának engedélyezése Mappanevek használata az előadók neveként Feltételezi, hogy a legfelső szintű mappa az előadó neve. Böngészés ID3 Tag használatával @@ -345,7 +344,6 @@ Általános api hiba: %1$s nincs üzenet a szerverről - Az LDAP-felhasználók számára nem támogatott a token-hitelesítés. Hibás felhasználónév vagy jelszó! Nem engedélyezett! Ellenőrizze a felhasználó jogosultságait a Subsonic kiszolgálón! A szükséges param hiányzik. diff --git a/ultrasonic/src/main/res/values-nl/strings.xml b/ultrasonic/src/main/res/values-nl/strings.xml index 485c7faa..fb9dbc2c 100644 --- a/ultrasonic/src/main/res/values-nl/strings.xml +++ b/ultrasonic/src/main/res/values-nl/strings.xml @@ -306,8 +306,7 @@ Zwart Thema Zelf-gesigneerd HTTPS-certificaat toestaan - Ondersteuning voor LDAP-gebruikers inschakelen - Dit dwingt de app om het wachtwoord altijd op de ouderwetse manier te versturen, als de Subsonic-server geen ondersteuning biedt voor het autoriseren via de nieuwe api. + Dit dwingt de app om het wachtwoord altijd op de ouderwetse manier te versturen, als de Subsonic-server geen ondersteuning biedt voor het autoriseren via de nieuwe api. Mappen gebruiken voor artiestennaam Aannemen dat de naam van de bovenliggende map de naam van de albumartiest is Toon meer nummerinformatie op het afspeelscherm (genre, jaar, bitsnelheid) diff --git a/ultrasonic/src/main/res/values-pl/strings.xml b/ultrasonic/src/main/res/values-pl/strings.xml index b89280fd..37ece52e 100644 --- a/ultrasonic/src/main/res/values-pl/strings.xml +++ b/ultrasonic/src/main/res/values-pl/strings.xml @@ -257,7 +257,6 @@ Ciemny Motyw Zezwalaj na własne certyfikaty HTTPS - Włącz wsparcie dla użytkowników LDAP Używaj folderów jako nazw artystów Zakłada, że folder najwyższego poziomu jest nazwą artysty albumu Przeglądaj używając tagów ID3 diff --git a/ultrasonic/src/main/res/values-pt-rBR/strings.xml b/ultrasonic/src/main/res/values-pt-rBR/strings.xml index 29923aaa..dec7f516 100644 --- a/ultrasonic/src/main/res/values-pt-rBR/strings.xml +++ b/ultrasonic/src/main/res/values-pt-rBR/strings.xml @@ -299,8 +299,8 @@ Negro Tema Permitir certificado HTTPS auto-assinado - Forçar autenticação não criptografada - Isso força o aplicativo a enviar a senha sem criptografia. É útil se o servidor Subsonic não suporta a nova API de autenticação de usuários. + Forçar autenticação não criptografada + Isso força o aplicativo a enviar a senha sem criptografia. É útil se o servidor Subsonic não suporta a nova API de autenticação de usuários. Usar Pasta para Nome do Artista Assumir que a pasta mais acima é o nome do artista Mostrar mais detalhes da música no Tocando Agora (gênero, ano, bitrate) diff --git a/ultrasonic/src/main/res/values-pt/strings.xml b/ultrasonic/src/main/res/values-pt/strings.xml index 845909df..03f44c0c 100644 --- a/ultrasonic/src/main/res/values-pt/strings.xml +++ b/ultrasonic/src/main/res/values-pt/strings.xml @@ -257,7 +257,6 @@ Escuro Tema Permitir o certificado HTTPS auto-assinado - Ative o suporte para usuários LDAP Usar Pasta para Nome do Artista Assumir que a pasta mais acima é o nome do artista Navegar Usando Etiquetas ID3 diff --git a/ultrasonic/src/main/res/values-ru/strings.xml b/ultrasonic/src/main/res/values-ru/strings.xml index dc0397ee..b2c8e258 100644 --- a/ultrasonic/src/main/res/values-ru/strings.xml +++ b/ultrasonic/src/main/res/values-ru/strings.xml @@ -284,7 +284,7 @@ Черная Оформление Разрешить самоподписанный сертификат HTTPS - Принудительная аутентификация по обычному паролю + Принудительная аутентификация по обычному паролю Использовать папки для имени исполнителя Предположим, папка верхнего уровня - это имя исполнителя альбома Обзор с использованием тегов ID3 diff --git a/ultrasonic/src/main/res/values-zh-rCN/strings.xml b/ultrasonic/src/main/res/values-zh-rCN/strings.xml index 3d41ede2..c4c6ced7 100644 --- a/ultrasonic/src/main/res/values-zh-rCN/strings.xml +++ b/ultrasonic/src/main/res/values-zh-rCN/strings.xml @@ -279,7 +279,7 @@ Black 主题 允许自签名 HTTPS 证书 - 强制原始密码认证 + 强制原始密码认证 将艺术家名称作为文件夹 将艺术家名称作为顶层文件夹名 使用 ID3 标签浏览 diff --git a/ultrasonic/src/main/res/values/strings.xml b/ultrasonic/src/main/res/values/strings.xml index 72ceb51a..e74adfcd 100644 --- a/ultrasonic/src/main/res/values/strings.xml +++ b/ultrasonic/src/main/res/values/strings.xml @@ -307,8 +307,8 @@ Black Theme Allow self-signed HTTPS certificate - Force plain password authentication - This forces the app to always send the password unencrypted. Useful if the Subsonic server does not support the new authentication API for the users. + Force plain password authentication + This forces the app to always send the password unencrypted. Useful if the Subsonic server does not support the new authentication API for the users. Use Folders For Artist Name Assume top-level folder is the name of the album artist Show more song details in Now Playing (genre, year, bitrate)