snehilrx · snehilrx · May 25, 2023 · May 25, 2023 · May 26, 2023 · May 28, 2023
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,7 +3,7 @@ name: Android Build CI
 on:
   push:
     branches:
-      - main
+      - release
 
 jobs:
   build:
@@ -55,6 +55,7 @@ jobs:
           build=$(echo "${old}" | awk -F. '{print $4}')
           build=$((build + 1))
           # Check commit message for version bump keywords
+          echo "${commit}"
           if echo "${commit}" | grep -q -w "major"; then
             major=$((major + 1))
             minor=0

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -23,10 +23,18 @@ jobs:
           java-version: 17
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
+        env: 
+          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+          KEY_PATH_FILE: ${{ github.workspace }}/${{ secrets.KEY_PATH }}
+          STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
+          BASE64_STRING: ${{ secrets.KEY_BASE64 }}
         with:
           gradle-version: 8.1
           parallel: true
       - run: |
+          touch "${KEY_PATH_FILE}"
+          echo "${BASE64_STRING}" | base64 --decode > ${KEY_PATH_FILE}
           git fetch --depth=1 origin +refs/tags/*:refs/tags/*
           new="$(git describe --abbrev=0 --tags $(git rev-list --tags --skip=1 --max-count=1))"
           echo ${new}
@@ -35,7 +43,7 @@ jobs:
           patch=$(echo "${new}" | awk -F. '{print $3}')
           build=$(echo "${new}" | awk -F. '{print $4}')
           property_content="majorVersion=${major}\nminorVersion=${minor}\npatchVersion=${patch}\nbuildNumber=${build}"
-          echo ${property_content} > version.properties
+          printf ${property_content} > version.properties
           ./gradlew lint
       - uses: yutailang0119/action-android-lint@v3
         with:

diff --git a/LICENSE b/LICENSE
diff --git a/SECURITY.md b/SECURITY.md
@@ -0,0 +1,21 @@
+# Security Policy
+
+## Supported Versions
+
+Use this section to tell people about which versions of your project are
+currently being supported with security updates.
+
+| Version | Supported          |
+|---------|--------------------|
+| 5.1.x   | :white_check_mark: |
+| 5.0.x   | :x:                |
+| 4.0.x   | :white_check_mark: |
+| < 4.0   | :x:                |
+
+## Reporting a Vulnerability
+
+Use this section to tell people how to report a vulnerability.
+
+Tell them where to go, how often they can expect to get an update on a
+reported vulnerability, what to expect if the vulnerability is accepted or
+declined, etc.
diff --git a/app/src/main/java/com/otaku/fetch/MainActivity.kt b/app/src/main/java/com/otaku/fetch/MainActivity.kt
@@ -7,9 +7,17 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.material3.*
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -34,7 +42,6 @@ class MainActivity : AppCompatActivity() {
         Font(R.font.sohne_fett, FontWeight.Bold)
     )
 
-    @OptIn(ExperimentalMaterial3Api::class)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {

diff --git a/app/src/main/java/com/otaku/fetch/ModuleActivity.kt b/app/src/main/java/com/otaku/fetch/ModuleActivity.kt
@@ -145,7 +145,7 @@ class ModuleActivity :
             statusBarHeight {
                 runOnUiThread {
                     findViewById<View>(com.lapism.search.R.id.search_view_background)
-                        ?.setPaddingRelative(0, it, 0, 0)
+                        ?.setPadding(0, it, 0, 0)
                 }
             }
             addView(searchSuggestionsList)

diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background"/>
+    <monochrome android:drawable="@drawable/ic_launcher_background" />
 </adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background"/>
+    <monochrome android:drawable="@drawable/ic_launcher_background" />
 </adaptive-icon>
diff --git a/app/src/main/res/values/color.xml b/app/src/main/res/values/color.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,5 +1,3 @@
 <resources>
     <string name="app_name">Fetch</string>
-    <string name="no_network">No Network</string>
-    <string name="title_kickass">Kickass Anime</string>
 </resources>
diff --git a/base/cloudflarebypass/src/main/java/com/fetch/cloudflarebypass/CloudflareHTTPClient.kt b/base/cloudflarebypass/src/main/java/com/fetch/cloudflarebypass/CloudflareHTTPClient.kt
@@ -38,7 +38,6 @@ import okhttp3.TlsVersion
  * }
  * </code>
  */
-@Suppress("BlockingMethodInNonBlockingContext")
 open class CloudflareHTTPClient(
     log: Log,
     uamSettingsBlock: (UAMSettings.() -> Unit)? = null

diff --git a/base/src/main/java/com/carouselrecyclerview/CarouselLayoutManager.kt b/base/src/main/java/com/carouselrecyclerview/CarouselLayoutManager.kt
@@ -274,10 +274,7 @@ class CarouselLayoutManager constructor(
             val rect = getFrame(index)
             //layout items area of a view if it's first inside the display area
             // and also not already on the screen
-            if (Rect.intersects(displayFrames, rect) && !mHasAttachedItems.get(
-                    index
-                )
-            ) {
+            if (Rect.intersects(displayFrames, rect) && !mHasAttachedItems[index]) {
                 if (itemCount == 0) continue
                 var actualPos = index % itemCount
                 if (actualPos < 0) actualPos += itemCount
@@ -457,7 +454,7 @@ class CarouselLayoutManager constructor(
      */
     fun centerPosition(): Int {
         val intervalPosition = getIntervalDistance()
-        if (intervalPosition == 0) return intervalPosition
+        if (intervalPosition == 0) return 0
 
         var pos = mOffsetAll / intervalPosition
         val more = mOffsetAll % intervalPosition

diff --git a/base/src/main/java/com/otaku/fetch/AppModule.kt b/base/src/main/java/com/otaku/fetch/AppModule.kt
@@ -13,17 +13,21 @@ interface AppModule {
 
     val notificationDeeplink: String
 
-    fun onSearch(query: String) {}
+    fun onSearch(query: String) {
+        // no-op
+    }
 
     fun getNavigationGraph(): Int = 0
 
-    suspend fun triggerNotification(context: Context, defaultIntent: TaskStackBuilder) {}
+    suspend fun triggerNotification(context: Context, defaultIntent: TaskStackBuilder) {
+        // defaults to no-op
+    }
 
-    fun initialize(query: String?, link: String = "") {}
     fun getBottomNavigationMenu(): Int = 0
 
     @Composable
-    fun ComposeTheme(content: @Composable() () -> Unit) {
+    fun ComposeTheme(content: @Composable () -> Unit) {
+        // defaults to no-op
     }
 
     suspend fun findEpisode(mediaId: String, mediaLink: String, mediaType: String): DownloadItem? =

diff --git a/base/src/main/java/com/otaku/fetch/ModuleRegistry.kt b/base/src/main/java/com/otaku/fetch/ModuleRegistry.kt
@@ -29,7 +29,7 @@ object ModuleRegistry {
      * After all the module is registered main activity (app module) it displays all the available
      * modules. When user selects a module we launch the module activity (app module) with the
      * named tag of the module, to inject the module dynamically at run time.
-     * @param namedTag injected name tag of AppModule
+     * @param displayName injected name tag of AppModule
      * */
     fun registerModule(displayName: String, @DrawableRes displayIcon: Int, appModule: AppModule) {
         modules.add(ModuleData(displayName, displayIcon, appModule))

diff --git a/base/src/main/java/com/otaku/fetch/base/Extensions.kt b/base/src/main/java/com/otaku/fetch/base/Extensions.kt
@@ -18,13 +18,12 @@ val Fragment.isLandscape: Boolean
     }
 
 fun BindingActivity<*>.askNotificationPermission(): Boolean {
-
-    when {
+    return when {
         ContextCompat.checkSelfPermission(
             this,
             Manifest.permission.POST_NOTIFICATIONS
         ) == PackageManager.PERMISSION_GRANTED -> {
-            return true
+            true
         }
 
         shouldShowRequestPermissionRationale(Manifest.permission.POST_NOTIFICATIONS) -> {
@@ -33,7 +32,7 @@ fun BindingActivity<*>.askNotificationPermission(): Boolean {
                     notificationPermission.launch(Manifest.permission.POST_NOTIFICATIONS)
                 }
             }
-            return false
+            false
         }
 
         else -> {
@@ -42,7 +41,7 @@ fun BindingActivity<*>.askNotificationPermission(): Boolean {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
                 notificationPermission.launch(Manifest.permission.POST_NOTIFICATIONS)
             }
-            return false
+            false
         }
     }
 }
diff --git a/base/src/main/java/com/otaku/fetch/base/download/DownloadScreens.kt b/base/src/main/java/com/otaku/fetch/base/download/DownloadScreens.kt
@@ -140,17 +140,10 @@ private fun DownloadRepository.TreeNode.toItemTreeIndex(
 
         override fun expand(index: Int): ItemTree? {
             return when (children[index]) {
-                is DownloadRepository.Anime -> {
+                is DownloadRepository.Episode, is DownloadRepository.Anime ->
                     return (children[index] as? DownloadRepository.TreeNode)?.toItemTreeIndex(
                         downloadsVM
                     )
-                }
-
-                is DownloadRepository.Episode -> {
-                    return (children[index] as? DownloadRepository.TreeNode)?.toItemTreeIndex(
-                        downloadsVM
-                    )
-                }
 
                 else -> null
             }
@@ -257,7 +250,6 @@ fun Bundle.toMediaUri(): Uri? {
 
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @androidx.annotation.OptIn(UnstableApi::class)
 @Composable
 private fun LeafItem(
@@ -374,7 +366,6 @@ private fun NodeItem(
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun DeleteButton(
     modifier: Modifier = Modifier, onClick: () -> Unit, warning: String

diff --git a/base/src/main/java/com/otaku/fetch/base/livedata/State.kt b/base/src/main/java/com/otaku/fetch/base/livedata/State.kt
@@ -2,13 +2,11 @@ package com.otaku.fetch.base.livedata
 
 
 sealed class GenericState<T>(open val exception: Exception?, val obj: T?) {
-    @Suppress("unused")
+
     class LOADING<T> : GenericState<T>(null, null)
 
-    @Suppress("unused")
     class SUCCESS<T>(data: T? = null) : GenericState<T>(null, data)
 
-    @Suppress("unused")
     class FAILED<T>(exception: Exception) : GenericState<T>(exception, null)
 
     override fun equals(other: Any?): Boolean {

diff --git a/base/src/main/java/com/otaku/fetch/base/settings/Settings.kt b/base/src/main/java/com/otaku/fetch/base/settings/Settings.kt
@@ -61,7 +61,7 @@ object Settings {
     val PREF_NEW_UPDATE_FOUND = booleanPreferencesKey("new_update")
 }
 
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class)
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun Settings(
     statusBarHeight: Float? = null, setupShineBar: (Shinebar) -> Unit = { _ -> run {} }
@@ -145,6 +145,6 @@ private fun VideoSetting(key: Preferences.Key<String>, pref: Preferences?) {
             id = R.string.video_quality
         ),
         summary = pref?.get(key),
-        entries = stringArrayResource(id = R.array.video_qualities).map { Pair(it, it) }.toMap()
+        entries = stringArrayResource(id = R.array.video_qualities).associateWith { it }
     )
 }
diff --git a/base/src/main/java/com/otaku/fetch/base/ui/BindingFragment.kt b/base/src/main/java/com/otaku/fetch/base/ui/BindingFragment.kt
@@ -1,3 +1,5 @@
+@file:Suppress("MemberVisibilityCanBePrivate", "MemberVisibilityCanBePrivate")
+
 package com.otaku.fetch.base.ui
 
 import android.os.Bundle
@@ -26,10 +28,11 @@ import io.github.snehilrx.shinebar.Shinebar
 import java.lang.ref.WeakReference
 
 
+@Suppress("MemberVisibilityCanBePrivate")
 open class BindingFragment<T : ViewDataBinding>(@LayoutRes private val layoutRes: Int) :
     Fragment() {
 
-    lateinit var weakReference: WeakReference<T>
+    private lateinit var weakReference: WeakReference<T>
     protected val binding: T
         get() = weakReference.get() ?: throw IllegalStateException("Binding is null")
 
@@ -137,11 +140,13 @@ open class BindingFragment<T : ViewDataBinding>(@LayoutRes private val layoutRes
 
     private fun setupToolbar(toolbar: Toolbar) {
         (activity as? AppCompatActivity)?.statusBarHeight {
-            toolbar.layoutParams = toolbar.layoutParams?.apply {
-                height += it
-            }
             toolbar.apply {
-                setPadding(paddingLeft, paddingTop + it, paddingRight, paddingBottom)
+                if (paddingTop == 0) {
+                    setPadding(paddingLeft, paddingTop + it, paddingRight, paddingBottom)
+                    toolbar.layoutParams = toolbar.layoutParams?.apply {
+                        height += it
+                    }
+                }
             }
         }
     }
@@ -182,7 +187,9 @@ open class BindingFragment<T : ViewDataBinding>(@LayoutRes private val layoutRes
         }
     }
 
-    protected open fun onBind(binding: T, savedInstanceState: Bundle?) {}
+    protected open fun onBind(binding: T, savedInstanceState: Bundle?) {
+        // no-op̊
+    }
 
     override fun onDestroy() {
         super.onDestroy()

diff --git a/base/src/main/java/com/otaku/fetch/base/ui/FetchScaffold.kt b/base/src/main/java/com/otaku/fetch/base/ui/FetchScaffold.kt
@@ -31,7 +31,7 @@ fun FetchScaffold(
     statusBarHeight: Float = 0f,
     scrollBehavior: TopAppBarScrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior(),
     setupShineBar: (Shinebar) -> Unit = { _ -> run {} },
-    actions: @Composable() (RowScope.() -> Unit) = {},
+    actions: @Composable (RowScope.() -> Unit) = {},
     content: @Composable () -> Unit,
 ) {
     val top = statusBarHeight.dp

diff --git a/base/src/main/java/com/otaku/fetch/base/ui/GradientFromImage.kt b/base/src/main/java/com/otaku/fetch/base/ui/GradientFromImage.kt
@@ -1,13 +1,11 @@
 package com.otaku.fetch.base.ui
 
 import android.content.Context
-import android.graphics.Bitmap
 import android.graphics.Color
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
 import android.graphics.drawable.GradientDrawable
 import android.graphics.drawable.LayerDrawable
-import android.os.AsyncTask
 import android.util.AttributeSet
 import android.util.TypedValue
 import androidx.palette.graphics.Palette
@@ -17,8 +15,6 @@ import com.otaku.fetch.base.utils.UiUtils
 
 class GradientFromImage : ShapeableImageView {
 
-    @Suppress("deprecation")
-    private var task: AsyncTask<Bitmap, Void, Palette>? = null
     private var mFadeSide: FadeSide = FadeSide.NONE
 
     enum class FadeSide {
@@ -80,7 +76,6 @@ class GradientFromImage : ShapeableImageView {
         init()
     }
 
-    @Suppress("unused")
     private fun init() {
         // Enable horizontal fading
         this.isHorizontalFadingEdgeEnabled = true
@@ -93,7 +88,7 @@ class GradientFromImage : ShapeableImageView {
     override fun setImageDrawable(drawable: Drawable?) {
         if (drawable == null) return
         if (drawable is BitmapDrawable) {
-            task = Palette.from(drawable.bitmap).generate {
+            Palette.from(drawable.bitmap).generate {
                 it?.let { palette ->
                     val layerDrawable = LayerDrawable(
                         arrayOf(