From 6665ab324191e0c3a274d1035a0c154e685f1121 Mon Sep 17 00:00:00 2001 From: tytan652 <17492366+tytan652@users.noreply.github.com> Date: Wed, 23 Oct 2019 16:28:47 +0200 Subject: fix: freshrss with yunohost-like solutions --- plugins/backend/fresh/fresh.plugin | 2 +- plugins/backend/fresh/freshAPI.vala | 2 +- plugins/backend/fresh/freshInterface.vala | 2 +- plugins/backend/fresh/freshUtils.vala | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/plugins/backend/fresh/fresh.plugin b/plugins/backend/fresh/fresh.plugin index 6b5c598c..ea74fbcc 100644 --- a/plugins/backend/fresh/fresh.plugin +++ b/plugins/backend/fresh/fresh.plugin @@ -2,7 +2,7 @@ Module=fresh Loader=C Name=freshRSS -Version=0.1 +Version=0.2 Description=Add freshRSS backend to FeedReader Authors=Jan Lukas Gernert Copyright=Copyright © 2015-16 Jan Lukas Gernert diff --git a/plugins/backend/fresh/freshAPI.vala b/plugins/backend/fresh/freshAPI.vala index f882b188..98a3c50a 100644 --- a/plugins/backend/fresh/freshAPI.vala +++ b/plugins/backend/fresh/freshAPI.vala @@ -28,7 +28,7 @@ public class FeedReader.freshAPI : Object { { Logger.debug("fresh backend: login"); - if(!Utils.ping(m_utils.getUnmodifiedURL())) + if(!Utils.ping(m_utils.getApiURL())) // Ping with api URL { return LoginResponse.NO_CONNECTION; } diff --git a/plugins/backend/fresh/freshInterface.vala b/plugins/backend/fresh/freshInterface.vala index 72656f77..27583fad 100644 --- a/plugins/backend/fresh/freshInterface.vala +++ b/plugins/backend/fresh/freshInterface.vala @@ -265,7 +265,7 @@ public class FeedReader.freshInterface : FeedServerInterface { public override bool serverAvailable() { - return Utils.ping(m_utils.getUnmodifiedURL()); + return Utils.ping(m_utils.getApiURL()); // Ping with api URL } public override void setArticleIsRead(string articleIDs, ArticleStatus read) diff --git a/plugins/backend/fresh/freshUtils.vala b/plugins/backend/fresh/freshUtils.vala index 4f04e294..107bcc3a 100644 --- a/plugins/backend/fresh/freshUtils.vala +++ b/plugins/backend/fresh/freshUtils.vala @@ -117,6 +117,11 @@ public class FeedReader.freshUtils : GLib.Object { return Utils.gsettingReadString(m_settings, "url"); } + public string getApiURL() + { + return Utils.gsettingReadString(m_settings, "url")[0:-12]; + } + public string getPasswd() { return m_password.get_password(); -- cgit v1.2.3 From 376ed73f36d3a99f0313ea104a835b40430e03ca Mon Sep 17 00:00:00 2001 From: tytan652 <17492366+tytan652@users.noreply.github.com> Date: Wed, 23 Oct 2019 18:38:10 +0200 Subject: hotfix: use getURL in getApiURL --- plugins/backend/fresh/freshUtils.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/backend/fresh/freshUtils.vala b/plugins/backend/fresh/freshUtils.vala index 107bcc3a..3cce5bdd 100644 --- a/plugins/backend/fresh/freshUtils.vala +++ b/plugins/backend/fresh/freshUtils.vala @@ -119,7 +119,7 @@ public class FeedReader.freshUtils : GLib.Object { public string getApiURL() { - return Utils.gsettingReadString(m_settings, "url")[0:-12]; + return getURL()[0:-12]; } public string getPasswd() -- cgit v1.2.3