lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Reset connected Google account if datastore could not be read

Browse Source
This commit is contained in:
MM20 2022-09-10 14:20:05 +02:00
parent 8dd0852a57
commit b1851401f2
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
g-services/src/main/java/de/mm20/launcher2/gservices/GoogleApiHelper.kt
View File

@ -20,6 +20,7 @@ import de.mm20.launcher2.crashreporter.CrashReporter
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.suspendCancellableCoroutine import kotlinx.coroutines.suspendCancellableCoroutine
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import java.io.File
import java.io.IOException import java.io.IOException
class GoogleApiHelper private constructor(private val context: Context) { class GoogleApiHelper private constructor(private val context: Context) {
@ -100,25 +101,38 @@ class GoogleApiHelper private constructor(private val context: Context) {
} }
private fun getAuthFlow(): GoogleAuthorizationCodeFlow? { private fun getAuthFlow(throwErrors: Boolean = false): GoogleAuthorizationCodeFlow? {
val configResId = getConfigResId() val configResId = getConfigResId()
if (configResId == 0) return null if (configResId == 0) return null
val jsonFactory = GsonFactory.getDefaultInstance() val jsonFactory = GsonFactory.getDefaultInstance()
return GoogleAuthorizationCodeFlow.Builder( try {
NetHttpTransport(), return GoogleAuthorizationCodeFlow.Builder(
jsonFactory, NetHttpTransport(),
GoogleClientSecrets.load(
jsonFactory, jsonFactory,
context.resources.openRawResource(configResId).reader() GoogleClientSecrets.load(
), jsonFactory,
SCOPES context.resources.openRawResource(configResId).reader()
) ),
.setCredentialDataStore( SCOPES
FileDataStoreFactory(context.filesDir).getDataStore(
"google_signin"
)
) )
.build() .setCredentialDataStore(
FileDataStoreFactory(context.filesDir).getDataStore(
"google_signin"
)
)
.build()
} catch (e: IOException) {
if (throwErrors) throw e
else {
File(context.filesDir, "google_signin").delete()
context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit {
putString(PREF_ACCOUNT_NAME, null)
}
Log.e("MM20", "Google account has been reset because data store couldn't be readg")
CrashReporter.logException(e)
return getAuthFlow(true)
}
}
} }
private var callback: (() -> Unit)? = null private var callback: (() -> Unit)? = null