forked from cwtch.im/cwtch-ui
Merge branch 'trunk' into iconUpdate
This commit is contained in:
commit
f1594be932
|
@ -262,8 +262,8 @@ class CwtchNotifier {
|
||||||
server: groupInvite["ServerHost"],
|
server: groupInvite["ServerHost"],
|
||||||
status: status,
|
status: status,
|
||||||
isGroup: true,
|
isGroup: true,
|
||||||
lastMessageTime: DateTime.now()));
|
lastMessageTime: DateTime.fromMillisecondsSinceEpoch(0)));
|
||||||
profileCN.getProfile(data["ProfileOnion"])?.contactList.updateLastMessageTime(groupInvite["GroupID"], DateTime.now());
|
profileCN.getProfile(data["ProfileOnion"])?.contactList.updateLastMessageTime(groupInvite["GroupID"], DateTime.fromMillisecondsSinceEpoch(0));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -271,7 +271,7 @@ class CwtchNotifier {
|
||||||
EnvironmentConfig.debugLog("accept group invite");
|
EnvironmentConfig.debugLog("accept group invite");
|
||||||
|
|
||||||
profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["GroupID"])!.authorization = ContactAuthorization.approved;
|
profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["GroupID"])!.authorization = ContactAuthorization.approved;
|
||||||
profileCN.getProfile(data["ProfileOnion"])?.contactList.updateLastMessageTime(data["GroupID"], DateTime.now());
|
profileCN.getProfile(data["ProfileOnion"])?.contactList.updateLastMessageTime(data["GroupID"], DateTime.fromMillisecondsSinceEpoch(0));
|
||||||
break;
|
break;
|
||||||
case "ServerStateChange":
|
case "ServerStateChange":
|
||||||
// Update the Server Cache
|
// Update the Server Cache
|
||||||
|
|
|
@ -58,6 +58,11 @@ class _ContactRowState extends State<ContactRow> {
|
||||||
softWrap: true,
|
softWrap: true,
|
||||||
overflow: TextOverflow.visible,
|
overflow: TextOverflow.visible,
|
||||||
),
|
),
|
||||||
|
Visibility(
|
||||||
|
visible: contact.isGroup && contact.status == "Authenticated",
|
||||||
|
child: LinearProgressIndicator(
|
||||||
|
color: Provider.of<Settings>(context).theme.defaultButtonActiveColor(),
|
||||||
|
)),
|
||||||
Text(contact.onion,
|
Text(contact.onion,
|
||||||
style: TextStyle(color: contact.isBlocked ? Provider.of<Settings>(context).theme.portraitBlockedTextColor() : Provider.of<Settings>(context).theme.mainTextColor())),
|
style: TextStyle(color: contact.isBlocked ? Provider.of<Settings>(context).theme.portraitBlockedTextColor() : Provider.of<Settings>(context).theme.mainTextColor())),
|
||||||
],
|
],
|
||||||
|
|
Loading…
Reference in New Issue