bluetooth patches courtesy Dmitriy Korovkin (thanks!):

* When sending data to a device, do service discovery in order to get port number.
* Switched to ussp-push for sending.
* Clear receivers list on rescan.
* Changed the way of window closing in order to shut down IRDA and bluetooth correctly.

4 files changed, 94 insertions, 29 deletions

diff --git a/core/obex/btobex.cpp b/core/obex/btobex.cpp
index a2866f6..bb5c06d 100644
--- a/core/obex/btobex.cpp
+++ b/core/obex/btobex.cpp
@@ -1,49 +1,58 @@
 
 #include "btobex.h"
+#include <manager.h>
+#include <services.h>
 
 /* OPIE */
 #include <opie2/oprocess.h>
 #include <opie2/odebug.h>
 
 /* QT */
 #include <qfileinfo.h>
-
-
+#include <qstring.h>
+#include <qmap.h>
+#include <qmessagebox.h>
 
 using namespace  OpieObex;
 
 using namespace Opie::Core;
 /* TRANSLATOR OpieObex::Obex */
+using namespace OpieTooth;
 
 BtObex::BtObex( QObject *parent, const char* name )
   : QObject(parent, name )
 {
     m_rec = 0;
     m_send=0;
     m_count = 0;
     m_receive = false;
     connect( this, SIGNAL(error(int) ), // for recovering to receive
              SLOT(slotError() ) );
     connect( this, SIGNAL(sent(bool) ),
              SLOT(slotError() ) );
+    btManager = NULL;
 };
+
 BtObex::~BtObex() {
+    if (btManager)
+        delete btManager;
     delete m_rec;
     delete m_send;
 }
+
 void BtObex::receive()  {
     m_receive = true;
     m_outp = QString::null;
     m_rec = new OProcess();
 
     // TODO mbhaynie: No idea if this actually works -- maybe opd is better.
     *m_rec << "obexftpd" << "-b";
     // connect to the necessary slots
     connect(m_rec,  SIGNAL(processExited(Opie::Core::OProcess*) ),
             this,  SLOT(slotExited(Opie::Core::OProcess*) ) );
 
     connect(m_rec,  SIGNAL(receivedStdout(Opie::Core::OProcess*, char*,  int ) ),
             this,  SLOT(slotStdOut(Opie::Core::OProcess*, char*, int) ) );
 
     if(!m_rec->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
         emit done( false );
@@ -55,70 +64,117 @@ void BtObex::receive()  {
 void BtObex::send( const QString& fileName, const QString& bdaddr) {
     // if currently receiving stop it send receive
     m_count = 0;
     m_file = fileName;
     m_bdaddr = bdaddr;
     if (m_rec != 0 ) {
         if (m_rec->isRunning() ) {
             emit error(-1 );
             delete m_rec;
             m_rec = 0;
 
         }else{
             emit error( -1 ); // we did not delete yet but it's not running slotExited is pending
             return;
         }
     }
+    //Now we need to find out if the OBEX push is supported for this device
+    //And get the port number
+    if (!btManager) {
+        btManager = new Manager("hci0");
+        connect(btManager,
+            SIGNAL(foundServices(const QString&, Services::ValueList)),
+            this, SLOT(slotFoundServices(const QString&, Services::ValueList)));
+    }
+    btManager->searchServices(bdaddr);
+}
+
+/**
+ * This function reacts on the service discovery finish
+ */
+void BtObex::slotFoundServices(const QString&, Services::ValueList svcList)
+{
+    QValueList<OpieTooth::Services>::Iterator it; 
+    QMap<int, QString> classList; //The classes list
+    QMap<int, QString>::Iterator classIt; //Iterator in the class list
+    int portNum = -1; //The desired port number
+    odebug << "BtObex slotFoundServices" << oendl;
+    if (svcList.isEmpty()) {
+        QMessageBox::critical(NULL, tr("Object send"), tr("No services found"));
+        emit error(-1);
+        return;    
+    }
+    for (it = svcList.begin(); it != svcList.end(); it++) {
+        classList = (*it).classIdList();
+        classIt = classList.begin();
+        if (classIt == classList.end())
+            continue;
+////We really need symbolic names for service IDs
+        //Ok, we have found the object push service
+        if (classIt.key() == 4357) { 
+            portNum = (*it).protocolDescriptorList().last().port();
+            break;
+        }
+    }
+    if (portNum == -1) {
+        QMessageBox::critical(NULL, tr("Object send"), 
+            tr("No OBEX Push service"));
+        emit error(-1);
+        return;
+    }
+    m_port = portNum;
     sendNow();
 }
+
 void BtObex::sendNow(){
     if ( m_count >= 25 ) { // could not send
         emit error(-1 );
         emit sent(false);
         return;
     }
     // OProcess inititialisation
-    m_send = new OProcess();
+    m_send = new OProcess(0, "ussp-push");
     m_send->setWorkingDirectory( QFileInfo(m_file).dirPath(true) );
 
-    // obextool push file <bdaddr> [channel]
-    // 9 for phones.
-    // Palm T3 accepts pictures on 1
-    *m_send << "obextool" << "push";
+    // ussp-push --timeo 30 <btaddr:port> file file
+    *m_send << "ussp-push" << "--timeo 30";
+    *m_send << m_bdaddr + "@" + QString::number(m_port);
     *m_send << QFile::encodeName(QFileInfo(m_file).fileName());
-    *m_send << m_bdaddr << "9";
-
+    *m_send << QFile::encodeName(QFileInfo(m_file).fileName());
+    m_send->setUseShell(true);
+    
     // connect to slots Exited and and StdOut
     connect(m_send,  SIGNAL(processExited(Opie::Core::OProcess*) ),
             this, SLOT(slotExited(Opie::Core::OProcess*)) );
-    connect(m_send,  SIGNAL(receivedStdout(Opie::Core::OProcess*, char*,  int )),
+    connect(m_send,  SIGNAL(receivedStdout(Opie::Core::OProcess*, char*,  int)),
             this, SLOT(slotStdOut(Opie::Core::OProcess*, char*, int) ) );
-
     // now start it
-    if (!m_send->start(/*OProcess::NotifyOnExit,  OProcess::AllOutput*/ ) ) {
+    if (!m_send->start(OProcess::NotifyOnExit,  OProcess::AllOutput) ) {
         m_count = 25;
         emit error(-1 );
         delete m_send;
         m_send=0;
     }
     // end
     m_count++;
     emit currentTry( m_count );
 }
 
 void BtObex::slotExited(OProcess* proc ){
+    odebug << proc->name() << " exited with result " 
+           << proc->exitStatus() << oendl;
     if (proc == m_rec )  // receive process
         received();
     else if ( proc == m_send ) 
         sendEnd();
     
 }
 void BtObex::slotStdOut(OProcess* proc, char* buf, int len){
     if ( proc == m_rec ) { // only receive
         QByteArray ar( len  );
         memcpy( ar.data(), buf, len );
         m_outp.append( ar );
     }
 }
 
 void BtObex::received() {
   if (m_rec->normalExit() ) {
@@ -127,51 +183,52 @@ void BtObex::received() {
           emit receivedFile( filename );
       }
   }else{
       emit done(false);
   };
   delete m_rec;
   m_rec = 0;
   receive();
 }
 
 void BtObex::sendEnd() {
   if (m_send->normalExit() ) {
     if ( m_send->exitStatus() == 0 ) {
       delete m_send;
       m_send=0;
       emit sent(true);
-    }else if (m_send->exitStatus() == 255 ) { // it failed maybe the other side wasn't ready
+    }else if (m_send->exitStatus() != 0 ) { // it failed maybe the other side wasn't ready
       // let's try it again
       delete m_send;
       m_send = 0;
       sendNow();
     }
   }else {
     emit error( -1 );
     delete m_send;
     m_send = 0;
   }
 }
 
 // This probably doesn't do anything useful for bt.
-QString BtObex::parseOut(     ){
+QString BtObex::parseOut(){
   QString path;
   QStringList list = QStringList::split("\n",  m_outp);
   QStringList::Iterator it;
   for (it = list.begin(); it != list.end(); ++it ) {
+    odebug << (*it) << oendl;
     if ( (*it).startsWith("Wrote"  ) ) {
         int pos = (*it).findRev('(' );
         if ( pos > 0 ) {
 
             path = (*it).remove( pos, (*it).length() - pos );
             path = path.mid(6 );
             path = path.stripWhiteSpace();
         }
     }
   }
   return path;
 }
 /**
  * when sent is done slotError is called we  will start receive again
  */
 void BtObex::slotError() {
diff --git a/core/obex/btobex.h b/core/obex/btobex.h
index 5ab591c..099f04a 100644
--- a/core/obex/btobex.h
+++ b/core/obex/btobex.h
@@ -1,25 +1,28 @@
 
 
 #ifndef OpieBtObex_H
 #define OpieBtObex_H
 
 #include <qobject.h>
+#include <services.h>
+#include <manager.h>
 
 namespace Opie {namespace Core {class OProcess;}}
 class QCopChannel;
+using namespace OpieTooth;
 namespace OpieObex {
   // Maybe this should be derved from Obex.
   class BtObex : public QObject {
       Q_OBJECT
   public:
       /**
        * BtObex c'tor look
        */
       BtObex( QObject *parent, const char* name);
       /**
        * d'tor
        */
       ~BtObex();
 
       /** TODO mbhaynie -- Maybe opd would be a better way to receive.
        *  Starting listening to Bluetooth after enabled by the applet
@@ -42,39 +45,42 @@ namespace OpieObex {
       void error( int );
       /**
        *  The current try to receive data
        */
       void currentTry(unsigned int);
       /**
        * signal sent The file got beamed to the remote location
        */
       void sent(bool);
       void done(bool);
 
   private:
       uint m_count;
       QString m_file;
       QString m_outp;
       QString m_bdaddr;
+      int m_port;
       Opie::Core::OProcess *m_send;
       Opie::Core::OProcess *m_rec;
       bool m_receive : 1;
+      OpieTooth::Manager* btManager;
       void shutDownReceive();
 
 private slots:
 
       // the process exited
-      void slotExited(Opie::Core::OProcess* proc) ;
+      void slotExited(Opie::Core::OProcess*) ;
       void slotStdOut(Opie::Core::OProcess*, char*, int);
       void slotError();
+      void slotFoundServices(const QString&, Services::ValueList);
 
   private:
       void sendNow();
       QString parseOut();
       void received();
       void sendEnd();
 
   };
 };
 
 
 #endif
diff --git a/core/obex/obex.pro b/core/obex/obex.pro
index d6b527c..33cb957 100644
--- a/core/obex/obex.pro
+++ b/core/obex/obex.pro
@@ -1,14 +1,14 @@
 TEMPLATE	= lib
 CONFIG		+= qt warn_on 
 HEADERS	=   obex.h btobex.h obexhandler.h obexsend.h receiver.h obeximpl.h
 SOURCES	=   obex.cpp btobex.cpp obexsend.cpp obexhandler.cpp receiver.cpp obeximpl.cpp
 TARGET		= opieobex
 DESTDIR		= $(OPIEDIR)/plugins/obex
 INTERFACES  = obexsendbase.ui
-INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/core/launcher
+INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/core/launcher $(OPIEDIR)/noncore/net/opietooth/lib
 DEPENDPATH  += 
-LIBS        += -lqpe -lopiecore2
+LIBS        += -lopietooth1 -lqpe -lopiecore2 
 VERSION		= 0.0.3
 
 include( $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/obex/obexsend.cpp b/core/obex/obexsend.cpp
index 9cd9972..dbbb7b3 100644
--- a/core/obex/obexsend.cpp
+++ b/core/obex/obexsend.cpp
@@ -7,34 +7,34 @@
 #include "btobex.h"
 #include "obexsend.h"
 using namespace OpieObex;
 
 /* OPIE */
 #include <opie2/odebug.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/resource.h>
 
 using namespace Opie::Core;
 
 /* QT */
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qpixmap.h>
 #include <qlistview.h>
-#include <qtimer.h>
 
+#include <unistd.h>
 /* TRANSLATOR OpieObex::SendWidget */
 
 SendWidget::SendWidget( QWidget* parent, const char* name )
     : obexSendBase( parent, name ) {
     initUI();
 }
 SendWidget::~SendWidget() {
 }
 void SendWidget::initUI() {
     m_obex = new Obex(this, "obex");
     connect(m_obex, SIGNAL(error(int) ),
             this, SLOT(slotIrError(int) ) );
     connect(m_obex, SIGNAL(sent(bool) ),
             this, SLOT(slotIrSent(bool) ) );
     connect(m_obex, SIGNAL(currentTry(unsigned int) ),
             this, SLOT(slotIrTry(unsigned int) ) );
@@ -70,33 +70,33 @@ void SendWidget::send( const QString& file, const QString& desc ) {
     scan_for_receivers();
 }
 
 int SendWidget::addReceiver(const char *r, const char *icon)
 {
     QListViewItem * item = new QListViewItem( receiverList, 0 );
     item->setText( 0, r);
     item->setPixmap( 1, Resource::loadPixmap( icon ) );
 
     int id=receivers.count();
     receivers[id]=item;
     return id;
 }
 
 bool SendWidget::receiverSelected(int id)
 {
-    return receivers[id]->pixmap(2);
+    return (bool)(receivers[id]->pixmap(2) != NULL);
 }
 
 void SendWidget::setReceiverStatus( int id, const QString& status ) {
     if ( !receivers.contains(id) ) return;
     receivers[id]->setText(3, status );
 }
 
 void SendWidget::slotIrDaDevices( const QStringList& list) {
     for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) {
 	int id = addReceiver(*it, "obex/irda.png");
 	m_irDa.insert( id, (*it) );
     }
     irdaStatus->setText( tr("ready."));
     m_irDaIt = m_irDa.begin();
 
 }
@@ -128,112 +128,114 @@ void SendWidget::dispatchIrda( const QCString& str, const QByteArray& ar ) {
 }
 void SendWidget::slotIrError( int ) {
     irdaStatus->setText(tr("error :("));
 }
 void SendWidget::slotIrSent( bool b) {
     QString text = b ? tr("Sent") : tr("Failure");
     setReceiverStatus( m_irDaIt.key(), text );
     ++m_irDaIt;
     slotStartIrda();
 }
 void SendWidget::slotIrTry(unsigned int trI) {
     setReceiverStatus(m_irDaIt.key(), tr("Try %1").arg( QString::number( trI ) ));
 }
 void SendWidget::slotStartIrda() {
 	if ( !m_irDa.count() ) return;
     if ( m_irDaIt == m_irDa.end() ) {
-	irdaStatus->setText(tr("complete."));
+        irdaStatus->setText(tr("complete."));
         return;
     }
     setReceiverStatus( m_irDaIt.key(), tr("Start sending") );
     m_obex->send( m_file );
 }
 
 void SendWidget::dispatchBt( const QCString& str, const QByteArray& ar ) {
     if ( str == "devices(QStringMap)" ) {
         QDataStream stream( ar, IO_ReadOnly );
 	QMap<QString, QString> btmap;
         stream >> btmap;
         slotBTDevices( btmap );
     }
 }
 void SendWidget::slotBtError( int ) {
     btStatus->setText(tr("error :("));    
 }
 void SendWidget::slotBtSent( bool b) {
     QString text = b ? tr("Sent") : tr("Failure");
     setReceiverStatus( m_btIt.key(), text );
     ++m_btIt;
     slotStartBt();
 }
 void SendWidget::slotBtTry(unsigned int trI) {
     setReceiverStatus( m_btIt.key(), tr("Try %1").arg( QString::number( trI ) ) );
 }
 void SendWidget::slotStartBt() {
     // skip past unselected receivers
     while((m_btIt != m_bt.end()) && !receiverSelected(m_btIt.key()))
 	  ++m_btIt;
     if (m_btIt == m_bt.end() ) {
-	btStatus->setText(tr("complete."));
+        btStatus->setText(tr("complete."));
         return;
     }
     setReceiverStatus( m_btIt.key(), tr("Start sending") );
     m_btobex->send( m_file, m_btIt.data().second() );
 }
 
 void SendWidget::send_to_receivers() {
     slotStartIrda();
     slotStartBt();
 }
 
 void SendWidget::scan_for_receivers()
 {
-    //FIXME: Clean ListBox prior to (re)scan
+    receiverList->clear();
+    receivers.clear();
     sendButton->setDisabled( true );
 
     if ( !QCopChannel::isRegistered("QPE/IrDaApplet") )
     {
         irdaStatus->setText(tr("not enabled."));
     }
     else
     {
         QCopEnvelope e1("QPE/IrDaApplet", "enableIrda()");
         irdaStatus->setText(tr("searching..."));
         sendButton->setEnabled( true );
         QCopEnvelope e2("QPE/IrDaApplet", "listDevices()");
     }
 
     if ( !QCopChannel::isRegistered("QPE/Bluetooth") )
     {
         btStatus->setText(tr("not enabled."));
     }
     else
     {
         QCopEnvelope e1("QPE/Bluetooth", "enableBluetooth()");
         btStatus->setText(tr("searching..."));
         sendButton->setEnabled( true );
         QCopEnvelope e3("QPE/Bluetooth", "listDevices()");
     }
 }
 
 void SendWidget::toggle_receiver(QListViewItem* item)
 {
     // toggle the state of an individual receiver.
     if(item->pixmap(2))
-	item->setPixmap(2,QPixmap());
+        item->setPixmap(2,QPixmap());
     else
-	item->setPixmap(2,Resource::loadPixmap("backup/check.png"));
+        item->setPixmap(2,Resource::loadPixmap("backup/check.png"));
 }
 
 
 void SendWidget::closeEvent( QCloseEvent* e) {
-    e->accept(); // make sure
-    QTimer::singleShot(0, this, SLOT(userDone() ) );
-}
-void SendWidget::userDone() {
+    obexSendBase::closeEvent(e);
     QCopEnvelope e0("QPE/IrDaApplet", "disableIrda()");
     QCopEnvelope e1("QPE/Bluetooth", "disableBluetooth()");
-    emit done();
 }
+
+void SendWidget::userDone() {
+    close();
+}
+
 QString SendWidget::file()const {
     return m_file;
 }