jabarros
732ab432a4
Merge pull request #812 from owncloud/download_folder__update_contextual_menu_asap
...
Allow cancelling download of folders as soon as the SynchronizeFolderOpe...
2014-12-17 09:47:18 +01:00
David A. Velasco
1d0f705509
Allow cancelling download of folders as soon as the SynchronizeFolderOperation is in the OperationsService
2014-12-17 09:32:13 +01:00
jabarros
98929a9c8f
Merge branch 'download_folder' into download_folder_cancel_downloads
2014-12-16 15:04:39 +01:00
jabarros
f22693cd4e
Added cancelation for each synchronizeFolderOperation when canceling download folder
2014-12-16 14:28:36 +01:00
jabarros
0c8d508a61
Run folder download cancelation in new thread
2014-12-16 14:15:46 +01:00
jabarros
cec7baba5b
'Cancel folder download' cancels downloads of files already in the FileDownloadService
2014-12-16 14:02:23 +01:00
David A. Velasco
727a941b3c
Show the download-in-progress icon in the folder as soon as the SynchronizeFolderOperation is created
2014-12-16 10:42:55 +01:00
jabarros
5a4b0731f0
Merge pull request #806 from owncloud/download_folder__clean_SynchronizeFolderOperation
...
Clean SynchronizeFolderOperation
2014-12-15 15:01:55 +01:00
David A. Velasco
e650fd2c6f
Avoid unneeded parameter
2014-12-15 14:46:52 +01:00
David A. Velasco
46b5e21ef5
Merge pull request #801 from owncloud/community_image-preview-save-position
...
Restore the current image when the preview activity is hidden
2014-12-15 10:22:10 +01:00
David A. Velasco
407a31b3ca
Merge pull request #805 from owncloud/download_folder_cancel_menu_option
...
Show 'cancel download' option in folder actions menu when folder is bein...
2014-12-15 09:57:27 +01:00
David A. Velasco
e409b5afb6
Fixed a couple of null pointers
2014-12-12 13:30:55 +01:00
David A. Velasco
399251bc5a
Optimize operation flow
2014-12-12 13:06:12 +01:00
David A. Velasco
ddac353a0a
Delay load of cached information about folder (mLocalFolder) until the operation is really run
2014-12-12 12:57:53 +01:00
jabarros
bbf85d96de
Show 'cancel download' option in folder actions menu when folder is being downloaded
2014-12-12 12:02:01 +01:00
jabarros
0be6894ec3
Changes after CR
2014-12-12 10:40:13 +01:00
jabarros
4e2f886b44
Merge pull request #766 from owncloud/feedbackWithVersionNumber
...
Email from feedback contains version number
2014-12-12 10:05:49 +01:00
jabarros
a6a010440d
Added some fixes in OperationsService
2014-12-12 09:16:32 +01:00
jabarros
407f64f5e0
Update OperationsService to receive requests for cancelling downloads (WIP)
2014-12-11 18:44:29 +01:00
jabarros
f6f1c7e629
Add call to OperationService for canceling transference of downloading a folder
2014-12-11 18:18:23 +01:00
jabarros
8fc865ea76
Merge branch 'develop' into community_image-preview-save-position
2014-12-11 10:23:03 +01:00
David A. Velasco
1f796350b0
Merge pull request #781 from owncloud/fix_logs_change_orientation
...
User chooser for sending mail in LogHistory (with crash fixed if device is rotated in the e-mail app)
2014-12-11 10:21:41 +01:00
jabarros
92e8194f18
Merge branch 'develop' into community_rotateImage
2014-12-11 08:51:31 +01:00
Luke Owncloud
1077a6de29
on downgrading upload db, delete and re-create
2014-12-11 08:32:38 +01:00
David A. Velasco
eab9d689c5
Fixed compilation error
2014-12-10 18:52:57 +01:00
David A. Velasco
11f6daf403
Fixed access to storage manager in SynchronizeFolderOperation
2014-12-10 18:31:26 +01:00
David A. Velasco
b309cafc15
Refactored OperationsService to hold two separated Handlers in two separated worker threads, one for SyncFolder, one for the rest
2014-12-10 18:30:05 +01:00
David A. Velasco
56eaed4529
Added construction of SynchronizeFolderOperation to OperationService
2014-12-10 18:28:43 +01:00
jabarros
d564ef443c
Resolve recursion on new SyncFolderOperation creating new instances of SynFolderOperation and running them
2014-12-10 16:23:46 +01:00
jabarros
c34646aed3
Merge branch 'fix_protocol_send_mail' into fix_logs_change_orientation
2014-12-10 14:13:32 +01:00
David A. Velasco
154188c38f
Hurry up release of source bitmap in rotations
2014-12-10 12:48:31 +01:00
David A. Velasco
77554b2b51
Cancel load task when fragment becomes invisible (fixes crash in rotations)
2014-12-10 12:46:34 +01:00
jabarros
f533fa8205
Merge pull request #794 from owncloud/download_folder__add_download_to_operationService
...
Updated OperationService to attend requests for FileSyncFolderOperations...
2014-12-10 11:03:43 +01:00
jabarros
114b07fe2c
Changes after CR
2014-12-10 10:06:10 +01:00
David A. Velasco
b0278c232e
Updated OperationService to attend requests for FileSyncFolderOperations without a Binder in the caller Context
2014-12-10 09:39:52 +01:00
jabarros
0df8f178de
Merge pull request #754 from owncloud/RadioListOnAccounts
...
Account list is now a radiobutton list
2014-12-10 08:45:12 +01:00
Keith Abdulla
1704c4f788
move subject message strings into strings.xml
2014-12-09 17:51:10 -08:00
jabarros
6ccf48b337
Request the download of all the files in a folder (non recursively)
2014-12-09 11:18:57 +01:00
jabarros
ee688193df
Create new SyncFolderOperation
2014-12-09 10:55:17 +01:00
jabarros
1e847c4ac8
Rename SynchronizeFolderOperation to RefreshFolderOperation and update references
2014-12-09 10:54:18 +01:00
David A. Velasco
34433e924d
Merge remote-tracking branch 'rhabbachi/feature/308_sync_folder' into download_folder
2014-12-09 10:39:14 +01:00
Keith Abdulla
4957791128
subject mail populated when user shares file/folder
2014-12-06 02:07:35 -08:00
jabarros
700d444977
Fix. Avoid load logs again when changing device orientation
2014-12-05 14:33:04 +01:00
jabarros
766b51f497
Remove unused imports and split long lines modified
2014-12-05 10:12:57 +01:00
Sam
c8af196f2a
Merge branch 'develop' of https://github.com/owncloud/android into multi2
2014-12-05 10:07:48 +01:00
jabarros
7d0723261a
Fixed. App crashes when previewing an image
2014-12-05 09:33:34 +01:00
David A. Velasco
50e39f044f
Merge branch 'master' into develop
2014-12-03 11:31:49 +01:00
jabarros
d58d6ca4d0
Merge pull request #773 from owncloud/triggerMediaScan
...
Trigger media scan
2014-12-03 10:10:26 +01:00
Sam
382191d1f9
Merged with owncloud develop
2014-12-03 10:04:39 +01:00
David A. Velasco
f139a7204d
Removed empty method, and some unused imports
2014-12-03 09:41:49 +01:00
David A. Velasco
1e9ff8c5fa
Trigger MediaScan for every downloaded file in a renamed or moved folder
2014-12-02 14:23:49 +01:00
David A. Velasco
5167e646ad
Refactoring: removed old FileDataStorageManager#moveFolder method, redirected to newer FileDataStorageManager#moveLocalFile
2014-12-02 13:33:57 +01:00
David A. Velasco
0f39ff841a
Bug fixed (and some refactoring): crash on local removal of a folder
2014-12-02 11:17:47 +01:00
Magnus Sjoqvist
1a6319eba4
Removes build version magic numbers
2014-12-02 11:11:34 +01:00
David A. Velasco
2717c2a219
Refactoring: MediaScan triggered via FileDataStorageManager in RemoveFileDialogFragment
2014-12-02 09:29:26 +01:00
David A. Velasco
87f911c1ed
Refactoring: moved MediaScan trigger from DownloadFileOperation to FileDownloader service via FileDataStorageManager
2014-12-02 09:21:35 +01:00
David A. Velasco
e771c09ad9
Refactoring: move all the intents for MediaScanner in FileDataStorageManager to a single method
2014-12-02 09:16:56 +01:00
David A. Velasco
c95eb327f8
Refactoring: get MediaScan trigger out of OCFile for renaming
2014-12-02 09:08:55 +01:00
jabarros
0a0c808e3b
Merge pull request #662 from tobiasKaminsky/fileCount
...
File count
2014-12-02 08:31:54 +01:00
tobiasKaminsky
eaa3b1ef56
Merge remote-tracking branch 'upstream/develop' into triggerMediaScan
...
-fr/strings.xml
Conflicts:
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/datamodel/OCFile.java
2014-11-29 12:18:02 +01:00
tobiasKaminsky
e8a4780cbc
- test fix for android 4
2014-11-29 12:13:46 +01:00
tobiasKaminsky
9fcba0b801
cleanup
2014-11-29 11:23:16 +01:00
tobiasKaminsky
95967c2151
- trigger mediaScan when files are deleted remote
2014-11-29 11:12:03 +01:00
tobiasKaminsky
cb9927fb00
- trigger works when moving files
2014-11-29 10:37:13 +01:00
tobiasKaminsky
178c94e6e2
Email from feedback contains version number
2014-11-27 08:25:57 +01:00
David A. Velasco
44c0d86ede
Merge pull request #752 from owncloud/instant_uploads_set_path
...
Better UI for settings path of instant uploads
2014-11-26 13:10:04 +01:00
jabarros
849dde6703
Changed var to parcelable in FolderPickerActivity
2014-11-26 13:06:00 +01:00
jabarros
48b3852f7b
Refactor after CR
2014-11-26 12:51:16 +01:00
jabarros
5c0e9ca5f2
Changes after CR
2014-11-26 09:05:23 +01:00
tobiasKaminsky
ddb38db935
"open with" in ContextMenu of downloaded files
2014-11-25 18:01:20 +01:00
tobiasKaminsky
611905a5d0
- Account list is now a radiobutton list
2014-11-25 17:42:41 +01:00
tobiasKaminsky
a710797262
- bugfix
2014-11-25 16:59:21 +01:00
tobiasKaminsky
f98665bc2d
bugfix
2014-11-24 20:15:57 +01:00
tobiasKaminsky
21a505cc33
changed order to: file(s), folder(s)
2014-11-24 10:59:31 +01:00
tobiasKaminsky
d05d7361ff
- thumbnails on browsing local files during upload
2014-11-23 13:34:24 +01:00
tobiasKaminsky
df1ab9cfaa
- removed Log
2014-11-21 18:12:48 +01:00
tobiasKaminsky
580c1f008e
fix bug #742
2014-11-21 18:08:44 +01:00
tobiasKaminsky
ae6b686775
Merge remote-tracking branch 'upstream/develop' into fileCount
2014-11-21 17:59:51 +01:00
tobiasKaminsky
e9ba0ebbfa
Merge remote-tracking branch 'upstream/develop' into triggerMediaScan
2014-11-21 17:58:32 +01:00
tobiasKaminsky
5d49850c25
Merge remote-tracking branch 'upstream/develop' into triggerMediaScan
2014-11-21 17:54:47 +01:00
Jorge Antonio Diaz-Benito Soriano
c63f7fbfaf
Merge remote-tracking branch 'upstream/develop' into gradleWithInternalDependency
2014-11-21 15:31:14 +01:00
David A. Velasco
e901b609ba
Merge pull request #740 from owncloud/revert-669-master
...
Revert "Add "select all" option to photo (or other) upload screen"
2014-11-21 12:23:27 +01:00
jabarros
85d5035cbd
Merge pull request #722 from ogasser/idn_share_fix
...
Convert IDN from ASCII to Unicode in Upload Dialog
2014-11-21 10:56:08 +01:00
Luke Owncloud
8de07698d9
integrating @davivels remarks
2014-11-20 13:46:54 +01:00
jabarros
aa16b13ab9
Remove last slash from uploads path (video/image) when showing them on settings view and they are not root folder
2014-11-20 09:39:10 +01:00
jabarros
1435e8c406
Merge branch 'develop' into instant_uploads_set_path
2014-11-19 18:40:06 +01:00
David A. Velasco
a98f14ecc3
Merge pull request #721 from owncloud/nea_upload_files
...
Fix upload of files from DocumentsProvider in Android > 4.4
2014-11-19 11:26:27 +01:00
David A. Velasco
703366c459
Fix failed uploads when display name of file brough from external apps includes separator or path-separator characters
2014-11-19 11:05:32 +01:00
jabarros
a2de2f28ab
Add new preference on settings for setting the upload video path
2014-11-19 10:14:27 +01:00
jabarros
cab3c5298c
Remove 'sort' and 'logs' options from action bar menu when showing the selecting upload path folder view
2014-11-19 09:22:12 +01:00
tobiasKaminsky
f273fe03fa
linewrap
2014-11-19 09:19:04 +01:00
tobiasKaminsky
bdd46fd811
cleanup
2014-11-19 09:11:44 +01:00
tobiasKaminsky
4867bb32c3
Merge remote-tracking branch 'upstream/develop' into imageGrid
...
Conflicts:
owncloud-android-library
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
2014-11-18 18:08:28 +01:00
Marc Plano-Lesay
a9e04965a6
Restore the current image when the preview activity is hidden
...
fixes #728
2014-11-18 15:57:04 +01:00
jabarros
c2ec3f783d
When user goes to set the upload path, the folder list view is shown in the current path set
2014-11-18 15:09:39 +01:00
jabarros
87b242019c
Create custom Preference ui for truncate automatically the upload folder path in the middle when it is too long
2014-11-18 14:57:19 +01:00
jabarros
00a8eb415a
Create FolderPickerActivity from which MoveActivity and UploadPathActivity extend
2014-11-18 14:51:49 +01:00
jabarros
12b4b0397f
Add view for selecting upload path folder browsing through local file list in preferences view
2014-11-18 11:01:55 +01:00
jabarros
387374bed2
Fix errors in Frechn translations and reaname var in FileDisplayActivity
2014-11-18 10:35:52 +01:00
jabarros
6224f73544
Fix crash in Android Lollipop when cliking on refresh the whole account
2014-11-17 14:07:48 +01:00
jabarros
a7c4814e28
Merge branch 'develop' into nea_upload_files
2014-11-17 13:49:17 +01:00
Jorge Antonio Diaz-Benito Soriano
9bfacf23cb
Merge remote-tracking branch 'upstream/develop' into gradleWithInternalDependency
2014-11-17 13:36:26 +01:00
jabarros
297cb6b5c3
Refactoring to avoid maintenance after CR
2014-11-17 11:32:46 +01:00
Oliver Gasser
e398ad0c63
Convert IDN from ASCII to Unicode in Upload Dialog
...
Display IDN host names as Unicode in the FileUpload Dialog. This dialog
is shown when multiple ownCloud accounts are setup and a file is shared
with ownCloud.
Fixes #708 .
2014-11-14 00:55:53 +01:00
tobiasKaminsky
7874dc4a9d
- reference bug 716
2014-11-13 10:10:57 +01:00
jabarros
5d784d98b4
Get file mimeType and pass it for being checked on UploadFileOperation class. Take into account if file extension comes in content Uri
2014-11-12 16:07:37 +01:00
tobiasKaminsky
6e34ccb817
fix Problem with < Android 3.0
2014-11-12 14:51:56 +01:00
jabarros
e4d6f267f7
Create static var for defining 'content://' String into FileDisplayActivity and delete some unnecessary comments
2014-11-12 12:46:33 +01:00
tobiasKaminsky
79cb6106fd
Merge remote-tracking branch 'upstream/develop' into beautifyTimestamps
...
Conflicts:
src/com/owncloud/android/utils/DisplayUtils.java
2014-11-12 09:02:23 +01:00
tobiasKaminsky
2117c024c4
< 60 seconds -> "seconds ago"
2014-11-12 08:56:53 +01:00
jabarros
3cae3d3eb8
Modify kitkat document provider implementation in order to cover all 'content://' cases
2014-11-12 08:46:29 +01:00
Magnus Sjoqvist
437d3315e0
merge
2014-11-11 12:49:22 +01:00
jabarros
903b66595f
Add workaround for Drive app in which a creation of a temporal copy is needed
2014-11-11 12:27:57 +01:00
Sam
c2ee5dbff9
This commit targets https://github.com/owncloud/android/issues/596
...
1. allows multiselect during upload for select applications
2. Added an api check, multiselect is only supported on api level 18+
2014-11-11 09:55:25 +01:00
tobiasKaminsky
39f7ee996a
fix scenario 1
2014-11-08 08:45:09 +01:00
jabarros
da7e13ed5c
Include impelementation of Storage Access Framework when device is KITKAT or over
2014-11-07 14:57:47 +01:00
Pro9
0ba228c064
Added an api check, since multiselect only works on api level 18+
2014-11-07 09:25:31 +01:00
tobiasKaminsky
65c78a44c8
- imageview gets updated when thumbnail generation is finished
2014-11-06 08:36:15 +01:00
tobiasKaminsky
045720d876
- initial image grid
2014-11-06 08:17:35 +01:00
tobiasKaminsky
f331120a14
Merge remote-tracking branch 'upstream/develop' into imageGrid
...
Conflicts:
owncloud-android-library
res/layout/list_item.xml
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
2014-11-05 22:07:11 +01:00
tobiasKaminsky
c105861d0f
Merge remote-tracking branch 'upstream/develop' into rotateImage
...
Conflicts:
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
2014-11-05 21:45:08 +01:00
Sam
e96a16b09b
allows multiselect during upload for select applications
2014-11-05 14:51:59 +01:00
David A. Velasco
80cfc55fda
Merge pull request #706 from owncloud/christmas_app
...
Winter holidays fix
2014-11-05 09:09:48 +01:00
jabarros
eb77fe1da1
Merge pull request #700 from owncloud/remember_last_share_location_fixed
...
Remember last share location
2014-11-05 08:36:16 +01:00
jabarros
2790c2379d
Fixed. App crashes when accesing to an account where you have not accessed after uploading a file in another
2014-11-04 11:15:59 +01:00
David A. Velasco
183cd732d0
Merge pull request #687 from owncloud/thumbnails_from_server
...
Get remote thumbnails from server (OC8)
2014-11-03 13:38:58 +01:00
jabarros
7283f54158
Fixed. App crashes when selecting an account where you have not accessed yet
2014-11-03 13:00:13 +01:00
David A. Velasco
58040881bd
Some clean-up in ThumbnailsCacheManager
2014-11-03 11:30:44 +01:00
David A. Velasco
a09a837585
Adjust the thumbnails size to the size used on screen
2014-11-03 11:27:51 +01:00
jabarros
9f1dd62c90
Update getSeasonalId method on DisplayUtils class for not changing the app icon on branded clients
2014-11-03 10:37:56 +01:00
David A. Velasco
0bedcb9128
Merge branch 'remember_last_share_location' into remember_last_share_location_fixed
2014-10-31 15:23:59 +01:00
David A. Velasco
87aa0fcfb7
Enable 'up' navigation from home button
2014-10-31 15:20:48 +01:00
David A. Velasco
dbd981f012
Fixed crash and remembered location when there are multiple accounts
2014-10-31 15:08:08 +01:00
David A. Velasco
9709593ccf
Crash in Android < 3 fixed: getSupportActionBar() instead of getActionBar()
2014-10-31 15:06:45 +01:00
jabarros
f345e3fed2
Fix. Update the way of setting the needed of update a thumbnail when the image changes on the server
2014-10-31 13:52:26 +01:00
jabarros
639d122721
Fixed. When an image is updated in the server and app folder is refreshed, the thumbnail does not change and it is not updated
2014-10-31 13:30:26 +01:00
tobiasKaminsky
d05770edfa
- moved Sorting to FileStorageUtils
...
- Slideshow obeys now the current sorting order
2014-10-30 18:28:50 +01:00
Luke Owncloud
035fc24a17
allow user to save choice of app for sending log
...
warn user if no app for sending log available
2014-10-30 09:53:24 +01:00
tobiasKaminsky
595a63bc39
Bugfix
2014-10-30 08:20:55 +01:00
grecep
31ffae0093
Revert "Add "select all" option to photo (or other) upload screen"
2014-10-29 22:37:45 +01:00
grecep
fd7a940dee
Merge pull request #669 from grecep/master
...
Add "select all" option to photo (or other) upload screen
2014-10-29 22:29:38 +01:00
jabarros
945c584f34
Merge pull request #686 from tobiasKaminsky/bugfixMultipleSelect
...
Bugfix multiple select
2014-10-29 18:09:16 +01:00
tobiasKaminsky
3b3d3e05bc
- moved rotateImage() to BitmapUtils
2014-10-29 16:12:03 +01:00
Luke Owncloud
5caa8d25a0
use chooser for sendmail (remove explicit gmail) in LogHistory
2014-10-29 12:39:44 +01:00
tobiasKaminsky
191cae30d6
- Thumbnail generation also obeys exif tag
2014-10-29 07:50:40 +01:00
grecep
8d29b6318c
removed unnecessary code
2014-10-28 20:50:09 +01:00
Jorge Antonio Diaz-Benito Soriano
b22dc8bce6
Minor updates
2014-10-28 18:43:10 +01:00
MMMarcy
2cad715525
Commit for the PR
...
The pull request targets:
1) Introduces Gradle support
2) Updates maven support (even thou the apk generated is not
stable)
3) Updates the setup_env.* scripts to support different building
tools
4) Removes non UTF-8 characters
5) Removes switches on R.id entries (not supported anymore from
ADT >= 14)
6) Introduced a binary dependency (.aar) that replace the actionbarsherlock
sub-module
Remainders:
1) Change the sub-module back to the owncloud android library
once the PR will be merge
2014-10-28 16:09:34 +01:00
tobiasKaminsky
f46dd624f7
- added Comment
2014-10-28 14:27:03 +01:00
jabarros
d9604bf99e
Merge branch 'develop' into idn_hosts
2014-10-28 13:27:32 +01:00
