From b8f7d145253311688e5d47ca4661efbfe26c0c17 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter@praktik.cz>
Date: Tue, 12 Sep 2017 13:33:54 +0200
Subject: [PATCH] Support for msg limiting. #112.

---
 .../owncloud/gui/formeditowncloudaccount.cpp  |   2 +
 .../owncloud/gui/formeditowncloudaccount.ui   | 162 +++++++++---------
 .../network/owncloudnetworkfactory.cpp        |   2 +-
 3 files changed, 86 insertions(+), 80 deletions(-)

diff --git a/src/services/owncloud/gui/formeditowncloudaccount.cpp b/src/services/owncloud/gui/formeditowncloudaccount.cpp
index 1f25ea497..47ed6d762 100755
--- a/src/services/owncloud/gui/formeditowncloudaccount.cpp
+++ b/src/services/owncloud/gui/formeditowncloudaccount.cpp
@@ -101,6 +101,7 @@ void FormEditOwnCloudAccount::execForEdit(OwnCloudServiceRoot* existing_root) {
 	m_ui->m_txtPassword->lineEdit()->setText(existing_root->network()->authPassword());
 	m_ui->m_txtUrl->lineEdit()->setText(existing_root->network()->url());
 	m_ui->m_checkServerSideUpdate->setChecked(existing_root->network()->forceServerSideUpdate());
+  m_ui->m_spinLimitMessages->setValue(existing_root->network()->batchSize());
 	exec();
 }
 
@@ -158,6 +159,7 @@ void FormEditOwnCloudAccount::onClickedOk() {
 	m_editableRoot->network()->setAuthUsername(m_ui->m_txtUsername->lineEdit()->text());
 	m_editableRoot->network()->setAuthPassword(m_ui->m_txtPassword->lineEdit()->text());
 	m_editableRoot->network()->setForceServerSideUpdate(m_ui->m_checkServerSideUpdate->isChecked());
+  m_editableRoot->network()->setBatchSize(m_ui->m_spinLimitMessages->value());
 	m_editableRoot->saveAccountDataToDatabase();
 	accept();
 
diff --git a/src/services/owncloud/gui/formeditowncloudaccount.ui b/src/services/owncloud/gui/formeditowncloudaccount.ui
index 86cc340cf..bb552a210 100755
--- a/src/services/owncloud/gui/formeditowncloudaccount.ui
+++ b/src/services/owncloud/gui/formeditowncloudaccount.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>602</width>
-    <height>391</height>
+    <width>552</width>
+    <height>364</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -16,33 +16,6 @@
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QFormLayout" name="formLayout">
-     <item row="0" column="0" colspan="2">
-      <layout class="QHBoxLayout" name="horizontalLayout">
-       <item>
-        <widget class="QLabel" name="m_lblTitle">
-         <property name="text">
-          <string>URL</string>
-         </property>
-         <property name="buddy">
-          <cstring>m_txtUrl</cstring>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="LineEditWithStatus" name="m_txtUrl" native="true"/>
-       </item>
-      </layout>
-     </item>
-     <item row="1" column="0" colspan="2">
-      <widget class="QLabel" name="m_lblDescription">
-       <property name="text">
-        <string/>
-       </property>
-       <property name="wordWrap">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
      <item row="2" column="0" colspan="2">
       <widget class="QCheckBox" name="m_checkServerSideUpdate">
        <property name="text">
@@ -50,16 +23,59 @@
        </property>
       </widget>
      </item>
-     <item row="3" column="0" colspan="2">
-      <widget class="QLabel" name="m_lblServerSideUpdateInformation">
+     <item row="4" column="0">
+      <widget class="QLabel" name="label">
        <property name="text">
-        <string/>
-       </property>
-       <property name="wordWrap">
-        <bool>true</bool>
+        <string>Limit number of downloaded messages per feed</string>
        </property>
       </widget>
      </item>
+     <item row="4" column="1">
+      <widget class="QSpinBox" name="m_spinLimitMessages">
+       <property name="maximumSize">
+        <size>
+         <width>140</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="suffix">
+        <string> = unlimited</string>
+       </property>
+       <property name="minimum">
+        <number>-1</number>
+       </property>
+       <property name="maximum">
+        <number>1000</number>
+       </property>
+       <property name="value">
+        <number>-1</number>
+       </property>
+      </widget>
+     </item>
+     <item row="7" column="0" colspan="2">
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <item>
+        <widget class="QPushButton" name="m_btnTestSetup">
+         <property name="text">
+          <string>&amp;Test setup</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="LabelWithStatus" name="m_lblTestResult" native="true">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="layoutDirection">
+          <enum>Qt::RightToLeft</enum>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
      <item row="6" column="0" colspan="2">
       <widget class="QGroupBox" name="m_gbAuthentication">
        <property name="toolTip">
@@ -111,52 +127,30 @@
        </layout>
       </widget>
      </item>
-     <item row="7" column="0">
-      <widget class="QPushButton" name="m_btnTestSetup">
+     <item row="0" column="0" colspan="2">
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <item>
+        <widget class="QLabel" name="m_lblTitle">
+         <property name="text">
+          <string>URL</string>
+         </property>
+         <property name="buddy">
+          <cstring>m_txtUrl</cstring>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="LineEditWithStatus" name="m_txtUrl" native="true"/>
+       </item>
+      </layout>
+     </item>
+     <item row="1" column="0" colspan="2">
+      <widget class="QLabel" name="m_lblDescription">
        <property name="text">
-        <string>&amp;Test setup</string>
+        <string/>
        </property>
-      </widget>
-     </item>
-     <item row="7" column="1">
-      <widget class="LabelWithStatus" name="m_lblTestResult" native="true">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="layoutDirection">
-        <enum>Qt::RightToLeft</enum>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="0">
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>Limit number of downloaded messages per feed</string>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="1">
-      <widget class="QSpinBox" name="m_spinLimitMessages">
-       <property name="maximumSize">
-        <size>
-         <width>140</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="suffix">
-        <string> = unlimited</string>
-       </property>
-       <property name="minimum">
-        <number>-1</number>
-       </property>
-       <property name="maximum">
-        <number>1000</number>
-       </property>
-       <property name="value">
-        <number>-1</number>
+       <property name="wordWrap">
+        <bool>true</bool>
        </property>
       </widget>
      </item>
@@ -170,6 +164,16 @@
        </property>
       </widget>
      </item>
+     <item row="3" column="0" colspan="2">
+      <widget class="QLabel" name="m_lblServerSideUpdateInformation">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>
diff --git a/src/services/owncloud/network/owncloudnetworkfactory.cpp b/src/services/owncloud/network/owncloudnetworkfactory.cpp
index 1092c63ea..f05311f34 100755
--- a/src/services/owncloud/network/owncloudnetworkfactory.cpp
+++ b/src/services/owncloud/network/owncloudnetworkfactory.cpp
@@ -247,7 +247,7 @@ OwnCloudGetMessagesResponse OwnCloudNetworkFactory::getMessages(int feed_id) {
 	}
 
 	QString final_url = m_urlMessages.arg(QString::number(feed_id),
-                                        QString::number(batchSize()),
+                                        QString::number(batchSize() <= 0 ? -1 : batchSize()),
 	                                      QString::number(0));
 	QByteArray result_raw;
 	NetworkResult network_reply = NetworkFactory::performNetworkOperation(final_url,