Fixed ANR when opening a PDF inside linphone (VFS enabled for example)
This commit is contained in:
parent
7335360c26
commit
6765505ff0
3 changed files with 56 additions and 32 deletions
|
@ -54,7 +54,11 @@ class PdfViewerFragment : GenericViewerFragment<FilePdfViewerFragmentBinding>()
|
||||||
)[PdfFileViewModel::class.java]
|
)[PdfFileViewModel::class.java]
|
||||||
binding.viewModel = viewModel
|
binding.viewModel = viewModel
|
||||||
|
|
||||||
|
viewModel.rendererReady.observe(viewLifecycleOwner) {
|
||||||
|
it.consume {
|
||||||
adapter = PdfPagesListAdapter(viewModel)
|
adapter = PdfPagesListAdapter(viewModel)
|
||||||
binding.pdfViewPager.adapter = adapter
|
binding.pdfViewPager.adapter = adapter
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,10 +26,15 @@ import android.widget.ImageView
|
||||||
import androidx.lifecycle.MutableLiveData
|
import androidx.lifecycle.MutableLiveData
|
||||||
import androidx.lifecycle.ViewModel
|
import androidx.lifecycle.ViewModel
|
||||||
import androidx.lifecycle.ViewModelProvider
|
import androidx.lifecycle.ViewModelProvider
|
||||||
|
import androidx.lifecycle.viewModelScope
|
||||||
import java.io.File
|
import java.io.File
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.launch
|
||||||
|
import kotlinx.coroutines.withContext
|
||||||
import org.linphone.LinphoneApplication.Companion.coreContext
|
import org.linphone.LinphoneApplication.Companion.coreContext
|
||||||
import org.linphone.core.Content
|
import org.linphone.core.Content
|
||||||
import org.linphone.core.tools.Log
|
import org.linphone.core.tools.Log
|
||||||
|
import org.linphone.utils.Event
|
||||||
|
|
||||||
class PdfFileViewModelFactory(private val content: Content) :
|
class PdfFileViewModelFactory(private val content: Content) :
|
||||||
ViewModelProvider.NewInstanceFactory() {
|
ViewModelProvider.NewInstanceFactory() {
|
||||||
|
@ -43,31 +48,49 @@ class PdfFileViewModelFactory(private val content: Content) :
|
||||||
class PdfFileViewModel(content: Content) : FileViewerViewModel(content) {
|
class PdfFileViewModel(content: Content) : FileViewerViewModel(content) {
|
||||||
val operationInProgress = MutableLiveData<Boolean>()
|
val operationInProgress = MutableLiveData<Boolean>()
|
||||||
|
|
||||||
private val pdfRenderer: PdfRenderer
|
val rendererReady = MutableLiveData<Event<Boolean>>()
|
||||||
|
|
||||||
|
private lateinit var pdfRenderer: PdfRenderer
|
||||||
|
|
||||||
init {
|
init {
|
||||||
operationInProgress.value = false
|
operationInProgress.value = false
|
||||||
|
|
||||||
val input = ParcelFileDescriptor.open(File(filePath), ParcelFileDescriptor.MODE_READ_ONLY)
|
viewModelScope.launch {
|
||||||
|
withContext(Dispatchers.IO) {
|
||||||
|
val input = ParcelFileDescriptor.open(
|
||||||
|
File(filePath),
|
||||||
|
ParcelFileDescriptor.MODE_READ_ONLY
|
||||||
|
)
|
||||||
pdfRenderer = PdfRenderer(input)
|
pdfRenderer = PdfRenderer(input)
|
||||||
Log.i("[PDF Viewer] ${pdfRenderer.pageCount} pages in file $filePath")
|
Log.i("[PDF Viewer] ${pdfRenderer.pageCount} pages in file $filePath")
|
||||||
|
rendererReady.postValue(Event(true))
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onCleared() {
|
override fun onCleared() {
|
||||||
|
if (this::pdfRenderer.isInitialized) {
|
||||||
pdfRenderer.close()
|
pdfRenderer.close()
|
||||||
|
}
|
||||||
super.onCleared()
|
super.onCleared()
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getPagesCount(): Int {
|
fun getPagesCount(): Int {
|
||||||
|
if (this::pdfRenderer.isInitialized) {
|
||||||
return pdfRenderer.pageCount
|
return pdfRenderer.pageCount
|
||||||
}
|
}
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
fun loadPdfPageInto(index: Int, view: ImageView) {
|
fun loadPdfPageInto(index: Int, view: ImageView) {
|
||||||
|
viewModelScope.launch {
|
||||||
|
withContext(Dispatchers.IO) {
|
||||||
try {
|
try {
|
||||||
operationInProgress.value = true
|
operationInProgress.postValue(true)
|
||||||
|
|
||||||
val page: PdfRenderer.Page = pdfRenderer.openPage(index)
|
val page: PdfRenderer.Page = pdfRenderer.openPage(index)
|
||||||
val width = if (coreContext.screenWidth <= coreContext.screenHeight) coreContext.screenWidth else coreContext.screenHeight
|
val width =
|
||||||
|
if (coreContext.screenWidth <= coreContext.screenHeight) coreContext.screenWidth else coreContext.screenHeight
|
||||||
val bm = Bitmap.createBitmap(
|
val bm = Bitmap.createBitmap(
|
||||||
width.toInt(),
|
width.toInt(),
|
||||||
(width / page.width * page.height).toInt(),
|
(width / page.width * page.height).toInt(),
|
||||||
|
@ -76,12 +99,16 @@ class PdfFileViewModel(content: Content) : FileViewerViewModel(content) {
|
||||||
page.render(bm, null, null, PdfRenderer.Page.RENDER_MODE_FOR_DISPLAY)
|
page.render(bm, null, null, PdfRenderer.Page.RENDER_MODE_FOR_DISPLAY)
|
||||||
page.close()
|
page.close()
|
||||||
|
|
||||||
|
withContext(Dispatchers.Main) {
|
||||||
view.setImageBitmap(bm)
|
view.setImageBitmap(bm)
|
||||||
|
}
|
||||||
|
|
||||||
operationInProgress.value = false
|
operationInProgress.postValue(false)
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
Log.e("[PDF Viewer] Exception: $e")
|
Log.e("[PDF Viewer] Exception: $e")
|
||||||
operationInProgress.value = false
|
operationInProgress.postValue(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,17 +47,10 @@ class TextFileViewModel(content: Content) : FileViewerViewModel(content) {
|
||||||
val text = MutableLiveData<String>()
|
val text = MutableLiveData<String>()
|
||||||
|
|
||||||
init {
|
init {
|
||||||
operationInProgress.value = false
|
|
||||||
|
|
||||||
openFile()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun openFile() {
|
|
||||||
operationInProgress.value = true
|
|
||||||
|
|
||||||
viewModelScope.launch {
|
viewModelScope.launch {
|
||||||
withContext(Dispatchers.IO) {
|
withContext(Dispatchers.IO) {
|
||||||
try {
|
try {
|
||||||
|
operationInProgress.postValue(true)
|
||||||
val br = BufferedReader(FileReader(filePath))
|
val br = BufferedReader(FileReader(filePath))
|
||||||
var line: String?
|
var line: String?
|
||||||
val textBuilder = StringBuilder()
|
val textBuilder = StringBuilder()
|
||||||
|
|
Loading…
Reference in a new issue