| -rw-r--r-- | core/launcher/transferserver.cpp | 14 | ||||
| -rw-r--r-- | core/settings/security/security.cpp | 33 | ||||
| -rw-r--r-- | core/settings/security/security.h | 1 | ||||
| -rw-r--r-- | core/settings/security/securitybase.ui | 34 |
4 files changed, 77 insertions, 5 deletions
diff --git a/core/launcher/transferserver.cpp b/core/launcher/transferserver.cpp index 439e110..eea9f3a 100644 --- a/core/launcher/transferserver.cpp +++ b/core/launcher/transferserver.cpp @@ -194,14 +194,23 @@ bool SyncAuthentication::checkPassword( const QString& password ) static int denials=0; int now = time(0); + Config cfg("Security"); + cfg.setGroup("Sync"); + QString syncapp = cfg.readEntry("syncapp","Qtopia"); + + //No password needed if the user really wants it + if (syncapp == "IntelliSync") { + return TRUE; + } + // Detect old Qtopia Desktop (no password) if ( password.isEmpty() ) { - if ( denials < 1 || now > lastdenial+600 ) { + if ( denials < 3 || now > lastdenial+600 ) { QMessageBox unauth( tr("Sync Connection"), tr("<p>An unauthorized system is requesting access to this device." "<p>If you are using a version of Qtopia Desktop older than 1.5.1, " - "please upgrade."), + "please upgrade or change the security setting to use IntelliSync." ), QMessageBox::Warning, QMessageBox::Cancel, QMessageBox::NoButton, QMessageBox::NoButton, 0, QString::null, TRUE, WStyle_StaysOnTop); @@ -212,6 +221,7 @@ bool SyncAuthentication::checkPassword( const QString& password ) lastdenial=now; } return FALSE; + } // Second, check sync password... diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp index 81363d2..1b90121 100644 --- a/core/settings/security/security.cpp +++ b/core/settings/security/security.cpp @@ -48,6 +48,16 @@ connect(syncnet, SIGNAL(textChanged(const QString&)), this, SLOT(setSyncNet(const QString&))); + cfg.setGroup("Sync"); + QString sa = cfg.readEntry("syncapp","Qtopia"); + + //There must be a better way to do that... + for (int i=0; i<syncapp->count(); i++) { + if ( syncapp->text(i) == sa ) { + syncapp->setCurrentItem(i); + } + } + /* cfg.setGroup("Remote"); if ( telnetAvailable() ) @@ -81,6 +91,7 @@ connect(userlist, SIGNAL(activated(int)), this, SLOT(changeLoginName(int))); connect(changepasscode,SIGNAL(clicked()), this, SLOT(changePassCode())); connect(clearpasscode,SIGNAL(clicked()), this, SLOT(clearPassCode())); + connect(syncapp,SIGNAL(activated(int)), this, SLOT(changeSyncApp())); loadUsers(); updateGUI(); @@ -105,7 +116,6 @@ void Security::updateGUI() autologinToggle->setChecked(autoLogin); userlist->setEnabled(autoLogin); - } @@ -249,6 +259,8 @@ void Security::applySecurity() parseNet(sn,auth_peer,auth_peer_bits); cfg.writeEntry("auth_peer",auth_peer); cfg.writeEntry("auth_peer_bits",auth_peer_bits); + cfg.writeEntry("syncapp",syncapp->currentText()); + /* cfg.setGroup("Remote"); if ( telnetAvailable() ) @@ -270,6 +282,25 @@ void Security::applySecurity() } } +void Security::changeSyncApp() +{ + // Don't say i didn't tell ya + if (syncapp->currentText() == "IntelliSync") { + QMessageBox attn( + tr("WARNING"), + tr("<p>Selecting IntelliSync here will disable the FTP password." + "<p>Every machine in your netrange will be able to sync with " + "your Zaurus!"), + QMessageBox::Warning, + QMessageBox::Cancel, QMessageBox::NoButton, QMessageBox::NoButton, + 0, QString::null, TRUE, WStyle_StaysOnTop); + attn.setButtonText(QMessageBox::Cancel, tr("Ok")); + attn.exec(); + } + updateGUI(); +} + + void Security::changeLoginName( int idx ) { diff --git a/core/settings/security/security.h b/core/settings/security/security.h index 52d56de..b1a3eca 100644 --- a/core/settings/security/security.h +++ b/core/settings/security/security.h @@ -46,6 +46,7 @@ private slots: void setSyncNet(const QString&); void changeLoginName(int); void toggleAutoLogin(bool); + void changeSyncApp(); private: diff --git a/core/settings/security/securitybase.ui b/core/settings/security/securitybase.ui index 9fb63a8..934111e 100644 --- a/core/settings/security/securitybase.ui +++ b/core/settings/security/securitybase.ui @@ -11,7 +11,7 @@ <rect> <x>0</x> <y>0</y> - <width>329</width> + <width>321</width> <height>483</height> </rect> </property> @@ -282,7 +282,7 @@ <vbox> <property stdset="1"> <name>margin</name> - <number>6</number> + <number>11</number> </property> <property stdset="1"> <name>spacing</name> @@ -382,6 +382,36 @@ </property> </widget> <widget> + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>TextLabel2</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>Select your sync software</string> + </property> + </widget> + <widget> + <class>QComboBox</class> + <item> + <property> + <name>text</name> + <string>QTopia</string> + </property> + </item> + <item> + <property> + <name>text</name> + <string>IntelliSync</string> + </property> + </item> + <property stdset="1"> + <name>name</name> + <cstring>syncapp</cstring> + </property> + </widget> + <widget> <class>QComboBox</class> <item> <property> |