fixed: LongMethod (4b2d8f55) · Commits · e / os / App Lounge

app/detekt-baseline.xml

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -17,10 +17,6 @@
	<ID>InvalidPackageDeclaration:Trackers.kt$package foundation.e.apps.data.exodus</ID>		<ID>InvalidPackageDeclaration:Trackers.kt$package foundation.e.apps.data.exodus</ID>
	<ID>LargeClass:ApplicationApiImpl.kt$ApplicationApiImpl : ApplicationApi</ID>		<ID>LargeClass:ApplicationApiImpl.kt$ApplicationApiImpl : ApplicationApi</ID>
	<ID>LargeClass:ApplicationFragment.kt$ApplicationFragment : TimeoutFragment</ID>		<ID>LargeClass:ApplicationFragment.kt$ApplicationFragment : TimeoutFragment</ID>
	<ID>LongMethod:ApplicationApiImpl.kt$ApplicationApiImpl$private suspend fun generateCleanAPKHome(home: CleanApkHome, appType: String): List<Home></ID>
	<ID>LongMethod:ApplicationFragment.kt$ApplicationFragment$private fun observeDownloadStatus(view: View)</ID>
	<ID>LongMethod:CategoryUtils.kt$CategoryUtils$fun provideAppsCategoryIconResource(categoryId: String): Int</ID>
	<ID>LongMethod:NativeDeviceInfoProviderModule.kt$NativeDeviceInfoProviderModule$@Singleton @Provides fun provideNativeDeviceProperties( @ApplicationContext context: Context, ): Properties</ID>
	<ID>LongParameterList:ApplicationApiImpl.kt$ApplicationApiImpl$( private val pkgManagerModule: PkgManagerModule, private val pwaManagerModule: PWAManagerModule, private val preferenceManagerModule: PreferenceManagerModule, @Named("gplayRepository") private val gplayRepository: PlayStoreRepository, @Named("cleanApkAppsRepository") private val cleanApkAppsRepository: CleanApkRepository, @Named("cleanApkPWARepository") private val cleanApkPWARepository: CleanApkRepository, @ApplicationContext private val context: Context )</ID>		<ID>LongParameterList:ApplicationApiImpl.kt$ApplicationApiImpl$( private val pkgManagerModule: PkgManagerModule, private val pwaManagerModule: PWAManagerModule, private val preferenceManagerModule: PreferenceManagerModule, @Named("gplayRepository") private val gplayRepository: PlayStoreRepository, @Named("cleanApkAppsRepository") private val cleanApkAppsRepository: CleanApkRepository, @Named("cleanApkPWARepository") private val cleanApkPWARepository: CleanApkRepository, @ApplicationContext private val context: Context )</ID>
	<ID>LongParameterList:ApplicationDialogFragment.kt$ApplicationDialogFragment$( drawable: Int = -1, title: String, message: String, positiveButtonText: String = "", positiveButtonAction: (() -> Unit)? = null, cancelButtonText: String = "", cancelButtonAction: (() -> Unit)? = null, cancellable: Boolean = true, onDismissListener: (() -> Unit)? = null, )</ID>		<ID>LongParameterList:ApplicationDialogFragment.kt$ApplicationDialogFragment$( drawable: Int = -1, title: String, message: String, positiveButtonText: String = "", positiveButtonAction: (() -> Unit)? = null, cancelButtonText: String = "", cancelButtonAction: (() -> Unit)? = null, cancellable: Boolean = true, onDismissListener: (() -> Unit)? = null, )</ID>
	<ID>LongParameterList:ApplicationListRVAdapter.kt$ApplicationListRVAdapter$( private val applicationInstaller: ApplicationInstaller, private val privacyInfoViewModel: PrivacyInfoViewModel, private val appInfoFetchViewModel: AppInfoFetchViewModel, private val mainActivityViewModel: MainActivityViewModel, private val currentDestinationId: Int, private var lifecycleOwner: LifecycleOwner?, private var paidAppHandler: ((Application) -> Unit)? = null )</ID>		<ID>LongParameterList:ApplicationListRVAdapter.kt$ApplicationListRVAdapter$( private val applicationInstaller: ApplicationInstaller, private val privacyInfoViewModel: PrivacyInfoViewModel, private val appInfoFetchViewModel: AppInfoFetchViewModel, private val mainActivityViewModel: MainActivityViewModel, private val currentDestinationId: Int, private var lifecycleOwner: LifecycleOwner?, private var paidAppHandler: ((Application) -> Unit)? = null )</ID>

app/src/main/java/foundation/e/apps/data/playstore/utils/NativeDeviceInfoProviderModule.kt

+89 −70

Original line number	Original line	Diff line number	Diff line
	@@ -44,38 +44,50 @@ object NativeDeviceInfoProviderModule {
	): Properties {		): Properties {
	val properties = Properties().apply {		val properties = Properties().apply {
	// Build Props		// Build Props
	setProperty("UserReadableName", "${Build.DEVICE}-default")		setBuildProperties()
	setProperty("Build.HARDWARE", Build.HARDWARE)		setConfigProperties(context)
			// Display Metrics
			setDisplayMetrics(context)
			// GL Extensions
			setGLExtensions(context)
			// Google Related Props
			setGoogleProperties(context)
			// MISC
			setMiscProperties()
			}
			return properties
			}

			private fun Properties.setMiscProperties() {
			setProperty("Roaming", "mobile-notroaming")
			setProperty("TimeZone", "UTC-10")
			// Telephony (USA 3650 AT&T)
			setProperty("CellOperator", "310")
			setProperty("SimOperator", "38")
			}

			private fun Properties.setGoogleProperties(context: Context) {
			val gsfVersionProvider = NativeGsfVersionProvider(context)
			setProperty("Client", "android-google")
			setProperty("GSF.version", "${gsfVersionProvider.getGsfVersionCode(true)}")
			setProperty("Vending.version", "${gsfVersionProvider.getVendingVersionCode(true)}")
			setProperty("Vending.versionString", gsfVersionProvider.getVendingVersionString(true))
			}

			private fun Properties.setGLExtensions(context: Context) {
			val activityManager =
			context.getSystemService(ACTIVITY_SERVICE) as ActivityManager
	setProperty(		setProperty(
	"Build.RADIO",		"GL.Version",
	if (Build.getRadioVersion() != null)		activityManager.deviceConfigurationInfo.reqGlEsVersion.toString()
	Build.getRadioVersion()
	else
	"unknown"
	)		)
	setProperty("Build.FINGERPRINT", Build.FINGERPRINT)
	setProperty("Build.BRAND", Build.BRAND)
	setProperty("Build.DEVICE", Build.DEVICE)
	setProperty("Build.VERSION.SDK_INT", "${Build.VERSION.SDK_INT}")
	setProperty("Build.VERSION.RELEASE", Build.VERSION.RELEASE)
	setProperty("Build.MODEL", Build.MODEL)
	setProperty("Build.MANUFACTURER", Build.MANUFACTURER)
	setProperty("Build.PRODUCT", Build.PRODUCT)
	setProperty("Build.ID", Build.ID)
	setProperty("Build.BOOTLOADER", Build.BOOTLOADER)

	val config = context.resources.configuration
	setProperty("TouchScreen", "${config.touchscreen}")
	setProperty("Keyboard", "${config.keyboard}")
	setProperty("Navigation", "${config.navigation}")
	setProperty("ScreenLayout", "${config.screenLayout and 15}")
	setProperty("HasHardKeyboard", "${config.keyboard == Configuration.KEYBOARD_QWERTY}")
	setProperty(		setProperty(
	"HasFiveWayNavigation",		"GL.Extensions",
	"${config.navigation == Configuration.NAVIGATIONHIDDEN_YES}"		EglExtensionProvider.eglExtensions.joinToString(separator = ",")
	)		)
			}

	// Display Metrics		private fun Properties.setDisplayMetrics(context: Context) {
	val metrics = context.resources.displayMetrics		val metrics = context.resources.displayMetrics
	setProperty("Screen.Density", "${metrics.densityDpi}")		setProperty("Screen.Density", "${metrics.densityDpi}")
	setProperty("Screen.Width", "${metrics.widthPixels}")		setProperty("Screen.Width", "${metrics.widthPixels}")
	@@ -93,34 +105,41 @@ object NativeDeviceInfoProviderModule {
	"SharedLibraries",		"SharedLibraries",
	getSharedLibraries(context).joinToString(separator = ",")		getSharedLibraries(context).joinToString(separator = ",")
	)		)
	// GL Extensions		}
	val activityManager =
	context.getSystemService(ACTIVITY_SERVICE) as ActivityManager		private fun Properties.setConfigProperties(context: Context) {
			val config = context.resources.configuration
			setProperty("TouchScreen", "${config.touchscreen}")
			setProperty("Keyboard", "${config.keyboard}")
			setProperty("Navigation", "${config.navigation}")
			setProperty("ScreenLayout", "${config.screenLayout and 15}")
			setProperty("HasHardKeyboard", "${config.keyboard == Configuration.KEYBOARD_QWERTY}")
	setProperty(		setProperty(
	"GL.Version",		"HasFiveWayNavigation",
	activityManager.deviceConfigurationInfo.reqGlEsVersion.toString()		"${config.navigation == Configuration.NAVIGATIONHIDDEN_YES}"
	)		)
			}

			private fun Properties.setBuildProperties() {
			setProperty("UserReadableName", "${Build.DEVICE}-default")
			setProperty("Build.HARDWARE", Build.HARDWARE)
	setProperty(		setProperty(
	"GL.Extensions",		"Build.RADIO",
	EglExtensionProvider.eglExtensions.joinToString(separator = ",")		if (Build.getRadioVersion() != null)
			Build.getRadioVersion()
			else
			"unknown"
	)		)
			setProperty("Build.FINGERPRINT", Build.FINGERPRINT)
	// Google Related Props		setProperty("Build.BRAND", Build.BRAND)
	val gsfVersionProvider = NativeGsfVersionProvider(context)		setProperty("Build.DEVICE", Build.DEVICE)
	setProperty("Client", "android-google")		setProperty("Build.VERSION.SDK_INT", "${Build.VERSION.SDK_INT}")
	setProperty("GSF.version", "${gsfVersionProvider.getGsfVersionCode(true)}")		setProperty("Build.VERSION.RELEASE", Build.VERSION.RELEASE)
	setProperty("Vending.version", "${gsfVersionProvider.getVendingVersionCode(true)}")		setProperty("Build.MODEL", Build.MODEL)
	setProperty("Vending.versionString", gsfVersionProvider.getVendingVersionString(true))		setProperty("Build.MANUFACTURER", Build.MANUFACTURER)
			setProperty("Build.PRODUCT", Build.PRODUCT)
	// MISC		setProperty("Build.ID", Build.ID)
	setProperty("Roaming", "mobile-notroaming")		setProperty("Build.BOOTLOADER", Build.BOOTLOADER)
	setProperty("TimeZone", "UTC-10")

	// Telephony (USA 3650 AT&T)
	setProperty("CellOperator", "310")
	setProperty("SimOperator", "38")
	}
	return properties
	}		}

	private fun getFeatures(context: Context): List<String> {		private fun getFeatures(context: Context): List<String> {

app/src/main/java/foundation/e/apps/ui/application/ApplicationFragment.kt

+62 −53

Original line number	Original line	Diff line number	Diff line
	@@ -489,15 +489,26 @@ class ApplicationFragment : TimeoutFragment(R.layout.fragment_application) {

	private fun observeDownloadStatus(view: View) {		private fun observeDownloadStatus(view: View) {
	applicationViewModel.appStatus.observe(viewLifecycleOwner) { status ->		applicationViewModel.appStatus.observe(viewLifecycleOwner) { status ->
	val installButton = binding.downloadInclude.installButton
	val downloadPB = binding.downloadInclude.progressLayout
	val appSize = binding.downloadInclude.appSize
	val application = applicationViewModel.getFusedApp() ?: Application()		val application = applicationViewModel.getFusedApp() ?: Application()

	mainActivityViewModel.verifyUiFilter(application) {		mainActivityViewModel.verifyUiFilter(application) {
	if (!application.filterLevel.isInitialized()) {		if (!application.filterLevel.isInitialized()) {
	return@verifyUiFilter		return@verifyUiFilter
	}		}

			handleInstallStatus(status, view, application)
			}
			}
			}

			private fun handleInstallStatus(
			status: Status?,
			view: View,
			application: Application,
			) {
			val installButton = binding.downloadInclude.installButton
			val downloadPB = binding.downloadInclude.progressLayout
			val appSize = binding.downloadInclude.appSize

	when (status) {		when (status) {
	Status.INSTALLED -> handleInstalled(		Status.INSTALLED -> handleInstalled(
	installButton,		installButton,
	@@ -555,8 +566,6 @@ class ApplicationFragment : TimeoutFragment(R.layout.fragment_application) {
	}		}
	}		}
	}		}
	}
	}

	private fun handleInstallingIssue(		private fun handleInstallingIssue(
	installButton: MaterialButton,		installButton: MaterialButton,