refactor: cleanup

Author: Lennoard

app/build.gradle.kts

@@ -111,6 +111,7 @@ kapt {
 dependencies {
     implementation(project(":domain"))
     implementation(project(":data"))
+    implementation(project(":common:utils"))
 
     implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
     implementation(kotlin("stdlib-jdk8", KotlinCompilerVersion.VERSION))
@@ -127,8 +128,8 @@ dependencies {
     implementation("androidx.navigation:navigation-ui-ktx:2.4.0")
     implementation("androidx.preference:preference-ktx:1.2.0")
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
-    implementation("androidx.room:room-ktx:2.3.0")
-    implementation("androidx.room:room-runtime:2.3.0")
+    implementation("androidx.room:room-ktx:2.4.0")
+    implementation("androidx.room:room-runtime:2.4.0")
 
     implementation("com.google.android.material:material:1.6.0-alpha02")
     implementation("com.google.code.gson:gson:2.8.6")
@@ -137,5 +138,5 @@ dependencies {
     implementation("com.github.topjohnwu.libsu:core:2.5.1")
     implementation("com.github.hadilq:live-event:1.3.0")
 
-    kapt("androidx.room:room-compiler:2.3.0")
+    kapt("androidx.room:room-compiler:2.4.0")
 }

app/proguard-rules.pro

@@ -37,4 +37,4 @@
 # Application classes that will be serialized/deserialized over Gson
 -keep class com.androidvip.sysctlgui.data.models.KernelParam { *; }
 -keep class com.androidvip.sysctlgui.data.models.RoomKernelParam { *; }
--keep class com.androidvip.sysctlgui.domain.models.param.DomainKernelParam { *; }
+-keep class com.androidvip.sysctlgui.domain.models.DomainKernelParam { *; }

app/src/main/kotlin/com/androidvip/sysctlgui/data/mapper/DomainParamMapper.kt

@@ -1,7 +1,7 @@
 package com.androidvip.sysctlgui.data.mapper
 
 import com.androidvip.sysctlgui.data.models.KernelParam
-import com.androidvip.sysctlgui.domain.models.param.DomainKernelParam
+import com.androidvip.sysctlgui.domain.models.DomainKernelParam
 
 object DomainParamMapper : Mapper<DomainKernelParam, KernelParam> {
     override fun map(from: DomainKernelParam): KernelParam = KernelParam().apply {

app/src/main/kotlin/com/androidvip/sysctlgui/data/models/KernelParam.kt

@@ -1,8 +1,8 @@
 package com.androidvip.sysctlgui.data.models
 
 import android.os.Parcelable
-import com.androidvip.sysctlgui.domain.Consts
-import com.androidvip.sysctlgui.domain.models.param.DomainKernelParam
+import com.androidvip.sysctlgui.utils.Consts
+import com.androidvip.sysctlgui.domain.models.DomainKernelParam
 import kotlinx.parcelize.Parcelize
 
 @Parcelize

app/src/main/kotlin/com/androidvip/sysctlgui/receivers/TaskerReceiver.kt

@@ -5,7 +5,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.util.Log
-import com.androidvip.sysctlgui.domain.Consts
+import com.androidvip.sysctlgui.utils.Consts
 import com.androidvip.sysctlgui.isValidTaskerBundle
 import com.androidvip.sysctlgui.services.TaskerService
 import kotlin.contracts.ExperimentalContracts

app/src/main/kotlin/com/androidvip/sysctlgui/services/TaskerService.kt

@@ -5,7 +5,7 @@ import android.content.Intent
 import android.os.IBinder
 import android.widget.Toast
 import com.androidvip.sysctlgui.R
-import com.androidvip.sysctlgui.domain.Consts
+import com.androidvip.sysctlgui.utils.Consts
 import com.androidvip.sysctlgui.domain.repository.AppPrefs
 import com.androidvip.sysctlgui.domain.usecase.ApplyParamsUseCase
 import com.androidvip.sysctlgui.domain.usecase.GetUserParamsUseCase
@@ -56,7 +56,7 @@ class TaskerService : Service(), CoroutineScope {
     }
 
     private suspend fun applyParams(listNumber: Int) {
-        val params = getUserParamsUseCase().getOrNull().orEmpty()
+        val params = getUserParamsUseCase()
         when (listNumber) {
             Consts.LIST_NUMBER_PRIMARY_TASKER,
             Consts.LIST_NUMBER_SECONDARY_TASKER -> params.filter { it.taskerParam }
@@ -65,7 +65,7 @@ class TaskerService : Service(), CoroutineScope {
 
             else -> emptyList()
         }.forEach {
-            applyParamsUseCase.execute(it)
+            applyParamsUseCase(it)
         }
     }
 }

app/src/main/kotlin/com/androidvip/sysctlgui/services/base/BaseStartUpService.kt

@@ -128,8 +128,8 @@ class BaseStartUpService(
     }
 
     private suspend fun applyConfig() {
-        getUserParamsUseCase().getOrNull().orEmpty().forEach {
-            applyParamsUseCase.execute(it)
+        getUserParamsUseCase().forEach {
+            applyParamsUseCase(it)
         }
     }
 

app/src/main/kotlin/com/androidvip/sysctlgui/ui/StartActivity.kt

@@ -78,7 +78,7 @@ class StartActivity : AppCompatActivity() {
         if (!prefs.migrationCompleted) {
             binding.splashStatusText.setText(R.string.splash_status_performing_migration)
 
-            val result = performDatabaseMigrationUseCase.execute()
+            val result = runCatching { performDatabaseMigrationUseCase() }
             prefs.migrationCompleted = result.isSuccess
         }
     }
@@ -105,7 +105,8 @@ class StartActivity : AppCompatActivity() {
                     putExtra(
                         RemovableParamAdapter.EXTRA_EDIT_SAVED_PARAM,
                         intent.getBooleanExtra(
-                            RemovableParamAdapter.EXTRA_EDIT_SAVED_PARAM, false
+                            RemovableParamAdapter.EXTRA_EDIT_SAVED_PARAM,
+                            false
                         )
                     )
                 }

app/src/main/kotlin/com/androidvip/sysctlgui/ui/export/ExportOptionsViewModel.kt

@@ -13,7 +13,7 @@ import com.androidvip.sysctlgui.domain.exceptions.InvalidFileExtensionException
 import com.androidvip.sysctlgui.domain.exceptions.MalformedLineException
 import com.androidvip.sysctlgui.domain.exceptions.NoParameterFoundException
 import com.androidvip.sysctlgui.domain.exceptions.NoValidParamException
-import com.androidvip.sysctlgui.domain.models.ViewState
+import com.androidvip.sysctlgui.utils.ViewState
 import com.androidvip.sysctlgui.domain.usecase.BackupParamsUseCase
 import com.androidvip.sysctlgui.domain.usecase.ExportParamsUseCase
 import com.androidvip.sysctlgui.domain.usecase.ImportParamsUseCase
@@ -79,7 +79,7 @@ class ExportOptionsViewModel(
         val postError: (Int) -> Unit = {
             _viewEffect.postValue(ExportOptionsViewEffect.ShowImportError(it))
         }
-        val result = importParamsUseCase.execute(stream, fileExtension)
+        val result = runCatching { importParamsUseCase(stream, fileExtension) }
         when (result.exceptionOrNull()) {
             is JsonParseException,
             is JsonSyntaxException -> postError(R.string.import_error_invalid_json)
@@ -137,20 +137,24 @@ class ExportOptionsViewModel(
         target: Uri,
         context: Context
     ): Result<Unit> = withContext(ioDispatcher) {
-        val descriptor = context.contentResolver.openFileDescriptor(target, "w")
-            ?: return@withContext Result.failure(IOException())
+        return@withContext runCatching {
+            val descriptor = context.contentResolver.openFileDescriptor(target, "w")
+                ?: throw IOException()
 
-        return@withContext exportParamsUseCase.execute(descriptor.fileDescriptor)
+            exportParamsUseCase(descriptor.fileDescriptor)
+        }
     }
 
     private suspend fun backUpParamsWithFileDescriptor(
         target: Uri,
         context: Context
     ): Result<Unit> = withContext(ioDispatcher) {
-        val descriptor = context.contentResolver.openFileDescriptor(target, "w")
-            ?: return@withContext Result.failure(IOException())
+        return@withContext runCatching {
+            val descriptor = context.contentResolver.openFileDescriptor(target, "w")
+                ?: throw IOException()
 
-        return@withContext backupParamsUseCase.execute(descriptor.fileDescriptor)
+            backupParamsUseCase(descriptor.fileDescriptor)
+        }
     }
 
     private val currentViewState: ViewState<Unit>

app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/BrowseParamsViewModel.kt

@@ -10,10 +10,10 @@ import androidx.lifecycle.viewModelScope
 import com.androidvip.sysctlgui.R
 import com.androidvip.sysctlgui.data.mapper.DomainParamMapper
 import com.androidvip.sysctlgui.data.models.KernelParam
-import com.androidvip.sysctlgui.domain.Consts
 import com.androidvip.sysctlgui.domain.repository.AppPrefs
 import com.androidvip.sysctlgui.domain.usecase.GetParamsFromFilesUseCase
 import com.androidvip.sysctlgui.ui.params.edit.EditKernelParamActivity
+import com.androidvip.sysctlgui.utils.Consts
 import com.hadilq.liveevent.LiveEvent
 import com.hadilq.liveevent.LiveEventConfig
 import kotlinx.coroutines.CoroutineDispatcher
@@ -57,7 +57,7 @@ class BrowseParamsViewModel(
         )
         val options: ActivityOptionsCompat = ActivityOptionsCompat.makeSceneTransitionAnimation(
             activity,
-            *sharedElements,
+            *sharedElements
         )
 
         viewEffect.postValue(ParamBrowserViewEffect.NavigateToParamDetails(param, options))
@@ -122,7 +122,7 @@ class BrowseParamsViewModel(
     private suspend fun loadBrowsableParamFiles(path: String) {
         updateState { isLoading = true }
         val files = getCurrentPathFiles(path).maybeDirectorySorted().maybeFiltered()
-        val params = getParamsFromFilesUseCase(files).getOrNull().orEmpty().map {
+        val params = getParamsFromFilesUseCase(files).map {
             DomainParamMapper.map(it)
         }