mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-21 16:24:32 +03:00
Code Issues Projects Releases Packages Wiki Activity
3659 commits 220 branches 1588 tags 639 MiB
Commit graph

2039 commits

Author SHA1 Message Date
jabarros
4257aa1d9c Merge branch 'develop' into obeySortOrder_fixmerge 2014-12-26 11:10:22 +01:00
jabarros
0b7c37671f Merge pull request #755 from owncloud/OpenWithInContextMenu 
"open with" in ContextMenu of downloaded files
 2014-12-26 09:13:58 +01:00
jabarros
f0905fbaac Merge pull request #784 from ekeitho/develop 
subject mail populated when user shares >>file/folder<<
 2014-12-26 09:04:02 +01:00
Keith Abdulla
1db0d7daf2 create an extra string resource 2014-12-23 09:31:59 -08:00
jabarros
1cc6d8c612 Fixed. Yellow arrow is not gone when there is not something to download 2014-12-23 09:15:59 +01:00
Keith Abdulla
38d0a19307 fix string format and context method 2014-12-19 20:11:25 -08:00
David A. Velasco
981d4580cf Merge pull request #718 from owncloudChalmers/multi2 
Multiselect functionalty targeting https://github.com/owncloud/android/issues/596
 2014-12-19 12:56:14 +01:00
jabarros
6e3d3cd016 Merge branch 'develop' into thumbnailForUpload 2014-12-19 10:58:08 +01:00
tobiasKaminsky
e23fa3acaa renamed sortDirectory to sortFolder 2014-12-18 21:19:39 +01:00
jabarros
ec820a29ac Removed specific check for character '%' when renaming a folder 2014-12-17 13:36:38 +01:00
David A. Velasco
f382ae73e3 Removed unneeded logs 2014-12-17 12:54:45 +01:00
David A. Velasco
cc77ea37de Added cancellation checks in SynchronizeFolderOperation before every RemoteOperation execution 2014-12-17 11:10:53 +01:00
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
tobiasKaminsky
ccdf0f1b96 - adding possibility to create folder during upload 2014-11-01 13:41:06 +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
jabarros
dcb985481b Merge branch 'develop' into thumbnails_from_server 
Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
 2014-10-27 15:12:48 +01:00
jabarros
13fab9321e Add check of server version before requesting remote thumbnails 2014-10-27 12:36:11 +01:00
tobiasKaminsky
56d9529b14 - beautify Timestamps 2014-10-26 21:12:45 +01:00
tobiasKaminsky
c779c7c6ed - obey exif orientation tag 2014-10-25 16:51:49 +02:00
tobiasKaminsky
ec19a11a38 Merge remote-tracking branch 'upstream/develop' into 
bugfixMultipleSelect

Conflicts:
	src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
 2014-10-24 18:44:04 +02:00
tobiasKaminsky
13758253ca -rebase on develop 2014-10-24 18:34:39 +02:00
tobiasKaminsky
fbc3d970c5 Merge remote-tracking branch 'upstream/develop' into fileCount 
Conflicts:
	res/layout/list_fragment.xml
	res/values/strings.xml
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2014-10-24 18:18:06 +02:00
David A. Velasco
8d3a956c97 Merge branch 'master' into develop 2014-10-24 15:24:50 +02:00
jabarros
2e47071c9c Merge branch 'thumbnails_from_server' of https://github.com/tobiasKaminsky/android into thumbnails_from_server 
Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
 2014-10-24 13:38:03 +02:00
David A. Velasco
ee6f2e7217 Full-account synchronization should never fetch the contents of a folder 
if its eTag did not change
 2014-10-24 10:13:43 +02:00
jabarros
c8d2d46627 Fixed. When trying to open the app in Galaxy mini 2, a crash appears 2014-10-23 18:06:59 +02:00
jabarros
69320c8805 Merge branch 'develop' into idn_hosts 2014-10-23 11:20:09 +02:00
jabarros
583194a19a Add comment removed when fixing conflict in merge 2014-10-23 11:16:31 +02:00
jabarros
6970560d2f Merge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting_files_2 
Conflicts:
	src/com/owncloud/android/datamodel/OCFile.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2014-10-23 11:06:05 +02:00
jabarros
2fad1e1a99 Merge branch 'develop' into sorting_files_2 
Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
 2014-10-23 10:18:20 +02:00
tobiasKaminsky
f1465210f0 - same threshold 2014-10-22 19:41:12 +02:00
tobiasKaminsky
4bbb4846bb - clean up 2 2014-10-22 12:41:56 +02:00
tobiasKaminsky
fd12caf9ae - cleaned up 2014-10-22 12:40:17 +02:00
tobiasKaminsky
b6f773bf8c - moved MediaScan to DownloadFileOperation. 2014-10-22 11:20:08 +02:00
tobiasKaminsky
c505977cb8 - update to obey non-image files 2014-10-22 09:07:08 +02:00
tobiasKaminsky
d7b32ecc17 Merge remote-tracking branch 'upstream/develop' into triggerMediaScan 
Conflicts:
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
	src/com/owncloud/android/ui/preview/PreviewImageActivity.java
	src/com/owncloud/android/ui/preview/PreviewImageFragment.java
 2014-10-22 08:09:47 +02:00
Magnus Sjoqvist
52bf54a00d Removes remember last share location setting 2014-10-21 17:27:47 +02:00
tobiasKaminsky
bc4a7bfe43 - added requested changes 2014-10-20 19:52:12 +02:00
jabarros
3a8ff76d0a Merge branch 'master' into develop 
Conflicts:
	owncloud-android-library
 2014-10-20 14:54:46 +02:00
Magnus Sjoqvist
dedd5bb36b Fixed log import 2014-10-20 14:48:06 +02:00
Magnus Sjoqvist
844790057b Merge with develop 2014-10-20 14:38:13 +02:00
Riadh Habbachi
9139508b9f Added initial implementation to download a folder. 
fixes owncloud/android#308
 2014-10-20 04:56:55 +01:00
tobiasKaminsky
712a513532 - bugfix 2014-10-19 19:36:04 +02:00
tobiasKaminsky
697719ce0e - fix bug 2014-10-19 19:33:31 +02:00
tobiasKaminsky
635394f2a2 - minor design changes 2014-10-19 08:56:57 +02:00
tobiasKaminsky
524a6e2bdd - added lgpgl 2014-10-18 10:47:36 +02:00
tobiasKaminsky
4e960eafeb added "x folders and y files" to end of list 2014-10-18 10:47:08 +02:00
tobiasKaminsky
effa6908b0 - Using Uri.encode... 
- Thumbnail size is set to 32dp
 2014-10-17 21:54:01 +02:00
tobiasKaminsky
bc3f8b3354 - requested changes by review by davivel 2014-10-17 21:28:48 +02:00
Magnus Sjoqvist
b6c7719415 Merge with develop 2014-10-17 11:06:30 +02:00
Magnus Sjoqvist
89627024b1 Added check for that the last upload folder still exists 2014-10-17 10:35:57 +02:00
tobiasKaminsky
e5515c1a2d trigger Media Scan on: 
- download
- delete local (on list and details)
- delete local & remote (on list and details)
 2014-10-17 09:35:25 +02:00
David A. Velasco
e3e5c205b6 Fix thumbnail generation after successful upload 2014-10-16 16:14:03 +02:00
David A. Velasco
d7de54a6a5 Fix glitch in reuse of thumbnails after crossed rename of files in the server side 2014-10-16 16:13:17 +02:00
jabarros
8859ba3971 Fixed. File is not downloaded in the end, when adding a slash at the end of the path 2014-10-16 14:13:09 +02:00
David A. Velasco
fe2f7ce8a6 Fix lost update of remoteId when file is sync'ed after being replaced in server by other one 2014-10-16 13:11:32 +02:00
jabarros
ad291624a3 Fixed. App crashes when changing the path and not going to the file list. Rename some methods. 2014-10-16 09:49:00 +02:00
jabarros
e4c77cabcb Fixed. The thumbnail of the just uploaded image is refreshed when it is not necessary 2014-10-15 18:36:39 +02:00
David A. Velasco
299ad36bb8 Thumbnails cache initialized in MainApp context to grant it is done even if the app wasn't opened, for the case of background synchronizations 2014-10-15 12:29:41 +02:00
jabarros
2910b00673 Merge branch 'idn_hosts' of https://github.com/ogasser/android into idn_hosts 
Conflicts:
	src/com/owncloud/android/authentication/AuthenticatorActivity.java
 2014-10-15 12:20:49 +02:00
David A. Velasco
395ad3248e Creation of ThumbnailsCacheManager class, grouping all the methods needed to access the thumbnails cache 2014-10-15 11:25:29 +02:00
jabarros
f68139619b Fixed. When define as instant upload path a path that does not exist, a crash is gotten 2014-10-15 11:21:37 +02:00
jabarros
d5625e6ccc Fixed. App crash when setting a path without slash 2014-10-15 08:21:24 +02:00
David A. Velasco
778ed30b58 Removed unused import 2014-10-14 13:19:56 +02:00
David A. Velasco
a04e5382b5 Fixed indention, log and copyright issues in DiskLruImageCache 2014-10-14 13:18:30 +02:00
David A. Velasco
0675834231 Use hash ok keys as actual key in thumbnails cache instead of custom transformed key 2014-10-14 13:16:32 +02:00
Sam
4275f02cab Fixed imports and added comments 2014-10-14 09:37:50 +02:00
Magnus Sjoqvist
dd80754057 Fixed merge 2014-10-14 09:37:27 +02:00
Magnus Sjoqvist
ebe0f73068 Added feature for remembering last upload location when sharing a file. Also added an option to turn it off in prefrences. 2014-10-14 09:34:49 +02:00
tobiasKaminsky
706a769e30 - disabled sort by size until server supports server-side folder size 
calculation
 2014-10-11 09:14:14 +02:00
jabarros
8f1045de2b Fixed. When removing a file inside a folder and then upload another, thumbnails are not shown correctly 2014-10-10 15:10:39 +02:00
grecep
df4f60dda4 select all / deselect all file in upload menu 2014-10-10 14:05:49 +02:00
jabarros
7d9fc6857e Merge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting_files 
Conflicts:
	res/menu/main_menu.xml
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
 2014-10-09 17:26:02 +02:00
jabarros
cbea96e563 Fixed bug. Thmumbnail is not correct when uploading a file in another folder 2014-10-09 13:21:50 +02:00
jabarros
3b79715686 Fixed bug. When previewing a big image, sometimes it is not possible load it because there is an out of memory error 2014-10-08 13:50:19 +02:00
David A. Velasco
1a98e798a0 Some indentation updates 2014-10-07 15:04:16 +02:00
David A. Velasco
a2a34ebf09 Consider possible trailing / in input URL in login view 2014-10-07 15:03:54 +02:00
David A. Velasco
fe176bed6e Some indentation updates 2014-10-07 13:11:23 +02:00
David A. Velasco
363cad2add On refersh of a folder, remove from the local file system the child folders that were deleted in the server 2014-10-07 12:54:31 +02:00
jabarros
1e7e893321 Merge branch 'master' of https://github.com/loripino21/android into instant_upload_path_chooseable 2014-10-06 14:58:34 +02:00
tobiasKaminsky
be7eb6e932 - sort dialog shows the right selected item 2014-10-04 12:40:35 +02:00
tobiasKaminsky
703187ea09 - persist settings for sort order 2014-10-04 12:23:16 +02:00
jabarros
2e472998c1 Merge branch 'develop' into release-1.6.0 2014-10-02 09:04:11 +02:00
jabarros
b5ae527bff Update Log_OC import reference 2014-10-02 09:00:21 +02:00
Javier Gonzalez
d456e2fb6c Merge pull request #641 from owncloud/thumbnails_for_downloaded_images 
Thumbnails for downloaded images
 2014-10-01 11:35:50 +02:00
jabarros
b9b0a753e0 Changes after CR 2014-10-01 09:03:15 +02:00
jabarros
2e0376e67d Fixed bug. Video files not previewed on accounts whose id has an space 2014-10-01 08:34:14 +02:00
jabarros
97d611aec3 Add column 'update_thumbnail' to the local files db for controlling the update of the thumbnails when images are updated on the server 2014-09-29 13:55:28 +02:00
jabarros
496c96223a Fixed bug related with refreshing when moving files 2014-09-24 12:22:06 +02:00
David A. Velasco
e72555f2bd Protect the app against crashes when opening the thumbnails cache 2014-09-23 14:28:23 +02:00
David A. Velasco
53740c0a8c Protect the app against crashes due to fails in creation of thumbnails 2014-09-23 13:43:30 +02:00
David A. Velasco
63de8e9229 Minimized memory use in load of bitmaps for thumbnails generated from local files 2014-09-23 13:34:25 +02:00
jabarros
96ba3bcdfc Fixed bug. Change way of decoding pictures from decodeFile to decodeStream and add FlushedInputStream class 2014-09-22 14:36:54 +02:00
jabarros
cf97936b76 Add customize Imageview and TouchImageView for fixing problem of seeing big pictures on nexus 7 
:q
exit
:q
 2014-09-22 09:27:23 +02:00
tobiasKaminsky
013542d5aa - removed help function 2014-09-21 19:29:33 +02:00
tobiasKaminsky
ff5795f281 Download thumbnails from server with rest api 2014-09-21 19:25:54 +02:00
tobiasKaminsky
800562383c new url 2014-09-21 19:14:06 +02:00
tobiasKaminsky
eb1e911457 update 2014-09-21 17:47:28 +02:00
jabarros
c376eef2e7 Fixed bug. Check if bitmap exceed the 2048x2048 size and set the imageview layer type to software one in order to avoid problems with OpenGL texture 2014-09-19 15:13:30 +02:00
David A. Velasco
7a345cf83b Work around constaint in valid key for DiskLruCache (capital letters are not allowed) 2014-09-19 14:14:30 +02:00
tobiasKaminsky
5434504486 - renamed ImageViews 
- switch to 80x80px filetype icon
 2014-09-18 21:36:43 +02:00
David A. Velasco
aa354e5d73 Merge branch 'develop' into release-1.6.0 2014-09-18 14:27:13 +02:00
David A. Velasco
02d085ed0e Hotfix for setups without new mail_logger string 2014-09-18 13:23:50 +02:00
jabarros
6c55a20389 Fixed bug. When there is a downloaded file which is not support as tiff, app crashes 2014-09-18 12:44:42 +02:00
jabarros
592761eafc Fixed bug. Image zoomed is not shown property 2014-09-18 10:46:12 +02:00
jabarros
c3e3160727 Fixed bug. When downloading two files, it is not possible to come back to the file list. Bars does not appear. 2014-09-18 09:36:35 +02:00
David A. Velasco
ea5c4760c2 Fixed conflict - Merge branch 'develop' into better_loggin_system 2014-09-18 09:31:24 +02:00
tobiasKaminsky
3cab2038a3 3row Grid 2014-09-17 17:21:26 +02:00
jabarros
6da86f04f6 Update with changes after CR 2014-09-17 17:10:20 +02:00
jabarros
74c29e1ce1 Changes after CR 2014-09-17 16:46:11 +02:00
jabarros
2ef886af31 Merge branch 'develop' into better_loggin_system 2014-09-17 09:47:34 +02:00
Oliver Gasser
b20ace9185 Add code to handle ownCloud servers running on IDN 
ownCloud instances can run on servers having an internationalized domain
name. This commit adds a conversion function between ASCII and Unicode.
The conversion function is used in the Authenticator and Preferences
activities.

See issue #469.
 2014-09-17 03:31:14 +02:00
jabarros
31bd59d681 Fix bug. App crashes when installing it 2014-09-16 13:48:17 +02:00
jabarros
6a297ebe91 Fix bug. Etag is been ignored when navigating through folders 2014-09-16 12:48:24 +02:00
jabarros
f029363e47 Fixed bug related with app crashes when opening the logs and rotate the device 2014-09-16 09:19:30 +02:00
tobiasKaminsky
ca59c75371 - GridLayout 2014-09-15 19:12:12 +02:00
tobiasKaminsky
a622b1dcfb - Only three orders: A-Z, Big-Small, New-Old. 
- Folder size is computed locally (therefore only downloaded files are
obeyed)
 2014-09-15 16:04:46 +02:00
jabarros
e549254059 Add boolean parameter 'ignoreTag' to SyncronizeFolderOperation constructor and pass ignoreTag = true in calls to #startSyncFolderOperation at FileDisplayActivity and MoveActivity in #onRefresh() 2014-09-15 13:14:32 +02:00
tobiasKaminsky
0523ec4e88 Keep folders on top 2014-09-15 12:00:19 +02:00
tobiasKaminsky
4f1b50795c Beginning gridView 2014-09-15 09:41:54 +02:00
David A. Velasco
aae90eb1aa Merge branch 'develop' of https://github.com/tobiasKaminsky/android into thumbnails_for_downloaded_images 2014-09-15 09:41:25 +02:00
tobiasKaminsky
1df7a8c062 Added forgotten Comparator 2014-09-14 16:05:34 +02:00
tobiasKaminsky
20cd00b22c Added sorting by name, date or size ascending/descending 2014-09-14 15:51:09 +02:00
tobiasKaminsky
3ace32e9ae Removed accidently added remote thumbnail generation. 2014-09-13 10:15:00 +02:00
tobiasKaminsky
2e5d99463d Re-added thumbnail generation for files that are not images. 2014-09-13 10:10:57 +02:00
jabarros
a720d1a049 Merge pull request #619 from owncloud/fix_crash_when_connecting_to_wifi 
FileUploader service checks existance of account before accepting an upload
 2014-09-12 13:55:03 +02:00
jabarros
87de2db17d Set the log folder path before starting logging 2014-09-12 11:24:12 +02:00
jabarros
4599553545 Move Logger class to owncloud library and update references. Add async task for loading log info into LogHistoryActivity 2014-09-11 18:26:52 +02:00
jabarros
c8fe95b914 Set maximum file size for logs and format logs info 2014-09-11 12:39:24 +02:00
jabarros
c281aaeb01 Add delete history login and chang the date format in logs 2014-09-11 11:00:40 +02:00
jabarros
c7263a2cb4 Visualize both older and current log files info in the log history view and send both attached in the mail 2014-09-11 09:33:40 +02:00
jabarros
9c65f99338 Manage size of log file automatically, handling two log files with a maximun size 2014-09-10 18:17:49 +02:00
jabarros
650ffdd13f Remove unused code for accesing to log file from Preferences class 2014-09-10 08:59:52 +02:00
jabarros
57d4ac96d9 Change log messages for using our logger in all logs 2014-09-10 08:49:41 +02:00
jabarros
30c00ae9e5 Done some changes for storing the log messages on log file and grant that logs are added to the same log file when the app is killed, then reopened 2014-09-10 08:46:38 +02:00
jabarros
7dd567050a Merge pull request #615 from owncloud/fast_account_selection 
When an account is clicked, the app immediately shows its contents
 2014-09-09 15:06:09 +02:00
David A. Velasco
f1fdfecb82 Changed title of settings activity to 'Settings' 2014-09-09 14:50:53 +02:00
jabarros
62fc78754e Changes after CR 2014-09-09 13:42:01 +02:00
jabarros
ba6c6375cf Merge branch 'develop' into ADFS_auth_support 
Conflicts:
	res/values/strings.xml
 2014-09-09 13:17:41 +02:00
David A. Velasco
3fac2e01a1 FileUploader service checks existance of account when receives an upload request 2014-09-09 13:03:00 +02:00
David A. Velasco
a34a2cac8a When an account is clicked, the app immediately shows its contents 2014-09-09 12:23:09 +02:00
jabarros
3e196f1f7d First changes for saving logs 2014-09-05 12:08:37 +02:00
jabarros
d3a99fff00 Fixed bug it is not possible to login using two accounts in saml server. Clear webview cache. 2014-09-04 13:13:07 +02:00
jabarros
2ada53c99b Enable log into text file automatically when BuildConfig.DEBUG is true. Open log activity when user clicks on action bar menu option. Add button to send email with log file attached. 2014-09-04 09:06:14 +02:00
jabarros
f94781b459 Fixed message when trying to move to a folder which does not exist anymore 2014-09-02 14:30:28 +02:00
jabarros
85f63a0ff4 Create dialog fragment for showing authentication dialog 2014-09-02 14:03:56 +02:00
David A. Velasco
1dbba08c7b Improved messages for operations on files not existing anymore in the server 2014-09-02 10:13:14 +02:00
tobiasKaminsky
db4ccec8ee Added requested changes. 2014-09-01 21:12:51 +02:00
loripino21
b4974653a9 Update FileStorageUtils.java 2014-09-01 12:24:10 +02:00
loripino21
a6290e06c5 Update FileStorageUtils.java 
Forget import.
 2014-09-01 12:18:15 +02:00
loripino21
3f8a56274e Update FileStorageUtils.java 2014-09-01 11:58:53 +02:00
David A. Velasco
679c7ed157 Fixed lost local copy of file when moved into a folder that is not created in the local file system yet 2014-09-01 10:35:47 +02:00
jabarros
baf4d6a627 Add menu restrictions for not showing move option on the Preview and details fragments 2014-09-01 09:03:15 +02:00
David A. Velasco
24ffdc2c2f Fixed crash when selecting a folder to move file into after rotating the device in the selection view 2014-08-28 18:44:15 +02:00
jabarros
622523b3e3 Show alert message when user or password in authentication is not correct 2014-08-28 16:03:03 +02:00
jabarros
28614af18d Merge branch 'develop' into move_files_and_folders 2014-08-28 12:32:39 +02:00
jabarros
d3d0816ed7 Show a dialog to request username and password to the user on authentication request 2014-08-28 12:30:32 +02:00
jabarros
8188d4fa92 Update messages for moving files operation results 2014-08-27 10:01:28 +02:00
David A. Velasco
c928626bfa Merge remote-tracking branch 'origin/move_files_and_folders' into move_files_and_folders 2014-08-26 19:32:41 +02:00
David A. Velasco
8cfafef514 Completed update of local database and storage after a successful remote move 2014-08-26 19:31:50 +02:00
jabarros
622d78906b Show an alert message when user tries to move a file or folder to a location where its name is used by other file or folder and when it is forbidden to move it 2014-08-26 18:44:14 +02:00
jabarros
872bdc822b Pass info of target file that is going to be moved 2014-08-26 18:03:38 +02:00
jabarros
a6afe6efd2 Add gestion for errors when moving files 2014-08-26 17:44:18 +02:00
David A. Velasco
5480c0b52f Refactored MoveFileOperation to handle local update after remote move (WIP) 2014-08-26 16:11:52 +02:00
jabarros
59c0d67e68 Trigger MoveFileOperation when 'Choose' button is clicked 2014-08-26 16:00:42 +02:00
David A. Velasco
7d0e39f730 Start MoveFileOperation when 'Choose' button is clicked [Work In 
Progress!]
 2014-08-26 10:58:47 +02:00
David A. Velasco
e050da1009 Added MoveFileOperation to move OCFiles 2014-08-26 10:57:25 +02:00
David A. Velasco
dafcdfb761 Perform creation of new folder in MoveActivity 2014-08-19 14:04:48 +02:00
David A. Velasco
edc465e3b6 Refactored MoveActivity and friends to remove duplicating classes MoveFileListFragment and FolderListListAdapter 2014-08-19 13:10:04 +02:00
David A. Velasco
b3bc1aeaf2 Some clean-up and refactoring in fragments listing files 2014-08-19 11:13:08 +02:00
David A. Velasco
f63996d115 Updated navigation elements of action bar and some clean-up in MoveActivity 2014-08-18 15:12:19 +02:00
jabarros
dc984ec5bf Add new activity for selecting the destination folder when moving files, including new List Fragment and new Adapter for listing only the folders 2014-08-13 16:43:50 +02:00
David A. Velasco
20e41c81ff Merge pull request #587 from owncloud/improved_fullscreen_for_gallery 
Improved full screen in gallery of images
 2014-08-12 12:17:04 +02:00
jabarros
49dff310ca Add changes after CR 2014-08-12 09:38:36 +02:00
jabarros
0c47bb097c Modify FileMenuFilter class for showing move option when it is appropiate 2014-08-12 09:11:26 +02:00
jabarros
83798b94d6 Fixed bug when tapping in the 3 points to hide the menu, top bar is also hidden 2014-08-11 12:46:29 +02:00
jabarros
7caf208c17 Add check for allow to use FullScreen and Immersive mode on devices equal or higher than Honeycomb 2014-08-11 09:35:01 +02:00
tobiasKaminsky
ba2d805197 Added x and y to specify maxX and maxY in route. 2014-08-09 19:12:36 +02:00
tobiasKaminsky
b810a773af Update thumbnails 2014-08-09 10:26:37 +02:00
tobiasKaminsky
8c96447fe7 Merge branch 'develop' of https://github.com/tobiasKaminsky/android into develop 
Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
 2014-08-09 10:20:07 +02:00
tobiasKaminsky
d15e5cce06 Thumbnail 2014-08-09 10:19:50 +02:00
tobiasKaminsky
c30ab40fdd Remote fetch of thumbnail 2014-08-09 10:19:02 +02:00
David A. Velasco
3816ceed7f Apply IMMERSIVE mode to gallery (works only in Android 4.4) 2014-08-07 17:50:47 +02:00
jabarros
b154fba6ee Merge branch 'develop' into accounts_view 
Conflicts:
	res/values/strings.xml
 2014-08-07 17:34:15 +02:00
jabarros
c4359ce393 Remove classes not used more after changing the view of OC accounts 2014-08-07 16:23:42 +02:00
jabarros
d3b07add37 Set first account checked as default when the current used account is removed and added some comments into the code 2014-08-07 16:02:51 +02:00
tobiasKaminsky
c0dc4c42d7 Thumbnail generation in ListView 2014-08-07 08:21:38 +02:00
tobiasKaminsky
add9df83d5 Thumbnail in ListView 2014-08-07 08:19:07 +02:00
tobiasKaminsky
eada18d017 Thumbnail preview 2014-08-07 07:53:21 +02:00
jabarros
7dfa955a03 Add long-press interaction to accounts elements for showing a context menu 2014-08-06 18:23:55 +02:00
jabarros
c35cc74961 Update the list of accounts in Preferences after adding a new account 2014-08-06 13:09:21 +02:00
jabarros
8d8c9eb315 Include 'add account' button after last account listed 2014-08-06 09:25:25 +02:00
jabarros
471d64a16c Change the title of preference for adding new accounts and remove unused commented code 2014-08-06 09:23:21 +02:00
jabarros
8ce8577fa7 Show all the active accounts on settings view and make behaviour of accounts checkbox similar to radio buttons 2014-08-05 15:05:03 +02:00
jabarros
5cba80a1ab Add new preference category on settings and list in it the accounts 2014-08-05 11:22:16 +02:00
tobiasKaminsky
8adb5641c3 Thumbnail for local images 2014-08-05 08:52:00 +02:00
jabarros
fcb556eb2d Show appropiate message and update library reference 2014-08-04 10:21:48 +02:00
David A. Velasco
41666b2d6c Merge pull request #578 from owncloud/show_message_for_empty_list 
Show background message when list of files is empty
 2014-07-30 09:40:17 +02:00
jabarros
ac18a468e8 Changes after CR 2014-07-30 09:35:31 +02:00
jabarros
1d8f734e6d Changes after CR 2014-07-29 15:08:49 +02:00
jabarros
5335975717 Fixed bug. It is not possible to refresh folder when it is empty 2014-07-29 15:04:06 +02:00
jabarros
bbbc486d53 Fixed bug when comming back to a zoomed photo, it is not zoom 2014-07-29 13:16:07 +02:00
jabarros
20bb37701c Use Extended view pager and set onTouchListener into image forshow/hide the action bar 2014-07-29 08:26:10 +02:00
jabarros
154a3949f2 Save message in onSaveInstanceState when folder is empty for allowing that it disappears if device orientation is changed 2014-07-28 13:06:29 +02:00
jabarros
a8c4271673 Change element ImageView of preview image fragment for TouchImageView in order to allow make zoom on the image 2014-07-28 11:11:28 +02:00
jabarros
d90b10d00c Fixed bug related when changing orientation of device, message for empty folders disappear 2014-07-28 10:12:54 +02:00
jabarros
89e7ad9e67 Show message when the file list is being loading and when it is empty 2014-07-25 13:13:58 +02:00
David A. Velasco
f5e3f97ef1 Removed conflict mark 2014-07-25 09:14:07 +02:00
jabarros
2b21d67791 Add case for when trying to download a file that is no longer available on the server 2014-07-25 09:11:21 +02:00
jabarros
61c8f7f083 Upgrade notifications on status bar when uploading to show proper message about fails due to lack of permissions and removed FailedUploaderActivity 2014-07-25 09:11:20 +02:00
jabarros
a28fa921c9 Update ErrorMessageAdapter class to generate appropiate error messages for operations failed due to lack of permissions (ResultCode.FORBIDDEN) 2014-07-25 09:10:26 +02:00
David A. Velasco
fa326f51c8 Fixed use of removed text messages unnoticed before updating all the languages 2014-07-25 08:45:39 +02:00
jabarros
fb1a4bad59 Add message when LocalFileList and OCFileLIst are empty 2014-07-24 18:34:12 +02:00
David A. Velasco
9778f720dc Fixed bug: failed upload notification not appearing in Android 2.x devices 2014-07-14 14:50:02 +02:00
jabarros
055be96386 Remove InstantUploadActivity and related resources 2014-07-14 08:40:16 +02:00
David A. Velasco
e5f20fb85b Update reference to library 2014-07-10 13:08:54 +02:00
David A. Velasco
49c69609ea Merge branch 'develop' into release-1.5.8 2014-07-09 12:27:35 +02:00
jabarros
8699c0414e Merge pull request #556 from owncloud/fix_bug_in_favorites_sync 
Fixed bug in favorites sync affecting editors that replace a file with a work copy instead of directly writing the file
 2014-07-09 11:47:26 +02:00
jabarros
96e2d198e0 Merge branch 'develop' into release-1.5.8 2014-07-08 13:03:09 +02:00
David A. Velasco
c880929ffd Fixed last minute bugs, and clean up 2014-07-08 12:51:01 +02:00
David A. Velasco
e610046e0d Watch for replacements of favorite file besides than direct notifications 2014-07-08 10:26:54 +02:00
David A. Velasco
e2a7e9bbf9 Watch local changes of kept-in-sync files by observing their parent folder, instead of the file itself 2014-07-08 10:26:53 +02:00
David A. Velasco
5205fe22ae Avoid the app crashes at every start due to a stuck obsolete broadcast 
intent.
 2014-07-08 10:24:37 +02:00
jabarros
dba9c3a64d Create observer class for parent folders 2014-07-08 10:24:36 +02:00
David A. Velasco
6647790620 Testing observance on parent folders to deal with apps that replace a favorite file (delete it) when updating it 2014-07-08 10:22:54 +02:00
David A. Velasco
014096ab2d Improved release of resources in FileObserverService#onDestroy 2014-07-08 10:21:38 +02:00
David A. Velasco
115032a36e Clean up FileObserverService to avoid redundant instances of OwnCloudFileObservers that may be driving mad inotify in some Android devices 2014-07-08 10:21:37 +02:00
jabarros
a1f52fe73b Modify OwncloudFileObserver for enforcing watching the file when an external app cancelled the watch and added a handler for startWatching again 2014-07-08 10:17:02 +02:00
jabarros
0bca42bcd8 Remove unused class FailedUploadActivity and related resources 2014-07-07 13:52:13 +02:00
jabarros
ce871c126b Show 'downloaded' icon over the file icon 2014-07-07 10:58:45 +02:00
jabarros
42946bcc6d Show folder icon with world above on the left side of any folder that is publicity shared 2014-07-07 10:10:18 +02:00
David A. Velasco
dacc14a882 Merge remote-tracking branch 'origin/develop' into add_cookie_based_session_support 2014-07-01 14:21:26 +02:00
David A. Velasco
fe4fc7a612 Fixed typos from 'shareWhatever' to 'sharedWhatever', and updated reference to library 2014-07-01 09:59:38 +02:00
jabarros
f5a4c6bc9f Fixed bug. In the uploads view, folders and files are shown as shared 2014-07-01 09:59:37 +02:00
jabarros
bb2830fd73 Fixed bug. Regular files are showing folder icon 2014-07-01 09:59:35 +02:00
David A. Velasco
947063c193 Fixed typo breaking upgrade of database version to add remote_id column 2014-07-01 09:59:34 +02:00
jabarros
440c703752 Increase db version number 2014-07-01 09:59:33 +02:00
jabarros
be0990baac Hide 'shared with me' icon when file does not have 'S' permission 2014-07-01 09:59:31 +02:00
jabarros
1e8337fbce Update class FileListAdapter to show new icon for a file and folder that includes 'S' in the permission property. Changed list item layout for showing 'sharedlink' and 'shared with me' icons. 2014-07-01 09:59:30 +02:00
jabarros
8a1e3f743e Add column 'Remote_Id' to the local files db. Create upgrade for 'Permissions' and 'Remote_id' db changes. 2014-07-01 09:59:28 +02:00
jabarros
80f6250604 Update class OCFile to include value of permissions column into db as a field. Modify SyncronizeFolderOperation and FileStorageUtils for setting permissions value 2014-07-01 09:59:28 +02:00
jabarros
ba4386008a Modify FileDataStorageManager for adding permission value to ContentValue 2014-07-01 09:59:27 +02:00
jabarros
0544e3a18d Add column 'Permissions' to the local files db 2014-07-01 09:59:26 +02:00
David A. Velasco
41705bd284 Updated ticker and title messages for notification of failed synchronization due to expired credentials 2014-06-26 11:21:30 +02:00
David A. Velasco
4f0dd59921 Fixed bug in update of SAML2 token after expiration 2014-06-26 10:26:05 +02:00
David A. Velasco
78a2ba5868 Fixed redirection to login view from failed notifications when click on 2014-06-25 17:04:02 +02:00
David A. Velasco
6619154839 Removed lost dependencies and unneeded parameters; updated library reference 2014-06-18 17:03:56 +02:00
masensio
f2320691b3 Update branding: instead of specific option, make that using SAML authentication implies enabling the SingleSessionManager. 2014-06-16 13:18:29 +02:00
masensio
cb21f379d7 Remove some imports 2014-06-16 13:18:05 +02:00
David A. Velasco
781c70ac9f Updated app to new OwnCloudClientManager#removeClient method, with OwnCloudAccount parameter 2014-06-13 15:09:48 +02:00
David A. Velasco
8b3c9f14dc Using default singleton OwnCloudClientManager instead of holding a reference in application context 2014-06-13 13:44:36 +02:00
David A. Velasco
37236f0faa Adapted code to use single OwnCloudClientManager#getClientFor(...) method 2014-06-13 12:52:21 +02:00