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
f7d2291e
Commit
f7d2291e
authored
Sep 13, 2021
by
Kim Jinsung
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug #44467【ABook Communication Android】プッシュメッセージ受信からチャットルーム開いた時にホーム(作業一覧)】に戻らない
parent
85a0b2c6
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
0 deletions
+8
-0
ABVJE_UI_Android/src/jp/agentec/abook/abv/launcher/android/ABVUIDataCache.java
+2
-0
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVAuthenticatedActivity.java
+5
-0
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVNoAuthenticatedActivity.java
+1
-0
No files found.
ABVJE_UI_Android/src/jp/agentec/abook/abv/launcher/android/ABVUIDataCache.java
View file @
f7d2291e
...
...
@@ -50,6 +50,8 @@ public class ABVUIDataCache {
*/
public
String
visibleActivityName
=
null
;
//チャット用プッシュメッセージからの作業一覧なのか判断フラグ
public
boolean
isChatPushMessageOpenOperationList
=
false
;
public
ABVUIDataCache
(
Context
context
)
{
this
.
context
=
context
;
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVAuthenticatedActivity.java
View file @
f7d2291e
...
...
@@ -1274,6 +1274,10 @@ public abstract class ABVAuthenticatedActivity extends ABVActivity implements Co
* プッシュメッセージがあるので、チャットルームに遷移する。
*/
public
boolean
goChatRoom
(
final
Intent
intent
,
final
String
targetActivityName
,
final
String
baseActivityName
)
{
//一度チャットルームを開いたのかチェックし、開いたらい何もしない
if
(!
getABVUIDataCache
().
isChatPushMessageOpenOperationList
)
{
return
false
;
}
if
(!
StringUtil
.
isNullOrEmpty
(
intent
.
getStringExtra
(
AppDefType
.
ChatPushMessageKey
.
roomName
))
&&
intent
.
getLongExtra
(
AppDefType
.
ChatPushMessageKey
.
roomId
,
'0'
)
>
0
)
{
...
...
@@ -1300,6 +1304,7 @@ public abstract class ABVAuthenticatedActivity extends ABVActivity implements Co
}
}
},
500
);
getABVUIDataCache
().
isChatPushMessageOpenOperationList
=
false
;
return
true
;
}
return
false
;
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVNoAuthenticatedActivity.java
View file @
f7d2291e
...
...
@@ -393,6 +393,7 @@ public abstract class ABVNoAuthenticatedActivity extends ABVActivity {
intent
.
putExtra
(
AppDefType
.
ChatPushMessageKey
.
pushSendDate
,
extras
.
getLong
(
AppDefType
.
ChatPushMessageKey
.
pushSendDate
));
intent
.
putExtra
(
AppDefType
.
ChatPushMessageKey
.
roomType
,
extras
.
getString
(
AppDefType
.
ChatPushMessageKey
.
roomType
));
intent
.
putExtra
(
AppDefType
.
ChatPushMessageKey
.
collaborationType
,
extras
.
getString
(
AppDefType
.
ChatPushMessageKey
.
collaborationType
));
getABVUIDataCache
().
isChatPushMessageOpenOperationList
=
true
;
}
}
intent
.
setClassName
(
getApplicationContext
().
getPackageName
(),
getMainActivityClassName
()).
setFlags
(
Intent
.
FLAG_ACTIVITY_CLEAR_TOP
);
...
...
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