Commit graph

10131 commits

Author SHA1 Message Date
Andy Scherzinger
7c7ee7aa36
Merge pull request #1983 from nextcloud/snackbar
Resized images: snackbar fix
2018-01-18 21:25:56 +01:00
Andy Scherzinger
60c416ea26
Merge pull request #1993 from nextcloud/intentNPE
Intent can be null if service is restarted
2018-01-18 21:24:58 +01:00
Andy Scherzinger
12f2be740c
Merge pull request #1978 from nextcloud/hardenNotificationManager
harden notificationManager
2018-01-18 21:24:16 +01:00
Andy Scherzinger
fb622ea6b5
Merge pull request #1997 from nextcloud/walledException
Internet walled: catch any exception
2018-01-18 21:11:36 +01:00
Andy Scherzinger
e21429a557
Merge pull request #1985 from nextcloud/drawerLoad
Fix NPE in external link icon loading
2018-01-18 21:07:33 +01:00
Andy Scherzinger
bf53f74025
Merge pull request #1981 from nextcloud/SyncFolderNPE
Avoid NPE
2018-01-18 21:06:54 +01:00
Andy Scherzinger
f54f114d9d
Merge pull request #1995 from nextcloud/shareButton
Make drawable mutable
2018-01-18 21:05:43 +01:00
Andy Scherzinger
6504145638
Merge pull request #1980 from nextcloud/retryFailedInThread
Retry upload in thread
2018-01-18 15:57:02 +01:00
tobiaskaminsky
b71c302db8
catch any exception
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-18 13:56:49 +01:00
tobiaskaminsky
252bc8cbd6
make drawable mutable
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-18 12:07:16 +01:00
tobiaskaminsky
948f3bd2f2
try to instantiate again
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-18 09:28:59 +01:00
tobiaskaminsky
36e8ad636a
harden notificationManager
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-18 09:28:59 +01:00
tobiaskaminsky
3145260054
also fix #1976
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-18 09:07:00 +01:00
tobiaskaminsky
2239730cb5
fix NPE in external link icon loading
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-18 09:07:00 +01:00
tobiaskaminsky
cab4f6a9a8
Intent can be null if service is restarted
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-18 08:33:16 +01:00
Nextcloud bot
795f0451b5
[tx-robot] updated from transifex 2018-01-18 01:39:55 +00:00
Tobias Kaminsky
fe3c9c2bb0 daily dev 20180118 2018-01-18 00:59:05 +01:00
tobiaskaminsky
3d3fbe557a
use provide activity instead of calling getActivity, which might be null.
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-17 15:23:26 +01:00
tobiaskaminsky
55df66377f
no path magic, but simply use parent id
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-17 15:07:58 +01:00
Andy Scherzinger
d7dd8c120d
Merge pull request #1984 from nextcloud/dismissDialog
Try to avoid Exception on dismissDialog
2018-01-17 14:45:53 +01:00
tobiaskaminsky
3eb99c65c5
try to avoid Exception on dismissDialog
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-17 14:32:17 +01:00
tobiaskaminsky
cff3b455c0
Snackbar fix IAE
download only if activity exists

Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-17 14:08:06 +01:00
tobiaskaminsky
e9f352c27c
avoid npe
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-17 13:22:43 +01:00
tobiaskaminsky
fef6d38c40
retry upload in thread
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-17 13:05:54 +01:00
Tobias Kaminsky
4e2a019de6
Merge pull request #1973 from nextcloud/fixDBforDev
Fix DB for dev version
2018-01-17 09:42:53 +01:00
tobiaskaminsky
b8e5b8c4bf
fix DB for dev version
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-17 08:17:16 +01:00
Nextcloud bot
43675d9880
[tx-robot] updated from transifex 2018-01-17 06:09:03 +00:00
tobiaskaminsky
e054fbcb83
replace … with &#8230; to make it clearer for translators
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-17 07:03:51 +01:00
Nextcloud bot
7cc57d2e45
[tx-robot] updated from transifex 2018-01-17 01:40:40 +00:00
Tobias Kaminsky
24eab27ebb daily dev 20180117 2018-01-17 01:03:38 +01:00
Tobias Kaminsky
e4b635f6e9
Merge pull request #1967 from nextcloud/removeWhatsNew200
Remove 2.0 what's new features
2018-01-16 13:16:56 +01:00
tobiasKaminsky
3753832a9a
remove 200 features from whats new
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-16 11:10:36 +01:00
Nextcloud bot
5522b0b82e
[tx-robot] updated from transifex 2018-01-16 01:42:35 +00:00
Tobias Kaminsky
d403609a8f daily dev 20180116 2018-01-16 01:18:26 +01:00
Tobias Kaminsky
6bd945f145
Merge pull request #1965 from nextcloud/300rc1
3.0.0 RC1 release
2018-01-15 15:04:34 +01:00
tobiasKaminsky
e28a4ab745
Version bump & changelog
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 14:13:45 +01:00
Tobias Kaminsky
43943205ca
Merge pull request #1954 from nextcloud/new-ardevd-storage
New, overhauled data storage management
2018-01-15 14:08:43 +01:00
tobiasKaminsky
59fafc7b3d
function is private
fix modified, but will soon be removed

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 13:24:07 +01:00
tobiasKaminsky
88498e4071
use copy & delete instead of move
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 12:40:15 +01:00
Mario Danic
1c8d46f9ff
Revert change
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-15 11:23:33 +01:00
Mario Danic
ffb33a3ed8
Remove double dep
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-15 11:23:33 +01:00
Mario Danic
f626f58378
Attempt to fix moves
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-15 11:23:33 +01:00
tobiaskaminsky
45f7cb1cc7
linebreaks
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-15 11:23:32 +01:00
Mario Danic
66711f215c
Fix code review issues
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-15 11:23:32 +01:00
Mario Danic
4c6a98d8af
Add new line
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-15 11:23:32 +01:00
Mario Danic
ee7d4ed56c
Implement keys migration
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-15 11:23:32 +01:00
Mario Danic
d56f53bb11
Fix uploads
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-15 11:23:31 +01:00
Mario Danic
845e85fb24
Most improvements
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-15 11:23:31 +01:00
Tobias Kaminsky
375d66761a
Merge pull request #1962 from nextcloud/topOfEncryption
Detect top of encryption folders
2018-01-15 11:03:45 +01:00
tobiasKaminsky
c1fe52bbf8
Detect top of encryption folders
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 10:45:43 +01:00