Skip to content

Commit ab96482

Browse files
marinofaggianamarinofaggiana
authored
fix (#4177)
* fix Signed-off-by: Marino Faggiana <marino.faggiana@nextcloud.com> * b 9 Signed-off-by: Marino Faggiana <marino.faggiana@nextcloud.com> --------- Signed-off-by: Marino Faggiana <marino.faggiana@nextcloud.com>
1 parent b159dd9 commit ab96482

2 files changed

Lines changed: 26 additions & 22 deletions

File tree

‎Nextcloud.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6234,7 +6234,7 @@
62346234
CLANG_WARN_UNREACHABLE_CODE = YES;
62356235
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
62366236
COPY_PHASE_STRIP = NO;
6237-
CURRENT_PROJECT_VERSION = 8;
6237+
CURRENT_PROJECT_VERSION = 9;
62386238
DEAD_CODE_STRIPPING = YES;
62396239
DEBUG_INFORMATION_FORMAT = dwarf;
62406240
DEVELOPMENT_TEAM = NKUJUXUJ3B;
@@ -6302,7 +6302,7 @@
63026302
CLANG_WARN_UNREACHABLE_CODE = YES;
63036303
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
63046304
COPY_PHASE_STRIP = NO;
6305-
CURRENT_PROJECT_VERSION = 8;
6305+
CURRENT_PROJECT_VERSION = 9;
63066306
DEAD_CODE_STRIPPING = YES;
63076307
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
63086308
DEVELOPMENT_TEAM = NKUJUXUJ3B;

‎iOSClient/Networking/NCAutoUpload.swift‎

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -167,29 +167,33 @@ class NCAutoUpload: NSObject {
167167
await self.database.updateAccountPropertyAsync(\.autoUploadSinceDate, value: date, account: session.account)
168168
}
169169

170-
if !metadatas.isEmpty {
171-
let metadatasToAdd: [tableMetadata]
172-
if filterExistingQueue {
173-
metadatasToAdd = await self.database.filterAutoUploadMetadatasNotAlreadyQueuedAsync(metadatas)
174-
} else {
175-
metadatasToAdd = metadatas
176-
}
177-
guard !metadatasToAdd.isEmpty else {
178-
return 0
179-
}
170+
guard !metadatas.isEmpty else {
171+
return 0
172+
}
180173

181-
if autoMkcol {
182-
await self.database.addMetadatasAsync(metadatas)
183-
} else {
184-
let metadatasFolder = await NCManageDatabaseCreateMetadata().createMetadatasFolderAsync(
185-
assets: assets,
186-
useSubFolder: tblAccount.autoUploadCreateSubfolder,
187-
session: session)
188-
await self.database.addMetadatasAsync(metadatasFolder + metadatas)
189-
}
174+
let metadatasToAdd: [tableMetadata]
175+
176+
if filterExistingQueue {
177+
metadatasToAdd = await self.database.filterAutoUploadMetadatasNotAlreadyQueuedAsync(metadatas)
178+
} else {
179+
metadatasToAdd = metadatas
180+
}
181+
182+
guard !metadatasToAdd.isEmpty else {
183+
return 0
184+
}
185+
186+
if autoMkcol {
187+
await self.database.addMetadatasAsync(metadatasToAdd)
188+
} else {
189+
let metadatasFolder = await NCManageDatabaseCreateMetadata().createMetadatasFolderAsync(
190+
assets: assets,
191+
useSubFolder: tblAccount.autoUploadCreateSubfolder,
192+
session: session)
193+
await self.database.addMetadatasAsync(metadatasFolder + metadatasToAdd)
190194
}
191195

192-
return metadatas.count
196+
return metadatasToAdd.count
193197
}
194198

195199
// MARK: -

0 commit comments

Comments
 (0)