Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[feature/fp-series-2] File Provider improvements #167

Merged
merged 49 commits into from
Jan 23, 2019
Merged

[feature/fp-series-2] File Provider improvements #167

Show file tree
Hide file tree
Changes from 48 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
05ec52e
- Minor memory optimizations - Updated to latest SDK
felix-schwarz Nov 26, 2018
49b0785
- Save changes prior to merge with master
felix-schwarz Dec 4, 2018
2d7612d
- Merge remote-tracking branch 'origin/master' into feature/fp-series-2
felix-schwarz Dec 4, 2018
43d0494
- Convert to Swift 4.2
felix-schwarz Dec 4, 2018
63798a9
- Further Swift 4.2 changes
felix-schwarz Dec 4, 2018
c6f8ec9
Merge remote-tracking branch 'origin/master' into feature/fp-series-2
felix-schwarz Dec 4, 2018
4fe6430
- Update to latest SDK develop commit
felix-schwarz Dec 5, 2018
267372c
Merge remote-tracking branch 'origin/master' into feature/fp-series-2
felix-schwarz Dec 5, 2018
d4ce438
- Adapting APP to latest SDK changes
felix-schwarz Dec 6, 2018
f89c018
- Added back ownCloudUI.framework to copy phase of ownCloud target
felix-schwarz Dec 10, 2018
5a5b824
- Add support for OCLogToggle in Settings
felix-schwarz Dec 11, 2018
d44bde2
- Fix issues in ClientQueryViewController related to UITableView not …
felix-schwarz Dec 11, 2018
14a0b5b
- Remove last traces of OCMocking.framework from ownCloud app target,…
felix-schwarz Dec 11, 2018
2132b77
- Fix EarlGrey/CocoaPods workspace / build errors
felix-schwarz Dec 11, 2018
334f416
- Adopt new OCLogger tags APIs in Log.swift and FileProviderExtension
felix-schwarz Dec 12, 2018
bcc96a1
- Update SDK
felix-schwarz Dec 14, 2018
6a5b525
- Remove superfluous [FP] from log message
felix-schwarz Dec 14, 2018
735ab11
- Make sure DisplayViewController uses the updated version of an item…
felix-schwarz Dec 14, 2018
6b26ef0
- Update to latest SDK
felix-schwarz Dec 14, 2018
1a8ddd1
- Fixing thumbnail aspect ratio and removing duplicate code in Naming…
felix-schwarz Dec 14, 2018
4ce416e
- Update SDK
felix-schwarz Dec 14, 2018
876b164
- Exit editing mode in the server list when the user selects an exist…
felix-schwarz Dec 17, 2018
a31d0a3
- Adapt app code base to change in OCError Swift conversion (followin…
felix-schwarz Dec 17, 2018
f0aa645
- Fix https://github.com/owncloud/ios-app/issues/152: if the user can…
felix-schwarz Dec 17, 2018
0d6463b
- Update to latest SDK
felix-schwarz Dec 17, 2018
d931db9
- Make ProgressSummarizer only consider Progress objects with descrip…
felix-schwarz Dec 19, 2018
5b76642
- Adapt to change of name of OCConnectionIssue to OCIssue
felix-schwarz Dec 19, 2018
d56ef7d
Merge branch 'master' of https://github.com/owncloud/ios-app into fea…
felix-schwarz Dec 20, 2018
e1263da
- Update to latest SDK
felix-schwarz Jan 8, 2019
ca11f94
- Make DisplayViewController use OCCoreOptionReturnImmediatelyIfOffli…
felix-schwarz Jan 8, 2019
9a1f808
Merge branch 'master' into feature/fp-series-2
felix-schwarz Jan 8, 2019
b3dfa3e
- Added priority summaries to ProgressSummarizer
felix-schwarz Jan 9, 2019
f115932
- Fix an issue where "Offline." was shortly shown when logging in
felix-schwarz Jan 11, 2019
4cba657
- Add *.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist to .gitignore
felix-schwarz Jan 11, 2019
3f9091d
Merge remote-tracking branch 'origin/master' into feature/fp-series-2
felix-schwarz Jan 15, 2019
3266cfa
- Updated ios-sdk
felix-schwarz Jan 15, 2019
96342c5
- Made FileProviderEnumerator use an OCQuery that includes the root i…
felix-schwarz Jan 15, 2019
4fce1b5
- Adapted to latest round of nullability additions in the SDK
felix-schwarz Jan 16, 2019
2017e09
- Update SDK
felix-schwarz Jan 17, 2019
bbe8915
- Updated ios-sdk
felix-schwarz Jan 17, 2019
0446300
- Update ios-sdk with IPC fixes
felix-schwarz Jan 17, 2019
eb5f074
- Adapt tests to SDK changes (all tests pass)
felix-schwarz Jan 18, 2019
d00a7bc
- Present cache contents while waiting for a reply from the server
felix-schwarz Jan 18, 2019
7ecec80
- Replacing DispatchQueue.main.async* with OnMainThread and a newly a…
felix-schwarz Jan 18, 2019
132eb9d
Merge remote-tracking branch 'origin/master' into feature/fp-series-2
felix-schwarz Jan 19, 2019
208733c
- Add verbose logging to FileProviderExtension to track the commands …
felix-schwarz Jan 20, 2019
6a5581d
- Temporary workaround: make importFileFromURL: not return directly w…
felix-schwarz Jan 22, 2019
efe24f4
- Switching ios-sdk to updated master branch
felix-schwarz Jan 23, 2019
6e6f563
Merge branch 'master' into feature/fp-series-2
felix-schwarz Jan 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ playground.xcworkspace
!*.xcodeproj/project.pbxproj
!*.xcodeproj/xcshareddata/
!*.xcworkspace/contents.xcworkspacedata
*.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
/*.gcno
*.xcworkspacedata
*.xcuserdata
Expand Down
4 changes: 3 additions & 1 deletion Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

target 'ownCloudTests' do
project 'ownCloud'

use_frameworks! # Required for Swift Test Targets only
inherit! :search_paths # Required for not double-linking libraries in the app and test targets.
pod 'EarlGrey'
end
end
2 changes: 1 addition & 1 deletion Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ SPEC REPOS:
SPEC CHECKSUMS:
EarlGrey: 7515b05c7f448374ad7ca2c454f3ea566fcb1a2f

PODFILE CHECKSUM: 9de74386bc9cfbd23b086eff3507630b400b4518
PODFILE CHECKSUM: 290710f64940713341c1d0a5e2bd003b7ce27279

COCOAPODS: 1.5.3
2 changes: 1 addition & 1 deletion ios-sdk
Open in desktop
Submodule ios-sdk updated 92 files
+3 −0 doc/CONFIGURATION.md
+60 −16 ownCloudSDK.xcodeproj/project.pbxproj
+8 −1 ownCloudSDK/Categories/Foundation/NSURL+OCURLNormalization.m
+1 −0 ownCloudSDK/Connection/OCConnection+Compatibility.m
+8 −0 ownCloudSDK/Connection/OCConnection+Setup.m
+9 −0 ownCloudSDK/Connection/OCConnection.h
+69 −44 ownCloudSDK/Connection/OCConnection.m
+2 −0 ownCloudSDK/Connection/OCConnectionQueue.h
+48 −5 ownCloudSDK/Connection/OCConnectionQueue.m
+2 −0 ownCloudSDK/Connection/OCConnectionRequest.h
+23 −2 ownCloudSDK/Connection/OCConnectionRequest.m
+0 −0 ownCloudSDK/Core/Connection Status/Maintenance Mode/OCCoreMaintenanceModeStatusSignalProvider.h
+0 −0 ownCloudSDK/Core/Connection Status/Maintenance Mode/OCCoreMaintenanceModeStatusSignalProvider.m
+32 −0 ownCloudSDK/Core/Connection Status/Network Path Monitor/OCCoreNetworkPathMonitorSignalProvider.h
+149 −0 ownCloudSDK/Core/Connection Status/Network Path Monitor/OCCoreNetworkPathMonitorSignalProvider.m
+37 −0 ownCloudSDK/Core/Connection Status/OCCore+ConnectionStatus.m
+1 −0 ownCloudSDK/Core/Connection Status/OCCoreConnectionStatusSignalProvider.h
+9 −0 ownCloudSDK/Core/Connection Status/OCCoreConnectionStatusSignalProvider.m
+0 −0 ownCloudSDK/Core/Connection Status/Reachability/OCCoreReachabilityConnectionStatusSignalProvider.h
+2 −2 ownCloudSDK/Core/Connection Status/Reachability/OCCoreReachabilityConnectionStatusSignalProvider.m
+0 −0 ownCloudSDK/Core/Connection Status/Reachability/OCReachabilityMonitor.h
+0 −0 ownCloudSDK/Core/Connection Status/Reachability/OCReachabilityMonitor.m
+3 −1 ownCloudSDK/Core/ItemList/OCCore+ItemList.h
+185 −101 ownCloudSDK/Core/ItemList/OCCore+ItemList.m
+87 −49 ownCloudSDK/Core/ItemList/OCCoreItemListTask.m
+1 −0 ownCloudSDK/Core/OCCore+Internal.h
+2 −1 ownCloudSDK/Core/OCCore+ItemUpdates.h
+69 −46 ownCloudSDK/Core/OCCore+ItemUpdates.m
+12 −5 ownCloudSDK/Core/OCCore.h
+305 −55 ownCloudSDK/Core/OCCore.m
+6 −0 ownCloudSDK/Core/Sync/Actions/CopyMove/OCSyncActionCopyMove.h
+185 −27 ownCloudSDK/Core/Sync/Actions/CopyMove/OCSyncActionCopyMove.m
+2 −1 ownCloudSDK/Core/Sync/Actions/CreateFolder/OCSyncActionCreateFolder.m
+3 −0 ownCloudSDK/Core/Sync/Actions/Delete/OCSyncActionDelete.m
+1 −1 ownCloudSDK/Core/Sync/Actions/OCSyncAction.m
+2 −1 ownCloudSDK/Core/Sync/Actions/Update/OCSyncActionUpdate.m
+8 −0 ownCloudSDK/Core/Sync/Actions/Upload/OCSyncActionUpload.m
+4 −0 ownCloudSDK/Core/Sync/OCCore+SyncEngine.h
+75 −36 ownCloudSDK/Core/Sync/OCCore+SyncEngine.m
+3 −0 ownCloudSDK/Core/Sync/Record/OCSyncRecord.h
+7 −0 ownCloudSDK/Core/Sync/Record/OCSyncRecord.m
+4 −4 ownCloudSDK/Core/Thumbnails/OCCore+Thumbnails.m
+7 −3 ownCloudSDK/Errors/NSError+OCError.h
+1 −1 ownCloudSDK/Errors/OCHTTPStatus.h
+25 −0 ownCloudSDK/Errors/OCHTTPStatus.m
+27 −19 ownCloudSDK/Events/OCEvent.h
+68 −4 ownCloudSDK/Events/OCEvent.m
+9 −5 ownCloudSDK/Events/OCEventTarget.h
+9 −6 ownCloudSDK/File Handling/OCFile.h
+21 −17 ownCloudSDK/Issues/OCIssue.h
+1 −1 ownCloudSDK/Item/Images/OCImage.h
+25 −0 ownCloudSDK/Item/Images/OCImage.m
+1 −1 ownCloudSDK/Item/Images/OCItemThumbnail.h
+32 −11 ownCloudSDK/Item/Images/OCItemThumbnail.m
+35 −28 ownCloudSDK/Item/OCItem.h
+63 −0 ownCloudSDK/Item/OCItem.m
+3 −0 ownCloudSDK/Logging/OCLogger.m
+3 −0 ownCloudSDK/OCMacros.h
+15 −11 ownCloudSDK/Query/OCQuery.h
+13 −2 ownCloudSDK/Resource Management/OCBookmarkManager.m
+8 −2 ownCloudSDK/Resource Management/OCCoreManager.h
+51 −1 ownCloudSDK/Resource Management/OCCoreManager.m
+6 −0 ownCloudSDK/Resources/en.lproj/Localizable.strings
+17 −13 ownCloudSDK/Security/OCCertificate.h
+6 −2 ownCloudSDK/Security/OCKeychain.h
+34 −0 ownCloudSDK/Toolkit/OCAsyncSequentialQueue.h
+112 −0 ownCloudSDK/Toolkit/OCAsyncSequentialQueue.m
+2 −0 ownCloudSDK/Toolkit/OCIPNotificationCenter.h
+61 −0 ownCloudSDK/Toolkit/OCIPNotificationCenter.m
+2 −1 ownCloudSDK/Toolkit/OCKeyValueStore.h
+23 −3 ownCloudSDK/Toolkit/OCKeyValueStore.m
+6 −1 ownCloudSDK/Toolkit/OCProcessManager.h
+36 −0 ownCloudSDK/Toolkit/OCProcessManager.m
+4 −0 ownCloudSDK/Toolkit/OCProcessSession.h
+26 −0 ownCloudSDK/Toolkit/OCProcessSession.m
+1 −1 ownCloudSDK/Vaults/Database/OCDatabase+Schemas.h
+35 −5 ownCloudSDK/Vaults/Database/OCDatabase+Schemas.m
+7 −1 ownCloudSDK/Vaults/Database/OCDatabase.h
+143 −4 ownCloudSDK/Vaults/Database/OCDatabase.m
+20 −13 ownCloudSDK/Vaults/OCVault.h
+13 −1 ownCloudSDK/Vaults/OCVault.m
+4 −2 ownCloudSDK/ownCloudSDK.h
+101 −0 ownCloudSDKTests/BookmarkManagerTests.m
+12 −0 ownCloudSDKTests/CertificateTests.m
+39 −2 ownCloudSDKTests/ConnectionTests.m
+128 −0 ownCloudSDKTests/CoreManagerTests.m
+125 −11 ownCloudSDKTests/CoreSyncTests.m
+198 −0 ownCloudSDKTests/CoreTests.m
+115 −0 ownCloudSDKTests/MiscTests.m
+5 −0 ownCloudSDKTests/OCTestTarget.h
+23 −0 ownCloudSDKTests/OCTestTarget.m
+2 −0 ownCloudUI/Certificate Metadata/OCCertificateDetailsViewNode.m
1 change: 1 addition & 0 deletions ownCloud File Provider/FileProviderEnumerator.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ - (void)_startQuery
{
// Start query
self->_query = [OCQuery queryForPath:queryPath];
self->_query.includeRootItem = YES;
self->_query.delegate = self;

@synchronized(self)
Expand Down
17 changes: 17 additions & 0 deletions ownCloud File Provider/FileProviderExtension.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,20 @@

@end

#define FPLogCmdBegin(command, format,...) \
NSString *actionLogCmdUUID = nil; \
NSArray *actionLogTags = nil; \
if (OCLogger.logLevel <= OCLogLevelDebug) \
{ \
actionLogCmdUUID = NSUUID.UUID.UUIDString; \
actionLogTags = @[command, @"FPAction", OCLogTagTypedID(@"CmdUUID", actionLogCmdUUID) ]; \
\
[[OCLogger sharedLogger] appendLogLevel:OCLogLevelDebug functionName:@(__PRETTY_FUNCTION__) file:@(__FILE__) line:__LINE__ tags:OCLogAddTags(self,actionLogTags) message:format, ##__VA_ARGS__]; \
} \

#define FPLogCmd(format,...) \
if (OCLogger.logLevel <= OCLogLevelDebug) \
{ \
[[OCLogger sharedLogger] appendLogLevel:OCLogLevelDebug functionName:@(__PRETTY_FUNCTION__) file:@(__FILE__) line:__LINE__ tags:OCLogAddTags(self,actionLogTags) message:format, ##__VA_ARGS__]; \
} \

Loading