diff options
| author | Jan Lukas Gernert <jangernert@gmail.com> | 2019-12-19 16:14:14 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-19 16:14:14 +0300 |
| commit | cf1be176c1e4275d51e1e8888e3b338cb5b318f3 (patch) | |
| tree | fe3805eb081c7cdfb6b68070401765aec4f3f551 | |
| parent | b6ae8f05663616be293c6cf088c4eb00ac03083d (diff) | |
| parent | 376ed73f36d3a99f0313ea104a835b40430e03ca (diff) | |
Merge pull request #957 from tytan652/fix-freshrss
fix: freshrss with yunohost-like solutions
| -rw-r--r-- | plugins/backend/fresh/fresh.plugin | 2 | ||||
| -rw-r--r-- | plugins/backend/fresh/freshAPI.vala | 2 | ||||
| -rw-r--r-- | plugins/backend/fresh/freshInterface.vala | 2 | ||||
| -rw-r--r-- | 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 <jangernert@gmail.com> 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..3cce5bdd 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 getURL()[0:-12]; + } + public string getPasswd() { return m_password.get_password(); |