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{
|
ApplicationWindow{
|
||||||
id:root
|
id:root
|
||||||
title: "Friendiqa"
|
title: "Friendiqa"
|
||||||
property var globaloptions: Service.readGO(db)
|
|
||||||
property QtObject osSettings: {var tmp=Qt.createComponent("qrc:/qml/configqml/OSSettingsAndroid.qml");return tmp.createObject(root)}
|
property QtObject osSettings: {var tmp=Qt.createComponent("qrc:/qml/configqml/OSSettingsAndroid.qml");return tmp.createObject(root)}
|
||||||
visible: true
|
visible: true
|
||||||
property var db: ["Friendiqa", "1.0", "Stores Friendica data", 100000000]
|
property var db: ["Friendiqa", "1.0", "Stores Friendica data", 100000000]
|
||||||
property var login: Service.readActiveConfig(db)
|
property var login: Service.readActiveConfig(db)
|
||||||
|
property var globaloptions: Service.readGO(db)
|
||||||
property real fontFactor: root.font.pixelSize/root.font.pointSize
|
property real fontFactor: root.font.pixelSize/root.font.pointSize
|
||||||
property var contactlist: []
|
property var contactlist: []
|
||||||
property real mm: osSettings.osType=="Android"?Screen.pixelDensity:Screen.pixelDensity*1.5
|
property real mm: osSettings.osType=="Android"?Screen.pixelDensity:Screen.pixelDensity*1.5
|
||||||
|
@ -76,7 +76,7 @@ ApplicationWindow{
|
||||||
Material.theme: Material.System
|
Material.theme: Material.System
|
||||||
|
|
||||||
function onLoginChanged(login){
|
function onLoginChanged(login){
|
||||||
if(login==""){rootstackView.push("qrc:/qml/configqml/AccountPage.qml")}
|
if(login=="" || login==null){rootstackView.push("qrc:/qml/configqml/AccountPage.qml")}
|
||||||
else{
|
else{
|
||||||
Newsjs.getCurrentContacts(login,db,function(contacts){
|
Newsjs.getCurrentContacts(login,db,function(contacts){
|
||||||
contactlist=contacts})}
|
contactlist=contacts})}
|
||||||
|
|
|
@ -257,7 +257,7 @@ Rectangle{
|
||||||
}
|
}
|
||||||
Connections{
|
Connections{
|
||||||
target:updatenews
|
target:updatenews
|
||||||
function onError(api,data){print("updatnews error "+api);
|
function onError(api,data){
|
||||||
newsBusy.running=false;
|
newsBusy.running=false;
|
||||||
}
|
}
|
||||||
function onSuccess(api){
|
function onSuccess(api){
|
||||||
|
|
Loading…
Reference in a new issue