6.11.1 commit

XilinJia · Oct 14, 2024 · 5ea458e · 5ea458e
1 parent 54e9708
commit 5ea458e
Show file tree

Hide file tree

Showing 50 changed files with 1,042 additions and 2,058 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -31,8 +31,8 @@ android {
         testApplicationId "ac.mdiq.podcini.tests"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
-        versionCode 3020270
-        versionName "6.11.0"
+        versionCode 3020271
+        versionName "6.11.1"
 
         applicationId "ac.mdiq.podcini.R"
         def commit = ""

diff --git a/app/src/androidTest/kotlin/ac/test/podcini/util/syndication/feedgenerator/Rss2Generator.kt b/app/src/androidTest/kotlin/ac/test/podcini/util/syndication/feedgenerator/Rss2Generator.kt
@@ -1,9 +1,9 @@
 package de.test.podcini.util.syndication.feedgenerator
 
+import ac.mdiq.podcini.net.feed.parser.FeedHandler
 import android.util.Xml
 import ac.mdiq.podcini.util.MiscFormatter.formatRfc822Date
 import ac.mdiq.podcini.storage.model.Feed
-import ac.mdiq.podcini.net.feed.parser.namespace.PodcastIndex
 import de.test.podcini.util.syndication.feedgenerator.GeneratorUtil.addPaymentLink
 import java.io.IOException
 import java.io.OutputStream
@@ -101,11 +101,11 @@ class Rss2Generator : FeedGenerator {
                 }
                 if (fundingList.isNotEmpty()) {
                     for (funding in fundingList) {
-                        xml.startTag(PodcastIndex.NSTAG, "funding")
-                        xml.attribute(PodcastIndex.NSTAG, "url", funding.url)
+                        xml.startTag(FeedHandler.PodcastIndex.NSTAG, "funding")
+                        xml.attribute(FeedHandler.PodcastIndex.NSTAG, "url", funding.url)
                         xml.text(funding.content)
                         addPaymentLink(xml, funding.url, true)
-                        xml.endTag(PodcastIndex.NSTAG, "funding")
+                        xml.endTag(FeedHandler.PodcastIndex.NSTAG, "funding")
                     }
                 }
 

diff --git a/app/src/main/kotlin/ac/mdiq/podcini/net/download/VistaDownloaderImpl.kt b/app/src/main/kotlin/ac/mdiq/podcini/net/download/VistaDownloaderImpl.kt
@@ -72,7 +72,6 @@ class VistaDownloaderImpl private constructor(val builder: OkHttpClient.Builder)
 
     /**
      * Get the size of the content that the url is pointing by firing a HEAD request.
-     *
      * @param url an url pointing to the content
      * @return the size of the content, in bytes
      */
@@ -95,9 +94,7 @@ class VistaDownloaderImpl private constructor(val builder: OkHttpClient.Builder)
         var requestBody: RequestBody? = null
         if (dataToSend != null) requestBody = RequestBody.create("application/json; charset=utf-8".toMediaTypeOrNull(), dataToSend)
 
-        val requestBuilder: Builder = Builder()
-            .method(httpMethod, requestBody).url(url)
-            .addHeader("User-Agent", USER_AGENT)
+        val requestBuilder: Builder = Builder().method(httpMethod, requestBody).url(url).addHeader("User-Agent", USER_AGENT)
 
         val cookies = getCookies(url)
         if (cookies.isNotEmpty()) requestBuilder.addHeader("Cookie", cookies)
@@ -142,7 +139,6 @@ class VistaDownloaderImpl private constructor(val builder: OkHttpClient.Builder)
 
         /**
          * It's recommended to call exactly once in the entire lifetime of the application.
-         *
          * @param builder if null, default builder will be used
          * @return a new instance of [DownloaderImpl]
          */

diff --git a/app/src/main/kotlin/ac/mdiq/podcini/net/download/service/DefaultDownloaderFactory.kt b/app/src/main/kotlin/ac/mdiq/podcini/net/download/service/DefaultDownloaderFactory.kt
@@ -3,6 +3,10 @@ package ac.mdiq.podcini.net.download.service
 import android.util.Log
 import android.webkit.URLUtil
 
+interface DownloaderFactory {
+    fun create(request: DownloadRequest): Downloader?
+}
+
 class DefaultDownloaderFactory : DownloaderFactory {
     override fun create(request: DownloadRequest): Downloader? {
         if (!URLUtil.isHttpUrl(request.source) && !URLUtil.isHttpsUrl(request.source)) {

diff --git a/app/src/main/kotlin/ac/mdiq/podcini/net/download/service/DownloaderFactory.kt b/app/src/main/kotlin/ac/mdiq/podcini/net/download/service/DownloaderFactory.kt
diff --git a/app/src/main/kotlin/ac/mdiq/podcini/net/feed/FeedBuilder.kt b/app/src/main/kotlin/ac/mdiq/podcini/net/feed/FeedBuilder.kt
@@ -281,4 +281,5 @@ class FeedBuilder(val context: Context, val showError: (String?, String)->Unit)
 //        }
         Logd(TAG, "fo.id: ${fo?.id} feed.id: ${feed.id}")
     }
+
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     //        }
             Logd(TAG, "fo.id: ${fo?.id} feed.id: ${feed.id}")
         }
     }