[Refactor] Minor refactoring.

zhanghai · Sep 19, 2023 · 3433a74 · 3433a74
1 parent 1c156ff
commit 3433a74
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/app/src/main/java/me/zhanghai/android/files/filejob/FileJobs.kt b/app/src/main/java/me/zhanghai/android/files/filejob/FileJobs.kt
@@ -478,7 +478,7 @@ private fun FileJob.showActionDialog(
     neutralButtonText: CharSequence?
 ): ActionResult =
     try {
-        runBlocking<ActionResult> {
+        runBlocking {
             suspendCoroutine { continuation ->
                 BackgroundActivityStarter.startActivity(
                     FileJobActionDialogActivity::class.createIntent().putArgs(
@@ -521,7 +521,7 @@ private fun FileJob.showConflictDialog(
     type: CopyMoveType
 ): ConflictResult =
     try {
-        runBlocking<ConflictResult> {
+        runBlocking {
             suspendCoroutine { continuation ->
                 BackgroundActivityStarter.startActivity(
                     FileJobConflictDialogActivity::class.createIntent().putArgs(

diff --git a/app/src/main/java/me/zhanghai/android/files/provider/archive/archiver/ArchiveReader.kt b/app/src/main/java/me/zhanghai/android/files/provider/archive/archiver/ArchiveReader.kt
@@ -112,9 +112,8 @@ object ArchiveReader {
         val (archive, closeable) = openArchive(file)
         var successful = false
         return try {
-            var currentEntry: ReadArchive.Entry? = null
             while (true) {
-                currentEntry = archive.readEntry(charset) ?: break
+                val currentEntry = archive.readEntry(charset) ?: break
                 if (currentEntry.name != entry.name) {
                     continue
                 }