diff --git a/app/build.gradle b/app/build.gradle index 518b257c..831cd64f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -105,6 +105,13 @@ android { } else { output.versionCodeOverride = 100 * project.android.defaultConfig.versionCode } + + def abi = output.getFilter(com.android.build.OutputFile.ABI) ?: "universal" + if (variant.flavorName == "github") { + output.outputFileName = "YTDLnis-${versionName}-${abi}-${variant.buildType.name}.apk" + } else { + output.outputFileName = "YTDLnis-${versionName}-foss-${abi}-${variant.buildType.name}.apk" + } } } @@ -160,16 +167,15 @@ dependencies { // implementation "com.github.yausername.youtubedl-android:ffmpeg:$youtubedlAndroidVer" // implementation "com.github.yausername.youtubedl-android:aria2c:$youtubedlAndroidVer" - implementation "io.github.junkfood02.youtubedl-android:library:0.18.1" + //implementation "io.github.junkfood02.youtubedl-android:library:0.17.4" //implementation "io.github.junkfood02.youtubedl-android:ffmpeg:0.18.1" - implementation "io.github.junkfood02.youtubedl-android:aria2c:0.18.1" - -// implementation "io.github.junkfood02.youtubedl-android:library:0.17.4" //noinspection NewerVersionAvailable implementation "io.github.junkfood02.youtubedl-android:ffmpeg:0.17.2" -// implementation "io.github.junkfood02.youtubedl-android:aria2c:0.17.2" + + implementation "io.github.junkfood02.youtubedl-android:aria2c:0.18.1" + //implementation "io.github.junkfood02.youtubedl-android:aria2c:0.17.2" implementation "androidx.appcompat:appcompat:1.7.1" implementation "androidx.constraintlayout:constraintlayout:2.2.1" diff --git a/app/src/main/java/com/deniscerri/ytdl/ui/more/terminal/TerminalFragment.kt b/app/src/main/java/com/deniscerri/ytdl/ui/more/terminal/TerminalFragment.kt index 8790a60e..65a7fff7 100644 --- a/app/src/main/java/com/deniscerri/ytdl/ui/more/terminal/TerminalFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdl/ui/more/terminal/TerminalFragment.kt @@ -43,6 +43,7 @@ import com.google.android.material.bottomappbar.BottomAppBar import com.google.android.material.slider.Slider import com.termux.terminal.TerminalSession import com.termux.view.TerminalView +import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.launch @@ -319,7 +320,10 @@ class TerminalFragment : Fragment() { } terminalViewModel.setFont(ResourcesCompat.getFont(requireContext(), R.font.jetbrainsmono_medium)!!) - session.write("yt-dlp ") + CoroutineScope(Dispatchers.Main).launch { + delay(100) + session.write("yt-dlp ") + } } } diff --git a/app/src/main/java/com/deniscerri/ytdl/util/UpdateUtil.kt b/app/src/main/java/com/deniscerri/ytdl/util/UpdateUtil.kt index 1f2537d7..47b21358 100644 --- a/app/src/main/java/com/deniscerri/ytdl/util/UpdateUtil.kt +++ b/app/src/main/java/com/deniscerri/ytdl/util/UpdateUtil.kt @@ -161,7 +161,7 @@ class UpdateUtil(var context: Context) { suspend fun downloadReleaseApk(release: GithubRelease, onProgress: (Long) -> Unit) : Result { return withContext(Dispatchers.IO) { try { - val releaseVersion = release.assets.firstOrNull { it.name.contains(Build.SUPPORTED_ABIS[0]) && it.name.contains("github") }!! + val releaseVersion = release.assets.firstOrNull { it.name.contains(Build.SUPPORTED_ABIS[0]) && !it.name.contains("foss") }!! File(FileUtil.getDefaultApksPath()).mkdirs() val tempApk = File(FileUtil.getDefaultApksPath(), "${releaseVersion.browser_download_url.split("/").last()}")