Commit graph

5797 commits

Author SHA1 Message Date
tobiaskaminsky
7a06cbce79
NPE if activity is already closed
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-19 09:18:33 +01:00
tobiaskaminsky
bc7f2b0f4e
fix NPE
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-19 08:51:51 +01:00
Nextcloud bot
62b5c74d46
[tx-robot] updated from transifex 2018-01-19 01:39:56 +00:00
AndyScherzinger
336c1705b1
codacy: organize imports 2018-01-18 21:28:54 +01:00
AndyScherzinger
2d79a37b9f
added newline 2018-01-18 21:27:48 +01:00
AndyScherzinger
fdd0431beb
center image/text 2018-01-18 21:27:48 +01:00
tobiaskaminsky
5d30d83e67
Hardening preview adapter for null files
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-18 21:27:47 +01:00
Andy Scherzinger
61c6a37acb
Merge pull request #1986 from nextcloud/NPEonFilename
No path magic, but simply use parent id
2018-01-18 21:27:15 +01:00
Andy Scherzinger
8933a065d6
Merge pull request #1988 from nextcloud/npeOnGetActivity
use provide activity instead of calling getActivity, which might be null
2018-01-18 21:26:49 +01:00
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
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
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
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
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
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
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
tobiasKaminsky
c1fe52bbf8
Detect top of encryption folders
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 10:45:43 +01:00
tobiaskaminsky
2e4fcd3f39
add support for slightly modified nc13 background (bigger dots)
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-15 09:56:00 +01:00
tobiasKaminsky
fab57d271e
search only folders when copy/move
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 09:06:19 +01:00
tobiaskaminsky
157afd9d61
fix #1800
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-15 09:06:19 +01:00
tobiaskaminsky
614d78ba58
refined annotations
added one more annotation

Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-15 08:40:54 +01:00
tobiasKaminsky
08c33b83c4
annotate via custom annotation 2018-01-15 08:40:54 +01:00
tobiasKaminsky
d16ebf6e9d
fix missing conversion 2018-01-15 08:40:54 +01:00
tobiasKaminsky
c4cee26b1f
trying to first show old one, but asyncDrawable is not working 2018-01-15 08:40:53 +01:00
tobiasKaminsky
3a1c1c904b
Use ETag for avatars 2018-01-15 08:40:53 +01:00
tobiasKaminsky
eef69ea4ce
change crc32 to v28
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:12:01 +01:00
tobiasKaminsky
f8ed3750a5
remove unused ressources
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:12:00 +01:00
tobiasKaminsky
756eddb3a7
fix due to rebase
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:12:00 +01:00
tobiasKaminsky
1167b82adb
moved methods
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:12:00 +01:00
tobiasKaminsky
fc7b4f789c
enable subfolder
check if in subfolder of encrypted folder

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:12:00 +01:00
tobiasKaminsky
a9e558160f
remove obsolete string
fix showing wrong string

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:12:00 +01:00
tobiasKaminsky
48f991663d
fix #1938
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:59 +01:00
tobiasKaminsky
cfd24f306d
remove duplicated upgrade
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:59 +01:00
tobiasKaminsky
8038791820
changes due to to rebase
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:59 +01:00
tobiasKaminsky
b52197d8ce
extract RSA/AES to static string
make final

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:59 +01:00
tobiasKaminsky
d5c5fb5933
new line
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:59 +01:00
tobiasKaminsky
6043767343
replace printStacktrace() with Log_OC
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:59 +01:00
tobiasKaminsky
3307d52dfb
remove printStacktrace()
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:59 +01:00
tobiasKaminsky
3a8b59a0c1
return RemoteOperationResult on error
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:58 +01:00
tobiasKaminsky
a6eae2396e
move public method up, add doc
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:58 +01:00
tobiasKaminsky
b82cf3e167
new line
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:58 +01:00
tobiasKaminsky
311656b0a1
delete stale file
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:58 +01:00
tobiasKaminsky
385306e45e
make FolderMetadata access private and use getter/setter
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:58 +01:00
tobiasKaminsky
29bcd8cd51
re-enable tests
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:58 +01:00
tobiasKaminsky
dba3a33a49
new line
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:58 +01:00
tobiasKaminsky
16080f8d05
re-add: always use new key / iv on upload
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:58 +01:00
tobiasKaminsky
3c2a01f7bc
disable logger
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:57 +01:00
tobiasKaminsky
c5883f8305
make text selectable
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:57 +01:00
tobiaskaminsky
b8d7922e0a
also lower case 2018-01-15 08:11:57 +01:00
tobiaskaminsky
373b999806
fix potential NPE 2018-01-15 08:11:57 +01:00
tobiaskaminsky
21a04b1bfe
delete local keys on account removal 2018-01-15 08:11:57 +01:00
tobiaskaminsky
128f3c97c8
ignore whitespaces in password 2018-01-15 08:11:57 +01:00
tobiaskaminsky
64221ece39
use new user agent 2018-01-15 08:11:57 +01:00
tobiaskaminsky
bba88d48de
enable logger, disable prior merge 2018-01-15 08:11:56 +01:00
tobiaskaminsky
1fe5c99d87
add cancel button 2018-01-15 08:11:56 +01:00
tobiaskaminsky
54ea7d9bcf
use nextcloud user agent for E2e calls 2018-01-15 08:11:56 +01:00
tobiaskaminsky
f3c3e1ca80
extract string and reword 2018-01-15 08:11:56 +01:00
tobiaskaminsky
debd89ed93
show info that mnemonic needs to be written down 2018-01-15 08:11:56 +01:00
tobiasKaminsky
d52baebb94
merge 2018-01-15 08:11:56 +01:00
tobiasKaminsky
21fd05af8c
codacy 2018-01-15 08:11:55 +01:00
tobiasKaminsky
9a7d59a1af
merge 2018-01-15 08:11:55 +01:00
tobiasKaminsky
17b1088ced
description, remove todo, suppress lint warning 2018-01-15 08:11:55 +01:00
tobiasKaminsky
917189f3ca
append salt to private key 2018-01-15 08:11:55 +01:00
tobiasKaminsky
d6b9f7e54b
immediately store folder token 2018-01-15 08:11:55 +01:00
tobiasKaminsky
9996753032
rebase 2018-01-15 08:11:55 +01:00
tobiasKaminsky
d06ef53659
change iv/key handling 2018-01-15 08:11:54 +01:00
tobiasKaminsky
41c602193a
remove EncryptionTest as it is now part of EncryptionIT 2018-01-15 08:11:54 +01:00
tobiasKaminsky
1293217da6
- rebased -> changed db numbers
- deleted old file
- add proper resume on folder lock
2018-01-15 08:11:54 +01:00
tobiasKaminsky
4e6c886cbb
store & re-use token for retry of failed encrypted upload 2018-01-15 08:11:54 +01:00