Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed ANR when opening a PDF inside linphone (VFS enabled for example)

Browse source
This commit is contained in:
Sylvain Berfini 2023-06-28 17:32:18 +02:00
parent 7335360c26
commit 6765505ff0
3 changed files with 56 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/org/linphone/activities/main/files/fragments/PdfViewerFragment.kt
View file

@ -54,7 +54,11 @@ class PdfViewerFragment : GenericViewerFragment<FilePdfViewerFragmentBinding>()
)[PdfFileViewModel::class.java] )[PdfFileViewModel::class.java]
binding.viewModel = viewModel binding.viewModel = viewModel
adapter = PdfPagesListAdapter(viewModel) viewModel.rendererReady.observe(viewLifecycleOwner) {
binding.pdfViewPager.adapter = adapter it.consume {
adapter = PdfPagesListAdapter(viewModel)
binding.pdfViewPager.adapter = adapter
}
}
} }
} }

71
app/src/main/java/org/linphone/activities/main/files/viewmodels/PdfFileViewModel.kt
View file

@ -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,45 +48,67 @@ 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 {
pdfRenderer = PdfRenderer(input) withContext(Dispatchers.IO) {
Log.i("[PDF Viewer] ${pdfRenderer.pageCount} pages in file $filePath") val input = ParcelFileDescriptor.open(
File(filePath),
ParcelFileDescriptor.MODE_READ_ONLY
)
pdfRenderer = PdfRenderer(input)
Log.i("[PDF Viewer] ${pdfRenderer.pageCount} pages in file $filePath")
rendererReady.postValue(Event(true))
}
}
} }
override fun onCleared() { override fun onCleared() {
pdfRenderer.close() if (this::pdfRenderer.isInitialized) {
pdfRenderer.close()
}
super.onCleared() super.onCleared()
} }
fun getPagesCount(): Int { fun getPagesCount(): Int {
return pdfRenderer.pageCount if (this::pdfRenderer.isInitialized) {
return pdfRenderer.pageCount
}
return 0
} }
fun loadPdfPageInto(index: Int, view: ImageView) { fun loadPdfPageInto(index: Int, view: ImageView) {
try { viewModelScope.launch {
operationInProgress.value = true withContext(Dispatchers.IO) {
try {
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 =
val bm = Bitmap.createBitmap( if (coreContext.screenWidth <= coreContext.screenHeight) coreContext.screenWidth else coreContext.screenHeight
width.toInt(), val bm = Bitmap.createBitmap(
(width / page.width * page.height).toInt(), width.toInt(),
Bitmap.Config.ARGB_8888 (width / page.width * page.height).toInt(),
) Bitmap.Config.ARGB_8888
page.render(bm, null, null, PdfRenderer.Page.RENDER_MODE_FOR_DISPLAY) )
page.close() page.render(bm, null, null, PdfRenderer.Page.RENDER_MODE_FOR_DISPLAY)
page.close()
view.setImageBitmap(bm) withContext(Dispatchers.Main) {
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)
}
}
} }
} }
} }

9
app/src/main/java/org/linphone/activities/main/files/viewmodels/TextFileViewModel.kt
View file

@ -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()