1.0.28

try registering this time

Author: niccellular

app/src/main/java/com/atakmap/android/meshtastic/MeshtasticMapComponent.java

@@ -14,6 +14,7 @@
 import android.content.ServiceConnection;
 
 import android.content.SharedPreferences;
+import android.os.Bundle;
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.preference.PreferenceManager;
@@ -30,6 +31,7 @@
 import com.atakmap.android.meshtastic.plugin.R;
 import com.atakmap.android.util.NotificationUtil;
 import com.atakmap.app.preferences.ToolsPreferenceFragment;
+import com.atakmap.comms.CotServiceRemote;
 import com.atakmap.coremap.filesystem.FileSystemUtils;
 import com.atakmap.coremap.log.Log;
 import com.atakmap.coremap.cot.event.CotEvent;
@@ -68,11 +70,23 @@
 
 public class MeshtasticMapComponent extends DropDownMapComponent
         implements CommsMapComponent.PreSendProcessor,
-        SharedPreferences.OnSharedPreferenceChangeListener {
+        SharedPreferences.OnSharedPreferenceChangeListener,
+        CotServiceRemote.ConnectionListener {
     private static final String TAG = "MeshtasticMapComponent";
     private Context pluginContext;
     public static CotShrinkerFactory cotShrinkerFactory = new CotShrinkerFactory();
     public static CotShrinker cotShrinker = cotShrinkerFactory.createCotShrinker();
+
+    @Override
+    public void onCotServiceConnected(Bundle bundle) {
+
+    }
+
+    @Override
+    public void onCotServiceDisconnected() {
+
+    }
+
     public enum ServiceConnectionState {
         DISCONNECTED,
         CONNECTED
@@ -687,7 +701,10 @@ public void onCreate(final Context context, Intent intent, MapView view) {
         CommsMapComponent.getInstance().registerPreSendProcessor(this);
         context.setTheme(R.style.ATAKPluginTheme);
         pluginContext = context;
-        
+
+
+
+
         mNotifyManager =
                 (NotificationManager) view.getContext()
                         .getSystemService(NOTIFICATION_SERVICE);
@@ -742,6 +759,10 @@ public void onCreate(final Context context, Intent intent, MapView view) {
 
         view.getContext().registerReceiver(mr, intentFilter, Context.RECEIVER_EXPORTED);
 
+        CotServiceRemote cotService = new CotServiceRemote();
+        cotService.setCotEventListener(mr);
+        cotService.connect(this);
+
         mServiceIntent = new Intent();
         mServiceIntent.setClassName(PACKAGE_NAME, CLASS_NAME);
 

app/src/main/java/com/atakmap/android/meshtastic/MeshtasticReceiver.java

@@ -997,6 +997,9 @@ public void onCotEvent(CotEvent cotEvent, Bundle bundle) {
         if (prefs.getBoolean("plugin_meshtastic_from_server", false)) {
             if (cotEvent.isValid()) {
 
+                Log.d(TAG, "onCotEvent");
+                Log.d(TAG, cotEvent.toString());
+
                 int hopLimit = prefs.getInt("plugin_meshtastic_hop_limit", 3);
                 if (hopLimit > 8) {
                     hopLimit = 8;
@@ -1029,7 +1032,6 @@ public void onCotEvent(CotEvent cotEvent, Bundle bundle) {
 
                 // All Chat Rooms
                 if (cotEvent.getType().startsWith("b-t-f") && cotEvent.getUID().contains("All Chat Rooms")) {
-
                     try {
                         while (eventType != XmlPullParser.END_DOCUMENT) {
                             if (eventType == XmlPullParser.START_TAG) {