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

Jump to bottom

Drop instant uploads in favour of camera uploads #2062

Merged
merged 43 commits into from
Jan 12, 2018
Merged

Drop instant uploads in favour of camera uploads #2062

merged 43 commits into from
Jan 12, 2018

Conversation

davigonz
Copy link
Contributor

@davigonz davigonz commented Nov 6, 2017 •
edited
Loading

Implements #2028

BUGS & IMPROVEMENTS

@davigonz davigonz changed the title Drop instant uploads Drop instant uploads [WIP] Nov 6, 2017
@davigonz davigonz force-pushed the drop_instant_uploads branch from ac1fdce to e2dfae5 Compare November 6, 2017 13:41
@davigonz davigonz changed the title Drop instant uploads [WIP] Drop instant uploads in favour of camera uploads[WIP] Nov 6, 2017
@davigonz davigonz changed the title Drop instant uploads in favour of camera uploads[WIP] Drop instant uploads in favour of auto uploads [WIP] Nov 6, 2017
@davigonz davigonz force-pushed the drop_instant_uploads branch from ceb4655 to 9a9b204 Compare November 7, 2017 12:55
@davigonz davigonz self-assigned this Nov 8, 2017
@jesmrec jesmrec mentioned this pull request Nov 8, 2017
Closed
@davigonz davigonz requested a review from jesmrec November 9, 2017 13:18
@davigonz
Copy link
Contributor Author

davigonz commented Nov 9, 2017

@jesmrec Can you have a look at this PR? It will be included in the coming 2.5.1 beta release

@davigonz davigonz force-pushed the drop_instant_uploads branch from d008ca7 to 8373747 Compare November 13, 2017 11:23
@davigonz davigonz changed the title Drop instant uploads in favour of auto uploads [WIP] Drop instant uploads in favour of camera uploads [WIP] Nov 13, 2017
@jcmontesmartos
Copy link

LGTM

@davigonz davigonz force-pushed the drop_instant_uploads branch 3 times, most recently from e524f4c to d31ffe7 Compare November 16, 2017 08:21
@davigonz davigonz force-pushed the drop_instant_uploads branch from 56eba65 to 5e6db90 Compare November 27, 2017 08:39
@jesmrec
Copy link
Collaborator

jesmrec commented Nov 28, 2017 •
edited
Loading

Wording (1) [FIXED]

Current:

Upload picture path
Upload video path

Suggested:

Picture upload path
Video upload path

@jesmrec
Copy link
Collaborator

jesmrec commented Nov 28, 2017 •
edited
Loading

Bug (2) [FIXED]

Steps:

  1. Enable instant uploads for pics or videos
  2. Tap on circle button to vanish the app and go to camera app
  3. Take some pics

Current

Pics are never uploaded

Expected:

Pics are uploaded after some time (less than 15 min)

Tested with Galaxy Note 4 v6, Nexus 6P v7.1

@jesmrec
Copy link
Collaborator

jesmrec commented Nov 29, 2017

@davigonz: If i take some pics, and i disable the feature before these pics are uploaded, which is the expected behaviour?

@davigonz
Copy link
Contributor Author

If i take some pics, and i disable the feature before these pics are uploaded, which is the expected behaviour?

@jesmrec The periodic job is automatically cancelled and the app won't upload those pics. See: https://github.com/owncloud/android/pull/2062/files#diff-257db3cd78d8a1eab3328301bfcaaab1R86

@davigonz davigonz force-pushed the drop_instant_uploads branch from 5e6db90 to 98e3539 Compare November 29, 2017 10:02
@jesmrec
Copy link
Collaborator

jesmrec commented Nov 29, 2017 •
edited by davigonz
Loading

Bug (3) [FIXED, NEW EXPECTED BEHAVIOUR]

Steps:

  1. Enable instant uploads for pics or videos
  2. Take same pics
  3. Before the pics are uploaded, disable instant upload by accepting the confirmation dialog.

Current

Pics are never uploaded

Expected:

Pics are uploaded Pics are never uploaded, user is warned about it.

Tested with Galaxy Note 4 v6, Nexus 6P v7.1

@jesmrec
Copy link
Collaborator

jesmrec commented Nov 29, 2017 •
edited
Loading

Bug (4) [FIXED] new expected behaviour

Steps:

  1. Enable instant uploads
  2. Take some pics
  3. Before the pics are uploaded, disable instant uploads
  4. Take more pics
  5. After some time (more than 15 minutes), enable camera uploads

Current

All pics are uploaded (steps 2. and 4.)

Expected:

Only pics at 2. should be uploaded Neither pics at 2 nor 4 should be uploaded

Tested with Galaxy Note 4 v6, Nexus 6P v7.1

@davigonz davigonz force-pushed the drop_instant_uploads branch 2 times, most recently from 9dada53 to 04ea076 Compare December 6, 2017 14:56
@davigonz
Copy link
Contributor Author

davigonz commented Dec 7, 2017 •
edited by jesmrec
Loading

Bug (5) [FIXED]

Steps:

  1. Go to app settings.
  2. Enable camera uploads.
  3. Select a specific folder.
  4. Delete that folder.
  5. Go back to file list.

Current:

App crashes when camera uploads synchronization starts.

Expected:

App doesn't crash and camera uploads synchronization is properly performed.

Tested with Nexus 5X v8.0.0

@jesmrec
Copy link
Collaborator

jesmrec commented Dec 12, 2017 •
edited
Loading

Bugs (1), (2), (3) and (5), fixed

(3) and (4) are still reproducible (Nexus 9 Android 7, Nexus 5 Android 6)

@davigonz

@davigonz davigonz force-pushed the drop_instant_uploads branch from 104ca15 to a28afd6 Compare December 13, 2017 07:55
@jesmrec
Copy link
Collaborator

jesmrec commented Dec 13, 2017 •
edited
Loading

Bug (6) [FIXED with new behaviour]

Steps:

  1. Enable instant uploads
  2. Take some pics
  3. Before the pics are uploaded, disable instant uploads and take more pics
    (after a bit of time, pics in step 1. are uploaded correctly and 3. are ignored)
  4. After that, take more pics
  5. After some time (more than 15 minutes), enable camera uploads

Current

Pics of 4. are uploaded

Expected:

Pics of 4. are not uploaded

Tested with Samsung Galaxy S7 v7

davigonz and others added 22 commits January 12, 2018 09:23
@davigonz
Fix crash in Android 8 when the ownCloud app is in background and tri…
5171c7a 
…es to retry an upload
@davigonz
Rebasing library with master
9982b1e
@davigonz
Retry with cellular network connection when Upload pictures via wifi …
17ece70 
…only option is disabled
@davigonz
Including new versions and changelog for 2.5.1 beta v1 version
61ab6e3
@davigonz
Include final interval for repeating camera uploads sync job
d5a9b2a
@davigonz
Update beta version name in changelog
0158e7b
@davigonz
Add touchImageView source code
3b4fd14
@davigonz
Deleting unneeded files (library example)
4f36cf0
@davigonz
Delete unneeded icon dependencies
52a8a6c
@davigonz
Improve wording
8ff5bbb
@davigonz
Fix Pics with no loading files view bug
789b99c
@davigonz
Refactor code
815528e
@davigonz
Fixing bug 3 [WIP]
cb82eb4
@davigonz
Fix crash when local camera folder doesn't exist
f778d7b
@davigonz
Pics never uploaded
b0cfcf2
@davigonz
Fix bug pics with feature disabled are uploaded
6620584
@davigonz
Update camera uploads period
32643e2
@davigonz
Fix bug Pics are uploaded after disabling option and executing job
05f4c0d
@davigonz
Using different jobs to upload pictures or videos + refactoring
b2eb7b5
@davigonz
Do not upload pictures/videos after camera uploads disabling + confir…
0efb955 
…mation dialog
@davigonz
Resolving conflicts
f658845
@davigonz
Resert timestamps when disabling the feature + code refactoring
ffad6cc
@davigonz davigonz force-pushed the drop_instant_uploads branch from 8ff4438 to ffad6cc Compare January 12, 2018 08:25
@davigonz
Copy link
Contributor Author

@jesmrec it is possible to move forward this so that we can start pushing the 2.6.0 release?

@jesmrec
Copy link
Collaborator

jesmrec commented Jan 12, 2018

@davigonz final checks are being performed right now. Very soon i expect to approve this to be included in 2.6.0

@jesmrec
Copy link
Collaborator

jesmrec commented Jan 12, 2018

Approved.

@davigonz davigonz merged commit 69b2b4a into master Jan 12, 2018
@davigonz davigonz deleted the drop_instant_uploads branch January 12, 2018 11:00
@jesmrec jesmrec changed the title Drop instant uploads in favour of camera uploads [WIP] Drop instant uploads in favour of camera uploads Feb 13, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jesmrec jesmrec jesmrec approved these changes

Assignees

@davigonz davigonz

Labels
Approved by qa
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@davigonz @jcmontesmartos @jesmrec @michaelstingl @nasli