Commit graph

337 commits

Author SHA1 Message Date
David A. Velasco
f767bf3f01 Non-previewable file is opened after successful donwload 2013-05-28 13:11:57 +02:00
David A. Velasco
50d77e8dc8 Review of login view layout optimizing the adaption to different screen sizes 2013-05-10 16:35:01 +02:00
David A. Velasco
1ee5b70d94 Generic values for Oauth 2 configuration 2013-05-03 13:30:35 +02:00
David A. Velasco
9b4da8439a Merge branch 'develop' into oauth_login
Conflicts:
	res/layout-land/account_setup.xml
	res/layout/account_setup.xml
2013-05-03 10:24:20 +02:00
zerginator
2acbe9455d Issue #56 + Issue #14 + Issue #143 2013-05-01 21:34:13 +02:00
zerginator
536cc166b6 Issue #136 [Feature] Instant upload of videos 2013-05-01 20:06:13 +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
bdc0332c23 Copyright note fixes 2013-04-17 12:26:13 +02:00
David A. Velasco
7052e3b5b8 About in settings, more i18n-friendly 2013-04-15 13:45:20 +02:00
David A. Velasco
c3ca5b5a4f Merge branch 'develop' into loggingtool
Conflicts:
	AndroidManifest.xml
	res/menu/main_menu.xml
	src/com/owncloud/android/datamodel/OCFile.java
	src/com/owncloud/android/files/services/FileDownloader.java
	src/com/owncloud/android/files/services/InstantUploadService.java
	src/com/owncloud/android/operations/SynchronizeFileOperation.java
	src/com/owncloud/android/operations/UploadFileOperation.java
	src/com/owncloud/android/ui/activity/FileDetailActivity.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/activity/UploadFilesActivity.java
	src/com/owncloud/android/ui/fragment/FileDetailFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
	src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java
	src/eu/alefzero/webdav/FileRequestEntity.java
	src/eu/alefzero/webdav/WebdavClient.java
2013-04-15 13:12:04 +02:00
David A. Velasco
053aad5ae1 Merge branch 'bug_hunting' into feature_previews
Conflicts:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
2013-04-04 16:49:04 +02:00
David A. Velasco
77ddd1ccb6 Merge branch 'develop' into feature_previews
Conflicts:
	AndroidManifest.xml
	res/menu/file_context_menu.xml
	res/menu/menu.xml
	res/values-de-rDE/strings.xml
	res/values/strings.xml
	src/com/owncloud/android/files/services/FileUploader.java
	src/com/owncloud/android/operations/UploadFileOperation.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
2013-04-04 16:44:30 +02:00
zerginator
5a22c7e79f Cleaned stuff , add a history delete button and renamed
Log2EmailActivity in LogHistoryActivity
2013-04-01 10:26:40 +02:00
David A. Velasco
97ae9007e4 Fixed hardcoded string in UploaderActivity layout; and German translations 2013-03-27 17:19:19 +01:00
David A. Velasco
2e5b40e357 Make the OAuth authorization available or not depending upon a variable in oauth.xml 2013-03-27 13:39:00 +01:00
David A. Velasco
980b31de2e Allow edition of OAuth endpoints for testing; better configuration values 2013-03-22 14:50:30 +01:00
David A. Velasco
cd45a90bac Fixed typo 2013-03-21 14:00:46 +01:00
David A. Velasco
69d6d821ec OAuth clean-up and refactoring 2013-03-21 12:21:48 +01:00
David A. Velasco
5665d9c306 Merge tag 'oc-android-1-3-22' into oauth_login
Conflicts:
	AndroidManifest.xml
	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/services/FileOperation.java
	src/com/owncloud/android/files/services/InstantUploadService.java
	src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
2013-03-18 14:28:49 +01:00
David A. Velasco
7d84fd0c9f Refresh authorization token on failed synchronizations when notification error is clicked 2013-03-18 14:05:34 +01:00
Matthias Baumann
6c5f561342 - exclude none InstantUpload from InstantUploadActivity
- add simple Activity for none InstantUloads to show the whole
error-message
2013-03-17 10:38:42 +01:00
Matthias Baumann
7392cfe5ab - InstantUpload path const not longer at two places, only at
InstantUploadService
- new method to create the full path for the instantupload's
- add QUOTA_EXCEEDED to RemoteOperationResult.ResultCode enum to hande
http-507 from oc
- handle RuntimeException at connection lost as HOST_NOT_AVAILABLE
- add the error message for failed uploads for every not uploaded
picture, espacially  for QUOTA_EXCEEDED is it necessary to show that to
the user
2013-03-16 18:56:27 +01:00
David A. Velasco
dc08386401 Merge branch 'details' into feature_previews 2013-03-12 13:03:15 +01:00
David A. Velasco
1493579a2e Changed 'See details' option menu for 'Details' 2013-03-12 13:02:51 +01:00
zerginator
8e36e7cc3e This wraps the android.util.logging into Log_OC which , if its enabled
in the app, logs the logcat into a file. It also includes the phone
information (MODEL, VERSION...)

https://github.com/owncloud/android/issues/97
2013-03-12 07:56:27 +01:00
David A. Velasco
7d67737a4f Updating translation files... 2013-03-11 13:27:56 +01:00
zerginator
18a715072c moved About App into preferences
https://github.com/owncloud/android/issues/57
2013-03-10 20:38:46 +01:00
David A. Velasco
d68b324653 Create our own media control - basic operation 2013-03-08 13:32:10 +01:00
David A. Velasco
6cfa24f55a Improved error messages in gallery for images that can not be loaded 2013-03-01 09:54:49 +01:00
David A. Velasco
cb66b59918 Minimize new fragment to monitor the progress of file download 2013-02-25 15:19:18 +01:00
Matthias Baumann
f764980474 - extend existing FileUpload, so we can handel failed instand upload
later
- new Activity to handle failed instant uploads
- new Activity InstantUploadActivity can be started at two ways,
     -touch to the 'Faild Upload Notifivation'
     -submenue underneath the upload menue  
- merges from head
- add lazy loading for the images list with failed uploads
2013-02-25 08:21:33 +01:00
David A. Velasco
24dd513682 Added progress bar for file transfers in details view (untested) 2013-02-19 13:28:01 +01:00
David A. Velasco
f2474ae28d Added basic menu options to the preview fragment: open, delete, see details 2013-02-18 11:23:18 +01:00
David A. Velasco
7101a04247 Created preview fragment to show previews for audio, video and images; shown when a downloaded file in these categories is downloaded 2013-02-14 19:21:09 +01:00
David A. Velasco
9420651936 Error messages for media playback improved 2013-02-12 12:07:42 +01:00
David A. Velasco
11c1ad8f78 Fixed bad behaviours when an error occurrs during audio playback 2013-02-12 11:26:38 +01:00
David A. Velasco
e4cd3fe54c Removed unused code in MediaService 2013-02-11 12:46:50 +01:00
David A. Velasco
6103446ab8 Error messages for video playback reviewed 2013-02-11 11:33:50 +01:00
David A. Velasco
4dc81e5168 Removed usused drawable; list_selector rewritten from scratch with new license (and color fixed for Android before ICS) 2013-02-08 11:37:02 +01:00
David A. Velasco
2623e9c195 Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
David A. Velasco
bb257ec729 Updated copyright in source files 2013-02-07 18:45:10 +01:00
David A. Velasco
7018ae7e1f Added music player service in background; 'open' button in details used to test (temporal) 2013-02-05 12:20:47 +01:00
David A. Velasco
5da9c095a4 Added dialog in the main app to advise users about the workaround app 2013-01-30 13:46:15 +01:00
David A. Velasco
fb8a8a2166 Fixed behaviour when authorization is denied by user; added toast message to explain the need to update credentials 2013-01-28 13:15:28 +01:00
David A. Velasco
63106c9238 Locked edition of URL and password in redirection due to expired credentials; error messages reviewed; fixed capture of redirection from web browser in OAuth 2013-01-25 15:11:10 +01:00
David A. Velasco
088b1e83a4 Cleaning-up AuthenticatorActivty code 2013-01-24 10:29:11 +01:00
David A. Velasco
2b5785556e Merge branch 'master' into oauth_login
Conflicts:
	AndroidManifest.xml
	res/values-de-rDE/strings.xml
	res/values-de/strings.xml
	res/values/strings.xml
	src/com/owncloud/android/Uploader.java
	src/com/owncloud/android/datamodel/FileDataStorageManager.java
	src/com/owncloud/android/files/OwnCloudFileObserver.java
	src/com/owncloud/android/files/services/FileDownloader.java
	src/com/owncloud/android/files/services/FileUploader.java
	src/com/owncloud/android/operations/RemoteOperationResult.java
	src/com/owncloud/android/syncadapter/FileSyncAdapter.java
	src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/activity/UploadFilesActivity.java
	src/com/owncloud/android/ui/fragment/FileDetailFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2013-01-17 14:25:49 +01:00
David A. Velasco
7239b9eb9d Translations update 2013-01-10 18:38:41 +01:00
David A. Velasco
c38a3b2ef1 Merge master into oauth_login 2012-12-18 11:20:03 +01:00
David A. Velasco
279670c303 Merge remote-tracking branch 'origin/sync_review_2' 2012-12-05 23:23:10 +01:00
David A. Velasco
4558866223 Give the user a chance to move the files selected for an upload when there is not space enough to copy them into the ownCloud folder 2012-12-04 14:20:02 +01:00
David A. Velasco
f68d10abc7 Give the user the option to move all the foreign files into the ownCloud local folder when the try to copy them during an account synchronization failed 2012-12-04 12:49:18 +01:00
David A. Velasco
a7535406d4 Customized error message for uploads when the local file cannot by copied to the ownCloud local directory 2012-11-30 14:39:31 +01:00
David A. Velasco
3ef64834e9 Added scroll to generic explanation activity. Enabled the copy of past uploads into ownCloud folder during synchronization. 2012-11-30 11:58:46 +01:00
David A. Velasco
2a913bfbeb Files uploaded in the past are copied to the local ownCloud directory during account synchronization 2012-11-30 11:29:18 +01:00
David A. Velasco
236895e7f8 Refactored app name in strings.xml 2012-11-29 12:26:55 +01:00
David A. Velasco
757f9027f5 Updating language strings; some hardcoded strings moved to strings.xml; workaround for bug in error popup 2012-11-29 11:28:34 +01:00
David A. Velasco
4c50eb4d2d Merge of master after sync_review was merged into it 2012-11-23 10:25:06 +01:00
David A. Velasco
d49bfd0c77 Added title to rename dialog; and some cleaning 2012-11-22 10:24:26 +01:00
David A. Velasco
38a80be828 Fixed lock of buttons in details view when the 'Keep both' option in conflicts dialog is used 2012-11-20 14:41:04 +01:00
David A. Velasco
c301865c35 Synchronize kept-in-sync files during account synchronization, in both directions and considering conflicts 2012-11-16 16:23:45 +01:00
David A. Velasco
a7ee15e023 Renaming confussing token 2012-11-16 09:42:51 +01:00
David A. Velasco
ff2271a8c5 Download button in file details view upgraded to sync file content in both directions 2012-11-15 17:18:04 +01:00
David A. Velasco
500cbf9cea New items in the context menu for files (not folders), depending upon its state 2012-11-06 15:13:27 +01:00
David A. Velasco
b27ebf0310 Removal of folders completed 2012-11-05 15:44:09 +01:00
David A. Velasco
cab55a8edd Login page updated to get OAuth2 access token 2012-10-31 18:59:43 +01:00
David A. Velasco
454f15138e Rename and remove operations connected to the contextual menu over items at the list of files 2012-10-31 17:41:57 +01:00
David A. Velasco
3d72058691 Quick fix to avoid two lines in button 2012-10-30 11:24:30 +01:00
David A. Velasco
cc1eb7a352 SSL warning with more information about certificate, accessible through a new 'Details' button 2012-10-29 15:03:34 +01:00
Bartek Przybylski
6c32365704 Solving modified date and length conflicts 2012-10-27 12:20:52 +02:00
David A. Velasco
8f2314d80e Improved explanation in PIN code view 2012-10-19 09:24:34 +02:00
David A. Velasco
97f21ee7be About message moved to strings.xml 2012-10-17 19:34:31 +02:00
David A. Velasco
d0f7de3ce0 Added help text in background of empty files list 2012-10-17 19:22:40 +02:00
David A. Velasco
d193e0031b Added explanation in the view for PIN Code creation 2012-10-17 11:04:27 +02:00
David A. Velasco
6eff1c94be Updated text in 'Remote and local' option offered when removing a downloaded file to fit the button size' (just some languages) 2012-10-17 10:14:14 +02:00
Bartek Przybylski
671cb91cef add upload via wifi only option 2012-10-08 21:26:18 +02:00
David A. Velasco
76ba00b2b2 Cancellation of current download in details view - UI changes 2012-10-08 09:03:12 +02:00
David A. Velasco
0c3aaf3c5a Fixed typo in link to owncloud.com 2012-10-03 11:52:54 +02:00
David A. Velasco
131d97d74d A new string 2012-09-13 17:08:00 +02:00
David A. Velasco
261aaf5001 Improvements in SSL certifcates checking: URL is checked with the hostname in the certificate and all the problems are shown in the same dialog 2012-09-07 14:11:08 +02:00
David A. Velasco
48f13c8adc SSL connections update: notice about untrusted certificates and allow the user save them as reliable 2012-09-05 13:46:30 +02:00
David A. Velasco
91bc3fdb1e Added notification for failures in manual synchronizations; some improvements in the management of exceptions occurred while synchronizing (more TODO) 2012-08-23 17:09:05 +02:00
David A. Velasco
4e57c008b7 Fixed crash when sending nothing to the Uploader activity; slightly more prettier UI 2012-08-22 13:53:03 +02:00
David A. Velasco
081b333eb1 Added link to register a new user at owncloud.com ; fixed cancel button in account creation for SGS3 2012-08-20 14:36:46 +02:00
David A. Velasco
1ecd2b61c5 Multiple upload available from the app 2012-08-14 12:37:08 +02:00
David A. Velasco
58ebd9d7e1 FIleDisplayActivity refactored to fix view never updated after installation in some devices and problems when all the accounts are deleted 2012-08-08 12:30:11 +02:00
David A. Velasco
532492bf9b Fixed crashed when the user tries to upload to ownCloud some content for wich the client does not have enough permissions; such as a contact. 2012-08-03 11:39:08 +02:00
David A. Velasco
38ece35da5 Fixed crash by URL with whitespaces in login page; reviewed error handling and user info in connection checking 2012-08-02 13:28:33 +02:00
David A. Velasco
6a9eaaf9aa Better failure handling in files renaming and removal 2012-07-30 15:11:59 +02:00
David A. Velasco
76a123fc35 Added failure handling to directory creation 2012-07-30 14:06:53 +02:00
David A. Velasco
3ab381f0e0 More hardcoded strings passed to string resources 2012-07-30 12:58:36 +02:00
David A. Velasco
e8852fa725 Fixed compatibility issue in local deletion and text typo 2012-07-30 09:46:24 +02:00
Bartek Przybylski
0cced280a4 allow removing local file only 2012-07-28 21:15:41 +02:00
David A. Velasco
7c93676d6f Make resource values for some hardcoded string 2012-07-27 15:02:03 +02:00
David A. Velasco
f3ba107585 Upload improvements: better control of errors, updated use of status notifications, removed toast notifications, new isUploading(...) mehtod 2012-07-26 18:35:09 +02:00
David A. Velasco
81970c8131 Reviewed error handling and notifications in downloads 2012-07-25 12:04:08 +02:00
David A. Velasco
20c5767a04 Minor typos and spelling corrected 2012-07-24 09:08:29 +02:00
Bartek Przybylski
7f75f13f0c make confirmation dialog more universal 2012-07-23 19:09:44 +02:00
David A. Velasco
eb2a7bcec2 Replaced strings in two pieces with formatted string 2012-07-23 14:38:16 +02:00
David A. Velasco
2a04c6ae5d Some fixes about downloads and how the detals view and list view is updated when downloads start and finish 2012-07-20 10:13:50 +02:00
David A. Velasco
0583bc8b33 Pin code messages update 2012-07-17 15:16:27 +02:00
David A. Velasco
463b30c46a Avoid crashes when an external app makes a bad response for the selection of a file to upload 2012-07-17 14:51:36 +02:00
David A. Velasco
91b1728493 More fixes to PIN code 2012-07-13 14:46:40 +02:00
David A. Velasco
50d8905f00 File removal in server completed 2012-07-12 13:49:21 +02:00
David A. Velasco
8b24606331 Fixed confirmation dialog for deletion 2012-07-12 10:55:47 +02:00
David A. Velasco
6701c9842d Delete remote file - confirmation dialog added 2012-07-12 09:48:55 +02:00
Bartek Przybylski
02610cad7d messy rename file 2012-07-10 22:52:31 +02:00
David A. Velasco
de5d818781 Strings extracted from PinCodeActivity to resources 2012-07-09 15:19:44 +02:00
David A. Velasco
3e4f8b4f0d Better policy to show PIN Code 2012-07-09 15:10:26 +02:00
David A. Velasco
93de9f91d5 Pin code 2012-07-09 11:11:44 +02:00
Bartek Przybylski
3113c45909 keep file in sync and initial commit for file sharing 2012-07-08 16:57:48 +02:00
Bartek Przybylski
9650ce5cf8 change string from location to URL 2012-07-02 19:08:54 +02:00
David A. Velasco
41f2cf1169 Download failures not treated as successes 2012-07-02 10:41:56 +02:00
David A. Velasco
72141b60fb Update of messages when uploads finish 2012-06-29 10:36:25 +02:00
Bartek Przybylski
6e3b5f488c dummy crash upload dialog 2012-06-13 20:47:38 +02:00
Bartek Przybylski
63f68f1020 use view instead of dialog about no setup account 2012-05-25 21:32:20 +02:00
Lennart Rosam
b735fc9458 Fixed navigation behaviour: HomeAsUp takes you up a dir 2012-05-25 07:01:12 +02:00
Lennart Rosam
e8c9e5b09a Filelisting using intents and OCFile.getId() instead of string matching
in db which can be very very slow if there are lots of files
2012-05-23 19:59:29 +02:00
Lennart Rosam
3727806652 Intermediate commit: Work on new FileDetailFragment layout, simplified
it's code a bit and renamed a color. Layout is WIP
2012-05-18 08:09:31 +02:00
Bartek Przybylski
b999f542c0 new icons, new uploader 2012-05-15 21:52:59 +02:00
Bartek Przybylski
0aeb425885 adjusting design to holo, stability for account setup 2012-05-13 16:13:13 +02:00
Bartek Przybylski
10c04c6d77 new stuff for account authenticator 2012-05-03 15:37:30 +02:00
Bartek Przybylski
dc7cafe677 initial commit of editbox with badge 2012-05-01 23:37:37 +02:00
Lennart Rosam
6e43d84b17 Started working on the "Where is my device?" feature 2012-04-15 17:31:08 +02:00
Bartek Przybylski
ff36d90802 adding use ssl mode 2012-04-15 09:54:21 +02:00
Lennart Rosam
8f2840fe11 Incorporated the ownCloud Blue into the ActionBar 2012-04-12 00:34:07 +02:00
Lennart Rosam
30c2ede8e5 Migration to ActionBarSherlock 4.0.1 / Custom Adapter to override text
colors in the ListNavigation Dropdown spinner
2012-04-10 04:40:53 +02:00
Lennart Rosam
320e446748 FileDetail fragement is now showing a text hint if there is no file
selected.
2012-04-07 02:52:50 +02:00
Lennart Rosam
4cbe903b8a Make account selectable from preferences 2012-04-07 02:15:38 +02:00
Lennart Rosam
9996436ccc Merged request #3 2012-04-01 15:06:23 +02:00
Bartek Przybylski
6deca0f9b1 some file list handling, action bar added 2012-02-11 23:11:57 +01:00
Lennart Rosam
ca5455e88d Started swapping our ActionBar in favor of ActionBarSherlock 2012-02-05 22:47:25 +01:00
Lennart Rosam
896f145cf6 Improved first run experience and added additional icons 2012-02-01 00:43:28 +01:00
Lennart Rosam
30734a9404 Heavy refactoring: Moved UI things to UI packages 2012-01-22 19:05:47 +01:00
Bartek Przybylski
55bcc455d2 contentprovider for contacts added 2011-09-17 15:41:44 +02:00
Sven Aßmann
ae68956174 change the display text of sync account to: "Sync Files&Contacts" 2011-09-15 21:37:19 +02:00
Bartek Przybylski
154bb85cf1 initial commit 2011-08-19 22:37:35 +02:00