Commit graph

351 commits

Author SHA1 Message Date
masensio
ea7f8fe491 Merge branch 'setup_colors' into setup_app_name 2013-10-18 12:24:29 +02:00
masensio
7488345470 OC-1663: Replace references to app_name in code 2013-10-17 16:54:43 +02:00
David A. Velasco
af62f9857d Refactoring FileContentProvider and FileDataStorageManager: deletion of subfolders in provider & transactions on database connection 2013-10-16 13:04:49 +02:00
masensio
9681b8687e OC-1656: Disable/enable help-imprint-feedback options 2013-10-16 08:56:41 +02:00
masensio
066cd5aab3 Merge branch 'develop' into contact_settings
Conflicts:
	res/values/strings.xml
2013-10-15 14:07:59 +02:00
masensio
152ab88d90 OC-1668: Block creation of account from device settings 2013-10-15 11:32:46 +02:00
masensio
9fcc118b8a 0C-1647: Enable/Disable Create Account option 2013-10-14 13:39:22 +02:00
David A. Velasco
d8de614d78 Some cleanup and methods renamed in FileDataStorageManager 2013-10-14 13:00:49 +02:00
David A. Velasco
5b8731873e Removed interface DataStorageManager 2013-10-14 12:33:19 +02:00
masensio
b78eb416a4 OC-1670: owncloud_white --> background_color 2013-10-11 15:08:32 +02:00
masensio
10d1efa18d OC-1580: Cancel upload 2013-10-11 14:54:40 +02:00
David A. Velasco
552a34689c Avoid occasional crash in app updates due to 'lost' events from previous synchronizations 2013-10-11 10:50:11 +02:00
David A. Velasco
31ccf4e966 Improved navitagation through navigation list, reducing the number of requests to the server to refresh the target folder 2013-10-09 10:17:21 +02:00
David A. Velasco
ec85b4225e The app goes directly to root folder when the current folder does not exist anymore after refreshing with server 2013-10-08 15:06:20 +02:00
David A. Velasco
79493448d9 Included name of the 'lost' folder in the toast warning about current folder removed in the server 2013-10-08 11:24:15 +02:00
David A. Velasco
fc2baec2f6 Fixed search of an existing current folder when the activity detects that the current folder does not exist any more 2013-10-08 11:17:20 +02:00
David A. Velasco
0aef684087 Fixed some crashes in refresh of current folder 2013-10-08 09:19:52 +02:00
David A. Velasco
23c9be24a2 Clean up of synchronization code 2013-10-04 15:07:05 +02:00
David A. Velasco
74370d5dee Exit the current folder when not existing in the server any more (2) 2013-10-02 18:08:01 +02:00
David A. Velasco
ab3bcf6fe6 Exit the current folder when not existing in the server any more 2013-10-02 16:52:36 +02:00
David A. Velasco
7c3fad35a3 Fixed behaviour when user enters in a folder deleted in the server before the app finishes to synchronize 2013-10-02 10:40:03 +02:00
masensio
df394c71be OC-1507- Reopened. Browse up < 2013-10-01 13:43:52 +02:00
masensio
5ff0989eb4 Merge remote-tracking branch 'origin/develop' into refresh_folder_contents_when_browsed_into 2013-10-01 12:58:17 +02:00
masensio
a8fade7369 OC-1508: App crashes when changing the orientation 2013-10-01 12:56:28 +02:00
David A. Velasco
ea26ae4349 Check and creation for InstantUploads folder fixed and rewritten 2013-09-27 14:34:43 +02:00
masensio
9aa8babbe2 OC-1507: When you browse up, < is shown all the time in the top bar 2013-09-27 14:33:57 +02:00
masensio
aaf8043d0c OC-1230: app doesn't show the folders structure correct for a while. Improve Sync Proccess 2013-09-25 18:38:17 +02:00
masensio
fdf2cae2ce Merge branch 'develop' into refresh_folder_contents_when_browsed_into 2013-09-24 14:57:45 +02:00
masensio
e2e1e62e45 Changes from comments of PR 2013-09-24 14:54:46 +02:00
masensio
d6267698e8 Merge branch 'develop' into refresh_folder_contents_when_browsed_into
Conflicts:
	src/com/owncloud/android/operations/SynchronizeFolderOperation.java
2013-09-20 10:19:44 +02:00
masensio
b884276998 OC-1130: Change the old dialog by the new dialog. 2013-09-19 13:29:25 +02:00
masensio
b9c7b92940 OC-1129: Add LoadingDialog.java 2013-09-18 18:13:24 +02:00
masensio
776c6f1ffd OC-1230 2013-09-11 09:08:21 +02:00
masensio
e0b1e23e45 OC-1194: Adapt Sync Process using etag 2013-09-09 14:42:06 +02:00
masensio
50067ee42b Fix bug: When you browses up, the folder and files dissapears 2013-09-04 10:25:27 +02:00
masensio
2948f1053e OC-922: Synchronize folder, refresh folder size 2013-08-23 14:53:07 +02:00
masensio
472b360675 OC-922: Refresh of folder 2013-08-22 19:11:30 +02:00
David A. Velasco
b2f18e0f12 Avoid that a user can recover an expirated SAML session with a different userid than the used to create it 2013-08-22 19:03:21 +02:00
David A. Velasco
b6213a0d5f Fixed comments in PR#246 2013-08-22 11:48:57 +02:00
David A. Velasco
37297fb7a9 Fixed orientation changes in SSO dialog with WebView 2013-08-21 18:51:13 +02:00
masensio
55f2bd23e6 Move Shibboleth WebView to a big Dialog 2013-08-13 13:28:45 +02:00
masensio
9dacdbec0b Move WebView to Dialog 2013-08-13 12:08:46 +02:00
David A. Velasco
5a65ff53c2 AuthenticatorActivity updated to test existance through SAML-based-federated-authenticated entry point 2013-07-26 13:05:01 +02:00
David A. Velasco
fffa77e211 Merge remote-tracking branch 'origin/bug_folder_size_delay' into bug_folder_size_delay 2013-07-09 13:25:43 +02:00
masensio
a72d7bfe21 OC-577: Modify FileDataStorageManager to call updateSubtreeSize. OC-523 2013-07-09 13:20:52 +02:00
masensio
eee74aa5f2 OC-575: Update the size of a folder in DB during the sync. OC-523 2013-07-09 13:16:40 +02:00
masensio
50628c0c0b OC-574: Show size in list from local database. OC-523 2013-07-09 13:04:40 +02:00
masensio
a52ff9359f OC-577: Modify FileDataStorageManager to call updateSubtreeSize. OC-523 2013-07-05 14:54:02 +02:00
David A. Velasco
b708d46def REALLY added imprint link in settings; imprint and help links protected for bad configuration of preferences.xml 2013-07-05 14:00:41 +02:00
David A. Velasco
12bffce50c Added help link, feedback email, recommendations through email, and (disabled) imprint link to app settings 2013-07-05 10:47:34 +02:00
masensio
994e81d7ce OC-575: Update the size of a folder in DB during the sync. OC-523 2013-07-04 18:47:38 +02:00
masensio
0707f6cf71 OC-574: Show size in list from local database. OC-523 2013-07-04 10:34:57 +02:00
David A. Velasco
dcbc08cae7 Merge branch 'develop' into check_account_existance_in_gallery 2013-07-03 10:06:37 +02:00
David A. Velasco
e8239f434a Merge branch 'develop' into modify_password 2013-07-02 13:08:27 +02:00
David A. Velasco
82375a917b FIXED: right screen when the app is left in a video, the account is deleted, the orientation is changed, the app is opened and the account reloged-in 2013-07-02 12:41:10 +02:00
David A. Velasco
fb500a906c Fixed lost of state of list of files in orientation changes 2013-06-28 13:35:03 +02:00
David A. Velasco
5b792b0440 Merge branch 'develop' into check_account_existance_in_gallery 2013-06-28 11:58:43 +02:00
David A. Velasco
04803ae879 Fixed false error message and lack of recheck when a server certificate is explicitly accepted by the user in the login view 2013-06-26 12:45:35 +02:00
David A. Velasco
646abfa08d Fixed update of action bar in successful rename 2013-06-26 11:47:20 +02:00
David A. Velasco
0f2a7475b1 Disabled logging options until fixed 2013-06-26 09:13:28 +02:00
David A. Velasco
863f3f68d2 Merge pull request #197 from owncloud/fixed_crash_due_to_uploads_to_accounts_not_already_existing
Fixed crash due to uploads to accounts not already existing
2013-06-25 23:51:58 -07:00
David A. Velasco
a102f26925 AuthenticatorActivity is started when 'change password' is selected for a list in the list of accounts 2013-06-21 14:04:48 +02:00
David A. Velasco
19bcc99538 Fixed: details about progress are shown when the notification of an upload is clicked 2013-06-18 14:59:36 +02:00
David A. Velasco
6ca1e170f7 Fixed crash, error notified instead 2013-06-18 14:04:51 +02:00
David A. Velasco
c4ac05dee2 REFACTORING: moved AccountUtils to .authentication package 2013-06-18 11:34:08 +02:00
David A. Velasco
7f34fba421 ConflictsResolveActivity protected against access to non-existing account 2013-06-17 14:43:26 +02:00
David A. Velasco
c43b15deab UploadFileActivity protected agains access to non-existing account 2013-06-17 14:21:33 +02:00
masensio
90428ec4c7 Merge remote-tracking branch 'origin/develop' into folderSizeInfo
Conflicts:
	.classpath
	tests/.classpath
2013-06-17 13:32:40 +02:00
David A. Velasco
10b014a19a Fixed bad transitions after adding protection for removed accounts to PreviewVideoActivity 2013-06-17 11:16:39 +02:00
David A. Velasco
3ecabe3ea7 PreviewVideoActivity protected against access to non-exiting account 2013-06-14 16:59:38 +02:00
David A. Velasco
f9babe7b7d PreviewImageActivity protected against access to non-existing account 2013-06-14 12:53:45 +02:00
David A. Velasco
3440b8a1d2 Fixed repeated request for create first account when all the accounts where removed after the app was left in an actitivy not root in its task 2013-06-13 11:35:17 +02:00
David A. Velasco
782186f5b1 Removed 'download' and 'open with' options from contextual menu in list of files 2013-06-10 14:21:24 +02:00
David A. Velasco
64bbf07d97 OC-299 fixed restart of finished downloads on orientation changes 2013-06-10 13:52:24 +02:00
masensio
6e2949f681 Update branch with develop branch 2013-06-06 17:22:25 +02:00
David A. Velasco
93f79c7099 Cancel button for downloads in progress replaceed with 'x' icon 2013-06-05 11:08:33 +02:00
David A. Velasco
16f121a7b2 REFACTORING: update mFile in FileDisplayActivity to improve transitions from notification bar, and some other fixes 2013-06-05 09:59:48 +02:00
David A. Velasco
c70f333358 REFACTORING: fix layout problems in orientation changes after removing FileDetailActivity 2013-06-04 14:30:29 +02:00
masensio
b2c6dd188d OC-167 2013-05-31 14:05:06 +02:00
David A. Velasco
fd39628997 REFACTORING: FileDetailActivity never more - simplifies transitions and removes bugs in orientation changes 2013-05-30 17:53:21 +02:00
David A. Velasco
5966b38de7 Open downloaded files with just click on the list of files 2013-05-29 10:42:04 +02:00
David A. Velasco
f767bf3f01 Non-previewable file is opened after successful donwload 2013-05-28 13:11:57 +02:00
David A. Velasco
99d5800234 Improved algorithm to open files with external apps: MIME type identified by the system is prefered before than the saved one from the server 2013-05-28 10:29:03 +02:00
David A. Velasco
edb380e0cd Code refactored to 'open file' in a single point 2013-05-27 15:01:54 +02:00
David A. Velasco
c6ed18dafa Download any file just with click on the list of files 2013-05-27 14:07:33 +02:00
David A. Velasco
fe159af4ea Removed unnecessary code for showing progress circle after creation of first account 2013-05-07 14:25:48 +02:00
David A. Velasco
bc1fcf8493 Added account existance validation to FileDetailsActivity 2013-05-07 13:49:54 +02:00
David A. Velasco
979bdc83b2 Replaced public scope with protected scope in inherited on*** methods for FileActivityS 2013-05-07 13:05:40 +02:00
David A. Velasco
f6780fdc00 Improved implementation of redirection for first account 2013-05-07 12:54:31 +02:00
David A. Velasco
b36914df88 Merge branch 'develop' into file_browsing_refactoring
Conflicts:
	AndroidManifest.xml
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/fragment/FileDetailFragment.java
2013-05-06 10:48:43 +02:00
David A. Velasco
2a95f59adc Fixed bug when turning tablet with no file in the right fragment
Conflicts:

	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
2013-05-03 13:14:32 +02:00
David A. Velasco
f6846b6686 Fixed flow from click on (up|down)load notifications in landscape tablets: dual pane, please 2013-05-02 16:34:38 +02:00
David A. Velasco
00328cb889 Video previews reworked to provide seamless playback in turns and changes between fullscreen and embedded, in any combination and order 2013-04-30 13:16:08 +02:00
zerginator
5b9bf1ad3f Issue #28 folders don't show date and size info 2013-04-28 15:19:34 +02:00
David A. Velasco
6496b9200d Video embedded mantains its playback state when the device is turned to other orientation 2013-04-26 14:02:17 +02:00
David A. Velasco
2946d8dd69 Merge branch 'develop' into oauth_login
Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/com/owncloud/android/Uploader.java
	src/com/owncloud/android/authentication/AccountAuthenticator.java
	src/com/owncloud/android/authenticator/AuthenticationRunnable.java
	src/com/owncloud/android/authenticator/OnAuthenticationResultListener.java
	src/com/owncloud/android/authenticator/OnConnectCheckListener.java
	src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
	src/com/owncloud/android/files/services/FileDownloader.java
	src/com/owncloud/android/files/services/FileOperation.java
	src/com/owncloud/android/files/services/FileUploader.java
	src/com/owncloud/android/network/OwnCloudClientUtils.java
	src/com/owncloud/android/operations/RemoteOperationResult.java
	src/com/owncloud/android/operations/UpdateOCVersionOperation.java
	src/com/owncloud/android/syncadapter/FileSyncAdapter.java
	src/com/owncloud/android/ui/activity/AccountSelectActivity.java
	src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/fragment/FileDetailFragment.java
	src/eu/alefzero/webdav/WebdavClient.java
2013-04-25 19:39:22 +02:00
David A. Velasco
6a6d83311f Avoid duplicated 'refresh file' entry in context menu on an item in the list of files 2013-04-24 11:04:23 +02:00
David A. Velasco
850d7a115d Fixed: hide all the actions for single file when none of them is selected in the landscape view 2013-04-22 15:11:09 +02:00
David A. Velasco
803568ab27 Moved buttons in details view to options/action menu 2013-04-22 14:34:42 +02:00
David A. Velasco
9ad30bdded Refactored path to directory for instant uploads; fixed some problems with first upload for never-synchronized accounts 2013-04-17 18:00:31 +02:00