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

Commit 0e636152 authored by Jonathan Klee's avatar Jonathan Klee
Browse files

Merge branch '0000-s-more-renamings-again' into 'main' 

Some more renamings

See merge request !393
parents 0617481c bd9a2605

app/detekt-baseline.xml

+19 −20
Original line number Diff line number Diff line
@@ -30,19 +30,20 @@ 
    <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>

    <ID>LongParameterList:AppManagerImpl.kt$AppManagerImpl$( @Named("cacheDir") private val cacheDir: String, private val downloadManager: DownloadManager, private val notificationManager: NotificationManager, private val appInstallRepository: AppInstallRepository, private val pwaManager: PWAManager, private val appLoungePackageManager: AppLoungePackageManager, @Named("download") private val downloadNotificationChannel: NotificationChannel, @Named("update") private val updateNotificationChannel: NotificationChannel, @ApplicationContext private val context: Context )</ID>

    <ID>LongParameterList:ApplicationDialogFragment.kt$ApplicationDialogFragment$( title: String, message: String, @DrawableRes drawableResId: Int = -1, drawable: Drawable? = null, positiveButtonText: String = "", positiveButtonAction: (() -&gt; Unit)? = null, cancelButtonText: String = "", cancelButtonAction: (() -&gt; Unit)? = null, cancelable: Boolean = true, onDismissListener: (() -&gt; Unit)? = null, )</ID>

    <ID>LongParameterList:ApplicationListRVAdapter.kt$ApplicationListRVAdapter$( private val applicationInstaller: ApplicationInstaller, private val privacyInfoViewModel: PrivacyInfoViewModel, private val appInfoFetchViewModel: AppInfoFetchViewModel, private val mainActivityViewModel: MainActivityViewModel, private val currentDestinationId: Int, private var lifecycleOwner: LifecycleOwner?, private var paidAppHandler: ((Application) -&gt; Unit)? = null )</ID>

    <ID>LongParameterList:ApplicationViewModel.kt$ApplicationViewModel$( id: String, packageName: String, origin: Origin, isFdroidLink: Boolean, authObjectList: List&lt;AuthObject&gt;, retryBlock: (failedObjects: List&lt;AuthObject&gt;) -&gt; Boolean, )</ID>

    <ID>LongParameterList:CleanApkRetrofit.kt$CleanApkRetrofit$( @Query("keyword") keyword: String, @Query("source") source: String = APP_SOURCE_FOSS, @Query("type") type: String = APP_TYPE_ANY, @Query("nres") nres: Int = 20, @Query("page") page: Int = 1, @Query("by") by: String? = null, )</ID>

    <ID>LongParameterList:EglExtensionProvider.kt$EglExtensionProvider$( egl10: EGL10, eglDisplay: EGLDisplay, eglConfig: EGLConfig?, ai: IntArray, ai1: IntArray?, set: MutableSet&lt;String&gt; )</ID>

    <ID>LongParameterList:FusedManagerImpl.kt$FusedManagerImpl$( @Named("cacheDir") private val cacheDir: String, private val downloadManager: DownloadManager, private val notificationManager: NotificationManager, private val fusedDownloadRepository: FusedDownloadRepository, private val pwaManager: PWAManager, private val appLoungePackageManager: AppLoungePackageManager, @Named("download") private val downloadNotificationChannel: NotificationChannel, @Named("update") private val updateNotificationChannel: NotificationChannel, @ApplicationContext private val context: Context )</ID>

    <ID>LongParameterList:MainActivityViewModel.kt$MainActivityViewModel$( private val appLoungeDataStore: AppLoungeDataStore, private val applicationRepository: ApplicationRepository, private val fusedManagerRepository: FusedManagerRepository, private val appLoungePackageManager: AppLoungePackageManager, private val pwaManager: PWAManager, private val ecloudRepository: EcloudRepository, private val blockedAppRepository: BlockedAppRepository, private val appInstallProcessor: AppInstallProcessor, )</ID>

    <ID>LongParameterList:MainActivityViewModel.kt$MainActivityViewModel$( private val appLoungeDataStore: AppLoungeDataStore, private val applicationRepository: ApplicationRepository, private val appManagerWrapper: AppManagerWrapper, private val appLoungePackageManager: AppLoungePackageManager, private val pwaManager: PWAManager, private val ecloudRepository: EcloudRepository, private val blockedAppRepository: BlockedAppRepository, private val appInstallProcessor: AppInstallProcessor, )</ID>

    <ID>LongParameterList:UpdatesManagerImpl.kt$UpdatesManagerImpl$( @ApplicationContext private val context: Context, private val appLoungePackageManager: AppLoungePackageManager, private val applicationRepository: ApplicationRepository, private val faultyAppRepository: FaultyAppRepository, private val appLoungePreference: AppLoungePreference, private val fdroidRepository: FdroidRepository, private val blockedAppRepository: BlockedAppRepository, )</ID>

    <ID>LongParameterList:UpdatesWorker.kt$UpdatesWorker$( @Assisted private val context: Context, @Assisted private val params: WorkerParameters, private val updatesManagerRepository: UpdatesManagerRepository, private val dataStoreManager: DataStoreManager, private val authenticatorRepository: AuthenticatorRepository, private val appInstallProcessor: AppInstallProcessor, private val blockedAppRepository: BlockedAppRepository, )</ID>

    <ID>MagicNumber:AnonymousLoginManager.kt$AnonymousLoginManager$200</ID>

    <ID>MagicNumber:ApkSignatureManager.kt$ApkSignatureManager$1024</ID>

    <ID>MagicNumber:AppDatabase.kt$AppDatabase.Companion.&lt;no name provided&gt;$3</ID>

    <ID>MagicNumber:AppDatabase.kt$AppDatabase.Companion.&lt;no name provided&gt;$4</ID>

    <ID>MagicNumber:AppManagerWrapper.kt$AppManagerWrapper$100</ID>

    <ID>MagicNumber:ApplicationFragment.kt$ApplicationFragment$100f</ID>

    <ID>MagicNumber:ApplicationFragment.kt$ApplicationFragment$15</ID>

    <ID>MagicNumber:ApplicationFragment.kt$ApplicationFragment$3</ID>
@@ -64,7 +65,6 @@ 
    <ID>MagicNumber:EglExtensionProvider.kt$EglExtensionProvider$4</ID>

    <ID>MagicNumber:EglExtensionProvider.kt$EglExtensionProvider$7939</ID>

    <ID>MagicNumber:FileManager.kt$FileManager$1024</ID>

    <ID>MagicNumber:FusedManagerRepository.kt$FusedManagerRepository$100</ID>

    <ID>MagicNumber:HomeChildRVAdapter.kt$HomeChildRVAdapter$0.6f</ID>

    <ID>MagicNumber:HomeChildRVAdapter.kt$HomeChildRVAdapter$0.7f</ID>

    <ID>MagicNumber:HomeChildRVAdapter.kt$HomeChildRVAdapter$500</ID>
@@ -80,20 +80,19 @@ 
    <ID>MagicNumber:StorageComputer.kt$StorageComputer$500</ID>

    <ID>MagicNumber:StorageComputer.kt$StorageComputer$999950</ID>

    <ID>MagicNumber:TOSFragment.kt$TOSFragment$20</ID>

    <ID>MaxLineLength:AppInstallProcessor.kt$AppInstallProcessor$"Enqueuing App install work is failed for ${fusedDownload.packageName} exception: ${e.localizedMessage}"</ID>

    <ID>MaxLineLength:AppManagerImpl.kt$AppManagerImpl$.</ID>

    <ID>MaxLineLength:AppManagerImpl.kt$AppManagerImpl$return</ID>

    <ID>MaxLineLength:AppManagerWrapper.kt$AppManagerWrapper$downloadList.find { it.origin == app.origin &amp;&amp; (it.packageName == app.package_name || it.id == app.package_name) }</ID>

    <ID>MaxLineLength:AppManagerWrapper.kt$AppManagerWrapper$return fdroidRepository.isFdroidApplicationSigned(context, appInstall.packageName, apkFilePath, appInstall.signature)</ID>

    <ID>MaxLineLength:AppManagerWrapper.kt$AppManagerWrapper$suspend</ID>

    <ID>MaxLineLength:AppPrivacyInfo.kt$AppPrivacyInfo</ID>

    <ID>MaxLineLength:ApplicationFragment.kt$ApplicationFragment.Companion$"https://gitlab.e.foundation/e/os/apps/-/blob/main/app/src/main/java/foundation/e/apps/data/exodus/repositories/PrivacyScoreRepositoryImpl.kt"</ID>

    <ID>MaxLineLength:CommonUtilsModule.kt$CommonUtilsModule$*</ID>

    <ID>MaxLineLength:DownloadManager.kt$DownloadManager$Timber.e("Download Issue: $downloadId : DownloadManager returns status: $status but the failed because: reason: $reason")</ID>

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

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

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

    <ID>MaxLineLength:DownloadManagerUtils.kt$DownloadManagerUtils$numberOfDownloadedItems == fusedDownload.downloadIdMap.size &amp;&amp; numberOfDownloadedItems == fusedDownload.downloadURLList.size</ID>

    <ID>MaxLineLength:DownloadManagerUtils.kt$DownloadManagerUtils$numberOfDownloadedItems == appInstall.downloadIdMap.size &amp;&amp; numberOfDownloadedItems == appInstall.downloadURLList.size</ID>

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

    <ID>MaxLineLength:FusedManagerImpl.kt$FusedManagerImpl$.</ID>

    <ID>MaxLineLength:FusedManagerImpl.kt$FusedManagerImpl$return</ID>

    <ID>MaxLineLength:FusedManagerRepository.kt$FusedManagerRepository$downloadList.find { it.origin == app.origin &amp;&amp; (it.packageName == app.package_name || it.id == app.package_name) }</ID>

    <ID>MaxLineLength:FusedManagerRepository.kt$FusedManagerRepository$return fdroidRepository.isFdroidApplicationSigned(context, fusedDownload.packageName, apkFilePath, fusedDownload.signature)</ID>

    <ID>MaxLineLength:FusedManagerRepository.kt$FusedManagerRepository$suspend</ID>

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

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

    <ID>MaxLineLength:PlayStoreRepository.kt$PlayStoreRepository$suspend fun getSearchResult(query: String, subBundle: MutableSet&lt;SearchBundle.SubBundle&gt;?): Pair&lt;List&lt;App&gt;, MutableSet&lt;SearchBundle.SubBundle&gt;&gt;</ID>
@@ -115,18 +114,18 @@ 
    <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(fusedDownload: FusedDownload): Boolean</ID>

    <ID>ReturnCount:AppInstallProcessor.kt$AppInstallProcessor$suspend fun enqueueFusedDownload( fusedDownload: FusedDownload, isAnUpdate: Boolean = false )</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 )</ID>

    <ID>ReturnCount:AppManagerWrapper.kt$AppManagerWrapper$suspend fun addDownload(appInstall: AppInstall): Boolean</ID>

    <ID>ReturnCount:AppManagerWrapper.kt$AppManagerWrapper$suspend fun calculateProgress( application: Application?, progress: DownloadProgress ): Int</ID>

    <ID>ReturnCount:AppPrivacyInfoRepositoryImpl.kt$AppPrivacyInfoRepositoryImpl$override suspend fun getAppPrivacyInfo( application: Application, appHandle: String ): Result&lt;AppPrivacyInfo&gt;</ID>

    <ID>ReturnCount:AppPrivacyInfoRepositoryImpl.kt$AppPrivacyInfoRepositoryImpl$private fun getAppPrivacyInfo( application: Application, appTrackerData: List&lt;Report&gt;, ): AppPrivacyInfo</ID>

    <ID>ReturnCount:DownloadManager.kt$DownloadManager$fun getSizeRequired(downloadId: Long): Long</ID>

    <ID>ReturnCount:DownloadManager.kt$DownloadManager$private fun sanitizeStatus(downloadId: Long, status: Int, reason: Int): Int</ID>

    <ID>ReturnCount:Extensions.kt$fun Context.isNetworkAvailable(): Boolean</ID>

    <ID>ReturnCount:FusedManagerRepository.kt$FusedManagerRepository$suspend fun addDownload(fusedDownload: FusedDownload): Boolean</ID>

    <ID>ReturnCount:FusedManagerRepository.kt$FusedManagerRepository$suspend fun calculateProgress( application: Application?, progress: DownloadProgress ): Int</ID>

    <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:StorageNotificationManager.kt$StorageNotificationManager$private fun getSpaceMissing(fusedDownload: FusedDownload, downloadId: Long? = null): Long</ID>

    <ID>ReturnCount:StorageNotificationManager.kt$StorageNotificationManager$private fun getSpaceMissing(appInstall: AppInstall, downloadId: Long? = null): Long</ID>

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

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

    <ID>SpreadOperator:EglExtensionProvider.kt$EglExtensionProvider$(*`as`)</ID>
@@ -147,6 +146,7 @@ 
    <ID>TooGenericExceptionCaught:AppInfoFetchViewModel.kt$AppInfoFetchViewModel$e: Exception</ID>

    <ID>TooGenericExceptionCaught:AppInstallProcessor.kt$AppInstallProcessor$e: Exception</ID>

    <ID>TooGenericExceptionCaught:AppLoungePackageManager.kt$AppLoungePackageManager$e: Exception</ID>

    <ID>TooGenericExceptionCaught:AppManagerImpl.kt$AppManagerImpl$e: Exception</ID>

    <ID>TooGenericExceptionCaught:ApplicationViewModel.kt$ApplicationViewModel$e: Exception</ID>

    <ID>TooGenericExceptionCaught:BlockedAppRepository.kt$BlockedAppRepository$exception: Exception</ID>

    <ID>TooGenericExceptionCaught:CommonUtilsModule.kt$CommonUtilsModule$e: Exception</ID>
@@ -156,7 +156,6 @@ 
    <ID>TooGenericExceptionCaught:DownloadProgressLD.kt$DownloadProgressLD$e: Exception</ID>

    <ID>TooGenericExceptionCaught:EcloudRepository.kt$EcloudRepository$e: Exception</ID>

    <ID>TooGenericExceptionCaught:FileManager.kt$FileManager$e: Exception</ID>

    <ID>TooGenericExceptionCaught:FusedManagerImpl.kt$FusedManagerImpl$e: Exception</ID>

    <ID>TooGenericExceptionCaught:GPlayHttpClient.kt$GPlayHttpClient$e: Exception</ID>

    <ID>TooGenericExceptionCaught:GoogleLoginManager.kt$GoogleLoginManager$e: Exception</ID>

    <ID>TooGenericExceptionCaught:InstallWorkManager.kt$InstallWorkManager$e: Exception</ID>
@@ -173,12 +172,12 @@ 
    <ID>TooGenericExceptionThrown:PlayStoreLoginWrapper.kt$PlayStoreLoginWrapper$throw Exception("Validation network code: ${response.code}")</ID>

    <ID>TooGenericExceptionThrown:PlayStoreLoginWrapper.kt$PlayStoreLoginWrapper$throw Exception(error)</ID>

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

    <ID>TooManyFunctions:AppManager.kt$AppManager</ID>

    <ID>TooManyFunctions:AppManagerImpl.kt$AppManagerImpl : AppManager</ID>

    <ID>TooManyFunctions:AppManagerWrapper.kt$AppManagerWrapper</ID>

    <ID>TooManyFunctions:ApplicationListFragment.kt$ApplicationListFragment : TimeoutFragmentApplicationInstaller</ID>

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

    <ID>TooManyFunctions:FusedManagerImpl.kt$FusedManagerImpl : IFusedManager</ID>

    <ID>TooManyFunctions:FusedManagerRepository.kt$FusedManagerRepository</ID>

    <ID>TooManyFunctions:HomeFragment.kt$HomeFragment : TimeoutFragmentApplicationInstaller</ID>

    <ID>TooManyFunctions:IFusedManager.kt$IFusedManager</ID>

    <ID>TooManyFunctions:MainActivityViewModel.kt$MainActivityViewModel : ViewModel</ID>

    <ID>TooManyFunctions:SearchFragment.kt$SearchFragment : TimeoutFragmentOnQueryTextListenerOnSuggestionListenerApplicationInstaller</ID>

    <ID>TooManyFunctions:TimeoutFragment.kt$TimeoutFragment : Fragment</ID>

app/src/main/java/foundation/e/apps/MainActivity.kt

+3 −3
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ import com.aurora.gplayapi.exceptions.ApiException 
import com.google.android.material.bottomnavigation.BottomNavigationView

import com.google.android.material.snackbar.Snackbar

import dagger.hilt.android.AndroidEntryPoint

import foundation.e.apps.data.fusedDownload.models.FusedDownload

import foundation.e.apps.data.install.models.AppInstall

import foundation.e.apps.data.login.AuthObject

import foundation.e.apps.data.login.LoginViewModel

import foundation.e.apps.data.login.PlayStoreAuthenticator
@@ -345,11 +345,11 @@ class MainActivity : AppCompatActivity() { 
        EventBus.events.filter { appEvent ->

            appEvent is AppEvent.AppPurchaseEvent

        }.collectLatest {

            goToAppPurchaseFragment(it.data as FusedDownload)

            goToAppPurchaseFragment(it.data as AppInstall)

        }

    }



    private fun goToAppPurchaseFragment(it: FusedDownload) {

    private fun goToAppPurchaseFragment(it: AppInstall) {

        val action =

            AppPurchaseFragmentDirections.actionGlobalAppPurchaseFragment(it.packageName)

        findNavController(R.id.fragment).navigate(action)

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

+3 −3
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ import foundation.e.apps.data.application.home.HomeApi 
import foundation.e.apps.data.application.search.GplaySearchResult

import foundation.e.apps.data.application.search.SearchApi

import foundation.e.apps.data.application.utils.CategoryType

import foundation.e.apps.data.fusedDownload.models.FusedDownload

import foundation.e.apps.data.install.models.AppInstall

import foundation.e.apps.ui.search.SearchResult

import javax.inject.Inject

import javax.inject.Singleton
@@ -87,11 +87,11 @@ class ApplicationRepository @Inject constructor( 


    suspend fun updateFusedDownloadWithDownloadingInfo(

        origin: Origin,

        fusedDownload: FusedDownload

        appInstall: AppInstall

    ) {

        downloadInfoApi.updateFusedDownloadWithDownloadingInfo(

            origin,

            fusedDownload

            appInstall

        )

    }

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

+5 −5
Original line number Diff line number Diff line
@@ -18,14 +18,14 @@ 
package foundation.e.apps.data.application



import foundation.e.apps.data.application.data.Application

import foundation.e.apps.data.fusedDownload.models.FusedDownload

import foundation.e.apps.data.install.models.AppInstall



object UpdatesDao {

    private val _appsAwaitingForUpdate: MutableList<Application> = mutableListOf()

    val appsAwaitingForUpdate: List<Application> = _appsAwaitingForUpdate



    private val _successfulUpdatedApps = mutableListOf<FusedDownload>()

    val successfulUpdatedApps: List<FusedDownload> = _successfulUpdatedApps

    private val _successfulUpdatedApps = mutableListOf<AppInstall>()

    val successfulUpdatedApps: List<AppInstall> = _successfulUpdatedApps



    fun addItemsForUpdate(appsNeedUpdate: List<Application>) {

        _appsAwaitingForUpdate.clear()
@@ -36,8 +36,8 @@ object UpdatesDao { 


    fun removeUpdateIfExists(packageName: String) = _appsAwaitingForUpdate.removeIf { it.package_name == packageName }



    fun addSuccessfullyUpdatedApp(fusedDownload: FusedDownload) {

        _successfulUpdatedApps.add(fusedDownload)

    fun addSuccessfullyUpdatedApp(appInstall: AppInstall) {

        _successfulUpdatedApps.add(appInstall)

    }



    fun clearSuccessfullyUpdatedApps() {

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

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ package foundation.e.apps.data.application.downloadInfo 


import foundation.e.apps.data.cleanapk.data.download.Download

import foundation.e.apps.data.enums.Origin

import foundation.e.apps.data.fusedDownload.models.FusedDownload

import foundation.e.apps.data.install.models.AppInstall

import retrofit2.Response



interface DownloadInfoApi {
@@ -34,7 +34,7 @@ interface DownloadInfoApi { 


    suspend fun updateFusedDownloadWithDownloadingInfo(

        origin: Origin,

        fusedDownload: FusedDownload

        appInstall: AppInstall

    )



    suspend fun getOSSDownloadInfo(id: String, version: String?): Response<Download>