Mercurial > hg > Members > riono > TreeVNC_ja_comment

changeset 483:b2f734f3eaf1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
disable authentication dialog
author oshiro
date Thu, 24 Jan 2019 18:37:34 +0900
parents 73b52954efc9
children 4accfd4ea9c2
files Todo.txt src/main/java/com/glavsoft/rfb/protocol/Protocol.java src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java
diffstat 3 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Todo.txt	Thu Jan 24 17:19:05 2019 +0900
+++ b/Todo.txt	Thu Jan 24 18:37:34 2019 +0900
@@ -1,6 +1,6 @@
 Wed Nov 28 18:45:41 JST 2018
 
-   VNCサーバー側が死んだ時にTreeVNCが暴走する
+   VNCサーバー側が死んだ時にTreeVNCが暴走する Done
    authenticationのポップアップがrootで上がってしまう
    SERVER_CHANGE_REQUESTでリクエスト側の画面が消えないことがある
    ディスプレイモードで立ち上げた時にも画面が開いた方が良い
--- a/src/main/java/com/glavsoft/rfb/protocol/Protocol.java	Thu Jan 24 17:19:05 2019 +0900
+++ b/src/main/java/com/glavsoft/rfb/protocol/Protocol.java	Thu Jan 24 18:37:34 2019 +0900
@@ -32,6 +32,7 @@
 import com.glavsoft.rfb.client.SetPixelFormatMessage;
 import com.glavsoft.rfb.encoding.PixelFormat;
 import com.glavsoft.rfb.encoding.decoder.DecodersContainer;
+import com.glavsoft.rfb.protocol.auth.SecurityType;
 import com.glavsoft.rfb.protocol.state.HandshakeState;
 import com.glavsoft.rfb.protocol.state.ProtocolState;
 import com.glavsoft.transport.Reader;
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java	Thu Jan 24 17:19:05 2019 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java	Thu Jan 24 18:37:34 2019 +0900
@@ -214,7 +214,7 @@
         if (isStoppingProcess) return;
         cleanUpUISessionAndConnection();
         logger.info("Rfb session stopped: " + reason);
-        if (presenter.needReconnection()) {
+        if (presenter.needReconnection() && !myRfb.isTreeManager()) {
             SwingUtilities.invokeLater(new Runnable() {
                 @Override
                 public void run() {
@@ -285,6 +285,9 @@
 
         @Override
         public String getPassword() {
+            if (myRfb.isTreeManager()){
+                return "";
+            }
             return Strings.isTrimmedEmpty(predefinedPassword) ?
                     getPasswordFromGUI() :
                         predefinedPassword;