From 9dc66c7c8d6280afecc01e64ca24a3899a36105e Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Fri, 4 Aug 2023 10:35:47 -0400
Subject: [PATCH] Combine tracking OAuth login activities

---
 app/src/main/AndroidManifest.xml              | 59 +++-------------
 .../ui/setting/track/AnilistLoginActivity.kt  | 22 ------
 .../ui/setting/track/BangumiLoginActivity.kt  | 21 ------
 .../setting/track/MyAnimeListLoginActivity.kt | 21 ------
 .../setting/track/ShikimoriLoginActivity.kt   | 21 ------
 .../ui/setting/track/TrackLoginActivity.kt    | 70 +++++++++++++++++++
 i18n/src/main/res/values/strings.xml          |  1 +
 7 files changed, 80 insertions(+), 135 deletions(-)
 delete mode 100644 app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/AnilistLoginActivity.kt
 delete mode 100644 app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/BangumiLoginActivity.kt
 delete mode 100644 app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/MyAnimeListLoginActivity.kt
 delete mode 100644 app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/ShikimoriLoginActivity.kt
 create mode 100644 app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/TrackLoginActivity.kt

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5eefefd44..3e3eca0b8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -124,8 +124,8 @@
             android:exported="false" />
 
         <activity
-            android:name=".ui.setting.track.AnilistLoginActivity"
-            android:label="Anilist"
+            android:name=".ui.setting.track.TrackLoginActivity"
+            android:label="@string/track_activity_name"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -133,54 +133,12 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data
-                    android:host="anilist-auth"
-                    android:scheme="tachiyomi" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name=".ui.setting.track.MyAnimeListLoginActivity"
-            android:label="MyAnimeList"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
+                <data android:host="anilist-auth"/>
+                <data android:host="bangumi-auth"/>
+                <data android:host="myanimelist-auth"/>
+                <data android:host="shikimori-auth"/>
 
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="myanimelist-auth"
-                    android:scheme="tachiyomi" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name=".ui.setting.track.ShikimoriLoginActivity"
-            android:label="Shikimori"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="shikimori-auth"
-                    android:scheme="tachiyomi" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name=".ui.setting.track.BangumiLoginActivity"
-            android:label="Bangumi"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="bangumi-auth"
-                    android:scheme="tachiyomi" />
+                <data android:scheme="tachiyomi"/>
             </intent-filter>
         </activity>
 
@@ -210,7 +168,8 @@
             android:name=".data.updater.AppUpdateService"
             android:exported="false" />
 
-        <service android:name=".extension.util.ExtensionInstallService"
+        <service
+            android:name=".extension.util.ExtensionInstallService"
             android:exported="false" />
 
         <service
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/AnilistLoginActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/AnilistLoginActivity.kt
deleted file mode 100644
index 001fd265d..000000000
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/AnilistLoginActivity.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package eu.kanade.tachiyomi.ui.setting.track
-
-import android.net.Uri
-import androidx.lifecycle.lifecycleScope
-import tachiyomi.core.util.lang.launchIO
-
-class AnilistLoginActivity : BaseOAuthLoginActivity() {
-
-    override fun handleResult(data: Uri?) {
-        val regex = "(?:access_token=)(.*?)(?:&)".toRegex()
-        val matchResult = regex.find(data?.fragment.toString())
-        if (matchResult?.groups?.get(1) != null) {
-            lifecycleScope.launchIO {
-                trackManager.aniList.login(matchResult.groups[1]!!.value)
-                returnToSettings()
-            }
-        } else {
-            trackManager.aniList.logout()
-            returnToSettings()
-        }
-    }
-}
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/BangumiLoginActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/BangumiLoginActivity.kt
deleted file mode 100644
index b1bea5d7a..000000000
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/BangumiLoginActivity.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package eu.kanade.tachiyomi.ui.setting.track
-
-import android.net.Uri
-import androidx.lifecycle.lifecycleScope
-import tachiyomi.core.util.lang.launchIO
-
-class BangumiLoginActivity : BaseOAuthLoginActivity() {
-
-    override fun handleResult(data: Uri?) {
-        val code = data?.getQueryParameter("code")
-        if (code != null) {
-            lifecycleScope.launchIO {
-                trackManager.bangumi.login(code)
-                returnToSettings()
-            }
-        } else {
-            trackManager.bangumi.logout()
-            returnToSettings()
-        }
-    }
-}
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/MyAnimeListLoginActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/MyAnimeListLoginActivity.kt
deleted file mode 100644
index 8b33a8fab..000000000
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/MyAnimeListLoginActivity.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package eu.kanade.tachiyomi.ui.setting.track
-
-import android.net.Uri
-import androidx.lifecycle.lifecycleScope
-import tachiyomi.core.util.lang.launchIO
-
-class MyAnimeListLoginActivity : BaseOAuthLoginActivity() {
-
-    override fun handleResult(data: Uri?) {
-        val code = data?.getQueryParameter("code")
-        if (code != null) {
-            lifecycleScope.launchIO {
-                trackManager.myAnimeList.login(code)
-                returnToSettings()
-            }
-        } else {
-            trackManager.myAnimeList.logout()
-            returnToSettings()
-        }
-    }
-}
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/ShikimoriLoginActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/ShikimoriLoginActivity.kt
deleted file mode 100644
index a5884bbc6..000000000
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/ShikimoriLoginActivity.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package eu.kanade.tachiyomi.ui.setting.track
-
-import android.net.Uri
-import androidx.lifecycle.lifecycleScope
-import tachiyomi.core.util.lang.launchIO
-
-class ShikimoriLoginActivity : BaseOAuthLoginActivity() {
-
-    override fun handleResult(data: Uri?) {
-        val code = data?.getQueryParameter("code")
-        if (code != null) {
-            lifecycleScope.launchIO {
-                trackManager.shikimori.login(code)
-                returnToSettings()
-            }
-        } else {
-            trackManager.shikimori.logout()
-            returnToSettings()
-        }
-    }
-}
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/TrackLoginActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/TrackLoginActivity.kt
new file mode 100644
index 000000000..af13de51b
--- /dev/null
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/TrackLoginActivity.kt
@@ -0,0 +1,70 @@
+package eu.kanade.tachiyomi.ui.setting.track
+
+import android.net.Uri
+import androidx.lifecycle.lifecycleScope
+import tachiyomi.core.util.lang.launchIO
+
+class TrackLoginActivity : BaseOAuthLoginActivity() {
+
+    override fun handleResult(data: Uri?) {
+        when (data?.host) {
+            "anilist-auth" -> handleAnilist(data)
+            "bangumi-auth" -> handleBangumi(data)
+            "myanimelist-auth" -> handleMyAnimeList(data)
+            "shikimori-auth" -> handleShikimori(data)
+        }
+    }
+
+    private fun handleAnilist(data: Uri) {
+        val regex = "(?:access_token=)(.*?)(?:&)".toRegex()
+        val matchResult = regex.find(data.fragment.toString())
+        if (matchResult?.groups?.get(1) != null) {
+            lifecycleScope.launchIO {
+                trackManager.aniList.login(matchResult.groups[1]!!.value)
+                returnToSettings()
+            }
+        } else {
+            trackManager.aniList.logout()
+            returnToSettings()
+        }
+    }
+
+    private fun handleBangumi(data: Uri) {
+        val code = data.getQueryParameter("code")
+        if (code != null) {
+            lifecycleScope.launchIO {
+                trackManager.bangumi.login(code)
+                returnToSettings()
+            }
+        } else {
+            trackManager.bangumi.logout()
+            returnToSettings()
+        }
+    }
+
+    private fun handleMyAnimeList(data: Uri) {
+        val code = data.getQueryParameter("code")
+        if (code != null) {
+            lifecycleScope.launchIO {
+                trackManager.myAnimeList.login(code)
+                returnToSettings()
+            }
+        } else {
+            trackManager.myAnimeList.logout()
+            returnToSettings()
+        }
+    }
+
+    private fun handleShikimori(data: Uri) {
+        val code = data.getQueryParameter("code")
+        if (code != null) {
+            lifecycleScope.launchIO {
+                trackManager.shikimori.login(code)
+                returnToSettings()
+            }
+        } else {
+            trackManager.shikimori.logout()
+            returnToSettings()
+        }
+    }
+}
diff --git a/i18n/src/main/res/values/strings.xml b/i18n/src/main/res/values/strings.xml
index 596de0f94..4ae199538 100644
--- a/i18n/src/main/res/values/strings.xml
+++ b/i18n/src/main/res/values/strings.xml
@@ -462,6 +462,7 @@
     <string name="enhanced_services_not_installed">Available but source not installed: %s</string>
     <string name="enhanced_tracking_info">Services that provide enhanced features for specific sources. Entries are automatically tracked when added to your library.</string>
     <string name="action_track">Track</string>
+    <string name="track_activity_name">Tracking login</string>
 
       <!-- Browse section -->
     <string name="pref_hide_in_library_items">Hide entries already in library</string>