Kazuyuki Hida · @hida-k · Kazuyuki Hida · Yujin Seo · Kazuyuki Hida · Yujin Seo
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/common/util/Base64.java 0 → 100644
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/common/util/Base64.java 0 → 100644
+// Portions copyright 2002, Google, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/common/util/Base64DecoderException.java 0 → 100644
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/common/util/Base64DecoderException.java 0 → 100644
+// Copyright 2002, Google, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/TaskReportDao.java
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/TaskReportDao.java
        if (plain == null) {
            return null;
        }
-        return Base64.getEncoder().encodeToString(plain.getBytes());
+        return jp.agentec.abook.abv.bl.common.util.Base64.encode(plain.getBytes());
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/TaskReportDao.java
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/TaskReportDao.java
        }
-        return Base64.getEncoder().encodeToString(plain.getBytes());
+        return jp.agentec.abook.abv.bl.common.util.Base64.encode(plain.getBytes());
    }

    public static String decode(String encoded) {
        if (encoded == null) {
            return null;
        }
-        return new String(Base64.getDecoder().decode(encoded));
+        try {
+            return new String(jp.agentec.abook.abv.bl.common.util.Base64.decode(encoded));
+        } catch (Base64DecoderException e) {
+            Logger.e(TAG, e);
+            return null;
+        }
--- a/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ABookCheckWebViewHelper.java
+++ b/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ABookCheckWebViewHelper.java
+
+    private String getOrZero(Map<String, String> param, String key) {
+        if (param.containsKey(key)) {
+            return param.get(key);
+        } else {
+            return "0";
+        }
+    }
+
+    private String getOrNull(Map<String, String> param, String key) {
+        if (param.containsKey(key)) {
+            return param.get(key);
+        } else {
+            return null;
+        }
+    }
--- a/gradle.properties
+++ b/gradle.properties
 #cms server
 #acms_address=https://check.abookcloud.com/acms
 #download_server_address=https://check.abookcloud.com/acms
-acms_address=https://abook188-1.abook.bz/acms
-download_server_address=https://abook188-1.abook.bz/acms
+#acms_address=https://abook188-1.abook.bz/acms
+#download_server_address=https://abook188-1.abook.bz/acms
 #acms_address=http://10.0.2.2:8080/acms
 #download_server_address=http://10.0.2.2:8080/acms
+acms_address=https://atform.sato.co.jp//acms
+download_server_address=https://atform.sato.co.jp//acms
--- a/gradle.properties
+++ b/gradle.properties
 #download_server_address=https://check.abookcloud.com/acms
-acms_address=https://abook188-1.abook.bz/acms
-download_server_address=https://abook188-1.abook.bz/acms
+#acms_address=https://abook188-1.abook.bz/acms
+#download_server_address=https://abook188-1.abook.bz/acms
 #acms_address=http://10.0.2.2:8080/acms
 #download_server_address=http://10.0.2.2:8080/acms
+acms_address=https://atform.sato.co.jp//acms
+download_server_address=https://atform.sato.co.jp//acms
+

 #syncview server
-websocket_server_http_url=https://abook188-1.abook.bz/v1
-websocket_server_ws_url=wss://abook188-1.abook.bz/v1
+websocket_server_http_url=https://atform.sato.co.jp//v1
+websocket_server_ws_url=wss://atform.sato.co.jp//v1