mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Rename createTemporary to dangerouslyCreateAndAdd

Browse source 
Class: `ConversationController`.

This function should not be used in application code as it creates potentially
invalid `Conversation` instances in our global conversation collection. We keep
making it available for testing purposes.
This commit is contained in:
Daniel Gasienica 2018-03-27 18:58:00 -04:00
parent 4e6d1e128f
commit 83c979fb84
4 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
js/conversation_controller.js
View file

@ -95,7 +95,7 @@
getUnsafe: function(id) { getUnsafe: function(id) {
return conversations.get(id); return conversations.get(id);
}, },
createTemporary: function(attributes) { dangerouslyCreateAndAdd: function(attributes) {
return conversations.add(attributes); return conversations.add(attributes);
}, },
getOrCreate: function(id, type) { getOrCreate: function(id, type) {

2
js/views/conversation_search_view.js
View file

@ -92,7 +92,7 @@
// Creates a view to display a new contact // Creates a view to display a new contact
this.new_contact_view = new Whisper.NewContactView({ this.new_contact_view = new Whisper.NewContactView({
el: this.$new_contact, el: this.$new_contact,
model: ConversationController.createTemporary({ model: ConversationController.dangerouslyCreateAndAdd({
type: 'private', type: 'private',
}), }),
}).render(); }).render();

15
test/keychange_listener_test.js
View file

@ -16,9 +16,12 @@ describe('KeyChangeListener', function() {
}); });
describe('When we have a conversation with this contact', function() { describe('When we have a conversation with this contact', function() {
var convo = new Whisper.Conversation({ id: phoneNumberWithKeyChange, type: 'private'}); let convo;
before(function() { before(function() {
ConversationController.createTemporary(convo); convo = ConversationController.dangerouslyCreateAndAdd({
id: phoneNumberWithKeyChange,
type: 'private',
});
return convo.save(); return convo.save();
}); });
@ -41,9 +44,13 @@ describe('KeyChangeListener', function() {
describe('When we have a group with this contact', function() { describe('When we have a group with this contact', function() {
var convo = new Whisper.Conversation({ id: 'groupId', type: 'group', members: [phoneNumberWithKeyChange] }); let convo;
before(function() { before(function() {
ConversationController.createTemporary(convo); convo = ConversationController.dangerouslyCreateAndAdd({
id: 'groupId',
type: 'group',
members: [phoneNumberWithKeyChange],
});
return convo.save(); return convo.save();
}); });
after(function() { after(function() {

2
test/views/message_view_test.js
View file

@ -2,7 +2,7 @@ describe('MessageView', function() {
var convo, message; var convo, message;
before(function() { before(function() {
convo = ConversationController.createTemporary({id: 'foo'}); convo = ConversationController.dangerouslyCreateAndAdd({id: 'foo'});
message = convo.messageCollection.add({ message = convo.messageCollection.add({
conversationId: convo.id, conversationId: convo.id,
body: 'hello world', body: 'hello world',