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,6 +28,7 @@ import org.yaaic.db.Database;
import org.yaaic.model.Server;
import android.content.Context;
import android.support.v4.content.LocalBroadcastManager;
/**
* Global Master Class :)
@ -61,7 +62,7 @@ public class Yaaic
servers = db.getServers();
db.close();
// context.sendBroadcast(new Intent(Broadcast.SERVER_UPDATE));
// LocalBroadcastManager.getInstance(context).sendBroadcast(new Intent(Broadcast.SERVER_UPDATE));
serversLoaded = true;
}
}

View File

@ -65,6 +65,7 @@ import android.os.Bundle;
import android.os.Handler;
import android.os.IBinder;
import android.speech.RecognizerIntent;
import android.support.v4.content.LocalBroadcastManager;
import android.support.v4.view.ViewPager;
import android.text.InputType;
import android.text.method.TextKeyListener;
@ -719,7 +720,8 @@ public class ConversationActivity extends SherlockActivity implements ServiceCon
server.getId(),
nicknameWithoutPrefix
);
binder.getService().sendBroadcast(intent);
LocalBroadcastManager.getInstance(binder.getService()).sendBroadcast(intent);
}
break;
case User.ACTION_OP:

View File

@ -55,6 +55,7 @@ import org.yaaic.model.Message;
import org.yaaic.model.Server;
import android.content.Intent;
import android.support.v4.content.LocalBroadcastManager;
/**
* Parser for commands
@ -195,7 +196,7 @@ public class CommandParser
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.Intent;
import android.support.v4.content.LocalBroadcastManager;
/**
* Command: /amsg <message>
@ -65,7 +66,7 @@ public class AMsgHandler extends BaseHandler
currentConversation.getName()
);
service.sendBroadcast(intent);
LocalBroadcastManager.getInstance(service).sendBroadcast(intent);
service.getConnection(server.getId()).sendMessage(currentConversation.getName(), text);
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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