Commit graph

210 commits

Author SHA1 Message Date
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
67477a754b Fixed broken manifest for full screen video 2013-03-21 15:49:44 +01:00
David A. Velasco
18d4ff203f Fixed minor bugs inserted in clean-up 2013-03-21 13:22:53 +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
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
David A. Velasco
d92ccf8bd0 Version up: 1.3.22 2013-03-14 10:38:25 +01:00
David A. Velasco
965870604f Version up: 1.3.21 2013-03-12 13:29:33 +01:00
David A. Velasco
fc2af5b03e Automatic preview after download in PreviewImageActivity 2013-02-26 12:33:28 +01:00
David A. Velasco
3d272eb753 Force preview of images in 'full screen' 2013-02-25 12:24:14 +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
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
586793a261 Basic video preview in a separate actitivy 2013-02-07 11:09:28 +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
0f99bd59a1 HOTFIX (oc 1.3.20, ocw 1.0.2): fixed the creation of new accounts after installing the workaround app and rebooting 2013-01-31 16:17:32 +01:00
David A. Velasco
fdd1dbf2d7 Version up: 1.3.19 2013-01-30 16:17:23 +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
c4cd9ef44c Prevent that the workaround app fixing the lost of credentials in Jelly Bean replaces the authenticator in the ownCloud 2013-01-16 12:54:15 +01:00
David A. Velasco
4aba533e6e Version 1.3.18 bump 2013-01-14 12:57:41 +01:00
David A. Velasco
11b88e0fcc Added support to OAuth2 'authorization code' grat type: get & save access token, use it to access ownCloud 2012-12-19 14:12:53 +01:00
David A. Velasco
c38a3b2ef1 Merge master into oauth_login 2012-12-18 11:20:03 +01:00
David A. Velasco
5be4bf17e1 Adding support to OAuth2 'authorization code' grant type [WIP] 2012-12-18 11:07:05 +01:00
David A. Velasco
1412712d89 Version bump: 1.3.17 2012-12-10 15:59:50 +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
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
264580cc33 Version bump: 1.3.15 2012-11-23 14:58:23 +01:00
David A. Velasco
cab55a8edd Login page updated to get OAuth2 access token 2012-10-31 18:59:43 +01:00
Bartek Przybylski
cce7e1247a assign octet-stream mimetype to unknown type file 2012-10-30 22:36:50 +01:00
Bartek Przybylski
b63ce78444 version bump 2012-10-30 20:12:53 +01:00
Bartek Przybylski
6c32365704 Solving modified date and length conflicts 2012-10-27 12:20:52 +02:00
Bartek Przybylski
de94751cde Two way synchronization for files 2012-10-22 21:15:26 +02:00
Bartek Przybylski
b6eb63a472 chaning photo taken name for more descriptive 2012-10-09 23:26:53 +02:00
Bartek Przybylski
fd6ce7def0 version bump to 1.3.12 2012-10-05 16:09:48 +02:00
Bartek Przybylski
c7dc135987 removing crash handler, we not have google play reports 2012-09-29 22:48:50 +02:00
David A. Velasco
b00957b5fa Added big file chunking for uplaods 2012-09-24 14:10:31 +02:00
David A. Velasco
5b60e21f43 Favourites disabled until fix can be pushed (2) 2012-09-14 14:28:14 +02:00
David A. Velasco
68667d0614 Removed crashlogger and permission request to read system logs 2012-09-13 17:51:27 +02:00
David A. Velasco
53b67429ea Added support for OC-Chunking in uploads (disabled, but ready) 2012-09-12 16:16:56 +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
be22e58b39 Uploading files are protected against removal from other apps 2012-08-24 14:50:37 +02:00
Bartek Przybylski
ba148a8278 complete two way synchronization 2012-08-22 19:33:22 +02:00
David A. Velasco
e7ed69aeed Version number updated 2012-08-22 16:06:19 +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
6617345fc4 Version update 2012-08-03 14:00:46 +02:00
David A. Velasco
cee46c7249 Update version number 2012-08-02 16:08:59 +02:00
David A. Velasco
239be8fb4f Version update 2012-08-01 15:25:22 +02:00
Bartek Przybylski
a4ba6170ea moving from eu.alefzero.eu to com.owncloud.android 2012-07-31 17:43:37 +02:00
Bartek Przybylski
d29a3658c9 version bump for GP 2012-07-30 18:52:55 +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
c06007b98a Granted that accounts different only in port number won't mix their files in the same local folder 2012-07-30 12:02:34 +02:00
David A. Velasco
e8852fa725 Fixed compatibility issue in local deletion and text typo 2012-07-30 09:46:24 +02:00
David A. Velasco
fa64d9eeec Forgotten version! 2012-07-27 15:05:58 +02:00
David A. Velasco
275eb1f8f8 Fixed: problems in handling a file that is still uploading but in the files list because a synchronization was triggered and finished; problems in UI refresh after removing or renaming a file, while in double pane mode 2012-07-27 14:29:46 +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
cd0886d3ca Pin code number hidden as a password 2012-07-26 13:08:14 +02:00
David A. Velasco
a032bdeebc Quick patch to fix operations not ready for HTTPS 2012-07-26 10:44:24 +02:00
David A. Velasco
cc313d2e48 File list is updated when a file contained in the current directory finished its download although it wasn't successful 2012-07-25 18:39:14 +02:00
David A. Velasco
ba5785e09f Fixed bad synchronization of files removed from another client; checked that condition removed is not necessary in any case 2012-07-25 14:39:46 +02:00
David A. Velasco
d8e29ce306 Updated logging for login ;) 2012-07-25 13:29:14 +02:00
David A. Velasco
81970c8131 Reviewed error handling and notifications in downloads 2012-07-25 12:04:08 +02:00
David A. Velasco
393bcd6869 FIxed null pointer exception when a file details view receives a message from the download service 2012-07-25 08:34:39 +02:00
David A. Velasco
a238d0635a Added a static list of downloads in progress to have a reliable way to check if a file is downloading 2012-07-24 14:08:54 +02:00
David A. Velasco
c82fc04aea Fixed cancel button in PIN code activity 2012-07-23 14:53:46 +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
6f189bffe1 Downloads through temporal file and better OCFile.isDownloading() and .isDown() implementation 2012-07-23 13:55:58 +02:00
David A. Velasco
8ba2ca7b85 Filter broadcast messages in receivers with the account, to avoid problems with services ongoing after the current account is changed 2012-07-23 12:47:58 +02:00
David A. Velasco
3e2d5f40b4 Fix the local file name saved in database when a file is renamed 2012-07-23 11:07:59 +02:00
David A. Velasco
3a34911f3b Rename file to upload to avoid overwrites in server 2012-07-23 10:13:50 +02:00
Bartek Przybylski
cb442b876f remove location service registration after booting 2012-07-21 22:20:14 +02:00
David A. Velasco
d2f2500bdd Handling of PUT response code fixed 2012-07-20 13:30:04 +02:00
David A. Velasco
ff0803c3ee Avoid crash in the login page when the connections is tested, then changed to other wrong URL and connect is clicked before the new test finishes 2012-07-20 12:27:05 +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
611fe1e4b5 Enable preemptive authentication to avoid double send of files in uploading 2012-07-19 11:34:51 +02:00
David A. Velasco
935a7b0934 Fixed null pointer in synchronization 2012-07-18 14:38:02 +02:00
David A. Velasco
cffdf90bf3 Added timeout to the connection test; timeoutted methods granted for HTTPS 2012-07-18 14:20:09 +02:00
David A. Velasco
153dbb0342 Be sure that root directoriy is listed when the synchronization is really fast 2012-07-17 15:28: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
45f89711be Fixed problem with some special characters when opening files; renamed WebdavUtils.encode to WebdavUtils.encodePath; fixed null pointer exception in preview 2012-07-17 14:26:18 +02:00
David A. Velasco
c6b553f635 OCFile stores again decoded remote paths; WebdavUtils.encode(...) added; fixed space conversion in paths in multiple uploads; CLEAN THE APPLICATION CACHE AFTER INSTALLING 2012-07-17 12:59:15 +02:00
David A. Velasco
400a17d3e3 Cancellable synchronization; current synchronizations are cancelled when the user request for a synchronization in the options menu 2012-07-16 15:06:03 +02:00
David A. Velasco
c0645e6832 Trigger synchronization when current account is changed; remove redundant accounts list in preferences 2012-07-16 11:34:37 +02:00
David A. Velasco
91b1728493 More fixes to PIN code 2012-07-13 14:46:40 +02:00
Bartek Przybylski
147227040b reduce permissions, optimize bitmap displaying 2012-07-12 22:02:30 +02:00
David A. Velasco
1dbc69dc11 Avoid double query to the ContentResolver when listing the contents of a folder 2012-07-12 17:49:29 +02:00
David A. Velasco
50d8905f00 File removal in server completed 2012-07-12 13:49:21 +02:00
David A. Velasco
f757b74ced Some fixes to PIN code 2012-07-11 18:59:59 +02:00
Bartek Przybylski
233553a081 dont loose keep in sync state when syncing 2012-07-09 17:16:56 +02:00
David A. Velasco
3e4f8b4f0d Better policy to show PIN Code 2012-07-09 15:10:26 +02:00
David A. Velasco
cbf9ca8bea Merge remote-tracking branch 'origin/master' into moresync 2012-07-09 11:28:51 +02:00
David A. Velasco
a48014bffd More improvements in refresh files list while synchronizing 2012-07-09 11:23:56 +02:00
David A. Velasco
93de9f91d5 Pin code 2012-07-09 11:11:44 +02:00
David A. Velasco
146f7969b3 Better backwards compatibility in crash logger and images preview 2012-07-09 09:39:32 +02:00
David A. Velasco
15a2d8b8e6 Fixed bug in creation of database after adding keep_in_sync column 2012-07-09 09:23:42 +02:00
David A. Velasco
461364f68b Some improvements in synchronization and refresh of directory list 2012-07-06 15:09:13 +02:00