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

Commit 2d108ccd authored by Sayantan Roychowdhury's avatar Sayantan Roychowdhury
Browse files

Merge branch '5642-no_google_login' into 'main' 

Issue 5642: No google login

See merge request !251
parents a0d466ca 3614d871

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

+1 −0
Original line number Diff line number Diff line
@@ -526,6 +526,7 @@ class ApplicationFragment : TimeoutFragment(R.layout.fragment_application) { 
        installButton.setOnClickListener {

            val errorMsg = when (mainActivityViewModel.getUser()) {

                User.ANONYMOUS,

                User.NO_GOOGLE,

                User.UNAVAILABLE -> getString(R.string.install_blocked_anonymous)

                User.GOOGLE -> getString(R.string.install_blocked_google)

            }

app/src/main/java/foundation/e/apps/applicationlist/ApplicationListRVAdapter.kt

+1 −0
Original line number Diff line number Diff line
@@ -339,6 +339,7 @@ class ApplicationListRVAdapter( 
            setOnClickListener {

                val errorMsg = when (mainActivityViewModel.getUser()) {

                    User.ANONYMOUS,

                    User.NO_GOOGLE,

                    User.UNAVAILABLE -> view.context.getString(R.string.install_blocked_anonymous)

                    User.GOOGLE -> view.context.getString(R.string.install_blocked_google)

                }

app/src/main/java/foundation/e/apps/home/model/HomeChildRVAdapter.kt

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ class HomeChildRVAdapter( 
        installButton.setOnClickListener {

            val errorMsg = when (mainActivityViewModel.getUser()) {

                User.ANONYMOUS,

                User.NO_GOOGLE,

                User.UNAVAILABLE -> view.context.getString(R.string.install_blocked_anonymous)

                User.GOOGLE -> view.context.getString(R.string.install_blocked_google)

            }

app/src/main/java/foundation/e/apps/login/LoginCommon.kt

+12 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


package foundation.e.apps.login



import foundation.e.apps.utils.Constants

import foundation.e.apps.utils.enums.User

import javax.inject.Inject

import javax.inject.Singleton
@@ -39,8 +40,19 @@ class LoginCommon @Inject constructor( 
        loginDataStore.saveGoogleLogin(email, oauth)

    }



    suspend fun setNoGoogleMode() {

        loginDataStore.setSource(Constants.PREFERENCE_SHOW_FOSS, true)

        loginDataStore.setSource(Constants.PREFERENCE_SHOW_PWA, true)

        loginDataStore.setSource(Constants.PREFERENCE_SHOW_GPLAY, false)

        loginDataStore.saveUserType(User.NO_GOOGLE)

    }



    suspend fun logout() {

        loginDataStore.destroyCredentials()

        loginDataStore.clearUserType()

        // reset app source preferences on logout.

        loginDataStore.setSource(Constants.PREFERENCE_SHOW_FOSS, true)

        loginDataStore.setSource(Constants.PREFERENCE_SHOW_PWA, true)

        loginDataStore.setSource(Constants.PREFERENCE_SHOW_GPLAY, true)

    }

}

app/src/main/java/foundation/e/apps/login/LoginDataStore.kt

+7 −0
Original line number Diff line number Diff line
@@ -148,6 +148,13 @@ class LoginDataStore @Inject constructor( 
    fun isPWASelected() = preferenceManager.getBoolean(PREFERENCE_SHOW_PWA, true)

    fun isGplaySelected() = preferenceManager.getBoolean(PREFERENCE_SHOW_GPLAY, true)



    fun setSource(source: String, value: Boolean) {

        preferenceManager.edit().run {

            this.putBoolean(source, value)

            apply()

        }

    }



    // Clear data



    /**