Commit 382d667f by Yujin Seo

Merge branch 'feature/contract/sato/1.0.300_52148_lost_local' into 'contract/sato/1.0.300'

一時保存した報告が消えてしまう不具合を修正

See merge request !290
parents 21c3225b 3e188be6
......@@ -1088,9 +1088,13 @@ public class OperationListActivity extends OperationActivity {
}
// サーバーから取得した作業情報がローカルに存在しないので削除する
for (TaskDto taskDto : localTaskList) {
boolean localSaved = mTaskReportDao.isLocalSaved(taskDto.taskKey, 0, null);
// 一時保存があったらそれは消さない
if (!localSaved) {
mOperationLogic.deleteTaskFileData(operationId, operationContentDto.contentId, taskDto.taskKey, TaskReportLevel.ReportType);
mTaskDao.delete(taskDto);
}
}
lastEditDate = json.lastEditDate;
progressCallback.callback(new Integer(40));
......
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