mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-07-26 14:24:45 +00:00
[dialer] Remove the tpCaller qml plugin
Everything is now moved to DialerUtils
This commit is contained in:
Martin Klapetek
parent
bba2650087
commit
1bff2a4c48
7 changed files with 0 additions and 230 deletions
|
|
@ -5,4 +5,3 @@ install(FILES package/metadata.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} RENAM
|
||||||
include_directories(${TELEPATHY_QT5_INCLUDE_DIR})
|
include_directories(${TELEPATHY_QT5_INCLUDE_DIR})
|
||||||
|
|
||||||
add_subdirectory(src)
|
add_subdirectory(src)
|
||||||
add_subdirectory(plugin)
|
|
||||||
|
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
set(tpcallerplugin_SRCS
|
|
||||||
tp-call-plugin.cpp
|
|
||||||
tp-caller.cpp
|
|
||||||
)
|
|
||||||
|
|
||||||
add_library(tpcallerplugin SHARED ${tpcallerplugin_SRCS})
|
|
||||||
target_link_libraries(tpcallerplugin Qt5::Core
|
|
||||||
Qt5::Qml
|
|
||||||
${TELEPATHY_QT5_LIBRARIES})
|
|
||||||
|
|
||||||
install(TARGETS tpcallerplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/tpcaller)
|
|
||||||
|
|
||||||
install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/tpcaller)
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
module org.kde.plasma.private.tpcaller
|
|
||||||
|
|
||||||
plugin tpcallerplugin
|
|
||||||
|
|
@ -1,30 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright (C) 2015 Martin Klapetek <mklapetek@kde.org>
|
|
||||||
|
|
||||||
This library is free software; you can redistribute it and/or
|
|
||||||
modify it under the terms of the GNU Lesser General Public
|
|
||||||
License as published by the Free Software Foundation; either
|
|
||||||
version 2.1 of the License, or (at your option) any later version.
|
|
||||||
|
|
||||||
This library is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
Lesser General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Lesser General Public
|
|
||||||
License along with this library; if not, write to the Free Software
|
|
||||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "tp-call-plugin.h"
|
|
||||||
#include "tp-caller.h"
|
|
||||||
|
|
||||||
#include <QtQml>
|
|
||||||
|
|
||||||
void TpCallPlugin::registerTypes(const char *uri)
|
|
||||||
{
|
|
||||||
Q_ASSERT(uri == QLatin1String("org.kde.plasma.private.tpcaller"));
|
|
||||||
|
|
||||||
qmlRegisterType<TpCaller>(uri, 1, 0, "TpCaller");
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -1,35 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright (C) 2015 Martin Klapetek <mklapetek@kde.org>
|
|
||||||
|
|
||||||
This library is free software; you can redistribute it and/or
|
|
||||||
modify it under the terms of the GNU Lesser General Public
|
|
||||||
License as published by the Free Software Foundation; either
|
|
||||||
version 2.1 of the License, or (at your option) any later version.
|
|
||||||
|
|
||||||
This library is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
Lesser General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Lesser General Public
|
|
||||||
License along with this library; if not, write to the Free Software
|
|
||||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef TPCALLPLUGIN_H
|
|
||||||
#define TPCALLPLUGIN_H
|
|
||||||
|
|
||||||
#include <QQmlExtensionPlugin>
|
|
||||||
|
|
||||||
class QQmlEngine;
|
|
||||||
class TpCallPlugin : public QQmlExtensionPlugin
|
|
||||||
{
|
|
||||||
Q_OBJECT
|
|
||||||
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
|
|
||||||
|
|
||||||
public:
|
|
||||||
void registerTypes(const char *uri);
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif // TPCALLPLUGIN_H
|
|
||||||
|
|
@ -1,101 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright (C) 2015 Martin Klapetek <mklapetek@kde.org>
|
|
||||||
|
|
||||||
This library is free software; you can redistribute it and/or
|
|
||||||
modify it under the terms of the GNU Lesser General Public
|
|
||||||
License as published by the Free Software Foundation; either
|
|
||||||
version 2.1 of the License, or (at your option) any later version.
|
|
||||||
|
|
||||||
This library is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
Lesser General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Lesser General Public
|
|
||||||
License along with this library; if not, write to the Free Software
|
|
||||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "tp-caller.h"
|
|
||||||
|
|
||||||
#include <TelepathyQt/Debug>
|
|
||||||
#include <TelepathyQt/Constants>
|
|
||||||
#include <TelepathyQt/ContactMessenger>
|
|
||||||
#include <TelepathyQt/PendingChannel>
|
|
||||||
#include <TelepathyQt/PendingReady>
|
|
||||||
#include <TelepathyQt/PendingContacts>
|
|
||||||
#include <TelepathyQt/TextChannel>
|
|
||||||
#include <TelepathyQt/Types>
|
|
||||||
#include <TelepathyQt/ContactManager>
|
|
||||||
|
|
||||||
TpCaller::TpCaller(QObject *parent)
|
|
||||||
: QObject(parent)
|
|
||||||
{
|
|
||||||
Tp::registerTypes();
|
|
||||||
Tp::ConnectionFactoryPtr connectionFactory = Tp::ConnectionFactory::create(QDBusConnection::sessionBus(), Tp::Features() << Tp::Connection::FeatureConnected);
|
|
||||||
|
|
||||||
Tp::ChannelFactoryPtr channelFactory = Tp::ChannelFactory::create(QDBusConnection::sessionBus());
|
|
||||||
Tp::Features textFeatures = Tp::Features() << Tp::TextChannel::FeatureMessageQueue
|
|
||||||
<< Tp::TextChannel::FeatureMessageSentSignal
|
|
||||||
<< Tp::TextChannel::FeatureChatState
|
|
||||||
<< Tp::TextChannel::FeatureMessageCapabilities;
|
|
||||||
|
|
||||||
channelFactory->addCommonFeatures(Tp::Channel::FeatureCore);
|
|
||||||
channelFactory->addFeaturesForTextChats(textFeatures);
|
|
||||||
|
|
||||||
m_simAccount = Tp::Account::create(TP_QT_ACCOUNT_MANAGER_BUS_NAME, QStringLiteral("/org/freedesktop/Telepathy/Account/ofono/ofono/account0"), connectionFactory, channelFactory);
|
|
||||||
Tp::PendingReady *op = m_simAccount->becomeReady(Tp::Features() << Tp::Account::FeatureCore);
|
|
||||||
|
|
||||||
connect(op, &Tp::PendingOperation::finished, [=](){
|
|
||||||
if (op->isError()) {
|
|
||||||
qWarning() << "SIM card account failed to get ready:" << op->errorMessage();
|
|
||||||
} else {
|
|
||||||
qDebug() << "SIM Account ready to use";
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
void TpCaller::dial(const QString &number)
|
|
||||||
{
|
|
||||||
// FIXME: this should be replaced by kpeople thing
|
|
||||||
auto pendingContact = m_simAccount->connection()->contactManager()->contactsForIdentifiers(QStringList() << number);
|
|
||||||
|
|
||||||
connect(pendingContact, &Tp::PendingOperation::finished, [=](){
|
|
||||||
if (pendingContact->contacts().size() < 1) {
|
|
||||||
qWarning() << " no contacts";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
qDebug() << "Starting call...";
|
|
||||||
Tp::PendingChannel *pendingChannel = m_simAccount->ensureAndHandleAudioCall(pendingContact->contacts().first());
|
|
||||||
connect(pendingChannel, &Tp::PendingChannel::finished, [=](){
|
|
||||||
if (pendingChannel->isError()) {
|
|
||||||
qWarning() << "Error when requesting channel" << pendingChannel->errorMessage();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
m_callChannel = Tp::CallChannelPtr(qobject_cast<Tp::CallChannel*>(pendingChannel->channel().data()));
|
|
||||||
connect(m_callChannel.data(), &Tp::Channel::invalidated, this, &TpCaller::callInProgressChanged);
|
|
||||||
connect(m_callChannel.data(), &Tp::CallChannel::callStateChanged, this, &TpCaller::callInProgressChanged);
|
|
||||||
Q_EMIT callInProgressChanged();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
bool TpCaller::callInProgress()
|
|
||||||
{
|
|
||||||
return m_callChannel && m_callChannel->isValid();
|
|
||||||
}
|
|
||||||
|
|
||||||
void TpCaller::hangUp()
|
|
||||||
{
|
|
||||||
if (m_callChannel && m_callChannel->isValid() && m_callChannel->connection()) {
|
|
||||||
qDebug() << "Hanging up";
|
|
||||||
Tp::PendingOperation *op = m_callChannel->hangup();
|
|
||||||
connect(op, &Tp::PendingOperation::finished, [=]() {
|
|
||||||
if (op->isError()) {
|
|
||||||
qWarning() << "Unable to hang up:" << op->errorMessage();
|
|
||||||
}
|
|
||||||
m_callChannel->requestClose();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,47 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright (C) 2015 Martin Klapetek <mklapetek@kde.org>
|
|
||||||
|
|
||||||
This library is free software; you can redistribute it and/or
|
|
||||||
modify it under the terms of the GNU Lesser General Public
|
|
||||||
License as published by the Free Software Foundation; either
|
|
||||||
version 2.1 of the License, or (at your option) any later version.
|
|
||||||
|
|
||||||
This library is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
Lesser General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Lesser General Public
|
|
||||||
License along with this library; if not, write to the Free Software
|
|
||||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef TPCALLER_H
|
|
||||||
#define TPCALLER_H
|
|
||||||
|
|
||||||
#include <QObject>
|
|
||||||
#include <TelepathyQt/Account>
|
|
||||||
#include <TelepathyQt/CallChannel>
|
|
||||||
|
|
||||||
class TpCaller : public QObject
|
|
||||||
{
|
|
||||||
Q_OBJECT
|
|
||||||
Q_PROPERTY(bool callInProgress READ callInProgress NOTIFY callInProgressChanged);
|
|
||||||
|
|
||||||
public:
|
|
||||||
TpCaller(QObject *parent = 0);
|
|
||||||
Q_INVOKABLE void dial(const QString &number);
|
|
||||||
Q_INVOKABLE void hangUp();
|
|
||||||
|
|
||||||
bool callInProgress();
|
|
||||||
|
|
||||||
Q_SIGNALS:
|
|
||||||
void callInProgressChanged();
|
|
||||||
|
|
||||||
private:
|
|
||||||
Tp::AccountPtr m_simAccount;
|
|
||||||
Tp::CallChannelPtr m_callChannel;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif // TPCALLER_H
|
|
||||||
|
|
||||||
Loading…
Reference in a new issue