MorsMortium/Friendiqa
1
0
Fork 0
forked from lubuwest/Friendiqa
Code Pull requests Activity

more detailed error message

Browse source
This commit is contained in:
LubuWest 2017-11-25 21:39:14 +01:00
parent de4bbcc137
commit 49bcba0656
3 changed files with 73 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Friendiqa_v0.1.1.apk
View file

Binary file not shown.

24
source-android/js/helper.js
View file

@ -4,17 +4,16 @@
function friendicaRequest(login,api,rootwindow,callback) { function friendicaRequest(login,api,rootwindow,callback) {
var xhrequest= new XMLHttpRequest(); var xhrequest= new XMLHttpRequest();
xhrequest.onreadystatechange = function() { xhrequest.onreadystatechange = function() {
//print(api+JSON.stringify(login));
if(xhrequest.readyState === XMLHttpRequest.DONE) { if(xhrequest.readyState === XMLHttpRequest.DONE) {
try{ if (xhrequest.status=200){ //if (xhrequest.responseText!=""){ try{
if (xhrequest.status=200){
callback(xhrequest.responseText) callback(xhrequest.responseText)
}else{ }else{
showMessage("Error","API:" +login.server+api+"\n NO RESPONSE"+xhrequest.statusText,rootwindow); showMessage("Error","API:" +login.server+api+"\n NO RESPONSE"+xhrequest.statusText,rootwindow);
//callback(xhrequest.responseText)
} }
} }
catch (e){print(e); catch (e){
showMessage("Error", xhrequest.responseText,rootwindow) showMessage("Error", login.server+api+"\n"+e+"\n Return: "+xhrequest.responseText,rootwindow)
} }
} }
} }
@ -35,9 +34,7 @@ function friendicaPostRequest(login,api,data,method,rootwindow,callback) {
callback(xhrequest.responseText) callback(xhrequest.responseText)
} }
} }
catch (e){ catch (e){showMessage("Error", api+" "+e+"\n Return:"+xhrequest.responseText,rootwindow)}
showMessage("Error", api+" "+e,rootwindow)
}
} }
} }
xhrequest.open(method, login.server+api,true,login.username,Qt.atob(login.password)); xhrequest.open(method, login.server+api,true,login.username,Qt.atob(login.password));
@ -57,13 +54,10 @@ function getCount(database,login,table,field,countvalue){
function friendicaWebRequest(url,rootwindow,callback) { function friendicaWebRequest(url,rootwindow,callback) {
var xhrequest = new XMLHttpRequest(); var xhrequest = new XMLHttpRequest();
xhrequest.onreadystatechange = function() { xhrequest.onreadystatechange = function() {
if (xhrequest.readyState === XMLHttpRequest.HEADERS_RECEIVED) { if (xhrequest.readyState === XMLHttpRequest.HEADERS_RECEIVED) {}
} else if(xhrequest.readyState === XMLHttpRequest.DONE) { else if(xhrequest.readyState === XMLHttpRequest.DONE) {
try{ callback(xhrequest.responseText); try{callback(xhrequest.responseText)}
} catch (e){showMessage("Error",url+" "+e+"\n Return: "+xhrequest.responseText, rootwindow)}
catch (e){print(e);
showMessage("Error",url+" "+e, rootwindow)
}
} }
} }
xhrequest.open("GET", url,true); xhrequest.open("GET", url,true);

26
source-linux/js/helper.js
View file

@ -4,17 +4,16 @@
function friendicaRequest(login,api,rootwindow,callback) { function friendicaRequest(login,api,rootwindow,callback) {
var xhrequest= new XMLHttpRequest(); var xhrequest= new XMLHttpRequest();
xhrequest.onreadystatechange = function() { xhrequest.onreadystatechange = function() {
//print(api+JSON.stringify(login));
if(xhrequest.readyState === XMLHttpRequest.DONE) { if(xhrequest.readyState === XMLHttpRequest.DONE) {
try{ if (xhrequest.status=200){ //if (xhrequest.responseText!=""){ try{
if (xhrequest.status=200){
callback(xhrequest.responseText) callback(xhrequest.responseText)
}else{ }else{
showMessage("Error","API:" +login.server+api+"\n NO RESPONSE"+xhrequest.statusText,rootwindow); showMessage("Error","API:" +login.server+api+"\n NO RESPONSE"+xhrequest.statusText,rootwindow);
//callback(xhrequest.responseText)
} }
} }
catch (e){print(e); catch (e){
showMessage("Error", xhrequest.responseText,rootwindow) showMessage("Error", login.server+api+"\n"+e+"\n Return: "+xhrequest.responseText,rootwindow)
} }
} }
} }
@ -35,9 +34,7 @@ function friendicaPostRequest(login,api,data,method,rootwindow,callback) {
callback(xhrequest.responseText) callback(xhrequest.responseText)
} }
} }
catch (e){ catch (e){showMessage("Error", api+" "+e+"\n Return:"+xhrequest.responseText,rootwindow)}
showMessage("Error", api+" "+e,rootwindow)
}
} }
} }
xhrequest.open(method, login.server+api,true,login.username,Qt.atob(login.password)); xhrequest.open(method, login.server+api,true,login.username,Qt.atob(login.password));
@ -57,13 +54,10 @@ function getCount(database,login,table,field,countvalue){
function friendicaWebRequest(url,rootwindow,callback) { function friendicaWebRequest(url,rootwindow,callback) {
var xhrequest = new XMLHttpRequest(); var xhrequest = new XMLHttpRequest();
xhrequest.onreadystatechange = function() { xhrequest.onreadystatechange = function() {
if (xhrequest.readyState === XMLHttpRequest.HEADERS_RECEIVED) { if (xhrequest.readyState === XMLHttpRequest.HEADERS_RECEIVED) {}
} else if(xhrequest.readyState === XMLHttpRequest.DONE) { else if(xhrequest.readyState === XMLHttpRequest.DONE) {
try{ callback(xhrequest.responseText); try{callback(xhrequest.responseText)}
} catch (e){showMessage("Error",url+" "+e+"\n Return: "+xhrequest.responseText, rootwindow)}
catch (e){print(e);
showMessage("Error",url+" "+e, rootwindow)
}
} }
} }
xhrequest.open("GET", url,true); xhrequest.open("GET", url,true);
@ -112,7 +106,7 @@ var where = " AND "+ filter +" = '" + filtervalue+"'";
}); });
} }
function showMessage(header,message,rootwindow){print("message: "+message); function showMessage(header,message,rootwindow){//print("message: "+message);
var cleanmessage=message.replace(/"/g,"-"); var cleanmessage=message.replace(/"/g,"-");
var messageString='import QtQuick 2.0; import QtQuick.Dialogs 1.2; MessageDialog{ visible: true; title:"'+header+'";standardButtons: StandardButton.Ok; text:" '+cleanmessage+'"}'; var messageString='import QtQuick 2.0; import QtQuick.Dialogs 1.2; MessageDialog{ visible: true; title:"'+header+'";standardButtons: StandardButton.Ok; text:" '+cleanmessage+'"}';
var messageObject=Qt.createQmlObject(messageString,rootwindow,"messageOutput"); var messageObject=Qt.createQmlObject(messageString,rootwindow,"messageOutput");