Skip to content

Commit

Permalink
1.0.10
Browse files Browse the repository at this point in the history 
Add some checks for nulls to avoid crashing
  • Loading branch information
@niccellular
niccellular committed Apr 8, 2024
1 parent eee4ac2 commit 4ac447b
Show file tree
Hide file tree
Showing 2 changed files with 92 additions and 90 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
buildscript {


ext.PLUGIN_VERSION = "1.0.9"
ext.PLUGIN_VERSION = "1.0.10"
ext.ATAK_VERSION = "4.10.0"

def takdevVersion = '2.+'
Expand Down
180 changes: 91 additions & 89 deletions app/src/main/java/com/atakmap/android/meshtastic/MeshtasticReceiver.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,82 +45,89 @@ public void onReceive(Context context, Intent intent) {
prefs = PreferenceManager.getDefaultSharedPreferences(context.getApplicationContext());

String action = intent.getAction();
if (action == null) return;
Log.d(TAG, "ACTION: " + action);
if (action.equals(MeshtasticMapComponent.ACTION_MESH_CONNECTED)) {
String extraConnected = intent.getStringExtra(MeshtasticMapComponent.EXTRA_CONNECTED);
boolean connected = extraConnected.equals(MeshtasticMapComponent.STATE_CONNECTED);
Log.d(TAG, "Received ACTION_MESH_CONNECTED: " + extraConnected);
if (connected) {
try {
boolean ret = MeshtasticMapComponent.reconnect();
if (ret) {
MeshtasticMapComponent.mConnectionState = MeshtasticMapComponent.ServiceConnectionState.CONNECTED;
MeshtasticMapComponent.mw.setIcon("green");
switch (action) {
case MeshtasticMapComponent.ACTION_MESH_CONNECTED: {
String extraConnected = intent.getStringExtra(MeshtasticMapComponent.EXTRA_CONNECTED);
boolean connected = extraConnected.equals(MeshtasticMapComponent.STATE_CONNECTED);
Log.d(TAG, "Received ACTION_MESH_CONNECTED: " + extraConnected);
if (connected) {
try {
boolean ret = MeshtasticMapComponent.reconnect();
if (ret) {
MeshtasticMapComponent.mConnectionState = MeshtasticMapComponent.ServiceConnectionState.CONNECTED;
MeshtasticMapComponent.mw.setIcon("green");
}
} catch (RemoteException e) {
e.printStackTrace();
}
} catch (RemoteException e) {
e.printStackTrace();
} else {
MeshtasticMapComponent.mConnectionState = MeshtasticMapComponent.ServiceConnectionState.DISCONNECTED;
MeshtasticMapComponent.mw.setIcon("red");
}
} else {
MeshtasticMapComponent.mConnectionState = MeshtasticMapComponent.ServiceConnectionState.DISCONNECTED;
MeshtasticMapComponent.mw.setIcon("red");
}
}
else if (action.equals(MeshtasticMapComponent.ACTION_MESH_DISCONNECTED)) {
String extraConnected = intent.getStringExtra(MeshtasticMapComponent.EXTRA_DISCONNECTED);
boolean connected = extraConnected.equals(MeshtasticMapComponent.STATE_DISCONNECTED);
Log.d(TAG, "Received ACTION_MESH_DISCONNECTED: " + extraConnected);
if (connected) {
MeshtasticMapComponent.mConnectionState = MeshtasticMapComponent.ServiceConnectionState.DISCONNECTED;
MeshtasticMapComponent.mw.setIcon("red");
break;
}
}
else if (action.equals(MeshtasticMapComponent.ACTION_MESSAGE_STATUS)) {
int id = intent.getIntExtra(MeshtasticMapComponent.EXTRA_PACKET_ID, 0);
MessageStatus status = intent.getParcelableExtra(MeshtasticMapComponent.EXTRA_STATUS);
Log.d(TAG, "Message Status ID: " + id + " Status: " + status.toString());
}
else if (action.equals(MeshtasticMapComponent.ACTION_RECEIVED_ATAK_FORWARDER)) {
Thread thread = new Thread(() -> receive(intent));
thread.setName("MeshtasticReceiver.Worker");
thread.start();
}
else if (action.equals(MeshtasticMapComponent.ACTION_RECEIVED_ATAK_PLUGIN)) {
Thread thread = new Thread(() -> receive(intent));
thread.setName("MeshtasticReceiver.Worker");
thread.start();
}
else if (action.equals(MeshtasticMapComponent.ACTION_NODE_CHANGE)) {
NodeInfo ni = intent.getParcelableExtra("com.geeksville.mesh.NodeInfo");
Log.d(TAG, ni.toString());

if (prefs.getBoolean("plugin_meshtastic_tracker", false)) {
Log.d(TAG, "Sending CoT for NodeInfo");
CotEvent cotEvent = new CotEvent();
CoordinatedTime time = new CoordinatedTime();
cotEvent.setTime(time);
cotEvent.setStart(time);
cotEvent.setStale(time.addMinutes(10));
cotEvent.setUID(ni.getUser().getLongName());
CotPoint gp = new CotPoint(ni.getPosition().getLatitude(), ni.getPosition().getLongitude(), ni.getPosition().getAltitude(), CotPoint.UNKNOWN, CotPoint.UNKNOWN);
cotEvent.setPoint(gp);
cotEvent.setHow("m-g");
cotEvent.setType("a-f-G-E-S");

CotDetail cotDetail = new CotDetail("detail");
cotEvent.setDetail(cotDetail);
CotDetail remarksDetail = new CotDetail("remarks");
remarksDetail.setInnerText(ni.toString());
cotDetail.addChild(remarksDetail);

if (cotEvent.isValid()) {
CotMapComponent.getInternalDispatcher().dispatch(cotEvent);
if (prefs.getBoolean("plugin_meshtastic_server", false)) {
CotMapComponent.getExternalDispatcher().dispatch(cotEvent);
}
case MeshtasticMapComponent.ACTION_MESH_DISCONNECTED: {
String extraConnected = intent.getStringExtra(MeshtasticMapComponent.EXTRA_DISCONNECTED);
if (extraConnected == null) {
Log.d(TAG, "Received ACTION_MESH_DISCONNECTED: null");
return;
}
else
Log.e(TAG, "cotEvent was not valid");
boolean connected = extraConnected.equals(MeshtasticMapComponent.STATE_DISCONNECTED);
Log.d(TAG, "Received ACTION_MESH_DISCONNECTED: " + extraConnected);
if (connected) {
MeshtasticMapComponent.mConnectionState = MeshtasticMapComponent.ServiceConnectionState.DISCONNECTED;
MeshtasticMapComponent.mw.setIcon("red");
}
break;
}
case MeshtasticMapComponent.ACTION_MESSAGE_STATUS:
int id = intent.getIntExtra(MeshtasticMapComponent.EXTRA_PACKET_ID, 0);
MessageStatus status = intent.getParcelableExtra(MeshtasticMapComponent.EXTRA_STATUS);
Log.d(TAG, "Message Status ID: " + id + " Status: " + status);
break;
case MeshtasticMapComponent.ACTION_RECEIVED_ATAK_FORWARDER:
case MeshtasticMapComponent.ACTION_RECEIVED_ATAK_PLUGIN: {
Thread thread = new Thread(() -> receive(intent));
thread.setName("MeshtasticReceiver.Worker");
thread.start();
break;
}
case MeshtasticMapComponent.ACTION_NODE_CHANGE:
NodeInfo ni = intent.getParcelableExtra("com.geeksville.mesh.NodeInfo");
if (ni == null) return;
Log.d(TAG, ni.toString());
if (prefs.getBoolean("plugin_meshtastic_tracker", false)) {
Log.d(TAG, "Sending CoT for NodeInfo");
CotEvent cotEvent = new CotEvent();
CoordinatedTime time = new CoordinatedTime();
cotEvent.setTime(time);
cotEvent.setStart(time);
cotEvent.setStale(time.addMinutes(10));
if (ni.getUser() == null) return;
cotEvent.setUID(ni.getUser().getLongName());
if (ni.getPosition() == null) return;
CotPoint gp = new CotPoint(ni.getPosition().getLatitude(), ni.getPosition().getLongitude(), ni.getPosition().getAltitude(), CotPoint.UNKNOWN, CotPoint.UNKNOWN);
cotEvent.setPoint(gp);
cotEvent.setHow("m-g");
cotEvent.setType("a-f-G-E-S");

CotDetail cotDetail = new CotDetail("detail");
cotEvent.setDetail(cotDetail);
CotDetail remarksDetail = new CotDetail("remarks");
remarksDetail.setInnerText(ni.toString());
cotDetail.addChild(remarksDetail);

if (cotEvent.isValid()) {
CotMapComponent.getInternalDispatcher().dispatch(cotEvent);
if (prefs.getBoolean("plugin_meshtastic_server", false)) {
CotMapComponent.getExternalDispatcher().dispatch(cotEvent);
}
} else
Log.e(TAG, "cotEvent was not valid");
}
break;
}
}

Expand All @@ -129,6 +136,7 @@ else if (action.equals(MeshtasticMapComponent.ACTION_NODE_CHANGE)) {
int cotSize = 0;
protected void receive(Intent intent) {
DataPacket payload = intent.getParcelableExtra(MeshtasticMapComponent.EXTRA_PAYLOAD);
if (payload == null) return;
int dataType = payload.getDataType();
Log.v(TAG, "handleReceive(), dataType: " + dataType);

Expand Down Expand Up @@ -178,8 +186,6 @@ protected void receive(Intent intent) {
CotMapComponent.getInternalDispatcher().dispatch(cotEvent);
if (prefs.getBoolean("plugin_meshtastic_server", false)) {
CotMapComponent.getExternalDispatcher().dispatch(cotEvent);
} else {
Log.d(TAG, "Not sending to server");
}
} else {
Log.d(TAG, "Failed to libcotshrink: " + new String(combined));
Expand All @@ -192,13 +198,10 @@ protected void receive(Intent intent) {
try {

CotEvent cotEvent = MeshtasticMapComponent.cotShrinker.toCotEvent(payload.getBytes());
if (cotEvent.isValid()) {
if ( cotEvent != null && cotEvent.isValid()) {
CotMapComponent.getInternalDispatcher().dispatch(cotEvent);
if (prefs.getBoolean("plugin_meshtastic_server", false)) {
CotMapComponent.getExternalDispatcher().dispatch(cotEvent);

} else {
Log.d(TAG, "Not sending to server");
}
}
} catch (Throwable e) {
Expand All @@ -210,7 +213,7 @@ protected void receive(Intent intent) {
Log.d(TAG, "Got TAK_PACKET");
Log.d(TAG, "Payload: " + payload);
String t = "";
for (int i=0; i<payload.getBytes().length; i++) {
for (int i = 0; i< payload.getBytes().length; i++) {
// convert bytes to ascii
t += (char) payload.getBytes()[i];
}
Expand Down Expand Up @@ -249,12 +252,17 @@ protected void receive(Intent intent) {
CotDetail groupDetail = new CotDetail("__group");

String role = ATAKProtos.MemberRole.forNumber(group.getRoleValue()).name();
if (role.equals("TeamMember"))
role = "Team Member";
else if (role.equals("TeamLead"))
role = "Team Lead";
else if (role.equals("ForwardObserver"))
role = "Forward Observer";
switch (role) {
case "TeamMember":
role = "Team Member";
break;
case "TeamLead":
role = "Team Lead";
break;
case "ForwardObserver":
role = "Forward Observer";
break;
}
groupDetail.setAttribute("role", role);

String team = ATAKProtos.Team.forNumber(group.getTeamValue()).name();
Expand Down Expand Up @@ -295,8 +303,6 @@ else if (team.equals("DarkGreen"))
CotMapComponent.getInternalDispatcher().dispatch(cotEvent);
if (prefs.getBoolean("plugin_meshtastic_server", false)) {
CotMapComponent.getExternalDispatcher().dispatch(cotEvent);
} else {
Log.d(TAG, "Not sending to server");
}
}
else
Expand Down Expand Up @@ -380,8 +386,6 @@ else if (team.equals("DarkGreen"))
CotMapComponent.getInternalDispatcher().dispatch(cotEvent);
if (prefs.getBoolean("plugin_meshtastic_server", false)) {
CotMapComponent.getExternalDispatcher().dispatch(cotEvent);
} else {
Log.d(TAG, "Not sending to server");
}
}
else
Expand Down Expand Up @@ -466,8 +470,6 @@ else if (team.equals("DarkGreen"))
CotMapComponent.getInternalDispatcher().dispatch(cotEvent);
if (prefs.getBoolean("plugin_meshtastic_server", false)) {
CotMapComponent.getExternalDispatcher().dispatch(cotEvent);
} else {
Log.d(TAG, "Not sending to server");
}
}
else
Expand Down

0 comments on commit 4ac447b

Please sign in to comment.