[Pkg-owncloud-commits] [owncloud-client] 215/470: Remove OwnCloud6 specific sharing code

[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 c090a511fd07e573edee604f15eca5c53b83a9c5
Author: Jocelyn Turcotte <jturcotte at woboq.com>
Date:   Thu Mar 17 12:15:47 2016 +0100

    Remove OwnCloud6 specific sharing code
    
    If users encounter this situation, the share icon will simply not show.
    This simplifies the transition to move this code in libsync.
---
 src/gui/socketapi.cpp | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/gui/socketapi.cpp b/src/gui/socketapi.cpp
index 051041b..83c04b4 100644
--- a/src/gui/socketapi.cpp
+++ b/src/gui/socketapi.cpp
@@ -679,17 +679,9 @@ SyncFileStatus SocketApi::fileStatus(Folder *folder, const QString& systemFileNa
         }
     }
 
-    if (rec.isValid()) {
-        if (rec._remotePerm.isNull()) {
-            // probably owncloud 6, that does not have permissions flag yet.
-            QString url = folder->remoteUrl().toString() + fileName;
-            if (url.contains( folder->accountState()->account()->davPath() + QLatin1String("Shared/") )) {
-                status.setSharedWithMe(true);
-            }
-        } else if (rec._remotePerm.contains("S")) {
-            status.setSharedWithMe(true);
-        }
-    }
+    if (rec.isValid() && rec._remotePerm.contains("S"))
+        status.setSharedWithMe(true);
+
     if (status.tag() == SyncFileStatus::STATUS_NEW) {
         // check the parent folder if it is shared and if it is allowed to create a file/dir within
         QDir d( fi.path() );

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