mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-23 01:00:26 +03:00
Code Issues Projects Releases Packages Wiki Activity
6411 commits 221 branches 1589 tags 640 MiB
Commit graph

3367 commits

Author SHA1 Message Date
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