From 4606745f2c4ed9c5ec9f94bfc65da58102cff4a5 Mon Sep 17 00:00:00 2001 From: Christine Coenen Date: Thu, 26 Oct 2023 15:25:38 +0200 Subject: [PATCH] Fix crash when restarting Zapp after removing a sd card with download files --- .../controller/downloads/DownloadFileInfoManager.kt | 12 ++++++++++-- app/src/main/res/raw/changelog.md | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/de/christinecoenen/code/zapp/app/mediathek/controller/downloads/DownloadFileInfoManager.kt b/app/src/main/java/de/christinecoenen/code/zapp/app/mediathek/controller/downloads/DownloadFileInfoManager.kt index 2d0025d8..785a3be9 100644 --- a/app/src/main/java/de/christinecoenen/code/zapp/app/mediathek/controller/downloads/DownloadFileInfoManager.kt +++ b/app/src/main/java/de/christinecoenen/code/zapp/app/mediathek/controller/downloads/DownloadFileInfoManager.kt @@ -18,7 +18,7 @@ import java.io.File import java.io.FileNotFoundException import java.io.FileOutputStream import java.io.OutputStream -import java.util.* +import java.util.UUID class DownloadFileInfoManager( private val applicationContext: Context, @@ -80,12 +80,20 @@ class DownloadFileInfoManager( resolver.delete(filePathUri, null, null) } catch (e: SecurityException) { // maybe file is already deleted - that's okay + } catch (e: IllegalArgumentException) { + // most likely the external volume has been removed - + // its not worth raising this error + Timber.e(e) } DownloadStatus.COMPLETED -> { val videoContentValues = ContentValues() videoContentValues.put(MediaStore.Video.Media.IS_PENDING, 0) - resolver.update(filePathUri, videoContentValues, null, null) + try { + resolver.update(filePathUri, videoContentValues, null, null) + } catch (e: SecurityException) { + // maybe file is already deleted - that's okay - db entry will adapt + } } else -> {} diff --git a/app/src/main/res/raw/changelog.md b/app/src/main/res/raw/changelog.md index e751ecb9..b14e68ee 100644 --- a/app/src/main/res/raw/changelog.md +++ b/app/src/main/res/raw/changelog.md @@ -1,5 +1,6 @@ # v-next * Von Exoplayer auf neue Media-3-Bibliothek umgestiegen +* Absturz beim Starten von Zapp behoben, wenn vorher eine SD-Karte mit Downloads entfernt wurde * Zapp auf Android 14 vorbereitet # 8.3.2