mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-12-20 04:41:51 +03:00
Code Issues Projects Releases Packages Wiki Activity
12104 commits 488 branches 258 tags 463 MiB
Commit graph

1494 commits

Author SHA1 Message Date
Roeland Jago Douma
c763a6e7fb
Show webview with page 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-02 22:50:48 +02:00
Camila Ayres
64cbc88474
Merge pull request #251 from nextcloud/clientSideEncryptionV4 
Client side encryption v4.
 2018-04-26 19:56:55 +02:00
Adrien
8e52f1237b Fix Use of Deprecated trUtf8 2018-04-19 12:02:26 +02:00
Tomaz Canabrava
7432d6a814 Merge branch 'master' into clientSideEncryptionV4 2018-04-10 16:18:58 +02:00
Daniel Nicoletti
3e05bd1da0 Do not detach encrypted files vector 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
3eb3535d0f Fix downloading NEW encrypted files 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
defe2d7631 Fix matching encrypted data for downloading 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
b12066f1aa Properly remove encryption data from JSON of deleted file 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
a9208f6581 Remove unused encrypted property 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
6e63a538b7 Make sure bool _currentLockingInProgress is first defined to false 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
a7a8de8787 Fix matching encrypted file for download 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
d3b6aacf3f Fix merging remote and local trees when e2e files are involved 
When populating the tree from the filesystem we need to fill
the e2eMangledName from DB and we when trying to find another
match on the oposite tree we need to take in account that names
don't match and search with the mangled name information
 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
c0ef36b8fa Use QUuid to generate random names 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
60fc5d6dd4 Fix upload of existing encrypted files by matching only filename 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
d5ab642e46 Fix sync status running when encryption data is missing 
When a file on the server of an encrypted folder do
not have a matching entry on the JSON metadata, we
need to report an error and be done with the job
so that Sync status is not "running".

This eventually should cause the file to be removed
from the server as it can not be recovered anymore.
 2018-04-09 13:23:52 +02:00
Tomaz Canabrava
b4b3e422de Handle gracefully failures in file decryption 2018-03-27 09:18:54 +02:00
Tomaz Canabrava
ed6f56257e Dont use new with QFiles. 2018-03-26 22:18:07 +02:00
Tomaz Canabrava
461aeca200 Do not crash when failing to decrypt the metadata 2018-03-26 22:02:46 +02:00
Tomaz Canabrava
6c88367ac6 Do not crash if there was an error encrypting the file. 2018-03-26 21:44:46 +02:00
Tomaz Canabrava
5fe9717598 Potentially fix crash acessing a deleted pointer. 2018-03-26 21:37:13 +02:00
Tomaz Canabrava
ec28465e01 Correctly handle systems without client side encryption 2018-03-26 20:51:14 +02:00
Tomaz Canabrava
11684682e6 Return empty metadata in case of error, Display error to the user. 2018-03-25 22:31:49 +02:00
Tomaz Canabrava
96115be0c6 Unlock folder in case of error 2018-03-25 21:54:08 +02:00
Camila San
2e4472a4db
Enables server notifications by default. 
Signed-off-by: Camila San <hello@camila.codes>
 2018-03-03 22:44:24 +01:00
Camila San
3c778980df
Makes sure JsonApiJob::finished won't throw a JSON error when status code is 304. 
Signed-off-by: Camila San <hello@camila.codes>
 2018-03-03 22:24:16 +01:00
Camila San
621596f45a
Saves notifications ETag response header to use to request only new notifications. 
Signed-off-by: Camila San <hello@camila.codes>
 2018-03-01 22:19:04 +01:00
Camila San
112c5e10b6
Removes Server Activities option from General settings. 
Signed-off-by: Camila San <hello@camila.codes>
 2018-02-26 12:02:34 +01:00
Camila San
1a0edc1cd0
Sync activities notifications are never shown unless there is an error. Server activities and notifications are off by default. 
Signed-off-by: Camila San <hello@camila.codes>
 2018-02-23 12:08:37 +01:00
Tomaz Canabrava
7da0764b8d Don't class what's not a class 2018-02-18 01:23:59 +01:00
Tomaz Canabrava
176a42a062 Return the error reported by openssl 2018-02-18 01:13:23 +01:00
Tomaz Canabrava
5faeca1b82 Move BIO2ByteArray to annonymous namespace 
This has no use outside of the clientsidenecryption.cpp
 2018-02-18 01:04:44 +01:00
Camila San
ab7185a6c7
Changes notification text in the checkboxes and adds tooltips with explanation about it. 
- Changes the configuration name in ConfigFile and GeneralSettings
accordingly with the new text.
- Makes sure the user sees error and conflict messages even if the
setting is disabled.

Signed-off-by: Camila San <hello@camila.codes>
 2018-02-15 20:21:35 +01:00
Camila San
bfc7aa16c6
Adds option to toggle display of Sync and Activity notifications. 
Signed-off-by: Camila San <hello@camila.codes>
 2018-02-14 20:38:15 +01:00
Daniel Nicoletti
99117078f3 Remove table for e2e and add an e2eMangledName column (#169) 
If the code was not complex enough syncing two tables
already started to give UNIQUE constrains errors on
simple sync operations, this also adds initial support
remote delete of an encrypted file
 2018-02-12 12:50:51 +01:00
Roeland Jago Douma
1eb7ba72f0
Use standardized filename 
See https://github.com/nextcloud/end_to_end_encryption_rfc/issues/13

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-09 11:40:06 +01:00
Roeland Jago Douma
d85c2bf025
Fix building on windows 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-30 11:10:03 +01:00
Roeland Jago Douma
296f46356e
If the metadata is empty we should store (and not update). 
Android only creates the metadata file when the first encrypted file is
added. We assumed it would be there.

This hacky code makes us store the metadata if there wasn't any yet.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-29 22:04:50 +01:00
Tomaz Canabrava
dcc9ac7d2e [Buildfix] Fix build from last merge 2018-01-29 14:17:52 +01:00
Tomaz Canabrava
d24a1e542e Merge branch 'master' into clientSideEncryptionV3 2018-01-29 14:06:12 +01:00
Tomaz Canabrava
682bb2ad43 [CSE] Save the encrypted name relation on downloads 2018-01-28 23:50:12 +01:00
Tomaz Canabrava
e8849a2cf9 [CSE] Save the relation of the file / encrypted file names on the db 2018-01-28 22:26:07 +01:00
Tomaz Canabrava
e9a7a56359 [CSE] Store the encrypted file name on the SyncFilePtr 2018-01-28 18:37:01 +01:00
Roeland Jago Douma
48bce4c6b0
Merge remote-tracking branch 'oc/master' into oc_up 2018-01-25 11:17:04 +01:00
Roeland Jago Douma
4892b0ec43
Properly fill EncryptedFile 
* Add a mimetype (mobile clients need this)
* Add the tag unencoded as we encode it when we send the metadata
already

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-23 21:31:00 +01:00
Roeland Jago Douma
21d55c3321
No sharing in metadata yet and PEM as PKCS#8 
* Don't store the metadata yet this crashes android
  - Yes android should be fixed but for now this is quicker ;)
* QSslKey exports PEM as PKCS#1
  - This is not handled properly on android so use PKCS#8 helper

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-23 21:02:52 +01:00
Olivier Goffart
72b9beb79c Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	shell_integration/nautilus/syncstate.py
 2018-01-23 14:08:15 +01:00
Roeland Jago Douma
7ce009ef49
If status.php fails check <server>/nextcloud/status.php 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-23 13:43:44 +01:00
Christian Kamm
d831369f86 Protocol: Remove entries for auto resolved conflicts #6316 2018-01-23 12:01:22 +01:00
Roeland Jago Douma
a2b8724adf
Hacky way to drop duplicates (we should really use the fileid!) 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-23 11:58:05 +01:00
Roeland Jago Douma
bb85e2ab2c
Reuse existing EncryptedFile 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-23 11:36:15 +01:00