David A. Velasco
|
2b5785556e
|
Merge branch 'master' into oauth_login
Conflicts:
AndroidManifest.xml
res/values-de-rDE/strings.xml
res/values-de/strings.xml
res/values/strings.xml
src/com/owncloud/android/Uploader.java
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/files/OwnCloudFileObserver.java
src/com/owncloud/android/files/services/FileDownloader.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/RemoteOperationResult.java
src/com/owncloud/android/syncadapter/FileSyncAdapter.java
src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/UploadFilesActivity.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
|
2013-01-17 14:25:49 +01:00 |
|
David A. Velasco
|
f91d3ce792
|
Fixed null pointer in FileObserverService initialization
|
2013-01-14 12:38:46 +01:00 |
|
David A. Velasco
|
35b25f04eb
|
Fixed crash in test of files downloading / uploading
|
2013-01-09 10:11:21 +01:00 |
|
David A. Velasco
|
11b88e0fcc
|
Added support to OAuth2 'authorization code' grat type: get & save access token, use it to access ownCloud
|
2012-12-19 14:12:53 +01:00 |
|
David A. Velasco
|
c38a3b2ef1
|
Merge master into oauth_login
|
2012-12-18 11:20:03 +01:00 |
|
David A. Velasco
|
abd5f51554
|
Fixed check of modifications applied in server (still based on modification date)
|
2012-12-05 16:14:01 +01:00 |
|
David A. Velasco
|
80448dc192
|
Fixed NULL pointers and wrong handling of dialogs
|
2012-12-05 12:22:26 +01:00 |
|
David A. Velasco
|
a7535406d4
|
Customized error message for uploads when the local file cannot by copied to the ownCloud local directory
|
2012-11-30 14:39:31 +01:00 |
|
David A. Velasco
|
a1c538db20
|
Some cleanup
|
2012-11-27 15:15:17 +01:00 |
|
David A. Velasco
|
fd9086a883
|
New policy: uploaded files are copied to the local storage ownCloud directory bu default
|
2012-11-27 14:28:19 +01:00 |
|
David A. Velasco
|
4c50eb4d2d
|
Merge of master after sync_review was merged into it
|
2012-11-23 10:25:06 +01:00 |
|
David A. Velasco
|
3f2081e607
|
Ensure that FileDownloader and FileUploader events are not lost
|
2012-11-22 16:40:00 +01:00 |
|
David A. Velasco
|
658267ad79
|
Disable rename and remove actions on folders when some file is uploading or downloading inside
|
2012-11-22 13:06:54 +01:00 |
|
David A. Velasco
|
f03852032f
|
Fixed old bug reintroduced in instant uploads
|
2012-11-21 16:19:27 +01:00 |
|
David A. Velasco
|
db0e2d0186
|
Reviewed values set to OCFile#mLastSyncDateForData
|
2012-11-21 08:54:15 +01:00 |
|
David A. Velasco
|
9c3dc6d850
|
Fixed crash in initialization of FileObserverService
|
2012-11-20 14:48:44 +01:00 |
|
David A. Velasco
|
38a80be828
|
Fixed lock of buttons in details view when the 'Keep both' option in conflicts dialog is used
|
2012-11-20 14:41:04 +01:00 |
|
David A. Velasco
|
195b009212
|
Fixed 'keep both' action in conflicts dialog (both resulting file were linked to the same local file in the device)
|
2012-11-20 14:12:32 +01:00 |
|
David A. Velasco
|
3fd56ecff8
|
Fixed bug: inconsistency in isDown() state due to old OCFile object being saved in the OwnCloudFileObserver instances
|
2012-11-20 11:28:27 +01:00 |
|
David A. Velasco
|
22a789e8d2
|
Fixed some bugs in the update of OCFile#mLastSyncDateForProperties at account synchronization time ; and some refactoring
|
2012-11-19 15:08:48 +01:00 |
|
David A. Velasco
|
c301865c35
|
Synchronize kept-in-sync files during account synchronization, in both directions and considering conflicts
|
2012-11-16 16:23:45 +01:00 |
|
David A. Velasco
|
97dd59063b
|
Fixed bug: when a file is checked as 'keep in sync' and the immediate synchronization results in an upload, when this finish the 'kepp in sync' check was being forgotten; not more
|
2012-11-15 19:29:30 +01:00 |
|
David A. Velasco
|
ff2271a8c5
|
Download button in file details view upgraded to sync file content in both directions
|
2012-11-15 17:18:04 +01:00 |
|
David A. Velasco
|
bd38627e14
|
Fixed lack of observance for files that are set as favourites when never were download before
|
2012-11-14 15:00:53 +01:00 |
|
David A. Velasco
|
b12ca42b45
|
Studying lack of upload when a file that was not previously down is set as favourite, then immediately opened and modified [WIP]
|
2012-11-13 16:01:13 +01:00 |
|
David A. Velasco
|
925a0554e5
|
Granted update of modificationTimestamp with the end of downloads and uploads
|
2012-11-13 15:59:05 +01:00 |
|
David A. Velasco
|
aef73a5263
|
Context handling made consistent
|
2012-11-13 11:38:00 +01:00 |
|
David A. Velasco
|
4460e43145
|
Grant that a favourite file in the device is watched if a redownload fails
|
2012-11-13 10:39:37 +01:00 |
|
David A. Velasco
|
e7b5284983
|
Remove observed file when requested although the list of observed had to be reinitialized
|
2012-11-13 10:26:35 +01:00 |
|
David A. Velasco
|
9aab2d26da
|
Fixed local path NULL when making favourite a file not down ; fixed change of local path for uploaded file when redownloading
|
2012-11-12 15:20:00 +01:00 |
|
David A. Velasco
|
85e9a40dbe
|
Fixed update of right fragment when actions in the context menu of the left fragment are completed, in large-landscape devices
|
2012-11-08 17:21:45 +01:00 |
|
Bartek Przybylski
|
92080afefc
|
add licence header to files
|
2012-10-28 00:12:15 +02:00 |
|
Bartek Przybylski
|
0f1065e53a
|
upload file only on write close
|
2012-10-27 21:55:24 +02:00 |
|
Bartek Przybylski
|
6c32365704
|
Solving modified date and length conflicts
|
2012-10-27 12:20:52 +02:00 |
|
Bartek Przybylski
|
de94751cde
|
Two way synchronization for files
|
2012-10-22 21:15:26 +02:00 |
|
David A. Velasco
|
9faab34fbd
|
Fixed notifications bug: when several notifications (download and upload, for instance) lived at the same time, clicking any of them resulted in the action expected for the last one; no more
|
2012-10-19 13:08:58 +02:00 |
|
David A. Velasco
|
cf27417e54
|
Fixed crash got when instant upload is tried to an account where the InstantUpload/ folder is not already created
|
2012-10-15 15:22:07 +02:00 |
|
David A. Velasco
|
27112bd200
|
Cancellation in uploads and access to details view pressing the status notification
|
2012-10-11 16:40:56 +02:00 |
|
David A. Velasco
|
b0ab3ce087
|
Merge remote-tracking branch 'origin/master' into cancel_in_upload
Conflicts:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
|
2012-10-11 11:40:15 +02:00 |
|
David A. Velasco
|
5fc7cd13e7
|
Adding cancellation to uploads (WIP)
|
2012-10-11 11:24:17 +02:00 |
|
Bartek Przybylski
|
4e1aafdafc
|
fixup! instant upload via wifi only - fixes
|
2012-10-10 22:08:13 +02:00 |
|
David A. Velasco
|
7382fa84b0
|
Fixed update of double pane view when download in notification bar is pressed in landspace mode
|
2012-10-10 16:18:11 +02:00 |
|
David A. Velasco
|
25f307c98a
|
Show the details of a file when the status notification of a download in progress is clicked
|
2012-10-10 13:13:22 +02:00 |
|
David A. Velasco
|
b246cf7075
|
Improved cancellation of downloads: fast abort of operation and fixed thread synchronization
|
2012-10-10 11:30:47 +02:00 |
|
Bartek Przybylski
|
b6eb63a472
|
chaning photo taken name for more descriptive
|
2012-10-09 23:26:53 +02:00 |
|
Bartek Przybylski
|
5bb706e8ac
|
instant upload via wifi only - fixes
|
2012-10-09 22:53:41 +02:00 |
|
David A. Velasco
|
38512099c4
|
Merge remote-tracking branch 'origin/master'
|
2012-10-09 14:54:14 +02:00 |
|
David A. Velasco
|
68ce2e7a38
|
Download service refactoring: multiple downloads and cancellation support
|
2012-10-09 14:53:25 +02:00 |
|
Bartek Przybylski
|
671cb91cef
|
add upload via wifi only option
|
2012-10-08 21:26:18 +02:00 |
|
Bartek Przybylski
|
aa14479e5b
|
removing some obvious warnings as first step to -Werror
|
2012-09-29 23:17:39 +02:00 |
|