Android: VNCConn: remove superfluous init() arg

bk138 · Aug 15, 2023 · 0e7dba7 · 0e7dba7
1 parent 10e4ef3
commit 0e7dba7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/android/app/src/main/java/com/coboltforge/dontmind/multivnc/VNCConn.java b/android/app/src/main/java/com/coboltforge/dontmind/multivnc/VNCConn.java
@@ -159,12 +159,9 @@ private class ClientCutText {
     private class ServerToClientThread extends Thread {
 
     	private final onInitResultListener initResultCallback;
-    	private Runnable setModes;
 
-
-    	public ServerToClientThread(onInitResultListener initResultCallback, Runnable setModes) {
+    	public ServerToClientThread(onInitResultListener initResultCallback) {
     		this.initResultCallback = initResultCallback;
-    		this.setModes = setModes;
     	}
 
 
@@ -412,18 +409,18 @@ public interface onInitResultListener {
 	}
 
 	/**
-	 * Create a view showing a VNC connection
+	 * Initialise a VNC connection
 	 * @param bean Connection settings
-	 * @param setModes Callback to run on UI thread after connection is set up
+	 * @param initResultCallback Callback that's called after connection is set up
 	 */
-	public void init(ConnectionBean bean, final Runnable setModes, onInitResultListener initResultCallback) {
+	public void init(ConnectionBean bean, onInitResultListener initResultCallback) {
 
 		Log.d(TAG, "initializing");
 
 		connSettings = bean;
 		this.pendingColorModel = COLORMODEL.valueOf(bean.colorModel);
 
-		inputThread = new ServerToClientThread(initResultCallback, setModes);
+		inputThread = new ServerToClientThread(initResultCallback);
 		inputThread.start();
 	}
 

diff --git a/android/app/src/main/java/com/coboltforge/dontmind/multivnc/ui/VncCanvasActivity.java b/android/app/src/main/java/com/coboltforge/dontmind/multivnc/ui/VncCanvasActivity.java
@@ -244,11 +244,7 @@ public void onSystemUiVisibilityChange(int visibility) {
 		pd.setButton(DialogInterface.BUTTON_NEGATIVE, getString(android.R.string.cancel), (dialog, which) -> finish());
 		pd.show();
 		firstFrameWaitDialog = pd;
-		conn.init(connection, new Runnable() {
-			public void run() {
-				setModes();
-			}
-		}, err -> {
+		conn.init(connection, err -> {
 			runOnUiThread(() -> {
 				if (err == null) {
 					// init success