From 66d0f54ec986c5426314d3ac6eb338f7e7a374fc Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Mon, 15 May 2023 13:55:40 +0530 Subject: [PATCH] Drop dependency upon apache's commons-io library Signed-off-by: Aayush Gupta --- app/build.gradle | 1 - .../store/data/installer/SessionInstaller.kt | 20 ++++++------------- .../store/data/service/UpdateService.kt | 4 ++-- .../java/com/aurora/store/util/ApkCopier.kt | 5 ++--- .../view/ui/details/AppDetailsActivity.kt | 7 ++++--- .../store/view/ui/updates/UpdatesFragment.kt | 4 ++-- 6 files changed, 16 insertions(+), 25 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5e8150dd9..78b969fe8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -128,7 +128,6 @@ dependencies { implementation "com.google.protobuf:protobuf-javalite:3.22.3" //Apache's Goodies - implementation "commons-io:commons-io:2.11.0" implementation "org.apache.commons:commons-text:1.10.0" //Google's Goodies diff --git a/app/src/main/java/com/aurora/store/data/installer/SessionInstaller.kt b/app/src/main/java/com/aurora/store/data/installer/SessionInstaller.kt index 3163a78d9..b8cc9513e 100644 --- a/app/src/main/java/com/aurora/store/data/installer/SessionInstaller.kt +++ b/app/src/main/java/com/aurora/store/data/installer/SessionInstaller.kt @@ -34,7 +34,6 @@ import com.aurora.extensions.isSAndAbove import com.aurora.extensions.isTAndAbove import com.aurora.store.BuildConfig import com.aurora.store.util.Log -import org.apache.commons.io.IOUtils import java.io.File class SessionInstaller(context: Context) : InstallerBase(context) { @@ -81,19 +80,12 @@ class SessionInstaller(context: Context) : InstallerBase(context) { Log.i("Writing splits to session for $packageName") for (uri in uriList) { - val inputStream = context.contentResolver.openInputStream(uri) - val outputStream = session.openWrite( - "${packageName}_${System.currentTimeMillis()}", - 0, - -1 - ) - - IOUtils.copy(inputStream, outputStream) - - session.fsync(outputStream) - - IOUtils.close(inputStream) - IOUtils.close(outputStream) + context.contentResolver.openInputStream(uri)?.use { input -> + session.openWrite("${packageName}_${System.currentTimeMillis()}", 0, -1).use { + input.copyTo(it) + session.fsync(it) + } + } } val callBackIntent = Intent(context, InstallerService::class.java) diff --git a/app/src/main/java/com/aurora/store/data/service/UpdateService.kt b/app/src/main/java/com/aurora/store/data/service/UpdateService.kt index 27dcb8c26..6b316b4b3 100644 --- a/app/src/main/java/com/aurora/store/data/service/UpdateService.kt +++ b/app/src/main/java/com/aurora/store/data/service/UpdateService.kt @@ -31,10 +31,10 @@ import com.tonyodev.fetch2core.Reason import nl.komponents.kovenant.task import nl.komponents.kovenant.ui.failUi import nl.komponents.kovenant.ui.successUi -import org.apache.commons.io.FileUtils import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode +import java.io.File import java.util.* import java.util.concurrent.locks.ReentrantLock import kotlin.concurrent.timerTask @@ -565,7 +565,7 @@ class UpdateService: LifecycleService() { var filesExist = true downloads.forEach { download -> - filesExist = filesExist && FileUtils.getFile(download.file).exists() + filesExist = filesExist && File(download.file).exists() } if (filesExist) { diff --git a/app/src/main/java/com/aurora/store/util/ApkCopier.kt b/app/src/main/java/com/aurora/store/util/ApkCopier.kt index 444d0cbb3..87d0e1675 100644 --- a/app/src/main/java/com/aurora/store/util/ApkCopier.kt +++ b/app/src/main/java/com/aurora/store/util/ApkCopier.kt @@ -26,7 +26,6 @@ import android.os.Build import androidx.annotation.RequiresApi import com.aurora.extensions.isLAndAbove import com.aurora.store.util.PackageUtil.getPackageInfo -import org.apache.commons.io.IOUtils import java.io.File import java.io.FileOutputStream import java.util.* @@ -92,10 +91,10 @@ class ApkCopier(private val context: Context, private val packageName: String) { val zipOutputStream = ZipOutputStream(fileOutputStream) for (file in fileList) { - file?.let { + file?.inputStream()?.use { val zipEntry = ZipEntry(file.name) zipOutputStream.putNextEntry(zipEntry) - IOUtils.copy(it.inputStream(), zipOutputStream) + it.copyTo(zipOutputStream) zipOutputStream.closeEntry() } } diff --git a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsActivity.kt b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsActivity.kt index eee9b8584..ea41fe86e 100644 --- a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsActivity.kt +++ b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsActivity.kt @@ -66,10 +66,10 @@ import com.tonyodev.fetch2core.DownloadBlock import nl.komponents.kovenant.task import nl.komponents.kovenant.ui.failUi import nl.komponents.kovenant.ui.successUi -import org.apache.commons.io.FileUtils import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode +import java.io.File class AppDetailsActivity : BaseDetailsActivity() { @@ -323,7 +323,7 @@ class AppDetailsActivity : BaseDetailsActivity() { var filesExist = true files.forEach { download -> - filesExist = filesExist && FileUtils.getFile(download.file).exists() + filesExist = filesExist && File(download.file).exists() } if (filesExist) @@ -683,7 +683,8 @@ class AppDetailsActivity : BaseDetailsActivity() { if (groupId == app.getGroupId(this@AppDetailsActivity)) { status = download.status flip(1) - FileUtils.touch(inProgressMarker) + inProgressMarker.parentFile?.mkdirs() + inProgressMarker.createNewFile() } } diff --git a/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt b/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt index b00c3abfd..1a43bfe20 100644 --- a/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt @@ -50,7 +50,7 @@ import com.tonyodev.fetch2.AbstractFetchGroupListener import com.tonyodev.fetch2.Download import com.tonyodev.fetch2.FetchGroup import nl.komponents.kovenant.task -import org.apache.commons.io.FileUtils +import java.io.File class UpdatesFragment : BaseFragment() { @@ -302,7 +302,7 @@ class UpdatesFragment : BaseFragment() { var filesExist = true downloads.forEach { download -> - filesExist = filesExist && FileUtils.getFile(download.file).exists() + filesExist = filesExist && File(download.file).exists() } if (filesExist) {