Commit graph

3530 commits

Author SHA1 Message Date
arkon
39c61a77b1 Move save pages to manga title setting to Reader section
(cherry picked from commit 224fcada17f2bf02f2ec9057ff172f3b77b879cb)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt
2021-05-04 14:13:16 -04:00
OncePunchedMan
d09bcafe7d Setting: Creates folders according to manga title (#4861)
* cherry-picking my changes

* Update SettingsDownloadController.kt

* Update SettingsDownloadController.kt

* Update ReaderPresenter.kt

Co-authored-by: arkon <arkon@users.noreply.github.com>
(cherry picked from commit 9278407b85719b9f574e9e1fddd85399cfb828f6)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt
2021-05-04 14:13:15 -04:00
arkon
b4a226157c Drop support for Android 5.x
(cherry picked from commit 89619b7836145130b4bf5d92ebc0f6fe70de7233)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt
2021-05-04 14:13:14 -04:00
Jobobby04
39d6319e8f Remove useless getResourceColor call 2021-05-04 14:13:14 -04:00
Jobobby04
1147bab1ce Quick fix to update check 2021-04-28 15:26:34 -04:00
arkon
f45fdca168 Remove app update check on Android 5.x
(cherry picked from commit 13324dd1a1f52dfeaa551d34d2a0c57d6be3940d)
2021-04-28 14:01:22 -04:00
Eugene
8ac309c4ae
Theme AMOLEDblue (#280) 2021-04-27 17:57:51 -04:00
Jobobby04
f170446c5f Lint 2021-04-26 18:02:29 -04:00
Ivan Iskandar
134be3893e Fix download error icon color tint (#4959)
* Fix download error color tint

* Use progress indicator as download icon border

* Resolve feedback

* Use extension function to set tinted drawable

(cherry picked from commit bf80dd622c9ebbdd27500f210858231a74ac3f4f)
2021-04-26 18:01:55 -04:00
Andreas
5855822edd Cleanup dual page split (#4956)
* Cleanup Dual Page Split

* Move where images is processed

* Change parameter name to imageStream

* Use available instead of Int.MAX_VALUE

* Update JavaDoc

(cherry picked from commit 662b71436eea6ddda4d15d18ec0946e946c6e4e9)
2021-04-26 18:01:47 -04:00
arkon
3343b766a2 Minor cleanup to updating download status in Updates
(cherry picked from commit f608cb55ebc3a1ecaf26258113489b6ca91a3503)
2021-04-26 18:01:39 -04:00
arkon
329d24c7db Don't automatically go to HALF_EXPANDED state for color filter tab (closes #4913)
(cherry picked from commit 6ba82da02991d8496cfbc37ab28ae5dce26e38c8)
2021-04-26 18:01:28 -04:00
arkon
bdfbc641d9 Reset Incognito Mode on app relaunch (closes #4928)
(cherry picked from commit f407e30b6e6b5c337f4c7ac5abb7ae0cce093688)
2021-04-26 18:01:20 -04:00
Ivan Iskandar
6e570d7fad Make the download progress status smoother (#4958)
* Make the download progress status smoother

* Download status icon cleanup

(cherry picked from commit 4e7b8c98f9b5fd532683eed54dd55f764bbee01d)
2021-04-26 18:01:11 -04:00
arkon
b5d696ebe2 Use popup menus for reader shortcuts instead of toggling through
(cherry picked from commit 5f9574541fae585d28777ed61cb37313189d6a26)
2021-04-26 18:01:02 -04:00
arkon
5299ae4856 Maybe better handle MAL token expiration
(cherry picked from commit 08a6db7d6eb9d682126f06597a1ded6b41744fa3)
2021-04-26 18:00:54 -04:00
arkon
f1a8132307 Remove "Locked" orientation, replace with explicit orientations
Portrait/Landscape allow sensor, Locked Portrait/Landscape don't.

(cherry picked from commit e8d8621f06751a6aa099931cba1d8f4e4f28ddb6)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
2021-04-26 18:00:36 -04:00
arkon
76185338bf Make manga and chapter folder name searching case insensitive
(cherry picked from commit 4cefbce7c34e724b409b6ba127f3c6c5c346ad8d)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt
2021-04-26 17:58:11 -04:00
arkon
bda4aae83d Sanitize source download folder name (fixes #4945)
(cherry picked from commit fa31369f99a1b25d669b7534960192a85fdd1e1f)
2021-04-26 17:57:05 -04:00
Ivan Iskandar
80bf908133 MainActivity: Show bottom nav when the tab page is changed (#4914)
* MainActivity: Show bottom nav when the tab page is changed

* Revert "MainActivity: Show bottom nav when the tab page is changed"

This reverts commit 27fd73db

* MainActivity: Show bottom nav when the app bar is fully expanded

(cherry picked from commit d0bf93ebb706811707b956a22b051b6b2bbe02c9)
2021-04-26 17:56:37 -04:00
arkon
91b49f8a0c Consider sort direction when downloading next n chapters (fixes #4916)
(cherry picked from commit 41a747c7e799a6cab936e9f4a14979ca7587ef39)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
2021-04-26 17:56:28 -04:00
arkon
80a5a54e60 Consider sort direction when resuming (fixes #4909)
(cherry picked from commit 8882cd4787040f76523d410e077497e6446a105e)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
2021-04-26 17:50:48 -04:00
arkon
3104f3a8b5 Add link to official Facebook page
(cherry picked from commit 68bea8a196d10e1038676e9b800c28a0a3b67464)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
2021-04-26 17:26:46 -04:00
Jobobby04
4fa2c968a9 Fix cleanup orphaned downloads removing valid downloads 2021-04-26 17:24:54 -04:00
Jobobby04
4118b13e5b Release 1.6.1 2021-04-19 15:19:13 -04:00
arkon
a8c4da9e2b Theme BiometricUnlockActivity to avoid flashing light theme
(cherry picked from commit dd1743698f477cb296778cf126cceebaf3315df3)
2021-04-19 14:58:52 -04:00
arkon
72d315b6ed Include extension loading errors in error logs
(cherry picked from commit b092e98ac9c57e5450a3027e69971b046570f2e8)
2021-04-19 14:58:44 -04:00
arkon
b886f0a55a Fix activity leak
(cherry picked from commit 9ee6262aedda77146f3d9918571c08f635305be1)
2021-04-19 14:58:36 -04:00
arkon
aa56698dac Clean up controller viewbinding creation
Based on https://github.com/Jays2Kings/tachiyomiJ2K/blob/master/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt

(cherry picked from commit cab919d74c2a00fd450c915a4d7fddc29c44927e)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
2021-04-19 14:56:08 -04:00
Ivan Iskandar
d37b24adb1 Fix source SearchView stuck open until query submitted (#4897)
closes #4850

(cherry picked from commit 60a929b92ce72a02ff8db4615e13b051a9cb6a28)
2021-04-19 14:42:18 -04:00
arkon
d3778ac6e1 Clean up ChapterCache (remove Gson, Rx usage)
(cherry picked from commit 356b7c346aba9dd0fafbb089c56de11ac50d1065)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/cache/ChapterCache.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
2021-04-19 14:42:04 -04:00
Ivan Iskandar
e43777bba7 Themes cleanup (#4894)
(cherry picked from commit ad57fde1c55984f3235ce86a7505e3675039b1dc)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt
#	app/src/main/res/values/themes.xml
2021-04-19 14:35:28 -04:00
arkon
a1be070e99 Minor cleanup
(cherry picked from commit b40af7c3c6beb2a28c1ec3104cc8cbd9f6a4a04e)

# Conflicts:
#	README.md
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt
2021-04-19 14:18:39 -04:00
arkon
eda47cd546 Move reading mode toast to default bottom position
Toasts don't block user interaction, so it's probably fine.

(cherry picked from commit 9065362fde063ec1f2913dcc33c7f98d99ab3e65)
2021-04-19 14:17:37 -04:00
arkon
54d8748c58 Adjust ActionToolbar positioning
Have I ever mentioned that I hate insets?

(cherry picked from commit ad9bad3d17aa01140e5dc339c71e19f405caaf90)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
2021-04-19 14:16:22 -04:00
arkon
77c17f2556 Avoid duplicate actions in update notifications
(cherry picked from commit dfd858034f3b6c023774f915a08150e50f702665)
2021-04-19 14:15:55 -04:00
arkon
77061067ee Avoid crash when users copying to clipboard fails because they have apps that are listening to their clipboards but also denied permissions
See https://commonsware.com/blog/2013/08/08/developer-psa-please-fix-your-clipboard-handling.html

(cherry picked from commit 38610d8a2432fb2c44498e3717668b62ea00e2a5)
2021-04-19 14:15:33 -04:00
arkon
707af702c1 Avoid rare crash in WebViewActivity
(cherry picked from commit 27cec697bf6252bfe9ae3244a702a235586e2110)
2021-04-19 14:15:24 -04:00
arkon
2220b6a91d Follow chapter sort setting for start/resume FAB (closes #1716)
(cherry picked from commit f7cc36f2f00ff8bcc690a0e5e94b1464f014e3b6)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
2021-04-19 14:14:59 -04:00
arkon
22b8f51fa3 Double tap Updates to go to Download Queue (closes #4884)
(cherry picked from commit ef5148ebb45fe282c80573bfcf2dafb8a0cd0a4a)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
2021-04-19 14:07:22 -04:00
arkon
08f0e515d5 Use DSL for creating chapter description spanned string
(cherry picked from commit 6dbc0a6fd50f0b97a0798792d482aa6657a7ea11)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChapterHolder.kt
2021-04-19 14:06:51 -04:00
arkon
28b4281683 Follow chapter sort setting when downloading next n chapters (closes #4725)
(cherry picked from commit fba3f9d501da586425b1fdce7db78ceaa6a644f7)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
2021-04-19 14:05:12 -04:00
arkon
665784a241 Adjust MoreController bottom padding for navbar
(cherry picked from commit 28416489b23654903aa195f20b4bb55156c3e987)
2021-04-19 14:01:11 -04:00
arkon
0d16609f95 Long press reader settings icon to open color filter tab
Partially addresses #4867

(cherry picked from commit 54a23ddd1f16f2c2bc0d73b6d2d19e094a0ef384)
2021-04-19 14:01:02 -04:00
arkon
b46500c837 Add checkmark beside selected popup menu item
Based on what's in J2K. Also renamed to MaterialSpinnerView to match what's there.

Co-authored-by: Jays2Kings <Jays2Kings@users.noreply.github.com>
(cherry picked from commit 3287ca9cf264fb0d28bdd7e43404cef595d953de)
2021-04-19 14:00:55 -04:00
arkon
fb5872ef51 Case insensitive source directory search
(cherry picked from commit a59e134862be796f5409d7fb535a2dd5225a8ead)

# Conflicts:
#	app/build.gradle.kts
2021-04-19 14:00:44 -04:00
arkon
bc28e2d617 Adjust ActionToolbar positioning
(cherry picked from commit 1f8c5b0120177ecd160110026ab2e018e20dd0c1)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
2021-04-19 14:00:10 -04:00
arkon
de0c55117d Minor cleanup
(cherry picked from commit c7f839ea4ae164cedb632946767fb0909b841c01)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
2021-04-19 13:59:33 -04:00
arkon
936997b52e Remove toolbar snapping
(cherry picked from commit d981245723dfb5b4feab5f6b8e2d656726ffe48b)
2021-04-19 13:58:43 -04:00
Ivan Iskandar
885c251fb4 Add navigation bar scrim (#4845)
* Revert "Add navigation bar scrim (closes #4836)"

This reverts commit 2a69d1b0

* Add navigation bar scrim

(cherry picked from commit 1f729f1cb33e4d9df6471016417eac0fd1782735)
2021-04-19 13:58:32 -04:00
Jobobby04
b8e907cea2 Block merged manga from being able to be migrated 2021-04-15 15:28:28 -04:00
Jobobby04
f4c6b2e09c Fix crash in migration if there are no viable chapter numbers 2021-04-15 15:03:44 -04:00
Jobobby04
13f4bfa7bc Remove source migration action 2021-04-15 14:57:49 -04:00
Jobobby04
780c1e68a6 Rename debug function 2021-04-14 19:01:41 -04:00
Jobobby04
f10944521c Fix build 2021-04-14 18:45:48 -04:00
arkon
af5ebeca56 Avoid crash when unknown reading mode is used
(cherry picked from commit b4577d667648819fc415b4dc0c0787de3d2d9eae)
2021-04-14 18:38:23 -04:00
Jays2Kings
5c1423be86 Migrating manga now also saves more chapter info
Bookmarks, Last Read, Date fetched, and has been read fully (this was already tracked but previously it only took the highest chapters

Closes #151

(cherry picked from commit ee4f3e6586910c8c4d62859c867c2a40e41eef67)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessAdapter.kt
2021-04-14 18:20:24 -04:00
Jays2Kings
382c23e0fd Fix webtoon mode not calling OnPageSelected in some cases (in upstream too)
This fix isn't 100% tested, but like 80%.

@arkon if you're reading this, this issue is happening up stream too. I can make a issue for it in the repo but haven't checked if it happens there:

Steps:
Get Cubari source, search "cubari:imgur/3iOqiIy" change to continuous vertical, crop borders. Then back out and open the chapter again. onPageSelected isn't called because recycler position is -1. Regardless of the 4 pages you should be on

also fyi just a slight scroll fixes this issue but still

(cherry picked from commit 88fd6e5c9897d4a528f93dd02cfa2a4c644a799d)
(cherry picked from commit 5f0493f1e55634471414b1369e2e1b8a1b56c656)
2021-04-14 18:18:03 -04:00
arkon
189b15fee6 Edge-to-edge in licenses activity
(cherry picked from commit c749e50becf3f7eb50b766c8b1fc8afcd7b1b37e)
2021-04-14 18:17:55 -04:00
Jobobby04
5af0e7e847 Nullable source name for manga type 2021-04-14 18:16:53 -04:00
Jobobby04
142bdd14b7 Add debug function to fix reader toast crash 2021-04-14 18:16:23 -04:00
Jobobby04
0483097fc3 Cleanup 2021-04-13 18:53:10 -04:00
Jobobby04
a3c26c63d4 LoginSource changes 2021-04-13 18:52:57 -04:00
arkon
fbe10151f4 Add navigation bar scrim (closes #4836)
(cherry picked from commit 2a69d1b0510107efd38de10853efabb90757635d)
2021-04-13 18:51:57 -04:00
arkon
92fc5ea4a0 Allow weaker unlock methods in Android 6 - 10 (fixes #4833)
(cherry picked from commit 126e1e2d9d66a7a88672c2836ae6d53105142603)
2021-04-13 18:51:49 -04:00
arkon
d2b620f485 Include debug info in dumped crash logs
(cherry picked from commit 0586e1d3ad29e36be0d57b9a874005771068cd2d)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
2021-04-13 18:51:40 -04:00
arkon
78aa57579d Allow dismissing download progress notification when paused (closes #4832)
(cherry picked from commit 07cb1c237edfb6471a1d295daf3c731299567945)
2021-04-13 18:49:54 -04:00
arkon
de36cd0626 Fix toolbar elevation in History and Updates
(cherry picked from commit 37fdf4d4342d4c14838c7d7ddc4dc246b659cdda)
2021-04-13 18:49:34 -04:00
arkon
b322ecd34a Fully expand source filter sheet on show (closes #4455)
(cherry picked from commit 99b46096a46ce4a56f4461d7ad7c7a24b0cf510b)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt
2021-04-13 18:49:23 -04:00
arkon
540e234562 Use same non-sticky heading style as Browse for Updates/History (closes #4822)
(cherry picked from commit 12e90ae35e37dd9d155a65d03a071f9d56e8f716)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SelectionHeader.kt
2021-04-13 18:31:18 -04:00
arkon
f6be2c7a2a Start download when tapping update notification (closes #4825)
(cherry picked from commit 023311a8747f4acd62747700593bd65717b7440a)
2021-04-12 15:03:49 -04:00
arkon
c5df8725de Fix ActionToolbar bottom offset
(cherry picked from commit 155a4dd463b53e187d54f20d5cbdb4173c77a96a)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
2021-04-12 15:03:40 -04:00
arkon
738e2f7cf1 Offset appbar using margin instead (maybe fixes #4819)
(cherry picked from commit 15bed1ac4c9140e7c0da214fdf6cd721cd7e4ff1)
2021-04-12 15:03:10 -04:00
Jobobby04
2602c49756 Hide dedupe by priority 2021-04-12 14:45:13 -04:00
Jobobby04
5a909f48b6 Fix some logs 2021-04-11 21:43:05 -04:00
Jobobby04
4d22db919d Disable mangadex tracking 2021-04-11 20:59:34 -04:00
Jobobby04
8a9f2cce10 More inset fixes 2021-04-11 20:56:50 -04:00
Jobobby04
ede0892cda Cleanup and fixes 2021-04-11 20:43:34 -04:00
Jobobby04
5df0eb7ed1 Convert EHentai Login controller to a activity 2021-04-11 20:43:21 -04:00
Jobobby04
67cb42ff30 Some inset fixes 2021-04-11 20:32:44 -04:00
arkon
fdac8a0380 Lint fixes/ignore some errors
(cherry picked from commit a3f1b721269b421dde67b8fd4e7017cf6c891c06)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
2021-04-11 18:48:14 -04:00
arkon
1c56624d13 Make library update/backup error log action clearer for non-technical users
(cherry picked from commit a82e5f545221a8347c1c25bd58aeaebd4a5453b6)
2021-04-11 18:47:32 -04:00
arkon
7c05c59501 Add locales: jv, lt, ne
(cherry picked from commit e10cb0e632663c10c1607ae43483f333e00e1621)
2021-04-11 18:47:23 -04:00
arkon
348ef2cf0f Log "Invalid download location" issues to error log
(cherry picked from commit d421401626e1e0181ba662b17e228c3af8f24fd3)
2021-04-11 18:46:45 -04:00
arkon
828944950b Add Google DoH provider
(cherry picked from commit b2d4e5ab846bcb5807785a0d1bfb82e9c5caeec6)

# Conflicts:
#	app/build.gradle.kts
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
2021-04-11 18:46:37 -04:00
Ivan Iskandar
1c67e82325 BrowseSourceController: Fix navigation bar insets not properly applied (#4810)
(cherry picked from commit 84e023607c9cdd8e4252600bbeba7d86720d0a4b)
2021-04-11 18:44:02 -04:00
Ken Swenson
a45e273e2c Move deletion actions to the IO thread (#4808)
(cherry picked from commit f145fd0dec583eff25d993e7f1bfbb0186ce3b93)
2021-04-11 18:43:55 -04:00
arkon
eb823cb208 Revert manga title folder for saved pages (closes #4803)
People also didn't like it making their galleries more complicate to navigate.

(cherry picked from commit 9567d5531211057b436cc79d881618e790d0414e)
2021-04-11 18:43:37 -04:00
Ivan Iskandar
9e40625c08 Draw edge-to-edge (#4802)
(cherry picked from commit f3660d88ddf21d92a80cc5e73bfa012ddf506e75)

# Conflicts:
#	app/build.gradle.kts
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
2021-04-11 18:43:19 -04:00
Riztard Lanthorn
a3c44fc5ad Search in library include manga description (#4787)
Co-Authored-By: jobobby04 <jobobby04@gmail.com>

Co-authored-by: jobobby04 <jobobby04@gmail.com>
(cherry picked from commit 01c3498dbff84b52d8225dd021a02642946cd4e1)
2021-04-11 18:41:28 -04:00
Taco
196e437da5 Update NDK, more KTX usage (#4792)
* Update NDK

* Utilize more KTX extensions

(cherry picked from commit b3471234ad74152bca46237e89a54e84a9912fe7)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt
2021-04-11 18:41:20 -04:00
arkon
5e8b5ef6cf Add clarification for category exclusion (closes #4777)
(cherry picked from commit b2d697131cabc8b85a06f871b4d0ce23f08532a1)
2021-04-11 18:40:31 -04:00
arkon
1ba07466ef Minor cleanup
(cherry picked from commit ef49fc91d8c40a45efab6661f9dfe78e147bc732)
2021-04-11 18:40:23 -04:00
arkon
eb88c9c94b Flip crop borders and orientation toggles
(cherry picked from commit 6222b47a4f518a7c92631aa6962b42624f41ac4b)

# Conflicts:
#	app/src/main/res/layout/reader_activity.xml
2021-04-11 18:40:12 -04:00
Jobobby04
2d4e589db8 Search browse if tag clicked in manga from Index controller 2021-04-11 18:36:41 -04:00
Jobobby04
3eecf5cb20 Disable Mangadex delegation 2021-04-11 18:17:06 -04:00
Jobobby04
6b08889c15 Use a Enum for MigrationStatus 2021-04-06 13:39:25 -04:00
Jobobby04
3bf070d88a Use material dialogs for exclude from automatic deletion 2021-04-04 21:40:26 -04:00
arkon
6d9753f361 Revert using fetch date for updates list
Spamming the list post-migration is currently a more common usecase than sources without chapter dates. We'll need to figure out a better way of handling both scenarios.

(cherry picked from commit 5b23f29d06da74c237d8e0ecc7772773ca0b4c1e)
2021-04-04 19:12:44 -04:00
arkon
f6b9867ce8 Fix global update category exclusion
(cherry picked from commit c1bdebee781565e628be71cda5e80a8f3ca02b43)
2021-04-04 19:12:36 -04:00