Translate language names.

[yandex-traffic] / connection.cpp

diff --git a/connection.cpp b/connection.cpp
index e60590a..07882b0 100644 (file)
--- a/connection.cpp
+++ b/connection.cpp
@@ -26,6 +26,7 @@ ConnectionChecker::ConnectionChecker ()
     _itf = new QDBusInterface (ICD_DBUS_API_INTERFACE, ICD_DBUS_API_PATH, ICD_DBUS_API_INTERFACE, _bus);
     _bus.connect (ICD_DBUS_API_INTERFACE, ICD_DBUS_API_PATH, ICD_DBUS_API_INTERFACE, ICD_DBUS_API_STATE_SIG,
                   this, SLOT (stateSignal (const QDBusMessage&)));
+    _conn_counter = 0;
 
     requestState ();
 }
@@ -43,16 +44,58 @@ void ConnectionChecker::requestState ()
 
 void ConnectionChecker::stateSignal (const QDBusMessage& msg)
 {
-    unsigned int status = msg.arguments ().value (7).value<unsigned int>();
+    if (msg.arguments ().count () != 8)
+        return;
 
-    updateState (status == ICD_STATE_CONNECTED);
+    unsigned int state = msg.arguments ().value (7).value<unsigned int>();
+    QString net = msg.arguments ().value (3).toString ();
+
+    if (state == ICD_STATE_CONNECTED)
+        _conn_counter++;
+    if (state == ICD_STATE_DISCONNECTED)
+        _conn_counter--;
+
+    if (state == ICD_STATE_CONNECTED || !_conn_counter)
+        updateState (state == ICD_STATE_CONNECTED, net);
 }
 
 
-void ConnectionChecker::updateState (bool new_state)
+void ConnectionChecker::updateState (bool new_state, const QString& net_type)
 {
+    network_type_t new_net = Net_None;
+
     if (new_state != _connected) {
         _connected = new_state;
         emit connected (_connected);
     }
+
+    if (_connected) {
+        if (net_type.startsWith ("WLAN"))
+            new_net = Net_WLAN;
+        else if (net_type.startsWith ("GPRS") || net_type.startsWith ("DUN_GSM"))
+            new_net = Net_GSM;
+    }
+
+    if (new_net != _net_type) {
+        _net_type = new_net;
+        type_changed (_net_type);
+    }
+}
+
+
+bool ConnectionChecker::checkConnection (bool allow_gsm, bool allow_wifi)
+{
+    if (!_connected)
+        return false;
+
+    switch (_net_type) {
+        case Net_None:
+            return true;
+        case Net_WLAN:
+            return allow_wifi;
+        case Net_GSM:
+            return allow_gsm;
+        default:
+            return true;
+    }
 }