hedgewars: comparison project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/netplay/ThreadedNetConnection.java

equal deleted inserted replaced

-:4feced261c68
+:de822cd3df3a
 import com.sun.jna.Pointer;
 /**
 * This class handles the actual communication with the networking library, running on a separate thread.
 *
 * In order to process net messages, this class regularly runs a tick() function on the frontlib. This
 * usually happens several times per second, but it can be slowed down a lot if no fast reaction to
 * events is required (e.g. to conserve battery if the application is in the background).
 */
 class ThreadedNetConnection {
-	private static final long TICK_INTERVAL_FAST = 100;
+private static final long TICK_INTERVAL_FAST = 100;
-	private static final long TICK_INTERVAL_SLOW = 5000;
+private static final long TICK_INTERVAL_SLOW = 5000;
-	private static final Frontlib FLIB = Flib.INSTANCE;
+private static final Frontlib FLIB = Flib.INSTANCE;
-	public final ToNetHandler toNetHandler;
+public final ToNetHandler toNetHandler;
-	private final Context appContext;
+private final Context appContext;
-	private final FromNetHandler fromNetHandler;
+private final FromNetHandler fromNetHandler;
-	private final TickHandler tickHandler;
+private final TickHandler tickHandler;
-	/**
+/**
-	 * conn can only be null while connecting (the first thing in the thread), and directly after disconnecting,
+* conn can only be null while connecting (the first thing in the thread), and directly after disconnecting,
-	 * in the same message (the looper is shut down on disconnect, so there will be no messages after that).
+* in the same message (the looper is shut down on disconnect, so there will be no messages after that).
-	 */
+*/
-	private NetconnPtr conn;
+private NetconnPtr conn;
-	private String playerName;
+private String playerName;
-	private ThreadedNetConnection(Context appContext, FromNetHandler fromNetHandler) {
+private ThreadedNetConnection(Context appContext, FromNetHandler fromNetHandler) {
-		this.appContext = appContext;
+this.appContext = appContext;
-		this.fromNetHandler = fromNetHandler;
+this.fromNetHandler = fromNetHandler;
-		HandlerThread thread = new HandlerThread("NetThread");
+HandlerThread thread = new HandlerThread("NetThread");
-		thread.start();
+thread.start();
-		toNetHandler = new ToNetHandler(thread.getLooper());
+toNetHandler = new ToNetHandler(thread.getLooper());
-		tickHandler = new TickHandler(thread.getLooper(), TICK_INTERVAL_FAST, tickCb);
+tickHandler = new TickHandler(thread.getLooper(), TICK_INTERVAL_FAST, tickCb);
-	}
+}
-	private void connect(final String name, final String host, final int port) {
+private void connect(final String name, final String host, final int port) {
-		toNetHandler.post(new Runnable() {
+toNetHandler.post(new Runnable() {
-			public void run() {
+public void run() {
-				playerName = name == null ? "Player" : name;
+playerName = name == null ? "Player" : name;
-				File dataPath;
+File dataPath;
-				try {
+try {
-					dataPath = FileUtils.getDataPathFile(appContext);
+dataPath = FileUtils.getDataPathFile(appContext);
-				} catch (FileNotFoundException e) {
+} catch (FileNotFoundException e) {
-					shutdown(true, appContext.getString(R.string.sdcard_not_mounted));
+shutdown(true, appContext.getString(R.string.sdcard_not_mounted));
-					return;
+return;
-				}
+}
-				conn = FLIB.flib_netconn_create(playerName, dataPath.getAbsolutePath()+"/", host, port);
+conn = FLIB.flib_netconn_create(playerName, dataPath.getAbsolutePath()+"/", host, port);
-				if(conn == null) {
+if(conn == null) {
-					shutdown(true, appContext.getString(R.string.error_connection_failed));
+shutdown(true, appContext.getString(R.string.error_connection_failed));
-					return;
+return;
-				}
+}
-				FLIB.flib_netconn_onSchemeChanged(conn, cfgSchemeCb, null);
+FLIB.flib_netconn_onSchemeChanged(conn, cfgSchemeCb, null);
-				FLIB.flib_netconn_onClientFlags(conn, clientFlagsCb, null);
+FLIB.flib_netconn_onClientFlags(conn, clientFlagsCb, null);
-				FLIB.flib_netconn_onChat(conn, chatCb, null);
+FLIB.flib_netconn_onChat(conn, chatCb, null);
-				FLIB.flib_netconn_onConnected(conn, connectedCb, null);
+FLIB.flib_netconn_onConnected(conn, connectedCb, null);
-				FLIB.flib_netconn_onDisconnected(conn, disconnectCb, null);
+FLIB.flib_netconn_onDisconnected(conn, disconnectCb, null);
-				FLIB.flib_netconn_onEngineMessage(conn, engineMessageCb, null);
+FLIB.flib_netconn_onEngineMessage(conn, engineMessageCb, null);
-				FLIB.flib_netconn_onEnterRoom(conn, enterRoomCb, null);
+FLIB.flib_netconn_onEnterRoom(conn, enterRoomCb, null);
-				FLIB.flib_netconn_onHogCountChanged(conn, hogCountChangedCb, null);
+FLIB.flib_netconn_onHogCountChanged(conn, hogCountChangedCb, null);
-				FLIB.flib_netconn_onLeaveRoom(conn, leaveRoomCb, null);
+FLIB.flib_netconn_onLeaveRoom(conn, leaveRoomCb, null);
-				FLIB.flib_netconn_onLobbyJoin(conn, lobbyJoinCb, null);
+FLIB.flib_netconn_onLobbyJoin(conn, lobbyJoinCb, null);
-				FLIB.flib_netconn_onLobbyLeave(conn, lobbyLeaveCb, null);
+FLIB.flib_netconn_onLobbyLeave(conn, lobbyLeaveCb, null);
-				FLIB.flib_netconn_onMapChanged(conn, mapChangedCb, null);
+FLIB.flib_netconn_onMapChanged(conn, mapChangedCb, null);
-				FLIB.flib_netconn_onMessage(conn, messageCb, null);
+FLIB.flib_netconn_onMessage(conn, messageCb, null);
-				FLIB.flib_netconn_onPasswordRequest(conn, passwordRequestCb, null);
+FLIB.flib_netconn_onPasswordRequest(conn, passwordRequestCb, null);
-				FLIB.flib_netconn_onRoomAdd(conn, roomAddCb, null);
+FLIB.flib_netconn_onRoomAdd(conn, roomAddCb, null);
-				FLIB.flib_netconn_onRoomDelete(conn, roomDeleteCb, null);
+FLIB.flib_netconn_onRoomDelete(conn, roomDeleteCb, null);
-				FLIB.flib_netconn_onRoomJoin(conn, roomJoinCb, null);
+FLIB.flib_netconn_onRoomJoin(conn, roomJoinCb, null);
-				FLIB.flib_netconn_onRoomLeave(conn, roomLeaveCb, null);
+FLIB.flib_netconn_onRoomLeave(conn, roomLeaveCb, null);
-				FLIB.flib_netconn_onRoomlist(conn, roomlistCb, null);
+FLIB.flib_netconn_onRoomlist(conn, roomlistCb, null);
-				FLIB.flib_netconn_onRoomUpdate(conn, roomUpdateCb, null);
+FLIB.flib_netconn_onRoomUpdate(conn, roomUpdateCb, null);
-				FLIB.flib_netconn_onRunGame(conn, runGameCb, null);
+FLIB.flib_netconn_onRunGame(conn, runGameCb, null);
-				FLIB.flib_netconn_onScriptChanged(conn, scriptChangedCb, null);
+FLIB.flib_netconn_onScriptChanged(conn, scriptChangedCb, null);
-				// FLIB.flib_netconn_onServerVar(conn, serverVarCb, null);
+// FLIB.flib_netconn_onServerVar(conn, serverVarCb, null);
-				FLIB.flib_netconn_onTeamAccepted(conn, teamAcceptedCb, null);
+FLIB.flib_netconn_onTeamAccepted(conn, teamAcceptedCb, null);
-				FLIB.flib_netconn_onTeamAdd(conn, teamAddedCb, null);
+FLIB.flib_netconn_onTeamAdd(conn, teamAddedCb, null);
-				FLIB.flib_netconn_onTeamColorChanged(conn, teamColorChangedCb, null);
+FLIB.flib_netconn_onTeamColorChanged(conn, teamColorChangedCb, null);
-				FLIB.flib_netconn_onTeamDelete(conn, teamDeletedCb, null);
+FLIB.flib_netconn_onTeamDelete(conn, teamDeletedCb, null);
-				FLIB.flib_netconn_onWeaponsetChanged(conn, weaponsetChangedCb, null);
+FLIB.flib_netconn_onWeaponsetChanged(conn, weaponsetChangedCb, null);
-				tickHandler.start();
+tickHandler.start();
-			}
+}
-		});
+});
-	}
+}
-	public static ThreadedNetConnection startConnection(Context appContext, FromNetHandler fromNetHandler, String playerName, String host, int port) {
+public static ThreadedNetConnection startConnection(Context appContext, FromNetHandler fromNetHandler, String playerName, String host, int port) {
-		ThreadedNetConnection result = new ThreadedNetConnection(appContext, fromNetHandler);
+ThreadedNetConnection result = new ThreadedNetConnection(appContext, fromNetHandler);
-		result.connect(playerName, host, port);
+result.connect(playerName, host, port);
-		return result;
+return result;
-	}
+}
-	public void setFastTickRate(boolean fastTickRate) {
+public void setFastTickRate(boolean fastTickRate) {
-		tickHandler.setInterval(fastTickRate ? TICK_INTERVAL_FAST : TICK_INTERVAL_SLOW);
+tickHandler.setInterval(fastTickRate ? TICK_INTERVAL_FAST : TICK_INTERVAL_SLOW);
-	}
+}
-	private final Runnable tickCb = new Runnable() {
+private final Runnable tickCb = new Runnable() {
-		public void run() {
+public void run() {
-			FLIB.flib_netconn_tick(conn);
+FLIB.flib_netconn_tick(conn);
-		}
+}
-	};
+};
-	private final SchemeCallback cfgSchemeCb = new SchemeCallback() {
+private final SchemeCallback cfgSchemeCb = new SchemeCallback() {
-		public void callback(Pointer context, SchemePtr schemePtr) {
+public void callback(Pointer context, SchemePtr schemePtr) {
-			sendFromNet(MSG_SCHEME_CHANGED, schemePtr.deref());
+sendFromNet(MSG_SCHEME_CHANGED, schemePtr.deref());
-		}
+}
-	};
+};
-	private final MapIntCallback mapChangedCb = new MapIntCallback() {
+private final MapIntCallback mapChangedCb = new MapIntCallback() {
-		public void callback(Pointer context, MapRecipePtr mapPtr, int updateType) {
+public void callback(Pointer context, MapRecipePtr mapPtr, int updateType) {
-			sendFromNet(MSG_MAP_CHANGED, updateType, mapPtr.deref());
+sendFromNet(MSG_MAP_CHANGED, updateType, mapPtr.deref());
-		}
+}
-	};
+};
-	private final StrCallback scriptChangedCb = new StrCallback() {
+private final StrCallback scriptChangedCb = new StrCallback() {
-		public void callback(Pointer context, String script) {
+public void callback(Pointer context, String script) {
-			sendFromNet(MSG_SCRIPT_CHANGED, script);
+sendFromNet(MSG_SCRIPT_CHANGED, script);
-		}
+}
-	};
+};
-	private final WeaponsetCallback weaponsetChangedCb = new WeaponsetCallback() {
+private final WeaponsetCallback weaponsetChangedCb = new WeaponsetCallback() {
-		public void callback(Pointer context, WeaponsetPtr weaponsetPtr) {
+public void callback(Pointer context, WeaponsetPtr weaponsetPtr) {
-			sendFromNet(MSG_WEAPONSET_CHANGED, weaponsetPtr.deref());
+sendFromNet(MSG_WEAPONSET_CHANGED, weaponsetPtr.deref());
-		}
+}
-	};
+};
-	private final StrCallback lobbyJoinCb = new StrCallback() {
+private final StrCallback lobbyJoinCb = new StrCallback() {
-		public void callback(Pointer context, String name) {
+public void callback(Pointer context, String name) {
-			sendFromNet(MSG_LOBBY_JOIN, name);
+sendFromNet(MSG_LOBBY_JOIN, name);
-		}
+}
-	};
+};
-	private final StrStrCallback lobbyLeaveCb = new StrStrCallback() {
+private final StrStrCallback lobbyLeaveCb = new StrStrCallback() {
-		public void callback(Pointer context, String name, String msg) {
+public void callback(Pointer context, String name, String msg) {
-			sendFromNet(MSG_LOBBY_LEAVE, Pair.create(name, msg));
+sendFromNet(MSG_LOBBY_LEAVE, Pair.create(name, msg));
-		}
+}
-	};
+};
-	private final StrCallback roomJoinCb = new StrCallback() {
+private final StrCallback roomJoinCb = new StrCallback() {
-		public void callback(Pointer context, String name) {
+public void callback(Pointer context, String name) {
-			sendFromNet(MSG_ROOM_JOIN, name);
+sendFromNet(MSG_ROOM_JOIN, name);
-		}
+}
-	};
+};
-	private final StrStrCallback roomLeaveCb = new StrStrCallback() {
+private final StrStrCallback roomLeaveCb = new StrStrCallback() {
-		public void callback(Pointer context, String name, String message) {
+public void callback(Pointer context, String name, String message) {
-			sendFromNet(MSG_ROOM_LEAVE, Pair.create(name, message));
+sendFromNet(MSG_ROOM_LEAVE, Pair.create(name, message));
-		}
+}
-	};
+};
-	private final StrStrBoolCallback clientFlagsCb = new StrStrBoolCallback() {
+private final StrStrBoolCallback clientFlagsCb = new StrStrBoolCallback() {
-		public void callback(Pointer context, String nick, String flags, boolean newFlagsState) {
+public void callback(Pointer context, String nick, String flags, boolean newFlagsState) {
-			sendFromNet(MSG_CLIENT_FLAGS, new ClientFlagsUpdate(nick, flags, newFlagsState));
+sendFromNet(MSG_CLIENT_FLAGS, new ClientFlagsUpdate(nick, flags, newFlagsState));
-		}
+}
-	};
+};
-	private final StrStrCallback chatCb = new StrStrCallback() {
+private final StrStrCallback chatCb = new StrStrCallback() {
-		public void callback(Pointer context, String name, String msg) {
+public void callback(Pointer context, String name, String msg) {
-			sendFromNet(MSG_CHAT, Pair.create(name, msg));
+sendFromNet(MSG_CHAT, Pair.create(name, msg));
-		}
+}
-	};
+};
-	private final IntStrCallback messageCb = new IntStrCallback() {
+private final IntStrCallback messageCb = new IntStrCallback() {
-		public void callback(Pointer context, int type, String msg) {
+public void callback(Pointer context, int type, String msg) {
-			sendFromNet(MSG_MESSAGE, type, msg);
+sendFromNet(MSG_MESSAGE, type, msg);
-		}
+}
-	};
+};
-	private final RoomCallback roomAddCb = new RoomCallback() {
+private final RoomCallback roomAddCb = new RoomCallback() {
-		public void callback(Pointer context, RoomPtr roomPtr) {
+public void callback(Pointer context, RoomPtr roomPtr) {
-			sendFromNet(MSG_ROOM_ADD, roomPtr.deref());
+sendFromNet(MSG_ROOM_ADD, roomPtr.deref());
-		}
+}
-	};
+};
-	private final StrRoomCallback roomUpdateCb = new StrRoomCallback() {
+private final StrRoomCallback roomUpdateCb = new StrRoomCallback() {
-		public void callback(Pointer context, String name, RoomPtr roomPtr) {
+public void callback(Pointer context, String name, RoomPtr roomPtr) {
-			sendFromNet(MSG_ROOM_UPDATE, Pair.create(name, roomPtr.deref()));
+sendFromNet(MSG_ROOM_UPDATE, Pair.create(name, roomPtr.deref()));
-		}
+}
-	};
+};
-	private final StrCallback roomDeleteCb = new StrCallback() {
+private final StrCallback roomDeleteCb = new StrCallback() {
-		public void callback(Pointer context, final String name) {
+public void callback(Pointer context, final String name) {
-			sendFromNet(MSG_ROOM_DELETE, name);
+sendFromNet(MSG_ROOM_DELETE, name);
-		}
+}
-	};
+};
-	private final RoomListCallback roomlistCb = new RoomListCallback() {
+private final RoomListCallback roomlistCb = new RoomListCallback() {
-		public void callback(Pointer context, RoomArrayPtr arg1, int count) {
+public void callback(Pointer context, RoomArrayPtr arg1, int count) {
-			sendFromNet(MSG_ROOMLIST, arg1.getRooms(count));
+sendFromNet(MSG_ROOMLIST, arg1.getRooms(count));
-		}
+}
-	};
+};
-	private final VoidCallback connectedCb = new VoidCallback() {
+private final VoidCallback connectedCb = new VoidCallback() {
-		public void callback(Pointer context) {
+public void callback(Pointer context) {
-			FLIB.flib_netconn_send_request_roomlist(conn);
+FLIB.flib_netconn_send_request_roomlist(conn);
-			playerName = FLIB.flib_netconn_get_playername(conn);
+playerName = FLIB.flib_netconn_get_playername(conn);
-			sendFromNet(MSG_CONNECTED, playerName);
+sendFromNet(MSG_CONNECTED, playerName);
-		}
+}
-	};
+};
-	private final StrCallback passwordRequestCb = new StrCallback() {
+private final StrCallback passwordRequestCb = new StrCallback() {
-		public void callback(Pointer context, String nickname) {
+public void callback(Pointer context, String nickname) {
-			sendFromNet(MSG_PASSWORD_REQUEST, playerName);
+sendFromNet(MSG_PASSWORD_REQUEST, playerName);
-		}
+}
-	};
+};
-	private final BoolCallback enterRoomCb = new BoolCallback() {
+private final BoolCallback enterRoomCb = new BoolCallback() {
-		public void callback(Pointer context, boolean isChief) {
+public void callback(Pointer context, boolean isChief) {
-			sendFromNet(MSG_ENTER_ROOM_FROM_LOBBY, isChief);
+sendFromNet(MSG_ENTER_ROOM_FROM_LOBBY, isChief);
-		}
+}
-	};
+};
-	private final IntStrCallback leaveRoomCb = new IntStrCallback() {
+private final IntStrCallback leaveRoomCb = new IntStrCallback() {
-		public void callback(Pointer context, int reason, String message) {
+public void callback(Pointer context, int reason, String message) {
-			sendFromNet(MSG_LEAVE_ROOM, reason, message);
+sendFromNet(MSG_LEAVE_ROOM, reason, message);
-		}
+}
-	};
+};
-	private final TeamCallback teamAddedCb = new TeamCallback() {
+private final TeamCallback teamAddedCb = new TeamCallback() {
-		public void callback(Pointer context, TeamPtr team) {
+public void callback(Pointer context, TeamPtr team) {
-			sendFromNet(MSG_TEAM_ADDED, team.deref());
+sendFromNet(MSG_TEAM_ADDED, team.deref());
-		}
+}
-	};
+};
-	private final StrCallback teamDeletedCb = new StrCallback() {
+private final StrCallback teamDeletedCb = new StrCallback() {
-		public void callback(Pointer context, String teamName) {
+public void callback(Pointer context, String teamName) {
-			sendFromNet(MSG_TEAM_DELETED, teamName);
+sendFromNet(MSG_TEAM_DELETED, teamName);
-		}
+}
-	};
+};
-	private final StrCallback teamAcceptedCb = new StrCallback() {
+private final StrCallback teamAcceptedCb = new StrCallback() {
-		public void callback(Pointer context, String teamName) {
+public void callback(Pointer context, String teamName) {
-			sendFromNet(MSG_TEAM_ACCEPTED, teamName);
+sendFromNet(MSG_TEAM_ACCEPTED, teamName);
-		}
+}
-	};
+};
-	private final StrIntCallback teamColorChangedCb = new StrIntCallback() {
+private final StrIntCallback teamColorChangedCb = new StrIntCallback() {
-		public void callback(Pointer context, String teamName, int colorIndex) {
+public void callback(Pointer context, String teamName, int colorIndex) {
-			sendFromNet(MSG_TEAM_COLOR_CHANGED, colorIndex, teamName);
+sendFromNet(MSG_TEAM_COLOR_CHANGED, colorIndex, teamName);
-		}
+}
-	};
+};
-	private final StrIntCallback hogCountChangedCb = new StrIntCallback() {
+private final StrIntCallback hogCountChangedCb = new StrIntCallback() {
-		public void callback(Pointer context, String teamName, int hogCount) {
+public void callback(Pointer context, String teamName, int hogCount) {
-			sendFromNet(MSG_HOG_COUNT_CHANGED, hogCount, teamName);
+sendFromNet(MSG_HOG_COUNT_CHANGED, hogCount, teamName);
-		}
+}
-	};
+};
-	private final BytesCallback engineMessageCb = new BytesCallback() {
+private final BytesCallback engineMessageCb = new BytesCallback() {
-		public void callback(Pointer context, ByteArrayPtr buffer, NativeSizeT size) {
+public void callback(Pointer context, ByteArrayPtr buffer, NativeSizeT size) {
-			sendFromNet(MSG_ENGINE_MESSAGE, buffer.deref(size.intValue()));
+sendFromNet(MSG_ENGINE_MESSAGE, buffer.deref(size.intValue()));
-		}
+}
-	};
+};
-	private final VoidCallback runGameCb = new VoidCallback() {
+private final VoidCallback runGameCb = new VoidCallback() {
-		public void callback(Pointer context) {
+public void callback(Pointer context) {
-			GameSetupPtr configPtr = FLIB.flib_netconn_create_gamesetup(conn);
+GameSetupPtr configPtr = FLIB.flib_netconn_create_gamesetup(conn);
-			sendFromNet(MSG_RUN_GAME, configPtr.deref());
+sendFromNet(MSG_RUN_GAME, configPtr.deref());
-			FLIB.flib_gamesetup_destroy(configPtr);
+FLIB.flib_gamesetup_destroy(configPtr);
-		}
+}
-	};
+};
-	private void shutdown(boolean error, String message) {
+private void shutdown(boolean error, String message) {
-		if(conn != null) {
+if(conn != null) {
-			FLIB.flib_netconn_destroy(conn);
+FLIB.flib_netconn_destroy(conn);
-			conn = null;
+conn = null;
-		}
+}
-		tickHandler.stop();
+tickHandler.stop();
-		toNetHandler.getLooper().quit();
+toNetHandler.getLooper().quit();
-		sendFromNet(MSG_DISCONNECTED, Pair.create(error, message));
+sendFromNet(MSG_DISCONNECTED, Pair.create(error, message));
-	}
+}
-	private final IntStrCallback disconnectCb = new IntStrCallback() {
+private final IntStrCallback disconnectCb = new IntStrCallback() {
-		public void callback(Pointer context, int reason, String message) {
+public void callback(Pointer context, int reason, String message) {
-			Boolean error = reason != Frontlib.NETCONN_DISCONNECT_NORMAL;
+Boolean error = reason != Frontlib.NETCONN_DISCONNECT_NORMAL;
-			String messageForUser = createDisconnectUserMessage(appContext.getResources(), reason, message);
+String messageForUser = createDisconnectUserMessage(appContext.getResources(), reason, message);
-			shutdown(error, messageForUser);
+shutdown(error, messageForUser);
-		}
+}
-	};
+};
-	private static String createDisconnectUserMessage(Resources res, int reason, String message) {
+private static String createDisconnectUserMessage(Resources res, int reason, String message) {
-		switch(reason) {
+switch(reason) {
-		case Frontlib.NETCONN_DISCONNECT_AUTH_FAILED:
+case Frontlib.NETCONN_DISCONNECT_AUTH_FAILED:
-			return res.getString(R.string.error_auth_failed);
+return res.getString(R.string.error_auth_failed);
-		case Frontlib.NETCONN_DISCONNECT_CONNLOST:
+case Frontlib.NETCONN_DISCONNECT_CONNLOST:
-			return res.getString(R.string.error_connection_lost);
+return res.getString(R.string.error_connection_lost);
-		case Frontlib.NETCONN_DISCONNECT_INTERNAL_ERROR:
+case Frontlib.NETCONN_DISCONNECT_INTERNAL_ERROR:
-			return res.getString(R.string.error_unexpected, message);
+return res.getString(R.string.error_unexpected, message);
-		case Frontlib.NETCONN_DISCONNECT_SERVER_TOO_OLD:
+case Frontlib.NETCONN_DISCONNECT_SERVER_TOO_OLD:
-			return res.getString(R.string.error_server_too_old);
+return res.getString(R.string.error_server_too_old);
-		default:
+default:
-			return message;
+return message;
-		}
+}
-	}
+}
-	private boolean sendFromNet(FromNetMsgType what, Object obj) {
+private boolean sendFromNet(FromNetMsgType what, Object obj) {
-		return fromNetHandler.sendMessage(fromNetHandler.obtainMessage(what.ordinal(), obj));
+return fromNetHandler.sendMessage(fromNetHandler.obtainMessage(what.ordinal(), obj));
-	}
+}
-	private boolean sendFromNet(FromNetMsgType what, int arg1, Object obj) {
+private boolean sendFromNet(FromNetMsgType what, int arg1, Object obj) {
-		return fromNetHandler.sendMessage(fromNetHandler.obtainMessage(what.ordinal(), arg1, 0, obj));
+return fromNetHandler.sendMessage(fromNetHandler.obtainMessage(what.ordinal(), arg1, 0, obj));
-	}
+}
-	static enum ToNetMsgType {
+static enum ToNetMsgType {
-		MSG_SEND_NICK,
+MSG_SEND_NICK,
-		MSG_SEND_PASSWORD,
+MSG_SEND_PASSWORD,
-		MSG_SEND_QUIT,
+MSG_SEND_QUIT,
-		MSG_SEND_ROOMLIST_REQUEST,
+MSG_SEND_ROOMLIST_REQUEST,
-		MSG_SEND_PLAYER_INFO_REQUEST,
+MSG_SEND_PLAYER_INFO_REQUEST,
-		MSG_SEND_CHAT,
+MSG_SEND_CHAT,
-		MSG_SEND_TEAMCHAT,
+MSG_SEND_TEAMCHAT,
-		MSG_SEND_FOLLOW_PLAYER,
+MSG_SEND_FOLLOW_PLAYER,
-		MSG_SEND_JOIN_ROOM,
+MSG_SEND_JOIN_ROOM,
-		MSG_SEND_CREATE_ROOM,
+MSG_SEND_CREATE_ROOM,
-		MSG_SEND_LEAVE_ROOM,
+MSG_SEND_LEAVE_ROOM,
-		MSG_SEND_KICK,
+MSG_SEND_KICK,
-		MSG_SEND_ADD_TEAM,
+MSG_SEND_ADD_TEAM,
-		MSG_SEND_REMOVE_TEAM,
+MSG_SEND_REMOVE_TEAM,
-		MSG_DISCONNECT,
+MSG_DISCONNECT,
-		MSG_SEND_TEAM_COLOR_INDEX,
+MSG_SEND_TEAM_COLOR_INDEX,
-		MSG_SEND_TEAM_HOG_COUNT,
+MSG_SEND_TEAM_HOG_COUNT,
-		MSG_SEND_ENGINE_MESSAGE,
+MSG_SEND_ENGINE_MESSAGE,
-		MSG_SEND_ROUND_FINISHED,
+MSG_SEND_ROUND_FINISHED,
-		MSG_SEND_TOGGLE_READY,
+MSG_SEND_TOGGLE_READY,
-		MSG_SEND_START_GAME,
+MSG_SEND_START_GAME,
-		MSG_SEND_WEAPONSET,
+MSG_SEND_WEAPONSET,
-		MSG_SEND_MAP,
+MSG_SEND_MAP,
-		MSG_SEND_MAP_NAME,
+MSG_SEND_MAP_NAME,
-		MSG_SEND_MAP_GENERATOR,
+MSG_SEND_MAP_GENERATOR,
-		MSG_SEND_MAP_TEMPLATE,
+MSG_SEND_MAP_TEMPLATE,
-		MSG_SEND_MAZE_SIZE,
+MSG_SEND_MAZE_SIZE,
-		MSG_SEND_MAP_SEED,
+MSG_SEND_MAP_SEED,
-		MSG_SEND_MAP_THEME,
+MSG_SEND_MAP_THEME,
-		MSG_SEND_MAP_DRAWDATA,
+MSG_SEND_MAP_DRAWDATA,
-		MSG_SEND_GAMESTYLE,
+MSG_SEND_GAMESTYLE,
-		MSG_SEND_SCHEME;
+MSG_SEND_SCHEME;
-		static final List<ThreadedNetConnection.ToNetMsgType> values = Collections.unmodifiableList(Arrays.asList(ToNetMsgType.values()));
+static final List<ThreadedNetConnection.ToNetMsgType> values = Collections.unmodifiableList(Arrays.asList(ToNetMsgType.values()));
-	}
+}
-	/**
+/**
-	 * Processes messages to the networking system. Runs on a non-main thread.
+* Processes messages to the networking system. Runs on a non-main thread.
-	 */
+*/
-	@SuppressLint("HandlerLeak")
+@SuppressLint("HandlerLeak")
-	public final class ToNetHandler extends Handler {
+public final class ToNetHandler extends Handler {
-		public ToNetHandler(Looper looper) {
+public ToNetHandler(Looper looper) {
-			super(looper);
+super(looper);
-		}
+}
-		@Override
+@Override
-		public void handleMessage(Message msg) {
+public void handleMessage(Message msg) {
-			switch(ToNetMsgType.values.get(msg.what)) {
+switch(ToNetMsgType.values.get(msg.what)) {
-			case MSG_SEND_NICK: {
+case MSG_SEND_NICK: {
-				FLIB.flib_netconn_send_nick(conn, (String)msg.obj);
+FLIB.flib_netconn_send_nick(conn, (String)msg.obj);
-				break;
+break;
-			}
+}
-			case MSG_SEND_PASSWORD: {
+case MSG_SEND_PASSWORD: {
-				FLIB.flib_netconn_send_password(conn, (String)msg.obj);
+FLIB.flib_netconn_send_password(conn, (String)msg.obj);
-				break;
+break;
-			}
+}
-			case MSG_SEND_QUIT: {
+case MSG_SEND_QUIT: {
-				FLIB.flib_netconn_send_quit(conn, (String)msg.obj);
+FLIB.flib_netconn_send_quit(conn, (String)msg.obj);
-				break;
+break;
-			}
+}
-			case MSG_SEND_ROOMLIST_REQUEST: {
+case MSG_SEND_ROOMLIST_REQUEST: {
-				FLIB.flib_netconn_send_request_roomlist(conn);
+FLIB.flib_netconn_send_request_roomlist(conn);
-				break;
+break;
-			}
+}
-			case MSG_SEND_PLAYER_INFO_REQUEST: {
+case MSG_SEND_PLAYER_INFO_REQUEST: {
-				FLIB.flib_netconn_send_playerInfo(conn, (String)msg.obj);
+FLIB.flib_netconn_send_playerInfo(conn, (String)msg.obj);
-				break;
+break;
-			}
+}
-			case MSG_SEND_CHAT: {
+case MSG_SEND_CHAT: {
-				if(FLIB.flib_netconn_send_chat(conn, (String)msg.obj) == 0) {
+if(FLIB.flib_netconn_send_chat(conn, (String)msg.obj) == 0) {
-					sendFromNet(MSG_CHAT, Pair.create(playerName, (String)msg.obj));
+sendFromNet(MSG_CHAT, Pair.create(playerName, (String)msg.obj));
-				}
+}
-				break;
+break;
-			}
+}
-			case MSG_SEND_TEAMCHAT: {
+case MSG_SEND_TEAMCHAT: {
-				FLIB.flib_netconn_send_teamchat(conn, (String)msg.obj);
+FLIB.flib_netconn_send_teamchat(conn, (String)msg.obj);
-				break;
+break;
-			}
+}
-			case MSG_SEND_FOLLOW_PLAYER: {
+case MSG_SEND_FOLLOW_PLAYER: {
-				FLIB.flib_netconn_send_playerFollow(conn, (String)msg.obj);
+FLIB.flib_netconn_send_playerFollow(conn, (String)msg.obj);
-				break;
+break;
-			}
+}
-			case MSG_SEND_JOIN_ROOM: {
+case MSG_SEND_JOIN_ROOM: {
-				FLIB.flib_netconn_send_joinRoom(conn, (String)msg.obj);
+FLIB.flib_netconn_send_joinRoom(conn, (String)msg.obj);
-				break;
+break;
-			}
+}
-			case MSG_SEND_CREATE_ROOM: {
+case MSG_SEND_CREATE_ROOM: {
-				FLIB.flib_netconn_send_createRoom(conn, (String)msg.obj);
+FLIB.flib_netconn_send_createRoom(conn, (String)msg.obj);
-				break;
+break;
-			}
+}
-			case MSG_SEND_LEAVE_ROOM: {
+case MSG_SEND_LEAVE_ROOM: {
-				if(FLIB.flib_netconn_send_leaveRoom(conn, (String)msg.obj) == 0) {
+if(FLIB.flib_netconn_send_leaveRoom(conn, (String)msg.obj) == 0) {
-					sendFromNet(MSG_LEAVE_ROOM, -1, "");
+sendFromNet(MSG_LEAVE_ROOM, -1, "");
-				}
+}
-				break;
+break;
-			}
+}
-			case MSG_SEND_KICK: {
+case MSG_SEND_KICK: {
-				FLIB.flib_netconn_send_kick(conn, (String)msg.obj);
+FLIB.flib_netconn_send_kick(conn, (String)msg.obj);
-				break;
+break;
-			}
+}
-			case MSG_SEND_ADD_TEAM: {
+case MSG_SEND_ADD_TEAM: {
-				FLIB.flib_netconn_send_addTeam(conn, TeamPtr.createJavaOwned((TeamInGame)msg.obj));
+FLIB.flib_netconn_send_addTeam(conn, TeamPtr.createJavaOwned((TeamInGame)msg.obj));
-				break;
+break;
-			}
+}
-			case MSG_SEND_REMOVE_TEAM: {
+case MSG_SEND_REMOVE_TEAM: {
-				if(FLIB.flib_netconn_send_removeTeam(conn, (String)msg.obj)==0) {
+if(FLIB.flib_netconn_send_removeTeam(conn, (String)msg.obj)==0) {
-					sendFromNet(MSG_TEAM_DELETED, msg.obj);
+sendFromNet(MSG_TEAM_DELETED, msg.obj);
-				}
+}
-				break;
+break;
-			}
+}
-			case MSG_DISCONNECT: {
+case MSG_DISCONNECT: {
-				FLIB.flib_netconn_send_quit(conn, (String)msg.obj);
+FLIB.flib_netconn_send_quit(conn, (String)msg.obj);
-				shutdown(false, "User quit");
+shutdown(false, "User quit");
-				break;
+break;
-			}
+}
-			case MSG_SEND_TEAM_COLOR_INDEX: {
+case MSG_SEND_TEAM_COLOR_INDEX: {
-				FLIB.flib_netconn_send_teamColor(conn, (String)msg.obj, msg.arg1);
+FLIB.flib_netconn_send_teamColor(conn, (String)msg.obj, msg.arg1);
-				break;
+break;
-			}
+}
-			case MSG_SEND_TEAM_HOG_COUNT: {
+case MSG_SEND_TEAM_HOG_COUNT: {
-				FLIB.flib_netconn_send_teamHogCount(conn, (String)msg.obj, msg.arg1);
+FLIB.flib_netconn_send_teamHogCount(conn, (String)msg.obj, msg.arg1);
-				break;
+break;
-			}
+}
-			case MSG_SEND_ENGINE_MESSAGE: {
+case MSG_SEND_ENGINE_MESSAGE: {
-				byte[] message = (byte[])msg.obj;
+byte[] message = (byte[])msg.obj;
-				ByteArrayPtr ptr = ByteArrayPtr.createJavaOwned(message);
+ByteArrayPtr ptr = ByteArrayPtr.createJavaOwned(message);
-				FLIB.flib_netconn_send_engineMessage(conn, ptr, NativeSizeT.valueOf(message.length));
+FLIB.flib_netconn_send_engineMessage(conn, ptr, NativeSizeT.valueOf(message.length));
-				break;
+break;
-			}
+}
-			case MSG_SEND_ROUND_FINISHED: {
+case MSG_SEND_ROUND_FINISHED: {
-				FLIB.flib_netconn_send_roundfinished(conn, (Boolean)msg.obj);
+FLIB.flib_netconn_send_roundfinished(conn, (Boolean)msg.obj);
-				break;
+break;
-			}
+}
-			case MSG_SEND_TOGGLE_READY: {
+case MSG_SEND_TOGGLE_READY: {
-				FLIB.flib_netconn_send_toggleReady(conn);
+FLIB.flib_netconn_send_toggleReady(conn);
-				break;
+break;
-			}
+}
-			case MSG_SEND_START_GAME: {
+case MSG_SEND_START_GAME: {
-				FLIB.flib_netconn_send_startGame(conn);
+FLIB.flib_netconn_send_startGame(conn);
-				break;
+break;
-			}
+}
-			case MSG_SEND_WEAPONSET: {
+case MSG_SEND_WEAPONSET: {
-				FLIB.flib_netconn_send_weaponset(conn, WeaponsetPtr.createJavaOwned((Weaponset)msg.obj));
+FLIB.flib_netconn_send_weaponset(conn, WeaponsetPtr.createJavaOwned((Weaponset)msg.obj));
-				break;
+break;
-			}
+}
-			case MSG_SEND_MAP: {
+case MSG_SEND_MAP: {
-				FLIB.flib_netconn_send_map(conn, MapRecipePtr.createJavaOwned((MapRecipe)msg.obj));
+FLIB.flib_netconn_send_map(conn, MapRecipePtr.createJavaOwned((MapRecipe)msg.obj));
-				break;
+break;
-			}
+}
-			case MSG_SEND_MAP_NAME: {
+case MSG_SEND_MAP_NAME: {
-				FLIB.flib_netconn_send_mapName(conn, (String)msg.obj);
+FLIB.flib_netconn_send_mapName(conn, (String)msg.obj);
-				break;
+break;
-			}
+}
-			case MSG_SEND_MAP_GENERATOR: {
+case MSG_SEND_MAP_GENERATOR: {
-				FLIB.flib_netconn_send_mapGen(conn, msg.arg1);
+FLIB.flib_netconn_send_mapGen(conn, msg.arg1);
-				break;
+break;
-			}
+}
-			case MSG_SEND_MAP_TEMPLATE: {
+case MSG_SEND_MAP_TEMPLATE: {
-				FLIB.flib_netconn_send_mapTemplate(conn, msg.arg1);
+FLIB.flib_netconn_send_mapTemplate(conn, msg.arg1);
-				break;
+break;
-			}
+}
-			case MSG_SEND_MAZE_SIZE: {
+case MSG_SEND_MAZE_SIZE: {
-				FLIB.flib_netconn_send_mapMazeSize(conn, msg.arg1);
+FLIB.flib_netconn_send_mapMazeSize(conn, msg.arg1);
-				break;
+break;
-			}
+}
-			case MSG_SEND_MAP_SEED: {
+case MSG_SEND_MAP_SEED: {
-				FLIB.flib_netconn_send_mapSeed(conn, (String) msg.obj);
+FLIB.flib_netconn_send_mapSeed(conn, (String) msg.obj);
-				break;
+break;
-			}
+}
-			case MSG_SEND_MAP_THEME: {
+case MSG_SEND_MAP_THEME: {
-				FLIB.flib_netconn_send_mapTheme(conn, (String) msg.obj);
+FLIB.flib_netconn_send_mapTheme(conn, (String) msg.obj);
-				break;
+break;
-			}
+}
-			case MSG_SEND_MAP_DRAWDATA: {
+case MSG_SEND_MAP_DRAWDATA: {
-				byte[] message = (byte[])msg.obj;
+byte[] message = (byte[])msg.obj;
-				ByteArrayPtr ptr = ByteArrayPtr.createJavaOwned(message);
+ByteArrayPtr ptr = ByteArrayPtr.createJavaOwned(message);
-				FLIB.flib_netconn_send_mapDrawdata(conn, ptr, NativeSizeT.valueOf(message.length));
+FLIB.flib_netconn_send_mapDrawdata(conn, ptr, NativeSizeT.valueOf(message.length));
-				break;
+break;
-			}
+}
-			case MSG_SEND_GAMESTYLE: {
+case MSG_SEND_GAMESTYLE: {
-				FLIB.flib_netconn_send_script(conn, (String) msg.obj);
+FLIB.flib_netconn_send_script(conn, (String) msg.obj);
-				break;
+break;
-			}
+}
-			case MSG_SEND_SCHEME: {
+case MSG_SEND_SCHEME: {
-				FLIB.flib_netconn_send_scheme(conn, SchemePtr.createJavaOwned((Scheme) msg.obj));
+FLIB.flib_netconn_send_scheme(conn, SchemePtr.createJavaOwned((Scheme) msg.obj));
-				break;
+break;
-			}
+}
-			default: {
+default: {
-				Log.e("ToNetHandler", "Unknown message type: "+msg.what);
+Log.e("ToNetHandler", "Unknown message type: "+msg.what);
-				break;
+break;
-			}
+}
-			}
+}
-		}
+}
-	}
+}
 }

changeset 10017	de822cd3df3a
parent 7691	55c0a856ecd0