Merge branch 'devel' into release/5

2023-03-02 18:52:59 +02:00
parent a3b22e050f a13c498d00
commit 1316d71d3e
14 changed files with 270 additions and 36 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,8 +15,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdkVersion 21
 		targetSdkVersion 33
-		versionCode 517
-		versionName '4.4.1'
+		versionCode 518
+		versionName '4.4.2'
 		generatedDensities = []
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

@@ -87,7 +87,7 @@ afterEvaluate {
 	}
 }
 dependencies {
-	implementation('com.github.KotatsuApp:kotatsu-parsers:f4c47b5b84') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:1093584202') {
 		exclude group: 'org.json', module: 'json'
 	}

@@ -124,8 +124,8 @@ dependencies {
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.2'
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.2'

-	implementation 'com.google.dagger:hilt-android:2.44.2'
-	kapt 'com.google.dagger:hilt-compiler:2.44.2'
+	implementation 'com.google.dagger:hilt-android:2.45'
+	kapt 'com.google.dagger:hilt-compiler:2.45'
 	implementation 'androidx.hilt:hilt-work:1.0.0'
 	kapt 'androidx.hilt:hilt-compiler:1.0.0'

@@ -154,6 +154,6 @@ dependencies {
 	androidTestImplementation 'androidx.room:room-testing:2.5.0'
 	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.14.0'

-	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.44.2'
-	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.44.2'
+	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.45'
+	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.45'
 }
--- a/app/src/main/java/org/koitharu/kotatsu/core/AppModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/AppModule.kt
@@ -96,6 +96,9 @@ interface AppModule {
 				writeTimeout(20, TimeUnit.SECONDS)
 				cookieJar(cookieJar)
 				dns(DoHManager(cache, settings))
+				if (settings.isSSLBypassEnabled) {
+					bypassSSLErrors()
+				}
 				cache(cache)
 				addInterceptor(GZipInterceptor())
 				addInterceptor(commonHeadersInterceptor)
--- a/app/src/main/java/org/koitharu/kotatsu/core/network/SSLBypass.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/network/SSLBypass.kt
@@ -0,0 +1,30 @@
+package org.koitharu.kotatsu.core.network
+
+import android.annotation.SuppressLint
+import okhttp3.OkHttpClient
+import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
+import java.security.SecureRandom
+import java.security.cert.X509Certificate
+import javax.net.ssl.SSLContext
+import javax.net.ssl.SSLSocketFactory
+import javax.net.ssl.X509TrustManager
+
+@SuppressLint("CustomX509TrustManager")
+fun OkHttpClient.Builder.bypassSSLErrors() = also { builder ->
+	runCatching {
+		val trustAllCerts = object : X509TrustManager {
+			override fun checkClientTrusted(chain: Array<X509Certificate>, authType: String) = Unit
+
+			override fun checkServerTrusted(chain: Array<X509Certificate>, authType: String) = Unit
+
+			override fun getAcceptedIssuers(): Array<X509Certificate> = emptyArray()
+		}
+		val sslContext = SSLContext.getInstance("SSL")
+		sslContext.init(null, arrayOf(trustAllCerts), SecureRandom())
+		val sslSocketFactory: SSLSocketFactory = sslContext.socketFactory
+		builder.sslSocketFactory(sslSocketFactory, trustAllCerts)
+		builder.hostnameVerifier { _, _ -> true }
+	}.onFailure {
+		it.printStackTraceDebug()
+	}
+}
--- a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
@@ -255,6 +255,9 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val dnsOverHttps: DoHProvider
 		get() = prefs.getEnumValue(KEY_DOH, DoHProvider.NONE)

+	val isSSLBypassEnabled: Boolean
+		get() = prefs.getBoolean(KEY_SSL_BYPASS, false)
+
 	var localListOrder: SortOrder
 		get() = prefs.getEnumValue(KEY_LOCAL_LIST_ORDER, SortOrder.NEWEST)
 		set(value) = prefs.edit { putEnumValue(KEY_LOCAL_LIST_ORDER, value) }
@@ -393,6 +396,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_SOURCES_GRID = "sources_grid"
 		const val KEY_UPDATES_UNSTABLE = "updates_unstable"
 		const val KEY_TIPS_CLOSED = "tips_closed"
+		const val KEY_SSL_BYPASS = "ssl_bypass"

 		// About
 		const val KEY_APP_UPDATE = "app_update"
--- a/app/src/main/java/org/koitharu/kotatsu/core/prefs/SourceSettings.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/prefs/SourceSettings.kt
@@ -23,6 +23,7 @@ class SourceSettings(context: Context, source: MangaSource) : MangaSourceConfig
 	@Suppress("UNCHECKED_CAST")
 	override fun <T> get(key: ConfigKey<T>): T {
 		return when (key) {
+			is ConfigKey.UserAgent -> prefs.getString(key.key, key.defaultValue).ifNullOrEmpty { key.defaultValue }
 			is ConfigKey.Domain -> prefs.getString(key.key, key.defaultValue).ifNullOrEmpty { key.defaultValue }
 			is ConfigKey.ShowSuspiciousContent -> prefs.getBoolean(key.key, key.defaultValue)
 		} as T
--- a/app/src/main/java/org/koitharu/kotatsu/settings/ContentSettingsFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/ContentSettingsFragment.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.view.View
 import androidx.preference.ListPreference
 import androidx.preference.Preference
+import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
 import org.koitharu.kotatsu.R
@@ -85,6 +86,10 @@ class ContentSettingsFragment :
 			AppSettings.KEY_SOURCES_HIDDEN -> {
 				bindRemoteSourcesSummary()
 			}
+
+			AppSettings.KEY_SSL_BYPASS -> {
+				Snackbar.make(listView, R.string.settings_apply_restart_required, Snackbar.LENGTH_INDEFINITE).show()
+			}
 		}
 	}

--- a/app/src/main/java/org/koitharu/kotatsu/settings/SourceSettingsExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/SourceSettingsExt.kt
@@ -37,6 +37,21 @@ fun PreferenceFragmentCompat.addPreferencesFromRepository(repository: RemoteMang
 				}
 			}

+			is ConfigKey.UserAgent -> {
+				EditTextPreference(requireContext()).apply {
+					summaryProvider = EditTextDefaultSummaryProvider(key.defaultValue)
+					setOnBindEditTextListener(
+						EditTextBindListener(
+							inputType = EditorInfo.TYPE_CLASS_TEXT,
+							hint = key.defaultValue,
+							validator = null,
+						),
+					)
+					setTitle(R.string.user_agent)
+					setDialogTitle(R.string.user_agent)
+				}
+			}
+
 			is ConfigKey.ShowSuspiciousContent -> {
 				SwitchPreferenceCompat(requireContext()).apply {
 					setDefaultValue(key.defaultValue)
--- a/app/src/main/java/org/koitharu/kotatsu/settings/utils/ThemeChooserPreference.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/utils/ThemeChooserPreference.kt
@@ -19,6 +19,7 @@ import androidx.preference.PreferenceViewHolder
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.prefs.ColorScheme
 import org.koitharu.kotatsu.databinding.ItemColorSchemeBinding
+import java.lang.ref.WeakReference

 class ThemeChooserPreference @JvmOverloads constructor(
 	context: Context,
@@ -68,7 +69,7 @@ class ThemeChooserPreference @JvmOverloads constructor(
 		}
 		scrollView.viewTreeObserver.run {
 			scrollPersistListener?.let { removeOnScrollChangedListener(it) }
-			scrollPersistListener = ScrollPersistListener(scrollView, lastScrollPosition)
+			scrollPersistListener = ScrollPersistListener(WeakReference(scrollView), lastScrollPosition)
 			addOnScrollChangedListener(scrollPersistListener)
 		}
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
@@ -106,7 +107,6 @@ class ThemeChooserPreference @JvmOverloads constructor(
 		}
 		super.onRestoreInstanceState(state.superState)
 		lastScrollPosition[0] = state.scrollPosition
-		// notifyChanged()
 	}

 	private fun setValueInternal(enumName: String, notifyChanged: Boolean) {
@@ -152,11 +152,12 @@ class ThemeChooserPreference @JvmOverloads constructor(
 	}

 	private class ScrollPersistListener(
-		private val scrollView: HorizontalScrollView,
+		private val scrollViewRef: WeakReference<HorizontalScrollView>,
 		private val lastScrollPosition: IntArray,
 	) : ViewTreeObserver.OnScrollChangedListener {

 		override fun onScrollChanged() {
+			val scrollView = scrollViewRef.get() ?: return
 			lastScrollPosition[0] = scrollView.scrollX
 		}
 	}
--- a/app/src/main/res/values-fil/plurals.xml
+++ b/app/src/main/res/values-fil/plurals.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <plurals name="items">
-        <item quantity="one">%1$d (na) aytem</item>
-        <item quantity="other">%1$d (na mga) aytem</item>
+        <item quantity="one">%1$d aytem</item>
+        <item quantity="other">%1$d (na) aytem</item>
    </plurals>
    <plurals name="pages">
-        <item quantity="one">Kabuuang %1$d (na) pahina</item>
-        <item quantity="other">Kabuuang %1$d (na) mga pahina</item>
+        <item quantity="one">"Kabuuang %1$d  pahina"</item>
+        <item quantity="other">Kabuuang %1$d (na) pahina</item>
    </plurals>
    <plurals name="minutes_ago">
        <item quantity="one">%1$d minutong nakakalipas</item>
@@ -14,15 +14,15 @@
    </plurals>
    <plurals name="new_chapters">
        <item quantity="one">%1$d bagong kabanata</item>
-        <item quantity="other">%1$d bagong (mga) kabanata</item>
+        <item quantity="other">%1$d mga bagong kabanata</item>
    </plurals>
    <plurals name="chapters">
-        <item quantity="one">%1$d (na) kabanata</item>
-        <item quantity="other">%1$d (na mga) kabanata</item>
+        <item quantity="one">"%1$d  kabanata"</item>
+        <item quantity="other">%1$d (na) kabanata</item>
    </plurals>
    <plurals name="chapters_from_x">
-        <item quantity="one">%1$d (na) kabanata mula sa %2$d</item>
-        <item quantity="other">%1$d (na) mga kabanata mula sa %2$d</item>
+        <item quantity="one">%1$d kabanata mula sa %2$d</item>
+        <item quantity="other">%1$d (na) kabanata mula sa %2$d</item>
    </plurals>
    <plurals name="hours_ago">
        <item quantity="one">%1$d oras ang nakalipas</item>
--- a/app/src/main/res/values-fil/strings.xml
+++ b/app/src/main/res/values-fil/strings.xml
@@ -8,7 +8,7 @@
    <string name="theme">Tema</string>
    <string name="dark">Madilim</string>
    <string name="automatic">Sundan ang sistema</string>
-    <string name="error_occurred">May naganap na error</string>
+    <string name="error_occurred">May nangyaring error</string>
    <string name="network_error">Error sa network</string>
    <string name="details">Mga detalye</string>
    <string name="chapters">Mga kabanata</string>
@@ -49,8 +49,8 @@
    <string name="text_search_holder_secondary">Subukang i-reformulate ang query.</string>
    <string name="text_history_holder_primary">Ang iyong nabasa ay ipapakita dito</string>
    <string name="text_shelf_holder_primary">Ang iyong manga ay ipapakita dito</string>
-    <string name="text_local_holder_primary">Mag-save muna</string>
-    <string name="text_local_holder_secondary">I save ito mula sa mga online na mapagkukunan o mag import ng mga file.</string>
+    <string name="text_local_holder_primary">Mag-save muna ng isang bagay</string>
+    <string name="text_local_holder_secondary">I-save ito mula sa mga online na source o mag import ng mga file.</string>
    <string name="manga_shelf">Istante</string>
    <string name="pages_animation">Animasyon ng pahina</string>
    <string name="not_available">Hindi magagamit</string>
@@ -137,7 +137,7 @@
    <string name="detailed_list">Detalyadong listahan</string>
    <string name="grid">Grid</string>
    <string name="settings">Mga setting</string>
-    <string name="remote_sources">Mga remote na mapagkukunan</string>
+    <string name="remote_sources">Mga remote na source</string>
    <string name="loading_">Naglo-load…</string>
    <string name="close">Isara</string>
    <string name="nothing_found">Walang nahanap</string>
@@ -169,7 +169,7 @@
    <string name="clear_cookies">I-clear ang mga cookie</string>
    <string name="clear_pages_cache">I-clear ang page cache</string>
    <string name="save_manga">I-save</string>
-    <string name="show_notification_app_update">Ipakita ang notification kung may available na bagong bersyon</string>
+    <string name="show_notification_app_update">Ipakita ang abiso kung may available na bagong bersyon</string>
    <string name="download">I-download</string>
    <string name="notifications_settings">Mga setting ng abiso</string>
    <string name="notification_sound">Tunog ng abiso</string>
@@ -214,7 +214,7 @@
    <string name="tracker_warning">Ang ilang device ay may iba\'t ibang gawi ng system, na maaaring masira ang mga gawain sa background.</string>
    <string name="queued">Nakapila na</string>
    <string name="chapter_is_missing_text">I-download o basahin ang nawawalang kabanata online.</string>
-    <string name="text_clear_cookies_prompt">Mala-log out ka mula sa lahat ng mapagkukunan</string>
+    <string name="text_clear_cookies_prompt">Mala-log out ka mula sa lahat ng source</string>
    <string name="state_finished">Tapos na</string>
    <string name="text_clear_search_history_prompt">Alisin ang lahat ng kamakailang query sa paghahanap nang permanente\?</string>
    <string name="about_app_translation">Pagsasalin</string>
@@ -237,7 +237,175 @@
    <string name="computing_">Nagco-compute…</string>
    <string name="chapter_d_of_d">Kabanata %1$d ng %2$d</string>
    <string name="try_again">Subukan ulit</string>
-    <string name="sort_order">Pagkakasunud-sunod ng pag-uuri</string>
+    <string name="sort_order">Pag-aayos ng order</string>
    <string name="clear">I-clear</string>
    <string name="_s_removed_from_history">Natanggal ang \"%s\" sa kasaysayan</string>
+    <string name="taps_on_edges">Mga taps ng gilid</string>
+    <string name="enabled_sources">Mga ginamit na source</string>
+    <string name="available_sources">Magagamit na mga source</string>
+    <string name="always">Lagi na lang</string>
+    <string name="preload_pages">I-preload ang mga pahina</string>
+    <string name="logged_in_as">Naka-log in bilang %s</string>
+    <string name="various_languages">Iba\'t ibang wika</string>
+    <string name="search_chapters">Maghanap ng kabanata</string>
+    <string name="percent_string_pattern">%1$s%%</string>
+    <string name="appearance">Hitsura</string>
+    <string name="suggestions_excluded_genres">Hindi isali ang mga genre</string>
+    <string name="suggestions_excluded_genres_summary">Tukuyin ang mga genre na hindi mo nais na makita sa mga mungkahi</string>
+    <string name="removal_completed">Nakumpleto na ang pagtanggal</string>
+    <string name="download_slowdown_summary">Tumutulong na maiwasan ang pag-block ng iyong IP address</string>
+    <string name="local_manga_processing">Naka-save na pagproseso ng manga</string>
+    <string name="account_already_exists">Mayroon nang account</string>
+    <string name="back">Bumalik</string>
+    <string name="sync">Pag-synchronize</string>
+    <string name="email_enter_hint">Ilagay ang iyong email upang magpatuloy</string>
+    <string name="hide">Itago</string>
+    <string name="new_sources_text">May mga bagong source ng manga</string>
+    <string name="show_notification_new_chapters_off">Hindi ka makakatanggap ng mga abiso ngunit ang mga bagong kabanata ay iha-highlight sa mga listahan</string>
+    <string name="notifications_enable">Paganahin ang mga abiso</string>
+    <string name="edit_category">Ayusin ang kategorya</string>
+    <string name="tracking">Tina-track</string>
+    <string name="empty_favourite_categories">Walang mga paboritong kategorya</string>
+    <string name="logout">Mag-log out</string>
+    <string name="bookmark_add">Magdagdag ng bookmark</string>
+    <string name="bookmark_removed">Tinanggal ang bookmark</string>
+    <string name="removed_from_history">Inalis sa kasaysayan</string>
+    <string name="dns_over_https">DNS sa HTTPS</string>
+    <string name="default_mode">Default na mode</string>
+    <string name="detect_reader_mode">Automatikong matukoy ang reader mode</string>
+    <string name="crash_text">May nangyaring mali. Mangyaring magsumite ng isang bug report sa mga developer upang matulungan kaming ayusin ito.</string>
+    <string name="send">Ipadala</string>
+    <string name="status_re_reading">Muling pagbabasa</string>
+    <string name="status_dropped">Binitawan</string>
+    <string name="appwidget_shelf_description">Manga mula sa iyong mga paborito</string>
+    <string name="appwidget_recent_description">Ang iyong kamakailang nabasa na manga</string>
+    <string name="data_deletion">Pagtanggal ng data</string>
+    <string name="show_reading_indicators_summary">Ipakita ang porsyento na nabasa sa kasaysayan at mga paborito</string>
+    <string name="show_all">Ipakita lahat</string>
+    <string name="select_range">Pumili ng saklaw</string>
+    <string name="clear_all_history">I-clear ang lahat ng kasaysayan</string>
+    <string name="no_bookmarks_summary">Maaari kang lumikha ng bookmark habang nagbabasa ng manga</string>
+    <string name="bookmarks_removed">Tinanggal ang mga bookmark</string>
+    <string name="random">Random</string>
+    <string name="no_manga_sources">Walang mga source ng manga</string>
+    <string name="no_manga_sources_text">Paganahin ang mga source ng manga upang basahin ang manga online</string>
+    <string name="reorder">Ayusin muli</string>
+    <string name="empty">Walang laman</string>
+    <string name="changelog">Changelog</string>
+    <string name="confirm_exit">Pindutin muli ang Bumalik upang lumabas</string>
+    <string name="exit_confirmation_summary">Pindutin ang Bumalik nang dalawang beses upang lumabas sa app</string>
+    <string name="exit_confirmation">Pagkumpirma ng paglabas</string>
+    <string name="saved_manga">Na-save na manga</string>
+    <string name="explore">Mag-Explore</string>
+    <string name="other_cache">Iba pang cache</string>
+    <string name="storage_usage">Paggamit ng storage</string>
+    <string name="available">Magagamit na</string>
+    <string name="memory_usage_pattern">%s - %s</string>
+    <string name="removed_from_favourites">Inalis sa mga paborito</string>
+    <string name="removed_from_s">Inalis mula sa \"%s\"</string>
+    <string name="options">Mga pagpipilian</string>
+    <string name="downloading_manga">Nagda-download ng manga</string>
+    <string name="incognito_mode">Incognito mode</string>
+    <string name="app_update_available_s">Magagamit ang pag update ng application: %s</string>
+    <string name="no_chapters">Walang mga kabanata</string>
+    <string name="automatic_scroll">Awtomatikong pag-scroll</string>
+    <string name="reader_info_pattern">Ch. %1$d/%2$d Pg. %3$d/%4$d</string>
+    <string name="reader_info_bar">Ipakita ang information bar sa pagbasa</string>
+    <string name="comics_archive">Archive ng mga comics</string>
+    <string name="folder_with_images">Folder na may mga larawan</string>
+    <string name="import_completed">Nakumpleto na ang pag-import</string>
+    <string name="import_will_start_soon">Magsisimula na ang pag-import</string>
+    <string name="feed">Feed</string>
+    <string name="history_shortcuts_summary">Gawing magagamit ang kamakailang manga sa pamamagitan ng mahabang pagpindot sa icon ng application</string>
+    <string name="history_shortcuts">Ipakita ang mga kamakailang manga shortcut</string>
+    <string name="reader_control_ltr">Ergonomic na kontrol sa mambabasa</string>
+    <string name="color_correction">Pagwawasto ng kulay</string>
+    <string name="brightness">Liwanag</string>
+    <string name="contrast">Kaibahan</string>
+    <string name="text_unsaved_changes_prompt">I-save o kalimutan ang mga hindi na-save na pagbabago\?</string>
+    <string name="discard">Kalimutan</string>
+    <string name="error_no_space_left">Walang natitirang espasyo sa device</string>
+    <string name="webtoon_zoom">Pag-zoom sa webtoon</string>
+    <string name="different_languages">Iba\'t ibang wika</string>
+    <string name="server_error">Server side error (%1$d). Subukang muli mamaya</string>
+    <string name="clear_new_chapters_counters">I-clear din ang impormasyon tungkol sa mga bagong kabanata</string>
+    <string name="prefetch_content">Preloading ng nilalaman</string>
+    <string name="mark_as_current">Markahan bilang kasalukuyan</string>
+    <string name="language">Wika</string>
+    <string name="share_logs">Ibahagi ang mga log</string>
+    <string name="show_suspicious_content">Magpakita ng kahina-hinalang nilalaman</string>
+    <string name="theme_name_dynamic">Dynamic</string>
+    <string name="show_in_grid_view">Ipakita sa grid view</string>
+    <string name="theme_name_asuka">Asuka</string>
+    <string name="theme_name_mion">Mion</string>
+    <string name="theme_name_rikka">Rikka</string>
+    <string name="theme_name_sakura">Sakura</string>
+    <string name="theme_name_mamimi">Mamimi</string>
+    <string name="theme_name_kanade">Kanade</string>
+    <string name="nothing_here">Wala naman dito</string>
+    <string name="services">Mga serbisyo</string>
+    <string name="allow_unstable_updates">Payagan ang mga hindi stable na update</string>
+    <string name="show_reading_indicators">Ipakita ang mga tagapagpahiwatig ng progress ng pagbabasa</string>
+    <string name="exclude_nsfw_from_history_summary">Manga na minarkahan bilang NSFW ay hindi kailanman idadagdag sa kasaysayan at ang iyong progress ay hindi mase-save</string>
+    <string name="clear_cookies_summary">Maaaring makatulong sa kaso ng ilang mga isyu. Ang lahat ng pahintulot ay mawawalan ng bisa</string>
+    <string name="invalid_domain_message">Imbalidong domain</string>
+    <string name="last_2_hours">Huling 2 oras</string>
+    <string name="history_cleared">Nabura ang kasaysayan</string>
+    <string name="manage">Pamahalaan</string>
+    <string name="no_bookmarks_yet">Wala pang bookmark</string>
+    <string name="nsfw">18+</string>
+    <string name="not_found_404">Hindi natagpuan o inalis ang nilalaman</string>
+    <string name="enable_logging_summary">Magtala ng ilang pagkilos para sa mga layunin ng pag-debug</string>
+    <string name="text_delete_local_manga_batch">Permanenteng tanggalin ang mga napiling item sa device\?</string>
+    <string name="chapters_empty">Walang mga kabanata sa manga na ito</string>
+    <string name="suggestions_updating">Nag-a-update ang mga mungkahi</string>
+    <string name="content">Nilalaman</string>
+    <string name="batch_manga_save_confirm">I-download ang lahat ng napiling manga at ang mga kabanata nito\? Maaari itong kumonsumo ng maraming trapiko at storage.</string>
+    <string name="parallel_downloads">Mga parallel na pag-download</string>
+    <string name="download_slowdown">Pagbagal ng pag-download</string>
+    <string name="chapters_will_removed_background">Tatanggalin ang mga chapters sa background. Maaari itong tumagal ng ilang oras</string>
+    <string name="canceled">Kinansela</string>
+    <string name="sync_title">I-sync ang iyong data</string>
+    <string name="check_new_chapters_title">Tingnan ang mga bagong kabanata at ipaalam ang tungkol dito</string>
+    <string name="name">Pangalan</string>
+    <string name="edit">I-edit</string>
+    <string name="bookmark_remove">Tanggalin ang bookmark</string>
+    <string name="show_notification_new_chapters_on">Makakatanggap ka ng mga abiso tungkol sa mga update ng manga na iyong binabasa</string>
+    <string name="undo">Mag-undo</string>
+    <string name="status_reading">Nagbabasa</string>
+    <string name="pages_cache">Cache ng mga pahina</string>
+    <string name="bookmarks">Mga bookmark</string>
+    <string name="categories_delete_confirm">Sigurado ka bang gusto mong tanggalin ang mga napiling paboritong kategorya\?
+\nAng lahat ng manga sa loob nito ay mawawala at hindi na ito mababawi.</string>
+    <string name="bookmark_added">Idinagdag ang bookmark</string>
+    <string name="detect_reader_mode_summary">Awtomatikong matukoy kung ang manga ay webtoon</string>
+    <string name="disable_battery_optimization">Huwag paganahin ang pag-optimize ng baterya</string>
+    <string name="disable_battery_optimization_summary">Tumutulong sa mga pagsusuri sa mga update sa background</string>
+    <string name="status_planned">Nakaplano</string>
+    <string name="status_completed">Nakumpleto na</string>
+    <string name="status_on_hold">Naka-hold</string>
+    <string name="disable_all">Huwag paganahin ang lahat</string>
+    <string name="use_fingerprint">Gumamit ng fingerprint kung magagamit</string>
+    <string name="report">Ulat</string>
+    <string name="enter_email_text">Ilagay ang iyong email upang magpatuloy</string>
+    <string name="reset">I-reset</string>
+    <string name="allow_unstable_updates_summary">Magmungkahi ng mga update sa mga beta na bersyon ng app</string>
+    <string name="network_unavailable">Hindi magagamit ang network</string>
+    <string name="network_unavailable_hint">I-on ang Wi-Fi o mobile network para magbasa ng manga online</string>
+    <string name="off_short">Naka-off</string>
+    <string name="seconds_pattern">%ss</string>
+    <string name="reader_control_ltr_summary">Mag-tap sa kanang gilid o ang pagpindot sa kanang key ay palaging lilipat sa susunod na pahina</string>
+    <string name="reader_slider">Ipakita ang slider ng paglipat ng pahina</string>
+    <string name="manga_error_description_pattern">Mga detalye ng error:&lt;br&gt;&lt;tt&gt;%1$s&lt;/tt&gt;&lt;br&gt;&lt;br&gt;1. Subukang &lt;a href=%2$s&gt;buksan ang manga sa isang web browser&lt;/a&gt; upang matiyak na magagamit ito sa source&lt;br&gt;nito 2. Kung magagamit ito, magpadala ng isang ulat ng error sa mga developer.</string>
+    <string name="enable_logging">Paganahin ang pag-log</string>
+    <string name="source_disabled">Hindi pinagana ang source</string>
+    <string name="importing_manga">Pag-import ng manga</string>
+    <string name="import_completed_hint">Maaari mong tanggalin ang orihinal na file mula sa storage upang makatipid ng espasyo</string>
+    <string name="color_correction_hint">Ang napiling mga setting ng kulay ay matatandaan para sa manga na ito</string>
+    <string name="webtoon_zoom_summary">Payagan ang pag-zoom in/zoom out na galaw sa webtoon mode (beta)</string>
+    <string name="compact">Compact</string>
+    <string name="scrobbling_empty_hint">Upang subaybayan ang pag unlad ng pagbabasa, piliin ang Menu → Track sa screen ng mga detalye ng manga.</string>
+    <string name="download_started">Nagsimula na ang pag-download</string>
+    <string name="color_theme">Scheme ng kulay</string>
+    <string name="theme_name_miku">Miku</string>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -426,4 +426,6 @@
 	<string name="download_started">Download started</string>
 	<string name="got_it">Got it</string>
 	<string name="sources_reorder_tip">Tap and hold on an item to reorder them</string>
+	<string name="user_agent">UserAgent header</string>
+	<string name="settings_apply_restart_required">Please restart the application to apply these changes</string>
 </resources>
--- a/app/src/main/res/xml/pref_content.xml
+++ b/app/src/main/res/xml/pref_content.xml
@@ -20,12 +20,6 @@
 		android:title="@string/suggestions"
 		app:allowDividerAbove="true" />

-	<ListPreference
-		android:entries="@array/doh_providers"
-		android:key="doh"
-		android:title="@string/dns_over_https"
-		app:useSimpleSummaryProvider="true" />
-
 	<ListPreference
 		android:defaultValue="0"
 		android:entries="@array/network_policy"
@@ -56,6 +50,17 @@
 		android:valueTo="5"
 		app:defaultValue="2" />

+	<ListPreference
+		android:entries="@array/doh_providers"
+		android:key="doh"
+		android:title="@string/dns_over_https"
+		app:allowDividerAbove="true"
+		app:useSimpleSummaryProvider="true" />
+
+	<SwitchPreferenceCompat
+		android:key="ssl_bypass"
+		android:title="Ignore SSL errors" />
+
 	<PreferenceScreen
 		android:fragment="org.koitharu.kotatsu.settings.backup.BackupSettingsFragment"
 		android:title="@string/backup_restore"
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 	dependencies {
 		classpath 'com.android.tools.build:gradle:7.4.1'
 		classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10'
-		classpath 'com.google.dagger:hilt-android-gradle-plugin:2.44.2'
+		classpath 'com.google.dagger:hilt-android-gradle-plugin:2.45'
 	}
 }

--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
-#Fri Jan 20 14:35:39 EET 2023
+#Sat Feb 25 17:16:02 EET 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionSha256Sum=6147605a23b4eff6c334927a86ff3508cb5d6722cd624c97ded4c2e8640f1f87
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists