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
David A. Velasco
d4df65d7c7
Fixed NPE on list of shares in SearchShareesFragment; and some clean-up
2015-10-30 16:55:29 +01:00
David A. Velasco
f91241566a
Renamed SearchFragment to SearchShareesFragment
2015-10-30 16:55:27 +01:00
David A. Velasco
aa4f47cbe0
Fixed error messages related with network in ShareActivity
2015-10-30 16:54:36 +01:00
masensio
fc2ac6445d
Give ALL_PRIVILEGES when create a Share with User/Group
2015-10-30 16:54:34 +01:00
masensio
ed89b915ae
Remove commented code
2015-10-30 16:54:33 +01:00
masensio
7b0ec3d3a6
Fix share with user/group when displayname!=username
2015-10-30 16:54:13 +01:00
masensio
c5ba47d4f2
Avoid fullscreen searchview when editing
2015-10-30 16:53:08 +01:00
David A. Velasco
ba694cba7d
Removed check of NULL after code review
2015-10-30 16:52:53 +01:00
David A. Velasco
30aa3fdfd1
Fixed error messages for user using getLogMessage()
2015-10-30 16:52:11 +01:00
David A. Velasco
cc0fb41554
Show error messages from server when share-specific errors occur while sharing or unsharing
2015-10-30 16:52:09 +01:00
David A. Velasco
eb9890f32f
Adaption to refactoring of library from GetRemoteUsersOrGroupsOperation to GetRemoteShareesOperation
2015-10-30 16:51:54 +01:00
David A. Velasco
2670c2642a
Put focus in search field and show keyboard automatically
2015-10-30 16:50:50 +01:00
masensio
d1294ca584
Good behaviiour in servers not supporting SHAREE API: show the menu option and a messsage when try to share with a new user/group
2015-10-30 16:50:49 +01:00
masensio
adde411b6f
Remove toast with create_share info
2015-10-30 16:48:36 +01:00
masensio
e9c562aa8a
Polish landscape and turns
2015-10-30 16:48:35 +01:00
masensio
f65152c5fb
Refactor saveSharesInFolder in FileDataStorageManager. Set the Content Values using prepareInsertShares method
2015-10-30 16:48:32 +01:00
masensio
671fef617b
Show users/groups in Search Fragment list
2015-10-30 16:48:31 +01:00
masensio
fdcf0ebbc8
Fix saveSharesDB, duplicated rows
2015-10-30 16:47:33 +01:00
David A. Velasco
b811eefe95
Fixed build after rebasing
2015-10-30 16:47:30 +01:00
David A. Velasco
4d13b49631
Fixes from CR
2015-10-30 16:47:28 +01:00
David A. Velasco
9df957d548
Share the file with a user or group when selected on the list of suggestions
2015-10-30 16:47:27 +01:00
David A. Velasco
5e0f46cc2e
Added operation to create shares with a sharee, separated from operation to create shares via link
2015-10-30 16:46:54 +01:00
David A. Velasco
33a9d1f447
Get rid of dependency on Context in CreateShareOperation
2015-10-30 16:41:59 +01:00
masensio
e81bff7679
Extra commit to complement: Fill in Users/Groups List of a 'share with' from server data
2015-10-30 16:41:58 +01:00
masensio
c49cc06d3d
Get users/group from Server, to fill in 'Share with' list
2015-10-30 16:41:57 +01:00
masensio
fcdef568ea
Remove share_group_indicator string
2015-10-30 16:39:23 +01:00
masensio
ceffbc4aa8
Remove unshare with users/groups option from the menu
2015-10-30 16:39:21 +01:00
David A. Velasco
2d854bc5a9
Prevent that arbitrary text is queried instead of selecting a user / group of the suggestions list
2015-10-30 16:39:20 +01:00
masensio
9cdaddefa3
Use UnshareOperation instead an AsyncTask, for unshare with
2015-10-30 16:39:19 +01:00
masensio
a00b272903
Adapt UnshareLinkOperation to support also ShareType: USER or GROUP. UnshareLinkOperation --> UnshareOperation
2015-10-30 16:37:36 +01:00
David A. Velasco
043d2128ad
Removed option to refine suggestions in edit field
2015-10-30 16:37:35 +01:00
masensio
de93a66763
Change ShareActivity type, now it is a FileActivity
2015-10-30 16:37:33 +01:00
David A. Velasco
1fae1f1b7f
Removed redundant ArrayList creation
2015-10-30 16:34:48 +01:00
tobiasKaminsky
fc0dfecf1a
fixed travis bug
2015-10-30 16:32:57 +01:00
masensio
1bdd672295
Add unshare with users/groups, from Share wiht view
2015-10-30 16:31:10 +01:00
David A. Velasco
305536f8c2
Users and groups retrieved from server to fill search suggestions
2015-10-30 16:31:08 +01:00
masensio
e0813be81e
Clean code in ShareFileFragment
2015-10-30 16:28:42 +01:00
masensio
1fbc44b574
Add new string for share_groups_indicator
2015-10-30 16:28:41 +01:00
masensio
3de67c45e4
Animate unshare button
2015-10-30 16:28:39 +01:00
masensio
fff362d103
Add unshare with user option to share with view
2015-10-30 16:28:37 +01:00
masensio
55dc0da79a
Get shares from Database, fix in insert shares in DB
2015-10-30 16:28:36 +01:00
David A. Velasco
e3d509a451
Complete search widget to send search requests to parent activity
2015-10-30 16:28:35 +01:00
masensio
72987c296f
Get shares from Database (WIP)
2015-10-30 16:26:28 +01:00
masensio
20b0ec8977
Show users/groups in share with view, getting the data from the server
2015-10-30 16:26:26 +01:00
masensio
00a221ea8f
Remove android.support.widget components from the sharewith view. Waiting for introducing Floating button in the project
2015-10-30 16:25:54 +01:00
David A. Velasco
0db4fc9b17
Sync user and group shares into database
2015-10-30 16:25:52 +01:00
masensio
905b68b4ec
Show the 'search' layout in phone and tablet
2015-10-30 15:23:03 +01:00
David A. Velasco
bc5687b74a
Changed title in sharing dialog from 'Share link' to 'Sharing' (seen in web UI)
2015-10-30 15:23:00 +01:00
masensio
263152a067
Add Get Groups operation
2015-10-30 15:22:57 +01:00
masensio
5a14928e1e
Add Get Users from Server Operation
2015-10-30 15:22:36 +01:00
masensio
f28faf0c26
Show the layout to hsare with user in phone and tablet
2015-10-30 15:21:48 +01:00
masensio
c288f91d87
Add new attribute to OCFile to know if this file is shared with users/groups
2015-10-30 15:21:45 +01:00
masensio
e50bc09321
Add new attribute to OCFile to know if this file is shared with users/groups
2015-10-30 15:10:41 +01:00
masensio
a94c176c75
Show share with users option if the server supports search users function
2015-10-30 15:08:14 +01:00
masensio
3a527a8fe4
Add 'Share with users/groups' to long press menu
2015-10-30 15:04:34 +01:00
Maria Asensio
eaa0612bfa
Merge pull request #1109 from owncloud/sync_full_folder
...
Replaced 'download folder' with 'synchronize', triggering the synchronization in two-ways of all the files in a folder
2015-10-30 14:14:52 +01:00
Maria Asensio
4a11470630
Merge pull request #1200 from owncloud/fix_1192_date_time
...
fix for #1192
2015-10-30 10:38:14 +01:00
LukeOwncloud
9d4ce6becd
MC: Updated comment only
...
Comment did not reflect last commit change.
2015-10-29 21:03:32 +01:00
masensio
3444d61be8
Detect conflict when local and server version are changed
2015-10-29 17:13:24 +01:00
Andy Scherzinger
448124cc7e
return standard date string as fallback
2015-10-29 10:24:15 +01:00
masensio
bcfa07f565
Fix Select Local Version or Keep Both behaviour when solving file coflict
2015-10-27 14:32:42 +01:00
masensio
b9ef747a0b
Merge branch 'master' into sync_full_folder
...
Conflicts:
owncloud-android-library
src/com/owncloud/android/files/services/FileUploader.java
2015-10-27 08:52:17 +01:00
Andy Scherzinger
5c1e6e59ba
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-10-22 13:05:06 +02:00
David A. Velasco
08443f90c5
Merge pull request #1177 from owncloud/notification_coloring
...
Add ownCloud color to notifications for lollipop
2015-10-22 09:10:10 +02:00
Andy Scherzinger
e8eda963ae
flipped the if/else for performance optimization
2015-10-16 11:41:26 +02:00
Andy Scherzinger
be83702fd7
Merge branch 'master' of https://github.com/owncloud/android into fix_1192_date_time
2015-10-16 10:42:02 +02:00
Andy Scherzinger
30720e98a5
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-10-16 10:41:32 +02:00
tobiasKaminsky
e18773465d
Merge remote-tracking branch 'remotes/upstream/master' into uploadShowsFiles
2015-10-15 18:27:07 +02:00
tobiasKaminsky
960ea3ceac
fixed missing refresh of thumbnail after sync
2015-10-15 16:20:14 +02:00
masensio
8e87cc2bf4
Merge remote-tracking branch 'origin/develop'
2015-10-15 16:17:32 +02:00
masensio
1f964a79dd
Merge branch 'detailThumbnail' of git://github.com/zmatsuo/android into zmatsuo-detailThumbnail
...
Conflicts:
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
2015-10-15 16:10:55 +02:00
Andy Scherzinger
ae6194ffee
fix for #1192
2015-10-15 14:04:56 +02:00
Andy Scherzinger
5db8c47b8a
Merge branch 'master' of https://github.com/owncloud/android into notification_coloring
2015-10-09 14:45:32 +02:00
tobiasKaminsky
8b3ed70791
wip
2015-10-07 22:35:55 +02:00
tobiasKaminsky
25410ff36a
Merge branch 'master' of github.com:owncloud/android into cancelWlan
2015-10-07 22:31:37 +02:00
tobiasKaminsky
c0a3399573
on wifi change: cancel all pending uploads, check prior each upload
2015-10-07 21:34:39 +02:00
Andy Scherzinger
41a883549f
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-10-07 19:03:23 +02:00
Maria Asensio
567355eed0
Merge pull request #1190 from owncloud/1182_Open_With_Fix
...
Fix for #1182 on Android 5
2015-10-07 11:19:16 +02:00
Maria Asensio
72e588b6b7
Merge pull request #1117 from owncloud/sortAccents
...
Sort accents
2015-10-06 14:51:14 +02:00
Andy Scherzinger
75e2349e5b
Code review
2015-10-06 09:58:16 +02:00
Andy Scherzinger
8f0ea82efd
Fix for #1182 on Android 5
2015-10-05 18:44:50 +02:00
tobiasKaminsky
7579d3daf7
Merge remote-tracking branch 'remotes/upstream/master' into sortAccents
2015-10-02 16:04:18 +02:00
Wikinaut
cf063bf04a
fix #1024 show cert fingerprints when adding new account w/ untrusted cert
...
+ show SHA-256, SHA-1 and MD5 certificate fingerprint
instead of signature hex dump
when certificate is untrusted
+ show error string if one of the digest algorithms is not available
+ added check and error msg for certificate load problems
2015-10-02 02:39:10 +02:00
masensio
99d7e18916
Merge pull request #839 from fluffy88/develop
...
Trigger media scan after file upload
2015-10-01 18:45:01 +02:00
masensio
08d02058c8
Use SYNC_CONFLICT instead CONFLICT for conflicts in UploadFileOperation
2015-09-30 17:59:12 +02:00
masensio
9494620cc4
Merge branch 'master' into sync_full_folder
...
Conflicts:
src/com/owncloud/android/providers/FileContentProvider.java
2015-09-30 12:24:01 +02:00
David A. Velasco
001801a39b
Upload operations end in conflict if overriding a version different than the last known
2015-09-28 11:21:33 +02:00
Andy Scherzinger
796b1bd297
Add ownCloud color to notifications (only works on lollipop and up) for progress bar and icon background
2015-09-27 21:40:52 +02:00
Andy Scherzinger
35a68aa337
custom list preference implementation for visual material consistency on pre-lollipop
2015-09-27 20:21:09 +02:00
tobiasKaminsky
126d251375
fixed bug: behaviour is now obeyed for files that are uploaded after connection switch (no wlan to wlan)
2015-09-25 17:22:40 +02:00
Andy Scherzinger
5417b2a4e5
Merge branch 'release-1.8' of https://github.com/owncloud/android into material_buttons
2015-09-25 16:09:01 +02:00
David A. Velasco
056b7c964d
Updated error message for failed folder synchronization ('download' not anymore)
2015-09-25 15:13:59 +02:00
David A. Velasco
7d7767aa11
Removed some logs
2015-09-25 15:13:57 +02:00
David A. Velasco
44023a6059
Clean-up: removed unused imports and methods, and commented code
2015-09-25 15:13:56 +02:00
David A. Velasco
499d628aa1
Removed separated 'download folder' in contextual menu and unused DownloadFolderOperation class
2015-09-25 15:13:54 +02:00
David A. Velasco
1e59a632bc
Fixed permanent 'uploading' icon on files that are automatically renamed during the upload
2015-09-25 15:13:53 +02:00
David A. Velasco
b8a3dc71e4
Safe blanket to clean DB if wrong conflicts keep stored
2015-09-25 15:13:51 +02:00
David A. Velasco
95bebe9382
Remove conflict badge from ancestors when conflict is solved there are no more conflicts below
2015-09-25 15:13:50 +02:00
David A. Velasco
7399508e05
Removed conflict badge when conflict is solved
2015-09-25 15:13:49 +02:00
