diff options
author | Iván Ávalos <avalos@disroot.org> | 2022-01-16 19:19:39 -0600 |
---|---|---|
committer | Iván Ávalos <avalos@disroot.org> | 2022-01-16 19:19:39 -0600 |
commit | 6537ff8aeddb4dd3026806aa1667527226ec902d (patch) | |
tree | dfd0e002d6279f647129658784bf4b21cbdfed0c /androidApp/src/main/java | |
parent | 8eda4b6bb96db95e4099a3f8d2fad7996dd36c47 (diff) | |
parent | 33e051ae011471e3472a69d405f805319d25bd70 (diff) | |
download | etbsa-trackermap-mobile-6537ff8aeddb4dd3026806aa1667527226ec902d.tar.gz etbsa-trackermap-mobile-6537ff8aeddb4dd3026806aa1667527226ec902d.tar.bz2 etbsa-trackermap-mobile-6537ff8aeddb4dd3026806aa1667527226ec902d.zip |
Merge branch 'main' of https://git.sr.ht/~avalos/trackermap-mobile
Diffstat (limited to 'androidApp/src/main/java')
2 files changed, 9 insertions, 0 deletions
diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/information/UnitInformationFragment.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/information/UnitInformationFragment.kt index 568bd6b..e75f475 100644 --- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/information/UnitInformationFragment.kt +++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/information/UnitInformationFragment.kt @@ -96,6 +96,9 @@ class UnitInformationFragment : Fragment() { unit.device.contact?.let { contact -> details.add(getString(R.string.unit_info_contact) to contact) } + unit.device.uniqueId?.let { uniqueId -> + details.add(getString(R.string.unit_info_uniqueid) to uniqueId) + } unit.position?.fixTime?.let { fixTime -> details.add(getString(R.string.unit_info_datetime) to Formatter.formatDate(fixTime)) } diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/UserInformationActivity.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/UserInformationActivity.kt index 13deed0..a3c6fd6 100644 --- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/UserInformationActivity.kt +++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/UserInformationActivity.kt @@ -64,6 +64,12 @@ class UserInformationActivity : AppCompatActivity() { idInfo.text = "${user.id ?: "--"}" deviceLimitInfo.text = "${user.deviceLimit ?: "--"}" adminInfo.text = "${user.administrator}" + user.deviceLimit?.let { + if (it <= 0) { + adminInfoLabel.visibility = View.GONE + adminInfo.visibility = View.GONE + } + } } } } |