From c24473e176d883304f9b4c29a6f516dd0a092067 Mon Sep 17 00:00:00 2001 From: Michelle Tang Date: Mon, 1 Jul 2024 16:44:53 -0400 Subject: [PATCH] Fix default name for linked devices. --- .../java/org/thoughtcrime/securesms/linkdevice/Device.kt | 2 +- .../thoughtcrime/securesms/linkdevice/LinkDeviceFragment.kt | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/Device.kt b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/Device.kt index a5ed5da636..509eee6343 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/Device.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/Device.kt @@ -3,4 +3,4 @@ package org.thoughtcrime.securesms.linkdevice /** * Class that represents a linked device */ -data class Device(val id: Long, val name: String, val createdMillis: Long, val lastSeenMillis: Long) +data class Device(val id: Long, val name: String?, val createdMillis: Long, val lastSeenMillis: Long) diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceFragment.kt index 27769e2af6..f0f42a0265 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceFragment.kt @@ -200,8 +200,9 @@ fun DeviceDescriptionScreen( } if (state.deviceToRemove != null) { val device: Device = state.deviceToRemove + val name = if (device.name.isNullOrEmpty()) stringResource(R.string.DeviceListItem_unnamed_device) else device.name Dialogs.SimpleAlertDialog( - title = stringResource(id = R.string.DeviceListActivity_unlink_s, device.name), + title = stringResource(id = R.string.DeviceListActivity_unlink_s, name), body = stringResource(id = R.string.DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive), confirm = stringResource(R.string.LinkDeviceFragment__unlink), dismiss = stringResource(android.R.string.cancel), @@ -312,7 +313,7 @@ fun DeviceDescriptionScreen( @Composable fun DeviceRow(device: Device, setDeviceToRemove: (Device) -> Unit) { - val titleString = device.name.ifEmpty { stringResource(R.string.DeviceListItem_unnamed_device) } + val titleString = if (device.name.isNullOrEmpty()) stringResource(R.string.DeviceListItem_unnamed_device) else device.name val linkedDate = DateUtils.getDayPrecisionTimeSpanString(LocalContext.current, Locale.getDefault(), device.createdMillis) val lastActive = DateUtils.getDayPrecisionTimeSpanString(LocalContext.current, Locale.getDefault(), device.lastSeenMillis)