Commit graph

3599 commits

Author SHA1 Message Date
Mario Danic
27e486458a Put quota text back to its place 2017-03-02 12:36:28 +01:00
Mario Danic
364d82c0c0 Clean up things 2017-02-27 11:10:34 +01:00
Mario Danic
6b1cf6895d Merge branch 'master' into branding 2017-02-27 10:17:00 +01:00
Mario Danic
ad357ef071 Add missing string to main strings 2017-02-25 10:16:38 +01:00
Mario Danic
05367bf9ab Fix string 2017-02-25 03:47:31 +01:00
Mario Danic
1052986243 Fix authorities 2017-02-25 03:43:08 +01:00
Mario Danic
3520d40a00 Change authority for custom
And some other stuff
2017-02-25 03:21:32 +01:00
Mario Danic
43d1c52da8 Move google-services to generic 2017-02-25 02:44:32 +01:00
Mario Danic
088e345ea5 custom variables 2017-02-25 02:44:32 +01:00
Mario Danic
10102c0f2d Remove currently unused variable 2017-02-25 02:44:32 +01:00
Mario Danic
7b57687fed Remove majority of custom folder 2017-02-25 02:44:32 +01:00
Mario Danic
749cbcf31c Move the generic MainApp 2017-02-25 02:44:31 +01:00
Mario Danic
dba8c4ed6e Move things around 2017-02-25 02:44:31 +01:00
Mario Danic
40913110f0 Rename the variable 2017-02-25 02:44:31 +01:00
Mario Danic
cc9ff688e7 Remove 1 (one!) new entry into setup.xml 2017-02-25 02:44:31 +01:00
Mario Danic
5c201a823e Update google services 2017-02-25 02:44:31 +01:00
Mario Danic
c7eed23de9 Add Google Firebase analytics 2017-02-25 02:44:31 +01:00
Mario Danic
4d1a0a60c8 Add required gs 2017-02-25 02:44:31 +01:00
Mario Danic
06d3f89f20 Add third parties properly 2017-02-25 02:44:31 +01:00
Mario Danic
0110e54ebe Add new customization options 2017-02-25 02:44:31 +01:00
Mario Danic
16f1243da6 Fix project structure and prepare for branding 2017-02-25 02:44:31 +01:00
Mario Danic
11b71f8c30
Make search view smaller in landscape 2017-02-23 10:21:53 +01:00
Mario Danic
cc87a41702
Revert "Revert "Fix landscape""
This reverts commit 23af3bb4c19c9a96aa07db564243a9dd3c1851f1.
2017-02-23 10:21:52 +01:00
Mario Danic
c91dfccf44
Revert "Fix landscape"
This reverts commit a2f177939c792d53dd851d3de31849b9c397e55c.
2017-02-23 10:21:52 +01:00
Mario Danic
27716f8425
Fix landscape 2017-02-23 10:21:52 +01:00
Mario Danic
4fa40f7392
Commit commit commit 2017-02-23 10:21:51 +01:00
Keith Abdulla
b8c73e2f73
fix potential out of memory exception 2017-02-23 10:21:51 +01:00
AndyScherzinger
a0936d43e8
simplify boolean statement, fix javadoc 2017-02-23 10:21:51 +01:00
Mario Danic
beb491f64b
Remove a line 2017-02-23 10:21:50 +01:00
Mario Danic
150a19c5b7
Add back menu entry 2017-02-23 10:21:50 +01:00
Mario Danic
0fd9a47b23
Fix arrow stuff 2017-02-23 10:21:49 +01:00
Mario Danic
6b4a94b5ca
Fix most bugs :P 2017-02-23 10:21:49 +01:00
Mario Danic
cae3f66681
Revert "Move stuff"
This reverts commit 84e721718aa7087bdc2f897c0b24aa5c9ea1fcac.
2017-02-23 10:21:49 +01:00
Mario Danic
ef4ac587ce
Move stuff 2017-02-23 10:21:48 +01:00
Mario Danic
767560a2e0
Update according to review 2017-02-23 10:21:48 +01:00
Mario Danic
8d09630eb1
Fix a few things 2017-02-23 10:21:47 +01:00
AndyScherzinger
3026a6bd4c
replace light blue search icon with grey one 2017-02-23 10:21:47 +01:00
Mario Danic
eb9e5f564d
Remove unused import 2017-02-23 10:21:46 +01:00
Mario Danic
aebad1476b
Set empty message for search 2017-02-23 10:21:46 +01:00
Mario Danic
5a36b60d7c
Show only files&folders in current folder 2017-02-23 10:21:46 +01:00
Mario Danic
7a36a45e5d
Try to fix filtering 2017-02-23 10:21:45 +01:00
Mario Danic
f47a7da793
Fix filtering a bit 2017-02-23 10:21:45 +01:00
Mario Danic
449ce15bdf
Fix codacy stuff 2017-02-23 10:21:45 +01:00
Mario Danic
e3cf4701f2
Animate search bar transition 2017-02-23 10:21:44 +01:00
Mario Danic
f7ceca9cab
Fix rotation magic 2017-02-23 10:21:44 +01:00
Mario Danic
43a82f7dcb
Make fab appear nicer 2017-02-23 10:21:44 +01:00
Mario Danic
7a15e20b20
Update footer 2017-02-23 10:21:43 +01:00
Mario Danic
ca674dd8a0
Set proper message 2017-02-23 10:21:43 +01:00
Mario Danic
6a510d96c0
Work on a new approach 2017-02-23 10:21:42 +01:00
Mario Danic
bc0bbd7842
Revert "Update one more broadcast"
This reverts commit 7abc8f12469cead1394167abe63716cf5e24afe0.

# Conflicts:
#	src/com/owncloud/android/datamodel/FileDataStorageManager.java
2017-02-19 19:24:13 +01:00
Mario Danic
db0620bab4
Add missing ; 2017-02-19 19:24:13 +01:00
Mario Danic
f3c735050d
Update one more broadcast 2017-02-19 19:24:12 +01:00
Mario Danic
7529084f82
Set package name on all sticky intents 2017-02-19 19:24:12 +01:00
carstendev
d038fd7260 Fix for #448. Rotation change in FolderPicker caused app crash. 2017-02-12 04:48:10 +01:00
Mario Danic
ba5dae93b4
Quick fix to work with new library updates 2017-02-05 22:17:13 +01:00
justin-sleep
b5ca2cdc90
Set DAV path in AccountUtils and retrieve it when calling DAVdroid 2017-02-05 21:45:20 +01:00
justin-sleep
66b6436d2b
Use proper API to get WebDAV path for DAVdroid URI correction 2017-02-05 21:45:19 +01:00
justin-sleep
ef1a56f844
Fix DavDroid integration (append necessary addition to mURI) 2017-02-05 21:45:14 +01:00
Mario Đanić
bb22b9d50b Merge pull request #605 from nextcloud/bug_597
Don't restore from unknown state for migration. Fixes #597
2017-01-31 09:21:16 +01:00
Andy Scherzinger
668229a2ed Merge pull request #524 from mario/improvement-toggle-favourite-only-relevant-files
Avoid toggling favourite for all selected files
2017-01-30 20:23:22 +01:00
Bartosz Przybylski
5a647cf094 Don't restore from unknown state for migration. Fixes #597 2017-01-30 17:38:22 +01:00
tobiasKaminsky
e1f8ace98e
round thumbnail size to power of 2: 384 => 256 2017-01-29 21:07:16 +01:00
Mario Danic
ca4947271c
Fix another formatting issue 2017-01-29 21:06:08 +01:00
Mario Danic
28faac1b53
Fix a formatting issue 2017-01-29 21:06:08 +01:00
Mario Danic
121bd06114
Fix review comments 2017-01-29 21:06:08 +01:00
Mario Danic
9010476ccc
Avoid toggling favourite for all selected files 2017-01-29 21:06:07 +01:00
AndyScherzinger
9d0306a8c8
formatting 2017-01-27 16:33:12 +01:00
AndyScherzinger
a49daae9eb
code review 2017-01-27 16:33:12 +01:00
AndyScherzinger
39b3f2f5d5
fix visibility 2017-01-27 16:33:11 +01:00
AndyScherzinger
84b9bb97d4
fix codacy warnings 2017-01-27 16:33:11 +01:00
AndyScherzinger
fa4439bc46
add further checks for API Level 2017-01-21 14:09:19 +01:00
tobiasKaminsky
4aa12e390c
changes according to Code Review 2017-01-20 16:01:30 +01:00
tobiasKaminsky
122e163675
prevent NoClassDefFound 2017-01-20 16:01:27 +01:00
AndyScherzinger
fa81cf7ec2
performance: only do further processing if not a Nc app folder 2017-01-11 22:55:12 +01:00
AndyScherzinger
c024df5602
NPE Fix
resolves #529
2017-01-11 22:55:03 +01:00
tobiasKaminsky
555e885940 fix wrong creation of folder during auto upload 2017-01-05 20:33:40 +01:00
tobiasKaminsky
1219844d58 try to fix TimSort, but it was just a plain NPE... 2017-01-04 20:24:26 +01:00
tobiasKaminsky
5ab691154e
- delay job execution by minimal 10s
- on job execution: check if file exists prior to real upload. If file does not exist anymore, just ignore it
2017-01-03 21:06:23 +01:00
tobiasKaminsky
bdf8e58d22
auto upload: only files, no folders 2017-01-03 20:45:10 +01:00
tobiasKaminsky
3055bcecb3
ignore files ending with ".tmp" 2016-12-31 18:32:20 +01:00
tobiasKaminsky
2b86d9912e
show pending jobs in upload view
cancel pending jobs
2016-12-31 17:37:42 +01:00
tobiasKaminsky
96777a7d36
extracted string value
first try to get uploadStorageManager show job
2016-12-31 17:37:40 +01:00
tobiasKaminsky
87077067f8
fixed removing files #473 2016-12-31 15:17:52 +01:00
tobiasKaminsky
a116cdf77f
disable handling broadcast on Nougat and better 2016-12-30 19:02:43 +01:00
AndyScherzinger
f79b7ca2c0
resolves: #483 - adding proper email sharee handling 2016-12-30 18:37:31 +01:00
AndyScherzinger
5e0a163709
simplify loading screen 2016-12-30 17:52:21 +01:00
AndyScherzinger
3eaeb049a1
fix codacy warnings 2016-12-30 17:43:04 +01:00
AndyScherzinger
4d646d0da3
restore backAsUp arrow in action bar when being in a subfolder (and drawer has been opened/closed) #445 2016-12-30 17:43:04 +01:00
AndyScherzinger
99d630bdf4
empty list tweaks for #445 2016-12-30 17:43:04 +01:00
AndyScherzinger
b5fea72953
codacy is really picky.... 2016-12-21 13:12:56 +01:00
AndyScherzinger
87aeb026b6
shorten interface 2016-12-21 13:04:30 +01:00
AndyScherzinger
75dace2af0
shorten class definition 2016-12-21 13:03:55 +01:00
AndyScherzinger
247bbc11b6
reuse account manager list adapter for account chooser, put helper method for list names in utils 2016-12-21 12:57:33 +01:00
AndyScherzinger
96229c6c6b
Added persistence of file extension selection per type 2016-12-21 11:56:45 +01:00
masaaki matsuo
930535fe1e
add .desktop Internet Shortcut 2016-12-21 11:08:30 +01:00
AndyScherzinger
1390afa6b0
remove unused/unneeded class 2016-12-21 11:08:29 +01:00
AndyScherzinger
07d4288246
fixed codacy warnings 2016-12-21 11:08:27 +01:00
masaaki matsuo
c0c6efc08a
fix webloc suffix 2016-12-21 11:08:27 +01:00
masaaki matsuo
fad2998f99
remove unuse valiable 2016-12-21 11:08:26 +01:00
masaaki matsuo
fe9d0926eb
add import 2016-12-21 11:08:26 +01:00
masaaki matsuo
d20481568b
fix codacy warnings 2016-12-21 11:08:25 +01:00
matsuo
dc41d3c1a5
add hideSpinnerDropDown() 2016-12-21 11:08:25 +01:00
matsuo
68bd78177f
move strings to resource, fix DialogFragments crash on screen rotation 2016-12-21 11:08:25 +01:00
matsuo
624665594b
reduce strings 2016-12-21 11:08:24 +01:00
matsuo
e45eed77c1
replace tab to spaces 2016-12-21 11:08:24 +01:00
matsuo
05d0b9e700
add filetype select 2016-12-21 11:08:24 +01:00
matsuo
02e49de3b3
adding spinner code 2016-12-21 11:08:23 +01:00
matsuo
ad16d4a4f5
test spinner in DialogFragment 2016-12-21 11:08:23 +01:00
matsuo
a568f73a1f
use DialogFragment instead of onCreateDialog() and showDialog() 2016-12-21 11:08:22 +01:00
matsuo
aff10f6ec2
use showDialog() to show DIALOG_UPLOAD_FILENAME dialog 2016-12-21 11:08:22 +01:00
matsuo
936ead2c3f
recognize intent from the google map 2016-12-21 11:08:22 +01:00
matsuo
6900c73642
add title and message in dialog 2016-12-21 11:08:21 +01:00
matsuo
678170024e
Code review fixes 2016-12-21 11:08:21 +01:00
matsuo
dcabcaa58e
reformat with Android Studio 2016-12-21 11:08:21 +01:00
matsuo
437f236552
Add upload URL file feature 2016-12-21 11:08:11 +01:00
wfiete
13a7b362dd Better readability. 2016-12-11 18:07:45 +01:00
wfiete
4488bfb84c Pending runnable that will be executed after the drawer has been closed. 2016-12-08 12:20:39 +01:00
AndyScherzinger
7d54ab07e3
revised text and order 2016-11-23 21:40:38 +01:00
AndyScherzinger
a49b54419a
fixed feature list / string for revamped what's new images 2016-11-23 21:18:52 +01:00
tobiasKaminsky
6eacd30783
fix "showing double whatsnew screen on first start" once again ;) 2016-11-23 21:18:52 +01:00
AndyScherzinger
7bf7299874
re-add missing methods 2016-11-23 21:18:52 +01:00
AndyScherzinger
786f00fa9a
fixed codacy warnings 2016-11-23 21:18:52 +01:00
AndyScherzinger
8436dc92e0
removal of code warnings 2016-11-23 21:18:51 +01:00
AndyScherzinger
ae40988c34
fixed headers and code duplication 2016-11-23 21:18:51 +01:00
AndyScherzinger
dd010cb555
organize imports after rebase 2016-11-23 21:18:51 +01:00
Andy Scherzinger
91fc60e8fb
hide "skip" button on last feature element 2016-11-23 21:18:51 +01:00
Andy Scherzinger
d23a01b573
incorporating the new feature graphics and coloring 2016-11-23 21:18:51 +01:00
Andy Scherzinger
528b8d5e5e
resized font sizes 2016-11-23 21:18:50 +01:00
Bartosz Przybylski
a811fe21e4
Code review fixes 2016-11-23 21:18:50 +01:00
Bartosz Przybylski
5ee2fbacf6
tabs to spaces 2016-11-23 21:18:49 +01:00
Bartosz Przybylski
2663ff871e
tabs to spaces 2016-11-23 21:18:49 +01:00
Bartosz Przybylski
91826228f4
Show whats new only once on first run 2016-11-23 21:18:49 +01:00
Bartosz Przybylski
907a61b01e
Change the way of displaying progress indicator 2016-11-23 21:18:49 +01:00
Bartosz Przybylski
bd91cb0c22
Use ViewPager instead of custom dragging mechanism 2016-11-23 21:18:49 +01:00
Bartosz Przybylski
deaf569c1c
Add parameter to allow showing whats new in beta 2016-11-23 21:18:48 +01:00
Bartosz Przybylski
c700937c6a
Till java7 won't be used on ant project use old diamond notation 2016-11-23 21:18:48 +01:00
Andy Scherzinger
0b9a1d0855
small design changes, adding arrow as vector (thus bumping gradle plugin to 1.5.0!), changing check icon and adding circle background for finish action 2016-11-23 21:18:48 +01:00
Andy Scherzinger
3e1c82d077
added iOS images for the whats new screens 2016-11-23 21:18:47 +01:00
Bartosz Przybylski
d837958e5c
Use global method to get version code 2016-11-23 21:18:47 +01:00
Bartosz Przybylski
3a9b6833a6
Show done button when only single news is available 2016-11-23 21:18:47 +01:00
Bartosz Przybylski
0bba52241a
Insert type in diamond operator, but this is just a hack to support old comiler 2016-11-23 21:18:47 +01:00
Bartosz Przybylski
0ecda26c73
Implement left/right swipe in whats new view 2016-11-23 21:18:47 +01:00
Bartosz Przybylski
3d9f35e6cf
Another small cleanup 2016-11-23 21:18:46 +01:00
Bartosz Przybylski
ebf39a8d36
Remove testing stuff 2016-11-23 21:18:46 +01:00
Bartosz Przybylski
0e05c5022f
Put FeatureList to separate file for cleaner code 2016-11-23 21:18:46 +01:00
Bartosz Przybylski
f6520fd18a
Small code cleanup in WhatsNewActivity 2016-11-23 21:18:46 +01:00
Bartosz Przybylski
2087d2d545
Add Whats new activity and embed it into project 2016-11-23 21:18:46 +01:00
tobiasKaminsky
b15fa8fc5e in case of sharedPref not accessible fallback to "do nothing" 2016-11-19 09:33:18 +01:00
tobiasKaminsky
8c7edf5339 disable instant upload only on Nougat 2016-11-17 23:13:40 +01:00
tobiasKaminsky
93e861cb9d hide Auto Sync for pre Nougat version 2016-11-16 17:54:57 +01:00
tobiasKaminsky
5c0f8da356 Merge remote-tracking branch 'origin/syncedFolders' into syncedFolders2 2016-11-16 17:46:46 +01:00
tobiasKaminsky
47c8afdcc0 hide Auto Sync for pre Nougat version 2016-11-16 17:46:04 +01:00
tobiasKaminsky
34e85d0c20 sorting of media folder is now case insensitive 2016-11-16 16:46:29 +01:00
tobiasKaminsky
718c1cc289 remove debugging output 2016-11-16 16:44:22 +01:00
tobiasKaminsky
e33f946d35 ignore media folders within our own app 2016-11-16 16:43:11 +01:00
tobiasKaminsky
0bff89949a show pending jobs 2016-11-16 12:17:53 +01:00
AndyScherzinger
e13a85fb53
fix access 2016-11-10 22:33:04 +01:00
AndyScherzinger
6c8bbd6c2c
Merge branch 'master' of https://github.com/nextcloud/android into syncedFolders
# Conflicts:
#	src/com/owncloud/android/MainApp.java
#	src/com/owncloud/android/db/ProviderMeta.java
#	src/com/owncloud/android/providers/FileContentProvider.java
#	src/com/owncloud/android/services/observer/FolderObserver.java
#	src/com/owncloud/android/ui/activity/Preferences.java
2016-11-10 22:18:15 +01:00
tobiasKaminsky
fb4fe4663e Merge remote-tracking branch 'origin/syncedFolders' into syncedFolders2 2016-11-10 21:50:43 +01:00
tobiasKaminsky
4c56ce2b0d fix only one picture is uploaded 2016-11-10 21:46:37 +01:00
Andy Scherzinger
d8f07d3abc Merge pull request #372 from nextcloud/fixSendLogCrash
fix crash during log sending when exposing URI on Android 7+
2016-11-10 21:13:56 +01:00
Andy Scherzinger
b3678f207b Merge pull request #346 from nextcloud/sortFix
Use correct array of options
2016-11-10 21:12:14 +01:00
AndyScherzinger
73b8220df0
fix crash when exposing URI on Android 7+ 2016-11-10 11:42:19 +01:00
AndyScherzinger
d64eabcc0f
re-add sort by size for local folder views while sorting folders in the list alphabetically 2016-11-10 11:40:13 +01:00
AndyScherzinger
eeff36b6a1
Use correct array of options
Resolves: #336
2016-11-10 11:40:10 +01:00
AndyScherzinger
3bfe30ea8e
wrong access level 2016-11-10 10:20:12 +01:00
AndyScherzinger
8f10f62c51
fix codacy warnings after rebase 2016-11-10 10:20:11 +01:00
AndyScherzinger
0d0321b001
Fixes after rebase 2016-11-10 10:20:11 +01:00
AndyScherzinger
feae5b7647
further formatting issues 2016-11-10 10:20:10 +01:00
AndyScherzinger
8da1f33123
fixed minor warnings 2016-11-10 10:20:10 +01:00
Iskra Delta
01a70fed85
PMD appeased
Some warnings have been supressed.
2016-11-10 10:20:09 +01:00
Iskra Delta
56af1f4205
FindBugs appeased 2016-11-10 10:20:09 +01:00
AndyScherzinger
aa3d3c262c
further findbugs/pmd fixes for new feature (sd card) 2016-11-10 10:20:09 +01:00
AndyScherzinger
f5dab28729
fixed minor warnings 2016-11-10 10:20:08 +01:00
Iskra Delta
89137a0819
PMD appeased
Some warnings have been supressed.
2016-11-10 10:20:08 +01:00
Iskra Delta
6c12644cf7
FindBugs appeased 2016-11-10 10:20:07 +01:00
AndyScherzinger
3f343a3399
fix codacy findings 2016-11-10 10:20:07 +01:00
AndyScherzinger
39ed78b5cc
remove unnecessary valueOf call 2016-11-10 10:20:06 +01:00
AndyScherzinger
4efdc6b00f
further formatting issues 2016-11-10 10:20:05 +01:00
AndyScherzinger
a30985ca1e
formatting 2016-11-10 10:20:05 +01:00
Iskra Delta
433b684a24
PMD appeased
Some warnings have been supressed.
2016-11-10 10:20:04 +01:00
Iskra Delta
9d521be13b
FindBugs appeased 2016-11-10 10:20:04 +01:00
AndyScherzinger
54f4dc7032
further findbugs/pmd fixes for new feature (sd card) 2016-11-10 10:20:03 +01:00
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