From 7e46f4d30a2b9a42be1b541f82578321b67d1cc8 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Wed, 9 Oct 2019 10:52:36 +0200 Subject: [PATCH] Fix models Signed-off-by: Mario Danic --- .../talk/models/ExternalSignalingServer.java | 0 .../nextcloud/talk/models/ImportAccount.java | 0 .../com/nextcloud/talk/models/LoginData.java | 0 .../nextcloud/talk/models/RetrofitBucket.java | 0 .../talk/models/RingtoneSettings.java | 0 .../talk/models/SignatureVerification.java | 0 .../json/autocomplete/AutocompleteOCS.java | 0 .../autocomplete/AutocompleteOverall.java | 0 .../json/autocomplete/AutocompleteUser.java | 0 .../json/capabilities/Capabilities.java | 0 .../json/capabilities/CapabilitiesList.java | 0 .../json/capabilities/CapabilitiesOCS.java | 0 .../capabilities/CapabilitiesOverall.java | 0 .../capabilities/NotificationsCapability.java | 0 .../json/capabilities/SpreedCapability.java | 0 .../json/capabilities/ThemingCapability.java | 0 .../talk/models/json/chat/ChatMessage.java | 0 .../talk/models/json/chat/ChatMessage.kt | 249 ------------------ .../talk/models/json/chat/ChatOCS.java | 0 .../talk/models/json/chat/ChatOCS.kt | 34 --- .../talk/models/json/chat/ChatOverall.java | 0 .../talk/models/json/chat/ChatOverall.kt | 34 --- .../talk/models/json/chat/ChatUtils.java | 0 .../talk/models/json/chat/ChatUtils.kt | 43 --- .../json/conversations/Conversation.java | 0 .../models/json/conversations/RoomOCS.java | 0 .../json/conversations/RoomOverall.java | 0 .../models/json/conversations/RoomsOCS.java | 0 .../json/conversations/RoomsOverall.java | 0 .../converters/EnumLobbyStateConverter.java | 0 .../EnumNotificationLevelConverter.java | 0 .../EnumParticipantTypeConverter.java | 0 .../EnumReadOnlyConversationConverter.java | 0 .../converters/EnumRoomTypeConverter.java | 0 .../EnumSystemMessageTypeConverter.kt | 0 .../LoganSquareJodaTimeConverter.java | 0 .../converters/ObjectParcelConverter.java | 0 .../json/converters/UriTypeConverter.java | 0 .../talk/models/json/generic/GenericMeta.java | 0 .../talk/models/json/generic/GenericOCS.java | 0 .../models/json/generic/GenericOverall.java | 0 .../talk/models/json/generic/Status.java | 0 .../talk/models/json/mention/Mention.java | 0 .../talk/models/json/mention/MentionOCS.java | 0 .../models/json/mention/MentionOverall.java | 0 .../json/notifications/Notification.java | 0 .../notifications/NotificationAction.java | 0 .../json/notifications/NotificationOCS.java | 0 .../notifications/NotificationRichObject.java | 0 .../json/notifications/NotificationsOCS.java | 0 .../notifications/NotificationsOverall.java | 0 .../json/participants/AddParticipantOCS.java | 0 .../participants/AddParticipantOverall.java | 0 .../models/json/participants/Participant.java | 0 .../json/participants/ParticipantsOCS.java | 0 .../participants/ParticipantsOverall.java | 0 .../json/push/DecryptedPushMessage.java | 0 .../json/push/PushConfigurationState.java | 0 .../models/json/push/PushRegistration.java | 0 .../models/json/push/PushRegistrationOCS.java | 0 .../json/push/PushRegistrationOverall.java | 0 .../models/json/sharees/ExactSharees.java | 0 .../talk/models/json/sharees/Sharee.java | 0 .../talk/models/json/sharees/ShareesOCS.java | 0 .../models/json/sharees/ShareesOverall.java | 0 .../talk/models/json/sharees/SharesData.java | 0 .../talk/models/json/sharees/Value.java | 0 .../json/signaling/DataChannelMessage.java | 0 .../signaling/DataChannelMessageNick.java | 0 .../models/json/signaling/NCIceCandidate.java | 0 .../json/signaling/NCMessagePayload.java | 0 .../json/signaling/NCMessageWrapper.java | 0 .../json/signaling/NCSignalingMessage.java | 0 .../talk/models/json/signaling/Signaling.java | 0 .../models/json/signaling/SignalingOCS.java | 0 .../json/signaling/SignalingOverall.java | 0 .../json/signaling/settings/IceServer.java | 0 .../json/signaling/settings/Settings.java | 0 .../settings/SignalingSettingsOcs.java | 0 .../settings/SignalingSettingsOverall.java | 0 .../json/userprofile/UserProfileData.java | 0 .../json/userprofile/UserProfileOCS.java | 0 .../json/userprofile/UserProfileOverall.java | 0 .../json/websocket/ActorWebSocketMessage.java | 0 .../AuthParametersWebSocketMessage.java | 0 .../json/websocket/AuthWebSocketMessage.java | 0 .../json/websocket/BaseWebSocketMessage.java | 0 .../json/websocket/ByeWebSocketMessage.java | 0 .../CallOverallWebSocketMessage.java | 0 .../json/websocket/CallWebSocketMessage.java | 0 .../ErrorOverallWebSocketMessage.java | 0 .../json/websocket/ErrorWebSocketMessage.java | 0 .../EventOverallWebSocketMessage.java | 0 .../HelloOverallWebSocketMessage.java | 0 .../HelloResponseOverallWebSocketMessage.java | 0 .../HelloResponseWebSocketMessage.java | 0 .../json/websocket/HelloWebSocketMessage.java | 0 .../JoinedRoomOverallWebSocketMessage.java | 0 .../RequestOfferOverallWebSocketMessage.java | 0 .../RequestOfferSignalingMessage.java | 0 .../RoomOverallWebSocketMessage.java | 0 .../RoomPropertiesWebSocketMessage.java | 0 .../json/websocket/RoomWebSocketMessage.java | 0 ...HelloResponseFeaturesWebSocketMessage.java | 0 ...SignalingDataWebSocketMessageForOffer.java | 0 105 files changed, 360 deletions(-) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/ExternalSignalingServer.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/ImportAccount.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/LoginData.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/RetrofitBucket.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/RingtoneSettings.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/SignatureVerification.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOCS.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOverall.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteUser.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/capabilities/Capabilities.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesList.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOCS.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOverall.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/capabilities/NotificationsCapability.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/capabilities/SpreedCapability.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/capabilities/ThemingCapability.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java (100%) delete mode 100644 presentation/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.kt rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCS.java (100%) delete mode 100644 presentation/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCS.kt rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverall.java (100%) delete mode 100644 presentation/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverall.kt rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.java (100%) delete mode 100644 presentation/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.kt rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOCS.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOverall.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOCS.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOverall.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/converters/EnumLobbyStateConverter.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/converters/EnumNotificationLevelConverter.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/converters/EnumParticipantTypeConverter.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/converters/EnumReadOnlyConversationConverter.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/converters/EnumRoomTypeConverter.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.kt (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/converters/LoganSquareJodaTimeConverter.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/converters/ObjectParcelConverter.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/converters/UriTypeConverter.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/generic/GenericMeta.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/generic/GenericOCS.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/generic/GenericOverall.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/generic/Status.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/mention/Mention.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/mention/MentionOCS.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/mention/MentionOverall.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/notifications/Notification.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationAction.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOCS.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationRichObject.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOCS.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOverall.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOCS.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOverall.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/participants/Participant.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOCS.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOverall.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/push/DecryptedPushMessage.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/push/PushConfigurationState.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/push/PushRegistration.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOCS.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOverall.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/sharees/ExactSharees.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/sharees/Sharee.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOCS.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOverall.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/sharees/SharesData.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/sharees/Value.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessage.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessageNick.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/signaling/NCIceCandidate.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessagePayload.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessageWrapper.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/signaling/NCSignalingMessage.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/signaling/Signaling.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOCS.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOverall.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/signaling/settings/IceServer.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/signaling/settings/Settings.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOcs.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOverall.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileData.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOCS.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOverall.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/websocket/ActorWebSocketMessage.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/websocket/AuthParametersWebSocketMessage.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/websocket/AuthWebSocketMessage.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/websocket/BaseWebSocketMessage.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/websocket/ByeWebSocketMessage.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/websocket/CallOverallWebSocketMessage.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/websocket/CallWebSocketMessage.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorOverallWebSocketMessage.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorWebSocketMessage.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/websocket/EventOverallWebSocketMessage.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/websocket/HelloOverallWebSocketMessage.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseOverallWebSocketMessage.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseWebSocketMessage.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/websocket/HelloWebSocketMessage.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/websocket/JoinedRoomOverallWebSocketMessage.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/websocket/RequestOfferOverallWebSocketMessage.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/websocket/RequestOfferSignalingMessage.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/websocket/RoomOverallWebSocketMessage.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/websocket/RoomPropertiesWebSocketMessage.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/websocket/RoomWebSocketMessage.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/websocket/ServerHelloResponseFeaturesWebSocketMessage.java (100%) rename {app => presentation}/src/main/java/com/nextcloud/talk/models/json/websocket/SignalingDataWebSocketMessageForOffer.java (100%) diff --git a/app/src/main/java/com/nextcloud/talk/models/ExternalSignalingServer.java b/presentation/src/main/java/com/nextcloud/talk/models/ExternalSignalingServer.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/ExternalSignalingServer.java rename to presentation/src/main/java/com/nextcloud/talk/models/ExternalSignalingServer.java diff --git a/app/src/main/java/com/nextcloud/talk/models/ImportAccount.java b/presentation/src/main/java/com/nextcloud/talk/models/ImportAccount.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/ImportAccount.java rename to presentation/src/main/java/com/nextcloud/talk/models/ImportAccount.java diff --git a/app/src/main/java/com/nextcloud/talk/models/LoginData.java b/presentation/src/main/java/com/nextcloud/talk/models/LoginData.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/LoginData.java rename to presentation/src/main/java/com/nextcloud/talk/models/LoginData.java diff --git a/app/src/main/java/com/nextcloud/talk/models/RetrofitBucket.java b/presentation/src/main/java/com/nextcloud/talk/models/RetrofitBucket.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/RetrofitBucket.java rename to presentation/src/main/java/com/nextcloud/talk/models/RetrofitBucket.java diff --git a/app/src/main/java/com/nextcloud/talk/models/RingtoneSettings.java b/presentation/src/main/java/com/nextcloud/talk/models/RingtoneSettings.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/RingtoneSettings.java rename to presentation/src/main/java/com/nextcloud/talk/models/RingtoneSettings.java diff --git a/app/src/main/java/com/nextcloud/talk/models/SignatureVerification.java b/presentation/src/main/java/com/nextcloud/talk/models/SignatureVerification.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/SignatureVerification.java rename to presentation/src/main/java/com/nextcloud/talk/models/SignatureVerification.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOCS.java b/presentation/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOCS.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOCS.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOCS.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOverall.java b/presentation/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOverall.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOverall.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOverall.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteUser.java b/presentation/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteUser.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteUser.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteUser.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/Capabilities.java b/presentation/src/main/java/com/nextcloud/talk/models/json/capabilities/Capabilities.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/capabilities/Capabilities.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/capabilities/Capabilities.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesList.java b/presentation/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesList.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesList.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesList.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOCS.java b/presentation/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOCS.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOCS.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOCS.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOverall.java b/presentation/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOverall.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOverall.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOverall.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/NotificationsCapability.java b/presentation/src/main/java/com/nextcloud/talk/models/json/capabilities/NotificationsCapability.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/capabilities/NotificationsCapability.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/capabilities/NotificationsCapability.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/SpreedCapability.java b/presentation/src/main/java/com/nextcloud/talk/models/json/capabilities/SpreedCapability.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/capabilities/SpreedCapability.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/capabilities/SpreedCapability.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/ThemingCapability.java b/presentation/src/main/java/com/nextcloud/talk/models/json/capabilities/ThemingCapability.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/capabilities/ThemingCapability.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/capabilities/ThemingCapability.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java b/presentation/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.kt b/presentation/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.kt deleted file mode 100644 index 66e9db07b..000000000 --- a/presentation/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.kt +++ /dev/null @@ -1,249 +0,0 @@ -/* - * Nextcloud Talk application - * - * @author Mario Danic - * Copyright (C) 2017-2018 Mario Danic - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.nextcloud.talk.models.json.chat - -import android.text.TextUtils -import com.bluelinelabs.logansquare.annotation.JsonField -import com.bluelinelabs.logansquare.annotation.JsonIgnore -import com.bluelinelabs.logansquare.annotation.JsonObject -import com.nextcloud.data.models.json.converters.EnumSystemMessageTypeConverter -import com.nextcloud.talk.R -import com.nextcloud.talk.application.NextcloudTalkApplication -import com.nextcloud.talk.database.UserEntity -import com.nextcloud.talk.models.database.UserEntity -import com.nextcloud.talk.utils.ApiUtils -import com.nextcloud.talk.utils.TextMatchers -import com.stfalcon.chatkit.commons.models.IMessage -import com.stfalcon.chatkit.commons.models.IUser -import com.stfalcon.chatkit.commons.models.MessageContentType -import org.apache.commons.lang3.exception.ExceptionUtils.getMessage -import org.parceler.Parcel -import java.util.* - -@Parcel -@JsonObject -class ChatMessage : IMessage, MessageContentType, MessageContentType.Image { - @JsonIgnore - var isGrouped: Boolean = false - @JsonIgnore - var isOneToOneConversation: Boolean = false - @JsonIgnore - var activeUser: UserEntity? = null - @JsonIgnore - var selectedIndividualHashMap: Map? = null - @JsonIgnore - var isLinkPreviewAllowed: Boolean = false - internal var messageTypesToIgnore = Arrays.asList(MessageType.REGULAR_TEXT_MESSAGE, - MessageType.SYSTEM_MESSAGE, MessageType.SINGLE_LINK_VIDEO_MESSAGE, - MessageType.SINGLE_LINK_AUDIO_MESSAGE, MessageType.SINGLE_LINK_MESSAGE) - @JsonField(name = ["id"]) - var jsonMessageId: Int = 0 - @JsonField(name = ["token"]) - var token: String? = null - // guests or users - @JsonField(name = ["actorType"]) - var actorType: String? = null - @JsonField(name = ["actorId"]) - var actorId: String? = null - // send when crafting a message - @JsonField(name = ["actorDisplayName"]) - var actorDisplayName: String? = null - @JsonField(name = ["timestamp"]) - var timestamp: Long = 0 - // send when crafting a message, max 1000 lines - @JsonField(name = ["message"]) - var message: String? = null - @JsonField(name = ["messageParameters"]) - var messageParameters: HashMap>? = null - @JsonField(name = ["systemMessage"], typeConverter = EnumSystemMessageTypeConverter::class) - var systemMessageType: SystemMessageType? = null - - val imageUrl: String? - get() { - if (messageParameters != null && messageParameters!!.size > 0) { - for (key in messageParameters!!.keys) { - val individualHashMap = messageParameters!![key] - if (individualHashMap!!["type"] == "file") { - selectedIndividualHashMap = individualHashMap - return NextcloudTalkApplication.sharedApplication?.resources?.getDimensionPixelSize(R.dimen.maximum_file_preview_size)?.let{maxPreviewSize : Int -> - ApiUtils.getUrlForFilePreviewWithFileId(activeUser!!.getBaseUrl(), individualHashMap["id"], maxPreviewSize) - } - } - } - } - - return if (!messageTypesToIgnore.contains(messageType) && isLinkPreviewAllowed) { - message!!.trim({ it <= ' ' }) - } else null - - } - - val messageType: MessageType - get() { - if (!TextUtils.isEmpty(systemMessage)) { - return MessageType.SYSTEM_MESSAGE - } - - return if (hasFileAttachment()) { - MessageType.SINGLE_NC_ATTACHMENT_MESSAGE - } else TextMatchers.getMessageTypeFromString(text) - - } - - val id: String - get() = Integer.toString(jsonMessageId) - - val text: String - get() = ChatUtils.getParsedMessage(getMessage(), getMessageParameters()) - - val lastMessageDisplayText: String - get() { - if (messageType == MessageType.REGULAR_TEXT_MESSAGE || messageType == MessageType.SYSTEM_MESSAGE) { - return text - } else { - if (messageType == MessageType.SINGLE_LINK_GIPHY_MESSAGE - || messageType == MessageType.SINGLE_LINK_TENOR_MESSAGE - || messageType == MessageType.SINGLE_LINK_GIF_MESSAGE) { - return if (getActorId() == getActiveUser()!!.getUserId()) { - NextcloudTalkApplication.Companion.getSharedApplication().getString(R.string.nc_sent_a_gif_you) - } else { - String.format(NextcloudTalkApplication.Companion.getSharedApplication().getResources().getString(R.string.nc_sent_a_gif), - if (!TextUtils.isEmpty(getActorDisplayName())) getActorDisplayName() else NextcloudTalkApplication.Companion.getSharedApplication().getString(R.string.nc_guest)) - } - } else if (messageType == MessageType.SINGLE_NC_ATTACHMENT_MESSAGE) { - return if (getActorId() == getActiveUser()!!.getUserId()) { - NextcloudTalkApplication.Companion.getSharedApplication().getString(R.string.nc_sent_an_attachment_you) - } else { - String.format(NextcloudTalkApplication.Companion.getSharedApplication().getResources().getString(R.string.nc_sent_an_attachment), - if (!TextUtils.isEmpty(getActorDisplayName())) getActorDisplayName() else NextcloudTalkApplication.Companion.getSharedApplication().getString(R.string.nc_guest)) - } - } else if (messageType == MessageType.SINGLE_LINK_MESSAGE) { - return if (getActorId() == getActiveUser()!!.getUserId()) { - NextcloudTalkApplication.Companion.getSharedApplication().getString(R.string.nc_sent_a_link_you) - } else { - String.format(NextcloudTalkApplication.Companion.getSharedApplication().getResources().getString(R.string.nc_sent_a_link), - if (!TextUtils.isEmpty(getActorDisplayName())) getActorDisplayName() else NextcloudTalkApplication.Companion.getSharedApplication().getString(R.string.nc_guest)) - } - } else if (messageType == MessageType.SINGLE_LINK_AUDIO_MESSAGE) { - return if (getActorId() == getActiveUser()!!.getUserId()) { - NextcloudTalkApplication.Companion.getSharedApplication().getString(R.string.nc_sent_an_audio_you) - } else { - String.format(NextcloudTalkApplication.Companion.getSharedApplication().getResources().getString(R.string.nc_sent_an_audio), - if (!TextUtils.isEmpty(getActorDisplayName())) getActorDisplayName() else NextcloudTalkApplication.Companion.getSharedApplication().getString(R.string.nc_guest)) - } - } else if (messageType == MessageType.SINGLE_LINK_VIDEO_MESSAGE) { - return if (getActorId() == getActiveUser()!!.getUserId()) { - NextcloudTalkApplication.Companion.getSharedApplication().getString(R.string.nc_sent_a_video_you) - } else { - String.format(NextcloudTalkApplication.Companion.getSharedApplication().getResources().getString(R.string.nc_sent_a_video), - if (!TextUtils.isEmpty(getActorDisplayName())) getActorDisplayName() else NextcloudTalkApplication.Companion.getSharedApplication().getString(R.string.nc_guest)) - } - } else if (messageType == MessageType.SINGLE_LINK_IMAGE_MESSAGE) { - return if (getActorId() == getActiveUser()!!.getUserId()) { - NextcloudTalkApplication.Companion.getSharedApplication().getString(R.string.nc_sent_an_image_you) - } else { - String.format(NextcloudTalkApplication.Companion.getSharedApplication().getResources().getString(R.string.nc_sent_an_image), - if (!TextUtils.isEmpty(getActorDisplayName())) getActorDisplayName() else NextcloudTalkApplication.Companion.getSharedApplication().getString(R.string.nc_guest)) - } - } - } - - return "" - } - - val user: IUser - get() = object : IUser() { - val id: String? - get() = actorId - - val name: String? - get() = actorDisplayName - - val avatar: String? - get() { - if (getActorType() == "users") { - return ApiUtils.getUrlForAvatarWithName(getActiveUser()!!.getBaseUrl(), actorId, R.dimen.avatar_size) - } else if (getActorType() == "guests") { - var apiId = NextcloudTalkApplication.Companion.getSharedApplication().getString(R.string.nc_guest) - - if (!TextUtils.isEmpty(getActorDisplayName())) { - apiId = getActorDisplayName() - } - return ApiUtils.getUrlForAvatarWithNameForGuests(getActiveUser()!!.getBaseUrl(), apiId, R.dimen.avatar_size) - } else { - return null - } - } - } - - val createdAt: Date - get() = Date(timestamp * 1000L) - - val systemMessage: String - get() = EnumSystemMessageTypeConverter().convertToString(getSystemMessageType()) - - private fun hasFileAttachment(): Boolean { - if (messageParameters != null && messageParameters!!.size > 0) { - for (key in messageParameters!!.keys) { - val individualHashMap = messageParameters!![key] - if (individualHashMap!!["type"] == "file") { - return true - } - } - } - - return false - } - - enum class MessageType { - REGULAR_TEXT_MESSAGE, - SYSTEM_MESSAGE, - SINGLE_LINK_GIPHY_MESSAGE, - SINGLE_LINK_TENOR_MESSAGE, - SINGLE_LINK_GIF_MESSAGE, - SINGLE_LINK_MESSAGE, - SINGLE_LINK_VIDEO_MESSAGE, - SINGLE_LINK_IMAGE_MESSAGE, - SINGLE_LINK_AUDIO_MESSAGE, - SINGLE_NC_ATTACHMENT_MESSAGE - } - - enum class SystemMessageType { - DUMMY, - CONVERSATION_CREATED, - CONVERSATION_RENAMED, - CALL_STARTED, - CALL_JOINED, - CALL_LEFT, - CALL_ENDED, - GUESTS_ALLOWED, - GUESTS_DISALLOWED, - PASSWORD_SET, - PASSWORD_REMOVED, - USER_ADDED, - USER_REMOVED, - MODERATOR_PROMOTED, - MODERATOR_DEMOTED, - FILE_SHARED, - LOBBY_NONE, - LOBBY_NON_MODERATORS, - LOBBY_OPEN_TO_EVERYONE - } -} diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCS.java b/presentation/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCS.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCS.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCS.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCS.kt b/presentation/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCS.kt deleted file mode 100644 index dd5ccb3a3..000000000 --- a/presentation/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCS.kt +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Nextcloud Talk application - * - * @author Mario Danic - * Copyright (C) 2017-2018 Mario Danic - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.nextcloud.talk.models.json.chat - -import com.bluelinelabs.logansquare.annotation.JsonField -import com.bluelinelabs.logansquare.annotation.JsonObject -import com.nextcloud.data.models.json.generic.GenericOCS - -import org.parceler.Parcel - - -@Parcel -@JsonObject -class ChatOCS : GenericOCS { - @JsonField(name = ["data"]) - var data: List? = null -} diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverall.java b/presentation/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverall.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverall.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverall.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverall.kt b/presentation/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverall.kt deleted file mode 100644 index 756488e37..000000000 --- a/presentation/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverall.kt +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Nextcloud Talk application - * - * @author Mario Danic - * Copyright (C) 2017-2018 Mario Danic - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.nextcloud.talk.models.json.chat - -import com.bluelinelabs.logansquare.annotation.JsonField -import com.bluelinelabs.logansquare.annotation.JsonObject - -import org.parceler.Parcel - - -@Parcel -@JsonObject -class ChatOverall { - @JsonField(name = ["ocs"]) - var ocs: ChatOCS? = null -} diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.java b/presentation/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.java diff --git a/presentation/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.kt b/presentation/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.kt deleted file mode 100644 index 58920de29..000000000 --- a/presentation/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.kt +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Nextcloud Talk application - * - * @author Mario Danic - * Copyright (C) 2017-2018 Mario Danic - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.nextcloud.talk.models.json.chat - -import java.util.* - -object ChatUtils { - - fun getParsedMessage(message: String, messageParameters: HashMap>?): String { - var message = message - if (messageParameters != null && messageParameters.size > 0) { - for (key in messageParameters.keys) { - val individualHashMap = messageParameters[key] - if (individualHashMap!!["type"] == "user" || individualHashMap["type"] == "guest" || individualHashMap["type"] == "call") { - message = message.replace("\\{$key\\}".toRegex(), "@" + messageParameters[key]!!["name"]!!) - } else if (individualHashMap["type"] == "file") { - message = message.replace("\\{$key\\}".toRegex(), messageParameters[key]!!["name"]) - } - } - } - - - return message - } -} diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.java b/presentation/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOCS.java b/presentation/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOCS.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOCS.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOCS.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOverall.java b/presentation/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOverall.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOverall.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOverall.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOCS.java b/presentation/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOCS.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOCS.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOCS.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOverall.java b/presentation/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOverall.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOverall.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOverall.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumLobbyStateConverter.java b/presentation/src/main/java/com/nextcloud/talk/models/json/converters/EnumLobbyStateConverter.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/converters/EnumLobbyStateConverter.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/converters/EnumLobbyStateConverter.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumNotificationLevelConverter.java b/presentation/src/main/java/com/nextcloud/talk/models/json/converters/EnumNotificationLevelConverter.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/converters/EnumNotificationLevelConverter.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/converters/EnumNotificationLevelConverter.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumParticipantTypeConverter.java b/presentation/src/main/java/com/nextcloud/talk/models/json/converters/EnumParticipantTypeConverter.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/converters/EnumParticipantTypeConverter.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/converters/EnumParticipantTypeConverter.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumReadOnlyConversationConverter.java b/presentation/src/main/java/com/nextcloud/talk/models/json/converters/EnumReadOnlyConversationConverter.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/converters/EnumReadOnlyConversationConverter.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/converters/EnumReadOnlyConversationConverter.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumRoomTypeConverter.java b/presentation/src/main/java/com/nextcloud/talk/models/json/converters/EnumRoomTypeConverter.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/converters/EnumRoomTypeConverter.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/converters/EnumRoomTypeConverter.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.kt b/presentation/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.kt similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.kt rename to presentation/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.kt diff --git a/app/src/main/java/com/nextcloud/talk/models/json/converters/LoganSquareJodaTimeConverter.java b/presentation/src/main/java/com/nextcloud/talk/models/json/converters/LoganSquareJodaTimeConverter.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/converters/LoganSquareJodaTimeConverter.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/converters/LoganSquareJodaTimeConverter.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/converters/ObjectParcelConverter.java b/presentation/src/main/java/com/nextcloud/talk/models/json/converters/ObjectParcelConverter.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/converters/ObjectParcelConverter.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/converters/ObjectParcelConverter.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/converters/UriTypeConverter.java b/presentation/src/main/java/com/nextcloud/talk/models/json/converters/UriTypeConverter.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/converters/UriTypeConverter.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/converters/UriTypeConverter.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericMeta.java b/presentation/src/main/java/com/nextcloud/talk/models/json/generic/GenericMeta.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/generic/GenericMeta.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/generic/GenericMeta.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericOCS.java b/presentation/src/main/java/com/nextcloud/talk/models/json/generic/GenericOCS.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/generic/GenericOCS.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/generic/GenericOCS.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericOverall.java b/presentation/src/main/java/com/nextcloud/talk/models/json/generic/GenericOverall.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/generic/GenericOverall.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/generic/GenericOverall.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/generic/Status.java b/presentation/src/main/java/com/nextcloud/talk/models/json/generic/Status.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/generic/Status.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/generic/Status.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/mention/Mention.java b/presentation/src/main/java/com/nextcloud/talk/models/json/mention/Mention.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/mention/Mention.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/mention/Mention.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/mention/MentionOCS.java b/presentation/src/main/java/com/nextcloud/talk/models/json/mention/MentionOCS.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/mention/MentionOCS.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/mention/MentionOCS.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/mention/MentionOverall.java b/presentation/src/main/java/com/nextcloud/talk/models/json/mention/MentionOverall.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/mention/MentionOverall.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/mention/MentionOverall.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/notifications/Notification.java b/presentation/src/main/java/com/nextcloud/talk/models/json/notifications/Notification.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/notifications/Notification.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/notifications/Notification.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationAction.java b/presentation/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationAction.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationAction.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationAction.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOCS.java b/presentation/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOCS.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOCS.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOCS.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationRichObject.java b/presentation/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationRichObject.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationRichObject.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationRichObject.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOCS.java b/presentation/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOCS.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOCS.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOCS.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOverall.java b/presentation/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOverall.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOverall.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOverall.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOCS.java b/presentation/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOCS.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOCS.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOCS.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOverall.java b/presentation/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOverall.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOverall.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOverall.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/participants/Participant.java b/presentation/src/main/java/com/nextcloud/talk/models/json/participants/Participant.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/participants/Participant.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/participants/Participant.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOCS.java b/presentation/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOCS.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOCS.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOCS.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOverall.java b/presentation/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOverall.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOverall.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOverall.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/push/DecryptedPushMessage.java b/presentation/src/main/java/com/nextcloud/talk/models/json/push/DecryptedPushMessage.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/push/DecryptedPushMessage.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/push/DecryptedPushMessage.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/push/PushConfigurationState.java b/presentation/src/main/java/com/nextcloud/talk/models/json/push/PushConfigurationState.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/push/PushConfigurationState.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/push/PushConfigurationState.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistration.java b/presentation/src/main/java/com/nextcloud/talk/models/json/push/PushRegistration.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistration.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/push/PushRegistration.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOCS.java b/presentation/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOCS.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOCS.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOCS.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOverall.java b/presentation/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOverall.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOverall.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOverall.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/sharees/ExactSharees.java b/presentation/src/main/java/com/nextcloud/talk/models/json/sharees/ExactSharees.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/sharees/ExactSharees.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/sharees/ExactSharees.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/sharees/Sharee.java b/presentation/src/main/java/com/nextcloud/talk/models/json/sharees/Sharee.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/sharees/Sharee.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/sharees/Sharee.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOCS.java b/presentation/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOCS.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOCS.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOCS.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOverall.java b/presentation/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOverall.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOverall.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOverall.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/sharees/SharesData.java b/presentation/src/main/java/com/nextcloud/talk/models/json/sharees/SharesData.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/sharees/SharesData.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/sharees/SharesData.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/sharees/Value.java b/presentation/src/main/java/com/nextcloud/talk/models/json/sharees/Value.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/sharees/Value.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/sharees/Value.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessage.java b/presentation/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessage.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessage.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessage.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessageNick.java b/presentation/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessageNick.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessageNick.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessageNick.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCIceCandidate.java b/presentation/src/main/java/com/nextcloud/talk/models/json/signaling/NCIceCandidate.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/signaling/NCIceCandidate.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/signaling/NCIceCandidate.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessagePayload.java b/presentation/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessagePayload.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessagePayload.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessagePayload.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessageWrapper.java b/presentation/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessageWrapper.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessageWrapper.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessageWrapper.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCSignalingMessage.java b/presentation/src/main/java/com/nextcloud/talk/models/json/signaling/NCSignalingMessage.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/signaling/NCSignalingMessage.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/signaling/NCSignalingMessage.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/Signaling.java b/presentation/src/main/java/com/nextcloud/talk/models/json/signaling/Signaling.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/signaling/Signaling.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/signaling/Signaling.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOCS.java b/presentation/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOCS.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOCS.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOCS.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOverall.java b/presentation/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOverall.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOverall.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOverall.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/IceServer.java b/presentation/src/main/java/com/nextcloud/talk/models/json/signaling/settings/IceServer.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/IceServer.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/signaling/settings/IceServer.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/Settings.java b/presentation/src/main/java/com/nextcloud/talk/models/json/signaling/settings/Settings.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/Settings.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/signaling/settings/Settings.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOcs.java b/presentation/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOcs.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOcs.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOcs.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOverall.java b/presentation/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOverall.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOverall.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOverall.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileData.java b/presentation/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileData.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileData.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileData.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOCS.java b/presentation/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOCS.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOCS.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOCS.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOverall.java b/presentation/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOverall.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOverall.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOverall.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ActorWebSocketMessage.java b/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/ActorWebSocketMessage.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/websocket/ActorWebSocketMessage.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/websocket/ActorWebSocketMessage.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/AuthParametersWebSocketMessage.java b/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/AuthParametersWebSocketMessage.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/websocket/AuthParametersWebSocketMessage.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/websocket/AuthParametersWebSocketMessage.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/AuthWebSocketMessage.java b/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/AuthWebSocketMessage.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/websocket/AuthWebSocketMessage.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/websocket/AuthWebSocketMessage.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/BaseWebSocketMessage.java b/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/BaseWebSocketMessage.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/websocket/BaseWebSocketMessage.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/websocket/BaseWebSocketMessage.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ByeWebSocketMessage.java b/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/ByeWebSocketMessage.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/websocket/ByeWebSocketMessage.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/websocket/ByeWebSocketMessage.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallOverallWebSocketMessage.java b/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/CallOverallWebSocketMessage.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/websocket/CallOverallWebSocketMessage.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/websocket/CallOverallWebSocketMessage.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallWebSocketMessage.java b/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/CallWebSocketMessage.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/websocket/CallWebSocketMessage.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/websocket/CallWebSocketMessage.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorOverallWebSocketMessage.java b/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorOverallWebSocketMessage.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorOverallWebSocketMessage.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorOverallWebSocketMessage.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorWebSocketMessage.java b/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorWebSocketMessage.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorWebSocketMessage.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorWebSocketMessage.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/EventOverallWebSocketMessage.java b/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/EventOverallWebSocketMessage.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/websocket/EventOverallWebSocketMessage.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/websocket/EventOverallWebSocketMessage.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloOverallWebSocketMessage.java b/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/HelloOverallWebSocketMessage.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloOverallWebSocketMessage.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/websocket/HelloOverallWebSocketMessage.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseOverallWebSocketMessage.java b/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseOverallWebSocketMessage.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseOverallWebSocketMessage.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseOverallWebSocketMessage.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseWebSocketMessage.java b/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseWebSocketMessage.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseWebSocketMessage.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseWebSocketMessage.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloWebSocketMessage.java b/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/HelloWebSocketMessage.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloWebSocketMessage.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/websocket/HelloWebSocketMessage.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/JoinedRoomOverallWebSocketMessage.java b/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/JoinedRoomOverallWebSocketMessage.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/websocket/JoinedRoomOverallWebSocketMessage.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/websocket/JoinedRoomOverallWebSocketMessage.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/RequestOfferOverallWebSocketMessage.java b/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/RequestOfferOverallWebSocketMessage.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/websocket/RequestOfferOverallWebSocketMessage.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/websocket/RequestOfferOverallWebSocketMessage.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/RequestOfferSignalingMessage.java b/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/RequestOfferSignalingMessage.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/websocket/RequestOfferSignalingMessage.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/websocket/RequestOfferSignalingMessage.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomOverallWebSocketMessage.java b/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/RoomOverallWebSocketMessage.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomOverallWebSocketMessage.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/websocket/RoomOverallWebSocketMessage.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomPropertiesWebSocketMessage.java b/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/RoomPropertiesWebSocketMessage.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomPropertiesWebSocketMessage.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/websocket/RoomPropertiesWebSocketMessage.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomWebSocketMessage.java b/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/RoomWebSocketMessage.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomWebSocketMessage.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/websocket/RoomWebSocketMessage.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ServerHelloResponseFeaturesWebSocketMessage.java b/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/ServerHelloResponseFeaturesWebSocketMessage.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/websocket/ServerHelloResponseFeaturesWebSocketMessage.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/websocket/ServerHelloResponseFeaturesWebSocketMessage.java diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/SignalingDataWebSocketMessageForOffer.java b/presentation/src/main/java/com/nextcloud/talk/models/json/websocket/SignalingDataWebSocketMessageForOffer.java similarity index 100% rename from app/src/main/java/com/nextcloud/talk/models/json/websocket/SignalingDataWebSocketMessageForOffer.java rename to presentation/src/main/java/com/nextcloud/talk/models/json/websocket/SignalingDataWebSocketMessageForOffer.java