Android bugfix
This commit is contained in:
parent
59fe1ea0df
commit
17f25d6809
|
@ -1 +1 @@
|
|||
../../source-linux/common/oauth.cpp
|
||||
/home/pankraz/ownCloud/clientsync/Friendiqa/v0.6/source-linux/common/oauth.cpp
|
|
@ -1 +1 @@
|
|||
../../source-linux/common/oauth.h
|
||||
/home/pankraz/ownCloud/clientsync/Friendiqa/v0.6/source-linux/common/oauth.h
|
|
@ -43,11 +43,11 @@ import "qrc:/qml/genericqml"
|
|||
ApplicationWindow{
|
||||
id:root
|
||||
title: "Friendiqa"
|
||||
property var globaloptions: Service.readGO(db)
|
||||
property QtObject osSettings: {var tmp=Qt.createComponent("qrc:/qml/configqml/OSSettingsAndroid.qml");return tmp.createObject(root)}
|
||||
visible: true
|
||||
property var db: ["Friendiqa", "1.0", "Stores Friendica data", 100000000]
|
||||
property var login: Service.readActiveConfig(db)
|
||||
property var globaloptions: Service.readGO(db)
|
||||
property real fontFactor: root.font.pixelSize/root.font.pointSize
|
||||
property var contactlist: []
|
||||
property real mm: osSettings.osType=="Android"?Screen.pixelDensity:Screen.pixelDensity*1.5
|
||||
|
@ -76,7 +76,7 @@ ApplicationWindow{
|
|||
Material.theme: Material.System
|
||||
|
||||
function onLoginChanged(login){
|
||||
if(login==""){rootstackView.push("qrc:/qml/configqml/AccountPage.qml")}
|
||||
if(login=="" || login==null){rootstackView.push("qrc:/qml/configqml/AccountPage.qml")}
|
||||
else{
|
||||
Newsjs.getCurrentContacts(login,db,function(contacts){
|
||||
contactlist=contacts})}
|
||||
|
|
|
@ -257,7 +257,7 @@ Rectangle{
|
|||
}
|
||||
Connections{
|
||||
target:updatenews
|
||||
function onError(api,data){print("updatnews error "+api);
|
||||
function onError(api,data){
|
||||
newsBusy.running=false;
|
||||
}
|
||||
function onSuccess(api){
|
||||
|
|
Loading…
Reference in a new issue