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

Verified Commit f826d103 authored by Fahim M. Choudhury's avatar Fahim M. Choudhury
Browse files

Merge branch '2203-paco' into 2112-nsfw-apps-after-merging-2203-paco 

# Conflicts:
#	app/src/main/java/foundation/e/apps/data/ageRating/AgeGroupApi.kt
#	app/src/main/java/foundation/e/apps/data/blockedApps/ContentRatingsRepository.kt
#	app/src/main/java/foundation/e/apps/data/cleanapk/RetrofitApiModule.kt
#	app/src/main/java/foundation/e/apps/data/playstore/PlayStoreRepositoryImpl.kt
#	app/src/main/java/foundation/e/apps/domain/ValidateAppAgeLimitUseCase.kt
#	app/src/main/java/foundation/e/apps/provider/AgeRatingProvider.kt
#	parental-control-data/src/main/java/foundation/e/apps/contract/ParentalControlContract.kt
parents 908d31f1 e8826ced

.gitlab-ci.yml

+12 −0
Original line number Diff line number Diff line
@@ -158,3 +158,15 @@ pushToPrebuilt: 
    - git push

    # Sometimes a single push doesn't do all the job, so we have to push twice

    - git push



publish-contracts:

  stage: publish

  needs: ["buildRelease"]

  rules:

    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'

      when: manual

    - if: '$CI_COMMIT_TAG !~ "/^$/"'

      when: always

  script:

    - ./gradlew :parental-control-data:build

    - ./gradlew :parental-control-data:publish
 
 No newline at end of file

app/build.gradle

+7 −1
Original line number Diff line number Diff line
@@ -85,10 +85,15 @@ android { 
    }



    sourceSets {

        debug {

            manifest.srcFile 'src/debug/AndroidManifest.xml'

        }

        releaseDev {

            manifest.srcFile 'src/release/AndroidManifest.xml'

            java.srcDirs = ['src/release/java']

        }

        releaseStable {

            manifest.srcFile 'src/release/AndroidManifest.xml'

            java.srcDirs = ['src/release/java']

        }

    }
@@ -154,6 +159,7 @@ allOpen { 


dependencies {



    implementation project(':parental-control-data')

// TODO: Add splitinstall-lib to a repo https://gitlab.e.foundation/e/os/backlog/-/issues/628

    api files('libs/splitinstall-lib.jar')

app/src/debug/AndroidManifest.xml

0 → 100644
+6 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<manifest xmlns:android="http://schemas.android.com/apk/res/android">



    <permission android:name="foundation.e.apps.debug.permission.PROVIDER_READ" />



</manifest>
 
 No newline at end of file

app/src/main/AndroidManifest.xml

+1 −3
Original line number Diff line number Diff line
@@ -55,8 +55,6 @@ 
        <package android:name="${parentalControlPkgName}" />

    </queries>



    <permission android:name="${applicationId}.provider.READ" android:protectionLevel="signature" />



    <application

        android:name=".AppLoungeApplication"

        android:allowBackup="false"
@@ -152,7 +150,7 @@ 
            android:authorities="${applicationId}.provider"

            android:name=".provider.AgeRatingProvider"

            android:exported="true"

            android:readPermission="${applicationId}.provider.READ" />

            android:readPermission="${applicationId}.permission.PROVIDER_READ" />



        <service android:name=".install.pkg.PackageInstallerService" />

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

+6 −9
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import com.aurora.gplayapi.exceptions.ApiException 
import com.google.android.material.bottomnavigation.BottomNavigationView

import com.google.android.material.snackbar.Snackbar

import dagger.hilt.android.AndroidEntryPoint

import foundation.e.apps.contract.ParentalControlContract.COLUMN_LOGIN_TYPE

import foundation.e.apps.data.Constants

import foundation.e.apps.data.enums.User

import foundation.e.apps.data.install.models.AppInstall
@@ -50,7 +51,6 @@ import foundation.e.apps.data.login.PlayStoreAuthenticator 
import foundation.e.apps.data.login.exceptions.GPlayValidationException

import foundation.e.apps.databinding.ActivityMainBinding

import foundation.e.apps.install.updates.UpdatesNotifier

import foundation.e.apps.provider.ProviderConstants.Companion.LOGIN_TYPE

import foundation.e.apps.ui.MainActivityViewModel

import foundation.e.apps.ui.application.subFrags.ApplicationDialogFragment

import foundation.e.apps.ui.purchase.AppPurchaseFragmentDirections
@@ -77,9 +77,6 @@ class MainActivity : AppCompatActivity() { 
        private const val SESSION_DIALOG_TAG = "session_dialog"

    }



    private var gPlayLoginRequested = false

    private var closeAfterLogin = false



    override fun onCreate(savedInstanceState: Bundle?) {

        super.onCreate(savedInstanceState)
@@ -140,10 +137,10 @@ class MainActivity : AppCompatActivity() { 
    }



    private fun checkGPlayLoginRequest(intent: Intent?) {

        gPlayLoginRequested =

        viewModel.gPlayLoginRequested =

            intent?.getBooleanExtra(Constants.REQUEST_GPLAY_LOGIN, false) ?: false



        if (!gPlayLoginRequested) return

        if (!viewModel.gPlayLoginRequested) return

        if (!viewModel.getTocStatus()) return

        if (viewModel.getUser() !in listOf(User.GOOGLE, User.ANONYMOUS)) {

            loginViewModel.logout()
@@ -340,7 +337,7 @@ class MainActivity : AppCompatActivity() { 
                    // Pop back stack to prevent showing TOSFragment on pressing back button.

                    navController.popBackStack()

                    navController.navigate(R.id.signInFragment)

                    if (gPlayLoginRequested) closeAfterLogin = true

                    if (viewModel.gPlayLoginRequested) viewModel.closeAfterLogin = true

                    return@observe

                }
@@ -368,7 +365,7 @@ class MainActivity : AppCompatActivity() { 
                broadcastGPlayLogin()

            }



            if (closeAfterLogin && it.isNotEmpty() && it.all { it.result.isSuccess() }) {

            if (viewModel.closeAfterLogin && it.isNotEmpty() && it.all { it.result.isSuccess() }) {

                finishAndRemoveTask()

            }

        }
@@ -377,7 +374,7 @@ class MainActivity : AppCompatActivity() { 
    private fun broadcastGPlayLogin() {

        val intent = Intent(Constants.ACTION_PARENTAL_CONTROL_APP_LOUNGE_LOGIN).apply {

            setPackage(BuildConfig.PACKAGE_NAME_PARENTAL_CONTROL)

            putExtra(LOGIN_TYPE, viewModel.getUser().name)

            putExtra(COLUMN_LOGIN_TYPE, viewModel.getUser().name)

        }

        sendBroadcast(intent)

    }