Merge pull request #77 from usetrmnl/76-fix-user-right-api-for-device-type

[FIXED] Use display API for BYOD and BYOS device/service type

Author: hossain-khan

app/src/main/java/ink/trmnl/android/data/TrmnlDisplayRepository.kt

@@ -41,13 +41,13 @@ class TrmnlDisplayRepository
          * @return A [TrmnlDisplayInfo] object containing the display data.
          */
         suspend fun getNextDisplayData(trmnlDeviceConfig: TrmnlDeviceConfig): TrmnlDisplayInfo {
+            Timber.i("Fetching next playlist item display data from server for device: ${trmnlDeviceConfig.type}")
+
             if (repositoryConfigProvider.shouldUseFakeData) {
                 // Avoid using real API in debug mode
                 return fakeTrmnlDisplayInfo(apiUsed = "next-image")
             }
 
-            Timber.i("Fetching next playlist item display data from server")
-
             val result =
                 apiService
                     .getNextDisplayData(
@@ -90,17 +90,24 @@ class TrmnlDisplayRepository
          * Fetches the current display data from the server using the provided access token.
          * If the app is in debug mode, it uses mock data instead.
          *
+         * ⚠️ NOTE: This API is not available on BYOS servers.
+         * See https://discord.com/channels/1281055965508141100/1331360842809348106/1382863253880963124
+         *
          * @param trmnlDeviceConfig Device configuration containing the access token and other settings.
          * @return A [TrmnlDisplayInfo] object containing the current display data.
          */
         suspend fun getCurrentDisplayData(trmnlDeviceConfig: TrmnlDeviceConfig): TrmnlDisplayInfo {
+            Timber.i("Fetching current display data from server for device: ${trmnlDeviceConfig.type}")
+
+            if (trmnlDeviceConfig.type == TrmnlDeviceType.BYOS) {
+                Timber.w("Current display image data API is not available for BYOS service.")
+            }
+
             if (repositoryConfigProvider.shouldUseFakeData) {
                 // Avoid using real API in debug mode
                 return fakeTrmnlDisplayInfo(apiUsed = "current-image")
             }
 
-            Timber.i("Fetching current display data from server")
-
             val result =
                 apiService
                     .getCurrentDisplayData(

app/src/main/java/ink/trmnl/android/ui/settings/AppSettingsScreen.kt

@@ -29,7 +29,6 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Clear
 import androidx.compose.material.icons.filled.DateRange
-import androidx.compose.material.icons.outlined.Info
 import androidx.compose.material.icons.outlined.Warning
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
@@ -62,22 +61,14 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalFocusManager
-import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.LinkAnnotation
-import androidx.compose.ui.text.SpanStyle
-import androidx.compose.ui.text.TextLinkStyles
-import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.text.style.TextDecoration
-import androidx.compose.ui.text.withLink
-import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.work.WorkInfo
@@ -276,19 +267,30 @@ class AppSettingsPresenter
                                 if (deviceType == TrmnlDeviceType.BYOS) {
                                     if (!isValidUrl(serverBaseUrl)) {
                                         isLoading = false
-                                        validationResult = InvalidServerUrl("Please enter a valid URL (e.g. https://example.com)")
+                                        validationResult = InvalidServerUrl("Please enter a valid HTTPS URL (e.g. https://my-terminus.com)")
                                         return@launch
                                     }
                                 }
 
-                                val response =
-                                    displayRepository.getCurrentDisplayData(
-                                        TrmnlDeviceConfig(
-                                            type = deviceType,
-                                            apiBaseUrl = serverBaseUrl.forDevice(deviceType),
-                                            apiAccessToken = accessToken,
-                                        ),
+                                // Device configuration for API calls
+                                val deviceConfig =
+                                    TrmnlDeviceConfig(
+                                        type = deviceType,
+                                        apiBaseUrl = serverBaseUrl.forDevice(deviceType),
+                                        apiAccessToken = accessToken,
                                     )
+                                // For TRMNL mirror device type, use getCurrentDisplayData
+                                // For all other device types, use getNextDisplayData
+                                // See https://discord.com/channels/1281055965508141100/1331360842809348106/1382865608236077086
+                                val response =
+                                    when (deviceType) {
+                                        TrmnlDeviceType.TRMNL -> {
+                                            displayRepository.getCurrentDisplayData(deviceConfig)
+                                        }
+                                        else -> {
+                                            displayRepository.getNextDisplayData(deviceConfig)
+                                        }
+                                    }
 
                                 if (response.status.isHttpError()) {
                                     // Handle explicit error response
@@ -528,7 +530,7 @@ fun AppSettingsContent(
 
             Spacer(modifier = Modifier.height(8.dp))
 
-            TokenInfoTextView()
+            SwitchDeviceTypeInfoText(deviceType = state.deviceType)
 
             Spacer(modifier = Modifier.height(16.dp))
 
@@ -868,61 +870,6 @@ private fun FakeApiInfoBanner(modifier: Modifier = Modifier) {
     }
 }
 
-@Composable
-private fun TokenInfoTextView() {
-    // Informational text with links using withLink
-    val uriHandler = LocalUriHandler.current
-    val linkStyle = SpanStyle(color = MaterialTheme.colorScheme.primary, textDecoration = TextDecoration.Underline)
-    val annotatedString =
-        buildAnnotatedString {
-            append("Your TRMNL device token can be found in settings screen from your ")
-
-            withLink(
-                LinkAnnotation.Url(
-                    url = "https://usetrmnl.com/dashboard",
-                    styles = TextLinkStyles(style = linkStyle),
-                    linkInteractionListener = { uriHandler.openUri("https://usetrmnl.com/dashboard") },
-                ),
-            ) {
-                withStyle(style = linkStyle) {
-                    append("dashboard")
-                }
-            }
-
-            append(". ")
-
-            withLink(
-                LinkAnnotation.Url(
-                    url = "https://docs.usetrmnl.com/go/private-api/introduction",
-                    styles = TextLinkStyles(style = linkStyle),
-                    linkInteractionListener = { uriHandler.openUri("https://docs.usetrmnl.com/go/private-api/introduction") },
-                ),
-            ) {
-                withStyle(style = linkStyle) {
-                    append("Learn more")
-                }
-            }
-
-            append(".")
-        }
-
-    Row(
-        modifier = Modifier.fillMaxWidth().padding(horizontal = 4.dp),
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        Icon(
-            imageVector = Icons.Outlined.Info,
-            contentDescription = "Information",
-            tint = MaterialTheme.colorScheme.onSurfaceVariant,
-        )
-        Spacer(modifier = Modifier.width(4.dp))
-        Text(
-            text = annotatedString,
-            style = MaterialTheme.typography.bodySmall.copy(color = MaterialTheme.colorScheme.onSurfaceVariant),
-        )
-    }
-}
-
 @Preview(name = "App Settings Content - Initial State")
 @Composable
 private fun PreviewAppSettingsContentInitial() {
@@ -1093,11 +1040,3 @@ private fun PreviewFakeApiInfoBanner() {
         FakeApiInfoBanner()
     }
 }
-
-@Preview(name = "Info Text View Preview", showBackground = true)
-@Composable
-private fun PreviewInfoTextView() {
-    TrmnlDisplayAppTheme {
-        TokenInfoTextView()
-    }
-}