Merge pull request #49 from scottlandis/master

implements the new SOFWERX swe-android library

Author: tabinfl

build.gradle

@@ -8,7 +8,7 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.android.tools.build:gradle:3.3.2'
 
 
         // NOTE: Do not place your application dependencies here; they belong

sample/TORGIListener/build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.android.tools.build:gradle:3.3.2'
 
 
         // NOTE: Do not place your application dependencies here; they belong

torgi/build.gradle

@@ -44,13 +44,13 @@ android {
 
 dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
-    implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
-    implementation 'com.google.android.material:material:1.1.0-alpha02'
-    viewerImplementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha02'
+    implementation 'com.google.android.material:material:1.1.0-alpha04'
     viewerImplementation 'com.github.PhilJay:MPAndroidChart:v3.1.0-alpha' //for charts
-    viewerImplementation 'org.osmdroid:osmdroid-android:6.0.2'
+    viewerImplementation 'org.osmdroid:osmdroid-android:6.0.3'
     implementation 'org.apache.httpcomponents:httpclient:4.5.6' //for SOS server
     implementation 'org.nanohttpd:nanohttpd:2.3.1' //for SOS server
+    implementation 'com.github.sofwerx:swe-android:1.0.5' //for SOS and IPC
     implementation 'org.apache.commons:commons-math3:3.6.1' //for statistical analysis
     implementation 'mil.nga.geopackage:geopackage-android:3.1.0'
     testImplementation 'junit:junit:4.12'

torgi/src/main/java/org/sofwerx/torgi/Config.java

@@ -20,6 +20,8 @@ public class Config {
     public final static String PREFS_SQAN = "sqan";
     public final static String PREFS_SEND_TO_SOS = "sendtosos";
     public final static String PREFS_SOS_URL = "sosurl";
+    public final static String PREFS_SOS_USERNAME = "sosusr";
+    public final static String PREFS_SOS_PASSWORD = "sospwd";
     public final static String PREFS_SOS_ASSIGNED_PROCEDURE = "sosprocedure";
     public final static String PREFS_SOS_ASSIGNED_OFFERING = "sosoffering";
     public final static String PREFS_SOS_ASSIGNED_TEMPLATE = "sostemplate";