6543/BayernMessenger
1
0
Fork 0
forked from GitHub-Mirror/riotX-android
Code Issues 4 Pull Requests Releases Wiki Activity

Fix issue: lastSeenTs can be null

Browse Source
This commit is contained in:
Benoit Marty 2019-06-11 13:57:35 +02:00
parent f6c36670c3
commit 64e5fed7ac
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/DeviceInfo.kt
View File

@ -48,7 +48,7 @@ data class DeviceInfo(
* The last time this device has been seen. * The last time this device has been seen.
*/ */
@Json(name = "last_seen_ts") @Json(name = "last_seen_ts")
var lastSeenTs: Long = 0, var lastSeenTs: Long? = null,


/** /**
* The last ip address * The last ip address
@ -58,6 +58,6 @@ data class DeviceInfo(
) : DatedObject { ) : DatedObject {


override val date: Long override val date: Long
get() = lastSeenTs get() = lastSeenTs ?: 0


} }

20
vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsPreferencesFragment.kt
View File

@ -2379,19 +2379,21 @@ class VectorSettingsPreferencesFragment : VectorPreferenceFragment(), SharedPref


// last seen info // last seen info
textView = layout.findViewById(R.id.device_last_seen) textView = layout.findViewById(R.id.device_last_seen)
if (!TextUtils.isEmpty(aDeviceInfo.lastSeenIp)) {
val lastSeenIp = aDeviceInfo.lastSeenIp val lastSeenIp = aDeviceInfo.lastSeenIp?.takeIf { ip -> ip.isNotBlank() } ?: "-"

val lastSeenTime = aDeviceInfo.lastSeenTs?.let { ts ->
val dateFormatTime = SimpleDateFormat("HH:mm:ss") val dateFormatTime = SimpleDateFormat("HH:mm:ss")
val time = dateFormatTime.format(Date(aDeviceInfo.lastSeenTs)) val date = Date(ts)

val time = dateFormatTime.format(date)
val dateFormat = DateFormat.getDateInstance(DateFormat.SHORT, Locale.getDefault()) val dateFormat = DateFormat.getDateInstance(DateFormat.SHORT, Locale.getDefault())
val lastSeenTime = dateFormat.format(Date(aDeviceInfo.lastSeenTs)) + ", " + time
dateFormat.format(date) + ", " + time
} ?: "-"

val lastSeenInfo = getString(R.string.devices_details_last_seen_format, lastSeenIp, lastSeenTime) val lastSeenInfo = getString(R.string.devices_details_last_seen_format, lastSeenIp, lastSeenTime)
textView.text = lastSeenInfo textView.text = lastSeenInfo
} else {
// hide last time seen section
layout.findViewById<View>(R.id.device_last_seen_title).visibility = View.GONE
textView.visibility = View.GONE
}


// title & icon // title & icon
builder.setTitle(R.string.devices_details_dialog_title) builder.setTitle(R.string.devices_details_dialog_title)