[Pkg-owncloud-commits] [owncloud-client] 81/175: Let checksumType() read the config to destinguish checksum type.

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 4e28a24af3cf272ce685b52a7679ecdab8f99569
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Thu May 21 14:30:21 2015 +0200

    Let checksumType() read the config to destinguish checksum type.
---
 src/libsync/transmissionchecksumvalidator.cpp | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/libsync/transmissionchecksumvalidator.cpp b/src/libsync/transmissionchecksumvalidator.cpp
index b01f9e0..8d1fdb9 100644
--- a/src/libsync/transmissionchecksumvalidator.cpp
+++ b/src/libsync/transmissionchecksumvalidator.cpp
@@ -34,13 +34,7 @@ void TransmissionChecksumValidator::setChecksumType( const QByteArray& type )
     _checksumType = type;
 }
 
-QString TransmissionChecksumValidator::checksumType()
-{
-    return _checksumType;
-}
-
-
-void TransmissionChecksumValidator::uploadValidation( SyncFileItem *item )
+QString TransmissionChecksumValidator::checksumType() const
 {
     QString checksumType = _checksumType;
     if( checksumType.isEmpty() ) {
@@ -48,26 +42,34 @@ void TransmissionChecksumValidator::uploadValidation( SyncFileItem *item )
         checksumType = cfg.transmissionChecksum();
     }
 
-    if( checksumType.isEmpty() || !item ) {
+    return checksumType;
+}
+
+void TransmissionChecksumValidator::uploadValidation( SyncFileItem *item )
+{
+    const QString csType = checksumType();
+
+    if( csType.isEmpty() || !item ) {
         // if there is no checksum defined, continue to upload
         emit validated();
     } else {
         _item = item;
         // Calculate the checksum in a different thread first.
+
         connect( &_watcher, SIGNAL(finished()),
                  this, SLOT(slotUploadChecksumCalculated()));
-        if( checksumType == checkSumMD5C ) {
+        if( csType == checkSumMD5C ) {
             item->_checksum = checkSumMD5C;
             item->_checksum += ":";
             _watcher.setFuture(QtConcurrent::run(FileSystem::calcMd5, _filePath));
 
-        } else if( checksumType == checkSumSHA1C ) {
+        } else if( csType == checkSumSHA1C ) {
             item->_checksum = checkSumSHA1C;
             item->_checksum += ":";
             _watcher.setFuture(QtConcurrent::run( FileSystem::calcSha1, _filePath));
         }
 #ifdef ZLIB_FOUND
-        else if( checksumType == checkSumAdlerC) {
+        else if( csType == checkSumAdlerC) {
             item->_checksum = checkSumAdlerC;
             item->_checksum += ":";
             _watcher.setFuture(QtConcurrent::run(FileSystem::calcAdler32, _filePath));

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git