From 9f164f1b58d99d9e6b43c8c1629c1f9984ffcd8c Mon Sep 17 00:00:00 2001 From: Vetle Ledaal Date: Fri, 7 Jun 2024 09:17:24 +0100 Subject: [PATCH] Mangalink: update domain (#3291) * Mangalink: update domain * force update baseUrl if changed in extension --- src/ar/mangalink/build.gradle | 4 ++-- .../extension/ar/mangalink/Mangalink.kt | 24 +++++++++++++------ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/ar/mangalink/build.gradle b/src/ar/mangalink/build.gradle index fe5f83c4b..b0f2dc013 100644 --- a/src/ar/mangalink/build.gradle +++ b/src/ar/mangalink/build.gradle @@ -2,8 +2,8 @@ ext { extName = 'Mangalink' extClass = '.Mangalink' themePkg = 'madara' - baseUrl = 'https://manga-link.com' - overrideVersionCode = 2 + baseUrl = 'https://link-manga.com' + overrideVersionCode = 3 } apply from: "$rootDir/common.gradle" diff --git a/src/ar/mangalink/src/eu/kanade/tachiyomi/extension/ar/mangalink/Mangalink.kt b/src/ar/mangalink/src/eu/kanade/tachiyomi/extension/ar/mangalink/Mangalink.kt index 2acea7ca3..fc0167c1b 100644 --- a/src/ar/mangalink/src/eu/kanade/tachiyomi/extension/ar/mangalink/Mangalink.kt +++ b/src/ar/mangalink/src/eu/kanade/tachiyomi/extension/ar/mangalink/Mangalink.kt @@ -4,7 +4,6 @@ import android.app.Application import android.content.SharedPreferences import android.widget.Toast import androidx.preference.PreferenceScreen -import eu.kanade.tachiyomi.extension.BuildConfig import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.source.ConfigurableSource import uy.kohesive.injekt.Injekt @@ -15,7 +14,7 @@ import java.util.Locale class Mangalink : Madara( "مانجا لينك", - "https://manga-link.com", + "https://link-manga.com", "ar", SimpleDateFormat("MMMM dd, yyyy", Locale("ar")), ), @@ -23,7 +22,6 @@ class Mangalink : override val chapterUrlSuffix = "" override val useLoadMoreRequest = LoadMoreStrategy.Always - private val defaultBaseUrl = "https://manga-link.com" override val baseUrl by lazy { getPrefBaseUrl() } private val preferences: SharedPreferences by lazy { @@ -33,7 +31,8 @@ class Mangalink : companion object { private const val RESTART_TACHIYOMI = ".لتطبيق الإعدادات الجديدة Tachiyomi أعد تشغيل" private const val BASE_URL_PREF_TITLE = "تعديل الرابط" - private const val BASE_URL_PREF = "overrideBaseUrl_v${BuildConfig.VERSION_CODE}" + private const val BASE_URL_PREF = "overrideBaseUrl" + private const val DEFAULT_BASE_URL_PREF = "defaultBaseUrl" private const val BASE_URL_PREF_SUMMARY = ".للاستخدام المؤقت. تحديث التطبيق سيؤدي الى حذف الإعدادات" } @@ -42,9 +41,9 @@ class Mangalink : key = BASE_URL_PREF title = BASE_URL_PREF_TITLE summary = BASE_URL_PREF_SUMMARY - this.setDefaultValue(defaultBaseUrl) + this.setDefaultValue(super.baseUrl) dialogTitle = BASE_URL_PREF_TITLE - dialogMessage = "Default: $defaultBaseUrl" + dialogMessage = "Default: ${super.baseUrl}" setOnPreferenceChangeListener { _, _ -> Toast.makeText(screen.context, RESTART_TACHIYOMI, Toast.LENGTH_LONG).show() @@ -53,5 +52,16 @@ class Mangalink : } screen.addPreference(baseUrlPref) } - private fun getPrefBaseUrl(): String = preferences.getString(BASE_URL_PREF, defaultBaseUrl)!! + private fun getPrefBaseUrl(): String = preferences.getString(BASE_URL_PREF, super.baseUrl)!! + + init { + preferences.getString(DEFAULT_BASE_URL_PREF, null).let { prefDefaultBaseUrl -> + if (prefDefaultBaseUrl != super.baseUrl) { + preferences.edit() + .putString(BASE_URL_PREF, super.baseUrl) + .putString(DEFAULT_BASE_URL_PREF, super.baseUrl) + .apply() + } + } + } }