[Android] Rename licence_dark_tv.css for license_dark_tv.css

diegofn git at videolan.org
Sun Jun 28 10:40:17 CEST 2020


vlc-android | branch: master | diegofn <diegofn at me.com> | Sat Jun 13 10:16:25 2020 -0500| [a91f34b950e7449687ad6c210cb78e7cf51e1d89] | committer: Nicolas Pomepuy

Rename licence_dark_tv.css for license_dark_tv.css
Enable Javascipt to browse the code in license webview

> https://code.videolan.org/videolan/vlc-android/commit/a91f34b950e7449687ad6c210cb78e7cf51e1d89
---

 .../src/main/java/org/videolan/television/ui/LicenceActivity.kt     | 6 +-----
 .../vlc-android/assets/{licence_dark_tv.css => license_dark_tv.css} | 0
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/application/television/src/main/java/org/videolan/television/ui/LicenceActivity.kt b/application/television/src/main/java/org/videolan/television/ui/LicenceActivity.kt
index 2ace733c1..7c53370aa 100644
--- a/application/television/src/main/java/org/videolan/television/ui/LicenceActivity.kt
+++ b/application/television/src/main/java/org/videolan/television/ui/LicenceActivity.kt
@@ -9,7 +9,6 @@ import android.webkit.WebViewClient
 import android.widget.FrameLayout
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
-import org.videolan.resources.util.applyOverscanMargin
 import org.videolan.vlc.R
 import org.videolan.vlc.util.Util
 
@@ -29,7 +28,7 @@ class LicenceActivity : FragmentActivity() {
             override fun onPageFinished(view: WebView, url: String) {
                 if (url.startsWith("file:///android_asset")) {
                     // Inject CSS when page is done loading
-                    injectCSS(view, "licence_dark_tv.css")
+                    injectCSS(view, "license_dark_tv.css")
                     injectCommitRevision(view, revision)
                 }
                 super.onPageFinished(view, url)
@@ -58,8 +57,6 @@ class LicenceActivity : FragmentActivity() {
                     "style.innerHTML = window.atob('" + encoded + "');" +
                     "parent.appendChild(style);" +
                     "})()")
-
-            webView.settings.javaScriptEnabled = false
         } catch (e: Exception) {
             e.printStackTrace()
         }
@@ -76,7 +73,6 @@ class LicenceActivity : FragmentActivity() {
                     "link.setAttribute('href', newLink);" +
                     "link.innerText = newLink;" +
                     "})()")
-            webView.settings.javaScriptEnabled = false
         } catch (e: Exception) {
             e.printStackTrace()
         }
diff --git a/application/vlc-android/assets/licence_dark_tv.css b/application/vlc-android/assets/license_dark_tv.css
similarity index 100%
rename from application/vlc-android/assets/licence_dark_tv.css
rename to application/vlc-android/assets/license_dark_tv.css



More information about the Android mailing list