Merge branch 'features/1.4.500_dev' into 'features/1.4.500'

課題9,10を修正

See merge request !318

ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/UserAuthenticateLogic.java

@@ -209,19 +209,7 @@ public class UserAuthenticateLogic extends AbstractLogic {
 				// 同じユーザの場合、警告なし
 				// 同じユーザの場合、警告なし
 				result = DeleteDataType.None;
 				result = DeleteDataType.None;
 			} else {
 			} else {
-				if (contractLogic.getUDIDOverwiteFlag()) {
-					if (isDiffUserGroup(dto.sid)) {
-						// 異なるグループの場合、全て削除
-						result = DeleteDataType.All;
-					} else {
-						// 同一グループの場合
-						// 警告なし
-						result = DeleteDataType.None;
-					}
-				} else {
-					// UDID上書きがfalseの場合、全て削除
-					result = DeleteDataType.All;
-				}
+				result = DeleteDataType.All;
 			}
 			}
 		}
 		}
 		return result;
 		return result;

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

@@ -286,9 +286,9 @@ public abstract class ABVNoAuthenticatedActivity extends ABVActivity {
 
 
 	private void showMain() {
 	private void showMain() {
 				try {
 				try {
-					ContractLogic contractLogic = AbstractLogic.getLogic(ContractLogic.class);
-					contractLogic.initializeContractServiceOption();
 					try {
 					try {
+						ContractLogic contractLogic = AbstractLogic.getLogic(ContractLogic.class);
+						contractLogic.initializeContractServiceOption();
 						final ABVDataCache dataCache = ABVDataCache.getInstance();
 						final ABVDataCache dataCache = ABVDataCache.getInstance();
 						dataCache.refreshServiceOptions();
 						dataCache.refreshServiceOptions();