One more fix to connection handling.

[jenirok] / src / daemon / calllistener.h

diff --git a/src/daemon/calllistener.h b/src/daemon/calllistener.h
index d842f81..16b6218 100644 (file)
--- a/src/daemon/calllistener.h
+++ b/src/daemon/calllistener.h
@@ -36,12 +36,14 @@ public:
     ~CallListener();
     bool begin();
     void end();
-    static const int REQUEST_TIMEOUT = 10000;
+    static const int REQUEST_TIMEOUT = 8000;
     static const int BANNER_DELAY = 350;
     static const int SEARCH_RETRIES = 2;
-    static const int CONNECT_RETRIES = 3;
-    static const int CONNECTION_LOOKUP_RETRIES = 15;
-    static const int WAIT_BETWEEN_RETRIES = 1000;
+    static const int CONNECT_RETRIES = 1;
+    static const int CONNECTION_LOOKUP_RETRIES = 7;
+    static const int GPRS_SCANS = 2;
+    static const int WLAN_SCANS = 4;
+    static const int WAIT_BETWEEN_RETRIES = 400;
     static const int ERROR_BANNER_TIMEOUT = 4500;
 
 protected:
@@ -52,10 +54,20 @@ private slots:
     void incomingCall(QDBusObjectPath path, QString numbe);
     void callTerminate();
     void showTimedMessage();
+    void handleAnswer();
+    void closeConnection();
 
 private:
     Q_DISABLE_COPY(CallListener);
 
+    struct CallDetails
+    {
+        QString number;
+        Source::Result result;
+        bool answered;
+        unsigned int time;
+    };
+
     void search(Source::SearchDetails const& details);
     void showResult(QString const& text);
     void showDelayedResult(QString const& text, int delay);
@@ -63,7 +75,9 @@ private:
     void searchClose();
     bool handleConnection();
     void showError(QString const& msg, int delay = 0);
+    bool is3g();
     void sleep(int ms);
+    void sendRetrySignal(QString const& iap, bool retry);
     QString createResult(QString const& name, QString const& street, QString const& city);
     QString timedMessage_;
     Source* source_;
@@ -75,8 +89,8 @@ private:
     QLabel* label_;
     static QDBusConnection systemBus_;
     int retries_;
-    QString currentSearch_;
     int timer_;
+    CallDetails* currentCall_;
 };
 
 #endif // CALLLISTENER_H