mobi/e-ntfy-android
1
0
Fork 0
Code Pull requests Activity

Do not prevent running other deletion tasks when icon does not exist

Browse source
This commit is contained in:
Philipp Heckel 2022-11-19 14:52:29 -05:00
parent 297b319819
commit 69fdd30a26
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/io/heckel/ntfy/work/DeleteWorker.kt
View file

@ -69,7 +69,14 @@ class DeleteWorker(ctx: Context, params: WorkerParameters) : CoroutineWorker(ctx
Log.d(TAG, "Deleting icons for deleted notifications") Log.d(TAG, "Deleting icons for deleted notifications")
val repository = Repository.getInstance(applicationContext) val repository = Repository.getInstance(applicationContext)
val activeIconUris = repository.getActiveIconUris() val activeIconUris = repository.getActiveIconUris()
val activeIconFilenames = activeIconUris.map{ fileStat(applicationContext, Uri.parse(it)).filename }.toSet() val activeIconFilenames = activeIconUris.mapNotNull {
try {
fileStat(applicationContext, Uri.parse(it)).filename
} catch (e: Exception) {
Log.w(TAG, "Unable to stat file $it", e)
null
}
}.toSet()
val iconDir = File(applicationContext.cacheDir, DownloadIconWorker.ICON_CACHE_DIR) val iconDir = File(applicationContext.cacheDir, DownloadIconWorker.ICON_CACHE_DIR)
val allIconFilenames = iconDir.listFiles()?.map{ file -> file.name }.orEmpty() val allIconFilenames = iconDir.listFiles()?.map{ file -> file.name }.orEmpty()
val filenamesToDelete = allIconFilenames.minus(activeIconFilenames) val filenamesToDelete = allIconFilenames.minus(activeIconFilenames)