Skip to content

Added an address field to the returned location packet. #2142

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

Open
wir3z wants to merge 8 commits into
base: master
Choose a base branch
from
+228 −110
Open

Added an address field to the returned location packet. #2142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7c0e9f4
Added an address field to the returned location packet. Contains the…
wir3z Nov 4, 2025
dfa2998
Updated formatting.
wir3z Nov 4, 2025
c5a1429
Merge branch 'master' into geocode
wir3z Nov 5, 2025
9ed6d2f
Moved address attribute to extended data.
wir3z Nov 18, 2025
c5cf200
Merge branch 'master' into geocode
growse Dec 3, 2025
962151b
kfmt
wir3z Dec 4, 2025
3abdceb
Merge branch 'master' into geocode
wir3z Dec 10, 2025
b744951
Merge branch 'master' into geocode
wir3z Jan 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions project/app/src/main/java/org/owntracks/android/model/messages/MessageLocation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,15 @@ import org.owntracks.android.preferences.Preferences
import org.owntracks.android.preferences.types.MonitoringMode

@JsonTypeInfo(
use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXTERNAL_PROPERTY, property = "_type")
use = JsonTypeInfo.Id.NAME,
include = JsonTypeInfo.As.EXTERNAL_PROPERTY,
property = "_type",
)
@JsonIgnoreProperties(ignoreUnknown = true)
@JsonInclude(JsonInclude.Include.NON_EMPTY)
open class MessageLocation(
private val messageWithCreatedAtImpl: MessageWithCreatedAt = MessageCreatedAtNow(RealClock()),
private val messageWithId: MessageWithId = MessageWithRandomId()
private val messageWithId: MessageWithId = MessageWithRandomId(),
) :
MessageBase(),
MessageWithCreatedAt by messageWithCreatedAtImpl,
Expand Down Expand Up @@ -70,6 +73,8 @@ open class MessageLocation(

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

@JsonProperty("address") var address: String? = null

override fun isValidMessage(): Boolean {
return timestamp > 0
}
Expand Down Expand Up @@ -108,7 +113,7 @@ open class MessageLocation(
@JvmStatic
fun fromLocationAndWifiInfo(
location: @NotNull Location,
wifiInfoProvider: WifiInfoProvider
wifiInfoProvider: WifiInfoProvider,
): @NotNull MessageLocation =
if (wifiInfoProvider.isConnected()) {
fromLocation(location).apply {
Expand All @@ -134,6 +139,6 @@ open class MessageLocation(
BEACON("b"), // Generated by iOS beacons
IOS_FREQUENT_LOCATIONS("v"), // Generated by iOS frequent locations
IOS_FOLLOW_CIRCULAR("C"), // Generated by iOS follow circular region
DEFAULT("")
DEFAULT(""),
}
}
Loading