OAuth and bugfixes

This commit is contained in:
LubuWest 2023-05-24 21:40:26 +02:00
commit d43c18bb76
65 changed files with 1681 additions and 1494 deletions

View file

@ -65,6 +65,7 @@ Item {
login=account;
if(!wideScreen){leftDrawerAndroid.close()}
friendsTabView.currentIndex=0;
friendsbar.currentIndex=0;
profileLoader.source="";
profileLoader.source="qrc:/qml/contactqml/ProfileTab.qml"
}
@ -82,7 +83,8 @@ Item {
onClicked:{
login=account;
if(!wideScreen){leftDrawerAndroid.close()}
friendsTabView.currentIndex=1
friendsTabView.currentIndex=1;
friendsbar.currentIndex=1;
friendsListLoader.source="";
friendsListLoader.source="qrc:/qml/contactqml/FriendsListTab.qml"
}
@ -93,14 +95,15 @@ Item {
y:5*root.fontFactor*osSettings.bigFontSize
width:parent.width
font.pointSize: osSettings.systemFontSize
font.bold: account.username==login.username && friendsTabView.currentIndex==3
font.bold: account.username==login.username && friendsTabView.currentIndex==2
text: " "+qsTr("Groups")
MouseArea{
anchors.fill:parent
onClicked:{
login=account;
if(!wideScreen){leftDrawerAndroid.close()}
friendsTabView.currentIndex=2
friendsTabView.currentIndex=2;
friendsbar.currentIndex=2;
}
}
}

View file

@ -206,21 +206,21 @@ Rectangle{
}
}
Component.onCompleted:{
Helperjs.readData(db,"contacts",login.username,function(contacts){
for (var name in contacts){
var contactstatus="neutral";
if (contact_allow.indexOf(contacts[name].cid)>-1){contactstatus="positive"}
else if (contact_deny.indexOf(contacts[name].cid)>-1){contactstatus="negative"}
contactModel.append({"contact":contacts[name],"contactstatus":contactstatus})
}},"isFriend",1,"name");
// Component.onCompleted:{
// Helperjs.readData(db,"contacts",login.username,function(contacts){
// for (var name in contacts){
// var contactstatus="neutral";
// if (contact_allow.indexOf(contacts[name].cid)>-1){contactstatus="positive"}
// else if (contact_deny.indexOf(contacts[name].cid)>-1){contactstatus="negative"}
// contactModel.append({"contact":contacts[name],"contactstatus":contactstatus})
// }},"isFriend",1,"name");
Helperjs.readData(db,"groups",login.username,function(owngroups){
for (var number in owngroups){
var groupstatus= "neutral";
if (group_allow.indexOf(owngroups[number].gid)>-1){groupstatus="positive"}
else if (group_deny.indexOf(owngroups[number].gid)>-1){groupstatus="negative"}
groupModel.append({"group":owngroups[number],"groupstatus":groupstatus})
}});
}
// Helperjs.readData(db,"groups",login.username,function(owngroups){
// for (var number in owngroups){
// var groupstatus= "neutral";
// if (group_allow.indexOf(owngroups[number].gid)>-1){groupstatus="positive"}
// else if (group_deny.indexOf(owngroups[number].gid)>-1){groupstatus="negative"}
// groupModel.append({"group":owngroups[number],"groupstatus":groupstatus})
// }});
// }
}