소스 검색

Remove keyword 'lateinit' of readerModel in ReaderViewModel

cooperku_kdanmobile 5 년 전
부모
커밋
a6b5357215
1개의 변경된 파일7개의 추가작업 그리고 11개의 파일을 삭제
  1. 7 11
      src/main/java/com/kdanmobile/reader/ReaderViewModel.kt

+ 7 - 11
src/main/java/com/kdanmobile/reader/ReaderViewModel.kt

@@ -127,7 +127,7 @@ class ReaderViewModel(private val readerModelManager: ReaderModelManager, val ur
     var inkAttributeLiveData = MutableLiveData<InkAttribute>().apply { value = DEFAULT_INK_ATTR }
 
     private var isVerified = false
-    lateinit var readerModel: ReaderModel
+    val readerModel: ReaderModel = readerModelManager.get(uri)
     private val kmpdfFactory: KMPDFFactory?
         get() = readerModel.kmpdfFactory
     private val kmpdfDocumentController: KMPDFDocumentController?
@@ -167,16 +167,12 @@ class ReaderViewModel(private val readerModelManager: ReaderModelManager, val ur
     }
 
     val password: String
-        get() = readerModel.password ?: ""
+        get() = readerModel.password
 
     enum class OpenFileResult {
         SUCCESS, FAILED, PASSWORD_PROTECTED
     }
 
-    init {
-        readerModel = readerModelManager.get(uri)
-    }
-
     @JvmOverloads
     fun openPdfFile(context: Context, uri: Uri, password: String, onRequestPassword: Runnable, type: String? = null): OpenFileResult {
         if (!isVerified) {
@@ -709,13 +705,13 @@ class ReaderViewModel(private val readerModelManager: ReaderModelManager, val ur
         kmpdfFactory?.setAnnotationEditMode(kmpdfShapeAnnotationBean.type)
     }
 
-    val pdfInfoHandler: PdfInfoHandler by lazy { readerModel.pdfInfoHandler }
+    val pdfInfoHandler: PdfInfoHandler = readerModel.pdfInfoHandler
 
-    val thumbnailHandler: ThumbnailHandler by lazy { readerModel.thumbnailHandler }
+    val thumbnailHandler: ThumbnailHandler = readerModel.thumbnailHandler
 
-    val bookmarkHandler: BookmarkHandler by lazy { readerModel.bookmarkHandler }
+    val bookmarkHandler: BookmarkHandler = readerModel.bookmarkHandler
 
-    val outlineHandler: OutlineHandler by lazy { readerModel.outlineHandler }
+    val outlineHandler: OutlineHandler = readerModel.outlineHandler
 
-    val searchHandler: SearchHandler by lazy { readerModel.searchHandler }
+    val searchHandler: SearchHandler = readerModel.searchHandler
 }