Skip to content

A
abook_check
Commit 058b4364 by onuma
Options

#46980 ABookCheck, eXFrame 各アプリ規約同意

parent af412954
Showing with 40 additions and 41 deletions
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/TermsOfUseJson.java 0 → 100644
package jp.agentec.abook.abv.bl.acms.client.json;
import org.json.adf.JSONException;
import org.json.adf.JSONObject;
import jp.agentec.abook.abv.bl.common.exception.AcmsException;
import jp.agentec.abook.abv.bl.common.exception.JSONValidationException;
/**
* 利用規約に同意するで取得するテキストを格納するJSON
*/
public class TermsOfUseJson extends AcmsCommonJSON {
public String message;
public TermsOfUseJson(String jsonString) throws AcmsException {
super(jsonString);
}
@Override
protected void parse(JSONObject json) throws JSONValidationException, JSONException {
super.parse(json);
message = getString(json, "message", null);
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/ContractLogic.java
package jp.agentec.abook.abv.bl.logic; package jp.agentec.abook.abv.bl.logic;
import org.json.adf.JSONObject;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
...@@ -7,8 +9,10 @@ import java.io.InputStreamReader; ...@@ -7,8 +9,10 @@ import java.io.InputStreamReader;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.URL; import java.net.URL;
import java.util.List; import java.util.List;
import java.util.Locale;
import jp.agentec.abook.abv.bl.acms.client.AcmsClient; import jp.agentec.abook.abv.bl.acms.client.AcmsClient;
import jp.agentec.abook.abv.bl.acms.client.json.TermsOfUseJson;
import jp.agentec.abook.abv.bl.acms.client.parameters.AcmsParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.AcmsParameters;
import jp.agentec.abook.abv.bl.acms.type.SecurityPolicyType; import jp.agentec.abook.abv.bl.acms.type.SecurityPolicyType;
import jp.agentec.abook.abv.bl.acms.type.ServiceOption.ServiceOptionId; import jp.agentec.abook.abv.bl.acms.type.ServiceOption.ServiceOptionId;
...@@ -368,38 +372,18 @@ public class ContractLogic extends AbstractLogic { ...@@ -368,38 +372,18 @@ public class ContractLogic extends AbstractLogic {
* @param url 取得しに行くURL * @param url 取得しに行くURL
* @return 取得した文字列（失敗したらnullが返る） * @return 取得した文字列（失敗したらnullが返る）
*/ */
public String getTermsOfServiceText(String url, String laungage) { public String getTermsOfServiceText(String url) {
HttpResponse response = new HttpResponse(); String requestUrl = url + "?language=" + Locale.getDefault().getLanguage();
HttpURLConnection conn = null;
try { try {
URL requestUrl = new URL(url + "?language=" + laungage); HttpResponse response = AcmsClient.getInstance(ABVEnvironment.getInstance().networkAdapter).send(requestUrl, "", null);
conn = HttpRequestSender.openConnection("GET", requestUrl, "UTF-8", null, null, 5000); TermsOfUseJson resultJson = new TermsOfUseJson(response.httpResponseBody);
Logger.i(TAG,"responseCode : " + conn.getResponseCode()); return resultJson.message;
response.httpResponseCode = conn.getResponseCode(); } catch (NetworkDisconnectedException e) {
if (response.httpResponseCode != 200) { Logger.e(TAG,"" + e);
return null; } catch (AcmsException e) {
} Logger.e(TAG,"" + e);
response.httpResponseMessage = conn.getResponseMessage(); } catch (Exception e) {
response.contentLength = NumericUtil.parseLong(conn.getHeaderField("Content-Length"), 0); Logger.e(TAG,"" + e);
InputStream inputStream = conn.getInputStream();
BufferedReader bufferReader = new BufferedReader(new InputStreamReader(conn.getInputStream(), "UTF-8"));
String resultJson = new String();
String str;
while ( null != ( str = bufferReader.readLine() ) ) {
resultJson = resultJson + str;
}
bufferReader.close();
Logger.d(TAG,"response JSON : " + resultJson);
return resultJson;
} catch (IOException e) {
Logger.e(e.getMessage());
} catch (NumberFormatException e) {
Logger.e(e.getMessage());
} finally {
if (conn != null) {
conn.disconnect();
}
} }
return null; return null;
} }
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/LoginActivity.java
...@@ -280,21 +280,13 @@ public class LoginActivity extends ABVLoginActivity { ...@@ -280,21 +280,13 @@ public class LoginActivity extends ABVLoginActivity {
// CMSより文言を取得し、ダイアログで表示する。 // CMSより文言を取得し、ダイアログで表示する。
ContractLogic logic = AbstractLogic.getLogic(ContractLogic.class); ContractLogic logic = AbstractLogic.getLogic(ContractLogic.class);
String language = Locale.getDefault().getLanguage(); String language = Locale.getDefault().getLanguage();
termsOfUseText = logic.getTermsOfServiceText(termsOfUseUrl, language); termsOfUseText = logic.getTermsOfServiceText(termsOfUseUrl);
runOnUiThread(new Runnable() { runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
String messageText = getString(R.string.err_gert_term_of_use_text); String messageText = getString(R.string.err_gert_term_of_use_text);
if (termsOfUseText != null) { if (termsOfUseText != null) {
JSONObject detail_json = new JSONObject(termsOfUseText); messageText = termsOfUseText;
Locale locale = Locale.getDefault();
if (locale.getLanguage().equals("ja")) {
messageText = detail_json.getString("ja");
} else if (locale.getLanguage().equals("ko")) {
messageText = detail_json.getString("ko");
} else {
messageText = detail_json.getString("en");
}
} }
AlertDialogUtil.showAlertDialog(LoginActivity.this, getString(R.string.error), messageText, true, new DialogInterface.OnClickListener() { AlertDialogUtil.showAlertDialog(LoginActivity.this, getString(R.string.error), messageText, true, new DialogInterface.OnClickListener() {
@Override @Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment