-
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
#7815 Delayed synchronization #11278
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.
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
base: master
Are you sure you want to change the base?
#7815 Delayed synchronization #11278
Conversation
# CHANGELOG.md # app/schemas/com.nextcloud.client.database.NextcloudDatabase/66.json # app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java # app/src/main/java/com/owncloud/android/ui/preview/PreviewVideoActivity.kt # app/src/main/res/values-b+en+001/strings.xml # app/src/main/res/values-bg-rBG/strings.xml # app/src/main/res/values-cs-rCZ/strings.xml # app/src/main/res/values-da/strings.xml # app/src/main/res/values-de/strings.xml # app/src/main/res/values-es/strings.xml # app/src/main/res/values-fr/strings.xml # app/src/main/res/values-hu-rHU/strings.xml # app/src/main/res/values-pl/strings.xml # app/src/main/res/values-tr/strings.xml # app/src/main/res/values-zh-rCN/strings.xml # app/src/main/res/values-zh-rHK/strings.xml # app/src/main/res/values-zh-rTW/strings.xml # app/src/main/res/values/strings.xml Signed-off-by: batpio <prbator@gmail.com>
Signed-off-by: batpio <prbator@gmail.com>
Signed-off-by: batpio <prbator@gmail.com>
Signed-off-by: batpio <prbator@gmail.com>
Signed-off-by: batpio <prbator@gmail.com>
Signed-off-by: batpio <prbator@gmail.com>
Signed-off-by: batpio <prbator@gmail.com>
Signed-off-by: batpio <prbator@gmail.com>
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## master #11278 +/- ##
============================================
+ Coverage 31.44% 31.52% +0.07%
- Complexity 3413 3427 +14
============================================
Files 575 577 +2
Lines 42018 42146 +128
Branches 5660 5664 +4
============================================
+ Hits 13214 13286 +72
- Misses 26861 26905 +44
- Partials 1943 1955 +12
|
Signed-off-by: batpio <prbator@gmail.com>
Signed-off-by: batpio <prbator@gmail.com>
Signed-off-by: batpio <prbator@gmail.com>
AlvaroBrey
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I haven't tested this yet, especially to see how this will behave with existing autoupload folders. This can't be tested without adressing my first comment below, however.
Having said that, this looks quite promising! Thanks for contributing @BatPio
app/src/androidTest/java/com/owncloud/android/ui/dialog/DurationPickerDialogFragmentIT.kt
Outdated
Show resolved
Hide resolved
app/src/androidTest/java/com/owncloud/android/utils/TimeUtilsTest.kt
Outdated
Show resolved
Hide resolved
jancborchardt
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good from the design side now. :)
|
I've reworked the UI as suggested by @jancborchardt . Could you please review the changes? |
…ified-master-v2 # Conflicts: # app/schemas/com.nextcloud.client.database.NextcloudDatabase/88.json # app/src/main/java/com/nextcloud/client/database/NextcloudDatabase.kt
Signed-off-by: batpio <prbator@gmail.com>
|
@tobiasKaminsky @alperozturk96 @ZetaTom could you give this a review? :) |
|
Will review tomorrow |
…ified-master-v2 # Conflicts: # app/schemas/com.nextcloud.client.database.NextcloudDatabase/89.json
Signed-off-by: batpio <prbator@gmail.com>
Signed-off-by: batpio <prbator@gmail.com>
# Conflicts: # app/schemas/com.nextcloud.client.database.NextcloudDatabase/90.json # app/src/main/java/com/nextcloud/client/database/NextcloudDatabase.kt
Signed-off-by: batpio <prbator@gmail.com>
# Conflicts: # app/src/main/java/com/owncloud/android/ui/dialog/SyncedFolderPreferencesDialogFragment.kt
…ation-fixes # Conflicts: # app/src/androidTest/java/com/nextcloud/client/SyncedFoldersActivityIT.java # app/src/main/java/com/owncloud/android/datamodel/FilesystemDataProvider.java
Signed-off-by: batpio <prbator@gmail.com>
Signed-off-by: batpio <prbator@gmail.com>
| // -> Rest of this file check takes not even 1 ms. | ||
| filesystemDataProvider.storeOrUpdateFileValue(contentPath, | ||
| cursor.getLong(column_index_date_modified), isFolder, | ||
| cursor.getLong(column_index_date_modified) * 1000, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In all other places storeOrUpdateFileValue is called with milliseconds, but DATE_MODIFIED stores timestamp in seconds format
https://developer.android.com/reference/android/provider/MediaStore.MediaColumns#DATE_MODIFIED
Signed-off-by: batpio <prbator@gmail.com>
Signed-off-by: batpio <prbator@gmail.com>
Hi, I updated my branch to master and resolved the conflicts with the database version. Could you please do a review? |
…ified-master-v2-utom-2 # Conflicts: # app/schemas/com.nextcloud.client.database.NextcloudDatabase/91.json # app/src/main/java/com/nextcloud/client/database/NextcloudDatabase.kt # app/src/main/java/com/nextcloud/client/jobs/FilesSyncWork.kt # app/src/main/java/com/owncloud/android/datamodel/FilesystemDataProvider.java # app/src/main/java/com/owncloud/android/db/ProviderMeta.java
…ation-simplified-master-v2-utom-2 # Conflicts: # app/src/main/java/com/nextcloud/client/database/NextcloudDatabase.kt # app/src/main/java/com/owncloud/android/db/ProviderMeta.java # app/src/main/java/com/owncloud/android/utils/FilesSyncHelper.java
Signed-off-by: batpio <prbator@gmail.com>
Signed-off-by: batpio <prbator@gmail.com>
Fixes #7815
Fixes #2323
Some tests are written. I'm waiting for suggestions on what else can be tested.
Delay configuration: