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

[fix/fp-offline-browsing] Allow offline browsing of folders in the File Provider #547

Merged
merged 5 commits into from
Oct 31, 2019
Merged

[fix/fp-offline-browsing] Allow offline browsing of folders in the File Provider #547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
14aad90
- Fix Swift and SwiftLint warnings
felix-schwarz Oct 21, 2019
a26fe30
Merge branch 'master' into milestone/1.2
hosy Oct 28, 2019
d5a4caa
- address libzip Xcode project upgrade warning
felix-schwarz Oct 29, 2019
0112b8d
Merge branch 'milestone/1.2' of https://www.github.com/owncloud/ios-a…
felix-schwarz Oct 29, 2019
97437b5
- Allow offline browsing of folders in the File Provider
felix-schwarz Oct 29, 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 external/libzip/libzip.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,7 @@
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = DCE93FD921FCA42B000E14F2;
productRefGroup = DCE93FE421FCA42C000E14F2 /* Products */;
Expand Down
2 changes: 1 addition & 1 deletion ios-sdk
Open in desktop
Submodule ios-sdk updated 8 files
+0 −8 CHANGELOG.md
+1 −1 ownCloudSDK/Core/OCCore.h
+3 −0 ownCloudSDK/Core/Sync/Record/OCSyncRecord.h
+1 −0 ownCloudSDK/OCTypes.h
+35 −0 ownCloudSDK/Vaults/Database/OCDatabase+Schemas.m
+69 −5 ownCloudSDK/Vaults/Database/OCDatabase.m
+1 −1 ownCloudSDKTests/ItemPolicyTests.m
+1 −0 ownCloudUI/openssl/framework/openssl.xcodeproj/project.pbxproj
5 changes: 5 additions & 0 deletions ownCloud File Provider/FileProviderExtension.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,3 +896,8 @@ - (void)core:(OCCore *)core handleError:(NSError *)error issue:(OCIssue *)issue
@end

OCClaimExplicitIdentifier OCClaimExplicitIdentifierFileProvider = @"fileProvider";

/*
Additional information:
- NSExtensionFileProviderSupportsPickingFolders: https://twitter.com/palmin/status/1177860144258076673
*/
8 changes: 8 additions & 0 deletions ownCloud File Provider/OCItem+FileProviderItem.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,14 @@ - (BOOL)isDownloaded
return (YES);
}

if (self.type == OCItemTypeCollection)
{
// Needs to return YES for folders in order to allow browsing while offline
// Otherwise Files.app will bring up an alert "You're not connected to the Internet"
// (big thanks to @palmin who pointed me to this possibility)
return (YES);
}

return (NO);
}

Expand Down