Merge branch 'main' of https://git.sr.ht/~avalos/trackermap-mobile

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
+                    }
+                }
             }
         }
     }