summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/dialer.cpp41
1 files changed, 27 insertions, 14 deletions
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
@@ -116,25 +116,27 @@ void Dialer::dial(const QString& number)
116 } 116 }
117 else break; 117 else break;
118 } 118 }
119 119
120 if(usercancel) 120 if(usercancel)
121 { 121 {
122 // modem hangup
123 trydial(QString::null);
122 reject(); 124 reject();
123 } 125 }
124} 126}
125 127
126void Dialer::trydial(const QString& number) 128void Dialer::trydial(const QString& number)
127{ 129{
128 if(state != state_cancel) 130 //if(state != state_cancel)
129 { 131 //{
130 switchState(state_preinit); 132 if(state != state_cancel) switchState(state_preinit);
131 send("+++ATH"); 133 send("+++ATH");
132 send(""); 134 send("");
133 //QString response = receive(); 135 //QString response = receive();
134 } 136 //}
135 137
136 if(state != state_cancel) 138 if(state != state_cancel)
137 { 139 {
138 switchState(state_init); 140 switchState(state_init);
139 send("ATZ"); 141 send("ATZ");
140 //send(m_profile.readEntry("InitString")); 142 //send(m_profile.readEntry("InitString"));
@@ -144,13 +146,13 @@ void Dialer::trydial(const QString& number)
144 } 146 }
145 147
146 if(state != state_cancel) 148 if(state != state_cancel)
147 { 149 {
148 switchState(state_options); 150 switchState(state_options);
149 151
150 send("ATM0L0"); 152 send("ATM3L3");
151 QString response3 = receive(); 153 QString response3 = receive();
152 if(!response3.contains("\nOK\r")) 154 if(!response3.contains("\nOK\r"))
153 reset(); 155 reset();
154 } 156 }
155 157
156 if(state != state_cancel) 158 if(state != state_cancel)
@@ -167,18 +169,23 @@ void Dialer::trydial(const QString& number)
167 { 169 {
168 switchState(state_dialing); 170 switchState(state_dialing);
169 171
170 send(QString("ATDT %1").arg(number)); 172 send(QString("ATDT %1").arg(number));
171 //send(QString("%1 %2").arg(m_profile.readEntry("DialPrefix1")).arg(number)); 173 //send(QString("%1 %2").arg(m_profile.readEntry("DialPrefix1")).arg(number));
172 QString response5 = receive(); 174 QString response5 = receive();
173 if(!response5.contains("\nOK\r")) 175 if(!response5.contains("\nCONNECT"))
174 { 176 {
175 QMessageBox::warning(this, 177 if(response5.contains("BUSY"))
176 QObject::tr("Failure"), 178 switchState(state_dialing);
177 QObject::tr("Dialing the number failed.")); 179 else
178 slotCancel(); 180 {
181 QMessageBox::warning(this,
182 QObject::tr("Failure"),
183 QObject::tr("Dialing the number failed."));
184 slotCancel();
185 }
179 } 186 }
180 } 187 }
181 188
182 if(state != state_cancel) 189 if(state != state_cancel)
183 { 190 {
184 switchState(state_online); 191 switchState(state_online);
@@ -205,35 +212,41 @@ qWarning("Sending: '%s'", m.latin1());
205 reset(); 212 reset();
206 } 213 }
207} 214}
208 215
209QString Dialer::receive() 216QString Dialer::receive()
210{ 217{
218 QString buf;
211 char buffer[1024]; 219 char buffer[1024];
212 int ret; 220 int ret;
213 221
222 qApp->processEvents();
223
214 while(1) 224 while(1)
215 { 225 {
216 ret = ::read(m_fd, buffer, sizeof(buffer)); 226 ret = ::read(m_fd, buffer, sizeof(buffer));
217 227
218 if(ret > 0) 228 if(ret > 0)
219 { 229 {
220 for(int i = 0; i < ret; i++) 230 for(int i = 0; i < ret; i++)
221 buffer[i] = buffer[i] & 0x7F; 231 buffer[i] = buffer[i] & 0x7F;
222 buffer[ret] = 0; 232 buffer[ret] = 0;
223 qWarning("Receiving: '%s'", buffer); 233qWarning("Got: '%s'", buffer);
224 return QString(buffer); 234 buf.append(QString(buffer));
235 if(buf.contains("OK") || buf.contains("ERROR") || buf.contains("CONNECT") || (buf.contains("BUSY")))
236{
237qWarning("Receiving: '%s'", buf.latin1());
238 return buf;
239}
225 } 240 }
226 else if(ret < 0) 241 else if(ret < 0)
227 { 242 {
228 if(errno != EAGAIN) reset(); 243 if(errno != EAGAIN) reset();
229 } 244 }
230 } 245 }
231 246
232 //for(int i = 0; i < 200000;i++)
233 //qApp->processEvents();
234 return QString::null; 247 return QString::null;
235} 248}
236 249
237void Dialer::switchState(int newstate) 250void Dialer::switchState(int newstate)
238{ 251{
239 int oldstate = state; 252 int oldstate = state;