moparisthebest
/
Yaaic
mirror of https://github.com/moparisthebest/Yaaic
1
0
Fork 0
Code Issues Releases Wiki Activity

IRCConnection: Use Broadcast helpers (Should be reviewed)

This commit is contained in:
Sebastian Kaspari 2010-03-24 19:46:49 +01:00
parent b482afa305
commit 3fdd183373
1 changed files with 141 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

225
src/org/yaaic/irc/IRCConnection.java
View File

@ -141,9 +141,12 @@ public class IRCConnection extends PircBot
message.setColor(Message.COLOR_GREEN); message.setColor(Message.COLOR_GREEN);
server.getConversation(ServerInfo.DEFAULT_NAME).addMessage(message); server.getConversation(ServerInfo.DEFAULT_NAME).addMessage(message);
Intent intent = new Intent(Broadcast.CONVERSATION_MESSAGE); Intent intent = Broadcast.createConversationIntent(
intent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); Broadcast.CONVERSATION_MESSAGE,
intent.putExtra(Broadcast.EXTRA_CONVERSATION, ServerInfo.DEFAULT_NAME); server.getId(),
ServerInfo.DEFAULT_NAME
);
service.sendBroadcast(intent); service.sendBroadcast(intent);
} }
@ -174,24 +177,30 @@ public class IRCConnection extends PircBot
conversation = new Query(sender); conversation = new Query(sender);
server.addConversationl(conversation); server.addConversationl(conversation);
conversation.addMessage(message); conversation.addMessage(message);
Intent intent = new Intent(Broadcast.CONVERSATION_NEW); Intent intent = Broadcast.createConversationIntent(
intent.putExtra(Broadcast.EXTRA_CONVERSATION, sender); Broadcast.CONVERSATION_NEW,
intent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); server.getId(),
sender
);
service.sendBroadcast(intent); service.sendBroadcast(intent);
} else { } else {
Intent intent = new Intent(Broadcast.CONVERSATION_MESSAGE); Intent intent = Broadcast.createConversationIntent(
intent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); Broadcast.CONVERSATION_MESSAGE,
intent.putExtra(Broadcast.EXTRA_CONVERSATION, sender); server.getId(),
sender
);
service.sendBroadcast(intent); service.sendBroadcast(intent);
} }
} else { } else {
// A action in a channel // A action in a channel
server.getConversation(target).addMessage(message); server.getConversation(target).addMessage(message);
Intent intent = new Intent(Broadcast.CONVERSATION_MESSAGE); Intent intent = Broadcast.createConversationIntent(
intent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); Broadcast.CONVERSATION_MESSAGE,
intent.putExtra(Broadcast.EXTRA_CONVERSATION, target); server.getId(),
target
);
service.sendBroadcast(intent); service.sendBroadcast(intent);
} }
} }
@ -218,9 +227,12 @@ public class IRCConnection extends PircBot
message.setColor(Message.COLOR_BLUE); message.setColor(Message.COLOR_BLUE);
server.getConversation(target).addMessage(message); server.getConversation(target).addMessage(message);
Intent intent = new Intent(Broadcast.CONVERSATION_MESSAGE); Intent intent = Broadcast.createConversationIntent(
intent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); Broadcast.CONVERSATION_MESSAGE,
intent.putExtra(Broadcast.EXTRA_CONVERSATION, target); server.getId(),
target
);
service.sendBroadcast(intent); service.sendBroadcast(intent);
} }
@ -237,9 +249,12 @@ public class IRCConnection extends PircBot
message.setIcon(R.drawable.voice); message.setIcon(R.drawable.voice);
server.getConversation(target).addMessage(message); server.getConversation(target).addMessage(message);
Intent intent = new Intent(Broadcast.CONVERSATION_MESSAGE); Intent intent = Broadcast.createConversationIntent(
intent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); Broadcast.CONVERSATION_MESSAGE,
intent.putExtra(Broadcast.EXTRA_CONVERSATION, target); server.getId(),
target
);
service.sendBroadcast(intent); service.sendBroadcast(intent);
} }
@ -256,18 +271,22 @@ public class IRCConnection extends PircBot
Message message = new Message(sourceNick + " invites you into " + target); Message message = new Message(sourceNick + " invites you into " + target);
server.getConversation(server.getSelectedConversation()).addMessage(message); server.getConversation(server.getSelectedConversation()).addMessage(message);
Intent intent = new Intent(Broadcast.CONVERSATION_MESSAGE); Intent intent = Broadcast.createConversationIntent(
intent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); Broadcast.CONVERSATION_MESSAGE,
intent.putExtra(Broadcast.EXTRA_CONVERSATION, server.getSelectedConversation()); server.getId(),
server.getSelectedConversation()
);
service.sendBroadcast(intent); service.sendBroadcast(intent);
} else { } else {
// Someone is invited // Someone is invited
Message message = new Message(sourceNick + " invites " + targetNick + " into " + target); Message message = new Message(sourceNick + " invites " + targetNick + " into " + target);
server.getConversation(target).addMessage(message); server.getConversation(target).addMessage(message);
Intent intent = new Intent(Broadcast.CONVERSATION_MESSAGE); Intent intent = Broadcast.createConversationIntent(
intent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); Broadcast.CONVERSATION_MESSAGE,
intent.putExtra(Broadcast.EXTRA_CONVERSATION, target); server.getId(),
target
);
service.sendBroadcast(intent); service.sendBroadcast(intent);
} }
} }
@ -284,9 +303,11 @@ public class IRCConnection extends PircBot
// We joined a new channel // We joined a new channel
server.addConversationl(new Channel(target)); server.addConversationl(new Channel(target));
Intent intent = new Intent(Broadcast.CONVERSATION_NEW); Intent intent = Broadcast.createConversationIntent(
intent.putExtra(Broadcast.EXTRA_CONVERSATION, target); Broadcast.CONVERSATION_NEW,
intent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); server.getId(),
target
);
service.sendBroadcast(intent); service.sendBroadcast(intent);
} else { } else {
Message message = new Message(sender + " joins"); Message message = new Message(sender + " joins");
@ -294,9 +315,11 @@ public class IRCConnection extends PircBot
message.setColor(Message.COLOR_GREEN); message.setColor(Message.COLOR_GREEN);
server.getConversation(target).addMessage(message); server.getConversation(target).addMessage(message);
Intent intent = new Intent(Broadcast.CONVERSATION_MESSAGE); Intent intent = Broadcast.createConversationIntent(
intent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); Broadcast.CONVERSATION_MESSAGE,
intent.putExtra(Broadcast.EXTRA_CONVERSATION, target); server.getId(),
target
);
service.sendBroadcast(intent); service.sendBroadcast(intent);
} }
} }
@ -313,18 +336,22 @@ public class IRCConnection extends PircBot
// We are kicked // We are kicked
server.removeConversation(target); server.removeConversation(target);
Intent intent = new Intent(Broadcast.CONVERSATION_REMOVE); Intent intent = Broadcast.createConversationIntent(
intent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); Broadcast.CONVERSATION_REMOVE,
intent.putExtra(Broadcast.EXTRA_CONVERSATION, target); server.getId(),
target
);
service.sendBroadcast(intent); service.sendBroadcast(intent);
} else { } else {
Message message = new Message(kickerNick + " kicks " + recipientNick); Message message = new Message(kickerNick + " kicks " + recipientNick);
message.setColor(Message.COLOR_GREEN); message.setColor(Message.COLOR_GREEN);
server.getConversation(target).addMessage(message); server.getConversation(target).addMessage(message);
Intent intent = new Intent(Broadcast.CONVERSATION_MESSAGE); Intent intent = Broadcast.createConversationIntent(
intent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); Broadcast.CONVERSATION_MESSAGE,
intent.putExtra(Broadcast.EXTRA_CONVERSATION, target); server.getId(),
target
);
service.sendBroadcast(intent); service.sendBroadcast(intent);
} }
} }
@ -349,9 +376,11 @@ public class IRCConnection extends PircBot
server.getConversation(target).addMessage(message); server.getConversation(target).addMessage(message);
Intent intent = new Intent(Broadcast.CONVERSATION_MESSAGE); Intent intent = Broadcast.createConversationIntent(
intent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); Broadcast.CONVERSATION_MESSAGE,
intent.putExtra(Broadcast.EXTRA_CONVERSATION, target); server.getId(),
target
);
service.sendBroadcast(intent); service.sendBroadcast(intent);
} }
@ -387,9 +416,11 @@ public class IRCConnection extends PircBot
message.setColor(Message.COLOR_GREEN); message.setColor(Message.COLOR_GREEN);
server.getConversation(target).addMessage(message); server.getConversation(target).addMessage(message);
Intent intent = new Intent(Broadcast.CONVERSATION_MESSAGE); Intent intent = Broadcast.createConversationIntent(
intent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); Broadcast.CONVERSATION_MESSAGE,
intent.putExtra(Broadcast.EXTRA_CONVERSATION, target); server.getId(),
target
);
service.sendBroadcast(intent); service.sendBroadcast(intent);
} }
} }
@ -417,9 +448,11 @@ public class IRCConnection extends PircBot
message.setIcon(R.drawable.info); message.setIcon(R.drawable.info);
conversation.addMessage(message); conversation.addMessage(message);
Intent intent = new Intent(Broadcast.CONVERSATION_MESSAGE); Intent intent = Broadcast.createConversationIntent(
intent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); Broadcast.CONVERSATION_MESSAGE,
intent.putExtra(Broadcast.EXTRA_CONVERSATION, conversation.getName()); server.getId(),
conversation.getName()
);
service.sendBroadcast(intent); service.sendBroadcast(intent);
} }
@ -436,9 +469,11 @@ public class IRCConnection extends PircBot
message.setIcon(R.drawable.op); message.setIcon(R.drawable.op);
server.getConversation(target).addMessage(message); server.getConversation(target).addMessage(message);
Intent intent = new Intent(Broadcast.CONVERSATION_MESSAGE); Intent intent = Broadcast.createConversationIntent(
intent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); Broadcast.CONVERSATION_MESSAGE,
intent.putExtra(Broadcast.EXTRA_CONVERSATION, target); server.getId(),
target
);
service.sendBroadcast(intent); service.sendBroadcast(intent);
} }
@ -454,9 +489,11 @@ public class IRCConnection extends PircBot
// We parted a channel // We parted a channel
server.removeConversation(target); server.removeConversation(target);
Intent intent = new Intent(Broadcast.CONVERSATION_REMOVE); Intent intent = Broadcast.createConversationIntent(
intent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); Broadcast.CONVERSATION_REMOVE,
intent.putExtra(Broadcast.EXTRA_CONVERSATION, target); server.getId(),
target
);
service.sendBroadcast(intent); service.sendBroadcast(intent);
} else { } else {
Message message = new Message(sender + " parts"); Message message = new Message(sender + " parts");
@ -464,9 +501,11 @@ public class IRCConnection extends PircBot
message.setIcon(R.drawable.part); message.setIcon(R.drawable.part);
server.getConversation(target).addMessage(message); server.getConversation(target).addMessage(message);
Intent intent = new Intent(Broadcast.CONVERSATION_MESSAGE); Intent intent = Broadcast.createConversationIntent(
intent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); Broadcast.CONVERSATION_MESSAGE,
intent.putExtra(Broadcast.EXTRA_CONVERSATION, target); server.getId(),
target
);
service.sendBroadcast(intent); service.sendBroadcast(intent);
} }
} }
@ -496,16 +535,20 @@ public class IRCConnection extends PircBot
conversation.addMessage(message); conversation.addMessage(message);
server.addConversationl(conversation); server.addConversationl(conversation);
Intent intent = new Intent(Broadcast.CONVERSATION_NEW); Intent intent = Broadcast.createConversationIntent(
intent.putExtra(Broadcast.EXTRA_CONVERSATION, sender); Broadcast.CONVERSATION_NEW,
intent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); server.getId(),
sender
);
service.sendBroadcast(intent); service.sendBroadcast(intent);
} else { } else {
conversation.addMessage(message); conversation.addMessage(message);
Intent intent = new Intent(Broadcast.CONVERSATION_MESSAGE); Intent intent = Broadcast.createConversationIntent(
intent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); Broadcast.CONVERSATION_MESSAGE,
intent.putExtra(Broadcast.EXTRA_CONVERSATION, sender); server.getId(),
sender
);
service.sendBroadcast(intent); service.sendBroadcast(intent);
} }
} }
@ -525,9 +568,11 @@ public class IRCConnection extends PircBot
message.setIcon(R.drawable.quit); message.setIcon(R.drawable.quit);
server.getConversation(target).addMessage(message); server.getConversation(target).addMessage(message);
Intent intent = new Intent(Broadcast.CONVERSATION_MESSAGE); Intent intent = Broadcast.createConversationIntent(
intent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); Broadcast.CONVERSATION_MESSAGE,
intent.putExtra(Broadcast.EXTRA_CONVERSATION, target); server.getId(),
target
);
service.sendBroadcast(intent); service.sendBroadcast(intent);
} }
@ -540,9 +585,11 @@ public class IRCConnection extends PircBot
message.setIcon(R.drawable.quit); message.setIcon(R.drawable.quit);
conversation.addMessage(message); conversation.addMessage(message);
Intent intent = new Intent(Broadcast.CONVERSATION_MESSAGE); Intent intent = Broadcast.createConversationIntent(
intent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); Broadcast.CONVERSATION_MESSAGE,
intent.putExtra(Broadcast.EXTRA_CONVERSATION, conversation.getName()); server.getId(),
conversation.getName()
);
service.sendBroadcast(intent); service.sendBroadcast(intent);
} }
@ -575,9 +622,11 @@ public class IRCConnection extends PircBot
// remember channel's topic // remember channel's topic
((Channel) server.getConversation(target)).setTopic(topic); ((Channel) server.getConversation(target)).setTopic(topic);
Intent intent = new Intent(Broadcast.CONVERSATION_MESSAGE); Intent intent = Broadcast.createConversationIntent(
intent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); Broadcast.CONVERSATION_MESSAGE,
intent.putExtra(Broadcast.EXTRA_CONVERSATION, target); server.getId(),
target
);
service.sendBroadcast(intent); service.sendBroadcast(intent);
} }
@ -605,9 +654,11 @@ public class IRCConnection extends PircBot
message.setColor(Message.COLOR_BLUE); message.setColor(Message.COLOR_BLUE);
server.getConversation(target).addMessage(message); server.getConversation(target).addMessage(message);
Intent intent = new Intent(Broadcast.CONVERSATION_MESSAGE); Intent intent = Broadcast.createConversationIntent(
intent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); Broadcast.CONVERSATION_MESSAGE,
intent.putExtra(Broadcast.EXTRA_CONVERSATION, target); server.getId(),
target
);
service.sendBroadcast(intent); service.sendBroadcast(intent);
} }
@ -930,9 +981,11 @@ public class IRCConnection extends PircBot
message.setColor(Message.COLOR_GREY); message.setColor(Message.COLOR_GREY);
server.getConversation(ServerInfo.DEFAULT_NAME).addMessage(message); server.getConversation(ServerInfo.DEFAULT_NAME).addMessage(message);
Intent intent = new Intent(Broadcast.CONVERSATION_MESSAGE); Intent intent = Broadcast.createConversationIntent(
intent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); Broadcast.CONVERSATION_MESSAGE,
intent.putExtra(Broadcast.EXTRA_CONVERSATION, ServerInfo.DEFAULT_NAME); server.getId(),
ServerInfo.DEFAULT_NAME
);
service.sendBroadcast(intent); service.sendBroadcast(intent);
} }
@ -968,9 +1021,11 @@ public class IRCConnection extends PircBot
message.setColor(Message.COLOR_GREY); message.setColor(Message.COLOR_GREY);
server.getConversation(ServerInfo.DEFAULT_NAME).addMessage(message); server.getConversation(ServerInfo.DEFAULT_NAME).addMessage(message);
Intent intent = new Intent(Broadcast.CONVERSATION_MESSAGE); Intent intent = Broadcast.createConversationIntent(
intent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); Broadcast.CONVERSATION_MESSAGE,
intent.putExtra(Broadcast.EXTRA_CONVERSATION, ServerInfo.DEFAULT_NAME); server.getId(),
ServerInfo.DEFAULT_NAME
);
service.sendBroadcast(intent); service.sendBroadcast(intent);
} }
@ -981,8 +1036,8 @@ public class IRCConnection extends PircBot
public void onDisconnect() public void onDisconnect()
{ {
server.setStatus(Status.DISCONNECTED); server.setStatus(Status.DISCONNECTED);
Intent sIntent = new Intent(Broadcast.SERVER_UPDATE);
sIntent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); Intent sIntent = Broadcast.createServerIntent(Broadcast.SERVER_UPDATE, server.getId());
service.sendBroadcast(sIntent); service.sendBroadcast(sIntent);
Message message = new Message("Disconnected"); Message message = new Message("Disconnected");
@ -990,9 +1045,11 @@ public class IRCConnection extends PircBot
message.setColor(Message.COLOR_RED); message.setColor(Message.COLOR_RED);
server.getConversation(ServerInfo.DEFAULT_NAME).addMessage(message); server.getConversation(ServerInfo.DEFAULT_NAME).addMessage(message);
Intent cIntent = new Intent(Broadcast.CONVERSATION_MESSAGE); Intent cIntent = Broadcast.createConversationIntent(
cIntent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); Broadcast.CONVERSATION_MESSAGE,
cIntent.putExtra(Broadcast.EXTRA_CONVERSATION, ServerInfo.DEFAULT_NAME); server.getId(),
ServerInfo.DEFAULT_NAME
);
service.sendBroadcast(cIntent); service.sendBroadcast(cIntent);
} }