#33433 報告(回答)で、同期後に所属グループを変更すると、プレビュー表示にならない(P006エラー処理)

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

@@ -1129,8 +1129,8 @@ public class OperationLogic extends AbstractLogic {
      * @return
      * @return
      * @throws Exception
      * @throws Exception
      */
      */
-    public boolean sendTaskReportSendData(long operationId, Callback progressCallback) throws Exception {
-        return sendTaskReportSendData(operationId, null, null, progressCallback);
+    public void sendTaskReportSendData(long operationId, Callback progressCallback) throws Exception {
+        sendTaskReportSendData(operationId, null, null, progressCallback);
     }
     }
 
 
     /**
     /**
@@ -1139,7 +1139,7 @@ public class OperationLogic extends AbstractLogic {
      * @param taskKey
      * @param taskKey
      * @throws Exception
      * @throws Exception
      */
      */
-    public boolean sendTaskReportSendData(long operationId, String taskKey, Integer taskReportLevel, Callback progressCallback) throws Exception {
+    public void sendTaskReportSendData(long operationId, String taskKey, Integer taskReportLevel, Callback progressCallback) throws Exception {
         OperationDto operationDto = mOperationDao.getOperation(operationId);
         OperationDto operationDto = mOperationDao.getOperation(operationId);
         List<TaskReportDto> taskReportDtoList = null;
         List<TaskReportDto> taskReportDtoList = null;
         int maxProgress = 0;
         int maxProgress = 0;
@@ -1214,10 +1214,7 @@ public class OperationLogic extends AbstractLogic {
 
 
                         FileUtil.delete(ABVEnvironment.getInstance().getOperationTaskReportSendDirFilePath(operationId, taskReportSendDto.taskKey, taskReportSendDto.taskReportSendId));
                         FileUtil.delete(ABVEnvironment.getInstance().getOperationTaskReportSendDirFilePath(operationId, taskReportSendDto.taskKey, taskReportSendDto.taskReportSendId));
                     } catch (AcmsException ex) {
                     } catch (AcmsException ex) {
-                        if (ex.getCode() == ABVExceptionCode.P_E_ACMS_P005) {
-                            mTaskReportSendDao.deleteBySendId(taskReportSendDto.taskReportSendId);
-                            FileUtil.delete(ABVEnvironment.getInstance().getOperationTaskReportSendDirFilePath(operationId, taskReportSendDto.taskKey, taskReportSendDto.taskReportSendId));
-                        } else if (ex.getCode() == ABVExceptionCode.P_E_ACMS_P006) {
+                        if (ex.getCode() == ABVExceptionCode.P_E_ACMS_P005 || ex.getCode() == ABVExceptionCode.P_E_ACMS_P006) {
                             mTaskReportSendDao.deleteBySendId(taskReportSendDto.taskReportSendId);
                             mTaskReportSendDao.deleteBySendId(taskReportSendDto.taskReportSendId);
                             FileUtil.delete(ABVEnvironment.getInstance().getOperationTaskReportSendDirFilePath(operationId, taskReportSendDto.taskKey, taskReportSendDto.taskReportSendId));
                             FileUtil.delete(ABVEnvironment.getInstance().getOperationTaskReportSendDirFilePath(operationId, taskReportSendDto.taskKey, taskReportSendDto.taskReportSendId));
                             taskReportDto.dataSendFlg = false;
                             taskReportDto.dataSendFlg = false;
@@ -1247,7 +1244,6 @@ public class OperationLogic extends AbstractLogic {
                 }
                 }
             }
             }
         }
         }
-        return false;
     }
     }
 
 
     /**
     /**

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

@@ -726,12 +726,7 @@ public class OperationListActivity extends ABVUIActivity {
             };
             };
 
 
             // 報告送信
             // 報告送信
-            if (mOperationLogic.sendTaskReportSendData(operationId, progressCallback)) {
-                // 作業報告タイプが定期点検且つ、P005のエラーの場合、以下のエラーをトーストメッセージで表示
-                handleErrorMessageToast(PatternStringUtil.patternToInt(getApplicationContext(),
-                        R.string.P005,
-                        getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)));
-            }
+            mOperationLogic.sendTaskReportSendData(operationId, progressCallback);
 
 
             progressDialogHorizontal.setProgress(60);
             progressDialogHorizontal.setProgress(60);
             // 報告受信
             // 報告受信
@@ -774,6 +769,9 @@ public class OperationListActivity extends ABVUIActivity {
                                                             R.string.P004,
                                                             R.string.P004,
                                                             getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)));
                                                             getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)));
                     break;
                     break;
+                case P_E_ACMS_P005:
+                    showSimpleAlertDialog(R.string.app_name, R.string.P005);
+                    break;
                 case P_E_ACMS_P006:
                 case P_E_ACMS_P006:
                     showSimpleAlertDialog(R.string.app_name, R.string.P006);
                     showSimpleAlertDialog(R.string.app_name, R.string.P006);
                     break;
                     break;