AndyScherzinger
544825e947
fixed minor warnings
2016-11-10 10:20:02 +01:00
AndyScherzinger
1934bfd33e
add Null Checks to fix isGrid/list checks
2016-11-10 10:20:02 +01:00
AndyScherzinger
aacdfc0c13
fix new PMD error after rebase, fix display remote file list issue
2016-11-10 10:20:02 +01:00
Iskra Delta
0a13a5b818
PMD appeased
...
Some warnings have been supressed.
2016-11-10 10:20:01 +01:00
Iskra Delta
97da0cbc94
FindBugs appeased
2016-11-10 10:19:52 +01:00
AndyScherzinger
df60c9c8d7
fixing codacy warnings
2016-11-07 23:02:16 +01:00
AndyScherzinger
500707ce6d
brackets
2016-11-07 16:19:20 +01:00
AndyScherzinger
46d0f01ad6
removal of code warnings
2016-11-07 15:36:35 +01:00
AndyScherzinger
560f5a76f2
simplified boolean check
2016-11-07 00:31:54 +01:00
AndyScherzinger
ff6b07b041
Avoid instantiating Boolean objects; reference Boolean.TRUE or Boolean.FALSE or call Boolean.valueOf() instead.
2016-11-07 00:23:17 +01:00
AndyScherzinger
c3eb12caef
fix crash when exposing URI on Android 7+
2016-11-06 21:59:34 +01:00
tobiasKaminsky
af859dfbda
fix wrong upload behaviour
2016-11-06 09:19:10 +01:00
tobiasKaminsky
ccccbbb4d6
dirty fix for null occurence
2016-11-03 22:02:55 +01:00
AndyScherzinger
9d7c9530b9
Merge branch 'master' of https://github.com/nextcloud/android into syncedFolders
2016-11-03 00:20:29 +01:00
AndyScherzinger
9579e0626d
fix after rebase
2016-11-02 23:34:51 +01:00
Andy Scherzinger
6b848b4066
fixes
2016-11-02 23:34:50 +01:00
David A. Velasco
aa0e4b8cc8
Fix crash opening or sending files in Android 7
...
# Conflicts:
# res/values/setup.xml
# src/com/owncloud/android/ui/activity/Preferences.java
2016-11-02 23:34:50 +01:00
AndyScherzinger
a737c09f10
fixes for preferences after merge
2016-11-02 22:06:51 +01:00
AndyScherzinger
fee252176e
Merge branch 'master' of https://github.com/nextcloud/android into syncedFolders
...
# Conflicts:
# src/com/owncloud/android/MainApp.java
# src/com/owncloud/android/ui/activity/Preferences.java
2016-11-02 21:48:52 +01:00
Andy Scherzinger
b09126cb81
fixed imports after rebase
2016-11-02 12:09:52 +01:00
Andy Scherzinger
20a0a747d7
extract/pre-compile the pattern
2016-11-02 12:09:52 +01:00
Andy Scherzinger
612199a9b7
further CR fixes, fixed comment in layout/migration_layout.xml
2016-11-02 12:09:52 +01:00
Andy Scherzinger
6e73da2809
CR, GPLv3
2016-11-02 12:09:52 +01:00
Andy Scherzinger
d7d2845117
lib version 1.0.2, organizes imports in FileStorageUtils
2016-11-02 12:09:51 +01:00
Bartosz Przybylski
e47ebda6cc
rebase fixes
2016-11-02 12:09:51 +01:00
tobiasKaminsky
afbe508dd1
use lollipop external storage system
2016-11-02 12:09:51 +01:00
Bartosz Przybylski
5cf019d9de
Because of multiple underlying implementation of storage mount points introduce a mechanism which is querying multiple solutions and lists them to the user
2016-11-02 12:09:51 +01:00
Bartosz Przybylski
a9f55d5d96
Handle case of migration of empty src directory
2016-11-02 12:09:50 +01:00
Bartosz Przybylski
4265c60b92
Change the way of fetching mounted resources, use system tools and parse results
2016-11-02 12:09:50 +01:00
Bartosz Przybylski
70c690ca7c
Use progress dialog instead of alert dialog, for better UX
2016-11-02 12:09:50 +01:00
Bartosz Przybylski
8b587cead2
Tabs to spaces
2016-11-02 12:09:50 +01:00
Bartosz Przybylski
47f522d34e
Small code cleanups
2016-11-02 12:09:50 +01:00
Bartosz Przybylski
9dc51a4880
Simplify storage selection process
2016-11-02 12:09:49 +01:00
Bartosz Przybylski
2af111b8cb
Add DataStorageUtils to detect connected SD cards
2016-11-02 12:09:49 +01:00
Bartosz Przybylski
cec707b582
For more reliability delete old files recursively in migration cleanup
2016-11-02 12:09:49 +01:00
Bartosz Przybylski
0ea54fa91c
Fix after rebase
2016-11-02 12:09:49 +01:00
Bartosz Przybylski
8ad388f951
Soften requirement on cleanup step failures
2016-11-02 12:09:49 +01:00
Bartosz Przybylski
6722f71be8
Stop and start logging on migration
2016-11-02 12:09:48 +01:00
Bartosz Przybylski
ebbab224b2
Code cleanups
2016-11-02 12:09:48 +01:00
Bartosz Przybylski
67bc271265
Add cleanup and rollback step when migrating. Correctly set progress during migration.
2016-11-02 12:09:48 +01:00
Bartosz Przybylski
b38b3276e2
Add more migration stuff. cleanup step is still missing
2016-11-02 12:09:48 +01:00
Andy Scherzinger
3fc8d999db
rebase
2016-11-02 12:09:48 +01:00
tobiasKaminsky
b1963aed50
Prepare preferences and project to use user defined storage path
2016-11-02 12:09:47 +01:00
AndyScherzinger
d713294cf0
further merge fixes
2016-11-02 00:34:54 +01:00
AndyScherzinger
d912bd2dce
Fixes after rebase
2016-11-02 00:30:50 +01:00
AndyScherzinger
fc6e3fc458
Merge branch 'master' of https://github.com/nextcloud/android into syncedFolders
...
# Conflicts:
# res/layout/drawer.xml
# res/layout/drawer_header.xml
# src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
2016-11-02 00:18:24 +01:00
AndyScherzinger
b3ffb02736
use proper alert
2016-11-01 23:35:19 +01:00
AndyScherzinger
50cbf61872
code review changes
2016-11-01 23:35:18 +01:00
AndyScherzinger
928a1b8630
fixes after cherry pick
2016-11-01 23:35:18 +01:00
David A. Velasco
5a97d31392
Finish action mode when drawer starts to open, recover it when drawer is closed
...
# Conflicts:
# build.gradle
# src/com/owncloud/android/ui/activity/DrawerActivity.java
# src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2016-11-01 23:35:17 +01:00
AndyScherzinger
ae0db114fb
housekeeping (file_actions and AccountActionsDialog aren't in use anymore due to multi select / account manager capabilities)
2016-11-01 23:35:17 +01:00
AndyScherzinger
e89531fc1a
optimized layout adding username + account-url
2016-11-01 23:35:16 +01:00
AndyScherzinger
8c9e2206cb
name and avatr clickable (switching accounts)
2016-11-01 23:35:16 +01:00
AndyScherzinger
42c61c9ed4
highlight currently active user
2016-11-01 23:35:16 +01:00
David A. Velasco
c098aca057
Show a check mark on the current account in the account manager
...
# Conflicts:
# res/layout/account_item.xml
# src/com/owncloud/android/ui/activity/ManageAccountsActivity.java
# src/com/owncloud/android/ui/adapter/AccountListAdapter.java
2016-11-01 23:35:15 +01:00
AndyScherzinger
7bf64ef1bc
account switching via list item click
2016-11-01 23:35:15 +01:00
David A. Velasco
d504a055aa
Fix exit of the app after not creating account from 'Add account' in navigation drawer
2016-11-01 23:35:12 +01:00
AndyScherzinger
8a565f85db
fix code review
2016-11-01 22:49:37 +01:00
AndyScherzinger
a5dec01990
rename 2/2
2016-10-31 12:51:40 +01:00
AndyScherzinger
d4e7728dc1
rename 1/2
2016-10-31 12:51:40 +01:00
AndyScherzinger
1a2a3e4173
Move all file type (as in mime type) checks to MimeTypeUtil
2016-10-31 12:51:40 +01:00
AndyScherzinger
e0eb7fb468
fix media queries escaping folder names and respecting folders with same names
...
Resolves : #361
2016-10-27 23:38:16 +02:00
AndyScherzinger
67672c53f0
proper formatting
2016-10-27 15:35:58 +02:00
AndyScherzinger
a72056161c
only show folder path on topo with synced folder made bold
2016-10-27 15:32:49 +02:00
AndyScherzinger
34003e922f
moved to switch instead of icon
2016-10-27 12:04:36 +02:00
AndyScherzinger
66c4a57ba4
added javadoc
2016-10-26 23:34:46 +02:00
AndyScherzinger
624e222ad5
beatufied code
2016-10-26 23:24:40 +02:00
AndyScherzinger
10cc73cf68
header
2016-10-26 21:41:10 +02:00
tobiasKaminsky
3c62f4128d
observers are restarted after changing a setting
2016-10-26 20:35:00 +02:00
AndyScherzinger
235b01b4bf
fixed review comments
2016-10-26 18:08:25 +02:00
AndyScherzinger
29d5e1e8cb
tweaked layout for preferences
2016-10-26 14:02:40 +02:00
AndyScherzinger
e879517481
removed final declaration
2016-10-26 13:36:25 +02:00
AndyScherzinger
cc45b0f1e9
added possibility to enable/disable sync folder in the settings screen
2016-10-26 12:14:56 +02:00
AndyScherzinger
d2d8352bac
recyclerview/media-folder optimized thumbnail cache/async task implementation
2016-10-25 18:02:12 +02:00
AndyScherzinger
cf28cdbbda
better legacy shared prefereenced cleanup
2016-10-24 18:28:31 +02:00
AndyScherzinger
a3cf129281
initially show instant upload feature revamp message if instant upload has been used/active with the legacy preferences
2016-10-24 16:43:10 +02:00
AndyScherzinger
9efa7de760
fix synced folder settings dialog theming + code cleanup
2016-10-24 15:52:16 +02:00
AndyScherzinger
faea2f01fb
dynamic media grid width sizing and revampedd instant upload icon
2016-10-24 15:21:00 +02:00
AndyScherzinger
c30dcd4a6d
minor renamings & javadoc
2016-10-24 14:45:09 +02:00
AndyScherzinger
223e29d5d4
hide legacy instant upload preferences on Android 5+
2016-10-24 13:21:09 +02:00
AndyScherzinger
e68c54798f
fix default upload behavior for synced folder
2016-10-24 12:12:45 +02:00
AndyScherzinger
eff5d9e70a
Order images by date (to always show the latest pictures taken)
2016-10-24 11:57:11 +02:00
AndyScherzinger
6afeee7535
hide instant upload icon on Android pre-lollipop
2016-10-24 11:56:43 +02:00
AndyScherzinger
a4a41a6705
enforce camera folder top position
2016-10-24 10:58:23 +02:00
tobiasKaminsky
c7147795c7
fix wlan upload
2016-10-21 21:52:00 +02:00
AndyScherzinger
e053caf4ff
Merge branch 'master' of https://github.com/nextcloud/android into syncedFolders
2016-10-19 18:23:57 +02:00
Andy Scherzinger
8ace0d0d11
Merge pull request #328 from apicellaj/master
...
add preference to show hidden files
2016-10-19 17:17:06 +02:00
AndyScherzinger
bf39292df6
persistence fix
2016-10-17 12:13:37 +02:00
Andy Scherzinger
fedc2ec851
Merge pull request #339 from nextcloud/fixContract
...
Fix TimSort
2016-10-17 10:53:08 +02:00
tobiasKaminsky
f79323aa61
removed test
2016-10-16 09:56:12 +02:00
tobiasKaminsky
3298a806d8
remove (o1 == 0 || o2 == 0 ) return 0 as this is ambiguous and confuses TimSort
2016-10-16 09:53:07 +02:00
tobiasKaminsky
b346d7bdc1
try to fix timSort error
2016-10-14 18:22:29 +02:00
Joe Apicella
e9cba821c8
switch array allocation to use list size
2016-10-13 09:06:06 -07:00
Joe Apicella
41d1aff589
add preference to show hidden files
2016-10-12 17:35:47 -07:00
AndyScherzinger
6783a1c628
minor persistence bugfix
2016-10-13 02:07:32 +02:00
AndyScherzinger
0889f8a69e
grid spacing added + negative/shortened margins for containers for nice image grids
2016-10-13 02:00:49 +02:00
tobiasKaminsky
c3a8b0c450
update job to obey syncedfolder settings
2016-10-12 21:41:44 +02:00
tobiasKaminsky
179c695128
removed dummy synced folder entry
2016-10-12 20:44:54 +02:00
AndyScherzinger
db96fe0399
media folder sorting (enabled, alphanumerical) + javadoc
2016-10-10 22:58:25 +02:00
AndyScherzinger
48d3ef6a24
removed toast
2016-10-09 23:43:46 +02:00
AndyScherzinger
b557b0762c
remote folder can now be changed, all config changes for a synced folder are now saved
2016-10-09 23:27:30 +02:00
AndyScherzinger
ccb16b7cc4
initial wip implementation of config element click listeners
2016-10-06 23:22:56 +02:00
AndyScherzinger
4796633bcd
Merge branch 'master' of https://github.com/nextcloud/android into syncedFolders
2016-10-06 22:47:02 +02:00
Andy Scherzinger
07c0cafadd
Merge pull request #316 from nextcloud/tuneUploadGrid
...
tune grid view of images
2016-10-06 22:10:22 +02:00
AndyScherzinger
6a4649467a
license header added
2016-10-06 22:03:32 +02:00
AndyScherzinger
0ab5d0f6b9
missed to push ViewType enum
2016-10-06 21:52:10 +02:00
AndyScherzinger
00a2f103b6
tune grid view of images
...
Resolves : #311
2016-10-06 21:37:03 +02:00
tobiasKaminsky
7a5965dd3f
wrong method called :/
2016-10-06 20:39:00 +02:00
Tobias Kaminsky
7525088db2
Merge pull request #301 from apicellaj/master
...
add grid view option when choosing a file from within the app
2016-10-06 20:29:21 +02:00
AndyScherzinger
c4c1b6b450
Merge branch 'master' of https://github.com/nextcloud/android into syncedFolders
2016-10-06 20:02:49 +02:00
Tobias Kaminsky
166b8262d3
Merge pull request #206 from nextcloud/descendIntoFolder
...
descend into folder after creating it in uploader
2016-10-06 19:25:31 +02:00
AndyScherzinger
d7f461a0f0
Merge branch 'master' of https://github.com/nextcloud/android into syncedFolders
2016-10-06 10:17:50 +02:00
Andy Scherzinger
4df036940c
code review changes
2016-10-06 09:08:11 +02:00
Andy Scherzinger
25a7b6ed48
downgrade to only support cloud://login
2016-10-06 09:08:11 +02:00
Andy Scherzinger
4f5554861a
move connection (re) init from start to onResume and restore server checked flag
2016-10-06 09:08:10 +02:00
Andy Scherzinger
442e85a8b5
wip server check
2016-10-06 09:08:10 +02:00
Andy Scherzinger
1cd1abbc9c
focus check
2016-10-06 09:08:10 +02:00
Andy Scherzinger
5977fed28d
MagicUrls for Login + Unit tests for the parser
2016-10-06 09:08:10 +02:00
tobiasKaminsky
97059873f1
add change to subfolder
2016-10-06 09:07:16 +02:00
tobiasKaminsky
0e5b0f383d
descend into folder after creating it in uploader
2016-10-06 09:07:05 +02:00
Andy Scherzinger
6ebbf0ce98
Merge pull request #302 from ryanwr/master
...
Sorts favourite files first in list
2016-10-05 22:49:34 +02:00
Andy Scherzinger
461b1c86b3
Merge pull request #298 from zmatsuo/openUrlFile
...
Add open URL file feature
2016-10-05 22:38:02 +02:00
AndyScherzinger
a634be95ca
fixed null check
2016-10-05 22:30:12 +02:00
Tobias Kaminsky
bb64481c65
Merge pull request #241 from nextcloud/LukeOwncloud-patch-remove-failed
...
fix remove failed
2016-10-05 20:28:37 +02:00
Tobias Kaminsky
66f909291f
Merge pull request #281 from nextcloud/dismissDialogFragment
...
fix crash in dismissLoadingDialog #279
2016-10-05 19:30:05 +02:00
Tobias Kaminsky
6c06147f4e
Merge pull request #284 from nextcloud/logSendCrash
...
Crash when sending non-existing log
2016-10-05 19:28:33 +02:00
Tobias Kaminsky
a2eb1af4fa
Merge pull request #290 from nextcloud/201_fixExpandableUploadListAdapter
...
Fix NPE in ExpandableUploadListAdapter...setText
2016-10-05 19:27:05 +02:00
Tobias Kaminsky
85bb93871b
Merge pull request #295 from florian-f/master
...
Fix NullPointerException in PreviewMediaFragment.
2016-10-05 19:22:53 +02:00
matsuo
29002e5a24
close() in finally block
2016-10-06 00:49:13 +09:00
Joe Apicella
3aa00bc53b
fix GridView layout
2016-10-04 16:53:53 -07:00
Joe Apicella
0b7e7848ba
fix issue with menu label not persisting
2016-10-04 16:53:28 -07:00
Andy Scherzinger
e6ba8a7e53
bugfix for NPE #201
2016-10-04 14:12:45 +02:00
Andy Scherzinger
0fa58f2aa5
removed unnecessary else part
2016-10-04 14:07:23 +02:00
LukeOwncloud
a82ab8e50f
return false if remove failed
...
if OCFile is null --> cannot delete ==> return false.
2016-10-04 14:07:23 +02:00
Andy Scherzinger
4a774a8099
IndexOutOfBounds check #283
2016-10-04 13:58:15 +02:00
Andy Scherzinger
00684cd339
fix crash in dismissLoadingDialog #279
2016-10-04 13:50:35 +02:00
Andy Scherzinger
1dd27dda88
fix crash in dismissLoadingDialog #279
2016-10-04 13:50:35 +02:00
AndyScherzinger
2704a0da47
pur cursor close in finally block to make sure no resource leak occurs - #305
...
Resolves : #305
2016-10-04 12:03:14 +02:00
ryanwr
bf451f52a8
Sorts favourite files first in list
2016-10-02 11:10:46 +01:00
Joe Apicella
2b2916a49a
add grid view option when choosing a file from within the app
2016-10-01 16:03:59 -07:00
Andy Scherzinger
b9c15c127c
toggle folder's sync on/off - wip since state persistence is not working reliably yet
2016-09-30 22:02:13 +02:00
matsuo
89a14e8755
Improved performance and simpler source code
2016-10-01 00:24:58 +09:00
matsuo
cb622e5dbc
Add open URL file feature
2016-10-01 00:24:58 +09:00
Andy Scherzinger
17b9eaed96
initial code to read (yet empty DB) and display settings screen (non-functional yet)
2016-09-30 01:27:50 +02:00
Andy Scherzinger
512b7ad229
hardening provider implementation + javadoc
2016-09-29 10:48:08 +02:00
Andy Scherzinger
a883dfcee7
make SyncedFolderObserverService use SyncedFolderProvider (todo also move the Observable to the Provider implementation)
2016-09-29 01:14:02 +02:00
Andy Scherzinger
dd35c49484
renamed upload action column, extended SyncFolder POJO, createdd a draft implementation of a SyncFolderProvider for DB operations
2016-09-29 01:06:52 +02:00
Florian Friemel
7b400995c9
Fix NullPointerException in PreviewMediaFragment.
...
Added null-checks for mVideoPreview and mMediaServiceBinder.
Resolves : #252
2016-09-28 18:12:51 +02:00
Andy Scherzinger
dc1b7b3958
layout tweaking, better listener support, loading visualization
2016-09-26 23:12:20 +02:00
tobiasKaminsky
281f970869
wip
2016-09-26 17:59:14 +02:00
tobiasKaminsky
59da136b9b
wip
2016-09-26 17:59:14 +02:00
tobiasKaminsky
12e4532a0d
wip
2016-09-26 17:59:14 +02:00
Andy Scherzinger
d2aa22f6c0
initial add for recycler view implementation with headers (WIP)
2016-09-26 17:59:14 +02:00
Andy Scherzinger
27cb68bee3
initial navigation setup for menu and activity
2016-09-26 17:59:14 +02:00
Andy Scherzinger
038f3167ab
initial link of menu buttons
2016-09-26 17:59:14 +02:00
Andy Scherzinger
c0afddd5d8
proper thumbnails, image counter, darkening etc.
2016-09-26 17:59:14 +02:00
Andy Scherzinger
4c31ca1ebe
initial v1 for grid view
2016-09-26 17:59:14 +02:00
Andy Scherzinger
36280b92d6
rudimentary media loader implementation (file thumbnails and any action TBD)
2016-09-26 17:59:14 +02:00
Andy Scherzinger
c1c7d232aa
initial add for recycler view implementation with headers (WIP)
2016-09-26 17:59:14 +02:00
Andy Scherzinger
30669c9677
initial navigation setup for menu and activity
2016-09-26 17:59:14 +02:00
tobiasKaminsky
cf27c2c9d3
add database for synced folders
2016-09-26 17:59:14 +02:00
Andy Scherzinger
79caae65bf
fix for #272 - check if more than one key are present in bundle in receive file
2016-09-20 19:02:15 +02:00
Andy Scherzinger
0a7df3281a
Don't show upload failed notification for already deleted files #242
2016-09-20 15:01:41 +02:00
tobiasKaminsky
f7633a8d03
change line width
2016-09-17 18:17:21 +02:00
tobiasKaminsky
9d10864a87
change caption for move and copy action
2016-09-17 18:10:33 +02:00
Andy Scherzinger
be08193007
show toast if davdroid sync has been setup successfully
2016-09-10 13:53:49 +02:00
Andy Scherzinger
4533d5f47f
move setup call to settings screen
2016-09-10 13:53:49 +02:00
Andy Scherzinger
2845cf521a
wip davdroid login launch
2016-09-10 13:53:49 +02:00
Andy Scherzinger
34c186bd8c
added transifex hint for translations
2016-09-08 13:34:54 +02:00
Andy Scherzinger
9a36b3508f
bugfix layouting and issue reporting button click
2016-09-08 10:29:59 +02:00
Andy Scherzinger
f8108b2162
Bugfix report GH issue button click
2016-09-08 10:29:59 +02:00
Andy Scherzinger
49c05ca825
OK/Cancel buttons to be translated for receive text from clipboard
2016-09-07 13:38:41 +02:00
Andy Scherzinger
07f5d9546e
revamped participation activity content based on the feedback
2016-09-06 19:36:02 +02:00
Andy Scherzinger
67940c57b2
don't show the currently active account in the account chooser (since it is already active and displayer in the drawer header)
...
- don't show information twice
2016-09-06 17:25:57 +02:00
Andy Scherzinger
660e5a8923
fix for triggering the main drawer menu items from "participate", changed participate icon and checkable behavior, don't show settings etc when showing accounts
2016-09-06 17:25:57 +02:00
tobiasKaminsky
c206c944bc
links are now extracted to setup.xml
2016-09-06 17:25:57 +02:00
tobiasKaminsky
a24f89be16
wip
2016-09-06 17:25:57 +02:00
Andy Scherzinger
e45816a5ed
fix string arrays, so n.o. elements doesn't depend on translation status, make upload spinner translatable
2016-09-06 16:17:14 +02:00
Andy Scherzinger
4ebd37bd1d
bugfix: call task all the time and only do storage calculation "move"
2016-09-06 15:49:49 +02:00
tobiasKaminsky
76ddafa4ad
"move upload" is first default when on first startup
2016-09-06 14:46:03 +02:00
tobiasKaminsky
1ad97d9ff7
move / copy updated
2016-09-06 14:46:03 +02:00
Andy Scherzinger
b8905bdb32
minor code reformattings and cleanup
2016-09-06 14:04:28 +02:00
tobiasKaminsky
90f582105f
show compatibility warning
2016-09-06 10:36:07 +02:00
Andy Scherzinger
8c53483f1e
minor formattings
2016-09-06 10:36:07 +02:00
Andy Scherzinger
9cf1676cc7
hide file listing switch visibility fix when share link gets deactivated
2016-09-06 10:36:07 +02:00
tobiasKaminsky
352ea77aa8
wip
2016-09-06 10:36:07 +02:00
tobiasKaminsky
e26dc7654d
wip
2016-09-06 10:36:07 +02:00
tobiasKaminsky
923d4b6293
wip
2016-09-06 10:36:07 +02:00
tobiasKaminsky
5890f554cd
wip
2016-09-06 10:36:07 +02:00
tobiasKaminsky
1ace509e4f
wip
2016-09-06 10:36:07 +02:00
Andy Scherzinger
92d28b8e83
mix folders and files on sort by date for local folders too
2016-09-04 19:32:14 +02:00
tobiasKaminsky
304ab15b51
mix folders and files on sort by date
2016-09-04 19:17:42 +02:00
Andy Scherzinger
32be5dfeb3
Merge pull request #171 from nextcloud/uploadWhenCharging
...
Upload when charging
2016-09-04 19:12:44 +02:00
Tobias Kaminsky
99d9d0ac13
Merge pull request #197 from nextcloud/fixPublicLink
...
search for the right ocShare with public link
2016-09-03 20:56:56 +02:00
Tobias Kaminsky
51f05ba65d
Merge pull request #229 from nextcloud/fixEmptyLocalUploadFolder
...
bugfix for empty folder display
2016-09-03 20:56:26 +02:00
tobiasKaminsky
271704c895
Merge remote-tracking branch 'origin/fixPublicLink' into fixPublicLink
2016-09-03 20:29:05 +02:00
tobiasKaminsky
77f9902f17
Merge remote-tracking branch 'remotes/origin/master' into uploadWhenCharging
2016-09-03 20:10:51 +02:00
tobiasKaminsky
74452c0dd7
search for the right ocShare with public link
2016-09-01 16:10:25 +02:00
Andy Scherzinger
70e8f62581
Added 'Pending' placeholder for still-unknown size of incoming federated folders
2016-09-01 14:42:55 +02:00
Andy Scherzinger
ad673921eb
fix remote folder size display (seems to have been lost after 1.2.0)
2016-09-01 14:24:03 +02:00
Andy Scherzinger
2fafdcf9ca
bugfix showing empty local folders as empty and not showing the parent folder in an empty folder
2016-09-01 11:28:30 +02:00
Andy Scherzinger
4f32abfafe
sizeScale 1 for MB, code removed for unsupported legacy Android versions
2016-09-01 10:12:02 +02:00
Andy Scherzinger
b29744c004
show quota for server without quota-unlimited info capability
2016-08-31 19:05:50 +02:00
Andy Scherzinger
0f80bdc894
CR changes
2016-08-18 15:55:11 +02:00
Andy Scherzinger
5280d66139
colorize quota progress bar depending on thresholds met, reformattings
2016-08-18 15:55:11 +02:00
Andy Scherzinger
2c941a5749
minor code refactoring extracting setup code into dedicated methods
2016-08-18 15:55:11 +02:00
Andy Scherzinger
217658740f
get and show quota information
2016-08-18 15:55:11 +02:00
Andy Scherzinger
3658becdf5
view elements fix
2016-08-18 15:55:11 +02:00
Andy Scherzinger
f8e0ee9ce1
initial quota display implementation
2016-08-18 15:55:11 +02:00
Andy Scherzinger
3f364ff783
reformetted two lines
2016-08-16 11:58:42 +02:00
tobiasKaminsky
351d7ba7c1
changes due to CR
2016-08-16 11:58:42 +02:00
tobiasKaminsky
3c715fe489
finish
2016-08-16 11:58:42 +02:00
tobiasKaminsky
993264c8b1
wip
2016-08-16 11:58:42 +02:00
Tobias Kaminsky
45c98398ac
Merge pull request #166 from nextcloud/refresh_folders_startup
...
Refresh when app starts
2016-08-16 08:43:15 +02:00
Andy Scherzinger
15a2439769
fix NPE (and unnecessary auto-boxing)
2016-08-15 14:21:54 +02:00
Andy Scherzinger
47e12fb278
CR changes
2016-08-14 21:50:46 +02:00
Andy Scherzinger
25a7a20352
Changed the delay to execute the runnable in startSyncFolderOperation, adding 350 ms.
2016-08-14 21:25:41 +02:00
Andy Scherzinger
37295ffecb
update to Nc Android lib 1.0.2
2016-08-09 00:06:51 +02:00
tobiasKaminsky
f890b3553a
resume chunked uploads
2016-08-09 00:06:51 +02:00
Andy Scherzinger
22ac5d3ff2
Merge pull request #199 from nextcloud/fixUploadComparator
...
Fix comparator determining order of list of uploads
2016-08-08 23:25:12 +02:00
tobiasKaminsky
f6e4a6b609
generate thumbnails only if mCurrentUpload is not null
2016-08-08 19:33:23 +02:00
tobiasKaminsky
aa069d3623
Merge remote-tracking branch 'origin/fixPublicLink' into fixPublicLink
2016-08-08 19:21:52 +02:00
tobiasKaminsky
9376da816d
constant, prevent possible NPE
2016-08-08 19:20:45 +02:00
David A. Velasco
80c69a439f
Fix comparator determining order of list of uploads
2016-08-08 13:13:08 +02:00
tobiasKaminsky
1f9be869c2
search for the right ocShare with public link
2016-08-08 12:57:55 +02:00
tobiasKaminsky
3cb205a548
search for the right ocShare with public link
2016-08-08 10:06:09 +02:00
Andy Scherzinger
fdc7fdcbf9
proper show hide during drawer open/close, also for filter-menu-item
2016-08-03 19:20:44 +02:00
Andy Scherzinger
3399f99ed9
GPLv3
2016-08-03 19:20:44 +02:00
Andy Scherzinger
69415612ec
fixed license version
2016-08-03 19:20:44 +02:00
tobiasKaminsky
a3a6420ead
filter for oc file list and local file list
2016-08-03 19:20:44 +02:00
Tobias Kaminsky
d828395d3a
Merge pull request #180 from nextcloud/NPEonEmptyLocalFolder
...
prevents NPE when selecting empty local folder
2016-08-03 18:01:19 +02:00
Tobias Kaminsky
67001d4a13
Merge pull request #161 from nextcloud/meteredWiFi
...
delay instant upload when metered wifi is used
2016-08-03 18:00:52 +02:00
David A. Velasco
a62cbd0cd8
Username trimmed in log-in view
2016-08-02 19:50:54 +02:00
David A. Velasco
9905e5c393
Add flag to disable suggestions in password field, no matter if visible or not
2016-08-02 19:50:54 +02:00
tobiasKaminsky
c5159e9246
delay instant upload when metered wifi is used
2016-08-02 16:01:28 +02:00
tobiasKaminsky
99852c1bc8
djvu is not an image
2016-08-01 14:49:56 +02:00
tobiasKaminsky
d533b5f2d9
prevents NPE when selecting empty local folder
2016-07-31 12:33:35 +02:00
tobiasKaminsky
ac695b7444
fix sharing for beta
2016-07-30 18:38:21 +02:00
tobiasKaminsky
9587af3e9d
Merge remote-tracking branch 'remotes/origin/master' into uploadWhenCharging
2016-07-30 16:56:44 +02:00
Andy Scherzinger
58f86500ad
generalization in super class
2016-07-22 18:50:22 +02:00
Andy Scherzinger
20d33737cc
javaDoc
2016-07-22 17:52:28 +02:00
Andy Scherzinger
16b1a95cc5
#145 Let user go back from upload activity
2016-07-22 17:40:19 +02:00
Andy Scherzinger
8487793056
fix compile error after merge
2016-07-21 13:13:55 +02:00
jabarros
1a1d50f8b6
Fix crash when adding a saml account
2016-07-21 13:13:54 +02:00
Andy Scherzinger
2e3d3a1aa0
Merge pull request #137 from nextcloud/userDebugPhone
...
Log.wtf() should not be used unless an assertion fails
2016-07-21 13:03:11 +02:00
Andy Scherzinger
573f95d110
fixes after merge
2016-07-20 15:33:08 +02:00
Andy Scherzinger
62c918f59a
Merge 'master' including conflict fixing
...
Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2016-07-20 15:26:59 +02:00
Andy Scherzinger
1876746481
Merge pull request #36 from nextcloud/video_thumbnail
...
Video thumbnail
2016-07-20 15:20:26 +02:00
Andy Scherzinger
71a44db0dd
CR changes
2016-07-20 14:24:03 +02:00
Andy Scherzinger
2af26edb0b
Merge branch 'master' of https://github.com/nextcloud/android into multiSelectNew
...
Conflicts:
res/values-ca/strings.xml
res/values-he/strings.xml
res/values-hu-rHU/strings.xml
res/values-ja-rJP/strings.xml
res/values-ko/strings.xml
res/values-lb/strings.xml
res/values-lt-rLT/strings.xml
res/values-pl/strings.xml
res/values-pt-rPT/strings.xml
res/values-th-rTH/strings.xml
res/values-tr/strings.xml
2016-07-20 13:19:41 +02:00
Andy Scherzinger
ecf1f9e3da
proper status bar coloring for multi select mode, cleanup logging
2016-07-20 13:09:56 +02:00
Andy Scherzinger
a6bd6030d2
Replace Log.wtf calls with Log.e
2016-07-19 14:36:41 +02:00
Kenny Root
b7295e5f09
Replace Log.wtf calls with Log.e
...
This will prevent crashing when running on a userdebug phone. Log#wtf
should only be used when the program can not go on because a critical
assertion fails. These all don't seem to meet that criteria.
Fixes #1603
Conflicts:
src/com/owncloud/android/ui/activity/FileActivity.java
2016-07-19 14:33:01 +02:00
tobiasKaminsky
dfae9cfc27
fix NPE
2016-07-16 08:11:30 +02:00
tobiasKaminsky
ff32763024
update to master
2016-07-15 20:15:59 +02:00
tobiasKaminsky
98a679548a
Merge remote-tracking branch 'remotes/origin/master' into multiSelectNew
2016-07-15 18:32:56 +02:00
tobiasKaminsky
411e5392bc
Merge remote-tracking branch 'remotes/origin/master' into video_thumbnail
2016-07-15 18:05:05 +02:00
Bartosz Przybylski
3f952fad30
Update account list adapter, just notifying adapter makes no sense
2016-07-14 23:31:46 +02:00
Bartosz Przybylski
098cf7dd46
Add confirmation dialog on account deletion
2016-07-14 23:31:46 +02:00
Andy Scherzinger
9172618c73
rename fix
2016-07-14 22:43:20 +02:00
tobiasKaminsky
cc3dfd6100
using all files not only downloaded one
2016-07-14 22:42:24 +02:00
Andy Scherzinger
a33a03a928
adaption after rebase to switch between all/offline files
2016-07-14 22:42:23 +02:00
tobiasKaminsky
abca14ce17
fixed bug #1297
2016-07-14 22:42:21 +02:00
tobiasKaminsky
7a2338f8d8
refresh after chage
2016-07-14 22:42:18 +02:00
tobiasKaminsky
9d74b7e223
enabled all occurrences.
2016-07-14 22:42:18 +02:00
Andy Scherzinger
21c80b056e
added local size sorter
2016-07-14 15:46:02 +02:00
Andy Scherzinger
cfe77ce270
renamed method
2016-07-14 15:40:45 +02:00
Andy Scherzinger
edc7781af9
simplified and bugfixed code using our own preference manager to handle preferences
2016-07-14 15:33:33 +02:00
Andy Scherzinger
2b7c555be8
Fixes after rebase
2016-07-14 14:38:38 +02:00
Andy Scherzinger
9f0008aeb9
rebase fixes
2016-07-14 14:31:47 +02:00
tobiasKaminsky
4c20679538
add sort to UploadFileActiviy
2016-07-14 14:31:46 +02:00
Andy Scherzinger
7fb1c1de3f
Merge pull request #43 from nextcloud/thumbnailDuringUpload
...
Thumbnail during upload
2016-07-13 21:49:32 +02:00
Andy Scherzinger
174fa1d7b7
CR changes
2016-07-13 12:58:38 +02:00
Andy Scherzinger
9b6ef94803
add license header
2016-07-13 11:24:16 +02:00
Andy Scherzinger
2c0950bc55
Move MimeType DIR to a constant in a MimeType class
2016-07-13 11:21:49 +02:00
tobiasKaminsky
fadb79aefd
minor code optimization
2016-07-13 11:04:44 +02:00
tobiasKaminsky
6c1deae1a2
use size computed by server
2016-07-13 11:04:43 +02:00
tobiasKaminsky
adaf5cf09e
thumbnail generation also when "file is kept in original folder" is set
2016-07-12 20:55:08 +02:00
tobiasKaminsky
7108e7ef6d
Merge remote-tracking branch 'origin/thumbnailDuringUpload' into thumbnailDuringUpload
2016-07-12 20:14:16 +02:00
David A. Velasco
dc44e8c28c
Recovered wait dialog for move and delete operations
...
Conflicts:
src/com/owncloud/android/files/FileOperationsHelper.java
2016-07-12 19:27:06 +02:00
David A. Velasco
3ed8cd4f1e
Removed unused dialog
2016-07-12 19:26:44 +02:00
David A. Velasco
25f623be8f
New 'move' icon; fixed hdpi, mdpi icons
2016-07-12 15:31:48 +02:00
David A. Velasco
79b04a5c29
Finish selection mode before showing details view for a file
2016-07-12 15:31:48 +02:00
tobiasKaminsky
5ad7225003
Create thumbnail during instant upload
2016-07-09 21:05:44 +02:00
Andy Scherzinger
bca547621f
merge conflict resolved
2016-07-09 20:45:58 +02:00
David A. Velasco
fdeff61ce2
Fixed life cycle of ExtendedListFragment (see #onCreateView method) so that selections are tracked in grid mode during rotations without tracking them in our code
2016-07-09 19:49:38 +02:00
David A. Velasco
0a4ac6e91c
Update selection in FileListListAdapter using ID received from list instead of position, so that changes removals or additions in the list result in correct update of the drawn selection
2016-07-09 19:49:37 +02:00
David A. Velasco
db6acc6868
Clean-up and small refactorings
...
Conflicts:
src/com/owncloud/android/files/FileOperationsHelper.java
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
2016-07-09 19:49:37 +02:00
David A. Velasco
936c182c3a
Fixed wrong onOptionsItemSelected implementations
2016-07-09 19:47:25 +02:00
tobiasKaminsky
644f255238
show video placeholder correctly
2016-07-02 18:06:00 +02:00
tobiasKaminsky
1edc488995
Merge remote-tracking branch 'remotes/origin/master' into video_thumbnail
2016-07-02 17:49:16 +02:00
tobiasKaminsky
c315b0e753
fix from CR
2016-07-02 13:36:50 +02:00
tobiasKaminsky
d6ecf06f39
check if correct adapter is used
2016-07-01 18:37:17 +02:00
Andy Scherzinger
ab136a14a3
Merge branch 'multiSelect' of https://github.com/owncloud/android into multiSelectNew
...
Conflicts:
build.gradle
oc_jb_workaround/build.gradle
owncloud-android-library
res/layout/uploader_layout.xml
res/layout/uploader_list_item_layout.xml
res/menu/file_actions_menu.xml
res/values/setup.xml
src/com/owncloud/android/authentication/AuthenticatorActivity.java
src/com/owncloud/android/db/PreferenceManager.java
src/com/owncloud/android/files/FileMenuFilter.java
src/com/owncloud/android/files/FileOperationsHelper.java
src/com/owncloud/android/ui/activity/FolderPickerActivity.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
2016-06-30 15:11:34 +02:00
jabarros
460e187713
Fix. Allow set multiple files as 'Available offline'
2016-06-30 13:02:29 +02:00
Marius Blüm
36b24a9673
Merge pull request #75 from nextcloud/loginLayout
...
Slight design optimizations for the login screen #22
2016-06-27 18:52:53 +02:00
Andy Scherzinger
c875bbace1
Merge pull request #35 from nextcloud/feature_uploadsubfolders
...
Feature uploadsubfolders
2016-06-27 10:45:41 +02:00
Andy Scherzinger
718fec0935
remove card view, change edit text and icon coloring
2016-06-26 22:59:28 +02:00
Andy Scherzinger
30ab5a6b57
code review: use string instead of object to not having to do instance of checks
2016-06-25 16:27:30 +02:00
Andy Scherzinger
78f1aa5f66
centralize handlePNG function
2016-06-25 16:27:30 +02:00
Andy Scherzinger
a466cfd109
PNG handling with NPE check first
2016-06-25 16:27:29 +02:00
Andy Scherzinger
5c44ea5884
Always process for png transparency
2016-06-25 16:27:29 +02:00
Andy Scherzinger
d413cfce0a
enforce refresh during start
2016-06-25 16:27:28 +02:00
Bartosz Przybylski
54f7e64414
Trying to generalize avatar setting.
2016-06-25 16:27:26 +02:00
Andy Scherzinger
880ac5f412
cleanups due to the code review, removing unused code
2016-06-25 16:27:25 +02:00
Andy Scherzinger
91f3629757
cleanup due to code review
2016-06-25 16:27:24 +02:00
Andy Scherzinger
e043dfbcb4
renamed getter method to be more java style like
2016-06-25 16:27:23 +02:00
Andy Scherzinger
7ff136854b
layout fixes after rebase
2016-06-25 16:27:22 +02:00
Andy Scherzinger
220de2fef3
fix for #41
2016-06-25 16:27:21 +02:00
Andy Scherzinger
face3c6efd
merge fix after rebase
2016-06-25 16:27:20 +02:00
Andy Scherzinger
9985872bd3
BugFix Log screen Toolbar
2016-06-25 16:27:19 +02:00
Andy Scherzinger
892cfd6f8f
avatar loading for account manager too + house keeping
2016-06-25 16:27:17 +02:00
Andy Scherzinger
ee71b38a84
fixing the thumbnail caching (user's name can be the same on two different servers), minor housekeeping for account name parsing
2016-06-25 16:27:17 +02:00
Andy Scherzinger
87359121f8
extend implementation to also set avatars in menu items
2016-06-25 16:27:16 +02:00
Andy Scherzinger
06dc13601e
drawer preparations for "On Device" menu item
2016-06-25 16:27:15 +02:00
Andy Scherzinger
cf158abbb6
aligned management screen with material design sizings
2016-06-25 16:27:13 +02:00
Andy Scherzinger
8b002c5d17
resized text, style and alignment within TextDrawable + cleanups
2016-06-25 16:27:13 +02:00
Andy Scherzinger
ff75f71836
move avatar helper method to TextDrawable, define everything in dp to be independent
2016-06-25 16:27:12 +02:00
Andy Scherzinger
3f53587308
deactivating icon tinting for drawer menu icons on pre lollipop versions
2016-06-25 16:27:12 +02:00
Andy Scherzinger
56e84a2c7f
Fix for dynamic avatar sizing for generic letter/circle avatars
2016-06-25 16:27:10 +02:00
Andy Scherzinger
583dca5cbc
rudimentary drawer header / avatar based account switching.
2016-06-25 16:27:10 +02:00
Andy Scherzinger
c813003e8b
JavaDoc
2016-06-25 16:27:09 +02:00
Andy Scherzinger
a0596e0ca1
merged avatar branch + circular avatar in drawer header
2016-06-25 16:27:08 +02:00
tobiasKaminsky
8dbb5b6305
wip
...
Conflicts:
res/layout/drawer.xml
src/com/owncloud/android/ui/activity/FileActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
2016-06-25 16:27:08 +02:00
Andy Scherzinger
dc8e596546
for null checks
2016-06-25 16:27:07 +02:00
Andy Scherzinger
acf8db8c3f
NPE Fix
2016-06-25 16:27:06 +02:00
Andy Scherzinger
acf77ddc04
standard header layouting, flexible avatar radius, code cleanups, dynamic avatar sizing
2016-06-25 16:27:06 +02:00
Andy Scherzinger
534d58008e
checked menu item state implementation
2016-06-25 16:27:05 +02:00
Andy Scherzinger
bf3deb49a2
rebase fixes
2016-06-25 16:27:04 +02:00
Andy Scherzinger
7c111125d3
cleanup after drawer-rewrite
2016-06-25 16:27:02 +02:00
Andy Scherzinger
27a9abc8b5
Streamlining moving account handling to a base class b/c it does not belong to toolbar or drawer implementation
2016-06-25 16:27:01 +02:00
Andy Scherzinger
3fef018452
moved account handling to base activity since this is not file specific and thus should be available on (new) base level
2016-06-25 16:27:01 +02:00
Andy Scherzinger
d15d912a67
Streamlining moving account handling to a base class b/c it does not belong to toolbar or drawer implementation
2016-06-25 16:27:00 +02:00
tobiasKaminsky
81de65d1a2
fix: crash when opening upload dialog
2016-06-25 16:27:00 +02:00
Andy Scherzinger
e789178587
added single top flag
2016-06-25 16:26:58 +02:00
Andy Scherzinger
9c2fe3f4fd
change detection for the drawer implementation
2016-06-25 16:26:58 +02:00
Andy Scherzinger
f7178fa837
housekeeping Preferences, removed all accounts related code
2016-06-25 16:26:57 +02:00
Andy Scherzinger
9925b8ea40
missing license comment in class
2016-06-25 16:26:56 +02:00
Andy Scherzinger
5f0f04a324
if new account is created via drawer menu item click, refresh drawer account list and active account
2016-06-25 16:26:55 +02:00
Andy Scherzinger
7d4092e3ca
proper list rendering upon account add/remove
2016-06-25 16:26:55 +02:00
Andy Scherzinger
d6fd180aa8
next try
2016-06-25 16:26:54 +02:00
Andy Scherzinger
03da5afcda
minor changes for testing
2016-06-25 16:26:53 +02:00
Andy Scherzinger
7d30667b50
trying to detect account additions and change the list view content (not working yet)
2016-06-25 16:26:53 +02:00
Andy Scherzinger
37da1a7920
wip account management - account list changes aren't propagated back to the drawer yet, preferences haven't been cleaned up yet
2016-06-25 16:26:52 +02:00
Andy Scherzinger
5f1c6ee134
split toolbar content method
2016-06-25 16:26:51 +02:00
Andy Scherzinger
7f72e8cabd
housekeeping removing old account switching code
2016-06-25 16:26:51 +02:00
Andy Scherzinger
0f8f714645
preserve drawer state on screen rotation and resumes, move color calculation code to utils class
2016-06-25 16:26:50 +02:00
Andy Scherzinger
f32493c6f1
account switching implemented (mostly by moving account related methods from FileActivity.javato DrawerActivity.java)
2016-06-25 16:26:49 +02:00
Andy Scherzinger
7e2c560004
circle icons for accounts with color coding
2016-06-25 16:26:49 +02:00
Andy Scherzinger
d9d3424968
initial account handling in drawer + initial icon generation (still broken)
2016-06-25 16:26:48 +02:00
Andy Scherzinger
f41e567b90
general menu/account list switch implemented (open: populate account list)
2016-06-25 16:26:47 +02:00
Andy Scherzinger
f82c4d96ba
initial account chooser toggle and further abstraction of the drawer API for child classes
2016-06-25 16:26:47 +02:00
Andy Scherzinger
ce803aa4e0
initial (functionless) account switcher for the drawer header and display size depending header sizing
2016-06-25 16:26:46 +02:00
Andy Scherzinger
29d8288bd5
initial bug fix for the uploader
2016-06-25 16:26:46 +02:00
Andy Scherzinger
8cb4e8f2bf
navigation bug fix for previewing text files
2016-06-25 16:26:45 +02:00
Andy Scherzinger
ed33c0aff4
initial rewrite to make use of the toolbar
2016-06-25 16:26:44 +02:00
tobiasKaminsky
08a11dd660
Merge remote-tracking branch 'remotes/origin/master' into newMultiSelect
2016-06-25 10:30:05 +02:00
David Wiesner
4f7d3d4fd1
fix: GridView not restore selected positions but getCheckedItemCount ill return right value
2016-06-24 12:11:31 +02:00
David Wiesner
ad6a82e925
reset: autoformat imports
2016-06-24 12:11:31 +02:00
David Wiesner
c95245acf0
remove duplicate
2016-06-24 12:11:31 +02:00
David Wiesner
b142de752c
reset: imports format
2016-06-24 12:11:31 +02:00
David Wiesner
3bf36dd5f0
remove duplicates
2016-06-24 12:11:31 +02:00
David Wiesner
659f280a8b
build fixes
2016-06-24 12:11:31 +02:00
David Wiesner
dbccf34e8b
rebase
2016-06-24 12:11:31 +02:00
David Wiesner
8aac596d72
remove unnecessary tests
2016-06-24 12:11:31 +02:00
David Wiesner
fda8708ce1
multi-select-fix-rotate-899
2016-06-24 12:11:31 +02:00
David Wiesner
a3fae49fbf
multi-select-fix-rotate-899
2016-06-24 12:11:31 +02:00
David A. Velasco
7631bc24d3
Patch preventing crash during move of multiple files
2016-06-24 12:11:31 +02:00
David A. Velasco
301ec578bc
Fix crash due to obsolete string resources
2016-06-24 12:11:31 +02:00
Juan Carlos González Cabrero
c6219c610f
Update actions menu on creation, to avoid losing filtering state
2016-06-24 12:11:31 +02:00
Juan Carlos González Cabrero
00cd3e6199
Actions menu filtering based on all checked items
2016-06-24 12:11:31 +02:00
Juan Carlos González Cabrero
5adf2fc54c
Remove manually destruction of the multiselect menu
2016-06-24 12:11:31 +02:00
Juan Carlos González Cabrero
9af6bf238c
Remove deprecated code after last update
2016-06-24 12:11:31 +02:00
Juan Carlos González Cabrero
217a5e9825
Update menu filter on item checked state changed
2016-06-24 12:11:31 +02:00
Juan Carlos González Cabrero
03045c502d
Add MultiChoiceModeListener for both listView and gridView
2016-06-24 12:11:31 +02:00
Juan Carlos González Cabrero
ba5eb293df
Assignment not anonymous, and put back the Override annotations
2016-06-24 12:11:31 +02:00
Andy Scherzinger
424854875f
show/hide logic for FAB during multi selection mode switching
2016-06-24 12:11:31 +02:00
Andy Scherzinger
98d4e4220e
use actual checkbox icon work
2016-06-24 12:11:31 +02:00
tobiasKaminsky
3f108e7a52
changes according to CR
2016-06-24 12:11:31 +02:00
Andy Scherzinger
4380290d90
code review fixes
2016-06-24 12:11:31 +02:00
Andy Scherzinger
2e65ffcf4f
grey system bar coloring on multi select
2016-06-24 12:11:31 +02:00
tobiasKaminsky
ad8c22cf20
fix for #1350
2016-06-24 12:11:31 +02:00
tobiasKaminsky
f7b73bff89
fix #1259
2016-06-24 12:11:31 +02:00
tobiasKaminsky
f1cba47d40
wip
2016-06-24 12:11:31 +02:00
tobiasKaminsky
d142cca6ab
wip
2016-06-24 12:11:31 +02:00
tobiasKaminsky
5085a92760
wip
2016-06-24 12:11:31 +02:00
tobiasKaminsky
4d87dbfaf3
changed highlighted color
2016-06-24 12:11:31 +02:00
tobiasKaminsky
d761f24572
wip
2016-06-24 12:11:31 +02:00
tobiasKaminsky
ee01a1ad1d
add missing files
2016-06-23 21:23:52 +02:00
tobiasKaminsky
1183e51c19
Merge remote-tracking branch 'owncloud/multiSelect' into multiSelectOwncloud
...
# Conflicts:
# res/drawable-hdpi/ic_checkbox_marked.png
# res/drawable-mdpi/ic_checkbox_marked.png
# res/drawable-xhdpi/ic_checkbox_marked.png
# res/drawable-xxhdpi/ic_checkbox_marked.png
# res/layout/grid_image.xml
# res/values/strings.xml
# src/com/owncloud/android/notifications/NotificationBuilderWithProgressBar.java
# src/com/owncloud/android/ui/activity/FileDisplayActivity.java
# src/com/owncloud/android/ui/adapter/FileListListAdapter.java
# src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
# src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2016-06-23 21:10:58 +02:00
Andy Scherzinger
7b27691a49
Renames due to https://github.com/nextcloud/android-library/pull/3
2016-06-23 14:44:44 +02:00
Andy Scherzinger
4e554c9245
fixed code duplicate
2016-06-22 16:43:25 +02:00
Andy Scherzinger
0db9c5e72d
fix code review comments
2016-06-22 16:43:24 +02:00
Andy Scherzinger
2c256bf53d
added the ability to select all within a folder for upload - selection is discarded when navigating folders
2016-06-22 16:43:23 +02:00
Timo Witte
bed46448c7
tidy up code based on feedback
2016-06-20 23:22:55 +02:00
Timo Witte
6401731e64
implement the same for videos and do some code cleanup
2016-06-20 23:22:54 +02:00
Timo Witte
f85cf5dcff
use long for timestamp and don´t fail if timestamp is empty
2016-06-20 23:22:54 +02:00
Timo Witte
7f02bb0ff2
make InstantUploader honor the SubFolder setting
2016-06-20 23:22:53 +02:00
Timo Witte
23e1071451
introduce upload subfolders configuration variable
2016-06-20 23:22:52 +02:00
Bartosz Przybylski
6bab4f00f9
Review fixes
2016-06-20 22:15:03 +02:00
Andy Scherzinger
75e2659947
use proper app icon in documents provider
2016-06-20 22:15:02 +02:00
Bartosz Przybylski
db7a4641c2
Add documents provider
2016-06-20 22:15:02 +02:00
tobiasKaminsky
d2e05d1184
remove commented line
2016-06-20 21:24:14 +02:00
tobiasKaminsky
f1bd8fc59a
linebreak
2016-06-19 21:24:59 +02:00
tobiasKaminsky
0e4243c996
hofix: https://github.com/nextcloud/server/pull/110
2016-06-19 21:24:36 +02:00
tobiasKaminsky
bed5a16e1f
Merge remote-tracking branch 'remotes/origin/master' into video_thumbnail
2016-06-19 18:23:06 +02:00
tobiasKaminsky
2c7256e835
Merge remote-tracking branch 'remotes/origin/videoBigThumbnails' into video_thumbnail
2016-06-19 18:22:45 +02:00
David A. Velasco
037535256e
Recovered full port and path in accounts naming to distinguish instances in the same host
2016-06-16 14:36:08 +02:00
David A. Velasco
aa2b113ea5
Show display name in list of uploads
2016-06-16 14:36:08 +02:00
David A. Velasco
ea3cf41b99
Show display name in account selector of ReceiveExternalFilesActivity.java
2016-06-16 14:36:08 +02:00
David A. Velasco
282f62b735
Updated after renaming operation in OC library
2016-06-16 14:36:08 +02:00
David A. Velasco
0913e3f234
Display name is sync'ed whenever a refresh of root folder occurs
2016-06-16 14:36:08 +02:00
David A. Velasco
3584666cf6
Added operation to sync display name
2016-06-16 14:36:08 +02:00
David A. Velasco
95152a36e8
Show display name in navigation drawer
2016-06-16 14:36:08 +02:00
David A. Velasco
70e24ceabe
Show display name in account selector
2016-06-16 14:36:08 +02:00
David A. Velasco
0f64fe48cd
Undo buggy refactoring; too much to do in that sense to get it works
2016-06-16 14:36:08 +02:00
David A. Velasco
a74901203b
Read and save display name when account is created
2016-06-16 14:36:08 +02:00
Andy Scherzinger
abe2b24f48
bugfix for image rendering
2016-06-14 13:29:12 +02:00
Andy Scherzinger
0db0ab1fd5
layouting changes so file list, local list and uploader list look the same
2016-06-14 09:55:24 +02:00
Andy Scherzinger
53a0da7021
revert filtering out files in the external file upload view
2016-06-14 09:55:23 +02:00
Andy Scherzinger
68849c7305
code review: fixed minor layout optimizations, set generic preference methods to private visibility
2016-06-14 09:55:22 +02:00
Andy Scherzinger
89dded113c
fix preference manager call after rebase
2016-06-14 09:55:21 +02:00
Andy Scherzinger
26ef68a02a
streamlined PrefManager API for simpler usage
2016-06-14 09:55:21 +02:00
Andy Scherzinger
5c72090ed2
removed now unused code
2016-06-14 09:55:20 +02:00
Andy Scherzinger
19c78855a0
moved the preference accessing to the oC Preference Manager
2016-06-14 09:55:19 +02:00
Andy Scherzinger
94a6bebb60
moved the preference accessing to the oC Preference Manager
2016-06-14 09:55:19 +02:00
Andy Scherzinger
1f4e9aa439
fix after rebase
2016-06-14 09:55:18 +02:00
Andy Scherzinger
8b04d61ff4
removed duplicate method call
2016-06-14 09:55:17 +02:00
Andy Scherzinger
ee7873d056
fixed menu, since grid view hasn't been part of the uploader screen
2016-06-14 09:55:17 +02:00
Andy Scherzinger
7c8fbf1ade
Fixes after rebase
2016-06-14 09:55:16 +02:00
Andy Scherzinger
8d47b770aa
implementation of #1193 - optimizing the uploader layout and taking user configured sorting into account
2016-06-14 09:55:15 +02:00
Andy Scherzinger
d74f5fdc2a
implementation of #1193 - optimizing the uploader layout and taking user configured sorting into account
2016-06-14 09:55:14 +02:00
Andy Scherzinger
9e116e6a98
removed ImageView onDraw super call
2016-06-14 09:47:45 +02:00
Andy Scherzinger
d00cf73fee
renamed method, changed input parameter + javaDoc
2016-06-13 22:25:04 +02:00
Andy Scherzinger
9eb6dc14ec
moved up onDraw super call
2016-06-13 22:11:42 +02:00
Andy Scherzinger
82f9f338fd
again, small formatting
2016-06-13 22:09:03 +02:00
Andy Scherzinger
6d7651eff9
return early
2016-06-13 22:09:02 +02:00
Andy Scherzinger
0a351f5899
formatting
2016-06-13 22:09:01 +02:00
tobiasKaminsky
4adecc96e8
changes due to CR
2016-06-13 22:09:01 +02:00
tobiasKaminsky
7e583891f0
- variables with m
...
- onMeasure sets always width/height
2016-06-13 22:09:00 +02:00
tobiasKaminsky
86b92a1753
add support for showing animated gifs in imagePreview
2016-06-13 22:08:59 +02:00
Andy Scherzinger
8073679c1b
further review comments
2016-06-13 21:50:11 +02:00
Andy Scherzinger
944af7e62b
code review plus fixed for the layouts and data to be displayed
...
now all file list view (uploader, upload external and standard file list have the same layout)
2016-06-13 21:50:11 +02:00
Andy Scherzinger
b5b1aab406
revert filtering out files in the external file upload view
2016-06-13 21:50:09 +02:00
Andy Scherzinger
e0a283a876
rebase changes with master
2016-06-13 21:50:08 +02:00
Andy Scherzinger
225cd2362f
removed duplicate method call
2016-06-13 21:50:08 +02:00
Andy Scherzinger
60d71a9423
Fixes after rebase
2016-06-13 21:50:06 +02:00
Andy Scherzinger
74fa10964a
implementation of #1193 - optimizing the uploader layout and taking user configured sorting into account
2016-06-13 21:50:05 +02:00
Andy Scherzinger
1a12fe2409
fix preference manager call after rebase
2016-06-13 21:50:04 +02:00
Andy Scherzinger
63761039db
streamlined PrefManager API for simpler usage
2016-06-13 21:50:04 +02:00
Andy Scherzinger
10594f490d
removed now unused code
2016-06-13 21:50:03 +02:00
Andy Scherzinger
3b4304048b
moved the preference accessing to the oC Preference Manager
2016-06-13 21:50:03 +02:00
Andy Scherzinger
a931baf8c6
moved the preference accessing to the oC Preference Manager
2016-06-13 21:50:02 +02:00
Andy Scherzinger
6a66b0a48f
fix after rebase
2016-06-13 21:50:01 +02:00
Andy Scherzinger
af9c055f85
removed duplicate method call
2016-06-13 21:50:01 +02:00
Andy Scherzinger
3ca1033d7a
fixed menu, since grid view hasn't been part of the uploader screen
2016-06-13 21:50:00 +02:00
Andy Scherzinger
df013d2b9c
Fixes after rebase
2016-06-13 21:49:59 +02:00
Andy Scherzinger
f2e93657e3
implementation of #1193 - optimizing the uploader layout and taking user configured sorting into account
2016-06-13 21:49:58 +02:00
Andy Scherzinger
cecab96b2f
implementation of #1193 - optimizing the uploader layout and taking user configured sorting into account
2016-06-13 21:49:57 +02:00
Andy Scherzinger
c9a3397aac
minor search provider config
2016-06-09 19:16:14 +02:00
Andy Scherzinger
91682b616c
replace launcher icon including seasonal icon removal
2016-06-09 17:52:35 +02:00
David A. Velasco
a12a1060ab
Grant that 'upload permission' is not changed when other properties of public share are updated
2016-06-07 16:49:25 +02:00
Juan Carlos González Cabrero
90b6f19161
Don't show local remove for available offline files/folders
2016-06-06 10:28:39 +02:00
tobiasKaminsky
d6dcccf396
Merge remote-tracking branch 'remotes/upstream/master' into thumbnailDuringUpload
2016-06-05 17:49:27 +02:00
Juan Carlos González Cabrero
28f20ec3ef
Check if the OCFile has a previous conflict before calling a sync operation
2016-06-02 12:40:09 +02:00
jabarros
a9a944799e
Added and changed synchronizing, sync error and successfully synced icons
2016-06-01 17:07:13 +02:00
David A. Velasco
7f33ba5d4a
Clear actions in menu don't deal with uploads waiting for Wifi as if were failed
2016-05-30 11:03:22 +02:00
David A. Velasco
d41accdb6a
Removed classes for compatibility of notifications with Android API level lesser than 14, not supported any more
2016-05-30 10:45:01 +02:00
David A. Velasco
52d8b7c264
Prevent that upload-in-progress notification is shown for instant uploads unless they are really performed
2016-05-30 10:45:01 +02:00
David A. Velasco
dab4ef4550
Moved upload waiting for Wifi to the section 'current' in uploads view
2016-05-30 10:45:01 +02:00
David A. Velasco
a5ef75a840
Prevent error notification for delayed uploads waiting for Wifi
2016-05-30 10:45:01 +02:00
David A. Velasco
cfbe5498f8
Prevent that files sent to OC from other apps are duplicated in local storage
2016-05-27 12:46:01 +02:00
jabarros
7225b9f631
Fix. [BUG] Some storages do not work when uploading content from other apps Drive
2016-05-23 13:04:31 +02:00
David A. Velasco
e34d76a126
Minor changes
2016-05-23 13:04:31 +02:00
jabarros
34470186aa
Final changes after CR
2016-05-23 13:04:31 +02:00
jabarros
7a46865c20
Second part of changes after CR
2016-05-23 13:04:31 +02:00
jabarros
36a0cd5a67
Changes after CR (WIP)
2016-05-23 13:04:31 +02:00
jabarros
2fadc0b62a
Added comments and cleaned code
2016-05-23 13:04:31 +02:00
jabarros
eae1e54c85
Removed unused imports
2016-05-23 13:04:31 +02:00
jabarros
49bcfd04a3
Removed unused and commented code
2016-05-23 13:04:31 +02:00
jabarros
e0ec383fe4
Show waiting dialog when receiving external files
2016-05-23 13:04:31 +02:00
jabarros
1a18ca4186
Remove content resolver parameter from UriUploader constructor and renamed UriUloadResult var
2016-05-23 13:04:31 +02:00
jabarros
7b7b85d530
Added and managed result cases when upload uris
2016-05-23 13:04:31 +02:00
jabarros
e84bfdf4ef
Refactor upload files code. Move to use UriUploader (WIP)
2016-05-23 13:04:31 +02:00
jabarros
f09fe374c0
Refactor upload files code (WIP)
2016-05-23 13:04:31 +02:00
jabarros
5948c1c387
Rename Uploader activity to ReceiveExternalFilesActivity
2016-05-23 13:04:31 +02:00
jabarros
ae63ec12b2
Changes after CR. Added silent error as Toast when error uploading a content uri file appears, or data file is not valid
2016-05-23 13:04:31 +02:00
jabarros
10b8f5ca4a
Removed replacement of ':' character from file name when uploading it as content uri scheme
2016-05-23 13:04:31 +02:00
jabarros
b8b17d4941
Fix. Import file from external storage with '/' character is uploaded incorrectly
2016-05-23 13:04:31 +02:00
jabarros
a0f2e7ab23
Minor refactor and added CR comment
2016-05-23 13:04:31 +02:00
jabarros
47f0a24f93
Remove unused import
2016-05-23 13:04:31 +02:00
jabarros
76e88dcd2b
Copy and upload the selected file when content type is uri
2016-05-23 13:04:31 +02:00
Andy Scherzinger
919fe916b6
cleanup since logging code has been implemented twice
2016-05-18 12:35:58 +02:00
Andy Scherzinger
e80d1465cd
show log preference item only for debug mode or flag set true (false by default)
2016-05-18 12:35:58 +02:00
Andy Scherzinger
74a05bb2a9
moved logs from drawer menu to "More" section in the settings
2016-05-18 12:35:57 +02:00
jabarros
64c6e90724
Fix. Favorite setting is not remembered when modifying the local file
2016-05-18 11:03:32 +02:00
Luke Owncloud
e9f7fc40db
if OCFile is null --> cannot delete ==> return false.
2016-04-29 19:51:01 +02:00
jabarros
61c6393f7f
Change way of checking if host url needs to be tested due to only in one case it should not be checked
2016-04-29 09:53:45 +02:00
jabarros
d78c03351f
Check if url is set in the activity creation and trigger server connection test
2016-04-29 09:53:45 +02:00
jabarros
aabdcaa04a
Changes after CR
2016-04-28 11:26:06 +02:00
jabarros
bf0af8e3a6
Add comments and rename vars
2016-04-28 11:26:06 +02:00
jabarros
93cd2be3bb
Change names of share features vars
2016-04-28 11:26:06 +02:00
jabarros
4899d0b851
Update UI to hide sections that are disabled according to setup variables
2016-04-28 11:26:06 +02:00
jabarros
4bdea46b63
Add configuration variables to setup and show or hide share feature on file menu
2016-04-28 11:26:06 +02:00
Lukas Reschke
5e65c15756
Update SamlWebViewDialog.java
2016-04-25 09:46:44 +02:00
Lukas Reschke
8af7a5f8cb
Disable plugins and file access from the web view
...
This is probably not required here and good practise as a further hardening.
2016-04-25 09:45:30 +02:00
David A. Velasco
1f117f1242
Close softkeyboard when passcode is processed to prevent it's still visible in passcode-protected Uploader activity
2016-04-21 11:31:48 +02:00
David A. Velasco
bc353af37e
Send update of share permissions in reshared remote shares
2016-04-21 11:31:48 +02:00
Juan Carlos González Cabrero
9f51a01c82
Stop upload process from external apps with content scheme uris
2016-04-21 11:31:48 +02:00
David A. Velasco
3f46a83396
Improved SAML webview rendering for non-responsive IdPs
2016-04-21 11:31:48 +02:00
David A. Velasco
a97b6ca88f
Fixed wrong conflict badge after resolving conflict with 'Keep both'
2016-04-21 11:31:48 +02:00
Juan Carlos González Cabrero
bd96e2c9ce
Refactor the check of last character of an OCFile parent path
2016-04-21 11:31:48 +02:00
Juan Carlos González Cabrero
112cb65b1f
Fix parent path build
2016-04-21 11:31:48 +02:00
Juan Carlos González Cabrero
e615b9a20d
Fix deleted file update in media scanner
2016-04-21 11:31:48 +02:00
David A. Velasco
04dc4b2f45
Fixed navigation to 'all files' to grant correct reuse of existing FileDisplayActivity in current task
2016-04-21 11:31:48 +02:00
David A. Velasco
154f6d03e0
Error correctly reported when share password could not be set, and clean-up of unused code for sharing via link
2016-04-21 11:31:48 +02:00
David A. Velasco
e43c1d6b3f
Improved error handling when copying shared link to clipboard
2016-04-21 11:31:48 +02:00
David A. Velasco
01cfbdd166
Set dimensions of SamlWebViewDialog to match parent for improved compatibility with adaptive web authenticators
2016-04-14 11:25:25 +02:00
David A. Velasco
8118334678
Applied changes after CR
2016-04-14 09:39:10 +02:00
David A. Velasco
68b96ce0db
Error dialogs in Uploader updated, both messages and implementation
2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
9e36ae2238
Modify Uploader activity to be singleton in the activity stack, and assure finish when the upload scheme is file
2016-04-14 09:39:10 +02:00
David A. Velasco
0f65e3a667
Grant execution of temporary copy of content URIs in configuration changes (such as rotation)
2016-04-14 09:39:10 +02:00
David A. Velasco
9d005d636f
Refatoring, warnings clean-up, improved error logic
2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
c88350a50f
replace path separator characters
2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
738e23a055
Keep the activity with the waiting dialog till the copies finish
2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
e1a9203c33
Fix async task call when no content uris received
2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
314f1fbd1f
Call to the async task with an uri array to iterate over it
2016-04-14 09:39:10 +02:00
David A. Velasco
6430ece72c
Files received via content:// URIs are temporary copied BEFORE requesting their upload to FileUploader service [WIP]
2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
ce7fa469a4
Refactoring on UploadFileOperation instances building
2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
5c0e7e851f
Fix extension parse error, and variable refactoring
2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
e85640bd93
Remove unused method with app logic from the domain class OCUpload
2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
fcdd464776
Refactor uploadFiles methods for 'file' schemes
2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
3207654895
Fix index condition and handle null mimetype extensions
2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
1b680c606b
Update error handling parsing the received uri
2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
59002bfb24
Fix lost extension for files with known mimetype
2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
da6b0c0162
Update dialog for sharing no files to be more intuitive
2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
996fdc4fa4
Remove useless code to identify pdf files
2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
7d5a44b4e5
Refactor file handling when receive from external apps to upload
2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
a0e442a8f2
Update library and remove old redirection check
2016-04-13 13:28:54 +02:00
Juan Carlos González Cabrero
1d30c83809
Minor changes from code review
2016-04-13 13:23:56 +02:00
Juan Carlos González Cabrero
9c617e993b
Moved up the logic of the 'SSL untrusted' dialog to FileActivity to be shown in all refreshes
2016-04-13 13:23:56 +02:00
Juan Carlos González Cabrero
47560ea7d5
Avoid overlapping an existing dialog
2016-04-13 13:18:17 +02:00
Juan Carlos González Cabrero
50f829a250
Add check of SSL unverified to show a dialog
2016-04-13 13:18:17 +02:00
David A. Velasco
f6ea9b597a
Merge branch 'master' into reliable_uploads_actions_uploads_view
...
Conflicts FIXED in res/values/styles.xml (trivial)
2016-03-30 13:27:09 +02:00
David A. Velasco
9de0ff8cd8
Fixed vertical spacing of cells in uploads view
2016-03-30 11:07:34 +02:00
David A. Velasco
da7fee4ee9
Invalidate progress bar every time the holding cell is requested for uploads in progress
2016-03-30 09:39:58 +02:00
David A. Velasco
04085bb223
Grant correct visibility of right button for reused cells in uploads view
2016-03-30 09:20:50 +02:00
David A. Velasco
e12e5e87c2
Limit number of successful uploads stored in DB, as stated in acceptance criteria
2016-03-29 19:22:49 +02:00
David A. Velasco
be00353096
No trash button for successful uploads
2016-03-29 17:42:14 +02:00
David A. Velasco
d098d07889
Grant that only one progress bar is bound to FileUploader service in uploads view
2016-03-29 16:58:27 +02:00
David A. Velasco
f1bd697d7f
Navigation drawer updated when account is removed in settings, opening this from uploads view
2016-03-29 14:11:09 +02:00
Juan Carlos González Cabrero
9b85e57c8c
Update local path of the uploads only if the behaviour is MOVE
2016-03-29 09:52:07 +02:00
Juan Carlos González Cabrero
60101fe349
Revert "Update local path of upload, for consistent move operations"
...
This reverts commit 94aaff3af8
2016-03-29 09:12:51 +02:00
David A. Velasco
163e9e7bbe
Uploads delayed for Wifi processed as any other upload -> notifications sent, uploads view refreshed correctly
2016-03-28 15:14:03 +02:00
Juan Carlos González Cabrero
94aaff3af8
Update local path of upload, for consistent move operations
2016-03-28 13:59:26 +02:00
Juan Carlos González Cabrero
1c701fbc00
Avoid storing upload if it ias already in current queue
2016-03-28 11:31:37 +02:00
Juan Carlos González Cabrero
467071321f
Remove unique upload by his ID when it already exists in current ones
2016-03-28 11:10:48 +02:00
tobiasKaminsky
bcbb365657
Create thumbnail during instant upload
2016-03-27 16:45:53 +02:00
Juan Carlos González Cabrero
cbf619be77
Add listener to let FileUploader know about a rename
2016-03-22 13:35:07 +01:00
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
e9bf119fa4
avoid NPE
2015-12-02 20:23:07 +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
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
