From aa11789fc4d735a04fac09063851753d8a57027b Mon Sep 17 00:00:00 2001 From: zecke Date: Sat, 21 Feb 2004 13:08:34 +0000 Subject: Yeah baby yeah remove IntelliSync support and add it to the SyncMode... as it should have been done Keep compatible with the old ored meaning... Now we can have IntelliSync plain text transfer, ask for pw less on connect Opie 1.0 plain text transfer, need pw and allow for syncing Qtopia 1.7 base64 transter , need pw and allow for syncing --- diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp index 34f7e50..4eddb55 100644 --- a/core/settings/security/security.cpp +++ b/core/settings/security/security.cpp @@ -44,19 +44,12 @@ int auth_peer = cfg.readNumEntry("auth_peer",0xc0a88100);//new default 192.168.129.0/24 int auth_peer_bits = cfg.readNumEntry("auth_peer_bits",24); selectNet(auth_peer,auth_peer_bits,TRUE); - + connect(syncnet, SIGNAL(textChanged(const QString&)), this, SLOT(setSyncNet(const QString&))); - cfg.setGroup("Sync"); - QString sa = cfg.readEntry("syncapp","Qtopia"); - for (int i=0; icount(); i++) { - if ( syncapp->text(i) == sa ) { - syncapp->setCurrentItem(i); - } - } - + /* cfg.setGroup("Remote"); if ( telnetAvailable() ) @@ -72,7 +65,7 @@ QString configFile = QPEApplication::qpeDir() + "/etc/opie-login.conf"; Config loginCfg(configFile,Config::File); - + loginCfg.setGroup("General"); autoLoginName=loginCfg.readEntry("AutoLogin",""); @@ -84,20 +77,27 @@ cfg.setGroup("SyncMode"); int mode = cfg.readNumEntry("Mode",2); // Default to Sharp - syncModeCombo->setCurrentItem( mode - 1 ); - - //since nobody knows what this is and it doesn't do anything, i'll hide it # CoreDump - // is this work-in-progress or can it be removed? - syncModeCombo->hide(); + switch( mode ) { + case 0x01: + syncModeCombo->setCurrentItem( 0 ); + break; + case 0x02: + default: + syncModeCombo->setCurrentItem( 1 ); + break; + case 0x04: + syncModeCombo->setCurrentItem( 2 ); + break; + } + connect(autologinToggle, SIGNAL(toggled(bool)), this, SLOT(toggleAutoLogin(bool))); 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())); - connect(restoredefaults,SIGNAL(clicked()), this, SLOT(restoreDefaults())); + connect(restoredefaults,SIGNAL(clicked()), this, SLOT(restoreDefaults())); connect(deleteentry,SIGNAL(clicked()), this, SLOT(deleteListEntry())); - + loadUsers(); updateGUI(); @@ -109,13 +109,13 @@ Security::~Security() { } -void Security::deleteListEntry() +void Security::deleteListEntry() { syncnet->removeItem(syncnet->currentItem()); } void Security::restoreDefaults() -{ +{ QMessageBox unrecbox( tr("Attention"), tr( "

All user-defined net ranges will be lost."), @@ -125,15 +125,16 @@ void Security::restoreDefaults() unrecbox.setButtonText(QMessageBox::Cancel, tr("Cancel")); unrecbox.setButtonText(QMessageBox::Yes, tr("Ok")); - if ( unrecbox.exec() == QMessageBox::Yes) + if ( unrecbox.exec() == QMessageBox::Yes) { syncnet->clear(); insertDefaultRanges(); - } + } + syncModeCombo->setCurrentItem( 2 ); } void Security::insertDefaultRanges() -{ +{ syncnet->insertItem( tr( "192.168.129.0/24" ) ); syncnet->insertItem( tr( "192.168.1.0/24" ) ); syncnet->insertItem( tr( "192.168.0.0/16" ) ); @@ -154,7 +155,7 @@ void Security::updateGUI() clearpasscode->setEnabled( !empty ); autologinToggle->setChecked(autoLogin); - userlist->setEnabled(autoLogin); + userlist->setEnabled(autoLogin); } @@ -237,19 +238,19 @@ void Security::selectNet(int auth_peer,int auth_peer_bits, bool update) //make sure we have no "twin" entries for (int i=0; icount(); i++) { if ( syncnet->text(i) == netrange ) { - already_there=TRUE; + already_there=TRUE; } } if (! already_there) { syncnet->insertItem( tr( netrange ) ); } else { already_there=FALSE; - } - } + } + } } - } - } - + } + } + for (int i=0; icount(); i++) { if ( syncnet->text(i).left(sn.length()) == sn ) { syncnet->setCurrentItem(i); @@ -334,20 +335,37 @@ void Security::applySecurity() int auth_peer_bits; QString sn = syncnet->currentText(); parseNet(sn,auth_peer,auth_peer_bits); - + //this is the *selected* (active) net range cfg.writeEntry("auth_peer",auth_peer); cfg.writeEntry("auth_peer_bits",auth_peer_bits); - + //write back all other net ranges in *cleartext* for (int i=0; i<10; i++) { QString target; target.sprintf("net%d", i); cfg.writeEntry(target,syncnet->text(i)); } - - cfg.writeEntry("syncapp",syncapp->currentText()); - + +#ifdef ODP + #error "Use 0,1,2 and use Launcher" +#endif + /* keep the old code so we don't use currentItem directly */ + int value = 0x02; + switch( syncModeCombo->currentItem() ) { + case 0: + value = 0x01; + break; + case 1: + value = 0x02; + break; + case 2: + value = 0x04; + break; + } + cfg.setGroup("SyncMode"); + cfg.writeEntry( "Mode", value ); + /* cfg.setGroup("Remote"); if ( telnetAvailable() ) @@ -369,23 +387,7 @@ void Security::applySecurity() } } -void Security::changeSyncApp() -{ - // Don't say i didn't tell ya - if (syncapp->currentText() == "IntelliSync") { - QMessageBox attn( - tr("WARNING"), - tr("

Selecting IntelliSync here will disable the FTP password." - "

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(); -} + diff --git a/core/settings/security/security.h b/core/settings/security/security.h index 72aa352..ed25ce1 100644 --- a/core/settings/security/security.h +++ b/core/settings/security/security.h @@ -25,7 +25,7 @@ class QPEDialogListener; class Security : public SecurityBase -{ +{ Q_OBJECT public: @@ -46,7 +46,6 @@ private slots: void setSyncNet(const QString&); void changeLoginName(int); void toggleAutoLogin(bool); - void changeSyncApp(); void restoreDefaults(); void insertDefaultRanges(); void deleteListEntry(); @@ -60,7 +59,7 @@ private: static void parseNet(const QString& sn,int& auth_peer,int& auth_peer_bits); void selectNet(int auth_peer,int auth_peer_bits,bool update); - + QString enterPassCode(const QString&); QString passcode; bool valid; diff --git a/core/settings/security/securitybase.ui b/core/settings/security/securitybase.ui index 1769ae1..dcf1d6b 100644 --- a/core/settings/security/securitybase.ui +++ b/core/settings/security/securitybase.ui @@ -11,7 +11,7 @@ 0 0 - 309 + 327 483 @@ -466,33 +466,6 @@ Beware that all manually entered net ranges will be lost! text - QTopia - - - - - text - IntelliSync - - - - name - syncapp - - - whatsThis - This option changes the login behaviour of the internal FTP server. - -If you have problems syncing, try the "IntelliSync" setting, which will accept any password you throw at the sync (FTP) port. - -The default is Qtopia. It will let you log in with username "root" and password "Qtopia". The password is CaSeSeNsItIvE. - - - - QComboBox - - - text Qtopia 1.7 @@ -505,13 +478,21 @@ The default is Qtopia. It will let you log in with username "root" and password text - Both + IntelliSync name syncModeCombo + + whatsThis + Alter the Sync Protocol to tweak for the different devices. + IntelliSync will disable the password check but you'll be prompted to accept the connection. + Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync + Qtopia1.7 will alter the way data is send to the client and will not work with older clients. + + -- cgit v0.9.0.2