Mercurial Repositories > eric / file comparison
comparison: Helpviewer/Sync/SyncHandler.py
Helpviewer/Sync/SyncHandler.py
- changeset 3022
- 57179e4cdadd
- parent 3002
- 6ffc581f00f1
- child 3034
- 7ce719013078
- child 3058
- 0a02c433f52d
equal
deleted
inserted
replaced
| 3021:801289962f4e | 3022:57179e4cdadd |
|---|---|
| 105 "Local user agent settings file is NEWER. Exporting" | 105 "Local user agent settings file is NEWER. Exporting" |
| 106 " local copy..."), | 106 " local copy..."), |
| 107 "LocalMissing": self.trUtf8( | 107 "LocalMissing": self.trUtf8( |
| 108 "Local user agent settings file does NOT exist." | 108 "Local user agent settings file does NOT exist." |
| 109 " Skipping synchronization!"), | 109 " Skipping synchronization!"), |
| 110 "Uploading": self.trUtf8("Uploading local user agent" | 110 "Uploading": self.trUtf8( |
| 111 " settings file..."), | 111 "Uploading local user agent settings file..."), |
| 112 }, | 112 }, |
| 113 "speeddial": { | 113 "speeddial": { |
| 114 "RemoteExists": self.trUtf8( | 114 "RemoteExists": self.trUtf8( |
| 115 "Remote speed dial settings file exists! Syncing local" | 115 "Remote speed dial settings file exists! Syncing local" |
| 116 " copy..."), | 116 " copy..."), |
| 121 "Local speed dial settings file is NEWER. Exporting" | 121 "Local speed dial settings file is NEWER. Exporting" |
| 122 " local copy..."), | 122 " local copy..."), |
| 123 "LocalMissing": self.trUtf8( | 123 "LocalMissing": self.trUtf8( |
| 124 "Local speed dial settings file does NOT exist." | 124 "Local speed dial settings file does NOT exist." |
| 125 " Skipping synchronization!"), | 125 " Skipping synchronization!"), |
| 126 "Uploading": self.trUtf8("Uploading local speed dial" | 126 "Uploading": self.trUtf8( |
| 127 " settings file..."), | 127 "Uploading local speed dial settings file..."), |
| 128 }, | 128 }, |
| 129 } | 129 } |
| 130 | 130 |
| 131 def syncBookmarks(self): | 131 def syncBookmarks(self): |
| 132 """ | 132 """ |
| 220 type_ == "passwords")): | 220 type_ == "passwords")): |
| 221 key = Preferences.getHelp("SyncEncryptionKey") | 221 key = Preferences.getHelp("SyncEncryptionKey") |
| 222 if not key: | 222 if not key: |
| 223 return QByteArray() | 223 return QByteArray() |
| 224 | 224 |
| 225 data, ok = dataEncrypt(data, key, | 225 data, ok = dataEncrypt( |
| 226 data, key, | |
| 226 keyLength=Preferences.getHelp("SyncEncryptionKeyLength"), | 227 keyLength=Preferences.getHelp("SyncEncryptionKeyLength"), |
| 227 hashIterations=100) | 228 hashIterations=100) |
| 228 if not ok: | 229 if not ok: |
| 229 return QByteArray() | 230 return QByteArray() |
| 230 | 231 |
| 256 type_ == "passwords")): | 257 type_ == "passwords")): |
| 257 key = Preferences.getHelp("SyncEncryptionKey") | 258 key = Preferences.getHelp("SyncEncryptionKey") |
| 258 if not key: | 259 if not key: |
| 259 return False, self.trUtf8("Invalid encryption key given.") | 260 return False, self.trUtf8("Invalid encryption key given.") |
| 260 | 261 |
| 261 data, ok = dataDecrypt(data, key, | 262 data, ok = dataDecrypt( |
| 263 data, key, | |
| 262 keyLength=Preferences.getHelp("SyncEncryptionKeyLength")) | 264 keyLength=Preferences.getHelp("SyncEncryptionKeyLength")) |
| 263 if not ok: | 265 if not ok: |
| 264 return False, self.trUtf8("Data cannot be decrypted.") | 266 return False, self.trUtf8("Data cannot be decrypted.") |
| 265 | 267 |
| 266 try: | 268 try: |
