Fix lint issues

jonathanklee · jonathanklee · commit 8e53fa919e8b · 2025-10-29T22:56:12.000+01:00
diff --git a/app/src/main/java/com/klee/sapio/data/DeviceConfiguration.kt b/app/src/main/java/com/klee/sapio/data/DeviceConfiguration.kt
@@ -34,7 +34,7 @@ class DeviceConfiguration @Inject constructor(
 
             if (packageManager.getApplicationLabel(app).toString() == GOOGLE_PLAY_SERVICES) {
                 type = GmsType.GOOGLE_PLAY_SERVICES
-                break;
+                break
             }
         }
 
diff --git a/app/src/main/java/com/klee/sapio/data/Models.kt b/app/src/main/java/com/klee/sapio/data/Models.kt
@@ -157,16 +157,20 @@ data class Label(val text: String, val color: Int) {
         fun create(context: Context, label: Int): Label {
             return when (label) {
                 MICROG -> Label(
-                    context.getString(R.string.microg_label), context.getColor(R.color.blue_200)
+                    context.getString(R.string.microg_label),
+                    context.getColor(R.color.blue_200)
                 )
                 BARE_AOSP -> Label(
-                    context.getString(R.string.bare_aosp_label), context.getColor(R.color.blue_700)
+                    context.getString(R.string.bare_aosp_label),
+                    context.getColor(R.color.blue_700)
                 )
                 SECURE -> Label(
-                    context.getString(R.string.secure_label), context.getColor(R.color.purple_200)
+                    context.getString(R.string.secure_label),
+                    context.getColor(R.color.purple_200)
                 )
                 RISKY -> Label(
-                    context.getString(R.string.risky_label), context.getColor(R.color.purple_700)
+                    context.getString(R.string.risky_label),
+                    context.getColor(R.color.purple_700)
                 )
                 else -> Label(" Empty label ", context.getColor(R.color.black))
             }
@@ -182,7 +186,7 @@ data class Rating(val value: Int, val text: String) {
         const val AVERAGE = 2
         const val BAD = 3
 
-        const val GREEN_CIRCLE_EMOJI =  0x1F7E2
+        const val GREEN_CIRCLE_EMOJI = 0x1F7E2
         const val YELLOW_CIRCLE_EMOJI = 0x1F7E1
         const val RED_CIRCLE_EMOJI = 0x1F534
 
diff --git a/app/src/main/java/com/klee/sapio/data/RetrofitClient.kt b/app/src/main/java/com/klee/sapio/data/RetrofitClient.kt
@@ -231,13 +231,13 @@ class EvaluationService @Inject constructor(
     }
 
     private suspend fun upload(image: MultipartBody.Part): Response<ArrayList<IconAnswer>>? =
-    try {
-        withTimeout(UPLOAD_TIMEOUT_MS) {
-            evaluationsApi.addIcon(image).execute()
+        try {
+            withTimeout(UPLOAD_TIMEOUT_MS) {
+                evaluationsApi.addIcon(image).execute()
+            }
+        } catch (_: IOException) {
+            null
         }
-    } catch (_: IOException) {
-        null
-    }
 
     suspend fun existingIcon(iconName: String): List<IconAnswer>? {
         var remotesImage: List<IconAnswer>? = null
@@ -285,5 +285,4 @@ class EvaluationService @Inject constructor(
         bitmap.compress(Bitmap.CompressFormat.PNG, COMPRESSION_QUALITY, stream)
         return stream.toByteArray()
     }
-
 }
diff --git a/app/src/main/java/com/klee/sapio/domain/EvaluateAppUseCase.kt b/app/src/main/java/com/klee/sapio/domain/EvaluateAppUseCase.kt
@@ -1,8 +1,8 @@
 package com.klee.sapio.domain
 
 import com.klee.sapio.data.DeviceConfiguration
-import com.klee.sapio.data.InstalledApplication
 import com.klee.sapio.data.IconAnswer
+import com.klee.sapio.data.InstalledApplication
 import com.klee.sapio.data.UploadEvaluation
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -11,8 +11,11 @@ import javax.inject.Inject
 
 class EvaluateAppUseCase @Inject constructor() {
 
-    @Inject lateinit var mEvaluationRepository: EvaluationRepository
-    @Inject lateinit var mDeviceConfiguration: DeviceConfiguration
+    @Inject
+    lateinit var mEvaluationRepository: EvaluationRepository
+
+    @Inject
+    lateinit var mDeviceConfiguration: DeviceConfiguration
 
     suspend operator fun invoke(
         app: InstalledApplication,
diff --git a/app/src/main/java/com/klee/sapio/domain/EvaluationRepository.kt b/app/src/main/java/com/klee/sapio/domain/EvaluationRepository.kt
@@ -1,10 +1,10 @@
 package com.klee.sapio.domain
 
 import com.klee.sapio.data.Evaluation
+import com.klee.sapio.data.IconAnswer
 import com.klee.sapio.data.InstalledApplication
 import com.klee.sapio.data.StrapiElement
 import com.klee.sapio.data.UploadEvaluation
-import com.klee.sapio.data.IconAnswer
 import retrofit2.Response
 
 interface EvaluationRepository {
diff --git a/app/src/main/java/com/klee/sapio/ui/view/AboutActivity.kt b/app/src/main/java/com/klee/sapio/ui/view/AboutActivity.kt
@@ -1,14 +1,11 @@
 package com.klee.sapio.ui.view
 
-import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.text.Html
 import android.text.method.LinkMovementMethod
 import androidx.appcompat.app.AppCompatActivity
 import com.klee.sapio.BuildConfig
 import com.klee.sapio.R
-import com.klee.sapio.data.Rating
 import com.klee.sapio.databinding.ActivityAboutBinding
 
 class AboutActivity : AppCompatActivity() {
diff --git a/app/src/main/java/com/klee/sapio/ui/view/ChooseAppAdapter.kt b/app/src/main/java/com/klee/sapio/ui/view/ChooseAppAdapter.kt
@@ -4,8 +4,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.klee.sapio.databinding.ChooseAppCardBinding
 import com.klee.sapio.data.InstalledApplication
+import com.klee.sapio.databinding.ChooseAppCardBinding
 
 class ChooseAppAdapter(
     private var mApps: List<InstalledApplication>,
diff --git a/app/src/main/java/com/klee/sapio/ui/view/ChooseAppDialog.kt b/app/src/main/java/com/klee/sapio/ui/view/ChooseAppDialog.kt
@@ -9,9 +9,9 @@ import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.klee.sapio.databinding.DialogChooseAppBinding
 import com.klee.sapio.data.InstalledApplication
 import com.klee.sapio.data.InstalledApplicationsRepository
+import com.klee.sapio.databinding.DialogChooseAppBinding
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
diff --git a/app/src/main/java/com/klee/sapio/ui/view/ChooseAppFragment.kt b/app/src/main/java/com/klee/sapio/ui/view/ChooseAppFragment.kt
@@ -9,8 +9,8 @@ import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import com.klee.sapio.R
-import com.klee.sapio.databinding.FragmentChooseAppBinding
 import com.klee.sapio.data.InstalledApplication
+import com.klee.sapio.databinding.FragmentChooseAppBinding
 import dagger.hilt.android.AndroidEntryPoint
 import io.ktor.client.HttpClient
 import io.ktor.client.engine.android.Android
diff --git a/app/src/main/java/com/klee/sapio/ui/view/EvaluateFragment.kt b/app/src/main/java/com/klee/sapio/ui/view/EvaluateFragment.kt
@@ -12,9 +12,9 @@ import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import com.klee.sapio.R
-import com.klee.sapio.data.InstalledApplicationsRepository
-import com.klee.sapio.data.EvaluationRepositoryImpl
 import com.klee.sapio.data.DeviceConfiguration
+import com.klee.sapio.data.EvaluationRepositoryImpl
+import com.klee.sapio.data.InstalledApplicationsRepository
 import com.klee.sapio.data.Label
 import com.klee.sapio.data.Rating
 import com.klee.sapio.databinding.FragmentEvaluateBinding
@@ -30,10 +30,18 @@ class EvaluateFragment : Fragment() {
         const val NOT_EXISTING = -1
     }
 
-    @Inject lateinit var mInstalledApplicationsRepository: InstalledApplicationsRepository
-    @Inject lateinit var mEvaluationRepository: EvaluationRepositoryImpl
-    @Inject lateinit var mEvaluateAppUseCase: EvaluateAppUseCase
-    @Inject lateinit var mDeviceConfiguration: DeviceConfiguration
+    @Inject
+    lateinit var mInstalledApplicationsRepository: InstalledApplicationsRepository
+
+    @Inject
+    lateinit var mEvaluationRepository: EvaluationRepositoryImpl
+
+    @Inject
+    lateinit var mEvaluateAppUseCase: EvaluateAppUseCase
+
+    @Inject
+    lateinit var mDeviceConfiguration: DeviceConfiguration
+
     private lateinit var mBinding: FragmentEvaluateBinding
     private lateinit var mPackageName: String
     private lateinit var mAppName: String
@@ -80,7 +88,9 @@ class EvaluateFragment : Fragment() {
             ) ?: return@runBlocking
 
             val rating = getRatingFromRadioId(mBinding.note.checkedRadioButtonId, requireView())
-            mEvaluateAppUseCase.invoke(app, rating,
+            mEvaluateAppUseCase.invoke(
+                app,
+                rating,
                 { onUploadSuccess() },
                 { onUploadError() }
             )
@@ -97,7 +107,7 @@ class EvaluateFragment : Fragment() {
     }
 
     private fun onUploadError() {
-       Toast.makeText(context, getString(R.string.upload_error), Toast.LENGTH_LONG).show()
+        Toast.makeText(context, getString(R.string.upload_error), Toast.LENGTH_LONG).show()
     }
 
     private fun getRatingFromRadioId(id: Int, view: View): Int {
diff --git a/app/src/main/java/com/klee/sapio/ui/view/EvaluationsActivity.kt b/app/src/main/java/com/klee/sapio/ui/view/EvaluationsActivity.kt
@@ -23,6 +23,7 @@ import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.ComposeView
+import androidx.core.graphics.createBitmap
 import androidx.core.view.isVisible
 import androidx.emoji2.widget.EmojiTextView
 import androidx.lifecycle.MutableLiveData
@@ -31,12 +32,15 @@ import com.bumptech.glide.Glide
 import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.engine.GlideException
 import com.bumptech.glide.request.RequestListener
+import com.bumptech.glide.request.target.CustomTarget
 import com.bumptech.glide.request.target.Target
+import com.bumptech.glide.request.transition.Transition
 import com.klee.sapio.R
 import com.klee.sapio.data.Evaluation
 import com.klee.sapio.data.EvaluationService
 import com.klee.sapio.data.Rating
 import com.klee.sapio.data.Settings
+import com.klee.sapio.data.SharedEvaluation
 import com.klee.sapio.databinding.ActivityEvaluationsBinding
 import com.klee.sapio.ui.viewmodel.AppEvaluationsViewModel
 import dagger.hilt.android.AndroidEntryPoint
@@ -45,16 +49,11 @@ import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.suspendCancellableCoroutine
 import java.io.IOException
 import javax.inject.Inject
-import com.klee.sapio.data.SharedEvaluation
-import com.bumptech.glide.request.target.CustomTarget
-import com.bumptech.glide.request.transition.Transition
-import kotlinx.coroutines.suspendCancellableCoroutine
-import java.lang.Exception
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
-import androidx.core.graphics.createBitmap
 
 @AndroidEntryPoint
 class EvaluationsActivity : AppCompatActivity() {
@@ -86,7 +85,6 @@ class EvaluationsActivity : AppCompatActivity() {
         const val SCREENSHOT_HEIGHT_DP = 115
     }
 
-
     @RequiresApi(Build.VERSION_CODES.O)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -148,13 +146,20 @@ class EvaluationsActivity : AppCompatActivity() {
     private fun onElementsLoaded(callback: () -> Unit) {
         if (settings.isRootConfigurationEnabled()) {
             combine(
-                microgUserReceived, microgRootReceived, bareAospUserReceived,
-                bareAospRootReceived, iconReceived
+                microgUserReceived,
+                microgRootReceived,
+                bareAospUserReceived,
+                bareAospRootReceived,
+                iconReceived
             ) { _, _, _, _, _ ->
                 callback.invoke()
             }.launchIn(lifecycleScope)
         } else {
-            combine(microgUserReceived, bareAospUserReceived, iconReceived) { _, _, _ ->
+            combine(
+                microgUserReceived,
+                bareAospUserReceived,
+                iconReceived
+            ) { _, _, _ ->
                 callback.invoke()
             }.launchIn(lifecycleScope)
         }
@@ -237,7 +242,7 @@ class EvaluationsActivity : AppCompatActivity() {
 
     private fun takeScreenshot(sharedEvaluation: SharedEvaluation): Bitmap {
         return composeToBitmap(this@EvaluationsActivity, SCREENSHOT_WIDTH_DP, SCREENSHOT_HEIGHT_DP) {
-                ShareScreenshot(sharedEvaluation)
+            ShareScreenshot(sharedEvaluation)
         }
     }
 
@@ -320,17 +325,12 @@ class EvaluationsActivity : AppCompatActivity() {
 
     private fun observeShare() {
         shareLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-            try {
-                contentResolver.delete(shareImage!!, null, null)
-                shareImage = null
-            } catch (e: Exception) {
-                Log.e(TAG, "Failed to delete screenshot", e)
-            }
+            contentResolver.delete(shareImage!!, null, null)
+            shareImage = null
         }
     }
 
     private fun share(bitmap: Bitmap, appName: String) {
-
         val contentValues = ContentValues().apply {
             put(Media.DISPLAY_NAME, "screenshot_${System.currentTimeMillis()}")
             put(Media.DESCRIPTION, "$appName Android Compatibility")
diff --git a/app/src/main/java/com/klee/sapio/ui/view/FeedAppAdapter.kt b/app/src/main/java/com/klee/sapio/ui/view/FeedAppAdapter.kt
@@ -7,7 +7,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.klee.sapio.databinding.FeedAppCardBinding
 import com.bumptech.glide.Glide
 import com.klee.sapio.R
 import com.klee.sapio.data.Evaluation
@@ -16,6 +15,7 @@ import com.klee.sapio.data.Label
 import com.klee.sapio.data.Rating
 import com.klee.sapio.data.Settings
 import com.klee.sapio.data.UserType
+import com.klee.sapio.databinding.FeedAppCardBinding
 import com.klee.sapio.domain.EvaluationRepository
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -59,7 +59,7 @@ class FeedAppAdapter(
                 R.string.updated_on,
                 app.updatedAt?.let { dateFormat.format(it) }
             )
-        
+
         element.emoji.text = Rating.create(app.rating).text
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
diff --git a/app/src/main/java/com/klee/sapio/ui/view/FeedFragment.kt b/app/src/main/java/com/klee/sapio/ui/view/FeedFragment.kt
@@ -58,7 +58,7 @@ class FeedFragment : Fragment() {
     override fun onResume() {
         super.onResume()
 
-        if (mPreviousRootVisible != mSettings.getRootConfigurationLevel())  {
+        if (mPreviousRootVisible != mSettings.getRootConfigurationLevel()) {
             mPreviousRootVisible = mSettings.getRootConfigurationLevel()
             fetchFeed(viewLifecycleOwner.lifecycleScope)
         }
diff --git a/app/src/main/java/com/klee/sapio/ui/view/MainActivity.kt b/app/src/main/java/com/klee/sapio/ui/view/MainActivity.kt
@@ -51,7 +51,8 @@ class MainActivity : AppCompatActivity() {
 
     private fun handleEdgeToEdgeInsets() {
         ViewCompat.setOnApplyWindowInsetsListener(mBinding.root) { v, windowInsets ->
-            val bars = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()
+            val bars = windowInsets.getInsets(
+                WindowInsetsCompat.Type.systemBars()
                     or WindowInsetsCompat.Type.displayCutout()
             )
 
diff --git a/app/src/main/java/com/klee/sapio/ui/view/PreferencesFragment.kt b/app/src/main/java/com/klee/sapio/ui/view/PreferencesFragment.kt
@@ -8,7 +8,7 @@ import androidx.core.view.updatePadding
 import androidx.preference.PreferenceFragmentCompat
 import com.klee.sapio.R
 
-class PreferencesFragment : PreferenceFragmentCompat()  {
+class PreferencesFragment : PreferenceFragmentCompat() {
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.preferences, rootKey)
     }
@@ -18,8 +18,7 @@ class PreferencesFragment : PreferenceFragmentCompat()  {
 
         ViewCompat.setOnApplyWindowInsetsListener(view) { v, windowInsets ->
             val bars = windowInsets.getInsets(
-                WindowInsetsCompat.Type.systemBars()
-                        or WindowInsetsCompat.Type.displayCutout()
+                WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
             )
 
             v.updatePadding(
diff --git a/app/src/main/java/com/klee/sapio/ui/view/SearchAppAdapter.kt b/app/src/main/java/com/klee/sapio/ui/view/SearchAppAdapter.kt
@@ -5,10 +5,10 @@ import android.content.Intent
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.klee.sapio.databinding.SearchAppCardBinding
 import com.bumptech.glide.Glide
 import com.klee.sapio.data.Evaluation
 import com.klee.sapio.data.EvaluationService
+import com.klee.sapio.databinding.SearchAppCardBinding
 import com.klee.sapio.domain.EvaluationRepository
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/com/klee/sapio/ui/view/SearchFragment.kt b/app/src/main/java/com/klee/sapio/ui/view/SearchFragment.kt
@@ -49,7 +49,6 @@ class SearchFragment : Fragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-
         mBinding = FragmentSearchBinding.inflate(inflater, container, false)
         mBinding.recyclerView.layoutManager = LinearLayoutManager(context)
         mBinding.recyclerView.visibility = View.INVISIBLE
diff --git a/app/src/main/java/com/klee/sapio/ui/view/ShareComposable.kt b/app/src/main/java/com/klee/sapio/ui/view/ShareComposable.kt
diff --git a/app/src/main/java/com/klee/sapio/ui/view/WarningFragment.kt b/app/src/main/java/com/klee/sapio/ui/view/WarningFragment.kt
diff --git a/app/src/main/java/com/klee/sapio/ui/viewmodel/AppEvaluationsViewModel.kt b/app/src/main/java/com/klee/sapio/ui/viewmodel/AppEvaluationsViewModel.kt
diff --git a/app/src/main/java/com/klee/sapio/ui/viewmodel/SearchViewModel.kt b/app/src/main/java/com/klee/sapio/ui/viewmodel/SearchViewModel.kt

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class DeviceConfiguration @Inject constructor(`
`34`	`34`
`35`	`35`	`if (packageManager.getApplicationLabel(app).toString() == GOOGLE_PLAY_SERVICES) {`
`36`	`36`	`type = GmsType.GOOGLE_PLAY_SERVICES`
`37`		`- break;`
	`37`	`+ break`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -231,13 +231,13 @@ class EvaluationService @Inject constructor(`
`231`	`231`	`}`
`232`	`232`
`233`	`233`	`private suspend fun upload(image: MultipartBody.Part): Response<ArrayList<IconAnswer>>? =`
`234`		`- try {`
`235`		`- withTimeout(UPLOAD_TIMEOUT_MS) {`
`236`		`- evaluationsApi.addIcon(image).execute()`
	`234`	`+ try {`
	`235`	`+ withTimeout(UPLOAD_TIMEOUT_MS) {`
	`236`	`+ evaluationsApi.addIcon(image).execute()`
	`237`	`+ }`
	`238`	`+ } catch (_: IOException) {`
	`239`	`+ null`
`237`	`240`	`}`
`238`		`- } catch (_: IOException) {`
`239`		`- null`
`240`		`- }`
`241`	`241`
`242`	`242`	`suspend fun existingIcon(iconName: String): List<IconAnswer>? {`
`243`	`243`	`var remotesImage: List<IconAnswer>? = null`
`@@ -285,5 +285,4 @@ class EvaluationService @Inject constructor(`
`285`	`285`	`bitmap.compress(Bitmap.CompressFormat.PNG, COMPRESSION_QUALITY, stream)`
`286`	`286`	`return stream.toByteArray()`
`287`	`287`	`}`
`288`		`-`
`289`	`288`	`}`