Commit 4411c835 by NGUYEN HOANG SON

fix auto sync error msg

parent 0c39bacd
...@@ -1472,5 +1472,6 @@ ...@@ -1472,5 +1472,6 @@
<string name="auto_sync">自動同期</string> <string name="auto_sync">自動同期</string>
<string name="auto_sync_setting_title">自動同期する</string> <string name="auto_sync_setting_title">自動同期する</string>
<string name="auto_sync_setting_subtitle">作業一覧で作業の自動同期を可能にします。</string> <string name="auto_sync_setting_subtitle">作業一覧で作業の自動同期を可能にします。</string>
<string name="msg_new_content_update_error">サーバ通信エラーの為、新着更新に失敗しました。</string>
</resources> </resources>
...@@ -1485,5 +1485,6 @@ ...@@ -1485,5 +1485,6 @@
<string name="auto_sync">Auto Sync</string> <string name="auto_sync">Auto Sync</string>
<string name="auto_sync_setting_title">Automatically 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="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> </resources>
\ No newline at end of file
...@@ -451,6 +451,9 @@ public class OperationListActivity extends OperationActivity { ...@@ -451,6 +451,9 @@ public class OperationListActivity extends OperationActivity {
stopUpdateAnimation(); stopUpdateAnimation();
final ABookAlertDialog messageDialog = AlertDialogUtil.createAlertDialog(OperationListActivity.this, R.string.app_name); final ABookAlertDialog messageDialog = AlertDialogUtil.createAlertDialog(OperationListActivity.this, R.string.app_name);
messageDialog.setMessage(getString(R.string.failed_get_master_data)); 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() { messageDialog.setPositiveButton(R.string.confirm, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int whichButton) { public void onClick(DialogInterface dialog, int whichButton) {
...@@ -2463,7 +2466,7 @@ public class OperationListActivity extends OperationActivity { ...@@ -2463,7 +2466,7 @@ public class OperationListActivity extends OperationActivity {
CommonExecutor.execute(new Runnable() { CommonExecutor.execute(new Runnable() {
@Override @Override
public void run() { public void run() {
dataRefresh(true); dataRefresh(false);
if (!contentRefresher.isRefreshing()) { if (!contentRefresher.isRefreshing()) {
autoSyncOperationDone(false); autoSyncOperationDone(false);
} }
......
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