Skip to content
Snippets Groups Projects
Commit 483c0a3d authored by Nicolas Pomepuy's avatar Nicolas Pomepuy
Browse files

Fix unresolved reference release on release builds

parent a647981c
Branches master
No related tags found
No related merge requests found
......@@ -298,10 +298,7 @@ class MediaParsingService : LifecycleService(), DevicesDiscoveryCb {
private fun startScan(shouldInit: Boolean, upgrade: Boolean) {
scanActivated = true
if (MLServiceLocator.getLocatorMode() == MLServiceLocator.LocatorMode.TESTS) {
val jsonData = AppContextProvider.appResources.openRawResource(R.raw.basic_stub).bufferedReader().use {
it.readText()
}
(medialibrary as StubMedialibrary).loadJsonData(jsonData)
(medialibrary as StubMedialibrary).loadJsonData(Util.readAsset("basic_stub.json", ""))
}
when {
shouldInit -> {
......
......@@ -23,14 +23,46 @@ package org.videolan.vlc.util
import android.app.Activity
import android.app.Service
import android.content.Context
import org.videolan.resources.AppContextProvider
import org.videolan.resources.VLCInstance
import org.videolan.tools.CloseableUtils
import org.videolan.tools.runBackground
import org.videolan.tools.runOnMainThread
import org.videolan.vlc.gui.video.VideoPlayerActivity
import java.io.BufferedReader
import java.io.IOException
import java.io.InputStream
import java.io.InputStreamReader
object Util {
const val TAG = "VLC/Util"
fun readAsset(assetName: String, defaultS: String): String {
var inputStream: InputStream? = null
var r: BufferedReader? = null
try {
inputStream = AppContextProvider.appResources.assets.open(assetName)
r = BufferedReader(InputStreamReader(inputStream, "UTF8"))
val sb = StringBuilder()
var line: String? = r.readLine()
if (line != null) {
sb.append(line)
line = r.readLine()
while (line != null) {
sb.append('\n')
sb.append(line)
line = r.readLine()
}
}
return sb.toString()
} catch (e: IOException) {
return defaultS
} finally {
CloseableUtils.close(inputStream)
CloseableUtils.close(r)
}
}
fun checkCpuCompatibility(ctx: Context) {
runBackground(Runnable {
if (!VLCInstance.testCompatibleCPU(ctx))
......
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