mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-20 07:52:18 +03:00
Code Issues Projects Releases Packages Wiki Activity
5251 commits 223 branches 1587 tags 638 MiB
Commit graph

2836 commits

Author SHA1 Message Date
Andy Scherzinger
cef29b48a3 fixed uploader warning icon in AlertDialog 2016-03-22 13:29:23 +01:00
Andy Scherzinger
8758c58814 fixed uploader warning icon in AlertDialog 2016-03-22 13:29:23 +01:00
Andy Scherzinger
c32ce5b9d5 fixed headline for share file fragment 2016-03-22 13:29:23 +01:00
Andy Scherzinger
c96be51151 fixed headline for edit share fragment 2016-03-22 13:29:23 +01:00
Andy Scherzinger
d893654bc1 Fix Headline in share edit and user search 2016-03-22 13:29:23 +01:00
Andy Scherzinger
6aa2d75f89 adding user/group icon to search suggestions 2016-03-22 13:29:23 +01:00
Andy Scherzinger
bad01a8488 add icon logic for user/group 2016-03-22 13:29:23 +01:00
Andy Scherzinger
7fe4de73f3 search view using AppCompat implementation + layout optimizations 2016-03-22 13:29:23 +01:00
Andy Scherzinger
e195cdadd8 redone layouting ans AppCompat switch implementation 2016-03-22 13:29:23 +01:00
David A. Velasco
eae56238f9 Rewired code path to upload files sent from other apps 2016-03-22 12:24:45 +01:00
Juan Carlos González Cabrero
def9478d44 Update remote path of the upload in the database just after rename 2016-03-22 10:47:04 +01:00
David A. Velasco
15eb8b493b Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-03-21 17:42:13 +01:00
Juan Carlos González Cabrero
9422b77ab7 Remove cancel when it is cancelled 2016-03-21 14:22:45 +01:00
Juan Carlos González Cabrero
94864bb094 Update strings, comments and removed some conditions 2016-03-21 09:45:27 +01:00
Juan Carlos González Cabrero
ac6d0038ec Enable change the permission when the capability is unknown too 2016-03-21 09:39:01 +01:00
Juan Carlos González Cabrero
3d8195795b Revert "Refactor calls to find views in ShareFileFragment" 
This reverts commit 6143872543d30569e46fb4c5edc559f26cdd8bd6.
 2016-03-21 09:39:01 +01:00
Juan Carlos González Cabrero
ceffd197a9 Refactor calls to find views in ShareFileFragment 2016-03-21 09:39:01 +01:00
Juan Carlos González Cabrero
02eade8029 Hide edition of public share when the related capability is disable 2016-03-21 09:39:01 +01:00
Juan Carlos González Cabrero
ee22243bb0 New Intent to request the share permission update, and fragment update to manage the event correctly 2016-03-21 09:39:01 +01:00
Juan Carlos González Cabrero
55fdcee912 New switch in share via link to allow editing 2016-03-21 09:31:34 +01:00
David A. Velasco
f37c622f23 Reviewed closure of Cursors in UploadsStorageManager 2016-03-18 14:16:44 +01:00
Juan Carlos González Cabrero
b1d46eb8ab Change error label for uploads when app is killed 2016-03-18 14:03:33 +01:00
David A. Velasco
ae67c0c878 Fixed comparator - upload really in progress now REALLY on the top 2016-03-18 13:37:21 +01:00
David A. Velasco
b305e20b83 Remove sticky broadcast when read in UploadListActivity 2016-03-18 13:29:46 +01:00
Juan Carlos González Cabrero
f150dce25c Refactor clear options for uploads avoiding clear the current ones 2016-03-18 09:22:42 +01:00
David A. Velasco
8b85a7345b Show account info in uploads in progress 2016-03-17 15:22:00 +01:00
David A. Velasco
1527cb86fc Grant that uploads view shows the correct title always, no matter if entering from notifications 2016-03-17 15:10:35 +01:00
David A. Velasco
babf24c2ee Map SSL specific errors to UploadResult.NETWORK_CONNECTION error too 2016-03-17 14:31:54 +01:00
David A. Velasco
86ade9d8c4 Fixed recovery of instant videos, and of every instant after adding DELAYED_WIFI as an UploadResult 2016-03-17 14:31:54 +01:00
Juan Carlos González Cabrero
f76ad79d4b Invalidate click listener on uploads not allowed to retry 2016-03-17 14:07:37 +01:00
David A. Velasco
e181253410 Retrying an upload failed due to wrong credentials checks if stored credentials were already updated before asking to the user 2016-03-17 13:23:25 +01:00
Juan Carlos González Cabrero
9c50fea5c8 Fix action bar title logic for uploads view 2016-03-17 11:41:34 +01:00
David A. Velasco
0e8537bffc 'Waiting for upload' shown in uploads in line, but not currenlty transferred 2016-03-16 19:30:58 +01:00
David A. Velasco
8c523b5fcc Fixed manual retry of upload failed due to credentials error 2016-03-16 19:23:10 +01:00
David A. Velasco
772d640bc8 Fixed status message in uploads view 2016-03-16 19:17:01 +01:00
Juan Carlos González Cabrero
f8f4c1ed43 Code Review changes done 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
c6a82c0a87 Separate share permissions update logic 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
b16a32dfec Fixed refresh of share icon when the share is deleted 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
6755453fa1 Fix suboptions display in 'can edit' option for folders 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
bdb7ecbc31 Change 'equals' method calls to be null safe 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
a969250b23 Adapt autocompletion to the web UI 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
eb783a0545 Update PR #1492 with the code review suggestions 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
87b2f25350 Enable autocompletion of federated shares with well known servers 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
7c1f8e0370 Disable the remote user suggestion when the capabilities does not allow federate sharing 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
28d90ac106 Hide the 'can share' option for federated shares in files, wich is not allowed 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
449f4567f2 Showing the federated shares in the shares view of a file or folder 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
49daadefba Revert the name fix wich was corrupting the database 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
f2d05a3554 Set appropiate permissions for the federated shares for the operation request 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
f60aa06c2d Send the right ShareType to the share operation if it is FEDERATED 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
a7efcf6a2f Add the remote suggestion to the MatrixCursor instead of the JSON array, wich could not parse the path correctly 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
87c3ec4c60 Added remote user suggestion when '@' is detected in the search field 2016-03-16 13:46:05 +01:00
David A. Velasco
26d748a2d3 Upload really in progress always and only in top of the list of current uploads 2016-03-15 18:44:53 +01:00
David A. Velasco
259c94a45b Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-03-15 09:48:12 +01:00
David A. Velasco
945841203c Grant renewal ownCloudClients managed in SessionManager after updating credentials 2016-03-14 14:07:20 +01:00
David A. Velasco
d053f34b8f Simplify checks of authentication needed after change in library; as a side effect, uploads failed due to SAML session expired are stored with right 'credentials error', instead of 'unknown' 2016-03-14 09:31:38 +01:00
David A. Velasco
e78bf9179b Allow retry of failed uploads of accounts different than the current one 2016-03-09 18:34:38 +01:00
David A. Velasco
5694915151 Recovery of FileUploader after sudden death 2016-03-09 17:21:52 +01:00
Thomas Müller
ea2fe8cb4e Merge pull request #1399 from owncloud/uploadShowsFiles_Master 
Upload shows files
 2016-03-09 13:10:53 +01:00
David A. Velasco
7980afbef8 Retry all failed uploads when option item 'retry failed' is tapped 2016-03-08 16:24:09 +01:00
David A. Velasco
ec9b705536 Wording and padding fixes in uploads list 2016-03-08 13:17:55 +01:00
David A. Velasco
4f962aeb2d Added 'event' to notify activities when new uploads are added to the queue of pending uploads, so that the uploads list is better refreshed when several retries are triggered 2016-03-08 11:40:46 +01:00
David A. Velasco
d9bb808308 BUG fixed: store file size with upload info to show correctly 2016-03-07 15:17:40 +01:00
David A. Velasco
d93397a58f Changes from my own CR 2016-03-04 12:51:39 +01:00
David A. Velasco
5707fce666 Fixed crash due to lifecycle of registered SyncBroadcastReceiver 2016-03-04 11:46:12 +01:00
Andy Scherzinger
f34a9ddf5b moved requestCode to Fragment 2016-03-03 21:44:28 +01:00
Andy Scherzinger
8d038e89a9 removed unused createFolder(), since this is now covered by the fab implementation in the fragment 2016-03-03 21:40:12 +01:00
David A. Velasco
beb10a91cd Uploads over settings in navigation drawer 2016-03-03 13:00:32 +01:00
David A. Velasco
52d05b37d4 Enabled again 'basic' recovery of instant uploads on WiFi connection 2016-03-03 12:52:16 +01:00
Andy Scherzinger
4327cf5433 code review: fixed java doc 2016-03-03 12:50:43 +01:00
Andy Scherzinger
7e82baa8bc cleanup for code review duplicate code for upload activity calls. 2016-03-03 12:50:28 +01:00
David A. Velasco
091985650b Remove from database uploads cancelled in batch when an account is removed while uplading 2016-03-02 18:38:00 +01:00
David A. Velasco
c5825a4e07 Refactoring: static methods to ease requests to FileUploader are grouped in a single class 2016-03-02 18:17:13 +01:00
David A. Velasco
fbfb5d56b4 Removed cancellation of all the uploads when Wifi is lost, not needed anymore after FileUploader refactoring 2016-03-02 17:06:12 +01:00
Andy Scherzinger
e4d936e837 changes due to code review 2016-03-02 14:34:33 +01:00
masensio
573d94453b Delete context menu in UploadListFragment 2016-02-26 14:34:41 +01:00
masensio
8006c893f9 Clean code, from uploads view implementation 2016-02-26 14:15:42 +01:00
masensio
55a33d8848 Change names in uploads comparator 2016-02-26 13:50:24 +01:00
Andy Scherzinger
413707272a rebased to master: resolved conflicts (edits from fab implementation) 2016-02-25 19:38:24 +01:00
Andy Scherzinger
d4ce0d920f hide FAB in copy/move folder chooser 2016-02-25 18:07:49 +01:00
Andy Scherzinger
4ecf325ea6 close logic on back pressed for drawer/fab/up-navigation 2016-02-25 18:07:29 +01:00
Andy Scherzinger
d7ff626db3 added sorting icon from material, spring cleaning in lower resolution icons and obsolete Android versions 2016-02-25 18:07:29 +01:00
Andy Scherzinger
e8c64ebf8d initial implementaion for click events + using the import icon for upload from other apps, also fixed the checkboxes for hdpi/mdpi 2016-02-25 18:07:28 +01:00
Andy Scherzinger
e0bacfaaea initial implementation of the FAB with Speed Dial 2016-02-25 18:07:11 +01:00
masensio
c0cf6d8788 Use Upload End Time in Uploads View 2016-02-25 15:32:12 +01:00
Juan Carlos González Cabrero
2682b1fd3d Upload path update after renaming 2016-02-25 12:27:18 +01:00
David A. Velasco
fcf107005f Merge pull request #1486 from owncloud/reliable_uploads_actions_uploads_view__credentials_error 
Fix problems with Credentials error in uploads
 2016-02-24 10:46:37 +01:00
Juan Carlos González Cabrero
a506014d58 Checking of local file when an upload retry is requested 2016-02-24 10:41:50 +01:00
masensio
531615c077 Changes from code review comments 2016-02-24 10:37:50 +01:00
masensio
ae5605e55b Fix problems with Credentials error in uploads 2016-02-24 10:37:13 +01:00
David A. Velasco
d2940f6214 Used OC trashbin icon in uploads view 2016-02-24 10:11:54 +01:00
David A. Velasco
0ec9543671 Remove progress bubble in uploads list as soon as pull-2-refresh is triggered 2016-02-23 17:57:53 +01:00
David A. Velasco
de1f34c493 Delay instant uploads when WiFi requirement is not met, and show as failed uploads in uploads list 2016-02-23 17:01:51 +01:00
David A. Velasco
5eeca847d1 Remove uploads from persisted list when cancelled 2016-02-23 13:56:23 +01:00
Juan Carlos González Cabrero
d49379abf8 Refactorized UploadStatus to have only 3 types of Status 2016-02-23 12:56:07 +01:00
Juan Carlos González Cabrero
a3aaca9ca3 Fixed the crash uploading without connection 2016-02-23 11:33:42 +01:00
David A. Velasco
245e8fe5c7 'Wifi-only' condition for instant uploads fixed - uploads are not done if connection is not through Wifi 2016-02-23 09:09:04 +01:00
David A. Velasco
366a1f7c51 Reconnect cancellation of uploads when Wifi is lost to interrupt only-wifi instant uploads 2016-02-22 14:37:36 +01:00
Juan Carlos González Cabrero
c0d0356821 Avoid rebuilding of the UploadListFragment 2016-02-22 14:13:00 +01:00
Juan Carlos González Cabrero
ee66791dcb Deleted keySuffix parameter from putIfAbsent method, wich was corrupting the path 2016-02-22 10:24:07 +01:00
David A. Velasco
286dc8fafd Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-02-22 10:21:46 +01:00
David A. Velasco
c9ad19692f Simplified FileUploader - UploadFileOperation gets responsibility to update local data as a new SyncOperation 2016-02-22 09:25:42 +01:00
Juan Carlos González Cabrero
9acb660165 Avoid storing an OCFile before the upload is completed 2016-02-22 09:20:52 +01:00
Maria Asensio
f88ab60a78 Merge pull request #1191 from owncloud/cancelUploadOnWlanExit 
Cancel upload on wlan exit
 2016-02-19 15:08:13 +01:00
David A. Velasco
e5fbc8fed9 Refactoring UploadFileOperation.java 2016-02-19 13:38:59 +01:00
Juan Carlos González Cabrero
6e63e65f2d Calls to the FileUploader service refactored and fixed 2016-02-19 12:52:22 +01:00
Maria Asensio
482d43a08d Merge pull request #1473 from owncloud/target_marshmallow_rebased 
Move to compile target Marshmallow (Android 6 - v23) - rebased without FAB
 2016-02-19 11:28:05 +01:00
David A. Velasco
1f3ff26001 Fixed broken initialization of UploadFileOperation 2016-02-19 11:08:49 +01:00
David A. Velasco
57de2968fb Removed dependency of OCUpload on OCFile 2016-02-19 10:06:55 +01:00
Juan Carlos González Cabrero
5fd891413e Line wrapping and getApplicationContext calls removed from last commit 2016-02-19 09:27:15 +01:00
Juan Carlos González Cabrero
e6cfedc285 Changed calls to FileUploader service to static methods to manage service Intents internally 2016-02-18 14:14:32 +01:00
Juan Carlos González Cabrero
d5fa3a5578 Retry action on list items of Updates view like in iOS 2016-02-18 10:21:03 +01:00
Juan Carlos González Cabrero
413d491112 Update uploads view when finish upload is deleted 2016-02-18 09:38:51 +01:00
David A. Velasco
40e9bb0529 Merged FileUploadService into FileUploader to avoid that changes from other branches are circumvented 2016-02-18 09:30:35 +01:00
David A. Velasco
cfcb18eb54 Saving new file to be uploaded for the first time with the correct reference to its parent folder 2016-02-17 17:46:16 +01:00
David A. Velasco
f58c19bb55 Minor fixes from own CR 2016-02-16 17:05:27 +01:00
Juan Carlos González Cabrero
91156063d2 'Clear all uploads' option implemented 2016-02-16 09:37:30 +01:00
David A. Velasco
89870064dc Merge pull request #1470 from owncloud/bug_7541 
Fixes app crash when malformed URL is entered in login view.
 2016-02-16 09:06:01 +01:00
David A. Velasco
82b0b7a84f Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-02-15 14:59:04 +01:00
Juan Carlos González Cabrero
9fe62d15ea Refresh listview when clear failed/finished uploads clicked 2016-02-15 10:58:53 +01:00
David A. Velasco
53df867a3c Removed dependency on org.apache.http.legacy.jar 2016-02-12 13:32:57 +01:00
Andy Scherzinger
9bdfc304c6 Move to NotificationCompat.Builder to create/replace notification (done for Android M compatibility @ compile target) 2016-02-12 12:39:46 +01:00
Andy Scherzinger
f85640527e use API for coloring 2016-02-12 12:31:59 +01:00
Andy Scherzinger
999ad9f355 refactored permission handling to separate class 2016-02-12 12:31:59 +01:00
Andy Scherzinger
55b4952687 fixed snackbar coloring of the action button 2016-02-12 12:29:05 +01:00
Andy Scherzinger
9d9bc6958b changes color of the OK button and the text 2016-02-12 12:29:05 +01:00
Andy Scherzinger
cbf134a6e2 move strings to resource file 2016-02-12 12:29:05 +01:00
Andy Scherzinger
4410bd9c60 add snackbar and check for write permission via API 2016-02-12 12:15:46 +01:00
Juan Carlos González Cabrero
2ca29f3e29 Fixes #7541: Catched invalid argument in URI parsing 2016-02-09 12:41:36 +01:00
David A. Velasco
ea1e67595c Prevent that lost waiting dialogs block operation after tricky rotations 2016-02-09 09:54:31 +01:00
David A. Velasco
3885db5013 Positive button of remove dialog(s) changed to 'Yes' 2016-02-09 08:59:35 +01:00
David A. Velasco
99c89e52ae Fixed multiple upload from external apps for Android 4.3+ 2016-02-09 08:43:27 +01:00
tobiasKaminsky
3ce879be24 according to CR 2016-02-05 17:27:35 +01:00
David A. Velasco
106db02dee Prevent crash when there are federated shares in the server 2016-02-05 14:28:57 +01:00
David A. Velasco
d23897c085 Fixed wrong set of incomplete password using 'cancel' button 2016-02-05 10:18:08 +01:00
masensio
7548964b37 Fix: App freezes when the data are cleared with an opened text file 2016-02-04 12:10:19 +01:00
David A. Velasco
b343896447 Fixed NullPointerException after clearing app data when left from image preview 2016-02-04 08:41:55 +01:00
masensio
9fd38ca0dd Changes from comments in Code Review: staring and NPE 2016-02-03 16:03:10 +01:00
masensio
dc2fdb9744 Changes from comments in Code Review: Strings and minor things 2016-02-03 14:28:12 +01:00
masensio
71d7c52e12 Use PassCode static values instead of literal strings 2016-02-03 13:50:43 +01:00
masensio
14530aa7b8 Changes from comments in PR Code Review 2016-02-03 13:45:53 +01:00
masensio
9e83827cc4 Delete settings in Clear Data method 2016-02-03 13:37:48 +01:00
masensio
491a8b71a2 Fix crash when Clear App Data and try to access 2016-02-03 13:37:45 +01:00
masensio
96ce49707b Clean app data (keeping the PASSCODE untouched) from ManageSpaceActivity 2016-02-03 13:37:45 +01:00
masensio
d6653ef684 Add android:manageSpaceActivity to AndroidManifest.xml. Create empty activity ManageSpaceActivity.java 2016-02-03 13:37:43 +01:00
tobiasKaminsky
145eb20a3d Merge remote-tracking branch 'remotes/upstream/master' into cancelUploadOnWlanExit_2 2016-02-02 21:50:50 +01:00
tobiasKaminsky
49f6d9c986 according to CR 2016-02-02 21:50:33 +01:00
tobiasKaminsky
0e89c1f01b solved bug 2016-02-02 21:13:41 +01:00
tobiasKaminsky
da0d98629c Merge remote-tracking branch 'remotes/upstream/master' into uploadShowsFiles_Master 2016-02-02 21:05:16 +01:00
David A. Velasco
831de4534e Merge pull request #1296 from owncloud/bug_1251 
Don't allow to remove passcode without entering it, nor set it incomplete
 2016-02-01 12:52:36 +01:00
masensio
8c5b1e6e47 Sort uploads: the latest the first shown 2016-01-28 10:03:38 +01:00
masensio
f5eb35c313 Max length of uploads shown = 30. 2016-01-27 17:14:07 +01:00
masensio
ea77bf553e Show thumbnails taking into account the upload status 2016-01-27 15:41:54 +01:00
masensio
9c57aafab5 Review appereance of Uploads View 2016-01-27 13:59:51 +01:00
David A. Velasco
a4e336acc2 Removed automatic back-browse; error codes from server do not distinguish between excess of permissions, removed share or removed file 2016-01-27 13:13:23 +01:00
David A. Velasco
c9017a2b0a Fixed operation of app after SAML expired sessions while editing share permissions 2016-01-27 11:09:24 +01:00
masensio
b59b0283bd Review uploads for favourite files 2016-01-26 18:28:13 +01:00
masensio
44f2894731 Checking Uploads with the same name 2016-01-26 17:53:13 +01:00
masensio
2f231561af Checking Priviledges Error failed uploads 2016-01-25 15:20:50 +01:00
masensio
29cb1277c3 Checking File Error failed uploads 2016-01-25 14:54:31 +01:00
masensio
15d5350ef6 Checking Folder Error failed uploads 2016-01-25 14:23:23 +01:00
masensio
198c1bf3b0 Checking Credential Error failed uploads: show error as Credential error and relogin 2016-01-25 13:02:22 +01:00
David A. Velasco
2681f8c22b Improved navigation after errors due to removal of shares, files or users from a separate client 2016-01-25 11:08:28 +01:00
masensio
b6f8e93504 Checking Network Connection failed uploads 2016-01-25 10:59:53 +01:00
David A. Velasco
6ac53bc1ba Grant that UI is correctly refreshed on rotations 2016-01-25 09:42:02 +01:00
David A. Velasco
2f1084012f Tweaked UI behaviour for resharing folders with partial edit permissions 2016-01-25 08:25:24 +01:00
tobiasKaminsky
1023aa1eba update todo 2016-01-24 08:39:10 +01:00
tobiasKaminsky
cc637a61c6 add lastMod 2016-01-24 08:33:36 +01:00
Andy Scherzinger
cc8df75355 fix NPR (Uploader doesn't have a progressbar, so we can't set a status for it (!) 2016-01-22 22:16:03 +01:00
masensio
66ec45f633 Review behaviour of failed uploads: list in uploads view 2016-01-22 10:59:43 +01:00
masensio
814a70f6a3 Update refresh icon in uploads view 2016-01-20 18:41:52 +01:00
David A. Velasco
628e713268 Update model changed: permission updates are requested to the server as soon as the user changes any value 2016-01-20 18:18:14 +01:00
masensio
b353ed62cd Show thumbnail or file icon depending on the file type in Uploads view 2016-01-20 18:06:35 +01:00
masensio
6448857a55 Fix problem with instant upload when parent folder is not created before 2016-01-20 14:24:23 +01:00
David A. Velasco
0d4c9b9961 Show error message from server when update of permissions fail 2016-01-20 12:22:24 +01:00
David A. Velasco
83092452a2 Dynamic retrieval of maximum permissions allowed to reshare is not trustful - removed 2016-01-20 11:57:53 +01:00
masensio
2c4daf3a93 Update the status of current upload when it finishes 2016-01-20 11:19:43 +01:00
masensio
6f58527273 Update progress bar for Current Upload 2016-01-19 17:32:50 +01:00
masensio
6a8d0383c6 Show current uploads in uploads list view. Apply code review changes, merging FileUpload + FileUploadService 2016-01-18 14:20:55 +01:00
David A. Velasco
3b4b8ceadd Dinamycally find out the maximum permissions to reshare 2016-01-18 14:08:38 +01:00
masensio
373daff473 Third step: merging services FileUploader + FileUploadService 2016-01-15 15:03:27 +01:00
masensio
3a908b8c1d Second step: merging services FileUploader + FileUploadService 2016-01-15 11:06:12 +01:00
masensio
92c33d932c First step to add lastest changes in FileUploader into FileUploadService 2016-01-14 13:27:12 +01:00
Andy Scherzinger
341abcd358 move to progress bar instead of unsupported legacy Indeterminate platform calls 2016-01-12 23:08:06 +01:00
masensio
2ec9899060 Show null path in uploads view 2016-01-12 18:28:22 +01:00
masensio
8c71b9ec29 Clean FileDisplayActivity: delete comments from merge conflicts and casting (Parcelable) on OCFile objects 2016-01-12 16:28:35 +01:00
masensio
990f16ca47 Add drawe access from uploads view 2016-01-12 14:16:22 +01:00
David A. Velasco
e7901656a1 Polish UI to edit permissions 2016-01-11 15:34:41 +01:00
masensio
de39244b83 Fix problems with DB access after updating upload 2016-01-11 14:51:41 +01:00
David A. Velasco
bba66e773d Reset state of check boxes if update of privileges fails 2016-01-11 12:17:46 +01:00
David A. Velasco
6f5d09ada2 Update share permissions when 'DONE' button is clicked 2016-01-11 12:17:45 +01:00
David A. Velasco
d826451e2d Added buttons to unshare (working) and finish (not working) in EditShareFragment layout 2016-01-11 12:17:11 +01:00
David A. Velasco
5fcb70beee Added fragment to edit share permissions with basic layout 2016-01-11 12:17:08 +01:00
tobiasKaminsky
021fe9d14b changes according to CR 2016-01-10 20:17:21 +01:00
masensio
2181239c6d Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-01-08 11:21:23 +01:00
David A. Velasco
ffbd118e8d Removed calls to ApplicationContext and minor refactoring 2016-01-05 12:03:02 +01:00
David A. Velasco
4ec4b66921 Fix update of text in menu after removal of static methods 2016-01-05 12:03:00 +01:00
tobiasKaminsky
337191ff1a minor code optimizations 2016-01-05 12:02:59 +01:00
tobiasKaminsky
45c82e4fed removed static functions (according to CR) 2016-01-05 12:02:57 +01:00
tobiasKaminsky
9bcef74f6d changes according to CR 2016-01-05 11:54:55 +01:00
tobiasKaminsky
cd04b0d389 do not show "switch" menu item on file details/preview text/video/audio 2016-01-05 11:50:03 +01:00
tobiasKaminsky
6920a7495e do not show "switch" menu item on file details/preview text/video/audio 2016-01-05 11:50:02 +01:00
tobiasKaminsky
d7e9ef92b8 fixed according to review 2016-01-05 11:50:00 +01:00
tobiasKaminsky
db46b19824 decision grid vs. list view remembered per folder, inherited by parents 2016-01-05 11:20:08 +01:00
tobiasKaminsky
6bd7065c73 wip 2016-01-05 11:16:00 +01:00
tobiasKaminsky
323bef93a9 change due to merge 2015-12-31 13:33:46 +01:00
tobiasKaminsky
b2ae3fa467 Merge remote-tracking branch 'remotes/upstream/master' into uploadShowsFiles 2015-12-31 13:26:36 +01:00
masensio
aeaa422fed Close cursors in UploadStorageManager methods 2015-12-29 13:22:31 +01:00
masensio
540d123ad5 Merge branch 'master' into reliable_uploads_actions_uploads_view 2015-12-29 12:46:45 +01:00
Andy Scherzinger
a812784ddd Merge branch 'master' of https://github.com/owncloud/android into material_buttons 
Conflicts (resolved):
	res/layout/drawer.xml
	res/values/colors.xml
	res/values/setup.xml
 2015-12-28 20:03:25 +01:00
Andy Scherzinger
cc2ba716fb Merge branch 'material_buttons' of https://github.com/owncloud/android into material_buttons 2015-12-28 19:22:40 +01:00
Andy Scherzinger
dd8c65dcd9 fix for #1381 2015-12-28 19:21:05 +01:00
masensio
aca6e66d19 Optimize set for boolean parameters in UploadsStorageManager. Fix problem in Uploads DB creation method 2015-12-28 15:04:33 +01:00
masensio
eee7ea369d Merge branch 'master' into reliable_uploads_actions_uploads_view 2015-12-28 10:13:38 +01:00
Bartosz Przybylski
3f61dc5a8a #1338: Correctly use delayUntil property of SyncResult 2015-12-18 15:55:05 +01:00
David A. Velasco
d5c4d7ab92 Changes from code review 2015-12-17 15:49:55 +01:00
masensio
e89104b40e Save OCFile into DB when a file is prepare to be uploaded, before uploading (WIP) 2015-12-16 09:17:35 +01:00
masensio
390e06efa8 Adapt UploadDBObject (new OCUpload) to manage uploads data 2015-12-15 13:00:38 +01:00
David A. Velasco
41f1924bb6 Access to Uploads table through ContentResolver instead of direct access as DB 2015-12-11 15:40:59 +01:00
masensio
10874aa7a7 Add new table for uploads on database 2015-12-11 14:35:45 +01:00
masensio
1a74d5ba59 Changes from comments in reliable_uploads code review 2015-12-11 11:15:53 +01:00
masensio
a840e67a68 Add 'Uploads' option into NavigationDrawer 2015-12-11 08:43:33 +01:00
masensio
a2b680edd0 Merge branch 'reliable_uploads' into reliable_uploads_actions_uploads_view 2015-12-10 17:35:32 +01:00
masensio
dc0aea30f0 Merge branch 'master' into reliable_uploads 
Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/com/owncloud/android/datamodel/OCFile.java
	src/com/owncloud/android/db/ProviderMeta.java
	src/com/owncloud/android/files/FileMenuFilter.java
	src/com/owncloud/android/files/FileOperationsHelper.java
	src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
	src/com/owncloud/android/files/services/FileUploader.java
	src/com/owncloud/android/operations/SynchronizeFolderOperation.java
	src/com/owncloud/android/operations/UploadFileOperation.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/utils/FileStorageUtils.java
 2015-12-10 17:18:52 +01:00
Andy Scherzinger
71e87d98a8 Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-12-09 15:14:22 +01:00
Maria Asensio
896e4859c0 Merge pull request #1168 from owncloud/avoidDuplicateFiles 
Avoid duplicate files
 2015-12-09 09:27:54 +01:00
tobiasKaminsky
9e678fc697 changed according to latest comments 2015-12-02 19:55:41 +01:00
tobiasKaminsky
04fc2e3cc2 changed according to latest discussion 2015-12-01 22:00:53 +01:00
masensio
a7304351b1 Fix issue 1319: Error on the preview, Android 4.1.2 2015-12-01 16:08:01 +01:00
David A. Velasco
d1a06c2dd3 Prevent that repeated requests to FileDownloader/FileUploader/SyncFolderHandler get to the worker thread 2015-12-01 13:20:50 +01:00
Andy Scherzinger
4f7d416b81 BugFix for #1312 - setting ListPreference selection on pre kitkat 2015-11-30 14:22:52 +01:00
tobiasKaminsky
5d77cfc62d fix 1313 2015-11-27 17:11:13 +01:00
masensio
49f593ecd1 Fix bug: App crash when try to share link with api disabled 2015-11-26 14:07:32 +01:00
masensio
b5ef1698bd Fix bug related with sharee with special characters 2015-11-26 14:07:31 +01:00
David A. Velasco
0ab80ee4d2 Fixed stalled connections when a thumbnail that cannot be generated by the server is requested several times 2015-11-26 14:00:52 +01:00
David A. Velasco
40d1961e66 Fixed bug: a file already shared with users couldn't be shared via link 2015-11-25 09:47:38 +01:00
David A. Velasco
7277d0a840 Prevent that repeated requests to FileDownloader/FileUploader/SyncFolderHandler get to the worker thread 2015-11-25 09:42:19 +01:00
David A. Velasco
854d333bd8 Silently handle remote folders removed while a full account refresh is run 2015-11-25 09:42:18 +01:00
David A. Velasco
0199ef3ef2 Fixed NPE in synchronization of full account 2015-11-25 09:42:17 +01:00
David A. Velasco
538af7d36b Added error messages on view for sharees searching 2015-11-25 09:42:16 +01:00
David A. Velasco
5c24e55421 Grant that ShareActivity is correctly refreshed if public share was removed in the server 
Updated library reference after merge in master
 2015-11-25 09:33:37 +01:00
David A. Velasco
00a4ba4f52 Retry forbidden share adding a password only if the value of 'enforce password' option is unknown 2015-11-25 09:32:35 +01:00
David A. Velasco
5384f6ff86 Fixed bug: grant that paused FileActivity behind ShareActivity is not registered as a listener with OperationService when the devide is rotated, preventing CRASH when password is enforced in server 2015-11-25 09:32:33 +01:00
David A. Velasco
9b4d153e90 Updated handling of enforced password for public shares depending on server capabilities 2015-11-25 09:32:32 +01:00
David A. Velasco
f5369ac4b2 Hide UI elements about public share when this is disabled in the server 2015-11-25 09:32:31 +01:00
David A. Velasco
b368a4b853 Removed useless code 2015-11-25 09:32:29 +01:00
masensio
030eaffcfc List view is shown completelly on the ShareFileFragment 2015-11-25 09:32:27 +01:00
masensio
e08513a762 Delete any rest of old public share/unshare flow 2015-11-25 09:32:26 +01:00
masensio
68550e9977 Implement 'Get link' button 2015-11-25 09:32:25 +01:00
David A. Velasco
6c1c63ac16 Show current expiration date selected in date picker while modifying it 2015-11-25 09:32:23 +01:00
David A. Velasco
3d7278f470 Modify current expiration date on touch in expiration label or value 2015-11-25 09:32:22 +01:00