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

Replaced 'download folder' with 'synchronize', triggering the synchronization in two-ways of all the files in a folder #1109

Merged
merged 27 commits into from
Oct 30, 2015
Merged

Replaced 'download folder' with 'synchronize', triggering the synchronization in two-ways of all the files in a folder #1109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
ac68569
Extend SyncFolderOperation to check local changes of all files and tr…
davivel Jul 13, 2015
0162d2f
Keep the old operation to sync folder as DownloadFolderOperation to a…
davivel Jul 13, 2015
e885c78
Added icon for files synchronizing; folders use it whenever downloadi…
davivel Jul 14, 2015
68b52dd
Rewritten queue of FileUploader based on IndexedForest
davivel Jul 16, 2015
9b5506f
Join cancelation of downloads and uploads in 'cancel sync', both for …
davivel Jul 17, 2015
c0c52fa
Fixed NullPointerExceptionS in upload cancelations
davivel Jul 21, 2015
5f41bb1
ETag used to detect changes in remote files (not only in folders)
davivel Jul 28, 2015
e6c1454
Persist conflicts in local database and show with an icon in the list…
davivel Aug 20, 2015
a2aa047
Added conflict icon to folders containing files with conflicts
davivel Aug 21, 2015
7399508
Removed conflict badge when conflict is solved
davivel Aug 21, 2015
95bebe9
Remove conflict badge from ancestors when conflict is solved there ar…
davivel Aug 21, 2015
b8a3dc7
Safe blanket to clean DB if wrong conflicts keep stored
davivel Aug 21, 2015
1e59a63
Fixed permanent 'uploading' icon on files that are automatically rena…
davivel Aug 21, 2015
499d628
Removed separated 'download folder' in contextual menu and unused Dow…
davivel Aug 24, 2015
44023a6
Clean-up: removed unused imports and methods, and commented code
davivel Aug 24, 2015
7d7767a
Removed some logs
davivel Aug 24, 2015
056b7c9
Updated error message for failed folder synchronization ('download' n…
davivel Aug 28, 2015
fb482fa
Updated reference to library after rebase
davivel Sep 25, 2015
001801a
Upload operations end in conflict if overriding a version different t…
davivel Sep 28, 2015
9494620
Merge branch 'master' into sync_full_folder
Sep 30, 2015
08d0205
Use SYNC_CONFLICT instead CONFLICT for conflicts in UploadFileOperation
Sep 30, 2015
8f67624
Fix: Long press menu shows two extra options: old cancel download and…
Oct 1, 2015
b9ef747
Merge branch 'master' into sync_full_folder
Oct 27, 2015
bcfa07f
Fix Select Local Version or Keep Both behaviour when solving file cof…
Oct 27, 2015
3444d61
Detect conflict when local and server version are changed
Oct 29, 2015
09a3493
Merge pull request #1219 from owncloud/sync_full_folder__fix_conflict…
davivel Oct 30, 2015
9b95d53
Update library reference, sync_full_folder
Oct 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion owncloud-android-library
Open in desktop
Submodule owncloud-android-library updated 7 files
+1 −1 src/com/owncloud/android/lib/common/network/WebdavEntry.java
+45 −0 src/com/owncloud/android/lib/common/network/WebdavUtils.java
+7 −2 src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
+1 −2 src/com/owncloud/android/lib/common/utils/Log_OC.java
+25 −7 src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
+17 −1 src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
+29 −21 src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java
Binary file added res/drawable/conflict_file_indicator.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable/synchronizing_file_indicator.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 2 additions & 7 deletions res/menu/file_actions_menu.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,8 @@
android:icon="@drawable/ic_action_refresh"
android:orderInCategory="1" />
<item
android:id="@+id/action_cancel_download"
android:title="@string/common_cancel_download"
android:icon="@android:drawable/ic_menu_close_clear_cancel"
android:orderInCategory="1" />
<item
android:id="@+id/action_cancel_upload"
android:title="@string/common_cancel_upload"
android:id="@+id/action_cancel_sync"
android:title="@string/common_cancel_sync"
android:icon="@android:drawable/ic_menu_close_clear_cancel"
android:orderInCategory="1" />
<item
Expand Down
7 changes: 3 additions & 4 deletions res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,16 +82,15 @@
<string name="filedetails_created">Created:</string>
<string name="filedetails_modified">Modified:</string>
<string name="filedetails_download">Download</string>
<string name="filedetails_sync_file">Refresh file</string>
<string name="filedetails_sync_file">Synchronize</string>
<string name="filedetails_renamed_in_upload_msg">File was renamed to %1$s during upload</string>
<string name="list_layout">List Layout</string>
<string name="action_share_file">Share link</string>
<string name="action_unshare_file">Unshare link</string>
<string name="common_yes">Yes</string>
<string name="common_no">No</string>
<string name="common_ok">OK</string>
<string name="common_cancel_download">Cancel download</string>
<string name="common_cancel_upload">Cancel upload</string>
<string name="common_cancel_sync">Cancel synchronization</string>
<string name="common_cancel">Cancel</string>
<string name="common_save_exit">Save &amp; Exit</string>
<string name="common_error">Error</string>
Expand Down Expand Up @@ -343,7 +342,7 @@
<string name="prefs_category_security">Security</string>

<string name="prefs_instant_video_upload_path_title">Upload Video Path</string>
<string name="download_folder_failed_content">Download of %1$s folder could not be completed</string>
<string name="sync_folder_failed_content">Synchronization of %1$s folder could not be completed</string>

<string name="shared_subject_header">shared</string>
<string name="with_you_subject_header">with you</string>
Expand Down
Loading