Changeset 72:fc91522ef9be in SMSSender

Timestamp:

Feb 9, 2010 9:47:21 PM (12 years ago)

Author:

Sämy Zehnder <saemy.zehnder@…>

Branch:

3.0

Convert:

svn:3639001d-8e34-449c-bb86-3782b86c4877/branches/3.0@71

Message:

• Started exception handling
• Fixed several bugs from the removal of the iloginaccount gateway

Files:

• gateways/SwisscomXtraZone/src/business/BCAccount.cpp (modified) (9 diffs)
• gateways/SwisscomXtraZone/src/ui/vcsettingswidget.cpp (modified) (2 diffs)
• lib/libdatatypes/datatypes.pro (modified) (3 diffs)
• lib/libdatatypes/src/abstract/abstractaccount.h (modified) (1 diff)
• lib/libdatatypes/src/abstract/abstractloginaccount.cpp (modified) (1 diff)
• lib/libdatatypes/src/abstract/persistence/abstractaccountstorageofficer.cpp (modified) (6 diffs)
• lib/libdatatypes/src/eventmappers/saccounteventmapper.h (modified) (1 diff)
• lib/libdatatypes/src/eventmappers/scontacteventmapper.h (modified) (1 diff)
• lib/libdatatypes/src/eventmappers/sgroupeventmapper.h (modified) (1 diff)
• lib/libdatatypes/src/eventmappers/sloginaccounteventmapper.h (modified) (1 diff)
• lib/libdatatypes/src/exceptions/eexception.cpp (added)
• lib/libdatatypes/src/exceptions/eexception.h (modified) (1 diff)
• lib/libdatatypes/src/exceptions/ehttpreadexception.h (deleted)
• lib/libdatatypes/src/exceptions/elibraryloadexception.h (modified) (1 diff)
• lib/libdatatypes/src/exceptions/eloginaccountloginexception.h (modified) (1 diff)
• lib/libdatatypes/src/exceptions/httpexceptions.h (modified) (1 diff)
• lib/libdatatypes/src/interfaces/iaccount.h (modified) (2 diffs)
• lib/libdatatypes/src/shttphelper.cpp (modified) (9 diffs)
• lib/libdatatypes/src/shttphelper.h (modified) (3 diffs)
• lib/libdatatypes/src/snumber.cpp (modified) (2 diffs)
• src/business/BCAccountLoadManager.cpp (modified) (3 diffs)
• src/business/BCAccountLoadManager.h (modified) (2 diffs)
• src/business/BCAccountLoadThread.cpp (modified) (1 diff)
• src/business/BCAccountLoadThread.h (modified) (1 diff)
• src/business/BCAccountManager.cpp (modified) (2 diffs)
• src/business/BCLibraryLoader.cpp (modified) (1 diff)
• src/persistence/storage/DAAccountListManager.cpp (modified) (1 diff)
• src/persistence/storage/DAStorage.cpp (modified) (15 diffs)
• src/ui/VCAccountList/vcaccountlist.cpp (modified) (1 diff)
• src/ui/VCAddressBook/vcaddressbook.cpp (modified) (1 diff)
• src/ui/VCEditContact/vceditcontact.cpp (modified) (1 diff)
• src/ui/VCEditGroup/vceditgroup.cpp (modified) (1 diff)
• src/ui/VCMain/vcmain.cpp (modified) (6 diffs)
• src/ui/VCMain/vcmain.h (modified) (1 diff)
• src/ui/models/accounttreemodel.cpp (modified) (1 diff)
• src/ui/models/loadedaccountmodel.cpp (modified) (1 diff)

gateways/SwisscomXtraZone/src/business/BCAccount.cpp

@@ -83 +83 @@
     posts.insert("isiwebpasswd", password());
 
-    lastHtml_   = httpHelper_->post(LOGIN_PAGE, QMap<QString, QString>(), posts);
+    if (!httpHelper_->post(LOGIN_PAGE, lastHtml_, QMap<QString, QString>(), posts)) {
+        throw LoginAccount::ELoginException(LoginAccount::ELoginException::RequestError).chain(httpHelper_->lastError());
+    }
 
     if (lastHtml_.contains("Begin error region content", Qt::CaseInsensitive)) {
-        throw LoginAccount::ELoginException(LoginAccount::ELoginException::InvalidLoginData);
+        throw LoginAccount::ELoginException(LoginAccount::ELoginException::InvalidLoginData).chain(httpHelper_->lastError());
     }
 
     if (!lastHtml_.contains("CobYouthSMSSenden:txtMessage", Qt::CaseInsensitive)) {
-        throw LoginAccount::ELoginException(LoginAccount::ELoginException::Unknown, "The returned page contains no message field.");
+        throw LoginAccount::ELoginException("The returned page contains no message field.").chain(httpHelper_->lastError());
     }
 
@@ -99 +101 @@
     qDebug() << "Starting logout";
 
-    httpHelper_->get(LOGOUT_PAGE);
+    QString requestResult;
+    if (!httpHelper_->get(LOGOUT_PAGE, requestResult)) {
+        qWarning() << tr("Error during logout: ") + httpHelper_->lastError().chainedWhat();
+        qWarning() << tr("But ignoring it, since we clear the cookies and are therefore also logged out");
+    }
     httpHelper_->cookieManager()->clearCookies();
 
@@ -108 +114 @@
     qDebug() << "Starting still-logged-in-check";
 
-    bool result = httpHelper_->get(MAIN_PAGE).contains("CobYouthSMSSenden:txtMessage", Qt::CaseInsensitive);
+    QString requestResult;
+    bool result = true;
+    if (!httpHelper_->get(MAIN_PAGE, requestResult)) {
+        result = false;
+        qWarning() << tr("Error while checking if we are still logged in: ") + httpHelper_->lastError().chainedWhat();
+        qWarning() << tr("But ignoring it, since we just do a new login attempt.");
+    }
+    result = result &&
+             requestResult.contains("CobYouthSMSSenden:txtMessage", Qt::CaseInsensitive);
 
     qDebug() << "Ended still-logged-in-check";
@@ -128 +142 @@
     }
 
-    lastHtml_ = httpHelper_->post(MAIN_PAGE, QMap<QString, QString>(), posts_);
+    if (!httpHelper_->post(MAIN_PAGE, lastHtml_, QMap<QString, QString>(), posts_)) {
+        throw Http::EReadException(tr("Error while doing a post")).addDebugInfos(posts_).chain(httpHelper_->lastError());
+    }
 
     rx.setPattern("<span.*id=\"CobYouthSMSSenden_lblErrorBox\".*>(.*)</span>");
@@ -145 +161 @@
     BCGateway* gtwy = static_cast<BCGateway*>(gateway());
 
-    rx.setPattern("<input.*id=\"CobYouthSMSSenden_txtMessageDisabled\".*value=\"(.*)\".*/>");
-    if (rx.indexIn(lastHtml_) == -1) {
-        throw EException(tr("Could not get the addon text!"));
-    }
-    gtwy->setAddonText(rx.cap(1));
-    qDebug() << "  Addon text: " + rx.cap(1);
-
-    rx.setPattern("<input.*id=\"lblcounter\".*value='(\\d*)'.*/?>");
-    if (rx.indexIn(lastHtml_) == -1){
-        throw EException(tr("Could not get the longSMSLength!"));
-    }
-    gtwy->setLongSMSLength(rx.cap(1).toInt() + gtwy->addonText().length());
-    qDebug() << "  Long SMS lenght: " + rx.cap(1);
-
-    rx.setPattern("<span.*id=\"CobYouthMMSSMSKonto_lblGuthaben\">(\\d*)</span>");
-    if (rx.indexIn(lastHtml_) == -1) {
-        throw EException(tr("Could not get the free sms count!"));
+    try {
+        rx.setPattern("<input.*id=\"CobYouthSMSSenden_txtMessageDisabled\".*value=\"(.*)\".*/>");
+        if (rx.indexIn(lastHtml_) == -1) {
+            throw EException(tr("Could not get the addon text!"));
+        }
+        gtwy->setAddonText(rx.cap(1));
+        qDebug() << "  Addon text: " + rx.cap(1);
+
+        rx.setPattern("<input.*id=\"lblcounter\".*value='(\\d*)'.*/?>");
+        if (rx.indexIn(lastHtml_) == -1){
+            throw EException(tr("Could not get the longSMSLength!"));
+        }
+        gtwy->setLongSMSLength(rx.cap(1).toInt() + gtwy->addonText().length());
+        qDebug() << "  Long SMS lenght: " + rx.cap(1);
+
+        rx.setPattern("<span.*id=\"CobYouthMMSSMSKonto_lblGuthaben\">(\\d*)</span>");
+        if (rx.indexIn(lastHtml_) == -1) {
+            throw EException(tr("Could not get the free sms count!"));
+        }
+    } catch (EException e) {
+        throw EException(tr("Error while parsing the sms-page: ") + e.unchainedWhat());
     }
     setFreeSMSCount(rx.cap(1).toInt());
@@ -173 +193 @@
     posts.insert("CobYouthSMSSenden:RecipientsDG:_ctl2:_ctl0", "");
 
-    while (lastHtml_.contains("CobYouthSMSSenden:RecipientsDG:_ctl2:_ctl0", Qt::CaseInsensitive)){
-        _doPost(posts);
+    try {
+        while (lastHtml_.contains("CobYouthSMSSenden:RecipientsDG:_ctl2:_ctl0", Qt::CaseInsensitive)){
+            _doPost(posts);
+        }
+    } catch (EException e) {
+        throw EException(tr("Could not remove old recipients: ") + e.unchainedWhat());
     }
     qDebug() << "Recipients removed";
@@ -186 +210 @@
     posts.insert("CobYouthSMSSenden:txtNewReceiver", recipient->number().toString("aaau"));
 
-    _doPost(posts);
+    try {
+        _doPost(posts);
+    } catch (EException e) {
+        throw EException(tr("Could not add a recipient: ") + e.what());
+    }
     qDebug() << "Recipient added";
 }
 
 void BCAccount::_sendSMS(const QString& text) {
-    qDebug() << "Starting sending part of SMS";
+    qDebug() << "Start of sending part of SMS";
 
     QString txt = text;
@@ -201 +229 @@
     posts.insert("CobYouthSMSSenden:txtMessage", txt);
 
-    _doPost(posts);
+    try {
+        _doPost(posts);
+    } catch (EException e) {
+        throw EException(tr("A part of the sms could not be sent to all recipients! ") + e.what());
+    }
 
     qDebug() << "Part of SMS sent";
@@ -231 +263 @@
         setProgress(0);
 
-    uncancelSendingSMS();
-
-    try {
-        setStatus(LoginAccount::Status::Login);
-        login();
-    }catch (...) {
-        // TODO
-        setStatus(LoginAccount::Status::Error);
-    }
-
-    _parseMainPage();
-
-    QList<QString> longSMSLst  = gateway()->splitTextToLongSMS(message);
-    QList<QString> shortSMSLst = gateway()->splitTextToShortSMS(message);
-
-    int freeSMSNeeded = shortSMSLst.size() * recipients.size();
-    if (freeSMSNeeded > freeSMSCount()) {
-        throw EException(tr("You have only %1 SMS for free. (You need at least %2 SMS left to send this message!)").arg(freeSMSCount()).arg(freeSMSNeeded));
-    }
-
-    setProgress(10);
-
-
-    int percent_per_sms = 80 / longSMSLst.size();
-
-    int x = 0;
-    QListIterator<QString> i(longSMSLst);
-    while (i.hasNext()) {
-        int y = 0;
-
-        QSetIterator<IContact*> j(recipients);
-        do {
-            setStatus(LoginAccount::Status::RemovingRecipients);
-            _removeRecipients(); // Remove all recipients
-            setProgress(percent_per_sms * 20/100, IncProgress);
-
-
-            int recipientsNum = std::min(recipients.size(), (y+1)*MAX_MOBILE);
-            setStatus(LoginAccount::Status::AddingRecipients.arg(y*MAX_MOBILE + 1).arg(recipientsNum).arg(recipients.size()));
-
-
-            int percent_per_contact = (percent_per_sms * 60/100) / recipientsNum;
-
-            int ix = 0;
-            while (j.hasNext() && (ix < MAX_MOBILE)) {
-                _addRecipient(j.next());
-                setProgress(percent_per_contact, IncProgress);
-
-                ix++;
-            }
-
-            setStatus(LoginAccount::Status::SendingSMS.arg(x+1).arg(longSMSLst.size()));
-            _sendSMS(i.next());
-            setStatus(LoginAccount::Status::SMSSent, percent_per_sms * 20/100, IncProgress);
-
-            y++;
-        } while ((y * MAX_MOBILE) < recipients.size()); // Repeat this step until the sms is sent to all recipients (if there are more than allowed to be addressed at once)
-
-        x++;
-    }
-
-    _parseMainPage();
-    setStatus(LoginAccount::Status::Logout, 90);
-    logout();
-
-    // TODO: check if sending was cancelled -> set status to "user abort"
-    setStatus(LoginAccount::Status::SMSSent, 100);
+        uncancelSendingSMS();
+
+        try {
+            setStatus(LoginAccount::Status::Login);
+            login();
+        }catch (...) {
+            // TODO
+            setStatus(LoginAccount::Status::Error);
+        }
+
+        _parseMainPage();
+
+        QList<QString> longSMSLst  = gateway()->splitTextToLongSMS(message);
+        QList<QString> shortSMSLst = gateway()->splitTextToShortSMS(message);
+
+        int freeSMSNeeded = shortSMSLst.size() * recipients.size();
+        if (freeSMSNeeded > freeSMSCount()) {
+            throw EException(tr("You have only %1 SMS for free. (You need at least %2 SMS left to send this message!)").arg(freeSMSCount()).arg(freeSMSNeeded));
+        }
+
+        setProgress(10);
+
+
+        int percent_per_sms = 80 / longSMSLst.size();
+
+        int x = 0;
+        QListIterator<QString> i(longSMSLst);
+        while (i.hasNext()) {
+            int y = 0;
+
+            QSetIterator<IContact*> j(recipients);
+            do {
+                setStatus(LoginAccount::Status::RemovingRecipients);
+                _removeRecipients(); // Remove all recipients
+                setProgress(percent_per_sms * 20/100, IncProgress);
+
+
+                int recipientsNum = std::min(recipients.size(), (y+1)*MAX_MOBILE);
+                setStatus(LoginAccount::Status::AddingRecipients.arg(y*MAX_MOBILE + 1).arg(recipientsNum).arg(recipients.size()));
+
+
+                int percent_per_contact = (percent_per_sms * 60/100) / recipientsNum;
+
+                int ix = 0;
+                while (j.hasNext() && (ix < MAX_MOBILE)) {
+                    _addRecipient(j.next());
+                    setProgress(percent_per_contact, IncProgress);
+
+                    ix++;
+                }
+
+                setStatus(LoginAccount::Status::SendingSMS.arg(x+1).arg(longSMSLst.size()));
+                _sendSMS(i.next());
+                setStatus(LoginAccount::Status::SMSSent, percent_per_sms * 20/100, IncProgress);
+
+                y++;
+            } while ((y * MAX_MOBILE) < recipients.size()); // Repeat this step until the sms is sent to all recipients (if there are more than allowed to be addressed at once)
+
+            x++;
+        }
+
+        _parseMainPage();
+        setStatus(LoginAccount::Status::Logout, 90);
+        logout();
+
+        // TODO: check if sending was cancelled -> set status to "user abort"
+        setStatus(LoginAccount::Status::SMSSent, 100);
 
     }catch (EException e) {
         // TODO
-        qDebug() << "An error occured: " + QString::fromLatin1(e.what());
+        qDebug() << "An error occured: " + e.what();
         setStatus(LoginAccount::Status::Error);
     }

gateways/SwisscomXtraZone/src/ui/vcsettingswidget.cpp

@@ -18 +18 @@
 
 void VCSettingsWidget::loadFromAccount(IAccount* account) {
-    BCAccount* account_;
-    try {
-        account_ = dynamic_cast<BCAccount*>(account);
-    } catch (...) {
-        throw new EException("Invalid account given!");
+    BCAccount* account_ = dynamic_cast<BCAccount*>(account);
+    if (account_ == NULL) {
+        throw EException("Invalid account given!");
     }
 
@@ -30 +28 @@
 
 void VCSettingsWidget::saveToAccount(IAccount* account) {
-    BCAccount* account_;
-    try {
-        // TODO: this gives no error...
-        account_ = dynamic_cast<BCAccount*>(account);
-    } catch (...) {
-        throw new EException("Invalid account given!");
+    BCAccount* account_ = dynamic_cast<BCAccount*>(account);
+    if (account_ == NULL) {
+        throw EException("Invalid account given!");
     }
 

lib/libdatatypes/datatypes.pro

@@ -46 +46 @@
     src/abstract/persistence/abstractstorageofficer.h \
     src/exceptions/eexception.h \
-    src/exceptions/ehttpreadexception.h \
     src/exceptions/elibraryloadexception.h \
     src/exceptions/eloginaccountloginexception.h \
@@ -78 +77 @@
     src/interfaces/persistence/istorageofficer.h \
     src/eventmappers/eventinterfaces.h \
-    src/eventmappers/saccounteventmapper.h \    
+    src/eventmappers/saccounteventmapper.h \
     src/eventmappers/scontacteventmapper.h \
     src/eventmappers/sgroupeventmapper.h \
@@ -99 +98 @@
     src/abstract/persistence/abstractloginaccountstorageofficer.cpp \
     src/abstract/persistence/abstractstorageofficer.cpp \
+    src/exceptions/eexception.cpp \
     src/interfaces/iaccount.cpp \
     src/interfaces/inumber.cpp \

lib/libdatatypes/src/abstract/abstractaccount.h

@@ -11 +11 @@
 #include "iaccount.h"
 #include "persistence/istorageofficer.h"
-
-#include "eventmappers/saccounteventmapper.h"
 
 class AbstractAccount: public QObject, public IAccount {

lib/libdatatypes/src/abstract/abstractloginaccount.cpp

@@ -19 +19 @@
 }
 ILoginAccountEvents* AbstractLoginAccount::accountEvents() const {
-    return static_cast<ILoginAccountEvents*>(eventMapper());
+    return static_cast<SLoginAccountEventMapper*>(eventMapper());
 }
 

lib/libdatatypes/src/abstract/persistence/abstractaccountstorageofficer.cpp

@@ -21 +21 @@
                   "); ");
     if (!query.exec()) {
-        throw Storage::EWriteException(tr("Could not create the account table in the database."));
+        throw Storage::EWriteException(tr("Could not create the account table in the database."))
+                        .addDebugInfo("sql-error", query.lastError().text());
     }
 }
@@ -32 +33 @@
                  "WHERE (accountId = '" + QString::number(account()->id()) + "'); ");
     if (!query.next()) {
-        throw Storage::EReadException(tr("No such account in the database! [accountId: %1]").arg(account()->id()));
+        throw Storage::EReadException(tr("No such account in the database!"))
+                        .addDebugInfo("accountId", account()->id());
     }
 
@@ -56 +58 @@
         query.bindValue(":gatewayName", account()->gateway()->name());
         if (!query.exec()) {
-            throw Storage::EWriteException(tr("The account could not have been written to the database."));
+            throw Storage::EWriteException(tr("The account could not have been written to the database."))
+                            .addDebugInfo("accountId", account()->id())
+                            .addDebugInfo("sql-error", query.lastError().text());
         }
 
@@ -64 +68 @@
                      "WHERE (name = '" + account()->name() + "'); ");
         if (!query.next()) {
-            throw Storage::EWriteException(tr("The account could not have been written to the database."));
+            throw Storage::EWriteException(tr("The account could not have been written to the database."))
+                            .addDebugInfo("accountId", account()->id())
+                            .addDebugInfo("sql-error", query.lastError().text());
         }
         account()->setId(query.value(0).toInt());
@@ -79 +85 @@
         if (!query.exec()) {
             qCritical() << query.lastError().text();
-            throw Storage::EWriteException(tr("The account could not have been written to the database."));
+            throw Storage::EWriteException(tr("The account could not have been written to the database."))
+                            .addDebugInfo("accountId", account()->id())
+                            .addDebugInfo("sql-error", query.lastError().text());
         }
     }
@@ -92 +100 @@
                     "WHERE (accountId = '" + QString::number(account()->id()) + "'); ");
     if (!query.exec()) {
-        throw Storage::EWriteException(tr("Could not remove the account from the database."));
+        throw Storage::EWriteException(tr("Could not remove the account from the database."))
+                        .addDebugInfo("accountId", account()->id())
+                        .addDebugInfo("sql-error", query.lastError().text());
     }
 

lib/libdatatypes/src/eventmappers/saccounteventmapper.h

@@ -24 +24 @@
       : account_(account)
     {};
-    IAccount* account() const { return account_; }
+    virtual IAccount* account() const { return account_; }
 
 signals:

lib/libdatatypes/src/eventmappers/scontacteventmapper.h

@@ -16 +16 @@
 
 class SContactEventMapper: public QObject,
-                           virtual public IContactEvents {
+                           public IContactEvents {
     Q_OBJECT
     Q_INTERFACES(IContactEvents)

lib/libdatatypes/src/eventmappers/sgroupeventmapper.h

@@ -17 +17 @@
 
 class SGroupEventMapper: public QObject,
-                         virtual public IGroupEvents {
+                         public IGroupEvents {
     Q_OBJECT
     Q_INTERFACES(IGroupEvents)

lib/libdatatypes/src/eventmappers/sloginaccounteventmapper.h

@@ -20 +20 @@
 
 public:
-    explicit SLoginAccountEventMapper(AbstractLoginAccount* account)
-      : SAccountEventMapper(reinterpret_cast<IAccount*>(account)) // Because of circular reference...
+    explicit SLoginAccountEventMapper(IAccount* account) // Has to be an instance of AbstractLoginAccount!
+      : SAccountEventMapper(account)
     {};
-    AbstractLoginAccount* account() const { return reinterpret_cast<AbstractLoginAccount*>(SAccountEventMapper::account()); }
 
 signals:
     void loggedIn();
     void loggedOut();
-
-private:
-    AbstractLoginAccount* account_;
 };
 

lib/libdatatypes/src/exceptions/eexception.h

@@ -9 +9 @@
 #define EEXCEPTION_H_
 
-#include <stdexcept>
+#include <QList>
+#include <QMap>
 #include <QString>
+#include <QStringList>
 
-class EException: public std::runtime_error {
+class EException {
 public:
-    explicit EException(const QString& msg) : std::runtime_error(msg.toStdString()) {}
+    EException()
+        : chainedException_(NULL)
+    {};
+    explicit EException(const QString& msg);
+    ~EException() throw(){};
+
+    EException      addDebugInfo(const QString& value) throw();
+    EException      addDebugInfo(const QString& key, int value) throw();
+    EException      addDebugInfo(const QString& key, const QString& value) throw();
+    EException      addDebugInfos(const QList<QString>& debugInfos) throw();
+    EException      addDebugInfos(const QMap<QString, QString>& debugInfos) throw();
+    QList<QString>  debugInfos() const throw();
+
+    EException      chain(const EException& exception) throw();
+    EException      chainedException() const throw();
+
+    void            setMessage(const QString& msg) throw();
+    QString         what(bool chained = true) const throw();
+    QString         chainedWhat() const throw();
+    QString         unchainedWhat() const throw();
+    virtual QString toString() const throw();
+
+private:
+    QString         message_;
+    QStringList     debugInfos_;
+    EException*     chainedException_;
 };
 

lib/libdatatypes/src/exceptions/elibraryloadexception.h

@@ -20 +20 @@
             InvalidLibraryFile,
             VersionMismatch,
+            Other,
             Unknown
         };
 
-        explicit ELoadException(const Purpose& purpose, const QString& message = "")
-            : EException(message)
-            , purpose_ (purpose)
-        {}
+        explicit ELoadException(const QString& message)
+            : purpose_(Other)
+            , msgStr_(message)
+        {};
+        explicit ELoadException(const Purpose& purpose)
+            : purpose_ (purpose)
+        {};
 
-        Purpose purpose(){ return purpose_; }
+        Purpose purpose() const throw() { return purpose_; }
+        QString toString() const throw() {
+            QString msg = QObject::tr("Loading the library failed: ");
+            switch (purpose()) {
+            case FileNotFound:
+                return msg + QObject::tr("Could not find the file");
+            case InvalidLibraryFile:
+                return msg + QObject::tr("The given file is no library");
+            case VersionMismatch:
+                return msg + QObject::tr("The given library has an invalid version");
+            case Other:
+                return msg + msgStr_;
+            case Unknown:
+            default:
+                return msg + QObject::tr("Unknown error");
+            }
+        }
 
     private:
         Purpose purpose_;
+        QString msgStr_;
     };
 }

lib/libdatatypes/src/exceptions/eloginaccountloginexception.h

@@ -18 +18 @@
     public:
         enum Purpose {
+            RequestError,
             InvalidLoginData,
+            Other,
             Unknown
         };
 
+        explicit ELoginException(const QString& msg) {
+            purpose_ = Other;
+            msgStr_  = msg;
+        };
         explicit ELoginException(const Purpose& purpose)
-            : EException("")
-            , purpose_(purpose)
-        {}
+            : purpose_(purpose)
+        {};
 
-        explicit ELoginException(const Purpose& purpose, const QString& msg)
-            : EException(msg)
-            , purpose_ (purpose)
-        {}
+        Purpose purpose() const throw() { return purpose_; }
 
-        Purpose purpose(){ return purpose_; }
+        QString toString() const throw() {
+            QString msg = QObject::tr("Login failed: ");
+            switch (purpose()) {
+            case RequestError:
+                return msg + QObject::tr("Request error");
+            case InvalidLoginData:
+                return msg + QObject::tr("Your login data might be wrong");
+            case Other:
+                return msg + msgStr_;
+            case Unknown:
+            default:
+                return msg + QObject::tr("Unknown error");
+            }
+        }
 
     private:
         Purpose purpose_;
+        QString msgStr_;
     };
 }

lib/libdatatypes/src/exceptions/httpexceptions.h

@@ -6 +6 @@
  */
 
-#include "ehttpreadexception.h"
+
+#include "eexception.h"
+
+#include <QList>
+#include <QSslError>
+
+namespace Http {
+    class EReadException: public EException {
+    public:
+        explicit EReadException(const QString& msg) : EException(msg) {}
+    };
+
+    class ESSLException: public EException {
+    public:
+        explicit ESSLException(const QList<QSslError>& errors)
+            : EException("")
+            , errors_(errors)
+        {
+            QString errorMsg = QObject::tr("SSL-Errors: ");
+            foreach (QSslError error, errors) {
+                errorMsg += error.errorString() + '\n';
+            }
+            errorMsg.left(errorMsg.length()-1);
+
+            EException::setMessage(errorMsg);
+        }
+
+        QList<QSslError> sslErrors() const { return errors_; }
+
+    private:
+        QList<QSslError> errors_;
+    };
+}

lib/libdatatypes/src/interfaces/iaccount.h

@@ -16 +16 @@
 #include "ivalidatable.h"
 
+#include "eventmappers/saccounteventmapper.h"
+
 class IContact;
 class IGateway;
-class SAccountEventMapper;
 
 namespace Account {
@@ -81 +82 @@
 #include "icontact.h"
 #include "igateway.h"
-#include "eventmappers/saccounteventmapper.h"
 
 #endif /* IACCOUNT_H_ */

lib/libdatatypes/src/shttphelper.cpp

@@ -6 +6 @@
 #include <QThread>
 #include <QUrl>
-
-#include "exceptions/httpexceptions.h"
 
 SHttpHelper::SHttpHelper() {
@@ -50 +48 @@
 }
 
-QString SHttpHelper::get(const QString& destination, const QMap<QString, QString>& requests /* = QMap<QString, QString>() */) {
+bool SHttpHelper::get(const QString& destination, QString& requestResult, const QMap<QString, QString>& requests /* = QMap<QString, QString>() */) {
     waitForRequest(false); // Wait until a running request has been finished
 
     startRequest("GET", destination, requests, QMap<QString, QString>());
     waitForRequest();
-    return getRequestResult();
-}
-
-QString SHttpHelper::post(const QString& destination, const QMap<QString, QString>& requests /* = QMap<QString, QString>() */,
+    requestResult = this->requestResult();
+
+    return !errorOccured();
+}
+
+bool SHttpHelper::post(const QString& destination, QString& requestResult, const QMap<QString, QString>& requests /* = QMap<QString, QString>() */,
         const QMap<QString, QString>& posts /* = QMap<QString, QString>() */)
 {
@@ -65 +65 @@
     startRequest("POST", destination, requests, posts);
     waitForRequest();
-    return getRequestResult();
+    requestResult = this->requestResult();
+
+    return !errorOccured();
 }
 
@@ -71 +73 @@
         const QMap<QString, QString>& posts /* = QMap<QString, QString>() */)
 {
-    requestResult_ = "";
+    requestResult_   = "";
+    requestHadError_ = false;
+    lastError_       = EException("");
 
     QUrl url_ = QUrl(destination);
@@ -142 +146 @@
 }
 
-/*bool HttpAccountHelper::isRequestFinished(const int& requestId) const {
-    return finishedRequests_.contains(requestId);
-}*/
-
 void SHttpHelper::waitForRequest(bool createLoopIfNotExisting) {
     if (!requestLoop_.isRunning() && !createLoopIfNotExisting){
@@ -152 +152 @@
 
     qDebug() << "Waiting for the request to finish...";
-    while (!request_.finished && thread()->isRunning()) {
-        thread()->wait(100);
-    }
 /*    while (!request_.finished && thread()->isRunning()) {
         thread()->wait(100);
     }*/
-//    requestLoop_.exec(QEventLoop::ExcludeUserInputEvents|QEventLoop::ExcludeSocketNotifiers|QEventLoop::WaitForMoreEvents);
+    requestLoop_.exec(QEventLoop::WaitForMoreEvents/*QEventLoop::ExcludeUserInputEvents|QEventLoop::ExcludeSocketNotifiers|QEventLoop::WaitForMoreEvents*/);
     qDebug() << "The request finished -> continuing";
 /*    while (!request_.finished) {
@@ -168 +165 @@
 }
 
-QString SHttpHelper::getRequestResult() const {
+QString SHttpHelper::requestResult() const {
     return requestResult_;
 }
+bool SHttpHelper::errorOccured() const {
+    return requestHadError_;
+}
+EException SHttpHelper::lastError() const {
+    return lastError_;
+}
+QString SHttpHelper::lastErrorStr() const {
+    return lastError_.toString();
+}
+
+void SHttpHelper::errorOccured(int httpRequestId, const EException& exception) {
+    if (httpRequestId != request_.httpRequestId) {
+        qWarning() << "Request [" + QString::number(httpRequestId) + "] finished with an error (it is ignored, since this request is detached): " + exception.what();
+        return;
+    }
+
+    requestHadError_ = true;
+    lastError_       = exception;
+    qWarning() << "Request [" + QString::number(httpRequestId) + "] finished with an error: " + lastError().what();
+}
 
 void SHttpHelper::responseHeaderReceived(const QHttpResponseHeader& responseHeader) {
-    //qDebug() << responseHeader.statusCode() << " " << responseHeader.reasonPhrase();
-    //qDebug() << responseHeader.values();
+    if (http()->currentId() != request_.httpRequestId)
+        return;
 
     switch (responseHeader.statusCode()) {
@@ -187 +204 @@
 
             request_.httpRequestId = -1; // To avoid error in httpRequestFinished
-            http_->abort();
 
             // Since the responseHeaderReceived-Slot could eventually not be called yet in cookieManager -> this would lead to a wrong header in doRequest
             cookieManager_->processResponseHeader(responseHeader);
 
-            //cookiemanager has not handled the response yet...
             doRequest(responseHeader.value("location")); // Do the redirect
             break;
 
         default:
-            throw Http::EReadException("Unknown response code!");
+            errorOccured(http_->currentId(), Http::EReadException(tr("Unknown response code")));
+            http()->abort();
             break;
     }
@@ -208 +224 @@
      }
 
-     qDebug() << "Quitting request loop";
-     requestLoop_.quit();
      request_.finished = true;
-
      if (error) {
-         qDebug() << "Request [" + QString::number(httpRequestId) + "] finished with an error: " + http_->errorString();
-         throw Http::EReadException(http_->errorString()); // TODO: Perhaps this error has to be thrown in the waitForRequest by passing a status value to requestLoop_.exit()
+         errorOccured(httpRequestId, Http::EReadException(http_->errorString()));
      } else {
          qDebug() << "Request [" + QString::number(httpRequestId) + "] finished";
-         requestResult_ = /*request.buffer.readAll()*/ http_->readAll();
-         //qDebug() << requestResult_;
+         requestResult_ = http_->readAll();
      }
-
-     requestLoop_.processEvents();
+     qDebug() << "Quitting request loop";
+     requestLoop_.exit(errorOccured() ? 1 : 0);
  }
 
 void SHttpHelper::sslErrors(const QList<QSslError>& errors) {
-    QListIterator<QSslError> i(errors);
-    while (i.hasNext()){
-        QSslError err = i.next();
-        qDebug() << "SSL-error: " + err.errorString();
-    }
-}
+    errorOccured(http()->currentId(), Http::ESSLException(errors));
+}

lib/libdatatypes/src/shttphelper.h

@@ -16 +16 @@
 
 #include <iaccount.h>
+#include "exceptions/httpexceptions.h"
 
 #include "shttpcookiemanager.h"
@@ -41 +42 @@
     ~SHttpHelper();
 
-    virtual QHttp*             http() const;
-    virtual SHttpCookieManager* cookieManager() const;
+    QHttp*                     http() const;
+    SHttpCookieManager*        cookieManager() const;
 
-    virtual QString            get(const QString& destination, const QMap<QString, QString>& requests = (QMap<QString, QString>()));
-    virtual QString            post(const QString& destination, const QMap<QString, QString>& requests = (QMap<QString, QString>()), const QMap<QString, QString>& posts = (QMap<QString, QString>()));
+    bool                       get(const QString& destination, QString& requestResult, const QMap<QString, QString>& requests = (QMap<QString, QString>()));
+    bool                       post(const QString& destination, QString& requestResult, const QMap<QString, QString>& requests = (QMap<QString, QString>()), const QMap<QString, QString>& posts = (QMap<QString, QString>()));
+
+    bool                       errorOccured() const;
+    EException                 lastError() const;
+    QString                    lastErrorStr() const;
 
 protected:
     virtual QHttpRequestHeader defaultHeader(const QUrl& url) const;
-
-    virtual void               startRequest(const QString& method, const QString& destination, const QMap<QString, QString>& requests = (QMap<QString, QString>()), const QMap<QString, QString>& posts = (QMap<QString, QString>()));
-    virtual int                doRequest(const QString& destination);
-    //virtual bool               isRequestFinished() const;
-    virtual void               waitForRequest(bool createIfNotExisting = true);
-    virtual QString            getRequestResult() const;
 
 private:
@@ -60 +59 @@
     QHttpRequestHeader* defaultHeader_;
 
-    SHttpCookieManager*  cookieManager_;
+    SHttpCookieManager* cookieManager_;
 
-    SHttpRequest         request_;
+    SHttpRequest        request_;
+    QEventLoop          requestLoop_;
     QString             requestResult_;
-    QEventLoop          requestLoop_;
+    bool                requestHadError_;
+    EException          lastError_;
 
     QString getParamStr(const QMap<QString, QString>& params);
+    QString requestResult() const;
+    void    startRequest(const QString& method, const QString& destination, const QMap<QString, QString>& requests = (QMap<QString, QString>()), const QMap<QString, QString>& posts = (QMap<QString, QString>()));
+    int     doRequest(const QString& destination);
+    void    waitForRequest(bool createIfNotExisting = true);
+
+    void    errorOccured(int requestId, const EException& exception);
 
 private slots:

lib/libdatatypes/src/snumber.cpp

@@ -42 +42 @@
 }
 SNumber::SNumber(const SNumber& other) {
-    fromString(other.toString("ccaaau"), "ccaaau");
+    setNumber(other.toString("ccaaau"), "ccaaau");
 }
 
@@ -75 +75 @@
     if (format == SNumber::GuessFormat) {
         QStringList formats;
+        formats.append("ccaaau");         // 410792436866
         formats.append("'+'cc' 'aaa' 'u");// +41 079 1234567
         formats.append("'+'cc' 'aa' 'u"); // +41 79 1234567

src/business/BCAccountLoadManager.cpp

@@ -26 +26 @@
 
          BCAccountLoadThread* alt = i.value();
-         QObject::disconnect(alt, SIGNAL(loadStateChanged(IAccount*, AccountLoadState)),
-                             this, SLOT(accountLoadThreadLoadStateChanged(IAccount*, AccountLoadState)));
-         QObject::disconnect(alt, SIGNAL(loaded(IAccount*)),
-                             this, SLOT(accountLoadThreadLoaded(IAccount*)));
-         QObject::disconnect(alt, SIGNAL(loadingFinished(IAccount*, AccountLoadState)),
-                             this, SLOT(accountLoadThreadLoadingFinished(IAccount*, AccountLoadState)));
-         QObject::disconnect(alt, SIGNAL(loadingFailed(IAccount*, EException*)),
-                             this, SLOT(accountLoadThreadLoadingFailed(IAccount*, EException*)));
+         disconnect(alt, SIGNAL(loadStateChanged(IAccount*, AccountLoadState)),
+                    this, SLOT(accountLoadThreadLoadStateChanged(IAccount*, AccountLoadState)));
+         disconnect(alt, SIGNAL(loaded(IAccount*)),
+                    this, SLOT(accountLoadThreadLoaded(IAccount*)));
+         disconnect(alt, SIGNAL(loadingFinished(IAccount*, AccountLoadState)),
+                    this, SLOT(accountLoadThreadLoadingFinished(IAccount*, AccountLoadState)));
+         disconnect(alt, SIGNAL(loadingFailed(IAccount*, const EException&)),
+                    this, SLOT(accountLoadThreadLoadingFailed(IAccount*, const EException&)));
          delete alt;
      }
@@ -76 +76 @@
     if (!accountLoadThreads_.contains(account)) {
         BCAccountLoadThread* alt = new BCAccountLoadThread(account);
-        QObject::connect(alt, SIGNAL(loadStateChanged(IAccount*, AccountLoadState)),
-                         this, SLOT(accountLoadThreadLoadStateChanged(IAccount*, AccountLoadState)));
-        QObject::connect(alt, SIGNAL(loaded(IAccount*)),
-                         this, SLOT(accountLoadThreadLoaded(IAccount*)));
-        QObject::connect(alt, SIGNAL(loadingFinished(IAccount*, AccountLoadState)),
-                         this, SLOT(accountLoadThreadLoadingFinished(IAccount*, AccountLoadState)));
-        QObject::connect(alt, SIGNAL(loadingFailed(IAccount*, EException*)),
-                         this, SLOT(accountLoadThreadLoadingFailed(IAccount*, EException*)));
+        connect(alt, SIGNAL(loadStateChanged(IAccount*, AccountLoadState)),
+                this, SLOT(accountLoadThreadLoadStateChanged(IAccount*, AccountLoadState)));
+        connect(alt, SIGNAL(loaded(IAccount*)),
+                this, SLOT(accountLoadThreadLoaded(IAccount*)));
+        connect(alt, SIGNAL(loadingFinished(IAccount*, AccountLoadState)),
+                this, SLOT(accountLoadThreadLoadingFinished(IAccount*, AccountLoadState)));
+        connect(alt, SIGNAL(loadingFailed(IAccount*, const EException&)),
+                this, SLOT(accountLoadThreadLoadingFailed(IAccount*, const EException&)));
 
         accountLoadThreads_.insert(account, alt);
@@ -93 +93 @@
 
 void BCAccountLoadManager::accountLoadThreadLoadStateChanged(IAccount* account, AccountLoadState state) {
-    accountLoadStateChanged(account, state);
+    emit accountLoadStateChanged(account, state);
 }
 void BCAccountLoadManager::accountLoadThreadLoaded(IAccount* account) {
-    accountLoaded(account);
+    emit accountLoaded(account);
 }
 void BCAccountLoadManager::accountLoadThreadLoadingFinished(IAccount* account, AccountLoadState state) {
-    accountLoadingFinished(account, state);
+    emit accountLoadingFinished(account, state);
 }
-void BCAccountLoadManager::accountLoadThreadLoadingFailed(IAccount* account, EException* exception) {
-    accountLoadingFailed(account, exception);
+void BCAccountLoadManager::accountLoadThreadLoadingFailed(IAccount* account, const EException& exception) {
+    emit accountLoadingFailed(account, exception);
 }

src/business/BCAccountLoadManager.h

@@ -34 +34 @@
     void accountLoaded(IAccount* account);
     void accountLoadingFinished(IAccount* account, AccountLoadState state);
-    void accountLoadingFailed(IAccount* account, EException* exception);
+    void accountLoadingFailed(IAccount* account, const EException& exception);
 
 protected:
@@ -46 +46 @@
     void accountLoadThreadLoaded(IAccount* account);
     void accountLoadThreadLoadingFinished(IAccount* account, AccountLoadState state);
-    void accountLoadThreadLoadingFailed(IAccount* account, EException* exception);
+    void accountLoadThreadLoadingFailed(IAccount* account, const EException& exception);
 
 

src/business/BCAccountLoadThread.cpp

@@ -23 +23 @@
         try {
             account_->initialize();
-        } catch (EException* exception) {
+        } catch (EException e) {
             setLoadState(Failed);
-            emit loadingFailed(account(), exception); // Signal
+            emit loadingFailed(account(), EException(tr("Initializing account failed")).chain(e)); // Signal
         } catch (...) {
         setLoadState(Failed);
-            emit loadingFailed(account(), new EException("Unknown error occured while loading an account.")); // Signal
+            emit loadingFailed(account(), EException("Unknown error occured while loading an account.")); // Signal
         }
 

src/business/BCAccountLoadThread.h

@@ -34 +34 @@
     void loaded(IAccount* account);
     void loadingFinished(IAccount* account, AccountLoadState state);
-    void loadingFailed(IAccount* account, EException* exception);
+    void loadingFailed(IAccount* account, const EException& exception);
 
 

src/business/BCAccountManager.cpp

@@ -9 +9 @@
 
 #include "../persistence/PersistenceFactory.h"
+
+#include <QDebug>
 
 BCAccountManager* BCAccountManager::instance_=0;
@@ -100 +102 @@
 }
 void BCAccountManager::accountDataChanged() {
-    SAccountEventMapper* eventMapper = static_cast<SAccountEventMapper*>(sender()); //TODO: this is wrong... (sender() is not the eventManager)
+    SAccountEventMapper* eventMapper = qobject_cast<SAccountEventMapper*>(sender()); //TODO: this is wrong... (sender() is not the eventManager)
     IAccount* account = eventMapper->account();
     Q_ASSERT(account);

src/business/BCLibraryLoader.cpp

@@ -38 +38 @@
     }
 
-    QLibrary library;
-    library.setLoadHints(QLibrary::ResolveAllSymbolsHint | QLibrary::ExportExternalSymbolsHint);
-    library.setFileName(filename);
+    try {
+        QLibrary library;
+        library.setLoadHints(QLibrary::ResolveAllSymbolsHint | QLibrary::ExportExternalSymbolsHint);
+        library.setFileName(filename);
 
-    typedef ILibrary* (*GetLibraryFunc)();
-    GetLibraryFunc getLibrary = (GetLibraryFunc)library.resolve("getLibrary");
-    if (getLibrary) {
-        ILibrary* lib = getLibrary();
-        if (lib != NULL) {
-            libraries_.insert(filename, lib);
-            IGateway* gateway = lib->getGateway();
-            if (gateway != NULL) {
-                gateways_.insert(lib, gateway);
+        typedef ILibrary* (*GetLibraryFunc)();
+        GetLibraryFunc getLibrary = (GetLibraryFunc)library.resolve("getLibrary");
+        if (getLibrary) {
+            ILibrary* lib = getLibrary();
+            if (lib != NULL) {
+                libraries_.insert(filename, lib);
+                IGateway* gateway = lib->getGateway();
+                if (gateway != NULL) {
+                    gateways_.insert(lib, gateway);
+                }
+
+                return lib;
+            } else {
+                qWarning() << "The library could not have been loaded: The returned library object was NULL";
             }
-
-            return lib;
         } else {
-            qWarning() << "The library could not have been loaded: The returned library object was NULL";
+            qWarning() << "The library could not have been loaded: " + library.errorString();
         }
-    } else {
-        qWarning() << "The library could not have been loaded: " + library.errorString();
+    } catch (EException e) {
+        throw EException(tr("Could not load the library"))
+                .addDebugInfo("filename", filename)
+                .chain(e);
     }
     return NULL;

src/persistence/storage/DAAccountListManager.cpp

@@ -30 +30 @@
                  "WHERE (accountId = '" + QString::number(accountId) + "'); ");
     if (!query.next()) {
-        throw Storage::EReadException(tr("No such account in the database! [accountId: %1]").arg(accountId));
+        throw Storage::EReadException(tr("No such account in the database!"))
+                        .addDebugInfo("accountId", accountId);
     }
 

src/persistence/storage/DAStorage.cpp

@@ -40 +40 @@
     if (!dbConnection_.open()) {
         qCritical() << dbConnection_.lastError().text();
-        throw Storage::EReadException(tr("Can't open the database!"));
-    }
-
-    bool somethingFailed = false;
+        throw Storage::EReadException(tr("Can't open the database!"))
+                        .addDebugInfo("sql-error", dbConnection_.lastError().text());
+    }
+
     QSqlQuery query;
-    somethingFailed |= !query.exec("CREATE TABLE IF NOT EXISTS t_contacts ("
-                                     "contactId INTEGER PRIMARY KEY AUTOINCREMENT, "
-                                     "name      TEXT    NOT NULL UNIQUE, "
-                                     "number    TEXT    NOT NULL UNIQUE "
-                                   "); ");
-    somethingFailed |= !query.exec("CREATE TABLE IF NOT EXISTS t_groups ("
-                                     "groupId INTEGER PRIMARY KEY AUTOINCREMENT, "
-                                     "name      TEXT    NOT NULL UNIQUE "
-                                   "); ");
-    somethingFailed |= !query.exec("CREATE TABLE IF NOT EXISTS t_settings ("
-                                     "namespace TEXT NOT NULL, "
-                                     "key       TEXT NOT NULL, "
-                                     "value     BLOB, "
-                                     "PRIMARY KEY(namespace, key) "
-                                   "); ");
-
-    if (somethingFailed) {
-        throw Storage::EWriteException(tr("Could not write the table definitions to the database."));
+    try {
+        if (!query.exec("CREATE TABLE IF NOT EXISTS t_contacts ("
+                          "contactId INTEGER PRIMARY KEY AUTOINCREMENT, "
+                          "name      TEXT    NOT NULL UNIQUE, "
+                          "number    TEXT    NOT NULL UNIQUE "
+                        "); ")) {
+            throw EException(query.lastError().text());
+        }
+        if (!query.exec("CREATE TABLE IF NOT EXISTS t_groups ("
+                          "groupId INTEGER PRIMARY KEY AUTOINCREMENT, "
+                          "name      TEXT    NOT NULL UNIQUE "
+                        "); ")) {
+            throw EException(query.lastError().text());
+        }
+        if (!query.exec("CREATE TABLE IF NOT EXISTS t_settings ("
+                          "namespace TEXT NOT NULL, "
+                          "key       TEXT NOT NULL, "
+                          "value     BLOB, "
+                          "PRIMARY KEY(namespace, key) "
+                        "); ")) {
+            throw EException(query.lastError().text());
+        }
+    } catch (EException e) {
+        throw Storage::EWriteException(tr("Could not write the table definitions to the database"))
+                        .addDebugInfo("sql-error", e.unchainedWhat());
     }
 }
@@ -133 +140 @@
                     "WHERE (contactId = '" + QString::number(contactId) + "'); ");
     if (!query.next()) {
-        throw Storage::EReadException(tr("No such contact in the database! [contactId: %1]").arg(contactId));
+        throw Storage::EReadException(tr("No such contact in the database!"))
+                        .addDebugInfo("contactId", QString::number(contactId))
+                        .addDebugInfo("sql-error", query.lastError().text());
     }
 
@@ -156 +165 @@
                     "WHERE (groupId = '" + QString::number(groupId) + "'); ");
     if (!query.next()) {
-        throw Storage::EReadException(tr("No such group in the database! [groupId: %1]").arg(groupId));
+        throw Storage::EReadException(tr("No such group in the database!"))
+                        .addDebugInfo("groupId", QString::number(groupId))
+                        .addDebugInfo("sql-error", query.lastError().text());
     }
 
@@ -234 +245 @@
 
     if (!query.exec()) {
-        throw Storage::EWriteException(tr("Could not write setting to the database."));
+        throw Storage::EWriteException(tr("Could not write setting to the database."))
+                        .addDebugInfo("namespace", _namespace)
+                        .addDebugInfo("key", key)
+                        .addDebugInfo("value", value.toString())
+                        .addDebugInfo("sql-error", query.lastError().text());
     }
 
@@ -255 +270 @@
 
         if (x > 10) {
-            throw Storage::EWriteException(tr("Could not write an encrypted string to the database. [%1, %2]").arg(_namespace).arg(key));
+            throw Storage::EWriteException(tr("Could not write an encrypted string to the database - maximum attemps reached."))
+                    .addDebugInfo("namespace", _namespace)
+                    .addDebugInfo("key", key);
         }
 
@@ -294 +311 @@
         query.bindValue(":number", contact->number().toString());
         if (!query.exec()) {
-            throw Storage::EWriteException(tr("The contact could not have been written to the database."));
+            throw Storage::EWriteException(tr("The contact could not have been written to the database."))
+                            .addDebugInfo("contactId", contact->id())
+                            .addDebugInfo("sql-error", query.lastError().text());
         }
 
@@ -302 +321 @@
                      "WHERE (name = '" + contact->name() + "'); ");
         if (!query.next()) {
-            throw Storage::EWriteException(tr("The contact could not have been written to the database."));
+            throw Storage::EWriteException(tr("The contact could not have been written to the database."))
+                            .addDebugInfo("contactId", contact->id())
+                            .addDebugInfo("sql-error", query.lastError().text());
         }
         contact->setId(query.value(0).toInt());
@@ -316 +337 @@
 
         if (!query.exec()) {
-            throw Storage::EWriteException(tr("The contact could not have been written to the database."));
+            throw Storage::EWriteException(tr("The contact could not have been written to the database."))
+                            .addDebugInfo("contactId", contact->id())
+                            .addDebugInfo("sql-error", query.lastError().text());
         }
     }
@@ -346 +369 @@
         query.bindValue(":name", group->name());
         if (!query.exec()) {
-            throw Storage::EWriteException(tr("The group could not have been written to the database."));
+            throw Storage::EWriteException(tr("The group could not have been written to the database."))
+                            .addDebugInfo("groupId", group->id())
+                            .addDebugInfo("sql-error", query.lastError().text());
         }
 
@@ -354 +379 @@
                      "WHERE (name = '" + group->name() + "'); ");
         if (!query.next()) {
-            throw Storage::EWriteException(tr("The group could not have been written to the database."));
+            throw Storage::EWriteException(tr("The group could not have been written to the database."))
+                            .addDebugInfo("groupId", group->id())
+                            .addDebugInfo("sql-error", query.lastError().text());
         }
         group->setId(query.value(0).toInt());
@@ -366 +393 @@
 
         if (!query.exec()) {
-            throw Storage::EWriteException(tr("The group could not have been written to the database."));
+            throw Storage::EWriteException(tr("The group could not have been written to the database."))
+                            .addDebugInfo("groupId", group->id())
+                            .addDebugInfo("sql-error", query.lastError().text());
         }
     }
@@ -395 +424 @@
                       "AND (key = '" + key + "'); ");
     if (!query.exec()) {
-        throw Storage::EWriteException(tr("Could not remove the setting from the database."));
+        throw Storage::EWriteException(tr("Could not remove the setting from the database."))
+                        .addDebugInfo("namespace", _namespace)
+                        .addDebugInfo("key", key)
+                        .addDebugInfo("sql-error", query.lastError().text());
     }
 }
@@ -404 +436 @@
                     "WHERE (namespace = '" + _namespace + "'); ");
     if (!query.exec()) {
-        throw Storage::EWriteException(tr("Could not remove the settings from the database."));
+        throw Storage::EWriteException(tr("Could not remove the settings from the database."))
+                        .addDebugInfo("namespace", _namespace)
+                        .addDebugInfo("sql-error", query.lastError().text());
     }
 }
@@ -419 +453 @@
                         "WHERE (contactId = '" + QString::number(contactId) + "'); ");
         if (!query.exec()) {
-            throw;
-        }
-    } catch (...) {
-        throw Storage::EWriteException(tr("Could not remove the contact from the database."));
+            throw EException(query.lastError().text());
+        }
+    } catch (EException e) {
+        throw Storage::EWriteException(tr("Could not remove the contact from the database"))
+                        .addDebugInfo("contactId", contactId)
+                        .chain(e);
     }
 }
@@ -436 +472 @@
                         "WHERE (groupId = '" + QString::number(groupId) + "'); ");
         if (!query.exec()) {
-            throw;
-        }
-    } catch (...) {
-        throw Storage::EWriteException(tr("Could not remove the group from the database."));
-    }
-}
+            throw EException(query.lastError().text());
+        }
+    } catch (EException e) {
+        throw Storage::EWriteException(tr("Could not remove the group from the database"))
+                        .addDebugInfo("groupId", groupId)
+                        .chain(e);
+    }
+}

src/ui/VCAccountList/vcaccountlist.cpp

@@ -6 +6 @@
 
 #include "../VCEditAccount/vceditaccount.h"
-
-#include "../UIHelper.h"
 
 #include <inumber.h>

src/ui/VCAddressBook/vcaddressbook.cpp

@@ -8 +8 @@
 #include "../VCEditContact/vceditcontact.h"
 #include "../VCEditGroup/vceditgroup.h"
-
-#include "../UIHelper.h"
 
 #include <scontact.h>

src/ui/VCEditContact/vceditcontact.cpp

@@ -9 +9 @@
 #include <QStringList>
 #include <QSortFilterProxyModel>
-
-#include "../UIHelper.h"
 
 #include <snumber.h>

src/ui/VCEditGroup/vceditgroup.cpp

@@ -2 +2 @@
 
 #include "../../business/BCContactManager.h"
-
-#include "../UIHelper.h"
 
 #include <QFileDialog>

src/ui/VCMain/vcmain.cpp

@@ -19 +19 @@
 #include "../../business/BCContactManager.h"
 #include "../../business/BCGroupManager.h"
-
-#include "../UIHelper.h"
 
 #include "../VCAccountList/vcaccountlist.h"
@@ -45 +43 @@
         accountFilterModel_->sort(AccountTreeModel::ColName, Qt::AscendingOrder);
         ui.lstAccounts->setModel(accountFilterModel_);
+        ui.lstAccounts->setModelColumn(AccountTreeModel::ColGatewayName);
 
         /* Contact / Groups */
@@ -75 +74 @@
     connect(BCAccountLoadManager::instance(), SIGNAL(accountLoaded(IAccount*)),
             this, SLOT(on_accountLoaded(IAccount*)));
-    connect(BCAccountLoadManager::instance(), SIGNAL(accountLoadingFailed(IAccount*, EException*)),
-            this, SLOT(on_accountLoadingFailed(IAccount*, EException*)));
+    connect(BCAccountLoadManager::instance(), SIGNAL(accountLoadingFailed(IAccount*, const EException&)),
+            this, SLOT(on_accountLoadingFailed(IAccount*, const EException&)));
 
 
@@ -95 +94 @@
 IContact* VCMain::getContactOfNode(const QTreeWidgetItem* node){
     if (!isContactNode(node)){
-        return (IContact*)0;
+        return NULL;
     } else {
         return nodeToContact[const_cast<QTreeWidgetItem*>(node)];
@@ -102 +101 @@
 IGroup* VCMain::getGroupOfNode(const QTreeWidgetItem* node){
     if (!isGroupNode(node)){
-        return (IGroup*)0;
+        return NULL;
     } else {
         return nodeToGroup[const_cast<QTreeWidgetItem*>(node)];
@@ -397 +396 @@
 
 void VCMain::on_accountLoaded(IAccount* account) {
+    Q_UNUSED(account);
+    enableSendBtnIfAllFilled();
+}
+
+void VCMain::on_accountLoadingFailed(IAccount* account, const EException& exception) {
+    QMessageBox::critical(this, tr("Error occured"),
+                          tr("An error occured while loading an account: ") + "\n\n"
+                          + tr("Account-Id: ") + account->id() + "\n"
+                          + exception.chainedWhat(), QMessageBox::Ok, QMessageBox::Ok);
     reloadAccountList();
 }
 
-void VCMain::on_accountLoadingFailed(IAccount* account, EException* exception) {
-    QMessageBox::critical(this, tr("Error occured"), tr("An unknown error has occured!") + "\n\n" + QString(exception->what()), QMessageBox::Ok, QMessageBox::Ok);
-    reloadAccountList();
-}
-

src/ui/VCMain/vcmain.h

@@ -85 +85 @@
     void on_accountLoadStateChanged(IAccount* account, AccountLoadState state);
     void on_accountLoaded(IAccount* account);
-    void on_accountLoadingFailed(IAccount* account, EException* exception);
+    void on_accountLoadingFailed(IAccount* account, const EException& exception);
 };
 

src/ui/models/accounttreemodel.cpp

@@ -32 +32 @@
 
     QModelIndex idx_start = index(row, 0);
-    QModelIndex idx_end   = index(row, columnCount());
+    QModelIndex idx_end   = index(row, columnCount()-1);
 
     if (idx_start.isValid() && idx_end.isValid()) {

src/ui/models/loadedaccountmodel.cpp

@@ -14 +14 @@
     const QModelIndex& idx     = srcModel->index(source_row, 0, source_parent);
     if (idx.isValid()) {
-        IAccount* account          = srcModel->dataObject(idx);
+        IAccount* account      = srcModel->dataObject(idx);
 
         return (account != NULL) && account->isInitialized() && account->isEnabled();