Merge pull request 'Show Syncing Message + Update libcwtch-go to fix message fetching issues' (#76) from notification-fixes into trunk
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
Reviewed-on: #76 Reviewed-by: Dan Ballard <dan@openprivacy.ca>
This commit is contained in:
commit
bec93d8980
|
@ -1 +1 @@
|
||||||
v1.0.0-7-g520d35a-2021-06-25-16-34
|
v1.0.0-12-g2e0b6ef-2021-06-29-23-42
|
|
@ -178,7 +178,7 @@ class FlwtchWorker(context: Context, parameters: WorkerParameters) :
|
||||||
"CreateGroup" -> {
|
"CreateGroup" -> {
|
||||||
val profile = (a.get("ProfileOnion") as? String) ?: ""
|
val profile = (a.get("ProfileOnion") as? String) ?: ""
|
||||||
val server = (a.get("server") as? String) ?: ""
|
val server = (a.get("server") as? String) ?: ""
|
||||||
val groupName = (a.get("groupname") as? String) ?: ""
|
val groupName = (a.get("groupName") as? String) ?: ""
|
||||||
Cwtch.createGroup(profile, server, groupName)
|
Cwtch.createGroup(profile, server, groupName)
|
||||||
}
|
}
|
||||||
"DeleteProfile" -> {
|
"DeleteProfile" -> {
|
||||||
|
|
|
@ -245,6 +245,7 @@ class CwtchNotifier {
|
||||||
break;
|
break;
|
||||||
case "ServerStateChange":
|
case "ServerStateChange":
|
||||||
// Update the Server Cache
|
// Update the Server Cache
|
||||||
|
EnvironmentConfig.debugLog("server state changes $data");
|
||||||
profileCN.getProfile(data["ProfileOnion"])?.updateServerStatusCache(data["GroupServer"], data["ConnectionState"]);
|
profileCN.getProfile(data["ProfileOnion"])?.updateServerStatusCache(data["GroupServer"], data["ConnectionState"]);
|
||||||
profileCN.getProfile(data["ProfileOnion"])?.contactList.contacts.forEach((contact) {
|
profileCN.getProfile(data["ProfileOnion"])?.contactList.contacts.forEach((contact) {
|
||||||
if (contact.isGroup == true && contact.server == data["GroupServer"]) {
|
if (contact.isGroup == true && contact.server == data["GroupServer"]) {
|
||||||
|
|
|
@ -24,8 +24,8 @@ class _MessageListState extends State<MessageList> {
|
||||||
|
|
||||||
bool showEphemeralWarning = (isP2P && Provider.of<ContactInfoState>(context).savePeerHistory != "SaveHistory");
|
bool showEphemeralWarning = (isP2P && Provider.of<ContactInfoState>(context).savePeerHistory != "SaveHistory");
|
||||||
bool showOfflineWarning = Provider.of<ContactInfoState>(context).isOnline() == false;
|
bool showOfflineWarning = Provider.of<ContactInfoState>(context).isOnline() == false;
|
||||||
bool showMessageWarning = showEphemeralWarning || showOfflineWarning;
|
|
||||||
bool showSyncing = isGroupAndSyncing;
|
bool showSyncing = isGroupAndSyncing;
|
||||||
|
bool showMessageWarning = showEphemeralWarning || showOfflineWarning || showSyncing;
|
||||||
// Only load historical messages when the conversation is with a p2p contact OR the conversation is a server and *not* syncing.
|
// Only load historical messages when the conversation is with a p2p contact OR the conversation is a server and *not* syncing.
|
||||||
bool loadMessages = isP2P || (isGroupAndSynced || isGroupAndNotAuthenticated);
|
bool loadMessages = isP2P || (isGroupAndSynced || isGroupAndNotAuthenticated);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue