Diffstat (limited to 'core/launcher/transferserver.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/launcher/transferserver.cpp | 36 |
1 files changed, 27 insertions, 9 deletions
diff --git a/core/launcher/transferserver.cpp b/core/launcher/transferserver.cpp index 9cb9d7a..8367a62 100644 --- a/core/launcher/transferserver.cpp +++ b/core/launcher/transferserver.cpp | |||
@@ -191,21 +191,39 @@ bool SyncAuthentication::checkPassword( const QString& password ) | |||
191 | 191 | ||
192 | static int lastdenial=0; | 192 | static int lastdenial=0; |
193 | static int denials=0; | 193 | static int denials=0; |
194 | int now = time(0); | 194 | int now = time(0); |
195 | 195 | ||
196 | Config cfg("Security"); | 196 | Config cfg("Security"); |
197 | cfg.setGroup("Sync"); | 197 | cfg.setGroup("SyncMode"); |
198 | QString syncapp = cfg.readEntry("syncapp","Qtopia"); | 198 | int mode = cfg.readNumEntry("Mode", 0x02 ); |
199 | 199 | ||
200 | //No password needed if the user really wants it | 200 | //No pass word needed if the user really needs it |
201 | if (syncapp == "IntelliSync") { | 201 | if (mode & 0x04) { |
202 | return TRUE; | 202 | QMessageBox unauth( |
203 | } | 203 | tr("Sync Connection"), |
204 | 204 | tr("<qt><p>An unauthorized system is requesting access to this device." | |
205 | // Detect old Qtopia Desktop (no password) | 205 | "<p>You chose IntelliSync so you may I allow or deny this connection.</qt>" ), |
206 | QMessageBox::Warning, | ||
207 | QMessageBox::Ok, QMessageBox::Cancel|QMessageBox::Default, QMessageBox::NoButton, | ||
208 | 0, QString::null, TRUE, WStyle_StaysOnTop); | ||
209 | unauth.setButtonText(QMessageBox::Ok, tr("Allow" ) ); | ||
210 | unauth.setButtonText(QMessageBox::Cancel, tr("Deny")); | ||
211 | switch( unauth.exec() ) { | ||
212 | case QMessageBox::Ok: | ||
213 | return TRUE; | ||
214 | break; | ||
215 | case QMessageBox::Cancel: | ||
216 | default: | ||
217 | denials++; | ||
218 | lastdenial=now; | ||
219 | return FALSE; | ||
220 | } | ||
221 | } | ||
222 | |||
223 | // Detect old Qtopia Desktop (no password) and fail | ||
206 | if ( password.isEmpty() ) { | 224 | if ( password.isEmpty() ) { |
207 | if ( denials < 3 || now > lastdenial+600 ) { | 225 | if ( denials < 3 || now > lastdenial+600 ) { |
208 | QMessageBox unauth( | 226 | QMessageBox unauth( |
209 | tr("Sync Connection"), | 227 | tr("Sync Connection"), |
210 | tr("<p>An unauthorized system is requesting access to this device." | 228 | tr("<p>An unauthorized system is requesting access to this device." |
211 | "<p>If you are using a version of Qtopia Desktop older than 1.5.1, " | 229 | "<p>If you are using a version of Qtopia Desktop older than 1.5.1, " |