2039 commits

Author	SHA1	Message	Date
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