From 4f4f79486b43593338cafe9432d68b9bff731305 Mon Sep 17 00:00:00 2001 From: Frank PREEL Date: Mon, 2 Feb 2026 14:26:33 +0100 Subject: [PATCH 1/3] feat: refactor, add shared constant for disabled state (lib v1.2.1) --- parental-control-data/build.gradle | 2 +- .../java/foundation/e/apps/contract/ParentalControlContract.kt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/parental-control-data/build.gradle b/parental-control-data/build.gradle index 75f7c659c..57eaabc4e 100644 --- a/parental-control-data/build.gradle +++ b/parental-control-data/build.gradle @@ -14,7 +14,7 @@ publishing { jar(MavenPublication) { groupId = 'foundation.e.apps' artifactId = 'ParentalControlData' - version = '1.2.0' + version = '1.2.1' artifact("$buildDir/libs/${project.name}.jar") diff --git a/parental-control-data/src/main/java/foundation/e/apps/contract/ParentalControlContract.kt b/parental-control-data/src/main/java/foundation/e/apps/contract/ParentalControlContract.kt index 793a1473c..409845a98 100644 --- a/parental-control-data/src/main/java/foundation/e/apps/contract/ParentalControlContract.kt +++ b/parental-control-data/src/main/java/foundation/e/apps/contract/ParentalControlContract.kt @@ -31,4 +31,6 @@ object ParentalControlContract { const val PATH_LOGIN_TYPE = "login_type" const val PATH_BLOCKLIST = "block_list" + + const val PARENTAL_CONTROL_DISABLED_ORDINAL = 5 } -- GitLab From c43baa84441bfcf8202758eb5f8656bbb2362ba9 Mon Sep 17 00:00:00 2001 From: Frank PREEL Date: Tue, 3 Feb 2026 10:13:59 +0100 Subject: [PATCH 2/3] feat: refactor, move Age enum to shared parental-control-data lib --- .../parentalcontrol/ParentalControlRepository.kt | 12 ++---------- .../e/apps/domain/ValidateAppAgeLimitUseCase.kt | 4 ++-- .../e/apps/domain/ValidateAppAgeLimitUseCaseTest.kt | 3 +-- .../e/apps/contract/ParentalControlContract.kt | 12 +++++++++--- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/foundation/e/apps/data/parentalcontrol/ParentalControlRepository.kt b/app/src/main/java/foundation/e/apps/data/parentalcontrol/ParentalControlRepository.kt index 59f97ca6a..688edc5df 100644 --- a/app/src/main/java/foundation/e/apps/data/parentalcontrol/ParentalControlRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/parentalcontrol/ParentalControlRepository.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2025 MURENA SAS + * Copyright (C) 2026 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 @@ -21,6 +21,7 @@ package foundation.e.apps.data.parentalcontrol import android.content.Context import androidx.core.net.toUri import dagger.hilt.android.qualifiers.ApplicationContext +import foundation.e.apps.contract.ParentalControlContract.Age import org.e.parentalcontrol.data.model.TypeAppManagement import javax.inject.Inject import javax.inject.Singleton @@ -68,12 +69,3 @@ class ParentalControlRepository @Inject constructor( return TypeAppManagement.DISABLED_MODE } } - -enum class Age { - THREE, - SIX, - ELEVEN, - FIFTEEN, - SEVENTEEN, - PARENTAL_CONTROL_DISABLED -} diff --git a/app/src/main/java/foundation/e/apps/domain/ValidateAppAgeLimitUseCase.kt b/app/src/main/java/foundation/e/apps/domain/ValidateAppAgeLimitUseCase.kt index e1d31c09b..d297461a8 100644 --- a/app/src/main/java/foundation/e/apps/domain/ValidateAppAgeLimitUseCase.kt +++ b/app/src/main/java/foundation/e/apps/domain/ValidateAppAgeLimitUseCase.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2025 MURENA SAS + * Copyright (C) 2026 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 @@ -25,7 +25,7 @@ import foundation.e.apps.data.blockedApps.BlockedAppRepository import foundation.e.apps.data.enums.Source import foundation.e.apps.data.enums.Type import foundation.e.apps.data.install.models.AppInstall -import foundation.e.apps.data.parentalcontrol.Age +import foundation.e.apps.contract.ParentalControlContract.Age import foundation.e.apps.data.parentalcontrol.ContentRatingDao import foundation.e.apps.data.parentalcontrol.ParentalControlRepository import foundation.e.apps.data.parentalcontrol.ParentalControlRepository.Companion.KEY_PARENTAL_GUIDANCE diff --git a/app/src/test/java/foundation/e/apps/domain/ValidateAppAgeLimitUseCaseTest.kt b/app/src/test/java/foundation/e/apps/domain/ValidateAppAgeLimitUseCaseTest.kt index 6a3906ca7..556600d11 100644 --- a/app/src/test/java/foundation/e/apps/domain/ValidateAppAgeLimitUseCaseTest.kt +++ b/app/src/test/java/foundation/e/apps/domain/ValidateAppAgeLimitUseCaseTest.kt @@ -2,6 +2,7 @@ package foundation.e.apps.domain import com.aurora.gplayapi.data.models.ContentRating import com.google.common.truth.Truth.assertThat +import foundation.e.apps.contract.ParentalControlContract.Age import foundation.e.apps.data.ResultSupreme import foundation.e.apps.data.application.apps.AppsApi import foundation.e.apps.data.application.data.Application @@ -11,14 +12,12 @@ import foundation.e.apps.data.enums.Source import foundation.e.apps.data.enums.Status import foundation.e.apps.data.enums.Type import foundation.e.apps.data.install.models.AppInstall -import foundation.e.apps.data.parentalcontrol.Age import foundation.e.apps.data.parentalcontrol.ContentRatingDao import foundation.e.apps.data.parentalcontrol.ParentalControlRepository import foundation.e.apps.data.parentalcontrol.fdroid.FDroidAntiFeatureRepository import foundation.e.apps.data.parentalcontrol.googleplay.GPlayContentRatingGroup import foundation.e.apps.data.parentalcontrol.googleplay.GPlayContentRatingRepository import foundation.e.apps.domain.ValidateAppAgeLimitUseCase.Companion.KEY_ANTI_FEATURES_NSFW -import foundation.e.apps.domain.model.ContentRatingValidity import io.mockk.coEvery import io.mockk.every import io.mockk.mockk diff --git a/parental-control-data/src/main/java/foundation/e/apps/contract/ParentalControlContract.kt b/parental-control-data/src/main/java/foundation/e/apps/contract/ParentalControlContract.kt index 409845a98..4aae81ebc 100644 --- a/parental-control-data/src/main/java/foundation/e/apps/contract/ParentalControlContract.kt +++ b/parental-control-data/src/main/java/foundation/e/apps/contract/ParentalControlContract.kt @@ -1,5 +1,5 @@ /* - * Copyright MURENA SAS 2025 + * Copyright MURENA SAS 2026 * Apps Quickly and easily install Android apps onto your device! * * This program is free software: you can redistribute it and/or modify @@ -31,6 +31,12 @@ object ParentalControlContract { const val PATH_LOGIN_TYPE = "login_type" const val PATH_BLOCKLIST = "block_list" - - const val PARENTAL_CONTROL_DISABLED_ORDINAL = 5 + enum class Age { + THREE, + SIX, + ELEVEN, + FIFTEEN, + SEVENTEEN, + PARENTAL_CONTROL_DISABLED + } } -- GitLab From 310a35308bab347a76f9fa85c08ee0adbf0c6fb7 Mon Sep 17 00:00:00 2001 From: Frank PREEL Date: Tue, 3 Feb 2026 11:30:23 +0100 Subject: [PATCH 3/3] fix: Imports must be ordered in lexicographic order without any empty lines in-between with "java", "javax", "kotlin" and aliases in the end [ImportOrdering] --- .../java/foundation/e/apps/domain/ValidateAppAgeLimitUseCase.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/foundation/e/apps/domain/ValidateAppAgeLimitUseCase.kt b/app/src/main/java/foundation/e/apps/domain/ValidateAppAgeLimitUseCase.kt index d297461a8..477018075 100644 --- a/app/src/main/java/foundation/e/apps/domain/ValidateAppAgeLimitUseCase.kt +++ b/app/src/main/java/foundation/e/apps/domain/ValidateAppAgeLimitUseCase.kt @@ -19,13 +19,13 @@ package foundation.e.apps.domain import com.aurora.gplayapi.data.models.ContentRating +import foundation.e.apps.contract.ParentalControlContract.Age import foundation.e.apps.data.ResultSupreme import foundation.e.apps.data.application.apps.AppsApi import foundation.e.apps.data.blockedApps.BlockedAppRepository import foundation.e.apps.data.enums.Source import foundation.e.apps.data.enums.Type import foundation.e.apps.data.install.models.AppInstall -import foundation.e.apps.contract.ParentalControlContract.Age import foundation.e.apps.data.parentalcontrol.ContentRatingDao import foundation.e.apps.data.parentalcontrol.ParentalControlRepository import foundation.e.apps.data.parentalcontrol.ParentalControlRepository.Companion.KEY_PARENTAL_GUIDANCE -- GitLab