cwtch.im
/
cwtch-ui
10
11
Fork 17
Code Issues 89 Pull Requests 2 Projects 2 Releases 28 Wiki Activity

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 

Reviewed-on: #76
Reviewed-by: Dan Ballard <dan@openprivacy.ca>
This commit is contained in:
Dan Ballard 2021-06-29 17:30:52 -07:00
parent fbf79a230b bb5fbf1b7f
commit bec93d8980
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LIBCWTCH-GO.version
View File

@ -1 +1 @@
v1.0.0-7-g520d35a-2021-06-25-16-34
v1.0.0-12-g2e0b6ef-2021-06-29-23-42

2
android/app/src/main/kotlin/im/cwtch/flwtch/FlwtchWorker.kt
View File

@ -178,7 +178,7 @@ class FlwtchWorker(context: Context, parameters: WorkerParameters) :
"CreateGroup" -> {
val profile = (a.get("ProfileOnion") 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)
}
"DeleteProfile" -> {

1
lib/cwtch/cwtchNotifier.dart
View File

@ -245,6 +245,7 @@ class CwtchNotifier {
break;
case "ServerStateChange":
// Update the Server Cache
EnvironmentConfig.debugLog("server state changes $data");
profileCN.getProfile(data["ProfileOnion"])?.updateServerStatusCache(data["GroupServer"], data["ConnectionState"]);
profileCN.getProfile(data["ProfileOnion"])?.contactList.contacts.forEach((contact) {
if (contact.isGroup == true && contact.server == data["GroupServer"]) {

2
lib/widgets/messagelist.dart
View File

@ -24,8 +24,8 @@ class _MessageListState extends State<MessageList> {
bool showEphemeralWarning = (isP2P && Provider.of<ContactInfoState>(context).savePeerHistory != "SaveHistory");
bool showOfflineWarning = Provider.of<ContactInfoState>(context).isOnline() == false;
bool showMessageWarning = showEphemeralWarning || showOfflineWarning;
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.
bool loadMessages = isP2P || (isGroupAndSynced || isGroupAndNotAuthenticated);