diff options
author | Mario Danic <mario@lovelyhq.com> | 2018-08-27 13:57:48 +0300 |
---|---|---|
committer | Mario Danic <mario@lovelyhq.com> | 2018-08-27 13:57:48 +0300 |
commit | 92919928fada5b924823cac11ecd4b7c1fb3cd28 (patch) | |
tree | f9f0dfaff4ff5561865d69b60e160ad58c5f4767 | |
parent | bf123dfc150c260aeb5268dd28b3d90690e93fc7 (diff) |
Implement better support for video verificationv3.0.0beta10
Signed-off-by: Mario Danic <mario@lovelyhq.com>
-rw-r--r-- | app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java | 4 | ||||
-rw-r--r-- | app/src/main/java/com/nextcloud/talk/models/json/rooms/Conversation.java | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java index 36842f9a0..23d6452cd 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java +++ b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java @@ -123,7 +123,9 @@ public class NotificationWorker extends Worker { Conversation conversation = roomOverall.getOcs().getData(); intent.putExtra(BundleKeys.KEY_ROOM, Parcels.wrap(conversation)); - if (conversation.getType().equals(Conversation.RoomType.ROOM_TYPE_ONE_TO_ONE_CALL)) { + if (conversation.getType().equals(Conversation.RoomType.ROOM_TYPE_ONE_TO_ONE_CALL) || + (!TextUtils.isEmpty(conversation.getObjectType()) && "share:password".equals + (conversation.getObjectType()))) { context.startActivity(intent); } else { if (conversation.getType().equals(Conversation.RoomType.ROOM_GROUP_CALL)) { diff --git a/app/src/main/java/com/nextcloud/talk/models/json/rooms/Conversation.java b/app/src/main/java/com/nextcloud/talk/models/json/rooms/Conversation.java index cd2ecc0c5..28ab6c276 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/rooms/Conversation.java +++ b/app/src/main/java/com/nextcloud/talk/models/json/rooms/Conversation.java @@ -74,6 +74,8 @@ public class Conversation { public boolean unreadMention; @JsonField(name = "lastMessage") public ChatMessage lastMessage; + @JsonField(name = "objectType") + String objectType; public boolean isPublic() { return (RoomType.ROOM_PUBLIC_CALL.equals(type)); |