|
@@ -1450,17 +1450,13 @@ class NCManageDatabase: NSObject {
|
|
|
let realm = try! Realm()
|
|
|
|
|
|
let sortProperties = [SortDescriptor(keyPath: "shareType", ascending: false), SortDescriptor(keyPath: "idShare", ascending: false)]
|
|
|
-
|
|
|
let firstShareLink = realm.objects(tableShare.self).filter("account == %@ AND serverUrl == %@ AND fileName == %@ AND shareType == 3", metadata.account, metadata.serverUrl, metadata.fileName).first
|
|
|
|
|
|
- if firstShareLink == nil {
|
|
|
-
|
|
|
- let results = realm.objects(tableShare.self).filter("account == %@ AND serverUrl == %@ AND fileName == %@", metadata.account, metadata.serverUrl, metadata.fileName).sorted(by: sortProperties)
|
|
|
- return(firstShareLink: firstShareLink, share: Array(results.map { tableShare.init(value: $0) }))
|
|
|
-
|
|
|
+ if let firstShareLink = firstShareLink {
|
|
|
+ let results = realm.objects(tableShare.self).filter("account == %@ AND serverUrl == %@ AND fileName == %@ AND idShare != %d", metadata.account, metadata.serverUrl, metadata.fileName, firstShareLink.idShare).sorted(by: sortProperties)
|
|
|
+ return(firstShareLink: tableShare.init(value: firstShareLink), share: Array(results.map { tableShare.init(value: $0) }))
|
|
|
} else {
|
|
|
-
|
|
|
- let results = realm.objects(tableShare.self).filter("account == %@ AND serverUrl == %@ AND fileName == %@ AND idShare != %d", metadata.account, metadata.serverUrl, metadata.fileName, firstShareLink!.idShare).sorted(by: sortProperties)
|
|
|
+ let results = realm.objects(tableShare.self).filter("account == %@ AND serverUrl == %@ AND fileName == %@", metadata.account, metadata.serverUrl, metadata.fileName).sorted(by: sortProperties)
|
|
|
return(firstShareLink: firstShareLink, share: Array(results.map { tableShare.init(value: $0) }))
|
|
|
}
|
|
|
}
|