From e267352b1336ec157c70b91c3dac2f4bb07e107a Mon Sep 17 00:00:00 2001 From: Eugene Cheung Date: Fri, 24 May 2019 23:03:28 -0400 Subject: [PATCH] Revert module changes (closes #1129) --- .../lib/urlhandler/UrlHandlerActivity.kt | 37 ------------------- lib/{extension-lib => ratelimit}/build.gradle | 2 +- .../src/main/AndroidManifest.xml | 2 +- .../lib/ratelimit/RateLimitInterceptor.kt | 0 settings.gradle | 4 +- src/all/mangadex/build.gradle | 4 +- .../all/mangadex/MangadexUrlActivity.kt | 33 ++++++++++++++--- src/all/nhentai/build.gradle | 6 +-- .../extension/all/nhentai/NHUrlActivity.kt | 33 ++++++++++++++--- src/ru/mintmanga/build.gradle | 4 +- src/ru/readmanga/build.gradle | 4 +- 11 files changed, 66 insertions(+), 63 deletions(-) delete mode 100644 lib/extension-lib/src/main/java/eu/kanade/tachiyomi/lib/urlhandler/UrlHandlerActivity.kt rename lib/{extension-lib => ratelimit}/build.gradle (86%) rename lib/{extension-lib => ratelimit}/src/main/AndroidManifest.xml (62%) rename lib/{extension-lib => ratelimit}/src/main/java/eu/kanade/tachiyomi/lib/ratelimit/RateLimitInterceptor.kt (100%) diff --git a/lib/extension-lib/src/main/java/eu/kanade/tachiyomi/lib/urlhandler/UrlHandlerActivity.kt b/lib/extension-lib/src/main/java/eu/kanade/tachiyomi/lib/urlhandler/UrlHandlerActivity.kt deleted file mode 100644 index 8aba8d200..000000000 --- a/lib/extension-lib/src/main/java/eu/kanade/tachiyomi/lib/urlhandler/UrlHandlerActivity.kt +++ /dev/null @@ -1,37 +0,0 @@ -package eu.kanade.tachiyomi.lib.urlhandler - -import android.app.Activity -import android.content.ActivityNotFoundException -import android.content.Intent -import android.os.Bundle -import android.util.Log - -abstract class UrlHandlerActivity : Activity() { - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - val pathSegments = intent?.data?.pathSegments - if (pathSegments != null && pathSegments.size > 1) { - val query = getQueryFromPathSegments(pathSegments) - val mainIntent = Intent().apply { - action = "eu.kanade.tachiyomi.SEARCH" - putExtra("query", query) - putExtra("filter", packageName) - } - - try { - startActivity(mainIntent) - } catch (e: ActivityNotFoundException) { - Log.e(localClassName, e.toString()) - } - } else { - Log.e(localClassName, "Could not parse uri from intent: $intent") - } - - finish() - System.exit(0) - } - - abstract fun getQueryFromPathSegments(pathSegments: List): String - -} diff --git a/lib/extension-lib/build.gradle b/lib/ratelimit/build.gradle similarity index 86% rename from lib/extension-lib/build.gradle rename to lib/ratelimit/build.gradle index 3c9d9f797..814d8e947 100644 --- a/lib/extension-lib/build.gradle +++ b/lib/ratelimit/build.gradle @@ -24,6 +24,6 @@ repositories { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compileOnly 'com.squareup.okhttp3:okhttp:3.10.0' } diff --git a/lib/extension-lib/src/main/AndroidManifest.xml b/lib/ratelimit/src/main/AndroidManifest.xml similarity index 62% rename from lib/extension-lib/src/main/AndroidManifest.xml rename to lib/ratelimit/src/main/AndroidManifest.xml index 1e793b0dc..a08d6eaff 100644 --- a/lib/extension-lib/src/main/AndroidManifest.xml +++ b/lib/ratelimit/src/main/AndroidManifest.xml @@ -1,3 +1,3 @@ + package="eu.kanade.tachiyomi.lib.ratelimit"> diff --git a/lib/extension-lib/src/main/java/eu/kanade/tachiyomi/lib/ratelimit/RateLimitInterceptor.kt b/lib/ratelimit/src/main/java/eu/kanade/tachiyomi/lib/ratelimit/RateLimitInterceptor.kt similarity index 100% rename from lib/extension-lib/src/main/java/eu/kanade/tachiyomi/lib/ratelimit/RateLimitInterceptor.kt rename to lib/ratelimit/src/main/java/eu/kanade/tachiyomi/lib/ratelimit/RateLimitInterceptor.kt diff --git a/settings.gradle b/settings.gradle index e33667466..ae38f5c09 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,8 +6,8 @@ new File(rootDir, "src").eachDir { dir -> } } -include ':extension-lib' -project(':extension-lib').projectDir = new File("lib/extension-lib") +include ':lib-ratelimit' +project(':lib-ratelimit').projectDir = new File("lib/ratelimit") include ':duktape-stub' project(':duktape-stub').projectDir = new File("lib/duktape-stub") diff --git a/src/all/mangadex/build.gradle b/src/all/mangadex/build.gradle index 6c291d96c..50d775eb9 100644 --- a/src/all/mangadex/build.gradle +++ b/src/all/mangadex/build.gradle @@ -5,12 +5,12 @@ ext { appName = 'Tachiyomi: MangaDex' pkgNameSuffix = 'all.mangadex' extClass = '.MangadexFactory' - extVersionCode = 59 + extVersionCode = 60 libVersion = '1.2' } dependencies { - implementation project(':extension-lib') + implementation project(':lib-ratelimit') compileOnly project(':preference-stub') compileOnly 'com.google.code.gson:gson:2.8.2' compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0' diff --git a/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangadexUrlActivity.kt b/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangadexUrlActivity.kt index 3bd9ab741..cccbafb13 100644 --- a/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangadexUrlActivity.kt +++ b/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangadexUrlActivity.kt @@ -1,6 +1,10 @@ package eu.kanade.tachiyomi.extension.all.mangadex -import eu.kanade.tachiyomi.lib.urlhandler.UrlHandlerActivity +import android.app.Activity +import android.content.ActivityNotFoundException +import android.content.Intent +import android.os.Bundle +import android.util.Log /** * Springboard that accepts https://mangadex.com/title/xxx intents and redirects them to @@ -11,11 +15,30 @@ import eu.kanade.tachiyomi.lib.urlhandler.UrlHandlerActivity * Main goal was to make it easier to open manga in Tachiyomi in spite of the DDoS blocking * the usual search screen from working. */ -class MangadexUrlActivity : UrlHandlerActivity() { +class MangadexUrlActivity : Activity() { - override fun getQueryFromPathSegments(pathSegments: List): String { - val id = pathSegments[1] - return "${Mangadex.PREFIX_ID_SEARCH}$id" + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + val pathSegments = intent?.data?.pathSegments + if (pathSegments != null && pathSegments.size > 1) { + val titleid = pathSegments[1] + val mainIntent = Intent().apply { + action = "eu.kanade.tachiyomi.SEARCH" + putExtra("query", "${Mangadex.PREFIX_ID_SEARCH}$titleid") + putExtra("filter", packageName) + } + + try { + startActivity(mainIntent) + } catch (e: ActivityNotFoundException) { + Log.e("MangadexUrlActivity", e.toString()) + } + } else { + Log.e("MangadexUrlActivity", "could not parse uri from intent $intent") + } + + finish() + System.exit(0) } } diff --git a/src/all/nhentai/build.gradle b/src/all/nhentai/build.gradle index 9e80bd819..15a9e4412 100644 --- a/src/all/nhentai/build.gradle +++ b/src/all/nhentai/build.gradle @@ -5,12 +5,8 @@ ext { appName = 'Tachiyomi: NHentai' pkgNameSuffix = 'all.nhentai' extClass = '.NHEnglish; .NHJapanese; .NHChinese' - extVersionCode = 12 + extVersionCode = 13 libVersion = '1.2' } -dependencies { - implementation project(':extension-lib') -} - apply from: "$rootDir/common.gradle" diff --git a/src/all/nhentai/src/eu/kanade/tachiyomi/extension/all/nhentai/NHUrlActivity.kt b/src/all/nhentai/src/eu/kanade/tachiyomi/extension/all/nhentai/NHUrlActivity.kt index 63bcfebe4..9009e102f 100644 --- a/src/all/nhentai/src/eu/kanade/tachiyomi/extension/all/nhentai/NHUrlActivity.kt +++ b/src/all/nhentai/src/eu/kanade/tachiyomi/extension/all/nhentai/NHUrlActivity.kt @@ -1,16 +1,37 @@ package eu.kanade.tachiyomi.extension.all.nhentai -import eu.kanade.tachiyomi.lib.urlhandler.UrlHandlerActivity +import android.app.Activity +import android.content.ActivityNotFoundException +import android.content.Intent +import android.os.Bundle +import android.util.Log /** * Springboard that accepts https://nhentai.net/g/xxxxxx intents and redirects them to * the main Tachiyomi process. */ -class NHUrlActivity : UrlHandlerActivity() { +class NHUrlActivity : Activity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + val pathSegments = intent?.data?.pathSegments + if (pathSegments != null && pathSegments.size > 1) { + val id = pathSegments[1] + val mainIntent = Intent().apply { + action = "eu.kanade.tachiyomi.SEARCH" + putExtra("query", "${NHentai.PREFIX_ID_SEARCH}$id") + putExtra("filter", packageName) + } - override fun getQueryFromPathSegments(pathSegments: List): String { - val id = pathSegments[1] - return "${NHentai.PREFIX_ID_SEARCH}$id" + try { + startActivity(mainIntent) + } catch (e: ActivityNotFoundException) { + Log.e("NHUrlActivity", e.toString()) + } + } else { + Log.e("NHUrlActivity", "could not parse uri from intent $intent") + } + + finish() + System.exit(0) } - } diff --git a/src/ru/mintmanga/build.gradle b/src/ru/mintmanga/build.gradle index b262b033b..7a77440b6 100644 --- a/src/ru/mintmanga/build.gradle +++ b/src/ru/mintmanga/build.gradle @@ -5,12 +5,12 @@ ext { appName = 'Tachiyomi: Mintmanga' pkgNameSuffix = 'ru.mintmanga' extClass = '.Mintmanga' - extVersionCode = 11 + extVersionCode = 12 libVersion = '1.2' } dependencies { - implementation project(':extension-lib') + implementation project(':lib-ratelimit') } apply from: "$rootDir/common.gradle" diff --git a/src/ru/readmanga/build.gradle b/src/ru/readmanga/build.gradle index 0646cc0ec..599ee4239 100644 --- a/src/ru/readmanga/build.gradle +++ b/src/ru/readmanga/build.gradle @@ -5,12 +5,12 @@ ext { appName = 'Tachiyomi: Readmanga' pkgNameSuffix = 'ru.readmanga' extClass = '.Readmanga' - extVersionCode = 11 + extVersionCode = 12 libVersion = '1.2' } dependencies { - implementation project(':extension-lib') + implementation project(':lib-ratelimit') } apply from: "$rootDir/common.gradle"