Skip to content

AutoUpload improvements#1468

Merged
AndyScherzinger merged 26 commits into
masterfrom
ao-improvements
Sep 6, 2017
Merged

AutoUpload improvements#1468
AndyScherzinger merged 26 commits into
masterfrom
ao-improvements

Conversation

@mario

@mario mario commented Aug 31, 2017

Copy link
Copy Markdown
Contributor

This should fix two issues:

Wasn't tested since I can't reproduce, but I know @tobiasKaminsky can on his phone, so please do.

@mario mario added this to the Nextcloud App 2.0.0 milestone Aug 31, 2017
@mario

mario commented Aug 31, 2017

Copy link
Copy Markdown
Contributor Author

Oh and it might help with #1450

@mario

mario commented Aug 31, 2017

Copy link
Copy Markdown
Contributor Author

@AndyScherzinger we talked about merges/rebases without asking :P

@AndyScherzinger

Copy link
Copy Markdown
Member

we talked about merges/rebases without asking :P

Thought that is about rebase, well than I'll also stop doing it for merged :)

@AndyScherzinger

Copy link
Copy Markdown
Member

@mario test is negative :( The actual state is broken... Tested with "only during charging", taking 3 pictures

This PR:
Queue (0B!)
screenshot_20170901-093637
"Uploaded" (55B!) --> no upload happened, nothing on the server, no log entries, no file, no activity written
screenshot_20170901-093716

Same done for master:
screenshot_20170901-094627
screenshot_20170901-094815

Issue (of course) on the master is that the timestamp is the upload time, not the file created/modified.

@AndyScherzinger

Copy link
Copy Markdown
Member

@mario btw I fixed some lint issues to make the drone build happy...

@mario

mario commented Sep 1, 2017

Copy link
Copy Markdown
Contributor Author

@AndyScherzinger thanks, will take a look.

@AndyScherzinger

Copy link
Copy Markdown
Member

Sweet!sorry for not having better news from testing :(

@mario

mario commented Sep 1, 2017

Copy link
Copy Markdown
Contributor Author

@AndyScherzinger if you can test once more (did an update) for both internal and SD card uploads, that would be sweet. I'll do more thorough testing once I'm back at my desk.

@AndyScherzinger

Copy link
Copy Markdown
Member

Sorry to disappoint you but the behavior described before remains the same except that the very first image waiting for upload shows the correct size in the queue, anything else is 0B and after "upload everything is 55B (displayed) while still none gets uploaded.

@tobiasKaminsky tobiasKaminsky mentioned this pull request Sep 1, 2017
@AndyScherzinger

Copy link
Copy Markdown
Member

Now size gets hidden for queued/failed uploads 👍
Unfortunately all uploads simply fail with http status -1 and I don't see any further infos in the logcat :/

@mario

mario commented Sep 4, 2017

Copy link
Copy Markdown
Contributor Author

o.O SD card or internal storage?

I tested this on a few phones, and it worked here :-/

@AndyScherzinger

Copy link
Copy Markdown
Member

internal storage

...not saying it has something todo with the device since I has re-login issues with the server yesterday but they are gone today ?! So it might work just fine. Hoping that @tobiasKaminsky can have another look so we are sure it is just my server...

@AndyScherzinger

AndyScherzinger commented Sep 4, 2017

Copy link
Copy Markdown
Member

@mario tested it again using @tobiasKaminsky's server instead of mine and I get the same error (fresh installation of the app on the phone - OP3T):

09-04 17:52:40.119 17845-20345/com.nextcloud.client E/UploadFileOperation: Upload of /storage/emulated/0/DCIM/Camera/IMG_20170904_175219.jpg to /InstantUpload/Camera/IMG_20170904_175219.jpg: Operation finished with HTTP status code -1 (fail)

@AndyScherzinger

Copy link
Copy Markdown
Member

@mario just re-tested with master and there the files simply upload, no issues...

@mario

mario commented Sep 4, 2017 via email

Copy link
Copy Markdown
Contributor Author

@AndyScherzinger

Copy link
Copy Markdown
Member

unfortunately I'm afk again for today :/

@enoch85

enoch85 commented Sep 4, 2017

Copy link
Copy Markdown
Member

If you can send me a test account with this PR included to daniel at techandme dot se I can test this PR with Huwaei P10 which produces the log spamming.

@mario

mario commented Sep 4, 2017

Copy link
Copy Markdown
Contributor Author

@enoch85 you mean apk? :) Can do it tomorrow, sure...

@enoch85

enoch85 commented Sep 5, 2017

Copy link
Copy Markdown
Member

@mario Yeah, even better actually. :)

@tobiasKaminsky

Copy link
Copy Markdown
Member

I tried it with my emulator, android 7 as a very first test:
The file is recognized and somehow "uploaded".
For a very short moment it is also visible in the correct folder:
2017-09-05-081754

But the file is not on server (also checked on filesystem).

However it is shown as correctly uploaded:
2017-09-05-082230

In Logcat I did not see any error. Only this related:

09-05 08:17:38.522 7175-7588/com.nextcloud.client D/UploadsStorageManager: updateDataseUploadResult uploadResult: com.owncloud.android.lib.common.operations.RemoteOperationResult@6aa377c upload: com.owncloud.android.operations.UploadFileOperation@9499805
09-05 08:17:38.526 7175-7199/com.nextcloud.client D/Thumbnail: URI: https://10.0.2.2/nc/index.php/apps/files/api/v1/thumbnail/256/256/SofortUpload/Camera/2017/09/IMG_20170905_081736.jpg
09-05 08:17:38.533 7175-7199/com.nextcloud.client D/OwnCloudClient #4: REQUEST GET /nc/index.php/apps/files/api/v1/thumbnail/256/256/SofortUpload/Camera/2017/09/IMG_20170905_081736.jpg
09-05 08:17:38.533 7175-7588/com.nextcloud.client V/UploadsStorageManager: Updating /storage/emulated/0/DCIM/Camera/IMG_20170905_081736.jpg with status:UPLOAD_SUCCEEDED and result:UPLOADED (old:/storage/emulated/0/DCIM/Camera/IMG_20170905_081736.jpg status:UPLOAD_IN_PROGRESS result:-1)
09-05 08:17:38.535 7175-7588/com.nextcloud.client V/UploadsStorageManager: Updating /storage/emulated/0/DCIM/Camera/IMG_20170905_081736.jpg with status=UPLOAD_SUCCEEDED
09-05 08:17:38.541 7175-7588/com.nextcloud.client D/UploadsStorageManager: updateUpload returns with: 1 for file: /storage/emulated/0/DCIM/Camera/IMG_20170905_081736.jpg

@mario

mario commented Sep 5, 2017 via email

Copy link
Copy Markdown
Contributor Author

@tobiasKaminsky

Copy link
Copy Markdown
Member

API 24

@mario

mario commented Sep 5, 2017 via email

Copy link
Copy Markdown
Contributor Author

@mario

mario commented Sep 5, 2017

Copy link
Copy Markdown
Contributor Author

@AndyScherzinger @tobiasKaminsky please try again. @tobiasKaminsky please try with the phone where you have 0 byte files :)

mario and others added 25 commits September 6, 2017 09:19
Signed-off-by: Mario Danic <mario@lovelyhq.com>
Signed-off-by: Mario Danic <mario@lovelyhq.com>
Signed-off-by: Mario Danic <mario@lovelyhq.com>
Signed-off-by: Mario Danic <mario@lovelyhq.com>
Signed-off-by: Mario Danic <mario@lovelyhq.com>
Signed-off-by: Mario Danic <mario@lovelyhq.com>
Signed-off-by: Mario Danic <mario@lovelyhq.com>
Signed-off-by: Mario Danic <mario@lovelyhq.com>
Signed-off-by: Mario Danic <mario@lovelyhq.com>
Signed-off-by: Mario Danic <mario@lovelyhq.com>
Signed-off-by: Mario Danic <mario@lovelyhq.com>
Signed-off-by: Mario Danic <mario@lovelyhq.com>
Signed-off-by: Mario Danic <mario@lovelyhq.com>
Signed-off-by: Mario Danic <mario@lovelyhq.com>
Signed-off-by: Mario Danic <mario@lovelyhq.com>
Signed-off-by: Mario Danic <mario@lovelyhq.com>
Signed-off-by: Mario Danic <mario@lovelyhq.com>
Signed-off-by: Mario Danic <mario@lovelyhq.com>
@AndyScherzinger
AndyScherzinger merged commit a65e0f4 into master Sep 6, 2017
@AndyScherzinger
AndyScherzinger deleted the ao-improvements branch September 6, 2017 07:27
@AndyScherzinger

Copy link
Copy Markdown
Member

@mario @tobiasKaminsky rebased and merged 💃

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Auto Upload: uploads 0b files

4 participants