From 3433a7442fbb23e689a74f0b48b6103d09905e9b Mon Sep 17 00:00:00 2001
From: Hai Zhang <dreaming.in.code.zh@gmail.com>
Date: Mon, 18 Sep 2023 21:41:58 -0700
Subject: [PATCH] [Refactor] Minor refactoring.

---
 .../main/java/me/zhanghai/android/files/filejob/FileJobs.kt   | 4 ++--
 .../android/files/provider/archive/archiver/ArchiveReader.kt  | 3 +--
 2 files changed, 3 insertions(+), 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
index 8c0e2d0fe..91be7cc79 100644
--- 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
index 66bc4cdb7..841e0fc1f 100644
--- 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
                 }