- added (not fully tested) SOS credential connection capability

Author: jvinall

.gradle/4.6/fileHashes/fileHashes.bin

@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 3
-        versionName '1.0.4'
+        versionCode 4
+        versionName '1.0.5'
     }
     buildTypes {
         release {

.gradle/4.6/fileHashes/fileHashes.lock

@@ -1,5 +1,6 @@
 package org.sofwerx.ogc.sos;
 
+import android.util.Base64;
 import android.util.Log;
 
 import java.io.BufferedReader;
@@ -9,13 +10,14 @@
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
 import java.net.URL;
 
 import javax.net.ssl.HttpsURLConnection;
 
 public class HttpHelper {
-    public static String post(String serverURL, String body) throws IOException {
+    public static String post(String serverURL, String username, String password, String body) throws IOException {
         if (serverURL == null)
             throw new IOException("Cannot connect to a null server URL");
         if (body == null)
@@ -36,6 +38,14 @@ public static String post(String serverURL, String body) throws IOException {
         conn.setRequestMethod("POST");
         conn.setRequestProperty("Content-Type","application/soap+xml");
         conn.setDoInput(true);
+        if ((username != null) && (password != null)) {
+            try {
+                byte[] data = (username + ":" + password).getBytes("UTF-8");
+                String encoded = new String(Base64.encode(data, Base64.DEFAULT));
+                conn.setRequestProperty("Authorization", "Basic " + encoded);
+            } catch (UnsupportedEncodingException ignore) {
+            }
+        }
         //conn.setDoOutput(true);
         conn.setInstanceFollowRedirects(false);
 

.gradle/4.6/taskHistory/taskHistory.bin

@@ -22,6 +22,8 @@ public class SosService implements SosMessageListener {
     private Handler handler;
     private SosMessageListener listener;
     private String serverURL;
+    private String username;
+    private String password;
     private Context context;
     private SosSensor sosSensor;
     private SosIpcTransceiver transceiver;
@@ -31,20 +33,25 @@ public class SosService implements SosMessageListener {
     private boolean sosHttpBroadcast;
 
     /**
-     * Creates a new SOS Service
+     * Creates a new SosService
      * @param context
      * @param sosSensor
+     * @param sosServerURL
+     * @param username
+     * @param password
      * @param turnOn true == the service will start running immediately; false means the service will initiate but will not start sending/receiving
      * @param enableIpcBroadcast
      */
-    public SosService(Context context, SosSensor sosSensor, String sosServerURL, final boolean turnOn, final boolean enableIpcBroadcast) {
+    public SosService(Context context, SosSensor sosSensor, String sosServerURL, String username, String password, final boolean turnOn, final boolean enableIpcBroadcast) {
         if (context == null)
             Log.e(SosIpcTransceiver.TAG,"SosService should not be passed a null context");
         this.context = context;
         this.sosSensor = sosSensor;
         if (context instanceof SosMessageListener)
             listener = (SosMessageListener)context;
         this.serverURL = sosServerURL;
+        this.username = username;
+        this.password = password;
         sosThread = new HandlerThread("SosService") {
             @Override
             protected void onLooperPrepared() {
@@ -59,6 +66,10 @@ protected void onLooperPrepared() {
         SosIpcTransceiver.setChannel(DEFAULT_SWE_CHANNEL);
     }
 
+    public SosService(Context context, SosSensor sosSensor, String sosServerURL, final boolean turnOn, final boolean enableIpcBroadcast) {
+        this(context, sosSensor, sosServerURL, null, null, turnOn, enableIpcBroadcast);
+    }
+
     /**
      * Toggles between on (active/running/transmitting and receiving) and off (paused)
      * @param on true = on/active/transmitting and receiving
@@ -120,7 +131,7 @@ private void broadcast(AbstractSosOperation operation) {
                     if ((serverURL != null) && sosHttpBroadcast) {
                         Log.d(SosIpcTransceiver.TAG,"Broadcasting SOS operation to "+serverURL);
                         try {
-                            String result = HttpHelper.post(serverURL,SosIpcTransceiver.toString(operation.toXML()));
+                            String result = HttpHelper.post(serverURL, username, password,SosIpcTransceiver.toString(operation.toXML()));
                             AbstractSosOperation responseOperation = AbstractSosOperation.newFromXmlString(result);
                             if (responseOperation == null) {
                                 Log.e(SosIpcTransceiver.TAG,"Unable to parse response from server: "+result);