Stop receiving when wanting to send

3 files changed, 71 insertions, 5 deletions

diff --git a/core/applets/obex/obex.cc b/core/applets/obex/obex.cc
index 683964b..2218dbc 100644
--- a/core/applets/obex/obex.cc
+++ b/core/applets/obex/obex.cc
@@ -13,12 +13,18 @@ Obex::Obex( QObject *parent, const char* 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() ),
+             SLOT(slotError() ) );
 };
 Obex::~Obex() {
   delete m_rec;
   delete m_send;
 }
 void Obex::receive()  {
+    m_receive = true;
   qWarning("Receive" );
    m_rec = new OProcess();
    *m_rec << "irobex_palm3";
@@ -32,16 +38,34 @@ void Obex::receive()  {
    if(!m_rec->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
      qWarning("could not start :(");
      emit done( false );
+        delete m_rec;
+        m_rec = 0;
    }
-   emit currentTry(m_count );
+//    emit currentTry(m_count );
 
 }
-void Obex::send( const QString& fileName) {
+void Obex::send( const QString& fileName) { // if currently receiving stop it send receive
   m_count = 0;
   m_file = fileName;
+    qWarning("send");
+    if (m_rec != 0 ) {
+        qWarning("running");
+        if (m_rec->isRunning() ) {
+            emit error(-1 );
+            qWarning("is running");
+            delete m_rec;
+            m_rec = 0;
+
+        }else{
+            qWarning("is not running");
+            emit error( -1 ); // we did not delete yet but it's not running slotExited is pending
+            return;
+        }
+    }
   sendNow();
 }
 void Obex::sendNow(){
+    qWarning("sendNow");
   if ( m_count >= 25 ) { // could not send
     emit error(-1 );
     return;
@@ -56,11 +80,14 @@ void Obex::sendNow(){
 	  this, SLOT(slotExited(OProcess*)) );
   connect(m_send,  SIGNAL(receivedStdout(OProcess*, char*,  int )),
 	  this, SLOT(slotStdOut(OProcess*, char*, int) ) );
+
   // now start it
   if (!m_send->start(/*OProcess::NotifyOnExit,  OProcess::AllOutput*/ ) ) {
     qWarning("could not send" );
     m_count = 25;
     emit error(-1 );
+        delete m_send;
+        m_send=0;
   }
   // end
   m_count++;
@@ -88,9 +115,11 @@ void Obex::recieved() {
       emit receivedFile( filename );
     }
   }else{
-    emit error(-1);
+      emit done(false);
   };
   delete m_rec;
+  m_rec = 0;
+  receive();
 }
 
 void Obex::sendEnd() {
@@ -126,3 +155,30 @@ QString Obex::parseOut(     ){
   }
   return path;
 }
+/**
+ * when sent is done slotError is called we  will start receive again
+ */
+void Obex::slotError() {
+    qWarning("slotError");
+    if ( m_receive )
+        receive();
+};
+void Obex::setReceiveEnabled( bool receive ) {
+    if ( !receive ) { //
+        m_receive = false;
+        shutDownReceive();
+    }
+}
+
+void Obex::shutDownReceive() {
+    if (m_rec != 0 ) {
+        qWarning("running");
+        if (m_rec->isRunning() ) {
+            emit error(-1 );
+            qWarning("is running");
+            delete m_rec;
+            m_rec = 0;
+        }
+    }
+
+}
diff --git a/core/applets/obex/obex.h b/core/applets/obex/obex.h
index 4e78015..2ce44f2 100644
--- a/core/applets/obex/obex.h
+++ b/core/applets/obex/obex.h
@@ -26,6 +26,7 @@ namespace OpieObex {
      */
     void receive();
     void send( const QString& );
+      void setReceiveEnabled( bool = false );
   signals:
 
     /**
@@ -55,6 +56,8 @@ namespace OpieObex {
     QString m_outp;
     OProcess *m_send;
     OProcess *m_rec;
+      bool m_receive : 1;
+      void shutDownReceive();
   
   private slots:
 
@@ -67,6 +70,7 @@ namespace OpieObex {
    // the process exited
    void slotExited(OProcess* proc) ;
    void slotStdOut(OProcess*, char*, int);
+      void slotError();
   
   private:
    void sendNow();
diff --git a/core/applets/obex/obeximpl.cc b/core/applets/obex/obeximpl.cc
index 856f100..0c137af 100644
--- a/core/applets/obex/obeximpl.cc
+++ b/core/applets/obex/obeximpl.cc
@@ -49,6 +49,7 @@ void ObexImpl::slotMessage( const QCString& msg, const QByteArray&data ) {
     stream >> desc;
     QString filename;
     stream >> filename;
+    m_sendgui->raise(); // should be on top
     m_sendgui->showMaximized();
     m_sendgui->lblPath->setText(filename);
     connect( (QObject*)m_sendgui->PushButton2, SIGNAL(clicked()),
@@ -56,9 +57,14 @@ void ObexImpl::slotMessage( const QCString& msg, const QByteArray&data ) {
     m_obex->send(filename );
     connect( (QObject*)m_obex, SIGNAL( sent() ), this,
              SLOT( slotSent() ) );
-  }else if(msg == "receive(bool)" ) { // open a GUI
+  }else if(msg == "receive(int)" ) { // open a GUI
       m_recvgui->showMaximized();
+      int receiveD = 0;
+      stream >> receiveD;
+      if ( receiveD == 1)
       m_obex->receive();
+      else
+          m_obex->setReceiveEnabled( false );
 
   } else if (msg =="done(QString)") {
       QString text;
@@ -87,7 +93,7 @@ void ObexImpl::slotSent() {
 void ObexImpl::slotError( int errorCode) {
 
     QString errorString = "";
-    if (errorCode = -1) {
+    if (errorCode == -1) {
         errorString = "test";
     }
     qDebug("Error: " + errorString);