diff --git a/lib/l10n/intl_de.arb b/lib/l10n/intl_de.arb index 13e90b6..3e3fd14 100644 --- a/lib/l10n/intl_de.arb +++ b/lib/l10n/intl_de.arb @@ -1,6 +1,7 @@ { "@@locale": "de", - "@@last_modified": "2021-06-24T18:24:27+02:00", + "@@last_modified": "2021-06-24T22:33:44+02:00", + "serverNotSynced": "Syncing New Messages (This can take some time)...", "groupInviteSettingsWarning": "You have been invited to join a group! Please enable the Group Chat Experiment in Settings to view this Invitation.", "shutdownCwtchAction": "Shutdown Cwtch", "shutdownCwtchDialog": "Are you sure you want to shutdown Cwtch? This will close all connections, and exit the application.", @@ -155,7 +156,6 @@ "inviteToGroupLabel": "In die Gruppe einladen", "groupNameLabel": "Gruppenname", "viewServerInfo": "Server Info", - "serverNotSynced": "Out of Sync", "serverSynced": "Synced", "serverConnectivityDisconnected": "Server getrennt", "serverConnectivityConnected": "Server verbunden", diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index 4258f85..2e06e53 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -1,6 +1,7 @@ { "@@locale": "en", - "@@last_modified": "2021-06-24T18:24:27+02:00", + "@@last_modified": "2021-06-24T22:33:44+02:00", + "serverNotSynced": "Syncing New Messages (This can take some time)...", "groupInviteSettingsWarning": "You have been invited to join a group! Please enable the Group Chat Experiment in Settings to view this Invitation.", "shutdownCwtchAction": "Shutdown Cwtch", "shutdownCwtchDialog": "Are you sure you want to shutdown Cwtch? This will close all connections, and exit the application.", @@ -155,7 +156,6 @@ "inviteToGroupLabel": "Invite to group", "groupNameLabel": "Group Name", "viewServerInfo": "Server Info", - "serverNotSynced": "Out of Sync", "serverSynced": "Synced", "serverConnectivityDisconnected": "Server Disconnected", "serverConnectivityConnected": "Server Connected", diff --git a/lib/l10n/intl_es.arb b/lib/l10n/intl_es.arb index 7a9fa72..79b0d35 100644 --- a/lib/l10n/intl_es.arb +++ b/lib/l10n/intl_es.arb @@ -1,6 +1,7 @@ { "@@locale": "es", - "@@last_modified": "2021-06-24T18:24:27+02:00", + "@@last_modified": "2021-06-24T22:33:44+02:00", + "serverNotSynced": "Fuera de sincronización con el servidor", "groupInviteSettingsWarning": "You have been invited to join a group! Please enable the Group Chat Experiment in Settings to view this Invitation.", "shutdownCwtchAction": "Shutdown Cwtch", "shutdownCwtchDialog": "Are you sure you want to shutdown Cwtch? This will close all connections, and exit the application.", @@ -155,7 +156,6 @@ "inviteToGroupLabel": "Invitar al grupo", "groupNameLabel": "Nombre del grupo", "viewServerInfo": "Información del servidor", - "serverNotSynced": "Fuera de sincronización con el servidor", "serverSynced": "Sincronizado", "serverConnectivityDisconnected": "Servidor desconectado", "serverConnectivityConnected": "Servidor conectado", diff --git a/lib/l10n/intl_fr.arb b/lib/l10n/intl_fr.arb index fa6ae03..48f8f3c 100644 --- a/lib/l10n/intl_fr.arb +++ b/lib/l10n/intl_fr.arb @@ -1,6 +1,7 @@ { "@@locale": "fr", - "@@last_modified": "2021-06-24T18:24:27+02:00", + "@@last_modified": "2021-06-24T22:33:44+02:00", + "serverNotSynced": "Syncing New Messages (This can take some time)...", "groupInviteSettingsWarning": "You have been invited to join a group! Please enable the Group Chat Experiment in Settings to view this Invitation.", "shutdownCwtchAction": "Shutdown Cwtch", "shutdownCwtchDialog": "Are you sure you want to shutdown Cwtch? This will close all connections, and exit the application.", @@ -155,7 +156,6 @@ "inviteToGroupLabel": "Inviter quelqu'un", "groupNameLabel": "Nom du groupe", "viewServerInfo": "Server Info", - "serverNotSynced": "Out of Sync", "serverSynced": "Synced", "serverConnectivityDisconnected": "Server Disconnected", "serverConnectivityConnected": "Server Connected", diff --git a/lib/l10n/intl_it.arb b/lib/l10n/intl_it.arb index 4fa8b15..acfe3e9 100644 --- a/lib/l10n/intl_it.arb +++ b/lib/l10n/intl_it.arb @@ -1,6 +1,7 @@ { "@@locale": "it", - "@@last_modified": "2021-06-24T18:24:27+02:00", + "@@last_modified": "2021-06-24T22:33:44+02:00", + "serverNotSynced": "Non sincronizzato", "groupInviteSettingsWarning": "You have been invited to join a group! Please enable the Group Chat Experiment in Settings to view this Invitation.", "shutdownCwtchAction": "Shutdown Cwtch", "shutdownCwtchDialog": "Are you sure you want to shutdown Cwtch? This will close all connections, and exit the application.", @@ -155,7 +156,6 @@ "inviteToGroupLabel": "Invitare nel gruppo", "groupNameLabel": "Nome del gruppo", "viewServerInfo": "Informazioni sul server", - "serverNotSynced": "Non sincronizzato", "serverSynced": "Sincronizzato", "serverConnectivityDisconnected": "Server disconnesso", "serverConnectivityConnected": "Server connesso", diff --git a/lib/l10n/intl_pt.arb b/lib/l10n/intl_pt.arb index fed1c6c..9c361ad 100644 --- a/lib/l10n/intl_pt.arb +++ b/lib/l10n/intl_pt.arb @@ -1,6 +1,7 @@ { "@@locale": "pt", - "@@last_modified": "2021-06-24T18:24:27+02:00", + "@@last_modified": "2021-06-24T22:33:44+02:00", + "serverNotSynced": "Syncing New Messages (This can take some time)...", "groupInviteSettingsWarning": "You have been invited to join a group! Please enable the Group Chat Experiment in Settings to view this Invitation.", "shutdownCwtchAction": "Shutdown Cwtch", "shutdownCwtchDialog": "Are you sure you want to shutdown Cwtch? This will close all connections, and exit the application.", @@ -155,7 +156,6 @@ "inviteToGroupLabel": "Convidar ao grupo", "groupNameLabel": "Nome do Grupo", "viewServerInfo": "Server Info", - "serverNotSynced": "Out of Sync", "serverSynced": "Synced", "serverConnectivityDisconnected": "Server Disconnected", "serverConnectivityConnected": "Server Connected", diff --git a/lib/model.dart b/lib/model.dart index 68a3fa2..566ab5e 100644 --- a/lib/model.dart +++ b/lib/model.dart @@ -437,7 +437,8 @@ class ContactInfoState extends ChangeNotifier { bool isOnline() { if (this.isGroup == true) { - return this.status == "Synced"; + // We now have an out of sync warning so we will mark these as online... + return this.status == "Authenticated" || this.status == "Synced"; } else { return this.status == "Authenticated"; } diff --git a/lib/widgets/messagelist.dart b/lib/widgets/messagelist.dart index 5a8fc0f..a6b2e26 100644 --- a/lib/widgets/messagelist.dart +++ b/lib/widgets/messagelist.dart @@ -19,6 +19,8 @@ class _MessageListState extends State { bool showEphemeralWarning = (Provider.of(context).isGroup == false && Provider.of(context).savePeerHistory != "SaveHistory"); bool showOfflineWarning = Provider.of(context).isOnline() == false; bool showMessageWarning = showEphemeralWarning || showOfflineWarning; + bool showSyncing = Provider.of(context).isGroup == true && Provider.of(context).status != "Synced"; + return RepaintBoundary( child: Container( child: Column(children: [ @@ -27,7 +29,10 @@ class _MessageListState extends State { child: Container( padding: EdgeInsets.all(5.0), color: Provider.of(context).theme.defaultButtonActiveColor(), - child: showOfflineWarning + child: showSyncing ? + Text(AppLocalizations.of(context)!.serverNotSynced, + textAlign: TextAlign.center) + : showOfflineWarning ? Text(Provider.of(context).isGroup ? AppLocalizations.of(context)!.serverConnectivityDisconnected : AppLocalizations.of(context)!.peerOfflineMessage, textAlign: TextAlign.center) // Only show the ephemeral status for peer conversations, not for groups... @@ -50,6 +55,7 @@ class _MessageListState extends State { alignment: Alignment.center, image: AssetImage("assets/core/negative_heart_512px.png"), colorFilter: ColorFilter.mode(Provider.of(context).theme.hilightElementTextColor(), BlendMode.srcIn))), + // Don't load messages for syncing server... child: ListView.builder( controller: ctrlr1, itemCount: Provider.of(outerContext).totalMessages,