diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentUploadUtil.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentUploadUtil.kt
index c74e291b03..16a2970eaf 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentUploadUtil.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentUploadUtil.kt
@@ -69,7 +69,7 @@ object AttachmentUploadUtil {
   @Throws(IOException::class)
   private fun getImageBlurHash(context: Context, attachment: Attachment): String? {
     if (attachment.blurHash != null) {
-      return attachment.blurHash!!.hash
+      return attachment.blurHash.hash
     }
 
     if (attachment.uri == null) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt
index bd19c2e83b..6892c9920f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt
@@ -282,7 +282,7 @@ class ChatItemArchiveExporter(
         var previousEdits = revisionMap[record.latestRevisionId]
         if (previousEdits == null) {
           previousEdits = ArrayList()
-          revisionMap[record.latestRevisionId!!] = previousEdits
+          revisionMap[record.latestRevisionId] = previousEdits
         }
         previousEdits += builder.build()
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/segmentedprogressbar/SegmentedProgressBar.kt b/app/src/main/java/org/thoughtcrime/securesms/components/segmentedprogressbar/SegmentedProgressBar.kt
index 0ad979ed7e..7725d29921 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/segmentedprogressbar/SegmentedProgressBar.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/segmentedprogressbar/SegmentedProgressBar.kt
@@ -226,10 +226,10 @@ class SegmentedProgressBar : View, ViewPager.OnPageChangeListener, View.OnTouchL
           0, segments.lastIndex -> {
             path.reset()
             path.addRoundRect(rectangle, corners, Path.Direction.CW)
-            canvas?.drawPath(path, drawingComponents.second[drawingIndex])
+            canvas.drawPath(path, drawingComponents.second[drawingIndex])
           }
 
-          else -> canvas?.drawRect(
+          else -> canvas.drawRect(
             rectangle,
             drawingComponents.second[drawingIndex]
           )
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/CallLinkTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/CallLinkTable.kt
index 1bba9b3c7e..ba015772a8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/CallLinkTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/CallLinkTable.kt
@@ -116,7 +116,7 @@ class CallLinkTable(context: Context, databaseHelper: SignalDatabase) : Database
     AppDependencies.databaseObserver.notifyCallLinkObservers(callLink.roomId)
     AppDependencies.databaseObserver.notifyCallUpdateObservers()
 
-    return recipientId!!
+    return recipientId
   }
 
   fun updateCallLinkCredentials(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/CreateReleaseChannelJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/CreateReleaseChannelJob.kt
index d589a05371..366711483d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/CreateReleaseChannelJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/CreateReleaseChannelJob.kt
@@ -54,7 +54,7 @@ class CreateReleaseChannelJob private constructor(parameters: Parameters) : Base
       Log.i(TAG, "Already created Release Channel recipient ${SignalStore.releaseChannel.releaseChannelRecipientId}")
 
       val recipient = Recipient.resolved(SignalStore.releaseChannel.releaseChannelRecipientId!!)
-      if (recipient.profileAvatar == null || recipient.profileAvatar?.isEmpty() == true) {
+      if (recipient.profileAvatar.isNullOrEmpty()) {
         setAvatar(recipient.id)
       }
     } else {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/verify/VerifySafetyNumberViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/verify/VerifySafetyNumberViewModel.kt
index 9abd39e2dd..ec892bd1fe 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/verify/VerifySafetyNumberViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/verify/VerifySafetyNumberViewModel.kt
@@ -158,7 +158,7 @@ data class SafetyNumberFingerprint(
     result = 31 * result + (localIdentityKey?.hashCode() ?: 0)
     result = 31 * result + (remoteStableIdentifier?.contentHashCode() ?: 0)
     result = 31 * result + (remoteIdentityKey?.hashCode() ?: 0)
-    result = 31 * result + (fingerprint?.hashCode() ?: 0)
+    result = 31 * result + fingerprint.hashCode()
     return result
   }
 }