Skip to content

Commit

Permalink
[feature/se-concurrency] Sync Engine concurrency support (#369)
Browse files Browse the repository at this point in the history
* hide beta warning

* [Bugfix 1.0.0] Fixed an issue with drag to action not working for some actions

* - Fix issue (3) "Oversized thumbnails"
- Fix separator insets in item list

* - Produce an appropriate error when an upload fails due to insufficient space left on the server (fix (4))

* - Fixing issue (1) and (2) via SDK update

* Version Bump to 114

* - disable table cell selection
- fixed long status messages, while setting dynamically numbers of lines

* Version Bump to 115

* - Fixed (5) where the progress of a file that completed download in the background was shown incorrectly

* - Improve progress updates and representation in ClientItemCell

* - Fix: indicate activity during last phase of setting up a new bookmark and whenever editing a bookmark and saving it (previously UI seemed stuck for a couple of seconds)

* - Added NSError+MessageResolution that resolves the localized description for OCErrors so they are included when serialized, so they become visible in the Files app, too
- Fixing issue (8) in #237

* Implemented improvement (13)

* - Fix newly introduced potential crash bug in renameItem FP method
- Remove trash method and permission flag for items in FP, so "Delete Now" is the only option and Files app shows a warning
- Fixing (11) in #237

* - Rename uploadsBarButton to plusBarButton in ClientQueryViewController
- Add new action extension location .plusButton
- Add Action extensions support to provide UIAlertAction objects
- Add .plusButton location to CreateFolder action
- Extend the ClientQueryViewController plusBarButton to include action extensions in the alert that's being shown
- Implementing improvement (15) from #237

* Fixed (13): restore multiple selection after reloading file list

* - Move File Upload and Photo Upload from ClientQueryViewController to distinct Action Extensions
- Extend ActionProgressHandler to cater for both publishing and unpublishing progress objects
- Replace repeated code with a method to provide a ActionProgressHandler in ClientItemQueryViewController
- Make CreateFolderAction require a folder as parent item
- Make MoveAction present on the provided ViewController, not its navigationController
- Extend error handling in several places

* Fixed (21): folder picker not canceleable when navigating into folder and back

* - SortBar overhaul / cleanup
	- remove create folder button from left
	- left-align the sort option and rename it "Sort by" (from "Sorted by")
	- turn the sort option button from a ThemeButton to a UIButton and replace the unicode arrow with an elegant chevron
	- remove sortBar location for action extensions
	- clean up SortBar code
- NSObject+ThemeApplication
	- replace use of isKindOfClass and force-casts with if let constructs
	- add support for UIButton themeing
- fix "flashing" reording right after opening a connection by setting the OCQuery sort method before starting the query
- fix bug where an alert was shown for invalid credentials, but the Edit button did not work
	- fix ClientRootViewController.closeClient(), so it calls the completionHandler
	- adjust the editing method to the changed view and navigation controller structure
- minor code formatting and style fixes in several places

* Fixed (22): no ‘more’ button in directory picker and now swipe to delete

* Another small fix for (22)

* Fix for multi-selection regression (items automatically selected) when re-entering multi-selection

* - Fix UI main thread violation in BookmarkViewController
- Fix spelling of CreateFolderAction.identifier value
- Simplify implementation of DuplicateAction by refactoring it to use new SDK APIs, addressing issue (7) in #237
- Fix potential future crash in ClientDirectoryPickerViewController by avoiding force-casting
- Make OCItem.parentItem in OCItem+Extension more robust using new SDK API
- Adapt FileProviderExtension to use new, supported SDK APIs instead of the island implementation that was -findKnownExistingItemInParent:withName:
- Add (and comment out) code that lets FileProviderExtension.createDirectoryWithName return as soon as the placeholder item is available
- Add empty implementations for trashItemWithIdentifier/untrashItemWithIdentifier/setLastUsedDate/supportedServiceSourcesForItemIdentifier to comply with requirement of overriding all methods raised in the documentation

* Fix for (24) refresh animation glitch

* Fixed (26) crash when trying to downsample corrupt image file

* Version Bump to 116

* Fixed (27): not downloading files which are present offline

* Using OCCore.localCopy() to test if the file is already downloaded

* Another fix for (27)

Not dismissing DisplayViewController when OpenIn action is triggered.

* - Update SDK

* - Address issue (17) from #237 by bringing up a custom error message when a user likely attempted a cross-server move operation through the Files app

* fixed earl grey ui test failures, because UI or logic changed in release_1.0.0 fixes

* - Address issue (30) in #237 via SDK update

* fixed memory leak, which causes that the viewcontroller was not released (this was recognized, because audio or video keeps playing in the background)

* - Updating SDK, fixing issues described for the initial release issue (30) fix

* - Fix issue (19) in #237
- Fix issue (30) in #237 with fixes described in owncloud/ios-sdk#46 (comment)

* - Addressing (30) in #237

* Fixed (35) handling taps in the PDFThumbnailsView

* Some fixes regarding thumbnail size calculation

* - Update to latest SDK (to solve (30))

* Fixed (31) plus couple of PDF thumbnail view fixes

* Fixed (37) disable horizontal scrolling in the gallery if there is a single item

* - Update ios-sdk which now includes important fixes from the ios-sdk feature/sharing branch

* - Fix another formatting warning

* - Certificate Manager now shows the acceptance reason for user-accepted certificates
- Certificate View now shows the acceptance reason description for user-accepted certificates

* Few cosmetic changes

* Removed unused instance variable

* Fixed (38) tap to hide bars -> recalculate image size

* Fixed an issue with swipe in the image gallery causing navigation bar to reappear

* Fixed (39) Going back to root folder when selected “Browse” tab is tapped

* - Fixing two issues from #237:
	- (25) Double deletion in maintenance mode
        - (41) Files re-appear in the files list after batch-deleting them

* - Fix (42) in #237: considerable CPU use and slow-down in busy/frequently updated directories

* - Fixing (33) in #237 via SDK update: give users option to keep file or retry when upload fails

* - Fix issue (32) and (40) in #237 by presenting ClientRootViewController
	- only when the core has been returned by OCCoreManager, showing an activity indicator in the selected cell until then
	- modally, using a custom push transition to avoid UINavigationController hell
- Fix issue where ClientRootViewController would dismiss the lat ClientQueryViewController while also being dismissed, leading to an inconsistent animation when looking closely

* - Cleanup

* - Cleanup

* Version Bump to 117

* Fixed UI tests which broke due to changes made to fix (32) and (40)

* Fixed remaining UI tests

* - Fix issue where logging in and out of a bookmark in quick succession could lead to hangs opening the bookmark (likely is (32) in #237)

* - Fix failing UI tests

* - Make certificate detail view more resilient

* - Update SDK to add logging around OCCoreManager core requests/returns

* - SDK update:
        - Make OCCoreManager use an administrative queue for every bookmark, so that one connection closing down or opening up can't hold up another
- Takes advantage of OCCoreManager managing every bookmark independently
	- allowing to select another bookmark if the previous one takes longer to open
	- not show the UI for a bookmark if Settings, Help or Add/Edit Bookmark UI is triggered meanwhile
	- fix crash caused by force-unwrapping self.core in ClientRootViewController.coreReady()

* - Address "(44) Re-save file to the same folder will lead to an error" in #237

* - Avoid showing download progress indicator when viewing files that are already downloaded (issue (46) in #237)
- Fix bug in PDFViewerViewController where CoreGraphics would throw an error when using pdfView with zero size (before properly laying it out)

* - Clean up DisplayViewController and remove force-casts
- Fix (47) "the non-openable files prompt the download progress bar in the "details" view" in #237

* removed localization for "Feedback" button

* Feature/heic to jpeg (#363)

* Added HEIC to JPEG conversion

* Localized strings for photo upload settings

* Fixed indentation

* Fixed license header

* Version Bump to 118

* Made sure that photo metadata is exported

* - ownCloud iOS SDK and Xcode update

* Fixes for #365

- Offloaded photo import operations off the main thread
- Using fullsize image URL to derive filename

* Memory use improvements

* - Update SDK
- include xcscheme options for new configuration variables

* - Correct settings in scheme

* More memory handling improvements when dealing with image conversion

* - ProgressSummarizer updates
	- now groups progress by type and provides summaries such as "Uploading X of Y files.." that are easier to follow for the user
	- now prioritizes newer progress submissions over old ones, taking into account the possbility these may be executed earlier due to Sync Engine concurrency

* - Clean up Viewer code
	- Remove unused original DisplayHostViewController
	- Rename GalleryHostViewController to DisplayViewController
	- move Viewer code below Client where it logically belongs and split it up into subdirectories
- (Re-)add download progress reporting to ClientQueryViewController and initially add it to Display*ViewController classes

* - ios-sdk update adding Sync Action categories and concurrency budgets
- Clean ups

* - Switch back to NSLog from Log.swift in tests (Log.swift is not incuded in the test target) so tests pass
- Remove XCTestsCase+Extension as it provides no benefit over Xcode's own messages whn tests start and finish
  • Loading branch information
felix-schwarz authored and michaelstingl committed May 13, 2019
1 parent d58cf32 commit a9f997e
Show file tree
Hide file tree
Showing 29 changed files with 200 additions and 232 deletions.
74 changes: 41 additions & 33 deletions ownCloud.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
23E22BB720C6A5C40024D11E /* UIDevice+UIUserInterfaceIdiom.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23E22BB220C6A5C40024D11E /* UIDevice+UIUserInterfaceIdiom.swift */; };
23EC77582137F3DD0032D4E6 /* PDFViewerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23EC77542137F3DC0032D4E6 /* PDFViewerViewController.swift */; };
23EC77592137F3DD0032D4E6 /* DisplayExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23EC77552137F3DC0032D4E6 /* DisplayExtension.swift */; };
23EC775A2137F3DD0032D4E6 /* DisplayHostViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23EC77562137F3DC0032D4E6 /* DisplayHostViewController.swift */; };
23EC775B2137F3DD0032D4E6 /* OCExtensionType+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23EC77572137F3DD0032D4E6 /* OCExtensionType+Extension.swift */; };
23EC775D2137FB6B0032D4E6 /* WebViewDisplayViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23EC775C2137FB6B0032D4E6 /* WebViewDisplayViewController.swift */; };
23F6238120B587EF004FDE8B /* SortMethod.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23F6238020B587EF004FDE8B /* SortMethod.swift */; };
Expand Down Expand Up @@ -83,7 +82,6 @@
59B09E6E21AD61F4007827B8 /* EditBookmarkTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59B09E6A21AD61F4007827B8 /* EditBookmarkTests.swift */; };
59B09E6F21AD61F4007827B8 /* CreateBookmarkTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59B09E6B21AD61F4007827B8 /* CreateBookmarkTests.swift */; };
59B09E7021AD61F4007827B8 /* UtilsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59B09E6C21AD61F4007827B8 /* UtilsTests.swift */; };
59BC2751221D552700548444 /* XCTestsCase+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59BC2750221D552700548444 /* XCTestsCase+Extension.swift */; };
59D4895220C83F2E00369C2E /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 59D4895420C83F2E00369C2E /* InfoPlist.strings */; };
6D107AA0B21417432C72755A /* EarlGrey.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7F3B3E74D4B04F9CAF95C09 /* EarlGrey.swift */; };
6E0A569E218702400056B7B4 /* DownloadFileProgressHUDViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E0A569D218702400056B7B4 /* DownloadFileProgressHUDViewController.swift */; };
Expand All @@ -94,7 +92,7 @@
6E586CFC2199A72600F680C4 /* OpenInAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E586CFB2199A72600F680C4 /* OpenInAction.swift */; };
6E586CFE2199A75900F680C4 /* MoveAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E586CFD2199A75900F680C4 /* MoveAction.swift */; };
6E586D002199A78E00F680C4 /* DeleteAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E586CFF2199A78E00F680C4 /* DeleteAction.swift */; };
6E5FC172221590B000F60846 /* GalleryHostViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E5FC171221590B000F60846 /* GalleryHostViewController.swift */; };
6E5FC172221590B000F60846 /* DisplayHostViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E5FC171221590B000F60846 /* DisplayHostViewController.swift */; };
6E83C77E20A32C1B0066EC23 /* SettingsSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E83C77D20A32C1B0066EC23 /* SettingsSection.swift */; };
6E83C78420A33C180066EC23 /* LAContext+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E83C78320A33C180066EC23 /* LAContext+Extension.swift */; };
6E91F37E21ECA6FD009436D2 /* CopyAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E91F37D21ECA6FD009436D2 /* CopyAction.swift */; };
Expand Down Expand Up @@ -476,12 +474,11 @@
23BEF1172076667F00DD2E6F /* IssuesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IssuesViewController.swift; sourceTree = "<group>"; };
23C5652F212167BD00BD4B47 /* CardPresentationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CardPresentationController.swift; sourceTree = "<group>"; };
23C56536212167BE00BD4B47 /* CardTransitionDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CardTransitionDelegate.swift; sourceTree = "<group>"; };
23D5241421491C670002C566 /* DisplayViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = DisplayViewController.swift; path = ownCloud/Viewer/DisplayViewController.swift; sourceTree = SOURCE_ROOT; };
23D5241421491C670002C566 /* DisplayViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DisplayViewController.swift; sourceTree = "<group>"; };
23D77FC6212BFBD100DE76F1 /* NamingViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NamingViewController.swift; sourceTree = "<group>"; };
23E22BB220C6A5C40024D11E /* UIDevice+UIUserInterfaceIdiom.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIDevice+UIUserInterfaceIdiom.swift"; sourceTree = "<group>"; };
23EC77542137F3DC0032D4E6 /* PDFViewerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PDFViewerViewController.swift; sourceTree = "<group>"; };
23EC77552137F3DC0032D4E6 /* DisplayExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DisplayExtension.swift; sourceTree = "<group>"; };
23EC77562137F3DC0032D4E6 /* DisplayHostViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DisplayHostViewController.swift; sourceTree = "<group>"; };
23EC77572137F3DD0032D4E6 /* OCExtensionType+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "OCExtensionType+Extension.swift"; sourceTree = "<group>"; };
23EC775C2137FB6B0032D4E6 /* WebViewDisplayViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebViewDisplayViewController.swift; sourceTree = "<group>"; };
23F6238020B587EF004FDE8B /* SortMethod.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SortMethod.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -560,7 +557,6 @@
59B09E6A21AD61F4007827B8 /* EditBookmarkTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EditBookmarkTests.swift; sourceTree = "<group>"; };
59B09E6B21AD61F4007827B8 /* CreateBookmarkTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CreateBookmarkTests.swift; sourceTree = "<group>"; usesTabs = 1; };
59B09E6C21AD61F4007827B8 /* UtilsTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UtilsTests.swift; sourceTree = "<group>"; };
59BC2750221D552700548444 /* XCTestsCase+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "XCTestsCase+Extension.swift"; sourceTree = "<group>"; };
59D4895320C83F2E00369C2E /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
59EACA8020CAA37F00F082EE /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/InfoPlist.strings; sourceTree = "<group>"; };
6CBDF92D3844CF78B20B5770 /* Pods-ownCloudTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ownCloudTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-ownCloudTests/Pods-ownCloudTests.release.xcconfig"; sourceTree = "<group>"; };
Expand All @@ -572,7 +568,7 @@
6E586CFB2199A72600F680C4 /* OpenInAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenInAction.swift; sourceTree = "<group>"; };
6E586CFD2199A75900F680C4 /* MoveAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoveAction.swift; sourceTree = "<group>"; };
6E586CFF2199A78E00F680C4 /* DeleteAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeleteAction.swift; sourceTree = "<group>"; };
6E5FC171221590B000F60846 /* GalleryHostViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GalleryHostViewController.swift; sourceTree = "<group>"; };
6E5FC171221590B000F60846 /* DisplayHostViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DisplayHostViewController.swift; sourceTree = "<group>"; };
6E83C77D20A32C1B0066EC23 /* SettingsSection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsSection.swift; sourceTree = "<group>"; };
6E83C78320A33C180066EC23 /* LAContext+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "LAContext+Extension.swift"; sourceTree = "<group>"; };
6E91F37D21ECA6FD009436D2 /* CopyAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CopyAction.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -809,8 +805,6 @@
233BDE9E204FEFE500C06732 /* ownCloud */ = {
isa = PBXGroup;
children = (
6E8E3CAB2213287500BF8BDB /* Gallery */,
23EC774D2137F3CD0032D4E6 /* Viewer */,
233BDE9F204FEFE500C06732 /* AppDelegate.swift */,
DCF4F1612051925A00189B9A /* Bookmarks */,
DC3BE0DB2077CC13002A0AC0 /* Client */,
Expand Down Expand Up @@ -912,18 +906,10 @@
children = (
23EC77552137F3DC0032D4E6 /* DisplayExtension.swift */,
23D5241421491C670002C566 /* DisplayViewController.swift */,
23EC77562137F3DC0032D4E6 /* DisplayHostViewController.swift */,
23EC77542137F3DC0032D4E6 /* PDFViewerViewController.swift */,
4C464BEB2187AF1500D30602 /* PDFOutlineViewController.swift */,
4C464BEC2187AF1500D30602 /* PDFSearchTableViewCell.swift */,
4C464BEA2187AF1400D30602 /* PDFSearchViewController.swift */,
4C464BE12187AF1400D30602 /* PDFThumbnailCollectionViewCell.swift */,
4C464BED2187AF1500D30602 /* PDFThumbnailsCollectionViewController.swift */,
4C464BEE2187AF1500D30602 /* PDFTocItem.swift */,
4C464BE92187AF1400D30602 /* PDFTocTableViewCell.swift */,
4C464BE82187AF1400D30602 /* PDFTocTableViewController.swift */,
23EC775C2137FB6B0032D4E6 /* WebViewDisplayViewController.swift */,
6E4F1733217749910049A71B /* ImageDisplayViewController.swift */,
6E5FC171221590B000F60846 /* DisplayHostViewController.swift */,
DCBF0A5E2280393A00465530 /* PDF */,
DCBF0A5F2280394B00465530 /* Image */,
DCBF0A602280395F00465530 /* WebView */,
);
path = Viewer;
sourceTree = "<group>";
Expand Down Expand Up @@ -1015,14 +1001,6 @@
path = "Actions+Extensions";
sourceTree = "<group>";
};
6E8E3CAB2213287500BF8BDB /* Gallery */ = {
isa = PBXGroup;
children = (
6E5FC171221590B000F60846 /* GalleryHostViewController.swift */,
);
path = Gallery;
sourceTree = "<group>";
};
DC1B26FD209CF0D2004715E1 /* Issues Animators */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1062,6 +1040,7 @@
DC3BE0DB2077CC13002A0AC0 /* Client */ = {
isa = PBXGroup;
children = (
23EC774D2137F3CD0032D4E6 /* Viewer */,
236735A421217C2300E5834A /* Actions */,
DCFED971208095E200A2D984 /* ClientItemCell.swift */,
DC3BE0DC2077CC13002A0AC0 /* ClientQueryViewController.swift */,
Expand Down Expand Up @@ -1228,11 +1207,42 @@
233BDEB4204FEFE500C06732 /* OwnCloudTests.swift */,
59B09E6C21AD61F4007827B8 /* UtilsTests.swift */,
DCAEB06021F9FC510067E147 /* EarlGrey+Tools.swift */,
59BC2750221D552700548444 /* XCTestsCase+Extension.swift */,
);
path = Tools;
sourceTree = "<group>";
};
DCBF0A5E2280393A00465530 /* PDF */ = {
isa = PBXGroup;
children = (
23EC77542137F3DC0032D4E6 /* PDFViewerViewController.swift */,
4C464BEB2187AF1500D30602 /* PDFOutlineViewController.swift */,
4C464BEC2187AF1500D30602 /* PDFSearchTableViewCell.swift */,
4C464BEA2187AF1400D30602 /* PDFSearchViewController.swift */,
4C464BE12187AF1400D30602 /* PDFThumbnailCollectionViewCell.swift */,
4C464BED2187AF1500D30602 /* PDFThumbnailsCollectionViewController.swift */,
4C464BEE2187AF1500D30602 /* PDFTocItem.swift */,
4C464BE92187AF1400D30602 /* PDFTocTableViewCell.swift */,
4C464BE82187AF1400D30602 /* PDFTocTableViewController.swift */,
);
path = PDF;
sourceTree = "<group>";
};
DCBF0A5F2280394B00465530 /* Image */ = {
isa = PBXGroup;
children = (
6E4F1733217749910049A71B /* ImageDisplayViewController.swift */,
);
path = Image;
sourceTree = "<group>";
};
DCBF0A602280395F00465530 /* WebView */ = {
isa = PBXGroup;
children = (
23EC775C2137FB6B0032D4E6 /* WebViewDisplayViewController.swift */,
);
path = WebView;
sourceTree = "<group>";
};
DCC6564720C9B7E400110A97 /* ownCloud File Provider */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1882,7 +1892,6 @@
4C80B1E62271BBB400252901 /* PhotoUploadSection.swift in Sources */,
DC1B270C209CF34B004715E1 /* BookmarkViewController.swift in Sources */,
DC63208321FCAC1E007EC0A8 /* ClientActivityViewController.swift in Sources */,
23EC775A2137F3DD0032D4E6 /* DisplayHostViewController.swift in Sources */,
4C464BF62187AF1500D30602 /* PDFTocItem.swift in Sources */,
6E3A103E219D5BBA00F90C96 /* RenameAction.swift in Sources */,
DC018F8320A0F56300135198 /* UIView+Animation.swift in Sources */,
Expand Down Expand Up @@ -1935,7 +1944,7 @@
232B01F62126B10900366FA0 /* MoreStaticTableViewController.swift in Sources */,
6E91F37E21ECA6FD009436D2 /* CopyAction.swift in Sources */,
593BAB97209F8A0500023634 /* AppLockManager.swift in Sources */,
6E5FC172221590B000F60846 /* GalleryHostViewController.swift in Sources */,
6E5FC172221590B000F60846 /* DisplayHostViewController.swift in Sources */,
DC85493421831B0B00782BA8 /* Tools.swift in Sources */,
DCFED972208095E200A2D984 /* ClientItemCell.swift in Sources */,
3998F5D522411EDF00B66713 /* BorderedLabel.swift in Sources */,
Expand Down Expand Up @@ -2001,7 +2010,6 @@
buildActionMask = 2147483647;
files = (
233BDEB5204FEFE500C06732 /* OwnCloudTests.swift in Sources */,
59BC2751221D552700548444 /* XCTestsCase+Extension.swift in Sources */,
59B09E6F21AD61F4007827B8 /* CreateBookmarkTests.swift in Sources */,
59B09E6E21AD61F4007827B8 /* EditBookmarkTests.swift in Sources */,
59538A0321E4A9C2005E543B /* CreateFolderTests.swift in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion ownCloud.xcodeproj/xcshareddata/xcschemes/MakeTVG.xcscheme
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1010"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1010"
LastUpgradeVersion = "1020"
wasCreatedForAppExtension = "YES"
version = "2.0">
<BuildAction
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1010"
LastUpgradeVersion = "1020"
wasCreatedForAppExtension = "YES"
version = "2.0">
<BuildAction
Expand Down
12 changes: 11 additions & 1 deletion ownCloud.xcodeproj/xcshareddata/xcschemes/ownCloud.xcscheme
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1010"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -100,6 +100,16 @@
value = "1"
isEnabled = "YES">
</EnvironmentVariable>
<EnvironmentVariable
key = "oc:core.override-reachability-signal"
value = "true"
isEnabled = "NO">
</EnvironmentVariable>
<EnvironmentVariable
key = "oc:core.override-availability-signal"
value = "false"
isEnabled = "NO">
</EnvironmentVariable>
<EnvironmentVariable
key = "oc:app.show-beta-warning"
value = "false"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1010"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 0 additions & 2 deletions ownCloud/Bookmarks/Issues/IssuesViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,7 @@ class IssuesViewController: UIViewController {
}

@objc func buttonPressed(_ button :UIButton) {

if let buttonPressed: IssueButton = buttons?[button.tag] {
print("buttonPressed name \(buttonPressed.title)")
buttonPressed.action()
}
}
Expand Down
7 changes: 5 additions & 2 deletions ownCloud/Client/ClientQueryViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -413,15 +413,16 @@ class ClientQueryViewController: UITableViewController, Themeable, UIDropInterac
if lastTappedItemLocalID != rowItem.localID {
lastTappedItemLocalID = rowItem.localID

core.downloadItem(rowItem, options: [ .returnImmediatelyIfOfflineOrUnavailable : true ]) { [weak self, query] (error, core, item, _) in
if let progress = core.downloadItem(rowItem, options: [ .returnImmediatelyIfOfflineOrUnavailable : true ], resultHandler: { [weak self, query] (error, core, item, _) in

guard let self = self else { return }
OnMainThread { [weak core] in
if (error == nil) || (error as NSError?)?.isOCError(withCode: .itemNotAvailableOffline) == true {
if let item = item, let core = core {
if item.localID == self.lastTappedItemLocalID {
let itemViewController = GalleryHostViewController(core: core, selectedItem: item, query: query)
let itemViewController = DisplayHostViewController(core: core, selectedItem: item, query: query)
itemViewController.hidesBottomBarWhenPushed = true
itemViewController.progressSummarizer = self.progressSummarizer
self.navigationController?.pushViewController(itemViewController, animated: true)
}
}
Expand All @@ -431,6 +432,8 @@ class ClientQueryViewController: UITableViewController, Themeable, UIDropInterac
self.lastTappedItemLocalID = nil
}
}
}) {
progressSummarizer?.startTracking(progress: progress)
}
}
}
Expand Down
File renamed without changes.
Loading

0 comments on commit a9f997e

Please sign in to comment.