Merge branch 'communication/feature/android6以下の対応' into 'communication/develop'

アンドロイド８以下バージョンでの処理追加。

See merge request !154

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebViewActivity.java

@@ -123,11 +123,6 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
     //private final String NETWORK_ERROR_PLACE_HOLDER = "file:///android_asset/chat/public/networkError.html";
     private final String CHAT_PAGE_URL = "file:///android_asset/chat/public_new/chat.html";
     private final String CHAT_ROOM_PAGE_URL = "file:///android_asset/chat/public_new/chat_room.html";
-    private final String PICTURE_COLLABORATION_PAGE_URL = "file:///android_asset/chat/public_new/collaboration_picture.html";
-    private final String VIDEO_COLLABORATION_PAGE_URL = "file:///android_asset/chat/public_new/collaboration_video.html";
-    private final String VOICE_COLLABORATION_PAGE_URL = "file:///android_asset/chat/public_new/collaboration_voice.html";
-    private final String DOCUMENT_COLLABORATION_PAGE_URL = "file:///android_asset/chat/public_new/collaboration_documents.html";
-    private final String WHITE_BOARD_COLLABORATION_PAGE_URL = "file:///android_asset/chat/public_new/collaboration_whiteboard.html";
     private final String COLLABORATION_PAGE_URL = "file:///android_asset/chat/public_new/collaboration.html";
     private final String DEFAULT_CHECKSUM = "0000000000";
     //AISDevelop
@@ -1350,6 +1345,13 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
         }
 
         @JavascriptInterface
+        public void joinChangedCollaboration(String collaborationType, String meetingId) throws NetworkDisconnectedException, AcmsException {
+            joinMeetingId = Integer.parseInt(meetingId);
+            collaborationJoinFlg = ABookCommConstants.FLAG.COLLABORATION_JOIN_FLG.JOIN;
+            AcmsClient.getInstance(ABVEnvironment.getInstance().networkAdapter).joinCollaboration(sid, roomId.intValue());
+        }
+
+        @JavascriptInterface
         public void inviteCollaboration(String inviteUserIds, String collaborationType) throws NetworkDisconnectedException, AcmsException {
             AcmsClient.getInstance(ABVEnvironment.getInstance().networkAdapter).inviteCollaboration(sid, roomId.intValue(), roomName, inviteUserIds, collaborationType);
         }
@@ -1402,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();
@@ -1426,7 +1427,6 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
         @JavascriptInterface
         public void startContentView() {
             activityHandlingHelper.removeContentViewActivity(activityHandlingHelper.getContentViewActivity());
-            finishBeforeContentListActivity();
             meetingManager.close();
             try {
                 connectMeetingServer();
@@ -1484,6 +1484,11 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
         public void changeCollaboration(int changeCollaborationType, int meetingId) throws NetworkDisconnectedException, AcmsException {
             AcmsClient.getInstance(ABVEnvironment.getInstance().networkAdapter).changeCollaboration(sid, roomId.intValue(), changeCollaborationType, meetingId);
         }
+
+        @JavascriptInterface
+        public int getAndroidVersion() {
+            return Build.VERSION.SDK_INT;
+        }
     }
 
     /**
@@ -1591,6 +1596,10 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
 
     }
     private void moveCollaborationScreen(Integer collaborationType) {
+        if (collaborationType.equals(ABookCommConstants.FLAG.COLLABORATION_TYPE.DOCUMENT) && !isValidVersion()) {
+            mChatWebView.loadUrl("javascript:alert(getLocalizedString('not_support_version'));");
+            return;
+        }
         mCollaborationType = collaborationType;
         mChatWebView.post(new Runnable() {
             @Override
@@ -1774,4 +1783,11 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
         return eventPrevent;
     }
 
+    public boolean isValidVersion() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            return false;
+        }
+        return true;
+    }
+
 }

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationRelatedContentActivity.java

@@ -511,22 +511,12 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
     @Override
     public void onResume() {
         Logger.i(TAG, "onResume:start");
-        Stack<ABVAuthenticatedActivity> stack = activityHandlingHelper.getCurrentActivityStack();
         super.onResume();
         if (isCollaboration) {
             hideBottomToolbar();
             if (!isCollaborationOwner) {
                 showProgressPopup();
                 hideContentList();
-                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();