Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,026 Commits 1 Branch 60 Tags
Commit Graph

9026 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jobobby04
ebcd7e8e27 Fix scanlator filter toolbar tint 2023-09-04 12:39:51 -04:00
Jobobby04
4a00ef32fd Fix read status in reader chapter list 2023-09-04 12:31:46 -04:00
renovate[bot]
60ef3f92b7 Update dependency io.kotest:kotest-assertions-core to v5.7.1 (#9905) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit d9d143e6be35dc1845dc4e23b40c26df6309b8f9)
 2023-09-04 12:18:05 -04:00
arkon
0346a4d6b0 Minor updates 
(cherry picked from commit 3f0db60a999cb30ff249ae4cc6a720c2a49c319a)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt
 2023-09-04 12:17:45 -04:00
arkon
cdfaf28910 Use app name in biometric unlock dialog 
Mostly for forks to show the right name.

(cherry picked from commit 87f3d4bd054d9442fb7af9204bda70a85a43b626)
 2023-09-04 12:16:06 -04:00
renovate[bot]
b81e1203c9 Update dependency io.kotest:kotest-assertions-core to v5.7.0 (#9901) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 5c3d655d9eed42f3a2f6e9e4ea8e232ed7b0df56)
 2023-09-04 12:15:55 -04:00
renovate[bot]
2f4f98f302 Update dependency ch.acra:acra-http to v5.11.2 (#9900) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 66b175a3c8c0bfb339a4101baed3882ba8b22097)
 2023-09-04 12:15:45 -04:00
Weblate (bot)
cdc65b5bd6 Translations update from Hosted Weblate (#9860) 
Weblate translations

Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ar/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/cs/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/de/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/el/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es_419/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/he/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/it/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ja/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ms/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/nb_NO/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ne/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pt/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pt_BR/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ru/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sv/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/vi/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hant/
Translation: Tachiyomi/Tachiyomi 0.x

Co-authored-by: Alessandro Jean <14254807+alessandrojean@users.noreply.github.com>
Co-authored-by: Ali Aljishi <ahj696@hotmail.com>
Co-authored-by: Astrid <github@astrid.exposed>
Co-authored-by: DarKCroX <DarKCroX@users.noreply.hosted.weblate.org>
Co-authored-by: DatTran MLL <tranthanhdat1142003@gmail.com>
Co-authored-by: Dexroneum <Rozhenkov69@gmail.com>
Co-authored-by: FateXBlood <zecrofelix@gmail.com>
Co-authored-by: Giorgio Sanna <sannagiorgio1997@gmail.com>
Co-authored-by: ID-86 <id86dev@gmail.com>
Co-authored-by: Luna Jernberg <droidbittin@gmail.com>
Co-authored-by: Lyfja <yassinelaoud@gmail.com>
Co-authored-by: Lzmxya <lzmxya@gmail.com>
Co-authored-by: Pitpe11 <giorgos2550@gmail.com>
Co-authored-by: TheKingTermux <achmadmaulana0233@gmail.com>
Co-authored-by: Uzuki Shimamura <hzy980512@126.com>
Co-authored-by: Vetle Ledaal <vetle.ledaal@gmail.com>
Co-authored-by: bapeey <luisrleccar@hotmail.com>
Co-authored-by: gallegonovato <fran-carro@hotmail.es>
Co-authored-by: rzvsrh <rzvsrh333@gmail.com>
Co-authored-by: stevenlele <stevenlele@outlook.com>
(cherry picked from commit 3cd3f45c8a47790edb3dd687942dd1539efe27c7)
 2023-09-04 12:15:38 -04:00
Ivan Iskandar
32b97eb206 "Updates" widget for Galaxy Z Flip5 cover screen (#9892) 
(cherry picked from commit 816d7815e94f8b1286e17b1459c3a01a9aba7369)
 2023-09-04 12:15:26 -04:00
arkon
d8158af43a Switch to different ktlint plugin 
Should be better at incremental builds.
To format, run `./gradlew ktlintFormat`.

(cherry picked from commit d29b7c4e5735dc137d578d3bcb3da1f0a02573e8)

# Conflicts:
#	buildSrc/src/main/kotlin/tachiyomi.lint.gradle.kts
#	data/src/main/java/tachiyomi/data/manga/MangaMapper.kt
#	domain/src/main/java/tachiyomi/domain/library/model/LibrarySortMode.kt
#	domain/src/main/java/tachiyomi/domain/library/service/LibraryPreferences.kt
#	domain/src/main/java/tachiyomi/domain/release/interactor/GetApplicationRelease.kt
#	presentation-core/src/main/java/tachiyomi/presentation/core/components/CollapsibleBox.kt
 2023-09-04 12:15:09 -04:00
arkon
e0a16abb37 Bump dependencies 
(cherry picked from commit 772db515934b79ef407b4213087c15035588d9ad)

# Conflicts:
#	gradle/libs.versions.toml
 2023-09-04 11:58:32 -04:00
arkon
511979045f Limit amount of updates loaded for widget 
Probably fixes #9868

(cherry picked from commit 87530f506e16db3d5c9ed89740c324ebd464117f)

# Conflicts:
#	domain/src/main/java/tachiyomi/domain/updates/interactor/GetUpdates.kt
 2023-09-04 11:57:28 -04:00
arkon
e776d455f5 Refactor some tracking-related logic 
(cherry picked from commit 98d6ce2eaf2c1e85f4763dd37303155d1fc6690d)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt
 2023-09-04 11:47:24 -04:00
arkon
04fbc76f55 Update kotlinx.serialization 
(cherry picked from commit 7644d7c31ee5901c1c76b28a97508f92108c7141)
 2023-09-04 11:35:32 -04:00
arkon
402014adb4 Refactor some tracking-related logic 
(cherry picked from commit dde2f42138082f2d71552d573adbe89015cc7ff4)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/track/interactor/TrackChapter.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt
 2023-09-04 11:35:19 -04:00
arkon
270ff9064a Add more user-friendly network-related exception messages 
(cherry picked from commit 6922792ad110ce9194aa963674bbf2c5c1351ea1)
 2023-09-03 23:36:28 -04:00
Mekanik
bef7a42da5 Make some error messages localizable (#9811) 
* Make error message of 3 exceptions localizable.

* Revert unnecessary file handle exception change.

(cherry picked from commit 8f395d98e7be976263d2ee9b7559c2638d57b47e)
 2023-09-03 23:36:09 -04:00
arkon
d098abc7e1 Use default non-final resource IDs behavior 
(cherry picked from commit f32243899df8ac7d903defae2060db9c484a5193)
 2023-09-03 23:33:13 -04:00
arkon
baa8658183 Remove unused rxandroid dependency 
(cherry picked from commit 13dc54df707623c914cd7cda2f2f781515f92eb3)
 2023-09-03 23:32:59 -04:00
arkon
347f98b392 Add ResolvableSource interface for potentially opening entries directly based on some URI via a share intent 
Implemented as an intermediate step in the existing Global Search share intent workflow.
If any source manages to resolve the URI (e.g., a URL, a slug, etc.), the resolved SManga entry
is directly opened. If nothing gets resolved, continue to a Global Search.

(cherry picked from commit 6d9a8a30e974574b8d92ba478333e6f62b0de2e2)
 2023-09-03 23:32:42 -04:00
arkon
1786b43378 Revert Compose upgrade 
Caused weird rendering issues in MangaScreen

(cherry picked from commit 2bf263e30157e4c5ec39aadf16d08738326c2ac9)
 2023-09-03 23:31:40 -04:00
arkon
72e1e3bda6 Better ignore irrelevant files when indexing downloads 
(cherry picked from commit c06beac6601f583965656602023c839de7ade998)
 2023-09-03 23:30:22 -04:00
arkon
105a971a4c Don't run automatic backup or library update jobs if battery is low 
(cherry picked from commit 74f74eef56ce83b52cd7969f705e370c7977af87)

# Conflicts:
#	app/build.gradle.kts
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt
 2023-09-03 23:30:10 -04:00
arkon
8f07b7ab5b Bump dependencies 
(cherry picked from commit 3aafec482c05495a4cfa34e278de78adf69e2445)
 2023-09-03 23:05:53 -04:00
Alessandro Jean
5661ee3ea5 Replace mentions with links to profiles in the release information (#9859) 
Replace mentions with links in the release information.

(cherry picked from commit ed80ac3154625d52238ef3cbc295044fadb8ed70)
 2023-09-03 23:05:38 -04:00
Alessandro Jean
3b31442a8f Only set the dialog title if not already set in the extension (#9858) 
Only set the dialog title if not already set in the extension.

(cherry picked from commit eeeaae4570833e9b94e8fbef13bb5055f518c38f)
 2023-09-03 23:05:21 -04:00
arkon
3df6435f4b Add documentation for HttpException 
Corresponds with https://github.com/tachiyomiorg/extensions-lib/pull/12

(cherry picked from commit d1c956401cfc8c0dcce68a2134ae97927ac2c678)
 2023-09-03 23:05:12 -04:00
arkon
5d1f33af3c Upgrade to Gradle 8.3 
(cherry picked from commit 1be7949275a11549883c89b32e2e56c1002cb8d1)
 2023-09-03 23:05:02 -04:00
Weblate (bot)
0dde8fd59f Translations update from Hosted Weblate (#9808) 
Weblate translations

Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ar/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ca/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/cs/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/cv/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/de/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/el/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/eu/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fil/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hu/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/id/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/it/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ne/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/nl/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pt_BR/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ro/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ru/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sa/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sv/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/th/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/uk/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/vi/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hant/
Translation: Tachiyomi/Tachiyomi 0.x

Co-authored-by: 2227975312 <2227975312@qq.com>
Co-authored-by: Alessandro Jean <14254807+alessandrojean@users.noreply.github.com>
Co-authored-by: Ali Aljishi <ahj696@hotmail.com>
Co-authored-by: Astrid <github@astrid.exposed>
Co-authored-by: Bashmak <mrwho.vz@gmail.com>
Co-authored-by: C201 <derasetad@gmail.com>
Co-authored-by: Dan <jonweblin2205@protonmail.com>
Co-authored-by: Dexroneum <Rozhenkov69@gmail.com>
Co-authored-by: Eduard Ereza Martínez <eduard@ereza.cat>
Co-authored-by: FateXBlood <zecrofelix@gmail.com>
Co-authored-by: Garutmaan Garuda <garutmaangaruda@gmail.com>
Co-authored-by: Giorgio Sanna <sannagiorgio1997@gmail.com>
Co-authored-by: ID-86 <id86dev@gmail.com>
Co-authored-by: InfinityDouki56 <ced.paltep10@gmail.com>
Co-authored-by: K. Sz. Bence <tudi20@protonmail.com>
Co-authored-by: Lyfja <yassinelaoud@gmail.com>
Co-authored-by: Lzmxya <lzmxya@gmail.com>
Co-authored-by: Milo Ivir <mail@milotype.de>
Co-authored-by: Pitpe11 <giorgos2550@gmail.com>
Co-authored-by: Reza Almanda <rezaalmanda27@gmail.com>
Co-authored-by: Shjosan <shjosan@kakmix.co>
Co-authored-by: Swyter <swyterzone@gmail.com>
Co-authored-by: Unai <uesandi@gmail.com>
Co-authored-by: altinat <altinat@duck.com>
Co-authored-by: arkon <eugcheung94@gmail.com>
Co-authored-by: f0roots <f0rootss@gmail.com>
Co-authored-by: torchlight <sima142222@gmail.com>
Co-authored-by: xconkhi9x <bighih2@gmail.com>
(cherry picked from commit 5572b28d017631ded23f95cbd5842d90ca50af04)
 2023-09-03 23:04:52 -04:00
arkon
42c404a0cc Minor cleanup 
(cherry picked from commit 4e68b628811dee26a5aba023183af619df5c3e99)
 2023-09-03 23:04:38 -04:00
arkon
93364cf589 Upgrade to AGP 8.1.0 
(cherry picked from commit 4e31e6a2faf40ac2833607979afe4999d3d82c8a)

# Conflicts:
#	gradle.properties
 2023-09-03 23:04:28 -04:00
arkon
e9958b3ea7 Bump dependencies 
(cherry picked from commit bc692ebfc6e9a6af9f8f5411452497e5edc4bdea)

# Conflicts:
#	gradle/compose.versions.toml
 2023-09-03 23:03:55 -04:00
Jobobby04
119d3ef56e Revert "Update Compose" 
This reverts commit 4b4e432ef6416f964a4344ebea4034d65fa6401a.
 2023-08-13 15:11:07 -04:00
Jobobby04
28f7e03cab Fix updates query 2023-08-13 15:07:14 -04:00
Jobobby04
4743276b20 Update baseline profile 2023-08-13 14:31:05 -04:00
Jobobby04
b717c14cdc Fix tag borders 2023-08-13 12:56:33 -04:00
Jobobby04
e7db248f36 Hide cleanup downloaded chapters for now 2023-08-13 12:43:06 -04:00
Alessandro Jean
a74ecd5c41 Make source ID generation function reusable to extensions (#9836) 
* Make source ID generation function reusable to extensions.

* Add parameters and return documentation.

(cherry picked from commit 3411ac40c014c0b95a105b00f87432e0ea77ff14)
 2023-08-13 12:27:00 -04:00
arkon
13b2da80ac Set tracker finished date when manually updating to last chapter 
Closes #9834
Individual tracker implementations already handle setting it too on update.

(cherry picked from commit 8a6a104987738c7251097f172d24aa7235a86e96)
 2023-08-13 12:26:43 -04:00
arkon
4b4e432ef6 Update Compose 
Also remove workaround for preventing keyboard showing up for SelectItems.

(cherry picked from commit efa7a3a167219e9e23ee9b29d9cabe3ca8eb088a)
 2023-08-13 12:26:31 -04:00
arkon
8aed8fa741 Bump dependencies 
(cherry picked from commit 67bc81ebde511cdecdbad4be4e8b3e03350462e8)
 2023-08-13 12:21:13 -04:00
arkon
ea6e0097c1 Clean up SetFetchIntervalTest 
(cherry picked from commit 0a3ce8ebe45d7615311f2f99b8e59ea8490411d4)
 2023-08-13 12:20:59 -04:00
arkon
71e0a02003 Minor reader cleanup 
(cherry picked from commit 3ebf39bd55cffbf5dc4bfe1c39e91aa22fa93777)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/res/values/arrays.xml
 2023-08-13 12:20:49 -04:00
Mekanik
fa80257af8 Fix missing inversion in tap zones help overlay. (#9812) 
(cherry picked from commit 26b3eb696c95b6363176e77effdd38089af5c19e)
 2023-08-13 12:07:34 -04:00
Ivan Iskandar
632ac0ebb2 Add private extension install method (#9710) 
* Add private extension install method

Private extensions are put inside private data directory of the running app, so
this kind of extensions can only be used by the running app and not shared with
other apps.

One limitation of private extension is the lack of deeplink handlers (if there's
any) since the extension APK is not installed to the system.

When both kinds of extensions are installed with a same package name, shared
extension (the one installed to the system) will be used unless the version
codes are different. In that case the one with higher version code will be used.

* update

(cherry picked from commit 627f07408e0fe62ab89dcd8881275141591b328d)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/extension/model/Extension.kt
 2023-08-13 12:07:25 -04:00
arkon
b1f17b0d49 Bump dependencies 
(cherry picked from commit 7146913c7184819417d86e6cd83aaab85bd6a798)
 2023-08-13 12:06:15 -04:00
arkon
39e82ba873 Consider local manga as downloaded when filtering in reader 
Fixes #9801

(cherry picked from commit 39c6bcccd8e4e687c0864b212437a387e69cf2f3)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterFilterDownloaded.kt
 2023-08-13 12:06:00 -04:00
Weblate (bot)
348eb95d1b Translations update from Hosted Weblate (#9775) 
Weblate translations

Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/cs/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/de/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fil/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hi/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/id/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/it/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ja/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ko/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/nb_NO/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ne/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pl/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pt_BR/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ru/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sv/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/th/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hant/
Translation: Tachiyomi/Tachiyomi 0.x

Co-authored-by: Alessandro Jean <14254807+alessandrojean@users.noreply.github.com>
Co-authored-by: Dexroneum <Rozhenkov69@gmail.com>
Co-authored-by: FateXBlood <zecrofelix@gmail.com>
Co-authored-by: Giorgio Sanna <sannagiorgio1997@gmail.com>
Co-authored-by: ID-86 <id86dev@gmail.com>
Co-authored-by: InfinityDouki56 <ced.paltep10@gmail.com>
Co-authored-by: Jendrej <ejjendrej@gmail.com>
Co-authored-by: Lyfja <yassinelaoud@gmail.com>
Co-authored-by: Lzmxya <lzmxya@gmail.com>
Co-authored-by: Milo Ivir <mail@milotype.de>
Co-authored-by: Reza Almanda <rezaalmanda27@gmail.com>
Co-authored-by: Shjosan <shjosan@kakmix.co>
Co-authored-by: Swyter <swyterzone@gmail.com>
Co-authored-by: THE_LEGEND <the.legend9285+weblate@gmail.com>
Co-authored-by: Uzuki Shimamura <hzy980512@126.com>
Co-authored-by: Vetle Ledaal <vetle.ledaal@gmail.com>
Co-authored-by: abc0922001 <abc0922001@hotmail.com>
Co-authored-by: altinat <altinat@duck.com>
Co-authored-by: gallegonovato <fran-carro@hotmail.es>
Co-authored-by: jinu147 <nesqea20@gmail.com>
Co-authored-by: stevenlele <stevenlele@outlook.com>
(cherry picked from commit cb4b8ac0dc35cb11044786737a9bf2ae86ce2430)
 2023-08-13 12:05:05 -04:00
Ivan Iskandar
ac5569929d ReaderViewModel: Fix saved state (#9807) 
Also save page index

(cherry picked from commit af0fdfa3b7e859db54154473a8cd4c7b50121ca7)
 2023-08-13 12:04:36 -04:00
Quang Kieu
9e7748c84b [Hotfix] Fix bug of not fetch update if manual library refresh as fetch period have lower limit (#9806) 
Fix bug of not fetch update if manual library refresh, no auto

If somehow manga missed check period, we would not give new next update cycle and it would forever left behind

(cherry picked from commit d874f20362217bf1752b16f513143f1f83972f69)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt
 2023-08-13 12:04:26 -04:00