|
@@ -131,7 +131,7 @@ class AddInviteDataActivity : BaseActivity<ActivityAddInviteDataBinding>() {
|
|
if (selectedImageUri != null) {
|
|
if (selectedImageUri != null) {
|
|
|
|
|
|
fileListItem.add(FileListItem().apply {
|
|
fileListItem.add(FileListItem().apply {
|
|
- fileName = File(uri2Path(selectedImageUri)).name
|
|
|
|
|
|
+ fileName = File(getFileName(selectedImageUri)).name
|
|
|
|
|
|
if (fileName.isBlank()) {
|
|
if (fileName.isBlank()) {
|
|
showMessage(resources.getString(R.string.file_select_error_hint))
|
|
showMessage(resources.getString(R.string.file_select_error_hint))
|
|
@@ -877,18 +877,18 @@ class AddInviteDataActivity : BaseActivity<ActivityAddInviteDataBinding>() {
|
|
})
|
|
})
|
|
}
|
|
}
|
|
|
|
|
|
- private fun uri2Path(uri: Uri): String {
|
|
|
|
- var filePath = ""
|
|
|
|
|
|
+ private fun getFileName(uri: Uri): String {
|
|
|
|
+ var fileName = ""
|
|
val projection = arrayOf(OpenableColumns.DISPLAY_NAME)
|
|
val projection = arrayOf(OpenableColumns.DISPLAY_NAME)
|
|
contentResolver.query(uri, projection, null, null, null)?.use { cursor ->
|
|
contentResolver.query(uri, projection, null, null, null)?.use { cursor ->
|
|
if (cursor.moveToFirst()) {
|
|
if (cursor.moveToFirst()) {
|
|
val columnIndex =
|
|
val columnIndex =
|
|
cursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME)
|
|
cursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME)
|
|
- filePath = cursor.getString(columnIndex)
|
|
|
|
|
|
+ fileName = cursor.getString(columnIndex)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- return filePath
|
|
|
|
|
|
+ return fileName
|
|
}
|
|
}
|
|
|
|
|
|
private fun openFileManager() {
|
|
private fun openFileManager() {
|