テスト仕様書No.78 (一括同期で資料ダウンロード失敗時、ダイアログとトーストメッセージが両方出る問題修正（エラーメッセージにhttpStatusを表示）)

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

@@ -13,13 +13,11 @@ import jp.agentec.abook.abv.bl.common.ABVEnvironment;
 import jp.agentec.abook.abv.bl.common.exception.AcmsException;
 import jp.agentec.abook.abv.bl.common.exception.AcmsException;
 import jp.agentec.abook.abv.bl.common.exception.NetworkDisconnectedException;
 import jp.agentec.abook.abv.bl.common.exception.NetworkDisconnectedException;
 import jp.agentec.abook.abv.bl.common.log.Logger;
 import jp.agentec.abook.abv.bl.common.log.Logger;
-import jp.agentec.abook.abv.bl.data.ABVDataCache;
 import jp.agentec.abook.abv.bl.data.dao.AbstractDao;
 import jp.agentec.abook.abv.bl.data.dao.AbstractDao;
 import jp.agentec.abook.abv.bl.data.dao.OperationDao;
 import jp.agentec.abook.abv.bl.data.dao.OperationDao;
 import jp.agentec.abook.abv.bl.data.dao.OperationGroupMasterDao;
 import jp.agentec.abook.abv.bl.data.dao.OperationGroupMasterDao;
 import jp.agentec.abook.abv.bl.dto.OperationDto;
 import jp.agentec.abook.abv.bl.dto.OperationDto;
 import jp.agentec.abook.abv.bl.dto.OperationGroupMasterDto;
 import jp.agentec.abook.abv.bl.dto.OperationGroupMasterDto;
-import jp.agentec.abook.abv.bl.dto.OperationGroupMasterRelationDto;
 import jp.agentec.abook.abv.bl.dto.comparator.OperationGroupMasterLevelComparator;
 import jp.agentec.abook.abv.bl.dto.comparator.OperationGroupMasterLevelComparator;
 
 
 /**
 /**

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

@@ -734,7 +734,19 @@ public class OperationListActivity extends ABVUIActivity {
     @Override
     @Override
     public void onDownloadingContentZip(final ContentZipDownloadNotification notification) {
     public void onDownloadingContentZip(final ContentZipDownloadNotification notification) {
         Logger.d(TAG, "[onDownloadingContentZip]");
         Logger.d(TAG, "[onDownloadingContentZip]");
-        super.onDownloadingContentZip(notification);
+        String errorCodeStr = "";
+        if (isShowingBatchSync()) {
+            if (notification.getError() != null) {
+                Exception e = notification.getError();
+                Logger.e(TAG, e);
+                if (e instanceof AcmsException && ((AcmsException)e).getCode() != null) {
+                    errorCodeStr = Integer.toString(((AcmsException)e).getHttpStatus());
+                }
+            }
+        } else {
+            // 一括同期以外は親Activityに通知する
+            super.onDownloadingContentZip(notification);
+        }
         OperationContentDto operationContentDto = mOperationContentDao.getOperationContentForContentId(notification.getContentId());
         OperationContentDto operationContentDto = mOperationContentDao.getOperationContentForContentId(notification.getContentId());
         if (operationContentDto != null) {
         if (operationContentDto != null) {
             if (notification.downloadStatus == DownloadStatusType.Succeeded) {
             if (notification.downloadStatus == DownloadStatusType.Succeeded) {
@@ -751,7 +763,7 @@ public class OperationListActivity extends ABVUIActivity {
                 if (isShowingBatchSync()) {
                 if (isShowingBatchSync()) {
                     // 一括同期からのダウンロード失敗時、エラーメッセージ表示
                     // 一括同期からのダウンロード失敗時、エラーメッセージ表示
                     OperationDto operationDto = mOperationLogic.getOperation(operationContentDto.operationId);
                     OperationDto operationDto = mOperationLogic.getOperation(operationContentDto.operationId);
-                    batchSyncView.showBatchSyncErrorAlert(operationDto, getString(R.string.msg_batch_sync_content_download_fail));
+                    batchSyncView.showBatchSyncErrorAlert(operationDto, getString(R.string.msg_batch_sync_content_download_fail) + (StringUtil.isNullOrEmpty(errorCodeStr) ? "" : "(" + errorCodeStr + ")"));
                 }
                 }
                 closeProgressPopup();
                 closeProgressPopup();
             }
             }