Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ATAK 4.1.1.5 #26

Merged
merged 5 commits into from
Dec 10, 2020
Merged

ATAK 4.1.1.5 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fa652bb
## 4.1.1.2
takdeveloper Dec 7, 2020
8ff5bef
## 4.1.1.3
takdeveloper Dec 7, 2020
283855d
## 4.1.1.4
takdeveloper Dec 7, 2020
77ebc5d
## 4.1.1.5
takdeveloper Dec 7, 2020
5837b30
Merge branch 'master' into upstream/4.1.1.5
takdeveloper Dec 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions VERSION.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Version History

## 4.1.1.5

* Handle potential `NullPointerException` in Route Navigation

## 4.1.1.4

* Android 11 (API Level 30) compatibility; add `PluginSpinner.isUIContext`
Expand Down
2 changes: 1 addition & 1 deletion atak/ATAK/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import java.util.regex.Pattern
////////////////////////////////////////////////////////////////////////////////

def ATAK_VERSION = "4.1.1"
def ATAK_VERSION_SUBMINOR = ".4"
def ATAK_VERSION_SUBMINOR = ".5"

buildscript {
ext.jacocoVersion = '0.8.5'
Expand Down
2 changes: 1 addition & 1 deletion atak/ATAK/app/src/main/java/com/atakmap/android/routes/RouteNavigationManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ private void onLocationChanged(GeoPoint newLocation) {

for (Integer p : possibleDepartures) {
PointMapItem pmi = route.getPointMapItem(p);
if (getHasPointBeenDepartedFrom(pmi.getPoint(), newLocation)) {
if (pmi != null && getHasPointBeenDepartedFrom(pmi.getPoint(), newLocation)) {
pointsTargetedButNotDepartedFrom.remove(p);
departedPoints.add(p);
fireOnDepartedPoint(pmi);
Expand Down