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
a8a16c26
Commit
a8a16c26
authored
May 20, 2021
by
Lee Munkyeong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
文書協業不具合対応
parent
991b4885
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
9 deletions
+0
-9
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebViewActivity.java
+0
-2
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationRelatedContentActivity.java
+0
-7
No files found.
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebViewActivity.java
View file @
a8a16c26
...
...
@@ -1404,7 +1404,6 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
meetingManager
.
close
();
Stack
<
ABVAuthenticatedActivity
>
stack
=
activityHandlingHelper
.
getCurrentActivityStack
();
activityHandlingHelper
.
removeContentViewActivity
(
activityHandlingHelper
.
getContentViewActivity
());
finishBeforeContentListActivity
();
Stack
<
ABVAuthenticatedActivity
>
stack2
=
activityHandlingHelper
.
getCurrentActivityStack
();
try
{
connectMeetingServer
();
...
...
@@ -1428,7 +1427,6 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
@JavascriptInterface
public
void
startContentView
()
{
activityHandlingHelper
.
removeContentViewActivity
(
activityHandlingHelper
.
getContentViewActivity
());
finishBeforeContentListActivity
();
meetingManager
.
close
();
try
{
connectMeetingServer
();
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationRelatedContentActivity.java
View file @
a8a16c26
...
...
@@ -521,13 +521,6 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
MeetingManager
meetingManager
=
MeetingManager
.
getInstance
();
}
MeetingManager
meetingManager
=
MeetingManager
.
getInstance
();
if
(!
meetingManager
.
isConnected
())
{
ChatWebViewActivity
chatWebViewActivity
=
activityHandlingHelper
.
getActivity
(
ChatWebViewActivity
.
class
);
if
(
chatWebViewActivity
!=
null
&&
chatWebViewActivity
.
isInPictureInPictureMode
())
{
getApplication
().
startActivity
(
new
Intent
(
chatWebViewActivity
,
ChatWebViewActivity
.
class
)
.
addFlags
(
Intent
.
FLAG_ACTIVITY_REORDER_TO_FRONT
|
Intent
.
FLAG_ACTIVITY_NEW_TASK
));
}
}
}
else
{
showBottomToolbar
();
showContentList
();
...
...
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