プッシュメッセージからチャットと協業に遷移する時、iOSと同じ遷移にした。(3)

不要なコメントを削除しました

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

@@ -307,10 +307,10 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity implements
                 boolean result = false;
                 // 画像が選択された場合
                 if (fileChooserParams.getAcceptTypes()[0].toLowerCase().contains(ABookKeys.IMAGE)) {
-                    result = startCameraIntent(ABOOK_CHECK_TASK_IMAGE, "Camera", ABookKeys.IMAGE, true);
+                    result = startCameraIntent(ABookCommConstants.ABOOK_CHECK_TASK_IMAGE, "Camera", ABookKeys.IMAGE, true);
                     // 動画が選択された場合
                 } else if (fileChooserParams.getAcceptTypes()[0].toLowerCase().contains(ABookKeys.VIDEO)) {
-                    result = startCameraIntent(ABOOK_CHECK_TASK_VIDEO, "Video", ABookKeys.VIDEO, true);
+                    result = startCameraIntent(ABookCommConstants.ABOOK_CHECK_TASK_VIDEO, "Video", ABookKeys.VIDEO, true);
                 }
                 if (result) {
                     if (mUploadMessage != null) {
@@ -704,9 +704,9 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity implements
             }
         }
 
-        if (requestCode == ABOOK_CHECK_TASK_IMAGE) {
+        if (requestCode == ABookCommConstants.ABOOK_CHECK_TASK_IMAGE) {
             activityResultReceivedImage(dataUri);
-        } else if (requestCode == ABOOK_CHECK_TASK_VIDEO) {
+        } else if (requestCode == ABookCommConstants.ABOOK_CHECK_TASK_VIDEO) {
             activityResultReceivedMovie(dataUri);
         }
 

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

@@ -550,37 +550,6 @@ public class OperationListActivity extends ABVUIActivity {
         configurationToolbarIcon();
     }
 
-    /**
-     * ッシュメッセージがあるので、チャットルームに遷移する。
-     */
-/*
-    public void goChatRoom(final Intent intent) {
-        if (!StringUtil.isNullOrEmpty(intent.getStringExtra(AppDefType.ChatPushMessageKey.roomName)) &&
-                intent.getLongExtra(AppDefType.ChatPushMessageKey.roomId, '0') > 0) {
-
-            handler.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    if (!StringUtil.isNullOrEmpty(intent.getStringExtra(AppDefType.ChatPushMessageKey.roomType)) &&
-                            !StringUtil.isNullOrEmpty(intent.getStringExtra(AppDefType.ChatPushMessageKey.collaborationType))
-                    ) {
-                        // roomTypeと、collaborationType が存在する場合は、協業を開始する。
-                        ActivityHandlingHelper.getInstance().startChatWebViewActivityWithCollaboration(
-                                intent.getLongExtra(AppDefType.ChatPushMessageKey.roomId, '0'),
-                                intent.getStringExtra(AppDefType.ChatPushMessageKey.roomName),
-                                intent.getStringExtra(AppDefType.ChatPushMessageKey.collaborationType),
-                                intent.getStringExtra(AppDefType.ChatPushMessageKey.roomType), "");
-
-                    } else {
-                        ActivityHandlingHelper.getInstance().startChatWebViewActivity(
-                                intent.getLongExtra(AppDefType.ChatPushMessageKey.roomId, '0'),
-                                intent.getStringExtra(AppDefType.ChatPushMessageKey.roomName), "");
-                    }
-                }
-            }, 500);
-        }
-    }
-*/
     // 検索ダイアログ表示
     private void showSearchDialog() {
         contentRefresher.stopRefresh();

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/CommunicationWebViewActivity.java

@@ -34,8 +34,6 @@ public class CommunicationWebViewActivity extends ABVAuthenticatedActivity {
     private ProgressBar m_progress;
     protected ContentDto mContentDto;
     protected File mLocalFile;
-    public final static int ABOOK_CHECK_TASK_IMAGE = 103;
-    public final static int ABOOK_CHECK_TASK_VIDEO = 104;
 
     @Override
     protected void onDestroy() {

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ParentWebViewActivity.java

@@ -257,6 +257,7 @@ public class ParentWebViewActivity extends ABVContentViewActivity {
                 ActivityHandlingHelper.getInstance().finishAllLinkContentViewActivity();
             } else {
                 ActivityHandlingHelper.getInstance().finishAllContentViewActivity();
+
             }
         }
     }