From 41933cef4a3518942df3040498c570a5336a4d63 Mon Sep 17 00:00:00 2001 From: moezbhatti Date: Sun, 18 Nov 2018 10:05:28 -0500 Subject: [PATCH] #1326 - Fix crash when there's a non-backup file in directory --- .../moez/QKSMS/repository/BackupRepositoryImpl.kt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt index 9ba3b1a5..5a153549 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt @@ -25,6 +25,7 @@ import androidx.core.content.contentValuesOf import com.moez.QKSMS.model.BackupFile import com.moez.QKSMS.model.Message import com.moez.QKSMS.util.QkFileObserver +import com.moez.QKSMS.util.tryOrNull import com.squareup.moshi.Moshi import io.reactivex.Observable import io.reactivex.schedulers.Schedulers @@ -148,15 +149,15 @@ class BackupRepositoryImpl @Inject constructor( .subscribeOn(Schedulers.io()) .observeOn(Schedulers.computation()) .map { files -> - files.map { file -> - val backup = Okio.buffer(Okio.source(file)).use { source -> - moshi.adapter(BackupMetadata::class.java).fromJson(source) - } - + files.mapNotNull { file -> + val adapter = moshi.adapter(BackupMetadata::class.java) + val backup = tryOrNull(false) { + Okio.buffer(Okio.source(file)).use(adapter::fromJson) + } ?: return@mapNotNull null val path = file.path val date = file.lastModified() - val messages = backup?.messageCount ?: 0 + val messages = backup.messageCount val size = file.length() BackupFile(path, date, messages, size) }