Mercurial Repositories > eric / file comparison
comparison: eric6/WebBrowser/Sync/SyncHandler.py
eric6/WebBrowser/Sync/SyncHandler.py
- changeset 7269
- 0c63ea7f94bd
- parent 7229
- 53054eb5b15a
- child 7360
- 9190402e4505
equal
deleted
inserted
replaced
| 7268:a28338eaf694 | 7269:0c63ea7f94bd |
|---|---|
| 213 data = inputFile.read() | 213 data = inputFile.read() |
| 214 inputFile.close() | 214 inputFile.close() |
| 215 except IOError: | 215 except IOError: |
| 216 return QByteArray() | 216 return QByteArray() |
| 217 | 217 |
| 218 if Preferences.getWebBrowser("SyncEncryptData") and \ | 218 if ( |
| 219 (not Preferences.getWebBrowser("SyncEncryptPasswordsOnly") or | 219 Preferences.getWebBrowser("SyncEncryptData") and |
| 220 (Preferences.getWebBrowser("SyncEncryptPasswordsOnly") and | 220 (not Preferences.getWebBrowser("SyncEncryptPasswordsOnly") or |
| 221 type_ == "passwords")): | 221 (Preferences.getWebBrowser("SyncEncryptPasswordsOnly") and |
| 222 type_ == "passwords")) | |
| 223 ): | |
| 222 key = Preferences.getWebBrowser("SyncEncryptionKey") | 224 key = Preferences.getWebBrowser("SyncEncryptionKey") |
| 223 if not key: | 225 if not key: |
| 224 return QByteArray() | 226 return QByteArray() |
| 225 | 227 |
| 226 data, ok = dataEncrypt( | 228 data, ok = dataEncrypt( |
| 251 @return tuple giving a success flag and an error string (boolean, | 253 @return tuple giving a success flag and an error string (boolean, |
| 252 string) | 254 string) |
| 253 """ | 255 """ |
| 254 data = bytes(data) | 256 data = bytes(data) |
| 255 | 257 |
| 256 if Preferences.getWebBrowser("SyncEncryptData") and \ | 258 if ( |
| 257 (not Preferences.getWebBrowser("SyncEncryptPasswordsOnly") or | 259 Preferences.getWebBrowser("SyncEncryptData") and |
| 258 (Preferences.getWebBrowser("SyncEncryptPasswordsOnly") and | 260 (not Preferences.getWebBrowser("SyncEncryptPasswordsOnly") or |
| 259 type_ == "passwords")): | 261 (Preferences.getWebBrowser("SyncEncryptPasswordsOnly") and |
| 262 type_ == "passwords")) | |
| 263 ): | |
| 260 key = Preferences.getWebBrowser("SyncEncryptionKey") | 264 key = Preferences.getWebBrowser("SyncEncryptionKey") |
| 261 if not key: | 265 if not key: |
| 262 return False, self.tr("Invalid encryption key given.") | 266 return False, self.tr("Invalid encryption key given.") |
| 263 | 267 |
| 264 data, ok = dataDecrypt( | 268 data, ok = dataDecrypt( |
