Mercurial Repositories > eric / file comparison
comparison: Helpviewer/Sync/SyncHandler.py
Helpviewer/Sync/SyncHandler.py
- changeset 1682
- 0eefcc28fa74
- parent 1680
- 28e57079dab5
- child 1695
- 7b115f986d48
equal
deleted
inserted
replaced
| 1681:34c774fb57b5 | 1682:0eefcc28fa74 |
|---|---|
| 103 if Preferences.getHelp("SyncEncryptData"): | 103 if Preferences.getHelp("SyncEncryptData"): |
| 104 key = Preferences.getHelp("SyncEncryptionKey") | 104 key = Preferences.getHelp("SyncEncryptionKey") |
| 105 if not key: | 105 if not key: |
| 106 return QByteArray() | 106 return QByteArray() |
| 107 | 107 |
| 108 data, ok = dataEncrypt(data, key) | 108 data, ok = dataEncrypt(data, key, |
| 109 keyLength=Preferences.getHelp("SyncEncryptionKeyLength"), | |
| 110 hashIterations=100) | |
| 109 if not ok: | 111 if not ok: |
| 110 return QByteArray() | 112 return QByteArray() |
| 111 | 113 |
| 112 return QByteArray(data) | 114 return QByteArray(data) |
| 113 | 115 |
| 129 if Preferences.getHelp("SyncEncryptData"): | 131 if Preferences.getHelp("SyncEncryptData"): |
| 130 key = Preferences.getHelp("SyncEncryptionKey") | 132 key = Preferences.getHelp("SyncEncryptionKey") |
| 131 if not key: | 133 if not key: |
| 132 return False, self.trUtf8("Invalid encryption key given.") | 134 return False, self.trUtf8("Invalid encryption key given.") |
| 133 | 135 |
| 134 data, ok = dataDecrypt(data, key) | 136 data, ok = dataDecrypt(data, key, |
| 137 keyLength=Preferences.getHelp("SyncEncryptionKeyLength")) | |
| 135 if not ok: | 138 if not ok: |
| 136 return False, self.trUtf8("Data cannot be decrypted.") | 139 return False, self.trUtf8("Data cannot be decrypted.") |
| 137 | 140 |
| 138 try: | 141 try: |
| 139 outputFile = open(fileName, "wb") | 142 outputFile = open(fileName, "wb") |
