external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

support android 6 (slow networkplay) tested with two Android 6 device

Browse Source
This commit is contained in:
Anthony Calosa
2019-11-01 17:34:42 +08:00
parent a5b65eaaed
commit a80c683901
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
forge-gui/src/main/java/forge/net/CustomObjectEncoder.java
View File

@@ -19,10 +19,9 @@ public class CustomObjectEncoder extends MessageToByteEncoder<Serializable> {
protected void encode(ChannelHandlerContext ctx, Serializable msg, ByteBuf out) throws Exception { protected void encode(ChannelHandlerContext ctx, Serializable msg, ByteBuf out) throws Exception {
int startIdx = out.writerIndex(); int startIdx = out.writerIndex();
ByteBufOutputStream bout = new ByteBufOutputStream(out); ByteBufOutputStream bout = new ByteBufOutputStream(out);
ElsaObjectOutputStream oout = null;
ObjectOutputStream ooutOld = null;
if (GuiBase.getpropertyConfig()){ if (GuiBase.getpropertyConfig()){
ElsaObjectOutputStream oout = null;
try { try {
bout.write(LENGTH_PLACEHOLDER); bout.write(LENGTH_PLACEHOLDER);
oout = new ElsaObjectOutputStream(bout); oout = new ElsaObjectOutputStream(bout);
@@ -35,21 +34,22 @@ public class CustomObjectEncoder extends MessageToByteEncoder<Serializable> {
bout.close(); bout.close();
} }
} }
} } else {
else { ObjectOutputStream oout = null;
try { try {
bout.write(LENGTH_PLACEHOLDER); bout.write(LENGTH_PLACEHOLDER);
ooutOld = new ObjectOutputStream(bout); oout = new ObjectOutputStream(bout);
ooutOld.writeObject(msg); oout.writeObject(msg);
ooutOld.flush(); oout.flush();
} finally { } finally {
if (ooutOld != null) { if (oout != null) {
ooutOld.close(); oout.close();
} else { } else {
bout.close(); bout.close();
} }
} }
} }
int endIdx = out.writerIndex(); int endIdx = out.writerIndex();
out.setInt(startIdx, endIdx - startIdx - 4); out.setInt(startIdx, endIdx - startIdx - 4);
} }

2
forge-gui/src/main/java/forge/net/GameProtocolHandler.java
View File

@@ -40,7 +40,7 @@ public abstract class GameProtocolHandler<T> extends ChannelInboundHandlerAdapte
} }
final Object[] args = event.getObjects(); final Object[] args = event.getObjects();
//protocolMethod.checkArgs(args); protocolMethod.checkArgs(args);
final Object toInvoke = getToInvoke(ctx); final Object toInvoke = getToInvoke(ctx);

4
forge-gui/src/main/java/forge/net/GameProtocolSender.java
View File

@@ -12,13 +12,13 @@ public final class GameProtocolSender {
} }
public void send(final ProtocolMethod method, final Object... args) { public void send(final ProtocolMethod method, final Object... args) {
//method.checkArgs(args); method.checkArgs(args);
remote.send(new GuiGameEvent(method, args)); remote.send(new GuiGameEvent(method, args));
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public <T> T sendAndWait(final ProtocolMethod method, final Object... args) { public <T> T sendAndWait(final ProtocolMethod method, final Object... args) {
//method.checkArgs(args); method.checkArgs(args);
try { try {
final Object returned = remote.sendAndWait(new GuiGameEvent(method, args)); final Object returned = remote.sendAndWait(new GuiGameEvent(method, args));
method.checkReturnValue(returned); method.checkReturnValue(returned);

3
forge-gui/src/main/java/forge/net/ProtocolMethod.java
View File

@@ -9,6 +9,7 @@ import java.util.Map;
import com.google.common.base.Function; import com.google.common.base.Function;
import forge.GuiBase;
import forge.assets.FSkinProp; import forge.assets.FSkinProp;
import forge.deck.CardPool; import forge.deck.CardPool;
import forge.game.GameEntityView; import forge.game.GameEntityView;
@@ -155,6 +156,8 @@ public enum ProtocolMethod {
} }
public void checkArgs(final Object[] args) { public void checkArgs(final Object[] args) {
if (GuiBase.getpropertyConfig())
return; //uses custom serializer for Android 8+..
for (int iArg = 0; iArg < args.length; iArg++) { for (int iArg = 0; iArg < args.length; iArg++) {
Object arg = null; Object arg = null;
Class<?> type = null; Class<?> type = null;