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

151 Commits

Author SHA1 Message Date
arkon
9320221a4e Minor cleanup 
(cherry picked from commit a93c0577acdf9fdc591087838ecb5a004d3acf81)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupRestore.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/lang/RxCoroutineBridge.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt
 2021-01-26 14:19:29 -05:00
Jobobby04
295af5306b Handle delegated source id lists better using a LisenterMutableMap 
Better source id comparisons
 2021-01-26 13:31:22 -05:00
arkon
9ec67db8cb Use proper method to clear notification actions 
(cherry picked from commit cf7ec6aa7628b23ddbb22938f1b587e7bd613d74)
 2021-01-21 19:06:57 -05:00
Jobobby04
0a4fcb480d Small cleanup and optimizations, add a coroutine version of insertFlatMetadata 2021-01-20 21:00:23 -05:00
arkon
7a893e3009 Revert removal of tracker start/end date 
(cherry picked from commit 0cd551d4fd94703aa49ede6db811fd07c712b2bc)
 2021-01-16 19:50:20 -05:00
arkon
0edff11353 More coroutine tweaks 
(cherry picked from commit c9cf9cfff006bc8d87e1d7a7245e213d579bb6d9)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/App.kt
#	app/src/main/java/eu/kanade/tachiyomi/AppModule.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupRestore.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/lang/RxCoroutineBridge.kt
 2021-01-10 18:43:47 -05:00
arkon
b7986a6773 Remove usage of RxJava from backup/restore 
(cherry picked from commit 990fb22d3eb5e640b81ff4465166a1bfb1f11442)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupRestore.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestore.kt
 2021-01-07 01:11:22 -05:00
arkon
68113f8c7d Convert more TrackService methods to coroutines 
(cherry picked from commit 2d0a5eb02cd201f944cbc9add9c7f1560546035d)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupRestore.kt
 2021-01-04 01:55:08 -05:00
arkon
23ac4b271c Replace usages of fetchChapterList with 1.x getChapterList API 
(cherry picked from commit 54dc01253d419079eaec61333d4c6f4deb5a58f8)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2021-01-02 03:08:16 -05:00
arkon
423983d41a Replace usages of fetchMangaDetails with 1.x getMangaDetails API 
(cherry picked from commit 4db9a90da2f67e7f4698b11431b8f99f9d66a47e)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2021-01-02 02:59:33 -05:00
arkon
8a8d8f7189 Include source name in backup restore error logs (closes #4230) 
(cherry picked from commit 3bb2102eb46af2ae2c03e505ade2512666b5cc91)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestore.kt
 2021-01-01 23:43:15 -05:00
Jobobby04
1a609e557b Refactor and cleanup 2020-12-26 16:12:52 -05:00
arkon
de03174131 Strip out no longer used tracker start/end date code 
Unfortunately MAL was the only one that supported it in the app, but the official API doesn't support it, so now no trackers have it.

(cherry picked from commit 6e7fefb8b22da062eb2eaf4cb20746e258ef4d65)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupTracking.kt
 2020-12-26 00:32:26 -05:00
arkon
17731f3904 Remove bundled fallback file picker 
(cherry picked from commit e8627800fef6525bc4ed3324c03178d7ac8850cd)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt
#	app/src/main/res/layout/common_listitem_dir.xml
#	app/src/main/res/values/styles.xml
 2020-12-21 14:21:34 -05:00
Jobobby04
6f712c7f17 Lint 2020-12-12 12:36:29 -05:00
Taco
d33cb59af5 Update libraries, some lints (#4099) 
* Update some plugins

* Fix some miscellaneous lints

(cherry picked from commit c2b8fea291686a148b98778aa8550e5fa61d8ab3)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
 2020-12-12 12:18:30 -05:00
Jobobby04
9a2ed755b7 Cleanup EH and AZ preferences 2020-11-30 15:11:58 -05:00
arkon
02946af081 Move NSFW source setting into Browse settings 
(cherry picked from commit c8316c72544308755fa73de9b5c632fd09fc7df3)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHelper.kt
 2020-11-29 00:23:06 -05:00
arkon
2b627128a6 Fall back to filename in backup creation notification if path not available 
(cherry picked from commit 6b9180844deee00b23a60a8f265110716754876e)
 2020-11-29 00:23:06 -05:00
arkon
f594ee66e5 More restore code cleanup 
(cherry picked from commit 368c30a2cc6d680c2c5345d22a5646b2184c77fd)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupRestore.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestore.kt
 2020-11-25 14:59:24 -05:00
arkon
b25e604bc2 Set preview/experimental compiler flags instead of using annotations 
(cherry picked from commit 781971ee813b9c3a71558c268365e9495dbc41c2)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
 2020-11-25 14:52:06 -05:00
arkon
383a797469 Some more code cleanup 
(cherry picked from commit cf6c48744a3217b39d7980c2c283a01d3f2a0473)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupRestore.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestore.kt
 2020-11-21 16:53:42 -05:00
arkon
978acec659 Some more code cleanup 
(cherry picked from commit 858664bfd741d4e1433573dd1e5672bea197ef2d)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupManager.kt
 2020-11-21 16:33:45 -05:00
arkon
22019a8046 Merge restore entry points, avoid unnecessary new strings 
(cherry picked from commit eceac4d6e34ad3c30a4e929e4af1e2d8e86ad126)
 2020-11-21 16:31:37 -05:00
arkon
b456d69aec Remove "full_" from v3 backup default file names 
(cherry picked from commit 47a172df1f4f84ee190b0551fb19cff1bff3914c)
 2020-11-21 16:31:27 -05:00
arkon
a5abdaa5b1 Minor cleanup 
(cherry picked from commit f2c0732c40041149928cec132475cbf51aac6f32)
 2020-11-21 16:31:18 -05:00
Jobobby04
6e8ac9cc10 Fix Full backup, DELETE ALL FULL BACKUPS MADE BEFORE THIS UPDATE 2020-11-12 14:58:58 -05:00
Jobobby04
e987ba8c3e Lets try this out for full backup categories 2020-11-06 14:24:55 -05:00
Jobobby04
015c610205 Use stable versions of RxUtil functions 2020-11-04 21:44:08 -05:00
Jobobby04
9cba544ffd Refactor and cleanup a bunch of code 2020-10-27 23:05:53 -04:00
Jobobby04
3ed0ef5e3e Cleanup 2020-10-24 13:39:28 -04:00
Jobobby04
b850a8729f Remove old backup code I tried for dummy restore 2020-10-24 13:39:04 -04:00
Jobobby04
5e531ba469 Put manga metadata into backups 2020-10-21 23:01:57 -04:00
Jobobby04
a4a1c2827c Fix some backup duplication issues 2020-10-19 18:39:08 -04:00
Jobobby04
c42e8739f6 Move some functions to the abstract backup manager 2020-10-14 17:36:22 -04:00
Jobobby04
d9ce86aca6 Dedupe some code, move over read and bookmarks properly 2020-10-14 15:19:46 -04:00
Jobobby04
f4200e2146 Rewrite backup categories 2020-10-14 14:15:14 -04:00
Jobobby04
e7c16cd0d1 Also apply changes to online restore 2020-10-14 13:15:54 -04:00
Jobobby04
f91d1af373 Dont break after finding one chapter 2020-10-14 13:10:24 -04:00
Jobobby04
326dc27009 Find chapter based on the url 2020-10-14 13:05:52 -04:00
Jobobby04
413c88d99f Fix backups always loading the full backup restore mode, even when legacy restore was used 2020-10-13 23:29:21 -04:00
Jobobby04
f3fc479020 Revert temp fixes, add serialization progurd rules 
This reverts commit 543e089982e9b774c5cfbcc4d0eddb5f21373928.
 2020-10-13 13:49:28 -04:00
Taco
8722c1806e Use some more KTX and Compat stuff (#3933) 
* Use more KTX extensions

* Update Android Studio

* Use more Compat classes

(cherry picked from commit 60755d0c26c55e8fa90406a973c00e0871c04723)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBackupController.kt
 2020-10-13 12:38:23 -04:00
Jobobby04
b67db6a25e Manually deserialize saved searches, fix NHentai 2020-10-13 11:34:29 -04:00
Jobobby04
3dd10df45e Likely fixed the full backup crashing for some users 2020-10-12 23:03:38 -04:00
Jobobby04
36c0d24143 Cleanup 2020-10-12 20:20:42 -04:00
jobobby04
445878794c
Make a protobuf based backup system (#112) 
* Make a protobuf based backup system, restore not tested

* Fix a number

* Remove uneeded change

* Remove more uneeded changes

* Use 1.x style models, backup should be 100% compatible with the 1.x backups

* Fix restore service not running

* Fix offline chapter restore
Cleanup saved searches restore(untested)

* Implement onlione/offline option, fix merged manga restore online, fix restore total

* Allow setting auto backup to use a full backup

* Fix for saved searches restore

* Edit some comments

* Convert flows back to observables

* Fix a model

* Fixes and comment only the SY specific things

* Move SY values range to 600 from 60

* Combine legacy and full backup services into one
Deduplicate a lot of code
Simplify a lot of stuff
Modify comments

* Cleanup

* Remove unneeded protobuf config edit because its now the default

* Migrate to kotlinx.serialization for backup saved searches

* Cleanup saved searches more, move gson type adapters to the legacy package
 2020-10-12 14:41:56 -04:00
Jobobby04
f3365cef67 Convert SY specific usages of Gson to Kotlin Serialization 
Cleanup saved searches a bit
Cleanup json parsing
 2020-10-12 14:20:54 -04:00
arkon
4aff2d79b7 Remove support for backup v1 
(cherry picked from commit 88aea311f810f1dbaeb092abe126bd32af7874fe)
 2020-09-24 08:22:09 -04:00
Jobobby04
a3be1c2c39 Fix merged manga getting backed up 2020-09-16 14:19:16 -04:00