Update all broadcast sending to use LocalBroadcastManager.

This breaks a lot as the receiving part is not changed yet. But this is
a branch anyways ... so let's break stuff!
This commit is contained in:
Sebastian Kaspari 2013-02-06 23:14:52 +01:00
parent 8858b362fe
commit e378c6570b
15 changed files with 100 additions and 83 deletions

View File

@ -28,10 +28,11 @@ import org.yaaic.db.Database;
import org.yaaic.model.Server; import org.yaaic.model.Server;
import android.content.Context; import android.content.Context;
import android.support.v4.content.LocalBroadcastManager;
/** /**
* Global Master Class :) * Global Master Class :)
* *
* @author Sebastian Kaspari <sebastian@yaaic.org> * @author Sebastian Kaspari <sebastian@yaaic.org>
*/ */
public class Yaaic public class Yaaic
@ -51,7 +52,7 @@ public class Yaaic
/** /**
* Load servers from database * Load servers from database
* *
* @param context * @param context
*/ */
public void loadServers(Context context) public void loadServers(Context context)
@ -61,14 +62,14 @@ public class Yaaic
servers = db.getServers(); servers = db.getServers();
db.close(); db.close();
// context.sendBroadcast(new Intent(Broadcast.SERVER_UPDATE)); // LocalBroadcastManager.getInstance(context).sendBroadcast(new Intent(Broadcast.SERVER_UPDATE));
serversLoaded = true; serversLoaded = true;
} }
} }
/** /**
* Get global Yaaic instance * Get global Yaaic instance
* *
* @return the global Yaaic instance * @return the global Yaaic instance
*/ */
public static Yaaic getInstance() public static Yaaic getInstance()
@ -82,7 +83,7 @@ public class Yaaic
/** /**
* Get server by id * Get server by id
* *
* @return Server object with given unique id * @return Server object with given unique id
*/ */
public Server getServerById(int serverId) public Server getServerById(int serverId)
@ -92,7 +93,7 @@ public class Yaaic
/** /**
* Remove server with given unique id from list * Remove server with given unique id from list
* *
* @param serverId * @param serverId
*/ */
public void removeServerById(int serverId) public void removeServerById(int serverId)
@ -102,7 +103,7 @@ public class Yaaic
/** /**
* Set servers * Set servers
* *
* @param servers * @param servers
*/ */
public void setServers(HashMap<Integer, Server> servers) public void setServers(HashMap<Integer, Server> servers)
@ -130,7 +131,7 @@ public class Yaaic
/** /**
* Get list of servers * Get list of servers
* *
* @return list of servers * @return list of servers
*/ */
public ArrayList<Server> getServersAsArrayList() public ArrayList<Server> getServersAsArrayList()

View File

@ -65,6 +65,7 @@ import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.IBinder; import android.os.IBinder;
import android.speech.RecognizerIntent; import android.speech.RecognizerIntent;
import android.support.v4.content.LocalBroadcastManager;
import android.support.v4.view.ViewPager; import android.support.v4.view.ViewPager;
import android.text.InputType; import android.text.InputType;
import android.text.method.TextKeyListener; import android.text.method.TextKeyListener;
@ -715,11 +716,12 @@ public class ConversationActivity extends SherlockActivity implements ServiceCon
server.addConversation(query); server.addConversation(query);
Intent intent = Broadcast.createConversationIntent( Intent intent = Broadcast.createConversationIntent(
Broadcast.CONVERSATION_NEW, Broadcast.CONVERSATION_NEW,
server.getId(), server.getId(),
nicknameWithoutPrefix nicknameWithoutPrefix
); );
binder.getService().sendBroadcast(intent);
LocalBroadcastManager.getInstance(binder.getService()).sendBroadcast(intent);
} }
break; break;
case User.ACTION_OP: case User.ACTION_OP:

View File

@ -55,6 +55,7 @@ import org.yaaic.model.Message;
import org.yaaic.model.Server; import org.yaaic.model.Server;
import android.content.Intent; import android.content.Intent;
import android.support.v4.content.LocalBroadcastManager;
/** /**
* Parser for commands * Parser for commands
@ -195,7 +196,7 @@ public class CommandParser
conversation.getName() conversation.getName()
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} }
} }
} }

View File

@ -33,6 +33,7 @@ import org.yaaic.model.Server;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.support.v4.content.LocalBroadcastManager;
/** /**
* Command: /amsg <message> * Command: /amsg <message>
@ -65,7 +66,7 @@ public class AMsgHandler extends BaseHandler
currentConversation.getName() currentConversation.getName()
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
service.getConnection(server.getId()).sendMessage(currentConversation.getName(), text); service.getConnection(server.getId()).sendMessage(currentConversation.getName(), text);
} }

View File

@ -30,12 +30,13 @@ import org.yaaic.model.Server;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.support.v4.content.LocalBroadcastManager;
/** /**
* Command: /close * Command: /close
* *
* Closes the current window * Closes the current window
* *
* @author Sebastian Kaspari <sebastian@yaaic.org> * @author Sebastian Kaspari <sebastian@yaaic.org>
*/ */
public class CloseHandler extends BaseHandler public class CloseHandler extends BaseHandler
@ -62,7 +63,8 @@ public class CloseHandler extends BaseHandler
server.getId(), server.getId(),
conversation.getName() conversation.getName()
); );
service.sendBroadcast(intent);
LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} }
} }
} }

View File

@ -32,6 +32,7 @@ import org.yaaic.model.Message;
import org.yaaic.model.Server; import org.yaaic.model.Server;
import android.content.Context; import android.content.Context;
import android.support.v4.content.LocalBroadcastManager;
/** /**
* Command: /dcc SEND <nickname> <file> * Command: /dcc SEND <nickname> <file>
@ -63,7 +64,7 @@ public class DCCHandler extends BaseHandler
message.setColor(Message.COLOR_GREY); message.setColor(Message.COLOR_GREY);
conversation.addMessage(message); conversation.addMessage(message);
service.sendBroadcast( LocalBroadcastManager.getInstance(service).sendBroadcast(
Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), conversation.getName()) Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), conversation.getName())
); );
} else { } else {

View File

@ -31,6 +31,7 @@ import org.yaaic.model.Server;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.support.v4.content.LocalBroadcastManager;
/** /**
* Command: /echo <text> * Command: /echo <text>
@ -54,7 +55,7 @@ public class EchoHandler extends BaseHandler
server.getId(), server.getId(),
conversation.getName() conversation.getName()
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} else { } else {
throw new CommandException(service.getString(R.string.text_missing)); throw new CommandException(service.getString(R.string.text_missing));
} }

View File

@ -35,10 +35,11 @@ import org.yaaic.model.Server;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.support.v4.content.LocalBroadcastManager;
/** /**
* Command: /help * Command: /help
* *
* @author Karol Gliniecki <karol.gliniecki@googlemail.com> * @author Karol Gliniecki <karol.gliniecki@googlemail.com>
* @author Sebastian Kaspari <sebastian@yaaic.org> * @author Sebastian Kaspari <sebastian@yaaic.org>
*/ */
@ -61,7 +62,7 @@ public class HelpHandler extends BaseHandler
/** /**
* Show all available commands * Show all available commands
* *
* @param conversation * @param conversation
* @param server * @param server
* @param service * @param service
@ -100,12 +101,12 @@ public class HelpHandler extends BaseHandler
conversation.getName() conversation.getName()
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} }
/** /**
* Show details of a single command * Show details of a single command
* *
* @param conversation * @param conversation
* @param server * @param server
* @param service * @param service
@ -129,7 +130,7 @@ public class HelpHandler extends BaseHandler
conversation.getName() conversation.getName()
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} else { } else {
throw new CommandException(service.getString(R.string.unknown_command, command)); throw new CommandException(service.getString(R.string.unknown_command, command));
} }

View File

@ -31,6 +31,7 @@ import org.yaaic.model.Server;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.support.v4.content.LocalBroadcastManager;
/** /**
* Command: /me <action> * Command: /me <action>
@ -62,7 +63,7 @@ public class MeHandler extends BaseHandler
server.getId(), server.getId(),
conversation.getName() conversation.getName()
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
service.getConnection(server.getId()).sendAction(conversation.getName(), action); service.getConnection(server.getId()).sendAction(conversation.getName(), action);
} else { } else {

View File

@ -31,6 +31,7 @@ import org.yaaic.model.Server;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.support.v4.content.LocalBroadcastManager;
/** /**
* Command: /msg <target> <message> * Command: /msg <target> <message>
@ -63,7 +64,7 @@ public class MsgHandler extends BaseHandler
targetConversation.getName() targetConversation.getName()
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} }
} else { } else {
throw new CommandException(service.getString(R.string.invalid_number_of_params)); throw new CommandException(service.getString(R.string.invalid_number_of_params));

View File

@ -32,6 +32,7 @@ import org.yaaic.model.Server;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.support.v4.content.LocalBroadcastManager;
/** /**
* Command: /names * Command: /names
@ -70,7 +71,7 @@ public class NamesHandler extends BaseHandler
server.getId(), server.getId(),
conversation.getName() conversation.getName()
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} }
/** /**

View File

@ -31,6 +31,7 @@ import org.yaaic.model.Server;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.support.v4.content.LocalBroadcastManager;
/** /**
* Command: /notice <nickname> <message> * Command: /notice <nickname> <message>
@ -59,7 +60,7 @@ public class NoticeHandler extends BaseHandler
server.getId(), server.getId(),
conversation.getName() conversation.getName()
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
service.getConnection(server.getId()).sendNotice(params[1], text); service.getConnection(server.getId()).sendNotice(params[1], text);
} else { } else {

View File

@ -31,6 +31,7 @@ import org.yaaic.model.Server;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.support.v4.content.LocalBroadcastManager;
/** /**
* Command: /query <nickname> * Command: /query <nickname>
@ -68,7 +69,7 @@ public class QueryHandler extends BaseHandler
server.getId(), server.getId(),
query.getName() query.getName()
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} else { } else {
throw new CommandException(service.getString(R.string.invalid_number_of_params)); throw new CommandException(service.getString(R.string.invalid_number_of_params));
} }

View File

@ -43,6 +43,7 @@ import org.yaaic.model.ServerInfo;
import org.yaaic.model.Status; import org.yaaic.model.Status;
import android.content.Intent; import android.content.Intent;
import android.support.v4.content.LocalBroadcastManager;
import android.util.Log; import android.util.Log;
/** /**
@ -169,7 +170,7 @@ public class IRCConnection extends PircBot
ignoreMOTD = service.getSettings().isIgnoreMOTDEnabled(); ignoreMOTD = service.getSettings().isIgnoreMOTDEnabled();
service.sendBroadcast( LocalBroadcastManager.getInstance(service).sendBroadcast(
Broadcast.createServerIntent(Broadcast.SERVER_UPDATE, server.getId()) Broadcast.createServerIntent(Broadcast.SERVER_UPDATE, server.getId())
); );
@ -193,7 +194,7 @@ public class IRCConnection extends PircBot
identify(server.getAuthentication().getNickservPassword()); identify(server.getAuthentication().getNickservPassword());
} }
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} }
/** /**
@ -246,7 +247,7 @@ public class IRCConnection extends PircBot
ServerInfo.DEFAULT_NAME ServerInfo.DEFAULT_NAME
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} }
/** /**
* On channel action * On channel action
@ -278,7 +279,7 @@ public class IRCConnection extends PircBot
server.getId(), server.getId(),
queryNick queryNick
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} else { } else {
conversation.addMessage(message); conversation.addMessage(message);
@ -287,7 +288,7 @@ public class IRCConnection extends PircBot
server.getId(), server.getId(),
queryNick queryNick
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} }
if (sender.equals(this.getNick())) { if (sender.equals(this.getNick())) {
@ -341,7 +342,7 @@ public class IRCConnection extends PircBot
target target
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} }
/** /**
@ -361,7 +362,7 @@ public class IRCConnection extends PircBot
target target
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} }
/** /**
@ -380,7 +381,7 @@ public class IRCConnection extends PircBot
server.getId(), server.getId(),
server.getSelectedConversation() server.getSelectedConversation()
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} else { } else {
// Someone is invited // Someone is invited
Message message = new Message(service.getString(R.string.message_invite_someone, sourceNick, targetNick, target)); Message message = new Message(service.getString(R.string.message_invite_someone, sourceNick, targetNick, target));
@ -391,7 +392,7 @@ public class IRCConnection extends PircBot
server.getId(), server.getId(),
target target
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} }
} }
@ -412,7 +413,7 @@ public class IRCConnection extends PircBot
server.getId(), server.getId(),
target target
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} else if (service.getSettings().showJoinPartAndQuit()) { } else if (service.getSettings().showJoinPartAndQuit()) {
Message message = new Message( Message message = new Message(
service.getString(R.string.message_join, sender), service.getString(R.string.message_join, sender),
@ -428,7 +429,7 @@ public class IRCConnection extends PircBot
server.getId(), server.getId(),
target target
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} }
} }
@ -448,7 +449,7 @@ public class IRCConnection extends PircBot
server.getId(), server.getId(),
target target
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} else { } else {
Message message = new Message(service.getString(R.string.message_kick, kickerNick, recipientNick)); Message message = new Message(service.getString(R.string.message_kick, kickerNick, recipientNick));
message.setColor(Message.COLOR_GREEN); message.setColor(Message.COLOR_GREEN);
@ -459,7 +460,7 @@ public class IRCConnection extends PircBot
server.getId(), server.getId(),
target target
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} }
} }
@ -496,7 +497,7 @@ public class IRCConnection extends PircBot
server.getId(), server.getId(),
target target
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} }
/** /**
@ -514,7 +515,7 @@ public class IRCConnection extends PircBot
Intent intent = new Intent(Broadcast.CHANNEL_MESSAGE); Intent intent = new Intent(Broadcast.CHANNEL_MESSAGE);
intent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); intent.putExtra(Broadcast.EXTRA_SERVER, server.getId());
intent.putExtra(Broadcast.EXTRA_CHANNEL, target); intent.putExtra(Broadcast.EXTRA_CHANNEL, target);
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
*/ */
} }
@ -538,7 +539,7 @@ public class IRCConnection extends PircBot
ServerInfo.DEFAULT_NAME ServerInfo.DEFAULT_NAME
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} }
Vector<String> channels = getChannelsByNickname(newNick); Vector<String> channels = getChannelsByNickname(newNick);
@ -553,7 +554,7 @@ public class IRCConnection extends PircBot
server.getId(), server.getId(),
target target
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} }
} }
@ -586,7 +587,7 @@ public class IRCConnection extends PircBot
server.getId(), server.getId(),
conversation.getName() conversation.getName()
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} }
/** /**
@ -605,7 +606,7 @@ public class IRCConnection extends PircBot
server.getId(), server.getId(),
target target
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} }
/** /**
@ -624,7 +625,7 @@ public class IRCConnection extends PircBot
server.getId(), server.getId(),
target target
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} else if (service.getSettings().showJoinPartAndQuit()) { } else if (service.getSettings().showJoinPartAndQuit()) {
Message message = new Message( Message message = new Message(
service.getString(R.string.message_part, sender), service.getString(R.string.message_part, sender),
@ -640,7 +641,7 @@ public class IRCConnection extends PircBot
server.getId(), server.getId(),
target target
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} }
} }
@ -670,7 +671,7 @@ public class IRCConnection extends PircBot
server.getId(), server.getId(),
queryNick queryNick
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} else { } else {
conversation.addMessage(message); conversation.addMessage(message);
@ -679,7 +680,7 @@ public class IRCConnection extends PircBot
server.getId(), server.getId(),
queryNick queryNick
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} }
if (sender.equals(this.getNick())) { if (sender.equals(this.getNick())) {
@ -732,7 +733,7 @@ public class IRCConnection extends PircBot
server.getId(), server.getId(),
target target
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} }
// Look if there's a query to update // Look if there's a query to update
@ -753,7 +754,7 @@ public class IRCConnection extends PircBot
server.getId(), server.getId(),
conversation.getName() conversation.getName()
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} }
} }
} }
@ -782,7 +783,7 @@ public class IRCConnection extends PircBot
server.getId(), server.getId(),
target target
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
// update the displayed conversation title if necessary // update the displayed conversation title if necessary
intent = Broadcast.createConversationIntent( intent = Broadcast.createConversationIntent(
@ -790,7 +791,7 @@ public class IRCConnection extends PircBot
server.getId(), server.getId(),
target target
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} }
/** /**
@ -818,7 +819,7 @@ public class IRCConnection extends PircBot
server.getId(), server.getId(),
target target
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} }
/** /**
@ -831,7 +832,7 @@ 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);
service.sendBroadcast( LocalBroadcastManager.getInstance(service).sendBroadcast(
Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target) Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target)
); );
} }
@ -846,7 +847,7 @@ 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);
service.sendBroadcast( LocalBroadcastManager.getInstance(service).sendBroadcast(
Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target) Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target)
); );
} }
@ -861,7 +862,7 @@ 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);
service.sendBroadcast( LocalBroadcastManager.getInstance(service).sendBroadcast(
Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target) Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target)
); );
} }
@ -876,7 +877,7 @@ 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);
service.sendBroadcast( LocalBroadcastManager.getInstance(service).sendBroadcast(
Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target) Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target)
); );
} }
@ -891,7 +892,7 @@ 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);
service.sendBroadcast( LocalBroadcastManager.getInstance(service).sendBroadcast(
Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target) Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target)
); );
} }
@ -906,7 +907,7 @@ 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);
service.sendBroadcast( LocalBroadcastManager.getInstance(service).sendBroadcast(
Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target) Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target)
); );
} }
@ -921,7 +922,7 @@ 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);
service.sendBroadcast( LocalBroadcastManager.getInstance(service).sendBroadcast(
Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target) Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target)
); );
} }
@ -936,7 +937,7 @@ 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);
service.sendBroadcast( LocalBroadcastManager.getInstance(service).sendBroadcast(
Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target) Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target)
); );
} }
@ -951,7 +952,7 @@ 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);
service.sendBroadcast( LocalBroadcastManager.getInstance(service).sendBroadcast(
Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target) Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target)
); );
} }
@ -966,7 +967,7 @@ 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);
service.sendBroadcast( LocalBroadcastManager.getInstance(service).sendBroadcast(
Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target) Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target)
); );
} }
@ -981,7 +982,7 @@ 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);
service.sendBroadcast( LocalBroadcastManager.getInstance(service).sendBroadcast(
Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target) Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target)
); );
} }
@ -996,7 +997,7 @@ 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);
service.sendBroadcast( LocalBroadcastManager.getInstance(service).sendBroadcast(
Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target) Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target)
); );
} }
@ -1011,7 +1012,7 @@ 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);
service.sendBroadcast( LocalBroadcastManager.getInstance(service).sendBroadcast(
Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target) Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target)
); );
} }
@ -1026,7 +1027,7 @@ 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);
service.sendBroadcast( LocalBroadcastManager.getInstance(service).sendBroadcast(
Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target) Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target)
); );
} }
@ -1041,7 +1042,7 @@ 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);
service.sendBroadcast( LocalBroadcastManager.getInstance(service).sendBroadcast(
Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target) Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target)
); );
} }
@ -1056,7 +1057,7 @@ 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);
service.sendBroadcast( LocalBroadcastManager.getInstance(service).sendBroadcast(
Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target) Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target)
); );
} }
@ -1071,7 +1072,7 @@ 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);
service.sendBroadcast( LocalBroadcastManager.getInstance(service).sendBroadcast(
Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target) Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target)
); );
} }
@ -1086,7 +1087,7 @@ 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);
service.sendBroadcast( LocalBroadcastManager.getInstance(service).sendBroadcast(
Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target) Broadcast.createConversationIntent(Broadcast.CONVERSATION_MESSAGE, server.getId(), target)
); );
} }
@ -1107,7 +1108,7 @@ public class IRCConnection extends PircBot
server.getId(), server.getId(),
ServerInfo.DEFAULT_NAME ServerInfo.DEFAULT_NAME
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} }
/** /**
@ -1156,7 +1157,7 @@ public class IRCConnection extends PircBot
server.getId(), server.getId(),
ServerInfo.DEFAULT_NAME ServerInfo.DEFAULT_NAME
); );
service.sendBroadcast(intent); LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
} }
/** /**
@ -1180,7 +1181,7 @@ public class IRCConnection extends PircBot
service.notifyDisconnected(server.getTitle()); service.notifyDisconnected(server.getTitle());
Intent sIntent = Broadcast.createServerIntent(Broadcast.SERVER_UPDATE, server.getId()); Intent sIntent = Broadcast.createServerIntent(Broadcast.SERVER_UPDATE, server.getId());
service.sendBroadcast(sIntent); LocalBroadcastManager.getInstance(service).sendBroadcast(sIntent);
Collection<Conversation> conversations = server.getConversations(); Collection<Conversation> conversations = server.getConversations();
@ -1195,7 +1196,7 @@ public class IRCConnection extends PircBot
server.getId(), server.getId(),
conversation.getName() conversation.getName()
); );
service.sendBroadcast(cIntent); LocalBroadcastManager.getInstance(service).sendBroadcast(cIntent);
} }
synchronized(isQuittingLock) { synchronized(isQuittingLock) {

View File

@ -50,6 +50,7 @@ import android.app.Service;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.os.SystemClock; import android.os.SystemClock;
import android.support.v4.content.LocalBroadcastManager;
/** /**
* The background service for managing the irc connections * The background service for managing the irc connections
@ -136,7 +137,7 @@ public class IRCService extends Service
db.close(); db.close();
// Broadcast changed server list // Broadcast changed server list
sendBroadcast(new Intent(Broadcast.SERVER_UPDATE)); LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent(Broadcast.SERVER_UPDATE));
} }
/** /**
@ -483,7 +484,7 @@ public class IRCService extends Service
server.setStatus(Status.DISCONNECTED); server.setStatus(Status.DISCONNECTED);
Intent sIntent = Broadcast.createServerIntent(Broadcast.SERVER_UPDATE, serverId); Intent sIntent = Broadcast.createServerIntent(Broadcast.SERVER_UPDATE, serverId);
sendBroadcast(sIntent); LocalBroadcastManager.getInstance(IRCService.this).sendBroadcast(sIntent);
IRCConnection connection = getConnection(serverId); IRCConnection connection = getConnection(serverId);
@ -520,7 +521,7 @@ public class IRCService extends Service
serverId, serverId,
ServerInfo.DEFAULT_NAME ServerInfo.DEFAULT_NAME
); );
sendBroadcast(cIntent); LocalBroadcastManager.getInstance(IRCService.this).sendBroadcast(cIntent);
} }
} }
}.start(); }.start();