Ensure that networks are still loaded after an application exits, or …

…you toggle the wifi
Eeems-Org · Sep 7, 2020 · 9c49b27 · 9c49b27
1 parent 747da3c
commit 9c49b27
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/applications/oxide/controller.h b/applications/oxide/controller.h
@@ -29,6 +29,8 @@ class Controller : public QObject
                 return false;
             }
             wifiManager = WifiManager::singleton();
+        }else{
+            wifiManager->loadNetworks();
         }
         return true;
     };

diff --git a/applications/oxide/wifimanager.h b/applications/oxide/wifimanager.h
@@ -168,6 +168,18 @@ class WifiManager : public DBusInterface
          : DBusInterface(SERVICE, path, SERVICE + ".Interface", connection),
            xochitlSettings("/home/root/.config/remarkable/xochitl.conf", QSettings::IniFormat) {
         // this->connection().connect("fi.w1.wpa_supplicant1", wlan0Path, "fi.w1.wpa_supplicant1.Interface", "ScanDone", this, SLOT(scanDone()));
+        loadNetworks();
+    };
+    ~WifiManager() {};
+    void waitForScan(){
+        while(Scanning()){
+            usleep(1000);
+        }
+    }
+    bool isConnected(){
+        return CurrentNetwork()->getPath().path() != "/";
+    }
+    void loadNetworks(){
         xochitlSettings.sync();
         xochitlSettings.beginGroup("wifinetworks");
         QList<QVariantMap> networks;
@@ -194,15 +206,6 @@ class WifiManager : public DBusInterface
             qDebug() << "Registered network " + network->SSID();
             network->setEnabled(true);
         }
-    };
-    ~WifiManager() {};
-    void waitForScan(){
-        while(Scanning()){
-            usleep(1000);
-        }
-    }
-    bool isConnected(){
-        return CurrentNetwork()->getPath().path() != "/";
     }
     void Scan(bool active = false){
         QMap<QString, QVariant> args;