From 281e3ce74791b8cb9c60c7d32a4c5fba99deea56 Mon Sep 17 00:00:00 2001 From: Marino Faggiana Date: Tue, 3 Dec 2024 16:09:58 +0100 Subject: [PATCH 1/3] fix Signed-off-by: Marino Faggiana --- .../{Base.lproj => }/MainInterface.storyboard | 0 .../hr.lproj/MainInterface.strings | 6 ----- .../lo.lproj/MainInterface.strings | 6 ----- .../sl.lproj/MainInterface.strings | 6 ----- Nextcloud.xcodeproj/project.pbxproj | 22 ++++--------------- 5 files changed, 4 insertions(+), 36 deletions(-) rename File Provider Extension UI/{Base.lproj => }/MainInterface.storyboard (100%) delete mode 100644 File Provider Extension UI/hr.lproj/MainInterface.strings delete mode 100644 File Provider Extension UI/lo.lproj/MainInterface.strings delete mode 100644 File Provider Extension UI/sl.lproj/MainInterface.strings diff --git a/File Provider Extension UI/Base.lproj/MainInterface.storyboard b/File Provider Extension UI/MainInterface.storyboard similarity index 100% rename from File Provider Extension UI/Base.lproj/MainInterface.storyboard rename to File Provider Extension UI/MainInterface.storyboard diff --git a/File Provider Extension UI/hr.lproj/MainInterface.strings b/File Provider Extension UI/hr.lproj/MainInterface.strings deleted file mode 100644 index 028c2f85b4..0000000000 --- a/File Provider Extension UI/hr.lproj/MainInterface.strings +++ /dev/null @@ -1,6 +0,0 @@ - -/* Class = "UIButton"; normalTitle = "Cancel"; ObjectID = "3gV-2h-5zD"; */ -"3gV-2h-5zD.normalTitle" = "Cancel"; - -/* Class = "UILabel"; text = "title"; ObjectID = "gdj-d0-nZ2"; */ -"gdj-d0-nZ2.text" = "title"; diff --git a/File Provider Extension UI/lo.lproj/MainInterface.strings b/File Provider Extension UI/lo.lproj/MainInterface.strings deleted file mode 100644 index 028c2f85b4..0000000000 --- a/File Provider Extension UI/lo.lproj/MainInterface.strings +++ /dev/null @@ -1,6 +0,0 @@ - -/* Class = "UIButton"; normalTitle = "Cancel"; ObjectID = "3gV-2h-5zD"; */ -"3gV-2h-5zD.normalTitle" = "Cancel"; - -/* Class = "UILabel"; text = "title"; ObjectID = "gdj-d0-nZ2"; */ -"gdj-d0-nZ2.text" = "title"; diff --git a/File Provider Extension UI/sl.lproj/MainInterface.strings b/File Provider Extension UI/sl.lproj/MainInterface.strings deleted file mode 100644 index 028c2f85b4..0000000000 --- a/File Provider Extension UI/sl.lproj/MainInterface.strings +++ /dev/null @@ -1,6 +0,0 @@ - -/* Class = "UIButton"; normalTitle = "Cancel"; ObjectID = "3gV-2h-5zD"; */ -"3gV-2h-5zD.normalTitle" = "Cancel"; - -/* Class = "UILabel"; text = "title"; ObjectID = "gdj-d0-nZ2"; */ -"gdj-d0-nZ2.text" = "title"; diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj index 96b249a527..a614b6e877 100644 --- a/Nextcloud.xcodeproj/project.pbxproj +++ b/Nextcloud.xcodeproj/project.pbxproj @@ -202,7 +202,6 @@ F704B5E72430C06700632F5F /* NCCreateFormUploadConflictCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F704B5E62430C06700632F5F /* NCCreateFormUploadConflictCell.xib */; }; F704B5E92430C0B800632F5F /* NCCreateFormUploadConflictCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F704B5E82430C0B800632F5F /* NCCreateFormUploadConflictCell.swift */; }; F70716E62987F81500E72C1D /* DocumentActionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F70716E52987F81500E72C1D /* DocumentActionViewController.swift */; }; - F70716E92987F81500E72C1D /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F70716E72987F81500E72C1D /* MainInterface.storyboard */; }; F70716ED2987F81500E72C1D /* File Provider Extension UI.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = F70716E32987F81500E72C1D /* File Provider Extension UI.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; F70753EB2542A99800972D44 /* NCViewerMediaPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = F70753EA2542A99800972D44 /* NCViewerMediaPage.swift */; }; F70753F12542A9A200972D44 /* NCViewerMedia.swift in Sources */ = {isa = PBXBuildFile; fileRef = F70753F02542A9A200972D44 /* NCViewerMedia.swift */; }; @@ -265,6 +264,7 @@ F71F6D0C2B6A6A5E00F1EB15 /* ThreadSafeArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = F71F6D062B6A6A5E00F1EB15 /* ThreadSafeArray.swift */; }; F71F6D0D2B6A6A5E00F1EB15 /* ThreadSafeArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = F71F6D062B6A6A5E00F1EB15 /* ThreadSafeArray.swift */; }; F7226EDC1EE4089300EBECB1 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7226EDB1EE4089300EBECB1 /* Main.storyboard */; }; + F722F0112CFF569500065FB5 /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F722F0102CFF569500065FB5 /* MainInterface.storyboard */; }; F723985C253C95CE00257F49 /* NCViewerRichdocument.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F723985B253C95CE00257F49 /* NCViewerRichdocument.storyboard */; }; F723B3DD22FC6D1D00301EFE /* NCShareCommentsCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F723B3DC22FC6D1C00301EFE /* NCShareCommentsCell.xib */; }; F72408332B8A27C900F128E2 /* NCMedia+Command.swift in Sources */ = {isa = PBXBuildFile; fileRef = F72408322B8A27C900F128E2 /* NCMedia+Command.swift */; }; @@ -1152,15 +1152,12 @@ 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCMenu.swift; sourceTree = ""; }; 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Menu.swift"; sourceTree = ""; }; 8491B1CC273BBA82001C8C5B /* UIViewController+Menu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+Menu.swift"; sourceTree = ""; }; - AACCAB512CFE041F00DA1786 /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sl; path = sl.lproj/MainInterface.strings; sourceTree = ""; }; AACCAB522CFE041F00DA1786 /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sl; path = sl.lproj/Intent.strings; sourceTree = ""; }; AACCAB532CFE041F00DA1786 /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sl; path = sl.lproj/Localizable.strings; sourceTree = ""; }; AACCAB542CFE041F00DA1786 /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sl; path = sl.lproj/InfoPlist.strings; sourceTree = ""; }; - AACCAB5D2CFE04C200DA1786 /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hr; path = hr.lproj/MainInterface.strings; sourceTree = ""; }; AACCAB5E2CFE04C200DA1786 /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hr; path = hr.lproj/Intent.strings; sourceTree = ""; }; AACCAB5F2CFE04C200DA1786 /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hr; path = hr.lproj/Localizable.strings; sourceTree = ""; }; AACCAB602CFE04C200DA1786 /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hr; path = hr.lproj/InfoPlist.strings; sourceTree = ""; }; - AACCAB612CFE04F700DA1786 /* lo */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = lo; path = lo.lproj/MainInterface.strings; sourceTree = ""; }; AACCAB622CFE04F700DA1786 /* lo */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = lo; path = lo.lproj/Intent.strings; sourceTree = ""; }; AACCAB632CFE04F700DA1786 /* lo */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = lo; path = lo.lproj/Localizable.strings; sourceTree = ""; }; AACCAB642CFE04F700DA1786 /* lo */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = lo; path = lo.lproj/InfoPlist.strings; sourceTree = ""; }; @@ -1245,7 +1242,6 @@ F704B5E82430C0B800632F5F /* NCCreateFormUploadConflictCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCCreateFormUploadConflictCell.swift; sourceTree = ""; }; F70716E32987F81500E72C1D /* File Provider Extension UI.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "File Provider Extension UI.appex"; sourceTree = BUILT_PRODUCTS_DIR; }; F70716E52987F81500E72C1D /* DocumentActionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DocumentActionViewController.swift; sourceTree = ""; }; - F70716E82987F81500E72C1D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/MainInterface.storyboard; sourceTree = ""; }; F70753EA2542A99800972D44 /* NCViewerMediaPage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCViewerMediaPage.swift; sourceTree = ""; }; F70753F02542A9A200972D44 /* NCViewerMedia.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCViewerMedia.swift; sourceTree = ""; }; F70753F62542A9C000972D44 /* NCViewerMediaPage.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = NCViewerMediaPage.storyboard; sourceTree = ""; }; @@ -1280,6 +1276,7 @@ F71CD6C92930D7B1006C95C1 /* NCApplicationHandle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCApplicationHandle.swift; sourceTree = ""; }; F71F6D062B6A6A5E00F1EB15 /* ThreadSafeArray.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreadSafeArray.swift; sourceTree = ""; }; F7226EDB1EE4089300EBECB1 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = ""; }; + F722F0102CFF569500065FB5 /* MainInterface.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = MainInterface.storyboard; sourceTree = ""; }; F723985B253C95CE00257F49 /* NCViewerRichdocument.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = NCViewerRichdocument.storyboard; sourceTree = ""; }; F723B3DC22FC6D1C00301EFE /* NCShareCommentsCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCShareCommentsCell.xib; sourceTree = ""; }; F72408322B8A27C900F128E2 /* NCMedia+Command.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCMedia+Command.swift"; sourceTree = ""; }; @@ -2084,7 +2081,7 @@ isa = PBXGroup; children = ( F70716E52987F81500E72C1D /* DocumentActionViewController.swift */, - F70716E72987F81500E72C1D /* MainInterface.storyboard */, + F722F0102CFF569500065FB5 /* MainInterface.storyboard */, ); path = "File Provider Extension UI"; sourceTree = ""; @@ -3649,7 +3646,7 @@ F7490E8D29882F5B009DCE94 /* Custom.xcassets in Resources */, F7490E8E2988334A009DCE94 /* Localizable.strings in Resources */, F7E4022E2BA85D1D007E5609 /* PrivacyInfo.xcprivacy in Resources */, - F70716E92987F81500E72C1D /* MainInterface.storyboard in Resources */, + F722F0112CFF569500065FB5 /* MainInterface.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4672,17 +4669,6 @@ /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ - F70716E72987F81500E72C1D /* MainInterface.storyboard */ = { - isa = PBXVariantGroup; - children = ( - F70716E82987F81500E72C1D /* Base */, - AACCAB512CFE041F00DA1786 /* sl */, - AACCAB5D2CFE04C200DA1786 /* hr */, - AACCAB612CFE04F700DA1786 /* lo */, - ); - name = MainInterface.storyboard; - sourceTree = ""; - }; F72685E927C78E490019EF5E /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( From 78c911cf90280b791b7547c27d50bf38a9af6402 Mon Sep 17 00:00:00 2001 From: Marino Faggiana Date: Tue, 3 Dec 2024 16:28:48 +0100 Subject: [PATCH 2/3] check index Signed-off-by: Marino Faggiana --- iOSClient/Media/NCMedia.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/iOSClient/Media/NCMedia.swift b/iOSClient/Media/NCMedia.swift index d249850466..b1459ba80a 100644 --- a/iOSClient/Media/NCMedia.swift +++ b/iOSClient/Media/NCMedia.swift @@ -278,6 +278,7 @@ class NCMedia: UIViewController { if !fileExists { if let index = dataSource.metadatas.firstIndex(where: {$0.ocId == ocId}), + index < self.dataSource.metadatas.count, let cell = collectionView.cellForItem(at: IndexPath(row: index, section: 0)) as? NCMediaCell, dataSource.metadatas[index].ocId == cell.ocId { indexPaths.append(IndexPath(row: index, section: 0)) From b6471000453c8ddf28bb9bbcbd21e6b2e00f8cc0 Mon Sep 17 00:00:00 2001 From: Marino Faggiana Date: Tue, 3 Dec 2024 16:41:54 +0100 Subject: [PATCH 3/3] build 10 Signed-off-by: Marino Faggiana --- Nextcloud.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj index a614b6e877..74a2da7a13 100644 --- a/Nextcloud.xcodeproj/project.pbxproj +++ b/Nextcloud.xcodeproj/project.pbxproj @@ -5487,7 +5487,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 9; + CURRENT_PROJECT_VERSION = 10; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = NKUJUXUJ3B; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -5553,7 +5553,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 9; + CURRENT_PROJECT_VERSION = 10; DEVELOPMENT_TEAM = NKUJUXUJ3B; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES;