|
|
@ -119,8 +119,11 @@ class ImportBookActivity : VMBaseActivity<ImportBookViewModel>(R.layout.activity |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private fun upRootDoc() { |
|
|
|
private fun upRootDoc() { |
|
|
|
AppConfig.importBookPath?.let { lastPath -> |
|
|
|
val lastPath = AppConfig.importBookPath |
|
|
|
when { |
|
|
|
when { |
|
|
|
|
|
|
|
lastPath.isNullOrEmpty() -> { |
|
|
|
|
|
|
|
FilePicker.selectFolder(this, requestCodeSelectFolder) |
|
|
|
|
|
|
|
} |
|
|
|
lastPath.isContentPath() -> { |
|
|
|
lastPath.isContentPath() -> { |
|
|
|
val rootUri = Uri.parse(lastPath) |
|
|
|
val rootUri = Uri.parse(lastPath) |
|
|
|
rootDoc = DocumentFile.fromTreeUri(this, rootUri) |
|
|
|
rootDoc = DocumentFile.fromTreeUri(this, rootUri) |
|
|
@ -130,8 +133,7 @@ class ImportBookActivity : VMBaseActivity<ImportBookViewModel>(R.layout.activity |
|
|
|
Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q -> { |
|
|
|
Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q -> { |
|
|
|
FilePicker.selectFolder(this, requestCodeSelectFolder) |
|
|
|
FilePicker.selectFolder(this, requestCodeSelectFolder) |
|
|
|
} |
|
|
|
} |
|
|
|
lastPath.isNotBlank() -> { |
|
|
|
else -> PermissionsCompat.Builder(this) |
|
|
|
PermissionsCompat.Builder(this) |
|
|
|
|
|
|
|
.addPermissions(*Permissions.Group.STORAGE) |
|
|
|
.addPermissions(*Permissions.Group.STORAGE) |
|
|
|
.rationale(R.string.tip_perm_request_storage) |
|
|
|
.rationale(R.string.tip_perm_request_storage) |
|
|
|
.onGranted { |
|
|
|
.onGranted { |
|
|
@ -142,9 +144,6 @@ class ImportBookActivity : VMBaseActivity<ImportBookViewModel>(R.layout.activity |
|
|
|
} |
|
|
|
} |
|
|
|
.request() |
|
|
|
.request() |
|
|
|
} |
|
|
|
} |
|
|
|
else -> FilePicker.selectFolder(this, requestCodeSelectFolder) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@SuppressLint("SetTextI18n") |
|
|
|
@SuppressLint("SetTextI18n") |
|
|
|