Merge branch 'features/1.3.200_42838' into 'features/1.3.200'

#42838（資料閲覧ができないものがある）対応。

See merge request !167

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ActivityHandlingHelper.java

@@ -174,11 +174,11 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
             @Override
             @Override
             public void run() {
             public void run() {
                 try {
                 try {
-                    intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+                    intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | intent.FLAG_ACTIVITY_NEW_TASK);
                     if (page != null) {
                     if (page != null) {
                         intent.putExtra(ABVActivity.PAGE, page);
                         intent.putExtra(ABVActivity.PAGE, page);
                     }
                     }
-                    startContentActivity(mContext, intent, null, Intent.FLAG_ACTIVITY_SINGLE_TOP, contentId);
+                    startContentActivity(mContext, intent, null, Intent.FLAG_ACTIVITY_SINGLE_TOP | intent.FLAG_ACTIVITY_NEW_TASK, contentId);
                 } catch (Exception e) {
                 } catch (Exception e) {
                     Logger.e(TAG, "startContentActivity contentId=" + contentId, e);
                     Logger.e(TAG, "startContentActivity contentId=" + contentId, e);
                     showToast(mContext.getString(R.string.E113));
                     showToast(mContext.getString(R.string.E113));
@@ -384,15 +384,24 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
 
 
             recordContentReadLog(context, contentId);
             recordContentReadLog(context, contentId);
         }
         }
-        Activity act = getCurrentActivity();
-        if (act instanceof ChatWebviewActivity) {
-            act = getActivity(OperationRelatedContentActivity.class);
+        //AbookCommの文書協業の場合(ChatWebviewがPIPモードの場合)既存Contextでなく以前のActivityから画面を遷移する。
+        ChatWebviewActivity chatWebViewActivity = getActivity(ChatWebviewActivity.class);
+        if (chatWebViewActivity != null && chatWebViewActivity.isInPictureInPictureMode()) {
+            context = getCurrentActivity();
+            intent.removeFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+            if (context instanceof ChatWebviewActivity) {
+                Stack<ABVAuthenticatedActivity> stack = getCurrentActivityStack();
+                if (stack.size() > 1){
+                    context = stack.get(stack.size()-2);
+                }
+            }
         }
         }
-        intent.setClass(act, ContentViewActivity.class);
+
         if (!StringUtil.equalsAny(contentType,
         if (!StringUtil.equalsAny(contentType,
                 ContentJSON.KEY_HTML_TYPE, ContentJSON.KEY_LINK_TYPE, ContentJSON.KEY_ENQUETE_TYPE, ContentJSON.KEY_EXAM_TYPE,
                 ContentJSON.KEY_HTML_TYPE, ContentJSON.KEY_LINK_TYPE, ContentJSON.KEY_ENQUETE_TYPE, ContentJSON.KEY_EXAM_TYPE,
                 ContentJSON.KEY_PANO_MOVIE_TYPE, ContentJSON.KEY_PANO_IMAGE_TYPE, ContentJSON.KEY_OBJECTVR_TYPE)) {
                 ContentJSON.KEY_PANO_MOVIE_TYPE, ContentJSON.KEY_PANO_IMAGE_TYPE, ContentJSON.KEY_OBJECTVR_TYPE)) {
-            act.startActivity(intent);
+            context.startActivity(intent);
         }
         }
     }
     }