Increase sync-friendlyness and repair broken sync with several

programs. Patch by Matthias Hentges <matthias@hentges.net> - thanks!

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
@@ -191,30 +191,40 @@ bool SyncAuthentication::checkPassword( const QString& password )
 #endif
 
     static int lastdenial=0;
     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);
 	    unauth.setButtonText(QMessageBox::Cancel, tr("Deny"));
 	    unauth.exec();
 
 	    denials++;
 	    lastdenial=now;
 	}
 	return FALSE;
+	   
     }
 
     // Second, check sync password...
 
     static int lock=0;
     if ( lock ) return FALSE;
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
@@ -45,12 +45,22 @@
     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);
     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() )
        telnet->setChecked(cfg.readEntry("allow_telnet"));
        else
        telnet->hide();
@@ -78,12 +88,13 @@
     syncModeCombo->setCurrentItem( mode - 1 );
 
     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()));
 
     loadUsers();
     updateGUI();
 
     dl = new QPEDialogListener(this);
     showMaximized();
@@ -102,13 +113,12 @@ void Security::updateGUI()
             : tr("Change passcode" )  );
     passcode_poweron->setEnabled( !empty );
     clearpasscode->setEnabled( !empty );
 
     autologinToggle->setChecked(autoLogin);
     userlist->setEnabled(autoLogin);
-
 }
 
 
 void Security::show()
 {
     //valid=FALSE;
@@ -246,12 +256,14 @@ void Security::applySecurity()
         int auth_peer=0;
         int auth_peer_bits;
         QString sn = syncnet->currentText();
         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() )
            cfg.writeEntry("allow_telnet",telnet->isChecked());
            if ( sshAvailable() )
            cfg.writeEntry("allow_ssh",ssh->isChecked());
@@ -267,12 +279,31 @@ void Security::applySecurity()
         } else {
             loginCfg.removeEntry("AutoLogin");
         }
 
     }
 }
+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 )
 {
     autoLoginName = userlist->text(idx);;
     updateGUI();
 }
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
@@ -43,12 +43,13 @@ protected:
 private slots:
     void changePassCode();
     void clearPassCode();
     void setSyncNet(const QString&);
     void changeLoginName(int);
     void toggleAutoLogin(bool);
+    void changeSyncApp();
 
 
 private:
     void loadUsers(void);
     bool telnetAvailable() const;
     bool sshAvailable() const;
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
@@ -8,13 +8,13 @@
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>329</width>
+            <width>321</width>
             <height>483</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Security Settings</string>
@@ -279,13 +279,13 @@
                     <name>title</name>
                     <string>Sync</string>
                 </attribute>
                 <vbox>
                     <property stdset="1">
                         <name>margin</name>
-                        <number>6</number>
+                        <number>11</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>6</number>
                     </property>
                     <widget>
@@ -379,12 +379,42 @@
                                 <property stdset="1">
                                     <name>editable</name>
                                     <bool>true</bool>
                                 </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>
                                         <name>text</name>
                                         <string>Qtopia 1.7</string>
                                     </property>