chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2025-09-09 05:53:09 +02:00
Code Activity
13,590 Commits 4 Branches 173 Tags
2.6.2-buildtest1
Commit Graph

6388 Commits

Author SHA1 Message Date
Camila San
20cf4ed642 Improves Notification Widget UI. 
- Changes spacing.
- Removes QFrame.
- Changes icon size.

Signed-off-by: Camila San <hello@camila.codes>
 2018-02-16 18: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
Camila San
b24751b099 Adds button to open notification in the browser - to update something, join a call, etc. 
Signed-off-by: Camila San <hello@camila.codes>
 2018-02-14 19:22:08 +01:00
Camila San
a7dd3a7da1 Displays the actual notification subject in the system tray messages. 
Signed-off-by: Camila San <hello@camila.codes>
 2018-02-12 22:16:46 +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
Daniel Nicoletti
080c5ea678 Better explanation for encryption passphrase 
FIXES: #149
 2018-02-02 17:27:58 +01:00
Camila San
2545017819 Refactores code. 
- Renames function from populateTableReadOnlyValues to setupTableReadOnlyItems.
- Use a const to define the number of read only rows.
- Removes enable/disable remove all button checks from where it was not
needed.

Signed-off-by: Camila San <hello@camila.codes>
 2018-02-02 16:01:53 +01:00
Camila San
73b7540468 Enable/disable remove all button depending on the number of rows. 
Signed-off-by: Camila San <hello@camila.codes>
 2018-02-02 15:50:17 +01:00
Camila San
c29d3b7e0b Adds button to remove all items from ignore list table. 
Signed-off-by: Camila San <hello@camila.codes>
 2018-02-02 14:40:30 +01:00
Camila San
4855e3242c Restores correctly default system values for ignore files list. 
Signed-off-by: Camila San <hello@camila.codes>
 2018-02-02 14:15:45 +01:00
Camila San
bf76b596af Allows deletion of pre configured patterns in the ignore list. 
Signed-off-by: Camila San <hello@camila.codes>
 2018-02-01 22:36:40 +01:00
Camila San
6dd349a8a6 Adds button to restore default patterns in the ignore list. 
Signed-off-by: Camila San <hello@camila.codes>
 2018-02-01 22:35:38 +01:00
Camila San
f7697b0584 Enables removing patterns from ignored files list. 
Signed-off-by: Camila San <hello@camila.codes>
 2018-01-31 22:59:51 +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
f4a50e88f5 [CSE] Ignore renames for downloaded files. 
- TODO: Fix the incorrect "filename has been removed" popup.
The file is not removed, just the popup shows.
 2018-01-28 23:59:53 +01:00
Tomaz Canabrava
682bb2ad43 [CSE] Save the encrypted name relation on downloads 2018-01-28 23:50:12 +01:00
Tomaz Canabrava
d38e5e1529 [CSE] Bypass rename if it's e2e 
The client tracks the files in server and locally, but the
names of the files differ in the server, but we do *not*
wanna rename the files to the server one, we wanna
keep it as is if it's an encrypted file.
 2018-01-28 23:48:51 +01:00
Tomaz Canabrava
7b123650da [CSE] Search for name, not mangled name. 2018-01-28 23:48:25 +01:00
Tomaz Canabrava
0c94142c97 [CSE] More debug output 2018-01-28 23:47:58 +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
Tomaz Canabrava
a003d216a5 [CSE] Implementation of the setE2eRelation 
This call creates a new entry on the database for e2e.
 2018-01-28 18:05:28 +01:00
Tomaz Canabrava
32eaaa0601 [CSE] GetMangledName implementation 2018-01-28 17:50:10 +01:00
Tomaz Canabrava
be817748f8 [CSE] Reset the new Queries on close 2018-01-28 17:46:20 +01:00
Tomaz Canabrava
b909bb6977 [CSE] Change the Database to handle Encrypted Files 
Create a table to hold the information between the
real file name and the fake file name
 2018-01-28 16:41:07 +01:00
Julius Härtl
bcb9553925 Use Qt5DBus_FOUND instead of the old WITH_DBUS 
WITH_DBUS was removed in 257d8142b1

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-25 14:18:03 +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
84b26e0d4d Merge pull request #133 from nextcloud/fix-notification-dismiss-button 
Uses QString::number to get a string equivalent of the notification_id number
 2018-01-24 19:29:21 +01:00
Camila San
7a69e19e4d Uses QString::number to get a string equivalent of the notification_id number. 
This fixes the bug reported #117.

Signed-off-by: Camila San <hello@camila.codes>
 2018-01-24 17:29:45 +01:00
Olivier Goffart
02988229b1 FolderStatusModel: don't use deprecated QModelIndex::child 
Was deprecated in Qt 5.8.
(IMHO this show that child can be usefull and I am not sure the
deprecation was justified)
 2018-01-24 10:23:03 +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
Olivier Goffart
982c591ec9 SocketApi: add a way to disable menu entries 2018-01-23 14:02:56 +01:00
Olivier Goffart
1782ae3c08 SocketAPI: Make it easier to add or remove item in the action menu 
By making it dynamic.
So far only the dolphin shell extension have been ported
 2018-01-23 14:02:56 +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
59f2e0634e Protocol: Correct sorting by size #6326 
Previously we were sorting by size string, where
"6 MB" < "3 KB".
 2018-01-23 12:02:16 +01:00
Christian Kamm
32bb1e6763 ProtocolItem: Use accessors over magic numbers 2018-01-23 12:02:16 +01:00
Christian Kamm
497b327d43 ShareLinkWidget: Remove outdated signal connection 
Also convert the others to the new syntax to avoid similar errors in the
future.
 2018-01-23 12:01:22 +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
Olivier Goffart
c3dbb20ce3 Logger: --logdebug only show owncloud's debug message 
Recent Qt version show way too many debug messages, spamming the console.
So filter only messages that comes from the client.
 2018-01-22 21:13:15 +01:00
Roeland Jago Douma
33beb7aade Don't generate values after we use them 
* Pregerenate IV
* Pregenerate key
* Pregenerate filename

TODO:
  - Reuse existing file entries and update (we might need logic in the
  metadatahandling to do this properly).
 2018-01-22 15:24:54 +01:00
Tomaz Canabrava
cae6bbc853 [CSE] Start the download process 2018-01-22 14:08:32 +01:00