## 4.5.1.6

* Bug Fixes * display the angle correctly for Grid North when showing doghouses.
deptofdefense · Oct 18, 2024 · fb55295 · fb55295
2 parents 896f9a2 + 254d6b8
commit fb55295
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 17 deletions.
diff --git a/VERSION.md b/VERSION.md
@@ -1,5 +1,10 @@
 # Version History
 
+## 4.5.1.6
+
+* Bug Fixes
+  * display the angle correctly for Grid North when showing doghouses.
+
 ## 4.5.1.5
 
 * Bug Fixes

diff --git a/atak/ATAK/app/build.gradle b/atak/ATAK/app/build.gradle
@@ -26,7 +26,7 @@ buildscript {
     apply from: '../../gradle/versions.gradle', to: project
 
     ext.ATAK_VERSION = "4.5.1"
-    ext.ATAK_VERSION_SUBMINOR = ".5"
+    ext.ATAK_VERSION_SUBMINOR = ".6"
 
     ext.isDevKitEnabled = { ->
         return getProperty('takRepoMavenUrl', null) != null &&

diff --git a/atak/ATAK/app/src/main/java/com/atakmap/android/maps/Doghouse.java b/atak/ATAK/app/src/main/java/com/atakmap/android/maps/Doghouse.java
@@ -517,8 +517,9 @@ private void setBearingToNext() {
         } else if (_northReference == NorthReference.TRUE) {
             bearing = _bearingToNext;
         } else {
-            bearing = ATAKUtilities.computeGridConvergence(_source.get(),
+            double gridConvergence = ATAKUtilities.computeGridConvergence(_source.get(),
                     _target.get());
+            bearing = AngleUtilities.wrapDeg(_bearingToNext - gridConvergence);
         }
         String bearingRepr = formatBearingString(bearing);
         setMetaString(

diff --git a/atak/ATAK/app/src/main/java/com/atakmap/android/navigation/views/loadout/LoadoutManager.java b/atak/ATAK/app/src/main/java/com/atakmap/android/navigation/views/loadout/LoadoutManager.java
@@ -254,12 +254,14 @@ public String serializeToXML(LoadoutItemModel loadout) {
     }
 
     @Override
-    public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
+    public void onSharedPreferenceChanged(final SharedPreferences prefs, final String key) {
 
         if (key == null)
             return;
 
-        if (key.startsWith(LOADOUT_PREFIX)) {
+        if (key.equals(PREF_SELECTED_LOADOUT)) {
+            setCurrentLoadout(_prefs.get(key, DEFAULT_LOADOUT_UID));
+        } else if (key.startsWith(LOADOUT_PREFIX)) {
 
             // Check if this change is in response to a local edit
             synchronized (_prefEditing) {
@@ -293,7 +295,7 @@ public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
             }
         }
     }
-
+    
     /**
      * Persist or remove a loadout to/from preferences
      * @param loadout Loadout

diff --git a/depends/LASzip-3.4.3-mod.tar.gz b/depends/LASzip-3.4.3-mod.tar.gz
diff --git a/depends/assimp-4.0.1-mod.tar.gz b/depends/assimp-4.0.1-mod.tar.gz
diff --git a/depends/gdal-2.4.4-mod.tar.gz b/depends/gdal-2.4.4-mod.tar.gz
diff --git a/depends/libLAS-1.8.2-mod.tar.gz b/depends/libLAS-1.8.2-mod.tar.gz
diff --git a/depends/tinygltf-2.4.1-mod.tar.gz b/depends/tinygltf-2.4.1-mod.tar.gz
diff --git a/depends/tinygltfloader-0.9.5-mod.tar.gz b/depends/tinygltfloader-0.9.5-mod.tar.gz
diff --git a/pluginsdk.zip b/pluginsdk.zip