Skip to content

Commit

Permalink
Merge branch 'milestone/1.3' into feature/whats-new-screen
Browse files Browse the repository at this point in the history
# Conflicts:
#	ios-sdk
#	ownCloud/Client/Viewer/DisplayHostViewController.swift
#	ownCloud/Client/Viewer/Media/MediaDisplayViewController.swift
  • Loading branch information
hosy committed Jan 13, 2020
2 parents 3de4e73 + 6904fcf commit db724f5
Show file tree
Hide file tree
Showing 103 changed files with 7,745 additions and 1,051 deletions.
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# ChangeLog

## Release version 1.2.1 (January 2020)

- Fix: Passcode Lock Screen on iOS 13 (#582)

## Release version 1.2.0 (December 2019)

- Multiple Window Support (iPadOS) (#488)
- Keyboard Commands (iPadOS) (#282)
- Media Player Improvements (#59, #374)
- Better File Previews (#481)
- Arabic Language Support
- Fix: Sort alphabetically (PR #546)
- Fix: Share Sheet on iPad (#568)
- Fix: FileProvider File Type Issue (#557)
- Fix: FileProvider Offline Browsing (PR #547)
- Fix: FileProvider Saving from Microsoft Word (PR #574)
- Fix: Photo Upload (#504)

## Release version 1.1.2 (October 2019)

- Fix for long delays before starting a request on iOS 13.1 (PR #531)
Expand Down
21 changes: 13 additions & 8 deletions docs/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -482,11 +482,16 @@ combined-stream2@^1.0.2:
debug "^2.1.1"
stream-length "^1.0.1"

commander@^2.12.2, commander@^2.19.0, commander@~2.20.0:
commander@^2.12.2, commander@^2.19.0:
version "2.20.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==

commander@~2.20.3:
version "2.20.3"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==

[email protected]:
version "0.0.1"
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
Expand Down Expand Up @@ -897,9 +902,9 @@ gulp-vinyl-zip@^2.1.2:
yazl "^2.2.1"

handlebars@^4.0.12:
version "4.1.2"
resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67"
integrity sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==
version "4.5.3"
resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.3.tgz#5cf75bd8714f7605713511a56be7c349becb0482"
integrity sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==
dependencies:
neo-async "^2.6.0"
optimist "^0.6.1"
Expand Down Expand Up @@ -1960,11 +1965,11 @@ typedarray@^0.0.6:
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=

uglify-js@^3.1.4:
version "3.5.15"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.5.15.tgz#fe2b5378fd0b09e116864041437bff889105ce24"
integrity sha512-fe7aYFotptIddkwcm6YuA0HmknBZ52ZzOsUxZEdhhkSsz7RfjHDX2QDxwKTiv4JQ5t5NhfmpgAK+J7LiDhKSqg==
version "3.7.3"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.3.tgz#f918fce9182f466d5140f24bb0ff35c2d32dcc6a"
integrity sha512-7tINm46/3puUA4hCkKYo4Xdts+JDaVC9ZPRcG8Xw9R4nhO/gZgUM3TENq8IF4Vatk8qCig4MzP/c8G4u2BkVQg==
dependencies:
commander "~2.20.0"
commander "~2.20.3"
source-map "~0.6.1"

unc-path-regex@^0.1.2:
Expand Down
35 changes: 33 additions & 2 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ platform :ios do
provisioningProfiles: {
"com.owncloud.ios-app" => "match AdHoc com.owncloud.ios-app",
"com.owncloud.ios-app.ownCloud-File-Provider" => "match AdHoc com.owncloud.ios-app.ownCloud-File-Provider",
"com.owncloud.ios-app.ownCloud-File-ProviderUI" => "match AdHoc com.owncloud.ios-app.ownCloud-File-ProviderUI"
"com.owncloud.ios-app.ownCloud-File-ProviderUI" => "match AdHoc com.owncloud.ios-app.ownCloud-File-ProviderUI",
"com.owncloud.ios-app.ownCloud-File-Intents" => "match AdHoc com.owncloud.ios-app.ownCloud-Intents"
#Add more Provisioning Profiles when extensions are added
}
}
Expand Down Expand Up @@ -71,6 +72,8 @@ platform :ios do
ENTERPRISE_FP_PROFILE = "Enterprise Distribution iOS Neo File Provider"
ENTERPRISE_FP_UI_ID = "com.owncloud.enterprise.ios-app.ownCloud-File-ProviderUI"
ENTERPRISE_FP_UI_PROFILE = "Enterprise Distribution iOS Neo File ProviderUI"
ENTERPRISE_INTENT_ID = "com.owncloud.enterprise.ios-app.ownCloud-Intents"
ENTERPRISE_INTENT_PROFILE = "Enterprise Distribution iOS Neo Intent"
ENTERPRISE_APP_FW_ID = "com.owncloud.enterprise.ownCloudApp"
ENTERPRISE_TEAM = "5QNK8L2PSC"
ENTERPRISE_IDENTITY = "iPhone Distribution: ownCloud GmbH"
Expand Down Expand Up @@ -99,6 +102,12 @@ platform :ios do
app_identifier: ENTERPRISE_APP_FW_ID
)

update_app_identifier(
xcodeproj: "ownCloud.xcodeproj",
plist_path: "ownCloud Intents/Info.plist",
app_identifier: ENTERPRISE_INTENT_ID
)

update_app_group_identifiers(
entitlements_file: "ownCloud/ownCloud.entitlements",
app_group_identifiers: ["group.com.owncloud.enterprise.ios-app"]
Expand All @@ -109,10 +118,18 @@ platform :ios do
app_group_identifiers: ["group.com.owncloud.enterprise.ios-app"]
)

update_app_group_identifiers(
entitlements_file: "ownCloud Intents/ownCloud Intents.entitlements",
app_group_identifiers: ["group.com.owncloud.enterprise.ios-app"]
)

set_info_plist_value(path: "ownCloud File Provider/Info.plist", key: "OCAppGroupIdentifier", value: "group.com.owncloud.enterprise.ios-app")
set_info_plist_value(path: "ownCloud File Provider/Info.plist", key: "OCKeychainAccessGroupIdentifier", value: "group.com.owncloud.enterprise.ios-app")
set_info_plist_value(path: "ownCloud File Provider/Info.plist", key: "NSExtension", subkey: "NSExtensionFileProviderDocumentGroup", value: "group.com.owncloud.enterprise.ios-app")

set_info_plist_value(path: "ownCloud Intents/Info.plist", key: "OCAppGroupIdentifier", value: "group.com.owncloud.enterprise.ios-app")
set_info_plist_value(path: "ownCloud Intents/Info.plist", key: "OCKeychainAccessGroupIdentifier", value: "group.com.owncloud.enterprise.ios-app")

automatic_code_signing(
path: "ownCloud.xcodeproj",
use_automatic_signing: false,
Expand Down Expand Up @@ -143,6 +160,16 @@ platform :ios do
targets: ["ownCloud File ProviderUI"]
)

automatic_code_signing(
path: "ownCloud.xcodeproj",
use_automatic_signing: false,
team_id: ENTERPRISE_TEAM,
code_sign_identity: ENTERPRISE_IDENTITY,
profile_name: ENTERPRISE_INTENT_PROFILE,
bundle_identifier: ENTERPRISE_INTENT_ID,
targets: ["ownCloud Intents"]
)

automatic_code_signing(
path: "ownCloud.xcodeproj",
use_automatic_signing: false,
Expand All @@ -157,6 +184,9 @@ platform :ios do
short_hash = commit[:abbreviated_commit_hash] # short sha of commit
sh "curl https://badgen.net/badge/Bitrise/" + short_hash + "/blue > badge.svg"
sh "brew install librsvg"
sh "brew unlink pango"
sh "brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/7cf3b63be191cb2ce4cd86f4406915128ec97432/Formula/pango.rb"
sh "brew switch pango 1.42.4_1 "
sh "rsvg-convert badge.svg > badge.png"
sh "badge --custom badge.png --glob /../**/*.appiconset/*.{png,PNG}"

Expand All @@ -172,7 +202,8 @@ platform :ios do
provisioningProfiles: {
ENTERPRISE_APP_ID => ENTERPRISE_APP_PROFILE,
ENTERPRISE_FP_ID => ENTERPRISE_FP_PROFILE,
ENTERPRISE_FP_UI_ID => ENTERPRISE_FP_UI_PROFILE
ENTERPRISE_FP_UI_ID => ENTERPRISE_FP_UI_PROFILE,
ENTERPRISE_INTENT_ID => ENTERPRISE_INTENT_PROFILE
}
}
)
Expand Down
Binary file added fastlane/screenshots/ar/keyword.strings
Binary file not shown.
Binary file added fastlane/screenshots/ar/title.strings
Binary file not shown.
Binary file added fastlane/screenshots/en-GB/keyword.strings
Binary file not shown.
Binary file added fastlane/screenshots/en-GB/title.strings
Binary file not shown.
Binary file modified fastlane/screenshots/gl/keyword.strings
Binary file not shown.
Binary file added fastlane/screenshots/lv/title.strings
Binary file not shown.
Binary file added fastlane/screenshots/zh-Hans/title.strings
Binary file not shown.
2 changes: 1 addition & 1 deletion ownCloud File Provider/FileProviderEnumerator.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

@class FileProviderExtension;

@interface FileProviderEnumerator : NSObject <NSFileProviderEnumerator, OCQueryDelegate>
@interface FileProviderEnumerator : NSObject <NSFileProviderEnumerator, OCQueryDelegate, OCLogTagging>
{
__weak FileProviderExtension *_fileProviderExtension;

Expand Down
18 changes: 15 additions & 3 deletions ownCloud File Provider/FileProviderEnumerator.m
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ - (void)_startQuery
{
// Start query
self->_query = [OCQuery queryForPath:queryPath];
self->_query.includeRootItem = YES;
self->_query.includeRootItem = queryPath.isRootPath; // Include the root item only for the root folder. If it's not included, no folder can be created in the root directory. If a non-root folder is included in a query result for its content, the Files Duplicate action will loop infinitely.
self->_query.delegate = self;

[DisplaySettings.sharedDisplaySettings updateQueryWithDisplaySettings:self->_query];
Expand Down Expand Up @@ -322,9 +322,11 @@ - (void)provideItemsForChangeObserverFromQuery:(OCQuery *)query

- (void)queryHasChangesAvailable:(OCQuery *)query
{
OCLogDebug(@"##### Query for %@ has changes. Query state: %lu", query.queryPath, (unsigned long)query.state);
OCLogDebug(@"##### Query for %@ has changes. Query state: %lu, SinceSyncAnchor: %@, Changes available: %d", query.queryPath, (unsigned long)query.state, query.querySinceSyncAnchor, query.hasChangesAvailable);

if ((query.state == OCQueryStateContentsFromCache) || ((query.state == OCQueryStateWaitingForServerReply) && (query.queryResults.count > 0)) || (query.state == OCQueryStateIdle))
if ( (query.state == OCQueryStateContentsFromCache) ||
((query.state == OCQueryStateWaitingForServerReply) && (query.queryResults.count > 0)) ||
(query.state == OCQueryStateIdle))
{
dispatch_async(dispatch_get_main_queue(), ^{
@synchronized(self)
Expand Down Expand Up @@ -422,4 +424,14 @@ - (void)currentSyncAnchorWithCompletionHandler:(void (^)(NSFileProviderSyncAncho
// - (void)finishEnumeratingWithError:(NSError *)error;
// }

+ (NSArray<OCLogTagName> *)logTags
{
return (@[ @"FPEnum" ]);
}

- (NSArray<OCLogTagName> *)logTags
{
return (@[ @"FPEnum", OCLogTagInstance(self)]);
}

@end
Loading

0 comments on commit db724f5

Please sign in to comment.