mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-04 14:13:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into sendButton

Browse Source
This commit is contained in:
Kevin Hester
2021-11-18 02:02:34 +08:00
committed by GitHub
parent 15161862f3 b8e9b68c0d
commit d867c5c85e
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt
View File

@@ -1,5 +1,6 @@
package com.geeksville.mesh.ui
import android.graphics.Color
import android.os.Bundle
import android.text.InputType
import android.view.LayoutInflater
@@ -57,7 +58,7 @@ class MessagesFragment : ScreenFragment("Messages"), Logging {
private fun getShortDateTime(time: Date): String {
// return time if within 24 hours, otherwise date/time
val one_day = 60 * 60 * 24 * 100L
val one_day = 60 * 60 * 24 * 1000
if (System.currentTimeMillis() - time.time > one_day) {
return dateTimeFormat.format(time)
} else return timeFormat.format(time)
@@ -145,7 +146,8 @@ class MessagesFragment : ScreenFragment("Messages"), Logging {
val nodes = model.nodeDB.nodes.value!!
val node = nodes.get(msg.from)
// Determine if this is my message (originated on this device).
val isMe = model.myNodeInfo.value?.myNodeNum == node?.num
// val isMe = model.myNodeInfo.value?.myNodeNum == node?.num
val isMe = msg.from == "^local"
// Set cardview offset and color.
val marginParams = holder.card.layoutParams as ViewGroup.MarginLayoutParams
@@ -183,7 +185,7 @@ class MessagesFragment : ScreenFragment("Messages"), Logging {
holder.username.text = user?.shortName ?: msg.from
}
if (msg.errorMessage != null) {
// FIXME, set the style to show a red error message
context?.let { holder.card.setCardBackgroundColor(Color.RED) }
holder.messageText.text = msg.errorMessage
} else {
holder.messageText.text = msg.text