Commit graph

5810 commits

Author SHA1 Message Date
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
Tobias Kaminsky
45f09e85e5 Merge pull request #253 from nextcloud/magicUrl
Provisioning Links to launch and prefill app with login data
2016-10-06 19:24:02 +02:00
AndyScherzinger
b607a770f2
minor layout optimization 2016-10-06 18:25:23 +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
845e84133b
fix url mapping 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
Nextcloud bot
ab6e0019e7
[tx-robot] updated from transifex 2016-10-06 00:32:49 +00: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
08b8eca02c Merge pull request #309 from nextcloud/fixDroneLink
new CI server address
2016-10-05 20:29:40 +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
8bd58a24ea Merge pull request #293 from nextcloud/wordingDavdroid
change wordings for davdroid integration
2016-10-05 19:24:33 +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
Tobias Kaminsky
56b3f3f88d Merge pull request #306 from nextcloud/cursorFix
put cursor close in finally block to make sure no resource leak occurrs
2016-10-05 19:15:35 +02:00
matsuo
29002e5a24 close() in finally block 2016-10-06 00:49:13 +09:00
Nextcloud bot
05a2583259
[tx-robot] updated from transifex 2016-10-05 00:32:48 +00:00
AndyScherzinger
afa274accf
new CI server address
Resolves: #308
2016-10-04 22:57:02 +02: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
tobiasKaminsky
28053a4612
change wordings for davdroid integration 2016-10-04 14:00:42 +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
Nextcloud bot
e8f5c57329
[tx-robot] updated from transifex 2016-10-03 00:33:13 +00:00
ryanwr
bf451f52a8 Sorts favourite files first in list 2016-10-02 11:10:46 +01:00
Nextcloud bot
953c0dd5c5
[tx-robot] updated from transifex 2016-10-02 00:33:02 +00:00
Nextcloud bot
1f7b8418e3
[tx-robot] updated from transifex 2016-10-01 00:32:53 +00: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
Nextcloud bot
b71243ea8f
[tx-robot] updated from transifex 2016-09-30 00:32:45 +00: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
f868e0daa0 Merge branch 'syncedFolders' of https://github.com/nextcloud/android into syncedFolders 2016-09-29 10:56:12 +02:00
Andy Scherzinger
a04682fe5d hardening provider implementation + javadoc 2016-09-29 10:54:32 +02:00
Andy Scherzinger
78dfb7cedf make SyncedFolderObserverService use SyncedFolderProvider (todo also move the Observable to the Provider implementation) 2016-09-29 10:54:32 +02:00
Andy Scherzinger
67d7ec9741 renamed upload action column, extended SyncFolder POJO, createdd a draft implementation of a SyncFolderProvider for DB operations 2016-09-29 10:54:32 +02:00