7.3.2 commit

Licenses_and_permissions.md

@@ -26,7 +26,7 @@ Apache License 2.0
 
 [com.github.ByteHamster](https://github.com/ByteHamster/SearchPreference/blob/master/LICENSE) MIT License
 
-[com.github.skydoves](https://github.com/skydoves/Only/blob/master/LICENSE) Apache License 2.0
+[//]: # ([com.github.skydoves](https://github.com/skydoves/Only/blob/master/LICENSE) Apache License 2.0)
 
 [//]: # ([com.github.xabaras](https://github.com/xabaras/RecyclerViewSwipeDecorator/blob/master/LICENSE) Apache License 2.0)
 

app/build.gradle

@@ -26,8 +26,8 @@ android {
         vectorDrawables.useSupportLibrary false
         vectorDrawables.generatedDensities = []
 
-        versionCode 3020338
-        versionName "7.3.1"
+        versionCode 3020339
+        versionName "7.3.2"
 
         ndkVersion "27.0.12077973"
 
@@ -179,16 +179,15 @@ dependencies {
     implementation "androidx.activity:activity-compose:1.9.3"
     implementation "androidx.constraintlayout:constraintlayout-compose:1.1.0"
     implementation "androidx.navigation:navigation-compose:2.8.5"
-//    implementation "androidx.compose.ui:ui-tooling-preview:1.7.6"
 
     implementation "androidx.annotation:annotation:1.9.1"
-    implementation "androidx.appcompat:appcompat:1.7.0"
-    implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
+//    implementation "androidx.appcompat:appcompat:1.7.0"
+//    implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
     implementation "androidx.core:core-ktx:1.15.0"
     implementation "androidx.documentfile:documentfile:1.0.1"
     implementation "androidx.core:core-splashscreen:1.0.1"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.8.7"
-    implementation "androidx.palette:palette-ktx:1.0.0"
+//    implementation "androidx.palette:palette-ktx:1.0.0"
 //    implementation "androidx.recyclerview:recyclerview:1.3.2"
     implementation "androidx.preference:preference-ktx:1.2.1"
     implementation "androidx.webkit:webkit:1.12.1"
@@ -210,7 +209,7 @@ dependencies {
     coreLibraryDesugaring "com.android.tools:desugar_jdk_libs_nio:2.1.4"
     implementation "com.github.XilinJia.vistaguide:VistaGuide:lv0.24.2.6"
 
-    implementation "com.github.skydoves:balloon:1.6.6"
+//    implementation "com.github.skydoves:balloon:1.6.6"
     implementation "io.coil-kt:coil:2.7.0"
     implementation "io.coil-kt:coil-compose:2.7.0"
     implementation "commons-io:commons-io:2.16.1"
@@ -223,9 +222,9 @@ dependencies {
     implementation "com.squareup.okio:okio:3.9.0"
     implementation "com.squareup.okhttp3:okhttp-urlconnection:4.12.0"
     implementation "net.dankito.readability4j:readability4j:1.0.8"
-    implementation "io.reactivex.rxjava3:rxandroid:3.0.2"
-    implementation "io.reactivex.rxjava3:rxjava:3.1.8"
-    implementation "io.reactivex.rxjava2:rxjava:2.2.21"
+//    implementation "io.reactivex.rxjava3:rxandroid:3.0.2"
+//    implementation "io.reactivex.rxjava3:rxjava:3.1.8"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.21" // needed by fyyd search index
     implementation "com.github.ByteHamster:SearchPreference:v2.5.0"
 
     compileOnly "com.google.android.wearable:wearable:2.9.0"

app/proguard.cfg

@@ -27,9 +27,9 @@
 # Keep methods used in tests.
 # This is only needed when running tests with proguard enabled.
 -keepclassmembers class org.apache.commons.lang3.StringUtils {*;}
--keepclassmembers class androidx.appcompat.app.ActionBar {
-    public ** getTitle();
-}
+#-keepclassmembers class androidx.appcompat.app.ActionBar {
+#    public ** getTitle();
+#}
 -keepclassmembers class org.apache.commons.io.IOUtils {
     public static void write(...);
 }

app/src/free/kotlin/ac/mdiq/podcini/playback/cast/CastEnabledActivity.kt

@@ -1,13 +1,13 @@
 package ac.mdiq.podcini.playback.cast
 
 import android.view.Menu
-import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.runtime.Composable
+import androidx.activity.ComponentActivity
 
 /**
  * Activity that allows for showing the MediaRouter button whenever there's a cast device in the network.
  */
-abstract class CastEnabledActivity : AppCompatActivity() {
+abstract class CastEnabledActivity : ComponentActivity() {
     val TAG = this::class.simpleName ?: "Anonymous"
 
     fun requestCastButton(menu: Menu?) {}

app/src/main/assets/licenses.xml

@@ -30,12 +30,12 @@
         website="https://github.com/realm/realm-kotlin"
         license="Apache 2.0"
         licenseText="LICENSE_APACHE-2.0.txt" />
-    <library
-        name="Balloon"
-        author="Jaewoong Eum"
-        website="https://github.com/skydoves/Balloon"
-        license="Apache 2.0"
-        licenseText="LICENSE_APACHE-2.0.txt" />
+<!--    <library-->
+<!--        name="Balloon"-->
+<!--        author="Jaewoong Eum"-->
+<!--        website="https://github.com/skydoves/Balloon"-->
+<!--        license="Apache 2.0"-->
+<!--        licenseText="LICENSE_APACHE-2.0.txt" />-->
     <library
         name="Conscrypt"
         author="Google"

app/src/main/kotlin/ac/mdiq/podcini/net/feed/parser/FeedHandler.kt

@@ -133,7 +133,7 @@ class FeedHandler {
     }
 
     private fun createReader(feed: Feed): Reader? {
-        if (feed.fileUrl == null) return null
+        if (feed.fileUrl.isNullOrBlank()) return null
 
         val reader: Reader
         try { reader = XmlStreamReader(File(feed.fileUrl!!))