Fix build and get working in rM-docker

Eeems-Org · Dec 10, 2023 · ccfa049 · ccfa049
1 parent b944a75
commit ccfa049
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 18 deletions.
diff --git a/applications/system-service/digitizerhandler.h b/applications/system-service/digitizerhandler.h
@@ -32,7 +32,7 @@ class DigitizerHandler : public QThread {
         event_device touchScreen_device(deviceSettings.getTouchDevicePath(), O_RDWR);
         if(touchScreen_device.fd == -1){
             O_WARNING("Failed to open event device: " << touchScreen_device.device.c_str());
-            throw QException();
+
         }
         instance = new DigitizerHandler(touchScreen_device, "touchscreen");
         return instance;
@@ -60,11 +60,17 @@ class DigitizerHandler : public QThread {
     }
     void setEnabled(bool enabled){ m_enabled = enabled; }
     void write(ushort type, ushort code, int value){
+        if(device.fd == -1){
+            return;
+        }
         auto event = createEvent(type, code, value);
         ::write(device.fd, &event, sizeof(input_event));
         O_DEBUG("Emitted event " << event.input_event_sec << event.input_event_usec << type << code << value);
     }
     void write(input_event* events, size_t size){
+        if(device.fd == -1){
+            return;
+        }
         ::write(device.fd, events, size);
     }
     void syn(){
@@ -84,6 +90,10 @@ class DigitizerHandler : public QThread {
 
 protected:
     void run(){
+        if(device.fd == -1){
+            O_WARNING("No device, not starting for thread");
+            return;
+        }
         char name[256];
         memset(name, 0, sizeof(name));
         ioctl(device.fd, EVIOCGNAME(sizeof(name)), name);

diff --git a/applications/system-service/wifiapi.cpp b/applications/system-service/wifiapi.cpp
@@ -211,6 +211,11 @@ bool WifiAPI::enable(){
     if(!hasPermission("wifi")){
         return false;
     }
+    if(interfaces().isEmpty()){
+        O_WARNING("There are no interfaces to enable");
+        disable();
+        return false;
+    }
     O_INFO("Turning wifi on");
     if(m_state == Off){
         setState(Disconnected);
@@ -347,12 +352,16 @@ void WifiAPI::reconnect(){
         return;
     }
     O_INFO("Reconnecting to wifi");
-    QList<QDBusPendingReply<void>> replies;
-    for(auto interface : interfaces()){
-        replies.append(interface->Reconnect());
-    }
-    for(auto reply : replies){
-        reply.waitForFinished();
+    try{
+        QList<QDBusPendingReply<void>> replies;
+        for(auto interface : interfaces()){
+            replies.append(interface->Reconnect());
+        }
+        for(auto reply : replies){
+            reply.waitForFinished();
+        }
+    }catch(const std::exception& e){
+        O_WARNING("Failed to reconnect to wifi: " << e.what());
     }
 }
 
@@ -689,10 +698,14 @@ void WifiAPI::PropertiesChanged(const QVariantMap& properties){
 
 QList<Interface*> WifiAPI::interfaces(){
     QList<Interface*> result;
-    for(auto wlan : wlans){
-        if(wlan->interface() != nullptr){
-            result.append(wlan->interface());
+    try{
+        for(auto wlan : wlans){
+            if(wlan->interface() != nullptr){
+                result.append(wlan->interface());
+            }
         }
+    }catch(const std::exception& e){
+        O_WARNING("Failed to get wifi interfaces: " << e.what());
     }
     return result;
 }

diff --git a/shared/liboxide/debug.cpp b/shared/liboxide/debug.cpp
@@ -38,7 +38,7 @@ namespace Oxide {
             .arg(::getpgrp())
             .arg(::getpid())
             .arg(::gettid())
-            .arg(Oxide::getAppName().c_str())
+            .arg(Oxide::getAppName(false).c_str())
             .toStdString();
     }
 

diff --git a/shared/liboxide/debug.h b/shared/liboxide/debug.h
@@ -109,7 +109,7 @@ namespace Oxide {
      * \param Don't use qApp's application name
      * \return The name of the application
      */
-    LIBOXIDE_EXPORT std::string getAppName(bool ignoreQApp = false);
+    LIBOXIDE_EXPORT std::string getAppName(bool ignoreQApp);
     /*!
      * \brief Print the current backtrace
      */

diff --git a/shared/liboxide/oxide_sentry.cpp b/shared/liboxide/oxide_sentry.cpp
@@ -366,6 +366,10 @@ namespace Oxide::Sentry{
     void set_tag(Transaction* transaction, const std::string& name, const std::string& tag){
 #ifdef SENTRY
         sentry_transaction_set_tag_n(transaction->inner, name.c_str(), name.size(), tag.c_str(), tag.size());
+#else
+        Q_UNUSED(transaction);
+        Q_UNUSED(name);
+        Q_UNUSED(tag);
 #endif
     }
 

diff --git a/shared/liboxide/tarnish.cpp b/shared/liboxide/tarnish.cpp
@@ -890,7 +890,7 @@ namespace Oxide::Tarnish {
             if(reply.isError()){
                 O_WARNING("Unable to request existing windows:" << reply.error().message());
             }else{
-                auto windowName = QString::fromStdString(Oxide::getAppName());
+                auto windowName = QString::fromStdString(Oxide::getAppName(false));
                 for(QDBusObjectPath qpath : reply.value()){
                     auto path = qpath.path();
                     if(path == "/"){
@@ -916,9 +916,9 @@ namespace Oxide::Tarnish {
             }
             QDBusPendingReply<QDBusObjectPath> reply;
             if(fbRequestedGeometry.isNull()){
-                reply = api_gui->createWindow(QString::fromStdString(Oxide::getAppName()), fbRequestedFormat);
+                reply = api_gui->createWindow(QString::fromStdString(Oxide::getAppName(false)), fbRequestedFormat);
             }else{
-                reply = api_gui->createWindow(fbRequestedGeometry, QString::fromStdString(Oxide::getAppName()), fbRequestedFormat);
+                reply = api_gui->createWindow(fbRequestedGeometry, QString::fromStdString(Oxide::getAppName(false)), fbRequestedFormat);
             }
             reply.waitForFinished();
             if(reply.isError()){

diff --git a/tests/liboxide/test_Debug.cpp b/tests/liboxide/test_Debug.cpp
@@ -36,11 +36,11 @@ void test_Debug::test_debugEnabled(){
 }
 
 void test_Debug::test_getAppName(){
-    QCOMPARE(QString::fromStdString(Oxide::getAppName()), QString("liboxide"));
+    QCOMPARE(QString::fromStdString(Oxide::getAppName(false)), QString("liboxide"));
     qApp->setApplicationName("liboxide-test");
-    QCOMPARE(QString::fromStdString(Oxide::getAppName()), QString("liboxide-test"));
+    QCOMPARE(QString::fromStdString(Oxide::getAppName(false)), QString("liboxide-test"));
     qApp->setApplicationName("liboxide");
-    QCOMPARE(QString::fromStdString(Oxide::getAppName()), QString("liboxide"));
+    QCOMPARE(QString::fromStdString(Oxide::getAppName(false)), QString("liboxide"));
     QCOMPARE(QString::fromStdString(Oxide::getAppName(true)), QString("liboxide"));
     // TODO - test /proc/self/comm changing
     // TODO - test /proc/self/exe changing