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

Commit bb00d0ed authored by Jonathan Klee's avatar Jonathan Klee
Browse files

Rename FusedAPIRepository to ApplicationRepository

parent fce72d77

app/src/main/java/foundation/e/apps/data/fused/FusedAPIRepository.kt→app/src/main/java/foundation/e/apps/data/fused/ApplicationRepository.kt

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ import javax.inject.Inject 
import javax.inject.Singleton



@Singleton

class FusedAPIRepository @Inject constructor(private val applicationAPIImpl: ApplicationApi) {

class ApplicationRepository @Inject constructor(private val applicationAPIImpl: ApplicationApi) {



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

        return applicationAPIImpl.getHomeScreenData(authData)

app/src/main/java/foundation/e/apps/data/updates/UpdatesManagerImpl.kt

+8 −8
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import foundation.e.apps.data.enums.Status 
import foundation.e.apps.data.enums.isUnFiltered

import foundation.e.apps.data.faultyApps.FaultyAppRepository

import foundation.e.apps.data.fdroid.FdroidRepository

import foundation.e.apps.data.fused.FusedAPIRepository

import foundation.e.apps.data.fused.ApplicationRepository

import foundation.e.apps.data.fused.ApplicationApi.Companion.APP_TYPE_ANY

import foundation.e.apps.data.fused.data.Application

import foundation.e.apps.data.preference.PreferenceManagerModule
@@ -46,7 +46,7 @@ import javax.inject.Inject 
class UpdatesManagerImpl @Inject constructor(

    @ApplicationContext private val context: Context,

    private val pkgManagerModule: PkgManagerModule,

    private val fusedAPIRepository: FusedAPIRepository,

    private val applicationRepository: ApplicationRepository,

    private val faultyAppRepository: FaultyAppRepository,

    private val preferenceManagerModule: PreferenceManagerModule,

    private val fdroidRepository: FdroidRepository,
@@ -95,7 +95,7 @@ class UpdatesManagerImpl @Inject constructor( 
        // Get open source app updates

        if (openSourceInstalledApps.isNotEmpty()) {

            status = getUpdatesFromApi({

                fusedAPIRepository.getApplicationDetails(

                applicationRepository.getApplicationDetails(

                    openSourceInstalledApps,

                    authData,

                    Origin.CLEANAPK
@@ -147,7 +147,7 @@ class UpdatesManagerImpl @Inject constructor( 


        if (openSourceInstalledApps.isNotEmpty()) {

            status = getUpdatesFromApi({

                fusedAPIRepository.getApplicationDetails(

                applicationRepository.getApplicationDetails(

                    openSourceInstalledApps,

                    AuthData("", ""),

                    Origin.CLEANAPK
@@ -238,7 +238,7 @@ class UpdatesManagerImpl @Inject constructor( 
        val appsResults = coroutineScope {

            val deferredResults = packageNames.map { packageName ->

                async {

                    fusedAPIRepository.getApplicationDetails(

                    applicationRepository.getApplicationDetails(

                        "",

                        packageName,

                        authData,
@@ -273,7 +273,7 @@ class UpdatesManagerImpl @Inject constructor( 
    private suspend fun getFDroidAppsAndSignatures(installedPackageNames: List<String>): Map<String, String> {

        val appsAndSignatures = hashMapOf<String, String>()

        for (packageName in installedPackageNames) {

            val cleanApkFusedApp = fusedAPIRepository.getCleanapkAppDetails(packageName).first

            val cleanApkFusedApp = applicationRepository.getCleanapkAppDetails(packageName).first

            if (cleanApkFusedApp.package_name.isBlank()) {

                continue

            }
@@ -286,7 +286,7 @@ class UpdatesManagerImpl @Inject constructor( 
        val installedVersionSignature = calculateSignatureVersion(cleanApkApplication)



        val downloadInfo =

            fusedAPIRepository

            applicationRepository

                .getOSSDownloadInfo(cleanApkApplication._id, installedVersionSignature)

                .body()?.download_data
@@ -377,6 +377,6 @@ class UpdatesManagerImpl @Inject constructor( 
    }



    fun getApplicationCategoryPreference(): List<String> {

        return fusedAPIRepository.getApplicationCategoryPreference()

        return applicationRepository.getApplicationCategoryPreference()

    }

}

app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallBinder.kt

+4 −4
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import androidx.core.content.pm.PackageInfoCompat 
import com.aurora.gplayapi.data.models.AuthData

import foundation.e.apps.ISplitInstallService

import foundation.e.apps.data.DownloadManager

import foundation.e.apps.data.fused.FusedAPIRepository

import foundation.e.apps.data.fused.ApplicationRepository

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.Dispatchers

import kotlinx.coroutines.launch
@@ -33,7 +33,7 @@ import timber.log.Timber 
class SplitInstallBinder(

    val context: Context,

    private val coroutineScope: CoroutineScope,

    val fusedAPIRepository: FusedAPIRepository,

    val applicationRepository: ApplicationRepository,

    val downloadManager: DownloadManager,

    val authData: AuthData?,

    private var splitInstallSystemService: foundation.e.splitinstall.ISplitInstallService?
@@ -97,10 +97,10 @@ class SplitInstallBinder( 
        moduleName: String,

        versionCode: Int

    ): String? {

        var url = fusedAPIRepository.getOnDemandModule(packageName, moduleName, versionCode, 1)

        var url = applicationRepository.getOnDemandModule(packageName, moduleName, versionCode, 1)



        if (url == null) {

            url = fusedAPIRepository.getOnDemandModule(

            url = applicationRepository.getOnDemandModule(

                packageName,

                "config.$moduleName",

                versionCode,

app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallService.kt

+3 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import com.aurora.gplayapi.data.models.AuthData 
import com.google.gson.Gson

import dagger.hilt.android.AndroidEntryPoint

import foundation.e.apps.data.DownloadManager

import foundation.e.apps.data.fused.FusedAPIRepository

import foundation.e.apps.data.fused.ApplicationRepository

import foundation.e.apps.data.preference.DataStoreModule

import foundation.e.splitinstall.ISplitInstallService

import foundation.e.splitinstall.SplitInstall
@@ -43,7 +43,7 @@ class SplitInstallService : LifecycleService() { 
    }



    @Inject lateinit var dataStoreModule: DataStoreModule

    @Inject lateinit var fusedAPIRepository: FusedAPIRepository

    @Inject lateinit var applicationRepository: ApplicationRepository

    @Inject lateinit var downloadManager: DownloadManager

    @Inject lateinit var gson: Gson

    private lateinit var binder: SplitInstallBinder
@@ -92,7 +92,7 @@ class SplitInstallService : LifecycleService() { 
        binder = SplitInstallBinder(

            applicationContext,

            lifecycleScope,

            fusedAPIRepository,

            applicationRepository,

            downloadManager,

            authData,

            splitInstallSystemService

app/src/main/java/foundation/e/apps/install/workmanager/AppInstallProcessor.kt

+3 −3
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import foundation.e.apps.data.ResultSupreme 
import foundation.e.apps.data.enums.ResultStatus

import foundation.e.apps.data.enums.Status

import foundation.e.apps.data.enums.Type

import foundation.e.apps.data.fused.FusedAPIRepository

import foundation.e.apps.data.fused.ApplicationRepository

import foundation.e.apps.data.fused.UpdatesDao

import foundation.e.apps.data.fused.data.Application

import foundation.e.apps.data.fusedDownload.FusedDownloadRepository
@@ -50,7 +50,7 @@ class AppInstallProcessor @Inject constructor( 
    @ApplicationContext private val context: Context,

    private val fusedDownloadRepository: FusedDownloadRepository,

    private val fusedManagerRepository: FusedManagerRepository,

    private val fusedAPIRepository: FusedAPIRepository,

    private val applicationRepository: ApplicationRepository,

    private val dataStoreManager: DataStoreManager,

    private val storageNotificationManager: StorageNotificationManager

) {
@@ -175,7 +175,7 @@ class AppInstallProcessor @Inject constructor( 
    private suspend fun updateFusedDownloadWithAppDownloadLink(

        fusedDownload: FusedDownload

    ) {

        fusedAPIRepository.updateFusedDownloadWithDownloadingInfo(

        applicationRepository.updateFusedDownloadWithDownloadingInfo(

            fusedDownload.origin, fusedDownload

        )

    }