From 997c466fd91843699280a770cbf34e6917dcee8a Mon Sep 17 00:00:00 2001
From: josef <josef>
Date: Fri, 18 Oct 2002 09:31:09 +0000
Subject: - improve dialer

It works now correctly for me :)
But a few details must be changed (i.e. no hardcoded values)
---
(limited to 'noncore')

diff --git a/noncore/apps/opie-console/dialer.cpp b/noncore/apps/opie-console/dialer.cpp
index 10c16ef..bd6b50f 100644
--- a/noncore/apps/opie-console/dialer.cpp
+++ b/noncore/apps/opie-console/dialer.cpp
@@ -119,19 +119,21 @@ void Dialer::dial(const QString& number)
 
 	if(usercancel)
 	{
+		// modem hangup
+		trydial(QString::null);
 		reject();
 	}
 }
 
 void Dialer::trydial(const QString& number)
 {
-	if(state != state_cancel)
-	{
-		switchState(state_preinit);
+	//if(state != state_cancel)
+	//{
+		if(state != state_cancel) switchState(state_preinit);
 		send("+++ATH");
 		send("");
 		//QString response = receive();
-	}
+	//}
 
 	if(state != state_cancel)
 	{
@@ -147,7 +149,7 @@ void Dialer::trydial(const QString& number)
 	{
 		switchState(state_options);
 
-		send("ATM0L0");
+		send("ATM3L3");
 		QString response3 = receive();
 		if(!response3.contains("\nOK\r"))
 			reset();
@@ -170,12 +172,17 @@ void Dialer::trydial(const QString& number)
 		send(QString("ATDT %1").arg(number));
 		//send(QString("%1 %2").arg(m_profile.readEntry("DialPrefix1")).arg(number));
 		QString response5 = receive();
-		if(!response5.contains("\nOK\r"))
+		if(!response5.contains("\nCONNECT"))
 		{
-			QMessageBox::warning(this,
-				QObject::tr("Failure"),
-				QObject::tr("Dialing the number failed."));
-			slotCancel();
+			if(response5.contains("BUSY"))
+				switchState(state_dialing);
+			else
+			{
+				QMessageBox::warning(this,
+					QObject::tr("Failure"),
+					QObject::tr("Dialing the number failed."));
+				slotCancel();
+			}
 		}
 	}
 	
@@ -208,9 +215,12 @@ qWarning("Sending: '%s'", m.latin1());
 
 QString Dialer::receive()
 {
+	QString buf;
 	char buffer[1024];
 	int ret;
 
+	qApp->processEvents();
+
 	while(1)
 	{
 		ret = ::read(m_fd, buffer, sizeof(buffer));
@@ -220,8 +230,13 @@ QString Dialer::receive()
 			for(int i = 0; i < ret; i++)
 				buffer[i] = buffer[i] & 0x7F;
 			buffer[ret] = 0;
-			qWarning("Receiving: '%s'", buffer);
-			return QString(buffer);
+qWarning("Got: '%s'", buffer);
+			buf.append(QString(buffer));
+			if(buf.contains("OK") || buf.contains("ERROR") || buf.contains("CONNECT") || (buf.contains("BUSY")))
+{
+qWarning("Receiving: '%s'", buf.latin1());
+				return buf;
+}
 		}
 		else if(ret < 0)
 		{
@@ -229,8 +244,6 @@ QString Dialer::receive()
 		}
 	}
 
-	//for(int i = 0; i < 200000;i++)
-	//	qApp->processEvents();
 	return QString::null;
 }
 
--
cgit v0.9.0.2