only handle a single time the groups from a configurationMessage

pull/1528/head
Audric Ackermann 5 years ago
parent 4478d0adea
commit c420bfcf74

@ -105,7 +105,7 @@
.getConversationController() .getConversationController()
.get(message.get('conversationId')); .get(message.get('conversationId'));
if (conversation) { if (conversation) {
conversation.updateLastMessage() conversation.updateLastMessage();
} }
this.remove(receipt); this.remove(receipt);

@ -106,7 +106,7 @@
.getConversationController() .getConversationController()
.get(message.get('conversationId')); .get(message.get('conversationId'));
if (conversation) { if (conversation) {
conversation.updateLastMessage() conversation.updateLastMessage();
} }
this.remove(receipt); this.remove(receipt);

@ -94,6 +94,10 @@
margin-bottom: 5px; margin-bottom: 5px;
} }
} }
& .or {
text-align: center;
}
} }
&__sections { &__sections {

@ -90,7 +90,9 @@ const SignInButtons = (props: {
<RestoreUsingRecoveryPhraseButton <RestoreUsingRecoveryPhraseButton
onRecoveryButtonClicked={props.onRecoveryButtonClicked} onRecoveryButtonClicked={props.onRecoveryButtonClicked}
/> />
<div className="spacer-lg" />
<div className="or">{window.i18n('or')}</div> <div className="or">{window.i18n('or')}</div>
<div className="spacer-lg" />
<LinkDeviceButton <LinkDeviceButton
onLinkDeviceButtonClicked={props.onLinkDeviceButtonClicked} onLinkDeviceButtonClicked={props.onLinkDeviceButtonClicked}
/> />

@ -1,5 +1,9 @@
import _ from 'lodash'; import _ from 'lodash';
import { getItemById, hasSyncedInitialConfigurationItem } from '../data/data'; import {
createOrUpdateItem,
getItemById,
hasSyncedInitialConfigurationItem,
} from '../data/data';
import { SignalService } from '../protobuf'; import { SignalService } from '../protobuf';
import { ConversationController } from '../session/conversations'; import { ConversationController } from '../session/conversations';
import { OpenGroup } from '../session/types'; import { OpenGroup } from '../session/types';
@ -56,12 +60,10 @@ async function handleGroupsAndContactsFromConfigMessage(
); );
return; return;
} }
if (didWeHandleAConfigurationMessageAlready) { await createOrUpdateItem({
window?.log?.warn( id: 'hasSyncedInitialConfigurationItem',
'Dropping configuration change as we already handled one... ' value: true,
); });
return;
}
const numberClosedGroup = configMessage.closedGroups?.length || 0; const numberClosedGroup = configMessage.closedGroups?.length || 0;

Loading…
Cancel
Save