mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2024-11-07 11:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Convert tracker add/update/login methods to coroutines

Browse Source
This commit is contained in:
arkon 2020-12-24 17:50:28 -05:00
parent 6fcf6ae1f5
commit ea33179a95
15 changed files with 152 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/eu/kanade/tachiyomi/data/track/TrackService.kt
View File

@ -8,7 +8,6 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.data.track.model.TrackSearch import eu.kanade.tachiyomi.data.track.model.TrackSearch
import eu.kanade.tachiyomi.network.NetworkHelper import eu.kanade.tachiyomi.network.NetworkHelper
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
import rx.Completable
import rx.Observable import rx.Observable
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy
@ -43,9 +42,9 @@ abstract class TrackService(val id: Int) {
abstract fun displayScore(track: Track): String abstract fun displayScore(track: Track): String
abstract fun add(track: Track): Observable<Track> abstract suspend fun add(track: Track): Track
abstract fun update(track: Track): Observable<Track> abstract suspend fun update(track: Track): Track
abstract fun bind(track: Track): Observable<Track> abstract fun bind(track: Track): Observable<Track>
@ -53,7 +52,7 @@ abstract class TrackService(val id: Int) {
abstract fun refresh(track: Track): Observable<Track> abstract fun refresh(track: Track): Observable<Track>
abstract fun login(username: String, password: String): Completable abstract suspend fun login(username: String, password: String)
@CallSuper @CallSuper
open fun logout() { open fun logout() {

38
app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt
View File

@ -10,7 +10,6 @@ import eu.kanade.tachiyomi.util.lang.runAsObservable
import kotlinx.serialization.decodeFromString import kotlinx.serialization.decodeFromString
import kotlinx.serialization.encodeToString import kotlinx.serialization.encodeToString
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import rx.Completable
import rx.Observable import rx.Observable
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy
@ -132,23 +131,19 @@ class Anilist(private val context: Context, id: Int) : TrackService(id) {
} }
} }
override fun add(track: Track): Observable<Track> { override suspend fun add(track: Track): Track {
return runAsObservable({ api.addLibManga(track) }) return api.addLibManga(track)
} }
override fun update(track: Track): Observable<Track> { override suspend fun update(track: Track): Track {
// If user was using API v1 fetch library_id // If user was using API v1 fetch library_id
if (track.library_id == null || track.library_id!! == 0L) { if (track.library_id == null || track.library_id!! == 0L) {
return runAsObservable({ api.findLibManga(track, getUsername().toInt()) }).flatMap { val libManga = api.findLibManga(track, getUsername().toInt())
if (it == null) { ?: throw Exception("$track not found on user library")
throw Exception("$track not found on user library") track.library_id = libManga.library_id
}
track.library_id = it.library_id
runAsObservable({ api.updateLibManga(track) })
}
} }
return runAsObservable({ api.updateLibManga(track) }) return api.updateLibManga(track)
} }
override fun bind(track: Track): Observable<Track> { override fun bind(track: Track): Observable<Track> {
@ -157,12 +152,12 @@ class Anilist(private val context: Context, id: Int) : TrackService(id) {
if (remoteTrack != null) { if (remoteTrack != null) {
track.copyPersonalFrom(remoteTrack) track.copyPersonalFrom(remoteTrack)
track.library_id = remoteTrack.library_id track.library_id = remoteTrack.library_id
update(track) runAsObservable({ update(track) })
} else { } else {
// Set default fields if it's not found in the list // Set default fields if it's not found in the list
track.score = DEFAULT_SCORE.toFloat() track.score = DEFAULT_SCORE.toFloat()
track.status = DEFAULT_STATUS track.status = DEFAULT_STATUS
add(track) runAsObservable({ add(track) })
} }
} }
} }
@ -180,17 +175,18 @@ class Anilist(private val context: Context, id: Int) : TrackService(id) {
} }
} }
override fun login(username: String, password: String) = login(password) override suspend fun login(username: String, password: String) = login(password)
fun login(token: String): Completable { suspend fun login(token: String) {
val oauth = api.createOAuth(token) try {
interceptor.setAuth(oauth) val oauth = api.createOAuth(token)
return runAsObservable({ api.getCurrentUser() }).map { (username, scoreType) -> interceptor.setAuth(oauth)
val (username, scoreType) = api.getCurrentUser()
scorePreference.set(scoreType) scorePreference.set(scoreType)
saveCredentials(username.toString(), oauth.access_token) saveCredentials(username.toString(), oauth.access_token)
}.doOnError { } catch (e: Throwable) {
logout() logout()
}.toCompletable() }
} }
override fun logout() { override fun logout() {

28
app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt
View File

@ -10,7 +10,6 @@ import eu.kanade.tachiyomi.util.lang.runAsObservable
import kotlinx.serialization.decodeFromString import kotlinx.serialization.decodeFromString
import kotlinx.serialization.encodeToString import kotlinx.serialization.encodeToString
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import rx.Completable
import rx.Observable import rx.Observable
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy
@ -32,12 +31,12 @@ class Bangumi(private val context: Context, id: Int) : TrackService(id) {
return track.score.toInt().toString() return track.score.toInt().toString()
} }
override fun add(track: Track): Observable<Track> { override suspend fun add(track: Track): Track {
return runAsObservable({ api.addLibManga(track) }) return api.addLibManga(track)
} }
override fun update(track: Track): Observable<Track> { override suspend fun update(track: Track): Track {
return runAsObservable({ api.updateLibManga(track) }) return api.updateLibManga(track)
} }
override fun bind(track: Track): Observable<Track> { override fun bind(track: Track): Observable<Track> {
@ -54,8 +53,8 @@ class Bangumi(private val context: Context, id: Int) : TrackService(id) {
// Set default fields if it's not found in the list // Set default fields if it's not found in the list
track.score = DEFAULT_SCORE.toFloat() track.score = DEFAULT_SCORE.toFloat()
track.status = DEFAULT_STATUS track.status = DEFAULT_STATUS
add(track) runAsObservable({ add(track) })
update(track) runAsObservable({ update(track) })
} }
} }
} }
@ -101,17 +100,16 @@ class Bangumi(private val context: Context, id: Int) : TrackService(id) {
override fun getCompletionStatus(): Int = COMPLETED override fun getCompletionStatus(): Int = COMPLETED
override fun login(username: String, password: String) = login(password) override suspend fun login(username: String, password: String) = login(password)
fun login(code: String): Completable { suspend fun login(code: String) {
return runAsObservable({ api.accessToken(code) }).map { oauth: OAuth? -> try {
val oauth = api.accessToken(code)
interceptor.newAuth(oauth) interceptor.newAuth(oauth)
if (oauth != null) { saveCredentials(oauth.user_id.toString(), oauth.access_token)
saveCredentials(oauth.user_id.toString(), oauth.access_token) } catch (e: Throwable) {
}
}.doOnError {
logout() logout()
}.toCompletable() }
} }
fun saveToken(oauth: OAuth?) { fun saveToken(oauth: OAuth?) {

29
app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt
View File

@ -10,7 +10,6 @@ import eu.kanade.tachiyomi.util.lang.runAsObservable
import kotlinx.serialization.decodeFromString import kotlinx.serialization.decodeFromString
import kotlinx.serialization.encodeToString import kotlinx.serialization.encodeToString
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import rx.Completable
import rx.Observable import rx.Observable
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy
import java.text.DecimalFormat import java.text.DecimalFormat
@ -71,12 +70,12 @@ class Kitsu(private val context: Context, id: Int) : TrackService(id) {
return df.format(track.score) return df.format(track.score)
} }
override fun add(track: Track): Observable<Track> { override suspend fun add(track: Track): Track {
return runAsObservable({ api.addLibManga(track, getUserId()) }) return api.addLibManga(track, getUserId())
} }
override fun update(track: Track): Observable<Track> { override suspend fun update(track: Track): Track {
return runAsObservable({ api.updateLibManga(track) }) return api.updateLibManga(track)
} }
override fun bind(track: Track): Observable<Track> { override fun bind(track: Track): Observable<Track> {
@ -85,11 +84,11 @@ class Kitsu(private val context: Context, id: Int) : TrackService(id) {
if (remoteTrack != null) { if (remoteTrack != null) {
track.copyPersonalFrom(remoteTrack) track.copyPersonalFrom(remoteTrack)
track.media_id = remoteTrack.media_id track.media_id = remoteTrack.media_id
update(track) runAsObservable({ update(track) })
} else { } else {
track.score = DEFAULT_SCORE track.score = DEFAULT_SCORE
track.status = DEFAULT_STATUS track.status = DEFAULT_STATUS
add(track) runAsObservable({ add(track) })
} }
} }
} }
@ -107,13 +106,15 @@ class Kitsu(private val context: Context, id: Int) : TrackService(id) {
} }
} }
override fun login(username: String, password: String): Completable { override suspend fun login(username: String, password: String) {
return runAsObservable({ api.login(username, password) }) try {
.doOnNext { interceptor.newAuth(it) } val token = api.login(username, password)
.flatMap { runAsObservable({ api.getCurrentUser() }) } interceptor.newAuth(token)
.doOnNext { userId -> saveCredentials(username, userId) } val userId = api.getCurrentUser()
.doOnError { logout() } saveCredentials(username, userId)
.toCompletable() } catch (e: Throwable) {
logout()
}
} }
override fun logout() { override fun logout() {

31
app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt
View File

@ -7,15 +7,10 @@ import eu.kanade.tachiyomi.data.database.models.Track
import eu.kanade.tachiyomi.data.track.TrackService import eu.kanade.tachiyomi.data.track.TrackService
import eu.kanade.tachiyomi.data.track.model.TrackSearch import eu.kanade.tachiyomi.data.track.model.TrackSearch
import eu.kanade.tachiyomi.util.lang.runAsObservable import eu.kanade.tachiyomi.util.lang.runAsObservable
import kotlinx.coroutines.runBlocking
import kotlinx.serialization.decodeFromString import kotlinx.serialization.decodeFromString
import kotlinx.serialization.encodeToString import kotlinx.serialization.encodeToString
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import rx.Completable
import rx.Observable import rx.Observable
import rx.android.schedulers.AndroidSchedulers
import rx.schedulers.Schedulers
import timber.log.Timber
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy
class MyAnimeList(private val context: Context, id: Int) : TrackService(id) { class MyAnimeList(private val context: Context, id: Int) : TrackService(id) {
@ -67,12 +62,12 @@ class MyAnimeList(private val context: Context, id: Int) : TrackService(id) {
return track.score.toInt().toString() return track.score.toInt().toString()
} }
override fun add(track: Track): Observable<Track> { override suspend fun add(track: Track): Track {
return runAsObservable({ api.addItemToList(track) }) return api.addItemToList(track)
} }
override fun update(track: Track): Observable<Track> { override suspend fun update(track: Track): Track {
return runAsObservable({ api.updateItem(track) }) return api.updateItem(track)
} }
override fun bind(track: Track): Observable<Track> { override fun bind(track: Track): Observable<Track> {
@ -88,21 +83,17 @@ class MyAnimeList(private val context: Context, id: Int) : TrackService(id) {
return runAsObservable({ api.getListItem(track) }) return runAsObservable({ api.getListItem(track) })
} }
override fun login(username: String, password: String) = login(password) override suspend fun login(username: String, password: String) = login(password)
fun login(authCode: String): Completable { suspend fun login(authCode: String) {
return Completable.fromCallable { try {
val oauth = runBlocking { api.getAccessToken(authCode) } val oauth = api.getAccessToken(authCode)
interceptor.setAuth(oauth) interceptor.setAuth(oauth)
val username = runBlocking { api.getCurrentUser() } val username = api.getCurrentUser()
saveCredentials(username, oauth.access_token) saveCredentials(username, oauth.access_token)
} catch (e: Throwable) {
logout()
} }
.doOnError {
Timber.e(it)
logout()
}
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
} }
override fun logout() { override fun logout() {

30
app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/Shikimori.kt
View File

@ -10,7 +10,6 @@ import eu.kanade.tachiyomi.util.lang.runAsObservable
import kotlinx.serialization.decodeFromString import kotlinx.serialization.decodeFromString
import kotlinx.serialization.encodeToString import kotlinx.serialization.encodeToString
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import rx.Completable
import rx.Observable import rx.Observable
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy
@ -44,12 +43,12 @@ class Shikimori(private val context: Context, id: Int) : TrackService(id) {
return track.score.toInt().toString() return track.score.toInt().toString()
} }
override fun add(track: Track): Observable<Track> { override suspend fun add(track: Track): Track {
return runAsObservable({ api.addLibManga(track, getUsername()) }) return api.addLibManga(track, getUsername())
} }
override fun update(track: Track): Observable<Track> { override suspend fun update(track: Track): Track {
return runAsObservable({ api.updateLibManga(track, getUsername()) }) return api.updateLibManga(track, getUsername())
} }
override fun bind(track: Track): Observable<Track> { override fun bind(track: Track): Observable<Track> {
@ -58,12 +57,12 @@ class Shikimori(private val context: Context, id: Int) : TrackService(id) {
if (remoteTrack != null) { if (remoteTrack != null) {
track.copyPersonalFrom(remoteTrack) track.copyPersonalFrom(remoteTrack)
track.library_id = remoteTrack.library_id track.library_id = remoteTrack.library_id
update(track) runAsObservable({ update(track) })
} else { } else {
// Set default fields if it's not found in the list // Set default fields if it's not found in the list
track.score = DEFAULT_SCORE.toFloat() track.score = DEFAULT_SCORE.toFloat()
track.status = DEFAULT_STATUS track.status = DEFAULT_STATUS
add(track) runAsObservable({ add(track) })
} }
} }
} }
@ -105,18 +104,17 @@ class Shikimori(private val context: Context, id: Int) : TrackService(id) {
override fun getCompletionStatus(): Int = COMPLETED override fun getCompletionStatus(): Int = COMPLETED
override fun login(username: String, password: String) = login(password) override suspend fun login(username: String, password: String) = login(password)
fun login(code: String): Completable { suspend fun login(code: String) {
return runAsObservable({ api.accessToken(code) }).map { oauth: OAuth? -> try {
val oauth = api.accessToken(code)
interceptor.newAuth(oauth) interceptor.newAuth(oauth)
if (oauth != null) { val user = api.getCurrentUser()
val user = api.getCurrentUser() saveCredentials(user.toString(), oauth.access_token)
saveCredentials(user.toString(), oauth.access_token) } catch (e: Throwable) {
}
}.doOnError {
logout() logout()
}.toCompletable() }
} }
fun saveToken(oauth: OAuth?) { fun saveToken(oauth: OAuth?) {

2
app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/ShikimoriApi.kt
View File

@ -131,7 +131,7 @@ class ShikimoriApi(private val client: OkHttpClient, interceptor: ShikimoriInter
if (responseBody.isEmpty()) { if (responseBody.isEmpty()) {
throw Exception("Null Response") throw Exception("Null Response")
} }
json.decodeFromString<OAuth>(responseBody) json.decodeFromString(responseBody)
} }
} }

24
app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackPresenter.kt
View File

@ -8,6 +8,9 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.data.track.TrackManager import eu.kanade.tachiyomi.data.track.TrackManager
import eu.kanade.tachiyomi.data.track.TrackService import eu.kanade.tachiyomi.data.track.TrackService
import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
import eu.kanade.tachiyomi.util.lang.await
import eu.kanade.tachiyomi.util.lang.launchIO
import eu.kanade.tachiyomi.util.lang.launchUI
import eu.kanade.tachiyomi.util.system.toast import eu.kanade.tachiyomi.util.system.toast
import rx.Observable import rx.Observable
import rx.Subscription import rx.Subscription
@ -107,19 +110,22 @@ class TrackPresenter(
} }
private fun updateRemote(track: Track, service: TrackService) { private fun updateRemote(track: Track, service: TrackService) {
service.update(track) launchIO {
.flatMap { db.insertTrack(track).asRxObservable() } try {
.subscribeOn(Schedulers.io()) service.update(track)
.observeOn(AndroidSchedulers.mainThread()) db.insertTrack(track).await()
.subscribeFirst( launchUI {
{ view, _ -> view.onRefreshDone() }, view!!.onRefreshDone()
{ view, error -> }
view.onRefreshError(error) } catch (e: Throwable) {
launchUI {
view!!.onRefreshError(e)
// Restart on error to set old values // Restart on error to set old values
fetchTrackings() fetchTrackings()
} }
) }
}
} }
fun setStatus(item: TrackItem, index: Int) { fun setStatus(item: TrackItem, index: Int) {

40
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
View File

@ -21,13 +21,15 @@ import eu.kanade.tachiyomi.ui.reader.model.ReaderChapter
import eu.kanade.tachiyomi.ui.reader.model.ReaderPage import eu.kanade.tachiyomi.ui.reader.model.ReaderPage
import eu.kanade.tachiyomi.ui.reader.model.ViewerChapters import eu.kanade.tachiyomi.ui.reader.model.ViewerChapters
import eu.kanade.tachiyomi.util.isLocal import eu.kanade.tachiyomi.util.isLocal
import eu.kanade.tachiyomi.util.lang.await
import eu.kanade.tachiyomi.util.lang.byteSize import eu.kanade.tachiyomi.util.lang.byteSize
import eu.kanade.tachiyomi.util.lang.launchIO import eu.kanade.tachiyomi.util.lang.launchIO
import eu.kanade.tachiyomi.util.lang.takeBytes import eu.kanade.tachiyomi.util.lang.takeBytes
import eu.kanade.tachiyomi.util.storage.DiskUtil import eu.kanade.tachiyomi.util.storage.DiskUtil
import eu.kanade.tachiyomi.util.system.ImageUtil import eu.kanade.tachiyomi.util.system.ImageUtil
import eu.kanade.tachiyomi.util.updateCoverLastModified import eu.kanade.tachiyomi.util.updateCoverLastModified
import rx.Completable import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll
import rx.Observable import rx.Observable
import rx.Subscription import rx.Subscription
import rx.android.schedulers.AndroidSchedulers import rx.android.schedulers.AndroidSchedulers
@ -661,29 +663,25 @@ class ReaderPresenter(
val trackManager = Injekt.get<TrackManager>() val trackManager = Injekt.get<TrackManager>()
db.getTracks(manga).asRxSingle() launchIO {
.flatMapCompletable { trackList -> db.getTracks(manga).await()
Completable.concat( .mapNotNull { track ->
trackList.map { track -> val service = trackManager.getService(track.sync_id)
val service = trackManager.getService(track.sync_id) if (service != null && service.isLogged && chapterRead > track.last_chapter_read) {
if (service != null && service.isLogged && chapterRead > track.last_chapter_read) { track.last_chapter_read = chapterRead
track.last_chapter_read = chapterRead
// We wan't these to execute even if the presenter is destroyed and leaks // We want these to execute even if the presenter is destroyed and leaks
// for a while. The view can still be garbage collected. // for a while. The view can still be garbage collected.
Observable.defer { service.update(track) } async {
.map { db.insertTrack(track).executeAsBlocking() } service.update(track)
.toCompletable() db.insertTrack(track).await()
.onErrorComplete()
} else {
Completable.complete()
} }
} else {
null
} }
) }
} .awaitAll()
.onErrorComplete() }
.subscribeOn(Schedulers.io())
.subscribe()
} }
/** /**

21
app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/AnilistLoginActivity.kt
View File

@ -1,8 +1,8 @@
package eu.kanade.tachiyomi.ui.setting.track package eu.kanade.tachiyomi.ui.setting.track
import android.net.Uri import android.net.Uri
import rx.android.schedulers.AndroidSchedulers import eu.kanade.tachiyomi.util.lang.launchIO
import rx.schedulers.Schedulers import eu.kanade.tachiyomi.util.lang.launchUI
class AnilistLoginActivity : BaseOAuthLoginActivity() { class AnilistLoginActivity : BaseOAuthLoginActivity() {
@ -10,17 +10,12 @@ class AnilistLoginActivity : BaseOAuthLoginActivity() {
val regex = "(?:access_token=)(.*?)(?:&)".toRegex() val regex = "(?:access_token=)(.*?)(?:&)".toRegex()
val matchResult = regex.find(data?.fragment.toString()) val matchResult = regex.find(data?.fragment.toString())
if (matchResult?.groups?.get(1) != null) { if (matchResult?.groups?.get(1) != null) {
trackManager.aniList.login(matchResult.groups[1]!!.value) launchIO {
.subscribeOn(Schedulers.io()) trackManager.aniList.login(matchResult.groups[1]!!.value)
.observeOn(AndroidSchedulers.mainThread()) launchUI {
.subscribe( returnToSettings()
{ }
returnToSettings() }
},
{
returnToSettings()
}
)
} else { } else {
trackManager.aniList.logout() trackManager.aniList.logout()
returnToSettings() returnToSettings()

21
app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/BangumiLoginActivity.kt
View File

@ -1,25 +1,20 @@
package eu.kanade.tachiyomi.ui.setting.track package eu.kanade.tachiyomi.ui.setting.track
import android.net.Uri import android.net.Uri
import rx.android.schedulers.AndroidSchedulers import eu.kanade.tachiyomi.util.lang.launchIO
import rx.schedulers.Schedulers import eu.kanade.tachiyomi.util.lang.launchUI
class BangumiLoginActivity : BaseOAuthLoginActivity() { class BangumiLoginActivity : BaseOAuthLoginActivity() {
override fun handleResult(data: Uri?) { override fun handleResult(data: Uri?) {
val code = data?.getQueryParameter("code") val code = data?.getQueryParameter("code")
if (code != null) { if (code != null) {
trackManager.bangumi.login(code) launchIO {
.subscribeOn(Schedulers.io()) trackManager.bangumi.login(code)
.observeOn(AndroidSchedulers.mainThread()) launchUI {
.subscribe( returnToSettings()
{ }
returnToSettings() }
},
{
returnToSettings()
}
)
} else { } else {
trackManager.bangumi.logout() trackManager.bangumi.logout()
returnToSettings() returnToSettings()

21
app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/MyAnimeListLoginActivity.kt
View File

@ -1,25 +1,20 @@
package eu.kanade.tachiyomi.ui.setting.track package eu.kanade.tachiyomi.ui.setting.track
import android.net.Uri import android.net.Uri
import rx.android.schedulers.AndroidSchedulers import eu.kanade.tachiyomi.util.lang.launchIO
import rx.schedulers.Schedulers import eu.kanade.tachiyomi.util.lang.launchUI
class MyAnimeListLoginActivity : BaseOAuthLoginActivity() { class MyAnimeListLoginActivity : BaseOAuthLoginActivity() {
override fun handleResult(data: Uri?) { override fun handleResult(data: Uri?) {
val code = data?.getQueryParameter("code") val code = data?.getQueryParameter("code")
if (code != null) { if (code != null) {
trackManager.myAnimeList.login(code) launchIO {
.subscribeOn(Schedulers.io()) trackManager.myAnimeList.login(code)
.observeOn(AndroidSchedulers.mainThread()) launchUI {
.subscribe( returnToSettings()
{ }
returnToSettings() }
},
{
returnToSettings()
}
)
} else { } else {
trackManager.myAnimeList.logout() trackManager.myAnimeList.logout()
returnToSettings() returnToSettings()

21
app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/ShikimoriLoginActivity.kt
View File

@ -1,25 +1,20 @@
package eu.kanade.tachiyomi.ui.setting.track package eu.kanade.tachiyomi.ui.setting.track
import android.net.Uri import android.net.Uri
import rx.android.schedulers.AndroidSchedulers import eu.kanade.tachiyomi.util.lang.launchIO
import rx.schedulers.Schedulers import eu.kanade.tachiyomi.util.lang.launchUI
class ShikimoriLoginActivity : BaseOAuthLoginActivity() { class ShikimoriLoginActivity : BaseOAuthLoginActivity() {
override fun handleResult(data: Uri?) { override fun handleResult(data: Uri?) {
val code = data?.getQueryParameter("code") val code = data?.getQueryParameter("code")
if (code != null) { if (code != null) {
trackManager.shikimori.login(code) launchIO {
.subscribeOn(Schedulers.io()) trackManager.shikimori.login(code)
.observeOn(AndroidSchedulers.mainThread()) launchUI {
.subscribe( returnToSettings()
{ }
returnToSettings() }
},
{
returnToSettings()
}
)
} else { } else {
trackManager.shikimori.logout() trackManager.shikimori.logout()
returnToSettings() returnToSettings()

25
app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/TrackLoginDialog.kt
View File

@ -7,10 +7,10 @@ import androidx.core.os.bundleOf
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.track.TrackManager import eu.kanade.tachiyomi.data.track.TrackManager
import eu.kanade.tachiyomi.data.track.TrackService import eu.kanade.tachiyomi.data.track.TrackService
import eu.kanade.tachiyomi.util.lang.launchIO
import eu.kanade.tachiyomi.util.lang.launchUI
import eu.kanade.tachiyomi.util.system.toast import eu.kanade.tachiyomi.util.system.toast
import eu.kanade.tachiyomi.widget.preference.LoginDialogPreference import eu.kanade.tachiyomi.widget.preference.LoginDialogPreference
import rx.android.schedulers.AndroidSchedulers
import rx.schedulers.Schedulers
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get import uy.kohesive.injekt.api.get
@ -34,8 +34,6 @@ class TrackLoginDialog(
} }
override fun checkLogin() { override fun checkLogin() {
requestSubscription?.unsubscribe()
if (binding!!.username.text.isNullOrEmpty() || binding!!.password.text.isNullOrEmpty()) { if (binding!!.username.text.isNullOrEmpty() || binding!!.password.text.isNullOrEmpty()) {
return return
} }
@ -44,20 +42,21 @@ class TrackLoginDialog(
val user = binding!!.username.text.toString() val user = binding!!.username.text.toString()
val pass = binding!!.password.text.toString() val pass = binding!!.password.text.toString()
requestSubscription = service.login(user, pass) launchIO {
.subscribeOn(Schedulers.io()) try {
.observeOn(AndroidSchedulers.mainThread()) service.login(user, pass)
.subscribe( launchUI {
{
dialog?.dismiss() dialog?.dismiss()
view?.context?.toast(R.string.login_success) view?.context?.toast(R.string.login_success)
}, }
{ error -> } catch (e: Throwable) {
launchUI {
binding!!.login.progress = -1 binding!!.login.progress = -1
binding!!.login.setText(R.string.unknown_error) binding!!.login.setText(R.string.unknown_error)
error.message?.let { view?.context?.toast(it) } e.message?.let { view?.context?.toast(it) }
} }
) }
}
} }
override fun onDialogClosed() { override fun onDialogClosed() {

4
app/src/main/java/eu/kanade/tachiyomi/widget/preference/LoginDialogPreference.kt
View File

@ -13,7 +13,6 @@ import com.dd.processbutton.iml.ActionProcessButton
import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.databinding.PrefAccountLoginBinding import eu.kanade.tachiyomi.databinding.PrefAccountLoginBinding
import eu.kanade.tachiyomi.ui.base.controller.DialogController import eu.kanade.tachiyomi.ui.base.controller.DialogController
import rx.Subscription
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy
abstract class LoginDialogPreference( abstract class LoginDialogPreference(
@ -28,8 +27,6 @@ abstract class LoginDialogPreference(
val preferences: PreferencesHelper by injectLazy() val preferences: PreferencesHelper by injectLazy()
var requestSubscription: Subscription? = null
override fun onCreateDialog(savedViewState: Bundle?): Dialog { override fun onCreateDialog(savedViewState: Bundle?): Dialog {
binding = PrefAccountLoginBinding.inflate(LayoutInflater.from(activity!!)) binding = PrefAccountLoginBinding.inflate(LayoutInflater.from(activity!!))
var dialog = MaterialDialog(activity!!) var dialog = MaterialDialog(activity!!)
@ -64,7 +61,6 @@ abstract class LoginDialogPreference(
} }
open fun onDialogClosed() { open fun onDialogClosed() {
requestSubscription?.unsubscribe()
binding = null binding = null
} }