## 4.4.0.11

* Bug Fixes
  * address issue with Spot Markers not getting properly renamed when done in succession.
  * prevent a NullPointerException when rendering the label for a Range and Bearing arrow

VERSION.md

@@ -1,5 +1,11 @@
 # Version History
 
+## 4.4.0.11
+
+* Bug Fixes
+  * address issue with Spot Markers not getting properly renamed when done in succession.
+  * prevent a NullPointerException when rendering the label for a Range and Bearing arrow
+
 ## 4.4.0.10
 
 * Bug Fix

atak/ATAK/app/build.gradle

@@ -24,7 +24,7 @@ import java.util.regex.Pattern
 buildscript {
 
     ext.ATAK_VERSION = "4.4.0"
-    ext.ATAK_VERSION_SUBMINOR = ".10"
+    ext.ATAK_VERSION_SUBMINOR = ".11"
 
     ext.jacocoVersion = '0.8.5'
 

atak/ATAK/app/src/main/java/com/atakmap/android/toolbars/RangeAndBearingMapItem.java

@@ -689,6 +689,12 @@ public static List<RangeAndBearingMapItem> getUsers(PointMapItem point) {
     }
 
     private void updateLabel() {
+
+        if (_bearingUnits == null) { 
+               _bearingUnits = Angle.DEGREE;
+        }
+
+
         // This just updates the radial menu - probably shouldn't be here
         setMetaBoolean("degs_t_bool", _bearingUnits == Angle.DEGREE
                 && _northReference == NorthReference.TRUE);

atak/ATAK/app/src/main/java/com/atakmap/android/user/icon/SpotMapReceiver.java

@@ -17,14 +17,13 @@
 import com.atakmap.android.maps.MapView;
 import com.atakmap.android.maps.Marker;
 import com.atakmap.android.user.PlacePointTool;
+import com.atakmap.annotations.DeprecatedApi;
 import com.atakmap.app.R;
 import com.atakmap.coremap.filesystem.FileSystemUtils;
 import com.atakmap.coremap.maps.coords.GeoPoint;
 
 /**
  * Manage Spot Map intents
- * 
- * 
  */
 public class SpotMapReceiver extends DropDownReceiver implements
         OnStateListener {
@@ -59,6 +58,11 @@ public void disposeImpl() {
         _item = null;
     }
 
+    /**
+     * @deprecated Use {@link #closeDropDown()} instead
+     */
+    @Deprecated
+    @DeprecatedApi(since = "4.5", forRemoval = true, removeAt = "4.8")
     public void closeDrawingDropDown() {
         closeDropDown();
     }
@@ -76,22 +80,32 @@ public void onReceive(Context context, Intent intent) {
         if (SPOT_DETAILS.equals(action) && marker != null) {
             // Close other details that are open first, otherwise we'll have
             // overwritten the info it needs to shut down when OnClose is called!
+            boolean close = false;
             if (DropDownManager.getInstance().isTopDropDown(this)) {
                 if (_item != null && _item != marker)
-                    closeDropDown();
+                    close = true;
                 else if (_item == marker) {
                     if (!isVisible())
                         DropDownManager.getInstance().unHidePane();
                     return;
                 }
             } else if (!isClosed())
-                closeDropDown();
-
-            // Make sure to cleanup existing marker before changing to new marker
-            cleanup(true);
+                close = true;
 
-            _item = marker;
-            _showPointDetails(_item);
+            if (close) {
+                // Close the drop-down and show the updated details the next frame
+                final Marker m = marker;
+                closeDropDown();
+                getMapView().post(new Runnable() {
+                    @Override
+                    public void run() {
+                        _showPointDetails(_item = m);
+                    }
+                });
+            } else {
+                // Show point details immediately
+                _showPointDetails(_item = marker);
+            }
         }
 
         // Toggle marker label
@@ -240,5 +254,4 @@ public void onDropDownSizeChanged(double width, double height) {
     public void onDropDownClose() {
         cleanup(true);
     }
-
-}
+}