diff --git a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioHash.java b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioHash.java
deleted file mode 100644
index 8d15adfc79..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioHash.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package org.thoughtcrime.securesms.audio;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import org.thoughtcrime.securesms.database.model.databaseprotos.AudioWaveFormData;
-import org.signal.core.util.ParcelUtil;
-import org.signal.core.util.Base64;
-
-import java.io.IOException;
-import java.util.Objects;
-
-/**
- * An AudioHash is a compact string representation of the wave form and duration for an audio file.
- */
-public final class AudioHash implements Parcelable {
-
-  @NonNull private final String            hash;
-  @NonNull private final AudioWaveFormData audioWaveForm;
-
-  private AudioHash(@NonNull String hash, @NonNull AudioWaveFormData audioWaveForm) {
-    this.hash          = hash;
-    this.audioWaveForm = audioWaveForm;
-  }
-
-  public AudioHash(@NonNull AudioWaveFormData audioWaveForm) {
-    this(Base64.encodeWithPadding(audioWaveForm.encode()), audioWaveForm);
-  }
-
-  protected AudioHash(Parcel in) {
-    hash = Objects.requireNonNull(in.readString());
-
-    try {
-      audioWaveForm = AudioWaveFormData.ADAPTER.decode(Objects.requireNonNull(ParcelUtil.readByteArray(in)));
-    } catch (IOException e) {
-      throw new AssertionError();
-    }
-  }
-
-  @Override
-  public void writeToParcel(Parcel dest, int flags) {
-    dest.writeString(hash);
-    ParcelUtil.writeByteArray(dest, audioWaveForm.encode());
-  }
-
-  @Override
-  public int describeContents() {
-    return 0;
-  }
-
-  public static final Creator<AudioHash> CREATOR = new Creator<>() {
-    @Override
-    public AudioHash createFromParcel(Parcel in) {
-      return new AudioHash(in);
-    }
-
-    @Override
-    public AudioHash[] newArray(int size) {
-      return new AudioHash[size];
-    }
-  };
-
-  public static @Nullable AudioHash parseOrNull(@Nullable String hash) {
-    if (hash == null) return null;
-    try {
-      return new AudioHash(hash, AudioWaveFormData.ADAPTER.decode(Base64.decode(hash)));
-    } catch (IOException e) {
-      return null;
-    }
-  }
-
-  @NonNull AudioWaveFormData getAudioWaveForm() {
-    return audioWaveForm;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    AudioHash other = (AudioHash) o;
-    return hash.equals(other.hash);
-  }
-
-  @Override
-  public int hashCode() {
-    return hash.hashCode();
-  }
-
-  public @NonNull String getHash() {
-    return hash;
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioHash.kt b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioHash.kt
new file mode 100644
index 0000000000..cbcbfcd9aa
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioHash.kt
@@ -0,0 +1,60 @@
+package org.thoughtcrime.securesms.audio
+
+import android.os.Parcel
+import android.os.Parcelable
+import kotlinx.parcelize.Parceler
+import kotlinx.parcelize.Parcelize
+import kotlinx.parcelize.TypeParceler
+import org.signal.core.util.Base64
+import org.signal.core.util.ParcelUtil
+import org.thoughtcrime.securesms.database.model.databaseprotos.AudioWaveFormData
+import java.io.IOException
+
+/**
+ * An AudioHash is a compact string representation of the wave form and duration for an audio file.
+ */
+@Parcelize
+class AudioHash private constructor(
+  val hash: String,
+  @TypeParceler<AudioWaveFormData, AudioWaveFormDataParceler>() internal val audioWaveForm: AudioWaveFormData
+) : Parcelable {
+
+  companion object {
+    @JvmStatic
+    fun parseOrNull(hash: String?): AudioHash? {
+      if (hash == null) {
+        return null
+      }
+
+      return try {
+        AudioHash(hash, AudioWaveFormData.ADAPTER.decode(Base64.decode(hash)))
+      } catch (e: IOException) {
+        null
+      }
+    }
+  }
+
+  constructor(audioWaveForm: AudioWaveFormData) : this(Base64.encodeWithPadding(audioWaveForm.encode()), audioWaveForm)
+
+  override fun equals(other: Any?): Boolean {
+    if (this === other) {
+      return true
+    }
+    if (other == null || javaClass != other.javaClass) {
+      return false
+    }
+    return hash == (other as AudioHash).hash
+  }
+
+  override fun hashCode(): Int = hash.hashCode()
+}
+
+private object AudioWaveFormDataParceler : Parceler<AudioWaveFormData> {
+  override fun create(parcel: Parcel): AudioWaveFormData {
+    return AudioWaveFormData.ADAPTER.decode(requireNotNull(ParcelUtil.readByteArray(parcel)))
+  }
+
+  override fun AudioWaveFormData.write(parcel: Parcel, flags: Int) {
+    ParcelUtil.writeByteArray(parcel, encode())
+  }
+}