Remove parameter 'uri' in ReaderViewModel::openPdfFile

src/main/java/com/kdanmobile/reader/ReaderActivity.kt

@@ -185,14 +185,12 @@ abstract class ReaderActivity : KdanBaseActivity(), ReaderSettingListener, PdfTh
             if (isShowPasswordActivity) return@also
             if (isOpened) return@also
 
-            val uri = viewModel.uri
-            if (Uri.EMPTY == uri) {
+            if (Uri.EMPTY == viewModel.uri) {
                 showFileCannotOpenDialog(getString(R.string.cannot_open_buffer))
                 onFilePathOrUriError(filePath)
             } else {
                 val result = viewModel.openPdfFile(
                         this@ReaderActivity,
-                        uri,
                         password,
                         Runnable { requestPassword() },
                         intent.type
@@ -1170,10 +1168,8 @@ abstract class ReaderActivity : KdanBaseActivity(), ReaderSettingListener, PdfTh
                     } else {
                         val isOpened = viewModel.isOpenedFileLiveData.value ?: return
                         if (isOpened) return
-                        val uri = viewModel.uri
                         val result = viewModel.openPdfFile(
                                 this@ReaderActivity,
-                                uri,
                                 password,
                                 Runnable { requestPassword(true) },
                                 intent.type

src/main/java/com/kdanmobile/reader/ReaderViewModel.kt

@@ -174,19 +174,19 @@ class ReaderViewModel(private val readerModelManager: ReaderModelManager, val ur
     }
 
     @JvmOverloads
-    fun openPdfFile(context: Context, uri: Uri, password: String, onRequestPassword: Runnable, type: String? = null): OpenFileResult {
+    fun openPdfFile(context: Context, password: String, onRequestPassword: Runnable, type: String? = null): OpenFileResult {
         if (!isVerified) {
             if (!verifyLicense(context)) {
                 return OpenFileResult.FAILED
             }
             isVerified = true
         }
-        return openPdfFileImp(context, uri, password, onRequestPassword, type).apply{
+        return openPdfFileImp(context, password, onRequestPassword, type).apply{
             isOpenedFileLiveData.postValue(this == OpenFileResult.SUCCESS)
         }
     }
 
-    private fun openPdfFileImp(context: Context, uri: Uri, password: String, requestPassword: Runnable, type: String?): OpenFileResult {
+    private fun openPdfFileImp(context: Context, password: String, requestPassword: Runnable, type: String?): OpenFileResult {
         file = File(uri.path)
         val factory = KMPDFFactory.open(context, uri, type) ?: return OpenFileResult.FAILED
         readerModel.initKMPDFFactory(factory, uri.path, password)