Merge branch 'communication/develop_onuma' into 'communication/develop'

onStop()で実行していた処理を削除した。

See merge request !228

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

@@ -112,8 +112,7 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity implements
     private String selectedUserIdList;
     private String selectedUserIdList;
     private String mSkey;
     private String mSkey;
     private boolean startPIP = false; // PIPモードを開始していたらtrue;
     private boolean startPIP = false; // PIPモードを開始していたらtrue;
-    private boolean needFinishOnStop = false;  // ×ボタンでPIP閉じた時用
-    private boolean doneOnStopEvent = false;
+    private boolean isActivityStop = false; // onResume で　tru onStop で false
     private String collaborationType = null;
     private String collaborationType = null;
     private String meetingId = null;
     private String meetingId = null;
 
 
@@ -902,7 +901,7 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity implements
             return;
             return;
         }
         }
 
 
-        if (doneOnStopEvent) {
+        if (isActivityStop) {
             mChatWebView.exitCollaboration();
             mChatWebView.exitCollaboration();
         }
         }
         mChatWebView.addPIPIndicator();
         mChatWebView.addPIPIndicator();
@@ -1014,7 +1013,7 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity implements
 
 
     @Override
     @Override
     protected void onResume() {
     protected void onResume() {
-        doneOnStopEvent = false; // activity動いている
+        isActivityStop = false; // activity動いている
         super.onResume();
         super.onResume();
         if (mChatWebView.getUrl() != null && mChatWebView.getUrl().equals(ABookCommConstants.CHAT_ROOM_PAGE_URL)) {
         if (mChatWebView.getUrl() != null && mChatWebView.getUrl().equals(ABookCommConstants.CHAT_ROOM_PAGE_URL)) {
             mChatWebView.socketCheck();
             mChatWebView.socketCheck();
@@ -1024,21 +1023,7 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity implements
     @Override
     @Override
     protected void onStop() {
     protected void onStop() {
         super.onStop();
         super.onStop();
-
-        doneOnStopEvent = true; // activity 停止
-
-        if (needFinishOnStop) {
-            try {
-                chatData.finishCollaboration();
-            } catch (NetworkDisconnectedException e) {
-                e.printStackTrace();
-            } catch (AcmsException e) {
-                e.printStackTrace();
-            }
-            // PIPモードは、状態変化のイベントがonStopくらいしかない。なので、PIPの時は、ここでfinish()する
-            finish();
-            needFinishOnStop = false;
-        }
+        isActivityStop = true; // activity 停止
     }
     }
 
 
     @Override
     @Override
@@ -1049,6 +1034,7 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity implements
             unregisterReceiver(receiver);
             unregisterReceiver(receiver);
             receiver = null;
             receiver = null;
         }
         }
+        finishBeforeContentListActivity();
     }
     }
 
 
     @Override
     @Override
@@ -1340,7 +1326,6 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity implements
     public void startPIPMode() {
     public void startPIPMode() {
         PictureInPictureParams.Builder mPipBuilder = new PictureInPictureParams.Builder();
         PictureInPictureParams.Builder mPipBuilder = new PictureInPictureParams.Builder();
         enterPictureInPictureMode(mPipBuilder.build());
         enterPictureInPictureMode(mPipBuilder.build());
-        needFinishOnStop = true;
         startPIP = true;
         startPIP = true;
     }
     }