---
src/hardwaremanipulator.cpp | 35 +++++++++++++++++++++++++++++++++--
1 file changed, 33 insertions(+), 2 deletions(-)
diff --git a/src/hardwaremanipulator.cpp b/src/hardwaremanipulator.cpp
index c19b507..b746229 100644
--- a/src/hardwaremanipulator.cpp
+++ b/src/hardwaremanipulator.cpp
@@ -123,13 +123,44 @@ void HardwareManipulator::constructCBMessage(const
QString &messageCode, int geo
m.setPage(pag);
m.setText(content);
+ uint nbPages, spaceLeftInLast;
+
+ if ( scheme == 0 && content.length() > (15*93)) {
+ warning(tr("Text too long"),
+ tr("The maximum number of pages (15) "
+ "is reached - text is truncated"));
+ m.setText(content.mid( 0, 15*93 ));
+ } else if (content.length() > (15*40)) {
+ warning(tr("Text too long"),
+ tr("The maximum number of pages (15) "
+ "is reached - text is truncated"));
+ m.setText(content.mid( 0, 15*40 ));
+ }
+
+ m.computeSize( nbPages, spaceLeftInLast );
+ if ( npag < nbPages ) {
+ warning(tr("Invalid number of pages"),
+ tr("The required number of pages is "
+ "higher than the given number"));
+ m.setNumPages(nbPages);
+ }
+
sendCBS(m);
}
void HardwareManipulator::sendCBS( const QCBSMessage &m )
{
- QByteArray pdu = m.toPdu();
- emit unsolicitedCommand(QString("+CBM:
")+QString::number(pdu.length())+'\r'+'\n'+ PS_toHex(pdu));
+ if( m.shouldSplit() ) {
+ QList<QCBSMessage> list = m.split();
+
+ for( int i =0; i < list.count(); i++ ) {
+ QByteArray pdu = list[i].toPdu();
+ emit unsolicitedCommand(QString("+CBM:
")+QString::number(pdu.length())+'\r'+'\n'+ PS_toHex(pdu));
+ }
+ } else {
+ QByteArray pdu = m.toPdu();
+ emit unsolicitedCommand(QString("+CBM:
")+QString::number(pdu.length())+'\r'+'\n'+ PS_toHex(pdu));
+ }
}
void HardwareManipulator::constructSMSMessage( const int type, const QString
&sender, const QString &serviceCenter, const QString &text )
--
1.7.9.5
_______________________________________________
ofono mailing list
[email protected]
http://lists.ofono.org/listinfo/ofono
