ktlint: Replace TAG properties with extension

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
2025-12-30 12:53:04 +08:00
parent 00c07d0a98
commit d2831ab3d2
47 changed files with 61 additions and 87 deletions
--- a/app/src/huawei/java/com/aurora/store/data/receiver/InstallerStatusReceiver.kt
+++ b/app/src/huawei/java/com/aurora/store/data/receiver/InstallerStatusReceiver.kt
@@ -24,6 +24,7 @@ import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
 import android.util.Log
 import com.aurora.Constants.PACKAGE_NAME_APP_GALLERY
+import com.aurora.extensions.TAG
 import com.huawei.appgallery.coreservice.api.ApiClient
 import com.huawei.appgallery.coreservice.api.ApiCode
 import com.huawei.appgallery.coreservice.api.IConnectionResult
@@ -38,8 +39,6 @@ import dagger.hilt.android.AndroidEntryPoint
@AndroidEntryPoint
 class InstallerStatusReceiver : BaseInstallerStatusReceiver() {

-    private val TAG = InstallerStatusReceiver::class.java.simpleName
-
    private lateinit var apiClient: ApiClient

    override fun onReceive(context: Context?, intent: Intent?) {
--- a/app/src/main/java/com/aurora/extensions/Any.kt
+++ b/app/src/main/java/com/aurora/extensions/Any.kt
@@ -0,0 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: 2025 The Calyx Institute
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+package com.aurora.extensions
+
+/**
+ * Simple extension method to provide logging TAG
+ */
+inline val <reified T> T.TAG: String
+    get() = when {
+        T::class.java.isAnonymousClass -> T::class.java.name
+        else -> T::class.java.simpleName
+    }
--- a/app/src/main/java/com/aurora/store/data/activity/InstallActivity.kt
+++ b/app/src/main/java/com/aurora/store/data/activity/InstallActivity.kt
@@ -7,6 +7,7 @@ import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.IntentCompat
 import com.aurora.Constants
+import com.aurora.extensions.TAG
 import com.aurora.store.data.installer.SessionInstaller
 import com.aurora.store.data.room.download.Download
 import dagger.hilt.android.AndroidEntryPoint
@@ -15,8 +16,6 @@ import javax.inject.Inject
@AndroidEntryPoint
 class InstallActivity : AppCompatActivity() {

-    private val TAG = InstallActivity::class.java.simpleName
-
    @Inject
    lateinit var sessionInstaller: SessionInstaller

--- a/app/src/main/java/com/aurora/store/data/activity/MicroGInstallerActivity.kt
+++ b/app/src/main/java/com/aurora/store/data/activity/MicroGInstallerActivity.kt
@@ -9,6 +9,7 @@ import android.util.Log
 import androidx.core.content.FileProvider
 import androidx.core.content.IntentCompat
 import com.aurora.Constants.PACKAGE_NAME_PLAY_STORE
+import com.aurora.extensions.TAG
 import com.aurora.store.BuildConfig
 import com.aurora.store.data.installer.MicroGInstaller.Companion.buildMicroGInstallIntent
 import java.io.File
@@ -16,7 +17,6 @@ import java.io.File
 class MicroGInstallerActivity : Activity() {

    companion object {
-        private val TAG = MicroGInstallerActivity::class.java.simpleName
        private const val REQUEST_CODE = 1001
        const val EXTRA_FILES = "extra_files"
        const val EXTRA_PACKAGE_NAME = "extra_package_name"
--- a/app/src/main/java/com/aurora/store/data/event/EventFlow.kt
+++ b/app/src/main/java/com/aurora/store/data/event/EventFlow.kt
@@ -1,6 +1,7 @@
 package com.aurora.store.data.event

 import android.util.Log
+import com.aurora.extensions.TAG
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import javax.inject.Singleton
@@ -8,8 +9,6 @@ import javax.inject.Singleton
@Singleton
 class EventFlow {

-    private val TAG = EventFlow::class.java.simpleName
-
    private val _busEvent = MutableSharedFlow<BusEvent>(extraBufferCapacity = 1)
    val busEvent = _busEvent.asSharedFlow()

--- a/app/src/main/java/com/aurora/store/data/helper/DownloadHelper.kt
+++ b/app/src/main/java/com/aurora/store/data/helper/DownloadHelper.kt
@@ -7,6 +7,7 @@ import androidx.work.ExistingWorkPolicy
 import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.OutOfQuotaPolicy
 import androidx.work.WorkManager
+import com.aurora.extensions.TAG
 import com.aurora.gplayapi.data.models.App
 import com.aurora.store.AuroraApp
 import com.aurora.store.data.model.DownloadStatus
@@ -47,8 +48,6 @@ class DownloadHelper @Inject constructor(

    val pagedDownloads get() = downloadDao.pagedDownloads()

-    private val TAG = DownloadHelper::class.java.simpleName
-
    /**
     * Removes failed download from the queue and starts observing for newly enqueued apps.
     */
--- a/app/src/main/java/com/aurora/store/data/helper/UpdateHelper.kt
+++ b/app/src/main/java/com/aurora/store/data/helper/UpdateHelper.kt
@@ -12,6 +12,7 @@ import androidx.work.OutOfQuotaPolicy
 import androidx.work.PeriodicWorkRequest
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
+import com.aurora.extensions.TAG
 import com.aurora.store.AuroraApp
 import com.aurora.store.data.event.BusEvent
 import com.aurora.store.data.event.InstallerEvent
@@ -82,8 +83,6 @@ class UpdateHelper @Inject constructor(
        }
    }

-    private val TAG = UpdateHelper::class.java.simpleName
-
    private val isExtendedUpdateEnabled
        get() = Preferences.getBoolean(context, Preferences.PREFERENCE_UPDATES_EXTENDED)

--- a/app/src/main/java/com/aurora/store/data/installer/AMInstaller.kt
+++ b/app/src/main/java/com/aurora/store/data/installer/AMInstaller.kt
@@ -3,6 +3,7 @@ package com.aurora.store.data.installer
 import android.content.Context
 import android.content.Intent
 import android.util.Log
+import com.aurora.extensions.TAG
 import com.aurora.store.R
 import com.aurora.store.data.installer.base.InstallerBase
 import com.aurora.store.data.model.Installer
@@ -38,8 +39,6 @@ class AMInstaller @Inject constructor(
            )
    }

-    private val TAG = AMInstaller::class.java.simpleName
-
    override fun install(download: Download) {
        if (isAlreadyQueued(download.packageName)) {
            Log.i(TAG, "${download.packageName} already queued")
--- a/app/src/main/java/com/aurora/store/data/installer/MicroGInstaller.kt
+++ b/app/src/main/java/com/aurora/store/data/installer/MicroGInstaller.kt
@@ -24,6 +24,7 @@ import android.content.Intent
 import android.net.Uri
 import android.util.Log
 import com.aurora.Constants.PACKAGE_NAME_PLAY_STORE
+import com.aurora.extensions.TAG
 import com.aurora.store.R
 import com.aurora.store.data.activity.MicroGInstallerActivity
 import com.aurora.store.data.installer.base.InstallerBase
@@ -61,8 +62,6 @@ class MicroGInstaller @Inject constructor(
        }
    }

-    private val TAG = MicroGInstaller::class.java.simpleName
-
    override fun install(download: Download) {
        super.install(download)

--- a/app/src/main/java/com/aurora/store/data/installer/NativeInstaller.kt
+++ b/app/src/main/java/com/aurora/store/data/installer/NativeInstaller.kt
@@ -24,6 +24,7 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Build
 import android.util.Log
+import com.aurora.extensions.TAG
 import com.aurora.extensions.runOnUiThread
 import com.aurora.store.R
 import com.aurora.store.data.installer.base.InstallerBase
@@ -56,8 +57,6 @@ class NativeInstaller @Inject constructor(
            )
    }

-    private val TAG = NativeInstaller::class.java.simpleName
-
    override fun install(download: Download) {
        if (isAlreadyQueued(download.packageName)) {
            Log.i(TAG, "${download.packageName} already queued")
--- a/app/src/main/java/com/aurora/store/data/installer/RootInstaller.kt
+++ b/app/src/main/java/com/aurora/store/data/installer/RootInstaller.kt
@@ -21,6 +21,7 @@ package com.aurora.store.data.installer

 import android.content.Context
 import android.util.Log
+import com.aurora.extensions.TAG
 import com.aurora.store.AuroraApp
 import com.aurora.store.R
 import com.aurora.store.data.event.InstallerEvent
@@ -56,8 +57,6 @@ class RootInstaller @Inject constructor(
            )
    }

-    private val TAG = RootInstaller::class.java.simpleName
-
    override fun install(download: Download) {
        if (isAlreadyQueued(download.packageName)) {
            Log.i(TAG, "${download.packageName} already queued")
--- a/app/src/main/java/com/aurora/store/data/installer/ServiceInstaller.kt
+++ b/app/src/main/java/com/aurora/store/data/installer/ServiceInstaller.kt
@@ -30,6 +30,7 @@ import android.os.IBinder
 import android.os.Looper
 import android.os.RemoteException
 import android.util.Log
+import com.aurora.extensions.TAG
 import com.aurora.services.IPrivilegedCallback
 import com.aurora.services.IPrivilegedService
 import com.aurora.store.AuroraApp
@@ -75,8 +76,6 @@ class ServiceInstaller @Inject constructor(
            )
    }

-    private val TAG = ServiceInstaller::class.java.simpleName
-
    override fun install(download: Download) {
        super.install(download)

--- a/app/src/main/java/com/aurora/store/data/installer/SessionInstaller.kt
+++ b/app/src/main/java/com/aurora/store/data/installer/SessionInstaller.kt
@@ -32,6 +32,7 @@ import android.content.pm.PackageManager
 import android.os.Process
 import android.util.Log
 import androidx.core.app.PendingIntentCompat
+import com.aurora.extensions.TAG
 import com.aurora.extensions.isNAndAbove
 import com.aurora.extensions.isOAndAbove
 import com.aurora.extensions.isSAndAbove
@@ -63,8 +64,6 @@ class SessionInstaller @Inject constructor(
    @ApplicationContext private val context: Context
 ) : InstallerBase(context) {

-    private val TAG = SessionInstaller::class.java.simpleName
-
    val currentSessionId: Int?
        get() = enqueuedSessions.firstOrNull()?.last()?.sessionId

--- a/app/src/main/java/com/aurora/store/data/installer/ShizukuInstaller.kt
+++ b/app/src/main/java/com/aurora/store/data/installer/ShizukuInstaller.kt
@@ -35,6 +35,7 @@ import android.os.IInterface
 import android.util.Log
 import androidx.annotation.RequiresApi
 import androidx.core.app.PendingIntentCompat
+import com.aurora.extensions.TAG
 import com.aurora.extensions.isOAndAbove
 import com.aurora.extensions.isSAndAbove
 import com.aurora.store.R
@@ -77,8 +78,6 @@ class ShizukuInstaller @Inject constructor(
            )
    }

-    private val TAG = ShizukuInstaller::class.java.simpleName
-
    // Taken from LSPatch (https://github.com/LSPosed/LSPatch)
    private fun IBinder.wrap() = ShizukuBinderWrapper(this)
    private fun IInterface.asShizukuBinder() = this.asBinder().wrap()
--- a/app/src/main/java/com/aurora/store/data/installer/base/InstallerBase.kt
+++ b/app/src/main/java/com/aurora/store/data/installer/base/InstallerBase.kt
@@ -26,6 +26,7 @@ import android.net.Uri
 import android.util.Log
 import androidx.core.content.FileProvider
 import androidx.core.content.getSystemService
+import com.aurora.extensions.TAG
 import com.aurora.store.AuroraApp
 import com.aurora.store.BuildConfig
 import com.aurora.store.R
@@ -59,8 +60,6 @@ abstract class InstallerBase(private val context: Context) : IInstaller {
        }
    }

-    private val TAG = InstallerBase::class.java.simpleName
-
    var download: Download? = null
        private set

--- a/app/src/main/java/com/aurora/store/data/network/HttpClient.kt
+++ b/app/src/main/java/com/aurora/store/data/network/HttpClient.kt
@@ -20,6 +20,7 @@
 package com.aurora.store.data.network

 import android.util.Log
+import com.aurora.extensions.TAG
 import com.aurora.gplayapi.data.models.PlayResponse
 import com.aurora.gplayapi.network.IHttpClient
 import com.aurora.store.BuildConfig.APPLICATION_ID
@@ -44,8 +45,6 @@ import javax.inject.Singleton
@Singleton
 class HttpClient @Inject constructor(private val okHttpClient: OkHttpClient): IHttpClient {

-    private val TAG = HttpClient::class.java.simpleName
-
    private val POST = "POST"
    private val GET = "GET"

--- a/app/src/main/java/com/aurora/store/data/providers/AuthProvider.kt
+++ b/app/src/main/java/com/aurora/store/data/providers/AuthProvider.kt
@@ -21,6 +21,7 @@ package com.aurora.store.data.providers

 import android.content.Context
 import android.util.Log
+import com.aurora.extensions.TAG
 import com.aurora.gplayapi.data.models.AuthData
 import com.aurora.gplayapi.data.models.PlayResponse
 import com.aurora.gplayapi.helpers.AuthHelper
@@ -46,8 +47,6 @@ class AuthProvider @Inject constructor(
    private val httpClient: IHttpClient
 ) {

-    private val TAG = AuthProvider::class.java.simpleName
-
    val dispenserURL: String?
        get() {
            val dispensers = Preferences.getStringSet(context, PREFERENCE_DISPENSER_URLS)
--- a/app/src/main/java/com/aurora/store/data/providers/PermissionProvider.kt
+++ b/app/src/main/java/com/aurora/store/data/providers/PermissionProvider.kt
@@ -14,6 +14,7 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.app.ActivityCompat
 import androidx.core.net.toUri
 import androidx.fragment.app.Fragment
+import com.aurora.extensions.TAG
 import com.aurora.extensions.checkManifestPermission
 import com.aurora.extensions.isDomainVerified
 import com.aurora.extensions.isExternalStorageAccessible
@@ -154,8 +155,6 @@ class PermissionProvider(private val fragment: Fragment) :
        }
    }

-    private val TAG = PermissionProvider::class.java.simpleName
-
    private val context: Context
        get() = fragment.requireContext()

--- a/app/src/main/java/com/aurora/store/data/providers/SpoofDeviceProvider.kt
+++ b/app/src/main/java/com/aurora/store/data/providers/SpoofDeviceProvider.kt
@@ -21,6 +21,7 @@ package com.aurora.store.data.providers

 import android.content.Context
 import android.util.Log
+import com.aurora.extensions.TAG
 import com.aurora.store.BuildConfig
 import com.aurora.store.util.PathUtil
 import java.io.BufferedInputStream
@@ -40,8 +41,6 @@ import javax.inject.Singleton
@Singleton
 open class SpoofDeviceProvider(private val context: Context) {

-    private val TAG = SpoofDeviceProvider::class.java.simpleName
-
    private val SUFFIX = ".properties"

    val availableDeviceProperties: List<Properties>
--- a/app/src/main/java/com/aurora/store/data/receiver/BaseInstallerStatusReceiver.kt
+++ b/app/src/main/java/com/aurora/store/data/receiver/BaseInstallerStatusReceiver.kt
@@ -27,6 +27,7 @@ import android.content.pm.PackageInstaller.EXTRA_SESSION_ID
 import android.util.Log
 import androidx.core.content.IntentCompat
 import androidx.core.content.getSystemService
+import com.aurora.extensions.TAG
 import com.aurora.extensions.runOnUiThread
 import com.aurora.store.AuroraApp
 import com.aurora.store.data.event.InstallerEvent
@@ -43,8 +44,6 @@ import com.aurora.store.util.Preferences.PREFERENCE_AUTO_DELETE

 abstract class BaseInstallerStatusReceiver : BroadcastReceiver() {

-    private val TAG = BaseInstallerStatusReceiver::class.java.simpleName
-
    override fun onReceive(context: Context?, intent: Intent?) {
        if (context != null && intent?.action == ACTION_INSTALL_STATUS) {
            val packageName = intent.getStringExtra(EXTRA_PACKAGE_NAME) ?: return
--- a/app/src/main/java/com/aurora/store/data/receiver/DownloadCancelReceiver.kt
+++ b/app/src/main/java/com/aurora/store/data/receiver/DownloadCancelReceiver.kt
@@ -9,6 +9,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.util.Log
+import com.aurora.extensions.TAG
 import com.aurora.store.AuroraApp
 import com.aurora.store.data.helper.DownloadHelper
 import dagger.hilt.android.AndroidEntryPoint
@@ -18,7 +19,6 @@ import javax.inject.Inject

@AndroidEntryPoint
 class DownloadCancelReceiver : BroadcastReceiver() {
-    private val TAG = DownloadCancelReceiver::class.java.simpleName

    @Inject
    lateinit var downloadHelper: DownloadHelper
--- a/app/src/main/java/com/aurora/store/data/receiver/UnarchivePackageReceiver.kt
+++ b/app/src/main/java/com/aurora/store/data/receiver/UnarchivePackageReceiver.kt
@@ -7,6 +7,7 @@ import android.content.Intent
 import android.content.pm.PackageInstaller.EXTRA_UNARCHIVE_PACKAGE_NAME
 import android.util.Log
 import androidx.core.content.getSystemService
+import com.aurora.extensions.TAG
 import com.aurora.extensions.isVAndAbove
 import com.aurora.gplayapi.helpers.AppDetailsHelper
 import com.aurora.store.AuroraApp
@@ -24,8 +25,6 @@ import javax.inject.Inject
@AndroidEntryPoint
 class UnarchivePackageReceiver: BroadcastReceiver() {

-    private val TAG = UnarchivePackageReceiver::class.java.simpleName
-
    @Inject
    lateinit var appDetailsHelper: AppDetailsHelper

--- a/app/src/main/java/com/aurora/store/data/work/AuthWorker.kt
+++ b/app/src/main/java/com/aurora/store/data/work/AuthWorker.kt
@@ -14,6 +14,7 @@ import androidx.hilt.work.HiltWorker
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
 import com.aurora.Constants.PACKAGE_NAME_PLAY_STORE
+import com.aurora.extensions.TAG
 import com.aurora.gplayapi.data.models.AuthData
 import com.aurora.gplayapi.helpers.AuthHelper
 import com.aurora.store.data.model.AccountType
@@ -39,8 +40,6 @@ open class AuthWorker @AssistedInject constructor(
    @Assisted workerParams: WorkerParameters
 ) : CoroutineWorker(context, workerParams) {

-    private val TAG = AuthWorker::class.java.simpleName
-
    override suspend fun doWork(): Result {
        if (!AccountProvider.isLoggedIn(context)) {
            Log.i(TAG, "User has logged out!")
--- a/app/src/main/java/com/aurora/store/data/work/DownloadWorker.kt
+++ b/app/src/main/java/com/aurora/store/data/work/DownloadWorker.kt
@@ -20,6 +20,7 @@ import androidx.work.WorkInfo.Companion.STOP_REASON_CANCELLED_BY_APP
 import androidx.work.WorkInfo.Companion.STOP_REASON_USER
 import androidx.work.WorkerParameters
 import com.aurora.Constants.FLAVOUR_HUAWEI
+import com.aurora.extensions.TAG
 import com.aurora.extensions.copyTo
 import com.aurora.extensions.isPAndAbove
 import com.aurora.extensions.isQAndAbove
@@ -85,7 +86,6 @@ class DownloadWorker @AssistedInject constructor(
    private var totalProgress = 0
    private var downloadedBytes = 0L

-    private val TAG = DownloadWorker::class.java.simpleName
    private val NOTIFICATION_ID: Int = 200

    inner class NoNetworkException : Exception(context.getString(R.string.title_no_network))
--- a/app/src/main/java/com/aurora/store/data/work/UpdateWorker.kt
+++ b/app/src/main/java/com/aurora/store/data/work/UpdateWorker.kt
@@ -8,6 +8,7 @@ import androidx.hilt.work.HiltWorker
 import androidx.work.ForegroundInfo
 import androidx.work.WorkerParameters
 import com.aurora.Constants
+import com.aurora.extensions.TAG
 import com.aurora.extensions.isIgnoringBatteryOptimizations
 import com.aurora.gplayapi.data.models.App
 import com.aurora.gplayapi.helpers.AppDetailsHelper
@@ -57,8 +58,6 @@ class UpdateWorker @AssistedInject constructor(
    @Assisted workerParams: WorkerParameters
 ) : AuthWorker(authProvider, context, workerParams) {

-    private val TAG = UpdateWorker::class.java.simpleName
-
    private val notificationID = 100

    private val canSelfUpdate = !CertUtil.isFDroidApp(context, BuildConfig.APPLICATION_ID) &&
--- a/app/src/main/java/com/aurora/store/util/CertUtil.kt
+++ b/app/src/main/java/com/aurora/store/util/CertUtil.kt
@@ -26,6 +26,7 @@ import android.util.Base64
 import android.util.Log
 import com.aurora.Constants.PACKAGE_NAME_APP_GALLERY
 import com.aurora.Constants.PACKAGE_NAME_GMS
+import com.aurora.extensions.TAG
 import com.aurora.extensions.generateX509Certificate
 import com.aurora.extensions.getUpdateOwnerPackageNameCompat
 import com.aurora.extensions.isPAndAbove
@@ -38,8 +39,6 @@ import javax.security.auth.x500.X500Principal

 object CertUtil {

-    private val TAG = "CertUtil"
-
    const val GOOGLE_ACCOUNT_TYPE = "com.google"
    const val GOOGLE_PLAY_AUTH_TOKEN_TYPE = "oauth2:https://www.googleapis.com/auth/googleplay"
    const val GOOGLE_PLAY_CERT =
--- a/app/src/main/java/com/aurora/store/view/ui/commons/BaseFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/commons/BaseFragment.kt
@@ -28,6 +28,7 @@ import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import androidx.viewbinding.ViewBinding
 import com.airbnb.epoxy.EpoxyRecyclerView
+import com.aurora.extensions.TAG
 import com.aurora.extensions.navigate
 import com.aurora.gplayapi.data.models.Category
 import com.aurora.gplayapi.data.models.StreamCluster
@@ -39,8 +40,6 @@ import java.lang.reflect.ParameterizedType

 abstract class BaseFragment<ViewBindingType : ViewBinding> : Fragment() {

-    private val TAG = BaseFragment::class.java.simpleName
-
    lateinit var permissionProvider: PermissionProvider

    protected open var _binding: ViewBindingType? = null
--- a/app/src/main/java/com/aurora/store/view/ui/sheets/NetworkDialogSheet.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/sheets/NetworkDialogSheet.kt
@@ -25,6 +25,7 @@ import android.os.Bundle
 import android.provider.Settings
 import android.util.Log
 import android.view.View
+import com.aurora.extensions.TAG
 import com.aurora.extensions.isQAndAbove
 import com.aurora.store.databinding.SheetNetworkBinding
 import dagger.hilt.android.AndroidEntryPoint
@@ -32,8 +33,6 @@ import dagger.hilt.android.AndroidEntryPoint
@AndroidEntryPoint
 class NetworkDialogSheet : BaseDialogSheet<SheetNetworkBinding>() {

-    private val TAG = NetworkDialogSheet::class.java.simpleName
-
    companion object {

        const val TAG = "NetworkDialogSheet"
--- a/app/src/main/java/com/aurora/store/view/ui/splash/BaseFlavouredSplashFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/splash/BaseFlavouredSplashFragment.kt
@@ -17,6 +17,7 @@ import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import com.aurora.Constants.PACKAGE_NAME_PLAY_STORE
+import com.aurora.extensions.TAG
 import com.aurora.extensions.getPackageName
 import com.aurora.extensions.navigate
 import com.aurora.gplayapi.helpers.AuthHelper
@@ -39,8 +40,6 @@ import kotlinx.coroutines.launch

 abstract class BaseFlavouredSplashFragment : BaseFragment<FragmentSplashBinding>() {

-    private val TAG = BaseFlavouredSplashFragment::class.java.simpleName
-
    val viewModel: AuthViewModel by activityViewModels()

    val canLoginWithMicroG: Boolean
--- a/app/src/main/java/com/aurora/store/viewmodel/all/FavouriteViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/all/FavouriteViewModel.kt
@@ -13,6 +13,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.paging.PagingData
 import androidx.paging.cachedIn
+import com.aurora.extensions.TAG
 import com.aurora.store.data.paging.GenericPagingSource.Companion.pager
 import com.aurora.store.data.room.favourite.Favourite
 import com.aurora.store.data.room.favourite.FavouriteDao
@@ -36,7 +37,6 @@ class FavouriteViewModel @Inject constructor(
    private val json: Json,
    @ApplicationContext private val context: Context
 ) : ViewModel() {
-    private val TAG = FavouriteViewModel::class.java.simpleName

    private val _favourites = MutableStateFlow<PagingData<Favourite>>(PagingData.empty())
    val favourites = _favourites.asStateFlow()
--- a/app/src/main/java/com/aurora/store/viewmodel/all/InstalledViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/all/InstalledViewModel.kt
@@ -25,6 +25,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.paging.PagingData
 import androidx.paging.cachedIn
+import com.aurora.extensions.TAG
 import com.aurora.gplayapi.data.models.App
 import com.aurora.gplayapi.helpers.web.WebAppDetailsHelper
 import com.aurora.store.data.paging.GenericPagingSource.Companion.manualPager
@@ -46,8 +47,6 @@ class InstalledViewModel @Inject constructor(
    private val webAppDetailsHelper: WebAppDetailsHelper
 ) : ViewModel() {

-    private val TAG = InstalledViewModel::class.java.simpleName
-
    private val packages = PackageUtil.getAllValidPackages(context)
    private val blacklist = blacklistProvider.blacklist

--- a/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt
@@ -24,6 +24,7 @@ import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.aurora.Constants
+import com.aurora.extensions.TAG
 import com.aurora.gplayapi.data.models.AuthData
 import com.aurora.gplayapi.helpers.AuthHelper
 import com.aurora.store.AuroraApp
@@ -52,8 +53,6 @@ class AuthViewModel @Inject constructor(
    private val aC2DMTask: AC2DMTask
 ) : ViewModel() {

-    private val TAG = AuthViewModel::class.java.simpleName
-
    private val _authState: MutableStateFlow<AuthState> = MutableStateFlow(AuthState.Init)
    val authState = _authState.asStateFlow()

--- a/app/src/main/java/com/aurora/store/viewmodel/blacklist/BlacklistViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/blacklist/BlacklistViewModel.kt
@@ -12,6 +12,7 @@ import android.util.Log
 import androidx.compose.runtime.mutableStateListOf
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.aurora.extensions.TAG
 import com.aurora.store.AuroraApp
 import com.aurora.store.data.event.BusEvent
 import com.aurora.store.data.helper.UpdateHelper
@@ -36,8 +37,6 @@ class BlacklistViewModel @Inject constructor(
    @ApplicationContext private val context: Context
 ) : ViewModel() {

-    private val TAG = BlacklistViewModel::class.java.simpleName
-
    private val isAuroraOnlyFilterEnabled =
        Preferences.getBoolean(context, Preferences.PREFERENCE_FILTER_AURORA_ONLY, false)
    private val isFDroidFilterEnabled =
--- a/app/src/main/java/com/aurora/store/viewmodel/browse/ExpandedStreamBrowseViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/browse/ExpandedStreamBrowseViewModel.kt
@@ -23,6 +23,7 @@ import android.util.Log
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.aurora.extensions.TAG
 import com.aurora.gplayapi.data.models.StreamCluster
 import com.aurora.gplayapi.helpers.ExpandedBrowseHelper
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -36,8 +37,6 @@ class ExpandedStreamBrowseViewModel @Inject constructor(
    private val streamHelper: ExpandedBrowseHelper
 ) : ViewModel() {

-    private val TAG = ExpandedStreamBrowseViewModel::class.java.simpleName
-
    val liveData: MutableLiveData<StreamCluster> = MutableLiveData()
    var streamCluster: StreamCluster = StreamCluster()

--- a/app/src/main/java/com/aurora/store/viewmodel/browse/StreamBrowseViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/browse/StreamBrowseViewModel.kt
@@ -23,6 +23,7 @@ import android.util.Log
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.aurora.extensions.TAG
 import com.aurora.gplayapi.data.models.StreamCluster
 import com.aurora.gplayapi.helpers.web.WebStreamHelper
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -35,8 +36,6 @@ class StreamBrowseViewModel @Inject constructor(
    private val streamHelper: WebStreamHelper
 ) : ViewModel() {

-    private val TAG = StreamBrowseViewModel::class.java.simpleName
-
    val liveData: MutableLiveData<StreamCluster> = MutableLiveData()

    private lateinit var streamCluster: StreamCluster
--- a/app/src/main/java/com/aurora/store/viewmodel/category/CategoryViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/category/CategoryViewModel.kt
@@ -23,6 +23,7 @@ import android.util.Log
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.aurora.extensions.TAG
 import com.aurora.gplayapi.data.models.Category
 import com.aurora.gplayapi.helpers.CategoryHelper
 import com.aurora.gplayapi.helpers.contracts.CategoryContract
@@ -38,8 +39,6 @@ class CategoryViewModel @Inject constructor(
    private val categoryHelper: CategoryHelper
 ) : ViewModel() {

-    private val TAG = CategoryViewModel::class.java.simpleName
-
    private var stash: CategoryStash = mutableMapOf(
        Category.Type.APPLICATION to emptyList(),
        Category.Type.GAME to emptyList()
--- a/app/src/main/java/com/aurora/store/viewmodel/details/AppDetailsViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/details/AppDetailsViewModel.kt
@@ -12,6 +12,7 @@ import androidx.core.content.pm.PackageInfoCompat
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.aurora.Constants
+import com.aurora.extensions.TAG
 import com.aurora.extensions.requiresGMS
 import com.aurora.gplayapi.data.models.App
 import com.aurora.gplayapi.data.models.Review
@@ -68,8 +69,6 @@ class AppDetailsViewModel @Inject constructor(
    private val json: Json
 ) : ViewModel() {

-    private val TAG = AppDetailsViewModel::class.java.simpleName
-
    private val _app = MutableStateFlow<App?>(null)
    val app = _app.asStateFlow()

--- a/app/src/main/java/com/aurora/store/viewmodel/details/DevProfileViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/details/DevProfileViewModel.kt
@@ -23,6 +23,7 @@ import android.util.Log
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.aurora.extensions.TAG
 import com.aurora.gplayapi.data.models.StreamBundle
 import com.aurora.gplayapi.data.models.StreamCluster
 import com.aurora.gplayapi.data.models.details.DevStream
@@ -42,8 +43,6 @@ class DevProfileViewModel @Inject constructor(
    private val streamHelper: StreamHelper
 ) : ViewModel() {

-    private val TAG = DevProfileViewModel::class.java.simpleName
-
    val liveData: MutableLiveData<ViewState> = MutableLiveData()
    var devStream:DevStream = DevStream()
    var streamBundle: StreamBundle = StreamBundle()
--- a/app/src/main/java/com/aurora/store/viewmodel/details/MoreViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/details/MoreViewModel.kt
@@ -9,6 +9,7 @@ package com.aurora.store.viewmodel.details
 import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.aurora.extensions.TAG
 import com.aurora.gplayapi.data.models.App
 import com.aurora.gplayapi.helpers.AppDetailsHelper
 import dagger.assisted.Assisted
@@ -31,8 +32,6 @@ class MoreViewModel @AssistedInject constructor(
        fun create(dependencies: List<String>): MoreViewModel
    }

-    private val TAG = MoreViewModel::class.java.simpleName
-
    private val _dependentApps = MutableStateFlow<List<App>?>(emptyList())
    val dependentApps = _dependentApps.asStateFlow()

--- a/app/src/main/java/com/aurora/store/viewmodel/details/ReviewViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/details/ReviewViewModel.kt
@@ -10,6 +10,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.paging.PagingData
 import androidx.paging.cachedIn
+import com.aurora.extensions.TAG
 import com.aurora.gplayapi.data.models.Review
 import com.aurora.gplayapi.helpers.ReviewsHelper
 import com.aurora.store.data.paging.GenericPagingSource.Companion.manualPager
@@ -34,8 +35,6 @@ class ReviewViewModel @AssistedInject constructor(
        fun create(packageName: String): ReviewViewModel
    }

-    private val TAG = ReviewViewModel::class.java.simpleName
-
    private val _reviews = MutableStateFlow<PagingData<Review>>(PagingData.Companion.empty())
    val reviews = _reviews.asStateFlow()

--- a/app/src/main/java/com/aurora/store/viewmodel/downloads/DownloadsViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/downloads/DownloadsViewModel.kt
@@ -12,6 +12,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.paging.PagingData
 import androidx.paging.cachedIn
+import com.aurora.extensions.TAG
 import com.aurora.store.data.helper.DownloadHelper
 import com.aurora.store.data.installer.AppInstaller
 import com.aurora.store.data.paging.GenericPagingSource.Companion.pager
@@ -35,8 +36,6 @@ class DownloadsViewModel @Inject constructor(
    @ApplicationContext private val context: Context
 ) : ViewModel() {

-    private val TAG = DownloadsViewModel::class.java.simpleName
-
    private val _downloads = MutableStateFlow<PagingData<Download>>(PagingData.empty())
    val downloads = _downloads.asStateFlow()

--- a/app/src/main/java/com/aurora/store/viewmodel/homestream/StreamViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/homestream/StreamViewModel.kt
@@ -23,6 +23,7 @@ import android.util.Log
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.aurora.extensions.TAG
 import com.aurora.gplayapi.data.models.StreamBundle
 import com.aurora.gplayapi.data.models.StreamCluster
 import com.aurora.gplayapi.helpers.contracts.StreamContract
@@ -41,8 +42,6 @@ class StreamViewModel @Inject constructor(
    private val webStreamHelper: WebStreamHelper
 ) : ViewModel() {

-    private val TAG = StreamViewModel::class.java.simpleName
-
    val liveData: MutableLiveData<ViewState> = MutableLiveData()

    private val stash: HomeStash = mutableMapOf()
--- a/app/src/main/java/com/aurora/store/viewmodel/onboarding/OnboardingViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/onboarding/OnboardingViewModel.kt
@@ -14,6 +14,7 @@ import androidx.lifecycle.ViewModel
 import com.aurora.Constants.FLAVOUR_HUAWEI
 import com.aurora.Constants.PACKAGE_NAME_GMS
 import com.aurora.Constants.PACKAGE_NAME_PLAY_STORE
+import com.aurora.extensions.TAG
 import com.aurora.extensions.areNotificationsEnabled
 import com.aurora.extensions.isIgnoringBatteryOptimizations
 import com.aurora.store.AuroraApp
@@ -59,8 +60,6 @@ class OnboardingViewModel @Inject constructor(
    @ApplicationContext private val context: Context
 ) : ViewModel() {

-    private val TAG = OnboardingViewModel::class.java.simpleName
-
    val isMicroGPromptRequired = FlavouredUtil.promptMicroGInstall(context)

    var uiState by mutableStateOf(OnboardingUiState())
--- a/app/src/main/java/com/aurora/store/viewmodel/preferences/InstallerViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/preferences/InstallerViewModel.kt
@@ -11,6 +11,7 @@ import android.util.Log
 import androidx.core.content.edit
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.aurora.extensions.TAG
 import com.aurora.extensions.isMIUI
 import com.aurora.extensions.isMiuiOptimizationDisabled
 import com.aurora.extensions.observeAsStateFlow
@@ -35,7 +36,6 @@ class InstallerViewModel @Inject constructor(
 ) : ViewModel(), Shizuku.OnBinderReceivedListener, Shizuku.OnBinderDeadListener,
    Shizuku.OnRequestPermissionResultListener {

-    private val TAG = InstallerViewModel::class.java.simpleName
    private val sharedPreferences = Preferences.getPrefs(context)
    private var isShizukuAlive = Sui.isSui()

--- a/app/src/main/java/com/aurora/store/viewmodel/search/SearchViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/search/SearchViewModel.kt
@@ -12,6 +12,7 @@ import androidx.lifecycle.viewModelScope
 import androidx.paging.PagingData
 import androidx.paging.cachedIn
 import androidx.paging.filter
+import com.aurora.extensions.TAG
 import com.aurora.extensions.requiresGMS
 import com.aurora.gplayapi.SearchSuggestEntry
 import com.aurora.gplayapi.data.models.App
@@ -42,8 +43,6 @@ class SearchViewModel @Inject constructor(
    private val webSearchHelper: WebSearchHelper
 ) : ViewModel() {

-    private val TAG = SearchViewModel::class.java.simpleName
-
    private val contract: SearchContract
        get() = if (authProvider.isAnonymous) webSearchHelper else searchHelper

--- a/app/src/main/java/com/aurora/store/viewmodel/spoof/SpoofViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/spoof/SpoofViewModel.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.net.Uri
 import android.util.Log
 import androidx.lifecycle.ViewModel
+import com.aurora.extensions.TAG
 import com.aurora.store.data.providers.NativeDeviceInfoProvider
 import com.aurora.store.data.providers.SpoofProvider
 import com.aurora.store.util.PathUtil
@@ -21,8 +22,6 @@ class SpoofViewModel @Inject constructor(
    @ApplicationContext private val context: Context
 ) : ViewModel() {

-    private val TAG = SpoofViewModel::class.java.simpleName
-
    val defaultLocale: Locale = Locale.getDefault()
    val defaultProperties = NativeDeviceInfoProvider.getNativeDeviceProperties(context)

--- a/app/src/main/java/com/aurora/store/viewmodel/subcategory/CategoryStreamViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/subcategory/CategoryStreamViewModel.kt
@@ -23,6 +23,7 @@ import android.util.Log
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.aurora.extensions.TAG
 import com.aurora.gplayapi.data.models.StreamBundle
 import com.aurora.gplayapi.data.models.StreamCluster
 import com.aurora.gplayapi.helpers.contracts.CategoryStreamContract
@@ -40,8 +41,6 @@ class CategoryStreamViewModel @Inject constructor(
    private val webCategoryStreamHelper: WebCategoryStreamHelper
 ) : ViewModel() {

-    private val TAG = CategoryStreamViewModel::class.java.simpleName
-
    val liveData: MutableLiveData<ViewState> = MutableLiveData()

    private var stash: MutableMap<String, StreamBundle> = mutableMapOf()