Merge pull request #14837 from woocommerce/issue/woomob-1449-crash-due-to-encrypted-logs-writing

Prevent crash when creating or adding logs to file

Author: hichamboushaba

WooCommerce/src/main/kotlin/com/woocommerce/android/util/crashlogging/EncryptedLogsFileProvider.kt

@@ -10,13 +10,16 @@ class EncryptedLogsFileProvider @Inject constructor(
     private val wooLog: WooLog,
     private val dispatchers: CoroutineDispatchers
 ) {
-    suspend fun provide(): File {
+    suspend fun provide(): File? {
         return withContext(dispatchers.io) {
-            val logs = wooLog.getCurrentLogEntries().take(LOG_ENTRIES_LIMIT)
-
-            File.createTempFile("log", "").apply {
-                appendText(logs.joinToString("\n"))
-            }
+            runCatching {
+                val logs = wooLog.getCurrentLogEntries().take(LOG_ENTRIES_LIMIT)
+                File.createTempFile("log", "").apply {
+                    appendText(logs.joinToString("\n"))
+                }
+            }.onFailure { exception ->
+                WooLog.e(WooLog.T.UTILS, "Could not create log file: ${exception.message}")
+            }.getOrNull()
         }
     }
 

WooCommerce/src/main/kotlin/com/woocommerce/android/util/crashlogging/EnqueueSendingEncryptedLogs.kt

@@ -21,20 +21,23 @@ class EnqueueSendingEncryptedLogs @Inject constructor(
         eventLevel: EventLevel
     ) {
         if (eventLevel == FATAL) {
-            val logs = runBlocking { encryptedLogsFileProvider.provide() }
-            encryptedLogging.enqueueSendingEncryptedLogs(
-                uuid = uuid,
-                file = logs,
-                shouldUploadImmediately = false
-            )
-        } else {
-            appCoroutineScope.launch {
+            runBlocking { encryptedLogsFileProvider.provide() }?.let { logs ->
                 encryptedLogging.enqueueSendingEncryptedLogs(
                     uuid = uuid,
-                    file = encryptedLogsFileProvider.provide(),
-                    shouldUploadImmediately = networkStatus.isConnected()
+                    file = logs,
+                    shouldUploadImmediately = false
                 )
             }
+        } else {
+            appCoroutineScope.launch {
+                encryptedLogsFileProvider.provide()?.let { logs ->
+                    encryptedLogging.enqueueSendingEncryptedLogs(
+                        uuid = uuid,
+                        file = logs,
+                        shouldUploadImmediately = networkStatus.isConnected()
+                    )
+                }
+            }
         }
     }
 }