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

Commit 67676f48 authored by Hasib Prince's avatar Hasib Prince
Browse files

Merge branch '333-remove_postfix_module' into 'main' 

333 remove postfix module

See merge request !406
parents 9b5e5656 590a7137

app/detekt-baseline.xml

+8 −10
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ 
    <ID>LongParameterList:ApplicationViewModel.kt$ApplicationViewModel$( id: String, packageName: String, origin: Origin, isFdroidLink: Boolean, authObjectList: List&lt;AuthObject&gt;, retryBlock: (failedObjects: List&lt;AuthObject&gt;) -&gt; Boolean, )</ID>

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

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

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

    <ID>LongParameterList:MainActivityViewModel.kt$MainActivityViewModel$( private val 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 )</ID>

    <ID>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, )</ID>

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

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

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

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

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

    <ID>MagicNumber:ApkSignatureManager.kt$ApkSignatureManager$1024</ID>
@@ -53,8 +53,6 @@ 
    <ID>MagicNumber:HomeChildRVAdapter.kt$HomeChildRVAdapter$500</ID>

    <ID>MagicNumber:InstallerService.kt$InstallerService$69</ID>

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

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

    <ID>MagicNumber:PWAManagerModule.kt$PWAManagerModule$500</ID>

    <ID>MagicNumber:PackageInstallerService.kt$PackageInstallerService$69</ID>

    <ID>MagicNumber:PkgManagerBR.kt$PkgManagerBR$69</ID>

    <ID>MagicNumber:PlayStoreLoginWrapper.kt$PlayStoreLoginWrapper$200</ID>
@@ -96,7 +94,7 @@ 
    <ID>PrintStackTrace:CommonUtilsModule.kt$CommonUtilsModule$e</ID>

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

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

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

    <ID>PrintStackTrace:AppLoungePackageManager.kt$PkgManagerModule$e</ID>

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

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

    <ID>ProtectedMemberInFinalClass:ApplicationListFragment.kt$ApplicationListFragment$// protected to avoid SyntheticAccessor protected val args: ApplicationListFragmentArgs by navArgs()</ID>
@@ -129,7 +127,7 @@ 
    <ID>SwallowedException:GPlayHttpClient.kt$GPlayHttpClient$e: Exception</ID>

    <ID>SwallowedException:NativeDeviceInfoProviderModule.kt$NativeDeviceInfoProviderModule$e: Exception</ID>

    <ID>SwallowedException:NativeGsfVersionProvider.kt$NativeGsfVersionProvider$e: PackageManager.NameNotFoundException</ID>

    <ID>SwallowedException:PkgManagerModule.kt$PkgManagerModule$e: PackageManager.NameNotFoundException</ID>

    <ID>SwallowedException:AppLoungePackageManager.kt$AppLoungePackageManager$e: PackageManager.NameNotFoundException</ID>

    <ID>SwallowedException:UpdatesManagerImpl.kt$UpdatesManagerImpl$e: Exception</ID>

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

    <ID>TooGenericExceptionCaught:ApiCaller.kt$e: Exception</ID>
@@ -152,9 +150,9 @@ 
    <ID>TooGenericExceptionCaught:LocaleChangedBroadcastReceiver.kt$LocaleChangedBroadcastReceiver$ex: Exception</ID>

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

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

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

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

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

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

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

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

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

    <ID>TooGenericExceptionCaught:SystemInfoProvider.kt$SystemInfoProvider$e: Exception</ID>
@@ -170,7 +168,7 @@ 
    <ID>TooManyFunctions:HomeFragment.kt$HomeFragment : TimeoutFragmentApplicationInstaller</ID>

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

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

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

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

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

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

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

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

+10 −10
Original line number Diff line number Diff line
@@ -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

        )

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -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)

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

+7 −7
Original line number Diff line number Diff line
@@ -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)

        }

    }

}

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

+3 −3
Original line number Diff line number Diff line
@@ -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()

}