認証問題対応

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java

@@ -18,6 +18,7 @@ import android.net.ConnectivityManager;
 import android.net.Network;
 import android.net.Network;
 import android.net.NetworkInfo;
 import android.net.NetworkInfo;
 import android.net.Uri;
 import android.net.Uri;
+import android.net.http.SslError;
 import android.net.wifi.WifiManager;
 import android.net.wifi.WifiManager;
 import android.os.AsyncTask;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Build;
@@ -32,6 +33,7 @@ import android.webkit.DownloadListener;
 import android.webkit.JavascriptInterface;
 import android.webkit.JavascriptInterface;
 import android.webkit.JsResult;
 import android.webkit.JsResult;
 import android.webkit.PermissionRequest;
 import android.webkit.PermissionRequest;
+import android.webkit.SslErrorHandler;
 import android.webkit.ValueCallback;
 import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
 import android.webkit.WebChromeClient;
 import android.webkit.WebSettings;
 import android.webkit.WebSettings;
@@ -363,7 +365,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
                 });
                 });
 
 
                 myAlertDialog = dialog;
                 myAlertDialog = dialog;
-                if (!isFinishing()) {
+                if (!isFinishing() && !message.equals("false")) {
                     dialog.show();
                     dialog.show();
                 }
                 }
                 result.confirm();
                 result.confirm();
@@ -383,7 +385,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
                 }  else if (message.equals("error_already_exist_same_user")) {
                 }  else if (message.equals("error_already_exist_same_user")) {
                     message = getString(R.string.msg_error_already_exist_same_room);
                     message = getString(R.string.msg_error_already_exist_same_room);
                 } else {
                 } else {
-                    message = "Confirm ?";
+                    message = message;
                 }
                 }
 
 
                 ABookAlertDialog confirmAlert = AlertDialogUtil.createAlertDialog(ChatWebviewActivity.this, R.string.app_name);
                 ABookAlertDialog confirmAlert = AlertDialogUtil.createAlertDialog(ChatWebviewActivity.this, R.string.app_name);
@@ -545,6 +547,11 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
                     }
                     }
                     return false;
                     return false;
                 }
                 }
+
+            @Override
+            public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
+                handler.proceed();
+            }
         });
         });
     }
     }
 
 

gradle.properties

@@ -40,14 +40,14 @@ app_versioncode=1
 #cms server
 #cms server
 #acms_address=http://10.0.2.2:8081/acms
 #acms_address=http://10.0.2.2:8081/acms
 #download_server_address=http://10.0.2.2:8081/acms
 #download_server_address=http://10.0.2.2:8081/acms
-acms_address=https://chatdev2.agentec.jp/acms
-download_server_address=https://chatdev2.agentec.jp/acms
+acms_address=https://checkdev1.agentec.jp/acms
+download_server_address=https://checkdev1.agentec.jp/acms
 #acms_address=https://check.abookcloud.com/acms
 #acms_address=https://check.abookcloud.com/acms
 #download_server_address=https://check.abookcloud.com/acms
 #download_server_address=https://check.abookcloud.com/acms
 
 
 #syncview server
 #syncview server
-websocket_server_http_url=https://chatdev2.agentec.jp/v1
-websocket_server_ws_url=wss://chatdev2.agentec.jp/v1
+websocket_server_http_url=https://checkdev1.agentec.jp/v1
+websocket_server_ws_url=wss://checkdev1.agentec.jp/v1
 #WebSocket debug�o��
 #WebSocket debug�o��
 websocket_debug=false
 websocket_debug=false