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

Commit 155a5de1 authored by Jonathan Klee's avatar Jonathan Klee
Browse files

Merge branch '0000-a15-fix-misc-style-detekt-errors' into 'main' 

Fix misc styling detekt errors

See merge request !635
parents c653df65 3fe63943

app/detekt-baseline.xml

+0 −65
Original line number Diff line number Diff line
@@ -171,59 +171,6 @@ 
    <ID>MultiLineIfElse:SearchViewModel.kt$SearchViewModel$searchRepository.getSearchSuggestions(it)</ID>

    <ID>MultiLineIfElse:SettingsFragment.kt$SettingsFragment$true</ID>

    <ID>MultiLineIfElse:ValidateAppAgeLimitUseCase.kt$ValidateAppAgeLimitUseCase$fetchedContentRating</ID>

    <ID>NoBlankLineBeforeRbrace:AgeGroupApi.kt$AgeGroupApi$ </ID>

    <ID>NoBlankLineBeforeRbrace:AgeRatingProvider.kt$AgeRatingProvider$ </ID>

    <ID>NoBlankLineBeforeRbrace:ApplicationListRVAdapter.kt$ApplicationListRVAdapter$ </ID>

    <ID>NoBlankLineBeforeRbrace:ContentRatingDao.kt$ContentRatingDao$ </ID>

    <ID>NoBlankLineBeforeRbrace:FDroidAntiFeatureRepository.kt$FDroidAntiFeatureRepository$ </ID>

    <ID>NoBlankLineBeforeRbrace:FDroidMonitorApi.kt$FDroidMonitorApi$ </ID>

    <ID>NoBlankLineBeforeRbrace:NetworkHandler.kt$ </ID>

    <ID>NoBlankLineBeforeRbrace:RetrofitApiModule.kt$RetrofitApiModule$ </ID>

    <ID>NoBlankLineBeforeRbrace:SystemAppDefinitionApi.kt$SystemAppDefinitionApi$ </ID>

    <ID>NoBlankLineBeforeRbrace:UpdatableSystemAppsApi.kt$UpdatableSystemAppsApi$ </ID>

    <ID>NoBlankLineBeforeRbrace:UpdatesManagerRepository.kt$UpdatesManagerRepository$ </ID>

    <ID>NoBlankLineBeforeRbrace:ValidateAppAgeLimitUseCase.kt$ValidateAppAgeLimitUseCase$ </ID>

    <ID>NoConsecutiveBlankLines:ApplicationRepository.kt$ApplicationRepository$ </ID>

    <ID>NoConsecutiveBlankLines:CategoriesViewModel.kt$CategoriesViewModel$ </ID>

    <ID>NoConsecutiveBlankLines:CleanApkSearchHelper.kt$ </ID>

    <ID>NoConsecutiveBlankLines:CommonUtilsModule.kt$CommonUtilsModule$ </ID>

    <ID>NoConsecutiveBlankLines:DumpAppInstallStatusReceiver.kt$ </ID>

    <ID>NoConsecutiveBlankLines:GPlayHttpClient.kt$GPlayHttpClient$ </ID>

    <ID>NoConsecutiveBlankLines:NetworkHandler.kt$ </ID>

    <ID>NoConsecutiveBlankLines:PlayStoreSearchHelper.kt$ </ID>

    <ID>NoConsecutiveBlankLines:Report.kt$ </ID>

    <ID>NoEmptyFirstLineInMethodBlock:AgeRatingProvider.kt$AgeRatingProvider$ </ID>

    <ID>NoEmptyFirstLineInMethodBlock:AppInstallProcessor.kt$AppInstallProcessor$ </ID>

    <ID>NoEmptyFirstLineInMethodBlock:AppLoungePackageManager.kt$AppLoungePackageManager$ </ID>

    <ID>NoEmptyFirstLineInMethodBlock:ApplicationListFragment.kt$ApplicationListFragment$ </ID>

    <ID>NoEmptyFirstLineInMethodBlock:ApplicationListViewModel.kt$ApplicationListViewModel$ </ID>

    <ID>NoEmptyFirstLineInMethodBlock:ApplicationViewModel.kt$ApplicationViewModel$ </ID>

    <ID>NoEmptyFirstLineInMethodBlock:AppsApiImpl.kt$AppsApiImpl$ </ID>

    <ID>NoEmptyFirstLineInMethodBlock:AuthDataProvider.kt$AuthDataProvider$ </ID>

    <ID>NoEmptyFirstLineInMethodBlock:AuthenticatorRepository.kt$AuthenticatorRepository$ </ID>

    <ID>NoEmptyFirstLineInMethodBlock:CategoryApiImpl.kt$CategoryApiImpl$ </ID>

    <ID>NoEmptyFirstLineInMethodBlock:CleanApkAppsRepository.kt$CleanApkAppsRepository$ </ID>

    <ID>NoEmptyFirstLineInMethodBlock:DownloadManagerUtils.kt$DownloadManagerUtils$ </ID>

    <ID>NoEmptyFirstLineInMethodBlock:FileManager.kt$FileManager$ </ID>

    <ID>NoEmptyFirstLineInMethodBlock:HomeApiImpl.kt$HomeApiImpl$ </ID>

    <ID>NoEmptyFirstLineInMethodBlock:LoadingViewModel.kt$LoadingViewModel$ </ID>

    <ID>NoEmptyFirstLineInMethodBlock:PlayStoreAuthenticator.kt$PlayStoreAuthenticator$ </ID>

    <ID>NoEmptyFirstLineInMethodBlock:SearchFragment.kt$SearchFragment$ </ID>

    <ID>NoEmptyFirstLineInMethodBlock:SettingsFragment.kt$SettingsFragment$ </ID>

    <ID>NoEmptyFirstLineInMethodBlock:StorageNotificationManager.kt$StorageNotificationManager$ </ID>

    <ID>NoEmptyFirstLineInMethodBlock:SystemAppsUpdatesRepository.kt$SystemAppsUpdatesRepository$ </ID>

    <ID>NoEmptyFirstLineInMethodBlock:TOSFragment.kt$TOSFragment$ </ID>

    <ID>NoEmptyFirstLineInMethodBlock:TimeoutFragment.kt$TimeoutFragment$ </ID>

    <ID>NoEmptyFirstLineInMethodBlock:UpdatesManagerImpl.kt$UpdatesManagerImpl$ </ID>

    <ID>NoEmptyFirstLineInMethodBlock:ValidateAppAgeLimitUseCase.kt$ValidateAppAgeLimitUseCase$ </ID>

    <ID>NoMultipleSpaces:AppLoungeDataStore.kt$AppLoungeDataStore$ </ID>

    <ID>NoMultipleSpaces:AppLoungePreference.kt$AppLoungePreference$ </ID>

    <ID>NoMultipleSpaces:CleanApkPwaRepository.kt$CleanApkPwaRepository$ </ID>

    <ID>NoMultipleSpaces:ExodusUriGenerator.kt$ExodusUriGenerator$ </ID>

    <ID>NoMultipleSpaces:PrivacyInfoViewModel.kt$PrivacyInfoViewModel$ </ID>

    <ID>NoMultipleSpaces:SearchViewModel.kt$SearchViewModel$ </ID>

    <ID>NoSemicolons:AgeRatingProvider.kt$AgeRatingProvider.UriCode.AgeRating$;</ID>

    <ID>NoTrailingSpaces:DownloadInfoApiImpl.kt$DownloadInfoApiImpl$ </ID>

    <ID>NoWildcardImports:SystemAppsUpdatesRepository.kt$import foundation.e.apps.data.gitlab.UpdatableSystemAppsApi.*</ID>

    <ID>PrintStackTrace:AppPrivacyInfoRepositoryImpl.kt$AppPrivacyInfoRepositoryImpl$e</ID>

    <ID>PrintStackTrace:CommonUtilsModule.kt$CommonUtilsModule$e</ID>
@@ -252,18 +199,6 @@ 
    <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>

    <ID>ReturnCount:UpdatesManagerImpl.kt$UpdatesManagerImpl$private suspend fun calculateSignatureVersion(latestCleanapkApp: Application): String</ID>

    <ID>SpacingAroundColon:AppEvent.kt$AppEvent.SuccessfulLogin$:</ID>

    <ID>SpacingAroundColon:AppPrivacyInfoRepositoryImpl.kt$AppPrivacyInfoRepositoryImpl$:</ID>

    <ID>SpacingAroundColon:CategoryApiImpl.kt$CategoryApiImpl$:</ID>

    <ID>SpacingAroundColon:GPlayException.kt$GPlayIOException$:</ID>

    <ID>SpacingAroundComma:HomeFragment.kt$HomeFragment$,</ID>

    <ID>SpacingAroundComma:StorageComputer.kt$StorageComputer$,</ID>

    <ID>SpacingAroundCurly:ApplicationListRVAdapter.kt$ApplicationListRVAdapter${</ID>

    <ID>SpacingAroundKeyword:SystemAppsUpdatesRepository.kt$SystemAppsUpdatesRepository$catch</ID>

    <ID>SpacingAroundParens:NetworkStatusManager.kt$NetworkStatusManager$(</ID>

    <ID>SpacingBetweenDeclarationsWithAnnotations:ApplicationDialogFragment.kt$ApplicationDialogFragment$@DrawableRes private var drawableResId: Int = -1</ID>

    <ID>SpacingBetweenDeclarationsWithAnnotations:LocaleChangedBroadcastReceiver.kt$LocaleChangedBroadcastReceiver$@Inject lateinit var cache: Cache</ID>

    <ID>SpacingBetweenDeclarationsWithAnnotations:LocaleChangedBroadcastReceiver.kt$LocaleChangedBroadcastReceiver$@Inject lateinit var json: Json</ID>

    <ID>SpreadOperator:DownloadProgressLD.kt$DownloadProgressLD$(*downloadingIds.toLongArray())</ID>

    <ID>SpreadOperator:EglExtensionProvider.kt$EglExtensionProvider$(*`as`)</ID>

    <ID>SpreadOperator:NativeDeviceInfoProviderModule.kt$NativeDeviceInfoProviderModule$(*context.assets.locales)</ID>

app/src/main/java/foundation/e/apps/data/NetworkHandler.kt

+0 −2
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ suspend fun <T> retryWithBackoff(retryDelayInSeconds: Int = -1, operation: suspe 
            Timber.w("Retrying...: $retryDelayInSeconds")

            result = retryWithBackoff(calculateRetryDelay(retryDelayInSeconds), operation)

        }



    } catch (e: Exception) {

        Timber.e(e)

        if (retryDelayInSeconds < MAX_RETRY_DELAY_IN_SECONDS) {
@@ -111,7 +110,6 @@ suspend fun <T> retryWithBackoff(retryDelayInSeconds: Int = -1, operation: suspe 
private fun calculateRetryDelay(retryDelayInSecond: Int) =

    if (retryDelayInSecond < 0) INITIAL_DELAY_RETRY_IN_SECONDS else retryDelayInSecond * 2





private fun <T> shouldRetry(result: T, retryDelayInSecond: Int) =

    result is ResultSupreme<*> &&

        !result.isSuccess() &&

app/src/main/java/foundation/e/apps/data/application/ApplicationRepository.kt

+8 −9
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ class ApplicationRepository @Inject constructor( 
        const val APP_TYPE_PWA = "pwa"

    }





    suspend fun getHomeScreenData(): LiveData<ResultSupreme<List<Home>>> {

        return homeApi.fetchHomeScreenData()

    }

app/src/main/java/foundation/e/apps/data/application/apps/AppsApiImpl.kt

+0 −2
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ class AppsApiImpl @Inject constructor( 
    private val stores: Stores,

    private val applicationDataManager: ApplicationDataManager

) : AppsApi {



    override suspend fun getCleanapkAppDetails(packageName: String): Pair<Application, ResultStatus> {

        var application = Application()

        val result = handleNetworkResult {
@@ -142,7 +141,6 @@ class AppsApiImpl @Inject constructor( 
        var application: Application



        val result = handleNetworkResult {



            val store = stores.getStore(source)

                ?: throw IllegalStateException("Could not get store")

app/src/main/java/foundation/e/apps/data/application/category/CategoryApiImpl.kt

+1 −3
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ class CategoryApiImpl @Inject constructor( 
    private val stores: Stores,

    private val applicationDataManager: ApplicationDataManager

) : CategoryApi {



    override suspend fun getCategoriesList(type: CategoryType): List<CategoriesResponse> {

        val categoryResponses = mutableListOf<CategoriesResponse>()
@@ -155,7 +154,6 @@ class CategoryApiImpl @Inject constructor( 
        category: String,

        pageUrl: String?

    ): ResultSupreme<Pair<List<Application>, String>> {



        return handleNetworkResult {

            val cluster =

                appSources.gplayRepo.getAppsByCategory(category, pageUrl)