diff --git a/html/content.html b/html/content.html
index bbcd5f5..b51f73f 100644
--- a/html/content.html
+++ b/html/content.html
@@ -4,7 +4,93 @@
TTRSS
-
+
diff --git a/html/content.js b/html/content.js
deleted file mode 100644
index 2d88c4e..0000000
--- a/html/content.js
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * This file is part of FeedTheMonkey.
- *
- * Copyright 2015 Jeena
- *
- * FeedTheMonkey is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * FeedTheMonkey 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with FeedTheMonkey. If not, see .
- */
-
-function $(id) {
- return document.getElementById(id);
-}
-
-function setArticle(article) {
- window.scrollTo(0, 0);
-
- $("date").innerHTML = "";
- $("title").innerHTML = "";
- $("title").href = "";
- $("title").title = "";
- $("feed_title").innerHTML = "";
- $("author").innerHTML = "";
- $("article").innerHTML = "";
-
- if(article === "empty") {
-
- $("article").innerHTML = "No unread articles to display.";
-
- } else if(article === "loading") {
-
- $("article").innerHTML = "Loading ";
-
- } else if (article === "logout") {
-
- } else if(article) {
-
- $("date").innerHTML = (new Date(parseInt(article.updated, 10) * 1000));
- $("title").innerHTML = article.title;
- $("title").href = article.link;
- $("title").title = article.link;
- $("feed_title").innerHTML = article.feed_title;
- $("title").className = article.marked ? "starred" : "";
- $("author").innerHTML = "";
- if(article.author && article.author.length > 0)
- $("author").innerHTML = "– " + article.author
- $("article").innerHTML = article.content;
-
- var as = $("article").getElementsByTagName("a");
- for(var i = 0; i < as.length; i++) {
- as[i].target = "";
- }
- }
-}
-
-function setFont(font, size) {
- document.body.style.fontFamily = font;
- document.body.style.fontSize = size + "pt";
-}
-
-function setNightmode(nightmode) {
- if(nightmode) document.body.className = "nightmode";
- else document.body.className = "";
-}
-
-document.onkeydown = checkKey;
-
-function checkKey(e) {
- e = e || window.event;
- if (e.keyCode == '37') {
- window.location.href = "feedthemonkey:previous";
- }
- else if (e.keyCode == '39') {
- window.location.href = "feedthemonkey:next";
- }
-}
diff --git a/html/html.qrc b/html/html.qrc
index 90d8b19..c6cf166 100644
--- a/html/html.qrc
+++ b/html/html.qrc
@@ -2,6 +2,5 @@
content.css
content.html
- content.js
diff --git a/qml/main.qml b/qml/main.qml
index 7746367..a5fcbcb 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -60,7 +60,6 @@ ApplicationWindow {
__contentItem.visible: visible
}
-
Settings {
id: settings
category: "window"
diff --git a/src/tinytinyrsslogin.cpp b/src/tinytinyrsslogin.cpp
index 78fcd9f..2648e7a 100644
--- a/src/tinytinyrsslogin.cpp
+++ b/src/tinytinyrsslogin.cpp
@@ -99,6 +99,18 @@ void TinyTinyRSSLogin::reply()
qWarning() << mLoginError;
emit loginErrorChanged(mLoginError);
+ if(mLoginError == "NOT_LOGGED_IN") {
+ mSessionId = nullptr;
+ mServerUrl = nullptr;
+
+ QSettings settings;
+ settings.remove("sessionId");
+ settings.remove("serverUrl");
+ settings.sync();
+
+ emit sessionIdChanged(mSessionId);
+ }
+
} else {
mSessionId = json.object().value("content").toObject().value("session_id").toString();