Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add trackerID to message card to allow cards to link to contacts. #1692

Merged
merged 2 commits into from
Jun 15, 2024
Merged

Add trackerID to message card to allow cards to link to contacts. #1692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7b3836
Add trackerID to message card to allow cards to link to contacts.
Apr 26, 2024
b889383
Merge branch 'master' into messagecard
growse Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions project/app/src/main/java/org/owntracks/android/model/messages/MessageCard.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package org.owntracks.android.model.messages
import androidx.databinding.Bindable
import com.fasterxml.jackson.annotation.JsonIgnoreProperties
import com.fasterxml.jackson.annotation.JsonInclude
import com.fasterxml.jackson.annotation.JsonProperty
import com.fasterxml.jackson.annotation.JsonSetter
import com.fasterxml.jackson.annotation.JsonTypeInfo

Expand All @@ -16,6 +17,8 @@ class MessageCard(private val messageWithId: MessageWithId = MessageWithRandomId

@set:JsonSetter var face: String? = null

@JsonInclude(JsonInclude.Include.NON_NULL) @JsonProperty("tid") var trackerId: String? = null

override val baseTopicSuffix: String
get() = BASETOPIC_SUFFIX

Expand Down
5 changes: 5 additions & 0 deletions project/app/src/main/java/org/owntracks/android/net/http/HttpMessageProcessorEndpoint.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import org.owntracks.android.data.repos.EndpointStateRepo
import org.owntracks.android.di.ApplicationScope
import org.owntracks.android.di.CoroutineScopes
import org.owntracks.android.model.messages.MessageBase
import org.owntracks.android.model.messages.MessageCard
import org.owntracks.android.model.messages.MessageLocation
import org.owntracks.android.net.CALeafCertMatchingHostnameVerifier
import org.owntracks.android.net.MessageProcessorEndpoint
Expand Down Expand Up @@ -235,6 +236,10 @@ class HttpMessageProcessorEndpoint(
// Build pseudo topic based on tid
if (message is MessageLocation) {
message.topic = HTTPTOPIC + message.trackerId
} else if (message is MessageCard) {
message.topic = HTTPTOPIC + message.trackerId
} else {
message.topic = "NOKEY"
}
return message
}
Expand Down