Merge branch 'contract/sato/1.0.500_son' into 'contract/sato/1.0.500'

fix auto sync error msg

See merge request !321

ABVJE_Res_Default_Android/res/values-ja/strings.xml

@@ -1472,5 +1472,6 @@
     <string name="auto_sync">自動同期</string>
     <string name="auto_sync_setting_title">自動同期する</string>
     <string name="auto_sync_setting_subtitle">作業一覧で作業の自動同期を可能にします。</string>
+    <string name="msg_new_content_update_error">サーバ通信エラーの為、新着更新に失敗しました。</string>
 
 </resources>

ABVJE_Res_Default_Android/res/values/strings.xml

@@ -1485,5 +1485,6 @@
     <string name="auto_sync">Auto Sync</string>
     <string name="auto_sync_setting_title">Automatically sync</string>
     <string name="auto_sync_setting_subtitle">Enables automatic synchronization of operations in the operation list.</string>
+    <string name="msg_new_content_update_error">Failed to update because of communication error.</string>
 
 </resources>
\ No newline at end of file

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

@@ -451,6 +451,9 @@ public class OperationListActivity extends OperationActivity {
                     stopUpdateAnimation();
                     final ABookAlertDialog messageDialog = AlertDialogUtil.createAlertDialog(OperationListActivity.this, R.string.app_name);
                     messageDialog.setMessage(getString(R.string.failed_get_master_data));
+                    if (isAutoSync() && mAutoSyncingFlg) {
+                        messageDialog.setMessage(getString(R.string.msg_new_content_update_error));
+                    }
                     messageDialog.setPositiveButton(R.string.confirm, new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int whichButton) {
@@ -2463,7 +2466,7 @@ public class OperationListActivity extends OperationActivity {
         CommonExecutor.execute(new Runnable() {
             @Override
             public void run() {
-                dataRefresh(true);
+                dataRefresh(false);
                 if (!contentRefresher.isRefreshing()) {
                     autoSyncOperationDone(false);
                 }