evilcorpltd · robinlinden · Feb 8, 2025
diff --git a/atox/src/androidTest/kotlin/ui/AvatarFactoryTest.kt b/atox/src/androidTest/kotlin/ui/AvatarFactoryTest.kt
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Robin Lindén <[email protected]>
+// SPDX-FileCopyrightText: 2022-2025 Robin Lindén <[email protected]>
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
@@ -7,16 +7,19 @@ package ltd.evilcorp.atox.ui
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import kotlin.test.Test
+import ltd.evilcorp.core.vo.PublicKey
 import org.junit.runner.RunWith
 
+private val pk = PublicKey("123")
+
 @RunWith(AndroidJUnit4::class)
 class AvatarFactoryTest {
     @Test
     fun emptyName() {
         AvatarFactory.create(
             InstrumentationRegistry.getInstrumentation().targetContext.resources,
             name = "",
-            publicKey = "123",
+            pk = pk,
         )
     }
 
@@ -25,7 +28,7 @@ class AvatarFactoryTest {
         AvatarFactory.create(
             InstrumentationRegistry.getInstrumentation().targetContext.resources,
             name = "a ",
-            publicKey = "123",
+            pk = pk,
         )
     }
 }
diff --git a/atox/src/main/kotlin/ActionReceiver.kt b/atox/src/main/kotlin/ActionReceiver.kt
@@ -76,18 +76,18 @@ class ActionReceiver : BroadcastReceiver() {
                 Log.e(TAG, "Got intent without required key $KEY_CONTACT_PK $intent")
                 return@launch
             }
-            if (!contactRepository.exists(pk.string())) {
+            if (!contactRepository.exists(pk)) {
                 notificationHelper.dismissNotifications(pk)
                 notificationHelper.dismissCallNotification(pk)
                 return@launch
             }
 
             RemoteInput.getResultsFromIntent(intent)?.let { results ->
                 results.getCharSequence(KEY_TEXT_REPLY)?.toString()?.let { input ->
-                    contactRepository.setHasUnreadMessages(pk.string(), false)
+                    contactRepository.setHasUnreadMessages(pk, false)
                     chatManager.sendMessage(pk, input)
                     notificationHelper.showMessageNotification(
-                        Contact(pk.string(), tox.getName()),
+                        Contact(pk, tox.getName()),
                         input,
                         outgoing = true,
                     )
@@ -103,7 +103,7 @@ class ActionReceiver : BroadcastReceiver() {
                 }
                 Action.CallIgnore -> callManager.removePendingCall(pk)
                 Action.MarkAsRead -> {
-                    contactRepository.setHasUnreadMessages(pk.string(), false)
+                    contactRepository.setHasUnreadMessages(pk, false)
                     notificationHelper.dismissNotifications(pk)
                 }
                 null -> Log.e(TAG, "Missing action in intent $intent")
@@ -117,7 +117,7 @@ class ActionReceiver : BroadcastReceiver() {
                 it
             } else {
                 Log.e(TAG, "Unable to get contact ${pk.fingerprint()} for call notification")
-                Contact(publicKey = pk.string(), name = pk.fingerprint())
+                Contact(publicKey = pk, name = pk.fingerprint())
             }
         }
 

diff --git a/atox/src/main/kotlin/ToxService.kt b/atox/src/main/kotlin/ToxService.kt
@@ -139,7 +139,7 @@ class ToxService : LifecycleService() {
         }
 
         lifecycleScope.launch(Dispatchers.Default) {
-            userRepository.get(tox.publicKey.string())
+            userRepository.get(tox.publicKey)
                 .filterNotNull()
                 .filter { it.connectionStatus != connectionStatus }
                 .flowWithLifecycle(lifecycle)

diff --git a/atox/src/main/kotlin/tox/EventListenerCallbacks.kt b/atox/src/main/kotlin/tox/EventListenerCallbacks.kt
@@ -52,9 +52,6 @@ private fun isImage(filename: String) = try {
     false
 }
 
-private const val FINGERPRINT_LEN = 8
-private fun String.fingerprint() = this.take(FINGERPRINT_LEN)
-
 @Singleton
 class EventListenerCallbacks @Inject constructor(
     private val ctx: Context,
@@ -73,7 +70,7 @@ class EventListenerCallbacks @Inject constructor(
     private var audioPlayer: AudioPlayer? = null
     private val scope = CoroutineScope(Dispatchers.Default)
 
-    private suspend fun tryGetContact(pk: String, tag: String) = contactRepository.get(pk).firstOrNull().let {
+    private suspend fun tryGetContact(pk: PublicKey, tag: String) = contactRepository.get(pk).firstOrNull().let {
         if (it == null) Log.e(TAG, "$tag -> unable to get contact for ${pk.fingerprint()}")
         it
     }
@@ -147,7 +144,7 @@ class EventListenerCallbacks @Inject constructor(
         }
 
         fileRecvHandler = { publicKey, fileNo, kind, fileSize, filename ->
-            val name = if (kind == FileKind.Avatar.ordinal) publicKey else filename
+            val name = if (kind == FileKind.Avatar.ordinal) publicKey.string() else filename
 
             val id = fileTransferManager.add(FileTransfer(publicKey, fileNo, kind, fileSize, name, outgoing = false))
 
@@ -168,16 +165,16 @@ class EventListenerCallbacks @Inject constructor(
             }
         }
 
-        fileRecvControlHandler = { publicKey: String, fileNo: Int, control: ToxFileControl ->
-            fileTransferManager.setStatus(publicKey, fileNo, control)
+        fileRecvControlHandler = { pk: PublicKey, fileNo: Int, control: ToxFileControl ->
+            fileTransferManager.setStatus(pk, fileNo, control)
         }
 
-        fileChunkRequestHandler = { publicKey: String, fileNo: Int, position: Long, length: Int ->
-            fileTransferManager.sendChunk(publicKey, fileNo, position, length)
+        fileChunkRequestHandler = { pk: PublicKey, fileNo: Int, position: Long, length: Int ->
+            fileTransferManager.sendChunk(pk, fileNo, position, length)
         }
 
         selfConnectionStatusHandler = { status ->
-            userRepository.updateConnection(tox.publicKey.string(), status)
+            userRepository.updateConnection(tox.publicKey, status)
         }
 
         friendTypingHandler = { publicKey, isTyping ->
@@ -201,8 +198,8 @@ class EventListenerCallbacks @Inject constructor(
                 audioPlayer?.stop()
                 audioPlayer?.release()
                 audioPlayer = null
-                notificationHelper.dismissCallNotification(PublicKey(pk))
-                callManager.endCall(PublicKey(pk))
+                notificationHelper.dismissCallNotification(pk)
+                callManager.endCall(pk)
             }
         }
 

diff --git a/atox/src/main/kotlin/ui/AvatarFactory.kt b/atox/src/main/kotlin/ui/AvatarFactory.kt
@@ -1,4 +1,5 @@
-// SPDX-FileCopyrightText: 2019-2022 aTox contributors
+// SPDX-FileCopyrightText: 2019-2025 Robin Lindén <[email protected]>
+// SPDX-FileCopyrightText: 2021-2022 aTox contributors
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
@@ -14,6 +15,7 @@ import android.graphics.RectF
 import android.graphics.Typeface
 import kotlin.math.abs
 import ltd.evilcorp.atox.R
+import ltd.evilcorp.core.vo.PublicKey
 
 internal object AvatarFactory {
 
@@ -27,7 +29,7 @@ internal object AvatarFactory {
     fun create(
         resources: Resources,
         name: String,
-        publicKey: String,
+        pk: PublicKey,
         size: Px = Px(resources.getDimension(R.dimen.default_avatar_size).toInt()),
     ): Bitmap {
         val defaultAvatarSize = resources.getDimension(R.dimen.default_avatar_size)
@@ -37,7 +39,7 @@ internal object AvatarFactory {
         val canvas = Canvas(bitmap)
         val rect = RectF(0f, 0f, bitmap.width.toFloat(), bitmap.height.toFloat())
         val colors = resources.getIntArray(R.array.contactBackgrounds)
-        val backgroundPaint = Paint().apply { color = colors[abs(publicKey.hashCode()).rem(colors.size)] }
+        val backgroundPaint = Paint().apply { color = colors[abs(pk.hashCode()).rem(colors.size)] }
 
         val textPaint = Paint().apply {
             color = Color.WHITE

diff --git a/atox/src/main/kotlin/ui/AvatarImageView.kt b/atox/src/main/kotlin/ui/AvatarImageView.kt
@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: 2022 aTox contributors
-// SPDX-FileCopyrightText: 2022-2024 Robin Lindén <[email protected]>
+// SPDX-FileCopyrightText: 2022-2025 Robin Lindén <[email protected]>
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
@@ -21,6 +21,7 @@ import kotlin.math.sqrt
 import ltd.evilcorp.atox.R
 import ltd.evilcorp.core.vo.ConnectionStatus
 import ltd.evilcorp.core.vo.Contact
+import ltd.evilcorp.core.vo.PublicKey
 import ltd.evilcorp.core.vo.UserStatus
 
 private const val STATUS_INDICATOR_SIZE_RATIO_WITH_AVATAR = 12f / 50
@@ -50,7 +51,7 @@ class AvatarImageView @JvmOverloads constructor(context: Context, attrs: Attribu
         }
 
     private var name = ""
-    private var publicKey = ""
+    private var publicKey = PublicKey("")
     private var avatarUri = ""
 
     fun setFrom(contact: Contact) {

diff --git a/atox/src/main/kotlin/ui/NotificationHelper.kt b/atox/src/main/kotlin/ui/NotificationHelper.kt
@@ -130,7 +130,7 @@ class NotificationHelper @Inject constructor(private val context: Context) {
             .setSmallIcon(android.R.drawable.sym_action_chat)
             .setContentTitle(contact.name.ifEmpty { context.getText(R.string.contact_default_name) })
             .setContentText(message)
-            .setContentIntent(deepLinkToChat(PublicKey(contact.publicKey)))
+            .setContentIntent(deepLinkToChat(contact.publicKey))
             .setAutoCancel(true)
             .setSilent(silent)
 
@@ -143,13 +143,15 @@ class NotificationHelper @Inject constructor(private val context: Context) {
 
             val chatPartner = Person.Builder()
                 .setName(contact.name.ifEmpty { context.getText(R.string.contact_default_name) })
-                .setKey(if (outgoing) "myself" else contact.publicKey)
+                .setKey(if (outgoing) "myself" else contact.publicKey.string())
                 .setIcon(icon)
                 .setImportant(true)
                 .build()
 
             val style =
-                notifierOld.activeNotifications.find { it.notification.group == contact.publicKey }?.notification?.let {
+                notifierOld.activeNotifications.find {
+                    it.notification.group == contact.publicKey.string()
+                }?.notification?.let {
                     NotificationCompat.MessagingStyle.extractMessagingStyleFromNotification(it)
                 } ?: NotificationCompat.MessagingStyle(chatPartner)
 
@@ -159,7 +161,7 @@ class NotificationHelper @Inject constructor(private val context: Context) {
 
             notificationBuilder
                 .setStyle(style)
-                .setGroup(contact.publicKey)
+                .setGroup(contact.publicKey.string())
         }
 
         // I can't find it in the documentation for RemoteInput or anything, but per
@@ -174,7 +176,10 @@ class NotificationHelper @Inject constructor(private val context: Context) {
                         PendingIntentCompat.getBroadcast(
                             context,
                             contact.publicKey.hashCode(),
-                            Intent(context, ActionReceiver::class.java).putExtra(KEY_CONTACT_PK, contact.publicKey),
+                            Intent(context, ActionReceiver::class.java).putExtra(
+                                KEY_CONTACT_PK,
+                                contact.publicKey.string(),
+                            ),
                             PendingIntent.FLAG_UPDATE_CURRENT,
                             mutable = true,
                         ),
@@ -194,7 +199,7 @@ class NotificationHelper @Inject constructor(private val context: Context) {
                     .Builder(
                         IconCompat.createWithResource(context, R.drawable.ic_send),
                         context.getString(R.string.reply),
-                        deepLinkToChat(PublicKey(contact.publicKey), focusMessageBox = true),
+                        deepLinkToChat(contact.publicKey, focusMessageBox = true),
                     )
                     .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_REPLY)
                     .build(),
@@ -209,7 +214,7 @@ class NotificationHelper @Inject constructor(private val context: Context) {
                     context,
                     "${contact.publicKey}_mark_as_read".hashCode(),
                     Intent(context, ActionReceiver::class.java)
-                        .putExtra(KEY_CONTACT_PK, contact.publicKey)
+                        .putExtra(KEY_CONTACT_PK, contact.publicKey.string())
                         .putExtra(KEY_ACTION, Action.MarkAsRead),
                     PendingIntent.FLAG_UPDATE_CURRENT,
                 ),
@@ -258,7 +263,7 @@ class NotificationHelper @Inject constructor(private val context: Context) {
             return
         }
 
-        dismissCallNotification(PublicKey(contact.publicKey))
+        dismissCallNotification(contact.publicKey)
         val notificationBuilder = NotificationCompat.Builder(context, CALL)
             .setCategory(NotificationCompat.CATEGORY_CALL)
             .setSmallIcon(android.R.drawable.ic_menu_call)
@@ -274,8 +279,8 @@ class NotificationHelper @Inject constructor(private val context: Context) {
             .setContentIntent(
                 NavDeepLinkBuilder(context)
                     .setGraph(R.navigation.nav_graph)
-                    .addDestination(R.id.chatFragment, bundleOf(CONTACT_PUBLIC_KEY to contact.publicKey))
-                    .addDestination(R.id.callFragment, bundleOf(CONTACT_PUBLIC_KEY to contact.publicKey))
+                    .addDestination(R.id.chatFragment, bundleOf(CONTACT_PUBLIC_KEY to contact.publicKey.string()))
+                    .addDestination(R.id.callFragment, bundleOf(CONTACT_PUBLIC_KEY to contact.publicKey.string()))
                     .createPendingIntent(),
             )
             .addAction(
@@ -287,7 +292,7 @@ class NotificationHelper @Inject constructor(private val context: Context) {
                             context,
                             "${contact.publicKey}_end_call".hashCode(),
                             Intent(context, ActionReceiver::class.java)
-                                .putExtra(KEY_CONTACT_PK, contact.publicKey)
+                                .putExtra(KEY_CONTACT_PK, contact.publicKey.string())
                                 .putExtra(KEY_ACTION, Action.CallEnd),
                             PendingIntent.FLAG_UPDATE_CURRENT,
                         ),
@@ -315,7 +320,7 @@ class NotificationHelper @Inject constructor(private val context: Context) {
             .setSmallIcon(android.R.drawable.ic_menu_call)
             .setContentTitle(context.getString(R.string.incoming_call))
             .setContentText(context.getString(R.string.incoming_call_from, c.name))
-            .setContentIntent(deepLinkToChat(PublicKey(c.publicKey)))
+            .setContentIntent(deepLinkToChat(c.publicKey))
             .addAction(
                 NotificationCompat.Action
                     .Builder(
@@ -325,7 +330,7 @@ class NotificationHelper @Inject constructor(private val context: Context) {
                             context,
                             "${c.publicKey}_accept_call".hashCode(),
                             Intent(context, ActionReceiver::class.java)
-                                .putExtra(KEY_CONTACT_PK, c.publicKey)
+                                .putExtra(KEY_CONTACT_PK, c.publicKey.string())
                                 .putExtra(KEY_ACTION, Action.CallAccept),
                             PendingIntent.FLAG_UPDATE_CURRENT,
                         ),
@@ -342,7 +347,7 @@ class NotificationHelper @Inject constructor(private val context: Context) {
                             context,
                             "${c.publicKey}_reject_call".hashCode(),
                             Intent(context, ActionReceiver::class.java)
-                                .putExtra(KEY_CONTACT_PK, c.publicKey)
+                                .putExtra(KEY_CONTACT_PK, c.publicKey.string())
                                 .putExtra(KEY_ACTION, Action.CallReject),
                             PendingIntent.FLAG_UPDATE_CURRENT,
                         ),
@@ -354,7 +359,7 @@ class NotificationHelper @Inject constructor(private val context: Context) {
                     context,
                     "${c.publicKey}_ignore_call".hashCode(),
                     Intent(context, ActionReceiver::class.java)
-                        .putExtra(KEY_CONTACT_PK, c.publicKey)
+                        .putExtra(KEY_CONTACT_PK, c.publicKey.string())
                         .putExtra(KEY_ACTION, Action.CallIgnore),
                     PendingIntent.FLAG_UPDATE_CURRENT,
                 ),

diff --git a/atox/src/main/kotlin/ui/addcontact/AddContactFragment.kt b/atox/src/main/kotlin/ui/addcontact/AddContactFragment.kt
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2019-2024 Robin Lindén <[email protected]>
+// SPDX-FileCopyrightText: 2019-2025 Robin Lindén <[email protected]>
 // SPDX-FileCopyrightText: 2020 aTox contributors
 //
 // SPDX-License-Identifier: GPL-3.0-only
@@ -87,7 +87,7 @@ class AddContactFragment : BaseFragment<FragmentAddContactBinding>(FragmentAddCo
             }
 
             if (toxId.error == null) {
-                if (contacts.find { it.publicKey == input.toPublicKey().string() } != null) {
+                if (contacts.find { it.publicKey == input.toPublicKey() } != null) {
                     toxId.error = getString(R.string.tox_id_error_already_exists)
                 }
             }

diff --git a/atox/src/main/kotlin/ui/addcontact/AddContactViewModel.kt b/atox/src/main/kotlin/ui/addcontact/AddContactViewModel.kt
@@ -1,4 +1,5 @@
-// SPDX-FileCopyrightText: 2019-2022 aTox contributors
+// SPDX-FileCopyrightText: 2019-2025 Robin Lindén <[email protected]>
+// SPDX-FileCopyrightText: 2022 aTox contributors
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
@@ -16,6 +17,7 @@ import ltd.evilcorp.core.repository.MessageRepository
 import ltd.evilcorp.core.vo.Contact
 import ltd.evilcorp.core.vo.Message
 import ltd.evilcorp.core.vo.MessageType
+import ltd.evilcorp.core.vo.PublicKey
 import ltd.evilcorp.core.vo.Sender
 import ltd.evilcorp.domain.feature.ContactManager
 import ltd.evilcorp.domain.tox.Tox
@@ -35,7 +37,7 @@ class AddContactViewModel @Inject constructor(
     fun isToxRunning() = tox.started
     fun tryLoadTox(): Boolean = toxStarter.tryLoadTox(null) == ToxSaveStatus.Ok
 
-    private fun addToChatLog(publicKey: String, message: String) = scope.launch {
+    private fun addToChatLog(publicKey: PublicKey, message: String) = scope.launch {
         messageRepository.add(
             Message(
                 publicKey,
@@ -50,6 +52,6 @@ class AddContactViewModel @Inject constructor(
 
     fun addContact(toxId: ToxID, message: String) {
         contactManager.add(toxId, message)
-        addToChatLog(toxId.toPublicKey().string(), message)
+        addToChatLog(toxId.toPublicKey(), message)
     }
 }