refactor: simplify logic of validating app installation (38b7eaf0) · Commits · e / os / App Lounge

app/detekt-baseline.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@
		<ID>LongParameterList:ApplicationViewModel.kt$ApplicationViewModel$( id: String, packageName: String, origin: Origin, isFdroidLink: Boolean, authObjectList: List<AuthObject>, retryBlock: (failedObjects: List<AuthObject>) -> 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<String> )</ID>
		<ID>LongParameterList:MainActivityViewModel.kt$MainActivityViewModel$( private val appLoungeDataStore: AppLoungeDataStore, private val applicationRepository: ApplicationRepository, private val appManagerWrapper: AppManagerWrapper, private val appLoungePackageManager: AppLoungePackageManager, private val pwaManager: PWAManager, private val ecloudRepository: EcloudRepository, private val blockedAppRepository: BlockedAppRepository, private val contentRatingsRepository: ContentRatingsRepository, private val appInstallProcessor: AppInstallProcessor, )</ID>
		<ID>LongParameterList:MainActivityViewModel.kt$MainActivityViewModel$( private val appLoungeDataStore: AppLoungeDataStore, private val applicationRepository: ApplicationRepository, private val appManagerWrapper: AppManagerWrapper, private val appLoungePackageManager: AppLoungePackageManager, private val pwaManager: PWAManager, private val ecloudRepository: EcloudRepository, private val blockedAppRepository: BlockedAppRepository, private val googlePlayContentRatingsRepository: GooglePlayContentRatingsRepository, 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>

app/src/main/java/foundation/e/apps/data/blockedApps/ContentRatingGroup.kt

deleted100644 → 0

+0 −29

Original line number	Diff line number	Diff line
		/*
		* Copyright MURENA SAS 2024
		* 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 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 <https://www.gnu.org/licenses/>.
		*
		*/

		package foundation.e.apps.data.blockedApps

		import com.google.gson.annotations.SerializedName

		data class ContentRatingGroup(
		val id: String,
		@SerializedName("age_group")
		val ageGroup: String,
		var ratings: List<String>
		)

app/src/main/java/foundation/e/apps/data/blockedApps/ParentalControlRepository.kt

deleted100644 → 0

+0 −60

Original line number	Diff line number	Diff line
		/*
		* Copyright MURENA SAS 2024
		* 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 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 <https://www.gnu.org/licenses/>.
		*
		*/

		package foundation.e.apps.data.blockedApps

		import android.content.Context
		import android.net.Uri
		import dagger.hilt.android.qualifiers.ApplicationContext
		import javax.inject.Inject
		import javax.inject.Singleton

		@Singleton
		class ParentalControlRepository @Inject constructor(
		@ApplicationContext private val context: Context
		) {

		companion object {
		private const val URI_PARENTAL_CONTROL_PROVIDER =
		"content://foundation.e.parentalcontrol.provider/age"
		}

		fun getSelectedAgeGroup(): Age {
		val uri = Uri.parse(URI_PARENTAL_CONTROL_PROVIDER)
		val cursor = context.contentResolver.query(uri, null, null, null, null)

		cursor?.use {
		if (it.moveToFirst()) {
		val ageOrdinal = it.getInt(it.getColumnIndexOrThrow("age"))
		return Age.values()[ageOrdinal]
		}
		}

		return Age.PARENTAL_CONTROL_DISABLED
		}
		}

		enum class Age {
		THREE,
		SIX,
		ELEVEN,
		FIFTEEN,
		SEVENTEEN,
		PARENTAL_CONTROL_DISABLED
		}

app/src/main/java/foundation/e/apps/data/install/models/AppInstall.kt

+24 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 MURENA SAS
		*
		* 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.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program. If not, see <https://www.gnu.org/licenses/>.
		*
		*/

		package foundation.e.apps.data.install.models

		import androidx.room.Entity
		@@ -40,6 +58,12 @@ data class AppInstall(
		@Ignore
		var contentRating: ContentRating = ContentRating()

		@Ignore
		var isFDroidApp: Boolean = false

		@Ignore
		var antiFeatures: List<Map<String, String>> = emptyList()

		fun isAppInstalling() = installingStatusList.contains(status)

		fun isAwaiting() = status == Status.AWAITING

app/src/main/java/foundation/e/apps/data/parentalcontrol/AppInstallationPermissionState.kt

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 MURENA SAS
		*
		* 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.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program. If not, see <https://www.gnu.org/licenses/>.
		*
		*/

		package foundation.e.apps.data.parentalcontrol

		sealed class AppInstallationPermissionState {
		object Allowed : AppInstallationPermissionState()
		object Denied : AppInstallationPermissionState()
		object DeniedOnDataLoadError : AppInstallationPermissionState()
		}