[Android] Rename licence.htm to license.htm

Nicolas Pomepuy git at videolan.org
Fri Jun 5 10:16:40 CEST 2020


vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Thu Jun  4 08:14:55 2020 +0200| [20f76334496afb0f5aee67cbed2bcb7490e89297] | committer: Nicolas Pomepuy

Rename licence.htm to license.htm

(cherry picked from commit c429dcd7f9781a135f36bc59aea7ef492c4547ba)

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

 .../src/main/java/org/videolan/television/ui/LicenceActivity.kt         | 2 +-
 application/vlc-android/assets/{licence.htm => license.htm}             | 0
 application/vlc-android/src/org/videolan/vlc/gui/AboutFragment.kt       | 2 +-
 3 files changed, 2 insertions(+), 2 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 9d38e7f41..2ace733c1 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
@@ -21,7 +21,7 @@ class LicenceActivity : FragmentActivity() {
 
         val webView = WebView(this)
         val revision = getString(R.string.build_revision)
-        webView.loadUrl("file:///android_asset/licence.htm")
+        webView.loadUrl("file:///android_asset/license.htm")
         webView.setBackgroundColor(backgroundColor)
 
         webView.webViewClient = object : WebViewClient() {
diff --git a/application/vlc-android/assets/licence.htm b/application/vlc-android/assets/license.htm
similarity index 100%
rename from application/vlc-android/assets/licence.htm
rename to application/vlc-android/assets/license.htm
diff --git a/application/vlc-android/src/org/videolan/vlc/gui/AboutFragment.kt b/application/vlc-android/src/org/videolan/vlc/gui/AboutFragment.kt
index ceaf074be..914280b9b 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/AboutFragment.kt
+++ b/application/vlc-android/src/org/videolan/vlc/gui/AboutFragment.kt
@@ -78,7 +78,7 @@ class AboutFragment : Fragment() {
         }
         lifecycleScope.launch {
             UiTools.fillAboutView(view)
-            webView.loadUrl("file:///android_asset/licence.htm")
+            webView.loadUrl("file:///android_asset/license.htm")
 
             webView.webViewClient = object : WebViewClient() {
 



More information about the Android mailing list