David A. Velasco
26eed9132e
Fixed wrong field override breaking options menu in PreviewMediaFragment and PreviewImageFragment
2014-05-07 17:05:33 +02:00
David A. Velasco
e42fcc1e32
Merge remote-tracking branch 'origin/refactor_update_filelist_from_database' into refactor_update_filelist_from_database
2014-05-07 10:03:41 +02:00
masensio
69fa5b9185
Enable necessary refresh in FileDisplayActivity. Delete onFileStateChanged in ContainerActivity
2014-05-07 09:46:25 +02:00
David A. Velasco
3adb39a15e
Review and reenable calls to refresh list of files where necessary, for events out of OnRemoteOperationListener flow
2014-05-07 09:46:20 +02:00
David A. Velasco
b86059bf83
Moved UploadFinishReceiver from FileDetailFragment to FileDisplayActivity
2014-05-06 14:07:47 +02:00
masensio
53a168c5a6
Revert "FileListListAdapter is a SimpleCursorAdapter"
...
This reverts commit 44dae87d2f
.
Conflicts:
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2014-05-06 13:28:26 +02:00
masensio
f119a13a30
Revert "Add mCursor to FileListListAdapter"
...
This reverts commit 85b6d7a987
.
Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
2014-05-06 13:22:59 +02:00
masensio
4e9becbc97
Revert "FileListListAdapter based in CursorAdapter instead of SimpleCursorAdapter for more flexible integration"
...
This reverts commit 65c7d5d5ba
.
Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2014-05-06 13:15:04 +02:00
masensio
f2d4ae877f
Revert "Add FileListCursorLoader. Update data using CursorLoader and LoaderManager. Update filelist when a file/folder is deleted"
...
This reverts commit c9626772a1
.
Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2014-05-06 13:04:23 +02:00
masensio
9804b40839
Revert "Update filelist for insert actions, sent notification to uri in FileContenProvider"
...
This reverts commit 4834fe15c7
.
2014-05-06 12:56:42 +02:00
masensio
97e4d690da
Revert "Update filelist for update actions, sent notification to uri in FileContenProvider"
...
This reverts commit 8283b301e1
.
2014-05-06 12:56:19 +02:00
masensio
e5c3f2eaa5
Revert "Grant that the content of the previous adapter is updated with rotations"
...
This reverts commit 9820893fd9
.
2014-05-06 12:55:21 +02:00
masensio
40b5fb8156
Revert commit 6cdd830a7b
2014-05-06 12:54:13 +02:00
David A. Velasco
c6edcab5a2
Merge remote-tracking branch 'origin/refactor_update_filelist_from_database' into refactor_update_filelist_from_database
2014-05-06 10:58:19 +02:00
David A. Velasco
bea36f23b0
Refactoring relationship between FileActivities and FileFragments (WIP)
2014-05-06 10:54:23 +02:00
masensio
6cdd830a7b
Additional changes to apply the new code to the other FileFragments: PreviewMediaFragment, DetailsFragment, PreviewImageFragment
2014-05-05 14:10:15 +02:00
masensio
9820893fd9
Grant that the content of the previous adapter is updated with rotations
2014-05-05 10:44:43 +02:00
masensio
8283b301e1
Update filelist for update actions, sent notification to uri in FileContenProvider
2014-05-02 14:33:23 +02:00
masensio
4834fe15c7
Update filelist for insert actions, sent notification to uri in FileContenProvider
2014-05-02 14:32:01 +02:00
masensio
c9626772a1
Add FileListCursorLoader. Update data using CursorLoader and LoaderManager. Update filelist when a file/folder is deleted
2014-05-02 14:24:00 +02:00
David A. Velasco
5b32faae4d
Refactoring to reduce dependencies and duplicated code (WIP)
2014-04-30 18:37:55 +02:00
David A. Velasco
6c33cefba0
WIP - commented pull-refreshes of list view as previous step to trust refresh to observer registered by Cursor
2014-04-29 13:53:11 +02:00
David A. Velasco
65c7d5d5ba
FileListListAdapter based in CursorAdapter instead of SimpleCursorAdapter for more flexible integration
2014-04-29 13:17:33 +02:00
masensio
85b6d7a987
Add mCursor to FileListListAdapter
2014-04-28 13:56:17 +02:00
masensio
44dae87d2f
FileListListAdapter is a SimpleCursorAdapter
2014-04-28 12:09:07 +02:00
David A. Velasco
e7a6a68531
Minimized imports
2014-04-22 12:30:15 +02:00
David A. Velasco
e2f0af1c26
Fixed lost automatic check of OC server on enforced update of password
2014-04-21 14:49:00 +02:00
David A. Velasco
37b44a551a
Fixed crash when browsing app from instantUploads folder after entering into the app from a notification
2014-04-21 14:27:06 +02:00
David A. Velasco
68f4ceb5a7
Separate options to enable & disable instant upload of new pictures and new videos
2014-04-21 10:49:31 +02:00
David A. Velasco
ffdc77f8d8
Fixed crash when clicking on an error notification due to wrong credentials
2014-04-16 20:13:35 +02:00
David A. Velasco
33b0909e7b
Merge branch 'develop' into videoInstandUploads
2014-04-16 19:31:27 +02:00
David A. Velasco
e8d969f032
Allow instant upload of new videos although not using Wi-Fi, with the same policy as pictures
2014-04-16 19:30:01 +02:00
masensio
b96cce8384
Fix bug: When accessing an coming back several times, the folder is hidden
2014-04-09 17:37:57 +02:00
masensio
e5ab756691
Add some comments for VideoInstantUploads
2014-04-08 14:58:41 +02:00
masensio
086985ad26
Fix bug: App crashes when coming back from a folder of second level
2014-04-08 13:58:27 +02:00
masensio
e8e1c7a0af
Grant InstantUpload feature works as before.
2014-04-08 13:02:59 +02:00
masensio
3351db6527
Merge branch 'develop' into videoInstandUploads
2014-04-08 12:50:50 +02:00
masensio
d3ecaa5a38
Fix bug: folder is not shown after accessing to it and coming back
2014-04-08 11:27:44 +02:00
masensio
2b06f07b17
Merge branch 'develop' into save_position_in_scroll_when_browsing
2014-04-08 09:29:47 +02:00
masensio
cbdcf7d457
Disable extra logs
2014-04-07 15:21:21 +02:00
David A. Velasco
0b0cc609c9
Fixed broken life cicle in FileActivity
2014-04-07 14:09:43 +02:00
David A. Velasco
f24e56d19d
Removed commented code and remaining forced exception
2014-04-07 11:14:44 +02:00
David A. Velasco
a3798996e1
Recovered some extra logs before validating
2014-04-07 10:24:43 +02:00
David A. Velasco
12bbc51dcb
Preventing hash colisions in identifier of operations
2014-04-07 10:22:08 +02:00
David A. Velasco
8d38fd331d
Simplified interface to request 'lost results' during rotation of Activity
2014-04-07 09:24:57 +02:00
masensio
baa585550d
Enable extra logs before validation to fix easily any possible bug
2014-04-04 15:05:21 +02:00
masensio
c1df34b5e3
Merge remote-tracking branch 'origin/operations_service' into operations_service
2014-04-04 14:50:46 +02:00
masensio
d535c420f2
Grant that OperationsService doesn't keep old saved results forever
2014-04-04 14:49:20 +02:00
David A. Velasco
8f5ab8df08
Merge remote-tracking branch 'origin/operations_service' into operations_service
2014-04-04 14:19:05 +02:00
David A. Velasco
7cf05f3647
Internal refactorization of AccountAuthenticatorActivity (and related dependencies)
2014-04-04 14:18:42 +02:00
masensio
46e949c826
Grant Share and Unshare work properly.
2014-04-04 12:57:25 +02:00
masensio
40f5eb6de6
Grant that same result is never processed twice by the same listener (one through callback, one through getResult)
2014-04-03 17:24:03 +02:00
masensio
5b7c5f6244
Take care with orientation changes when save and restore scroll position
2014-04-03 14:56:31 +02:00
masensio
20e3a5f420
Save the scroll position when moving between folders. REstore scroll position
2014-04-03 14:36:55 +02:00
David A. Velasco
0024569aff
AuthenticatorActivity clean up: removed commented code and warnings
2014-04-02 12:46:54 +02:00
masensio
eb95be232f
Run GetRemoteUserNameOperation in OperationsService
2014-04-02 09:46:40 +02:00
David A. Velasco
e566d041d1
Merge remote-tracking branch 'origin/operations_service' into operations_service
2014-04-01 15:17:33 +02:00
masensio
c2c10bcff8
Run ExistenceCheckRemoteOperation on OperationsService
2014-04-01 14:51:53 +02:00
masensio
5ac1a1ebbb
Merge branch 'develop' into operations_service
2014-04-01 14:18:32 +02:00
David A. Velasco
0addc90ae5
Moved OAuth2GetAccessToken to be run in OperationsService
2014-04-01 13:56:08 +02:00
David A. Velasco
08aa08ce60
Moved execution of GetServerInfoOperation into OperationsService
2014-04-01 11:59:38 +02:00
David A. Velasco
022c555aca
GetRemoteStatusOperation and DetectAuthenticationMethodOperations are joint in GetServerInfoOperation
2014-04-01 11:41:11 +02:00
David A. Velasco
11f5a299bd
Modifies OperationsService so that activities can request the resulf of operations finished while the activity was 'rotating'; and applie to DetectAuthenticationMethodOperation
2014-03-31 13:14:47 +02:00
masensio
2628eceb6b
Modify DetectAuthenticationMethodOperation so that , when returning its result through the callback, there is no crash if AuthenticatorActivity is not ready (rotating)
2014-03-28 15:04:10 +01:00
masensio
2812120456
Add webdav url to DetectAuthenticationMethodOperation
2014-03-28 14:51:36 +01:00
David A. Velasco
7c4fc0486f
Merge remote-tracking branch 'origin/operations_service' into operations_service
2014-03-28 12:57:44 +01:00
masensio
f991e1e91d
Modify OperationsService so that AuthenticatorActivity may ask for the execution of DetectAuthenticationMethodOperation in the service
2014-03-28 12:57:18 +01:00
David A. Velasco
565875d753
AuthenticatorActivity is bound to OperationsService when created
2014-03-28 12:55:07 +01:00
masensio
53a2789326
Check the version number instead of the version string
2014-03-27 18:01:37 +01:00
masensio
1195c6dba3
Check the version number taking into account the new format
2014-03-27 09:45:41 +01:00
David A. Velasco
fb9f7797f4
Fixed detection of authentication method in server with permanent redirection
2014-03-26 08:34:39 +01:00
David A. Velasco
afaa4b2df3
Fixed lost text in notifications for failed uploads
2014-03-25 08:52:05 +01:00
David A. Velasco
571fdba15e
Fixed crash after app updates due to changed serialization id in RemoteOperationResult
2014-03-24 13:18:23 +01:00
masensio
1bda7e1e87
Merge branch 'develop' into regular_authentication_in_saml_server
2014-03-24 09:31:43 +01:00
masensio
4191f66593
Merge pull request #445 from owncloud/remove_refresh_of_shares_in_full_sync
...
Removed refresh of shares in full synchronization
2014-03-21 14:56:46 +01:00
masensio
dca770be6a
Modify AuthenticatorActivity#detectAuthorizationMethod so that it triggers a DetectAuthorizationOperation when called. Modifiy AuthenitcatorActivity#onRemoteOperationResult to process the response of DetectAuthorizationOperation
2014-03-21 14:51:56 +01:00
David A. Velasco
d20c1e4141
Implemented analysis in DetectAuthenticationMethodOperation to find out what authentication method requires the server side
2014-03-21 13:42:39 +01:00
David A. Velasco
bef5d5c5f8
Added skeleton of new operation to detect authentication method in the server side
2014-03-21 12:03:25 +01:00
David A. Velasco
a3bf6883fc
Merge branch 'develop' into regular_authentication_in_saml_server
2014-03-21 11:02:36 +01:00
masensio
7ed3179100
Merge branch 'develop' into improve_notifications_pr_400_with_develop
2014-03-21 10:37:11 +01:00
masensio
2d6826fe8b
Merge pull request #400 from tommyd3mdi/develop
...
Notification improvements
2014-03-21 10:32:49 +01:00
David A. Velasco
0336eced64
Fixed lost of 'shared' attribute during full synchronization process for already known shares
2014-03-21 09:05:19 +01:00
David A. Velasco
4f4c6843a7
Merge branch 'develop' into remove_refresh_of_shares_in_full_sync
2014-03-20 17:48:23 +01:00
masensio
4ae57b5bea
Changes from comments in PR#443
2014-03-20 16:51:00 +01:00
masensio
c6f0847866
Changes from comments in PR#443
2014-03-20 16:15:59 +01:00
masensio
3064f1fc4b
Changes from comments in PR#442, in oc-project
2014-03-20 15:35:23 +01:00
masensio
d9219441b1
Revert "Changes from comments in PR#442, in oc-project"
...
This reverts commit 0aa9a0bc6c
.
2014-03-20 14:01:35 +01:00
masensio
0aa9a0bc6c
Changes from comments in PR#442, in oc-project
2014-03-20 13:52:34 +01:00
David A. Velasco
604abaf3b4
Grant that progress bar in notifications is shown in Android 2.x and 3.x devices
2014-03-20 10:43:06 +01:00
masensio
b0cfec7a00
Add auth_unsupported_basic_auth string
2014-03-20 09:08:02 +01:00
masensio
432d696432
Merge branch 'develop' into regular_authentication_in_saml_server
2014-03-19 17:57:56 +01:00
masensio
1fb1a3294e
Merge branch 'develop' into share_link__reuse_link_shared_in_server
2014-03-19 17:22:31 +01:00
masensio
738ea33c06
Merge branch 'develop' into remove_refresh_of_shares_in_full_sync
2014-03-19 17:17:55 +01:00
masensio
d326d100ed
Revert "Prevent that full synchronization process browses deeper when already knows no change exists under the current folder"
...
This reverts commit dabcf4dce4
.
2014-03-19 17:00:27 +01:00
masensio
71e049394e
OC-3390: Shows message about 'not support authentication' under server address
2014-03-19 10:07:56 +01:00
masensio
3e108163bc
Merge branch 'develop' into regular_authentication_in_saml_server
2014-03-19 08:55:37 +01:00
masensio
705bee08fa
OC-3390: Message is shown in the login screen instead of an alert message: Change the alert dialog by an error message under server address
2014-03-18 15:13:50 +01:00
masensio
0d2c764638
Merge branch 'develop' into remove_refresh_of_shares_in_full_sync
2014-03-18 14:43:34 +01:00
masensio
c80357f750
OC-3386:(Fix bug) An alert saying 'trying to login' is shown before clicking the to connect
2014-03-18 14:41:25 +01:00
masensio
b124167f50
Merge pull request #395 from dontcallmedom/master
...
allow multi-line checkbox for preferences with long titles
2014-03-18 14:28:17 +01:00
masensio
d10c10532f
OC-3381: (Fix bug) In preferences, the 'instant upload via WIFI' field is multiline but only use two lines instead of three
2014-03-18 13:40:28 +01:00
masensio
6e86dfb001
OC-3376: 'manage account' field is multiline, in preferences
2014-03-18 13:36:16 +01:00
masensio
a043bcd8de
OC-3314: Modify CreateShareOperation#run in the application so that it uses GetRemoteSharesForFileOperation() to get a remote link in the server (if exists) and use it without creating a new one
2014-03-18 12:51:15 +01:00
masensio
d01e065586
OC-3261: Fix a problem when trying to detect the kind of authentication. Add new AlertMessageDialog. Show an alert message if it is necessary a different authentication method
2014-03-17 13:39:03 +01:00
David A. Velasco
dabcf4dce4
Prevent that full synchronization process browses deeper when already knows no change exists under the current folder
2014-03-17 13:02:36 +01:00
David A. Velasco
5d53f3c0ba
Recursive refresh of folders in full synchronization does not retrieve information about shares
2014-03-17 12:28:54 +01:00
masensio
eda6ddd98f
OC-3260: Detect authentication method
2014-03-17 10:29:24 +01:00
David A. Velasco
7ab8ee7d4a
Progress bar in notifications is hidden when download/upload finishes
2014-03-14 14:29:25 +01:00
David A. Velasco
35bf347759
Grant that notifications of finished downloads can be removed from notification are without clicking on
2014-03-14 14:18:52 +01:00
masensio
4299d1e650
Correction in license of CheckBoxPreferenceWithLongTitle
2014-03-13 15:59:40 +01:00
masensio
9b2e4a6063
Merge branch 'pr/400' into improve_notifications_pr_400_with_develop
2014-03-13 15:49:17 +01:00
masensio
2ab9496b6e
Merge branch 'pr/395' into allow_multiline_checkbox_preferences_pr_395_with_develop
2014-03-13 10:39:22 +01:00
masensio
834c98644b
Remove some import warnings
2014-03-12 10:53:32 +01:00
David A. Velasco
5338b93604
Fixed wrong reload of SAML web dialog after rotation when the SSL-error dialog is visible over it
2014-03-12 10:32:05 +01:00
masensio
41efad3804
Merge branch 'develop' into check_server_certificates_in_SSO_webview
2014-03-12 08:44:56 +01:00
Thomas Keller
5eccd08bc7
Notification improvements:
...
- use NotificationCompat.Builder from the support library and remove the custom progressbar layout; this will give platform users the expected look and feel of a notificati
- remove OCNotificationManager (it contained the old layout references, but was unused)
- add new notification icons that follow the Android style guidelines (http://developer.android.com/design/style/iconography.html#notification )
2014-03-12 00:08:51 +01:00
masensio
207a52f422
OC-3242: Add new error message for fail in GetUserName. No changes in library reference
2014-03-11 14:43:48 +01:00
masensio
660f97baab
Revert "OC-3242: Add new error message for fail in GetUserName"
...
This reverts commit 564bbf7bb8
.
2014-03-11 14:40:38 +01:00
masensio
564bbf7bb8
OC-3242: Add new error message for fail in GetUserName
2014-03-11 13:56:41 +01:00
David A. Velasco
8c6f415ed4
Ssl-error dialogs joint in a single one that uses different adapters to update its view depending on the classes providing the information
2014-03-11 11:39:19 +01:00
masensio
101cbbe492
Merge branch 'develop' into check_server_certificates_in_SSO_webview
2014-03-10 11:08:42 +01:00
masensio
45bc02fbe5
OC-3212: Show appropiate error messages for SslError in SSL error dialog shown by WebViewClient
2014-03-10 10:53:11 +01:00
masensio
9cac3b60a5
Merge branch 'add_ssl_warning_dialog_for_devices_without_access_to_X509Certificte_in_WebView_SSL_errors' into check_server_certificates_in_SSO_webview
2014-03-07 15:11:59 +01:00
masensio
6944503874
OC-3208: Unify both SSL dialogs taking information from X509Certificate in just one
2014-03-07 14:48:42 +01:00
David A. Velasco
a2be11ad54
Improved view of certificate details for SSL dialog based on SslCertificate
2014-03-07 14:39:30 +01:00
David A. Velasco
6bab28424a
Added new dialog for SSL errors showing information saved in SslCertificate
2014-03-07 13:44:13 +01:00
masensio
517bde6aae
OC-3196: Rewrite according to comments in PR#420
2014-03-07 09:38:42 +01:00
masensio
8e1a2573b9
OC-3116: Add a warning dialog for untrusted SslCertificates and show it instead of call proceed() directly
2014-03-06 18:26:35 +01:00
David A. Velasco
ebcc9b98e3
Alternative solution for fix in 10f99ceb9ca... enforcing dialog dissmiss instead of introducing false specific onConfigurationChange
2014-03-06 16:29:21 +01:00
masensio
e280f5e618
Add License in LoadindDialog
2014-03-05 12:44:09 +01:00
masensio
1ace8a21ef
OC-3163: Check if the certificate is in the app cetificates repository (mKnownServers of NetworkUtils)
2014-03-05 12:16:48 +01:00
masensio
ee79b7a9a9
OC-3111: Check in SsoWebViewClient#onReceivedSslError() if the failed X509Certificate is accesible
2014-03-05 10:20:56 +01:00
masensio
56853acff0
Won't Fix:
...
Revert "OC-3121: (fix bug) An empty message is sent, when renaming a file in the web of a big file"
This reverts commit df4d0355f2
.
2014-03-04 13:28:07 +01:00
masensio
df4d0355f2
OC-3121: (fix bug) An empty message is sent, when renaming a file in the web of a big file
2014-03-04 11:58:30 +01:00
masensio
77b7f99d66
OC-3097: (fix bug) When the connection is lost during a download, app thinks that the download is finished
2014-02-28 13:56:33 +01:00
masensio
1b77e7f846
Hotfix on develop: Show share file instead send_file for folders
2014-02-27 12:32:28 +01:00
masensio
ac836eddb7
Merge branch 'develop' into send_file_pr311_with_develop
2014-02-27 08:40:17 +01:00
masensio
aaba7b2725
OC-3097:(fix bug) When the connection is lost during a download, app thinks that the download is finished
2014-02-26 17:23:18 +01:00
masensio
10f99ceb9c
OC-3079: (fix bug) Two send options appear after send and mail with a ownCloud file
2014-02-26 11:05:25 +01:00
masensio
21a6560375
OC-3087: (fix bug) The loading doesn't deissapear during the download process
2014-02-26 10:28:21 +01:00
masensio
b230388f63
OC-3082: The file list is white after send a not downloaded file
2014-02-25 14:40:44 +01:00
masensio
7c0865ae0f
OC-3078: (Fix bug) Appear 'Copy link' option on the send menu
2014-02-25 11:18:43 +01:00
masensio
64452b60f6
OC-3050: Grant the filelist doesn't refresh unnecessary because of the old update folder size
2014-02-24 13:54:03 +01:00
masensio
c8fc9cfa70
Merge branch 'develop' into remove_folder_size_info
2014-02-24 13:37:48 +01:00
masensio
af1f880b27
Merge branch 'develop' into send_file_pr311_with_develop
2014-02-24 13:33:23 +01:00
masensio
271078a403
Merge branch 'master' into develop
2014-02-24 13:16:57 +01:00
masensio
a5215ce89e
OC-3049: Remove the database update for the folder size data: modify FileContentProvider and FileSyncAdapter.
2014-02-24 10:51:44 +01:00
masensio
049f659f77
OC-3049: Remove the database update for the folder size data
2014-02-21 14:46:09 +01:00
masensio
422f87c57f
OC-3047: Hide the file size when the file is a folder
2014-02-21 14:06:02 +01:00
David A. Velasco
6faa40fde5
Fixed problems unsharing links when other kind of shares exist on a file
2014-02-20 15:00:52 +01:00