5b5840a79e
Previously, all Conversations/Contacts/Users were stored in the Server, each in their respective KeyMaps, identified solely by their identifiers. This leads to the glaring problem of overlap― if the user has multiple accounts, some users/rooms might be used or present in multiple accounts at the same time. Now, each accounts' Contacts, Conversations, and Users are stored in its ProtocolLooper, making this overlap impossible. An oversight of only allowing one user identifier to be stored (fMySelf) in Server was also fixed this way. This is the bulk of the work required for multi-account support― now, the user can join the same XMPP room on two seperate accounts, and it works perfectly.
156 lines
2.2 KiB
C++
156 lines
2.2 KiB
C++
/*
|
|
* Copyright 2009-2011, Andrea Anzani. All rights reserved.
|
|
* Copyright 2009-2011, Pier Luigi Fiorini. All rights reserved.
|
|
* Distributed under the terms of the MIT License.
|
|
*
|
|
* Authors:
|
|
* Andrea Anzani, andrea.anzani@gmail.com
|
|
* Pier Luigi Fiorini, pierluigi.fiorini@gmail.com
|
|
*/
|
|
|
|
#include "ProtocolLooper.h"
|
|
|
|
#include <String.h>
|
|
|
|
#include "Account.h"
|
|
#include "Conversation.h"
|
|
|
|
|
|
ProtocolLooper::ProtocolLooper(CayaProtocol* protocol, int64 instance)
|
|
:
|
|
BLooper(),
|
|
fProtocol(protocol),
|
|
fInstance(instance)
|
|
{
|
|
Account* account = reinterpret_cast<Account*>(
|
|
protocol->MessengerInterface());
|
|
|
|
BString name(protocol->FriendlySignature());
|
|
name << " - " << account->Name();
|
|
|
|
SetName(name.String());
|
|
Run();
|
|
}
|
|
|
|
|
|
void
|
|
ProtocolLooper::MessageReceived(BMessage* msg)
|
|
{
|
|
if (Protocol()->Process(msg) != B_OK)
|
|
BLooper::MessageReceived(msg);
|
|
}
|
|
|
|
|
|
CayaProtocol*
|
|
ProtocolLooper::Protocol()
|
|
{
|
|
return fProtocol;
|
|
}
|
|
|
|
|
|
ChatMap
|
|
ProtocolLooper::Conversations() const
|
|
{
|
|
return fChatMap;
|
|
}
|
|
|
|
|
|
Conversation*
|
|
ProtocolLooper::ConversationById(BString id)
|
|
{
|
|
bool found = false;
|
|
return fChatMap.ValueFor(id, &found);
|
|
}
|
|
|
|
|
|
void
|
|
ProtocolLooper::AddConversation(Conversation* chat)
|
|
{
|
|
fChatMap.AddItem(chat->GetId(), chat);
|
|
}
|
|
|
|
|
|
void
|
|
ProtocolLooper::RemoveConversation(Conversation* chat)
|
|
{
|
|
fChatMap.RemoveItemFor(chat->GetId());
|
|
}
|
|
|
|
|
|
RosterMap
|
|
ProtocolLooper::Contacts() const
|
|
{
|
|
return fRosterMap;
|
|
}
|
|
|
|
|
|
Contact*
|
|
ProtocolLooper::ContactById(BString id)
|
|
{
|
|
bool found = false;
|
|
return fRosterMap.ValueFor(id, &found);
|
|
}
|
|
|
|
|
|
void
|
|
ProtocolLooper::AddContact(Contact* contact)
|
|
{
|
|
fRosterMap.AddItem(contact->GetId(), contact);
|
|
}
|
|
|
|
|
|
UserMap
|
|
ProtocolLooper::Users() const
|
|
{
|
|
UserMap users = fUserMap;
|
|
|
|
for (int i = 0; i < fRosterMap.CountItems(); i++) {
|
|
User* user = (User*)fRosterMap.ValueAt(i);
|
|
users.AddItem(user->GetId(), user);
|
|
}
|
|
|
|
return users;
|
|
}
|
|
|
|
|
|
User*
|
|
ProtocolLooper::UserById(BString id)
|
|
{
|
|
bool found = false;
|
|
User* user = ContactById(id);
|
|
if (user == NULL)
|
|
user = fUserMap.ValueFor(id, &found);
|
|
|
|
return user;
|
|
}
|
|
|
|
|
|
void
|
|
ProtocolLooper::AddUser(User* user)
|
|
{
|
|
fUserMap.AddItem(user->GetId(), user);
|
|
}
|
|
|
|
|
|
BString
|
|
ProtocolLooper::GetOwnId()
|
|
{
|
|
return fMySelf;
|
|
}
|
|
|
|
|
|
void
|
|
ProtocolLooper::SetOwnId(BString user_id)
|
|
{
|
|
fMySelf = user_id;
|
|
}
|
|
|
|
|
|
int64
|
|
ProtocolLooper::GetInstance()
|
|
{
|
|
return fInstance;
|
|
}
|
|
|
|
|