Fixed bad ssid comparison when checking for already connected wifi

albertogeniola · Jun 6, 2021 · cf2f795 · cf2f795
1 parent e602350
commit cf2f795
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/...src/main/java/com/albertogeniola/merossconf/ui/fragments/pair/ExecutePairingFragment.java b/...src/main/java/com/albertogeniola/merossconf/ui/fragments/pair/ExecutePairingFragment.java
@@ -133,7 +133,8 @@ private void unregisterWifiChanges() {
     private void connectToDeviceWifiAp() {
         state = State.CONNECTING_DEVICE_WIFI_AP;
 
-        String targetSsid = "\""+pairActivityViewModel.getMerossPairingAp().getValue().getSsid()+"\"";
+        String ssid = pairActivityViewModel.getMerossPairingAp().getValue().getSsid();
+        String targetSsid = "\""+ssid+"\"";
         String bssid = pairActivityViewModel.getMerossPairingAp().getValue().getBssid();
 
         // Check if we are already connected to such wifi
@@ -142,15 +143,16 @@ private void connectToDeviceWifiAp() {
                 connectedWifi.getSSID() == null ||
                 connectedWifi.getSSID().compareTo(targetSsid)!=0 ||
                 connectedWifi.getBSSID().compareTo(bssid)!=0)
-            connectToKnownWifi(targetSsid, bssid);
+            connectToKnownWifi(ssid, bssid);
         else
             stateMachine(Signal.DEVICE_WIFI_CONNECTED);
     }
 
     private void connectToLocalWifi() {
         state = State.CONNETING_LOCAL_WIFI;
 
-        String targetSsid = "\""+pairActivityViewModel.getMerossConfiguredWifi().getValue().getScannedWifi().getSsid()+"\"";
+        String ssid = pairActivityViewModel.getMerossConfiguredWifi().getValue().getScannedWifi().getSsid();
+        String targetSsid = "\""+ssid+"\"";
         String bssid = pairActivityViewModel.getMerossConfiguredWifi().getValue().getScannedWifi().getBssid();
 
         // Check if we are already connected to such wifi
@@ -159,7 +161,7 @@ private void connectToLocalWifi() {
                 connectedWifi.getSSID() == null ||
                 connectedWifi.getSSID().compareTo(targetSsid)!=0 ||
                 connectedWifi.getBSSID().compareTo(bssid)!=0)
-            connectToKnownWifi(targetSsid, bssid);
+            connectToKnownWifi(ssid, bssid);
         else
             stateMachine(Signal.LOCAL_WIFI_CONNECTED);
     }