diff --git a/app/detekt-baseline.xml b/app/detekt-baseline.xml index b01b024b653fe45ad950743ee0d5bbf287232c40..2068eb0f931916634db37034e8a2c47305a8ff2c 100644 --- a/app/detekt-baseline.xml +++ b/app/detekt-baseline.xml @@ -18,9 +18,9 @@ LongParameterList:ApplicationViewModel.kt$ApplicationViewModel$( id: String, packageName: String, origin: Origin, isFdroidLink: Boolean, authObjectList: List<AuthObject>, retryBlock: (failedObjects: List<AuthObject>) -> Boolean, ) 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, ) LongParameterList:EglExtensionProvider.kt$EglExtensionProvider$( egl10: EGL10, eglDisplay: EGLDisplay, eglConfig: EGLConfig?, ai: IntArray, ai1: IntArray?, set: MutableSet<String> ) - LongParameterList:FusedManagerImpl.kt$FusedManagerImpl$( @Named("cacheDir") private val cacheDir: String, private val downloadManager: DownloadManager, private val notificationManager: NotificationManager, private val fusedDownloadRepository: FusedDownloadRepository, private val pwaManagerModule: PWAManagerModule, private val pkgManagerModule: PkgManagerModule, @Named("download") private val downloadNotificationChannel: NotificationChannel, @Named("update") private val updateNotificationChannel: NotificationChannel, @ApplicationContext private val context: Context ) - LongParameterList:MainActivityViewModel.kt$MainActivityViewModel$( private val dataStoreModule: DataStoreModule, private val applicationRepository: ApplicationRepository, private val fusedManagerRepository: FusedManagerRepository, private val pkgManagerModule: PkgManagerModule, private val pwaManagerModule: PWAManagerModule, private val ecloudRepository: EcloudRepository, private val blockedAppRepository: BlockedAppRepository, private val appInstallProcessor: AppInstallProcessor ) - LongParameterList:UpdatesManagerImpl.kt$UpdatesManagerImpl$( @ApplicationContext private val context: Context, private val pkgManagerModule: PkgManagerModule, private val applicationRepository: ApplicationRepository, private val faultyAppRepository: FaultyAppRepository, private val preferenceManagerModule: PreferenceManagerModule, private val fdroidRepository: FdroidRepository, private val blockedAppRepository: BlockedAppRepository, ) + 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 ) + 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 ) + 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, ) 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, ) MagicNumber:AnonymousLoginManager.kt$AnonymousLoginManager$200 MagicNumber:ApkSignatureManager.kt$ApkSignatureManager$1024 @@ -53,8 +53,6 @@ MagicNumber:HomeChildRVAdapter.kt$HomeChildRVAdapter$500 MagicNumber:InstallerService.kt$InstallerService$69 MagicNumber:NativeDeviceInfoProviderModule.kt$NativeDeviceInfoProviderModule$15 - MagicNumber:PWAManagerModule.kt$PWAManagerModule$100 - MagicNumber:PWAManagerModule.kt$PWAManagerModule$500 MagicNumber:PackageInstallerService.kt$PackageInstallerService$69 MagicNumber:PkgManagerBR.kt$PkgManagerBR$69 MagicNumber:PlayStoreLoginWrapper.kt$PlayStoreLoginWrapper$200 @@ -96,7 +94,7 @@ PrintStackTrace:CommonUtilsModule.kt$CommonUtilsModule$e PrintStackTrace:EcloudRepository.kt$EcloudRepository$e PrintStackTrace:InstallWorkManager.kt$InstallWorkManager$e - PrintStackTrace:PkgManagerModule.kt$PkgManagerModule$e + PrintStackTrace:AppLoungePackageManager.kt$PkgManagerModule$e PrintStackTrace:PlayStoreAuthenticator.kt$PlayStoreAuthenticator$e PrintStackTrace:SystemInfoProvider.kt$SystemInfoProvider$e ProtectedMemberInFinalClass:ApplicationListFragment.kt$ApplicationListFragment$// protected to avoid SyntheticAccessor protected val args: ApplicationListFragmentArgs by navArgs() @@ -129,7 +127,7 @@ SwallowedException:GPlayHttpClient.kt$GPlayHttpClient$e: Exception SwallowedException:NativeDeviceInfoProviderModule.kt$NativeDeviceInfoProviderModule$e: Exception SwallowedException:NativeGsfVersionProvider.kt$NativeGsfVersionProvider$e: PackageManager.NameNotFoundException - SwallowedException:PkgManagerModule.kt$PkgManagerModule$e: PackageManager.NameNotFoundException + SwallowedException:AppLoungePackageManager.kt$AppLoungePackageManager$e: PackageManager.NameNotFoundException SwallowedException:UpdatesManagerImpl.kt$UpdatesManagerImpl$e: Exception TooGenericExceptionCaught:AnonymousLoginManager.kt$AnonymousLoginManager$e: Exception TooGenericExceptionCaught:ApiCaller.kt$e: Exception @@ -152,9 +150,9 @@ TooGenericExceptionCaught:LocaleChangedBroadcastReceiver.kt$LocaleChangedBroadcastReceiver$ex: Exception TooGenericExceptionCaught:NativeDeviceInfoProviderModule.kt$NativeDeviceInfoProviderModule$e: Exception TooGenericExceptionCaught:NetworkHandler.kt$e: Exception - TooGenericExceptionCaught:PWAManagerModule.kt$PWAManagerModule$e: Exception + TooGenericExceptionCaught:PWAManager.kt$PWAManager$e: Exception TooGenericExceptionCaught:PWAPlayerStatusReceiver.kt$PWAPlayerStatusReceiver$e: Exception - TooGenericExceptionCaught:PkgManagerModule.kt$PkgManagerModule$e: Exception + TooGenericExceptionCaught:AppLoungePackageManager.kt$AppLoungePackageManager$e: Exception TooGenericExceptionCaught:PlayStoreAuthenticator.kt$PlayStoreAuthenticator$e: Exception TooGenericExceptionCaught:RetrofitModule.kt$RetrofitModule$e: Exception TooGenericExceptionCaught:SystemInfoProvider.kt$SystemInfoProvider$e: Exception @@ -170,7 +168,7 @@ TooManyFunctions:HomeFragment.kt$HomeFragment : TimeoutFragmentApplicationInstaller TooManyFunctions:IFusedManager.kt$IFusedManager TooManyFunctions:MainActivityViewModel.kt$MainActivityViewModel : ViewModel - TooManyFunctions:PkgManagerModule.kt$PkgManagerModule + TooManyFunctions:AppLoungePackageManager.kt$AppLoungePackageManager TooManyFunctions:SearchFragment.kt$SearchFragment : TimeoutFragmentOnQueryTextListenerOnSuggestionListenerApplicationInstaller TooManyFunctions:TimeoutFragment.kt$TimeoutFragment : Fragment TooManyFunctions:UpdatesFragment.kt$UpdatesFragment : TimeoutFragmentApplicationInstaller diff --git a/app/src/main/java/foundation/e/apps/AppLoungeApplication.kt b/app/src/main/java/foundation/e/apps/AppLoungeApplication.kt index 3fcf7e4291a670066c7431b8e8bd17270079b7cc..f79680000dde5e781a8a0e4b63b5f2f5e799e425 100644 --- a/app/src/main/java/foundation/e/apps/AppLoungeApplication.kt +++ b/app/src/main/java/foundation/e/apps/AppLoungeApplication.kt @@ -27,10 +27,10 @@ import androidx.work.Configuration import androidx.work.ExistingPeriodicWorkPolicy import dagger.hilt.android.HiltAndroidApp import foundation.e.apps.data.Constants.TAG_AUTHDATA_DUMP -import foundation.e.apps.data.preference.DataStoreModule -import foundation.e.apps.data.preference.PreferenceManagerModule +import foundation.e.apps.data.preference.AppLoungeDataStore +import foundation.e.apps.data.preference.AppLoungePreference import foundation.e.apps.install.pkg.PkgManagerBR -import foundation.e.apps.install.pkg.PkgManagerModule +import foundation.e.apps.install.pkg.AppLoungePackageManager import foundation.e.apps.install.updates.UpdatesWorkManager import foundation.e.apps.install.workmanager.InstallWorkManager import foundation.e.apps.ui.setup.tos.TOS_VERSION @@ -51,16 +51,16 @@ import kotlinx.coroutines.runBlocking class AppLoungeApplication : Application(), Configuration.Provider { @Inject - lateinit var pkgManagerModule: PkgManagerModule + lateinit var appLoungePackageManager: AppLoungePackageManager @Inject lateinit var workerFactory: HiltWorkerFactory @Inject - lateinit var dataStoreModule: DataStoreModule + lateinit var appLoungeDataStore: AppLoungeDataStore @Inject - lateinit var preferenceManagerModule: PreferenceManagerModule + lateinit var appLoungePreference: AppLoungePreference @Inject lateinit var uncaughtExceptionHandler: CustomUncaughtExceptionHandler @@ -74,12 +74,12 @@ class AppLoungeApplication : Application(), Configuration.Provider { InstallWorkManager.context = this // Register broadcast receiver for package manager val pkgManagerBR = object : PkgManagerBR() {} - registerReceiver(pkgManagerBR, pkgManagerModule.getFilter(), RECEIVER_EXPORTED) + registerReceiver(pkgManagerBR, appLoungePackageManager.getFilter(), RECEIVER_EXPORTED) - val currentVersion = runBlocking { dataStoreModule.tosVersion.first() } + val currentVersion = runBlocking { appLoungeDataStore.tosVersion.first() } if (!currentVersion.contentEquals(TOS_VERSION)) { MainScope().launch { - dataStoreModule.saveTOCStatus(false, "") + appLoungeDataStore.saveTOCStatus(false, "") } } @@ -100,7 +100,7 @@ class AppLoungeApplication : Application(), Configuration.Provider { UpdatesWorkManager.enqueueWork( this, - preferenceManagerModule.getUpdateInterval(), + appLoungePreference.getUpdateInterval(), ExistingPeriodicWorkPolicy.KEEP ) } diff --git a/app/src/main/java/foundation/e/apps/MainActivity.kt b/app/src/main/java/foundation/e/apps/MainActivity.kt index e94784c0271bdf17868bd81b9dafd937e196c6ef..1ff39c88cbc1e4ff19df0f1f557d94787522106e 100644 --- a/app/src/main/java/foundation/e/apps/MainActivity.kt +++ b/app/src/main/java/foundation/e/apps/MainActivity.kt @@ -43,7 +43,7 @@ import foundation.e.apps.data.login.AuthObject import foundation.e.apps.data.login.LoginViewModel import foundation.e.apps.data.login.PlayStoreAuthenticator import foundation.e.apps.data.login.exceptions.GPlayValidationException -import foundation.e.apps.data.preference.PreferenceManagerModule +import foundation.e.apps.data.preference.AppLoungePreference import foundation.e.apps.databinding.ActivityMainBinding import foundation.e.apps.install.updates.UpdatesNotifier import foundation.e.apps.ui.MainActivityViewModel @@ -70,7 +70,7 @@ class MainActivity : AppCompatActivity() { private lateinit var viewModel: MainActivityViewModel @Inject - lateinit var preferenceManagerModule: PreferenceManagerModule + lateinit var appLoungePreference: AppLoungePreference override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/foundation/e/apps/data/application/ApplicationDataManager.kt b/app/src/main/java/foundation/e/apps/data/application/ApplicationDataManager.kt index 0cf2820fefdf3fd60dbe87ae0b542c842cae9822..b5daea5364d514d195c803bdd63283a40fdeaaec 100644 --- a/app/src/main/java/foundation/e/apps/data/application/ApplicationDataManager.kt +++ b/app/src/main/java/foundation/e/apps/data/application/ApplicationDataManager.kt @@ -26,8 +26,8 @@ import foundation.e.apps.data.enums.FilterLevel import foundation.e.apps.data.enums.Origin import foundation.e.apps.data.enums.Status import foundation.e.apps.data.playstore.PlayStoreRepository -import foundation.e.apps.install.pkg.PWAManagerModule -import foundation.e.apps.install.pkg.PkgManagerModule +import foundation.e.apps.install.pkg.PWAManager +import foundation.e.apps.install.pkg.AppLoungePackageManager import javax.inject.Inject import javax.inject.Named import javax.inject.Singleton @@ -35,8 +35,8 @@ import javax.inject.Singleton @Singleton class ApplicationDataManager @Inject constructor( @Named("gplayRepository") private val gplayRepository: PlayStoreRepository, - private val pkgManagerModule: PkgManagerModule, - private val pwaManagerModule: PWAManagerModule + private val appLoungePackageManager: AppLoungePackageManager, + private val pwaManager: PWAManager ) { suspend fun updateFilterLevel(authData: AuthData?, application: Application) { application.filterLevel = getAppFilterLevel(application, authData) @@ -107,13 +107,13 @@ class ApplicationDataManager @Inject constructor( * Get fused app installation status. * Applicable for both native apps and PWAs. * - * Recommended to use this instead of [PkgManagerModule.getPackageStatus]. + * Recommended to use this instead of [AppLoungePackageManager.getPackageStatus]. */ fun getFusedAppInstallationStatus(application: Application): Status { return if (application.is_pwa) { - pwaManagerModule.getPwaStatus(application) + pwaManager.getPwaStatus(application) } else { - pkgManagerModule.getPackageStatus(application.package_name, application.latest_version_code) + appLoungePackageManager.getPackageStatus(application.package_name, application.latest_version_code) } } } diff --git a/app/src/main/java/foundation/e/apps/data/application/apps/AppsApiImpl.kt b/app/src/main/java/foundation/e/apps/data/application/apps/AppsApiImpl.kt index e1f00df2f791402b1e88e0f9ce0f2d269929b0fb..15ac3e6bfd00de930c179a6fe6becc33c5d90bfa 100644 --- a/app/src/main/java/foundation/e/apps/data/application/apps/AppsApiImpl.kt +++ b/app/src/main/java/foundation/e/apps/data/application/apps/AppsApiImpl.kt @@ -35,7 +35,7 @@ import foundation.e.apps.data.enums.Status import foundation.e.apps.data.enums.isUnFiltered import foundation.e.apps.data.handleNetworkResult import foundation.e.apps.data.playstore.PlayStoreRepository -import foundation.e.apps.data.preference.PreferenceManagerModule +import foundation.e.apps.data.preference.AppLoungePreference import foundation.e.apps.ui.applicationlist.ApplicationDiffUtil import retrofit2.Response import javax.inject.Inject @@ -43,7 +43,7 @@ import javax.inject.Named class AppsApiImpl @Inject constructor( @ApplicationContext private val context: Context, - private val preferenceManagerModule: PreferenceManagerModule, + private val appLoungePreference: AppLoungePreference, @Named("gplayRepository") private val gplayRepository: PlayStoreRepository, @Named("cleanApkAppsRepository") private val cleanApkAppsRepository: CleanApkRepository, private val applicationDataManager: ApplicationDataManager @@ -271,5 +271,5 @@ class AppsApiImpl @Inject constructor( return false } - override fun isOpenSourceSelected() = preferenceManagerModule.isOpenSourceSelected() + override fun isOpenSourceSelected() = appLoungePreference.isOpenSourceSelected() } diff --git a/app/src/main/java/foundation/e/apps/data/application/category/CategoryApiImpl.kt b/app/src/main/java/foundation/e/apps/data/application/category/CategoryApiImpl.kt index b705204954621d705022e73104b99c16ce6632a2..c7062248745de2659fdce8997b214346ba341f20 100644 --- a/app/src/main/java/foundation/e/apps/data/application/category/CategoryApiImpl.kt +++ b/app/src/main/java/foundation/e/apps/data/application/category/CategoryApiImpl.kt @@ -40,13 +40,13 @@ import foundation.e.apps.data.enums.Source import foundation.e.apps.data.enums.isUnFiltered import foundation.e.apps.data.handleNetworkResult import foundation.e.apps.data.playstore.PlayStoreRepository -import foundation.e.apps.data.preference.PreferenceManagerModule +import foundation.e.apps.data.preference.AppLoungePreference import javax.inject.Inject import javax.inject.Named class CategoryApiImpl @Inject constructor( @ApplicationContext private val context: Context, - private val preferenceManagerModule: PreferenceManagerModule, + private val appLoungePreference: AppLoungePreference, @Named("gplayRepository") private val gplayRepository: PlayStoreRepository, @Named("cleanApkAppsRepository") private val cleanApkAppsRepository: CleanApkRepository, @Named("cleanApkPWARepository") private val cleanApkPWARepository: CleanApkRepository, @@ -67,15 +67,15 @@ class CategoryApiImpl @Inject constructor( ): ResultStatus { val categoryResults: MutableList = mutableListOf() - if (preferenceManagerModule.isOpenSourceSelected()) { + if (appLoungePreference.isOpenSourceSelected()) { categoryResults.add(fetchCategoryResult(categoriesList, type, Source.OPEN)) } - if (preferenceManagerModule.isPWASelected()) { + if (appLoungePreference.isPWASelected()) { categoryResults.add(fetchCategoryResult(categoriesList, type, Source.PWA)) } - if (preferenceManagerModule.isGplaySelected()) { + if (appLoungePreference.isGplaySelected()) { categoryResults.add(fetchCategoryResult(categoriesList, type, Source.GPLAY)) } diff --git a/app/src/main/java/foundation/e/apps/data/application/home/HomeApiImpl.kt b/app/src/main/java/foundation/e/apps/data/application/home/HomeApiImpl.kt index 946ac4dfc577e70aec4bd1ea194cda20dd08720d..7a262ab0d174a248df590d201c2f9387b8f1462d 100644 --- a/app/src/main/java/foundation/e/apps/data/application/home/HomeApiImpl.kt +++ b/app/src/main/java/foundation/e/apps/data/application/home/HomeApiImpl.kt @@ -38,7 +38,7 @@ import foundation.e.apps.data.enums.Source import foundation.e.apps.data.handleNetworkResult import foundation.e.apps.data.login.AuthObject import foundation.e.apps.data.playstore.PlayStoreRepository -import foundation.e.apps.data.preference.PreferenceManagerModule +import foundation.e.apps.data.preference.AppLoungePreference import foundation.e.apps.utils.eventBus.AppEvent import foundation.e.apps.utils.eventBus.EventBus import kotlinx.coroutines.MainScope @@ -53,7 +53,7 @@ import foundation.e.apps.data.cleanapk.data.home.Home as CleanApkHome class HomeApiImpl @Inject constructor( @ApplicationContext private val context: Context, - private val preferenceManagerModule: PreferenceManagerModule, + private val appLoungePreference: AppLoungePreference, @Named("gplayRepository") private val gplayRepository: PlayStoreRepository, @Named("cleanApkAppsRepository") private val cleanApkAppsRepository: CleanApkRepository, @Named("cleanApkPWARepository") private val cleanApkPWARepository: CleanApkRepository, @@ -79,15 +79,15 @@ class HomeApiImpl @Inject constructor( return liveData { coroutineScope { - if (preferenceManagerModule.isGplaySelected()) { + if (appLoungePreference.isGplaySelected()) { resultGplay = async { loadHomeData(list, Source.GPLAY, authData) } } - if (preferenceManagerModule.isOpenSourceSelected()) { + if (appLoungePreference.isOpenSourceSelected()) { resultOpenSource = async { loadHomeData(list, Source.OPEN, authData) } } - if (preferenceManagerModule.isPWASelected()) { + if (appLoungePreference.isPWASelected()) { resultPWA = async { loadHomeData(list, Source.PWA, authData) } } diff --git a/app/src/main/java/foundation/e/apps/data/application/search/SearchApiImpl.kt b/app/src/main/java/foundation/e/apps/data/application/search/SearchApiImpl.kt index a012c82ce6a38a6c70b29bfa71dcf18bd3ffc08e..5190fe909b7e2a16351afe044fbbc4dd632d8dcf 100644 --- a/app/src/main/java/foundation/e/apps/data/application/search/SearchApiImpl.kt +++ b/app/src/main/java/foundation/e/apps/data/application/search/SearchApiImpl.kt @@ -39,7 +39,7 @@ import foundation.e.apps.data.enums.ResultStatus import foundation.e.apps.data.handleNetworkResult import foundation.e.apps.data.login.AuthObject import foundation.e.apps.data.playstore.PlayStoreRepository -import foundation.e.apps.data.preference.PreferenceManagerModule +import foundation.e.apps.data.preference.AppLoungePreference import foundation.e.apps.utils.eventBus.AppEvent import foundation.e.apps.utils.eventBus.EventBus import kotlinx.coroutines.Deferred @@ -55,7 +55,7 @@ typealias FusedHomeDeferred = Deferred>> @Singleton class SearchApiImpl @Inject constructor( private val appsApi: AppsApi, - private val preferenceManagerModule: PreferenceManagerModule, + private val appLoungePreference: AppLoungePreference, @Named("gplayRepository") private val gplayRepository: PlayStoreRepository, @Named("cleanApkAppsRepository") private val cleanApkAppsRepository: CleanApkRepository, @Named("cleanApkPWARepository") private val cleanApkPWARepository: CleanApkRepository, @@ -72,9 +72,9 @@ class SearchApiImpl @Inject constructor( override fun getSelectedAppTypes(): List { val selectedAppTypes = mutableListOf() - if (preferenceManagerModule.isGplaySelected()) selectedAppTypes.add(APP_TYPE_ANY) - if (preferenceManagerModule.isOpenSourceSelected()) selectedAppTypes.add(APP_TYPE_OPEN) - if (preferenceManagerModule.isPWASelected()) selectedAppTypes.add(APP_TYPE_PWA) + if (appLoungePreference.isGplaySelected()) selectedAppTypes.add(APP_TYPE_ANY) + if (appLoungePreference.isOpenSourceSelected()) selectedAppTypes.add(APP_TYPE_OPEN) + if (appLoungePreference.isPWASelected()) selectedAppTypes.add(APP_TYPE_PWA) return selectedAppTypes } @@ -97,7 +97,7 @@ class SearchApiImpl @Inject constructor( fetchPackageSpecificResult(authData, query).data?.first ?: emptyList() val searchResult = mutableListOf() - if (preferenceManagerModule.isOpenSourceSelected()) { + if (appLoungePreference.isOpenSourceSelected()) { finalSearchResult = fetchOpenSourceSearchResult( query, searchResult, @@ -105,7 +105,7 @@ class SearchApiImpl @Inject constructor( ) } - if (preferenceManagerModule.isPWASelected()) { + if (appLoungePreference.isPWASelected()) { finalSearchResult = fetchPWASearchResult( query, searchResult, @@ -145,7 +145,7 @@ class SearchApiImpl @Inject constructor( packageSpecificResults, query ), - preferenceManagerModule.isGplaySelected() + appLoungePreference.isGplaySelected() ) ) } @@ -174,7 +174,7 @@ class SearchApiImpl @Inject constructor( packageSpecificResults, query ), - preferenceManagerModule.isGplaySelected() || preferenceManagerModule.isPWASelected() + appLoungePreference.isGplaySelected() || appLoungePreference.isPWASelected() ) ) } @@ -188,11 +188,11 @@ class SearchApiImpl @Inject constructor( var cleanapkPackageResult: Application? = null val result = handleNetworkResult { - if (preferenceManagerModule.isGplaySelected()) { + if (appLoungePreference.isGplaySelected()) { gplayPackageResult = getGplayPackagResult(query, authData) } - if (preferenceManagerModule.isOpenSourceSelected()) { + if (appLoungePreference.isOpenSourceSelected()) { cleanapkPackageResult = getCleanApkPackageResult(query) } } @@ -204,7 +204,7 @@ class SearchApiImpl @Inject constructor( gplayPackageResult?.let { packageSpecificResults.add(it) } } - if (preferenceManagerModule.isGplaySelected()) { + if (appLoungePreference.isGplaySelected()) { packageSpecificResults.add(Application(isPlaceHolder = true)) } @@ -236,7 +236,7 @@ class SearchApiImpl @Inject constructor( val finalList = (packageSpecificResults + filteredResults).toMutableList() finalList.removeIf { it.isPlaceHolder } - if (preferenceManagerModule.isGplaySelected()) { + if (appLoungePreference.isGplaySelected()) { finalList.add(Application(isPlaceHolder = true)) } @@ -325,7 +325,7 @@ class SearchApiImpl @Inject constructor( val searchResults = gplayRepository.getSearchResult(query, nextPageSubBundle?.toMutableSet()) - if (!preferenceManagerModule.isGplaySelected()) { + if (!appLoungePreference.isGplaySelected()) { return@handleNetworkResult Pair( listOf(), setOf() diff --git a/app/src/main/java/foundation/e/apps/data/fusedDownload/FusedManagerImpl.kt b/app/src/main/java/foundation/e/apps/data/fusedDownload/FusedManagerImpl.kt index 2169c34165cd7b9cda9bdb02aba359f0c67c92f7..f0e2b6b7e36c601960b5522c8e879591f3265029 100644 --- a/app/src/main/java/foundation/e/apps/data/fusedDownload/FusedManagerImpl.kt +++ b/app/src/main/java/foundation/e/apps/data/fusedDownload/FusedManagerImpl.kt @@ -33,8 +33,8 @@ import foundation.e.apps.data.enums.Status import foundation.e.apps.data.enums.Type import foundation.e.apps.data.fusedDownload.models.FusedDownload import foundation.e.apps.install.download.data.DownloadProgressLD -import foundation.e.apps.install.pkg.PWAManagerModule -import foundation.e.apps.install.pkg.PkgManagerModule +import foundation.e.apps.install.pkg.PWAManager +import foundation.e.apps.install.pkg.AppLoungePackageManager import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock @@ -51,8 +51,8 @@ class FusedManagerImpl @Inject constructor( private val downloadManager: DownloadManager, private val notificationManager: NotificationManager, private val fusedDownloadRepository: FusedDownloadRepository, - private val pwaManagerModule: PWAManagerModule, - private val pkgManagerModule: PkgManagerModule, + 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 @@ -103,7 +103,7 @@ class FusedManagerImpl @Inject constructor( mutex.withLock { when (fusedDownload.type) { Type.NATIVE -> downloadNativeApp(fusedDownload) - Type.PWA -> pwaManagerModule.installPWAApp(fusedDownload) + Type.PWA -> pwaManager.installPWAApp(fusedDownload) } } } @@ -119,7 +119,7 @@ class FusedManagerImpl @Inject constructor( if (list.size != 0) { try { Timber.i("installApp: STARTED ${fusedDownload.name} ${list.size}") - pkgManagerModule.installApplication(list, fusedDownload.packageName) + appLoungePackageManager.installApplication(list, fusedDownload.packageName) Timber.i("installApp: ENDED ${fusedDownload.name} ${list.size}") } catch (e: Exception) { Timber.i(">>> installApp app failed ") @@ -278,10 +278,10 @@ class FusedManagerImpl @Inject constructor( } override fun isFusedDownloadInstalled(fusedDownload: FusedDownload): Boolean { - return pkgManagerModule.isInstalled(fusedDownload.packageName) + return appLoungePackageManager.isInstalled(fusedDownload.packageName) } override fun getFusedDownloadInstallationStatus(fusedApp: FusedDownload): Status { - return pkgManagerModule.getPackageStatus(fusedApp.packageName, fusedApp.versionCode) + return appLoungePackageManager.getPackageStatus(fusedApp.packageName, fusedApp.versionCode) } } diff --git a/app/src/main/java/foundation/e/apps/data/login/CleanApkAuthenticator.kt b/app/src/main/java/foundation/e/apps/data/login/CleanApkAuthenticator.kt index 5a83b9a83c1628a75df9e1d7e0c19047ddcd433d..aec68bcbdffab823aa08a1cd5407190e24ad2c45 100644 --- a/app/src/main/java/foundation/e/apps/data/login/CleanApkAuthenticator.kt +++ b/app/src/main/java/foundation/e/apps/data/login/CleanApkAuthenticator.kt @@ -19,8 +19,8 @@ package foundation.e.apps.data.login import foundation.e.apps.data.ResultSupreme import foundation.e.apps.data.enums.User -import foundation.e.apps.data.preference.DataStoreModule -import foundation.e.apps.data.preference.PreferenceManagerModule +import foundation.e.apps.data.preference.AppLoungeDataStore +import foundation.e.apps.data.preference.AppLoungePreference import javax.inject.Inject import javax.inject.Singleton @@ -30,12 +30,12 @@ import javax.inject.Singleton */ @Singleton class CleanApkAuthenticator @Inject constructor( - private val dataStoreModule: DataStoreModule, - private val preferenceManagerModule: PreferenceManagerModule, + private val appLoungeDataStore: AppLoungeDataStore, + private val appLoungePreference: AppLoungePreference, ) : StoreAuthenticator { private val user: User - get() = dataStoreModule.getUserType() + get() = appLoungeDataStore.getUserType() override fun isStoreActive(): Boolean { if (user == User.UNAVAILABLE) { @@ -44,7 +44,7 @@ class CleanApkAuthenticator @Inject constructor( */ return false } - return preferenceManagerModule.isOpenSourceSelected() || preferenceManagerModule.isPWASelected() + return appLoungePreference.isOpenSourceSelected() || appLoungePreference.isPWASelected() } override suspend fun login(): AuthObject.CleanApk { diff --git a/app/src/main/java/foundation/e/apps/data/login/LoginCommon.kt b/app/src/main/java/foundation/e/apps/data/login/LoginCommon.kt index 8af0004e3e73a18c63eeb2a73a18dea0874f496f..137ecf433bf569d719fa90ff639ff8003a0be3c8 100644 --- a/app/src/main/java/foundation/e/apps/data/login/LoginCommon.kt +++ b/app/src/main/java/foundation/e/apps/data/login/LoginCommon.kt @@ -19,8 +19,8 @@ package foundation.e.apps.data.login import foundation.e.apps.data.Constants import foundation.e.apps.data.enums.User -import foundation.e.apps.data.preference.DataStoreModule -import foundation.e.apps.data.preference.PreferenceManagerModule +import foundation.e.apps.data.preference.AppLoungeDataStore +import foundation.e.apps.data.preference.AppLoungePreference import javax.inject.Inject import javax.inject.Singleton @@ -32,34 +32,34 @@ import javax.inject.Singleton */ @Singleton class LoginCommon @Inject constructor( - private val dataStoreModule: DataStoreModule, - private val preferenceManagerModule: PreferenceManagerModule, + private val appLoungeDataStore: AppLoungeDataStore, + private val appLoungePreference: AppLoungePreference, ) { suspend fun saveUserType(user: User) { - dataStoreModule.saveUserType(user) + appLoungeDataStore.saveUserType(user) } fun getUserType(): User { - return dataStoreModule.getUserType() + return appLoungeDataStore.getUserType() } suspend fun saveGoogleLogin(email: String, oauth: String) { - dataStoreModule.saveGoogleLogin(email, oauth) + appLoungeDataStore.saveGoogleLogin(email, oauth) } suspend fun setNoGoogleMode() { - preferenceManagerModule.setSource(Constants.PREFERENCE_SHOW_FOSS, true) - preferenceManagerModule.setSource(Constants.PREFERENCE_SHOW_PWA, true) - preferenceManagerModule.setSource(Constants.PREFERENCE_SHOW_GPLAY, false) - dataStoreModule.saveUserType(User.NO_GOOGLE) + appLoungePreference.setSource(Constants.PREFERENCE_SHOW_FOSS, true) + appLoungePreference.setSource(Constants.PREFERENCE_SHOW_PWA, true) + appLoungePreference.setSource(Constants.PREFERENCE_SHOW_GPLAY, false) + appLoungeDataStore.saveUserType(User.NO_GOOGLE) } suspend fun logout() { - dataStoreModule.destroyCredentials() - dataStoreModule.saveUserType(null) + appLoungeDataStore.destroyCredentials() + appLoungeDataStore.saveUserType(null) // reset app source preferences on logout. - preferenceManagerModule.setSource(Constants.PREFERENCE_SHOW_FOSS, true) - preferenceManagerModule.setSource(Constants.PREFERENCE_SHOW_PWA, true) - preferenceManagerModule.setSource(Constants.PREFERENCE_SHOW_GPLAY, true) + appLoungePreference.setSource(Constants.PREFERENCE_SHOW_FOSS, true) + appLoungePreference.setSource(Constants.PREFERENCE_SHOW_PWA, true) + appLoungePreference.setSource(Constants.PREFERENCE_SHOW_GPLAY, true) } } diff --git a/app/src/main/java/foundation/e/apps/data/login/PlayStoreAuthenticator.kt b/app/src/main/java/foundation/e/apps/data/login/PlayStoreAuthenticator.kt index 5f303860428a073f759910e035cfe2d99c4f0a13..823c84f63ae8851ba754c39ae5911f4f7f118247 100644 --- a/app/src/main/java/foundation/e/apps/data/login/PlayStoreAuthenticator.kt +++ b/app/src/main/java/foundation/e/apps/data/login/PlayStoreAuthenticator.kt @@ -28,8 +28,8 @@ import foundation.e.apps.data.login.api.PlayStoreLoginManagerFactory import foundation.e.apps.data.login.api.PlayStoreLoginManager import foundation.e.apps.data.login.api.GoogleLoginManager import foundation.e.apps.data.login.api.PlayStoreLoginWrapper -import foundation.e.apps.data.preference.DataStoreModule -import foundation.e.apps.data.preference.PreferenceManagerModule +import foundation.e.apps.data.preference.AppLoungeDataStore +import foundation.e.apps.data.preference.AppLoungePreference import foundation.e.apps.data.retryWithBackoff import foundation.e.apps.data.preference.getSync import timber.log.Timber @@ -47,15 +47,15 @@ import javax.inject.Singleton class PlayStoreAuthenticator @Inject constructor( @ApplicationContext private val context: Context, private val gson: Gson, - private val dataStoreModule: DataStoreModule, - private val preferenceManagerModule: PreferenceManagerModule, + private val appLoungeDataStore: AppLoungeDataStore, + private val appLoungePreference: AppLoungePreference, ) : StoreAuthenticator, AuthDataValidator { @Inject lateinit var loginManagerFactory: PlayStoreLoginManagerFactory private val user: User - get() = dataStoreModule.getUserType() + get() = appLoungeDataStore.getUserType() private val loginManager: PlayStoreLoginManager get() = loginManagerFactory.createLoginManager(user) @@ -73,7 +73,7 @@ class PlayStoreAuthenticator @Inject constructor( */ return false } - return preferenceManagerModule.isGplaySelected() + return appLoungePreference.isGplaySelected() } /** @@ -110,7 +110,7 @@ class PlayStoreAuthenticator @Inject constructor( } override suspend fun logout() { - dataStoreModule.saveAuthData(null) + appLoungeDataStore.saveAuthData(null) } /** @@ -118,7 +118,7 @@ class PlayStoreAuthenticator @Inject constructor( * Returns null if nothing is saved. */ private fun getSavedAuthData(): AuthData? { - val authJson = dataStoreModule.authData.getSync() + val authJson = appLoungeDataStore.authData.getSync() return if (authJson.isBlank()) null else try { gson.fromJson(authJson, AuthData::class.java) @@ -129,14 +129,14 @@ class PlayStoreAuthenticator @Inject constructor( } private suspend fun saveAuthData(authData: AuthData) { - dataStoreModule.saveAuthData(authData) + appLoungeDataStore.saveAuthData(authData) } /** * Generate new AuthData based on the user type. */ private suspend fun generateAuthData(): ResultSupreme { - return when (dataStoreModule.getUserType()) { + return when (appLoungeDataStore.getUserType()) { User.ANONYMOUS -> getAuthDataAnonymously() User.GOOGLE -> getAuthDataWithGoogleAccount() else -> ResultSupreme.Error("User type not ANONYMOUS or GOOGLE") @@ -161,9 +161,9 @@ class PlayStoreAuthenticator @Inject constructor( private suspend fun getAuthDataWithGoogleAccount(): ResultSupreme { - val email = dataStoreModule.emailData.getSync() - val oauthToken = dataStoreModule.oauthToken.getSync() - val aasToken = dataStoreModule.aasToken.getSync() + val email = appLoungeDataStore.emailData.getSync() + val oauthToken = appLoungeDataStore.oauthToken.getSync() + val aasToken = appLoungeDataStore.aasToken.getSync() /* * If aasToken is not blank, means it was stored successfully from a previous Google login. * Use it to fetch auth data. @@ -199,7 +199,7 @@ class PlayStoreAuthenticator @Inject constructor( /* * Finally save the aasToken and create auth data. */ - dataStoreModule.saveAasToken(aasTokenFetched) + appLoungeDataStore.saveAasToken(aasTokenFetched) return loginWrapper.login(locale).run { if (isSuccess()) ResultSupreme.Success(formatAuthData(this.data!!)) else this diff --git a/app/src/main/java/foundation/e/apps/data/login/api/GoogleLoginManager.kt b/app/src/main/java/foundation/e/apps/data/login/api/GoogleLoginManager.kt index d99fdb7f92a481a1ae67a6819fe175dc15ad4f58..2adef4c67b9cfcb4e2213c50aeda11985c774cde 100644 --- a/app/src/main/java/foundation/e/apps/data/login/api/GoogleLoginManager.kt +++ b/app/src/main/java/foundation/e/apps/data/login/api/GoogleLoginManager.kt @@ -23,7 +23,7 @@ import com.aurora.gplayapi.helpers.AuthHelper import foundation.e.apps.data.playstore.utils.AC2DMTask import foundation.e.apps.data.playstore.utils.CustomAuthValidator import foundation.e.apps.data.playstore.utils.GPlayHttpClient -import foundation.e.apps.data.preference.DataStoreModule +import foundation.e.apps.data.preference.AppLoungeDataStore import foundation.e.apps.data.preference.getSync import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext @@ -33,7 +33,7 @@ class GoogleLoginManager( private val gPlayHttpClient: GPlayHttpClient, private val nativeDeviceProperty: Properties, private val aC2DMTask: AC2DMTask, - private val dataStoreModule: DataStoreModule, + private val appLoungeDataStore: AppLoungeDataStore, ) : PlayStoreLoginManager { /** @@ -59,8 +59,8 @@ class GoogleLoginManager( * @return authData: authentication data */ override suspend fun login(): AuthData? { - val email = dataStoreModule.emailData.getSync() - val aasToken = dataStoreModule.aasToken.getSync() + val email = appLoungeDataStore.emailData.getSync() + val aasToken = appLoungeDataStore.aasToken.getSync() var authData: AuthData? withContext(Dispatchers.IO) { diff --git a/app/src/main/java/foundation/e/apps/data/login/api/PlayStoreLoginManagerFactory.kt b/app/src/main/java/foundation/e/apps/data/login/api/PlayStoreLoginManagerFactory.kt index fc1c55156aaa747569a37d350591355f536e7a2e..4e1ccdafb914c5309ec206354f9069d526b7371b 100644 --- a/app/src/main/java/foundation/e/apps/data/login/api/PlayStoreLoginManagerFactory.kt +++ b/app/src/main/java/foundation/e/apps/data/login/api/PlayStoreLoginManagerFactory.kt @@ -21,7 +21,7 @@ import com.google.gson.Gson import foundation.e.apps.data.enums.User import foundation.e.apps.data.playstore.utils.AC2DMTask import foundation.e.apps.data.playstore.utils.GPlayHttpClient -import foundation.e.apps.data.preference.DataStoreModule +import foundation.e.apps.data.preference.AppLoungeDataStore import java.util.Properties import javax.inject.Inject import javax.inject.Singleton @@ -32,12 +32,12 @@ class PlayStoreLoginManagerFactory @Inject constructor( private val nativeDeviceProperty: Properties, private val aC2DMTask: AC2DMTask, private val gson: Gson, - private val dataStoreModule: DataStoreModule, + private val appLoungeDataStore: AppLoungeDataStore, ) { fun createLoginManager(user: User): PlayStoreLoginManager { return when (user) { - User.GOOGLE -> GoogleLoginManager(gPlayHttpClient, nativeDeviceProperty, aC2DMTask, dataStoreModule) + User.GOOGLE -> GoogleLoginManager(gPlayHttpClient, nativeDeviceProperty, aC2DMTask, appLoungeDataStore) else -> AnonymousLoginManager(gPlayHttpClient, nativeDeviceProperty, gson) } } diff --git a/app/src/main/java/foundation/e/apps/data/preference/DataStoreModule.kt b/app/src/main/java/foundation/e/apps/data/preference/AppLoungeDataStore.kt similarity index 99% rename from app/src/main/java/foundation/e/apps/data/preference/DataStoreModule.kt rename to app/src/main/java/foundation/e/apps/data/preference/AppLoungeDataStore.kt index 7f042d00debf807c317d683e49ba23751ff2ce9c..5d99c5f8f2af5d7b5b7925752a6abf1a9bff65ca 100644 --- a/app/src/main/java/foundation/e/apps/data/preference/DataStoreModule.kt +++ b/app/src/main/java/foundation/e/apps/data/preference/AppLoungeDataStore.kt @@ -52,7 +52,7 @@ import kotlinx.coroutines.flow.Flow */ @Singleton -class DataStoreModule @Inject constructor( +class AppLoungeDataStore @Inject constructor( @ApplicationContext private val context: Context, private val gson: Gson diff --git a/app/src/main/java/foundation/e/apps/data/preference/PreferenceManagerModule.kt b/app/src/main/java/foundation/e/apps/data/preference/AppLoungePreference.kt similarity index 95% rename from app/src/main/java/foundation/e/apps/data/preference/PreferenceManagerModule.kt rename to app/src/main/java/foundation/e/apps/data/preference/AppLoungePreference.kt index 813fa8584cb703ea1f8a0b0208479e5d0781bc2a..415c52cd0ff03c496dc5449daf7f94bfb66d421c 100644 --- a/app/src/main/java/foundation/e/apps/data/preference/PreferenceManagerModule.kt +++ b/app/src/main/java/foundation/e/apps/data/preference/AppLoungePreference.kt @@ -31,7 +31,7 @@ import javax.inject.Singleton @Singleton @OpenForTesting -class PreferenceManagerModule @Inject constructor( +class AppLoungePreference @Inject constructor( @ApplicationContext private val context: Context ) { diff --git a/app/src/main/java/foundation/e/apps/data/preference/DataStoreManager.kt b/app/src/main/java/foundation/e/apps/data/preference/DataStoreManager.kt index 240d0716cbdcd59db27d0fa321810be37cfc6b48..a3194625013b0b9cb5452879ab05ef240948eff6 100644 --- a/app/src/main/java/foundation/e/apps/data/preference/DataStoreManager.kt +++ b/app/src/main/java/foundation/e/apps/data/preference/DataStoreManager.kt @@ -26,17 +26,17 @@ import javax.inject.Singleton @Singleton class DataStoreManager @Inject constructor() { @Inject - lateinit var dataStoreModule: DataStoreModule + lateinit var appLoungeDataStore: AppLoungeDataStore @Inject lateinit var gson: Gson fun getAuthData(): AuthData { - val authDataJson = dataStoreModule.authData.getSync() + val authDataJson = appLoungeDataStore.authData.getSync() return gson.fromJson(authDataJson, AuthData::class.java) ?: AuthData("", "") } fun getUserType(): User { - return dataStoreModule.getUserType() + return appLoungeDataStore.getUserType() } } diff --git a/app/src/main/java/foundation/e/apps/data/updates/UpdatesManagerImpl.kt b/app/src/main/java/foundation/e/apps/data/updates/UpdatesManagerImpl.kt index 5b0b9df12a53d56c924a3abb786d21dda350ff21..1da8e13a55461574d2501095fad862533d55d547 100644 --- a/app/src/main/java/foundation/e/apps/data/updates/UpdatesManagerImpl.kt +++ b/app/src/main/java/foundation/e/apps/data/updates/UpdatesManagerImpl.kt @@ -33,8 +33,8 @@ import foundation.e.apps.data.fdroid.FdroidRepository import foundation.e.apps.data.application.ApplicationRepository import foundation.e.apps.data.application.search.SearchApi.Companion.APP_TYPE_ANY import foundation.e.apps.data.application.data.Application -import foundation.e.apps.data.preference.PreferenceManagerModule -import foundation.e.apps.install.pkg.PkgManagerModule +import foundation.e.apps.data.preference.AppLoungePreference +import foundation.e.apps.install.pkg.AppLoungePackageManager import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.async import kotlinx.coroutines.awaitAll @@ -45,10 +45,10 @@ import javax.inject.Inject class UpdatesManagerImpl @Inject constructor( @ApplicationContext private val context: Context, - private val pkgManagerModule: PkgManagerModule, + private val appLoungePackageManager: AppLoungePackageManager, private val applicationRepository: ApplicationRepository, private val faultyAppRepository: FaultyAppRepository, - private val preferenceManagerModule: PreferenceManagerModule, + private val appLoungePreference: AppLoungePreference, private val fdroidRepository: FdroidRepository, private val blockedAppRepository: BlockedAppRepository, ) { @@ -60,7 +60,7 @@ class UpdatesManagerImpl @Inject constructor( } private val userApplications: List - get() = pkgManagerModule.getAllUserApps() + get() = appLoungePackageManager.getAllUserApps() suspend fun getUpdates(authData: AuthData): Pair, ResultStatus> { val updateList = mutableListOf() @@ -69,7 +69,7 @@ class UpdatesManagerImpl @Inject constructor( val openSourceInstalledApps = getOpenSourceInstalledApps().toMutableList() val gPlayInstalledApps = getGPlayInstalledApps().toMutableList() - if (preferenceManagerModule.shouldUpdateAppsFromOtherStores()) { + if (appLoungePreference.shouldUpdateAppsFromOtherStores()) { withContext(Dispatchers.IO) { val otherStoresInstalledApps = getAppsFromOtherStores().toMutableList() @@ -131,7 +131,7 @@ class UpdatesManagerImpl @Inject constructor( val openSourceInstalledApps = getOpenSourceInstalledApps().toMutableList() - if (preferenceManagerModule.shouldUpdateAppsFromOtherStores()) { + if (appLoungePreference.shouldUpdateAppsFromOtherStores()) { val otherStoresInstalledApps = getAppsFromOtherStores().toMutableList() // This list is based on app signatures @@ -166,7 +166,7 @@ class UpdatesManagerImpl @Inject constructor( */ private fun getOpenSourceInstalledApps(): List { return userApplications.filter { - pkgManagerModule.getInstallerName(it.packageName) in listOf( + appLoungePackageManager.getInstallerName(it.packageName) in listOf( context.packageName, PACKAGE_NAME_F_DROID, PACKAGE_NAME_F_DROID_PRIVILEGED, @@ -182,7 +182,7 @@ class UpdatesManagerImpl @Inject constructor( */ private fun getGPlayInstalledApps(): List { return userApplications.filter { - pkgManagerModule.getInstallerName(it.packageName) in listOf( + appLoungePackageManager.getInstallerName(it.packageName) in listOf( PACKAGE_NAME_ANDROID_VENDING, ) }.map { it.packageName } @@ -315,7 +315,7 @@ class UpdatesManagerImpl @Inject constructor( val fDroidUpdatablePackageNames = fDroidAppsAndSignatures.filter { // For each installed app also present on F-droid, check signature of base APK. - val baseApkPath = pkgManagerModule.getBaseApkPath(it.key) + val baseApkPath = appLoungePackageManager.getBaseApkPath(it.key) ApkSignatureManager.verifyFdroidSignature(context, baseApkPath, it.value, it.key) }.map { it.key } @@ -345,8 +345,8 @@ class UpdatesManagerImpl @Inject constructor( Timber.i("Latest signature version for $packageName : $latestSignatureVersion") - val installedVersionCode = pkgManagerModule.getVersionCode(packageName) - val installedVersionName = pkgManagerModule.getVersionName(packageName) + val installedVersionCode = appLoungePackageManager.getVersionCode(packageName) + val installedVersionName = appLoungePackageManager.getVersionName(packageName) Timber.i("Calculate signature for $packageName : $installedVersionCode, $installedVersionName") diff --git a/app/src/main/java/foundation/e/apps/install/download/DownloadManagerModule.kt b/app/src/main/java/foundation/e/apps/di/DownloadManagerModule.kt similarity index 94% rename from app/src/main/java/foundation/e/apps/install/download/DownloadManagerModule.kt rename to app/src/main/java/foundation/e/apps/di/DownloadManagerModule.kt index 9d94e27b3648a6a7c32c9a3ce2182e621370cd0a..f902b05974512d98cbc569ba75530d52e479f0df 100644 --- a/app/src/main/java/foundation/e/apps/install/download/DownloadManagerModule.kt +++ b/app/src/main/java/foundation/e/apps/di/DownloadManagerModule.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.install.download +package foundation.e.apps.di import android.app.DownloadManager import android.content.Context diff --git a/app/src/main/java/foundation/e/apps/install/notification/NotificationManagerModule.kt b/app/src/main/java/foundation/e/apps/di/NotificationManagerModule.kt similarity index 64% rename from app/src/main/java/foundation/e/apps/install/notification/NotificationManagerModule.kt rename to app/src/main/java/foundation/e/apps/di/NotificationManagerModule.kt index f12b62b16ff2abec95cf7a1d35ec698c061cb2b3..3d3747adb7a2c9b085c8440e6528383fb053a8ad 100644 --- a/app/src/main/java/foundation/e/apps/install/notification/NotificationManagerModule.kt +++ b/app/src/main/java/foundation/e/apps/di/NotificationManagerModule.kt @@ -1,22 +1,23 @@ /* - * Apps Quickly and easily install Android apps onto your device! - * Copyright (C) 2021 E FOUNDATION + * Copyright MURENA SAS 2023 + * Apps Quickly and easily install Android apps onto your device! * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . */ -package foundation.e.apps.install.notification +package foundation.e.apps.di import android.app.NotificationChannel import android.app.NotificationManager diff --git a/app/src/main/java/foundation/e/apps/install/notification/StorageNotificationManager.kt b/app/src/main/java/foundation/e/apps/install/notification/StorageNotificationManager.kt index be74895ea1fe501207d33b01a5585214bcbaac14..cf767bba7d41866d535a9c98590f9cf1ea4dc075 100644 --- a/app/src/main/java/foundation/e/apps/install/notification/StorageNotificationManager.kt +++ b/app/src/main/java/foundation/e/apps/install/notification/StorageNotificationManager.kt @@ -30,6 +30,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext import foundation.e.apps.R import foundation.e.apps.data.DownloadManager import foundation.e.apps.data.fusedDownload.models.FusedDownload +import foundation.e.apps.di.NotificationManagerModule import foundation.e.apps.utils.StorageComputer import javax.inject.Inject diff --git a/app/src/main/java/foundation/e/apps/install/pkg/PkgManagerModule.kt b/app/src/main/java/foundation/e/apps/install/pkg/AppLoungePackageManager.kt similarity index 96% rename from app/src/main/java/foundation/e/apps/install/pkg/PkgManagerModule.kt rename to app/src/main/java/foundation/e/apps/install/pkg/AppLoungePackageManager.kt index 839aa2d9e737bdda2ce22ae207c7b836cd1cb941..0dc514861388ed439dc32e89d0b1e828a6257b02 100644 --- a/app/src/main/java/foundation/e/apps/install/pkg/PkgManagerModule.kt +++ b/app/src/main/java/foundation/e/apps/install/pkg/AppLoungePackageManager.kt @@ -44,7 +44,7 @@ import javax.inject.Singleton @Singleton @OpenForTesting -class PkgManagerModule @Inject constructor( +class AppLoungePackageManager @Inject constructor( @ApplicationContext private val context: Context ) { companion object { @@ -126,7 +126,7 @@ class PkgManagerModule @Inject constructor( packageManager.setInstallerPackageName(targetPackage, FAKE_STORE_PACKAGE_NAME) Timber.d("Changed installer to $FAKE_STORE_PACKAGE_NAME for $targetPackage") } catch (e: Exception) { - e.printStackTrace() + Timber.w(e) } } } diff --git a/app/src/main/java/foundation/e/apps/install/pkg/InstallerService.kt b/app/src/main/java/foundation/e/apps/install/pkg/InstallerService.kt index eaaafb3e60861d8fd57f2af23b4499a87ce0ea29..1d98217c79777b9cf69821a22caed53585d81791 100644 --- a/app/src/main/java/foundation/e/apps/install/pkg/InstallerService.kt +++ b/app/src/main/java/foundation/e/apps/install/pkg/InstallerService.kt @@ -42,7 +42,7 @@ class InstallerService : Service() { lateinit var fusedManagerRepository: FusedManagerRepository @Inject - lateinit var pkgManagerModule: PkgManagerModule + lateinit var appLoungePackageManager: AppLoungePackageManager @Inject lateinit var faultyAppRepository: FaultyAppRepository @@ -60,9 +60,9 @@ class InstallerService : Service() { /** There is some error case where package name from PackageInstaller remains empty (example: INSTALL_PARSE_FAILED_NOT_APK). - the packageName from PkgManagerModule will be used in this error case. + the packageName from AppLoungePackageManager will be used in this error case. */ - val packageNamePackageManagerModule = intent.getStringExtra(PkgManagerModule.PACKAGE_NAME) + val packageNamePackageManagerModule = intent.getStringExtra(AppLoungePackageManager.PACKAGE_NAME) packageName = packageName ?: packageNamePackageManagerModule postStatus(status, packageName, extra) diff --git a/app/src/main/java/foundation/e/apps/install/pkg/PWAManagerModule.kt b/app/src/main/java/foundation/e/apps/install/pkg/PWAManager.kt similarity index 95% rename from app/src/main/java/foundation/e/apps/install/pkg/PWAManagerModule.kt rename to app/src/main/java/foundation/e/apps/install/pkg/PWAManager.kt index 4179f6fbd0e878e6a16eec3627c71325e3adf4f1..4b3d37a277ddd36955cd7b37432377c0632eaecf 100644 --- a/app/src/main/java/foundation/e/apps/install/pkg/PWAManagerModule.kt +++ b/app/src/main/java/foundation/e/apps/install/pkg/PWAManager.kt @@ -27,7 +27,7 @@ import javax.inject.Singleton @Singleton @OpenForTesting -class PWAManagerModule @Inject constructor( +class PWAManager @Inject constructor( @ApplicationContext private val context: Context, private val fusedDownloadRepository: FusedDownloadRepository, ) { @@ -43,6 +43,10 @@ class PWAManagerModule @Inject constructor( private const val PWA_PLAYER = "content://foundation.e.pwaplayer.provider/pwa" private const val VIEW_PWA = "foundation.e.blisslauncher.VIEW_PWA" + + private const val DELAY_100 = 100L + private const val DELAY_500 = 500L + private const val BITMAP_QUALITY = 100 } /** @@ -148,7 +152,7 @@ class PWAManagerModule @Inject constructor( fun Bitmap.toByteArray(): ByteArray { val byteArrayOS = ByteArrayOutputStream() - this.compress(Bitmap.CompressFormat.PNG, 100, byteArrayOS) + this.compress(Bitmap.CompressFormat.PNG, BITMAP_QUALITY, byteArrayOS) return byteArrayOS.toByteArray() } @@ -178,12 +182,12 @@ class PWAManagerModule @Inject constructor( ShortcutManagerCompat.requestPinShortcut(context, shortcutInfo, null) // Add a small delay to avoid conflict of button states. - delay(100) + delay(DELAY_100) // Update status fusedDownload.status = Status.INSTALLED fusedDownloadRepository.updateDownload(fusedDownload) - delay(500) + delay(DELAY_500) fusedDownloadRepository.deleteDownload(fusedDownload) } } diff --git a/app/src/main/java/foundation/e/apps/install/pkg/PkgManagerBR.kt b/app/src/main/java/foundation/e/apps/install/pkg/PkgManagerBR.kt index a33cc1d9444fc7b8e7bb20ff3802b3fba6066206..29cb4dfc1cc06226c6f54bd6244018de5ab8e1e6 100644 --- a/app/src/main/java/foundation/e/apps/install/pkg/PkgManagerBR.kt +++ b/app/src/main/java/foundation/e/apps/install/pkg/PkgManagerBR.kt @@ -42,7 +42,7 @@ open class PkgManagerBR : BroadcastReceiver() { lateinit var fusedManagerRepository: FusedManagerRepository @Inject - lateinit var pkgManagerModule: PkgManagerModule + lateinit var appLoungePackageManager: AppLoungePackageManager @Inject lateinit var faultyAppRepository: FaultyAppRepository @@ -86,7 +86,7 @@ open class PkgManagerBR : BroadcastReceiver() { removeFaultyAppByPackageName(pkgName) } - PkgManagerModule.ERROR_PACKAGE_INSTALL -> { + AppLoungePackageManager.ERROR_PACKAGE_INSTALL -> { Timber.e("Installation failed due to error: $extra") updateInstallationIssue(pkgName) } @@ -114,7 +114,7 @@ open class PkgManagerBR : BroadcastReceiver() { } GlobalScope.launch { val fusedDownload = fusedManagerRepository.getFusedDownload(packageName = pkgName) - pkgManagerModule.setFakeStoreAsInstallerIfNeeded(fusedDownload) + appLoungePackageManager.setFakeStoreAsInstallerIfNeeded(fusedDownload) fusedManagerRepository.updateDownloadStatus(fusedDownload, Status.INSTALLED) } } diff --git a/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallService.kt b/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallService.kt index 1335092429afdaec35a670babee19586cb03fc57..03011ea2fa75200d20afab8be471c200e0db3469 100644 --- a/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallService.kt +++ b/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallService.kt @@ -29,7 +29,7 @@ import com.google.gson.Gson import dagger.hilt.android.AndroidEntryPoint import foundation.e.apps.data.DownloadManager import foundation.e.apps.data.application.ApplicationRepository -import foundation.e.apps.data.preference.DataStoreModule +import foundation.e.apps.data.preference.AppLoungeDataStore import foundation.e.splitinstall.ISplitInstallService import foundation.e.splitinstall.SplitInstall import kotlinx.coroutines.launch @@ -42,7 +42,7 @@ class SplitInstallService : LifecycleService() { const val TAG = "SplitInstallService" } - @Inject lateinit var dataStoreModule: DataStoreModule + @Inject lateinit var appLoungeDataStore: AppLoungeDataStore @Inject lateinit var applicationRepository: ApplicationRepository @Inject lateinit var downloadManager: DownloadManager @Inject lateinit var gson: Gson @@ -82,7 +82,7 @@ class SplitInstallService : LifecycleService() { } private suspend fun fetchAuthData() { - dataStoreModule.authData.collect { + appLoungeDataStore.authData.collect { authData = gson.fromJson(it, AuthData::class.java) } } diff --git a/app/src/main/java/foundation/e/apps/install/updates/UpdatesBroadcastReceiver.kt b/app/src/main/java/foundation/e/apps/install/updates/UpdatesBroadcastReceiver.kt index 3edffdff75a812efd7b7cfe81fa9c0ac5f5b5523..8598a2543b41c1e4423b38dd059e2612bdd0a992 100644 --- a/app/src/main/java/foundation/e/apps/install/updates/UpdatesBroadcastReceiver.kt +++ b/app/src/main/java/foundation/e/apps/install/updates/UpdatesBroadcastReceiver.kt @@ -21,7 +21,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import androidx.work.ExistingPeriodicWorkPolicy -import foundation.e.apps.data.preference.PreferenceManagerModule +import foundation.e.apps.data.preference.AppLoungePreference import timber.log.Timber class UpdatesBroadcastReceiver : BroadcastReceiver() { @@ -29,8 +29,8 @@ class UpdatesBroadcastReceiver : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { Timber.d("onReceive: ${intent.action}") if (intent.action == Intent.ACTION_BOOT_COMPLETED) { - val preferenceManagerModule = PreferenceManagerModule(context) - val interval = preferenceManagerModule.getUpdateInterval() + val appLoungePreference = AppLoungePreference(context) + val interval = appLoungePreference.getUpdateInterval() UpdatesWorkManager.enqueueWork(context, interval, ExistingPeriodicWorkPolicy.REPLACE) } } diff --git a/app/src/main/java/foundation/e/apps/receivers/DumpAuthData.kt b/app/src/main/java/foundation/e/apps/receivers/DumpAuthData.kt index 02b8842ff9217f7c9554d22d64bd21035e5cff89..499413790c85f3eea30c7508dc5a5f369bef0ec5 100644 --- a/app/src/main/java/foundation/e/apps/receivers/DumpAuthData.kt +++ b/app/src/main/java/foundation/e/apps/receivers/DumpAuthData.kt @@ -23,7 +23,7 @@ import com.aurora.gplayapi.data.models.AuthData import com.google.gson.Gson import foundation.e.apps.data.Constants.ACTION_AUTHDATA_DUMP import foundation.e.apps.data.Constants.TAG_AUTHDATA_DUMP -import foundation.e.apps.data.preference.DataStoreModule +import foundation.e.apps.data.preference.AppLoungeDataStore import foundation.e.apps.data.preference.getSync import org.json.JSONObject import timber.log.Timber @@ -48,7 +48,7 @@ class DumpAuthData : BroadcastReceiver() { private fun getAuthDataDump(context: Context): String { val gson = Gson() // TODO: replace with context.configuration - val authData = DataStoreModule(context, gson).authData.getSync().let { + val authData = AppLoungeDataStore(context, gson).authData.getSync().let { gson.fromJson(it, AuthData::class.java) } val filteredData = JSONObject().apply { diff --git a/app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt b/app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt index 51a52c96575a90ce2291a3c0e3728bac2a2bff65..ff5070959d47d8f7e73029c077580d85adfdc433 100644 --- a/app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt @@ -45,9 +45,9 @@ import foundation.e.apps.data.application.ApplicationRepository import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.fusedDownload.FusedManagerRepository import foundation.e.apps.data.fusedDownload.models.FusedDownload -import foundation.e.apps.data.preference.DataStoreModule -import foundation.e.apps.install.pkg.PWAManagerModule -import foundation.e.apps.install.pkg.PkgManagerModule +import foundation.e.apps.data.preference.AppLoungeDataStore +import foundation.e.apps.install.pkg.PWAManager +import foundation.e.apps.install.pkg.AppLoungePackageManager import foundation.e.apps.install.workmanager.AppInstallProcessor import foundation.e.apps.data.preference.getSync import kotlinx.coroutines.channels.ProducerScope @@ -58,17 +58,17 @@ import javax.inject.Inject @HiltViewModel class MainActivityViewModel @Inject constructor( - private val dataStoreModule: DataStoreModule, + private val appLoungeDataStore: AppLoungeDataStore, private val applicationRepository: ApplicationRepository, private val fusedManagerRepository: FusedManagerRepository, - private val pkgManagerModule: PkgManagerModule, - private val pwaManagerModule: PWAManagerModule, + private val appLoungePackageManager: AppLoungePackageManager, + private val pwaManager: PWAManager, private val ecloudRepository: EcloudRepository, private val blockedAppRepository: BlockedAppRepository, private val appInstallProcessor: AppInstallProcessor ) : ViewModel() { - val tocStatus: LiveData = dataStoreModule.tocStatus.asLiveData() + val tocStatus: LiveData = appLoungeDataStore.tocStatus.asLiveData() private val _purchaseAppLiveData: MutableLiveData = MutableLiveData() val purchaseAppLiveData: LiveData = _purchaseAppLiveData @@ -88,11 +88,11 @@ class MainActivityViewModel @Inject constructor( lateinit var connectivityManager: ConnectivityManager fun getUser(): User { - return dataStoreModule.getUserType() + return appLoungeDataStore.getUserType() } fun getUserEmail(): String { - return dataStoreModule.emailData.getSync() + return appLoungeDataStore.emailData.getSync() } fun uploadFaultyTokenToEcloud(email: String, description: String = "") { @@ -295,14 +295,14 @@ class MainActivityViewModel @Inject constructor( } fun getAppNameByPackageName(packageName: String): String { - return pkgManagerModule.getAppNameFromPackageName(packageName) + return appLoungePackageManager.getAppNameFromPackageName(packageName) } fun getLaunchIntentForPackageName(packageName: String): Intent? { - return pkgManagerModule.getLaunchIntent(packageName) + return appLoungePackageManager.getLaunchIntent(packageName) } fun launchPwa(application: Application) { - pwaManagerModule.launchPwa(application) + pwaManager.launchPwa(application) } } diff --git a/app/src/main/java/foundation/e/apps/ui/application/ApplicationFragment.kt b/app/src/main/java/foundation/e/apps/ui/application/ApplicationFragment.kt index d69cc60320cca6083b4a75471a36f6a3c3448f29..021d357d05fcb6da9b722443f3a53c3bea6ce994 100644 --- a/app/src/main/java/foundation/e/apps/ui/application/ApplicationFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/application/ApplicationFragment.kt @@ -59,8 +59,8 @@ import foundation.e.apps.data.login.exceptions.GPlayLoginException import foundation.e.apps.databinding.FragmentApplicationBinding import foundation.e.apps.di.CommonUtilsModule.LIST_OF_NULL import foundation.e.apps.install.download.data.DownloadProgress -import foundation.e.apps.install.pkg.PWAManagerModule -import foundation.e.apps.install.pkg.PkgManagerModule +import foundation.e.apps.install.pkg.PWAManager +import foundation.e.apps.install.pkg.AppLoungePackageManager import foundation.e.apps.ui.AppInfoFetchViewModel import foundation.e.apps.ui.MainActivityViewModel import foundation.e.apps.ui.PrivacyInfoViewModel @@ -112,10 +112,10 @@ class ApplicationFragment : TimeoutFragment(R.layout.fragment_application) { private lateinit var screenshotsRVAdapter: ApplicationScreenshotsRVAdapter @Inject - lateinit var pkgManagerModule: PkgManagerModule + lateinit var appLoungePackageManager: AppLoungePackageManager @Inject - lateinit var pwaManagerModule: PWAManagerModule + lateinit var pwaManager: PWAManager private val applicationViewModel: ApplicationViewModel by viewModels() private val privacyInfoViewModel: PrivacyInfoViewModel by viewModels() @@ -778,9 +778,9 @@ class ApplicationFragment : TimeoutFragment(R.layout.fragment_application) { ContextCompat.getColorStateList(view.context, R.color.colorAccent) setOnClickListener { if (application.is_pwa) { - pwaManagerModule.launchPwa(application) + pwaManager.launchPwa(application) } else { - val launchIntent = pkgManagerModule.getLaunchIntent(application.package_name) + val launchIntent = appLoungePackageManager.getLaunchIntent(application.package_name) launchIntent?.run { startActivity(this) } } } diff --git a/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListFragment.kt b/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListFragment.kt index f1c18aa09aef4786842c5351d02be2b39672ad79..01ecf4c07885e752b06eb3b184dfbf2234b0672c 100644 --- a/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListFragment.kt @@ -39,8 +39,8 @@ import foundation.e.apps.data.login.AuthObject import foundation.e.apps.data.login.exceptions.GPlayLoginException import foundation.e.apps.databinding.FragmentApplicationListBinding import foundation.e.apps.install.download.data.DownloadProgress -import foundation.e.apps.install.pkg.PWAManagerModule -import foundation.e.apps.install.pkg.PkgManagerModule +import foundation.e.apps.install.pkg.PWAManager +import foundation.e.apps.install.pkg.AppLoungePackageManager import foundation.e.apps.ui.AppInfoFetchViewModel import foundation.e.apps.ui.AppProgressViewModel import foundation.e.apps.ui.MainActivityViewModel @@ -59,10 +59,10 @@ class ApplicationListFragment : protected val args: ApplicationListFragmentArgs by navArgs() @Inject - lateinit var pkgManagerModule: PkgManagerModule + lateinit var appLoungePackageManager: AppLoungePackageManager @Inject - lateinit var pwaManagerModule: PWAManagerModule + lateinit var pwaManager: PWAManager // protected to avoid SyntheticAccessor protected val viewModel: ApplicationListViewModel by viewModels() diff --git a/app/src/main/java/foundation/e/apps/ui/home/HomeFragment.kt b/app/src/main/java/foundation/e/apps/ui/home/HomeFragment.kt index 5615aa3ade8687c8f7362c2376e9f80f67b2605f..0c69177bff8f393764f2fb1fb583c132f04872db 100644 --- a/app/src/main/java/foundation/e/apps/ui/home/HomeFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/home/HomeFragment.kt @@ -38,7 +38,7 @@ import foundation.e.apps.data.login.exceptions.GPlayLoginException import foundation.e.apps.databinding.FragmentHomeBinding import foundation.e.apps.di.CommonUtilsModule.safeNavigate import foundation.e.apps.install.download.data.DownloadProgress -import foundation.e.apps.install.pkg.PWAManagerModule +import foundation.e.apps.install.pkg.PWAManager import foundation.e.apps.ui.AppInfoFetchViewModel import foundation.e.apps.ui.AppProgressViewModel import foundation.e.apps.ui.MainActivityViewModel @@ -66,7 +66,7 @@ class HomeFragment : TimeoutFragment(R.layout.fragment_home), ApplicationInstall private val appInfoFetchViewModel: AppInfoFetchViewModel by viewModels() @Inject - lateinit var pwaManagerModule: PWAManagerModule + lateinit var pwaManager: PWAManager override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/app/src/main/java/foundation/e/apps/ui/search/SearchFragment.kt b/app/src/main/java/foundation/e/apps/ui/search/SearchFragment.kt index 4c54fc682241cff5e208483a078c85cbae390873..0c743352eba41ddc2361c260b3297255fd60b197 100644 --- a/app/src/main/java/foundation/e/apps/ui/search/SearchFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/search/SearchFragment.kt @@ -50,7 +50,7 @@ import foundation.e.apps.data.login.AuthObject import foundation.e.apps.data.login.exceptions.GPlayLoginException import foundation.e.apps.databinding.FragmentSearchBinding import foundation.e.apps.install.download.data.DownloadProgress -import foundation.e.apps.install.pkg.PWAManagerModule +import foundation.e.apps.install.pkg.PWAManager import foundation.e.apps.ui.AppInfoFetchViewModel import foundation.e.apps.ui.AppProgressViewModel import foundation.e.apps.ui.MainActivityViewModel @@ -70,7 +70,7 @@ class SearchFragment : ApplicationInstaller { @Inject - lateinit var pwaManagerModule: PWAManagerModule + lateinit var pwaManager: PWAManager private var _binding: FragmentSearchBinding? = null private val binding get() = _binding!! diff --git a/app/src/main/java/foundation/e/apps/ui/setup/signin/LocaleChangedBroadcastReceiver.kt b/app/src/main/java/foundation/e/apps/ui/setup/signin/LocaleChangedBroadcastReceiver.kt index f659e91832f9704a493ee486bcef4857eb292f56..7b842e20e36539f5a564a332c7a4a0573a196537 100644 --- a/app/src/main/java/foundation/e/apps/ui/setup/signin/LocaleChangedBroadcastReceiver.kt +++ b/app/src/main/java/foundation/e/apps/ui/setup/signin/LocaleChangedBroadcastReceiver.kt @@ -24,7 +24,7 @@ import android.content.Intent import com.aurora.gplayapi.data.models.AuthData import com.google.gson.Gson import dagger.hilt.android.AndroidEntryPoint -import foundation.e.apps.data.preference.DataStoreModule +import foundation.e.apps.data.preference.AppLoungeDataStore import foundation.e.apps.data.preference.getSync import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.Dispatchers @@ -40,7 +40,7 @@ import javax.inject.Inject class LocaleChangedBroadcastReceiver : BroadcastReceiver() { @Inject - lateinit var dataStoreModule: DataStoreModule + lateinit var appLoungeDataStore: AppLoungeDataStore @Inject lateinit var gson: Gson @Inject @@ -53,10 +53,10 @@ class LocaleChangedBroadcastReceiver : BroadcastReceiver() { } GlobalScope.launch { try { - val authDataJson = dataStoreModule.authData.getSync() + val authDataJson = appLoungeDataStore.authData.getSync() val authData = gson.fromJson(authDataJson, AuthData::class.java) authData.locale = context.resources.configuration.locales[0] - dataStoreModule.saveAuthData(authData) + appLoungeDataStore.saveAuthData(authData) withContext(Dispatchers.IO) { cache.evictAll() } diff --git a/app/src/main/java/foundation/e/apps/ui/setup/signin/SignInViewModel.kt b/app/src/main/java/foundation/e/apps/ui/setup/signin/SignInViewModel.kt index 742cf51d9c723b77700af4c358ef05f6fbc6d0cd..f12caf9cd4c1d3eefc94328774b18f19f9c41eda 100644 --- a/app/src/main/java/foundation/e/apps/ui/setup/signin/SignInViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/setup/signin/SignInViewModel.kt @@ -4,20 +4,17 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.asLiveData -import androidx.lifecycle.viewModelScope import com.aurora.gplayapi.data.models.AuthData import dagger.hilt.android.lifecycle.HiltViewModel -import foundation.e.apps.data.enums.User -import foundation.e.apps.data.preference.DataStoreModule -import kotlinx.coroutines.launch +import foundation.e.apps.data.preference.AppLoungeDataStore import javax.inject.Inject @HiltViewModel class SignInViewModel @Inject constructor( - private val dataStoreModule: DataStoreModule, + private val appLoungeDataStore: AppLoungeDataStore, ) : ViewModel() { - val userType: LiveData = dataStoreModule.userType.asLiveData() + val userType: LiveData = appLoungeDataStore.userType.asLiveData() private val _authLiveData: MutableLiveData = MutableLiveData() val authLiveData: LiveData = _authLiveData diff --git a/app/src/main/java/foundation/e/apps/ui/setup/tos/TOSViewModel.kt b/app/src/main/java/foundation/e/apps/ui/setup/tos/TOSViewModel.kt index ef3ad38050c5c237b84c18b5e2272b101233819e..bc1ec1052435ba5c4903a083718dd34f7aee62d5 100644 --- a/app/src/main/java/foundation/e/apps/ui/setup/tos/TOSViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/setup/tos/TOSViewModel.kt @@ -5,20 +5,20 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.asLiveData import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import foundation.e.apps.data.preference.DataStoreModule +import foundation.e.apps.data.preference.AppLoungeDataStore import kotlinx.coroutines.launch import javax.inject.Inject @HiltViewModel class TOSViewModel @Inject constructor( - private val dataStoreModule: DataStoreModule + private val appLoungeDataStore: AppLoungeDataStore ) : ViewModel() { - val tocStatus: LiveData = dataStoreModule.tocStatus.asLiveData() + val tocStatus: LiveData = appLoungeDataStore.tocStatus.asLiveData() fun saveTOCStatus(status: Boolean) { viewModelScope.launch { - dataStoreModule.saveTOCStatus(status, TOS_VERSION) + appLoungeDataStore.saveTOCStatus(status, TOS_VERSION) } } } diff --git a/app/src/main/java/foundation/e/apps/ui/updates/UpdatesFragment.kt b/app/src/main/java/foundation/e/apps/ui/updates/UpdatesFragment.kt index 615da67a64911542ba676abc903c92fced8ab024..13d9c372067530c9161053ef33c80b363cbdd2b8 100644 --- a/app/src/main/java/foundation/e/apps/ui/updates/UpdatesFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/updates/UpdatesFragment.kt @@ -45,7 +45,7 @@ import foundation.e.apps.data.login.exceptions.GPlayLoginException import foundation.e.apps.databinding.FragmentUpdatesBinding import foundation.e.apps.di.CommonUtilsModule.safeNavigate import foundation.e.apps.install.download.data.DownloadProgress -import foundation.e.apps.install.pkg.PWAManagerModule +import foundation.e.apps.install.pkg.PWAManager import foundation.e.apps.install.updates.UpdatesWorkManager import foundation.e.apps.install.workmanager.InstallWorkManager.INSTALL_WORK_NAME import foundation.e.apps.ui.AppInfoFetchViewModel @@ -71,7 +71,7 @@ class UpdatesFragment : TimeoutFragment(R.layout.fragment_updates), ApplicationI private val binding get() = _binding!! @Inject - lateinit var pwaManagerModule: PWAManagerModule + lateinit var pwaManager: PWAManager private val updatesViewModel: UpdatesViewModel by viewModels() private val privacyInfoViewModel: PrivacyInfoViewModel by viewModels() diff --git a/app/src/main/java/foundation/e/apps/ui/updates/UpdatesViewModel.kt b/app/src/main/java/foundation/e/apps/ui/updates/UpdatesViewModel.kt index 5f0a47a8bdfe781da0fab056350dc3d5c1e6dd5a..12efeb8f643e8539a98668f74953002d4b3a72da 100644 --- a/app/src/main/java/foundation/e/apps/ui/updates/UpdatesViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/updates/UpdatesViewModel.kt @@ -30,7 +30,7 @@ import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.login.AuthObject import foundation.e.apps.data.login.exceptions.CleanApkException import foundation.e.apps.data.login.exceptions.GPlayException -import foundation.e.apps.data.preference.PreferenceManagerModule +import foundation.e.apps.data.preference.AppLoungePreference import foundation.e.apps.data.updates.UpdatesManagerRepository import foundation.e.apps.ui.parentFragment.LoadingViewModel import kotlinx.coroutines.launch @@ -40,7 +40,7 @@ import javax.inject.Inject class UpdatesViewModel @Inject constructor( private val updatesManagerRepository: UpdatesManagerRepository, private val applicationRepository: ApplicationRepository, - private val preferenceManagerModule: PreferenceManagerModule + private val appLoungePreference: AppLoungePreference ) : LoadingViewModel() { val updatesList: MutableLiveData, ResultStatus?>> = MutableLiveData() @@ -132,5 +132,5 @@ class UpdatesViewModel @Inject constructor( return updatesList.value?.first?.any { pendingStatesForUpdate.contains(it.status) } == true } - fun getUpdateInterval() = preferenceManagerModule.getUpdateInterval() + fun getUpdateInterval() = appLoungePreference.getUpdateInterval() } diff --git a/app/src/test/java/foundation/e/apps/FakePkgManagerModule.kt b/app/src/test/java/foundation/e/apps/FakeAppLoungePackageManager.kt similarity index 93% rename from app/src/test/java/foundation/e/apps/FakePkgManagerModule.kt rename to app/src/test/java/foundation/e/apps/FakeAppLoungePackageManager.kt index 7be3cb29f682e387887b0fc9b69d4116f6783b1c..c27a0257c7c42cd80996563b0c4fc7a368ad084e 100644 --- a/app/src/test/java/foundation/e/apps/FakePkgManagerModule.kt +++ b/app/src/test/java/foundation/e/apps/FakeAppLoungePackageManager.kt @@ -23,12 +23,12 @@ import android.content.pm.ApplicationInfo import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.updates.UpdatesManagerImpl.Companion.PACKAGE_NAME_ANDROID_VENDING import foundation.e.apps.data.updates.UpdatesManagerImpl.Companion.PACKAGE_NAME_F_DROID -import foundation.e.apps.install.pkg.PkgManagerModule +import foundation.e.apps.install.pkg.AppLoungePackageManager -class FakePkgManagerModule( +class FakeAppLoungePackageManager( context: Context, val gplayApps: List, -) : PkgManagerModule(context) { +) : AppLoungePackageManager(context) { val applicationInfo = mutableListOf( ApplicationInfo().apply { this.packageName = "foundation.e.demoone" }, diff --git a/app/src/test/java/foundation/e/apps/FakePreferenceModule.kt b/app/src/test/java/foundation/e/apps/FakeAppLoungePreference.kt similarity index 91% rename from app/src/test/java/foundation/e/apps/FakePreferenceModule.kt rename to app/src/test/java/foundation/e/apps/FakeAppLoungePreference.kt index 538bd64e585bb099ca611c4acb15405bea2b375a..7fca0e5ba3c54f0a95fc53dcbff95d7b505f9d91 100644 --- a/app/src/test/java/foundation/e/apps/FakePreferenceModule.kt +++ b/app/src/test/java/foundation/e/apps/FakeAppLoungePreference.kt @@ -18,9 +18,9 @@ package foundation.e.apps import android.content.Context -import foundation.e.apps.data.preference.PreferenceManagerModule +import foundation.e.apps.data.preference.AppLoungePreference -class FakePreferenceModule(context: Context) : PreferenceManagerModule(context) { +class FakeAppLoungePreference(context: Context) : AppLoungePreference(context) { var isPWASelectedFake = false var isOpenSourceelectedFake = false var isGplaySelectedFake = false diff --git a/app/src/test/java/foundation/e/apps/UpdateManagerImptTest.kt b/app/src/test/java/foundation/e/apps/UpdateManagerImptTest.kt index 0bf50502f4402c09db7135cfd2d01d706f81db6e..214e3ee21b47515b8abc0a11bfc0999feaa563ee 100644 --- a/app/src/test/java/foundation/e/apps/UpdateManagerImptTest.kt +++ b/app/src/test/java/foundation/e/apps/UpdateManagerImptTest.kt @@ -63,12 +63,12 @@ class UpdateManagerImptTest { @Mock private lateinit var context: Context - private lateinit var pkgManagerModule: FakePkgManagerModule + private lateinit var pkgManagerModule: FakeAppLoungePackageManager @Mock private lateinit var applicationRepository: ApplicationRepository - private lateinit var preferenceModule: FakePreferenceModule + private lateinit var preferenceModule: FakeAppLoungePreference private lateinit var faultyAppRepository: FaultyAppRepository @@ -84,8 +84,8 @@ class UpdateManagerImptTest { fun setup() { MockitoAnnotations.openMocks(this) faultyAppRepository = FaultyAppRepository(FakeFaultyAppDao()) - preferenceModule = FakePreferenceModule(context) - pkgManagerModule = FakePkgManagerModule(context, getGplayApps()) + preferenceModule = FakeAppLoungePreference(context) + pkgManagerModule = FakeAppLoungePackageManager(context, getGplayApps()) updatesManagerImpl = UpdatesManagerImpl( context, pkgManagerModule, diff --git a/app/src/test/java/foundation/e/apps/apps/AppsApiTest.kt b/app/src/test/java/foundation/e/apps/apps/AppsApiTest.kt index 533a55a9aeb56cdcf3dc184e733094d32bd3f971..49eaaa2eda5ec3c3e4975a3a43a7954708485e7d 100644 --- a/app/src/test/java/foundation/e/apps/apps/AppsApiTest.kt +++ b/app/src/test/java/foundation/e/apps/apps/AppsApiTest.kt @@ -24,7 +24,7 @@ import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.aurora.gplayapi.Constants import com.aurora.gplayapi.data.models.App import com.aurora.gplayapi.data.models.AuthData -import foundation.e.apps.FakePreferenceModule +import foundation.e.apps.FakeAppLoungePreference import foundation.e.apps.data.cleanapk.repositories.CleanApkRepository import foundation.e.apps.data.enums.FilterLevel import foundation.e.apps.data.enums.Origin @@ -34,8 +34,8 @@ import foundation.e.apps.data.application.apps.AppsApi import foundation.e.apps.data.application.apps.AppsApiImpl import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.playstore.PlayStoreRepository -import foundation.e.apps.install.pkg.PWAManagerModule -import foundation.e.apps.install.pkg.PkgManagerModule +import foundation.e.apps.install.pkg.PWAManager +import foundation.e.apps.install.pkg.AppLoungePackageManager import foundation.e.apps.util.MainCoroutineRule import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest @@ -66,10 +66,10 @@ class AppsApiTest { var mainCoroutineRule = MainCoroutineRule() @Mock - private lateinit var pwaManagerModule: PWAManagerModule + private lateinit var pwaManager: PWAManager @Mock - private lateinit var pkgManagerModule: PkgManagerModule + private lateinit var appLoungePackageManager: AppLoungePackageManager @Mock private lateinit var context: Context @@ -84,7 +84,7 @@ class AppsApiTest { private lateinit var applicationDataManager: ApplicationDataManager - private lateinit var preferenceManagerModule: FakePreferenceModule + private lateinit var preferenceManagerModule: FakeAppLoungePreference private lateinit var formatterMocked: MockedStatic @@ -96,9 +96,9 @@ class AppsApiTest { fun setup() { MockitoAnnotations.openMocks(this) formatterMocked = Mockito.mockStatic(Formatter::class.java) - preferenceManagerModule = FakePreferenceModule(context) + preferenceManagerModule = FakeAppLoungePreference(context) applicationDataManager = - ApplicationDataManager(gPlayAPIRepository, pkgManagerModule, pwaManagerModule) + ApplicationDataManager(gPlayAPIRepository, appLoungePackageManager, pwaManager) appsApi = AppsApiImpl( context, @@ -222,15 +222,15 @@ class AppsApiTest { ) ) - Mockito.`when`(pkgManagerModule.getPackageStatus(eq("foundation.e.demoone"), eq(123))) + Mockito.`when`(appLoungePackageManager.getPackageStatus(eq("foundation.e.demoone"), eq(123))) .thenReturn( Status.UNAVAILABLE ) - Mockito.`when`(pkgManagerModule.getPackageStatus(eq("foundation.e.demotwo"), eq(123))) + Mockito.`when`(appLoungePackageManager.getPackageStatus(eq("foundation.e.demotwo"), eq(123))) .thenReturn( Status.UNAVAILABLE ) - Mockito.`when`(pkgManagerModule.getPackageStatus(eq("foundation.e.demothree"), eq(123))) + Mockito.`when`(appLoungePackageManager.getPackageStatus(eq("foundation.e.demothree"), eq(123))) .thenReturn( Status.UNAVAILABLE ) @@ -265,15 +265,15 @@ class AppsApiTest { ) ) - Mockito.`when`(pkgManagerModule.getPackageStatus(eq("foundation.e.demoone"), eq(123))) + Mockito.`when`(appLoungePackageManager.getPackageStatus(eq("foundation.e.demoone"), eq(123))) .thenReturn( Status.UNAVAILABLE ) - Mockito.`when`(pkgManagerModule.getPackageStatus(eq("foundation.e.demotwo"), eq(123))) + Mockito.`when`(appLoungePackageManager.getPackageStatus(eq("foundation.e.demotwo"), eq(123))) .thenReturn( Status.INSTALLED ) - Mockito.`when`(pkgManagerModule.getPackageStatus(eq("foundation.e.demothree"), eq(123))) + Mockito.`when`(appLoungePackageManager.getPackageStatus(eq("foundation.e.demothree"), eq(123))) .thenReturn( Status.UNAVAILABLE ) @@ -308,15 +308,15 @@ class AppsApiTest { ) ) - Mockito.`when`(pkgManagerModule.getPackageStatus(eq("foundation.e.demoone"), eq(123))) + Mockito.`when`(appLoungePackageManager.getPackageStatus(eq("foundation.e.demoone"), eq(123))) .thenReturn( Status.UNAVAILABLE ) - Mockito.`when`(pkgManagerModule.getPackageStatus(eq("foundation.e.demotwo"), eq(123))) + Mockito.`when`(appLoungePackageManager.getPackageStatus(eq("foundation.e.demotwo"), eq(123))) .thenReturn( Status.INSTALLED ) - Mockito.`when`(pkgManagerModule.getPackageStatus(eq("foundation.e.demothree"), eq(123))) + Mockito.`when`(appLoungePackageManager.getPackageStatus(eq("foundation.e.demothree"), eq(123))) .thenReturn( Status.UNAVAILABLE ) @@ -337,7 +337,7 @@ class AppsApiTest { is_pwa = true ) - Mockito.`when`(pwaManagerModule.getPwaStatus(application)).thenReturn(application.status) + Mockito.`when`(pwaManager.getPwaStatus(application)).thenReturn(application.status) val installationStatus = appsApi.getFusedAppInstallationStatus(application) assertEquals("getFusedAppInstallationStatusWhenPWA", application.status, installationStatus) @@ -353,7 +353,7 @@ class AppsApiTest { ) Mockito.`when`( - pkgManagerModule.getPackageStatus( + appLoungePackageManager.getPackageStatus( application.package_name, application.latest_version_code ) ).thenReturn(Status.INSTALLED) diff --git a/app/src/test/java/foundation/e/apps/category/CategoryApiTest.kt b/app/src/test/java/foundation/e/apps/category/CategoryApiTest.kt index 57c9d1428a51dd06e64b1e705f7579820ef35419..26451db61473a9c9d0a5d47d7eca80bec452c7d1 100644 --- a/app/src/test/java/foundation/e/apps/category/CategoryApiTest.kt +++ b/app/src/test/java/foundation/e/apps/category/CategoryApiTest.kt @@ -21,7 +21,7 @@ package foundation.e.apps.category import android.content.Context import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.aurora.gplayapi.data.models.Category -import foundation.e.apps.FakePreferenceModule +import foundation.e.apps.FakeAppLoungePreference import foundation.e.apps.R import foundation.e.apps.data.application.ApplicationDataManager import foundation.e.apps.data.application.category.CategoryApi @@ -31,8 +31,8 @@ import foundation.e.apps.data.cleanapk.data.categories.Categories import foundation.e.apps.data.cleanapk.repositories.CleanApkRepository import foundation.e.apps.data.enums.ResultStatus import foundation.e.apps.data.playstore.PlayStoreRepository -import foundation.e.apps.install.pkg.PWAManagerModule -import foundation.e.apps.install.pkg.PkgManagerModule +import foundation.e.apps.install.pkg.PWAManager +import foundation.e.apps.install.pkg.AppLoungePackageManager import foundation.e.apps.util.MainCoroutineRule import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest @@ -63,10 +63,10 @@ class CategoryApiTest { private lateinit var context: Context @Mock - private lateinit var pwaManagerModule: PWAManagerModule + private lateinit var pwaManager: PWAManager @Mock - private lateinit var pkgManagerModule: PkgManagerModule + private lateinit var appLoungePackageManager: AppLoungePackageManager @Mock private lateinit var cleanApkAppsRepository: CleanApkRepository @@ -77,16 +77,16 @@ class CategoryApiTest { @Mock private lateinit var gPlayAPIRepository: PlayStoreRepository - private lateinit var preferenceManagerModule: FakePreferenceModule + private lateinit var preferenceManagerModule: FakeAppLoungePreference private lateinit var categoryApi: CategoryApi @Before fun setup() { MockitoAnnotations.openMocks(this) - preferenceManagerModule = FakePreferenceModule(context) + preferenceManagerModule = FakeAppLoungePreference(context) val applicationDataManager = - ApplicationDataManager(gPlayAPIRepository, pkgManagerModule, pwaManagerModule) + ApplicationDataManager(gPlayAPIRepository, appLoungePackageManager, pwaManager) categoryApi = CategoryApiImpl( context, preferenceManagerModule, diff --git a/app/src/test/java/foundation/e/apps/fused/SearchApiImplTest.kt b/app/src/test/java/foundation/e/apps/fused/SearchApiImplTest.kt index ce265ed98b08f94eabbcc578f4303371fea26e85..c63435755f53695d4fc6b9ade94752cc869148a1 100644 --- a/app/src/test/java/foundation/e/apps/fused/SearchApiImplTest.kt +++ b/app/src/test/java/foundation/e/apps/fused/SearchApiImplTest.kt @@ -23,7 +23,7 @@ import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.aurora.gplayapi.data.models.App import com.aurora.gplayapi.data.models.AuthData import com.aurora.gplayapi.data.models.SearchBundle -import foundation.e.apps.FakePreferenceModule +import foundation.e.apps.FakeAppLoungePreference import foundation.e.apps.data.cleanapk.data.search.Search import foundation.e.apps.data.cleanapk.repositories.CleanApkRepository import foundation.e.apps.data.enums.Origin @@ -34,8 +34,8 @@ import foundation.e.apps.data.application.apps.AppsApi import foundation.e.apps.data.application.apps.AppsApiImpl import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.playstore.PlayStoreRepository -import foundation.e.apps.install.pkg.PWAManagerModule -import foundation.e.apps.install.pkg.PkgManagerModule +import foundation.e.apps.install.pkg.PWAManager +import foundation.e.apps.install.pkg.AppLoungePackageManager import foundation.e.apps.util.MainCoroutineRule import foundation.e.apps.utils.eventBus.EventBus import kotlinx.coroutines.ExperimentalCoroutinesApi @@ -75,10 +75,10 @@ class SearchApiImplTest { private lateinit var fusedAPIImpl: SearchApiImpl @Mock - private lateinit var pwaManagerModule: PWAManagerModule + private lateinit var pwaManager: PWAManager @Mock - private lateinit var pkgManagerModule: PkgManagerModule + private lateinit var appLoungePackageManager: AppLoungePackageManager @Mock private lateinit var context: Context @@ -96,7 +96,7 @@ class SearchApiImplTest { private lateinit var applicationDataManager: ApplicationDataManager - private lateinit var preferenceManagerModule: FakePreferenceModule + private lateinit var preferenceManagerModule: FakeAppLoungePreference private lateinit var formatterMocked: MockedStatic @@ -108,9 +108,9 @@ class SearchApiImplTest { fun setup() { MockitoAnnotations.openMocks(this) formatterMocked = Mockito.mockStatic(Formatter::class.java) - preferenceManagerModule = FakePreferenceModule(context) + preferenceManagerModule = FakeAppLoungePreference(context) applicationDataManager = - ApplicationDataManager(gPlayAPIRepository, pkgManagerModule, pwaManagerModule) + ApplicationDataManager(gPlayAPIRepository, appLoungePackageManager, pwaManager) appsApi = AppsApiImpl( context, @@ -201,8 +201,8 @@ class SearchApiImplTest { gplayLivedata: Pair, MutableSet>, willThrowException: Boolean = false ) { - Mockito.`when`(pwaManagerModule.getPwaStatus(any())).thenReturn(Status.UNAVAILABLE) - Mockito.`when`(pkgManagerModule.getPackageStatus(any(), any())) + Mockito.`when`(pwaManager.getPwaStatus(any())).thenReturn(Status.UNAVAILABLE) + Mockito.`when`(appLoungePackageManager.getPackageStatus(any(), any())) .thenReturn(Status.UNAVAILABLE) Mockito.`when`( cleanApkAppsRepository.getSearchResult( diff --git a/app/src/test/java/foundation/e/apps/home/HomeApiTest.kt b/app/src/test/java/foundation/e/apps/home/HomeApiTest.kt index 2ed361abdf185f93f3a0f7a58a2f9d21a7cedb77..27ba23e72963aca476aa5a04640980cb40e54152 100644 --- a/app/src/test/java/foundation/e/apps/home/HomeApiTest.kt +++ b/app/src/test/java/foundation/e/apps/home/HomeApiTest.kt @@ -23,15 +23,15 @@ import android.text.format.Formatter import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.aurora.gplayapi.data.models.App import com.aurora.gplayapi.data.models.AuthData -import foundation.e.apps.FakePreferenceModule +import foundation.e.apps.FakeAppLoungePreference import foundation.e.apps.data.application.ApplicationDataManager import foundation.e.apps.data.application.home.HomeApi import foundation.e.apps.data.application.home.HomeApiImpl import foundation.e.apps.data.cleanapk.repositories.CleanApkRepository import foundation.e.apps.data.enums.Status import foundation.e.apps.data.playstore.PlayStoreRepository -import foundation.e.apps.install.pkg.PWAManagerModule -import foundation.e.apps.install.pkg.PkgManagerModule +import foundation.e.apps.install.pkg.PWAManager +import foundation.e.apps.install.pkg.AppLoungePackageManager import foundation.e.apps.util.MainCoroutineRule import foundation.e.apps.util.getOrAwaitValue import foundation.e.apps.utils.eventBus.EventBus @@ -66,10 +66,10 @@ class HomeApiTest { private lateinit var applicationDataManager: ApplicationDataManager @Mock - private lateinit var pwaManagerModule: PWAManagerModule + private lateinit var pwaManager: PWAManager @Mock - private lateinit var pkgManagerModule: PkgManagerModule + private lateinit var appLoungePackageManager: AppLoungePackageManager @Mock private lateinit var context: Context @@ -83,7 +83,7 @@ class HomeApiTest { @Mock private lateinit var gPlayAPIRepository: PlayStoreRepository - private lateinit var preferenceManagerModule: FakePreferenceModule + private lateinit var preferenceManagerModule: FakeAppLoungePreference private lateinit var formatterMocked: MockedStatic @@ -95,9 +95,9 @@ class HomeApiTest { fun setup() { MockitoAnnotations.openMocks(this) formatterMocked = Mockito.mockStatic(Formatter::class.java) - preferenceManagerModule = FakePreferenceModule(context) + preferenceManagerModule = FakeAppLoungePreference(context) applicationDataManager = - ApplicationDataManager(gPlayAPIRepository, pkgManagerModule, pwaManagerModule) + ApplicationDataManager(gPlayAPIRepository, appLoungePackageManager, pwaManager) homeApi = HomeApiImpl( context, preferenceManagerModule, @@ -131,7 +131,7 @@ class HomeApiTest { any() ) ).thenReturn(listOf()) - Mockito.`when`(pkgManagerModule.getPackageStatus(any(), any())) + Mockito.`when`(appLoungePackageManager.getPackageStatus(any(), any())) .thenReturn(Status.UNAVAILABLE) var hasLimitedDataFound = false