mirror of
https://github.com/tachiyomiorg/tachiyomi.git
synced 2024-08-13 01:10:09 +02:00
Spelling fixes + fix to drag & drop
Targeting tracepot for crashes Migrations now shows how many manual migrations were made after skipping the rest
This commit is contained in:
Jay
parent
19a21519b8
commit
bac01c9807
@ -27,7 +27,7 @@ import uy.kohesive.injekt.injectLazy
|
||||
import uy.kohesive.injekt.registry.default.DefaultRegistrar
|
||||
|
||||
@ReportsCrashes(
|
||||
formUri = "http://tachiyomi.kanade.eu/crash_report",
|
||||
formUri = "https://collector.tracepot.com/e90773ff",
|
||||
reportType = org.acra.sender.HttpSender.Type.JSON,
|
||||
httpMethod = org.acra.sender.HttpSender.Method.PUT,
|
||||
buildConfigClass = BuildConfig::class,
|
||||
|
||||
@ -27,7 +27,7 @@ interface GithubService {
|
||||
}
|
||||
}
|
||||
|
||||
@GET("/repos/Jays2Kings/tachiyomi/releases/latest")
|
||||
@GET("/repos/Jays2Kings/tachiyomiJ2K/releases/latest")
|
||||
fun getLatestVersion(): Observable<GithubRelease>
|
||||
|
||||
}
|
||||
|
||||
@ -24,7 +24,6 @@ class ExtensionUpdateJob : Job() {
|
||||
val extensionManager: ExtensionManager = Injekt.get()
|
||||
extensionManager.findAvailableExtensions()
|
||||
|
||||
// Update favorite manga. Destroy service when completed or in case of an error.
|
||||
Observable.defer {
|
||||
extensionManager.getInstalledExtensionsObservable().map { list ->
|
||||
val pendingUpdates = list.filter { it.hasUpdate }
|
||||
@ -71,8 +70,8 @@ class ExtensionUpdateJob : Job() {
|
||||
const val TAG = "ExtensionUpdate"
|
||||
|
||||
fun setupTask() {
|
||||
JobRequest.Builder(TAG).setPeriodic(TimeUnit.DAYS.toMillis(1),
|
||||
TimeUnit.HOURS.toMillis(1))
|
||||
JobRequest.Builder(TAG).setPeriodic(TimeUnit.HOURS.toMillis(12),
|
||||
TimeUnit.HOURS.toMillis(2))
|
||||
.setRequiredNetworkType(JobRequest.NetworkType.CONNECTED)
|
||||
.setRequirementsEnforced(true)
|
||||
.setUpdateCurrent(true)
|
||||
|
||||
@ -429,8 +429,8 @@ class LibraryController(
|
||||
}
|
||||
R.id.action_alpha_asc -> reOrder(1)
|
||||
R.id.action_alpha_dsc -> reOrder(2)
|
||||
R.id.action_update_asc -> reOrder(3)
|
||||
R.id.action_update_dsc -> reOrder(4)
|
||||
R.id.action_update_dsc -> reOrder(3)
|
||||
R.id.action_update_asc -> reOrder(4)
|
||||
else -> return super.onOptionsItemSelected(item)
|
||||
}
|
||||
|
||||
|
||||
@ -71,6 +71,7 @@ class MigrationListController(bundle: Bundle? = null) : BaseController(bundle),
|
||||
private var migrationsJob: Job? = null
|
||||
private var migratingManga: MutableList<MigratingManga>? = null
|
||||
private var selectedPosition:Int? = null
|
||||
private var manaulMigrations = 0
|
||||
|
||||
override fun inflateView(inflater: LayoutInflater, container: ViewGroup): View {
|
||||
return inflater.inflate(R.layout.migration_list_controller, container, false)
|
||||
@ -263,7 +264,16 @@ class MigrationListController(bundle: Bundle? = null) : BaseController(bundle),
|
||||
|
||||
override fun noMigration() {
|
||||
launchUI {
|
||||
activity?.toast(R.string.no_migrations)
|
||||
val res = resources
|
||||
if (res != null) {
|
||||
activity?.toast(
|
||||
res.getString(
|
||||
R.string.x_migrations,
|
||||
if (manaulMigrations == 0) res.getString(R.string.no)
|
||||
else "$manaulMigrations"
|
||||
)
|
||||
)
|
||||
}
|
||||
router.popCurrentController()
|
||||
}
|
||||
}
|
||||
@ -281,8 +291,14 @@ class MigrationListController(bundle: Bundle? = null) : BaseController(bundle),
|
||||
}
|
||||
}
|
||||
R.id.action_skip -> adapter?.removeManga(position)
|
||||
R.id.action_migrate_now -> adapter?.migrateManga(position, false)
|
||||
R.id.action_copy_now -> adapter?.migrateManga(position, true)
|
||||
R.id.action_migrate_now -> {
|
||||
adapter?.migrateManga(position, false)
|
||||
manaulMigrations++
|
||||
}
|
||||
R.id.action_copy_now -> {
|
||||
adapter?.migrateManga(position, true)
|
||||
manaulMigrations++
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -60,7 +60,7 @@ class SettingsAboutController : SettingsController() {
|
||||
}
|
||||
preference {
|
||||
title = "Github"
|
||||
val url = "https://github.com/Jays2Kings/tachiyomi"
|
||||
val url = "https://github.com/Jays2Kings/tachiyomiJ2K"
|
||||
summary = url
|
||||
onClick {
|
||||
val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
|
||||
|
||||
@ -22,8 +22,8 @@
|
||||
<string name="label_selected">Selected: %1$d</string>
|
||||
<string name="label_backup">Backup</string>
|
||||
<string name="label_migration">Source migration</string>
|
||||
<string name="label_reorganize_by">Re-order</string>
|
||||
<string name="label_alpha_reverse">Alphabetically (descending)</string>
|
||||
<string name="label_reorganize_by">Reorder</string>
|
||||
<string name="label_alpha_reverse">Alpha. (descending)</string>
|
||||
<string name="label_hide_title">Hide title</string>
|
||||
<string name="label_show_title">Show title</string>
|
||||
<string name="label_extensions">Extensions</string>
|
||||
@ -48,7 +48,7 @@
|
||||
<string name="action_sort_first_updated">First updated</string>
|
||||
<string name="action_sort_drag_and_drop">Drag & Drop</string>
|
||||
<string name="action_search">Search</string>
|
||||
<string name="action_skip_manga">Skip manga</string>
|
||||
<string name="action_skip_manga">Don\'t migrate</string>
|
||||
<string name="action_global_search">Global search</string>
|
||||
<string name="action_select_all">Select all</string>
|
||||
<string name="action_mark_as_read">Mark as read</string>
|
||||
@ -430,7 +430,8 @@
|
||||
<string name="confirm_migration">Migrate %1$d%2$s manga?</string>
|
||||
<string name="confirm_copy">Copy %1$d%2$s manga?</string>
|
||||
<string name="skipping_x">(skipping %1$d)</string>
|
||||
<string name="no_migrations">No manga migrated</string>
|
||||
<string name="x_migrations">%1$s manga migrated</string>
|
||||
<string name="no">No</string>
|
||||
<string name="error_fetching_migration">No chapters found, this manga cannot be used for
|
||||
migration</string>
|
||||
<string name="no_alternatives_found">No Alternatives Found</string>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user