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
e2d6419c
Commit
e2d6419c
authored
Dec 26, 2019
by
Jeong Gilmo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- チャットについて
#36215 403エラーが発生した場合は強制ログアウトしてログイン画面に遷移する
parent
e7293e59
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
ABVJE_Launcher_Android/assets/chat/public/js/chat.js
+1
-1
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
+4
-1
No files found.
ABVJE_Launcher_Android/assets/chat/public/js/chat.js
View file @
e2d6419c
...
@@ -1587,7 +1587,7 @@ socket.on('showServerError', function (message){
...
@@ -1587,7 +1587,7 @@ socket.on('showServerError', function (message){
// #36215
// #36215
if
(
message
.
includes
(
"SC_FORBIDDEN"
))
if
(
message
.
includes
(
"SC_FORBIDDEN"
))
{
{
alert
(
"SC_FORBIDDEN OCCURED"
);
alert
(
'SC_FORBIDDEN'
);
return
;
return
;
}
}
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
View file @
e2d6419c
...
@@ -190,6 +190,8 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
...
@@ -190,6 +190,8 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
message
=
getString
(
R
.
string
.
msg_error_chat_room_name_too_long
);
message
=
getString
(
R
.
string
.
msg_error_chat_room_name_too_long
);
}
else
if
(
message
.
equals
(
"InvalidSpecialCharacterRoomName"
))
{
}
else
if
(
message
.
equals
(
"InvalidSpecialCharacterRoomName"
))
{
message
=
getString
(
R
.
string
.
msg_error_chat_name_has_invalid_character
);
message
=
getString
(
R
.
string
.
msg_error_chat_name_has_invalid_character
);
}
else
if
(
message
.
equals
(
"SC_FORBIDDEN"
))
{
message
=
getString
(
R
.
string
.
msg_error_chat_room_sc_forbidden
);
}
else
{
}
else
{
message
=
message
;
message
=
message
;
}
}
...
@@ -208,7 +210,8 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
...
@@ -208,7 +210,8 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
@Override
@Override
public
void
onDismiss
(
DialogInterface
dialog
)
{
public
void
onDismiss
(
DialogInterface
dialog
)
{
// サーバと接続された場合、チャット画面を閉じる
// サーバと接続された場合、チャット画面を閉じる
if
(
tempMessage
.
equals
(
getString
(
R
.
string
.
msg_error_chat_disconnected
)))
{
if
(
tempMessage
.
equals
(
getString
(
R
.
string
.
msg_error_chat_disconnected
))
||
tempMessage
.
equals
(
getString
(
R
.
string
.
msg_error_chat_room_sc_forbidden
)))
{
mChatWebView
.
loadUrl
(
"javascript:leaveRoom()"
);
mChatWebView
.
loadUrl
(
"javascript:leaveRoom()"
);
finish
();
finish
();
}
else
if
(
tempMessage
.
equals
(
getString
(
R
.
string
.
msg_error_chat_join
)))
{
}
else
if
(
tempMessage
.
equals
(
getString
(
R
.
string
.
msg_error_chat_join
)))
{
...
...
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