Skip to content

Commit a706e26

Browse files
author
Andrii Chubko
committed
Clean code
1 parent b11e60a commit a706e26

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

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

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,13 @@ class ReadTextActivity : SimpleActivity() {
8787
super.onActivityResult(requestCode, resultCode, resultData)
8888
if (requestCode == SELECT_SAVE_FILE_INTENT && resultCode == Activity.RESULT_OK && resultData != null && resultData.data != null) {
8989
val outputStream = contentResolver.openOutputStream(resultData.data!!)
90-
saveTextContent(outputStream, shouldExitAfterSaving = requestCode == SELECT_SAVE_FILE_AND_EXIT_INTENT,
91-
shouldOverwriteOriginalText = getRealPathFromURI(intent.data!!) == filePath)
90+
91+
val shouldExitAfterSaving = requestCode == SELECT_SAVE_FILE_AND_EXIT_INTENT
92+
93+
val selectedFilePath = getRealPathFromURI(intent.data!!)
94+
val shouldOverwriteOriginalText = selectedFilePath == filePath
95+
96+
saveTextContent(outputStream, shouldExitAfterSaving, shouldOverwriteOriginalText)
9297
}
9398
}
9499

@@ -133,7 +138,7 @@ class ReadTextActivity : SimpleActivity() {
133138
}
134139

135140
if (filePath.isEmpty()) {
136-
SaveAsDialog(this, filePath, true) { path, filename ->
141+
SaveAsDialog(this, filePath, true) { _, filename ->
137142
Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
138143
type = "text/plain"
139144
putExtra(Intent.EXTRA_TITLE, filename)
@@ -148,12 +153,13 @@ class ReadTextActivity : SimpleActivity() {
148153
}
149154
}
150155
} else {
151-
SaveAsDialog(this, filePath, false) { path, filename ->
152-
handlePermission(PERMISSION_WRITE_STORAGE) {
153-
if (it) {
156+
SaveAsDialog(this, filePath, false) { path, _ ->
157+
handlePermission(PERMISSION_WRITE_STORAGE) { isPermissionGranted ->
158+
if (isPermissionGranted) {
154159
val file = File(path)
155160
getFileOutputStream(file.toFileDirItem(this), true) {
156-
saveTextContent(it, shouldExitAfterSaving, shouldOverwriteOriginalText = path == filePath)
161+
val shouldOverwriteOriginalText = path == filePath
162+
saveTextContent(it, shouldExitAfterSaving, shouldOverwriteOriginalText)
157163
}
158164
}
159165
}

0 commit comments

Comments
 (0)