Merge pull request #1517 from davotoula/fix-streamable-videos

Use latest LightCompressor-enhanced

amethyst/build.gradle

@@ -151,12 +151,6 @@ android {
             signingConfig = signingConfigs.debug
         }
     }
-    // TODO: remove this when lightcompressor uses one MP4 parser only
-    packaging {
-        resources {
-            resources.pickFirsts.add('builddef.lst')
-        }
-    }
 
     flavorDimensions = ["channel"]
 

amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/VideoCompressionHelper.kt

@@ -257,16 +257,9 @@ object VideoCompressionHelper {
                                             "Compressed [$size] ($reductionPercent% reduction)",
                                     )
 
-                                    // Attempt to correct the path: if it contains "_temp" then remove it
-                                    val correctedPath =
-                                        if (path.contains("_temp")) {
-                                            path.replace("_temp", "")
-                                        } else {
-                                            path
-                                        }
                                     if (continuation.isActive) {
                                         continuation.resume(
-                                            MediaCompressorResult(Uri.fromFile(File(correctedPath)), contentType, size),
+                                            MediaCompressorResult(Uri.fromFile(File(path)), contentType, size),
                                         )
                                     }
                                 }

gradle/libs.versions.toml

@@ -33,7 +33,7 @@ languageId = "17.0.6"
 lazysodiumAndroid = "5.2.0"
 lazysodiumJava = "5.2.0"
 lifecycleRuntimeKtx = "2.9.4"
-lightcompressor = "1.5.0"
+lightcompressor-enhanced = "1.6.0"
 markdown = "f92ef49c9d"
 media3 = "1.8.0"
 mockk = "1.14.5"
@@ -63,7 +63,7 @@ core = "1.7.0"
 mavenPublish = "0.34.0"
 
 [libraries]
-abedElazizShe-video-compressor-fork = { group = "com.github.davotoula", name = "LightCompressor-enhanced", version.ref = "lightcompressor" }
+abedElazizShe-video-compressor-fork = { group = "com.github.davotoula", name = "LightCompressor-enhanced", version.ref = "lightcompressor-enhanced" }
 accompanist-adaptive = { group = "com.google.accompanist", name = "accompanist-adaptive", version.ref = "accompanistAdaptive" }
 accompanist-permissions = { group = "com.google.accompanist", name = "accompanist-permissions", version.ref = "accompanistAdaptive" }
 androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }