2 files changed, 5 insertions, 3 deletions
diff --git a/openpgp-ktx/src/main/java/me/msfjarvis/openpgpktx/AutocryptPeerUpdate.kt b/openpgp-ktx/src/main/java/me/msfjarvis/openpgpktx/AutocryptPeerUpdate.kt
index 45ee5755..6690fe35 100644
--- a/openpgp-ktx/src/main/java/me/msfjarvis/openpgpktx/AutocryptPeerUpdate.kt
+++ b/openpgp-ktx/src/main/java/me/msfjarvis/openpgpktx/AutocryptPeerUpdate.kt
@@ -25,6 +25,7 @@ public class AutocryptPeerUpdate() : Parcelable {
     this.preferEncrypt = preferEncrypt
   }
 
+  @Suppress("UNUSED_PARAMETER")
   private constructor(source: Parcel, version: Int) : this() {
     keyData = source.createByteArray()
     effectiveDate = if (source.readInt() != 0) Date(source.readLong()) else null
@@ -85,7 +86,8 @@ public class AutocryptPeerUpdate() : Parcelable {
   public companion object CREATOR : Creator<AutocryptPeerUpdate> {
 
     private const val PARCELABLE_VERSION = 1
-    override fun createFromParcel(source: Parcel): AutocryptPeerUpdate? {
+
+    override fun createFromParcel(source: Parcel): AutocryptPeerUpdate {
       val version = source.readInt() // parcelableVersion
       val parcelableSize = source.readInt()
       val startPosition = source.dataPosition()
@@ -95,7 +97,7 @@ public class AutocryptPeerUpdate() : Parcelable {
       return vr
     }
 
-    override fun newArray(size: Int): Array<AutocryptPeerUpdate?>? {
+    override fun newArray(size: Int): Array<AutocryptPeerUpdate?> {
       return arrayOfNulls(size)
     }
   }
diff --git a/openpgp-ktx/src/main/java/me/msfjarvis/openpgpktx/util/OpenPgpUtils.kt b/openpgp-ktx/src/main/java/me/msfjarvis/openpgpktx/util/OpenPgpUtils.kt
index c70d9c3c..aee5babe 100644
--- a/openpgp-ktx/src/main/java/me/msfjarvis/openpgpktx/util/OpenPgpUtils.kt
+++ b/openpgp-ktx/src/main/java/me/msfjarvis/openpgpktx/util/OpenPgpUtils.kt
@@ -64,7 +64,7 @@ public object OpenPgpUtils {
     if (userId.isNotEmpty()) {
       val matcher = USER_ID_PATTERN.matcher(userId)
       if (matcher.matches()) {
-        var name = if (matcher.group(1).isEmpty()) null else matcher.group(1)
+        var name = if (matcher.group(1)?.isEmpty() == true) null else matcher.group(1)
         val comment = matcher.group(2)
         var email = matcher.group(3)
         if (email != null && name != null) {