Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
abook_check
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abook_android
abook_check
Commits
4411c835
Commit
4411c835
authored
Feb 29, 2024
by
NGUYEN HOANG SON
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix auto sync error msg
parent
0c39bacd
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
1 deletions
+7
-1
ABVJE_Res_Default_Android/res/values-ja/strings.xml
+1
-0
ABVJE_Res_Default_Android/res/values/strings.xml
+2
-0
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
+4
-1
No files found.
ABVJE_Res_Default_Android/res/values-ja/strings.xml
View file @
4411c835
...
@@ -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>
ABVJE_Res_Default_Android/res/values/strings.xml
View file @
4411c835
...
@@ -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
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
View file @
4411c835
...
@@ -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
(
tru
e
);
dataRefresh
(
fals
e
);
if
(!
contentRefresher
.
isRefreshing
())
{
if
(!
contentRefresher
.
isRefreshing
())
{
autoSyncOperationDone
(
false
);
autoSyncOperationDone
(
false
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment