From 16409db6898a0e2f55307b9e568647ba8476b7e8 Mon Sep 17 00:00:00 2001 From: moezbhatti Date: Mon, 4 Mar 2019 23:43:36 -0500 Subject: [PATCH] #1332 - Don't allow bad message to break restore, send log when messages fail to restore --- .../moez/QKSMS/repository/BackupRepositoryImpl.kt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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 11de5366..f91cf498 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt @@ -176,6 +176,7 @@ class BackupRepositoryImpl @Inject constructor( } val messageCount = backup?.messages?.size ?: 0 + var errorCount = 0 backup?.messages?.forEachIndexed { index, message -> if (stopFlag) { @@ -187,7 +188,8 @@ class BackupRepositoryImpl @Inject constructor( // Update the progress restoreProgress.onNext(BackupRepository.Progress.Running(messageCount, index)) - context.contentResolver.insert(Telephony.Sms.CONTENT_URI, contentValuesOf( + try { + context.contentResolver.insert(Telephony.Sms.CONTENT_URI, contentValuesOf( Telephony.Sms.TYPE to message.type, Telephony.Sms.ADDRESS to message.address, Telephony.Sms.DATE to message.date, @@ -200,6 +202,14 @@ class BackupRepositoryImpl @Inject constructor( Telephony.Sms.SERVICE_CENTER to message.serviceCenter, Telephony.Sms.LOCKED to message.locked, Telephony.Sms.SUBSCRIPTION_ID to message.subId)) + } catch (e: Exception) { + Timber.w(e) + errorCount++ + } + } + + if (errorCount > 0) { + Timber.w(Exception("Failed to backup $errorCount/$messageCount messages")) } // Sync the messages