chore: Auto play videos when ready, Webview No Network Error

app/src/main/java/org/openedx/app/di/AppModule.kt

@@ -180,7 +180,14 @@ val appModule = module {
         DownloadWorkerController(get(), get(), get())
     }
 
-    single { AppData(versionName = BuildConfig.VERSION_NAME) }
+    single {
+        val resourceManager = get<ResourceManager>()
+        AppData(
+            appName = resourceManager.getString(R.string.app_name),
+            versionName = BuildConfig.VERSION_NAME,
+            applicationId = BuildConfig.APPLICATION_ID,
+        )
+    }
     factory { (activity: AppCompatActivity) -> AppReviewManager(activity, get(), get()) }
 
     single { TranscriptManager(get(), get()) }

app/src/main/java/org/openedx/app/di/ScreenModule.kt

@@ -170,6 +170,7 @@ val screenModule = module {
             get(),
             get(),
             get(),
+            get(),
         )
     }
 
@@ -227,6 +228,7 @@ val screenModule = module {
             get(),
             get(),
             get(),
+            get(),
         )
     }
     viewModel { (courseId: String) ->
@@ -458,7 +460,7 @@ val screenModule = module {
         )
     }
 
-    viewModel { ProgramViewModel(get(), get(), get(), get(), get(), get(), get()) }
+    viewModel { ProgramViewModel(get(), get(), get(), get(), get(), get(), get(), get()) }
 
     viewModel { (courseId: String, courseTitle: String) ->
         CourseOfflineViewModel(

core/src/main/java/org/openedx/core/presentation/global/AppData.kt

@@ -1,5 +1,9 @@
 package org.openedx.core.presentation.global
 
 data class AppData(
+    val appName: String,
+    val applicationId: String,
     val versionName: String,
-)
+) {
+    val appUserAgent get() = "$appName/$applicationId/$versionName"
+}

core/src/main/java/org/openedx/core/ui/ComposeCommon.kt

@@ -1215,7 +1215,7 @@ fun FullScreenErrorView(
             modifier = Modifier
                 .widthIn(Dp.Unspecified, 162.dp),
             text = stringResource(id = errorType.actionResId),
-            textColor = MaterialTheme.appColors.primaryButtonText,
+            textColor = MaterialTheme.appColors.secondaryButtonText,
             backgroundColor = MaterialTheme.appColors.secondaryButtonBackground,
             onClick = onReloadClick,
         )

course/src/main/java/org/openedx/course/presentation/unit/html/HtmlUnitFragment.kt

@@ -52,7 +52,6 @@ import androidx.fragment.app.Fragment
 import kotlinx.coroutines.launch
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
-import org.openedx.core.extension.equalsHost
 import org.openedx.core.extension.loadUrl
 import org.openedx.core.system.AppCookieManager
 import org.openedx.core.ui.FullScreenErrorView
@@ -359,7 +358,7 @@ private fun HTMLContentView(
                         request: WebResourceRequest,
                         error: WebResourceError
                     ) {
-                        if (view.url.equalsHost(request.url.host)) {
+                        if (request.url.toString() == view.url) {
                             onWebPageLoadError()
                         }
                         super.onReceivedError(view, request, error)

course/src/main/java/org/openedx/course/presentation/unit/video/VideoUnitFragment.kt

@@ -222,7 +222,7 @@ class VideoUnitFragment : Fragment(R.layout.fragment_video_unit) {
                             mediaItem,
                             viewModel.exoPlayer?.currentPosition ?: 0L
                         )
-                        viewModel.castPlayer?.playWhenReady = false
+                        viewModel.castPlayer?.playWhenReady = true
                         showVideoControllerIndefinitely(true)
                     }
 

course/src/main/java/org/openedx/course/presentation/unit/video/VideoUnitViewModel.kt

@@ -30,7 +30,7 @@ open class VideoUnitViewModel(
 
     var videoUrl = ""
     var transcripts = emptyMap<String, String>()
-    var isPlaying = false
+    var isPlaying = true
     var transcriptLanguage = AppDataConstants.defaultLocale.language ?: "en"
         private set
 

discovery/src/main/java/org/openedx/discovery/presentation/WebViewDiscoveryFragment.kt

@@ -97,6 +97,7 @@ class WebViewDiscoveryFragment : Fragment() {
                     isPreLogin = viewModel.isPreLogin,
                     contentUrl = viewModel.discoveryUrl,
                     uriScheme = viewModel.uriScheme,
+                    userAgent = viewModel.appUserAgent,
                     isRegistrationEnabled = viewModel.isRegistrationEnabled,
                     hasInternetConnection = hasInternetConnection,
                     onWebViewUIAction = { action ->
@@ -195,6 +196,7 @@ private fun WebViewDiscoveryScreen(
     contentUrl: String,
     uriScheme: String,
     isRegistrationEnabled: Boolean,
+    userAgent: String,
     hasInternetConnection: Boolean,
     onWebViewUIAction: (WebViewUIAction) -> Unit,
     onWebPageUpdated: (String) -> Unit,
@@ -275,6 +277,7 @@ private fun WebViewDiscoveryScreen(
                             DiscoveryWebView(
                                 contentUrl = contentUrl,
                                 uriScheme = uriScheme,
+                                userAgent = userAgent,
                                 onWebPageLoaded = {
                                     if ((uiState is WebViewUIState.Error).not()) {
                                         onWebViewUIAction(WebViewUIAction.WEB_PAGE_LOADED)
@@ -316,6 +319,7 @@ private fun WebViewDiscoveryScreen(
 private fun DiscoveryWebView(
     contentUrl: String,
     uriScheme: String,
+    userAgent: String,
     onWebPageLoaded: () -> Unit,
     onWebPageUpdated: (String) -> Unit,
     onUriClick: (String, WebViewLink.Authority) -> Unit,
@@ -324,6 +328,7 @@ private fun DiscoveryWebView(
     val webView = CatalogWebViewScreen(
         url = contentUrl,
         uriScheme = uriScheme,
+        userAgent = userAgent,
         onWebPageLoaded = onWebPageLoaded,
         onWebPageUpdated = onWebPageUpdated,
         onUriClick = onUriClick,
@@ -396,6 +401,7 @@ private fun WebViewDiscoveryScreenPreview() {
             contentUrl = "https://www.example.com/",
             uriScheme = "",
             isRegistrationEnabled = true,
+            userAgent = "",
             hasInternetConnection = false,
             onWebViewUIAction = {},
             onWebPageUpdated = {},

discovery/src/main/java/org/openedx/discovery/presentation/WebViewDiscoveryViewModel.kt

@@ -6,6 +6,7 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import org.openedx.core.config.Config
 import org.openedx.core.data.storage.CorePreferences
+import org.openedx.core.presentation.global.AppData
 import org.openedx.core.presentation.global.ErrorType
 import org.openedx.core.presentation.global.webview.WebViewUIState
 import org.openedx.core.system.connection.NetworkConnection
@@ -14,6 +15,7 @@ import org.openedx.foundation.utils.UrlUtils
 
 class WebViewDiscoveryViewModel(
     private val querySearch: String,
+    private val appData: AppData,
     private val config: Config,
     private val networkConnection: NetworkConnection,
     private val corePreferences: CorePreferences,
@@ -30,6 +32,8 @@ class WebViewDiscoveryViewModel(
     val isPreLogin get() = config.isPreLoginExperienceEnabled() && corePreferences.user == null
     val isRegistrationEnabled: Boolean get() = config.isRegistrationEnabled()
 
+    val appUserAgent get() = appData.appUserAgent
+
     private var _discoveryUrl = webViewConfig.baseUrl
     val discoveryUrl: String
         get() {

discovery/src/main/java/org/openedx/discovery/presentation/catalog/CatalogWebView.kt

@@ -8,7 +8,6 @@ import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalContext
-import org.openedx.core.extension.equalsHost
 import org.openedx.foundation.extension.applyDarkModeIfEnabled
 import org.openedx.discovery.presentation.catalog.WebViewLink.Authority as linkAuthority
 
@@ -17,6 +16,7 @@ import org.openedx.discovery.presentation.catalog.WebViewLink.Authority as linkA
 fun CatalogWebViewScreen(
     url: String,
     uriScheme: String,
+    userAgent: String,
     isAllLinksExternal: Boolean = false,
     onWebPageLoaded: () -> Unit,
     refreshSessionCookie: () -> Unit = {},
@@ -90,7 +90,7 @@ fun CatalogWebViewScreen(
                     request: WebResourceRequest,
                     error: WebResourceError
                 ) {
-                    if (view.url.equalsHost(request.url.host)) {
+                    if (request.url.toString() == view.url) {
                         onWebPageLoadError()
                     }
                     super.onReceivedError(view, request, error)
@@ -104,6 +104,7 @@ fun CatalogWebViewScreen(
                 setSupportZoom(true)
                 loadsImagesAutomatically = true
                 domStorageEnabled = true
+                userAgentString = "$userAgentString $userAgent"
             }
             isVerticalScrollBarEnabled = false
             isHorizontalScrollBarEnabled = false

discovery/src/main/java/org/openedx/discovery/presentation/info/CourseInfoFragment.kt

@@ -127,8 +127,9 @@ class CourseInfoFragment : Fragment() {
                     webViewUIState = webViewState,
                     uiMessage = uiMessage,
                     uriScheme = viewModel.uriScheme,
-                    hasInternetConnection = hasInternetConnection,
                     isRegistrationEnabled = viewModel.isRegistrationEnabled,
+                    userAgent = viewModel.appUserAgent,
+                    hasInternetConnection = hasInternetConnection,
                     onWebViewUIAction = { action ->
                         when (action) {
                             WebViewUIAction.WEB_PAGE_LOADED -> {
@@ -244,6 +245,7 @@ private fun CourseInfoScreen(
     uiMessage: UIMessage?,
     uriScheme: String,
     isRegistrationEnabled: Boolean,
+    userAgent: String,
     hasInternetConnection: Boolean,
     onWebViewUIAction: (WebViewUIAction) -> Unit,
     onRegisterClick: () -> Unit,
@@ -318,6 +320,7 @@ private fun CourseInfoScreen(
                             CourseInfoWebView(
                                 contentUrl = (uiState as CourseInfoUIState.CourseInfo).initialUrl,
                                 uriScheme = uriScheme,
+                                userAgent = userAgent,
                                 onWebPageLoaded = { onWebViewUIAction(WebViewUIAction.WEB_PAGE_LOADED) },
                                 onUriClick = onUriClick,
                                 onWebPageLoadError = {
@@ -354,13 +357,15 @@ private fun CourseInfoScreen(
 private fun CourseInfoWebView(
     contentUrl: String,
     uriScheme: String,
+    userAgent: String,
     onWebPageLoaded: () -> Unit,
     onUriClick: (String, linkAuthority) -> Unit,
     onWebPageLoadError: () -> Unit
 ) {
     val webView = CatalogWebViewScreen(
         url = contentUrl,
         uriScheme = uriScheme,
+        userAgent = userAgent,
         isAllLinksExternal = true,
         onWebPageLoaded = onWebPageLoaded,
         onUriClick = onUriClick,
@@ -391,6 +396,7 @@ fun CourseInfoScreenPreview() {
             uiMessage = null,
             uriScheme = "",
             isRegistrationEnabled = true,
+            userAgent = "",
             hasInternetConnection = false,
             onWebViewUIAction = {},
             onRegisterClick = {},

discovery/src/main/java/org/openedx/discovery/presentation/info/CourseInfoViewModel.kt

@@ -15,6 +15,7 @@ import kotlinx.coroutines.withContext
 import org.openedx.core.config.Config
 import org.openedx.core.data.storage.CorePreferences
 import org.openedx.core.presentation.CoreAnalyticsKey
+import org.openedx.core.presentation.global.AppData
 import org.openedx.core.presentation.global.ErrorType
 import org.openedx.core.presentation.global.webview.WebViewUIState
 import org.openedx.core.system.connection.NetworkConnection
@@ -37,6 +38,7 @@ import org.openedx.core.R as CoreR
 class CourseInfoViewModel(
     val pathId: String,
     val infoType: String,
+    private val appData: AppData,
     private val config: Config,
     private val networkConnection: NetworkConnection,
     private val router: DiscoveryRouter,
@@ -75,6 +77,8 @@ class CourseInfoViewModel(
 
     val uriScheme: String get() = config.getUriScheme()
 
+    val appUserAgent get() = appData.appUserAgent
+
     private val webViewConfig get() = config.getDiscoveryConfig().webViewConfig
 
     private fun getInitialUrl(): String {

discovery/src/main/java/org/openedx/discovery/presentation/program/ProgramFragment.kt

@@ -132,6 +132,7 @@ class ProgramFragment : Fragment() {
                         ?.isNotEmpty() == true,
                     isNestedFragment = isNestedFragment,
                     uriScheme = viewModel.uriScheme,
+                    userAgent = viewModel.appUserAgent,
                     hasInternetConnection = hasInternetConnection,
                     onWebViewUIAction = { action ->
                         when (action) {
@@ -243,6 +244,7 @@ private fun ProgramInfoScreen(
     contentUrl: String,
     cookieManager: AppCookieManager,
     uriScheme: String,
+    userAgent: String,
     canShowBackBtn: Boolean,
     isNestedFragment: Boolean,
     hasInternetConnection: Boolean,
@@ -319,6 +321,7 @@ private fun ProgramInfoScreen(
                             val webView = CatalogWebViewScreen(
                                 url = contentUrl,
                                 uriScheme = uriScheme,
+                                userAgent = userAgent,
                                 isAllLinksExternal = true,
                                 onWebPageLoaded = { onWebViewUIAction(WebViewUIAction.WEB_PAGE_LOADED) },
                                 refreshSessionCookie = {
@@ -378,6 +381,7 @@ fun MyProgramsPreview() {
             contentUrl = "https://www.example.com/",
             cookieManager = koinViewModel<ProgramViewModel>().cookieManager,
             uriScheme = "",
+            userAgent = "",
             canShowBackBtn = false,
             isNestedFragment = false,
             hasInternetConnection = false,

discovery/src/main/java/org/openedx/discovery/presentation/program/ProgramViewModel.kt

@@ -8,6 +8,7 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import org.openedx.core.R
 import org.openedx.core.config.Config
+import org.openedx.core.presentation.global.AppData
 import org.openedx.core.presentation.global.ErrorType
 import org.openedx.core.system.AppCookieManager
 import org.openedx.core.system.connection.NetworkConnection
@@ -22,6 +23,7 @@ import org.openedx.foundation.presentation.UIMessage
 import org.openedx.foundation.system.ResourceManager
 
 class ProgramViewModel(
+    private val appData: AppData,
     private val config: Config,
     private val networkConnection: NetworkConnection,
     private val router: DiscoveryRouter,
@@ -38,6 +40,8 @@ class ProgramViewModel(
 
     val hasInternetConnection: Boolean get() = networkConnection.isOnline()
 
+    val appUserAgent get() = appData.appUserAgent
+
     private val _uiState = MutableStateFlow<ProgramUIState>(ProgramUIState.Loading)
     val uiState: StateFlow<ProgramUIState> get() = _uiState.asStateFlow()
 

profile/src/main/java/org/openedx/profile/presentation/settings/SettingsScreenUI.kt

@@ -625,7 +625,9 @@ fun AppVersionItemUpgradeRequired(
 }
 
 private val mockAppData = AppData(
+    appName = "openedx",
     versionName = "1.0.0",
+    applicationId = "org.example.com"
 )
 
 private val mockConfiguration = Configuration(