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

2374 commits

Author SHA1 Message Date
purigarcia
354e3aed5c add actions in the preview 2015-07-08 10:57:37 +02:00
purigarcia
4e66d6acd8 Actions in the detail view 2015-07-08 10:32:58 +02:00
purigarcia
96e2a2b97b toggleKeepInSync is moved to FileOperationsHelper 2015-07-08 10:22:41 +02:00
purigarcia
f226b5f93a add the action in the context menu 2015-07-08 10:17:27 +02:00
purigarcia
684104ccb8 reuse a existing method, remove the new one 2015-07-08 09:12:40 +02:00
purigarcia
f0c302b0f8 first step to detect if the file is favorite 2015-07-08 09:08:49 +02:00
purigarcia
d039386831 options are not shown if it is a foler 2015-07-08 08:58:06 +02:00
purigarcia
32346efa62 this two options are not shown if the file is downloading or uploading 2015-07-08 08:55:41 +02:00
David A. Velasco
0f0e210d69 Fixed title in action bar when user clicks on upload notification in progress / failed 2015-07-02 13:03:48 +02:00
David A. Velasco
04d4be82cb Fixed condition to browse up when current file shown is uploading for first time or a failed upload 2015-07-02 12:08:36 +02:00
tobiasKaminsky
57991cb8c4 revert previous commit 2015-06-27 21:48:34 +02:00
tobiasKaminsky
ddb1e41753 enabling video thumbnails 2015-06-27 21:16:03 +02:00
David A. Velasco
bded939b5e Fixed bug in access to same folder than last time when a file is shared with OC to upload 2015-06-26 09:07:51 +02:00
David A. Velasco
9babe1b38c Merge branch 'develop' into release-1.7.2 2015-06-25 14:43:04 +02:00
Jorge Antonio Díaz-Benito Soriano
efbab82a6e Moved text load call to onStart 2015-06-25 12:49:45 +02:00
masensio
a818aaca47 Fixed upload of files into non-root folders 
Fixed condition selecting grid or list mode - at least an image!
 2015-06-25 09:13:37 +02:00
David A. Velasco
907e63a103 Replaced constructor with parameter in FileDetailsFragment with static method and setArguments 2015-06-25 09:10:49 +02:00
David A. Velasco
51a04aa541 Refactored extractions of server version from AccountManager through 
AccountUtils; fixed line lengths and some warnings
 2015-06-25 09:10:48 +02:00
David A. Velasco
1a3a150248 Automatic grid view is only enabled if server supports remote thumbnails and ALL the files in a folder are images 2015-06-25 09:10:47 +02:00
Jorge Antonio Diaz-Benito Soriano
cc0627db93 Implementation of the requested changes to the asynctask that loads the text 2015-06-24 22:38:39 +02:00
Jorge Antonio Diaz-Benito Soriano
1508e99e9a Added exception logging 2015-06-24 22:24:39 +02:00
Jorge Antonio Diaz-Benito Soriano
4c17d77a6c Added braces to single-line if statements 2015-06-24 22:14:58 +02:00
David A. Velasco
8107d9dc4f Fixed wrong format of files & folder count 2015-06-23 14:40:51 +02:00
David A. Velasco
8c5b2b7b13 Merge remote-tracking branch 'origin/release-1.7.2' into release-1.7.2 2015-06-22 14:56:13 +02:00
masensio
fb57bbc8c8 Merge pull request #1023 from owncloud/fix_issues_from_Transifex 
Message with count of list(s) and folder(s) reestructured for better translations
 2015-06-22 14:14:36 +02:00
masensio
84678c9903 Fix: Import file from other app shows all folders as TextView 2015-06-22 12:58:41 +02:00
David A. Velasco
69a5b6f25d More i18n-friendly format for footer in list of files (no string composition) 
Conflicts FIXED:
	res/values/strings.xml
 2015-06-22 11:42:37 +02:00
masensio
e7710e7383 Update string subject_token and update library reference 2015-06-19 15:11:49 +02:00
Sean
1551a5280a Trigger media scan after file upload 
After a successful upload, the uploaded file is saved locally on the
device but the media scan was not getting triggered.
 2015-06-18 15:42:06 +01:00
masensio
75fd0f40c6 Merge branch 'develop' into forbidden_characters_from_server 
Conflicts:
	owncloud-android-library
	src/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java
	src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java
 2015-06-15 14:51:13 +02:00
masensio
fbfb6dee90 Merge remote-tracking branch 'origin/develop' into navigationDrawer_basic 
Conflicts:
	.travis.yml
	src/com/owncloud/android/authentication/AuthenticatorActivity.java
 2015-06-15 14:07:49 +02:00
David A. Velasco
d4390de111 Save target location of server behind a permanent redirection after password validation 2015-06-11 09:42:21 +02:00
David A. Velasco
5160dc58dc Fixed bug of action bar position in PreviewImageActvitiy in Android <=4.2 2015-06-09 11:17:01 +02:00
masensio
6cf7c72ce3 Fix, Title is not correct when rotating the device 2015-06-05 12:26:12 +02:00
masensio
705d2eb773 Fix, the message is not correct when creating a folder with / 2015-06-04 19:01:13 +02:00
masensio
65ff5a374a Fix, title is not correct when menu is shown and rotate 2015-06-04 18:41:07 +02:00
masensio
b6d7cd73c7 Fix issue #1000 2015-06-04 11:02:21 +02:00
David A. Velasco
88ded5540a Fixed home button in action bar for PreviewImageActvitiy when navigation drawer is shown 2015-06-03 13:36:09 +02:00
David A. Velasco
a45c0f57f9 Refactor method to update title and home (up) button of FileActivity 2015-06-03 13:29:11 +02:00
David A. Velasco
4d7b5a1e50 Merge remote-tracking branch 'origin/navigationDrawer_basic' into navigationDrawer_basic 2015-06-03 11:09:19 +02:00
David A. Velasco
6779b77f3b Disable navigation drawer in gallery view when system bars are not visible 2015-06-03 11:05:10 +02:00
masensio
d4c13821ef Add new message for Rename, Move and Uploads 2015-06-03 09:46:32 +02:00
masensio
5f47524864 fix, in a tablet, the title is not correct when menu is shown and rotating 2015-06-02 15:26:42 +02:00
masensio
bad83f956d Fix, the correct navigation not shown in the action bar 2015-06-02 14:48:56 +02:00
masensio
b7dfc0aa41 Fix, App crash after rotate the device previewing an image 2015-06-02 14:16:48 +02:00
masensio
d4c14f8b29 Fix: app crash when trying to edit the url. Fix a problem from android support library v7 (19) 2015-06-02 14:01:42 +02:00
masensio
80108e336f Parse and show the error of invalid characters coming from the server side. Show new message in CreationFolder 2015-06-02 13:07:54 +02:00
masensio
afaa2879d1 Filter only '/' character in user input when version of server is 8.1 or later 2015-06-02 09:38:47 +02:00
David A. Velasco
05e2bf041d Close drawer before jumping to other activities so that it's not still open when come back later 2015-06-02 01:41:11 +02:00
David A. Velasco
7a941e0b0b Better swipe from left to open drawer in preview of video files 2015-06-02 01:34:45 +02:00
David A. Velasco
0117006313 Fixed update of id.home action bar button on navigation through FileDisplayActivity 2015-06-02 01:00:14 +02:00
David A. Velasco
bf23f0b5e9 Recover exit on BACK pressed 2015-06-02 00:05:08 +02:00
David A. Velasco
78158aa4a3 Fixed title and up button in Settings activity 2015-06-01 13:52:08 +02:00
masensio
1363f6686d Fix: Folder name is lose when changing the orientation of the device 2015-05-29 15:19:59 +02:00
masensio
d843140686 Fix, Logs option doesn't work 2015-05-29 13:14:42 +02:00
masensio
c66f578ace Change hamburguer icon by arrow when it is needed. Remove some imports 2015-05-29 12:42:53 +02:00
masensio
cf535b70f1 Disable 'Accounts' in Navigation Drawer 2015-05-29 11:32:36 +02:00
masensio
3603c122ff Home button shows an arrow when user is into a folder 2015-05-29 10:57:15 +02:00
masensio
1c3f88c456 Fix refresh folder name in action bar title 2015-05-29 10:51:45 +02:00
masensio
f89e112f14 Remove code related with action bar folder list 2015-05-29 09:33:17 +02:00
masensio
e78102d123 Remove drop-down list in action bar 2015-05-28 18:37:43 +02:00
masensio
d789d304e3 Click on OC icon shows the navigation drawer if the current folder isn't the root folder 2015-05-28 14:43:30 +02:00
masensio
d05160c1e2 Show root folder when click on 'All files' option 2015-05-28 14:27:50 +02:00
masensio
6e2dd6b191 Enable fitsSystemWindows in drawer.xml 2015-05-28 13:18:56 +02:00
masensio
c83925b454 Add license in some files 2015-05-28 11:30:02 +02:00
masensio
db01425a07 Add NavigationDrawer to image preview 2015-05-28 11:07:14 +02:00
tobiasKaminsky
bf880e97cc removed import 2015-05-27 19:16:08 +02:00
tobiasKaminsky
dd1675e925 removed dependency to Hex 2015-05-27 19:07:40 +02:00
tobiasKaminsky
3dc9a78696 Updated to work with latest update 2015-05-27 18:50:09 +02:00
tobiasKaminsky
a75ffde65f Merge branch 'navigationDrawer_update' of github.com:owncloud/android into navigationDrawer_update 2015-05-27 18:35:39 +02:00
tobiasKaminsky
e80828afed Merge branch 'navigationDrawer_update' of github.com:owncloud/android into navigationDrawer_update 2015-05-27 18:35:21 +02:00
masensio
7196b88374 Include again 'Refresh account' in the menu 2015-05-27 17:50:34 +02:00
masensio
c20041d157 Merge branch 'remove_ActionBarSherlock' into navigationDrawer_update 
Conflicts:
	res/menu/main_menu.xml
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/activity/FolderPickerActivity.java
	src/com/owncloud/android/ui/activity/Preferences.java
	src/com/owncloud/android/ui/preview/PreviewImageActivity.java
 2015-05-27 14:19:30 +02:00
tobiasKaminsky
bc5e05934f added rectangle with first character 2015-05-26 20:49:03 +02:00
masensio
e934f015e8 Enable 'Logs' navigation drawer entry only in DEBUG mode 2015-05-26 12:55:40 +02:00
masensio
a9dad9e480 Add content_description to Navigation Drawer options 2015-05-26 11:46:15 +02:00
masensio
101989b70c Move 'Logs' from Settings to Navigation Drawer 2015-05-26 09:11:27 +02:00
masensio
6d8fc58eab Remove some imports 2015-05-26 08:48:36 +02:00
masensio
015eb6fee9 Disable On Device option in Navigation Drawer 2015-05-26 00:01:39 +02:00
masensio
4f2f0ceb80 Add actionBar 2015-05-25 12:39:05 +02:00
tobiasKaminsky
ed118c952a Changed computing of account name color 2015-05-24 08:53:58 +02:00
tobiasKaminsky
293d636f3a Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update 
# Conflicts:
#	gradle/wrapper/gradle-wrapper.properties
#	owncloud-android-library
#	res/layout-land/account_setup.xml
#	res/layout/account_setup.xml
#	res/layout/list_item.xml
#	res/layout/uploader_list_item_layout.xml
#	res/menu/main_menu.xml
#	res/values/colors.xml
#	res/values/strings.xml
#	src/com/owncloud/android/MainApp.java
#	src/com/owncloud/android/operations/SynchronizeFolderOperation.java
#	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
#	src/com/owncloud/android/ui/activity/Preferences.java
#	src/com/owncloud/android/ui/activity/Uploader.java
#	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
#	src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
#	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
#	src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
#	src/com/owncloud/android/utils/BitmapUtils.java
 2015-05-23 07:44:16 +02:00
tobiasKaminsky
6d4207a06b Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update 2015-05-21 21:12:44 +02:00
masensio
5f2820355d Merge branch 'develop' into navigation_drawer 
Conflicts:
	src/com/owncloud/android/ui/preview/PreviewImageFragment.java
 2015-05-21 09:46:59 +02:00
David A. Velasco
a3642ab864 Improved load of images in PreviewImageFragment - no more images in full size by default, up to 3 tries to downScale 2015-05-18 14:29:00 +02:00
masensio
a496f08717 Remove actionbarsherlock , replace it with Android Support Library (v7) 2015-05-18 12:59:46 +02:00
David A. Velasco
c0ef93882e Removed extra public constructor from Fragments handled by PreviewImageActivity 2015-05-14 18:05:12 +02:00
David A. Velasco
7f7af85f12 Better condition 2015-05-12 14:42:57 +02:00
David A. Velasco
dd35ee031b Close that stream... 2015-05-12 14:10:53 +02:00
David A. Velasco
25f5eb193e Merge remote-tracking branch 'origin/thumbnailOOM' into thumbnailOOM 2015-05-12 13:32:56 +02:00
David A. Velasco
10e4373bcf Minor changes after reviewing Bitmaps life cycle in PreviewImageFragment 2015-05-12 13:32:01 +02:00
masensio
e24b31f42d Replace call to get.ResponseBody with get.getReponseBodyAsStream in ThumbnailsCacheManager 2015-05-12 13:25:36 +02:00
masensio
f448a36456 Merge branch 'develop' into thumbnailOOM 2015-05-11 14:58:47 +02:00
David A. Velasco
47343ca299 Merge pull request #973 from owncloud/delete_share_option_in_app 
Make share feature configurable
 2015-05-08 14:55:07 +02:00
David A. Velasco
8d48929f5b Fixed build 2015-05-08 11:27:20 +02:00
masensio
6f3e8fbb85 Merge branch 'develop' into thumbnailOOM 2015-05-06 13:42:43 +02:00
David A. Velasco
5e1f98dcaf Fixes after crossed review 2015-05-06 09:13:10 +02:00
masensio
7d82231809 Merge branch 'develop' into pinEnhancement 2015-05-05 13:56:57 +02:00
masensio
ddbb5d2522 Merge branch 'develop' into thumbnailOOM 2015-05-05 13:53:56 +02:00
David A. Velasco
dcd8dde864 Merge branch 'develop' into pinEnhancement 2015-05-05 13:43:01 +02:00
David A. Velasco
c04d9c2198 Merge remote-tracking branch 'origin/pinEnhancement' into pinEnhancement 2015-05-05 13:42:51 +02:00
masensio
b9c4fab1cb Change message when entering an incorrect pass code 2015-05-05 13:37:18 +02:00
masensio
8debbb5f90 Changes from comments in PR#967, Second part 2015-05-05 13:18:49 +02:00
masensio
3c07444ff7 Changes from comments in PR#967 2015-05-05 12:56:14 +02:00
David A. Velasco
ef034fd6b8 Removed commented code 2015-05-05 12:49:38 +02:00
masensio
7eea2ea507 Merge branch 'develop' into thumbnailOOM 2015-05-05 10:31:46 +02:00
David A. Velasco
930d21dc93 Removed unneeded toggling on 'selected' state 2015-05-05 10:28:49 +02:00
David A. Velasco
4f0cc76a12 Removed unneeded toggling on cursor visibility 2015-05-05 09:54:49 +02:00
David A. Velasco
5aa9789a2e Reduced duplicated code with a common TextWatcher implementation for all the input fields 2015-05-05 09:49:11 +02:00
masensio
20cc8a1551 Trying fix travis fail 2015-05-05 09:32:49 +02:00
David A. Velasco
510c00f66d Cleaned code in PassCodeActivity 2015-05-05 00:07:24 +02:00
masensio
05df07a362 Enable/disable share option in the menu: long press and details menu, using setup option 2015-05-04 14:54:49 +02:00
masensio
50622d6415 Fix bug: Choose account menu doesn't disappear after rotate the device 2015-05-04 13:39:07 +02:00
David A. Velasco
08de1b153d Added license header to PassCodeManager 2015-05-04 11:43:51 +02:00
David A. Velasco
9593b580b7 Replaced 'PIN code' by 'pass code' 2015-05-04 11:41:09 +02:00
David A. Velasco
3eb64bcdd7 When pass code is enabled, the app is sent to background if the screen is turned off and the windows are made secure to prevent they are rendered in the 'recents' menu 2015-05-04 10:52:57 +02:00
masensio
7d33176509 Fix bug: List of files is not the correct one 2015-04-30 18:12:23 +02:00
David A. Velasco
f186149787 Fixed lost uppercase 2015-04-30 16:26:34 +02:00
David A. Velasco
2f97466301 Added pass code protection to AuthenticatorActivity 2015-04-30 16:06:06 +02:00
David A. Velasco
8925a0a7c6 Logs on activities life cycle simplified 2015-04-30 13:30:55 +02:00
David A. Velasco
84e99c3cc7 Prevent that PIN code is requested when system windows partially overlapping the app disappear and the app is resumed 2015-04-30 13:21:28 +02:00
masensio
7d5c573766 Show Waiting dialog, while copy temporal file async task is working 2015-04-30 13:04:51 +02:00
masensio
e242c5a45f Copy file to upload for all kind of files, not only for images. 2015-04-29 18:27:45 +02:00
David A. Velasco
e0867d2b28 Refactored location of passcode check: a callback to rule them all 2015-04-29 16:50:30 +02:00
masensio
b064bd4591 Execute the file to upload copy in an AsyncTask 2015-04-29 12:42:10 +02:00
masensio
42fde39ff1 Get file to upload and copy into a temporal file (Uploads#uploadFiles 2015-04-28 14:22:35 +02:00
David A. Velasco
802a164616 Merge branch 'develop' into pinEnhancement 
Conflicts SOLVED:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/activity/Preferences.java
	src/com/owncloud/android/ui/activity/Uploader.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2015-04-28 14:20:17 +02:00
David A. Velasco
b058d008a1 FileActivity does not need to 'remember' the current account in configuration changes 2015-04-27 12:27:09 +02:00
David A. Velasco
2fcffbd3d5 Merge pull request #957 from owncloud/fix_crash_invalid_server_url 
Fix crash when typed invalid URL
 2015-04-22 11:01:52 +02:00
David A. Velasco
1b628540c9 Fixes after CR 2015-04-22 10:33:58 +02:00
David A. Velasco
968c535e19 Merge branch 'develop' into loging_different_servers_same_pattern 
Conflicts SOLVED in:
	src/com/owncloud/android/ui/activity/FileActivity.java
 2015-04-22 09:35:37 +02:00
masensio
870b8c0726 Filter dots at the beginning of the url 2015-04-21 13:50:13 +02:00
David A. Velasco
21c34ee6d4 Transaction signaled as successful in the right place - and some clean-up 2015-04-21 10:16:11 +02:00
tobiasKaminsky
6b0af82960 HOTFIX: prevent OOM when scrolling Thumbnails 2015-04-19 11:04:32 +02:00
David A. Velasco
5ca1b94865 Fixed now - FileDisplayActivity is not recreated anymore when the user selects another account 2015-04-17 14:32:35 +02:00
masensio
eac77d8749 Show an error message for invalid server url 2015-04-17 14:10:41 +02:00
David A. Velasco
ea14d6247e Got rid of other old dialogs in FileDisplayActivity 2015-04-17 13:49:01 +02:00
David A. Velasco
bed85b265a Some minor clean-up 2015-04-17 13:48:45 +02:00
David A. Velasco
8aa0060f4a Fixed bug: depecrated showdialog should not be used anymore, DialogFragment used instead 2015-04-17 13:45:45 +02:00
masensio
98f73400ca Fix bug: when installing the app for the first time, app crashes 2015-04-17 12:49:39 +02:00
masensio
f12956fe2a Remove comments 2015-04-17 11:05:13 +02:00
masensio
74b8e1a536 Replace rawQuery by query, onUpgrade --> updateDownloadedFiles 2015-04-17 09:00:53 +02:00
masensio
77ed62dbcf Replace account.name by newAccountName in onUpgrade 2015-04-16 17:21:47 +02:00
masensio
27147e5e08 Select * in updateDownloadedFiles 2015-04-15 18:50:59 +02:00
masensio
ab7c998d07 Changes in update for downloaded files 2015-04-15 18:37:12 +02:00
masensio
123c7fc1cd Update downloaded files 2015-04-15 18:15:57 +02:00
masensio
d9e22f0752 Merge pull request #946 from owncloud/upgrading_account_manager 
Upgrading account manager
 2015-04-15 13:07:14 +02:00
David A. Velasco
cc9431feeb Upgraded accounts in AccountManager with new account name 2015-04-15 12:52:07 +02:00
masensio
19be4b4a6f Remove old update sql for 10 version, in onUpgrade method 2015-04-15 12:25:18 +02:00
masensio
ef948a46fd Change update query and add log in onUpgrade (10 DB version) 2015-04-15 10:14:19 +02:00
David A. Velasco
1c579d1eb0 Removed 'support' for WebDAV entry point before OC 4, and dependent unused code 2015-04-14 15:00:43 +02:00
David A. Velasco
28d3b5fdaa Removed unused method 2015-04-14 14:42:39 +02:00
David A. Velasco
47dcbb219e Modify upgrade of account names in database; upgrade of accounts in AccountManager will be done before, not after 2015-04-14 14:34:27 +02:00
masensio
7efd1076aa Upgrade account name in all the rows of files table in database 2015-04-14 11:37:08 +02:00
masensio
56703df78e Udpate imports in MainApp 2015-04-09 13:35:50 +02:00
masensio
7696c08565 Hotfix user_agent 2015-04-09 11:16:13 +02:00
David A. Velasco
340428d820 Once again, disable session based client 2015-03-31 14:29:09 +02:00
David A. Velasco
4fbce341be Fixed crashes in Android 2.x due to accesibility code 2015-03-30 14:38:26 +02:00
masensio
9177f1487a Enable session support ( in MainApp ) 2015-03-26 09:23:46 +01:00
David A. Velasco
fef1f5c31e Emergency fix: accesibility additions break Android 2.x 2015-03-25 11:28:02 +01:00
David A. Velasco
6bef4abf74 Merge pull request #924 from owncloud/add_user_agent_support 
Updated after adding custom user agent support to library
 2015-03-25 10:57:04 +01:00
masensio
90d84ca927 Changes from comments in PR#924 2015-03-25 09:10:32 +01:00
masensio
0de25b228c Update uger agent string 2015-03-24 14:44:05 +01:00
masensio
6af93bfdde Refactor parameter user_agent out of RemoteOperation and children 2015-03-24 14:32:13 +01:00
masensio
6d3bbd8bf3 Modify User Agent string 2015-03-24 13:27:17 +01:00
masensio
c3616e9001 Clean code, after validation 2015-03-24 12:57:35 +01:00
masensio
7c49aa940d fix bug:When rotating the device, alert to choose the account is shown again 2015-03-23 15:01:17 +01:00
masensio
d6701bf8d5 Fix bug: Folder is created in the wrong account 2015-03-20 15:12:33 +01:00
masensio
c0da8a93f2 Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop 2015-03-20 14:55:48 +01:00
David A. Velasco
5ebd90ed2d Merge pull request #914 from owncloud/accessibility 
Added accesibility descriptions as a mean to add automatic tests un UI.
 2015-03-19 12:59:17 +01:00
masensio
7a42dc2bf4 Add user-agent string to setup options 2015-03-18 17:08:42 +01:00
masensio
b22e231909 Merge branch 'develop' into add_user_agent_support 2015-03-18 09:37:55 +01:00
masensio
879160bebe Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop 2015-03-18 09:20:02 +01:00
masensio
e230ce33f7 Fix bug: Files/folders shown are not the correct when upload a file from other app and rotate the device 2015-03-17 14:53:18 +01:00
masensio
5d843eec5d Fix bug: App crashes when upload a file from other app, create a folder and rotate the device 2015-03-17 12:46:43 +01:00
masensio
95e5a905cc Fix bug: App crahes after accessing a folder with gridview and then not 2015-03-16 14:27:23 +01:00
masensio
876204faf0 Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop 2015-03-16 11:15:27 +01:00
masensio
06d5cc9477 Add user agent in android project 2015-03-13 14:55:28 +01:00
masensio
d55c21ccfb Fix crash when navigate to upload a file 2015-03-13 12:31:11 +01:00
masensio
5c54df6af0 Reformat some lines 2015-03-13 12:30:47 +01:00
masensio
b3147346eb Fix crash in navigation in FileList 2015-03-12 18:41:03 +01:00
masensio
c963eb0fad Merge branch 'develop' into accessibility 
Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
 2015-03-10 14:58:21 +01:00
masensio
88ff4ff910 Fix bug: Permission error is shown when it shouldn't 2015-03-10 14:27:22 +01:00
masensio
40ca3d9b21 Fix bug: After trying to share a file without permission, it's not possible to share a file 2015-03-09 15:16:42 +01:00
masensio
4a47e96bc7 Fix bug: password is shown, when in fact we do not have permission to share 2015-03-09 13:47:52 +01:00
masensio
6f1fe5ad6d Process share with password 2015-03-06 12:48:56 +01:00
masensio
82fa95fe43 Merge branch 'develop' into share_password_support 2015-03-06 10:19:06 +01:00
masensio
9da433bb7b Changes from comments in PR 2015-03-06 09:07:44 +01:00
masensio
9e55ef9585 Show password dialog 2015-03-05 18:02:40 +01:00
masensio
b08e9e35e6 Create password dialog: SharePasswordDialog.java 2015-03-05 17:54:03 +01:00
masensio
0bef9fdedb Update year in license 2015-03-05 13:27:45 +01:00
masensio
3d3046dc26 Add author's line in license 2015-03-05 12:36:30 +01:00
jabarros
21c7755858 Added item name to ContentDescription property in list item linearlayout of FileListListAdapter 2015-03-03 14:12:15 +01:00
masensio
01fc29c892 Bug fixed: Upload fails 2015-02-25 09:09:41 +01:00
masensio
8d773ef002 Merge remote-tracking branch 'origin/cancel_transfer_for_deleted_users' into cancel_transfer_for_deleted_users 2015-02-24 15:09:54 +01:00
David A. Velasco
4d2b382785 Grant that the proper RemoteOperationResult is built when an upload is cancelled while copying to temporary space 2015-02-24 15:02:26 +01:00
masensio
2d697473a1 Merge branch 'develop' into cancel_transfer_for_deleted_users 2015-02-24 14:19:41 +01:00
David A. Velasco
2be8e301e5 Clean-up and minor refactoring 2015-02-23 13:22:44 +01:00
masensio
e3a61d283f Changes from comments, FileUploader and FileDownloader implement OnAccountsUpdateListener 2015-02-20 10:51:18 +01:00
masensio
0f7ea542c9 New method in IndexesForest: remove(Account account). Use this method for cancelling downloads 2015-02-20 10:23:46 +01:00
masensio
83ad608faa Changes from Comments in PR#886 2015-02-19 18:48:04 +01:00
masensio
0a03b6d3d4 Merge branch 'develop' into enable_cookies 
Conflicts:
	src/com/owncloud/android/authentication/AuthenticatorActivity.java
 2015-02-19 13:02:53 +01:00
masensio
cb175f2994 Merge branch 'develop' into cancel_transfer_for_deleted_users 
Conflicts:
	AndroidManifest.xml
 2015-02-19 12:54:59 +01:00
masensio
e93016d7e0 Try to cancel transfers when an account is deleted outside of the app: Done 2015-02-19 12:50:53 +01:00
masensio
2058391230 Cancel downloads for deleted users 2015-02-18 18:39:10 +01:00
masensio
90b786853e Fix bug: Black screen is shown when trying to go to files view after changing the password 2015-02-18 12:23:25 +01:00
David A. Velasco
fc435f64f0 Fixed recovery of position list when browsing up after two rotations 2015-02-18 11:29:31 +01:00
David A. Velasco
2cfed6eaa7 Recovered ExtendedListView; ExtendedListFragment updated to handle to possible layouts 2015-02-17 14:00:18 +01:00
masensio
acb2da8f02 Cancel the current upload when it hasn't started yet 2015-02-16 13:56:37 +01:00
masensio
a091d39076 Fix building 2015-02-13 15:07:11 +01:00
masensio
fba65e37f6 Merge remote-tracking branch 'origin/enable_cookies' into enable_cookies 
Conflicts:
	src/com/owncloud/android/authentication/AuthenticatorActivity.java
	src/com/owncloud/android/authentication/AuthenticatorAsyncTask.java
 2015-02-13 14:39:35 +01:00
masensio
75880ec553 Adapt behaviour Authentication AyncTask + rotations 2015-02-13 14:29:15 +01:00
David A. Velasco
15dc7be9d9 Count of files & folders removed from view to choose target folder for a MOVE operation 2015-02-11 16:51:46 +01:00
David A. Velasco
f75ddcb97e Fixing build 2015-02-10 10:48:55 +01:00
David A. Velasco
b5d70ad8e7 App updated to OwnCloudAccount with deferred load of credentials 2015-02-10 10:29:51 +01:00
masensio
2c4b08395d Fix bug: Move view should not show as a grid 2015-02-10 09:57:42 +01:00
David A. Velasco
246c25d27e Kill former session when authentication token is updated 2015-02-09 15:30:17 +01:00
masensio
1e7a75c042 Add AuthenticatorAsyncTask 2015-02-09 15:09:04 +01:00
masensio
0b217c465d Convert accessRootFolderRemoteOperation method in AsyncTask 2015-02-09 14:13:40 +01:00
David A. Velasco
64435cab25 Revert "Enable session support for all authentication methods in the app" 
This reverts commit 02372fde24.
 2015-02-09 10:35:25 +01:00
David A. Velasco
170c041505 Revert "Fix bug: When editing the account, it is possible to include any password. Remove cookies when change password" 
This reverts commit 3605bd70da.
 2015-02-09 10:34:39 +01:00
masensio
3605bd70da Fix bug: When editing the account, it is possible to include any password. Remove cookies when change password 2015-02-06 13:05:48 +01:00
David A. Velasco
f728c502c5 Fixed some log levels 2015-02-05 16:34:15 +01:00
David A. Velasco
55c9c3a6c6 Updated services clean-up; Android 4.3 and 4.4 keep a huge number of threads in other case 2015-02-05 16:28:37 +01:00
masensio
3ff42b6220 Cancel the transfers of an account when the account is deleted: Cancel current upload 2015-02-05 09:40:09 +01:00
masensio
beb7d352f9 Cancel the transfers of an account when the account is deleted, part 1 2015-02-04 18:38:11 +01:00
David A. Velasco
28e4b35595 Quotes updated in subject message for shared link, better format string 2015-02-03 13:17:14 +01:00
David A. Velasco
02372fde24 Enable session support for all authentication methods in the app 2015-02-03 13:04:19 +01:00
David A. Velasco
5116bd99e2 Merge branch 'master' into release-1.7.0 2015-02-03 12:46:23 +01:00
masensio
b64fd4cc5b Merge branch 'develop' into cancel_transfer_for_deleted_users 2015-02-03 11:25:09 +01:00
David A. Velasco
e4e50d44c4 Corrections from my own comments 2015-02-03 09:52:22 +01:00
masensio
aa7b7af721 Cancel transfers of an account when it detects that the account doesn't exist 2015-02-02 14:51:46 +01:00
David A. Velasco
4af15f7b4e Merge branch 'develop' into imageGrid 2015-02-02 13:48:30 +01:00
masensio
ab8bf56a15 Detect if the account exists before the tranfer starts 2015-02-02 13:23:33 +01:00
masensio
c6124920d1 Changes from comments in PR 844 2015-02-02 09:34:43 +01:00
tobiasKaminsky
fb095ecc71 save 2015-01-30 17:43:17 +01:00
masensio
7f6c5bd3b2 Merge commit 'refs/pr/701' into create_folder_during_upload_pr_701_with_develop 2015-01-30 12:10:15 +01:00
David A. Velasco
7ddb745bef Clean-up excess of logs in SAML dialog 2015-01-30 11:34:44 +01:00
David A. Velasco
54dc3efc18 Load SAML log-in dialog from the original URL so that cookies returned with the redirection are not lost 2015-01-30 11:34:43 +01:00
masensio
4354329b46 Fix bug: When renaming a folder, in the photos apps both folder are shown 2015-01-29 11:22:47 +01:00
masensio
d19128e770 Merge branch 'develop' into delete_local_files 2015-01-28 10:37:08 +01:00
David A. Velasco
bcef916292 Removed commented code 2015-01-28 09:40:59 +01:00
masensio
d3b0747dde Merge pull request #866 from owncloud/download_folder 
Download a folder
 2015-01-28 09:31:25 +01:00
masensio
a69c04d8e9 Fix bug: audio are not refreshed when delete them from the app 2015-01-27 14:31:44 +01:00
masensio
8ebaba45e7 Show status icons in gridview 2015-01-27 13:51:44 +01:00
David A. Velasco
0df1eeaac4 Fixed download of folder after updating credentials in the app 2015-01-27 13:50:14 +01:00
masensio
281a6b8e1a Fix bug (Media Scan) Files are not refreshed when delete from the app) 2015-01-26 15:15:00 +01:00
David A. Velasco
e89e030077 Commented excess of logs 2015-01-26 13:37:46 +01:00
David A. Velasco
7d16de3c07 Fixed cancellation of SynchronizeOperationFolder 2015-01-26 13:32:54 +01:00
masensio
d2d20d9ec1 Fix bug: Footer is not shown correct in the grid view 2015-01-26 13:09:07 +01:00
David A. Velasco
d860ae7cd4 Added indexed tree of synchronizing folders to SyncFolderHandler 2015-01-26 09:42:44 +01:00
David A. Velasco
9093ef8f9f Refactored SyncFolderHandler out of OperationsService 2015-01-23 09:34:45 +01:00
David A. Velasco
a07937cb6f Minimize refresh of list of files on reception of events from FileDownloader 2015-01-22 22:15:08 +01:00
tobiasKaminsky
bceecf9d17 - moved timeout to PINCODE_TIMEOUT 2015-01-22 21:21:02 +01:00
David A. Velasco
265e32dee6 Added cancelation for subtrees 2015-01-22 20:01:41 +01:00
David A. Velasco
5b54915209 Added indexed tree of folders downloading anything 2015-01-22 17:06:09 +01:00
jabarros
68eb22929d 'Fixed. 'Upload pictures via WIFI only' is hidden when going to files and come back to settings 2015-01-22 13:49:31 +01:00
jabarros
18b45ff589 Fixed. Some message dissapear from list view as 'loading' and 'nothing in here...' 2015-01-22 13:14:57 +01:00
jabarros
81a8604f7f Fixed. Remove size from folders in the Upload view 2015-01-21 18:18:39 +01:00
jabarros
38ea01dc1e Move GridViewWithHeaderAndFooter class to third_parties/in/srain/cube/ 2015-01-21 17:51:16 +01:00
jabarros
d57a472a93 Merge branch 'imageGrid' into imageGrid_footer 2015-01-21 13:06:00 +01:00
jabarros
6cc3596ce8 Fixed. Size of the folders is shown in the file list when it should not 2015-01-21 12:37:28 +01:00
jabarros
e548665897 Fixed. App crashes when accessing to some folders in upload view 2015-01-21 12:15:52 +01:00
jabarros
9b1b5f5e3b Fixed. Footer message should be showed in the list view mode. Also added in grid view mode. 2015-01-21 11:08:15 +01:00
jabarros
dea36157e7 Update unsuccessful downloaded file 2015-01-20 13:00:37 +01:00
jabarros
d8ac7b2241 Merge branch 'download_folder__refactoring_observance_of_downloads_in_progress' into download_folder_update_database 2015-01-20 12:42:27 +01:00
jabarros
05c236ba62 Store file on db with 'downloading' state after adding it to pending downloads 2015-01-20 12:27:40 +01:00
David A. Velasco
d2883905c6 Revert changes for files uploading 2015-01-20 11:28:36 +01:00
jabarros
6674379a5f Remove is_uploading field from database 2015-01-20 11:07:44 +01:00
David A. Velasco
49849786e5 Removed call to methods to check transfer state of files through binders and replaced with methods on OCFile 2015-01-20 09:42:58 +01:00
jabarros
d0cee8be85 Merge branch 'develop' into SettingsGreyedOut 2015-01-20 09:25:20 +01:00
tobiasKaminsky
3c79991b12 Merge branches 'develop' and 'imageGrid' of github.com:owncloud/android into imageGrid2 
Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	owncloud-android-library
 2015-01-19 22:24:33 +01:00
tobiasKaminsky
b5fdba576f changes as requested 2015-01-19 22:13:45 +01:00
tobiasKaminsky
04b77aa2f4 rebased 
footer view disabled due to GridView does not support it
 2015-01-19 22:10:29 +01:00
tobiasKaminsky
d4e0f3bdb1 Merge branch 'develop2' into imageGrid2 
Conflicts:
	owncloud-android-library
	res/layout/list_fragment.xml
	res/values-fr/strings.xml
	src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
	src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2015-01-19 21:02:37 +01:00
jabarros
115268008e Increase db number and added getters and setter for new 'uploading' and 'downloading' fields in OCFile 2015-01-19 14:41:34 +01:00
David A. Velasco
b6e4f0f4ae Merge pull request #798 from LukeOwncloud/develop 
On downgrading upload db, delete and re-create
 2015-01-19 13:44:30 +01:00
jabarros
3515ab160c Added uploading and downloading fields into filelist table 2015-01-19 13:10:21 +01:00
jabarros
e98fc8b141 Merge branch 'develop' into download_folder 2015-01-19 12:49:28 +01:00
jabarros
6022456fd5 Trigger Media Scan on parent folder when deleting a file or a folder from locally 2015-01-19 10:39:23 +01:00
tobiasKaminsky
6d5c6f86e5 Merge branch 'develop2' into imageGrid2 
Conflicts:
	owncloud-android-library
	res/layout/list_fragment.xml
	res/values-fr/strings.xml
	src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
	src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2015-01-18 17:00:29 +01:00
David A. Velasco
2275f2eca4 Move every sendBroadcast from SynchronizeFolderOperation to SyncFolderHandler scope 2015-01-13 20:07:43 +01:00
jabarros
72942b5cb7 Add context description tag to action bar title 2015-01-13 14:08:57 +01:00
jabarros
6c70154a50 Merge branch 'develop' into thumbnailForUpload 2015-01-12 14:30:06 +01:00
jabarros
b7e80e6ace Other minor changes after CR 2015-01-12 14:17:29 +01:00
David A. Velasco
5ee9c129a9 Fixed stuck 'downloading' icon in download of folders 2015-01-12 13:51:30 +01:00
jabarros
5d228838e2 Changes after CR 2015-01-12 12:52:40 +01:00
David A. Velasco
76904d2c8e Fix on search of operation to cancel 2015-01-12 10:43:40 +01:00
jabarros
6fee98e6a4 Fix. Subfolders are not cancelled correctly 2015-01-09 15:16:52 +01:00
jabarros
cc15321173 Fixed. In the upload view, videos does not have the correct icon 2015-01-09 09:46:43 +01:00
David A. Velasco
74d4f5302e Fixed icon for MIME type application/javascript 2015-01-09 09:44:02 +01:00
tobiasKaminsky
d54345d040 Merge remote-tracking branch 'upstream/develop' into uploadNewFolder 
Conflicts:
	src/com/owncloud/android/ui/activity/Uploader.java
 2015-01-08 22:41:41 +01:00
tobiasKaminsky
6b742de58e - removed uneccessary improts 2015-01-08 22:33:28 +01:00
David A. Velasco
1975f9e776 Aesthetic fixes 2015-01-08 16:56:21 +01:00
David A. Velasco
cb5f8b3fcd Considered MIME types for .py, .js, and fixed .xls, .ppt, and some clean-up 2015-01-08 16:43:25 +01:00
jabarros
e6fc5d13ad Notify the download cancelation for updating the screen and remove the yellow arrow that continues being shown after the cancel 2015-01-08 15:02:42 +01:00
jabarros
737381eaad Fix for downloads that are not cancelled 2015-01-08 14:59:27 +01:00
jabarros
46d045fd62 Merge branch 'download_folder' into download_folder__fixing_recursive_cancellation 2015-01-08 14:26:38 +01:00
David A. Velasco
643162cac9 Consider application/xml for XML files 2015-01-08 10:55:42 +01:00
David A. Velasco
8da1926f02 Merge pull request #820 from owncloud/obeySortOrder_fixmerge 
Obey sort order in gallery of images.
 2015-01-08 09:08:42 +01:00
David A. Velasco
14bbe5bf01 First try 2015-01-07 18:23:53 +01:00
jabarros
d05d5ffe1a Merge branch 'develop' into download_folder 2015-01-07 14:04:46 +01:00
jabarros
f737785b4f Change error message when trying download a folder that does not exist 2015-01-07 13:47:38 +01:00
jabarros
90e49a96e4 Added folder name to 'file not found' error message 2015-01-07 13:04:46 +01:00
jabarros
1db11eb586 Fix. App does not realize that the folder does not exist 2015-01-07 11:22:24 +01:00
tobiasKaminsky
0ae80926ac update 2015-01-05 19:53:40 +01:00
tobiasKaminsky
5345fed890 - fix #667 2015-01-01 13:55:06 +01:00
tobiasKaminsky
30b332745d - last whitespace 2015-01-01 13:07:31 +01:00
tobiasKaminsky
cb725acdf3 - removed whitespaces 
- renamed pin description
 2015-01-01 13:06:25 +01:00
jabarros
fa159e4891 Fix. Some icons are not correct. Showed default file icon when there is not mimetype 2014-12-31 14:25:24 +01:00
jabarros
61b267d309 Fix. App does not realize that the folder does not exits when traying to download a folder 2014-12-31 13:48:36 +01:00
jabarros
6caad2be05 Fixed. Icons which have extensions in UpperCase, in the uploads view are not correct 2014-12-30 11:55:13 +01:00
tobiasKaminsky
5def3658a9 fix double pin entry on start 2014-12-30 09:32:33 +01:00
tobiasKaminsky
0e061f6f06 - fix #47 2014-12-29 22:36:15 +01:00
jabarros
cd1a150bf9 Create getThumbnailDimension and add some comments 2014-12-29 17:06:33 +01:00
jabarros
fe5c6b6542 Refactor ThumbnailsCacheManager to reduce repeated code 2014-12-29 14:54:45 +01:00
jabarros
2319a52bab Merge branch 'develop' into thumbnailForUpload 2014-12-29 09:27:50 +01:00
jabarros
0d6320aa79 Move isImage method to BitmapUtils class 2014-12-29 09:26:44 +01:00
tobiasKaminsky
cb5f0971af - moved check to PinCheck 
- hardcoded 10s time-out
 2014-12-29 09:15:51 +01:00
tobiasKaminsky
ed74bba5fb temp 2014-12-27 16:48:40 +01:00
tobiasKaminsky
be4d7d14d2 - fix #76 2014-12-27 16:20:34 +01:00
tobiasKaminsky
9b61fc9af6 - fixes #674, #198 2014-12-27 09:08:11 +01:00
jabarros
da87634804 Merge branch 'develop' into rename_with_special_character 2014-12-26 14:27:52 +01:00
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
Jorge Antonio Diaz-Benito Soriano
49e8dafac0 Merge remote-tracking branch 'upstream/develop' into us4_view_text_files 
Conflicts:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
 2014-12-03 15:08:45 +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