Browse Source

Remove ReaderViewModel::encrypt(String)

cooperku_kdanmobile 4 years ago
parent
commit
e056903107

+ 2 - 19
src/main/java/com/kdanmobile/reader/ReaderActivity.kt

@@ -93,7 +93,6 @@ abstract class ReaderActivity :
 
 
     companion object {
     companion object {
         const val KEY_FILE_ABSOLUTE = "file_absolutepath"
         const val KEY_FILE_ABSOLUTE = "file_absolutepath"
-        const val KEY_ENCRYPT_PASSWORD = "encryptPassword"
         const val KEY_IS_PASSWORD_ACTIVITY_SHOWING = "isShowPasswordActivity"
         const val KEY_IS_PASSWORD_ACTIVITY_SHOWING = "isShowPasswordActivity"
         const val REQUEST_PASSWORD = 222
         const val REQUEST_PASSWORD = 222
     }
     }
@@ -183,14 +182,7 @@ abstract class ReaderActivity :
         setSupportActionBar(toolbar_readerActivity)
         setSupportActionBar(toolbar_readerActivity)
         isShowPasswordActivity = savedInstanceState?.getBoolean(KEY_IS_PASSWORD_ACTIVITY_SHOWING) ?: false
         isShowPasswordActivity = savedInstanceState?.getBoolean(KEY_IS_PASSWORD_ACTIVITY_SHOWING) ?: false
         // Get file path to determine the opening file is pdf or not
         // Get file path to determine the opening file is pdf or not
-        var encryptPassword: String? = null
-        intent.apply {
-            filePath = getStringExtra(KEY_FILE_ABSOLUTE)
-
-            encryptPassword = getStringExtra(KEY_ENCRYPT_PASSWORD)?.also {
-                putExtra(KEY_ENCRYPT_PASSWORD, null as String?)
-            }
-        }
+        filePath = intent.getStringExtra(KEY_FILE_ABSOLUTE)
 
 
         val displayMetrics = DisplayMetrics()
         val displayMetrics = DisplayMetrics()
         windowManager.defaultDisplay.getMetrics(displayMetrics)
         windowManager.defaultDisplay.getMetrics(displayMetrics)
@@ -223,11 +215,10 @@ abstract class ReaderActivity :
             } else {
             } else {
                 val result = viewModel.openPdfFile(
                 val result = viewModel.openPdfFile(
                         this@ReaderActivity,
                         this@ReaderActivity,
-                        encryptPassword ?: password,
+                        password,
                         Runnable { requestPassword() },
                         Runnable { requestPassword() },
                         intent.type
                         intent.type
                 )
                 )
-                encryptPassword = null
                 if (result == ReaderViewModel.OpenFileResult.FAILED) {
                 if (result == ReaderViewModel.OpenFileResult.FAILED) {
                     showFileCannotOpenDialog(getString(R.string.cannot_open_file_Path, filePath))
                     showFileCannotOpenDialog(getString(R.string.cannot_open_file_Path, filePath))
                 }
                 }
@@ -756,14 +747,6 @@ abstract class ReaderActivity :
         }
         }
     }
     }
 
 
-    fun encryptPdf(password: String): Boolean {
-        return viewModel.encrypt(password)
-    }
-
-    fun decryptPdf(): Boolean {
-        return viewModel.encrypt("")
-    }
-
     private fun onClickBookmark() {
     private fun onClickBookmark() {
         onEvent(HookEvent.OnClickTopBookmarkBtn())
         onEvent(HookEvent.OnClickTopBookmarkBtn())
         viewModel.isPageInBookmarksLiveData.value?.let {
         viewModel.isPageInBookmarksLiveData.value?.let {

+ 0 - 6
src/main/java/com/kdanmobile/reader/ReaderViewModel.kt

@@ -253,12 +253,6 @@ class ReaderViewModel(
         return OpenFileResult.FAILED
         return OpenFileResult.FAILED
     }
     }
 
 
-    fun encrypt(password: String): Boolean {
-        val isSuccess = kmpdfDocumentController?.addPasswordForDocument(password) ?: false
-        kmpdfDocumentController?.save()
-        return isSuccess
-    }
-
     override fun onCleared() {
     override fun onCleared() {
         readerModelManager.release(uri)
         readerModelManager.release(uri)
         super.onCleared()
         super.onCleared()