Skip to content

Commit

Permalink
BB10 1.0.0.4 Alerts if URL not valid/reachable
Browse files Browse the repository at this point in the history
  • Loading branch information
@linuxq
linuxq committed Feb 11, 2014
1 parent 56057af commit b5b770b
Show file tree
Hide file tree
Showing 7 changed files with 151 additions and 117 deletions.
2 changes: 1 addition & 1 deletion bb10/config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<widget xmlns="http://www.w3.org/ns/widgets"
xmlns:rim="http://www.blackberry.com/ns/widgets"
version="1.0.0.3" id="com.meissel.ttrssreader">
version="1.0.0.4" id="com.meissel.ttrssreader">

<name>TE-Reader</name>

Expand Down
59 changes: 28 additions & 31 deletions build/app.js
View file

Large diffs are not rendered by default.

Binary file added com.meissel.ttrssreader_1.0.0_all.ipk
View file
Binary file not shown.
59 changes: 28 additions & 31 deletions deploy/tt-rssenyo/build/app.js
View file

Large diffs are not rendered by default.

7 changes: 2 additions & 5 deletions deploy/tt-rssenyo/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,17 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>Tiny Tiny RSS Reader</title>
<link rel="shortcut icon" href="assets/favicon.ico"/>
<link rel="stylesheet" href="css/bbui.css" type="text/css" media="screen" />
<!-- -->
<meta http-equiv="Content-Type" content="text/html; charset=utf8"/>
<meta name="apple-mobile-web-app-capable" content="yes"/>
<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
<!-- css -->
<link href="build/enyo.css" rel="stylesheet"/>
<link href="build/app.css" rel="stylesheet"/>
<link href="css/bbui.css" rel="stylesheet"/>
<!-- js -->
<script src="build/enyo.js"></script>
<script src="build/app.js"></script>
<script src="build/bbui.js" type="text/javascript"></script>
<script src="local:///chrome/webworks.js" type="text/javascript"></script>
<script src="build/app.js"></script>

<script src="helper.js" type="text/javascript"></script>
</head>
<body class="enyo-unselectable">
Expand Down
120 changes: 71 additions & 49 deletions source/App.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -592,31 +592,31 @@ enyo.kind({
if (gblBB10 && startcount>=2) {
//setTimeout(enyo.bind(this, "LoginTap"), 500);
//blackberry.ui.toast.show("No TinyTinyRSS-Server set up!");
var message = "IMPORTANT!\n\n No Server specified!\n\nPlease enter your TinyTiny RSS Server URL and login credentials. TE-Reader needs access to an instance.\n\nMore info about the open source TinyTiny RSS server can be found at: http://tt-rss.org",
buttonText = "Ok",
toastId,
options = {
buttonText : buttonText,
timeout : 15000
};
toastId = blackberry.ui.toast.show(message, options);
this.multialert("IMPORTANT!\n\nNo Server specified!\n\nPlease enter your TinyTiny RSS Server URL and login credentials. TE-Reader needs access to an instance.\n\nMore info about the open source TinyTiny RSS server can be found at: http://tt-rss.org", "", 15000);
setTimeout(enyo.bind(this, "LoginTap"), 500);
} else if (!gblBB10) {
this.multialert("IMPORTANT!\n\nNo Server specified!\n\nPlease enter your TinyTiny RSS Server URL and login credentials. TE-Reader needs access to an instance.\n\nMore info about the open source TinyTiny RSS server can be found at: http://tt-rss.org", "", 15000);
setTimeout(enyo.bind(this, "LoginTap"), 500);
};
startcount++;
//this.LoginTap();
//this.$.LoginPopup.show();
} else {
ttrssLogin(this.ttrssURL, this.ttrssUser, this.ttrssPassword, enyo.bind(this, "processLoginSuccess"), enyo.bind(this, "processLoginError"));
/*var getUnreadOnly = this.$.toggleUnread.getValue();
if (this.AutoLoadAllArticles) {
ttrssGetHeadlines(this.ttrssURL, this.ttrss_SID, getUnreadOnly, -4, false, enyo.bind(this, "processGetHeadlinesSuccess"), enyo.bind(this, "processGetHeadlinesError"));
} else
{
ttrssGetHeadlines(this.ttrssURL, this.ttrss_SID, getUnreadOnly, 29, false, enyo.bind(this, "processGetHeadlinesSuccess"), enyo.bind(this, "processGetHeadlinesError"));
}
*/
chkURL = CheckUrl(this.ttrssURL);
if (!chkURL) {
if (gblBB10 && startcount>=2) {
this.multialert("CAUTION:\n\nURL doesn't exist or is not reachable!","", 15000);
setTimeout(enyo.bind(this, "LoginTap"), 500);
} else if (!gblBB10) {
this.multialert("CAUTION:\n\nURL doesn't exist or is not reachable!","", 15000);
setTimeout(enyo.bind(this, "LoginTap"), 500);
};
} else {
if (gblBB10 && startcount>=2) {
ttrssLogin(this.ttrssURL, this.ttrssUser, this.ttrssPassword, enyo.bind(this, "processLoginSuccess"), enyo.bind(this, "processLoginError"));
} else if (!gblBB10) {
ttrssLogin(this.ttrssURL, this.ttrssUser, this.ttrssPassword, enyo.bind(this, "processLoginSuccess"), enyo.bind(this, "processLoginError"));
};
};
startcount++;
};
if (window.innerWidth < 1024) {
this.$.btnFullArticle.setShowing(false);
Expand Down Expand Up @@ -797,8 +797,9 @@ enyo.kind({
this.$.chkArticleRead.setShowing(false);
},
LoginClose: function(inSender, inEvent){
if (this.ttrssURL=="") {
alert("Caution: No Url specified!");
console.log("URL:" + this.ttrssURL + ":");
if (this.ttrssURL=="" || !this.ttrssURL) {
this.multialert("Caution: No Url specified!", "Login error", 5000);
};
this.$.LoginPopup.hide();
this.$.viewPanels.setShowing(true);
Expand All @@ -810,8 +811,9 @@ enyo.kind({
this.ttrssUser = this.$.serverUser.getValue();
this.ttrssPassword = this.$.serverPassword.getValue();
if (this.ttrssURL=="" || this.ttrssUser=="" || this.ttrssPassword=="") {
alert("You must enter Url, user and password!");
} else {
this.multialert("You must enter Url, user and password!", "Caution", 15000);
} else {
console.log(this.ViewMode);
this.ViewMode = this.$.pickViewMode.getSelected().value;
this.AutoLoadFirstFeed = this.$.autoLoadFirstFeed.getValue();
this.AutoLockPanels = this.$.autoLockPanels.getValue();
Expand All @@ -831,23 +833,20 @@ enyo.kind({
localStorage.setItem("instapaperUser", this.instapaperUser);
localStorage.setItem("instapaperPW", this.instapaperPW);

//Notification
if (gblBB10 && this.AutoLockPanels) {
var message = "You selected 'swipeable article view': In article view you can swipe left and right to load the next or previous article. Simply hit 'Back' to go back to list view.",
buttonText = "Ok",
toastId,
options = {
buttonText : buttonText,
timeout : 15000
};
toastId = blackberry.ui.toast.show(message, options);
};

this.$.LoginPopup.hide();
ttrssLogin(this.ttrssURL, this.ttrssUser, this.ttrssPassword, enyo.bind(this, "processLoginSuccess"), enyo.bind(this, "processLoginError"));
this.$.viewPanels.setShowing(true);
this.swipeup();
this.resize();
chkURL = CheckUrl(this.ttrssURL);
if (!chkURL) {
this.multialert("CAUTION:\n\nURL doesn't exist or is not reachable!","", 15000);
} else {
//Notification
if (gblBB10 && this.AutoLockPanels && this.ViewMode==0) {
this.multialert("Hint:\n\n'Swipeable article view': In article view you can swipe left and right to load the next or previous article. Simply hit 'Back' to go back to list view.", "", 15000);
};
this.$.LoginPopup.hide();
ttrssLogin(this.ttrssURL, this.ttrssUser, this.ttrssPassword, enyo.bind(this, "processLoginSuccess"), enyo.bind(this, "processLoginError"));
this.$.viewPanels.setShowing(true);
this.swipeup();
this.resize();
}
}
},
LoginTap: function(inSender, inEvent) {
Expand Down Expand Up @@ -906,13 +905,17 @@ enyo.kind({
this.changeViewMode();
},
changeViewMode: function(inSender, inEvent) {
if (gblBB10) {
this.$.autoLockPanels.setShowing(false);
};
if (this.ViewMode == "1") {
this.$.articlePreviewScroller.setShowing(true);
this.$.articleViewScroller.setShowing(false);
this.$.body.setShowing(false);
if (gblBB10) {
this.$.FeedListPageUpButton.setShowing(false);
this.$.FeedListPageDownButton.setShowing(false);
this.$.autoLockPanels.setShowing(false);
} else {
this.$.FeedListPageUpButton.setShowing(true);
this.$.FeedListPageDownButton.setShowing(true);
Expand Down Expand Up @@ -960,12 +963,12 @@ enyo.kind({
processLoginError: function(LoginResponse) {
//LoginResponse = inResponse;
console.error("LOGIN Error: " + LoginResponse.error);
alert("LOGIN Error: " + LoginResponse.error);
this.multialert("LOGIN Error: " + LoginResponse.error, "Login Error", 10000);
this.$.main.setContent("LOGIN ERROR: " + LoginResponse.error);
setTimeout(enyo.bind(this, "LoginTap"), 500);
},
clickRefresh: function(inSender, inEvent){
console.error("clickRefresh");
//console.error("clickRefresh");
this.getCategories();
},
getCategories: function (inSender){
Expand All @@ -981,7 +984,7 @@ enyo.kind({
if (inEvent.length == 0) {
this.debugconsole("GetCategories: NO Categories");
this.setLoadbar(false);
alert("Sorry, no news!");
this.multialert("Sorry, no news!", " ", 5000);
this.setLoadbar(false);
return;
};
Expand Down Expand Up @@ -1036,7 +1039,7 @@ enyo.kind({
processGetCategoriesError: function(inEvent){
console.error("processGetCategoriesError");
console.error(inEvent);
alert(inEvent);
this.multialert(inEvent, "Get Categories Error", 10000);
this.setLoadbar(false);
},
getFeeds: function(inSender, inEvent){
Expand Down Expand Up @@ -1515,11 +1518,15 @@ enyo.kind({
}
},
addFeedClick: function(inSender, inEvent) {
this.$.AddFeedCategory.setContent(this.CategoryTitle[this.currentCategoryIndex]);
this.$.AddFeedPopup.show();
if (gblBB10) {
this.debugconsole("IN CLIPBOARD: " + community.clipboard.getText());
this.$.AddFeedURL.setValue(community.clipboard.getText());
if (this.currentCategoryIndex==0) {
this.multialert("Select category first","",5000);
} else {
this.$.AddFeedCategory.setContent(this.CategoryTitle[this.currentCategoryIndex]);
this.$.AddFeedPopup.show();
if (gblBB10) {
this.debugconsole("IN CLIPBOARD: " + community.clipboard.getText());
this.$.AddFeedURL.setValue(community.clipboard.getText());
}
}
},
addFeedSave: function(inSender, inEvent) {
Expand Down Expand Up @@ -2185,5 +2192,20 @@ enyo.kind({
to: ["apps@meissel.com"]
})
}
},
multialert: function (message, titel, timeout) {
if (gblBB10) {
var bbmessage = message,
buttonText = "Ok",
toastId,
options = {
buttonText : buttonText,
timeout : timeout
};
toastId = blackberry.ui.toast.show(message, options);

} else{
alert(message);
}
}
});
21 changes: 21 additions & 0 deletions source/ttrss.js
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
//***************** Check URL ****************
function CheckUrl(chkurl) {
var xhr = new XMLHttpRequest();
var file = chkurl; //
var randomNum = Math.round(Math.random() * 10000);

xhr.open('HEAD', file + "?rand=" + randomNum, false);

try {
xhr.send();

if (xhr.status >= 200 && xhr.status < 304) {
return true;
} else {
return false;
}
} catch (e) {
return false;
}
};

//**************** Login ********************
function ttrssLogin(ttrssurl, ttrssuser, ttrsspassword, successCallback, errorCallback) {
var data = {
Expand Down

0 comments on commit b5b770b

Please sign in to comment.