--- a/geekdroid/build.gradle.kts Tue Jan 16 16:50:07 2024 -0400
+++ b/geekdroid/build.gradle.kts Tue Jan 16 17:01:14 2024 -0400
@@ -105,6 +105,8 @@
implementation(libs.room.runtime)
implementation(libs.browser)
implementation(libs.work.runtime)
+ implementation(libs.preference.ktx)
+
}
--- a/geekdroid/src/main/java/com/geekorum/geekdroid/accounts/AccountAuthenticatorAppCompatActivity.kt Tue Jan 16 16:50:07 2024 -0400
+++ b/geekdroid/src/main/java/com/geekorum/geekdroid/accounts/AccountAuthenticatorAppCompatActivity.kt Tue Jan 16 17:01:14 2024 -0400
@@ -26,6 +26,7 @@
import android.accounts.AccountManager
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.IntentCompat
/**
* An [AccountAuthenticatorActivity] that supports and AppCompat theme
@@ -37,7 +38,7 @@
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- accountAuthenticatorResponse = intent.getParcelableExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE)
+ accountAuthenticatorResponse = IntentCompat.getParcelableExtra(intent, AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, AccountAuthenticatorResponse::class.java)
accountAuthenticatorResponse?.onRequestContinued()
}
--- a/geekdroid/src/main/java/com/geekorum/geekdroid/accounts/AccountSelector.kt Tue Jan 16 16:50:07 2024 -0400
+++ b/geekdroid/src/main/java/com/geekorum/geekdroid/accounts/AccountSelector.kt Tue Jan 16 17:01:14 2024 -0400
@@ -26,7 +26,7 @@
import android.annotation.SuppressLint
import android.app.Application
import android.content.SharedPreferences
-import android.preference.PreferenceManager
+import androidx.preference.PreferenceManager
import javax.inject.Inject
@@ -35,7 +35,8 @@
*/
class AccountSelector internal constructor(
private val preferences: SharedPreferences,
- private val accountManager: AccountManager) {
+ private val accountManager: AccountManager
+) {
val savedAccount: Account?
get() {
--- a/geekdroid/src/main/java/com/geekorum/geekdroid/accounts/AccountTokenRetriever.kt Tue Jan 16 16:50:07 2024 -0400
+++ b/geekdroid/src/main/java/com/geekorum/geekdroid/accounts/AccountTokenRetriever.kt Tue Jan 16 17:01:14 2024 -0400
@@ -71,7 +71,7 @@
getAuthToken(account, tokenType, options, notifyAuthFailure, {
try {
val bundle = it.result
- cont.resume(bundle[AccountManager.KEY_AUTHTOKEN] as String?)
+ cont.resume(bundle.getString(AccountManager.KEY_AUTHTOKEN))
} catch (e: Exception) {
cont.resumeWithException(e)
}