X-Git-Url: http://git.maemo.org/git/?p=jenirok;a=blobdiff_plain;f=src%2Fdaemon%2Fcalllistener.h;h=b58f3cbbbf47d32a88ed9f34c5a1b60442da2507;hp=164e10be9f528d820de99778a75108acd0c7ed11;hb=7c78a6f936682395aa101b2429c118934bb0f1d8;hpb=ee9cbde6d8233ae35e57771468588e6a198ec246

diff --git a/src/daemon/calllistener.h b/src/daemon/calllistener.h
index 164e10b..b58f3cb 100644
--- a/src/daemon/calllistener.h
+++ b/src/daemon/calllistener.h
@@ -25,9 +25,7 @@
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusObjectPath>
 #include "informationbox.h"
-#include "eniro.h"
-#include "contactmanager.h"
-#include "connectionmanager.h"
+#include "source.h"
 
 class CallListener: public QObject
 {
@@ -36,35 +34,64 @@ class CallListener: public QObject
 public:
     CallListener();
     ~CallListener();
-    void begin();
+    bool begin();
     void end();
-    static const int REQUEST_TIMEOUT = 10000;
-    static const int BANNER_DELAY = 300;
-    static const int NUMBER_OF_RETRIES = 3;
+    static const int REQUEST_TIMEOUT = 8000;
+    static const int BANNER_DELAY = 350;
+    static const int SEARCH_RETRIES = 2;
+    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:
+    virtual void timerEvent(QTimerEvent* event);
 
 private slots:
-    void requestFinished(QVector <Eniro::Result> const& results, Eniro::SearchDetails const& details, bool error);
+    void requestFinished(QVector <Source::Result> const& results, Source::SearchDetails const& details, bool error);
     void incomingCall(QDBusObjectPath path, QString numbe);
     void callTerminate();
     void showTimedMessage();
+    void handleAnswer();
+    void closeConnection();
 
 private:
     Q_DISABLE_COPY(CallListener);
 
-    void search(Eniro::SearchDetails const& details);
+    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);
+    void searchInit();
+    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_;
-    Eniro* eniro_;
-    ContactManager* contactManager_;
-    ConnectionManager* connectionManager_;
+    Source* source_;
+    Source::SourceId sourceId_;
+    QMap<QString, QString> sourceConfig_;
     bool closeConnection_;
+    bool initialized_;
     InformationBox* box_;
     QLabel* label_;
     static QDBusConnection systemBus_;
     int retries_;
-    QString currentSearch_;
+    int timer_;
+    CallDetails* currentCall_;
+    bool ignoreFirstZero_;
 };
 
 #endif // CALLLISTENER_H