medvedych/harbour-seaprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove secure/taint indicator and related functionality

Browse source
This commit is contained in:
Anton Thomasson 2021-11-15 22:00:30 +01:00
parent e918b8784a
commit 76e579532a
3 changed files with 5 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
qml/pages/FirstPage.qml
View file

@ -265,23 +265,12 @@ Page {
+ (Utils.existsAndNotEmpty("printer-location", printer) ? " • "+printer.attrs["printer-location"].value : "") + (Utils.existsAndNotEmpty("printer-location", printer) ? " • "+printer.attrs["printer-location"].value : "")
} }
Row {
Icon {
visible: printer.isIpps && !printer.tainted
color: canPrint || selectedFile == "" ? Theme.highlightColor : Theme.secondaryColor
height: Theme.fontSizeTiny
width: Theme.fontSizeTiny
anchors.verticalCenter: parent.verticalCenter
source: "image://theme/icon-m-browser-permissions"
}
Label { Label {
id: uri_label id: uri_label
color: canPrint || selectedFile == "" ? Theme.highlightColor : Theme.secondaryColor color: canPrint || selectedFile == "" ? Theme.highlightColor : Theme.secondaryColor
font.pixelSize: Theme.fontSizeTiny font.pixelSize: Theme.fontSizeTiny
text: printer.url text: printer.url
} }
}
Row { Row {
spacing: Theme.paddingMedium spacing: Theme.paddingMedium

12
src/ippprinter.cpp
View file

@ -33,7 +33,6 @@ IppPrinter::IppPrinter()
qRegisterMetaType<QMargins>(); qRegisterMetaType<QMargins>();
_workerThread.start(); _workerThread.start();
_tainted = false;
} }
IppPrinter::~IppPrinter() { IppPrinter::~IppPrinter() {
@ -249,12 +248,6 @@ void IppPrinter::cancelJobFinished(CURLcode res, QByteArray data)
getJobs(); getJobs();
} }
void IppPrinter::onSslErrors(QNetworkReply *reply, const QList<QSslError> &errors)
{
_tainted = true;
emit taintedChanged();
return ignoreSslErrors(reply, errors);
}
void IppPrinter::ignoreSslErrors(QNetworkReply *reply, const QList<QSslError> &errors) void IppPrinter::ignoreSslErrors(QNetworkReply *reply, const QList<QSslError> &errors)
{ {
@ -655,11 +648,6 @@ bool IppPrinter::cancelJob(qint32 jobId) {
return true; return true;
} }
bool IppPrinter::isIpps()
{
return _url.scheme() == "ipps";
}
bool IppPrinter::correctSuffix() bool IppPrinter::correctSuffix()
{ {
foreach(QJsonValue u, _attrs["printer-uri-supported"].toObject()["value"].toArray()) foreach(QJsonValue u, _attrs["printer-uri-supported"].toObject()["value"].toArray())

6
src/ippprinter.h
View file

@ -22,8 +22,6 @@ class IppPrinter : public QObject
Q_PROPERTY(QString busyMessage MEMBER _busyMessage NOTIFY busyMessageChanged) Q_PROPERTY(QString busyMessage MEMBER _busyMessage NOTIFY busyMessageChanged)
Q_PROPERTY(QString progress MEMBER _progress NOTIFY progressChanged) Q_PROPERTY(QString progress MEMBER _progress NOTIFY progressChanged)
Q_PROPERTY(bool tainted MEMBER _tainted NOTIFY taintedChanged)
Q_PROPERTY(bool isIpps READ isIpps NOTIFY urlChanged)
Q_PROPERTY(bool correctSuffix READ correctSuffix NOTIFY attrsChanged) Q_PROPERTY(bool correctSuffix READ correctSuffix NOTIFY attrsChanged)
Q_PROPERTY(QStringList suffixes READ suffixes NOTIFY attrsChanged) Q_PROPERTY(QStringList suffixes READ suffixes NOTIFY attrsChanged)
@ -40,7 +38,6 @@ public:
Q_INVOKABLE bool getJobs(); Q_INVOKABLE bool getJobs();
Q_INVOKABLE bool cancelJob(qint32 jobId); Q_INVOKABLE bool cancelJob(qint32 jobId);
bool isIpps();
bool correctSuffix(); bool correctSuffix();
QStringList suffixes(); QStringList suffixes();
@ -80,7 +77,6 @@ signals:
void additionalDocumentFormatsChanged(); void additionalDocumentFormatsChanged();
void busyMessageChanged(); void busyMessageChanged();
void progressChanged(); void progressChanged();
void taintedChanged();
public slots: public slots:
void print(QJsonObject attrs, QString file); void print(QJsonObject attrs, QString file);
@ -93,7 +89,6 @@ public slots:
void getJobsRequestFinished(CURLcode res, QByteArray data); void getJobsRequestFinished(CURLcode res, QByteArray data);
void cancelJobFinished(CURLcode res, QByteArray data); void cancelJobFinished(CURLcode res, QByteArray data);
void onSslErrors(QNetworkReply *reply, const QList<QSslError> &errors);
static void ignoreSslErrors(QNetworkReply *reply, const QList<QSslError> &errors); static void ignoreSslErrors(QNetworkReply *reply, const QList<QSslError> &errors);
void convertFailed(QString message); void convertFailed(QString message);
@ -126,7 +121,6 @@ private:
QThread _workerThread; QThread _workerThread;
ConvertWorker* _worker; ConvertWorker* _worker;
bool _tainted;
}; };
#endif // IPPPRINTER_H #endif // IPPPRINTER_H