Skip to content
This repository was archived by the owner on May 2, 2025. It is now read-only.

Commit 94e275d

Browse files
committed
## 4.5.1.10
* Bug Fixes * Fix issue with chat message receipt while the overflow menu is open which causes the side pane no longer to function correctly.
1 parent a6f8dc3 commit 94e275d

File tree

11 files changed

+33
-18
lines changed

11 files changed

+33
-18
lines changed

VERSION.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Version History
22

3+
## 4.5.1.10
4+
5+
* Bug Fixes
6+
* Fix issue with chat message receipt while the overflow menu is open which causes the side pane no longer to function correctly.
7+
38
## 4.5.1.9
49

510
* Bug Fixes

atak/ATAK/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ buildscript {
2626
apply from: '../../gradle/versions.gradle', to: project
2727

2828
ext.ATAK_VERSION = "4.5.1"
29-
ext.ATAK_VERSION_SUBMINOR = ".9"
29+
ext.ATAK_VERSION_SUBMINOR = ".10"
3030

3131
ext.isDevKitEnabled = { ->
3232
return getProperty('takRepoMavenUrl', null) != null &&

atak/ATAK/app/src/main/java/com/atakmap/android/contact/Contacts.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
import android.content.BroadcastReceiver;
55
import android.content.Context;
66
import android.content.Intent;
7-
import com.atakmap.android.ipc.AtakBroadcast.DocumentedIntentFilter;
87
import android.os.Bundle;
98

109
import com.atakmap.android.contact.Contact.UpdateStatus;
1110
import com.atakmap.android.cot.CotMapComponent;
1211
import com.atakmap.android.ipc.AtakBroadcast;
12+
import com.atakmap.android.ipc.AtakBroadcast.DocumentedIntentFilter;
1313
import com.atakmap.android.maps.MapEvent;
1414
import com.atakmap.android.maps.MapEventDispatcher;
1515
import com.atakmap.android.maps.MapItem;
@@ -487,8 +487,16 @@ private void setUnreadCount(String ref, int totalUnread) {
487487
NavButtonModel mdl = NavButtonManager.getInstance()
488488
.getModelByReference(ref);
489489
if (mdl != null) {
490-
mdl.setBadgeCount(totalUnread);
491-
NavButtonManager.getInstance().notifyModelChanged(mdl);
490+
MapView mapView = MapView.getMapView();
491+
if (mapView != null) {
492+
mapView.post(new Runnable() {
493+
@Override
494+
public void run() {
495+
mdl.setBadgeCount(totalUnread);
496+
NavButtonManager.getInstance().notifyModelChanged(mdl);
497+
}
498+
});
499+
}
492500
}
493501
}
494502
}

atak/ATAK/app/src/main/java/com/atakmap/android/navigation/NavButtonManager.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import android.content.Context;
55
import android.content.Intent;
66

7+
import androidx.annotation.NonNull;
8+
79
import com.atakmap.android.navigation.models.NavButtonIntentAction;
810
import com.atakmap.android.navigation.models.NavButtonModel;
911
import com.atakmap.android.tools.menu.ActionBroadcastData;
@@ -20,7 +22,6 @@
2022
import java.util.Map;
2123
import java.util.concurrent.ConcurrentLinkedQueue;
2224

23-
import androidx.annotation.NonNull;
2425
import transapps.maps.plugin.tool.Tool;
2526

2627
/**
@@ -247,7 +248,8 @@ public void removeModelListChangedListener(OnModelListChangedListener l) {
247248
}
248249

249250
/**
250-
* Notify listeners that a model has been modified
251+
* Notify listeners that a model has been modified. Please ensure this is run on the UI
252+
* thread.
251253
* @param model Model that was modified
252254
*/
253255
public void notifyModelChanged(NavButtonModel model) {

depends/LASzip-3.4.3-mod.tar.gz

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:a31d1c549c2d129416627f1c3f58e890c988ecfbef48fc6bdc928b2c96cb1625
3-
size 241736
2+
oid sha256:a0154623042b4f5a7ef7f102969a4a120e8aeba2abd529da7d386696a6b9bc8a
3+
size 241744

depends/assimp-4.0.1-mod.tar.gz

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:fbd2a0bec1ff0df1e7250f4b549fc13fea419c6194d0ceb09b9b2adb27ef2bb7
3-
size 45183648
2+
oid sha256:f5925291c8be42912e6d4599752796904c08b86a83b41d778f9d455a553be893
3+
size 45176828

depends/gdal-2.4.4-mod.tar.gz

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:8b5ba765b7905dce3e2fdee272665da06a05f300f3e8136be973cae904602edd
3-
size 14551557
2+
oid sha256:3c2be727a2c913cb573d222806bdd46f238c193a3b5148ed18aa0604d4c72d2e
3+
size 14552701

depends/libLAS-1.8.2-mod.tar.gz

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:0751a24fd36c86f01347080311a5df6f77a366587345e6f7ff198c902d7b6796
3-
size 141029858
2+
oid sha256:08b583fb01227b84022c388e48932d15c2ebf73e688e6d70a795d1c41b797c70
3+
size 141008879

depends/tinygltf-2.4.1-mod.tar.gz

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:80477453626168254e061579f83b5d4b4e116dd4f9bf32e8fc4502e9fa04cc92
3-
size 5755927
2+
oid sha256:ddb69120c543c970d216be78c356c1bd0294b40828fbf370d5c56116f2626631
3+
size 5755928
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:df87b6111f3d3d469bcf9740fbfaaab36dd992060cb397afe90568f4983d5d37
3-
size 708750
2+
oid sha256:9a0513cb49a51759715dfd463e83d85190bfc5a047a79f7c497001de24f36f1f
3+
size 708586

0 commit comments

Comments
 (0)