diff --git a/app/build.gradle b/app/build.gradle index 5e91a9cd..185a081a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -36,7 +36,7 @@ android { targetSdkVersion 30 versionCode 49 - versionName "3.0.0" + versionName "3.0.1" resValue "string", "app_version", "${defaultConfig.versionName}${versionNameSuffix ?: ""}" @@ -94,7 +94,6 @@ dependencies { implementation 'androidx.test.ext:junit-ktx:1.1.3' testImplementation 'org.json:json:20180813' - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation 'androidx.core:core-ktx:1.8.0' implementation 'androidx.appcompat:appcompat:1.4.2' implementation 'com.google.android.material:material:1.5.0' // dont change this to 1.6.0 it looks ugly af diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt index b2219d1c..f6cc0201 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt @@ -32,9 +32,8 @@ class APIRepository(val api: MainAPI) { val hasQuickSearch = api.hasQuickSearch suspend fun load(url: String): Resource { - if (isInvalidData(url)) throw ErrorLoadingException() - return safeApiCall { + if (isInvalidData(url)) throw ErrorLoadingException() api.load(api.fixUrl(url)) ?: throw ErrorLoadingException() } } diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt index 3a69925d..beca6e87 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt @@ -1224,7 +1224,7 @@ class ResultFragment : ResultTrailerPlayer() { sortUrls( currentLinks ?: return@main ),//(currentLinks ?: return@main).filter { !it.isM3u8 }, - getString(R.string.episode_action_download_mirror) + context?.getString(R.string.episode_action_download_mirror) ?: "" ) { link -> startDownload( context, diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt index d9dd9512..9450175b 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt @@ -1602,11 +1602,15 @@ object VideoDownloadManager { } private fun saveQueue() { - val dQueue = - downloadQueue.toList() - .mapIndexed { index, any -> DownloadQueueResumePackage(index, any) } - .toTypedArray() - setKey(KEY_RESUME_QUEUE_PACKAGES, dQueue) + try { + val dQueue = + downloadQueue.toList() + .mapIndexed { index, any -> DownloadQueueResumePackage(index, any) } + .toTypedArray() + setKey(KEY_RESUME_QUEUE_PACKAGES, dQueue) + } catch (e : Exception) { + logError(e) + } } /*fun isMyServiceRunning(context: Context, serviceClass: Class<*>): Boolean { diff --git a/build.gradle b/build.gradle index 1b227907..be01c63b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = "1.6.21" + ext.kotlin_version = "1.7.10" repositories { google() jcenter()