Skip to content

Commit 308755c

Browse files
committed
make sure the file exists before trying to read it at the read activity
1 parent 90a0d6a commit 308755c

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

app/src/main/kotlin/com/simplemobiletools/filemanager/activities/ReadTextActivity.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,13 @@ class ReadTextActivity : SimpleActivity() {
8080

8181
val text = if (uri.scheme == "file") {
8282
filePath = uri.path
83-
File(uri.path).readText()
83+
val file = File(filePath)
84+
if (file.exists()) {
85+
file.readText()
86+
} else {
87+
toast(R.string.unknown_error_occurred)
88+
""
89+
}
8490
} else {
8591
try {
8692
contentResolver.openInputStream(uri).bufferedReader().use { it.readText() }

app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
9595

9696
override fun getSelectableItemCount() = fileDirItems.size
9797

98-
override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int) = createViewHolder(R.layout.list_item, parent)
98+
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = createViewHolder(R.layout.list_item, parent)
9999

100100
override fun onBindViewHolder(holder: MyRecyclerViewAdapter.ViewHolder, position: Int) {
101101
val fileDirItem = fileDirItems[position]
@@ -461,10 +461,10 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
461461
}
462462
}
463463

464-
override fun onViewRecycled(holder: ViewHolder?) {
464+
override fun onViewRecycled(holder: ViewHolder) {
465465
super.onViewRecycled(holder)
466466
if (!activity.isActivityDestroyed()) {
467-
Glide.with(activity).clear(holder?.itemView?.item_icon!!)
467+
Glide.with(activity).clear(holder.itemView?.item_icon!!)
468468
}
469469
}
470470

app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ManageFavoritesAdapter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class ManageFavoritesAdapter(activity: BaseSimpleActivity, var favorites: ArrayL
3434

3535
override fun getSelectableItemCount() = favorites.size
3636

37-
override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int) = createViewHolder(R.layout.item_manage_favorite, parent)
37+
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = createViewHolder(R.layout.item_manage_favorite, parent)
3838

3939
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
4040
val favorite = favorites[position]

0 commit comments

Comments
 (0)