Castopod
/
Podcini-podcast
mirror of https://github.com/XilinJia/Podcini.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #94 from Dacid99/main 

Fixed bug in nextcloud auth
This commit is contained in:
Xilin Jia 2024-09-24 23:37:58 +01:00 committed by GitHub
parent 8ae7365852 1b0d10183f
commit d84dbeba7e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/kotlin/ac/mdiq/podcini/net/sync/nextcloud/NextcloudLoginFlow.kt
View File

@ -22,6 +22,7 @@ class NextcloudLoginFlow(private val httpClient: OkHttpClient, private val rawHo
private val hostname = HostnameParser(rawHostUrl) private val hostname = HostnameParser(rawHostUrl)
private var token: String? = null private var token: String? = null
private var endpoint: String? = null private var endpoint: String? = null
private var isWaitingForBrowser:Boolean = false
fun saveInstanceState(): ArrayList<String?> { fun saveInstanceState(): ArrayList<String?> {
val state = ArrayList<String?>() val state = ArrayList<String?>()
@ -51,7 +52,7 @@ class NextcloudLoginFlow(private val httpClient: OkHttpClient, private val rawHo
withContext(Dispatchers.Main) { withContext(Dispatchers.Main) {
val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(result)) val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(result))
context.startActivity(browserIntent) context.startActivity(browserIntent)
poll() isWaitingForBrowser = true
} }
} catch (e: Throwable) { } catch (e: Throwable) {
Log.e(TAG, Log.getStackTraceString(e)) Log.e(TAG, Log.getStackTraceString(e))
@ -79,6 +80,13 @@ class NextcloudLoginFlow(private val httpClient: OkHttpClient, private val rawHo
throw RuntimeException("Maximum retries exceeded") throw RuntimeException("Maximum retries exceeded")
} }
fun onResume(){ //trigger poll only when returning from the browser
if (token != null && isWaitingForBrowser){
poll()
isWaitingForBrowser = false
}
}
private fun poll() { private fun poll() {
CoroutineScope(Dispatchers.IO).launch { CoroutineScope(Dispatchers.IO).launch {
try { try {

2
app/src/main/kotlin/ac/mdiq/podcini/preferences/fragments/SynchronizationPreferencesFragment.kt
View File

@ -285,6 +285,8 @@ class SynchronizationPreferencesFragment : PreferenceFragmentCompat() {
} }
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
nextcloudLoginFlow?.onResume()
if (shouldDismiss) dismiss() if (shouldDismiss) dismiss()
} }
override fun onNextcloudAuthenticated(server: String, username: String, password: String) { override fun onNextcloudAuthenticated(server: String, username: String, password: String) {