Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Verified Commit 08753688 authored by Fahim M. Choudhury's avatar Fahim M. Choudhury
Browse files

refactor: resolve detekt issues for Search feature

parent 21028454
Loading
Loading
Loading
Loading
Loading
+0 −7
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@
    <ID>ProtectedMemberInFinalClass:ApplicationListFragment.kt$ApplicationListFragment$// protected to avoid SyntheticAccessor protected val args: ApplicationListFragmentArgs by navArgs()</ID>
    <ID>ProtectedMemberInFinalClass:ApplicationListFragment.kt$ApplicationListFragment$// protected to avoid SyntheticAccessor protected val viewModel: ApplicationListViewModel by viewModels()</ID>
    <ID>ProtectedMemberInFinalClass:GoogleSignInFragment.kt$GoogleSignInFragment$// protected to avoid SyntheticAccessor protected val viewModel: LoginViewModel by lazy { ViewModelProvider(requireActivity())[LoginViewModel::class.java] }</ID>
    <ID>ProtectedMemberInFinalClass:SearchFragment.kt$SearchFragment$protected val searchViewModel: SearchViewModel by viewModels()</ID>
    <ID>ReturnCount:ApkSignatureManager.kt$ApkSignatureManager$private fun verifyAPKSignature( apkInputStream: BufferedInputStream, apkSignatureInputStream: InputStream, publicKeyInputStream: InputStream, packageName: String ): Boolean</ID>
    <ID>ReturnCount:AppInstallProcessor.kt$AppInstallProcessor$private suspend fun updateDownloadUrls(appInstall: AppInstall): Boolean</ID>
    <ID>ReturnCount:AppInstallProcessor.kt$AppInstallProcessor$suspend fun enqueueFusedDownload( appInstall: AppInstall, isAnUpdate: Boolean = false, isSystemApp: Boolean = false )</ID>
@@ -125,7 +124,6 @@
    <ID>ReturnCount:PlayStoreAuthenticator.kt$PlayStoreAuthenticator$override suspend fun validateAuthData(): ResultSupreme&lt;AuthData?&gt;</ID>
    <ID>ReturnCount:PlayStoreAuthenticator.kt$PlayStoreAuthenticator$private suspend fun getAuthDataWithGoogleAccount(): ResultSupreme&lt;AuthData?&gt;</ID>
    <ID>ReturnCount:PrivacyInfoViewModel.kt$PrivacyInfoViewModel$fun shouldRequestExodusReport(application: Application?): Boolean</ID>
    <ID>ReturnCount:SearchRepositoryImpl.kt$SearchRepositoryImpl$private suspend fun replaceWithFDroid(gPlayApps: List&lt;Application&gt;): List&lt;Application&gt;</ID>
    <ID>ReturnCount:StorageNotificationManager.kt$StorageNotificationManager$private fun getSpaceMissing(appInstall: AppInstall, downloadId: Long? = null): Long</ID>
    <ID>ReturnCount:SystemAppsUpdatesRepository.kt$SystemAppsUpdatesRepository$private suspend fun getApplication( packageName: String, releaseType: OsReleaseType, sdkLevel: Int, device: String, ): Application?</ID>
    <ID>ReturnCount:SystemAppsUpdatesRepository.kt$SystemAppsUpdatesRepository$private suspend fun getReleaseDetailsUrl( systemAppProject: SystemAppProject, releaseType: OsReleaseType, ): String?</ID>
@@ -173,7 +171,6 @@
    <ID>TooGenericExceptionCaught:PlayStoreRepository.kt$PlayStoreRepository$exception: Exception</ID>
    <ID>TooGenericExceptionCaught:PwaManager.kt$PwaManager$e: Exception</ID>
    <ID>TooGenericExceptionCaught:PwaPlayerStatusReceiver.kt$PwaPlayerStatusReceiver$e: Exception</ID>
    <ID>TooGenericExceptionCaught:SearchRepositoryImpl.kt$SearchRepositoryImpl$e: Exception</ID>
    <ID>TooGenericExceptionCaught:SystemInfoProvider.kt$SystemInfoProvider$e: Exception</ID>
    <ID>TooGenericExceptionCaught:UpdatesManagerImpl.kt$UpdatesManagerImpl$e: Exception</ID>
    <ID>TooGenericExceptionCaught:UpdatesWorker.kt$UpdatesWorker$e: Throwable</ID>
@@ -188,19 +185,15 @@
    <ID>TooManyFunctions:ApplicationRepository.kt$ApplicationRepository</ID>
    <ID>TooManyFunctions:HomeFragment.kt$HomeFragment : TimeoutFragmentApplicationInstaller</ID>
    <ID>TooManyFunctions:MainActivityViewModel.kt$MainActivityViewModel : ViewModel</ID>
    <ID>TooManyFunctions:SearchFragment.kt$SearchFragment : TimeoutFragmentOnQueryTextListenerOnSuggestionListenerApplicationInstaller</ID>
    <ID>TooManyFunctions:TimeoutFragment.kt$TimeoutFragment : Fragment</ID>
    <ID>TooManyFunctions:UpdatesFragment.kt$UpdatesFragment : TimeoutFragmentApplicationInstaller</ID>
    <ID>UnusedParameter:PrivacyInfoViewModel.kt$PrivacyInfoViewModel$forced: Boolean = false</ID>
    <ID>UnusedParameter:SearchViewModel.kt$SearchViewModel$gPlayAuth: AuthObject.GPlayAuth</ID>
    <ID>UnusedPrivateProperty:SearchViewModel.kt$SearchViewModel.Companion$private const val DATA_LOAD_ERROR = "Data load error"</ID>
    <ID>UseCheckOrError:AppsApiImpl.kt$AppsApiImpl$throw IllegalStateException("Could not get store")</ID>
    <ID>UseCheckOrError:CleanApkAppsRepository.kt$CleanApkAppsRepository$throw IllegalStateException("No home data found")</ID>
    <ID>UseCheckOrError:CleanApkPwaRepository.kt$CleanApkPwaRepository$throw IllegalStateException("No home data found")</ID>
    <ID>UseCheckOrError:HomeApiImpl.kt$HomeApiImpl$throw IllegalStateException("Could not find store for $source")</ID>
    <ID>UseCheckOrError:PlayStoreRepository.kt$PlayStoreRepository$throw IllegalStateException("App version code cannot be 0")</ID>
    <ID>UseCheckOrError:PlayStoreRepository.kt$PlayStoreRepository$throw IllegalStateException("Could not get download details for $idOrPackageName")</ID>
    <ID>UseCheckOrError:SearchRepositoryImpl.kt$SearchRepositoryImpl$throw IllegalStateException("Could not get store")</ID>
    <ID>UseCheckOrError:Stores.kt$Stores$throw IllegalStateException("store not found")</ID>
    <ID>WildcardImport:SystemAppsUpdatesRepository.kt$import foundation.e.apps.data.gitlab.UpdatableSystemAppsApi.*</ID>
  </CurrentIssues>
+18 −24
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import foundation.e.apps.data.enums.Source
import foundation.e.apps.data.handleNetworkResult
import foundation.e.apps.data.login.exceptions.GPlayIOException
import foundation.e.apps.data.playstore.PlayStoreRepository
import timber.log.Timber
import javax.inject.Inject
import javax.inject.Singleton

@@ -254,7 +253,7 @@ class SearchRepositoryImpl @Inject constructor(
            }

            val searchResults = stores.getStore(source)?.getSearchResults(query)
                    ?: throw IllegalStateException("Could not get store")
                ?: error("Couldn't get Store for Source: $source")

            val apps = replaceWithFDroid(searchResults).toMutableList()
            if (searchResults.isNotEmpty()) {
@@ -281,8 +280,7 @@ class SearchRepositoryImpl @Inject constructor(
            return emptyList()
        }

        val replacedApps = try {
            when (val storeRepository = stores.getStore(Source.OPEN_SOURCE)) {
        val replacedApps = when (val storeRepository = stores.getStore(Source.OPEN_SOURCE)) {
            is CleanApkRepository -> {
                val packageNames = playStoreApps.map { it.package_name }
                val response = storeRepository.checkAvailablePackages(packageNames)
@@ -303,10 +301,6 @@ class SearchRepositoryImpl @Inject constructor(

            else -> playStoreApps
        }
        } catch (e: Exception) {
            Timber.w(e, "Failed to replace Play Store apps with their F-Droid counterparts.")
            playStoreApps
        }

        return replacedApps
    }
+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ class SearchFragment :
    private var _binding: FragmentSearchBinding? = null
    private val binding get() = _binding!!

    protected val searchViewModel: SearchViewModel by viewModels()
    val searchViewModel: SearchViewModel by viewModels()
    private val privacyInfoViewModel: PrivacyInfoViewModel by viewModels()
    private val appInfoFetchViewModel: AppInfoFetchViewModel by viewModels()
    val mainActivityViewModel: MainActivityViewModel by activityViewModels()