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

[New arch] Synchronization #2934

Merged
merged 636 commits into from
Dec 12, 2022
Merged

[New arch] Synchronization #2934

merged 636 commits into from
Dec 12, 2022

Conversation

abelgardep
Copy link
Contributor

@abelgardep abelgardep commented Aug 12, 2020 •
edited
Loading

Implements synchronization epic: #2818
Library: owncloud/android-library#339

Already merged:

@abelgardep abelgardep added this to the Synchronization milestone milestone Aug 12, 2020
@abelgardep abelgardep self-assigned this Aug 12, 2020
@abelgardep abelgardep mentioned this pull request Aug 12, 2020
Merged
@abelgardep abelgardep force-pushed the new_arch/synchronization branch from 5a5ebc7 to 095eb22 Compare September 11, 2020 06:46
@abelgardep abelgardep force-pushed the new_arch/synchronization branch from 1d830e7 to 55f021b Compare October 6, 2020 10:02
@abelgardep
Copy link
Contributor Author

Rebased with 2.15.3

@abelgardep abelgardep force-pushed the new_arch/synchronization branch from 30d147e to 5e38619 Compare November 10, 2020 16:54
@abelgardep
Copy link
Contributor Author

Rebased with master: 78b0219

@abelgardep abelgardep force-pushed the new_arch/synchronization branch from 5e38619 to f05a9f7 Compare March 11, 2021 16:54
@abelgardep
Copy link
Contributor Author

Rebased with master: 88e8289

@abelgardep abelgardep force-pushed the new_arch/synchronization branch 2 times, most recently from 4b4e969 to a30fea4 Compare April 30, 2021 12:16
@abelgardep abelgardep force-pushed the new_arch/synchronization branch from 60904f9 to 88faed5 Compare May 11, 2021 07:37
@abelgardep abelgardep force-pushed the new_arch/synchronization branch 2 times, most recently from 26b999f to 7cd9e1e Compare May 27, 2021 07:09
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@abelgardep abelgardep force-pushed the new_arch/synchronization branch 2 times, most recently from 705d12e to 71c569a Compare August 23, 2021 12:57
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@abelgardep abelgardep mentioned this pull request Sep 13, 2021
Closed
@abelgardep abelgardep force-pushed the new_arch/synchronization branch from edbe4a7 to 4ce4228 Compare November 17, 2021 18:25
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@abelgardep abelgardep force-pushed the new_arch/synchronization branch from 1c9e003 to 5908532 Compare May 9, 2022 12:00
@abelgardep
Copy link
Contributor Author

Rebased with 2.20 29ebcb0

@abelgardep abelgardep force-pushed the new_arch/synchronization branch from 7de7120 to 5102103 Compare June 9, 2022 12:06
@abelgardep
Copy link
Contributor Author

Rebased with 2.21 f02860c

@abelgardep abelgardep mentioned this pull request Jun 13, 2022
Closed
75 tasks
@abelgardep abelgardep force-pushed the new_arch/synchronization branch from b401004 to f2d9a48 Compare July 8, 2022 09:32
@abelgardep abelgardep mentioned this pull request Jul 8, 2022
Closed
9 tasks
JuancaG05 and others added 24 commits December 9, 2022 14:01
@JuancaG05 @abelgardep
Retrieve files as OCFileWithSyncInfo and show sync badge
c1f4a30
@JuancaG05 @abelgardep
Propagate sync status to parent folders
7b31438
@JuancaG05 @abelgardep
Update toolbar according to the sync status of files and folders
9fb323f
@JuancaG05 @abelgardep
Removed unused methods
180589d
@JuancaG05 @abelgardep
Fixed unit tests
e26dfe2
@JuancaG05 @abelgardep
Fixed upload path for uploads from document provider
d7323bb
@JuancaG05 @abelgardep
CR changes requested
6a3411b
@JuancaG05 @abelgardep
Cancel transfers recursively moved to ViewModel
001eceb
@JuancaG05 @abelgardep
Fix open with and send behaviour when they overlap
e82460f
@JuancaG05 @abelgardep
Fix KtLint reports
9ca01f9
@JuancaG05 @abelgardep
New usecases to cancel transfers in a bulky and more efficient way
0b435fd
@JuancaG05 @abelgardep
Text and audio files always show updated preview
2f1efe6
@JuancaG05 @abelgardep
Simplified management of file waiting to preview
a9dd26c
@JuancaG05 @abelgardep
Moved hard-coded strings to strings.xml
9be159b
@JuancaG05 @abelgardep
If previewable file sync fails, apart from showing the preview, an er…
4b44cf6 
…ror will be shown
@JuancaG05 @abelgardep
Kotlinizing some expressions
9700a22
@JuancaG05 @abelgardep
Added necessary usecase to dependency injection
956f550
@abelgardep
Move the folder refresh and sync operations to the viewmodel that han…
b97a55a 
…dles all the file operations
@abelgardep
Fix ktlint
592d180
@abelgardep
Support migration from beta2 to release 3.0
f460928
@abelgardep
Use a viewmodel to retry failed uploads
c068bfe
@JuancaG05 @abelgardep
Fix for conflicts resolving and conflicts propagation
b3dc19f
@JuancaG05 @abelgardep
Fix database migration to DB version 38
f2cd905
@JuancaG05 @abelgardep
Update versionName and versionCode
f2556f5
@abelgardep abelgardep force-pushed the new_arch/synchronization branch from e568783 to f2556f5 Compare December 9, 2022 13:01
@abelgardep abelgardep marked this pull request as ready for review December 12, 2022 08:52
@abelgardep abelgardep requested a review from JuancaG05 December 12, 2022 08:53
JuancaG05
JuancaG05 approved these changes Dec 12, 2022
View reviewed changes
Copy link
Collaborator

@JuancaG05 JuancaG05 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LET'S GOOOOOOO 🚀

@abelgardep abelgardep merged commit e99f7b6 into master Dec 12, 2022
@abelgardep abelgardep deleted the new_arch/synchronization branch March 21, 2023 16:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michaelstingl michaelstingl michaelstingl left review comments

@hannesa2 hannesa2 hannesa2 left review comments

@JuancaG05 JuancaG05 JuancaG05 approved these changes

Assignees

@abelgardep abelgardep

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[New arch] Synchronization
5 participants
@abelgardep @michaelstingl @hannesa2 @JuancaG05 @jesmrec