Uploads from content uris #1643

jabarros · 2016-04-28T07:23:18Z

No description provided.

malkomich · 2016-04-28T08:00:19Z

src/com/owncloud/android/ui/activity/FileDisplayActivity.java

+                }
+                // and what happens in case of error?; wrong target name for the upload
+            } catch (Exception e) {
+                Log_OC.e(TAG, "Error while trying to copy and upload a content schema type file ", e);


schema type content, in this case ;)

malkomich · 2016-04-28T08:01:23Z

All code seems OK, just that log detail ^^ 👍

ghost · 2016-04-28T08:33:59Z

@jabarros

Thanks a lot for your contribution!
Contributions to the core repo require a signed contributors agreement http://owncloud.org/about/contributor-agreement/

Alternatively you can add a comment here where you state that this contribution is MIT licensed.

Some more details about out pull request workflow can be found here: http://owncloud.org/code-reviews-on-github/

ghost · 2016-04-28T08:43:17Z

@jabarros

Thanks a lot for your contribution!
Contributions to the core repo require a signed contributors agreement http://owncloud.org/about/contributor-agreement/

Alternatively you can add a comment here where you state that this contribution is MIT licensed.

Some more details about out pull request workflow can be found here: http://owncloud.org/code-reviews-on-github/

malkomich · 2016-04-28T09:01:04Z

Cool, we can ping @jesmrec to test it when he gets less busy ;)

ghost · 2016-05-12T10:37:49Z

@jabarros

Thanks a lot for your contribution!
Contributions to the core repo require a signed contributors agreement http://owncloud.org/about/contributor-agreement/

Alternatively you can add a comment here where you state that this contribution is MIT licensed.

Some more details about out pull request workflow can be found here: http://owncloud.org/code-reviews-on-github/

ghost · 2016-05-12T12:14:13Z

@jabarros

Thanks a lot for your contribution!
Contributions to the core repo require a signed contributors agreement http://owncloud.org/about/contributor-agreement/

Alternatively you can add a comment here where you state that this contribution is MIT licensed.

Some more details about out pull request workflow can be found here: http://owncloud.org/code-reviews-on-github/

jesmrec · 2016-05-12T13:00:39Z

approved 👍

davivel · 2016-05-16T06:49:42Z

src/com/owncloud/android/ui/activity/FileDisplayActivity.java

+                }
+                // and what happens in case of error?; wrong target name for the upload
+            } catch (Exception e) {
+                Log_OC.e(TAG, "Error while trying to copy and upload a schema type content file ", e);


This will end in a silent error; we should show the Toast that was introduced in version 2.0.0, previous line number 786

ghost · 2016-05-16T10:02:16Z

@jabarros

Thanks a lot for your contribution!
Contributions to the core repo require a signed contributors agreement http://owncloud.org/about/contributor-agreement/

Alternatively you can add a comment here where you state that this contribution is MIT licensed.

Some more details about out pull request workflow can be found here: http://owncloud.org/code-reviews-on-github/

davivel · 2016-05-18T09:05:56Z

@jabarros , let's refactor a bit.

Code in Uploader#uploadFiles() is better handling both file:// and content:// URIs pointing to files to upload. Let's put it in a common place so that FileDisplayActivity#requestSimpleUpload() takes advantage of it, and avoid this way duplicated code that evolves differently. We've suffered a lot of bugs in the past due to this.

ghost · 2016-05-19T11:15:06Z

@jabarros

Thanks a lot for your contribution!
Contributions to the core repo require a signed contributors agreement http://owncloud.org/about/contributor-agreement/

Alternatively you can add a comment here where you state that this contribution is MIT licensed.

Some more details about out pull request workflow can be found here: http://owncloud.org/code-reviews-on-github/

ghost · 2016-05-19T11:30:29Z

@jabarros

Thanks a lot for your contribution!
Contributions to the core repo require a signed contributors agreement http://owncloud.org/about/contributor-agreement/

Alternatively you can add a comment here where you state that this contribution is MIT licensed.

Some more details about out pull request workflow can be found here: http://owncloud.org/code-reviews-on-github/

davivel · 2016-05-19T14:11:35Z

src/com/owncloud/android/ui/activity/FileDisplayActivity.java

-                return;
-            }
-        }
+        ArrayList<Parcelable> mStreamsToUpload = new ArrayList<Parcelable>() {{


Local variable shouldn't have m prefix, you, copy-paster :P ;)

Besides, we should move this code out of the method, or change it to receive directly an ArrayList<Parcelable> object instead of an Intent data. See the caller code; in some situations requestSimpleUpload is called in a loop, what will result in a several UriUploader objects created and, more problematic, in several CopyAndUploadContentUrisTask

davivel · 2016-05-19T14:56:35Z

@jabarros , reviewed. Great job you did it there, let's give it the final shot.

ghost · 2016-05-20T08:34:52Z

@jabarros

Thanks a lot for your contribution!
Contributions to the core repo require a signed contributors agreement http://owncloud.org/about/contributor-agreement/

Alternatively you can add a comment here where you state that this contribution is MIT licensed.

Some more details about out pull request workflow can be found here: http://owncloud.org/code-reviews-on-github/

ghost · 2016-05-20T09:23:55Z

@jabarros

Thanks a lot for your contribution!
Contributions to the core repo require a signed contributors agreement http://owncloud.org/about/contributor-agreement/

Alternatively you can add a comment here where you state that this contribution is MIT licensed.

Some more details about out pull request workflow can be found here: http://owncloud.org/code-reviews-on-github/

ghost · 2016-05-20T12:29:57Z

@jabarros

Thanks a lot for your contribution!
Contributions to the core repo require a signed contributors agreement http://owncloud.org/about/contributor-agreement/

Alternatively you can add a comment here where you state that this contribution is MIT licensed.

Some more details about out pull request workflow can be found here: http://owncloud.org/code-reviews-on-github/

jesmrec · 2016-05-23T09:35:37Z

Approved (again) 👍

davivel · 2016-05-23T10:59:54Z

Seen last changes by @jabarros . 👍

… incorrectly

… as content uri scheme

…content uri file appears, or data file is not valid

…named UriUloadResult var

…r apps Drive

ghost · 2016-05-23T11:05:52Z

@jabarros

Thanks a lot for your contribution!
Contributions to the core repo require a signed contributors agreement http://owncloud.org/about/contributor-agreement/

Alternatively you can add a comment here where you state that this contribution is MIT licensed.

Some more details about out pull request workflow can be found here: http://owncloud.org/code-reviews-on-github/

malkomich reviewed Apr 28, 2016
View reviewed changes

malkomich added the 4 - Ready to test label Apr 28, 2016

malkomich mentioned this pull request Apr 28, 2016

Uploads from google drive do not work #1607

Closed

jesmrec mentioned this pull request May 3, 2016

[PR 1643] Uploads from Google Drive & other external storages owncloud/QA#223

Closed

malkomich mentioned this pull request May 3, 2016

Multiple files upload from Google Photos application not working #1358

Closed

jesmrec added Approved by qa and removed 4 - Ready to test labels May 12, 2016

davivel reviewed May 16, 2016
View reviewed changes

davivel reviewed May 19, 2016
View reviewed changes

jesmrec added Approved by qa and removed 4 - Ready to test labels May 23, 2016

jabarros and others added 20 commits May 23, 2016 13:04

Copy and upload the selected file when content type is uri

76e88dc

Remove unused import

47f0a24

Minor refactor and added CR comment

a0f2e7a

Fix. Import file from external storage with '/' character is uploaded…

b8b17d4

… incorrectly

Removed replacement of ':' character from file name when uploading it…

10b8f5c

… as content uri scheme

Changes after CR. Added silent error as Toast when error uploading a …

ae63ec1

…content uri file appears, or data file is not valid

Rename Uploader activity to ReceiveExternalFilesActivity

5948c1c

Refactor upload files code (WIP)

f09fe37

Refactor upload files code. Move to use UriUploader (WIP)

e84bfdf

Added and managed result cases when upload uris

7b7b85d

Remove content resolver parameter from UriUploader constructor and re…

1a18ca4

…named UriUloadResult var

Show waiting dialog when receiving external files

e0ec383

Removed unused and commented code

49bcfd0

Removed unused imports

eae1e54

Added comments and cleaned code

2fadc0b

Changes after CR (WIP)

36a0cd5

Second part of changes after CR

7a46865

Final changes after CR

3447018

Minor changes

e34d76a

Fix. [BUG] Some storages do not work when uploading content from othe…

7225b9f

…r apps Drive

davivel force-pushed the uploads_from_content_uris branch from d8004af to 7225b9f Compare May 23, 2016 11:04

davivel merged commit 3cf03ec into master May 23, 2016

davivel deleted the uploads_from_content_uris branch May 23, 2016 11:10

davivel mentioned this pull request Jun 10, 2016

Android app not able to upload photos manually #1707

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uploads from content uris #1643

Uploads from content uris #1643

jabarros commented Apr 28, 2016

malkomich Apr 28, 2016

malkomich commented Apr 28, 2016

ghost commented Apr 28, 2016

ghost commented Apr 28, 2016

malkomich commented Apr 28, 2016

ghost commented May 12, 2016

ghost commented May 12, 2016

jesmrec commented May 12, 2016

davivel May 16, 2016

ghost commented May 16, 2016

davivel commented May 18, 2016

ghost commented May 19, 2016

ghost commented May 19, 2016

davivel May 19, 2016 •

edited

Loading

davivel May 19, 2016 •

edited

Loading

davivel commented May 19, 2016

ghost commented May 20, 2016

ghost commented May 20, 2016

ghost commented May 20, 2016

jesmrec commented May 23, 2016

davivel commented May 23, 2016

ghost commented May 23, 2016

Uploads from content uris #1643

Uploads from content uris #1643

Conversation

jabarros commented Apr 28, 2016

malkomich Apr 28, 2016

Choose a reason for hiding this comment

malkomich commented Apr 28, 2016

ghost commented Apr 28, 2016

ghost commented Apr 28, 2016

malkomich commented Apr 28, 2016

ghost commented May 12, 2016

ghost commented May 12, 2016

jesmrec commented May 12, 2016

davivel May 16, 2016

Choose a reason for hiding this comment

ghost commented May 16, 2016

davivel commented May 18, 2016

ghost commented May 19, 2016

ghost commented May 19, 2016

davivel May 19, 2016 • edited Loading

Choose a reason for hiding this comment

davivel May 19, 2016 • edited Loading

Choose a reason for hiding this comment

davivel commented May 19, 2016

ghost commented May 20, 2016

ghost commented May 20, 2016

ghost commented May 20, 2016

jesmrec commented May 23, 2016

davivel commented May 23, 2016

ghost commented May 23, 2016

davivel May 19, 2016 •

edited

Loading

davivel May 19, 2016 •

edited

Loading