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

Commit 07ccca15 authored by Jonathan Klee's avatar Jonathan Klee
Browse files

style: fix detekt indentation warnings

parent 25fb039e

app/detekt-baseline.xml

+0 −33
Original line number Diff line number Diff line
@@ -18,11 +18,8 @@ 
    <ID>ArgumentListWrapping:DownloadManager.kt$DownloadManager$("Download Issue: $downloadId : DownloadManager returns status: $status but the failed because: reason: $reason")</ID>

    <ID>ArgumentListWrapping:DownloadManagerUtils.kt$DownloadManagerUtils$("===&gt; updateDownloadStatus: ${appInstall.name}: $downloadId: $numberOfDownloadedItems/${appInstall.downloadIdMap.size}")</ID>

    <ID>ArgumentListWrapping:HomeFragment.kt$HomeFragment$( this, mainActivityViewModel, appInfoFetchViewModel, viewLifecycleOwner )</ID>

    <ID>ArgumentListWrapping:InstallAppWorker.kt$InstallAppWorker$( atomicInteger.getAndIncrement(), notification)</ID>

    <ID>ArgumentListWrapping:MainActivity.kt$MainActivity$( ActivityResultContracts.StartActivityForResult())</ID>

    <ID>ArgumentListWrapping:MainActivity.kt$MainActivity$(R.string.message_app_available_later)</ID>

    <ID>ArgumentListWrapping:MainActivity.kt$MainActivity$(getString(R.string.message_app_available_later))</ID>

    <ID>ArgumentListWrapping:PwaManager.kt$PwaManager$( Uri.parse(PWA_PLAYER), null, null, null, null )</ID>

    <ID>ArgumentListWrapping:ResultSupreme.kt$ResultSupreme.Companion$( status, newData, message ?: result.message, exception ?: result.exception )</ID>

    <ID>ArgumentListWrapping:SearchFragment.kt$SearchFragment$( searchViewModel.searchText, false )</ID>

    <ID>ArgumentListWrapping:SystemAppsUpdatesRepository.kt$SystemAppsUpdatesRepository$(exception.message, "Android API isn't in supported range to update some system apps")</ID>
@@ -31,32 +28,14 @@ 
    <ID>ArgumentListWrapping:UpdatesNotifier.kt$UpdatesNotifier$(R.string.automatically_install_updates_notification_text)</ID>

    <ID>ArgumentListWrapping:UpdatesNotifier.kt$UpdatesNotifier$(context.getString(R.string.automatically_install_updates_notification_text))</ID>

    <ID>ArgumentListWrapping:UpdatesWorkManager.kt$UpdatesWorkManager$( UPDATES_WORK_NAME, existingPeriodicWorkPolicy, buildPeriodicWorkRequest(interval) )</ID>

    <ID>ArgumentListWrapping:ValidateAppAgeLimitUseCase.kt$ValidateAppAgeLimitUseCase$( "${app.packageName} - Content rating: ${app.contentRating.id} \n" + "Selected age group: $ageGroup \nAllowed content rating: $allowedContentRating")</ID>

    <ID>BlockCommentInitialStarAlignment:SystemAppsUpdatesRepository.kt$SystemAppsUpdatesRepository$/* TODO manually add new supported android version when they will be supported. * VANILLA_ICE_CREAM (A15) =&gt; https://gitlab.e.foundation/e/os/backlog/-/issues/2772 * BAKLAVA (A16) =&gt; https://gitlab.e.foundation/e/os/backlog/-/issues/2773 */</ID>

    <ID>ChainWrapping:DownloadManagerUtils.kt$DownloadManagerUtils$||</ID>

    <ID>ChainWrapping:HomeViewModel.kt$HomeViewModel$||</ID>

    <ID>ChainWrapping:NetworkHandler.kt$&amp;&amp;</ID>

    <ID>ChainWrapping:ValidateAppAgeLimitUseCase.kt$ValidateAppAgeLimitUseCase$&amp;&amp;</ID>

    <ID>EmptyCatchBlock:NativeDeviceInfoProviderModule.kt$NativeDeviceInfoProviderModule${ }</ID>

    <ID>EmptyFunctionBlock:CleanApkAuthenticator.kt$CleanApkAuthenticator${}</ID>

    <ID>FinalNewline:ContentRatingValidity.kt$foundation.e.apps.domain.model.ContentRatingValidity.kt</ID>

    <ID>FunctionReturnTypeSpacing:AppPrivacyInfoRepositoryImpl.kt$AppPrivacyInfoRepositoryImpl$private suspend fun fetchReports(packageName: String) : List&lt;Report&gt;</ID>

    <ID>FunctionReturnTypeSpacing:CategoryApiImpl.kt$CategoryApiImpl$override suspend fun getCategoriesList(type: CategoryType) : List&lt;CategoriesResponse&gt;</ID>

    <ID>FunctionStartOfBodySpacing:RetrofitApiModule.kt$RetrofitApiModule$@Singleton @Provides fun provideCleanApkApi( okHttpClient: OkHttpClient, @Named("gsonCustomAdapter") gson: Gson ): CleanApkRetrofit</ID>

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

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

    <ID>Indentation:ContentRatingValidity.kt$ContentRatingValidity$ </ID>

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

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

    <ID>Indentation:InstallAppWorker.kt$InstallAppWorker$ </ID>

    <ID>Indentation:MainActivity.kt$MainActivity$ </ID>

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

    <ID>Indentation:PwaManager.kt$PwaManager$ </ID>

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

    <ID>Indentation:Source.kt$Source$ </ID>

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

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

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

    <ID>InstanceOfCheckForException:GPlayHttpClient.kt$GPlayHttpClient$e is SocketTimeoutException</ID>

    <ID>InvalidPackageDeclaration:Trackers.kt$package foundation.e.apps.data.exodus</ID>

    <ID>LargeClass:ApplicationFragment.kt$ApplicationFragment : TimeoutFragment</ID>
@@ -120,7 +99,6 @@ 
    <ID>MaxLineLength:FDroidRepository.kt$FDroidRepository$if</ID>

    <ID>MaxLineLength:FDroidRepository.kt$FDroidRepository$override suspend</ID>

    <ID>MaxLineLength:GoogleLoginManager.kt$GoogleLoginManager$authData = AuthHelper.build(email, aasToken, tokenType = AuthHelper.Token.AAS, properties = nativeDeviceProperty)</ID>

    <ID>MaxLineLength:MainActivity.kt$MainActivity$if</ID>

    <ID>MaxLineLength:MainActivity.kt$MainActivity$is InternalException.AppNotPurchased -&gt; showSnackbarMessage(getString(R.string.message_app_available_later))</ID>

    <ID>MaxLineLength:MainActivityViewModel.kt$MainActivityViewModel$fusedDownload.source == it.source &amp;&amp; (fusedDownload.packageName == it.package_name || fusedDownload.id == it._id)</ID>

    <ID>MaxLineLength:PrivacyScoreRepositoryImpl.kt$PrivacyScoreRepositoryImpl$return if (numberOfTrackers &gt; THRESHOLD_OF_NON_ZERO_TRACKER_SCORE) MIN_TRACKER_SCORE else MAX_TRACKER_SCORE - numberOfTrackers</ID>
@@ -193,7 +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>NewLineAtEndOfFile:ContentRatingValidity.kt$foundation.e.apps.domain.model.ContentRatingValidity.kt</ID>

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

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

    <ID>NoBlankLineBeforeRbrace:ApplicationListRVAdapter.kt$ApplicationListRVAdapter$ </ID>
@@ -207,7 +184,6 @@ 
    <ID>NoBlankLineBeforeRbrace:UpdatesManagerRepository.kt$UpdatesManagerRepository$ </ID>

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

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

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

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

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

    <ID>NoConsecutiveBlankLines:CommonUtilsModule.kt$CommonUtilsModule$ </ID>
@@ -247,7 +223,6 @@ 
    <ID>NoMultipleSpaces:PrivacyInfoViewModel.kt$PrivacyInfoViewModel$ </ID>

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

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

    <ID>NoSemicolons:AuthDataProvider.kt$AuthDataProvider$;</ID>

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

    <ID>NoUnusedImports:AppLoungePackageManager.kt$foundation.e.apps.install.pkg.AppLoungePackageManager.kt</ID>

    <ID>NoUnusedImports:AppManagerImpl.kt$foundation.e.apps.data.install.AppManagerImpl.kt</ID>
@@ -266,9 +241,6 @@ 
    <ID>NoUnusedImports:UpdatesFragment.kt$foundation.e.apps.ui.updates.UpdatesFragment.kt</ID>

    <ID>NoUnusedImports:UpdatesNotifier.kt$foundation.e.apps.install.updates.UpdatesNotifier.kt</ID>

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

    <ID>ParameterListWrapping:AuthDataProvider.kt$AuthDataProvider$(uri: Uri, projection: Array&lt;String&gt;?, selection: String?, selectionArgs: Array&lt;String&gt;?, sortOrder: String?)</ID>

    <ID>ParameterListWrapping:AuthDataProvider.kt$AuthDataProvider$(uri: Uri, values: ContentValues?, selection: String?, selectionArgs: Array&lt;String&gt;?)</ID>

    <ID>ParameterListWrapping:ContentRatingValidity.kt$ContentRatingValidity$(val isValid: Boolean, val contentRating: ContentRating? = null, val requestPin: Boolean = false)</ID>

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

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

    <ID>PrintStackTrace:EcloudRepository.kt$EcloudRepository$e</ID>
@@ -303,7 +275,6 @@ 
    <ID>SpacingAroundComma:HomeFragment.kt$HomeFragment$,</ID>

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

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

    <ID>SpacingAroundCurly:RetrofitApiModule.kt$RetrofitApiModule${</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>
@@ -379,13 +350,9 @@ 
    <ID>WildcardImport:SystemAppsUpdatesRepository.kt$import foundation.e.apps.data.gitlab.UpdatableSystemAppsApi.*</ID>

    <ID>Wrapping:AppInstallProcessor.kt$AppInstallProcessor$(</ID>

    <ID>Wrapping:ApplicationDeserializer.kt$ApplicationDeserializer$(</ID>

    <ID>Wrapping:AuthDataProvider.kt$AuthDataProvider$(</ID>

    <ID>Wrapping:ContentRatingValidity.kt$ContentRatingValidity$(</ID>

    <ID>Wrapping:InstallAppWorker.kt$InstallAppWorker$(</ID>

    <ID>Wrapping:MainActivity.kt$MainActivity$(</ID>

    <ID>Wrapping:MainActivity.kt$MainActivity$(this, object : OnBackPressedCallback(true) { override fun handleOnBackPressed() { if (isInitialScreen()) { resetIgnoreStatusForSessionRefresh() finish() } else { // Let the system handle the back press isEnabled = false onBackPressedDispatcher.onBackPressed() } } })</ID>

    <ID>Wrapping:SearchFragment.kt$SearchFragment$Fragment(R.layout.fragment_search), ApplicationInstaller, SearchViewHandler.SearchViewListener</ID>

    <ID>Wrapping:SystemAppsUpdatesRepository.kt$SystemAppsUpdatesRepository$(</ID>

    <ID>Wrapping:ValidateAppAgeLimitUseCase.kt$ValidateAppAgeLimitUseCase$(</ID>

  </CurrentIssues>

</SmellBaseline>

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

+4 −2
Original line number Diff line number Diff line
@@ -113,8 +113,10 @@ private fun calculateRetryDelay(retryDelayInSecond: Int) = 




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

    result is ResultSupreme<*> && !result.isSuccess() && retryDelayInSecond < MAX_RETRY_DELAY_IN_SECONDS

            && isExceptionAllowedToRetry(result.exception)

    result is ResultSupreme<*> &&

        !result.isSuccess() &&

        retryDelayInSecond < MAX_RETRY_DELAY_IN_SECONDS &&

        isExceptionAllowedToRetry(result.exception)



private fun isExceptionAllowedToRetry(exception: Exception?): Boolean {

    // Here, (value != true) is used, because value can be null also and we want to allow retry for null message

app/src/main/java/foundation/e/apps/data/gitlab/SystemAppsUpdatesRepository.kt

+5 −4
Original line number Diff line number Diff line
@@ -92,7 +92,8 @@ class SystemAppsUpdatesRepository @Inject constructor( 
        }

    }



    private fun isEligibleToFetchAppListFromTest(systemName: String) = systemName.isBlank() ||

    private fun isEligibleToFetchAppListFromTest(systemName: String) =

        systemName.isBlank() ||

            systemName.contains("beta") ||

            systemName.contains("rc") ||

            systemName.contains("test")

app/src/main/java/foundation/e/apps/di/network/RetrofitApiModule.kt

+1 −2
Original line number Diff line number Diff line
@@ -49,8 +49,7 @@ class RetrofitApiModule { 
    fun provideCleanApkApi(

        okHttpClient: OkHttpClient,

        @Named("gsonCustomAdapter") gson: Gson

    ): CleanApkRetrofit

    {

    ): CleanApkRetrofit {

        return Retrofit.Builder()

            .baseUrl(CleanApkRetrofit.BASE_URL)

            .client(okHttpClient)

app/src/main/java/foundation/e/apps/domain/ValidateAppAgeLimitUseCase.kt

+5 −4
Original line number Diff line number Diff line
@@ -129,7 +129,8 @@ class ValidateAppAgeLimitUseCase @Inject constructor( 


            Timber.d(

                "${app.packageName} - Content rating: ${app.contentRating.id} \n" +

                        "Selected age group: $ageGroup \nAllowed content rating: $allowedContentRating")

                    "Selected age group: $ageGroup \nAllowed content rating: $allowedContentRating"

            )



            val isValid = isValidAppAgeRating(app, allowedContentRating)

            return ResultSupreme.Success(