Revert "[sms] Restore compatibility with current Android release"
R
A new Android app was released
This reverts commit 4266834052
.
This commit is contained in:
parent
18031e97a9
commit
0f32462e26
1 changed files with 17 additions and 6 deletions
|
@ -59,15 +59,26 @@ bool SmsPlugin::receivePacket(const NetworkPacket& np)
|
|||
|
||||
void SmsPlugin::sendSms(const QDBusVariant& addresses, const QString& messageBody, const qint64 subID)
|
||||
{
|
||||
Q_UNUSED(subID)
|
||||
const QList<ConversationAddress> addressList = ConversationAddress::listfromDBus(addresses);
|
||||
QList<ConversationAddress> addressList = ConversationAddress::listfromDBus(addresses);
|
||||
|
||||
if (addressList.isEmpty()) {
|
||||
qCDebug(KDECONNECT_PLUGIN_SMS) << "Empty address list";
|
||||
return;
|
||||
QVariantList addressMapList;
|
||||
for (const ConversationAddress address : addressList) {
|
||||
QVariantMap addressMap({{QStringLiteral("address"), address.address()}});
|
||||
addressMapList.append(addressMap);
|
||||
qDebug() <<address.address();
|
||||
}
|
||||
|
||||
sendSms(addressList.first().address(), messageBody);
|
||||
QVariantMap packetMap({
|
||||
{QStringLiteral("sendSms"), true},
|
||||
{QStringLiteral("addresses"), addressMapList},
|
||||
{QStringLiteral("messageBody"), messageBody}
|
||||
});
|
||||
if (subID != -1) {
|
||||
packetMap[QStringLiteral("subID")] = subID;
|
||||
}
|
||||
NetworkPacket np(PACKET_TYPE_SMS_REQUEST, packetMap);
|
||||
qCDebug(KDECONNECT_PLUGIN_SMS) << "Dispatching SMS send request to remote";
|
||||
sendPacket(np);
|
||||
}
|
||||
|
||||
void SmsPlugin::sendSms(const QString& address, const QString& messageBody)
|
||||
|
|
Loading…
Reference in a new issue