mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-19 15:33:00 +03:00
Code Issues Projects Releases Packages Wiki Activity
9932 commits 223 branches 1586 tags 638 MiB
Commit graph

5932 commits

Author SHA1 Message Date
tobiasKaminsky
b0a1152a75
store info that file is encrypted 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-01-31 08:47:50 +01:00
Tobias Kaminsky
d1c53093cc
Merge pull request #2068 from nextcloud/snackbarOnlyIfActivityExists 
show download snackbar only if activity exists
 2018-01-31 08:10:32 +01:00
Tobias Kaminsky
44bef145a2
Merge pull request #2066 from nextcloud/fix-autoupload-2 
Fix auto restart of pending Auto Upload entries
 2018-01-31 07:37:17 +01:00
tobiaskaminsky
d9435fcf1d
show download snackbar only if activity exists 
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
 2018-01-31 07:35:41 +01:00
Nextcloud bot
09337e9cea
[tx-robot] updated from transifex 2018-01-31 01:39:53 +00:00
Mario Đanić
737ce03e51
Merge pull request #2067 from nextcloud/hardenExternalStorage 
getExternalFilesDir(null) can be null --> preventing NPE
 2018-01-30 19:26:05 +01:00
Mario Đanić
f4670cf602
Merge pull request #2071 from nextcloud/e2eFlagOnlyOnFolders 
E2e flag only on folders
 2018-01-30 19:24:22 +01:00
Bartosz Przybylski
2e8c417ed7 Fixes #2070: Move the responsibility of FAB's theming to theris owner 
Since ExtendedListFragment is owning all FAB's where is no need for any other activity to alter the theming of those buttons. ThemeUtils are wide accessible, and at the time of construction, so apply the theming there.
 2018-01-30 17:12:02 +01:00
tobiaskaminsky
3ae0610b7a
add default values 
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
 2018-01-30 13:20:13 +01:00
tobiaskaminsky
c1a2221b88
e2e flag only on folder 
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
 2018-01-30 13:14:34 +01:00
tobiaskaminsky
f080bdb70e
getExternalFilesDir(null) an be null --> preventing NPE 
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
 2018-01-30 08:37:15 +01:00
Nextcloud bot
dcb82998f8
[tx-robot] updated from transifex 2018-01-30 01:41:11 +00:00
Mario Danic
6bb9636dcb Just a test 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2018-01-29 20:55:33 +01:00
tobiasKaminsky
601138099a
bump version 
fix webpage -> website

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-01-29 16:50:02 +01:00
tobiaskaminsky
91f624524d
use fetched userID 
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
 2018-01-29 16:50:02 +01:00
Mario Đanić
8bf7aa24bf
Merge pull request #2062 from nextcloud/fix-for-autoupload 
Fix for autoupload
 2018-01-29 16:48:53 +01:00
Mario Danic
30dd629364 Check internetSet all arguments as nullable 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2018-01-29 10:29:31 +01:00
Tobias Kaminsky
9d89d0554e
Update UploadsStorageManager.java 
line wrap
 2018-01-29 10:28:04 +01:00
Mario Danic
18ad2d858b Fix up request 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2018-01-29 10:18:10 +01:00
Mario Đanić
1028bb351d
Merge pull request #2052 from nextcloud/tintDeleteDialog 
Tint delete account dialog buttons
 2018-01-29 09:15:51 +01:00
Mario Danic
4880e783bf Fix 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2018-01-29 09:12:56 +01:00
Mario Danic
0feaa84149 Fix auto uploads 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2018-01-29 09:11:41 +01:00
Tobias Kaminsky
19ca990db8
Merge pull request #2058 from nextcloud/fix-issues-with-services 
Fix crashing issue on bootup
 2018-01-29 08:54:51 +01:00
Tobias Kaminsky
74b9872ffd
Merge pull request #2060 from nextcloud/fix-2041 
Fix 2041
 2018-01-29 08:54:01 +01:00
Nextcloud bot
13e36cc59a
[tx-robot] updated from transifex 2018-01-29 01:42:10 +00:00
Mario Danic
098c4aacbf Fix 2041 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2018-01-28 21:46:34 +01:00
Mario Danic
bedf9f1ae8 Fix crashing issue on bootup 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2018-01-28 21:28:13 +01:00
Mario Đanić
af0a31d957
Merge pull request #2054 from nextcloud/handlePNG 
handlePNG generates not noly square images
 2018-01-28 20:47:35 +01:00
Mario Đanić
a1813fa11e
Merge pull request #2053 from nextcloud/welcomeScreen 
Initial welcome screen: centered and no bullet points
 2018-01-28 20:47:08 +01:00
Nextcloud bot
dd2c02e46a
[tx-robot] updated from transifex 2018-01-28 01:39:29 +00:00
tobiasKaminsky
9d30e6cae1
handlePNG generates not noly square images 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-01-27 09:16:21 +01:00
tobiasKaminsky
6ce793ed16
Initial welcome screen: centered and no bullet points 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-01-27 08:55:59 +01:00
tobiasKaminsky
6f6423d276
Tint delete account dialog buttons 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-01-27 08:42:40 +01:00
Nextcloud bot
e4cf4455f6
[tx-robot] updated from transifex 2018-01-27 01:39:40 +00:00
tobiaskaminsky
9ab98e95a2
fix renaming folder 
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
 2018-01-26 13:36:14 +01:00
Nextcloud bot
1fd1f38faf
[tx-robot] updated from transifex 2018-01-26 06:39:46 +00:00
Nextcloud bot
5f64b6bc1b
[tx-robot] updated from transifex 2018-01-26 01:39:46 +00:00
tobiasKaminsky
f10b5a5aaf
change images 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-01-25 12:41:37 +01:00
tobiaskaminsky
79d1349942
make bullet list toggable, 
update e2e & text

Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
 2018-01-25 12:41:13 +01:00
tobiasKaminsky
ae7b51e66d
- add 300 feature 
- bullet point list for feature text
- improved lint: do not warn/error on unused translated ressources

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-01-25 12:41:13 +01:00
tobiasKaminsky
7840fb4db0
do not ignore ignoreEtags 2018-01-25 08:47:05 +01:00
Nextcloud bot
8eda104078
[tx-robot] updated from transifex 2018-01-25 01:41:03 +00:00
Tobias Kaminsky
3f1fb1bbbb
Merge pull request #1998 from nextcloud/fix-storage-stuff 
Fix storage stuff
 2018-01-24 07:22:25 +01:00
Nextcloud bot
ddfa4b6bc6
[tx-robot] updated from transifex 2018-01-24 01:40:01 +00:00
Andy Scherzinger
6c8d6b5a75
Merge pull request #2031 from nextcloud/removeSleep 
Remove unwanted sleep
 2018-01-23 22:47:04 +01:00
tobiasKaminsky
9dbb302042
remove unwanted sleep 2018-01-23 16:14:25 +01:00
Tobias Kaminsky
2c62688440
Merge pull request #2030 from nextcloud/untrustedDomain 
Show infos on untrusted domain if available
 2018-01-23 15:54:10 +01:00
Mario Đanić
d7e2217fbf
Merge pull request #2022 from nextcloud/replaceTextField 
Replace text field
 2018-01-23 15:19:23 +01:00
tobiasKaminsky
f04f500669
suppress lint with explanation 2018-01-23 14:47:52 +01:00
tobiaskaminsky
633faf2169
show infos on untrusted domain if available 
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
 2018-01-23 13:16:29 +01:00
tobiaskaminsky
873f7333cd
fix crash on <4.4 when opening drawer 
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
 2018-01-23 12:46:28 +01:00
Mario Danic
0737092d5a Try to fix 4 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2018-01-23 11:28:30 +01:00
tobiaskaminsky
544c4723b9 rebased 
create parent folder if needed
fix line breaks

Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
 2018-01-23 08:10:45 +01:00
Mario Danic
c1a72a4b4b Lots of storage changes 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2018-01-23 08:10:45 +01:00
Mario Danic
ec13dc8234 More tries 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2018-01-23 08:10:45 +01:00
Mario Danic
833c7f5773 Fix a bug with storage settings 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2018-01-23 08:10:45 +01:00
Mario Danic
63a6fd650c Try to fix 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2018-01-23 08:10:45 +01:00
Mario Danic
91c429bf20 Try to fix it 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2018-01-23 08:10:45 +01:00
Mario Danic
f675c1c972
Missing stuff all around 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2018-01-23 07:42:13 +01:00
Mario Danic
cadde9dc9a
Fix 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2018-01-23 07:42:13 +01:00
Mario Danic
b4e8b85910
Remove useless assignment 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2018-01-23 07:42:13 +01:00
Mario Danic
38dc41ad3b
Remove commented out stuff 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2018-01-23 07:42:12 +01:00
Mario Danic
9b2b72c713
Fix upload checks 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2018-01-23 07:42:12 +01:00
Mario Danic
39b477f513
Fix conditions check 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2018-01-23 07:42:12 +01:00
Nextcloud bot
2111bd66c0
[tx-robot] updated from transifex 2018-01-23 01:40:20 +00:00
tobiaskaminsky
d7cfbffe34
replace text filed 
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
 2018-01-22 22:52:38 +01:00
tobiaskaminsky
beb312b8af
prevent index out of bounds exception 
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
 2018-01-22 21:58:30 +01:00
tobiasKaminsky
fdc9abcd34
remove modified flavor 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-01-22 17:33:28 +01:00
Allan Nordhøy
2c07590717
Contactlist user icon → User icon for contact list 2018-01-22 17:01:20 +01:00
Allan Nordhøy
8b861f5efd
sync, folder, mobile freedom, A - Z 2018-01-22 17:01:20 +01:00
Allan Nordhøy
7dd747f1c1
Spelling: Admin, sync, filename, make note 2018-01-22 17:01:20 +01:00
Allan Nordhøy
e4bc267209
Spelling: Synced, config, copylefted, (4.4) 2018-01-22 17:01:17 +01:00
tobiaskaminsky
e3efbb1770
prevent copy/move into encrypted folder --> M2 
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
 2018-01-22 12:39:31 +01:00
Nextcloud bot
0e2b4109cc
[tx-robot] updated from transifex 2018-01-22 01:39:28 +00:00
Nextcloud bot
110086217b
[tx-robot] updated from transifex 2018-01-21 01:39:58 +00:00
Andy Scherzinger
f4350da349
Merge pull request #2009 from nextcloud/getIdForE2E 
Use id instead of account name
 2018-01-20 14:31:30 +01:00
Nextcloud bot
565b8af563
[tx-robot] updated from transifex 2018-01-20 01:40:02 +00:00
Andy Scherzinger
faeafb69fa
Merge pull request #2008 from nextcloud/sortingPreviewOrder 
Obey sort order also on preview image slide
 2018-01-19 14:46:54 +01:00
Andy Scherzinger
c9927cd7f2
Merge pull request #2004 from nextcloud/fixDuplicateColumn 
Catch error on duplicate column
 2018-01-19 14:46:37 +01:00
Andy Scherzinger
741503de06
Merge pull request #2001 from nextcloud/authOnOldNC 
Auth: NPE
 2018-01-19 14:46:22 +01:00
Andy Scherzinger
847fb45ea5
Merge pull request #2002 from nextcloud/NPEonActivityResult 
NPE if activity is already closed
 2018-01-19 14:46:04 +01:00
tobiaskaminsky
a259a3f84b
use id instead of account name 
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
 2018-01-19 14:17:41 +01:00
tobiaskaminsky
2ff542520a
obey sort order also on preview image slide 
remove obsolete code

Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
 2018-01-19 12:04:11 +01:00
tobiaskaminsky
f79f3f65e4
catch error on duplicate column 
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
 2018-01-19 10:43:23 +01:00
Nextcloud bot
9bf81a02de
[tx-robot] updated from transifex 2018-01-19 08:46:06 +00:00
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