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

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

refactor: rename AppInstallProcessor to AppInstallationFacade

parent 9f314420
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import foundation.e.apps.data.install.core.helper.AppInstallWorkRunner
import foundation.e.apps.domain.model.install.Status
import javax.inject.Inject

class AppInstallProcessor @Inject constructor(
class AppInstallationFacade @Inject constructor(
    private val appInstallComponents: AppInstallComponents,
    private val installationEnqueuer: InstallationEnqueuer,
    private val appInstallWorkRunner: AppInstallWorkRunner,
+3 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import foundation.e.apps.data.enums.ResultStatus
import foundation.e.apps.data.event.AppEvent
import foundation.e.apps.data.event.EventBus
import foundation.e.apps.data.gitlab.SystemAppsUpdatesRepository
import foundation.e.apps.data.install.core.AppInstallProcessor
import foundation.e.apps.data.install.core.AppInstallationFacade
import foundation.e.apps.data.login.repository.AuthenticatorRepository
import foundation.e.apps.data.updates.UpdatesManagerRepository
import foundation.e.apps.domain.model.User
@@ -40,7 +40,7 @@ class UpdatesWorker @AssistedInject constructor(
    private val sessionRepository: SessionRepository,
    private val appPreferencesRepository: AppPreferencesRepository,
    private val authenticatorRepository: AuthenticatorRepository,
    private val appInstallProcessor: AppInstallProcessor,
    private val appInstallationFacade: AppInstallationFacade,
    private val blockedAppRepository: BlockedAppRepository,
    private val systemAppsUpdatesRepository: SystemAppsUpdatesRepository,
) : CoroutineWorker(context, params) {
@@ -235,7 +235,7 @@ class UpdatesWorker @AssistedInject constructor(
                response.add(Pair(fusedApp, false))
                continue
            }
            val status = appInstallProcessor.initAppInstall(fusedApp, true)
            val status = appInstallationFacade.initAppInstall(fusedApp, true)
            response.add(Pair(fusedApp, status))
        }
        return response
+3 −3
Original line number Diff line number Diff line
@@ -32,14 +32,14 @@ import androidx.work.WorkerParameters
import dagger.assisted.Assisted
import dagger.assisted.AssistedInject
import foundation.e.apps.R
import foundation.e.apps.data.install.core.AppInstallProcessor
import foundation.e.apps.data.install.core.AppInstallationFacade
import java.util.concurrent.atomic.AtomicInteger

@HiltWorker
class InstallAppWorker @AssistedInject constructor(
    @Assisted private val context: Context,
    @Assisted private val params: WorkerParameters,
    private val appInstallProcessor: AppInstallProcessor
    private val appInstallationFacade: AppInstallationFacade
) : CoroutineWorker(context, params) {

    companion object {
@@ -65,7 +65,7 @@ class InstallAppWorker @AssistedInject constructor(
        }

        val isPackageUpdate = params.inputData.getBoolean(IS_UPDATE_WORK, false)
        val response = appInstallProcessor.processInstall(fusedDownloadId, isPackageUpdate) { title ->
        val response = appInstallationFacade.processInstall(fusedDownloadId, isPackageUpdate) { title ->
            setForeground(createForegroundInfo("${context.getString(R.string.installing)} $title"))
        }

+4 −4
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ import foundation.e.apps.data.install.AppManagerWrapper
import foundation.e.apps.data.install.models.AppInstall
import foundation.e.apps.data.install.pkg.AppLoungePackageManager
import foundation.e.apps.data.install.pkg.PwaManager
import foundation.e.apps.data.install.core.AppInstallProcessor
import foundation.e.apps.data.install.core.AppInstallationFacade
import foundation.e.apps.data.login.core.AuthObject
import foundation.e.apps.data.parentalcontrol.fdroid.FDroidAntiFeatureRepository
import foundation.e.apps.data.parentalcontrol.googleplay.GPlayContentRatingRepository
@@ -64,7 +64,7 @@ class MainActivityViewModel @Inject constructor(
    private val blockedAppRepository: BlockedAppRepository,
    private val gPlayContentRatingRepository: GPlayContentRatingRepository,
    private val fDroidAntiFeatureRepository: FDroidAntiFeatureRepository,
    private val appInstallProcessor: AppInstallProcessor,
    private val appInstallationFacade: AppInstallationFacade,
    private val systemAppsUpdatesRepository: SystemAppsUpdatesRepository,
    private val reportFaultyTokenUseCase: ReportFaultyTokenUseCase,
) : ViewModel() {
@@ -271,7 +271,7 @@ class MainActivityViewModel @Inject constructor(

    fun getApplication(app: Application) {
        viewModelScope.launch(Dispatchers.IO) {
            appInstallProcessor.initAppInstall(app)
            appInstallationFacade.initAppInstall(app)
        }
    }

@@ -283,7 +283,7 @@ class MainActivityViewModel @Inject constructor(
        val fusedDownload = appManagerWrapper.getFusedDownload(packageName = packageName)
        val authData = sessionRepository.getAuthData()
        if (!authData.isAnonymous) {
            appInstallProcessor.enqueueFusedDownload(fusedDownload)
            appInstallationFacade.enqueueFusedDownload(fusedDownload)
            return fusedDownload
        }

+46 −46
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ import foundation.e.apps.data.login.core.StoreType
import foundation.e.apps.data.login.repository.AuthenticatorRepository
import foundation.e.apps.data.preference.SessionDataStore
import foundation.e.apps.data.updates.UpdatesManagerRepository
import foundation.e.apps.data.install.core.AppInstallProcessor
import foundation.e.apps.data.install.core.AppInstallationFacade
import foundation.e.apps.domain.model.LoginState
import foundation.e.apps.domain.model.User
import foundation.e.apps.domain.preferences.AppPreferencesRepository
@@ -96,7 +96,7 @@ class UpdatesWorkerTest {
        val appLoungeDataStore = createDataStore(dataStoreContext)
        val storeAuthenticator = mockk<StoreAuthenticator>()
        val authenticatorRepository = AuthenticatorRepository(listOf(storeAuthenticator), appLoungeDataStore)
        val appInstallProcessor = mock<AppInstallProcessor>()
        val appInstallationFacade = mock<AppInstallationFacade>()
        val blockedAppRepository = mock<BlockedAppRepository>()
        val systemAppsUpdatesRepository = mock<SystemAppsUpdatesRepository>()
        val authData = AuthData(email = "user@example.com")
@@ -151,7 +151,7 @@ class UpdatesWorkerTest {
            updatesManagerRepository,
            appLoungeDataStore,
            authenticatorRepository,
            appInstallProcessor,
            appInstallationFacade,
            blockedAppRepository,
            systemAppsUpdatesRepository
        )
@@ -176,7 +176,7 @@ class UpdatesWorkerTest {
        val storeAuthenticator = mockk<StoreAuthenticator>()
        val authenticatorRepository =
            AuthenticatorRepository(listOf(storeAuthenticator), appLoungeDataStore)
        val appInstallProcessor = mock<AppInstallProcessor>()
        val appInstallationFacade = mock<AppInstallationFacade>()
        val blockedAppRepository = mock<BlockedAppRepository>()
        val systemAppsUpdatesRepository = mock<SystemAppsUpdatesRepository>()
        val authData = AuthData(email = "user@example.com")
@@ -237,7 +237,7 @@ class UpdatesWorkerTest {
            updatesManagerRepository,
            appLoungeDataStore,
            authenticatorRepository,
            appInstallProcessor,
            appInstallationFacade,
            blockedAppRepository,
            systemAppsUpdatesRepository
        )
@@ -247,7 +247,7 @@ class UpdatesWorkerTest {
        assertThat(result).isEqualTo(androidx.work.ListenableWorker.Result.failure())
        verify(updatesManagerRepository, times(UpdatesWorker.MAX_RETRY_COUNT.plus(1))).getUpdates()
        verify(updatesManagerRepository, never()).getUpdatesOSS()
        verify(appInstallProcessor, never()).initAppInstall(any(), any())
        verify(appInstallationFacade, never()).initAppInstall(any(), any())
    }

    @Test
@@ -258,7 +258,7 @@ class UpdatesWorkerTest {
        val updatesManagerRepository = mock<UpdatesManagerRepository>()
        val appLoungeDataStore = createDataStore(dataStoreContext)
        val authenticatorRepository = AuthenticatorRepository(emptyList(), appLoungeDataStore)
        val appInstallProcessor = mock<AppInstallProcessor>()
        val appInstallationFacade = mock<AppInstallationFacade>()
        val blockedAppRepository = mock<BlockedAppRepository>()
        val systemAppsUpdatesRepository = mock<SystemAppsUpdatesRepository>()
        val notificationManager = mock<NotificationManager>()
@@ -279,7 +279,7 @@ class UpdatesWorkerTest {
                updatesManagerRepository,
                appLoungeDataStore,
                authenticatorRepository,
                appInstallProcessor,
                appInstallationFacade,
                blockedAppRepository,
                systemAppsUpdatesRepository
            ),
@@ -306,7 +306,7 @@ class UpdatesWorkerTest {
        val updatesManagerRepository = mock<UpdatesManagerRepository>()
        val appLoungeDataStore = createDataStore(appContext)
        val authenticatorRepository = AuthenticatorRepository(emptyList(), appLoungeDataStore)
        val appInstallProcessor = mock<AppInstallProcessor>()
        val appInstallationFacade = mock<AppInstallationFacade>()
        val blockedAppRepository = mock<BlockedAppRepository>()
        val systemAppsUpdatesRepository = mock<SystemAppsUpdatesRepository>()

@@ -316,7 +316,7 @@ class UpdatesWorkerTest {
            updatesManagerRepository,
            appLoungeDataStore,
            authenticatorRepository,
            appInstallProcessor,
            appInstallationFacade,
            blockedAppRepository,
            systemAppsUpdatesRepository
        )
@@ -335,7 +335,7 @@ class UpdatesWorkerTest {
        val storeAuthenticator = mockk<StoreAuthenticator>()
        val authenticatorRepository =
            AuthenticatorRepository(listOf(storeAuthenticator), appLoungeDataStore)
        val appInstallProcessor = mock<AppInstallProcessor>()
        val appInstallationFacade = mock<AppInstallationFacade>()
        val blockedAppRepository = mock<BlockedAppRepository>()
        val systemAppsUpdatesRepository = mock<SystemAppsUpdatesRepository>()
        val worker = createWorker(
@@ -344,7 +344,7 @@ class UpdatesWorkerTest {
            updatesManagerRepository,
            appLoungeDataStore,
            authenticatorRepository,
            appInstallProcessor,
            appInstallationFacade,
            blockedAppRepository,
            systemAppsUpdatesRepository
        )
@@ -366,7 +366,7 @@ class UpdatesWorkerTest {
        val storeAuthenticator = mockk<StoreAuthenticator>()
        val authenticatorRepository =
            AuthenticatorRepository(listOf(storeAuthenticator), appLoungeDataStore)
        val appInstallProcessor = mock<AppInstallProcessor>()
        val appInstallationFacade = mock<AppInstallationFacade>()
        val blockedAppRepository = mock<BlockedAppRepository>()
        val systemAppsUpdatesRepository = mock<SystemAppsUpdatesRepository>()
        val worker = createWorker(
@@ -375,7 +375,7 @@ class UpdatesWorkerTest {
            updatesManagerRepository,
            appLoungeDataStore,
            authenticatorRepository,
            appInstallProcessor,
            appInstallationFacade,
            blockedAppRepository,
            systemAppsUpdatesRepository
        )
@@ -414,7 +414,7 @@ class UpdatesWorkerTest {
        val updatesManagerRepository = mock<UpdatesManagerRepository>()
        val appLoungeDataStore = createDataStore(appContext)
        val authenticatorRepository = AuthenticatorRepository(emptyList(), appLoungeDataStore)
        val appInstallProcessor = mock<AppInstallProcessor>()
        val appInstallationFacade = mock<AppInstallationFacade>()
        val blockedAppRepository = mock<BlockedAppRepository>()
        val systemAppsUpdatesRepository = mock<SystemAppsUpdatesRepository>()

@@ -424,7 +424,7 @@ class UpdatesWorkerTest {
            updatesManagerRepository,
            appLoungeDataStore,
            authenticatorRepository,
            appInstallProcessor,
            appInstallationFacade,
            blockedAppRepository,
            systemAppsUpdatesRepository
        )
@@ -446,7 +446,7 @@ class UpdatesWorkerTest {
        val updatesManagerRepository = mock<UpdatesManagerRepository>()
        val sessionDataStore = mock<SessionDataStore>()
        val authenticatorRepository = mock<AuthenticatorRepository>()
        val appInstallProcessor = mock<AppInstallProcessor>()
        val appInstallationFacade = mock<AppInstallationFacade>()
        val blockedAppRepository = mock<BlockedAppRepository>()
        val systemAppsUpdatesRepository = mock<SystemAppsUpdatesRepository>()

@@ -464,7 +464,7 @@ class UpdatesWorkerTest {
            updatesManagerRepository,
            sessionDataStore,
            authenticatorRepository,
            appInstallProcessor,
            appInstallationFacade,
            blockedAppRepository,
            systemAppsUpdatesRepository,
            createAppPreferencesRepository(
@@ -489,7 +489,7 @@ class UpdatesWorkerTest {
        val updatesManagerRepository = mock<UpdatesManagerRepository>()
        val sessionDataStore = mock<SessionDataStore>()
        val authenticatorRepository = mock<AuthenticatorRepository>()
        val appInstallProcessor = mock<AppInstallProcessor>()
        val appInstallationFacade = mock<AppInstallationFacade>()
        val blockedAppRepository = mock<BlockedAppRepository>()
        val systemAppsUpdatesRepository = mock<SystemAppsUpdatesRepository>()

@@ -508,7 +508,7 @@ class UpdatesWorkerTest {
            updatesManagerRepository,
            sessionDataStore,
            authenticatorRepository,
            appInstallProcessor,
            appInstallationFacade,
            blockedAppRepository,
            systemAppsUpdatesRepository,
            createAppPreferencesRepository(
@@ -537,7 +537,7 @@ class UpdatesWorkerTest {
        val updatesManagerRepository = mock<UpdatesManagerRepository>()
        val sessionDataStore = mock<SessionDataStore>()
        val authenticatorRepository = mock<AuthenticatorRepository>()
        val appInstallProcessor = mock<AppInstallProcessor>()
        val appInstallationFacade = mock<AppInstallationFacade>()
        val blockedAppRepository = mock<BlockedAppRepository>()
        val systemAppsUpdatesRepository = mock<SystemAppsUpdatesRepository>()

@@ -582,7 +582,7 @@ class UpdatesWorkerTest {
        )
        whenever(systemAppsUpdatesRepository.fetchUpdatableSystemApps(true))
            .thenReturn(ResultSupreme.Success(Unit))
        whenever(appInstallProcessor.initAppInstall(any(), any())).thenReturn(true)
        whenever(appInstallationFacade.initAppInstall(any(), any())).thenReturn(true)

        val worker = createWorker(
            workerContext,
@@ -590,7 +590,7 @@ class UpdatesWorkerTest {
            updatesManagerRepository,
            sessionDataStore,
            authenticatorRepository,
            appInstallProcessor,
            appInstallationFacade,
            blockedAppRepository,
            systemAppsUpdatesRepository,
            createAppPreferencesRepository(
@@ -603,7 +603,7 @@ class UpdatesWorkerTest {
        val result = worker.doWork()

        assertThat(result).isEqualTo(androidx.work.ListenableWorker.Result.success())
        verify(appInstallProcessor).initAppInstall(any(), any())
        verify(appInstallationFacade).initAppInstall(any(), any())
    }

    @Test
@@ -618,7 +618,7 @@ class UpdatesWorkerTest {
        val updatesManagerRepository = mock<UpdatesManagerRepository>()
        val sessionDataStore = mock<SessionDataStore>()
        val authenticatorRepository = mock<AuthenticatorRepository>()
        val appInstallProcessor = mock<AppInstallProcessor>()
        val appInstallationFacade = mock<AppInstallationFacade>()
        val blockedAppRepository = mock<BlockedAppRepository>()
        val systemAppsUpdatesRepository = mock<SystemAppsUpdatesRepository>()

@@ -670,7 +670,7 @@ class UpdatesWorkerTest {
            updatesManagerRepository,
            sessionDataStore,
            authenticatorRepository,
            appInstallProcessor,
            appInstallationFacade,
            blockedAppRepository,
            systemAppsUpdatesRepository
        )
@@ -678,7 +678,7 @@ class UpdatesWorkerTest {
        val result = worker.doWork()

        assertThat(result).isEqualTo(androidx.work.ListenableWorker.Result.failure())
        verify(appInstallProcessor, never()).initAppInstall(any(), any())
        verify(appInstallationFacade, never()).initAppInstall(any(), any())
    }


@@ -697,7 +697,7 @@ class UpdatesWorkerTest {
        val storeAuthenticator = mockk<StoreAuthenticator>()
        val authenticatorRepository =
            AuthenticatorRepository(listOf(storeAuthenticator), appLoungeDataStore)
        val appInstallProcessor = mock<AppInstallProcessor>()
        val appInstallationFacade = mock<AppInstallationFacade>()
        val blockedAppRepository = mock<BlockedAppRepository>()
        val systemAppsUpdatesRepository = mock<SystemAppsUpdatesRepository>()

@@ -725,7 +725,7 @@ class UpdatesWorkerTest {
                updatesManagerRepository,
                appLoungeDataStore,
                authenticatorRepository,
                appInstallProcessor,
                appInstallationFacade,
                blockedAppRepository,
                systemAppsUpdatesRepository
            )
@@ -754,7 +754,7 @@ class UpdatesWorkerTest {
        val storeAuthenticator = mockk<StoreAuthenticator>()
        val authenticatorRepository =
            AuthenticatorRepository(listOf(storeAuthenticator), appLoungeDataStore)
        val appInstallProcessor = mock<AppInstallProcessor>()
        val appInstallationFacade = mock<AppInstallationFacade>()
        val blockedAppRepository = mock<BlockedAppRepository>()
        val systemAppsUpdatesRepository = mock<SystemAppsUpdatesRepository>()

@@ -782,7 +782,7 @@ class UpdatesWorkerTest {
                updatesManagerRepository,
                appLoungeDataStore,
                authenticatorRepository,
                appInstallProcessor,
                appInstallationFacade,
                blockedAppRepository,
                systemAppsUpdatesRepository
            )
@@ -806,7 +806,7 @@ class UpdatesWorkerTest {
        val storeAuthenticator = mockk<StoreAuthenticator>()
        val authenticatorRepository =
            AuthenticatorRepository(listOf(storeAuthenticator), appLoungeDataStore)
        val appInstallProcessor = mock<AppInstallProcessor>()
        val appInstallationFacade = mock<AppInstallationFacade>()
        val blockedAppRepository = mock<BlockedAppRepository>()
        val systemAppsUpdatesRepository = mock<SystemAppsUpdatesRepository>()

@@ -824,14 +824,14 @@ class UpdatesWorkerTest {
            updatesManagerRepository,
            appLoungeDataStore,
            authenticatorRepository,
            appInstallProcessor,
            appInstallationFacade,
            blockedAppRepository,
            systemAppsUpdatesRepository
        )

        val paidApp = Application(name = "Paid", isFree = false)
        val freeApp = Application(name = "Free", isFree = true)
        whenever(appInstallProcessor.initAppInstall(freeApp, true)).thenReturn(true)
        whenever(appInstallationFacade.initAppInstall(freeApp, true)).thenReturn(true)

        val result = worker.startUpdateProcess(listOf(paidApp, freeApp))

@@ -839,8 +839,8 @@ class UpdatesWorkerTest {
            Pair(paidApp, false),
            Pair(freeApp, true)
        )
        verify(appInstallProcessor, times(1)).initAppInstall(freeApp, true)
        verify(appInstallProcessor, times(0)).initAppInstall(paidApp, true)
        verify(appInstallationFacade, times(1)).initAppInstall(freeApp, true)
        verify(appInstallationFacade, times(0)).initAppInstall(paidApp, true)
    }

    @Test
@@ -853,7 +853,7 @@ class UpdatesWorkerTest {
        val storeAuthenticator = mockk<StoreAuthenticator>()
        val authenticatorRepository =
            AuthenticatorRepository(listOf(storeAuthenticator), appLoungeDataStore)
        val appInstallProcessor = mock<AppInstallProcessor>()
        val appInstallationFacade = mock<AppInstallationFacade>()
        val blockedAppRepository = mock<BlockedAppRepository>()
        val systemAppsUpdatesRepository = mock<SystemAppsUpdatesRepository>()
        val authData = AuthData(email = "user@example.com", isAnonymous = false)
@@ -871,18 +871,18 @@ class UpdatesWorkerTest {
            updatesManagerRepository,
            appLoungeDataStore,
            authenticatorRepository,
            appInstallProcessor,
            appInstallationFacade,
            blockedAppRepository,
            systemAppsUpdatesRepository
        )

        val paidApp = Application(name = "Paid", isFree = false)
        whenever(appInstallProcessor.initAppInstall(paidApp, true)).thenReturn(false)
        whenever(appInstallationFacade.initAppInstall(paidApp, true)).thenReturn(false)

        val result = worker.startUpdateProcess(listOf(paidApp))

        assertThat(result).containsExactly(Pair(paidApp, false))
        verify(appInstallProcessor, times(1)).initAppInstall(paidApp, true)
        verify(appInstallationFacade, times(1)).initAppInstall(paidApp, true)
    }

    @Test
@@ -894,7 +894,7 @@ class UpdatesWorkerTest {
        val storeAuthenticator = mockk<StoreAuthenticator>()
        val authenticatorRepository =
            AuthenticatorRepository(listOf(storeAuthenticator), appLoungeDataStore)
        val appInstallProcessor = mock<AppInstallProcessor>()
        val appInstallationFacade = mock<AppInstallationFacade>()
        val blockedAppRepository = mock<BlockedAppRepository>()
        val systemAppsUpdatesRepository = mock<SystemAppsUpdatesRepository>()

@@ -909,7 +909,7 @@ class UpdatesWorkerTest {
                updatesManagerRepository,
                appLoungeDataStore,
                authenticatorRepository,
                appInstallProcessor,
                appInstallationFacade,
                blockedAppRepository,
                systemAppsUpdatesRepository
            )
@@ -944,7 +944,7 @@ class UpdatesWorkerTest {
        val storeAuthenticator = mockk<StoreAuthenticator>()
        val authenticatorRepository =
            AuthenticatorRepository(listOf(storeAuthenticator), appLoungeDataStore)
        val appInstallProcessor = mock<AppInstallProcessor>()
        val appInstallationFacade = mock<AppInstallationFacade>()
        val blockedAppRepository = mock<BlockedAppRepository>()
        val systemAppsUpdatesRepository = mock<SystemAppsUpdatesRepository>()

@@ -959,7 +959,7 @@ class UpdatesWorkerTest {
                updatesManagerRepository,
                appLoungeDataStore,
                authenticatorRepository,
                appInstallProcessor,
                appInstallationFacade,
                blockedAppRepository,
                systemAppsUpdatesRepository
            )
@@ -994,7 +994,7 @@ class UpdatesWorkerTest {
        updatesManagerRepository: UpdatesManagerRepository,
        sessionRepository: SessionRepository,
        authenticatorRepository: AuthenticatorRepository,
        appInstallProcessor: AppInstallProcessor,
        appInstallationFacade: AppInstallationFacade,
        blockedAppRepository: BlockedAppRepository,
        systemAppsUpdatesRepository: SystemAppsUpdatesRepository,
        appPreferencesRepository: AppPreferencesRepository = createAppPreferencesRepository(),
@@ -1006,7 +1006,7 @@ class UpdatesWorkerTest {
            sessionRepository,
            appPreferencesRepository,
            authenticatorRepository,
            appInstallProcessor,
            appInstallationFacade,
            blockedAppRepository,
            systemAppsUpdatesRepository
        )
Loading