Skip to content
Snippets Groups Projects
Commit 977f5f83 authored by Nicolas Pomepuy's avatar Nicolas Pomepuy Committed by Geoffrey Métais
Browse files

Fix lollipop webview crash

parent 918e4425
No related branches found
No related tags found
No related merge requests found
......@@ -24,6 +24,8 @@
package org.videolan.vlc.gui
import android.content.Intent
import android.content.res.AssetManager
import android.os.Build
import android.os.Bundle
import android.os.Parcelable
import android.view.MenuItem
......@@ -92,6 +94,12 @@ class SecondaryActivity : ContentActivity() {
.commit()
}
//workaround for Error inflating class android.webkit.WebView
override fun getAssets(): AssetManager {
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1 && intent.getStringExtra(KEY_FRAGMENT) == ABOUT) return resources.assets
return super.getAssets()
}
override fun onResume() {
overridePendingTransition(0, 0)
super.onResume()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment