From c9d3ae21fa9ddc3a107b3985be937412af58e436 Mon Sep 17 00:00:00 2001
From: Johannes Joens <34899572+jopejoe1@users.noreply.github.com>
Date: Thu, 10 Jun 2021 09:45:14 +1200
Subject: [PATCH] Added 2 fiels that i missed to commit in previous pr (#7570)
(#7582)
* Update MadaraGenerator.kt
* Added AndroidManifest.xml
* Added AndroidManifest.xml
---
.../madara/default/AndroidManifest.xml | 22 +++++++++
.../multisrc/madara/MadaraGenerator.kt | 4 +-
.../multisrc/madara/MadaraUrlActivity.kt | 45 +++++++++++++++++++
3 files changed, 68 insertions(+), 3 deletions(-)
create mode 100644 multisrc/overrides/madara/default/AndroidManifest.xml
create mode 100644 multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraUrlActivity.kt
diff --git a/multisrc/overrides/madara/default/AndroidManifest.xml b/multisrc/overrides/madara/default/AndroidManifest.xml
new file mode 100644
index 000000000..0fc9b70c0
--- /dev/null
+++ b/multisrc/overrides/madara/default/AndroidManifest.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt
index b81c2eb73..1ffd06507 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt
@@ -10,7 +10,7 @@ class MadaraGenerator : ThemeSourceGenerator {
override val themeClass = "Madara"
- override val baseVersionCode: Int = 6
+ override val baseVersionCode: Int = 7
override val sources = listOf(
MultiLang("Leviatan Scans", "https://leviatanscans.com", listOf("en", "es"), className = "LeviatanScansFactory", overrideVersionCode = 4),
@@ -26,8 +26,6 @@ class MadaraGenerator : ThemeSourceGenerator {
SingleLang("Agent of Change Translations", "https://aoc.moe", "en", overrideVersionCode = 1),
SingleLang("AkuManga", "https://akumanga.com", "ar"),
SingleLang("AllPornComic", "https://allporncomic.com", "en", isNsfw = true),
- SingleLang("Aloalivn", "https://aloalivn.com", "en", overrideVersionCode = 2),
- SingleLang("AniMangaEs", "https://animangaes.com", "en", overrideVersionCode = 1),
SingleLang("Anisa Manga", "https://anisamanga.com", "tr"),
SingleLang("ApollComics", "https://apollcomics.xyz", "es", overrideVersionCode = 1),
SingleLang("Arang Scans", "https://arangscans.com", "en", overrideVersionCode = 3), // removed override
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraUrlActivity.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraUrlActivity.kt
new file mode 100644
index 000000000..3de566730
--- /dev/null
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraUrlActivity.kt
@@ -0,0 +1,45 @@
+package eu.kanade.tachiyomi.multisrc.madara
+
+import android.app.Activity
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import android.os.Bundle
+import android.util.Log
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+import kotlin.system.exitProcess
+
+class MadaraUrlActivity: Activity() {
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ val pathSegments = intent?.data?.pathSegments
+
+ if (pathSegments != null && pathSegments.size >= 2) {
+
+
+ val mainIntent = Intent().apply {
+ action = "eu.kanade.tachiyomi.SEARCH"
+ putExtra("query","${getSLUG(pathSegments)}")
+ putExtra("filter", packageName)
+ }
+ try {
+ startActivity(mainIntent)
+ } catch (e: ActivityNotFoundException) {
+ Log.e("MadaraUrl", e.toString())
+ }
+ } else {
+ Log.e("MadaraUrl", "could not parse uri from intent $intent")
+ }
+
+ finish()
+ exitProcess(0)
+ }
+
+ private fun getSLUG(pathSegments: MutableList): String? {
+ return if (pathSegments.size >= 2) {
+ val slug = pathSegments[1]
+ "${Madara.URL_SEARCH_PREFIX}$slug"
+ } else {
+ null
+ }
+ }
+}