[feature/shortcut-uploads] Shortcut uploads and error handling improvements #930

felix-schwarz · 2021-03-12T21:06:18Z

Description

Update to Shortcuts support:

Save File (Uploads)
- add a "wait for completion" option
- delegate uploads to the FileProvider, so they can upload in the background
Create Folder
- add a "wait for completion" option
improved error handling - and now also reporting authentication errors
improved behaviour by
- waiting for the connection to the server to complete for up to 5 seconds
- keeping managed OCCores alive while scheduling work
- ensuring intent completion handler can never be called twice
refactor/rewrite of OCItemTracker
typo fixed error messages
implement new iOS 14 only methods required by Xcode 12.4
File Provider tunneling support for file replacements (report content modification)

Screenshots

Error when authentication fails

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to change)

QA

QA Checks: #930 (comment)

(1) Create folder after revoking token returns bad error [feature/shortcut-uploads] Shortcut uploads and error handling improvements #930 (comment) [FIXED]
(2) Multiple Photos [feature/shortcut-uploads] Shortcut uploads and error handling improvements #930 (comment) [FEATURE REQUEST] Shortcut "Save File" expanded to save multiple files #947
(3) Non accurate error message with no connection in the device [feature/shortcut-uploads] Shortcut uploads and error handling improvements #930 (comment) [FIXED]

- add "Wait for upload to finish" option to SaveFileIntentHandler (implementation of the functionality still pending)

- FileProviderServiceSource: - add additional logging - add new method for reporting local modifications - OCFileProviderServiceSession: - plug error handling hole - add support for new method for reporting local modifications - SaveFileIntentHandler: - refactor and partial rewrite to support new option to wait for completion - add support for import and update through the FP for almost immediate return with the file being uploaded in the background - fix provideAccountOptionsCollection implementation

CLAassistant · 2021-03-12T21:06:23Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

- rewrite OCItemTracker helper to support additional features: - report core errors (withErrorHandler, on by default) - delay item tracking until the core's connection status is online or a timeout is met (waitOnlineTimeout, off by default) - OCIssue extension to simplify identification and access to authentication errors from OCIssues and Error Intents: big refactoring and expansion - CreateFolder: add "wait for completion" option, report authentication errors, wait (with timeout) for core to become online - DeletePath: report authentication errors, wait (with timeout) for core to become online - GetDirectoryListing: add missing return of requested core, report authentication errors - GetFileInfo: report authentication errors, wait (with timeout) for core to become online - GetFile: allow time for the core to find newly added files, report authentication errors, wait (with timeout) for core to become online - PathExists: report authentication errors, wait (with timeout) for core to become online - SaveFile: report authentication errors, wait (with timeout) for core to become online (pending cleanup) - fix typo in localization: "The given path does not exists" -> "The given path does not exist." ownCloud: - adopt improvements from ownCloudAppShared

…- do not wait for timeout before starting item tracking in that case - SaveFile Intent: clean up code, streamline error reporting, report authentication errors

… is not online and a download therefore not possible

ownCloud Intents/SaveFileIntentHandler.swift

ownCloud Intents/PathExistsIntentHandler.swift

ownCloud Intents/GetFileIntentHandler.swift

ownCloud Intents/GetDirectoryListingIntentHandler.swift

ownCloud Intents/DeletePathItemIntentHandler.swift

ownCloud Intents/CreateFolderIntentHandler.swift

jesmrec · 2021-04-05T08:08:01Z

QA checks:

Execute shortcut "Create Folder" with Wait for folder creation to complete
Execute shortcut "Create Folder" without Wait for folder creation to complete)
Execute shortcut "Create Folder" in non-root with Wait for folder creation to complete
Execute shortcut "Create Folder" in non-root without Wait for folder creation to complete
Execute shortcut "Create Folder" with OAuth2 session expired -> [feature/shortcut-uploads] Shortcut uploads and error handling improvements #930 (comment)
Execute shortcut "Save File" with Wait for folder creation to complete
Execute shortcut "Save File" without Wait for folder creation to complete
Execute shortcut "Save File" with OAuth2 session expired

jesmrec · 2021-04-05T08:30:52Z

(1)

Create a simple shortcut that creates a folder in the account, like:

In web dashboard, revoke token
Execute the shortcut

Current:

Expected:

Commit c087c6aa
iPhoneXR v14.4

jesmrec · 2021-04-05T09:07:05Z

(2)

Kind of regression

Checking the Select Photos action, it has a sub-option called Select Multiple.

In case you select that option and then, a Save File ownCloud action, the shortcut will allow you to select multiple Photos, but, at the end, only one will be uploaded to ownCloud.

Is this a new behaviour? should we address to a new ticket?

jesmrec · 2021-04-05T09:19:15Z

(3)

Also, kind of regression.

Remove device connection
Execute a "Create folder" shortcut

The following error message is displayed. Is this the expected behaviour?:

In case the executed shortcut is a "Save File", the displayed error is An unknown error occurred

Expected: a correct no-connection message (feasible?)

Commit c087c6aa
iPhoneXR v14.4

- fix finding (1) from #930: wrong error message trying to create a folder in an account with invalid token

…ing, remove multiple implementations in extensions/categories

felix-schwarz · 2021-04-08T10:50:47Z

@jesmrec Regarding the findings:

(1)

Thanks! I could reproduce and fix this in acf2f3d.

(2)

Save File has only accepted a single file in the past, too, because it is defined that way:

We could expand it to accept and upload more than one file, but this would be outside the scope of this PR IMO. Please file an issue.

- add support for differentiated network unavailable error reporting - add .isNetworkConnectionError NSError/Error glue code

felix-schwarz · 2021-04-08T11:41:43Z

@jesmrec

(3)

Thanks! Networking errors weren't handled in a differentiated way. Fixed that with ec1a0bc .

…rtcut-uploads

jesmrec · 2021-04-09T06:52:08Z

(1) and (3) are fixed with 451a35b8

(2) addressed to #947

jesmrec · 2021-04-09T07:08:47Z

This is approved on my side. You can check above the QA checks

felix-schwarz · 2021-04-09T12:52:50Z

@jesmrec Thanks!

felix-schwarz added 2 commits March 11, 2021 10:56

- adapt Intents to iOS 14

fd70b7a

- add "Wait for upload to finish" option to SaveFileIntentHandler (implementation of the functionality still pending)

felix-schwarz changed the title ~~[feature/shortcut-uploads] Shortcut Upo~~ [feature/shortcut-uploads] Shortcut Upload improvements Mar 12, 2021

felix-schwarz changed the title ~~[feature/shortcut-uploads] Shortcut Upload improvements~~ [feature/shortcut-uploads] Shortcut Upload improvements [WIP] Mar 12, 2021

felix-schwarz added 2 commits March 13, 2021 17:43

- OCItemTracker: add case handling for core being online immediately …

2d3a523

…- do not wait for timeout before starting item tracking in that case - SaveFile Intent: clean up code, streamline error reporting, report authentication errors

felix-schwarz changed the title ~~[feature/shortcut-uploads] Shortcut Upload improvements [WIP]~~ [feature/shortcut-uploads] Shortcut uploads and error handling improvements Mar 13, 2021

felix-schwarz added this to the 11.6.0-Current milestone Mar 13, 2021

- GetFileIntentHandler: return quickly with local results if the core…

3f25689

… is not online and a download therefore not possible

felix-schwarz requested review from hosy and jesmrec March 13, 2021 21:37

Merge branch 'milestone/11.6' into feature/shortcut-uploads

c087c6a

hosy requested changes Mar 17, 2021

View reviewed changes

felix-schwarz linked an issue Mar 22, 2021 that may be closed by this pull request

[BUG] Shortcut actions needs to throw an error when access token is expired #858

Closed

felix-schwarz requested a review from hosy March 29, 2021 21:27

hosy approved these changes Mar 30, 2021

View reviewed changes

felix-schwarz added 2 commits April 8, 2021 12:15

- update SDK

acf2f3d

- fix finding (1) from #930: wrong error message trying to create a folder in an account with invalid token

- adopt new OCBookmarkManager method to resolve account from UUID str…

c34eac5

…ing, remove multiple implementations in extensions/categories

Shortcuts extension:

ec1a0bc

- add support for differentiated network unavailable error reporting - add .isNetworkConnectionError NSError/Error glue code

Merge remote-tracking branch 'origin/milestone/11.6' into feature/sho…

451a35b

…rtcut-uploads

jesmrec mentioned this pull request Apr 9, 2021

[FEATURE REQUEST] Shortcut "Save File" expanded to save multiple files #947

Open

9 tasks

jesmrec approved these changes Apr 9, 2021

View reviewed changes

jesmrec added the Approved by QA Approved by QA label Apr 9, 2021

hosy merged commit 13f35b4 into milestone/11.6 Apr 9, 2021

delete-merged-branch bot deleted the feature/shortcut-uploads branch April 9, 2021 08:19

hosy mentioned this pull request Dec 9, 2021

iOS: Feature "Shortcuts" owncloud/docs-client-ios-app#23

Open

12 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[feature/shortcut-uploads] Shortcut uploads and error handling improvements #930

[feature/shortcut-uploads] Shortcut uploads and error handling improvements #930

felix-schwarz commented Mar 12, 2021 •

edited by jesmrec

CLAassistant commented Mar 12, 2021

jesmrec commented Apr 5, 2021 •

edited

jesmrec commented Apr 5, 2021

jesmrec commented Apr 5, 2021 •

edited

jesmrec commented Apr 5, 2021 •

edited

felix-schwarz commented Apr 8, 2021 •

edited

felix-schwarz commented Apr 8, 2021 •

edited

jesmrec commented Apr 9, 2021

jesmrec commented Apr 9, 2021

felix-schwarz commented Apr 9, 2021

[feature/shortcut-uploads] Shortcut uploads and error handling improvements #930

[feature/shortcut-uploads] Shortcut uploads and error handling improvements #930

Conversation

felix-schwarz commented Mar 12, 2021 • edited by jesmrec

Description

Screenshots

Error when authentication fails

Types of changes

QA

CLAassistant commented Mar 12, 2021

jesmrec commented Apr 5, 2021 • edited

jesmrec commented Apr 5, 2021

(1)

jesmrec commented Apr 5, 2021 • edited

(2)

jesmrec commented Apr 5, 2021 • edited

(3)

felix-schwarz commented Apr 8, 2021 • edited

(1)

(2)

felix-schwarz commented Apr 8, 2021 • edited

(3)

jesmrec commented Apr 9, 2021

jesmrec commented Apr 9, 2021

felix-schwarz commented Apr 9, 2021

felix-schwarz commented Mar 12, 2021 •

edited by jesmrec

jesmrec commented Apr 5, 2021 •

edited

jesmrec commented Apr 5, 2021 •

edited

jesmrec commented Apr 5, 2021 •

edited

felix-schwarz commented Apr 8, 2021 •

edited

felix-schwarz commented Apr 8, 2021 •

edited