fix crashing for some extensions

aniyomiorg · Feb 9, 2023 · fd7f90f · fd7f90f
1 parent dc8d1af
commit fd7f90f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -3,7 +3,7 @@
 I acknowledge that:
 
 - I have updated:
-  - To the latest version of the app (stable is v0.12.3.8)
+  - To the latest version of the app (stable is v0.12.3.9)
   - All extensions
 - If this is an issue with an anime extension, that I should be opening an issue in https://github.com/jmir1/aniyomi-extensions
 - I have searched the existing issues and this is new ticket **NOT** a duplicate or related to another open issue

diff --git a/.github/ISSUE_TEMPLATE/report_issue.yml b/.github/ISSUE_TEMPLATE/report_issue.yml
@@ -52,7 +52,7 @@ body:
       label: Aniyomi version
       description: You can find your Aniyomi version in **More → About**.
       placeholder: |
-        Example: "0.12.3.8"
+        Example: "0.12.3.9"
     validations:
       required: true
 
@@ -97,7 +97,7 @@ body:
           required: true
         - label: I have tried the [troubleshooting guide](https://aniyomi.jmir.xyz/help/guides/troubleshooting/).
           required: true
-        - label: I have updated the app to version **[0.12.3.8](https://github.com/jmir1/aniyomi/releases/latest)**.
+        - label: I have updated the app to version **[0.12.3.9](https://github.com/jmir1/aniyomi/releases/latest)**.
           required: true
         - label: I have updated all installed extensions.
           required: true

diff --git a/.github/ISSUE_TEMPLATE/request_feature.yml b/.github/ISSUE_TEMPLATE/request_feature.yml
@@ -32,7 +32,7 @@ body:
           required: true
         - label: If this is an issue with an extension, I should be opening an issue in the [extensions repository](https://github.com/jmir1/aniyomi-extensions/issues/new/choose).
           required: true
-        - label: I have updated the app to version **[0.12.3.8](https://github.com/jmir1/aniyomi/releases/latest)**.
+        - label: I have updated the app to version **[0.12.3.9](https://github.com/jmir1/aniyomi/releases/latest)**.
           required: true
         - label: I will fill out all of the requested information in this form.
           required: true
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -30,7 +30,7 @@ android {
         minSdk = AndroidConfig.minSdk
         targetSdk = AndroidConfig.targetSdk
         versionCode = 72
-        versionName = "0.12.3.8"
+        versionName = "0.12.3.9"
 
         buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")
         buildConfigField("String", "COMMIT_SHA", "\"${getGitSha()}\"")

diff --git a/app/src/main/java/eu/kanade/tachiyomi/animesource/model/Video.kt b/app/src/main/java/eu/kanade/tachiyomi/animesource/model/Video.kt
@@ -6,14 +6,28 @@ import okhttp3.Headers
 import rx.subjects.Subject
 import tachiyomi.animesource.model.VideoUrl
 
+data class Track(val url: String, val lang: String)
+
 open class Video(
     val url: String = "",
     val quality: String = "",
     var videoUrl: String? = null,
     @Transient var uri: Uri? = null, // Deprecated but can't be deleted due to extensions
-    val headers: Headers? = null
+    val headers: Headers? = null,
+    // "url", "language-label-2", "url2", "language-label-2"
+    val subtitleTracks: List<Track> = emptyList(),
+    val audioTracks: List<Track> = emptyList(),
 ) : ProgressListener {
 
+    constructor(
+        url: String,
+        quality: String,
+        videoUrl: String?,
+        headers: Headers? = null,
+        subtitleTracks: List<Track> = emptyList(),
+        audioTracks: List<Track> = emptyList(),
+    ) : this(url, quality, videoUrl, null, headers, subtitleTracks, audioTracks)
+
     @Transient
     @Volatile
     var status: Int = 0