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

Commit 9f51cd6c authored by Sayantan Roychowdhury's avatar Sayantan Roychowdhury
Browse files

MR 13: More fixes for login

parent 98fecdcb

app/src/main/java/foundation/e/apps/api/gplay/utils/GPlayHttpClient.kt

+0 −6
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ package foundation.e.apps.api.gplay.utils 


import com.aurora.gplayapi.data.models.PlayResponse

import com.aurora.gplayapi.network.IHttpClient

import foundation.e.apps.utils.Constants.timeoutDurationInMillis

import okhttp3.Cache

import okhttp3.Headers.Companion.toHeaders

import okhttp3.HttpUrl
@@ -36,7 +35,6 @@ import timber.log.Timber 
import java.io.IOException

import java.net.SocketTimeoutException

import java.net.UnknownHostException

import java.util.concurrent.TimeUnit

import javax.inject.Inject



class GPlayHttpClient @Inject constructor(
@@ -51,10 +49,6 @@ class GPlayHttpClient @Inject constructor( 
    }



    private val okHttpClient = OkHttpClient().newBuilder()

        .connectTimeout(timeoutDurationInMillis, TimeUnit.MILLISECONDS)

        .readTimeout(timeoutDurationInMillis, TimeUnit.MILLISECONDS)

        .writeTimeout(timeoutDurationInMillis, TimeUnit.MILLISECONDS)

        .callTimeout(timeoutDurationInMillis, TimeUnit.MILLISECONDS)

        .retryOnConnectionFailure(false)

        .followRedirects(true)

        .followSslRedirects(true)

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

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ import foundation.e.apps.utils.enums.ResultStatus 
import foundation.e.apps.utils.enums.Status

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

import foundation.e.apps.utils.enums.isInitialized

import foundation.e.apps.utils.exceptions.GPlayValidationException

import foundation.e.apps.utils.exceptions.GPlayLoginException

import foundation.e.apps.utils.modules.CommonUtilsModule.LIST_OF_NULL

import foundation.e.apps.utils.modules.PWAManagerModule

import foundation.e.apps.utils.parentFragment.TimeoutFragment
@@ -380,7 +380,7 @@ class ApplicationFragment : TimeoutFragment(R.layout.fragment_application) { 
    }



    override fun onSignInError(

        exception: GPlayValidationException,

        exception: GPlayLoginException,

        predefinedDialog: AlertDialog.Builder

    ): AlertDialog.Builder? {

        return predefinedDialog

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

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ import foundation.e.apps.login.AuthObject 
import foundation.e.apps.manager.download.data.DownloadProgress

import foundation.e.apps.manager.pkg.PkgManagerModule

import foundation.e.apps.utils.enums.Status

import foundation.e.apps.utils.exceptions.GPlayValidationException

import foundation.e.apps.utils.exceptions.GPlayLoginException

import foundation.e.apps.utils.modules.PWAManagerModule

import foundation.e.apps.utils.parentFragment.TimeoutFragment

import kotlinx.coroutines.launch
@@ -288,7 +288,7 @@ class ApplicationListFragment : 
    }



    override fun onSignInError(

        exception: GPlayValidationException,

        exception: GPlayLoginException,

        predefinedDialog: AlertDialog.Builder

    ): AlertDialog.Builder? {

        return predefinedDialog

app/src/main/java/foundation/e/apps/categories/AppsFragment.kt

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import foundation.e.apps.R 
import foundation.e.apps.categories.model.CategoriesRVAdapter

import foundation.e.apps.databinding.FragmentAppsBinding

import foundation.e.apps.login.AuthObject

import foundation.e.apps.utils.exceptions.GPlayValidationException

import foundation.e.apps.utils.exceptions.GPlayLoginException

import foundation.e.apps.utils.parentFragment.TimeoutFragment



@AndroidEntryPoint
@@ -87,7 +87,7 @@ class AppsFragment : TimeoutFragment(R.layout.fragment_apps) { 
    }



    override fun onSignInError(

        exception: GPlayValidationException,

        exception: GPlayLoginException,

        predefinedDialog: AlertDialog.Builder

    ): AlertDialog.Builder? {

        return predefinedDialog

app/src/main/java/foundation/e/apps/categories/GamesFragment.kt

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import foundation.e.apps.R 
import foundation.e.apps.categories.model.CategoriesRVAdapter

import foundation.e.apps.databinding.FragmentGamesBinding

import foundation.e.apps.login.AuthObject

import foundation.e.apps.utils.exceptions.GPlayValidationException

import foundation.e.apps.utils.exceptions.GPlayLoginException

import foundation.e.apps.utils.parentFragment.TimeoutFragment



@AndroidEntryPoint
@@ -87,7 +87,7 @@ class GamesFragment : TimeoutFragment(R.layout.fragment_games) { 
    }



    override fun onSignInError(

        exception: GPlayValidationException,

        exception: GPlayLoginException,

        predefinedDialog: AlertDialog.Builder

    ): AlertDialog.Builder? {

        return predefinedDialog