課題6,7,8を修正（Bizからの移植）

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/ABVDataCache.java

@@ -71,7 +71,7 @@ public class ABVDataCache {
 	 * @return サービスオプション情報です。指定したserviceOptionIdがサービスオプションリストに存在しない場合はnullを返します。
 	 * @return サービスオプション情報です。指定したserviceOptionIdがサービスオプションリストに存在しない場合はnullを返します。
 	 * @since 1.0.0
 	 * @since 1.0.0
 	 */
 	 */
-	public ServiceOptionDto getServiceOption(int serviceOptionId) {
+	public synchronized ServiceOptionDto getServiceOption(int serviceOptionId) {
 		if (serviceOptionDtoList != null) {
 		if (serviceOptionDtoList != null) {
 			for (ServiceOptionDto serviceOptionDto : Collections.unmodifiableCollection(serviceOptionDtoList)) {
 			for (ServiceOptionDto serviceOptionDto : Collections.unmodifiableCollection(serviceOptionDtoList)) {
 				if (serviceOptionDto.serviceOptionId == serviceOptionId) {
 				if (serviceOptionDto.serviceOptionId == serviceOptionId) {

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVNoAuthenticatedActivity.java

@@ -127,10 +127,15 @@ public abstract class ABVNoAuthenticatedActivity extends ABVActivity {
 			}
 			}
 
 
 			private void logoutAlert(int messageRes) {
 			private void logoutAlert(int messageRes) {
-				AlertDialogUtil.showAlertDialog(ABVNoAuthenticatedActivity.this, R.string.app_name, messageRes, true, new DialogInterface.OnClickListener() {
+				runOnUiThread(new Runnable() {
 					@Override
 					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						LogoutHelper.logout(ABVNoAuthenticatedActivity.this);
+					public void run() {
+						AlertDialogUtil.showAlertDialog(ABVNoAuthenticatedActivity.this, R.string.app_name, messageRes, true, new DialogInterface.OnClickListener() {
+							@Override
+							public void onClick(DialogInterface dialog, int which) {
+								LogoutHelper.logout(ABVNoAuthenticatedActivity.this);
+							}
+						});
 					}
 					}
 				});
 				});
 			}
 			}

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

@@ -86,7 +86,6 @@ public class LoginPasswordChangeActivity extends ABVNoAuthenticatedActivity {
 				if (mType == 1 || mType == 2) {
 				if (mType == 1 || mType == 2) {
 					// 催促
 					// 催促
 					showMainActivity(mLoginId);
 					showMainActivity(mLoginId);
-					finish();
 				} else {
 				} else {
 					finishActivity();
 					finishActivity();
 				}
 				}
@@ -177,7 +176,6 @@ public class LoginPasswordChangeActivity extends ABVNoAuthenticatedActivity {
 			ABVToastUtil.showMakeText(LoginPasswordChangeActivity.this, getString(R.string.change_password_ok), Toast.LENGTH_LONG);
 			ABVToastUtil.showMakeText(LoginPasswordChangeActivity.this, getString(R.string.change_password_ok), Toast.LENGTH_LONG);
 
 
 			showMainActivity(mLoginId);
 			showMainActivity(mLoginId);
-			finish();
 		} catch (NetworkDisconnectedException e) {
 		} catch (NetworkDisconnectedException e) {
 			Logger.e("NetworkDisconnectedException", e);
 			Logger.e("NetworkDisconnectedException", e);
 			handleErrorMessageToast(ErrorCode.NETWORK);
 			handleErrorMessageToast(ErrorCode.NETWORK);