summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/applets/obex/obex.cc62
-rw-r--r--core/applets/obex/obex.h4
-rw-r--r--core/applets/obex/obeximpl.cc10
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
@@ -10,18 +10,24 @@ using namespace OpieObex;
Obex::Obex( 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() ),
+ 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";
// connect to the necessary slots
connect(m_rec, SIGNAL(processExited(OProcess*) ),
this, SLOT(slotExited(OProcess*) ) );
@@ -29,22 +35,40 @@ void Obex::receive() {
connect(m_rec, SIGNAL(receivedStdout(OProcess*, char*, int ) ),
this, SLOT(slotStdOut(OProcess*, char*, int) ) );
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;
}
// OProcess inititialisation
m_send = new OProcess();
@@ -53,17 +77,20 @@ void Obex::sendNow(){
// connect to slots Exited and and StdOut
connect(m_send, SIGNAL(processExited(OProcess*) ),
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++;
emit currentTry( m_count );
}
@@ -85,15 +112,17 @@ void Obex::recieved() {
if (m_rec->normalExit() ) {
if ( m_rec->exitStatus() == 0 ) { // we got one
QString filename = parseOut();
emit receivedFile( filename );
}
}else{
- emit error(-1);
+ emit done(false);
};
delete m_rec;
+ m_rec = 0;
+ receive();
}
void Obex::sendEnd() {
if (m_send->normalExit() ) {
if ( m_send->exitStatus() == 0 ) {
delete m_send;
@@ -123,6 +152,33 @@ QString Obex::parseOut( ){
path = pathes[1];
qWarning("path %s", path.latin1() );
}
}
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
@@ -23,12 +23,13 @@ namespace OpieObex {
/**
* Starting listening to irda after enabled by the applet
* a signal gets emitted when recieved a file
*/
void receive();
void send( const QString& );
+ void setReceiveEnabled( bool = false );
signals:
/**
* a signal
* @param path The path to the recieved file
*/
@@ -52,24 +53,27 @@ namespace OpieObex {
private:
uint m_count;
QString m_file;
QString m_outp;
OProcess *m_send;
OProcess *m_rec;
+ bool m_receive : 1;
+ void shutDownReceive();
private slots:
/**
* send over palm obex
*/
//void send(const QString&);
// the process exited
void slotExited(OProcess* proc) ;
void slotStdOut(OProcess*, char*, int);
+ void slotError();
private:
void sendNow();
QString parseOut();
void recieved();
void sendEnd();
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
@@ -46,22 +46,28 @@ void ObexImpl::slotMessage( const QCString& msg, const QByteArray&data ) {
qWarning("Message %s", msg.data() );
if(msg == "send(QString,QString,QString)" ) {
QString desc;
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()),
this, SLOT(slotCancelSend()));
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;
stream >> text;
m_sendgui->lblPath->setText(tr("Done transfering " + text));
@@ -84,13 +90,13 @@ void ObexImpl::slotSent() {
m_sendgui->hide();
}
void ObexImpl::slotError( int errorCode) {
QString errorString = "";
- if (errorCode = -1) {
+ if (errorCode == -1) {
errorString = "test";
}
qDebug("Error: " + errorString);
m_sendgui->hide();
}