Commit graph

2431 commits

Author SHA1 Message Date
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
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
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
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
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
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
David A. Velasco
3b4b8ceadd Dinamycally find out the maximum permissions to reshare 2016-01-18 14:08:38 +01:00
Andy Scherzinger
341abcd358 move to progress bar instead of unsupported legacy Indeterminate platform calls 2016-01-12 23:08:06 +01:00
David A. Velasco
e7901656a1 Polish UI to edit permissions 2016-01-11 15:34: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
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
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
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
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
David A. Velasco
494267ad15 Modify current password on touch in password label or value 2015-11-25 09:32:21 +01:00
David A. Velasco
ad7666370f Set or clear expiration date to protect public link in ShareFileFragment 2015-11-25 09:32:20 +01:00
David A. Velasco
729a9b7c77 Set or clear password to protect public link in ShareFileFragment 2015-11-25 09:32:19 +01:00
David A. Velasco
19cf573db0 Unshare public link in ShareFileFragment 2015-11-25 09:32:17 +01:00
David A. Velasco
261299cf23 Share public link in ShareFileFragment 2015-11-25 09:32:16 +01:00
David A. Velasco
f1b3208f1a Updated ShareFileFragment layout with extra section for public shares 2015-11-25 09:32:15 +01:00
Andy Scherzinger
ecdb95fa0c Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-11-22 17:10:37 +01:00
tobiasKaminsky
d901208c1f rename file is not working across mount points: therefore copying it and then delete 2015-11-22 13:22:59 +01:00
tobiasKaminsky
4471d3beb9 changes according to CR (code review) 2015-11-21 09:03:53 +01:00
tobiasKaminsky
2aac1e5270 Merge remote-tracking branch 'remotes/upstream/master' into avoidDuplicateFiles_Master 2015-11-21 08:48:40 +01:00
Maria Asensio
08be3d3433 Merge pull request #1119 from owncloud/strip-index-php-from-server-url
Strip away index.php/apps/files to allow copy pasting from the server
2015-11-20 12:24:11 +01:00
Bartosz Przybylski
bb7e95739a Don't allow to remove passcode without entering it. Don't allow to set incomplete passcode, 2015-11-19 20:53:08 +01:00
David A. Velasco
257a9ec0a9 Merge pull request #1274 from owncloud/read_capabilities_for_showing_share_options
Adapt availability of "Share with users" depending on server capabilities
2015-11-12 10:32:36 +01:00
masensio
35922a08c1 Read capabilities for showing Share Options
Updated library reference after merge in master
2015-11-12 10:28:37 +01:00
Maria Asensio
80aacce3f3 Merge pull request #1269 from owncloud/fix_video_not_previewed
Fix video not previewed #1180
2015-11-11 17:13:42 +01:00
David A. Velasco
4326883490 Minimal cleaning 2015-11-06 19:47:19 +01:00
David A. Velasco
2477d496e3 Fixed local URI to video files passed to VideoView 2015-11-06 15:02:57 +01:00
Andy Scherzinger
c31f602fd1 Merge branch 'master' of https://github.com/owncloud/android into material_buttons
Conflicts:
	res/layout/list_item.xml
2015-11-06 11:38:51 +01:00
Maria Asensio
19cce9c90f Merge pull request #1184 from Wikinaut/show-certificate-digest
fix #1024 show cert fingerprints when adding new account w/ untrusted certificate
2015-11-06 11:23:30 +01:00
Andy Scherzinger
337b8f30a5 Fix visibility of file size and separator for folder see #1232 2015-11-04 10:04:03 +01:00
Andy Scherzinger
2cfc7237ea correct text field names 2015-11-02 15:26:00 +01:00
Andy Scherzinger
8110be0155 fixed another typo 2015-11-02 12:32:15 +01:00
Andy Scherzinger
90097b107d typos fixed 2015-11-02 12:22:49 +01:00
Andy Scherzinger
f72289f7bf Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-11-02 08:41:51 +01:00
David A. Velasco
58559b784b Let server decide default permissions for new share 2015-10-30 16:56:40 +01:00
David A. Velasco
d89488ea01 Refactoring: a single method to request ShareActivity 2015-10-30 16:56:24 +01:00
David A. Velasco
f4ae62cc48 Simplified handling of life cycle in ShareActivity to grant nice operation
while navigating and rotating
2015-10-30 16:56:23 +01:00