Code cleanup

.gitignore

@@ -34,3 +34,4 @@ native/build.o
 /javadoc.xml
 /doc
 /greenDaoGenerator/
+release/

build.gradle

@@ -3,16 +3,13 @@ buildscript {
         mavenCentral()
         google()
 
-//        jcenter reached end-of-life, but is required for MQTT until migrated.
-        jcenter()
-
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0'
+        classpath 'com.android.tools.build:gradle:7.0.2'
         classpath 'org.greenrobot:greendao-gradle-plugin:3.3.0' // add plugin
 
-        classpath 'com.google.gms:google-services:4.3.8' //added gms support
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.0'
+        classpath 'com.google.gms:google-services:4.3.10' //added gms support
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'
     }
 }
 apply plugin: 'com.android.application'
@@ -24,25 +21,25 @@ allprojects {
     repositories {
         mavenCentral()
         google()
-        jcenter()
 
         maven { url "https://jitpack.io" }
     }
 }
+
 dependencies {
     //firebase
-    implementation 'com.google.firebase:firebase-crashlytics:18.0.1'
-    implementation 'com.google.firebase:firebase-analytics:19.0.0'
-    implementation 'com.google.firebase:firebase-core:19.0.0'
+    implementation 'com.google.firebase:firebase-crashlytics:18.2.1'
+    implementation 'com.google.firebase:firebase-analytics:19.0.1'
+    implementation 'com.google.firebase:firebase-core:19.0.1'
     //google api
     implementation 'com.google.android.gms:play-services-base:17.6.0'
     implementation 'com.google.android.gms:play-services-basement:17.6.0'
     implementation 'com.google.android.gms:play-services-tasks:17.2.1'
     implementation 'com.google.android.gms:play-services-location:18.0.0'
 
-    implementation 'com.google.android.gms:play-services-analytics:17.0.0'
+    implementation 'com.google.android.gms:play-services-analytics:17.0.1'
     implementation 'com.google.android.gms:play-services-maps:17.0.1'
-    implementation 'com.google.android.gms:play-services-auth:19.0.0'
+    implementation 'com.google.android.gms:play-services-auth:19.2.0'
     //greenDao
 //    implementation 'org.roboguice:roboguice:4.0.0'
     implementation 'org.greenrobot:greendao:3.3.0'
@@ -55,19 +52,19 @@ dependencies {
 
     //AMQP
     // https://mvnrepository.com/artifact/com.rabbitmq/amqp-client
-    implementation group: 'com.rabbitmq', name: 'amqp-client', version: '5.12.0'
+    implementation group: 'com.rabbitmq', name: 'amqp-client', version: '5.13.1'
 
     implementation files('libs/qpid-broker-core-9.0.0-SNAPSHOT.jar')
     //forked repo https://github.com/irinil/qpid-broker-j
     //implementation group: 'org.apache.qpid', name: 'qpid-broker-core', version: '8.0.0' //default package doesn't support android.
     // https://mvnrepository.com/artifact/javax.naming/jndi
-    implementation files('libs/jndi-1.2.1.jar');
+    implementation files('libs/jndi-1.2.1.jar')
     // https://mvnrepository.com/artifact/org.apache.qpid/qpid-broker-plugins-amqp-0-8-protocol
-    implementation group: 'org.apache.qpid', name: 'qpid-broker-plugins-amqp-0-8-protocol', version: '8.0.4'
+    implementation group: 'org.apache.qpid', name: 'qpid-broker-plugins-amqp-0-8-protocol', version: '8.0.6'
     // https://mvnrepository.com/artifact/org.apache.qpid/qpid-broker-plugins-amqp-1-0-protocol
-    implementation group: 'org.apache.qpid', name: 'qpid-broker-plugins-amqp-1-0-protocol', version: '8.0.4'
+    implementation group: 'org.apache.qpid', name: 'qpid-broker-plugins-amqp-1-0-protocol', version: '8.0.6'
     // https://mvnrepository.com/artifact/org.apache.qpid/qpid-broker-plugins-memory-store
-    implementation group: 'org.apache.qpid', name: 'qpid-broker-plugins-memory-store', version: '8.0.4'
+    implementation group: 'org.apache.qpid', name: 'qpid-broker-plugins-memory-store', version: '8.0.6'
 
     //dependencies of AMQP broker
     // https://mvnrepository.com/artifact/com.google.guava/guava
@@ -82,12 +79,12 @@ dependencies {
 
     //MQTT
     //moquette
-    implementation 'io.moquette:moquette-broker:0.12.1'
+    implementation 'io.moquette:moquette-broker:0.15'
     //hive-Mq
     implementation group: 'com.hivemq', name: 'hivemq-mqtt-client', version: '1.2.2'
 
     //SU Library for root
-    implementation 'eu.chainfire:libsuperuser:1.0.0.201704021214'
+    implementation "com.github.topjohnwu.libsu:core:3.1.2"
 
     //RootTools Library
     implementation 'com.github.Stericson:RootShell:1.6'
@@ -97,9 +94,9 @@ dependencies {
         exclude group: 'com.github.Stericson'
     }
 
-    implementation "androidx.constraintlayout:constraintlayout:2.0.4"
+    implementation "androidx.constraintlayout:constraintlayout:2.1.0"
 
-    implementation "androidx.work:work-runtime:2.6.0-beta01"
+    implementation 'androidx.work:work-runtime:2.7.0-alpha05'
 
     //androidX legacy support
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
@@ -110,14 +107,14 @@ dependencies {
     implementation files('libs/alfresco-jlan.jar')
     implementation files('libs/nineoldandroids-2.4.0.jar')
     implementation files('libs/cryptix-jce-provider.jar')
-    implementation group: 'org.snmp4j', name: 'snmp4j', version: '3.4.5'
+    implementation group: 'org.snmp4j', name: 'snmp4j', version: '3.5.1'
     // https://mvnrepository.com/artifact/org.snmp4j/snmp4j-agent
-    implementation group: 'org.snmp4j', name: 'snmp4j-agent', version: '3.3.6'
+    implementation group: 'org.snmp4j', name: 'snmp4j-agent', version: '3.5.0'
     implementation files('libs/VirusTotalAPI.jar')
-    implementation 'com.google.firebase:firebase-analytics:19.0.0'
+    implementation 'com.google.firebase:firebase-analytics:19.0.1'
 
     // https://mvnrepository.com/artifact/com.hierynomus/smbj
-    testImplementation group: 'com.hierynomus', name: 'smbj', version: '0.11.1'
+    testImplementation group: 'com.hierynomus', name: 'smbj', version: '0.11.3'
 
     // https://mvnrepository.com/artifact/commons-io/commons-io
     implementation group: 'commons-io', name: 'commons-io', version: '2.9.0'
@@ -126,7 +123,7 @@ dependencies {
     implementation 'com.jaredrummler:android-device-names:2.0.0'
 
     //materialDesign
-    implementation 'com.google.android.material:material:1.4.0-rc01'
+    implementation 'com.google.android.material:material:1.5.0-alpha02'
 
     //leakcanary
     //debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.4'
@@ -136,22 +133,22 @@ dependencies {
     //testImplementation 'androidx.test:core:1.2.0'
 
     // Optional -- Mockito framework
-    testImplementation "org.mockito:mockito-core:3.10.0"
-    implementation 'androidx.annotation:annotation:1.0.0'
+    testImplementation 'org.mockito:mockito-core:3.12.4'
+    implementation 'androidx.annotation:annotation:1.2.0'
 
-    androidTestImplementation 'androidx.test:rules:1.4.0-beta02'
-    androidTestImplementation 'androidx.test:runner:1.4.0-beta02'
+    androidTestImplementation 'androidx.test:rules:1.4.0'
+    androidTestImplementation 'androidx.test:runner:1.4.0'
 
     // Optional -- UI testing with Espresso
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     //PowerMock
     testImplementation 'org.powermock:powermock-api-mockito2:2.0.9'
     testImplementation 'org.powermock:powermock-module-junit4:2.0.9'
     testImplementation 'org.powermock:powermock-core:2.0.9'
     testImplementation 'org.powermock:powermock-module-junit4-rule:2.0.9'
-    implementation 'androidx.multidex:multidex:2.0.0'
+    implementation 'androidx.multidex:multidex:2.0.1'
     // Optional -- Robolectric environment
-    testImplementation 'org.robolectric:robolectric:4.4.1'
+    testImplementation 'org.robolectric:robolectric:4.6.1'
 }
 
 greendao {
@@ -169,8 +166,8 @@ configurations {
 android {
     compileSdkVersion 30
     defaultConfig {
-        versionCode 16
-        versionName "2.4"
+        versionCode 17
+        versionName "2.4.1"
         minSdkVersion 24
         targetSdkVersion 30
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -203,32 +200,12 @@ android {
         pickFirst "META-INF/INDEX.LIST"
         pickFirst "META-INF/io.netty.versions.properties"
     }
-    // signing for release only works in the console
-    boolean doSigningForRelease = System.console() != null
-    if (doSigningForRelease) {
-        signingConfigs {
-            release {
-                storeFile file(System.console().readLine("\n\$ Enter keystore path:  "))
-                storePassword System.console().readLine("\n\$ Enter keystore password:  ")
-                keyAlias System.console().readLine("\n\$ Enter key alias:  ")
-                keyPassword System.console().readLine("\n\$ Enter key password:")
-            }
-        }
-    }
+
     buildTypes {
         debug {
             debuggable true
             jniDebuggable true
 //            testCoverageEnabled true
-            //resValue "string", "google_maps_api_key", "AIzaSyDs3xp1-2KQojns5h7mWHHdQxAL-5AZ-q4"
-        }
-        if (doSigningForRelease) {
-            release {
-                debuggable false
-                jniDebuggable false
-                signingConfig signingConfigs.release
-                //resValue "string", "google_maps_api_key", "AIzaSyDs3xp1-2KQojns5h7mWHHdQxAL-5AZ-q4"
-            }
         }
         release {
 //            signingConfig signingConfigs.config