From 17f25d68095a8fd73df4e6cbf5ebc8f2893e3512 Mon Sep 17 00:00:00 2001
From: LubuWest <lubuwest@gmx.net>
Date: Mon, 5 Jun 2023 21:36:53 +0200
Subject: [PATCH] Android bugfix

---
 source-android/common/oauth.cpp        | 2 +-
 source-android/common/oauth.h          | 2 +-
 source-android/qml/friendiqa.qml       | 4 ++--
 source-linux/qml/newsqml/NewsStack.qml | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/source-android/common/oauth.cpp b/source-android/common/oauth.cpp
index 7e5af5f..52faaff 120000
--- a/source-android/common/oauth.cpp
+++ b/source-android/common/oauth.cpp
@@ -1 +1 @@
-../../source-linux/common/oauth.cpp
\ No newline at end of file
+/home/pankraz/ownCloud/clientsync/Friendiqa/v0.6/source-linux/common/oauth.cpp
\ No newline at end of file
diff --git a/source-android/common/oauth.h b/source-android/common/oauth.h
index 607b211..5c2bab8 120000
--- a/source-android/common/oauth.h
+++ b/source-android/common/oauth.h
@@ -1 +1 @@
-../../source-linux/common/oauth.h
\ No newline at end of file
+/home/pankraz/ownCloud/clientsync/Friendiqa/v0.6/source-linux/common/oauth.h
\ No newline at end of file
diff --git a/source-android/qml/friendiqa.qml b/source-android/qml/friendiqa.qml
index 000aa0e..e9c5227 100644
--- a/source-android/qml/friendiqa.qml
+++ b/source-android/qml/friendiqa.qml
@@ -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})}
diff --git a/source-linux/qml/newsqml/NewsStack.qml b/source-linux/qml/newsqml/NewsStack.qml
index 82aeed8..239b6a4 100644
--- a/source-linux/qml/newsqml/NewsStack.qml
+++ b/source-linux/qml/newsqml/NewsStack.qml
@@ -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){