chore: clean

rebelonion · Jan 6, 2025 · f9f9767 · f9f9767
1 parent 31a67c8
commit f9f9767
Show file tree

Hide file tree

Showing 106 changed files with 866 additions and 595 deletions.
diff --git a/app/src/google/java/ani/dantotsu/others/AppUpdater.kt b/app/src/google/java/ani/dantotsu/others/AppUpdater.kt
@@ -18,6 +18,7 @@ import ani.dantotsu.Mapper
 import ani.dantotsu.R
 import ani.dantotsu.buildMarkwon
 import ani.dantotsu.client
+import ani.dantotsu.connections.comments.CommentsAPI
 import ani.dantotsu.currContext
 import ani.dantotsu.decodeBase64ToString
 import ani.dantotsu.logError
@@ -84,7 +85,7 @@ object AppUpdater {
 
     private suspend fun fetchFromFallback(isDebug: Boolean): Pair<String, String> {
         val url = if (isDebug) fallbackBetaUrl else fallbackStableUrl
-        val response = client.get(url).parsed<FallbackResponse>()
+        val response = CommentsAPI.requestBuilder().get(url).parsed<FallbackResponse>()
         return response.changelog to response.version
     }
 
@@ -112,7 +113,7 @@ object AppUpdater {
 
     private suspend fun fetchApkUrlFromFallback(version: String, isDebug: Boolean): String? {
         val url = if (isDebug) fallbackBetaUrl else fallbackStableUrl
-        return client.get("$url/$version").parsed<FallbackResponse>().downloadUrl
+        return CommentsAPI.requestBuilder().get("$url/$version").parsed<FallbackResponse>().downloadUrl
     }
 
     suspend fun check(activity: FragmentActivity, post: Boolean = false) {
@@ -200,8 +201,7 @@ object AppUpdater {
 
 
     //Blatantly kanged from https://github.com/LagradOst/CloudStream-3/blob/master/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
-    private fun Activity.downloadUpdate(version: String, url: String): Boolean {
-
+    private fun Activity.downloadUpdate(version: String, url: String) {
         toast(getString(R.string.downloading_update, version))
 
         val downloadManager = this.getSystemService<DownloadManager>()!!
@@ -223,7 +223,7 @@ object AppUpdater {
             logError(e)
             -1
         }
-        if (id == -1L) return true
+        if (id == -1L) return
         ContextCompat.registerReceiver(
             this,
             object : BroadcastReceiver() {
@@ -244,7 +244,6 @@ object AppUpdater {
             }, IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE),
             ContextCompat.RECEIVER_EXPORTED
         )
-        return true
     }
 
     private fun openApk(context: Context, uri: Uri) {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+`<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
@@ -113,10 +113,8 @@
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
 
-                <data android:host="*"/>
                 <data android:mimeType="application/epub+zip"/>
                 <data android:mimeType="application/x-mobipocket-ebook" />
                 <data android:mimeType="application/vnd.amazon.ebook" />
@@ -385,10 +383,10 @@
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:scheme="content" />
+                <data android:scheme="file" />
                 <data android:mimeType="*/*" />
                 <data android:pathPattern=".*\\.ani" />
                 <data android:pathPattern=".*\\.sani" />
-                <data android:host="*" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />

diff --git a/app/src/main/java/ani/dantotsu/App.kt b/app/src/main/java/ani/dantotsu/App.kt
@@ -107,9 +107,9 @@ class App : MultiDexApplication() {
 
         if (PrefManager.getVal<Int>(PrefName.CommentsEnabled) == 0) {
             if (BuildConfig.FLAVOR.contains("fdroid")) {
-              PrefManager.setVal(PrefName.CommentsEnabled, 2)
+                PrefManager.setVal(PrefName.CommentsEnabled, 2)
             } else {
-              PrefManager.setVal(PrefName.CommentsEnabled, 1)
+                PrefManager.setVal(PrefName.CommentsEnabled, 1)
             }
         }
 
@@ -136,9 +136,9 @@ class App : MultiDexApplication() {
             downloadAddonManager = Injekt.get()
             torrentAddonManager.init()
             downloadAddonManager.init()
-            if (PrefManager.getVal<Int>(PrefName.CommentsEnabled) == 1) { 
+            if (PrefManager.getVal<Int>(PrefName.CommentsEnabled) == 1) {
                 CommentsAPI.fetchAuthToken(this@App)
-             }
+            }
 
             val useAlarmManager = PrefManager.getVal<Boolean>(PrefName.UseAlarmManager)
             val scheduler = TaskScheduler.create(this@App, useAlarmManager)

diff --git a/app/src/main/java/ani/dantotsu/Functions.kt b/app/src/main/java/ani/dantotsu/Functions.kt
@@ -117,7 +117,6 @@ import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withC
 import com.bumptech.glide.load.resource.gif.GifDrawable
 import com.bumptech.glide.request.RequestListener
 import com.bumptech.glide.request.RequestOptions
-import com.bumptech.glide.request.target.CustomTarget
 import com.bumptech.glide.request.target.Target
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
 import com.google.android.material.bottomnavigation.BottomNavigationView
@@ -138,12 +137,9 @@ import io.noties.markwon.html.TagHandlerNoOp
 import io.noties.markwon.image.AsyncDrawable
 import io.noties.markwon.image.glide.GlideImagesPlugin
 import jp.wasabeef.glide.transformations.BlurTransformation
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import nl.joery.animatedbottombar.AnimatedBottomBar
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
@@ -856,6 +852,7 @@ fun savePrefsToDownloads(
         }
     )
 }
+
 @SuppressLint("StringFormatMatches")
 fun savePrefs(serialized: String, path: String, title: String, context: Context): File? {
     var file = File(path, "$title.ani")
@@ -923,6 +920,7 @@ fun shareImage(title: String, bitmap: Bitmap, context: Context) {
     intent.putExtra(Intent.EXTRA_STREAM, contentUri)
     context.startActivity(Intent.createChooser(intent, "Share $title"))
 }
+
 @SuppressLint("StringFormatMatches")
 fun saveImage(image: Bitmap, path: String, imageFileName: String): File? {
     val imageFile = File(path, "$imageFileName.png")
@@ -1469,6 +1467,7 @@ fun buildMarkwon(
                         }
                         return false
                     }
+
                     override fun onLoadFailed(
                         e: GlideException?,
                         model: Any?,
@@ -1497,9 +1496,9 @@ fun buildMarkwon(
 }
 
 
-
 fun getYoutubeId(url: String): String {
-    val regex = """(?:youtube\.com/(?:[^/]+/.+/|(?:v|e(?:mbed)?)/|.*[?&]v=)|(?:youtu\.be|youtube\.com)/)([^"&?/\s]{11})|youtube\.com/""".toRegex()
+    val regex =
+        """(?:youtube\.com/(?:[^/]+/.+/|(?:v|e(?:mbed)?)/|.*[?&]v=)|(?:youtu\.be|youtube\.com)/)([^"&?/\s]{11})|youtube\.com/""".toRegex()
     val matchResult = regex.find(url)
     return matchResult?.groupValues?.getOrNull(1) ?: ""
 }

diff --git a/app/src/main/java/ani/dantotsu/addons/download/DownloadAddonApiV2.kt b/app/src/main/java/ani/dantotsu/addons/download/DownloadAddonApiV2.kt
@@ -26,9 +26,17 @@ interface DownloadAddonApiV2 {
         statCallback: (Double) -> Unit
     ): Long
 
-    suspend fun customFFMpeg(command: String, videoUrls: List<String>, logCallback: (String) -> Unit): Long
+    suspend fun customFFMpeg(
+        command: String,
+        videoUrls: List<String>,
+        logCallback: (String) -> Unit
+    ): Long
 
-    suspend fun customFFProbe(command: String, videoUrls: List<String>, logCallback: (String) -> Unit)
+    suspend fun customFFProbe(
+        command: String,
+        videoUrls: List<String>,
+        logCallback: (String) -> Unit
+    )
 
     fun getState(sessionId: Long): String
 

diff --git a/app/src/main/java/ani/dantotsu/addons/torrent/TorrentAddonManager.kt b/app/src/main/java/ani/dantotsu/addons/torrent/TorrentAddonManager.kt
@@ -6,11 +6,11 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import ani.dantotsu.R
 import ani.dantotsu.addons.AddonDownloader.Companion.hasUpdate
+import ani.dantotsu.addons.AddonInstallReceiver
 import ani.dantotsu.addons.AddonListener
 import ani.dantotsu.addons.AddonLoader
 import ani.dantotsu.addons.AddonManager
 import ani.dantotsu.addons.LoadResult
-import ani.dantotsu.addons.AddonInstallReceiver
 import ani.dantotsu.media.AddonType
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.settings.saving.PrefName

diff --git a/app/src/main/java/ani/dantotsu/addons/torrent/TorrentService.kt b/app/src/main/java/ani/dantotsu/addons/torrent/TorrentService.kt
@@ -41,7 +41,8 @@ class TorrentServerService : Service() {
         flags: Int,
         startId: Int,
     ): Int {
-        extension = Injekt.get<TorrentAddonManager>().extension?.extension ?: return START_NOT_STICKY
+        extension =
+            Injekt.get<TorrentAddonManager>().extension?.extension ?: return START_NOT_STICKY
         intent?.let {
             if (it.action != null) {
                 when (it.action) {

diff --git a/app/src/main/java/ani/dantotsu/aniyomi/anime/custom/InjektModules.kt b/app/src/main/java/ani/dantotsu/aniyomi/anime/custom/InjektModules.kt
@@ -8,7 +8,6 @@ import androidx.media3.common.util.UnstableApi
 import androidx.media3.database.StandaloneDatabaseProvider
 import ani.dantotsu.addons.download.DownloadAddonManager
 import ani.dantotsu.addons.torrent.TorrentAddonManager
-import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
 import ani.dantotsu.download.DownloadsManager
 import ani.dantotsu.media.manga.MangaCache
 import ani.dantotsu.parsers.novel.NovelExtensionManager

diff --git a/app/src/main/java/ani/dantotsu/connections/anilist/AnilistMutations.kt b/app/src/main/java/ani/dantotsu/connections/anilist/AnilistMutations.kt
@@ -145,7 +145,10 @@ class AnilistMutations {
         return result?.get("errors") == null
     }
 
-    suspend fun updateCustomLists(animeCustomLists: List<String>?, mangaCustomLists: List<String>?): Boolean {
+    suspend fun updateCustomLists(
+        animeCustomLists: List<String>?,
+        mangaCustomLists: List<String>?
+    ): Boolean {
         val query = """
             mutation (${"$"}animeListOptions: MediaListOptionsInput, ${"$"}mangaListOptions: MediaListOptionsInput) {
                 UpdateUser(animeListOptions: ${"$"}animeListOptions, mangaListOptions: ${"$"}mangaListOptions) {
@@ -291,7 +294,8 @@ class AnilistMutations {
                     isFollower
                 }
             }
-        """.trimIndent())
+        """.trimIndent()
+        )
     }
 
     suspend fun toggleLike(id: Int, type: String): ToggleLike? {
@@ -302,7 +306,8 @@ class AnilistMutations {
                     __typename
                 }
             }
-        """.trimIndent())
+        """.trimIndent()
+        )
     }
 
     suspend fun postActivity(text: String, edit: Int? = null): String {
@@ -316,10 +321,16 @@ class AnilistMutations {
         """.trimIndent()
         val result = executeQuery<JsonObject>(query)
         val errors = result?.get("errors")
-        return errors?.toString() ?: (currContext()?.getString(ani.dantotsu.R.string.success) ?: "Success")
+        return errors?.toString() ?: (currContext()?.getString(ani.dantotsu.R.string.success)
+            ?: "Success")
     }
 
-    suspend fun postMessage(userId: Int, text: String, edit: Int? = null, isPrivate: Boolean = false): String {
+    suspend fun postMessage(
+        userId: Int,
+        text: String,
+        edit: Int? = null,
+        isPrivate: Boolean = false
+    ): String {
         val encodedText = text.replace("", "").stringSanitizer()
         val query = """
             mutation {
@@ -335,7 +346,8 @@ class AnilistMutations {
         """.trimIndent()
         val result = executeQuery<JsonObject>(query)
         val errors = result?.get("errors")
-        return errors?.toString() ?: (currContext()?.getString(ani.dantotsu.R.string.success) ?: "Success")
+        return errors?.toString() ?: (currContext()?.getString(ani.dantotsu.R.string.success)
+            ?: "Success")
     }
 
     suspend fun postReply(activityId: Int, text: String, edit: Int? = null): String {
@@ -353,7 +365,8 @@ class AnilistMutations {
         """.trimIndent()
         val result = executeQuery<JsonObject>(query)
         val errors = result?.get("errors")
-        return errors?.toString() ?: (currContext()?.getString(ani.dantotsu.R.string.success) ?: "Success")
+        return errors?.toString() ?: (currContext()?.getString(ani.dantotsu.R.string.success)
+            ?: "Success")
     }
 
     suspend fun postReview(summary: String, body: String, mediaId: Int, score: Int): String {
@@ -373,7 +386,8 @@ class AnilistMutations {
         """.trimIndent()
         val result = executeQuery<JsonObject>(query)
         val errors = result?.get("errors")
-        return errors?.toString() ?: (currContext()?.getString(ani.dantotsu.R.string.success) ?: "Success")
+        return errors?.toString() ?: (currContext()?.getString(ani.dantotsu.R.string.success)
+            ?: "Success")
     }
 
     suspend fun deleteActivityReply(activityId: Int): Boolean {

diff --git a/app/src/main/java/ani/dantotsu/connections/anilist/AnilistViewModel.kt b/app/src/main/java/ani/dantotsu/connections/anilist/AnilistViewModel.kt
@@ -359,19 +359,24 @@ class AnilistSearch : ViewModel() {
     var searched = false
     var notSet = true
     lateinit var aniMangaSearchResults: AniMangaSearchResults
-    private val aniMangaResult: MutableLiveData<AniMangaSearchResults?> = MutableLiveData<AniMangaSearchResults?>(null)
+    private val aniMangaResult: MutableLiveData<AniMangaSearchResults?> =
+        MutableLiveData<AniMangaSearchResults?>(null)
 
     lateinit var characterSearchResults: CharacterSearchResults
-    private val characterResult: MutableLiveData<CharacterSearchResults?> = MutableLiveData<CharacterSearchResults?>(null)
+    private val characterResult: MutableLiveData<CharacterSearchResults?> =
+        MutableLiveData<CharacterSearchResults?>(null)
 
     lateinit var studioSearchResults: StudioSearchResults
-    private val studioResult: MutableLiveData<StudioSearchResults?> = MutableLiveData<StudioSearchResults?>(null)
+    private val studioResult: MutableLiveData<StudioSearchResults?> =
+        MutableLiveData<StudioSearchResults?>(null)
 
     lateinit var staffSearchResults: StaffSearchResults
-    private val staffResult: MutableLiveData<StaffSearchResults?> = MutableLiveData<StaffSearchResults?>(null)
+    private val staffResult: MutableLiveData<StaffSearchResults?> =
+        MutableLiveData<StaffSearchResults?>(null)
 
     lateinit var userSearchResults: UserSearchResults
-    private val userResult: MutableLiveData<UserSearchResults?> = MutableLiveData<UserSearchResults?>(null)
+    private val userResult: MutableLiveData<UserSearchResults?> =
+        MutableLiveData<UserSearchResults?>(null)
 
     fun <T> getSearch(type: SearchType): MutableLiveData<T?> {
         return when (type) {
@@ -517,12 +522,13 @@ class AnilistSearch : ViewModel() {
         )
     )
 
-    private suspend fun loadNextCharacterPage(r: CharacterSearchResults) = characterResult.postValue(
-        Anilist.query.searchCharacters(
-            r.page + 1,
-            r.search,
+    private suspend fun loadNextCharacterPage(r: CharacterSearchResults) =
+        characterResult.postValue(
+            Anilist.query.searchCharacters(
+                r.page + 1,
+                r.search,
+            )
         )
-    )
 
     private suspend fun loadNextStudiosPage(r: StudioSearchResults) = studioResult.postValue(
         Anilist.query.searchStudios(

diff --git a/app/src/main/java/ani/dantotsu/connections/anilist/anilistGraphql.kt b/app/src/main/java/ani/dantotsu/connections/anilist/anilistGraphql.kt
@@ -34,7 +34,8 @@ fun characterInformation(includeMediaInfo: Boolean) = """
       month
       day
     }
-    ${if (includeMediaInfo) """
+    ${
+    if (includeMediaInfo) """
     media(page: 0,sort:[POPULARITY_DESC,SCORE_DESC]) {
       $standardPageInformation
       edges {
@@ -79,7 +80,8 @@ fun characterInformation(includeMediaInfo: Boolean) = """
           }
         }
       }
-    }""".prepare() else ""}
+    }""".prepare() else ""
+}
 """.prepare()
 
 fun studioInformation(page: Int, perPage: Int) = """

diff --git a/app/src/main/java/ani/dantotsu/connections/anilist/api/Feed.kt b/app/src/main/java/ani/dantotsu/connections/anilist/api/Feed.kt
@@ -14,6 +14,7 @@ data class FeedResponse(
         val page: ActivityPage
     ) : java.io.Serializable
 }
+
 @Serializable
 data class ActivityPage(
     @SerialName("activities")

diff --git a/app/src/main/java/ani/dantotsu/connections/anilist/api/Media.kt b/app/src/main/java/ani/dantotsu/connections/anilist/api/Media.kt
@@ -189,7 +189,7 @@ data class MediaTitle(
 
     // The currently authenticated users preferred title language. Default romaji for non-authenticated
     @SerialName("userPreferred") var userPreferred: String,
-): java.io.Serializable
+) : java.io.Serializable
 
 @Serializable
 enum class MediaType {
@@ -239,6 +239,7 @@ data class AiringSchedule(
     // The associate media of the airing episode
     @SerialName("media") var media: Media?,
 )
+
 @Serializable
 data class MediaStreamingEpisode(
     // The title of the episode
@@ -253,6 +254,7 @@ data class MediaStreamingEpisode(
     // The site location of the streaming episode
     @SerialName("site") var site: String?,
 )
+
 @Serializable
 data class MediaCoverImage(
     // The cover image url of the media at its largest size. If this size isn't available, large will be provided instead.