Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 04:58:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix default name for linked devices.

Browse Source
This commit is contained in:
Michelle Tang
2024-07-01 16:44:53 -04:00
committed by GitHub
parent 1311ec498f
commit c24473e176
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/linkdevice/Device.kt
View File

@@ -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)

5
app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceFragment.kt
View File

@@ -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)