--- a/ui/downloader_win.cpp	Wed Feb 19 10:45:29 2014 +0000
+++ b/ui/downloader_win.cpp	Wed Feb 19 14:22:26 2014 +0000
@@ -21,12 +21,18 @@
 #include <QDebug>
 #include <QDateTime>
 #include <QSaveFile>
+#include <QFileInfo>
 
 #define DEBUG if (1) qDebug() << __PRETTY_FUNCTION__
 
 #define MAX_SW_SIZE 10485760
 #define MAX_LIST_SIZE 1048576
 
+
+#define LIST_RESOURCE "/incoming/aheinecke/test"
+#define SW_RESOURCE "/incoming/aheinecke/test"
+
+
 /** @brief Qt wrapper around FormatMessage
  *
  * @returns The error message of the error that occurred
@@ -281,16 +287,18 @@
 }
 
 bool Downloader::downloadFile(HINTERNET hSession, HINTERNET hConnect,
-        LPCWSTR resource, const QString &filename, DWORD maxSize)
+        LPCWSTR resource, const QString &fileName, DWORD maxSize)
 {
     HINTERNET hRequest = NULL;
     bool retval = false;
     DWORD bytesAvailable = 0,
           err = 0,
           bytesRead = 0,
-          totalDownloaded = 0;
+          totalDownloaded = 0,
+          contentLength = 0,
+          sizeOfDWORD = sizeof (DWORD);
 
-    QSaveFile outputFile(filename);
+    QSaveFile outputFile(fileName);
 
     if (!hSession || !hConnect || !resource) {
         SetLastError(ERROR_INVALID_PARAMETER);
@@ -322,6 +330,36 @@
         // TODO error out
     }
 
+
+    if (!(WinHttpQueryHeaders(hRequest,
+                              WINHTTP_QUERY_CONTENT_LENGTH |
+                              WINHTTP_QUERY_FLAG_NUMBER,
+                              NULL,
+                              &contentLength,
+                              &sizeOfDWORD,
+                              WINHTTP_NO_HEADER_INDEX))) {
+        // Continue anyway as we later really check how
+        // much we download.
+        DEBUG << "No content-length";
+    }
+
+    if (contentLength > maxSize) {
+        err = ERROR_INVALID_DATA;
+        goto cleanup;
+    }
+
+    if (contentLength) {
+        QFileInfo finf(fileName);
+        if (finf.exists() && finf.isReadable() &&
+                finf.size() == contentLength) {
+            // We already have data of the same size
+            // No need to waste bandwidth.
+            DEBUG << "Skipping download because file exists";
+            retval = true;
+            goto cleanup;
+        }
+    }
+
     // Open / Create the file to write to.
     if (!outputFile.open(QIODevice::WriteOnly)) {
         DEBUG << "Failed to open file";
@@ -329,6 +367,7 @@
         goto cleanup;
     }
 
+    DEBUG << "output file size: " << outputFile.size();
     do
     {
         char outBuf[8192]; // 8KB is the internal buffer size of winhttp
@@ -350,6 +389,7 @@
         if (bytesAvailable > maxSize) {
             DEBUG << "File to large";
             retval = false;
+            err = ERROR_INVALID_DATA;
             break;
         }
 
@@ -360,8 +400,6 @@
             break;
         } else {
             if (bytesRead) {
-                DEBUG << "Downloaded: " << bytesRead << "B";
-
                 // Write data to file.
                 if (outputFile.write(outBuf, bytesRead) !=
                         bytesRead) {
@@ -392,7 +430,7 @@
 
 cleanup:
 
-    if (retval) {
+    if (retval && outputFile.isOpen()) {
         // Actually save the file to disk / move to homedir
         retval = outputFile.commit();
     }
@@ -440,10 +478,10 @@
 
 
     lastModifiedSoftware = getLastModifiedHeader(hSession, hConnect,
-            L"/incoming/aheinecke/test");
+            L""SW_RESOURCE);
 
     lastModifiedList = getLastModifiedHeader(hSession, hConnect,
-            L"/incoming/aheinecke/test");
+            L""LIST_RESOURCE);
 
     if (!lastModifiedList.isValid() || !lastModifiedSoftware.isValid()) {
         DEBUG << "Could not read headers: " << getLastErrorMsg();
@@ -462,9 +500,9 @@
             .append(lastModifiedSoftware.toString("yyyymmddHHmmss"))
             .append(".exe");
 
-        DEBUG << "Filename: " << fileName;
+        DEBUG << "fileName: " << fileName;
 
-        if (!downloadFile(hSession, hConnect, L"/incoming/aheinecke/test",
+        if (!downloadFile(hSession, hConnect, L""SW_RESOURCE,
                    fileName, MAX_SW_SIZE)) {
             DEBUG << "Error downloading File: " << getLastErrorMsg();
             goto cleanup;
@@ -483,9 +521,9 @@
             .append(lastModifiedSoftware.toString("yyyymmddHHmmss"))
             .append(".txt");
 
-        DEBUG << "Filename: " << fileName;
+        DEBUG << "fileName: " << fileName;
 
-        if (!downloadFile(hSession, hConnect, L"/incoming/aheinecke/test",
+        if (!downloadFile(hSession, hConnect, L""LIST_RESOURCE,
                    fileName, MAX_LIST_SIZE)) {
             DEBUG << "Error downloading File: " << getLastErrorMsg();
             goto cleanup;

--- a/ui/main.cpp	Wed Feb 19 10:45:29 2014 +0000
+++ b/ui/main.cpp	Wed Feb 19 14:22:26 2014 +0000
@@ -4,6 +4,7 @@
 #include <QSystemTrayIcon>
 #include <QtPlugin>
 #include <QMessageBox>
+#include <QSettings>
 
 #ifndef VERSION
 #define VERSION "0.0.1"
@@ -39,6 +40,7 @@
     QApplication::setOrganizationName(QString::fromLatin1(ORGANIZATION));
     QApplication::setApplicationName(QString::fromLatin1(APPNAME));
     QApplication::setApplicationVersion(QString::fromLatin1(VERSION));
+    QSettings::setDefaultFormat(QSettings::IniFormat);
 
     MainWindow mainWin;
     mainWin.show();

--- a/ui/mainwindow.cpp	Wed Feb 19 10:45:29 2014 +0000
+++ b/ui/mainwindow.cpp	Wed Feb 19 14:22:26 2014 +0000
@@ -101,7 +101,6 @@
     mSettings.setValue("Software/available", fileName);
     mSettings.setValue("Software/availableDate", modDate);
 
-    qDebug() << "Settings value: " << mSettings.value("Software/available");
     mSettings.sync();
     showMessage();
 }
@@ -110,19 +109,12 @@
 {
     verifyAvailableData();
 
-    QDateTime listAvailableLastMod = mSettings.value("List/availableDate").toDateTime();
-    QDateTime swAvailableLastMod = mSettings.value("Software/availableDate").toDateTime();
-
-    if (!listAvailableLastMod.isValid()) {
-        listAvailableLastMod = mSettings.value("List/installedLastMod").toDateTime();
-    }
-
-    if (!swAvailableLastMod.isValid()) {
-        swAvailableLastMod = mSettings.value("List/installedLastMod").toDateTime();
-    }
+    QDateTime listInstalledLastMod = mSettings.value("List/installedDate").toDateTime();
+    QDateTime swInstalledLastMod = mSettings.value("Software/installedDate").toDateTime();
 
     Downloader* downloader = new Downloader(this, QString::fromLatin1("www.files.kolab.org"),
-            QByteArray(), swAvailableLastMod, listAvailableLastMod);
+            QByteArray(), swInstalledLastMod, listInstalledLastMod);
+
     connect(downloader, SIGNAL(newListAvailable(const QString&, const QDateTime&)),
             this, SLOT(handleNewList(const QString&, const QDateTime&)));
     connect(downloader, SIGNAL(newSoftwareAvailable(const QString&, const QDateTime&)),

--- a/ui/mainwindow.h	Wed Feb 19 10:45:29 2014 +0000
+++ b/ui/mainwindow.h	Wed Feb 19 14:22:26 2014 +0000
@@ -46,7 +46,7 @@
     QString mInstalledSWVersion;
     QString mInstalledListVersion;
 
-    QSettings mSettings(QSettings::IniFormat);
+    QSettings mSettings;
 
     QSystemTrayIcon *mTrayIcon;