diff --git a/app/src/main/java/com/futo/platformplayer/activities/LoginActivity.kt b/app/src/main/java/com/futo/platformplayer/activities/LoginActivity.kt index f26317d1..23040dad 100644 --- a/app/src/main/java/com/futo/platformplayer/activities/LoginActivity.kt +++ b/app/src/main/java/com/futo/platformplayer/activities/LoginActivity.kt @@ -3,7 +3,9 @@ package com.futo.platformplayer.activities import android.content.Context import android.content.Intent import android.os.Bundle +import android.webkit.ConsoleMessage import android.webkit.CookieManager +import android.webkit.WebChromeClient import android.webkit.WebView import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.lifecycleScope @@ -68,9 +70,15 @@ class LoginActivity : AppCompatActivity() { view?.evaluateJavascript("setTimeout(()=> document.querySelector(\"${authConfig.loginButton}\")?.click(), 1000)", {}); } } - //TODO: Required for some...TBD what to do with it. Clear on finish? _webView.settings.domStorageEnabled = true; + /* + _webView.webChromeClient = object: WebChromeClient() { + override fun onConsoleMessage(consoleMessage: ConsoleMessage?): Boolean { + Logger.w(TAG, "Login Console: " + consoleMessage?.message()); + return super.onConsoleMessage(consoleMessage); + } + }*/ _webView.webViewClient = webViewClient; _webView.loadUrl(authConfig.loginUrl); } diff --git a/app/src/main/java/com/futo/platformplayer/api/media/models/video/SerializedPlatformNestedContent.kt b/app/src/main/java/com/futo/platformplayer/api/media/models/video/SerializedPlatformNestedContent.kt index 6ab033a5..5c2ad3f4 100644 --- a/app/src/main/java/com/futo/platformplayer/api/media/models/video/SerializedPlatformNestedContent.kt +++ b/app/src/main/java/com/futo/platformplayer/api/media/models/video/SerializedPlatformNestedContent.kt @@ -30,7 +30,7 @@ open class SerializedPlatformNestedContent( override val contentProvider: String?, override val contentThumbnails: Thumbnails ) : IPlatformNestedContent, SerializedPlatformContent { - final override val contentType: ContentType get() = ContentType.MEDIA; + final override val contentType: ContentType get() = ContentType.NESTED_VIDEO; override val contentPlugin: String? = StatePlatform.instance.getContentClientOrNull(contentUrl)?.id; override val contentSupported: Boolean get() = contentPlugin != null; diff --git a/app/src/main/java/com/futo/platformplayer/others/LoginWebViewClient.kt b/app/src/main/java/com/futo/platformplayer/others/LoginWebViewClient.kt index 371af503..6f02c21d 100644 --- a/app/src/main/java/com/futo/platformplayer/others/LoginWebViewClient.kt +++ b/app/src/main/java/com/futo/platformplayer/others/LoginWebViewClient.kt @@ -12,6 +12,7 @@ import com.futo.platformplayer.constructs.Event2 import com.futo.platformplayer.logging.Logger import com.futo.platformplayer.matchesDomain import kotlinx.serialization.encodeToString +import kotlinx.serialization.json.Json class LoginWebViewClient : WebViewClient { private val LOG_VERBOSE = false; diff --git a/app/src/main/java/com/futo/platformplayer/serializers/PlatformContentSerializer.kt b/app/src/main/java/com/futo/platformplayer/serializers/PlatformContentSerializer.kt index 6214d62e..f7f839bf 100644 --- a/app/src/main/java/com/futo/platformplayer/serializers/PlatformContentSerializer.kt +++ b/app/src/main/java/com/futo/platformplayer/serializers/PlatformContentSerializer.kt @@ -20,10 +20,10 @@ class PlatformContentSerializer() : JsonContentPolymorphicSerializer SerializedPlatformVideo.serializer(); - "NESTED" -> SerializedPlatformNestedContent.serializer(); + "NESTED_VIDEO" -> SerializedPlatformNestedContent.serializer(); "ARTICLE" -> throw NotImplementedError("Articles not yet implemented"); "POST" -> throw NotImplementedError("Post not yet implemented"); - else -> throw NotImplementedError("Unknown Content Type Value: ${obj?.jsonPrimitive?.int}") + else -> throw NotImplementedError("Unknown Content Type Value: ${obj?.jsonPrimitive?.contentOrNull}") }; else return when(obj?.jsonPrimitive?.int) {