jeena/FeedMonkey
Archived
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Issue #30 : Handle the NOT_LOGGED_IN errors that can come from tt-rss backends. It currently asks the user to type the login/password again, which is not ideal. But at least he can access his unread articles again.

Browse source
This commit is contained in:
mossroy 2014-08-06 12:18:27 +02:00
parent dfcc5ba27a
commit 3f75c49e3e
1 changed files with 39 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

66
js/App.js
View file

@ -162,35 +162,47 @@ App.prototype.reload = function() {
App.prototype.gotUnreadFeeds = function(new_articles) { App.prototype.gotUnreadFeeds = function(new_articles) {
if(new_articles == null || !this.validate(new_articles)) { // on error load the saved unread articles. if(new_articles == null || !this.validate(new_articles)) {
var old_articles = localStorage.unread_articles; // Check if we did not get a NOT_LOGGED_IN error, and ask the
if(old_articles) { // user to login again if it is the case.
this.unread_articles = JSON.parse(old_articles); // This can happen with TT-RSS backend
} if (new_articles.error && new_articles.error === "NOT_LOGGED_IN") {
this.populateList(); $("#url").value = localStorage.server_url;
$("#login form").backend[0].checked = true;
alert("Your TinyTinyRSS session has expired. Please login again");
this.login.log_in();
}
else {
// On other errors, load the saved unread articles.
var old_articles = localStorage.unread_articles;
if(old_articles) {
this.unread_articles = JSON.parse(old_articles);
}
this.populateList();
}
} else { } else {
this.unread_articles = this.unread_articles.concat(new_articles);
this.unread_articles = this.unread_articles.concat(new_articles); if(new_articles.length > 0) {
try {
if(new_articles.length > 0) { //To check if when it fails it is the same
try { localStorage.unread_articles = JSON.stringify(this.unread_articles);
//To check if when it fails it is the same var size = parseInt(localStorage.maxDownload);
localStorage.unread_articles = JSON.stringify(this.unread_articles); if(localStorage.unread_articles.length < size) {
var size = parseInt(localStorage.maxDownload); var num = parseInt(localStorage.numArticles);
if(localStorage.unread_articles.length < size) { this.backend.getUnreadFeeds(this.gotUnreadFeeds.bind(this), this.unread_articles,num);
var num = parseInt(localStorage.numArticles); } else {
this.backend.getUnreadFeeds(this.gotUnreadFeeds.bind(this), this.unread_articles,num); alert("Limit size reached: Downloaded: " + this.unread_articles.length + " articles. Reached: " + localStorage.unread_articles.length +" bytes");
} else { }
alert("Limit size reached: Downloaded: " + this.unread_articles.length + " articles. Reached: " + localStorage.unread_articles.length +" bytes"); }
} catch (e) {
} alert("Reached maximum memory by app " + e.name + " " + e.message + ". We will keep working in anycase with: " + localStorage.unread_articles.length);
catch (e) { }
alert("Reached maximum memory by app " + e.name + " " + e.message + ". We will keep working in anycase with: " + localStorage.unread_articles.length); this.populateList();
} }
this.populateList();
}
} }
}; };