バックグラウンド協業が通知された時に、端末のホーム画面にポップアップが表示されてしまうのを修正した。

ABVJE_UI_Android/src/jp/agentec/abook/abv/cl/push/ABVFcmListenerService.java

@@ -98,11 +98,15 @@ public class ABVFcmListenerService extends FirebaseMessagingService {
                         msg.put(AppDefType.PushMessageKey.message, textMessage);
                     }
 
+                    String roomType = null;
+                    String[] inviteMessage;
                     if (textMessage.contains(INVITE_COLLABORATION)) {
-                        String roomType = Integer.toString(json.getInt(AppDefType.ChatPushMessageKey.roomType));
-                        String[] inviteMessage = textMessage.split(CHAT_MESSAGE_SEPERATOR);
-                        showCollaborationPopUpMessage(roomId, roomName, roomType, pushSendLoginId, pushSendDate, inviteMessage[1]);
-                        return;
+                        roomType = Integer.toString(json.getInt(AppDefType.ChatPushMessageKey.roomType));
+                        inviteMessage = textMessage.split(CHAT_MESSAGE_SEPERATOR);
+                        //showCollaborationPopUpMessage(roomId, roomName, roomType, pushSendLoginId, pushSendDate, inviteMessage[1]);
+                        //return;
+                        Logger.i(TAG,"" + roomType);
+                        Logger.i(TAG,"" + inviteMessage[1]);
                     }
                 }
 
@@ -248,22 +252,42 @@ public class ABVFcmListenerService extends FirebaseMessagingService {
             return intent;
         }
 
+
         JSONObject json = new JSONObject(tempMsg);
 
+        String textMessage = json.getString(AppDefType.PushMessageKey.message);
+        if (textMessage.length() > 0){
+            //tempMsg = textMessage;
+        }
+
+        String roomType = "";
+        String collaborationType = "";
+        if (textMessage.contains(INVITE_COLLABORATION)) {
+            roomType = Integer.toString(json.getInt(AppDefType.ChatPushMessageKey.roomType));
+            String[] inviteMessage = textMessage.split(CHAT_MESSAGE_SEPERATOR);
+            collaborationType = inviteMessage[1];
+            //showCollaborationPopUpMessage(roomId, roomName, roomType, pushSendLoginId, pushSendDate, inviteMessage[1]);
+            //return;
+        }
         String roomName = json.getString(AppDefType.ChatPushMessageKey.roomName);
         String pushMsg = json.getString(AppDefType.PushMessageKey.message);
         message.put(AppDefType.PushMessageKey.message, pushMsg);
 
-        if (roomName.length() <= 0) { return intent; }
+        if (roomName.length() <= 0) {
+            return intent;
+        }
 
         long roomId = json.getLong(AppDefType.ChatPushMessageKey.roomId);
         long pushSendDate = json.getLong(AppDefType.ChatPushMessageKey.pushSendDate);
         String pushSendLoginId = json.getString(AppDefType.ChatPushMessageKey.pushSendLoginId);
+        //String roomType = json.getString(AppDefType.ChatPushMessageKey.roomType);
 
         intent.putExtra(AppDefType.ChatPushMessageKey.roomId, roomId);
         intent.putExtra(AppDefType.ChatPushMessageKey.roomName, roomName);
         intent.putExtra(AppDefType.ChatPushMessageKey.pushSendLoginId, pushSendLoginId);
         intent.putExtra(AppDefType.ChatPushMessageKey.pushSendDate, pushSendDate);
+        intent.putExtra(AppDefType.ChatPushMessageKey.roomType, roomType);
+        intent.putExtra(AppDefType.ChatPushMessageKey.collaborationType, collaborationType);
 
         return intent;
     }

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVNoAuthenticatedActivity.java

@@ -389,8 +389,10 @@ public abstract class ABVNoAuthenticatedActivity extends ABVActivity {
 				if (extras != null && !StringUtil.isNullOrEmpty(extras.getString(AppDefType.ChatPushMessageKey.roomName))) {
 					intent.putExtra(AppDefType.ChatPushMessageKey.roomId, extras.getLong(AppDefType.ChatPushMessageKey.roomId));  // Room Id
 					intent.putExtra(AppDefType.ChatPushMessageKey.roomName, extras.getString(AppDefType.ChatPushMessageKey.roomName));  // Room Name
-					intent.putExtra(AppDefType.ChatPushMessageKey.pushSendLoginId, extras.getString(AppDefType.ChatPushMessageKey.pushSendLoginId)); // sendLoginId
+					intent.putExtra(AppDefType.ChatPushMessageKey.pushSendLoginId, extras.getLong(AppDefType.ChatPushMessageKey.pushSendLoginId)); // sendLoginId
 					intent.putExtra(AppDefType.ChatPushMessageKey.pushSendDate, extras.getString(AppDefType.ChatPushMessageKey.pushSendDate));
+					intent.putExtra(AppDefType.ChatPushMessageKey.roomType, extras.getString(AppDefType.ChatPushMessageKey.roomType));
+					intent.putExtra(AppDefType.ChatPushMessageKey.collaborationType, extras.getString(AppDefType.ChatPushMessageKey.collaborationType));
 				}
 			}
 			intent.setClassName(getApplicationContext().getPackageName(), getMainActivityClassName()).setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/appinfo/AppDefType.java

@@ -145,5 +145,7 @@ public interface AppDefType {
 		String pushSendDate = "pushSendDate";
 		String collaborationType = "collaborationType";
 		String roomType = "roomType";
+		String shopName = "shopName";
+		String loginId = "loginId";
 	}
 }

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

@@ -357,10 +357,21 @@ public class OperationListActivity extends ABVUIActivity {
         // プッシュメッセージがある場合
         else if (!StringUtil.isNullOrEmpty(getIntent().getStringExtra(AppDefType.ChatPushMessageKey.roomName)) &&
                 getIntent().getLongExtra(AppDefType.ChatPushMessageKey.roomId, '0') > 0) {
+            if (!StringUtil.isNullOrEmpty(getIntent().getStringExtra(AppDefType.ChatPushMessageKey.roomType)) &&
+                    !StringUtil.isNullOrEmpty(getIntent().getStringExtra(AppDefType.ChatPushMessageKey.collaborationType))
+            ) {
+                ActivityHandlingHelper.getInstance().startChatWebViewActivityWithCollaboration(
+                        getIntent().getLongExtra(AppDefType.ChatPushMessageKey.roomId, '0'),
+                        getIntent().getStringExtra(AppDefType.ChatPushMessageKey.roomName),
+                        getIntent().getStringExtra(AppDefType.ChatPushMessageKey.collaborationType),
+                        getIntent().getStringExtra(AppDefType.ChatPushMessageKey.roomType));
+
+            } else {
                 ActivityHandlingHelper.getInstance().startChatWebViewActivity(
                         getIntent().getLongExtra(AppDefType.ChatPushMessageKey.roomId, '0'),
                         getIntent().getStringExtra(AppDefType.ChatPushMessageKey.roomName));
             }
+        }
 
         // リスト更新
         setOperationListView();

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

@@ -1640,12 +1640,11 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
         intent.putExtra("sid", sid);
         String loginId = ABVDataCache.getInstance().getMemberInfo().loginId;
         String shopName = ABVDataCache.getInstance().getUrlPath();
-        intent.putExtra("loginId", loginId);
-        intent.putExtra("shopName", shopName);
-        if(dto != null)
-        {
-            intent.putExtra("roomId",dto.roomId);
-            intent.putExtra("roomName", dto.roomName);
+        intent.putExtra(AppDefType.ChatPushMessageKey.loginId, loginId);
+        intent.putExtra(AppDefType.ChatPushMessageKey.shopName, shopName);
+        if (dto != null) {
+            intent.putExtra(AppDefType.ChatPushMessageKey.loginId, dto.roomId);
+            intent.putExtra(AppDefType.ChatPushMessageKey.roomName, dto.roomName);
         }
         intent.setClassName(mContext.getPackageName(), className);
         intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
@@ -1662,8 +1661,8 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
         intent.putExtra("sid", sid);
         String loginId = ABVDataCache.getInstance().getMemberInfo().loginId;
         String shopName = ABVDataCache.getInstance().getUrlPath();
-        intent.putExtra("loginId", loginId);
-        intent.putExtra("shopName", shopName);
+        intent.putExtra(AppDefType.ChatPushMessageKey.loginId, loginId);
+        intent.putExtra(AppDefType.ChatPushMessageKey.shopName, shopName);
         intent.setClassName(mContext.getPackageName(), className);
         intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         getCurrentActivity().startActivity(intent);
@@ -1679,11 +1678,10 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
         intent.putExtra("sid", sid);
         String loginId = ABVDataCache.getInstance().getMemberInfo().loginId;
         String shopName = ABVDataCache.getInstance().getUrlPath();
-        intent.putExtra("loginId", loginId);
-        intent.putExtra("shopName", shopName);
-        intent.putExtra("roomId", roomId);
-        intent.putExtra("roomName", roomName);
-
+        intent.putExtra(AppDefType.ChatPushMessageKey.loginId, loginId);
+        intent.putExtra(AppDefType.ChatPushMessageKey.shopName, shopName);
+        intent.putExtra(AppDefType.ChatPushMessageKey.roomId, roomId);
+        intent.putExtra(AppDefType.ChatPushMessageKey.roomName, roomName);
         intent.setClassName(mContext.getPackageName(), className);
         intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         getCurrentActivity().startActivity(intent);
@@ -1923,12 +1921,12 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
         intent.putExtra("sid", sid);
         String loginId = ABVDataCache.getInstance().getMemberInfo().loginId;
         String shopName = ABVDataCache.getInstance().getUrlPath();
-        intent.putExtra("loginId", loginId);
-        intent.putExtra("collaborationType", collaborationType);
-        intent.putExtra("shopName", shopName);
-        intent.putExtra("roomId", roomId);
-        intent.putExtra("roomName", roomName);
-        intent.putExtra("roomType", roomType);
+        intent.putExtra(AppDefType.ChatPushMessageKey.loginId, loginId);
+        intent.putExtra(AppDefType.ChatPushMessageKey.collaborationType, collaborationType);
+        intent.putExtra(AppDefType.ChatPushMessageKey.shopName, shopName);
+        intent.putExtra(AppDefType.ChatPushMessageKey.roomId, roomId);
+        intent.putExtra(AppDefType.ChatPushMessageKey.roomName, roomName);
+        intent.putExtra(AppDefType.ChatPushMessageKey.roomType, roomType);
         intent.setClassName(mContext.getPackageName(), className);
         intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         getCurrentActivity().startActivity(intent);

[Kim Jinsung]

重要な情報でないので、Logger.dにしてください。 ログの確認時にはLogger.dを利用してください。

[onuma]

この行は、d901cb70 のコミットで消しました。最後のコミットのファイルで確認していただけますか？