Refactor write-readiness logic into the session itself too

Author: pimterry

app/src/main/java/tech/httptoolkit/android/vpn/Session.java

@@ -321,6 +321,17 @@ public boolean isDataForSendingReady() {
 	public void setDataForSendingReady(boolean isDataForSendingReady) {
 		this.isDataForSendingReady = isDataForSendingReady;
 	}
+
+	public boolean isReadyToWrite() {
+		ProxyProtocolHandler handler = this.getProxySetupHandler();
+
+		if (handler != null) {
+			return handler.hasHandshakeDataToSend();
+		} else {
+			return this.hasDataToSend() && this.isDataForSendingReady();
+		}
+	}
+
 	public void setUnackData(byte[] unackData) {
 		this.unackData = unackData;
 	}

app/src/main/java/tech/httptoolkit/android/vpn/socket/SocketChannelWriter.java

@@ -37,16 +37,6 @@ public class SocketChannelWriter {
 		this.writer = writer;
 	}
 
-	public boolean isReadyToWrite(@NonNull Session session) {
-		ProxyProtocolHandler handler = session.getProxySetupHandler();
-
-		if (handler != null) {
-			return handler.hasHandshakeDataToSend();
-		} else {
-			return session.hasDataToSend() && session.isDataForSendingReady();
-		}
-	}
-
 	public void write(@NonNull Session session) {
 		if (session.isAbortingConnection()) {
 			Log.d(TAG,"shutting down aborted connection on write -> "+ session);
@@ -166,7 +156,7 @@ private void writeProxySetupData(ProxyProtocolHandler proxyProtocolHandler, Sess
 
 		proxyProtocolHandler.confirmHandshakeDataWritten();
 
-		if (this.isReadyToWrite(session)) {
+		if (session.isReadyToWrite()) {
 			// It's possible that this finishes the proxy protocol, and the session is now ready to write.
 			// If so, we make sure to resubscribe, so this will fire again shortly:
 			session.subscribeKey(SelectionKey.OP_WRITE);

app/src/main/java/tech/httptoolkit/android/vpn/socket/SocketNIODataService.java

@@ -233,7 +233,7 @@ private void processSelectorRead(SelectionKey selectionKey, Session session) {
 
 	private void processPendingWrite(SelectionKey selectionKey, Session session) {
 		// Nothing to write? Skip this entirely, and make sure we're not subscribed
-		if (!writer.isReadyToWrite(session)) {
+		if (!session.isReadyToWrite()) {
 			session.unsubscribeKey(SelectionKey.OP_WRITE);
 			return;
 		}