43220対応。

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

@@ -1648,28 +1648,8 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
             intent.putExtra("roomName", dto.roomName);
         }
         intent.setClassName(mContext.getPackageName(), className);
-
-        Activity activity2 = null;
-        if (!currentActivityStack.isEmpty()) {
-            int size = currentActivityStack.size();
-
-            for(int i = size-1; i >= 0; i--) {
-                ABVAuthenticatedActivity activity = currentActivityStack.elementAt(i);
-                if (activity instanceof ChatWebViewActivity) {
-                    activity2 = (ChatWebViewActivity) activity;
-                }
-            }
-        }
-
-        if (activity2 != null) {
-            activity2.finish();
-            activity2.startActivity(intent);
-        } else {
-            Activity activity = getCurrentActivity();
-            if (activity != null) {
-                activity.startActivity(intent);
-            }
-        }
+        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        getCurrentActivity().startActivity(intent);
     }
 
     //チャットに入る
@@ -1685,28 +1665,8 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
         intent.putExtra("loginId", loginId);
         intent.putExtra("shopName", shopName);
         intent.setClassName(mContext.getPackageName(), className);
-
-        Activity activity2 = null;
-        if (!currentActivityStack.isEmpty()) {
-            int size = currentActivityStack.size();
-
-            for(int i = size-1; i >= 0; i--) {
-                ABVAuthenticatedActivity activity = currentActivityStack.elementAt(i);
-                if (activity instanceof ChatWebViewActivity) {
-                    activity2 = (ChatWebViewActivity) activity;
-                }
-            }
-        }
-
-        if (activity2 != null) {
-            activity2.finish();
-            activity2.startActivity(intent);
-        } else {
-            Activity activity = getCurrentActivity();
-            if (activity != null) {
-                activity.startActivity(intent);
-            }
-        }
+        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        getCurrentActivity().startActivity(intent);
     }
 
     // プシュメッセージからチャットに入る
@@ -1725,28 +1685,8 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
         intent.putExtra("roomName", roomName);
 
         intent.setClassName(mContext.getPackageName(), className);
-
-        Activity activity2 = null;
-        if (!currentActivityStack.isEmpty()) {
-            int size = currentActivityStack.size();
-
-            for(int i = size-1; i >= 0; i--) {
-                ABVAuthenticatedActivity activity = currentActivityStack.elementAt(i);
-                if (activity instanceof ChatWebViewActivity) {
-                    activity2 = (ChatWebViewActivity) activity;
-                }
-            }
-        }
-
-        if (activity2 != null) {
-            activity2.finish();
-            activity2.startActivity(intent);
-        } else {
-            Activity activity = getCurrentActivity();
-            if (activity != null) {
-                activity.startActivity(intent);
-            }
-        }
+        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        getCurrentActivity().startActivity(intent);
     }
 
     /**
@@ -1990,28 +1930,8 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
         intent.putExtra("roomName", roomName);
         intent.putExtra("roomType", roomType);
         intent.setClassName(mContext.getPackageName(), className);
-
-        Activity activity2 = null;
-        if (!currentActivityStack.isEmpty()) {
-            int size = currentActivityStack.size();
-
-            for (int i = size - 1; i >= 0; i--) {
-                ABVAuthenticatedActivity activity = currentActivityStack.elementAt(i);
-                if (activity instanceof ChatWebViewActivity) {
-                    activity2 = (ChatWebViewActivity) activity;
-                }
-            }
-        }
-
-        if (activity2 != null) {
-            activity2.finish();
-            activity2.startActivity(intent);
-        } else {
-            Activity activity = getCurrentActivity();
-            if (activity != null) {
-                activity.startActivity(intent);
-            }
-        }
+        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        getCurrentActivity().startActivity(intent);
     }
 
     /**