diff --git a/app/build.gradle b/app/build.gradle index 611bb0809f7d6e6ed91154c07fd6df96bc8a3c43..6592d9072f4c7ff12e8c66c6d5a7b4e0bfa787fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,10 +66,10 @@ android { signingConfigs { def keystore_password = System.getenv('KEYSTORE_PASSWORD') debugConfig { - storeFile file("../keystore/platform.keystore") - storePassword 'android' - keyAlias 'platform' - keyPassword 'android' + storeFile file("keystore/platform.jks") + storePassword "platform" + keyAlias "platform" + keyPassword "platform" } releaseTestConfig { storeFile file("../keystore/proprietary.keystore") @@ -111,8 +111,6 @@ android { buildTypes { debug { - versionNameSuffix ".debug" - applicationIdSuffix ".debug" signingConfig signingConfigs.debugConfig proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } diff --git a/app/keystore/platform.jks b/app/keystore/platform.jks new file mode 100644 index 0000000000000000000000000000000000000000..b778840542e79c048bcf570aa960243eeb9b9d53 Binary files /dev/null and b/app/keystore/platform.jks differ diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml deleted file mode 100644 index 06576182c53944e646cdd220354e8323bd6ee37c..0000000000000000000000000000000000000000 --- a/app/src/debug/AndroidManifest.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/java/foundation/e/apps/provider/AgeRatingProvider.kt b/app/src/main/java/foundation/e/apps/provider/AgeRatingProvider.kt index 38097b0a41ad810d7ca5d6f06d223bb2e4d0fdb1..1b262b85f0f6d28e447c22bbb81b590f8767e89b 100644 --- a/app/src/main/java/foundation/e/apps/provider/AgeRatingProvider.kt +++ b/app/src/main/java/foundation/e/apps/provider/AgeRatingProvider.kt @@ -31,13 +31,11 @@ import dagger.hilt.EntryPoint import dagger.hilt.InstallIn import dagger.hilt.android.EntryPointAccessors import dagger.hilt.components.SingletonComponent -import foundation.e.apps.BuildConfig import foundation.e.apps.R import foundation.e.apps.contract.ParentalControlContract.COLUMN_LOGIN_TYPE import foundation.e.apps.contract.ParentalControlContract.COLUMN_PACKAGE_NAME import foundation.e.apps.contract.ParentalControlContract.PATH_BLOCKLIST import foundation.e.apps.contract.ParentalControlContract.PATH_LOGIN_TYPE -import foundation.e.apps.contract.ParentalControlContract.getAppLoungeProviderAuthority import foundation.e.apps.data.ResultSupreme import foundation.e.apps.data.blockedApps.BlockedAppRepository import foundation.e.apps.data.enums.Origin @@ -79,6 +77,7 @@ class AgeRatingProvider : ContentProvider() { companion object { private const val CHANNEL_ID = "applounge_provider" private const val NOTIFICATION_ID = 77 + private const val AUTHORITY = "foundation.e.apps.provider" } private lateinit var authenticatorRepository: AuthenticatorRepository @@ -97,12 +96,10 @@ class AgeRatingProvider : ContentProvider() { ; } - private val authority = getAppLoungeProviderAuthority(BuildConfig.DEBUG) - private val uriMatcher by lazy { UriMatcher(UriMatcher.NO_MATCH).apply { - addURI(authority, PATH_LOGIN_TYPE, UriCode.LoginType.code) - addURI(authority, PATH_BLOCKLIST, UriCode.AgeRating.code) + addURI(AUTHORITY, PATH_LOGIN_TYPE, UriCode.LoginType.code) + addURI(AUTHORITY, PATH_BLOCKLIST, UriCode.AgeRating.code) } } @@ -327,9 +324,9 @@ class AgeRatingProvider : ContentProvider() { override fun getType(uri: Uri): String { return when (uriMatcher.match(uri)) { UriCode.LoginType.code -> - "vnd.android.cursor.item/${authority}.${UriCode.LoginType.code}" + "vnd.android.cursor.item/${AUTHORITY}.${UriCode.LoginType.code}" UriCode.AgeRating.code -> - "vnd.android.cursor.item/${authority}.${UriCode.AgeRating.code}" + "vnd.android.cursor.item/${AUTHORITY}.${UriCode.AgeRating.code}" else -> throw IllegalArgumentException("Unknown URI: $uri") } } 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 016c92bbf71649618ecb8a108a26a09b5ba9a538..0b6797e56ddfb370c161fb547fd03bf7ac72bf26 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 @@ -25,7 +25,4 @@ object ParentalControlContract { const val PATH_LOGIN_TYPE = "login_type" const val PATH_BLOCKLIST = "block_list" - - fun getAppLoungeProviderAuthority(isDebug: Boolean = false) = - "foundation.e.apps${if (isDebug) ".debug" else ""}.provider" }