FreshRSS/rssguard
1
0
Fork 0
mirror of https://github.com/martinrotter/rssguard.git synced 2024-12-27 08:33:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

save¨

Browse Source
This commit is contained in:
Martin Rotter 2021-01-29 14:41:31 +01:00
parent b0e5773b22
commit 85e5fd1560
4 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/librssguard/miscellaneous/databasequeries.cpp
View File

@ -2447,6 +2447,15 @@ QList<ServiceRoot*> DatabaseQueries::getStandardAccounts(const QSqlDatabase& db,
return roots;
}
bool DatabaseQueries::deleteGreaderAccount(const QSqlDatabase& db, int account_id) {
QSqlQuery q(db);
q.setForwardOnly(true);
q.prepare(QSL("DELETE FROM GoogleReaderApiAccounts WHERE id = :id;"));
q.bindValue(QSL(":id"), account_id);
return q.exec();
}
bool DatabaseQueries::deleteTtRssAccount(const QSqlDatabase& db, int account_id) {
QSqlQuery q(db);

1
src/librssguard/miscellaneous/databasequeries.h
View File

@ -149,6 +149,7 @@ class DatabaseQueries {
static void fillFeedData(T* feed, const QSqlRecord& sql_record);
// Greader account.
static bool deleteGreaderAccount(const QSqlDatabase& db, int account_id);
static QList<ServiceRoot*> getGreaderAccounts(const QSqlDatabase& db, bool* ok = nullptr);
static bool createGreaderAccount(const QSqlDatabase& db, int id_to_assign, const QString& username,
const QString& password, GreaderServiceRoot::Service service,

2
src/librssguard/services/greader/greadernetwork.cpp
View File

@ -254,7 +254,7 @@ RootItem* GreaderNetwork::decodeTagsSubscriptions(const QString& categories, con
QByteArray icon_data;
if (icon_url.startsWith(QSL("//"))) {
icon_url = QSL("https:") + icon_url;
icon_url = QUrl(baseUrl()).scheme() + QSL(":") + icon_url;
}
if (NetworkFactory::performNetworkOperation(icon_url, timeout,

9
src/librssguard/services/greader/greaderserviceroot.cpp
View File

@ -42,7 +42,14 @@ bool GreaderServiceRoot::editViaGui() {
}
bool GreaderServiceRoot::deleteViaGui() {
return false;
QSqlDatabase database = qApp->database()->connection(metaObject()->className());
if (DatabaseQueries::deleteGreaderAccount(database, accountId())) {
return ServiceRoot::deleteViaGui();
}
else {
return false;
}
}
void GreaderServiceRoot::start(bool freshly_activated) {