Merge pull request #1 from christianrowlands/feature/connection_edit_…

…fields Make MQTT connection fields protected instead of private
christianrowlands · Jun 16, 2022 · 6a3d0ad · 6a3d0ad
2 parents 33d86f6 + bd52b0d
commit 6a3d0ad
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/MqttLibrary/build.gradle b/MqttLibrary/build.gradle
@@ -18,11 +18,11 @@ plugins {
 }
 
 group 'com.craxiom'
-version '0.4.4'
+version '0.4.5'
 
 android {
     compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         minSdkVersion 24

diff --git a/MqttLibrary/src/main/java/com/craxiom/mqttlibrary/ui/AConnectionFragment.java b/MqttLibrary/src/main/java/com/craxiom/mqttlibrary/ui/AConnectionFragment.java
@@ -63,12 +63,12 @@ public abstract class AConnectionFragment<T extends AConnectionFragment.ServiceB
     private CardView connectionStatusCardView;
     private TextView connectionStatusText;
     private SwitchCompat mqttConnectionToggleSwitch;
-    private EditText mqttHostAddressEdit;
-    private EditText mqttPortNumberEdit;
-    private SwitchCompat tlsToggleSwitch;
-    private EditText deviceNameEdit;
-    private EditText usernameEdit;
-    private EditText passwordEdit;
+    protected EditText mqttHostAddressEdit;
+    protected EditText mqttPortNumberEdit;
+    protected SwitchCompat tlsToggleSwitch;
+    protected EditText deviceNameEdit;
+    protected EditText usernameEdit;
+    protected EditText passwordEdit;
 
     private boolean mdmConfigPresent;
     private boolean mdmOverride = false;

diff --git a/MqttLibrary/src/main/res/values/strings.xml b/MqttLibrary/src/main/res/values/strings.xml
@@ -26,6 +26,8 @@
     <string name="help_title">Help?</string>
     <string name="tls">TLS</string>
 
+    <string name="scan_code">Auto Configure with QR code</string>
+
     <string name="mqtt_mdm_override_description">Your MQTT connection settings have been set by a Mobile Device Management server.  Toggle the switch below to override those settings so you can specify your own MQTT Broker connection information.</string>
     <string name="mqtt_mdm_override_title">Override MDM MQTT Settings</string>
     <string name="mdm_override_title">MDM Override</string>

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.1.3"
+        classpath 'com.android.tools.build:gradle:7.0.4'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip