Merge pull request #1 from niccellular/4.10.0

4.10.0

Author: niccellular

.idea/workspace.xml

@@ -8,8 +8,8 @@
 
 buildscript {
 
-    ext.PLUGIN_VERSION = "1.0"
-    ext.ATAK_VERSION = "4.8.1"
+    ext.PLUGIN_VERSION = "3.0"
+    ext.ATAK_VERSION = "4.10.0"
 
     def takdevVersion = '2.+'
 
@@ -59,7 +59,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         if(isDevKitEnabled()) {
             classpath "com.atakmap.gradle:atak-gradle-takdev:${takdevVersion}"
         } else {
@@ -284,7 +284,8 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 26
+        targetSdkVersion 33
         ndk {
             abiFilters "armeabi-v7a", "arm64-v8a", "x86"
         }
@@ -294,7 +295,9 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: '*.jar')
-    implementation 'com.paulmandal.atak:libcotshrink:1.0.3'
+    //implementation 'com.paulmandal.atak:libcotshrink:1.0.3'
 
+    // https://mvnrepository.com/artifact/com.siemens.ct.exi/exificient
+    implementation 'com.siemens.ct.exi:exificient:1.0.7'
 }
 

app/build.gradle

@@ -48,11 +48,11 @@
 
 
 
--keep class * extends transapps.maps.plugin.tool.Tool {
-}
--keep class * implements transapps.maps.plugin.lifecycle.Lifecycle {
+
+-keep class * implements gov.tak.api.plugin.IPlugin {
 }
 
+
 # overcome an existing bug in the gradle subsystem (3.5.x)
 -keep class module-info
 

app/proguard-gradle.txt

@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.atakmap.android.aprstak.plugin">
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
@@ -13,11 +14,12 @@
         <meta-data android:name="plugin-api" android:value="${atakApiVersion}"/>
         <meta-data android:name="app_desc" android:value="@string/app_desc"/>
 
-              <activity android:name="com.atakmap.app.component">  
-                  <intent-filter android:label="@string/app_name"> 
-                    <action android:name="com.atakmap.app.component" />  
-                  </intent-filter> 
-              </activity>
+        <activity android:name="com.atakmap.app.component" tools:ignore="MissingClass" android:exported="true">
+            <intent-filter android:label="@string/app_name">
+                <action android:name="com.atakmap.app.component" />
+            </intent-filter>
+        </activity>
+
 
     </application>
 

app/src/main/AndroidManifest.xml

@@ -3,13 +3,8 @@
 <plugin>
 
     <extension
-        type="transapps.maps.plugin.lifecycle.Lifecycle"
+        type="gov.tak.api.plugin.IPlugin"
         impl="com.atakmap.android.aprstak.plugin.PluginLifecycle"
         singleton="true" />
 
-    <extension
-        type="transapps.maps.plugin.tool.ToolDescriptor"
-        impl="com.atakmap.android.aprstak.plugin.PluginTool"
-        singleton="true" />
-
 </plugin>

app/src/main/assets/plugin.xml

@@ -9,40 +9,70 @@
 
 import com.atakmap.comms.CommsMapComponent;
 import com.atakmap.coremap.cot.event.CotEvent;
-import com.paulmandal.atak.libcotshrink.pub.api.CotShrinker;
 
 import com.atakmap.android.aprstak.plugin.PluginLifecycle;
+import com.siemens.ct.exi.core.EXIFactory;
+import com.siemens.ct.exi.core.helpers.DefaultEXIFactory;
+import com.siemens.ct.exi.main.api.sax.EXIResult;
 
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
+
+import java.io.ByteArrayOutputStream;
+import java.io.StringReader;
 import java.nio.ByteBuffer;
 import java.security.MessageDigest;
 import java.security.SecureRandom;
 
 import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
 
 import utils.AprsUtility;
 
 public class APRSMessageHandler implements CommsMapComponent.PreSendProcessor {
 
     private static final String TAG = "APRSMessageHandler";
-    private final CotShrinker cotShrinker;
 
-    public APRSMessageHandler(CotShrinker cotShrinker) {
+    private Context context;
+
+    public APRSMessageHandler(Context context) {
         CommsMapComponent.getInstance().registerPreSendProcessor(this);
-        this.cotShrinker = cotShrinker;
+        this.context = context;
     }
 
     @Override
     public void processCotEvent(CotEvent cotEvent, String[] toUIDs) {
         if (cotEvent.toString().contains("All Chat Rooms")) {
-            byte[] cotBytes = cotShrinker.toByteArrayLossy(cotEvent);
-            String encodedString;
+            byte[] cotAsBytes;
+
+            try {
+                EXIFactory exiFactory = DefaultEXIFactory.newInstance();
+                ByteArrayOutputStream osEXI = new ByteArrayOutputStream();
+                EXIResult exiResult = new EXIResult(exiFactory);
+                exiResult.setOutputStream(osEXI);
+                SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
+                SAXParser newSAXParser = saxParserFactory.newSAXParser();
+                XMLReader xmlReader = newSAXParser.getXMLReader();
+                xmlReader.setContentHandler(exiResult.getHandler());
+                InputSource stream = new InputSource(new StringReader(cotEvent.toString()));
+                xmlReader.parse(stream); // parse XML input
+                cotAsBytes = osEXI.toByteArray();
+                osEXI.close();
+            } catch (Exception e) {
+                e.printStackTrace();
+                return;
+            }
+
+            Log.d(TAG, "Size: " + cotAsBytes.length);            String encodedString;
+
             if (AprsUtility.usePSK) {
                 com.atakmap.coremap.log.Log.i(TAG, "PSK enabled");
                 ByteBuffer payload;
                 byte[] PSKhash, cipherText;
-                SharedPreferences sharedPref = PluginLifecycle.activity.getSharedPreferences("aprs-prefs", Context.MODE_PRIVATE);
+                SharedPreferences sharedPref = context.getSharedPreferences("aprs-prefs", Context.MODE_PRIVATE);
                 String psk = sharedPref.getString("PSKText", "atakatak");
                 try {
                     MessageDigest digest = MessageDigest.getInstance("MD5");
@@ -57,7 +87,7 @@ public void processCotEvent(CotEvent cotEvent, String[] toUIDs) {
                     Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
                     SecretKeySpec key = new SecretKeySpec(PSKhash, "AES");
                     cipher.init(Cipher.ENCRYPT_MODE, key, new IvParameterSpec(iv));
-                    cipherText = cipher.doFinal(cotBytes);
+                    cipherText = cipher.doFinal(cotAsBytes);
                     // set the iv+cipherText as the payload
                     payload = ByteBuffer.allocate(iv.length + cipherText.length);
                     payload.put(iv);
@@ -68,13 +98,13 @@ public void processCotEvent(CotEvent cotEvent, String[] toUIDs) {
                 }
                 encodedString = Base64.encodeToString(payload.array(), Base64.NO_WRAP);
             } else {
-                encodedString = Base64.encodeToString(cotBytes, Base64.NO_WRAP);
+                encodedString = Base64.encodeToString(cotAsBytes, Base64.NO_WRAP);
             }
 
             Log.d(TAG, "Base64 string len: " + encodedString.length());
             Intent i = new Intent("org.aprsdroid.app.SEND_PACKET").setPackage("org.aprsdroid.app");
             i.putExtra("data", ">M," + encodedString);
-            PluginLifecycle.activity.getApplicationContext().startForegroundService(i);
+            context.getApplicationContext().startForegroundService(i);
         }
     }
 }