Finish favorites sync

This commit is contained in:
NerdNumber9
2018-02-01 13:46:33 -05:00
parent 126da3979c
commit ded22f1717
10 changed files with 174 additions and 12 deletions

View File

@@ -120,4 +120,8 @@ object PreferenceKeys {
fun trackToken(syncId: Int) = "track_token_$syncId"
const val eh_nh_useHighQualityThumbs = "eh_nh_hq_thumbs"
const val eh_showSyncIntro = "eh_show_sync_intro"
const val eh_readOnlySync = "eh_sync_read_only"
}

View File

@@ -206,5 +206,9 @@ class PreferencesHelper(val context: Context) {
fun lockUseFingerprint() = rxPrefs.getBoolean("lock_finger", false)
fun eh_useHighQualityThumbs() = rxPrefs.getBoolean(Keys.eh_nh_useHighQualityThumbs, false)
fun eh_showSyncIntro() = rxPrefs.getBoolean(Keys.eh_showSyncIntro, true)
fun eh_readOnlySync() = rxPrefs.getBoolean(Keys.eh_readOnlySync, false)
// <-- EH
}

View File

@@ -37,6 +37,7 @@ import eu.kanade.tachiyomi.ui.migration.MigrationController
import eu.kanade.tachiyomi.util.inflate
import eu.kanade.tachiyomi.util.toast
import eu.kanade.tachiyomi.widget.DrawerSwipeCloseListener
import exh.favorites.FavoritesIntroDialog
import exh.favorites.FavoritesSyncStatus
import exh.metadata.loadAllMetadata
import exh.metadata.models.SearchableGalleryMetadata
@@ -410,9 +411,14 @@ class LibraryController(
R.id.action_source_migration -> {
router.pushController(MigrationController().withFadeTransaction())
}
R.id.action_download_favorites -> {
presenter.favoritesSync.runSync()
// --> EXH
R.id.action_sync_favorites -> {
if(preferences.eh_showSyncIntro().getOrDefault())
activity?.let { FavoritesIntroDialog().show(it) }
else
presenter.favoritesSync.runSync()
}
// <-- EXH
else -> return super.onOptionsItemSelected(item)
}

View File

@@ -1,8 +1,14 @@
package eu.kanade.tachiyomi.ui.setting
import android.support.v7.preference.PreferenceScreen
import android.widget.Toast
import com.afollestad.materialdialogs.MaterialDialog
import com.bluelinelabs.conductor.RouterTransaction
import com.bluelinelabs.conductor.changehandler.FadeChangeHandler
import eu.kanade.tachiyomi.data.preference.PreferenceKeys
import eu.kanade.tachiyomi.util.toast
import exh.favorites.FavoritesIntroDialog
import exh.favorites.LocalFavoritesStorage
import exh.ui.login.LoginController
import rx.android.schedulers.AndroidSchedulers
import rx.schedulers.Schedulers
@@ -125,5 +131,47 @@ class SettingsEhController : SettingsController() {
"tr_20"
)
}.dependency = "enable_exhentai"
preferenceCategory {
title = "Favorites sync"
switchPreference {
title = "Disable favorites uploading"
summary = "Favorites are only downloaded from ExHentai. Any changes to favorites in the app will not be uploaded. Prevents accidental loss of favorites on ExHentai. Note that removals will still be downloaded (if you remove a favorites on ExHentai, it will be removed in the app as well)."
key = PreferenceKeys.eh_readOnlySync
}
preference {
title = "Show favorites sync notes"
summary = "Show some information regarding the favorites sync feature"
onClick {
activity?.let {
FavoritesIntroDialog().show(it)
}
}
}
preference {
title = "Force sync state reset"
summary = "Performs a full resynchronization on the next sync. Removals will not be synced. All favorites in the app will be re-uploaded to ExHentai and all favorites on ExHentai will be redownloaded into the app. Useful for repairing sync after sync has been interrupted."
onClick {
activity?.let {
MaterialDialog.Builder(it)
.title("Are you sure?")
.content("Resetting the sync state can cause your next sync to be extremely slow.")
.positiveText("Yes")
.onPositive { _, _ ->
LocalFavoritesStorage().clearSnapshots()
it.toast("Sync state reset", Toast.LENGTH_LONG)
}
.negativeText("No")
.cancelable(false)
.show()
}
}
}
}
}
}