4609 Commits

Author SHA1 Message Date
Carlos
7f73094bb4 follows sort yolo
(cherry picked from commit 097d44ef35b021ba11e164f45234356fd8395540)

# Conflicts:
#	app/src/main/java/exh/md/handlers/FollowsHandler.kt
2020-10-14 17:43:40 -04:00
Jobobby04
a2a21bbbb7 Fix strings(again) 2020-10-14 17:36:51 -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
e32f4eb317 Replace migrate button with merge 2020-10-14 14:06:05 -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
0a790c3c25 Fix grammer 2020-10-14 13:05:36 -04:00
Jobobby04
f6fd8a8ddb Make offline the default 2020-10-14 12:46:39 -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
d15a473ed1 Enable the proguard rules 2020-10-13 21:53:23 -04:00
Jobobby04
c31beccf3c Lets try this 2020-10-13 21:33:34 -04:00
Jobobby04
f92c09b0f6 More comments 2020-10-13 20:55:18 -04:00
Jobobby04
5b056c6b70 Comment it all out 2020-10-13 20:27:36 -04:00
Jobobby04
2281a7a03d Comment out even more for a test 2020-10-13 17:23:43 -04:00
Jobobby04
713dcdfe53 Comment out some new rules for testing 2020-10-13 16:51:47 -04:00
Jobobby04
f3fc479020 Revert temp fixes, add serialization progurd rules
This reverts commit 543e089982e9b774c5cfbcc4d0eddb5f21373928.
2020-10-13 13:49:28 -04:00
Soitora
13196a68b1 Darken the description colors (#3858)
* Darken the description colors

* Restore UpdatesHolder.kt

* Use the same color as the Extensions subtitles

(cherry picked from commit 9f05d563f96385e2e0f5fe82f6ce097f8f2ccca2)
2020-10-13 12:39:14 -04:00
arkon
90452a7833 Use secondary color for manga info header action button default state
(cherry picked from commit 72d114d46a3f0c9d07fc3aa5967dee07bbb824e1)
2020-10-13 12:39:00 -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
543e089982 Revert the converter factory back to gson 2020-10-13 11:43:46 -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
22f81758b0 Refactor custom manga info manager 2020-10-12 22:35:45 -04:00
Jobobby04
405b0580fc Implement exclude categories from deletion 2020-10-12 22:11:16 -04:00
Jobobby04
eea1f696ca Update dependencies 2020-10-12 21:52:20 -04:00
Jobobby04
7e93557bd2 Remove markwan dependancy 2020-10-12 21:50:06 -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
bbfce97125 Trust user-added CAs (closes https://github.com/inorichi/tachiyomi-extensions/issues/4581)
(cherry picked from commit a689e4e041b5a09ab32d8cc47b8068e0f4bde067)
2020-10-11 16:07:35 -04:00
arkon
232f5b8aab Migrate to kotlinx.serialization for Bangumi
(cherry picked from commit f5aa36c787317441f34494472ec63e09c567f541)
2020-10-11 16:07:24 -04:00
arkon
4f575f37c0 Migrate to kotlinx.serialization for Shikimori
(cherry picked from commit f8d82cb0521012f16d11520daaac97e5efb0219c)
2020-10-11 16:07:11 -04:00
arkon
5b4f17777c Migrate to kotlinx.serialization for download store and deleter
(cherry picked from commit 980feb6c96282e5b0b92a2889980ce3bd2197c37)
2020-10-11 15:53:50 -04:00
arkon
38c3a926bb Migrate to kotlinx.serialization for Anilist
(cherry picked from commit e7d660549059e55f5cbeeb8607c658279a64ffdc)
2020-10-11 15:53:42 -04:00
arkon
b4cf0e9723 Migrate to kotlinx.serialization for extensions and update fetching
(cherry picked from commit 7a476abb53a4d3a36cf4f7618af83d984a78536b)

# Conflicts:
#	build.gradle.kts
2020-10-11 15:53:27 -04:00
arkon
4d64734dec [SKIP CI] Remove dev build logic from Travis CI config (#3873)
(cherry picked from commit 19581792fcf1e140ca3f4d08df9e0e148d9aecb9)

# Conflicts:
#	.travis/build.sh
2020-10-11 15:37:19 -04:00
specterflare
30d3d88d03 [SKIP CI] Replace dead link in README with correct one (#3929)
(cherry picked from commit aadc6a56cd651d74ca2661ab82affe54232e3b49)

# Conflicts:
#	README.md
2020-10-11 15:36:13 -04:00
arkon
57803bce2f Bump minimum WebView version to 84
(cherry picked from commit b88e444cbc9551f2ce89c587b5eb91bb9ae95bdd)
2020-10-11 15:34:53 -04:00
arkon
6d235e23ff Update dependencies
(cherry picked from commit 6c792d2821336894f37a758b80134186bd40580b)
2020-10-11 15:34:34 -04:00
arkon
428720fb74 Update AboutLibraries
(cherry picked from commit 9afb445620178d0928e9f3a2af20220123c60ae3)

# Conflicts:
#	build.gradle.kts
2020-10-11 15:34:15 -04:00
jobobby04
f32ccf1c6d
Remove pong 2020-10-10 01:01:39 -04:00
Jobobby04
776a4b2a24 History fixes 2020-10-10 00:32:39 -04:00
Jobobby04
883af56a9a Do some work on the workflows 2020-10-09 13:19:51 -04:00
arkon
a9279fbb2e Cancel previous CI workflow runs
(cherry picked from commit a249373bf50c0701c6f8d0f1b9e692dc633cd5ab)

# Conflicts:
#	README.md
2020-10-09 13:06:13 -04:00
arkon
6dc55a3fc4 Use eskatos/gradle-command-action instead of manually handling caching
(cherry picked from commit e1eb030b182e3418caedede9c992690a98960be5)

# Conflicts:
#	.github/workflows/build_check.yml
2020-10-09 13:04:43 -04:00
Aakash Singh
f0e2367071 skip ci in commit message condition check (#3902)
* skip ci condition check

* always Validate Gradle Wrapper

* naming workflow jobs

(cherry picked from commit 6aea0f48ed439ef321f7ce84e3092f6904408ce9)

# Conflicts:
#	.github/workflows/build_check.yml
2020-10-09 13:04:02 -04:00
arkon
8e27ffcad7 Add Amharic locale
(cherry picked from commit 842295348e39bb910a4ff681a89fa03bc2961812)
2020-10-09 13:02:30 -04:00