add login disclaimer support

leekleak · Apr 27, 2024 · 73c1d2e · 73c1d2e
1 parent f470cbe
commit 73c1d2e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/LoginFragment.kt b/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/LoginFragment.kt
@@ -1,6 +1,7 @@
 package dev.jdtech.jellyfin.fragments
 
 import android.os.Bundle
+import android.text.Html.fromHtml
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -132,6 +133,10 @@ class LoginFragment : Fragment() {
             }
         }
 
+        viewLifecycleOwner.lifecycleScope.launch {
+            binding.loginDisclaimer.text = fromHtml(viewModel.getLoginDisclaimer(), 0)
+        }
+
         return binding.root
     }
 

diff --git a/app/phone/src/main/res/layout/fragment_login.xml b/app/phone/src/main/res/layout/fragment_login.xml
@@ -141,6 +141,15 @@
                     android:visibility="invisible" />
             </RelativeLayout>
 
+            <TextView
+                android:id="@+id/login_disclaimer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="24dp"
+                android:layout_marginTop="24dp"
+                android:textSize="16sp"
+                tools:text="Sample login disclaimer" />
+
         </LinearLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>

diff --git a/core/src/main/java/dev/jdtech/jellyfin/viewmodels/LoginViewModel.kt b/core/src/main/java/dev/jdtech/jellyfin/viewmodels/LoginViewModel.kt
@@ -19,6 +19,7 @@ import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.jellyfin.sdk.api.client.extensions.authenticateWithQuickConnect
+import org.jellyfin.sdk.api.client.extensions.brandingApi
 import org.jellyfin.sdk.model.api.AuthenticateUserByName
 import org.jellyfin.sdk.model.api.AuthenticationResult
 import javax.inject.Inject
@@ -165,6 +166,8 @@ constructor(
         }
     }
 
+    suspend fun getLoginDisclaimer(): String? = jellyfinApi.api.brandingApi.getBrandingOptions().content.loginDisclaimer
+
     private suspend fun saveAuthenticationResult(authenticationResult: AuthenticationResult) {
         val serverInfo by jellyfinApi.systemApi.getPublicSystemInfo()