UUID crash fix

instructure · Jan 27, 2023 · 7a73191 · 7a73191
1 parent f53de62
commit 7a73191
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.../teacher/src/main/java/com/instructure/teacher/presenters/SpeedGraderCommentsPresenter.kt b/.../teacher/src/main/java/com/instructure/teacher/presenters/SpeedGraderCommentsPresenter.kt
@@ -408,8 +408,10 @@ class SpeedGraderCommentsPresenter(
 
     private fun subscribePendingWorkers() {
         subscribeJob = weave {
-            val pendingComments = pendingSubmissionCommentDao.findByPageId(mPageId).orEmpty()
-            viewCallback?.subscribePendingWorkers(pendingComments.mapNotNull { UUID.fromString( it.pendingSubmissionCommentEntity.workerId) })
+            val workerIds = pendingSubmissionCommentDao.findByPageId(mPageId).orEmpty()
+                .filter { it.pendingSubmissionCommentEntity.workerId != null && it.pendingSubmissionCommentEntity.workerId != "null" }
+                .mapNotNull { UUID.fromString(it.pendingSubmissionCommentEntity.workerId) }
+            viewCallback?.subscribePendingWorkers(workerIds)
         }
     }
 }
diff --git a/...java/com/instructure/pandautils/room/model/PendingSubmissionCommentWithFileUploadInput.kt b/...java/com/instructure/pandautils/room/model/PendingSubmissionCommentWithFileUploadInput.kt
@@ -27,7 +27,11 @@ data class PendingSubmissionCommentWithFileUploadInput(
             date = pendingSubmissionCommentEntity.date
             id = pendingSubmissionCommentEntity.id
             status = CommentSendStatus.valueOf(pendingSubmissionCommentEntity.status)
-            workerId = UUID.fromString(pendingSubmissionCommentEntity.workerId)
+            workerId = if (pendingSubmissionCommentEntity.workerId != null && pendingSubmissionCommentEntity.workerId != "null") {
+                UUID.fromString(pendingSubmissionCommentEntity.workerId)
+            } else {
+                null
+            }
             workerInputData = FileUploadWorkerData(
                 fileUploadInput?.filePaths ?: emptyList(),
                 fileUploadInput?.courseId ?: -1L,