|
@@ -76,6 +76,7 @@ abstract class ReaderActivity : KdanBaseActivity(), ReaderSettingListener, PdfTh
|
|
|
|
|
|
companion object {
|
|
companion object {
|
|
const val KEY_FILE_ABSOLUTE = "file_absolutepath"
|
|
const val KEY_FILE_ABSOLUTE = "file_absolutepath"
|
|
|
|
+ const val KEY_IS_PASSWORD_ACTIVITY_SHOWING = "isShowPasswordActivity"
|
|
const val REQUEST_PASSWORD = 222
|
|
const val REQUEST_PASSWORD = 222
|
|
}
|
|
}
|
|
|
|
|
|
@@ -148,7 +149,7 @@ abstract class ReaderActivity : KdanBaseActivity(), ReaderSettingListener, PdfTh
|
|
window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN)
|
|
window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN)
|
|
setContentView(R.layout.activity_reader)
|
|
setContentView(R.layout.activity_reader)
|
|
setSupportActionBar(toolbar_readerActivity)
|
|
setSupportActionBar(toolbar_readerActivity)
|
|
- isShowPasswordActivity = savedInstanceState?.getBoolean("isShowPasswordActivity") ?: false
|
|
|
|
|
|
+ isShowPasswordActivity = savedInstanceState?.getBoolean(KEY_IS_PASSWORD_ACTIVITY_SHOWING) ?: false
|
|
filePath = intent.getStringExtra(KEY_FILE_ABSOLUTE)
|
|
filePath = intent.getStringExtra(KEY_FILE_ABSOLUTE)
|
|
|
|
|
|
val displayMetrics = DisplayMetrics()
|
|
val displayMetrics = DisplayMetrics()
|
|
@@ -232,14 +233,14 @@ abstract class ReaderActivity : KdanBaseActivity(), ReaderSettingListener, PdfTh
|
|
|
|
|
|
override fun onSaveInstanceState(outState: Bundle?) {
|
|
override fun onSaveInstanceState(outState: Bundle?) {
|
|
super.onSaveInstanceState(outState)
|
|
super.onSaveInstanceState(outState)
|
|
- outState?.putBoolean("isShowPasswordActivity", isShowPasswordActivity)
|
|
|
|
|
|
+ outState?.putBoolean(KEY_IS_PASSWORD_ACTIVITY_SHOWING, isShowPasswordActivity)
|
|
}
|
|
}
|
|
|
|
|
|
private fun requestPassword(isIncorrectPassword: Boolean = false) {
|
|
private fun requestPassword(isIncorrectPassword: Boolean = false) {
|
|
isShowPasswordActivity = true
|
|
isShowPasswordActivity = true
|
|
val intent = Intent(baseContext, DialogPasswordActivity::class.java)
|
|
val intent = Intent(baseContext, DialogPasswordActivity::class.java)
|
|
val bundle = Bundle()
|
|
val bundle = Bundle()
|
|
- bundle.putBoolean("isIncorrectPassword", isIncorrectPassword)
|
|
|
|
|
|
+ bundle.putBoolean(DialogPasswordActivity.KEY_IS_INCORRECT_PASSWORD, isIncorrectPassword)
|
|
intent.putExtras(bundle)
|
|
intent.putExtras(bundle)
|
|
startActivityForResult(intent, REQUEST_PASSWORD)
|
|
startActivityForResult(intent, REQUEST_PASSWORD)
|
|
}
|
|
}
|
|
@@ -1163,7 +1164,7 @@ abstract class ReaderActivity : KdanBaseActivity(), ReaderSettingListener, PdfTh
|
|
if (resultCode == Activity.RESULT_OK){
|
|
if (resultCode == Activity.RESULT_OK){
|
|
when (requestCode) {
|
|
when (requestCode) {
|
|
REQUEST_PASSWORD -> {
|
|
REQUEST_PASSWORD -> {
|
|
- val password = data?.getStringExtra("password") ?: ""
|
|
|
|
|
|
+ val password = data?.getStringExtra(DialogPasswordActivity.KEY_USER_INPUT_PASSWORD) ?: ""
|
|
if (password.isEmpty()) {
|
|
if (password.isEmpty()) {
|
|
finish()
|
|
finish()
|
|
} else {
|
|
} else {
|