David A. Velasco
e8239f434a
Merge branch 'develop' into modify_password
2013-07-02 13:08:27 +02:00
David A. Velasco
8f1566a21c
Removed toast message for updating credentials when user manually accessed to the AcountAuthenticatorActivity
2013-06-21 14:16:45 +02:00
David A. Velasco
c4ac05dee2
REFACTORING: moved AccountUtils to .authentication package
2013-06-18 11:34:08 +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
edb380e0cd
Code refactored to 'open file' in a single point
2013-05-27 15:01:54 +02:00
David A. Velasco
bc1fcf8493
Added account existance validation to FileDetailsActivity
2013-05-07 13:49:54 +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
5b9935c849
Removed text notification about first instant upload only on line - not necessary any more
2013-04-17 18:07:00 +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
David A. Velasco
bdc0332c23
Copyright note fixes
2013-04-17 12:26:13 +02:00
David A. Velasco
274dfd2958
Used Log_OC in all the logs
2013-04-15 13:17:47 +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
9b758dfa70
Recovery of instant uploads in temporary disabled
2013-04-04 17:15:53 +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
David A. Velasco
69d6d821ec
OAuth clean-up and refactoring
2013-03-21 12:21:48 +01:00
David A. Velasco
4861636185
Refresh authorization token on failed downloads / uploads when notification error is clicked
2013-03-18 15:05:35 +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
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
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
e0cb989b3a
Click on notifications about image downloads / uploads goes to gallery
2013-02-27 16:27:25 +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
0c75a839f2
Automatic download of previewable files in download mode
2013-02-22 16:39:58 +01:00
David A. Velasco
bcc7bd2744
Fixed ClassCastException in FileUploader
2013-02-21 09:57:23 +01:00
David A. Velasco
e8ae33b628
Fix: clicking on an upload notification goes to file details, never to file preview
2013-02-20 15:58:29 +01:00
David A. Velasco
cfb68a69dd
Progress bar in details view is successfully updated
2013-02-20 12:34:11 +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
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
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
f91d3ce792
Fixed null pointer in FileObserverService initialization
2013-01-14 12:38:46 +01:00
David A. Velasco
35b25f04eb
Fixed crash in test of files downloading / uploading
2013-01-09 10:11:21 +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
abd5f51554
Fixed check of modifications applied in server (still based on modification date)
2012-12-05 16:14:01 +01:00
David A. Velasco
80448dc192
Fixed NULL pointers and wrong handling of dialogs
2012-12-05 12:22:26 +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
a1c538db20
Some cleanup
2012-11-27 15:15:17 +01:00
David A. Velasco
fd9086a883
New policy: uploaded files are copied to the local storage ownCloud directory bu default
2012-11-27 14:28:19 +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
3f2081e607
Ensure that FileDownloader and FileUploader events are not lost
2012-11-22 16:40:00 +01:00
David A. Velasco
658267ad79
Disable rename and remove actions on folders when some file is uploading or downloading inside
2012-11-22 13:06:54 +01:00
David A. Velasco
f03852032f
Fixed old bug reintroduced in instant uploads
2012-11-21 16:19:27 +01:00
David A. Velasco
db0e2d0186
Reviewed values set to OCFile#mLastSyncDateForData
2012-11-21 08:54:15 +01:00
David A. Velasco
9c3dc6d850
Fixed crash in initialization of FileObserverService
2012-11-20 14:48:44 +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
195b009212
Fixed 'keep both' action in conflicts dialog (both resulting file were linked to the same local file in the device)
2012-11-20 14:12:32 +01:00
David A. Velasco
3fd56ecff8
Fixed bug: inconsistency in isDown() state due to old OCFile object being saved in the OwnCloudFileObserver instances
2012-11-20 11:28:27 +01:00
David A. Velasco
22a789e8d2
Fixed some bugs in the update of OCFile#mLastSyncDateForProperties at account synchronization time ; and some refactoring
2012-11-19 15:08:48 +01:00
