From e208d0e161aeeddada0359e3e266b750ebadda88 Mon Sep 17 00:00:00 2001 From: fanap_soft_90 Date: Wed, 26 Aug 2020 16:35:36 +0430 Subject: [PATCH 1/4] data model integration 1 --- .../java/com/example/podchat/ChatTest.java | 18 +- .../application/chatexample/ChatActivity.java | 201 +++++----- .../application/chatexample/ChatContract.java | 168 ++++---- .../chatexample/ChatPresenter.java | 253 ++++++------ .../chatexample/ChatSandBoxActivity.java | 49 ++- .../com/example/podchat/ExampleUnitTest.java | 21 +- gradle.properties | 12 +- .../java/com/fanap/podchat/chat/Chat.java | 362 +++++++++--------- .../com/fanap/podchat/chat/ChatAdapter.java | 21 +- .../com/fanap/podchat/chat/ChatHandler.java | 4 +- .../com/fanap/podchat/chat/ChatListener.java | 24 +- .../podchat/chat/ChatListenerManager.java | 24 +- .../fanap/podchat/chat/mention/Mention.java | 6 +- ...tionList.java => GetMentionedRequest.java} | 8 +- ...a => GetAllUnreadMessageCountRequest.java} | 8 +- .../podchat/chat/messge/MessageManager.java | 2 +- .../chat/pin/pin_message/PinMessage.java | 6 +- ...ssage.java => PinUnpinMessageRequest.java} | 8 +- .../chat/pin/pin_thread/PinThread.java | 13 +- ...Thread.java => PinUnpinThreadRequest.java} | 8 +- ...> IsPublicThreadNameAvailableRequest.java} | 8 +- ...read.java => JoinPublicThreadRequest.java} | 8 +- .../thread/public_thread/PublicThread.java | 4 +- .../RequestCreatePublicThread.java | 6 +- .../chat/user/profile/ChatProfileVO.java | 2 +- ...Profile.java => UpdateProfileRequest.java} | 8 +- ...rofile.java => UpdateProfileResponse.java} | 4 +- .../chat/user/profile/UserProfile.java | 8 +- .../chat/user/user_roles/UserRoles.java | 8 +- ...Contact.java => SearchContactRequest.java} | 10 +- ...ock.java => BlockUnblockUserResponse.java} | 2 +- ...t.java => GetBlockedUserListResponse.java} | 2 +- ...tContact.java => GetContactsResponse.java} | 2 +- ...UserInfo.java => GetUserInfoResponse.java} | 2 +- .../com/fanap/podchat/model/OutPutBlock.java | 6 +- .../fanap/podchat/model/OutPutBlockList.java | 6 +- .../fanap/podchat/model/OutPutContact.java | 6 +- .../fanap/podchat/model/OutPutUserInfo.java | 6 +- .../persistance/MessageDatabaseHelper.java | 30 +- ...AddContact.java => AddContactRequest.java} | 8 +- ...pants.java => AddParticipantsRequest.java} | 16 +- .../{RequestBlock.java => BlockRequest.java} | 8 +- ...rHistory.java => ClearHistoryRequest.java} | 8 +- ...equestConnect.java => ConnectRequest.java} | 8 +- ...teThread.java => CreateThreadRequest.java} | 21 +- ....java => CreateThreadWithFileRequest.java} | 29 +- ...va => CreateThreadWithMessageRequest.java} | 21 +- ...Message.java => DeleteMessageRequest.java} | 8 +- ...itMessage.java => EditMessageRequest.java} | 8 +- ...leMessage.java => FileMessageRequest.java} | 8 +- ...essage.java => ForwardMessageRequest.java} | 8 +- ...in.java => GetAllThreadAdminsRequest.java} | 10 +- ...ckList.java => GetBlockedListRequest.java} | 8 +- ...GetContact.java => GetContactRequest.java} | 8 +- ...s.java => GetCurrentUserRolesRequest.java} | 8 +- ...equestGetFile.java => GetFileRequest.java} | 10 +- ...GetHistory.java => GetHistoryRequest.java} | 8 +- ...uestGetImage.java => GetImageRequest.java} | 8 +- ...> GetMessageDeliveredSeenListRequest.java} | 8 +- ...java => GetThreadParticipantsRequest.java} | 8 +- ...uestThread.java => GetThreadsRequest.java} | 8 +- ...ava => GetUserNotSeenDurationRequest.java} | 6 +- ...aveThread.java => LeaveThreadRequest.java} | 8 +- ...MapReverse.java => MapReverseRequest.java} | 8 +- ...MapRouting.java => MapRoutingRequest.java} | 8 +- ...cImage.java => MapStaticImageRequest.java} | 8 +- ...read.java => MuteUnmuteThreadRequest.java} | 8 +- ...Contact.java => RemoveContactRequest.java} | 8 +- ...ts.java => RemoveParticipantsRequest.java} | 8 +- ...sage.java => ReplyTextMessageRequest.java} | 8 +- .../requestobject/RequestImageMessage.java | 4 +- ...ssage.java => SendDeliverSeenRequest.java} | 8 +- ...e.java => SendLocationMessageRequest.java} | 8 +- ....java => SendReplyFileMessageRequest.java} | 8 +- ...ssage.java => SendTextMessageRequest.java} | 8 +- ...etAdmin.java => SetRemoveRoleRequest.java} | 8 +- ...pam.java => SpamPrivateThreadRequest.java} | 8 +- ...equestUnBlock.java => UnBlockRequest.java} | 8 +- ...ontact.java => UpdateContactsRequest.java} | 8 +- ...Info.java => UpdateThreadInfoRequest.java} | 16 +- ...UploadFile.java => UploadFileRequest.java} | 10 +- ...loadImage.java => UploadImageRequest.java} | 10 +- ...stMapSearch.java => MapSearchRequest.java} | 8 +- 83 files changed, 859 insertions(+), 902 deletions(-) rename podchat/src/main/java/com/fanap/podchat/chat/mention/model/{RequestGetMentionList.java => GetMentionedRequest.java} (90%) rename podchat/src/main/java/com/fanap/podchat/chat/messge/{RequestGetUnreadMessagesCount.java => GetAllUnreadMessageCountRequest.java} (74%) rename podchat/src/main/java/com/fanap/podchat/chat/pin/pin_message/model/{RequestPinMessage.java => PinUnpinMessageRequest.java} (81%) rename podchat/src/main/java/com/fanap/podchat/chat/pin/pin_thread/model/{RequestPinThread.java => PinUnpinThreadRequest.java} (77%) rename podchat/src/main/java/com/fanap/podchat/chat/thread/public_thread/{RequestCheckIsNameAvailable.java => IsPublicThreadNameAvailableRequest.java} (70%) rename podchat/src/main/java/com/fanap/podchat/chat/thread/public_thread/{RequestJoinPublicThread.java => JoinPublicThreadRequest.java} (77%) rename podchat/src/main/java/com/fanap/podchat/chat/user/profile/{RequestUpdateProfile.java => UpdateProfileRequest.java} (81%) rename podchat/src/main/java/com/fanap/podchat/chat/user/profile/{ResultUpdateProfile.java => UpdateProfileResponse.java} (82%) rename podchat/src/main/java/com/fanap/podchat/mainmodel/{RequestSearchContact.java => SearchContactRequest.java} (93%) rename podchat/src/main/java/com/fanap/podchat/model/{ResultBlock.java => BlockUnblockUserResponse.java} (89%) rename podchat/src/main/java/com/fanap/podchat/model/{ResultBlockList.java => GetBlockedUserListResponse.java} (88%) rename podchat/src/main/java/com/fanap/podchat/model/{ResultContact.java => GetContactsResponse.java} (96%) rename podchat/src/main/java/com/fanap/podchat/model/{ResultUserInfo.java => GetUserInfoResponse.java} (87%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestAddContact.java => AddContactRequest.java} (90%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestAddParticipants.java => AddParticipantsRequest.java} (91%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestBlock.java => BlockRequest.java} (89%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestClearHistory.java => ClearHistoryRequest.java} (71%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestConnect.java => ConnectRequest.java} (94%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestCreateThread.java => CreateThreadRequest.java} (82%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestCreateThreadWithFile.java => CreateThreadWithFileRequest.java} (57%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestCreateThreadWithMessage.java => CreateThreadWithMessageRequest.java} (84%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestDeleteMessage.java => DeleteMessageRequest.java} (85%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestEditMessage.java => EditMessageRequest.java} (87%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestFileMessage.java => FileMessageRequest.java} (97%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestForwardMessage.java => ForwardMessageRequest.java} (83%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestGetAdmin.java => GetAllThreadAdminsRequest.java} (85%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestBlockList.java => GetBlockedListRequest.java} (82%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestGetContact.java => GetContactRequest.java} (65%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestGetUserRoles.java => GetCurrentUserRolesRequest.java} (70%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestGetFile.java => GetFileRequest.java} (88%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestGetHistory.java => GetHistoryRequest.java} (96%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestGetImage.java => GetImageRequest.java} (90%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestDeliveredMessageList.java => GetMessageDeliveredSeenListRequest.java} (72%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestThreadParticipant.java => GetThreadParticipantsRequest.java} (86%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestThread.java => GetThreadsRequest.java} (93%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestGetLastSeens.java => GetUserNotSeenDurationRequest.java} (77%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestLeaveThread.java => LeaveThreadRequest.java} (76%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestMapReverse.java => MapReverseRequest.java} (81%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestMapRouting.java => MapRoutingRequest.java} (83%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestMapStaticImage.java => MapStaticImageRequest.java} (76%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestMuteThread.java => MuteUnmuteThreadRequest.java} (74%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestRemoveContact.java => RemoveContactRequest.java} (75%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestRemoveParticipants.java => RemoveParticipantsRequest.java} (83%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestReplyMessage.java => ReplyTextMessageRequest.java} (91%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestSeenMessage.java => SendDeliverSeenRequest.java} (83%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestLocationMessage.java => SendLocationMessageRequest.java} (92%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestReplyFileMessage.java => SendReplyFileMessageRequest.java} (95%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestMessage.java => SendTextMessageRequest.java} (90%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestSetAdmin.java => SetRemoveRoleRequest.java} (81%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestSpam.java => SpamPrivateThreadRequest.java} (75%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestUnBlock.java => UnBlockRequest.java} (90%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestUpdateContact.java => UpdateContactsRequest.java} (90%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestThreadInfo.java => UpdateThreadInfoRequest.java} (85%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestUploadFile.java => UploadFileRequest.java} (89%) rename podchat/src/main/java/com/fanap/podchat/requestobject/{RequestUploadImage.java => UploadImageRequest.java} (87%) rename podchat/src/main/java/com/fanap/podchat/util/{RequestMapSearch.java => MapSearchRequest.java} (87%) diff --git a/app/src/androidTest/java/com/example/podchat/ChatTest.java b/app/src/androidTest/java/com/example/podchat/ChatTest.java index fa2fab9a..3cd04c27 100644 --- a/app/src/androidTest/java/com/example/podchat/ChatTest.java +++ b/app/src/androidTest/java/com/example/podchat/ChatTest.java @@ -17,18 +17,18 @@ import com.fanap.podchat.ProgressHandler; import com.fanap.podchat.chat.Chat; import com.fanap.podchat.chat.ChatAdapter; -import com.fanap.podchat.chat.user.profile.RequestUpdateProfile; +import com.fanap.podchat.chat.user.profile.UpdateProfileRequest; import com.fanap.podchat.example.R; import com.fanap.podchat.mainmodel.Contact; import com.fanap.podchat.mainmodel.History; import com.fanap.podchat.mainmodel.Invitee; -import com.fanap.podchat.mainmodel.RequestSearchContact; +import com.fanap.podchat.mainmodel.SearchContactRequest; import com.fanap.podchat.model.ChatResponse; import com.fanap.podchat.model.ErrorOutPut; import com.fanap.podchat.model.ResultImageFile; import com.fanap.podchat.model.ResultThreads; -import com.fanap.podchat.chat.pin.pin_message.model.RequestPinMessage; -import com.fanap.podchat.requestobject.RequestGetUserRoles; +import com.fanap.podchat.chat.pin.pin_message.model.PinUnpinMessageRequest; +import com.fanap.podchat.requestobject.GetCurrentUserRolesRequest; import com.fanap.podchat.requestobject.RequestSignalMsg; import com.fanap.podchat.util.ChatMessageType; @@ -90,7 +90,7 @@ public void updateUserProfile(){ sleep(10000); - RequestUpdateProfile request = new RequestUpdateProfile + UpdateProfileRequest request = new UpdateProfileRequest .Builder("عیب رندان مکن ای زاهد پاکیزه سرشت") .build(); @@ -188,7 +188,7 @@ public void getCurrentUserRoles() { sleep(25000); - RequestGetUserRoles req = new RequestGetUserRoles.Builder() + GetCurrentUserRolesRequest req = new GetCurrentUserRolesRequest.Builder() .setThreadId(5801) .build(); @@ -235,7 +235,7 @@ public void pinMessage() { sleep(25000); - RequestPinMessage requestPinMessage = new RequestPinMessage.Builder() + PinUnpinMessageRequest requestPinMessage = new PinUnpinMessageRequest.Builder() .setMessageId(76306) .setNotifyAll(true) .build(); @@ -255,7 +255,7 @@ public void unpinMessage() { sleep(25000); - RequestPinMessage requestPinMessage = new RequestPinMessage.Builder() + PinUnpinMessageRequest requestPinMessage = new PinUnpinMessageRequest.Builder() .setMessageId(76306) .build(); @@ -688,7 +688,7 @@ public void unBlock() { public void searchContact() { sleep(3000); - RequestSearchContact requestSearchContact = new RequestSearchContact.Builder("0", "2").id("1063").build(); + SearchContactRequest requestSearchContact = new SearchContactRequest.Builder("0", "2").id("1063").build(); presenter.searchContact(requestSearchContact); sleep(3000); Mockito.verify(view, Mockito.times(1)).onSearchContact(); diff --git a/app/src/main/java/com/example/chat/application/chatexample/ChatActivity.java b/app/src/main/java/com/example/chat/application/chatexample/ChatActivity.java index 506f811e..1330def2 100644 --- a/app/src/main/java/com/example/chat/application/chatexample/ChatActivity.java +++ b/app/src/main/java/com/example/chat/application/chatexample/ChatActivity.java @@ -27,11 +27,8 @@ import android.widget.Toast; import com.bumptech.glide.Glide; -import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.load.model.GlideUrl; import com.bumptech.glide.load.model.LazyHeaders; -import com.bumptech.glide.load.resource.bitmap.CenterCrop; -import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.bumptech.glide.request.RequestOptions; import com.fanap.podchat.ProgressHandler; import com.fanap.podchat.chat.Chat; @@ -43,70 +40,66 @@ import com.fanap.podchat.chat.bot.result_model.CreateBotResult; import com.fanap.podchat.chat.bot.result_model.DefineBotCommandResult; import com.fanap.podchat.chat.file_manager.download_file.model.ResultDownloadFile; -import com.fanap.podchat.chat.mention.model.RequestGetMentionList; +import com.fanap.podchat.chat.mention.model.GetMentionedRequest; import com.fanap.podchat.chat.messge.ResultUnreadMessagesCount; -import com.fanap.podchat.chat.pin.pin_message.model.RequestPinMessage; +import com.fanap.podchat.chat.pin.pin_message.model.PinUnpinMessageRequest; import com.fanap.podchat.chat.pin.pin_message.model.ResultPinMessage; -import com.fanap.podchat.chat.pin.pin_thread.model.RequestPinThread; -import com.fanap.podchat.chat.thread.public_thread.RequestCheckIsNameAvailable; +import com.fanap.podchat.chat.pin.pin_thread.model.PinUnpinThreadRequest; +import com.fanap.podchat.chat.thread.public_thread.IsPublicThreadNameAvailableRequest; import com.fanap.podchat.chat.thread.public_thread.RequestCreatePublicThread; -import com.fanap.podchat.chat.thread.public_thread.RequestJoinPublicThread; +import com.fanap.podchat.chat.thread.public_thread.JoinPublicThreadRequest; import com.fanap.podchat.chat.thread.public_thread.ResultIsNameAvailable; import com.fanap.podchat.chat.thread.public_thread.ResultJoinPublicThread; -import com.fanap.podchat.chat.user.profile.RequestUpdateProfile; +import com.fanap.podchat.chat.user.profile.UpdateProfileRequest; import com.fanap.podchat.chat.user.user_roles.model.ResultCurrentUserRoles; import com.fanap.podchat.example.R; -import com.fanap.podchat.mainmodel.Contact; import com.fanap.podchat.mainmodel.FileUpload; import com.fanap.podchat.mainmodel.Invitee; import com.fanap.podchat.mainmodel.Inviter; import com.fanap.podchat.mainmodel.NosqlListMessageCriteriaVO; import com.fanap.podchat.mainmodel.NosqlSearchMetadataCriteria; -import com.fanap.podchat.mainmodel.RequestSearchContact; +import com.fanap.podchat.mainmodel.SearchContactRequest; import com.fanap.podchat.mainmodel.RequestThreadInnerMessage; import com.fanap.podchat.model.ChatResponse; import com.fanap.podchat.model.ErrorOutPut; import com.fanap.podchat.model.ResultFile; import com.fanap.podchat.model.ResultImageFile; import com.fanap.podchat.model.ResultStaticMapImage; -import com.fanap.podchat.notification.GlideApp; -import com.fanap.podchat.notification.PodGlideModule; import com.fanap.podchat.notification.PodNotificationManager; -import com.fanap.podchat.requestobject.RequestAddContact; -import com.fanap.podchat.requestobject.RequestAddParticipants; -import com.fanap.podchat.requestobject.RequestBlockList; -import com.fanap.podchat.requestobject.RequestClearHistory; -import com.fanap.podchat.requestobject.RequestConnect; -import com.fanap.podchat.requestobject.RequestCreateThread; -import com.fanap.podchat.requestobject.RequestCreateThreadWithFile; -import com.fanap.podchat.requestobject.RequestDeleteMessage; -import com.fanap.podchat.requestobject.RequestDeliveredMessageList; -import com.fanap.podchat.requestobject.RequestFileMessage; -import com.fanap.podchat.requestobject.RequestForwardMessage; -import com.fanap.podchat.requestobject.RequestGetAdmin; -import com.fanap.podchat.requestobject.RequestGetContact; -import com.fanap.podchat.requestobject.RequestGetFile; -import com.fanap.podchat.requestobject.RequestGetHistory; -import com.fanap.podchat.requestobject.RequestGetImage; +import com.fanap.podchat.requestobject.AddContactRequest; +import com.fanap.podchat.requestobject.AddParticipantsRequest; +import com.fanap.podchat.requestobject.GetBlockedListRequest; +import com.fanap.podchat.requestobject.ClearHistoryRequest; +import com.fanap.podchat.requestobject.ConnectRequest; +import com.fanap.podchat.requestobject.CreateThreadRequest; +import com.fanap.podchat.requestobject.CreateThreadWithFileRequest; +import com.fanap.podchat.requestobject.DeleteMessageRequest; +import com.fanap.podchat.requestobject.GetMessageDeliveredSeenListRequest; +import com.fanap.podchat.requestobject.FileMessageRequest; +import com.fanap.podchat.requestobject.ForwardMessageRequest; +import com.fanap.podchat.requestobject.GetAllThreadAdminsRequest; +import com.fanap.podchat.requestobject.GetContactRequest; +import com.fanap.podchat.requestobject.GetFileRequest; +import com.fanap.podchat.requestobject.GetHistoryRequest; +import com.fanap.podchat.requestobject.GetImageRequest; import com.fanap.podchat.requestobject.RequestGetPodSpaceFile; import com.fanap.podchat.requestobject.RequestGetPodSpaceImage; -import com.fanap.podchat.requestobject.RequestGetUserRoles; -import com.fanap.podchat.requestobject.RequestLocationMessage; -import com.fanap.podchat.requestobject.RequestMapReverse; -import com.fanap.podchat.requestobject.RequestMapStaticImage; -import com.fanap.podchat.requestobject.RequestRemoveParticipants; -import com.fanap.podchat.requestobject.RequestReplyFileMessage; -import com.fanap.podchat.requestobject.RequestReplyMessage; +import com.fanap.podchat.requestobject.GetCurrentUserRolesRequest; +import com.fanap.podchat.requestobject.SendLocationMessageRequest; +import com.fanap.podchat.requestobject.MapReverseRequest; +import com.fanap.podchat.requestobject.MapStaticImageRequest; +import com.fanap.podchat.requestobject.RemoveParticipantsRequest; +import com.fanap.podchat.requestobject.SendReplyFileMessageRequest; +import com.fanap.podchat.requestobject.ReplyTextMessageRequest; import com.fanap.podchat.requestobject.RequestRole; -import com.fanap.podchat.requestobject.RequestSeenMessageList; -import com.fanap.podchat.requestobject.RequestSetAdmin; +import com.fanap.podchat.requestobject.SetRemoveRoleRequest; import com.fanap.podchat.requestobject.RequestSetAuditor; -import com.fanap.podchat.requestobject.RequestSpam; -import com.fanap.podchat.requestobject.RequestThread; -import com.fanap.podchat.requestobject.RequestThreadInfo; -import com.fanap.podchat.requestobject.RequestThreadParticipant; -import com.fanap.podchat.requestobject.RequestUploadFile; -import com.fanap.podchat.requestobject.RequestUploadImage; +import com.fanap.podchat.requestobject.SpamPrivateThreadRequest; +import com.fanap.podchat.requestobject.GetThreadsRequest; +import com.fanap.podchat.requestobject.UpdateThreadInfoRequest; +import com.fanap.podchat.requestobject.GetThreadParticipantsRequest; +import com.fanap.podchat.requestobject.UploadFileRequest; +import com.fanap.podchat.requestobject.UploadImageRequest; import com.fanap.podchat.requestobject.RetryUpload; import com.fanap.podchat.util.FilePick; import com.fanap.podchat.util.InviteType; @@ -216,20 +209,20 @@ public class ChatActivity extends AppCompatActivity /** * Main Server Setting: */ -// -// private static String name = BaseApplication.getInstance().getString(R.string.main_server_name); -// private static String socketAddress = BaseApplication.getInstance().getString(R.string.socketAddress); -// private static String platformHost = BaseApplication.getInstance().getString(R.string.platformHost); -// private static String fileServer = BaseApplication.getInstance().getString(R.string.fileServer); + + private static String name = BaseApplication.getInstance().getString(R.string.main_server_name); + private static String socketAddress = BaseApplication.getInstance().getString(R.string.socketAddress); + private static String platformHost = BaseApplication.getInstance().getString(R.string.platformHost); + private static String fileServer = BaseApplication.getInstance().getString(R.string.fileServer); /** * Sandbox setting: */ - private static String name = BaseApplication.getInstance().getString(R.string.sandbox_server_name); - private static String socketAddress = BaseApplication.getInstance().getString(R.string.sandbox_socketAddress); - private static String platformHost = BaseApplication.getInstance().getString(R.string.sandbox_platformHost); - private static String fileServer = BaseApplication.getInstance().getString(R.string.sandbox_fileServer); +// private static String name = BaseApplication.getInstance().getString(R.string.sandbox_server_name); +// private static String socketAddress = BaseApplication.getInstance().getString(R.string.sandbox_socketAddress); +// private static String platformHost = BaseApplication.getInstance().getString(R.string.sandbox_platformHost); +// private static String fileServer = BaseApplication.getInstance().getString(R.string.sandbox_fileServer); //sand box / group @@ -665,8 +658,8 @@ public void onBlock(String uniqueId) { // .title("Test File PodSpace") // .build(); - RequestThreadInfo request = - new RequestThreadInfo.Builder(TEST_THREAD_ID) + UpdateThreadInfoRequest request = + new UpdateThreadInfoRequest.Builder(TEST_THREAD_ID) // .name("Test File PodSpace") // .metadata("{}") // .image() @@ -692,14 +685,14 @@ public void onBlock(String uniqueId) { } case 7: { - RequestSeenMessageList requests = new RequestSeenMessageList + GetMessageDeliveredSeenListRequest requests = new GetMessageDeliveredSeenListRequest .Builder(TEST_THREAD_ID).build(); presenter.seenMessageList(requests); break; } case 8: { - RequestDeliveredMessageList requestD = new RequestDeliveredMessageList + GetMessageDeliveredSeenListRequest requestD = new GetMessageDeliveredSeenListRequest .Builder(50532).build(); presenter.deliveredMessageList(requestD); } @@ -839,8 +832,8 @@ public void onExceptionOccurred(String cause) { private void getBlockList() { - RequestBlockList request = - new RequestBlockList.Builder() + GetBlockedListRequest request = + new GetBlockedListRequest.Builder() .count(50) .offset(0) // .withNoCache() @@ -869,7 +862,7 @@ private void createThreadWithMessage() { invite.add(new Invitee(1151568, InviteType.Constants.TO_BE_USER_CONTACT_ID)); invite.add(new Invitee(1512305, InviteType.Constants.TO_BE_USER_CONTACT_ID)); - RequestUploadImage requestUploadThreadImageImage = new RequestUploadImage + UploadImageRequest requestUploadThreadImageImage = new UploadImageRequest .Builder(ChatActivity.this, getUri()) .setwC(140) .sethC(140) @@ -881,7 +874,7 @@ private void createThreadWithMessage() { // .forwardedMessageIds(listForwardIds) .build(); - RequestCreateThread requestCreateThread = new RequestCreateThread + CreateThreadRequest requestCreateThread = new CreateThreadRequest .Builder(ThreadType.Constants.OWNER_GROUP, invite) .message(message) .setUploadThreadImageRequest(requestUploadThreadImageImage) @@ -951,10 +944,10 @@ private void downloadFile() { String fileHashCode = "17077360d4b-0.2366487166443898"; - RequestGetImage requestGetImage = new RequestGetImage.Builder(imageId, imageHashCode, true) + GetImageRequest requestGetImage = new GetImageRequest.Builder(imageId, imageHashCode, true) .build(); - RequestGetFile requestGetFile = new RequestGetFile.Builder(fileId, fileHashCode, true).build(); + GetFileRequest requestGetFile = new GetFileRequest.Builder(fileId, fileHashCode, true).build(); RequestGetPodSpaceFile rePod = new RequestGetPodSpaceFile.Builder("RD2VZRMJ6DXIJQ5W") @@ -1093,7 +1086,7 @@ public void onFileReady(ChatResponse response) { private void getUserRoles() { - RequestGetUserRoles req = new RequestGetUserRoles.Builder() + GetCurrentUserRolesRequest req = new GetCurrentUserRolesRequest.Builder() .setThreadId(TEST_THREAD_ID) .build(); @@ -1112,20 +1105,20 @@ private void createThreadWithFile() { } - RequestUploadImage requestUploadThreadImageImage = new RequestUploadImage + UploadImageRequest requestUploadThreadImageImage = new UploadImageRequest .Builder(this, getUri()) .setwC(140) .sethC(140) .build(); - RequestUploadImage requestUploadImage = new RequestUploadImage.Builder(this, getUri()) + UploadImageRequest requestUploadImage = new UploadImageRequest.Builder(this, getUri()) .setwC(120) .sethC(120) .setxC(1) .setyC(1) .build(); - RequestUploadFile requestUploadFile = new RequestUploadFile.Builder( + UploadFileRequest requestUploadFile = new UploadFileRequest.Builder( this, getUri()).build(); @@ -1150,7 +1143,7 @@ private void createThreadWithFile() { // .build(); - RequestCreateThreadWithFile request = new RequestCreateThreadWithFile + CreateThreadWithFileRequest request = new CreateThreadWithFileRequest .Builder(ThreadType.Constants.OWNER_GROUP, invite, requestUploadFile, @@ -1306,7 +1299,7 @@ private void setAdminRules() { // requestRoles.add(requestRole2); - RequestSetAdmin requestAddAdmin = new RequestSetAdmin + SetRemoveRoleRequest requestAddAdmin = new SetRemoveRoleRequest .Builder(TEST_THREAD_ID, requestRoles) .build(); @@ -1337,7 +1330,7 @@ private void removeAdminRules() { requestRoles.add(requestRole); // requestRoles.add(requestRole2); - RequestSetAdmin requestAddAdmin = new RequestSetAdmin + SetRemoveRoleRequest requestAddAdmin = new SetRemoveRoleRequest .Builder(TEST_THREAD_ID, requestRoles) .build(); @@ -1354,7 +1347,7 @@ private void sendLocationMsg() { String meta = getMetaData(); - RequestLocationMessage requestLocationMessage = new RequestLocationMessage + SendLocationMessageRequest requestLocationMessage = new SendLocationMessageRequest .Builder() .systemMetadata(meta) .center(center) @@ -1432,7 +1425,7 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis String center = "35.7003510,51.3376472"; - RequestLocationMessage requestLocationMessage = new RequestLocationMessage + SendLocationMessageRequest requestLocationMessage = new SendLocationMessageRequest .Builder() .center(center) .message("This is location ") @@ -1452,14 +1445,14 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis public void mapReverse() { double lat = 35.7003510; double lng = 51.3376472; - RequestMapReverse requestMapReverse = new RequestMapReverse.Builder(lat, lng).build(); + MapReverseRequest requestMapReverse = new MapReverseRequest.Builder(lat, lng).build(); presenter.mapReverse(requestMapReverse); } public void mapStatic() { String center = "35.7003510,51.3376472"; - RequestMapStaticImage staticImage = new RequestMapStaticImage.Builder() + MapStaticImageRequest staticImage = new MapStaticImageRequest.Builder() .center(center) .build(); @@ -1486,7 +1479,7 @@ public void onItemSelected(AdapterView parent, View view, int position, long break; case 2: - RequestFileMessage request = new RequestFileMessage.Builder( + FileMessageRequest request = new FileMessageRequest.Builder( ChatActivity.this, TEST_THREAD_ID, getUri(), @@ -1598,7 +1591,7 @@ public void onLeaveThread(String uniqueId) { break; case 9: - RequestSearchContact requestSearchContact = new RequestSearchContact + SearchContactRequest requestSearchContact = new SearchContactRequest .Builder("0", "20") // .id("2247") // .cellphoneNumber("0938") @@ -1653,7 +1646,7 @@ public void onFinishImage(String json, ChatResponse chatRespons break; case 14: { //clear history - RequestClearHistory requestClearHistory = new RequestClearHistory + ClearHistoryRequest requestClearHistory = new ClearHistoryRequest .Builder(TEST_THREAD_ID) .build(); presenter.clearHistory(requestClearHistory); @@ -1749,7 +1742,7 @@ private void createBot() { private void updateUserProfile() { - RequestUpdateProfile request = new RequestUpdateProfile + UpdateProfileRequest request = new UpdateProfileRequest .Builder("عِیب رِندان مَکُن ای زاهِدِ پاکیزه‌سِرِشت") .setMetadata(getMetaData()) .build(); @@ -1768,7 +1761,7 @@ private void seenMessage() { private void spamThread() { - RequestSpam requestSpam = new RequestSpam.Builder() + SpamPrivateThreadRequest requestSpam = new SpamPrivateThreadRequest.Builder() .threadId(TEST_THREAD_ID) .build(); @@ -1781,7 +1774,7 @@ private void getAdminList() { //2116 //2115 //2107 - RequestGetAdmin requestGetAdmin = new RequestGetAdmin + GetAllThreadAdminsRequest requestGetAdmin = new GetAllThreadAdminsRequest // .Builder(10654,true) .Builder(TEST_THREAD_ID) // .admin(true) @@ -1803,7 +1796,7 @@ public void deleteMessage() { // msgIds.add(47564L); - RequestDeleteMessage requestDeleteMessage = new RequestDeleteMessage + DeleteMessageRequest requestDeleteMessage = new DeleteMessageRequest .Builder() .messageIds(msgIds) .deleteForAll(true) @@ -1829,7 +1822,7 @@ private void removeParticipants() { participantIds.add(5581L); participantIds.add(1261L); long threadId = TEST_THREAD_ID; - RequestRemoveParticipants request = new RequestRemoveParticipants + RemoveParticipantsRequest request = new RemoveParticipantsRequest .Builder(threadId, participantIds) .build(); presenter.removeParticipants(request, null); @@ -1887,7 +1880,7 @@ private void addParticipants() { //add with coreUserIds - RequestAddParticipants request = RequestAddParticipants + AddParticipantsRequest request = AddParticipantsRequest .newBuilder() .threadId((long) TEST_THREAD_ID) // .withCoreUserIds(982L, 5241L) @@ -2124,7 +2117,7 @@ public void onUnMuteThread(String uniqueId) { // // // } - RequestAddContact request = new RequestAddContact.Builder() + AddContactRequest request = new AddContactRequest.Builder() .firstName("مسعود") .lastName("امجدی") .username("ma.amjadi") @@ -2158,7 +2151,7 @@ public void onUnMuteThread(String uniqueId) { * Pin ConversationVO */ - RequestPinThread requestPinThread = new RequestPinThread.Builder(TEST_THREAD_ID) + PinUnpinThreadRequest requestPinThread = new PinUnpinThreadRequest.Builder(TEST_THREAD_ID) .build(); presenter.pinThread(requestPinThread); @@ -2171,7 +2164,7 @@ public void onUnMuteThread(String uniqueId) { * UnPin ConversationVO */ - RequestPinThread requestPinThread = new RequestPinThread.Builder(TEST_THREAD_ID) + PinUnpinThreadRequest requestPinThread = new PinUnpinThreadRequest.Builder(TEST_THREAD_ID) .build(); presenter.unPinThread(requestPinThread); @@ -2184,7 +2177,7 @@ public void onUnMuteThread(String uniqueId) { case 20: { - RequestPinMessage requestPinMessage = new RequestPinMessage.Builder() + PinUnpinMessageRequest requestPinMessage = new PinUnpinMessageRequest.Builder() .setMessageId(TEST_THREAD_ID) .setNotifyAll(true) .build(); @@ -2197,7 +2190,7 @@ public void onUnMuteThread(String uniqueId) { case 21: { - RequestPinMessage requestPinMessage = new RequestPinMessage.Builder() + PinUnpinMessageRequest requestPinMessage = new PinUnpinMessageRequest.Builder() .setMessageId(TEST_THREAD_ID) .build(); @@ -2210,7 +2203,7 @@ public void onUnMuteThread(String uniqueId) { case 22: { - RequestGetMentionList req = new RequestGetMentionList + GetMentionedRequest req = new GetMentionedRequest .Builder(TEST_THREAD_ID) // .setAllMentioned(true) // .setUnreadMentioned(true) @@ -2276,8 +2269,8 @@ public void onUnMuteThread(String uniqueId) { private void getThreadParticipants() { - RequestThreadParticipant request = - new RequestThreadParticipant.Builder() + GetThreadParticipantsRequest request = + new GetThreadParticipantsRequest.Builder() .count(20) .offset(0) .threadId(TEST_THREAD_ID) @@ -2302,7 +2295,7 @@ private void getThreadParticipants() { private void joinPublicThread() { - RequestJoinPublicThread request = new RequestJoinPublicThread + JoinPublicThreadRequest request = new JoinPublicThreadRequest .Builder(THREAD_UNIQUE_NAME) .build(); @@ -2342,8 +2335,8 @@ private void createPublicThread() { private void checkIsNameAvailable() { - RequestCheckIsNameAvailable request = - new RequestCheckIsNameAvailable.Builder(THREAD_UNIQUE_NAME) + IsPublicThreadNameAvailableRequest request = + new IsPublicThreadNameAvailableRequest.Builder(THREAD_UNIQUE_NAME) .build(); presenter.checkIsNameAvailable(request); @@ -2474,7 +2467,7 @@ private void createThread() { // .build(); - RequestCreateThread requestCreateThread = new RequestCreateThread + CreateThreadRequest requestCreateThread = new CreateThreadRequest .Builder(ThreadType.Constants.NORMAL, invite) .title("A New Thread " + (new Date().getTime() / 1000)) .withDescription("Description created at " @@ -2502,7 +2495,7 @@ private void updateContact() { public void getThreadHistory() { - RequestGetHistory request = new RequestGetHistory + GetHistoryRequest request = new GetHistoryRequest .Builder(TEST_THREAD_ID) .count(25) .build(); @@ -2619,7 +2612,7 @@ public void getThreads() { // threadIds.add(TEST_THREAD_ID); // threadIds.add(1573); // threadIds.add(351); - RequestThread requestThread = new RequestThread + GetThreadsRequest requestThread = new GetThreadsRequest .Builder() // .newMessages() // .partnerCoreContactId(566) @@ -2636,7 +2629,7 @@ public void getThreads() { } public void replyMessage() { - RequestReplyMessage message = new RequestReplyMessage + ReplyTextMessageRequest message = new ReplyTextMessageRequest .Builder("this is reply from john", TEST_THREAD_ID, 94305, TextMessageType.Constants.TEXT) .build(); @@ -2660,7 +2653,7 @@ public void ForwardMessage() { long threadId = TEST_THREAD_ID; // presenter.forwardMessage(threadId, messageIds); - RequestForwardMessage forwardMessage = new RequestForwardMessage + ForwardMessageRequest forwardMessage = new ForwardMessageRequest .Builder(threadId, messageIds) .build(); @@ -2673,7 +2666,7 @@ public void ForwardMessage() { private void getContacts() { - RequestGetContact request = new RequestGetContact.Builder() + GetContactRequest request = new GetContactRequest.Builder() .count(50) .offset(offset) // .withNoCache() @@ -2698,7 +2691,7 @@ public void onClick(View v) { if (v == buttonConnect) { - RequestConnect rc = new RequestConnect.Builder( + ConnectRequest rc = new ConnectRequest.Builder( socketAddress, APP_ID, serverName, @@ -2776,7 +2769,7 @@ public String getFileUri() { } public void getThreadWithCoreUser() { - RequestThread requestThread = new RequestThread.Builder() + GetThreadsRequest requestThread = new GetThreadsRequest.Builder() .partnerCoreContactId(566) // .threadIds() // .threadName() @@ -2861,7 +2854,7 @@ private void replyFileMessage() { Inviter inviter = new Inviter(); inviter.setName("Me"); String meta = gson.toJson(inviter); - RequestReplyFileMessage fileMessage = new RequestReplyFileMessage + SendReplyFileMessageRequest fileMessage = new SendReplyFileMessageRequest .Builder(messageContent, threadId, messageId, fileUri, this, TextMessageType.Constants.POD_SPACE_PICTURE) .systemMetaData(meta) @@ -3009,7 +3002,7 @@ public void onGetUnreadsMessagesCount(ChatResponse re public void onGetToken(String token) { - RequestConnect rc = new RequestConnect.Builder( + ConnectRequest rc = new ConnectRequest.Builder( socketAddress, APP_ID, serverName, diff --git a/app/src/main/java/com/example/chat/application/chatexample/ChatContract.java b/app/src/main/java/com/example/chat/application/chatexample/ChatContract.java index 4f081f86..4571a89c 100644 --- a/app/src/main/java/com/example/chat/application/chatexample/ChatContract.java +++ b/app/src/main/java/com/example/chat/application/chatexample/ChatContract.java @@ -3,7 +3,6 @@ import android.app.Activity; import android.content.Context; import android.net.Uri; -import android.util.Log; import com.fanap.podchat.ProgressHandler; import com.fanap.podchat.chat.Chat; @@ -13,62 +12,61 @@ import com.fanap.podchat.chat.bot.request_model.StartAndStopBotRequest; import com.fanap.podchat.chat.bot.result_model.CreateBotResult; import com.fanap.podchat.chat.bot.result_model.DefineBotCommandResult; -import com.fanap.podchat.chat.mention.model.RequestGetMentionList; +import com.fanap.podchat.chat.mention.model.GetMentionedRequest; import com.fanap.podchat.chat.messge.ResultUnreadMessagesCount; -import com.fanap.podchat.chat.thread.public_thread.RequestCheckIsNameAvailable; +import com.fanap.podchat.chat.thread.public_thread.IsPublicThreadNameAvailableRequest; import com.fanap.podchat.chat.thread.public_thread.RequestCreatePublicThread; -import com.fanap.podchat.chat.thread.public_thread.RequestJoinPublicThread; +import com.fanap.podchat.chat.thread.public_thread.JoinPublicThreadRequest; import com.fanap.podchat.chat.thread.public_thread.ResultIsNameAvailable; import com.fanap.podchat.chat.thread.public_thread.ResultJoinPublicThread; -import com.fanap.podchat.chat.user.profile.RequestUpdateProfile; +import com.fanap.podchat.chat.user.profile.UpdateProfileRequest; import com.fanap.podchat.chat.user.user_roles.model.ResultCurrentUserRoles; import com.fanap.podchat.mainmodel.History; import com.fanap.podchat.mainmodel.Invitee; import com.fanap.podchat.mainmodel.NosqlListMessageCriteriaVO; -import com.fanap.podchat.mainmodel.RequestSearchContact; +import com.fanap.podchat.mainmodel.SearchContactRequest; import com.fanap.podchat.mainmodel.ThreadInfoVO; import com.fanap.podchat.model.ChatResponse; import com.fanap.podchat.chat.pin.pin_message.model.ResultPinMessage; import com.fanap.podchat.model.ResultStaticMapImage; import com.fanap.podchat.model.ResultThreads; -import com.fanap.podchat.requestobject.RequestAddContact; -import com.fanap.podchat.requestobject.RequestBlockList; -import com.fanap.podchat.requestobject.RequestCreateThreadWithFile; -import com.fanap.podchat.requestobject.RequestGetContact; -import com.fanap.podchat.requestobject.RequestGetFile; -import com.fanap.podchat.requestobject.RequestGetImage; +import com.fanap.podchat.requestobject.AddContactRequest; +import com.fanap.podchat.requestobject.GetBlockedListRequest; +import com.fanap.podchat.requestobject.CreateThreadWithFileRequest; +import com.fanap.podchat.requestobject.GetContactRequest; +import com.fanap.podchat.requestobject.GetFileRequest; +import com.fanap.podchat.requestobject.GetImageRequest; import com.fanap.podchat.requestobject.RequestGetPodSpaceFile; import com.fanap.podchat.requestobject.RequestGetPodSpaceImage; -import com.fanap.podchat.requestobject.RequestGetUserRoles; -import com.fanap.podchat.chat.pin.pin_message.model.RequestPinMessage; -import com.fanap.podchat.requestobject.RequestSetAdmin; -import com.fanap.podchat.requestobject.RequestAddParticipants; -import com.fanap.podchat.requestobject.RequestClearHistory; -import com.fanap.podchat.requestobject.RequestConnect; -import com.fanap.podchat.requestobject.RequestCreateThread; -import com.fanap.podchat.requestobject.RequestDeleteMessage; -import com.fanap.podchat.requestobject.RequestDeliveredMessageList; -import com.fanap.podchat.requestobject.RequestFileMessage; -import com.fanap.podchat.requestobject.RequestForwardMessage; -import com.fanap.podchat.requestobject.RequestGetAdmin; -import com.fanap.podchat.requestobject.RequestGetHistory; -import com.fanap.podchat.requestobject.RequestLocationMessage; -import com.fanap.podchat.requestobject.RequestMapReverse; -import com.fanap.podchat.requestobject.RequestMapStaticImage; -import com.fanap.podchat.requestobject.RequestMessage; -import com.fanap.podchat.chat.pin.pin_thread.model.RequestPinThread; -import com.fanap.podchat.requestobject.RequestRemoveParticipants; -import com.fanap.podchat.requestobject.RequestReplyFileMessage; -import com.fanap.podchat.requestobject.RequestReplyMessage; -import com.fanap.podchat.requestobject.RequestSeenMessageList; +import com.fanap.podchat.requestobject.GetCurrentUserRolesRequest; +import com.fanap.podchat.chat.pin.pin_message.model.PinUnpinMessageRequest; +import com.fanap.podchat.requestobject.SetRemoveRoleRequest; +import com.fanap.podchat.requestobject.AddParticipantsRequest; +import com.fanap.podchat.requestobject.ClearHistoryRequest; +import com.fanap.podchat.requestobject.ConnectRequest; +import com.fanap.podchat.requestobject.CreateThreadRequest; +import com.fanap.podchat.requestobject.DeleteMessageRequest; +import com.fanap.podchat.requestobject.GetMessageDeliveredSeenListRequest; +import com.fanap.podchat.requestobject.FileMessageRequest; +import com.fanap.podchat.requestobject.ForwardMessageRequest; +import com.fanap.podchat.requestobject.GetAllThreadAdminsRequest; +import com.fanap.podchat.requestobject.GetHistoryRequest; +import com.fanap.podchat.requestobject.SendLocationMessageRequest; +import com.fanap.podchat.requestobject.MapReverseRequest; +import com.fanap.podchat.requestobject.MapStaticImageRequest; +import com.fanap.podchat.requestobject.SendTextMessageRequest; +import com.fanap.podchat.chat.pin.pin_thread.model.PinUnpinThreadRequest; +import com.fanap.podchat.requestobject.RemoveParticipantsRequest; +import com.fanap.podchat.requestobject.SendReplyFileMessageRequest; +import com.fanap.podchat.requestobject.ReplyTextMessageRequest; import com.fanap.podchat.requestobject.RequestSetAuditor; import com.fanap.podchat.requestobject.RequestSignalMsg; -import com.fanap.podchat.requestobject.RequestSpam; -import com.fanap.podchat.requestobject.RequestThread; -import com.fanap.podchat.requestobject.RequestThreadInfo; -import com.fanap.podchat.requestobject.RequestThreadParticipant; -import com.fanap.podchat.requestobject.RequestUnBlock; -import com.fanap.podchat.requestobject.RequestUpdateContact; +import com.fanap.podchat.requestobject.SpamPrivateThreadRequest; +import com.fanap.podchat.requestobject.GetThreadsRequest; +import com.fanap.podchat.requestobject.UpdateThreadInfoRequest; +import com.fanap.podchat.requestobject.GetThreadParticipantsRequest; +import com.fanap.podchat.requestobject.UnBlockRequest; +import com.fanap.podchat.requestobject.UpdateContactsRequest; import com.fanap.podchat.requestobject.RetryUpload; import java.util.ArrayList; @@ -223,9 +221,9 @@ interface presenter { void enableAutoRefresh(Activity activity,String entry); - void sendLocationMessage(RequestLocationMessage request); + void sendLocationMessage(SendLocationMessageRequest request); - void sendLocationMessage(RequestLocationMessage requestLocationMessage, ProgressHandler.sendFileMessage sendFileMessage); + void sendLocationMessage(SendLocationMessageRequest requestLocationMessage, ProgressHandler.sendFileMessage sendFileMessage); void isDatabaseOpen(); @@ -240,17 +238,17 @@ interface presenter { void cancelUpload(String uniqueId); - void seenMessageList(RequestSeenMessageList requestParam); + void seenMessageList(GetMessageDeliveredSeenListRequest requestParam); - void deliveredMessageList(RequestDeliveredMessageList requestParams); + void deliveredMessageList(GetMessageDeliveredSeenListRequest requestParams); - void createThreadWithMessage(RequestCreateThread threadRequest); + void createThreadWithMessage(CreateThreadRequest threadRequest); String createThread(int threadType, Invitee[] invitee, String threadTitle, String description, String image , String metadata); - void getThreads(RequestThread requestThread, ChatHandler handler); + void getThreads(GetThreadsRequest requestThread, ChatHandler handler); void getThreads(Integer count, Long offset, ArrayList threadIds, String threadName, @@ -263,21 +261,21 @@ void getThreads(Integer count, Long offset, ArrayList threadIds, String void connect(String serverAddress, String appId, String severName, String token, String ssoHost , String platformHost, String fileServer, String typeCode); - void connect(RequestConnect requestConnect); + void connect(ConnectRequest requestConnect); void mapSearch(String searchTerm, Double latitude, Double longitude); void mapRouting(String origin, String destination); - void mapStaticImage(RequestMapStaticImage request); + void mapStaticImage(MapStaticImageRequest request); - void mapReverse(RequestMapReverse request); + void mapReverse(MapReverseRequest request); void getUserInfo(ChatHandler handler); void getHistory(History history, long threadId, ChatHandler handler); - void getHistory(RequestGetHistory request, ChatHandler handler); + void getHistory(GetHistoryRequest request, ChatHandler handler); void searchHistory(NosqlListMessageCriteriaVO messageCriteriaVO, ChatHandler handler); @@ -288,13 +286,13 @@ void createThread(int threadType, Invitee[] invitee, String threadTitle, String void sendTextMessage(String textMessage, long threadId, Integer messageType, String metaData, ChatHandler handler); - void sendTextMessage(RequestMessage requestMessage, ChatHandler handler); + void sendTextMessage(SendTextMessageRequest requestMessage, ChatHandler handler); void replyMessage(String messageContent, long threadId, long messageId, Integer messageType, ChatHandler handler); - void replyFileMessage(RequestReplyFileMessage request, ProgressHandler.sendFileMessage handler); + void replyFileMessage(SendReplyFileMessageRequest request, ProgressHandler.sendFileMessage handler); - void replyMessage(RequestReplyMessage request, ChatHandler handler); + void replyMessage(ReplyTextMessageRequest request, ChatHandler handler); void muteThread(int threadId, ChatHandler handler); @@ -310,33 +308,33 @@ void createThread(int threadType, Invitee[] invitee, String threadTitle, String void removeContact(long id); - void searchContact(RequestSearchContact requestSearchContact); + void searchContact(SearchContactRequest requestSearchContact); void block(Long contactId, Long userId, Long threadId, ChatHandler handler); void unBlock(Long blockId, Long userId, Long threadId, Long contactId, ChatHandler handler); - void unBlock(RequestUnBlock request, ChatHandler handler); + void unBlock(UnBlockRequest request, ChatHandler handler); void spam(long threadId); - String spam(RequestSpam requestSpam); + String spam(SpamPrivateThreadRequest requestSpam); void getBlockList(Long count, Long offset, ChatHandler handler); String sendFileMessage(Context context, Activity activity, String description, long threadId, Uri fileUri, String metaData, Integer messageType, ProgressHandler.sendFileMessage handler); - String sendFileMessage(RequestFileMessage requestFileMessage, ProgressHandler.sendFileMessage handler); + String sendFileMessage(FileMessageRequest requestFileMessage, ProgressHandler.sendFileMessage handler); void syncContact(Activity activity); void forwardMessage(long threadId, ArrayList messageIds); - void forwardMessage(RequestForwardMessage request); + void forwardMessage(ForwardMessageRequest request); void updateContact(int id, String firstName, String lastName, String cellphoneNumber, String email); - void updateContact(RequestUpdateContact updateContact); + void updateContact(UpdateContactsRequest updateContact); void uploadImage(Activity activity, Uri fileUri); @@ -348,33 +346,33 @@ void createThread(int threadType, Invitee[] invitee, String threadTitle, String void removeParticipants(long threadId, List participantIds, ChatHandler handler); - void removeParticipants(RequestRemoveParticipants requestRemoveParticipants, ChatHandler handler); + void removeParticipants(RemoveParticipantsRequest requestRemoveParticipants, ChatHandler handler); void addParticipants(long threadId, List contactIds, ChatHandler handler); - void addParticipants(RequestAddParticipants requestAddParticipants, ChatHandler handler); + void addParticipants(AddParticipantsRequest requestAddParticipants, ChatHandler handler); void leaveThread(long threadId, ChatHandler handler); void updateThreadInfo(long threadId, ThreadInfoVO threadInfoVO, ChatHandler handler); - void updateThreadInfo(RequestThreadInfo request, ChatHandler handler); + void updateThreadInfo(UpdateThreadInfoRequest request, ChatHandler handler); void deleteMessage(ArrayList messageIds,long threadId, Boolean deleteForAll, ChatHandler handler); - void deleteMessage(RequestDeleteMessage deleteMessage, ChatHandler handler); + void deleteMessage(DeleteMessageRequest deleteMessage, ChatHandler handler); void uploadImageProgress(Context context, Activity activity, Uri fileUri, ProgressHandler.onProgress handler); void uploadFileProgress(Context context, Activity activity, Uri fileUri, ProgressHandler.onProgressFile handler); - void setAdmin(RequestSetAdmin requestAddAdmin); + void setAdmin(SetRemoveRoleRequest requestAddAdmin); - void removeAdminRules(RequestSetAdmin requestAddAdmin); + void removeAdminRules(SetRemoveRoleRequest requestAddAdmin); - void clearHistory(RequestClearHistory requestClearHistory); + void clearHistory(ClearHistoryRequest requestClearHistory); - void getAdminList(RequestGetAdmin requestGetAdmin); + void getAdminList(GetAllThreadAdminsRequest requestGetAdmin); // String startSignalMessage(RequestSignalMsg requestSignalMsg); @@ -388,29 +386,29 @@ void createThread(int threadType, Invitee[] invitee, String threadTitle, String void stopAllSignalMessages(); - void pinThread(RequestPinThread requestPinThread); + void pinThread(PinUnpinThreadRequest requestPinThread); - void unPinThread(RequestPinThread requestPinThread); + void unPinThread(PinUnpinThreadRequest requestPinThread); void setAuditor(RequestSetAuditor requestAddAdmin); void removeAuditor(RequestSetAuditor requestAddAdmin); - void createThreadWithFile(RequestCreateThreadWithFile request,ProgressHandler.sendFileMessage handler); + void createThreadWithFile(CreateThreadWithFileRequest request, ProgressHandler.sendFileMessage handler); - void getUserRoles(RequestGetUserRoles req); + void getUserRoles(GetCurrentUserRolesRequest req); - void pinMessage(RequestPinMessage requestPinMessage); + void pinMessage(PinUnpinMessageRequest requestPinMessage); - void unPinMessage(RequestPinMessage requestPinMessage); + void unPinMessage(PinUnpinMessageRequest requestPinMessage); - void getMentionList(RequestGetMentionList req); + void getMentionList(GetMentionedRequest req); void startTyping(RequestSignalMsg req); - String downloadFile(RequestGetImage requestGetImage, ProgressHandler.IDownloadFile onProgressFile); + String downloadFile(GetImageRequest requestGetImage, ProgressHandler.IDownloadFile onProgressFile); - String downloadFile(RequestGetFile requestGetFile, ProgressHandler.IDownloadFile onProgressFile); + String downloadFile(GetFileRequest requestGetFile, ProgressHandler.IDownloadFile onProgressFile); boolean cancelDownload(String downloadingId); @@ -430,21 +428,21 @@ void createThread(int threadType, Invitee[] invitee, String threadTitle, String void closeChat(); - void addContact(RequestAddContact request); + void addContact(AddContactRequest request); - void updateChatProfile(RequestUpdateProfile request); + void updateChatProfile(UpdateProfileRequest request); - void checkIsNameAvailable(RequestCheckIsNameAvailable request); + void checkIsNameAvailable(IsPublicThreadNameAvailableRequest request); void createPublicThread(RequestCreatePublicThread request); - void joinPublicThread(RequestJoinPublicThread request); + void joinPublicThread(JoinPublicThreadRequest request); - void getContact(RequestGetContact request); + void getContact(GetContactRequest request); - void getBlockList(RequestBlockList request); + void getBlockList(GetBlockedListRequest request); - void getThreadParticipant(RequestThreadParticipant request); + void getThreadParticipant(GetThreadParticipantsRequest request); void shareLogs(); @@ -458,9 +456,9 @@ void createThread(int threadType, Invitee[] invitee, String threadTitle, String String downloadFile(RequestGetPodSpaceImage rePod, ProgressHandler.IDownloadFile iDownloadFile); - String updateThreadInfo(RequestThreadInfo request); + String updateThreadInfo(UpdateThreadInfoRequest request); - String createThread(RequestCreateThread requestCreateThread); + String createThread(CreateThreadRequest requestCreateThread); void deliverNotification(String threadId); diff --git a/app/src/main/java/com/example/chat/application/chatexample/ChatPresenter.java b/app/src/main/java/com/example/chat/application/chatexample/ChatPresenter.java index f87eeb7d..ce74af5b 100644 --- a/app/src/main/java/com/example/chat/application/chatexample/ChatPresenter.java +++ b/app/src/main/java/com/example/chat/application/chatexample/ChatPresenter.java @@ -22,23 +22,23 @@ import com.fanap.podchat.chat.bot.result_model.CreateBotResult; import com.fanap.podchat.chat.bot.result_model.DefineBotCommandResult; import com.fanap.podchat.chat.bot.result_model.StartStopBotResult; -import com.fanap.podchat.chat.mention.model.RequestGetMentionList; -import com.fanap.podchat.chat.messge.RequestGetUnreadMessagesCount; +import com.fanap.podchat.chat.mention.model.GetMentionedRequest; +import com.fanap.podchat.chat.messge.GetAllUnreadMessageCountRequest; import com.fanap.podchat.chat.messge.ResultUnreadMessagesCount; -import com.fanap.podchat.chat.thread.public_thread.RequestCheckIsNameAvailable; +import com.fanap.podchat.chat.thread.public_thread.IsPublicThreadNameAvailableRequest; import com.fanap.podchat.chat.thread.public_thread.RequestCreatePublicThread; -import com.fanap.podchat.chat.thread.public_thread.RequestJoinPublicThread; +import com.fanap.podchat.chat.thread.public_thread.JoinPublicThreadRequest; import com.fanap.podchat.chat.thread.public_thread.ResultIsNameAvailable; import com.fanap.podchat.chat.thread.public_thread.ResultJoinPublicThread; -import com.fanap.podchat.chat.user.profile.RequestUpdateProfile; -import com.fanap.podchat.chat.user.profile.ResultUpdateProfile; +import com.fanap.podchat.chat.user.profile.UpdateProfileRequest; +import com.fanap.podchat.chat.user.profile.UpdateProfileResponse; import com.fanap.podchat.chat.user.user_roles.model.ResultCurrentUserRoles; import com.fanap.podchat.example.R; import com.fanap.podchat.mainmodel.History; import com.fanap.podchat.mainmodel.Invitee; import com.fanap.podchat.mainmodel.NosqlListMessageCriteriaVO; import com.fanap.podchat.mainmodel.ResultDeleteMessage; -import com.fanap.podchat.mainmodel.RequestSearchContact; +import com.fanap.podchat.mainmodel.SearchContactRequest; import com.fanap.podchat.mainmodel.ThreadInfoVO; import com.fanap.podchat.model.ChatResponse; import com.fanap.podchat.model.ErrorOutPut; @@ -48,10 +48,10 @@ import com.fanap.podchat.model.OutputSignalMessage; import com.fanap.podchat.model.ResultAddContact; import com.fanap.podchat.model.ResultAddParticipant; -import com.fanap.podchat.model.ResultBlock; -import com.fanap.podchat.model.ResultBlockList; +import com.fanap.podchat.model.BlockUnblockUserResponse; +import com.fanap.podchat.model.GetBlockedUserListResponse; import com.fanap.podchat.model.ResultClearHistory; -import com.fanap.podchat.model.ResultContact; +import com.fanap.podchat.model.GetContactsResponse; import com.fanap.podchat.model.ResultFile; import com.fanap.podchat.model.ResultHistory; import com.fanap.podchat.model.ResultImageFile; @@ -67,51 +67,50 @@ import com.fanap.podchat.model.ResultThread; import com.fanap.podchat.model.ResultThreads; import com.fanap.podchat.model.ResultUpdateContact; -import com.fanap.podchat.model.ResultUserInfo; +import com.fanap.podchat.model.GetUserInfoResponse; import com.fanap.podchat.networking.retrofithelper.TimeoutConfig; import com.fanap.podchat.notification.CustomNotificationConfig; -import com.fanap.podchat.requestobject.RequestBlockList; -import com.fanap.podchat.requestobject.RequestCreateThreadWithFile; -import com.fanap.podchat.requestobject.RequestGetContact; -import com.fanap.podchat.requestobject.RequestGetFile; -import com.fanap.podchat.requestobject.RequestGetImage; +import com.fanap.podchat.requestobject.GetBlockedListRequest; +import com.fanap.podchat.requestobject.CreateThreadWithFileRequest; +import com.fanap.podchat.requestobject.GetContactRequest; +import com.fanap.podchat.requestobject.GetFileRequest; +import com.fanap.podchat.requestobject.GetImageRequest; import com.fanap.podchat.requestobject.RequestGetPodSpaceFile; import com.fanap.podchat.requestobject.RequestGetPodSpaceImage; -import com.fanap.podchat.requestobject.RequestGetUserRoles; -import com.fanap.podchat.chat.pin.pin_message.model.RequestPinMessage; -import com.fanap.podchat.requestobject.RequestSetAdmin; -import com.fanap.podchat.requestobject.RequestAddContact; -import com.fanap.podchat.requestobject.RequestAddParticipants; -import com.fanap.podchat.requestobject.RequestClearHistory; -import com.fanap.podchat.requestobject.RequestConnect; -import com.fanap.podchat.requestobject.RequestCreateThread; -import com.fanap.podchat.requestobject.RequestDeleteMessage; -import com.fanap.podchat.requestobject.RequestDeliveredMessageList; -import com.fanap.podchat.requestobject.RequestFileMessage; -import com.fanap.podchat.requestobject.RequestForwardMessage; -import com.fanap.podchat.requestobject.RequestGetAdmin; -import com.fanap.podchat.requestobject.RequestGetHistory; -import com.fanap.podchat.requestobject.RequestGetLastSeens; -import com.fanap.podchat.requestobject.RequestLeaveThread; -import com.fanap.podchat.requestobject.RequestLocationMessage; -import com.fanap.podchat.requestobject.RequestMapReverse; -import com.fanap.podchat.requestobject.RequestMapStaticImage; -import com.fanap.podchat.requestobject.RequestMessage; -import com.fanap.podchat.chat.pin.pin_thread.model.RequestPinThread; -import com.fanap.podchat.requestobject.RequestRemoveParticipants; -import com.fanap.podchat.requestobject.RequestReplyFileMessage; -import com.fanap.podchat.requestobject.RequestReplyMessage; -import com.fanap.podchat.requestobject.RequestSeenMessageList; +import com.fanap.podchat.requestobject.GetCurrentUserRolesRequest; +import com.fanap.podchat.chat.pin.pin_message.model.PinUnpinMessageRequest; +import com.fanap.podchat.requestobject.SetRemoveRoleRequest; +import com.fanap.podchat.requestobject.AddContactRequest; +import com.fanap.podchat.requestobject.AddParticipantsRequest; +import com.fanap.podchat.requestobject.ClearHistoryRequest; +import com.fanap.podchat.requestobject.ConnectRequest; +import com.fanap.podchat.requestobject.CreateThreadRequest; +import com.fanap.podchat.requestobject.DeleteMessageRequest; +import com.fanap.podchat.requestobject.GetMessageDeliveredSeenListRequest; +import com.fanap.podchat.requestobject.FileMessageRequest; +import com.fanap.podchat.requestobject.ForwardMessageRequest; +import com.fanap.podchat.requestobject.GetAllThreadAdminsRequest; +import com.fanap.podchat.requestobject.GetHistoryRequest; +import com.fanap.podchat.requestobject.GetUserNotSeenDurationRequest; +import com.fanap.podchat.requestobject.LeaveThreadRequest; +import com.fanap.podchat.requestobject.SendLocationMessageRequest; +import com.fanap.podchat.requestobject.MapReverseRequest; +import com.fanap.podchat.requestobject.MapStaticImageRequest; +import com.fanap.podchat.requestobject.SendTextMessageRequest; +import com.fanap.podchat.chat.pin.pin_thread.model.PinUnpinThreadRequest; +import com.fanap.podchat.requestobject.RemoveParticipantsRequest; +import com.fanap.podchat.requestobject.SendReplyFileMessageRequest; +import com.fanap.podchat.requestobject.ReplyTextMessageRequest; import com.fanap.podchat.requestobject.RequestSetAuditor; import com.fanap.podchat.requestobject.RequestSignalMsg; -import com.fanap.podchat.requestobject.RequestSpam; -import com.fanap.podchat.requestobject.RequestThread; -import com.fanap.podchat.requestobject.RequestThreadInfo; -import com.fanap.podchat.requestobject.RequestThreadParticipant; -import com.fanap.podchat.requestobject.RequestUnBlock; -import com.fanap.podchat.requestobject.RequestUpdateContact; -import com.fanap.podchat.requestobject.RequestUploadFile; -import com.fanap.podchat.requestobject.RequestUploadImage; +import com.fanap.podchat.requestobject.SpamPrivateThreadRequest; +import com.fanap.podchat.requestobject.GetThreadsRequest; +import com.fanap.podchat.requestobject.UpdateThreadInfoRequest; +import com.fanap.podchat.requestobject.GetThreadParticipantsRequest; +import com.fanap.podchat.requestobject.UnBlockRequest; +import com.fanap.podchat.requestobject.UpdateContactsRequest; +import com.fanap.podchat.requestobject.UploadFileRequest; +import com.fanap.podchat.requestobject.UploadImageRequest; import com.fanap.podchat.requestobject.RetryUpload; import com.fanap.podchat.util.ChatMessageType; import com.fanap.podchat.util.ChatStateType; @@ -224,7 +223,7 @@ public void connect(String serverAddress, String appId, String severName, } @Override - public void connect(RequestConnect requestConnect) { + public void connect(ConnectRequest requestConnect) { NetworkPingSender.NetworkStateConfig build = new NetworkPingSender.NetworkStateConfig() .setHostName("chat-sandbox.pod.ir") @@ -264,9 +263,9 @@ public void connect(RequestConnect requestConnect) { @Override - public void checkIsNameAvailable(RequestCheckIsNameAvailable request) { + public void checkIsNameAvailable(IsPublicThreadNameAvailableRequest request) { - chat.isNameAvailable(request); + chat.isPublicThreadNameAvailable(request); } @Override @@ -276,22 +275,22 @@ public void createPublicThread(RequestCreatePublicThread request) { } @Override - public void joinPublicThread(RequestJoinPublicThread request) { + public void joinPublicThread(JoinPublicThreadRequest request) { chat.joinPublicThread(request); } @Override - public void getContact(RequestGetContact request) { + public void getContact(GetContactRequest request) { chat.getContacts(request, null); } @Override - public void getBlockList(RequestBlockList request) { + public void getBlockList(GetBlockedListRequest request) { chat.getBlockList(request, null); } @Override - public void getThreadParticipant(RequestThreadParticipant request) { + public void getThreadParticipant(GetThreadParticipantsRequest request) { chat.getThreadParticipants(request, null); } @@ -334,12 +333,12 @@ public String downloadFile(RequestGetPodSpaceImage rePod, ProgressHandler.IDownl } @Override - public String updateThreadInfo(RequestThreadInfo request) { + public String updateThreadInfo(UpdateThreadInfoRequest request) { return chat.updateThreadInfo(request, null); } @Override - public String createThread(RequestCreateThread requestCreateThread) { + public String createThread(CreateThreadRequest requestCreateThread) { return chat.createThread(requestCreateThread); } @@ -433,12 +432,12 @@ public void enableAutoRefresh(Activity activity, String entry) { } @Override - public void sendLocationMessage(RequestLocationMessage request) { + public void sendLocationMessage(SendLocationMessageRequest request) { chat.sendLocationMessage(request); } @Override - public void sendLocationMessage(RequestLocationMessage requestLocationMessage, ProgressHandler.sendFileMessage handler) { + public void sendLocationMessage(SendLocationMessageRequest requestLocationMessage, ProgressHandler.sendFileMessage handler) { chat.sendLocationMessage(requestLocationMessage, handler); } @@ -481,21 +480,21 @@ public void cancelUpload(String uniqueId) { } @Override - public void seenMessageList(RequestSeenMessageList requestParams) { + public void seenMessageList(GetMessageDeliveredSeenListRequest requestParams) { chat.getMessageSeenList(requestParams); } @Override - public void deliveredMessageList(RequestDeliveredMessageList requestParams) { + public void deliveredMessageList(GetMessageDeliveredSeenListRequest requestParams) { chat.getMessageDeliveredList(requestParams); } @Override - public void createThreadWithMessage(RequestCreateThread threadRequest) { + public void createThreadWithMessage(CreateThreadRequest threadRequest) { chat.createThreadWithMessage(threadRequest); } @@ -509,7 +508,7 @@ public String createThread(int threadType, Invitee[] invitee, String threadTitle } @Override - public void getThreads(RequestThread requestThread, ChatHandler handler) { + public void getThreads(GetThreadsRequest requestThread, ChatHandler handler) { chat.getThreads(requestThread, handler); @@ -517,7 +516,7 @@ public void getThreads(RequestThread requestThread, ChatHandler handler) { Thread.sleep(2000); } catch (InterruptedException ignored) {} - RequestGetUnreadMessagesCount req = new RequestGetUnreadMessagesCount + GetAllUnreadMessageCountRequest req = new GetAllUnreadMessageCountRequest .Builder() .withMuteThreads() .build(); @@ -535,7 +534,7 @@ public void getThreads(Integer count, long partnerCoreContactId, ChatHandler handler) { - RequestThread request = new RequestThread.Builder() + GetThreadsRequest request = new GetThreadsRequest.Builder() .count(count) .offset(offset) .threadIds(threadIds) @@ -553,7 +552,7 @@ public void getThreads(Integer count, public void getThreads(Integer count, Long offset, ArrayList threadIds, String threadName, boolean isNew, ChatHandler handler) { - RequestThread request = new RequestThread.Builder() + GetThreadsRequest request = new GetThreadsRequest.Builder() .count(count) .offset(offset) .threadIds(threadIds) @@ -584,12 +583,12 @@ public void mapRouting(String origin, String originLng) { } @Override - public void mapStaticImage(RequestMapStaticImage request) { + public void mapStaticImage(MapStaticImageRequest request) { chat.mapStaticImage(request); } @Override - public void mapReverse(RequestMapReverse request) { + public void mapReverse(MapReverseRequest request) { chat.mapReverse(request); } @@ -619,7 +618,7 @@ public void getHistory(History history, long threadId, ChatHandler handler) { } @Override - public void getHistory(RequestGetHistory request, ChatHandler handler) { + public void getHistory(GetHistoryRequest request, ChatHandler handler) { chat.getHistory(request, handler); } @@ -645,7 +644,7 @@ public void sendTextMessage(String textMessage, long threadId, Integer messageTy } @Override - public void sendTextMessage(RequestMessage requestMessage, ChatHandler handler) { + public void sendTextMessage(SendTextMessageRequest requestMessage, ChatHandler handler) { chat.sendTextMessage(requestMessage, null); } @@ -655,13 +654,13 @@ public void replyMessage(String messageContent, long threadId, long messageId, I } @Override - public void replyFileMessage(RequestReplyFileMessage request, ProgressHandler.sendFileMessage handler) { + public void replyFileMessage(SendReplyFileMessageRequest request, ProgressHandler.sendFileMessage handler) { chat.replyFileMessage(request, handler); } @Override - public void replyMessage(RequestReplyMessage request, ChatHandler handler) { - chat.replyMessage(request, handler); + public void replyMessage(ReplyTextMessageRequest request, ChatHandler handler) { + chat.replyTextMessage(request, handler); } @Override @@ -687,7 +686,7 @@ public void editMessage(int messageId, String messageContent, String metaData, C @Override public void getThreadParticipant(int count, Long offset, long threadId, ChatHandler handler) { - RequestThreadParticipant participant = new RequestThreadParticipant + GetThreadParticipantsRequest participant = new GetThreadParticipantsRequest .Builder(threadId) .count(50) .offset(0) @@ -721,7 +720,7 @@ public void removeContact(long id) { } @Override - public void searchContact(RequestSearchContact requestSearchContact) { + public void searchContact(SearchContactRequest requestSearchContact) { chat.searchContact(requestSearchContact); } @@ -743,7 +742,7 @@ public void unBlock(Long blockId, Long userId, Long threadId, Long contactId, Ch } @Override - public void unBlock(RequestUnBlock request, ChatHandler handler) { + public void unBlock(UnBlockRequest request, ChatHandler handler) { // RequestUnBlock requestUnBlock = new RequestUnBlock.Builder() // .blockId() @@ -763,20 +762,20 @@ public void unBlock(RequestUnBlock request, ChatHandler handler) { @Override public void spam(long threadId) { - RequestSpam requestSpam = new RequestSpam.Builder() + SpamPrivateThreadRequest requestSpam = new SpamPrivateThreadRequest.Builder() .threadId(threadId) .build(); - chat.spam(requestSpam); + chat.spamPrivateThread(requestSpam); } @Override - public String spam(RequestSpam requestSpam) { + public String spam(SpamPrivateThreadRequest requestSpam) { - return chat.spam(requestSpam); + return chat.spamPrivateThread(requestSpam); } @Override @@ -787,7 +786,7 @@ public void getBlockList(Long count, Long offset, ChatHandler handler) { @Override public String sendFileMessage(Context context, Activity activity, String description, long threadId, Uri fileUri, String metaData, Integer messageType, ProgressHandler.sendFileMessage handler) { - RequestFileMessage request = new RequestFileMessage.Builder(activity, threadId, fileUri, messageType) + FileMessageRequest request = new FileMessageRequest.Builder(activity, threadId, fileUri, messageType) .description(description) .systemMetadata(metaData) @@ -798,7 +797,7 @@ public String sendFileMessage(Context context, Activity activity, String descrip } @Override - public String sendFileMessage(RequestFileMessage requestFileMessage, ProgressHandler.sendFileMessage handler) { + public String sendFileMessage(FileMessageRequest requestFileMessage, ProgressHandler.sendFileMessage handler) { return chat.sendFileMessage(requestFileMessage, handler); } @@ -813,7 +812,7 @@ public void forwardMessage(long threadId, ArrayList messageIds) { } @Override - public void forwardMessage(RequestForwardMessage request) { + public void forwardMessage(ForwardMessageRequest request) { chat.forwardMessage(request); } @@ -823,14 +822,14 @@ public void updateContact(int id, String firstName, String lastName, String cell } @Override - public void updateContact(RequestUpdateContact updateContact) { + public void updateContact(UpdateContactsRequest updateContact) { chat.updateContact(updateContact); } @Override public void uploadImage(Activity activity, Uri fileUri) { - RequestUploadImage req = new RequestUploadImage.Builder(activity, fileUri) + UploadImageRequest req = new UploadImageRequest.Builder(activity, fileUri) .build(); chat.uploadImage(req); } @@ -838,7 +837,7 @@ public void uploadImage(Activity activity, Uri fileUri) { @Override public void uploadFile(@NonNull Activity activity, @NonNull Uri uri) { - RequestUploadFile request = new RequestUploadFile.Builder(activity, uri) + UploadFileRequest request = new UploadFileRequest.Builder(activity, uri) .build(); chat.uploadFile(request); @@ -860,7 +859,7 @@ public void removeParticipants(long threadId, List contactIds, ChatHandler } @Override - public void removeParticipants(RequestRemoveParticipants requestRemoveParticipants, ChatHandler handler) { + public void removeParticipants(RemoveParticipantsRequest requestRemoveParticipants, ChatHandler handler) { chat.removeParticipants(requestRemoveParticipants, handler); } @@ -870,14 +869,14 @@ public void addParticipants(long threadId, List contactIds, ChatHandler ha } @Override - public void addParticipants(RequestAddParticipants requestAddParticipants, ChatHandler handler) { + public void addParticipants(AddParticipantsRequest requestAddParticipants, ChatHandler handler) { chat.addParticipants(requestAddParticipants, handler); } @Override public void leaveThread(long threadId, ChatHandler handler) { - RequestLeaveThread leaveThread = new RequestLeaveThread.Builder(threadId) + LeaveThreadRequest leaveThread = new LeaveThreadRequest.Builder(threadId) .build(); chat.leaveThread(leaveThread, null); } @@ -888,14 +887,14 @@ public void updateThreadInfo(long threadId, ThreadInfoVO threadInfoVO, ChatHandl } @Override - public void updateThreadInfo(RequestThreadInfo request, ChatHandler handler) { + public void updateThreadInfo(UpdateThreadInfoRequest request, ChatHandler handler) { chat.updateThreadInfo(request, handler); } @Override public void deleteMessage(ArrayList messageIds, long threadId, Boolean deleteForAll, ChatHandler handler) { - RequestDeleteMessage requestDeleteMessage = new RequestDeleteMessage + DeleteMessageRequest requestDeleteMessage = new DeleteMessageRequest .Builder() .messageIds(messageIds) .deleteForAll(deleteForAll) @@ -907,7 +906,7 @@ public void deleteMessage(ArrayList messageIds, long threadId, Boolean del } @Override - public void deleteMessage(RequestDeleteMessage deleteMessage, ChatHandler handler) { + public void deleteMessage(DeleteMessageRequest deleteMessage, ChatHandler handler) { String un = chat.deleteMessage(deleteMessage, handler); } @@ -915,7 +914,7 @@ public void deleteMessage(RequestDeleteMessage deleteMessage, ChatHandler handle public void uploadImageProgress(Context context, Activity activity, Uri fileUri, ProgressHandler.onProgress handler) { - RequestUploadImage req = new RequestUploadImage.Builder(activity, fileUri) + UploadImageRequest req = new UploadImageRequest.Builder(activity, fileUri) .setwC(240) .sethC(120) .setxC(10) @@ -933,7 +932,7 @@ public void uploadImageProgress(Context context, Activity activity, Uri fileUri, public void uploadFileProgress(Context context, Activity activity, Uri fileUri, ProgressHandler.onProgressFile handler) { - RequestUploadFile req = new RequestUploadFile + UploadFileRequest req = new UploadFileRequest .Builder(activity, fileUri) .setPublic(false) .build(); @@ -942,38 +941,34 @@ public void uploadFileProgress(Context context, Activity activity, Uri fileUri, } @Override - public void setAdmin(RequestSetAdmin requestAddAdmin) { + public void setAdmin(SetRemoveRoleRequest requestAddAdmin) { chat.addAdmin(requestAddAdmin); } @Override - public void removeAdminRules(RequestSetAdmin requestAddAdmin) { + public void removeAdminRules(SetRemoveRoleRequest requestAddAdmin) { chat.removeAdmin(requestAddAdmin); } @Override - public void clearHistory(RequestClearHistory requestClearHistory) { + public void clearHistory(ClearHistoryRequest requestClearHistory) { chat.clearHistory(requestClearHistory); } @Override - public void getAdminList(RequestGetAdmin requestGetAdmin) { - chat.getAdminList(requestGetAdmin); + public void getAdminList(GetAllThreadAdminsRequest requestGetAdmin) { + chat.getThreadAdmins(requestGetAdmin); } @Override public void getNotSeenDuration(ArrayList userIds) { - - - RequestGetLastSeens requestGetLastSeens = - new RequestGetLastSeens + GetUserNotSeenDurationRequest requestGetLastSeens = + new GetUserNotSeenDurationRequest .Builder(userIds) .build(); - - - chat.getNotSeenDuration(requestGetLastSeens); + chat.getUserNotSeenDuration(requestGetLastSeens); } @@ -1007,14 +1002,14 @@ public void stopAllSignalMessages() { } @Override - public void pinThread(RequestPinThread requestPinThread) { + public void pinThread(PinUnpinThreadRequest requestPinThread) { chat.pinThread(requestPinThread); } @Override - public void unPinThread(RequestPinThread requestPinThread) { + public void unPinThread(PinUnpinThreadRequest requestPinThread) { chat.unPinThread(requestPinThread); } @@ -1027,13 +1022,13 @@ public void setAuditor(RequestSetAuditor requestAddAdmin) { @Override public void removeAuditor(RequestSetAuditor requestAddAdmin) { - - chat.removeAuditor(requestAddAdmin); +// + // chat.removeAuditor(requestAddAdmin); } @Override - public void createThreadWithFile(RequestCreateThreadWithFile request, ProgressHandler.sendFileMessage handler) { + public void createThreadWithFile(CreateThreadWithFileRequest request, ProgressHandler.sendFileMessage handler) { chat.createThreadWithFile(request, handler); } @@ -1055,7 +1050,7 @@ public void onThreadInfoUpdated(String content, ChatResponse respo } @Override - public void onGetContacts(String content, ChatResponse outPutContact) { + public void onGetContacts(String content, ChatResponse outPutContact) { super.onGetContacts(content, outPutContact); view.onGetContacts(); @@ -1068,7 +1063,7 @@ public void onSeen(String content, ChatResponse chatResponse) { } @Override - public void onUserInfo(String content, ChatResponse outPutUserInfo) { + public void onUserInfo(String content, ChatResponse outPutUserInfo) { view.onGetUserInfo(); } @@ -1100,7 +1095,7 @@ public void onError(String content, ErrorOutPut outPutError) { } @Override - public void getUserRoles(RequestGetUserRoles req) { + public void getUserRoles(GetCurrentUserRolesRequest req) { String uniqueId = chat.getCurrentUserRoles(req); @@ -1108,7 +1103,7 @@ public void getUserRoles(RequestGetUserRoles req) { } @Override - public void pinMessage(RequestPinMessage requestPinMessage) { + public void pinMessage(PinUnpinMessageRequest requestPinMessage) { String uniqueId = chat.pinMessage(requestPinMessage); @@ -1116,15 +1111,15 @@ public void pinMessage(RequestPinMessage requestPinMessage) { } @Override - public void unPinMessage(RequestPinMessage requestPinMessage) { + public void unPinMessage(PinUnpinMessageRequest requestPinMessage) { String uniqueId = chat.unPinMessage(requestPinMessage); } @Override - public void getMentionList(RequestGetMentionList req) { + public void getMentionList(GetMentionedRequest req) { - chat.getMentionList(req); + chat.getMentionedMessages(req); } @@ -1136,12 +1131,12 @@ public void startTyping(RequestSignalMsg req) { } @Override - public String downloadFile(RequestGetImage requestGetImage, ProgressHandler.IDownloadFile onProgressFile) { + public String downloadFile(GetImageRequest requestGetImage, ProgressHandler.IDownloadFile onProgressFile) { return chat.getImage(requestGetImage, onProgressFile); } @Override - public String downloadFile(RequestGetFile requestGetFile, ProgressHandler.IDownloadFile onProgressFile) { + public String downloadFile(GetFileRequest requestGetFile, ProgressHandler.IDownloadFile onProgressFile) { return chat.getFile(requestGetFile, onProgressFile); } @@ -1191,12 +1186,12 @@ public void closeChat() { } @Override - public void addContact(RequestAddContact request) { + public void addContact(AddContactRequest request) { chat.addContact(request); } @Override - public void updateChatProfile(RequestUpdateProfile request) { + public void updateChatProfile(UpdateProfileRequest request) { chat.updateChatProfile(request); } @@ -1301,7 +1296,7 @@ public void onThreadLeaveParticipant(String content, ChatResponse response) { + public void onChatProfileUpdated(ChatResponse response) { Log.d("CHAT_SDK_PRESENTER", "Chat profile updated"); @@ -1316,7 +1311,7 @@ public void onChatState(String state) { if(state.equals(ChatStateType.ChatSateConstant.CHAT_READY)){ - RequestGetUnreadMessagesCount req = new RequestGetUnreadMessagesCount.Builder() + GetAllUnreadMessageCountRequest req = new GetAllUnreadMessageCountRequest.Builder() .build(); chat.getAllUnreadMessagesCount(req); @@ -1332,13 +1327,13 @@ public void onNewMessage(String content, ChatResponse chatResp } @Override - public void onBlock(String content, ChatResponse outPutBlock) { + public void onBlock(String content, ChatResponse outPutBlock) { super.onBlock(content, outPutBlock); view.onBlock(); } @Override - public void onUnBlock(String content, ChatResponse outPutBlock) { + public void onUnBlock(String content, ChatResponse outPutBlock) { super.onUnBlock(content, outPutBlock); view.onUnblock(); } @@ -1355,7 +1350,7 @@ public void onMapRouting(String content) { } @Override - public void onGetBlockList(String content, ChatResponse outPutBlockList) { + public void onGetBlockList(String content, ChatResponse outPutBlockList) { super.onGetBlockList(content, outPutBlockList); view.ongetBlockList(); } @@ -1366,7 +1361,7 @@ public void OnSeenMessageList(String content, ChatResponse ch } @Override - public void onSearchContact(String content, ChatResponse chatResponse) { + public void onSearchContact(String content, ChatResponse chatResponse) { super.onSearchContact(content, chatResponse); view.onSearchContact(); } diff --git a/app/src/main/java/com/example/chat/application/chatexample/ChatSandBoxActivity.java b/app/src/main/java/com/example/chat/application/chatexample/ChatSandBoxActivity.java index 83284e80..eb948146 100644 --- a/app/src/main/java/com/example/chat/application/chatexample/ChatSandBoxActivity.java +++ b/app/src/main/java/com/example/chat/application/chatexample/ChatSandBoxActivity.java @@ -29,24 +29,21 @@ import com.fanap.podchat.mainmodel.Inviter; import com.fanap.podchat.mainmodel.NosqlListMessageCriteriaVO; import com.fanap.podchat.mainmodel.NosqlSearchMetadataCriteria; -import com.fanap.podchat.mainmodel.RequestSearchContact; -import com.fanap.podchat.mainmodel.RequestThreadInnerMessage; +import com.fanap.podchat.mainmodel.SearchContactRequest; import com.fanap.podchat.model.ChatResponse; import com.fanap.podchat.model.ResultImageFile; import com.fanap.podchat.model.ResultStaticMapImage; -import com.fanap.podchat.requestobject.RequestCreateThread; -import com.fanap.podchat.requestobject.RequestDeleteMessage; -import com.fanap.podchat.requestobject.RequestDeliveredMessageList; -import com.fanap.podchat.requestobject.RequestFileMessage; -import com.fanap.podchat.requestobject.RequestLocationMessage; -import com.fanap.podchat.requestobject.RequestMapReverse; -import com.fanap.podchat.requestobject.RequestMapStaticImage; -import com.fanap.podchat.requestobject.RequestMessage; -import com.fanap.podchat.requestobject.RequestReplyFileMessage; +import com.fanap.podchat.requestobject.DeleteMessageRequest; +import com.fanap.podchat.requestobject.GetMessageDeliveredSeenListRequest; +import com.fanap.podchat.requestobject.SendLocationMessageRequest; +import com.fanap.podchat.requestobject.MapReverseRequest; +import com.fanap.podchat.requestobject.MapStaticImageRequest; +import com.fanap.podchat.requestobject.SendTextMessageRequest; +import com.fanap.podchat.requestobject.SendReplyFileMessageRequest; import com.fanap.podchat.requestobject.RequestSeenMessageList; -import com.fanap.podchat.requestobject.RequestThreadInfo; -import com.fanap.podchat.requestobject.RequestUnBlock; -import com.fanap.podchat.requestobject.RequestUpdateContact; +import com.fanap.podchat.requestobject.UpdateThreadInfoRequest; +import com.fanap.podchat.requestobject.UnBlockRequest; +import com.fanap.podchat.requestobject.UpdateContactsRequest; import com.fanap.podchat.util.FilePick; import com.fanap.podchat.util.TextMessageType; @@ -199,11 +196,11 @@ public void onItemSelected(AdapterView parent, View view, int position, long break; case 7: - RequestSeenMessageList requests = new RequestSeenMessageList.Builder(17374).build(); + GetMessageDeliveredSeenListRequest requests = new GetMessageDeliveredSeenListRequest.Builder(17374).build(); presenter.seenMessageList(requests); break; case 8: - RequestDeliveredMessageList requestD = new RequestDeliveredMessageList.Builder(17374).build(); + GetMessageDeliveredSeenListRequest requestD = new GetMessageDeliveredSeenListRequest.Builder(17374).build(); presenter.deliveredMessageList(requestD); break; case 9: @@ -240,7 +237,7 @@ public void onNothingSelected(AdapterView parent) { private void sendLocationMsg() { String center = "35.7003510,51.3376472"; - RequestLocationMessage requestLocationMessage = new RequestLocationMessage.Builder() + SendLocationMessageRequest requestLocationMessage = new SendLocationMessageRequest.Builder() .center(center) .message("This is location ") .activity(ChatSandBoxActivity.this) @@ -252,14 +249,14 @@ private void sendLocationMsg() { public void mapReverse() { double lat = 35.7003510; double lng = 51.3376472; - RequestMapReverse requestMapReverse = new RequestMapReverse.Builder(lat, lng).build(); + MapReverseRequest requestMapReverse = new MapReverseRequest.Builder(lat, lng).build(); presenter.mapReverse(requestMapReverse); } public void mapStatic() { // String center = "35.7003510,51.3376472"; String center = "35.7003510,35.7003510"; - RequestMapStaticImage staticImage = new RequestMapStaticImage.Builder() + MapStaticImageRequest staticImage = new MapStaticImageRequest.Builder() .center(center) .build(); presenter.mapStaticImage(staticImage); @@ -293,7 +290,7 @@ public void createThreadWithMsg() { public void updateThreadInfo() { // 1104 is a group - RequestThreadInfo threadInfo = new RequestThreadInfo.Builder(1104).threadId(1104).description("yes").name("this is test").build(); + UpdateThreadInfoRequest threadInfo = new UpdateThreadInfoRequest.Builder(1104).threadId(1104).description("yes").name("this is test").build(); presenter.updateThreadInfo(threadInfo, null); @@ -307,7 +304,7 @@ public void updateThreadInfo() { } public void unBlock() { - RequestUnBlock requestUnBlock = new RequestUnBlock.Builder().build(); + UnBlockRequest requestUnBlock = new UnBlockRequest.Builder().build(); // RequestUnBlock requestUnBlock = new RequestUnBlock.Builder(1382).build(); presenter.unBlock(requestUnBlock, null); @@ -420,7 +417,7 @@ public void onLeaveThread(String uniqueId) { break; case 9: - RequestSearchContact requestSearchContact = new RequestSearchContact.Builder("0", "2").id("1063").build(); + SearchContactRequest requestSearchContact = new SearchContactRequest.Builder("0", "2").id("1063").build(); presenter.searchContact(requestSearchContact); break; case 10: @@ -456,7 +453,7 @@ private void replyFileMessage() { Inviter inviter = new Inviter(); inviter.setName("sina"); String meta = gson.toJson(inviter); - RequestReplyFileMessage fileMessage = new RequestReplyFileMessage + SendReplyFileMessageRequest fileMessage = new SendReplyFileMessageRequest .Builder(messageContent, threadId, messageId, fileUri, this, TextMessageType.Constants.FILE).systemMetaData(meta).build(); presenter.replyFileMessage(fileMessage, null); @@ -465,7 +462,7 @@ private void replyFileMessage() { public void deleteMessage() { ArrayList msgIds = new ArrayList<>(); msgIds.add(37443L); - RequestDeleteMessage requestDeleteMessage = new RequestDeleteMessage + DeleteMessageRequest requestDeleteMessage = new DeleteMessageRequest .Builder() .messageIds(msgIds) // .deleteForAll(true) @@ -502,7 +499,7 @@ public void sendMessage(View view) { Inviter inviter = new Inviter(); inviter.setName("sina"); String meta = gson.toJson(inviter); - RequestMessage requestMessage = new RequestMessage + SendTextMessageRequest requestMessage = new SendTextMessageRequest .Builder("test at" + " " + new Date().getTime() + name, 1105) .jsonMetaData(meta) .build(); @@ -678,7 +675,7 @@ public void onGetContact(String uniqueId) { break; case 16: /**UPDATE CONTACTS*/ - RequestUpdateContact requestUpdateContact = new RequestUpdateContact.Builder(2404) + UpdateContactsRequest requestUpdateContact = new UpdateContactsRequest.Builder(2404) .cellphoneNumber("09148401824") .firstName("Black Masoudi") .lastName("Amjadi") diff --git a/app/src/test/java/com/example/podchat/ExampleUnitTest.java b/app/src/test/java/com/example/podchat/ExampleUnitTest.java index b367e0cf..e46c3682 100644 --- a/app/src/test/java/com/example/podchat/ExampleUnitTest.java +++ b/app/src/test/java/com/example/podchat/ExampleUnitTest.java @@ -1,17 +1,12 @@ package com.example.podchat; -import android.util.Log; - import com.example.chat.application.chatexample.TestClass; import com.fanap.podchat.cachemodel.PhoneContact; -import com.fanap.podchat.chat.App; import com.fanap.podchat.chat.thread.public_thread.RequestCreatePublicThread; import com.fanap.podchat.mainmodel.Invitee; -import com.fanap.podchat.notification.PodPushMessage; -import com.fanap.podchat.requestobject.RequestCreateThread; +import com.fanap.podchat.requestobject.CreateThreadRequest; import com.fanap.podchat.util.DataTypeConverter; import com.fanap.podchat.util.InviteType; -import com.fanap.podchat.util.PodThreadManager; import com.fanap.podchat.util.Util; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -24,28 +19,16 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; -import java.util.Collection; import java.util.Collections; -import java.util.Comparator; import java.util.Date; import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashSet; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.Set; import java.util.concurrent.BlockingQueue; -import java.util.concurrent.DelayQueue; -import java.util.concurrent.Executor; import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - -import rx.Observable; -import rx.Observer; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -266,7 +249,7 @@ public void instanceOfTest() { } - public void getUniqueName(RequestCreateThread request) { + public void getUniqueName(CreateThreadRequest request) { if (request instanceof RequestCreatePublicThread) { diff --git a/gradle.properties b/gradle.properties index 743d692c..b8e8ec1b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,17 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx1536m +org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +org.gradle.daemon=true +org.gradle.parallel=true +org.gradle.configureondemand=false +android.enableBuildCache=false +#org.gradle.caching=true +#Sun Nov 18 13:42:15 IRST 2018 +android.enableR8=false # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects diff --git a/podchat/src/main/java/com/fanap/podchat/chat/Chat.java b/podchat/src/main/java/com/fanap/podchat/chat/Chat.java index 6e027a58..2eebb6fc 100644 --- a/podchat/src/main/java/com/fanap/podchat/chat/Chat.java +++ b/podchat/src/main/java/com/fanap/podchat/chat/Chat.java @@ -11,7 +11,6 @@ import android.net.ConnectivityManager; import android.net.Uri; import android.os.AsyncTask; -import android.os.Build; import android.os.Environment; import android.os.Handler; import android.os.HandlerThread; @@ -53,25 +52,25 @@ import com.fanap.podchat.chat.file_manager.upload_file.PodUploader; import com.fanap.podchat.chat.file_manager.upload_file.UploadToPodSpaceResult; import com.fanap.podchat.chat.mention.Mention; -import com.fanap.podchat.chat.mention.model.RequestGetMentionList; +import com.fanap.podchat.chat.mention.model.GetMentionedRequest; import com.fanap.podchat.chat.messge.MessageManager; -import com.fanap.podchat.chat.messge.RequestGetUnreadMessagesCount; +import com.fanap.podchat.chat.messge.GetAllUnreadMessageCountRequest; import com.fanap.podchat.chat.messge.ResultUnreadMessagesCount; import com.fanap.podchat.chat.pin.pin_message.PinMessage; -import com.fanap.podchat.chat.pin.pin_message.model.RequestPinMessage; +import com.fanap.podchat.chat.pin.pin_message.model.PinUnpinMessageRequest; import com.fanap.podchat.chat.pin.pin_message.model.ResultPinMessage; import com.fanap.podchat.chat.pin.pin_thread.PinThread; -import com.fanap.podchat.chat.pin.pin_thread.model.RequestPinThread; +import com.fanap.podchat.chat.pin.pin_thread.model.PinUnpinThreadRequest; import com.fanap.podchat.chat.pin.pin_thread.model.ResultPinThread; import com.fanap.podchat.chat.thread.ThreadManager; import com.fanap.podchat.chat.thread.public_thread.PublicThread; -import com.fanap.podchat.chat.thread.public_thread.RequestCheckIsNameAvailable; +import com.fanap.podchat.chat.thread.public_thread.IsPublicThreadNameAvailableRequest; import com.fanap.podchat.chat.thread.public_thread.RequestCreatePublicThread; -import com.fanap.podchat.chat.thread.public_thread.RequestJoinPublicThread; +import com.fanap.podchat.chat.thread.public_thread.JoinPublicThreadRequest; import com.fanap.podchat.chat.thread.public_thread.ResultIsNameAvailable; import com.fanap.podchat.chat.thread.public_thread.ResultJoinPublicThread; -import com.fanap.podchat.chat.user.profile.RequestUpdateProfile; -import com.fanap.podchat.chat.user.profile.ResultUpdateProfile; +import com.fanap.podchat.chat.user.profile.UpdateProfileRequest; +import com.fanap.podchat.chat.user.profile.UpdateProfileResponse; import com.fanap.podchat.chat.user.profile.UserProfile; import com.fanap.podchat.chat.user.user_roles.UserRoles; import com.fanap.podchat.chat.user.user_roles.model.CacheUserRoles; @@ -95,7 +94,7 @@ import com.fanap.podchat.mainmodel.NosqlListMessageCriteriaVO; import com.fanap.podchat.mainmodel.Participant; import com.fanap.podchat.mainmodel.RemoveParticipant; -import com.fanap.podchat.mainmodel.RequestSearchContact; +import com.fanap.podchat.mainmodel.SearchContactRequest; import com.fanap.podchat.mainmodel.RequestThreadInnerMessage; import com.fanap.podchat.mainmodel.ResultDeleteMessage; import com.fanap.podchat.mainmodel.Thread; @@ -128,10 +127,10 @@ import com.fanap.podchat.model.OutputSignalMessage; import com.fanap.podchat.model.ResultAddContact; import com.fanap.podchat.model.ResultAddParticipant; -import com.fanap.podchat.model.ResultBlock; -import com.fanap.podchat.model.ResultBlockList; +import com.fanap.podchat.model.BlockUnblockUserResponse; +import com.fanap.podchat.model.GetBlockedUserListResponse; import com.fanap.podchat.model.ResultClearHistory; -import com.fanap.podchat.model.ResultContact; +import com.fanap.podchat.model.GetContactsResponse; import com.fanap.podchat.model.ResultFile; import com.fanap.podchat.model.ResultHistory; import com.fanap.podchat.model.ResultImageFile; @@ -151,7 +150,7 @@ import com.fanap.podchat.model.ResultThreads; import com.fanap.podchat.model.ResultThreadsSummary; import com.fanap.podchat.model.ResultUpdateContact; -import com.fanap.podchat.model.ResultUserInfo; +import com.fanap.podchat.model.GetUserInfoResponse; import com.fanap.podchat.networking.ProgressRequestBody; import com.fanap.podchat.networking.ProgressResponseBody; import com.fanap.podchat.networking.api.ContactApi; @@ -171,54 +170,53 @@ import com.fanap.podchat.persistance.module.AppDatabaseModule; import com.fanap.podchat.persistance.module.AppModule; import com.fanap.podchat.persistance.module.DaggerMessageComponent; -import com.fanap.podchat.requestobject.RequestAddContact; -import com.fanap.podchat.requestobject.RequestAddParticipants; -import com.fanap.podchat.requestobject.RequestBlock; -import com.fanap.podchat.requestobject.RequestBlockList; -import com.fanap.podchat.requestobject.RequestClearHistory; -import com.fanap.podchat.requestobject.RequestConnect; -import com.fanap.podchat.requestobject.RequestCreateThread; -import com.fanap.podchat.requestobject.RequestCreateThreadWithFile; -import com.fanap.podchat.requestobject.RequestCreateThreadWithMessage; -import com.fanap.podchat.requestobject.RequestDeleteMessage; -import com.fanap.podchat.requestobject.RequestDeliveredMessageList; -import com.fanap.podchat.requestobject.RequestEditMessage; -import com.fanap.podchat.requestobject.RequestFileMessage; -import com.fanap.podchat.requestobject.RequestForwardMessage; -import com.fanap.podchat.requestobject.RequestGetAdmin; -import com.fanap.podchat.requestobject.RequestGetContact; -import com.fanap.podchat.requestobject.RequestGetFile; -import com.fanap.podchat.requestobject.RequestGetHistory; -import com.fanap.podchat.requestobject.RequestGetImage; -import com.fanap.podchat.requestobject.RequestGetLastSeens; +import com.fanap.podchat.requestobject.AddContactRequest; +import com.fanap.podchat.requestobject.AddParticipantsRequest; +import com.fanap.podchat.requestobject.BlockRequest; +import com.fanap.podchat.requestobject.GetBlockedListRequest; +import com.fanap.podchat.requestobject.ClearHistoryRequest; +import com.fanap.podchat.requestobject.ConnectRequest; +import com.fanap.podchat.requestobject.CreateThreadRequest; +import com.fanap.podchat.requestobject.CreateThreadWithFileRequest; +import com.fanap.podchat.requestobject.CreateThreadWithMessageRequest; +import com.fanap.podchat.requestobject.DeleteMessageRequest; +import com.fanap.podchat.requestobject.GetMessageDeliveredSeenListRequest; +import com.fanap.podchat.requestobject.EditMessageRequest; +import com.fanap.podchat.requestobject.FileMessageRequest; +import com.fanap.podchat.requestobject.ForwardMessageRequest; +import com.fanap.podchat.requestobject.GetAllThreadAdminsRequest; +import com.fanap.podchat.requestobject.GetContactRequest; +import com.fanap.podchat.requestobject.GetFileRequest; +import com.fanap.podchat.requestobject.GetHistoryRequest; +import com.fanap.podchat.requestobject.GetImageRequest; +import com.fanap.podchat.requestobject.GetUserNotSeenDurationRequest; import com.fanap.podchat.requestobject.RequestGetPodSpaceFile; import com.fanap.podchat.requestobject.RequestGetPodSpaceImage; -import com.fanap.podchat.requestobject.RequestGetUserRoles; -import com.fanap.podchat.requestobject.RequestLeaveThread; -import com.fanap.podchat.requestobject.RequestLocationMessage; -import com.fanap.podchat.requestobject.RequestMapReverse; -import com.fanap.podchat.requestobject.RequestMapRouting; -import com.fanap.podchat.requestobject.RequestMapStaticImage; -import com.fanap.podchat.requestobject.RequestMessage; -import com.fanap.podchat.requestobject.RequestMuteThread; -import com.fanap.podchat.requestobject.RequestRemoveContact; -import com.fanap.podchat.requestobject.RequestRemoveParticipants; -import com.fanap.podchat.requestobject.RequestReplyFileMessage; -import com.fanap.podchat.requestobject.RequestReplyMessage; +import com.fanap.podchat.requestobject.GetCurrentUserRolesRequest; +import com.fanap.podchat.requestobject.LeaveThreadRequest; +import com.fanap.podchat.requestobject.SendLocationMessageRequest; +import com.fanap.podchat.requestobject.MapReverseRequest; +import com.fanap.podchat.requestobject.MapRoutingRequest; +import com.fanap.podchat.requestobject.MapStaticImageRequest; +import com.fanap.podchat.requestobject.SendTextMessageRequest; +import com.fanap.podchat.requestobject.MuteUnmuteThreadRequest; +import com.fanap.podchat.requestobject.RemoveContactRequest; +import com.fanap.podchat.requestobject.RemoveParticipantsRequest; +import com.fanap.podchat.requestobject.SendReplyFileMessageRequest; +import com.fanap.podchat.requestobject.ReplyTextMessageRequest; import com.fanap.podchat.requestobject.RequestRole; -import com.fanap.podchat.requestobject.RequestSeenMessage; -import com.fanap.podchat.requestobject.RequestSeenMessageList; -import com.fanap.podchat.requestobject.RequestSetAdmin; +import com.fanap.podchat.requestobject.SendDeliverSeenRequest; +import com.fanap.podchat.requestobject.SetRemoveRoleRequest; import com.fanap.podchat.requestobject.RequestSetAuditor; import com.fanap.podchat.requestobject.RequestSignalMsg; -import com.fanap.podchat.requestobject.RequestSpam; -import com.fanap.podchat.requestobject.RequestThread; -import com.fanap.podchat.requestobject.RequestThreadInfo; -import com.fanap.podchat.requestobject.RequestThreadParticipant; -import com.fanap.podchat.requestobject.RequestUnBlock; -import com.fanap.podchat.requestobject.RequestUpdateContact; -import com.fanap.podchat.requestobject.RequestUploadFile; -import com.fanap.podchat.requestobject.RequestUploadImage; +import com.fanap.podchat.requestobject.SpamPrivateThreadRequest; +import com.fanap.podchat.requestobject.GetThreadsRequest; +import com.fanap.podchat.requestobject.UpdateThreadInfoRequest; +import com.fanap.podchat.requestobject.GetThreadParticipantsRequest; +import com.fanap.podchat.requestobject.UnBlockRequest; +import com.fanap.podchat.requestobject.UpdateContactsRequest; +import com.fanap.podchat.requestobject.UploadFileRequest; +import com.fanap.podchat.requestobject.UploadImageRequest; import com.fanap.podchat.requestobject.RetryUpload; import com.fanap.podchat.util.AsyncAckType; import com.fanap.podchat.util.Callback; @@ -235,7 +233,7 @@ import com.fanap.podchat.util.Permission; import com.fanap.podchat.util.PodChatException; import com.fanap.podchat.util.PodThreadManager; -import com.fanap.podchat.util.RequestMapSearch; +import com.fanap.podchat.util.MapSearchRequest; import com.fanap.podchat.util.TextMessageType; import com.fanap.podchat.util.Util; import com.google.gson.Gson; @@ -1207,7 +1205,7 @@ private void handleIsNameAvailable(ChatMessage chatMessage) { private void handleOnChatProfileUpdated(ChatMessage chatMessage) { - ChatResponse response = UserProfile.handleOutputUpdateProfile(chatMessage); + ChatResponse response = UserProfile.handleOutputUpdateProfile(chatMessage); listenerManager.callOnChatProfileUpdated(response); @@ -1356,7 +1354,7 @@ private void handleOutPutSpamPVThread(ChatMessage chatMessage, String messageUni * fileServer {**REQUIRED**} * ssoHost {**REQUIRED**} */ - public void connect(RequestConnect requestConnect) { + public void connect(ConnectRequest requestConnect) { String platformHost = requestConnect.getPlatformHost(); String token = requestConnect.getToken(); String fileServer = requestConnect.getFileServer(); @@ -1603,7 +1601,7 @@ private void insertToSendQueue(String uniqueId, SendingQueueCache sendingQueue) } - public String pinThread(RequestPinThread request) { + public String pinThread(PinUnpinThreadRequest request) { String uniqueId = generateUniqueId(); @@ -1617,7 +1615,7 @@ public String pinThread(RequestPinThread request) { } - public String unPinThread(RequestPinThread request) { + public String unPinThread(PinUnpinThreadRequest request) { String uniqueId = generateUniqueId(); @@ -1638,7 +1636,7 @@ public String unPinThread(RequestPinThread request) { * and roles to them */ - public String addAdmin(RequestSetAdmin request) { + public String addAdmin(SetRemoveRoleRequest request) { SetRuleVO setRuleVO = new SetRuleVO(); @@ -1662,7 +1660,7 @@ public String addAuditor(RequestSetAuditor request) { } - public String removeAuditor(RequestSetAuditor request) { + public String removeAuditor(SetRemoveRoleRequest request) { SetRuleVO setRuleVO = new SetRuleVO(); @@ -1674,7 +1672,7 @@ public String removeAuditor(RequestSetAuditor request) { return removeRole(setRuleVO); } - public String removeAdmin(RequestSetAdmin request) { + public String removeAdmin(SetRemoveRoleRequest request) { SetRuleVO setRuleVO = new SetRuleVO(); @@ -1718,7 +1716,7 @@ private String setRole(SetRuleVO request) { } - public String updateChatProfile(RequestUpdateProfile request) { + public String updateChatProfile(UpdateProfileRequest request) { String uniqueId = generateUniqueId(); @@ -1866,7 +1864,7 @@ public String stopBot(StartAndStopBotRequest request) { */ - public String getMentionList(RequestGetMentionList request) { + public String getMentionedMessages(GetMentionedRequest request) { String uniqueId = generateUniqueId(); @@ -1889,7 +1887,7 @@ public String getMentionList(RequestGetMentionList request) { } @SuppressWarnings("unchecked") - private void loadMentionsFromCache(RequestGetMentionList request, String uniqueId) { + private void loadMentionsFromCache(GetMentionedRequest request, String uniqueId) { messageDatabaseHelper.getMentionList(request, (messages, contentCount) -> { @@ -1914,7 +1912,7 @@ private void loadMentionsFromCache(RequestGetMentionList request, String uniqueI * @return */ - public String isNameAvailable(RequestCheckIsNameAvailable request) { + public String isPublicThreadNameAvailable(IsPublicThreadNameAvailableRequest request) { String uniqueId = generateUniqueId(); @@ -1937,7 +1935,7 @@ public String isNameAvailable(RequestCheckIsNameAvailable request) { * notifyAll: if you want notify all thread member about this message */ - public String pinMessage(RequestPinMessage request) { + public String pinMessage(PinUnpinMessageRequest request) { String uniqueId = generateUniqueId(); @@ -1962,7 +1960,7 @@ public String pinMessage(RequestPinMessage request) { */ - public String unPinMessage(RequestPinMessage request) { + public String unPinMessage(PinUnpinMessageRequest request) { String uniqueId = generateUniqueId(); @@ -1982,7 +1980,7 @@ public String unPinMessage(RequestPinMessage request) { } - public String getCurrentUserRoles(RequestGetUserRoles request) { + public String getCurrentUserRoles(GetCurrentUserRolesRequest request) { String uniqueId = generateUniqueId(); @@ -2005,7 +2003,7 @@ public String getCurrentUserRoles(RequestGetUserRoles request) { return uniqueId; } - private void loadUserRolesFromCache(RequestGetUserRoles request, String uniqueId) { + private void loadUserRolesFromCache(GetCurrentUserRolesRequest request, String uniqueId) { messageDatabaseHelper.getCurrentUserRoles(request, cacheRole -> { @@ -2079,7 +2077,7 @@ private String removeRole(SetRuleVO request) { * String jsonMetaData {metadata of the message} * long threadId {The id of a thread that its wanted to send } */ - public String sendTextMessage(RequestMessage requestMessage, ChatHandler handler) { + public String sendTextMessage(SendTextMessageRequest requestMessage, ChatHandler handler) { String textMessage = requestMessage.getTextMessage(); long threadId = requestMessage.getThreadId(); int messageType = requestMessage.getMessageType(); @@ -2305,7 +2303,7 @@ private boolean needReadStoragePermission(Activity activity) { // // return sendFileMessage(activity, description, threadId, fileUri, systemMetadata, messageType, handler); // } - public String sendFileMessage(RequestFileMessage requestFileMessage, ProgressHandler.sendFileMessage handler) { + public String sendFileMessage(FileMessageRequest requestFileMessage, ProgressHandler.sendFileMessage handler) { String uniqueId = generateUniqueId(); @@ -2494,7 +2492,7 @@ public void onProgressUpdate(int progress, int totalBytesSent, int totalBytesToS return uniqueId; } - private void sendFileMessage(RequestFileMessage requestFileMessage, String uniqueId, ProgressHandler.sendFileMessage handler) { + private void sendFileMessage(FileMessageRequest requestFileMessage, String uniqueId, ProgressHandler.sendFileMessage handler) { if (needReadStoragePermission(requestFileMessage.getActivity())) { @@ -2929,11 +2927,11 @@ public void cancelUpload(String uniqueCancel) { /** * It uploads image to the server just by pass image uri */ - public String uploadImage(RequestUploadImage requestUploadImage) { + public String uploadImage(UploadImageRequest requestUploadImage) { return uploadImageProgress(requestUploadImage, null); } - public String uploadImageProgress(RequestUploadImage request, @Nullable ProgressHandler.onProgress handler) { + public String uploadImageProgress(UploadImageRequest request, @Nullable ProgressHandler.onProgress handler) { String uniqueId = generateUniqueId(); @@ -3167,7 +3165,7 @@ public void onProgressUpdate(int progress, int totalBytesSent, int totalBytesToS // // return uniqueId; // } - public String uploadFile(@NonNull RequestUploadFile requestUploadFile) { + public String uploadFile(@NonNull UploadFileRequest requestUploadFile) { return uploadFileProgress(requestUploadFile, null); @@ -3177,7 +3175,7 @@ public String uploadFile(@NonNull RequestUploadFile requestUploadFile) { * It uploads file and it shows progress of the file downloading */ - public String uploadFileProgress(RequestUploadFile request, @Nullable ProgressHandler.onProgressFile handler) { + public String uploadFileProgress(UploadFileRequest request, @Nullable ProgressHandler.onProgressFile handler) { String uniqueId = generateUniqueId(); @@ -3393,7 +3391,7 @@ public void onProgressUpdate(int progress, int totalBytesSent, int totalBytesToS // } //new upload file function - private void uploadFileToThread(RequestUploadFile request, String userGroupHash, String uniqueId, @Nullable ProgressHandler.onProgressFile handler, OnWorkDone listener) { + private void uploadFileToThread(UploadFileRequest request, String userGroupHash, String uniqueId, @Nullable ProgressHandler.onProgressFile handler, OnWorkDone listener) { if (needReadStoragePermission(request.getActivity())) { String jsonError = captureError(ChatConstant.ERROR_READ_EXTERNAL_STORAGE_PERMISSION @@ -3505,7 +3503,7 @@ public void onProgressUpdate(int progress, int totalBytesSent, int totalBytesToS } //new upload image function - private void uploadImageToThread(RequestUploadImage request, String userGroupHash, String uniqueId, @Nullable ProgressHandler.onProgress handler, OnWorkDone listener) { + private void uploadImageToThread(UploadImageRequest request, String userGroupHash, String uniqueId, @Nullable ProgressHandler.onProgress handler, OnWorkDone listener) { if (needReadStoragePermission(request.getActivity())) { @@ -4008,7 +4006,7 @@ private String getFile(long fileId, String hashCode, boolean downloadable) { /** * This method generate url that you can use to get your file */ - private String getFile(RequestGetFile requestGetFile) { + private String getFile(GetFileRequest requestGetFile) { return getFileServer() + "nzh/file/" + "?fileId=" + requestGetFile.getFileId() + "&downloadable=" + requestGetFile.isDownloadable() @@ -4031,7 +4029,7 @@ private String getImage(long imageId, String hashCode, boolean downloadable) { /** * This method generate url based on your input params that you can use to get your image */ - private String getImage(RequestGetImage requestGetImage) { + private String getImage(GetImageRequest requestGetImage) { String url; if (requestGetImage.isDownloadable()) { url = getFileServer() + "nzh/image/" @@ -4333,7 +4331,7 @@ private String getPodSpaceServer() { return podSpaceServer; } - public String getFile(RequestGetFile request, ProgressHandler.IDownloadFile progressHandler) { + public String getFile(GetFileRequest request, ProgressHandler.IDownloadFile progressHandler) { String uniqueId = generateUniqueId(); @@ -4440,7 +4438,7 @@ public void onFileReady(ChatResponse response) { return uniqueId; } - public String getImage(RequestGetImage request, ProgressHandler.IDownloadFile progressHandler) { + public String getImage(GetImageRequest request, ProgressHandler.IDownloadFile progressHandler) { String uniqueId = generateUniqueId(); @@ -4865,7 +4863,7 @@ public String addParticipants(long threadId, List contactIds, ChatHandler * threadId Id of the thread that you are {*NOTICE*}admin of that and you are going to * add someone as a participant. */ - public String addParticipants(RequestAddParticipants request, ChatHandler handler) { + public String addParticipants(AddParticipantsRequest request, ChatHandler handler) { String uniqueId = generateUniqueId(); if (chatReady) { @@ -4980,7 +4978,7 @@ public String removeParticipants(long threadId, List participantIds, ChatH * participantIds List of PARTICIPANT IDs from Thread's Participants object * threadId Id of the thread that we wants to remove their participant */ - public String removeParticipants(RequestRemoveParticipants request, ChatHandler handler) { + public String removeParticipants(RemoveParticipantsRequest request, ChatHandler handler) { List participantIds = request.getParticipantIds(); long threadId = request.getThreadId(); @@ -5032,7 +5030,7 @@ public String leaveThread(long threadId, ChatHandler handler) { * * @ param threadId id of the thread */ - public String leaveThread(RequestLeaveThread request, ChatHandler handler) { + public String leaveThread(LeaveThreadRequest request, ChatHandler handler) { return leaveThread(request.getThreadId(), handler); } @@ -5136,7 +5134,7 @@ private void moveFromSendingQueueToWaitQueue(String uniqueId) { * threadId destination thread id * messageIds Array of message ids that we want to forward them */ - public List forwardMessage(RequestForwardMessage request) { + public List forwardMessage(ForwardMessageRequest request) { return forwardMessage(request.getThreadId(), request.getMessageIds()); } @@ -5148,7 +5146,7 @@ public List forwardMessage(RequestForwardMessage request) { * messageId of the message that we want to reply * metaData meta data of the message */ - public String replyFileMessage(RequestReplyFileMessage request, ProgressHandler.sendFileMessage handler) { + public String replyFileMessage(SendReplyFileMessageRequest request, ProgressHandler.sendFileMessage handler) { String uniqueId = generateUniqueId(); @@ -5343,7 +5341,7 @@ public void onProgressUpdate(int progress, int totalBytesSent, int totalBytesToS * messageId of the message that we want to reply * metaData meta data of the message */ - public String replyMessage(RequestReplyMessage request, ChatHandler handler) { + public String replyTextMessage(ReplyTextMessageRequest request, ChatHandler handler) { long threadId = request.getThreadId(); long messageId = request.getMessageId(); String messageContent = request.getMessageContent(); @@ -5498,7 +5496,7 @@ private String deleteMessage(Long messageId, Boolean deleteForAll, ChatHandler h * deleteForAll If you want to delete message for everyone you can set it true if u don't want * you can set it false or even null. */ - public String deleteMessage(RequestDeleteMessage request, ChatHandler handler) { + public String deleteMessage(DeleteMessageRequest request, ChatHandler handler) { if (request.getMessageIds().size() > 1) { @@ -5526,7 +5524,7 @@ public String deleteMessage(RequestDeleteMessage request, ChatHandler handler) { } - public List deleteMultipleMessage(RequestDeleteMessage request, ChatHandler handler) { + public List deleteMultipleMessages(DeleteMessageRequest request, ChatHandler handler) { return deleteMessage(request.getMessageIds(), request.isDeleteForAll(), @@ -5864,7 +5862,7 @@ public void onGetThread(String data) { } - public String getThreads(RequestThread requestThread, ChatHandler handler) { + public String getThreads(GetThreadsRequest requestThread, ChatHandler handler) { ArrayList threadIds = requestThread.getThreadIds(); long offset = requestThread.getOffset(); @@ -6160,7 +6158,7 @@ private void resetCache(Runnable onDone) { * threadId Id of the thread that we want to get the history */ - public String getHistory(RequestGetHistory request, ChatHandler handler) { + public String getHistory(GetHistoryRequest request, ChatHandler handler) { History history = getHistoryModelFromRequestGetHistory(request); @@ -6170,7 +6168,7 @@ public String getHistory(RequestGetHistory request, ChatHandler handler) { } - private History getHistoryModelFromRequestGetHistory(RequestGetHistory request) { + private History getHistoryModelFromRequestGetHistory(GetHistoryRequest request) { return new History.Builder() .count(request.getCount()) .firstMessageId(request.getFirstMessageId()) @@ -6693,7 +6691,7 @@ public void stopAllSignalMessages() { /** * Get all of the contacts of the user */ - public String getContacts(RequestGetContact request, ChatHandler handler) { + public String getContacts(GetContactRequest request, ChatHandler handler) { long offset = request.getOffset(); long count = request.getCount(); @@ -6832,7 +6830,7 @@ public String getContacts(Integer count, Long offset, ChatHandler handler) { // } - public String searchContact(RequestSearchContact requestSearchContact) { + public String searchContact(SearchContactRequest requestSearchContact) { String uniqueId = generateUniqueId(); @@ -6854,7 +6852,7 @@ public String searchContact(RequestSearchContact requestSearchContact) { if (cache && requestSearchContact.canUseCache()) { - ChatResponse chatResponse = messageDatabaseHelper.searchContacts(requestSearchContact, size, offset); + ChatResponse chatResponse = messageDatabaseHelper.searchContacts(requestSearchContact, size, offset); chatResponse.setUniqueId(uniqueId); String jsonContact = gson.toJson(chatResponse); @@ -6924,7 +6922,7 @@ public String searchContact(RequestSearchContact requestSearchContact) { handlerSend.put(uniqueId, new ChatHandler() { @Override - public void onGetContact(String contactJson, ChatResponse chatResponse) { + public void onGetContact(String contactJson, ChatResponse chatResponse) { super.onGetContact(contactJson, chatResponse); showLog("RECEIVE_SEARCH_CONTACT", contactJson); @@ -7075,7 +7073,7 @@ public String addContact(String firstName, String lastName, String cellphoneNumb * cellphoneNumber Notice: If you just put the cellPhoneNumber doesn't necessary to add email * email email of the contact */ - public String addContact(RequestAddContact request) { + public String addContact(AddContactRequest request) { String firstName = request.getFirstName(); String lastName = request.getLastName(); @@ -7152,7 +7150,7 @@ public String removeContact(long userId) { *

* userId id of the user that we want to remove from contact list */ - public String removeContact(RequestRemoveContact request) { + public String removeContact(RemoveContactRequest request) { long userId = request.getUserId(); @@ -7278,7 +7276,7 @@ public String updateContact(long userId, String firstName, String lastName, Stri * Update contacts * all of the params all required */ - public String updateContact(RequestUpdateContact request) { + public String updateContact(UpdateContactsRequest request) { String firstName = request.getFirstName(); String lastName = request.getLastName(); String email = request.getEmail(); @@ -7331,7 +7329,7 @@ public String mapSearch(String searchTerm, Double latitude, Double longitude) { * double longitude ; */ - public String mapSearch(RequestMapSearch request) { + public String mapSearch(MapSearchRequest request) { String searchTerm = request.getSearchTerm(); double latitude = request.getLatitude(); double longitude = request.getLongitude(); @@ -7362,7 +7360,7 @@ public String mapRouting(String origin, String destination) { return uniqueId; } - public String mapRouting(RequestMapRouting request) { + public String mapRouting(MapRoutingRequest request) { String origin = request.getOrigin(); String destination = request.getDestination(); String uniqueId; @@ -7395,7 +7393,7 @@ public String mapRouting(RequestMapRouting request) { * [default value] width = 800 * [default value] height = 500 */ - private String mainMapStaticImage(RequestLocationMessage request, + private String mainMapStaticImage(SendLocationMessageRequest request, Activity activity, String uniqueId, boolean isMessage) { @@ -7541,7 +7539,7 @@ public void onFailure(Call call, Throwable t) { } - private String mainMapStaticImage(RequestLocationMessage request, + private String mainMapStaticImage(SendLocationMessageRequest request, Activity activity, String uniqueId, boolean isMessage, @@ -7815,14 +7813,14 @@ public void onFailure(Call call, Throwable t) { } - public String mapStaticImage(RequestMapStaticImage request) { + public String mapStaticImage(MapStaticImageRequest request) { int zoom = request.getZoom(); int width = request.getWidth(); int height = request.getHeight(); String center = request.getCenter(); - RequestLocationMessage requestLMsg = new RequestLocationMessage.Builder() + SendLocationMessageRequest requestLMsg = new SendLocationMessageRequest.Builder() .height(height) .width(width) .center(center) @@ -7833,7 +7831,7 @@ public String mapStaticImage(RequestMapStaticImage request) { return mainMapStaticImage(requestLMsg, null, null, false, null); } - public String sendLocationMessage(RequestLocationMessage request) { + public String sendLocationMessage(SendLocationMessageRequest request) { String uniqueId = generateUniqueId(); Activity activity = request.getActivity(); @@ -7842,7 +7840,7 @@ public String sendLocationMessage(RequestLocationMessage request) { return uniqueId; } - public String sendLocationMessage(RequestLocationMessage request, ProgressHandler.sendFileMessage handler) { + public String sendLocationMessage(SendLocationMessageRequest request, ProgressHandler.sendFileMessage handler) { String uniqueId = generateUniqueId(); @@ -7855,7 +7853,7 @@ public String sendLocationMessage(RequestLocationMessage request, ProgressHandle } - public String mapReverse(RequestMapReverse request) { + public String mapReverse(MapReverseRequest request) { String uniqueId = null; if (chatReady) { @@ -7988,7 +7986,7 @@ public String block(Long contactId, Long userId, Long threadId, ChatHandler hand * @ param threadId id of the thread * @ param userId id of the user */ - public String block(RequestBlock request, ChatHandler handler) { + public String block(BlockRequest request, ChatHandler handler) { Long contactId = request.getContactId(); long threadId = request.getThreadId(); long userId = request.getUserId(); @@ -8071,7 +8069,7 @@ public String unblock(Long blockId, Long userId, Long threadId, Long contactId, * @ param threadId Id of the thread * @ param contactId Id of the contact */ - public String unblock(RequestUnBlock request, ChatHandler handler) { + public String unblock(UnBlockRequest request, ChatHandler handler) { long contactId = request.getContactId(); long threadId = request.getThreadId(); long userId = request.getUserId(); @@ -8122,7 +8120,7 @@ public String spam(long threadId) { * * @ param long threadId Id of the thread */ - public String spam(RequestSpam request) { + public String spamPrivateThread(SpamPrivateThreadRequest request) { String uniqueId; JsonObject jsonObject; @@ -8184,12 +8182,12 @@ public String getBlockList(Long count, Long offset, ChatHandler handler) { List cacheContacts = messageDatabaseHelper.getBlockedContacts(count, offset); if (!Util.isNullOrEmpty(cacheContacts)) { - ChatResponse chatResponse = new ChatResponse<>(); + ChatResponse chatResponse = new ChatResponse<>(); chatResponse.setErrorCode(0); chatResponse.setHasError(false); chatResponse.setUniqueId(uniqueId); chatResponse.setCache(true); - ResultBlockList resultBlockList = new ResultBlockList(); + GetBlockedUserListResponse resultBlockList = new GetBlockedUserListResponse(); resultBlockList.setContacts(cacheContacts); chatResponse.setResult(resultBlockList); @@ -8258,12 +8256,12 @@ private String getBlockList(Long count, Long offset, boolean useCache, ChatHandl List cacheContacts = messageDatabaseHelper.getBlockedContacts(count, offset); if (!Util.isNullOrEmpty(cacheContacts)) { - ChatResponse chatResponse = new ChatResponse<>(); + ChatResponse chatResponse = new ChatResponse<>(); chatResponse.setErrorCode(0); chatResponse.setHasError(false); chatResponse.setUniqueId(uniqueId); chatResponse.setCache(true); - ResultBlockList resultBlockList = new ResultBlockList(); + GetBlockedUserListResponse resultBlockList = new GetBlockedUserListResponse(); resultBlockList.setContacts(cacheContacts); chatResponse.setResult(resultBlockList); @@ -8329,14 +8327,14 @@ private String getBlockList(Long count, Long offset, boolean useCache, ChatHandl /** * It gets the list of the contacts that is on block list */ - public String getBlockList(RequestBlockList request, ChatHandler handler) { + public String getBlockList(GetBlockedListRequest request, ChatHandler handler) { return getBlockList(request.getCount(), request.getOffset(), request.useCacheData(), handler); } - public String createThread(RequestCreateThread request) { + public String createThread(CreateThreadRequest request) { String uniqueId = generateUniqueId(); @@ -8391,7 +8389,7 @@ public void onThreadCreated(ResultThread thread) { return uniqueId; } - private void updateThreadImage(ResultThread thread, RequestUploadImage uploadImageRequest) { + private void updateThreadImage(ResultThread thread, UploadImageRequest uploadImageRequest) { ThreadInfoVO threadInfoVO = new ThreadInfoVO.Builder() @@ -8409,7 +8407,7 @@ private void updateThreadImage(ResultThread thread, RequestUploadImage uploadIma } - private String createThread(RequestCreateThread request, String uniqueId) { + private String createThread(CreateThreadRequest request, String uniqueId) { if (chatReady) { @@ -8445,7 +8443,7 @@ private String createThread(RequestCreateThread request, String uniqueId) { } - public String joinPublicThread(RequestJoinPublicThread request) { + public String joinPublicThread(JoinPublicThreadRequest request) { String uniqueId = generateUniqueId(); @@ -8460,7 +8458,7 @@ public String joinPublicThread(RequestJoinPublicThread request) { return uniqueId; } - public String getAllUnreadMessagesCount(RequestGetUnreadMessagesCount request) { + public String getAllUnreadMessagesCount(GetAllUnreadMessageCountRequest request) { String uniqueId = generateUniqueId(); @@ -8486,7 +8484,7 @@ public String getAllUnreadMessagesCount(RequestGetUnreadMessagesCount request) { } - private void loadUnreadMessagesCountFromCache(RequestGetUnreadMessagesCount request, String uniqueId) { + private void loadUnreadMessagesCountFromCache(GetAllUnreadMessageCountRequest request, String uniqueId) { try { messageDatabaseHelper.loadAllUnreadMessagesCount(request, count -> { @@ -8612,7 +8610,7 @@ public String createThread(int threadType, // 2.2. Upload file to server with thread userGroupHash and send uploaded file as message by sendFileMessage. // - public ArrayList createThreadWithFile(RequestCreateThreadWithFile request, @Nullable ProgressHandler.sendFileMessage progressHandler) { + public ArrayList createThreadWithFile(CreateThreadWithFileRequest request, @Nullable ProgressHandler.sendFileMessage progressHandler) { ArrayList uniqueIds = new ArrayList<>(); @@ -8634,8 +8632,8 @@ public void onThreadCreated(ResultThread thread) { new PodThreadManager() .doThisAndGo(() -> updateThreadImage(thread, request.getUploadThreadImageRequest())); - RequestFileMessage.Builder requestFileBuilder = - new RequestFileMessage.Builder( + FileMessageRequest.Builder requestFileBuilder = + new FileMessageRequest.Builder( request.getMessage() != null ? request.getMessage().getText() : null, request.getFile().getActivity(), thread.getThread().getId(), @@ -8645,24 +8643,24 @@ public void onThreadCreated(ResultThread thread) { thread.getThread().getUserGroupHash()); - if (request.getFile() instanceof RequestUploadImage) { + if (request.getFile() instanceof UploadImageRequest) { - requestFileBuilder.setImageHc(String.valueOf(((RequestUploadImage) request.getFile()).gethC())); - requestFileBuilder.setImageWc(String.valueOf(((RequestUploadImage) request.getFile()).getwC())); - requestFileBuilder.setImageXc(String.valueOf(((RequestUploadImage) request.getFile()).getxC())); - requestFileBuilder.setImageYc(String.valueOf(((RequestUploadImage) request.getFile()).getyC())); + requestFileBuilder.setImageHc(String.valueOf(((UploadImageRequest) request.getFile()).gethC())); + requestFileBuilder.setImageWc(String.valueOf(((UploadImageRequest) request.getFile()).getwC())); + requestFileBuilder.setImageXc(String.valueOf(((UploadImageRequest) request.getFile()).getxC())); + requestFileBuilder.setImageYc(String.valueOf(((UploadImageRequest) request.getFile()).getyC())); } - RequestFileMessage requestFile = requestFileBuilder.build(); + FileMessageRequest requestFile = requestFileBuilder.build(); sendFileMessage(requestFile, requestUniqueId, progressHandler); } }); - RequestCreateThread requestCreateThread = - new RequestCreateThread.Builder( + CreateThreadRequest requestCreateThread = + new CreateThreadRequest.Builder( request.getType(), request.getInvitees()) .title(request.getTitle()) @@ -8683,7 +8681,7 @@ public void onThreadCreated(ResultThread thread) { return uniqueIds; } - private void prepareCreateThreadWithFile(RequestCreateThreadWithFile request, String requestUniqueId, String innerMessageUniqueId, List forwardUniqueIds, String metaData) { + private void prepareCreateThreadWithFile(CreateThreadWithFileRequest request, String requestUniqueId, String innerMessageUniqueId, List forwardUniqueIds, String metaData) { RequestThreadInnerMessage requestThreadInnerMessage = generateInnerMessageForCreateThreadWithFile(request, metaData); @@ -8702,7 +8700,7 @@ private String getMimType(Uri fileUri) { return getContext().getContentResolver().getType(fileUri); } - private RequestThreadInnerMessage generateInnerMessageForCreateThreadWithFile(RequestCreateThreadWithFile request, String metaData) { + private RequestThreadInnerMessage generateInnerMessageForCreateThreadWithFile(CreateThreadWithFileRequest request, String metaData) { RequestThreadInnerMessage requestThreadInnerMessage; @@ -8723,13 +8721,13 @@ private RequestThreadInnerMessage generateInnerMessageForCreateThreadWithFile(Re } private void createThreadWithMessage( - RequestCreateThreadWithFile request, + CreateThreadWithFileRequest request, String requestUniqueId, String innerMessageUniqueId, List forwardUniqueIds) { - RequestCreateThreadWithMessage rctm = new RequestCreateThreadWithMessage + CreateThreadWithMessageRequest rctm = new CreateThreadWithMessageRequest .Builder(request.getType(), request.getInvitees(), request.getMessageType()) .message(request.getMessage()) .build(); @@ -8814,7 +8812,7 @@ private void createThreadWithMessage( } } - private List generateForwardingMessageId(RequestCreateThreadWithFile request, OnWorkDone listener) { + private List generateForwardingMessageId(CreateThreadWithFileRequest request, OnWorkDone listener) { List uniqueIds = new ArrayList<>(); @@ -8839,7 +8837,7 @@ private List generateForwardingMessageId(RequestCreateThreadWithFile req return null; } - private String generateMessageUniqueId(RequestCreateThreadWithFile request, OnWorkDone listener) { + private String generateMessageUniqueId(CreateThreadWithFileRequest request, OnWorkDone listener) { String newMsgUniqueId = null; if (request.getMessage() != null && !Util.isNullOrEmpty(request.getMessage().getText())) { @@ -8872,7 +8870,7 @@ private String generateMessageUniqueId(RequestCreateThreadWithFile request, OnWo * ------------- List forwardedMessageIds [Optional] * } */ - public ArrayList createThreadWithMessage(RequestCreateThread threadRequest) { + public ArrayList createThreadWithMessage(CreateThreadRequest threadRequest) { List forwardUniqueIds; JsonObject innerMessageObj; @@ -9051,7 +9049,7 @@ public String updateThreadInfo(long threadId, ThreadInfoVO threadInfoVO, ChatHan return uniqueId; } - private String updateThreadInfo(long threadId, ThreadInfoVO threadInfoVO, String userGroupHash, RequestUploadImage requestUploadThreadPicture, ChatHandler handler) { + private String updateThreadInfo(long threadId, ThreadInfoVO threadInfoVO, String userGroupHash, UploadImageRequest requestUploadThreadPicture, ChatHandler handler) { String uniqueId = generateUniqueId(); @@ -9156,7 +9154,7 @@ private String updateThreadInfo(long threadId, ThreadInfoVO threadInfoVO, String * metadata; */ - public String updateThreadInfo(RequestThreadInfo request, ChatHandler handler) { + public String updateThreadInfo(UpdateThreadInfoRequest request, ChatHandler handler) { ThreadInfoVO threadInfoVO = new ThreadInfoVO.Builder() .title(request.getName()) @@ -9181,7 +9179,7 @@ public String updateThreadInfo(RequestThreadInfo request, ChatHandler handler) { * @ param long offset offset of the participant list */ - public String getThreadParticipants(RequestThreadParticipant request, ChatHandler handler) { + public String getThreadParticipants(GetThreadParticipantsRequest request, ChatHandler handler) { long count = request.getCount(); long offset = request.getOffset(); @@ -9448,7 +9446,7 @@ public String seenMessage(long messageId, long ownerId, ChatHandler handler) { /** * In order to send seen message you have to call {@link #seenMessage(long, long, ChatHandler)} */ - public String seenMessage(RequestSeenMessage request, ChatHandler handler) { + public String seen(SendDeliverSeenRequest request, ChatHandler handler) { long messageId = request.getMessageId(); long ownerId = request.getOwnerId(); @@ -9471,9 +9469,9 @@ public String getUserInfo(ChatHandler handler) { if (userInfo != null) { - ChatResponse chatResponse = new ChatResponse<>(); + ChatResponse chatResponse = new ChatResponse<>(); - ResultUserInfo result = new ResultUserInfo(); + GetUserInfoResponse result = new GetUserInfoResponse(); setUserId(userInfo.getId()); @@ -9558,9 +9556,9 @@ public String getUserInfo(boolean useCache, ChatHandler handler) { if (userInfo != null) { - ChatResponse chatResponse = new ChatResponse<>(); + ChatResponse chatResponse = new ChatResponse<>(); - ResultUserInfo result = new ResultUserInfo(); + GetUserInfoResponse result = new GetUserInfoResponse(); setUserId(userInfo.getId()); @@ -9683,14 +9681,14 @@ public String muteThread(long threadId, ChatHandler handler) { /** * Mute the thread so notification is off for that thread */ - public String muteThread(RequestMuteThread request, ChatHandler handler) { + public String muteThread(MuteUnmuteThreadRequest request, ChatHandler handler) { return muteThread(request.getThreadId(), handler); } /** * It Un mutes the thread so notification is on for that thread */ - public String unMuteThread(RequestMuteThread request, ChatHandler handler) { + public String unMuteThread(MuteUnmuteThreadRequest request, ChatHandler handler) { String uniqueId; uniqueId = generateUniqueId(); JsonObject jsonObject = null; @@ -9839,7 +9837,7 @@ public String editMessage(int messageId, String messageContent, String systemMet * Message can be edit when you pass the message id and the edited * content in order to edit your Message. */ - public String editMessage(RequestEditMessage request, ChatHandler handler) { + public String editMessage(EditMessageRequest request, ChatHandler handler) { return editMessage((int) request.getMessageId(), request.getMessageContent(), request.getMetaData(), handler); @@ -9893,11 +9891,11 @@ public String editMessage(RequestEditMessage request, ChatHandler handler) { // return uniqueId; } - public String getMessageDeliveredList(RequestDeliveredMessageList requestParams) { + public String getMessageDeliveredList(GetMessageDeliveredSeenListRequest requestParams) { return deliveredMessageList(requestParams); } - public String getMessageSeenList(RequestSeenMessageList requestParams) { + public String getMessageSeenList(GetMessageDeliveredSeenListRequest requestParams) { return seenMessageList(requestParams); } @@ -9994,7 +9992,7 @@ public void setTtl(long ttl) { this.ttl = ttl; } - public String clearHistory(RequestClearHistory requestClearHistory) { + public String clearHistory(ClearHistoryRequest requestClearHistory) { String uniqueId = generateUniqueId(); @@ -10030,7 +10028,7 @@ public String clearHistory(RequestClearHistory requestClearHistory) { return uniqueId; } - public String getNotSeenDuration(RequestGetLastSeens requestGetLastSeens) { + public String getUserNotSeenDuration(GetUserNotSeenDurationRequest requestGetLastSeens) { String uniqueId = generateUniqueId(); @@ -10081,7 +10079,7 @@ public String getNotSeenDuration(RequestGetLastSeens requestGetLastSeens) { } - public String getAdminList(RequestGetAdmin requestGetAdmin) { + public String getThreadAdmins(GetAllThreadAdminsRequest requestGetAdmin) { long count = requestGetAdmin.getCount(); long offset = requestGetAdmin.getOffset(); @@ -10092,7 +10090,7 @@ public String getAdminList(RequestGetAdmin requestGetAdmin) { } - public String getAdminList(RequestGetAdmin requestGetAdmin, ChatHandler handler) { + public String getAdminList(GetAllThreadAdminsRequest requestGetAdmin, ChatHandler handler) { long count = requestGetAdmin.getCount(); long offset = requestGetAdmin.getOffset(); @@ -11401,7 +11399,7 @@ private void updateWaitingQ(long threadId, String uniqueId, ChatHandler handler) private void getHistoryWithUniqueIds(long threadId, String uniqueId, String[] uniqueIds) { - RequestGetHistory request = new RequestGetHistory + GetHistoryRequest request = new GetHistoryRequest .Builder(threadId) .offset(0) .count(uniqueIds.length) @@ -11560,7 +11558,7 @@ private void onUnknownException(String uniqueId, Throwable throwable) { private void handleGetContact(Callback callback, ChatMessage chatMessage, String messageUniqueId) { - ChatResponse chatResponse = reformatGetContactResponse(chatMessage, callback); + ChatResponse chatResponse = reformatGetContactResponse(chatMessage, callback); String contactJson = gson.toJson(chatResponse); if (handlerSend.containsKey(chatMessage.getUniqueId()) @@ -11578,7 +11576,7 @@ private void handleGetContact(Callback callback, ChatMessage chatMessage, String } - private void removeContactTest(ChatResponse chatResponse) { + private void removeContactTest(ChatResponse chatResponse) { for (Contact contact : chatResponse.getResult().getContacts()) { @@ -11589,7 +11587,7 @@ private void removeContactTest(ChatResponse chatResponse) { new PodThreadManager() .doThisSafe(() -> { - RequestRemoveContact request = new RequestRemoveContact.Builder(contact.getId()) + RemoveContactRequest request = new RemoveContactRequest.Builder(contact.getId()) .build(); removeContact(request); try { @@ -11911,7 +11909,7 @@ private void handleOnGetUserInfo(ChatMessage chatMessage, String messageUniqueId if (callback.isResult()) { userInfoResponse = true; - ChatResponse chatResponse = new ChatResponse<>(); + ChatResponse chatResponse = new ChatResponse<>(); UserInfo userInfo = gson.fromJson(chatMessage.getContent(), UserInfo.class); //add user info for sentry @@ -12193,8 +12191,8 @@ private void handleOutPutDeleteMsg(ChatMessage chatMessage) { private void handleOutPutBlock(ChatMessage chatMessage, String messageUniqueId) { BlockedContact contact = gson.fromJson(chatMessage.getContent(), BlockedContact.class); - ChatResponse chatResponse = new ChatResponse<>(); - ResultBlock resultBlock = new ResultBlock(); + ChatResponse chatResponse = new ChatResponse<>(); + BlockUnblockUserResponse resultBlock = new BlockUnblockUserResponse(); resultBlock.setContact(contact); chatResponse.setResult(resultBlock); chatResponse.setErrorCode(0); @@ -12362,8 +12360,8 @@ private void handleRemoveRole(ChatMessage chatMessage) { private void handleUnBlock(ChatMessage chatMessage, String messageUniqueId) { BlockedContact contact = gson.fromJson(chatMessage.getContent(), BlockedContact.class); - ChatResponse chatResponse = new ChatResponse<>(); - ResultBlock resultBlock = new ResultBlock(); + ChatResponse chatResponse = new ChatResponse<>(); + BlockUnblockUserResponse resultBlock = new BlockUnblockUserResponse(); resultBlock.setContact(contact); chatResponse.setResult(resultBlock); chatResponse.setErrorCode(0); @@ -12384,11 +12382,11 @@ private void handleUnBlock(ChatMessage chatMessage, String messageUniqueId) { } private void handleOutPutGetBlockList(ChatMessage chatMessage) { - ChatResponse chatResponse = new ChatResponse<>(); + ChatResponse chatResponse = new ChatResponse<>(); chatResponse.setErrorCode(0); chatResponse.setHasError(false); chatResponse.setUniqueId(chatMessage.getUniqueId()); - ResultBlockList resultBlockList = new ResultBlockList(); + GetBlockedUserListResponse resultBlockList = new GetBlockedUserListResponse(); List blockedContacts = gson.fromJson(chatMessage.getContent(), new TypeToken>() { }.getType()); @@ -12580,9 +12578,9 @@ private void loadContactsFromCache(String uniqueId, long offset, int mCount) { try { cacheContactsList = new ArrayList<>(messageDatabaseHelper.getContacts(mCount, offset)); - ChatResponse chatResponse = new ChatResponse<>(); + ChatResponse chatResponse = new ChatResponse<>(); - ResultContact resultContact = new ResultContact(); + GetContactsResponse resultContact = new GetContactsResponse(); resultContact.setContacts(cacheContactsList); chatResponse.setResult(resultContact); chatResponse.setCache(true); @@ -12752,7 +12750,7 @@ private int getExpireAmount() { /** * The replacement method is getMessageDeliveredList. */ - private String deliveredMessageList(RequestDeliveredMessageList requestParams) { + private String deliveredMessageList(GetMessageDeliveredSeenListRequest requestParams) { String uniqueId; uniqueId = generateUniqueId(); @@ -12806,7 +12804,7 @@ private String deliveredMessageList(RequestDeliveredMessageList requestParams) { /* * The replacement method is getMessageSeenList. * */ - private String seenMessageList(RequestSeenMessageList requestParams) { + private String seenMessageList(GetMessageDeliveredSeenListRequest requestParams) { String uniqueId; uniqueId = generateUniqueId(); if (chatReady) { @@ -13680,9 +13678,9 @@ private ChatMessage getChatMessage(MessageVO jsonMessage) { return message; } - private String reformatUserInfo(ChatMessage chatMessage, ChatResponse outPutUserInfo, UserInfo userInfo) { + private String reformatUserInfo(ChatMessage chatMessage, ChatResponse outPutUserInfo, UserInfo userInfo) { - ResultUserInfo result = new ResultUserInfo(); + GetUserInfoResponse result = new GetUserInfoResponse(); if (cache && permit) { @@ -14546,9 +14544,9 @@ private void handleRemoveFromWaitQueue(ChatMessage chatMessage) { @NonNull - private ChatResponse reformatGetContactResponse(ChatMessage chatMessage, Callback callback) { - ResultContact resultContact = new ResultContact(); - ChatResponse outPutContact = new ChatResponse<>(); + private ChatResponse reformatGetContactResponse(ChatMessage chatMessage, Callback callback) { + GetContactsResponse resultContact = new GetContactsResponse(); + ChatResponse outPutContact = new ChatResponse<>(); ArrayList contacts = gson.fromJson(chatMessage.getContent(), new TypeToken>() { }.getType()); diff --git a/podchat/src/main/java/com/fanap/podchat/chat/ChatAdapter.java b/podchat/src/main/java/com/fanap/podchat/chat/ChatAdapter.java index 0ac8d413..50be502d 100644 --- a/podchat/src/main/java/com/fanap/podchat/chat/ChatAdapter.java +++ b/podchat/src/main/java/com/fanap/podchat/chat/ChatAdapter.java @@ -6,15 +6,14 @@ import com.fanap.podchat.model.ErrorOutPut; import com.fanap.podchat.model.OutPutMapNeshan; import com.fanap.podchat.model.OutPutNotSeenDurations; -import com.fanap.podchat.model.OutPutParticipant; import com.fanap.podchat.model.OutPutThread; import com.fanap.podchat.model.OutputSignalMessage; import com.fanap.podchat.model.ResultAddContact; import com.fanap.podchat.model.ResultAddParticipant; -import com.fanap.podchat.model.ResultBlock; -import com.fanap.podchat.model.ResultBlockList; +import com.fanap.podchat.model.BlockUnblockUserResponse; +import com.fanap.podchat.model.GetBlockedUserListResponse; import com.fanap.podchat.model.ResultClearHistory; -import com.fanap.podchat.model.ResultContact; +import com.fanap.podchat.model.GetContactsResponse; import com.fanap.podchat.model.ResultFile; import com.fanap.podchat.model.ResultHistory; import com.fanap.podchat.model.ResultImageFile; @@ -30,7 +29,7 @@ import com.fanap.podchat.model.ResultThread; import com.fanap.podchat.model.ResultThreads; import com.fanap.podchat.model.ResultUpdateContact; -import com.fanap.podchat.model.ResultUserInfo; +import com.fanap.podchat.model.GetUserInfoResponse; public class ChatAdapter implements ChatListener { @@ -46,7 +45,7 @@ public void onError(String content, ErrorOutPut error) { } @Override - public void onGetContacts(String content, ChatResponse outPutContact) { + public void onGetContacts(String content, ChatResponse outPutContact) { } @@ -66,12 +65,12 @@ public void onThreadInfoUpdated(String content, ChatResponse respo } @Override - public void onBlock(String content, ChatResponse outPutBlock) { + public void onBlock(String content, ChatResponse outPutBlock) { } @Override - public void onUnBlock(String content, ChatResponse outPutBlock) { + public void onUnBlock(String content, ChatResponse outPutBlock) { } @@ -91,7 +90,7 @@ public void onUnmuteThread(String content, ChatResponse outPutUnMute } @Override - public void onUserInfo(String content, ChatResponse outPutUserInfo) { + public void onUserInfo(String content, ChatResponse outPutUserInfo) { } @@ -237,7 +236,7 @@ public void onChatState(String state) { } @Override - public void onGetBlockList(String content, ChatResponse outPutBlockList) { + public void onGetBlockList(String content, ChatResponse outPutBlockList) { } @@ -257,7 +256,7 @@ public void OnSeenMessageList(String content,ChatResponse cha } @Override - public void onSearchContact(String content, ChatResponse chatResponse) { + public void onSearchContact(String content, ChatResponse chatResponse) { } diff --git a/podchat/src/main/java/com/fanap/podchat/chat/ChatHandler.java b/podchat/src/main/java/com/fanap/podchat/chat/ChatHandler.java index 6cae647d..3a4d4a72 100644 --- a/podchat/src/main/java/com/fanap/podchat/chat/ChatHandler.java +++ b/podchat/src/main/java/com/fanap/podchat/chat/ChatHandler.java @@ -2,7 +2,7 @@ import com.fanap.podchat.mainmodel.ChatMessage; import com.fanap.podchat.model.ChatResponse; -import com.fanap.podchat.model.ResultContact; +import com.fanap.podchat.model.GetContactsResponse; import com.fanap.podchat.model.ResultHistory; import com.fanap.podchat.model.ResultThread; import com.fanap.podchat.model.ResultThreads; @@ -42,7 +42,7 @@ public void onSearchHistory(String uniqueId){} public void onGetContact(String uniqueId) { } - public void onGetContact(String contactJson, ChatResponse chatResponse) { } + public void onGetContact(String contactJson, ChatResponse chatResponse) { } public void onBlock(String uniqueId) { } diff --git a/podchat/src/main/java/com/fanap/podchat/chat/ChatListener.java b/podchat/src/main/java/com/fanap/podchat/chat/ChatListener.java index 17f7643b..612570c0 100644 --- a/podchat/src/main/java/com/fanap/podchat/chat/ChatListener.java +++ b/podchat/src/main/java/com/fanap/podchat/chat/ChatListener.java @@ -7,7 +7,7 @@ import com.fanap.podchat.chat.messge.ResultUnreadMessagesCount; import com.fanap.podchat.chat.thread.public_thread.ResultIsNameAvailable; import com.fanap.podchat.chat.thread.public_thread.ResultJoinPublicThread; -import com.fanap.podchat.chat.user.profile.ResultUpdateProfile; +import com.fanap.podchat.chat.user.profile.UpdateProfileResponse; import com.fanap.podchat.chat.user.user_roles.model.ResultCurrentUserRoles; import com.fanap.podchat.mainmodel.ResultDeleteMessage; import com.fanap.podchat.model.ChatResponse; @@ -19,10 +19,10 @@ import com.fanap.podchat.model.OutputSignalMessage; import com.fanap.podchat.model.ResultAddContact; import com.fanap.podchat.model.ResultAddParticipant; -import com.fanap.podchat.model.ResultBlock; -import com.fanap.podchat.model.ResultBlockList; +import com.fanap.podchat.model.BlockUnblockUserResponse; +import com.fanap.podchat.model.GetBlockedUserListResponse; import com.fanap.podchat.model.ResultClearHistory; -import com.fanap.podchat.model.ResultContact; +import com.fanap.podchat.model.GetContactsResponse; import com.fanap.podchat.model.ResultFile; import com.fanap.podchat.model.ResultHistory; import com.fanap.podchat.model.ResultImageFile; @@ -42,7 +42,7 @@ import com.fanap.podchat.model.ResultThread; import com.fanap.podchat.model.ResultThreads; import com.fanap.podchat.model.ResultUpdateContact; -import com.fanap.podchat.model.ResultUserInfo; +import com.fanap.podchat.model.GetUserInfoResponse; public interface ChatListener { @@ -51,7 +51,7 @@ default void onError(String content, ErrorOutPut error) { } - default void onGetContacts(String content, ChatResponse response) { + default void onGetContacts(String content, ChatResponse response) { } default void onGetHistory(String content, ChatResponse history) { @@ -65,11 +65,11 @@ default void onThreadInfoUpdated(String content, ChatResponse resp } - default void onBlock(String content, ChatResponse response) { + default void onBlock(String content, ChatResponse response) { } - default void onUnBlock(String content, ChatResponse response) { + default void onUnBlock(String content, ChatResponse response) { } @@ -93,7 +93,7 @@ default void onUnmuteThread(String content, ChatResponse response) { } - default void onUserInfo(String content, ChatResponse response) { + default void onUserInfo(String content, ChatResponse response) { } @@ -161,7 +161,7 @@ default void onSyncContact(String content, ChatResponse chatResponse) } - default void onSearchContact(String content, ChatResponse response) { + default void onSearchContact(String content, ChatResponse response) { } @@ -188,7 +188,7 @@ default void onChatState(String state) { } - default void onGetBlockList(String content, ChatResponse response) { + default void onGetBlockList(String content, ChatResponse response) { } default void onUpdateThreadInfo(String threadJson, ChatResponse response) { @@ -261,7 +261,7 @@ default void onLowFreeSpace(long bytesAvailable){} default void onContactsLastSeenUpdated(ChatResponse response){} - default void onChatProfileUpdated(ChatResponse response){} + default void onChatProfileUpdated(ChatResponse response){} default void onUniqueNameIsAvailable(ChatResponse response){} diff --git a/podchat/src/main/java/com/fanap/podchat/chat/ChatListenerManager.java b/podchat/src/main/java/com/fanap/podchat/chat/ChatListenerManager.java index d9bbe290..5367e94d 100644 --- a/podchat/src/main/java/com/fanap/podchat/chat/ChatListenerManager.java +++ b/podchat/src/main/java/com/fanap/podchat/chat/ChatListenerManager.java @@ -10,7 +10,7 @@ import com.fanap.podchat.chat.messge.ResultUnreadMessagesCount; import com.fanap.podchat.chat.thread.public_thread.ResultIsNameAvailable; import com.fanap.podchat.chat.thread.public_thread.ResultJoinPublicThread; -import com.fanap.podchat.chat.user.profile.ResultUpdateProfile; +import com.fanap.podchat.chat.user.profile.UpdateProfileResponse; import com.fanap.podchat.chat.user.user_roles.model.ResultCurrentUserRoles; import com.fanap.podchat.mainmodel.ResultDeleteMessage; import com.fanap.podchat.model.ChatResponse; @@ -22,10 +22,10 @@ import com.fanap.podchat.model.OutputSignalMessage; import com.fanap.podchat.model.ResultAddContact; import com.fanap.podchat.model.ResultAddParticipant; -import com.fanap.podchat.model.ResultBlock; -import com.fanap.podchat.model.ResultBlockList; +import com.fanap.podchat.model.BlockUnblockUserResponse; +import com.fanap.podchat.model.GetBlockedUserListResponse; import com.fanap.podchat.model.ResultClearHistory; -import com.fanap.podchat.model.ResultContact; +import com.fanap.podchat.model.GetContactsResponse; import com.fanap.podchat.model.ResultFile; import com.fanap.podchat.model.ResultHistory; import com.fanap.podchat.model.ResultImageFile; @@ -45,7 +45,7 @@ import com.fanap.podchat.model.ResultThread; import com.fanap.podchat.model.ResultThreads; import com.fanap.podchat.model.ResultUpdateContact; -import com.fanap.podchat.model.ResultUserInfo; +import com.fanap.podchat.model.GetUserInfoResponse; import java.util.ArrayList; import java.util.List; @@ -174,7 +174,7 @@ public void callOnGetThreadHistory(String content, ChatResponse c } } - public void callOnGetContacts(String content, ChatResponse outPutContact) { + public void callOnGetContacts(String content, ChatResponse outPutContact) { for (ChatListener listener : getSynchronizedListeners()) { try { listener.onGetContacts(content, outPutContact); @@ -323,7 +323,7 @@ public void callOnUnmuteThread(String content, ChatResponse outPut) } } - public void callOnUserInfo(String content, ChatResponse outPutUserInfo) { + public void callOnUserInfo(String content, ChatResponse outPutUserInfo) { for (ChatListener listener : getSynchronizedListeners()) { try { listener.onUserInfo(content, outPutUserInfo); @@ -497,7 +497,7 @@ public void callOnMapRouting(String content) { } } - public void callOnBlock(String content, ChatResponse outPutBlock) { + public void callOnBlock(String content, ChatResponse outPutBlock) { for (ChatListener listener : getSynchronizedListeners()) { try { listener.onBlock(content, outPutBlock); @@ -507,7 +507,7 @@ public void callOnBlock(String content, ChatResponse outPutBlock) { } } - public void callOnUnBlock(String content, ChatResponse outPutBlock) { + public void callOnUnBlock(String content, ChatResponse outPutBlock) { for (ChatListener listener : getSynchronizedListeners()) { try { listener.onUnBlock(content, outPutBlock); @@ -517,7 +517,7 @@ public void callOnUnBlock(String content, ChatResponse outPutBlock) } } - public void callOnGetBlockList(String content, ChatResponse outPutBlockList) { + public void callOnGetBlockList(String content, ChatResponse outPutBlockList) { for (ChatListener listener : getSynchronizedListeners()) { try { listener.onGetBlockList(content, outPutBlockList); @@ -527,7 +527,7 @@ public void callOnGetBlockList(String content, ChatResponse out } } - public void callOnSearchContact(String content, ChatResponse response) { + public void callOnSearchContact(String content, ChatResponse response) { for (ChatListener listener : getSynchronizedListeners()) { try { listener.onSearchContact(content, response); @@ -808,7 +808,7 @@ public void callOnContactsLastSeenUpdated(ChatResponse re } } - public void callOnChatProfileUpdated(ChatResponse response) { + public void callOnChatProfileUpdated(ChatResponse response) { for (ChatListener listener : getSynchronizedListeners()) { diff --git a/podchat/src/main/java/com/fanap/podchat/chat/mention/Mention.java b/podchat/src/main/java/com/fanap/podchat/chat/mention/Mention.java index ac130e5a..77d0faca 100644 --- a/podchat/src/main/java/com/fanap/podchat/chat/mention/Mention.java +++ b/podchat/src/main/java/com/fanap/podchat/chat/mention/Mention.java @@ -2,7 +2,7 @@ import com.fanap.podchat.chat.App; import com.fanap.podchat.chat.CoreConfig; -import com.fanap.podchat.chat.mention.model.RequestGetMentionList; +import com.fanap.podchat.chat.mention.model.GetMentionedRequest; import com.fanap.podchat.mainmodel.AsyncMessage; import com.fanap.podchat.mainmodel.ChatMessage; import com.fanap.podchat.mainmodel.MessageVO; @@ -18,7 +18,7 @@ public class Mention { - public static String getMentionList(RequestGetMentionList request, String uniqueId) { + public static String getMentionList(GetMentionedRequest request, String uniqueId) { long threadId = request.getThreadId(); @@ -68,7 +68,7 @@ public static ChatResponse getMentionListResponse(ChatMessage cha return finalResponse; } - public static ChatResponse getMentionListCacheResponse(RequestGetMentionList request, + public static ChatResponse getMentionListCacheResponse(GetMentionedRequest request, List messageVOS, String uniqueId, long contentCount) { diff --git a/podchat/src/main/java/com/fanap/podchat/chat/mention/model/RequestGetMentionList.java b/podchat/src/main/java/com/fanap/podchat/chat/mention/model/GetMentionedRequest.java similarity index 90% rename from podchat/src/main/java/com/fanap/podchat/chat/mention/model/RequestGetMentionList.java rename to podchat/src/main/java/com/fanap/podchat/chat/mention/model/GetMentionedRequest.java index ccae6fb2..f424c7ef 100644 --- a/podchat/src/main/java/com/fanap/podchat/chat/mention/model/RequestGetMentionList.java +++ b/podchat/src/main/java/com/fanap/podchat/chat/mention/model/GetMentionedRequest.java @@ -2,7 +2,7 @@ import com.fanap.podchat.requestobject.BaseRequestObject; -public class RequestGetMentionList extends BaseRequestObject { +public class GetMentionedRequest extends BaseRequestObject { private Boolean allMentioned; @@ -22,7 +22,7 @@ public long getThreadId() { return threadId; } - public RequestGetMentionList(Builder builder) { + public GetMentionedRequest(Builder builder) { super(builder); this.allMentioned = builder.allMentioned; this.unreadMentioned = builder.unreadMentioned; @@ -88,8 +88,8 @@ public BaseRequestObject.Builder typeCode(String typeCode) { } @Override - public RequestGetMentionList build() { - return new RequestGetMentionList(this); + public GetMentionedRequest build() { + return new GetMentionedRequest(this); } @Override diff --git a/podchat/src/main/java/com/fanap/podchat/chat/messge/RequestGetUnreadMessagesCount.java b/podchat/src/main/java/com/fanap/podchat/chat/messge/GetAllUnreadMessageCountRequest.java similarity index 74% rename from podchat/src/main/java/com/fanap/podchat/chat/messge/RequestGetUnreadMessagesCount.java rename to podchat/src/main/java/com/fanap/podchat/chat/messge/GetAllUnreadMessageCountRequest.java index d261a052..3eb445a8 100644 --- a/podchat/src/main/java/com/fanap/podchat/chat/messge/RequestGetUnreadMessagesCount.java +++ b/podchat/src/main/java/com/fanap/podchat/chat/messge/GetAllUnreadMessageCountRequest.java @@ -2,11 +2,11 @@ import com.fanap.podchat.requestobject.GeneralRequestObject; -public class RequestGetUnreadMessagesCount extends GeneralRequestObject { +public class GetAllUnreadMessageCountRequest extends GeneralRequestObject { private boolean mute; - public RequestGetUnreadMessagesCount(Builder builder) { + public GetAllUnreadMessageCountRequest(Builder builder) { super(builder); this.mute = builder.mute; } @@ -25,8 +25,8 @@ public Builder withMuteThreads() { } @Override - public RequestGetUnreadMessagesCount build() { - return new RequestGetUnreadMessagesCount(this); + public GetAllUnreadMessageCountRequest build() { + return new GetAllUnreadMessageCountRequest(this); } @Override diff --git a/podchat/src/main/java/com/fanap/podchat/chat/messge/MessageManager.java b/podchat/src/main/java/com/fanap/podchat/chat/messge/MessageManager.java index 6db3221e..dfe41cea 100644 --- a/podchat/src/main/java/com/fanap/podchat/chat/messge/MessageManager.java +++ b/podchat/src/main/java/com/fanap/podchat/chat/messge/MessageManager.java @@ -12,7 +12,7 @@ public class MessageManager { - public static String getAllUnreadMessgesCount(RequestGetUnreadMessagesCount request, String uniqueId) { + public static String getAllUnreadMessgesCount(GetAllUnreadMessageCountRequest request, String uniqueId) { JsonObject content = new JsonObject(); diff --git a/podchat/src/main/java/com/fanap/podchat/chat/pin/pin_message/PinMessage.java b/podchat/src/main/java/com/fanap/podchat/chat/pin/pin_message/PinMessage.java index c555dc13..d3acb6d8 100644 --- a/podchat/src/main/java/com/fanap/podchat/chat/pin/pin_message/PinMessage.java +++ b/podchat/src/main/java/com/fanap/podchat/chat/pin/pin_message/PinMessage.java @@ -3,7 +3,7 @@ import com.fanap.podchat.chat.App; import com.fanap.podchat.chat.CoreConfig; -import com.fanap.podchat.chat.pin.pin_message.model.RequestPinMessage; +import com.fanap.podchat.chat.pin.pin_message.model.PinUnpinMessageRequest; import com.fanap.podchat.chat.pin.pin_message.model.ResultPinMessage; import com.fanap.podchat.mainmodel.AsyncMessage; import com.fanap.podchat.mainmodel.ChatMessage; @@ -15,7 +15,7 @@ public class PinMessage { - public static String pinMessage(RequestPinMessage request, String uniqueId) { + public static String pinMessage(PinUnpinMessageRequest request, String uniqueId) { long messageId = request.getMessageId(); @@ -39,7 +39,7 @@ public static String pinMessage(RequestPinMessage request, String uniqueId) { } - public static String unPinMessage(RequestPinMessage request, String uniqueId) { + public static String unPinMessage(PinUnpinMessageRequest request, String uniqueId) { long messageId = request.getMessageId(); diff --git a/podchat/src/main/java/com/fanap/podchat/chat/pin/pin_message/model/RequestPinMessage.java b/podchat/src/main/java/com/fanap/podchat/chat/pin/pin_message/model/PinUnpinMessageRequest.java similarity index 81% rename from podchat/src/main/java/com/fanap/podchat/chat/pin/pin_message/model/RequestPinMessage.java rename to podchat/src/main/java/com/fanap/podchat/chat/pin/pin_message/model/PinUnpinMessageRequest.java index c1066f48..5dab3faf 100644 --- a/podchat/src/main/java/com/fanap/podchat/chat/pin/pin_message/model/RequestPinMessage.java +++ b/podchat/src/main/java/com/fanap/podchat/chat/pin/pin_message/model/PinUnpinMessageRequest.java @@ -3,13 +3,13 @@ import com.fanap.podchat.requestobject.GeneralRequestObject; -public class RequestPinMessage extends GeneralRequestObject { +public class PinUnpinMessageRequest extends GeneralRequestObject { private long messageId; private boolean notifyAll; - public RequestPinMessage(Builder builder) { + public PinUnpinMessageRequest(Builder builder) { super(builder); this.messageId = builder.messageId; this.notifyAll = builder.notifyAll; @@ -40,8 +40,8 @@ public Builder setNotifyAll(boolean notifyAll) { } @Override - public RequestPinMessage build() { - return new RequestPinMessage(this); + public PinUnpinMessageRequest build() { + return new PinUnpinMessageRequest(this); } @Override diff --git a/podchat/src/main/java/com/fanap/podchat/chat/pin/pin_thread/PinThread.java b/podchat/src/main/java/com/fanap/podchat/chat/pin/pin_thread/PinThread.java index 732423b7..9e9eb6d3 100644 --- a/podchat/src/main/java/com/fanap/podchat/chat/pin/pin_thread/PinThread.java +++ b/podchat/src/main/java/com/fanap/podchat/chat/pin/pin_thread/PinThread.java @@ -1,25 +1,18 @@ package com.fanap.podchat.chat.pin.pin_thread; -import android.util.Log; - import com.fanap.podchat.chat.App; -import com.fanap.podchat.chat.ChatHandler; import com.fanap.podchat.chat.CoreConfig; -import com.fanap.podchat.chat.pin.pin_thread.model.RequestPinThread; +import com.fanap.podchat.chat.pin.pin_thread.model.PinUnpinThreadRequest; import com.fanap.podchat.chat.pin.pin_thread.model.ResultPinThread; import com.fanap.podchat.mainmodel.AsyncMessage; import com.fanap.podchat.mainmodel.ChatMessage; import com.fanap.podchat.model.ChatResponse; -import com.fanap.podchat.util.AsyncAckType; -import com.fanap.podchat.util.ChatConstant; import com.fanap.podchat.util.ChatMessageType; -import com.fanap.podchat.util.Util; -import com.google.gson.JsonObject; public class PinThread { - public static String pinThread(RequestPinThread request, String uniqueId) { + public static String pinThread(PinUnpinThreadRequest request, String uniqueId) { long threadId = request.getThreadId(); @@ -37,7 +30,7 @@ public static String pinThread(RequestPinThread request, String uniqueId) { } - public static String unPinThread(RequestPinThread request, String uniqueId) { + public static String unPinThread(PinUnpinThreadRequest request, String uniqueId) { long threadId = request.getThreadId(); diff --git a/podchat/src/main/java/com/fanap/podchat/chat/pin/pin_thread/model/RequestPinThread.java b/podchat/src/main/java/com/fanap/podchat/chat/pin/pin_thread/model/PinUnpinThreadRequest.java similarity index 77% rename from podchat/src/main/java/com/fanap/podchat/chat/pin/pin_thread/model/RequestPinThread.java rename to podchat/src/main/java/com/fanap/podchat/chat/pin/pin_thread/model/PinUnpinThreadRequest.java index fda42b3a..d260789b 100644 --- a/podchat/src/main/java/com/fanap/podchat/chat/pin/pin_thread/model/RequestPinThread.java +++ b/podchat/src/main/java/com/fanap/podchat/chat/pin/pin_thread/model/PinUnpinThreadRequest.java @@ -4,10 +4,10 @@ import com.fanap.podchat.requestobject.GeneralRequestObject; -public class RequestPinThread extends GeneralRequestObject { +public class PinUnpinThreadRequest extends GeneralRequestObject { private long threadId; - RequestPinThread(@NonNull Builder builder) { + PinUnpinThreadRequest(@NonNull Builder builder) { super(builder); this.threadId = builder.threadId; } @@ -28,8 +28,8 @@ public Builder(long threadId) { } @NonNull - public RequestPinThread build() { - return new RequestPinThread(this); + public PinUnpinThreadRequest build() { + return new PinUnpinThreadRequest(this); } @NonNull diff --git a/podchat/src/main/java/com/fanap/podchat/chat/thread/public_thread/RequestCheckIsNameAvailable.java b/podchat/src/main/java/com/fanap/podchat/chat/thread/public_thread/IsPublicThreadNameAvailableRequest.java similarity index 70% rename from podchat/src/main/java/com/fanap/podchat/chat/thread/public_thread/RequestCheckIsNameAvailable.java rename to podchat/src/main/java/com/fanap/podchat/chat/thread/public_thread/IsPublicThreadNameAvailableRequest.java index dffedbaf..b280de32 100644 --- a/podchat/src/main/java/com/fanap/podchat/chat/thread/public_thread/RequestCheckIsNameAvailable.java +++ b/podchat/src/main/java/com/fanap/podchat/chat/thread/public_thread/IsPublicThreadNameAvailableRequest.java @@ -2,11 +2,11 @@ import com.fanap.podchat.requestobject.GeneralRequestObject; -public class RequestCheckIsNameAvailable extends GeneralRequestObject { +public class IsPublicThreadNameAvailableRequest extends GeneralRequestObject { private String uniqueName; - private RequestCheckIsNameAvailable(Builder builder) { + private IsPublicThreadNameAvailableRequest(Builder builder) { super(builder); this.uniqueName = builder.uniqueName; } @@ -28,8 +28,8 @@ public Builder(String uniqueName) { } @Override - public RequestCheckIsNameAvailable build() { - return new RequestCheckIsNameAvailable(this); + public IsPublicThreadNameAvailableRequest build() { + return new IsPublicThreadNameAvailableRequest(this); } @Override diff --git a/podchat/src/main/java/com/fanap/podchat/chat/thread/public_thread/RequestJoinPublicThread.java b/podchat/src/main/java/com/fanap/podchat/chat/thread/public_thread/JoinPublicThreadRequest.java similarity index 77% rename from podchat/src/main/java/com/fanap/podchat/chat/thread/public_thread/RequestJoinPublicThread.java rename to podchat/src/main/java/com/fanap/podchat/chat/thread/public_thread/JoinPublicThreadRequest.java index e1534c70..fffc3231 100644 --- a/podchat/src/main/java/com/fanap/podchat/chat/thread/public_thread/RequestJoinPublicThread.java +++ b/podchat/src/main/java/com/fanap/podchat/chat/thread/public_thread/JoinPublicThreadRequest.java @@ -2,12 +2,12 @@ import com.fanap.podchat.requestobject.GeneralRequestObject; -public class RequestJoinPublicThread extends GeneralRequestObject { +public class JoinPublicThreadRequest extends GeneralRequestObject { private String uniqueName; - public RequestJoinPublicThread(Builder builder) { + public JoinPublicThreadRequest(Builder builder) { super(builder); this.uniqueName = builder.uniqueName; } @@ -31,8 +31,8 @@ public Builder setUniqueName(String uniqueName) { } @Override - public RequestJoinPublicThread build() { - return new RequestJoinPublicThread(this); + public JoinPublicThreadRequest build() { + return new JoinPublicThreadRequest(this); } @Override diff --git a/podchat/src/main/java/com/fanap/podchat/chat/thread/public_thread/PublicThread.java b/podchat/src/main/java/com/fanap/podchat/chat/thread/public_thread/PublicThread.java index 6305748d..3907ca15 100644 --- a/podchat/src/main/java/com/fanap/podchat/chat/thread/public_thread/PublicThread.java +++ b/podchat/src/main/java/com/fanap/podchat/chat/thread/public_thread/PublicThread.java @@ -14,7 +14,7 @@ public class PublicThread { - public static String checkIfNameIsAvailable(RequestCheckIsNameAvailable request, String uniqueId) { + public static String checkIfNameIsAvailable(IsPublicThreadNameAvailableRequest request, String uniqueId) { AsyncMessage message = new AsyncMessage(); @@ -51,7 +51,7 @@ public static ChatResponse handleIsNameAvailableResponse( } - public static String joinPublicThread(RequestJoinPublicThread request, String uniqueId) { + public static String joinPublicThread(JoinPublicThreadRequest request, String uniqueId) { AsyncMessage message = new AsyncMessage(); diff --git a/podchat/src/main/java/com/fanap/podchat/chat/thread/public_thread/RequestCreatePublicThread.java b/podchat/src/main/java/com/fanap/podchat/chat/thread/public_thread/RequestCreatePublicThread.java index 51e2b798..e9ae9c2a 100644 --- a/podchat/src/main/java/com/fanap/podchat/chat/thread/public_thread/RequestCreatePublicThread.java +++ b/podchat/src/main/java/com/fanap/podchat/chat/thread/public_thread/RequestCreatePublicThread.java @@ -3,11 +3,11 @@ import android.support.annotation.NonNull; import com.fanap.podchat.mainmodel.Invitee; -import com.fanap.podchat.requestobject.RequestCreateThread; +import com.fanap.podchat.requestobject.CreateThreadRequest; import java.util.List; -public class RequestCreatePublicThread extends RequestCreateThread { +public class RequestCreatePublicThread extends CreateThreadRequest { private String uniqueName; @@ -22,7 +22,7 @@ public String getUniqueName() { return uniqueName; } - public static class Builder extends RequestCreateThread.Builder { + public static class Builder extends CreateThreadRequest.Builder { private String uniqueName; diff --git a/podchat/src/main/java/com/fanap/podchat/chat/user/profile/ChatProfileVO.java b/podchat/src/main/java/com/fanap/podchat/chat/user/profile/ChatProfileVO.java index d02a1bee..5a8e15a8 100644 --- a/podchat/src/main/java/com/fanap/podchat/chat/user/profile/ChatProfileVO.java +++ b/podchat/src/main/java/com/fanap/podchat/chat/user/profile/ChatProfileVO.java @@ -5,7 +5,7 @@ import android.arch.persistence.room.PrimaryKey; @Entity -public class ChatProfileVO extends ResultUpdateProfile { +public class ChatProfileVO extends UpdateProfileResponse { @PrimaryKey private long id; diff --git a/podchat/src/main/java/com/fanap/podchat/chat/user/profile/RequestUpdateProfile.java b/podchat/src/main/java/com/fanap/podchat/chat/user/profile/UpdateProfileRequest.java similarity index 81% rename from podchat/src/main/java/com/fanap/podchat/chat/user/profile/RequestUpdateProfile.java rename to podchat/src/main/java/com/fanap/podchat/chat/user/profile/UpdateProfileRequest.java index b78aca97..c37b10d6 100644 --- a/podchat/src/main/java/com/fanap/podchat/chat/user/profile/RequestUpdateProfile.java +++ b/podchat/src/main/java/com/fanap/podchat/chat/user/profile/UpdateProfileRequest.java @@ -4,7 +4,7 @@ import com.fanap.podchat.requestobject.GeneralRequestObject; -public class RequestUpdateProfile extends GeneralRequestObject { +public class UpdateProfileRequest extends GeneralRequestObject { private String bio; private String metadata; @@ -18,7 +18,7 @@ public String getMetadata() { return metadata; } - public RequestUpdateProfile(Builder builder) { + public UpdateProfileRequest(Builder builder) { super(builder); this.bio = builder.bio; this.metadata = builder.metadata; @@ -45,9 +45,9 @@ public Builder setMetadata(String metadata) { } @NonNull - public RequestUpdateProfile build() { + public UpdateProfileRequest build() { - return new RequestUpdateProfile(this); + return new UpdateProfileRequest(this); } @Override diff --git a/podchat/src/main/java/com/fanap/podchat/chat/user/profile/ResultUpdateProfile.java b/podchat/src/main/java/com/fanap/podchat/chat/user/profile/UpdateProfileResponse.java similarity index 82% rename from podchat/src/main/java/com/fanap/podchat/chat/user/profile/ResultUpdateProfile.java rename to podchat/src/main/java/com/fanap/podchat/chat/user/profile/UpdateProfileResponse.java index 3d3bc6c3..079bfdd3 100644 --- a/podchat/src/main/java/com/fanap/podchat/chat/user/profile/ResultUpdateProfile.java +++ b/podchat/src/main/java/com/fanap/podchat/chat/user/profile/UpdateProfileResponse.java @@ -1,11 +1,11 @@ package com.fanap.podchat.chat.user.profile; -public class ResultUpdateProfile { +public class UpdateProfileResponse { private String bio; private String metadata; - public ResultUpdateProfile() { } + public UpdateProfileResponse() { } public String getBio() { return bio; diff --git a/podchat/src/main/java/com/fanap/podchat/chat/user/profile/UserProfile.java b/podchat/src/main/java/com/fanap/podchat/chat/user/profile/UserProfile.java index f020a6fe..542f7117 100644 --- a/podchat/src/main/java/com/fanap/podchat/chat/user/profile/UserProfile.java +++ b/podchat/src/main/java/com/fanap/podchat/chat/user/profile/UserProfile.java @@ -15,7 +15,7 @@ public class UserProfile { - public static String setProfile(RequestUpdateProfile request,String uniqueId){ + public static String setProfile(UpdateProfileRequest request, String uniqueId){ String bio = request.getBio(); String metadata = request.getMetadata(); @@ -37,11 +37,11 @@ public static String setProfile(RequestUpdateProfile request,String uniqueId){ - public static ChatResponse handleOutputUpdateProfile(ChatMessage chatMessage){ + public static ChatResponse handleOutputUpdateProfile(ChatMessage chatMessage){ - ChatResponse response = new ChatResponse<>(); + ChatResponse response = new ChatResponse<>(); - ResultUpdateProfile result = App.getGson().fromJson(chatMessage.getContent(),ResultUpdateProfile.class); + UpdateProfileResponse result = App.getGson().fromJson(chatMessage.getContent(), UpdateProfileResponse.class); response.setResult(result); diff --git a/podchat/src/main/java/com/fanap/podchat/chat/user/user_roles/UserRoles.java b/podchat/src/main/java/com/fanap/podchat/chat/user/user_roles/UserRoles.java index 79f23e23..3edf7ca0 100644 --- a/podchat/src/main/java/com/fanap/podchat/chat/user/user_roles/UserRoles.java +++ b/podchat/src/main/java/com/fanap/podchat/chat/user/user_roles/UserRoles.java @@ -7,18 +7,16 @@ import com.fanap.podchat.mainmodel.AsyncMessage; import com.fanap.podchat.mainmodel.ChatMessage; import com.fanap.podchat.model.ChatResponse; -import com.fanap.podchat.requestobject.RequestGetUserRoles; +import com.fanap.podchat.requestobject.GetCurrentUserRolesRequest; import com.fanap.podchat.util.ChatMessageType; -import com.google.gson.JsonObject; import com.google.gson.reflect.TypeToken; import java.util.ArrayList; -import java.util.List; public class UserRoles { - public static String getUserRoles(RequestGetUserRoles request, String uniqueId) { + public static String getUserRoles(GetCurrentUserRolesRequest request, String uniqueId) { long threadId = request.getThreadId(); @@ -53,7 +51,7 @@ public static ChatResponse handleOnGetUserRoles(ChatMess } - public static ChatResponse handleOnGetUserRolesFromCache(String uniqueId, RequestGetUserRoles request, CacheUserRoles cacheUserRole) { + public static ChatResponse handleOnGetUserRolesFromCache(String uniqueId, GetCurrentUserRolesRequest request, CacheUserRoles cacheUserRole) { ArrayList roles = new ArrayList<>(cacheUserRole.getRole()); diff --git a/podchat/src/main/java/com/fanap/podchat/mainmodel/RequestSearchContact.java b/podchat/src/main/java/com/fanap/podchat/mainmodel/SearchContactRequest.java similarity index 93% rename from podchat/src/main/java/com/fanap/podchat/mainmodel/RequestSearchContact.java rename to podchat/src/main/java/com/fanap/podchat/mainmodel/SearchContactRequest.java index 4166b469..990c996d 100644 --- a/podchat/src/main/java/com/fanap/podchat/mainmodel/RequestSearchContact.java +++ b/podchat/src/main/java/com/fanap/podchat/mainmodel/SearchContactRequest.java @@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName; -public class RequestSearchContact { +public class SearchContactRequest { private String firstName; private String lastName; private String cellphoneNumber; @@ -18,7 +18,7 @@ public class RequestSearchContact { private final String size; private boolean useCache = true; - public RequestSearchContact(Builder builder) { + public SearchContactRequest(Builder builder) { this.firstName = builder.firstName; this.lastName = builder.lastName; this.size = builder.size; @@ -36,7 +36,7 @@ public String getOrder() { return order; } - public RequestSearchContact(String size, String offset) { + public SearchContactRequest(String size, String offset) { this.offset = offset; this.size = size; } @@ -172,8 +172,8 @@ public Builder withNoCache() { } @NonNull - public RequestSearchContact build() { - return new RequestSearchContact(this); + public SearchContactRequest build() { + return new SearchContactRequest(this); } } } diff --git a/podchat/src/main/java/com/fanap/podchat/model/ResultBlock.java b/podchat/src/main/java/com/fanap/podchat/model/BlockUnblockUserResponse.java similarity index 89% rename from podchat/src/main/java/com/fanap/podchat/model/ResultBlock.java rename to podchat/src/main/java/com/fanap/podchat/model/BlockUnblockUserResponse.java index 5a5e76ea..2d3955ac 100644 --- a/podchat/src/main/java/com/fanap/podchat/model/ResultBlock.java +++ b/podchat/src/main/java/com/fanap/podchat/model/BlockUnblockUserResponse.java @@ -3,7 +3,7 @@ import com.fanap.podchat.mainmodel.BlockedContact; import com.fanap.podchat.mainmodel.Contact; -public class ResultBlock { +public class BlockUnblockUserResponse { private BlockedContact contact; public BlockedContact getContact() { diff --git a/podchat/src/main/java/com/fanap/podchat/model/ResultBlockList.java b/podchat/src/main/java/com/fanap/podchat/model/GetBlockedUserListResponse.java similarity index 88% rename from podchat/src/main/java/com/fanap/podchat/model/ResultBlockList.java rename to podchat/src/main/java/com/fanap/podchat/model/GetBlockedUserListResponse.java index 60b98776..99900c76 100644 --- a/podchat/src/main/java/com/fanap/podchat/model/ResultBlockList.java +++ b/podchat/src/main/java/com/fanap/podchat/model/GetBlockedUserListResponse.java @@ -4,7 +4,7 @@ import java.util.List; -public class ResultBlockList { +public class GetBlockedUserListResponse { private List contacts; diff --git a/podchat/src/main/java/com/fanap/podchat/model/ResultContact.java b/podchat/src/main/java/com/fanap/podchat/model/GetContactsResponse.java similarity index 96% rename from podchat/src/main/java/com/fanap/podchat/model/ResultContact.java rename to podchat/src/main/java/com/fanap/podchat/model/GetContactsResponse.java index 24f66057..494c7c6a 100644 --- a/podchat/src/main/java/com/fanap/podchat/model/ResultContact.java +++ b/podchat/src/main/java/com/fanap/podchat/model/GetContactsResponse.java @@ -4,7 +4,7 @@ import java.util.ArrayList; -public class ResultContact { +public class GetContactsResponse { private ArrayList contacts; private long contentCount; private boolean hasNext; diff --git a/podchat/src/main/java/com/fanap/podchat/model/ResultUserInfo.java b/podchat/src/main/java/com/fanap/podchat/model/GetUserInfoResponse.java similarity index 87% rename from podchat/src/main/java/com/fanap/podchat/model/ResultUserInfo.java rename to podchat/src/main/java/com/fanap/podchat/model/GetUserInfoResponse.java index eaf79554..f43a55aa 100644 --- a/podchat/src/main/java/com/fanap/podchat/model/ResultUserInfo.java +++ b/podchat/src/main/java/com/fanap/podchat/model/GetUserInfoResponse.java @@ -2,7 +2,7 @@ import com.fanap.podchat.mainmodel.UserInfo; -public class ResultUserInfo { +public class GetUserInfoResponse { private UserInfo user; public UserInfo getUser() { diff --git a/podchat/src/main/java/com/fanap/podchat/model/OutPutBlock.java b/podchat/src/main/java/com/fanap/podchat/model/OutPutBlock.java index b91b5018..c7e18648 100644 --- a/podchat/src/main/java/com/fanap/podchat/model/OutPutBlock.java +++ b/podchat/src/main/java/com/fanap/podchat/model/OutPutBlock.java @@ -4,7 +4,7 @@ public class OutPutBlock extends BaseOutPut { private String referenceNumber; private String ott; - private ResultBlock result; + private BlockUnblockUserResponse result; public String getReferenceNumber() { return referenceNumber; @@ -22,11 +22,11 @@ public void setOtt(String ott) { this.ott = ott; } - public ResultBlock getResult() { + public BlockUnblockUserResponse getResult() { return result; } - public void setResult(ResultBlock result) { + public void setResult(BlockUnblockUserResponse result) { this.result = result; } } diff --git a/podchat/src/main/java/com/fanap/podchat/model/OutPutBlockList.java b/podchat/src/main/java/com/fanap/podchat/model/OutPutBlockList.java index 3182996a..f70885c4 100644 --- a/podchat/src/main/java/com/fanap/podchat/model/OutPutBlockList.java +++ b/podchat/src/main/java/com/fanap/podchat/model/OutPutBlockList.java @@ -3,7 +3,7 @@ public class OutPutBlockList extends BaseOutPut { private String referenceNumber; private String ott; - private ResultBlockList result; + private GetBlockedUserListResponse result; public String getReferenceNumber() { return referenceNumber; @@ -21,11 +21,11 @@ public void setOtt(String ott) { this.ott = ott; } - public ResultBlockList getResult() { + public GetBlockedUserListResponse getResult() { return result; } - public void setResult(ResultBlockList result) { + public void setResult(GetBlockedUserListResponse result) { this.result = result; } } diff --git a/podchat/src/main/java/com/fanap/podchat/model/OutPutContact.java b/podchat/src/main/java/com/fanap/podchat/model/OutPutContact.java index 1af6dd34..a613410a 100644 --- a/podchat/src/main/java/com/fanap/podchat/model/OutPutContact.java +++ b/podchat/src/main/java/com/fanap/podchat/model/OutPutContact.java @@ -2,13 +2,13 @@ public class OutPutContact extends BaseOutPut { - private ResultContact result; + private GetContactsResponse result; - public ResultContact getResult() { + public GetContactsResponse getResult() { return result; } - public void setResult(ResultContact result) { + public void setResult(GetContactsResponse result) { this.result = result; } diff --git a/podchat/src/main/java/com/fanap/podchat/model/OutPutUserInfo.java b/podchat/src/main/java/com/fanap/podchat/model/OutPutUserInfo.java index 4dd8d5f5..705ef1cd 100644 --- a/podchat/src/main/java/com/fanap/podchat/model/OutPutUserInfo.java +++ b/podchat/src/main/java/com/fanap/podchat/model/OutPutUserInfo.java @@ -2,13 +2,13 @@ public class OutPutUserInfo extends BaseOutPut{ - private ResultUserInfo result; + private GetUserInfoResponse result; - public ResultUserInfo getResult() { + public GetUserInfoResponse getResult() { return result; } - public void setResult(ResultUserInfo resultUserInfo) { + public void setResult(GetUserInfoResponse resultUserInfo) { this.result = resultUserInfo; } } diff --git a/podchat/src/main/java/com/fanap/podchat/persistance/MessageDatabaseHelper.java b/podchat/src/main/java/com/fanap/podchat/persistance/MessageDatabaseHelper.java index dcd982c9..9ddcc095 100644 --- a/podchat/src/main/java/com/fanap/podchat/persistance/MessageDatabaseHelper.java +++ b/podchat/src/main/java/com/fanap/podchat/persistance/MessageDatabaseHelper.java @@ -29,11 +29,11 @@ import com.fanap.podchat.cachemodel.queue.WaitQueueCache; import com.fanap.podchat.chat.App; import com.fanap.podchat.chat.Chat; -import com.fanap.podchat.chat.mention.model.RequestGetMentionList; -import com.fanap.podchat.chat.messge.RequestGetUnreadMessagesCount; +import com.fanap.podchat.chat.mention.model.GetMentionedRequest; +import com.fanap.podchat.chat.messge.GetAllUnreadMessageCountRequest; import com.fanap.podchat.chat.thread.ThreadManager; import com.fanap.podchat.chat.user.profile.ChatProfileVO; -import com.fanap.podchat.chat.user.profile.ResultUpdateProfile; +import com.fanap.podchat.chat.user.profile.UpdateProfileResponse; import com.fanap.podchat.chat.user.user_roles.model.CacheUserRoles; import com.fanap.podchat.chat.user.user_roles.model.ResultCurrentUserRoles; import com.fanap.podchat.mainmodel.BlockedContact; @@ -45,19 +45,19 @@ import com.fanap.podchat.mainmodel.MessageVO; import com.fanap.podchat.mainmodel.Participant; import com.fanap.podchat.mainmodel.PinMessageVO; -import com.fanap.podchat.mainmodel.RequestSearchContact; +import com.fanap.podchat.mainmodel.SearchContactRequest; import com.fanap.podchat.mainmodel.Thread; import com.fanap.podchat.mainmodel.UserInfo; import com.fanap.podchat.model.ChatResponse; import com.fanap.podchat.model.ConversationSummery; import com.fanap.podchat.model.ReplyInfoVO; import com.fanap.podchat.chat.pin.pin_message.model.ResultPinMessage; -import com.fanap.podchat.model.ResultContact; +import com.fanap.podchat.model.GetContactsResponse; import com.fanap.podchat.model.ResultHistory; import com.fanap.podchat.persistance.dao.MessageDao; import com.fanap.podchat.persistance.dao.MessageQueueDao; -import com.fanap.podchat.requestobject.RequestGetHistory; -import com.fanap.podchat.requestobject.RequestGetUserRoles; +import com.fanap.podchat.requestobject.GetHistoryRequest; +import com.fanap.podchat.requestobject.GetCurrentUserRolesRequest; import com.fanap.podchat.util.Callback; import com.fanap.podchat.util.ChatConstant; import com.fanap.podchat.util.FunctionalListener; @@ -1417,7 +1417,7 @@ public List getCacheHistories(@NonNull History history, long thr } - private History getHistoryModelFromRequestGetHistory(RequestGetHistory request) { + private History getHistoryModelFromRequestGetHistory(GetHistoryRequest request) { return new History.Builder() .count(request.getCount()) .firstMessageId(request.getFirstMessageId()) @@ -1434,7 +1434,7 @@ private History getHistoryModelFromRequestGetHistory(RequestGetHistory request) } - public void getMentionList(RequestGetMentionList request, FunctionalListener listener) { + public void getMentionList(GetMentionedRequest request, FunctionalListener listener) { worker(() -> { @@ -3135,13 +3135,13 @@ public List getContactsByFirst(String firstName) { @NonNull - public ChatResponse searchContacts(RequestSearchContact requestSearchContact, String size, String offset) { + public ChatResponse searchContacts(SearchContactRequest requestSearchContact, String size, String offset) { List contacts = new ArrayList<>(); - ChatResponse chatResponse = new ChatResponse<>(); + ChatResponse chatResponse = new ChatResponse<>(); chatResponse.setCache(true); - ResultContact resultContact = new ResultContact(); + GetContactsResponse resultContact = new GetContactsResponse(); resultContact.setContacts(new ArrayList<>(contacts)); chatResponse.setHasError(false); @@ -3541,7 +3541,7 @@ public void setThreadUnPinned(ChatMessage chatMessage) { } - public void updateChatProfile(ResultUpdateProfile result) { + public void updateChatProfile(UpdateProfileResponse result) { worker(() -> { UserInfo userInfo = getUserInfo(); @@ -3571,7 +3571,7 @@ private ChatProfileVO getChatProfile(long id) { } - public void loadAllUnreadMessagesCount(RequestGetUnreadMessagesCount req, OnWorkDone listener) + public void loadAllUnreadMessagesCount(GetAllUnreadMessageCountRequest req, OnWorkDone listener) throws RoomIntegrityException { @@ -3590,7 +3590,7 @@ public void loadAllUnreadMessagesCount(RequestGetUnreadMessagesCount req, OnWork } - public void getCurrentUserRoles(RequestGetUserRoles request, OnWorkDone listener) { + public void getCurrentUserRoles(GetCurrentUserRolesRequest request, OnWorkDone listener) { worker(() -> { diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestAddContact.java b/podchat/src/main/java/com/fanap/podchat/requestobject/AddContactRequest.java similarity index 90% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestAddContact.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/AddContactRequest.java index 8c113a76..fa8b39e1 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestAddContact.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/AddContactRequest.java @@ -2,7 +2,7 @@ import android.support.annotation.NonNull; -public class RequestAddContact extends GeneralRequestObject { +public class AddContactRequest extends GeneralRequestObject { private String firstName; private String lastName; @@ -10,7 +10,7 @@ public class RequestAddContact extends GeneralRequestObject { private String email; private String username; - RequestAddContact(@NonNull Builder builder) { + AddContactRequest(@NonNull Builder builder) { super(builder); this.firstName = builder.firstName; this.lastName = builder.lastName; @@ -80,8 +80,8 @@ public Builder email(String email) { } @NonNull - public RequestAddContact build(){ - return new RequestAddContact(this); + public AddContactRequest build(){ + return new AddContactRequest(this); } @NonNull diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestAddParticipants.java b/podchat/src/main/java/com/fanap/podchat/requestobject/AddParticipantsRequest.java similarity index 91% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestAddParticipants.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/AddParticipantsRequest.java index e19e1872..d2c18fdd 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestAddParticipants.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/AddParticipantsRequest.java @@ -5,13 +5,13 @@ import java.util.Arrays; import java.util.List; -public class RequestAddParticipants extends GeneralRequestObject { +public class AddParticipantsRequest extends GeneralRequestObject { private long threadId; private List contactIds; private List userNames; private List coreUserIds; - private RequestAddParticipants(Builder builder) { + private AddParticipantsRequest(Builder builder) { super(builder); this.contactIds = builder.contactIds; this.threadId = builder.threadId; @@ -19,7 +19,7 @@ private RequestAddParticipants(Builder builder) { this.coreUserIds = builder.coreUserIds; } - public RequestAddParticipants() { + public AddParticipantsRequest() { } public static ThreadIdStep newBuilder() { @@ -92,7 +92,7 @@ public interface ActionStep { public interface BuildStep { - RequestAddParticipants build(); + AddParticipantsRequest build(); } @@ -115,8 +115,8 @@ protected Builder self() { return this; } - public RequestAddParticipants build() { - return new RequestAddParticipants(this); + public AddParticipantsRequest build() { + return new AddParticipantsRequest(this); } } @@ -188,9 +188,9 @@ public BuildStep withCoreUserIds(List coreUserIds) { @Override - public RequestAddParticipants build() { + public AddParticipantsRequest build() { - RequestAddParticipants request = new RequestAddParticipants(); + AddParticipantsRequest request = new AddParticipantsRequest(); request.setThreadId(threadId); diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestBlock.java b/podchat/src/main/java/com/fanap/podchat/requestobject/BlockRequest.java similarity index 89% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestBlock.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/BlockRequest.java index 51ba5e8b..291c3c78 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestBlock.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/BlockRequest.java @@ -2,12 +2,12 @@ import android.support.annotation.NonNull; -public class RequestBlock { +public class BlockRequest { private long contactId; private long userId; private long threadId; - RequestBlock(Builder builder) { + BlockRequest(Builder builder) { this.contactId = builder.contactId; this.userId = builder.userId; this.threadId = builder.threadId; @@ -35,8 +35,8 @@ public Builder threadId(long threadId) { } @NonNull - public RequestBlock build() { - return new RequestBlock(this); + public BlockRequest build() { + return new BlockRequest(this); } } diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestClearHistory.java b/podchat/src/main/java/com/fanap/podchat/requestobject/ClearHistoryRequest.java similarity index 71% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestClearHistory.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/ClearHistoryRequest.java index 89dd0975..61eb3553 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestClearHistory.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/ClearHistoryRequest.java @@ -1,10 +1,10 @@ package com.fanap.podchat.requestobject; -public class RequestClearHistory { +public class ClearHistoryRequest { private long threadId; - private RequestClearHistory (Builder builder){ + private ClearHistoryRequest(Builder builder){ this.threadId = builder.threadId; } @@ -15,8 +15,8 @@ public Builder (long threadId){ this.threadId = threadId; } - public RequestClearHistory build(){ - return new RequestClearHistory(this); + public ClearHistoryRequest build(){ + return new ClearHistoryRequest(this); } } diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestConnect.java b/podchat/src/main/java/com/fanap/podchat/requestobject/ConnectRequest.java similarity index 94% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestConnect.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/ConnectRequest.java index 92637552..80d70f16 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestConnect.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/ConnectRequest.java @@ -2,7 +2,7 @@ import android.support.annotation.NonNull; -public class RequestConnect extends BaseRequestObject { +public class ConnectRequest extends BaseRequestObject { private String socketAddress; private String appId; @@ -14,7 +14,7 @@ public class RequestConnect extends BaseRequestObject { private String podSpaceServer; - public RequestConnect(@NonNull Builder builder) { + public ConnectRequest(@NonNull Builder builder) { super(builder); this.socketAddress = builder.socketAddress; this.appId = builder.appId; @@ -61,8 +61,8 @@ public Builder(String socketAddress, String appId, String severName, String toke } @NonNull - public RequestConnect build(){ - return new RequestConnect(this); + public ConnectRequest build(){ + return new ConnectRequest(this); } @NonNull diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestCreateThread.java b/podchat/src/main/java/com/fanap/podchat/requestobject/CreateThreadRequest.java similarity index 82% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestCreateThread.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/CreateThreadRequest.java index cbba0f0c..5432ed98 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestCreateThread.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/CreateThreadRequest.java @@ -1,16 +1,13 @@ package com.fanap.podchat.requestobject; -import android.arch.persistence.room.Ignore; import android.support.annotation.NonNull; import com.fanap.podchat.mainmodel.Invitee; import com.fanap.podchat.mainmodel.RequestThreadInnerMessage; -import com.google.gson.annotations.Expose; -import com.google.gson.annotations.JsonAdapter; import java.util.List; -public class RequestCreateThread extends BaseRequestObject { +public class CreateThreadRequest extends BaseRequestObject { private int type; private String ownerSsoId; @@ -21,10 +18,10 @@ public class RequestCreateThread extends BaseRequestObject { private String image; private String metadata; - private transient RequestUploadImage uploadImageRequest; + private transient UploadImageRequest uploadImageRequest; - protected RequestCreateThread(@NonNull Builder builder) { + protected CreateThreadRequest(@NonNull Builder builder) { super(builder); this.type = builder.type; this.message = builder.message; @@ -38,7 +35,7 @@ protected RequestCreateThread(@NonNull Builder builder) { } - public RequestUploadImage getUploadThreadImageRequest() { + public UploadImageRequest getUploadThreadImageRequest() { return uploadImageRequest; } @@ -48,7 +45,7 @@ public static class Builder extends BaseRequestObject.Builder { private final List invitees; private String title; private RequestThreadInnerMessage message; - private RequestUploadImage uploadImageRequest; + private UploadImageRequest uploadImageRequest; private String description; @@ -91,21 +88,21 @@ public Builder withMetadata(String metadata) { } - public Builder setUploadThreadImageRequest(RequestUploadImage uploadImageRequest) { + public Builder setUploadThreadImageRequest(UploadImageRequest uploadImageRequest) { this.uploadImageRequest = uploadImageRequest; return this; } @NonNull @Override - protected RequestCreateThread.Builder self() { + protected CreateThreadRequest.Builder self() { return this; } @NonNull - public RequestCreateThread build() { - return new RequestCreateThread(this); + public CreateThreadRequest build() { + return new CreateThreadRequest(this); } } diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestCreateThreadWithFile.java b/podchat/src/main/java/com/fanap/podchat/requestobject/CreateThreadWithFileRequest.java similarity index 57% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestCreateThreadWithFile.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/CreateThreadWithFileRequest.java index 6fa13e56..64368e17 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestCreateThreadWithFile.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/CreateThreadWithFileRequest.java @@ -4,48 +4,47 @@ import com.fanap.podchat.mainmodel.Invitee; import com.fanap.podchat.mainmodel.RequestThreadInnerMessage; -import java.io.Serializable; import java.util.List; -public class RequestCreateThreadWithFile extends RequestCreateThreadWithMessage{ +public class CreateThreadWithFileRequest extends CreateThreadWithMessageRequest { - private transient RequestUploadFile file; + private transient UploadFileRequest file; - RequestCreateThreadWithFile(Builder builder) { + CreateThreadWithFileRequest(Builder builder) { super(builder); this.file = builder.file; } - public RequestUploadFile getFile() { + public UploadFileRequest getFile() { return file; } - public void setFile(RequestUploadFile file) { + public void setFile(UploadFileRequest file) { this.file = file; } - public RequestCreateThreadWithFile(RequestCreateThreadWithMessage.Builder builder, RequestUploadFile file) { + public CreateThreadWithFileRequest(CreateThreadWithMessageRequest.Builder builder, UploadFileRequest file) { super(builder); this.file = file; } - public RequestCreateThreadWithFile(BaseRequestObject.Builder builder, RequestUploadFile file) { + public CreateThreadWithFileRequest(BaseRequestObject.Builder builder, UploadFileRequest file) { super(builder); this.file = file; } - public RequestCreateThreadWithFile(RequestUploadFile file) { + public CreateThreadWithFileRequest(UploadFileRequest file) { this.file = file; } - public static class Builder extends RequestCreateThreadWithMessage.Builder { - private RequestUploadFile file; + public static class Builder extends CreateThreadWithMessageRequest.Builder { + private UploadFileRequest file; - public Builder(int type, List invitees, RequestUploadFile file,int messageType) { + public Builder(int type, List invitees, UploadFileRequest file, int messageType) { super(type, invitees,messageType); this.file = file; } @@ -57,7 +56,7 @@ public Builder message(RequestThreadInnerMessage message) { } @Override - public Builder setUploadThreadImageRequest(RequestUploadImage uploadImageRequest) { + public Builder setUploadThreadImageRequest(UploadImageRequest uploadImageRequest) { super.setUploadThreadImageRequest(uploadImageRequest); return this; } @@ -86,8 +85,8 @@ protected Builder self() { return this; } - public RequestCreateThreadWithFile build() { - return new RequestCreateThreadWithFile(this); + public CreateThreadWithFileRequest build() { + return new CreateThreadWithFileRequest(this); } } } diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestCreateThreadWithMessage.java b/podchat/src/main/java/com/fanap/podchat/requestobject/CreateThreadWithMessageRequest.java similarity index 84% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestCreateThreadWithMessage.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/CreateThreadWithMessageRequest.java index bb4e1cbf..fd86e4a0 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestCreateThreadWithMessage.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/CreateThreadWithMessageRequest.java @@ -4,10 +4,9 @@ import com.fanap.podchat.mainmodel.Invitee; import com.fanap.podchat.mainmodel.RequestThreadInnerMessage; -import java.io.Serializable; import java.util.List; -public class RequestCreateThreadWithMessage extends BaseRequestObject { +public class CreateThreadWithMessageRequest extends BaseRequestObject { private int type; private String ownerSsoId; @@ -18,12 +17,12 @@ public class RequestCreateThreadWithMessage extends BaseRequestObject { private String image; - private transient RequestUploadImage uploadImageRequest; + private transient UploadImageRequest uploadImageRequest; private int messageType; - RequestCreateThreadWithMessage(Builder builder) { + CreateThreadWithMessageRequest(Builder builder) { super(builder); this.type = builder.type; this.message = builder.message; @@ -37,15 +36,15 @@ public class RequestCreateThreadWithMessage extends BaseRequestObject { } - public RequestCreateThreadWithMessage(BaseRequestObject.Builder builder) { + public CreateThreadWithMessageRequest(BaseRequestObject.Builder builder) { super(builder); } - public RequestUploadImage getUploadThreadImageRequest() { + public UploadImageRequest getUploadThreadImageRequest() { return uploadImageRequest; } - public RequestCreateThreadWithMessage() { + public CreateThreadWithMessageRequest() { } public int getMessageType() { @@ -120,7 +119,7 @@ public static class Builder> extends BaseRequestObject.Buil private String description; private String image; private int messageType; - private RequestUploadImage uploadImageRequest; + private UploadImageRequest uploadImageRequest; public Builder(int type, List invitees, int messageType) { @@ -130,7 +129,7 @@ public Builder(int type, List invitees, int messageType) { } - public Builder setUploadThreadImageRequest(RequestUploadImage uploadImageRequest) { + public Builder setUploadThreadImageRequest(UploadImageRequest uploadImageRequest) { this.uploadImageRequest = uploadImageRequest; return this; } @@ -161,8 +160,8 @@ protected Builder self() { } - public RequestCreateThreadWithMessage build() { - return new RequestCreateThreadWithMessage(this); + public CreateThreadWithMessageRequest build() { + return new CreateThreadWithMessageRequest(this); } } } diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestDeleteMessage.java b/podchat/src/main/java/com/fanap/podchat/requestobject/DeleteMessageRequest.java similarity index 85% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestDeleteMessage.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/DeleteMessageRequest.java index d612630c..4dd2ed06 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestDeleteMessage.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/DeleteMessageRequest.java @@ -4,12 +4,12 @@ import java.util.ArrayList; -public class RequestDeleteMessage extends GeneralRequestObject { +public class DeleteMessageRequest extends GeneralRequestObject { private ArrayList messageIds; private boolean deleteForAll; - private RequestDeleteMessage(@NonNull Builder builder) { + private DeleteMessageRequest(@NonNull Builder builder) { super(builder); this.deleteForAll = builder.deleteForAll; this.messageIds = builder.messageIds; @@ -37,8 +37,8 @@ public Builder deleteForAll(boolean deleteForAll) { } @NonNull - public RequestDeleteMessage build() { - return new RequestDeleteMessage(this); + public DeleteMessageRequest build() { + return new DeleteMessageRequest(this); } @NonNull diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestEditMessage.java b/podchat/src/main/java/com/fanap/podchat/requestobject/EditMessageRequest.java similarity index 87% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestEditMessage.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/EditMessageRequest.java index 023dbf04..d99cae29 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestEditMessage.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/EditMessageRequest.java @@ -2,12 +2,12 @@ import android.support.annotation.NonNull; -public class RequestEditMessage extends GeneralRequestObject { +public class EditMessageRequest extends GeneralRequestObject { private String messageContent; private long messageId; private String metaData; - RequestEditMessage(@NonNull Builder builder) { + EditMessageRequest(@NonNull Builder builder) { super(builder); this.metaData = builder.metaData; this.messageContent = builder.messageContent; @@ -31,8 +31,8 @@ public Builder metaData(String metaData) { } @NonNull - public RequestEditMessage build() { - return new RequestEditMessage(this); + public EditMessageRequest build() { + return new EditMessageRequest(this); } @NonNull diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestFileMessage.java b/podchat/src/main/java/com/fanap/podchat/requestobject/FileMessageRequest.java similarity index 97% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestFileMessage.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/FileMessageRequest.java index caba7575..39284fea 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestFileMessage.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/FileMessageRequest.java @@ -4,7 +4,7 @@ import android.net.Uri; import android.support.annotation.NonNull; -public class RequestFileMessage { +public class FileMessageRequest { private Activity activity; private long threadId; private Uri fileUri; @@ -18,7 +18,7 @@ public class RequestFileMessage { private String imageHc; private String imageWc; - RequestFileMessage(Builder builder) { + FileMessageRequest(Builder builder) { this.setActivity(builder.activity); this.setThreadId(builder.threadId); this.setFileUri(builder.fileUri); @@ -241,8 +241,8 @@ public Builder setImageWc(String imageWc) { } @NonNull - public RequestFileMessage build() { - return new RequestFileMessage(this); + public FileMessageRequest build() { + return new FileMessageRequest(this); } } } diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestForwardMessage.java b/podchat/src/main/java/com/fanap/podchat/requestobject/ForwardMessageRequest.java similarity index 83% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestForwardMessage.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/ForwardMessageRequest.java index 743671ed..0cf51bda 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestForwardMessage.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/ForwardMessageRequest.java @@ -4,12 +4,12 @@ import java.util.ArrayList; -public class RequestForwardMessage extends GeneralRequestObject{ +public class ForwardMessageRequest extends GeneralRequestObject{ private long threadId; private ArrayList messageIds; - RequestForwardMessage(@NonNull Builder builder){ + ForwardMessageRequest(@NonNull Builder builder){ super(builder); this.threadId = builder.threadId; this.messageIds = builder.messageIds; @@ -26,8 +26,8 @@ public Builder (long threadId,ArrayList messageIds){ } @NonNull - public RequestForwardMessage build(){ - return new RequestForwardMessage(this); + public ForwardMessageRequest build(){ + return new ForwardMessageRequest(this); } @NonNull diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestGetAdmin.java b/podchat/src/main/java/com/fanap/podchat/requestobject/GetAllThreadAdminsRequest.java similarity index 85% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestGetAdmin.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/GetAllThreadAdminsRequest.java index 26548df2..2c96b268 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestGetAdmin.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/GetAllThreadAdminsRequest.java @@ -2,14 +2,14 @@ import android.support.annotation.NonNull; -public class RequestGetAdmin extends RequestThreadParticipant { +public class GetAllThreadAdminsRequest extends GetThreadParticipantsRequest { private boolean admin; private long count; private int offset; - public RequestGetAdmin(Builder builder) { + public GetAllThreadAdminsRequest(Builder builder) { super(builder); this.admin = builder.admin; this.count = builder.count; @@ -18,7 +18,7 @@ public RequestGetAdmin(Builder builder) { } - public static class Builder extends RequestThreadParticipant.Builder { + public static class Builder extends GetThreadParticipantsRequest.Builder { public long count; public int offset; @@ -75,8 +75,8 @@ public Builder threadId(long threadId) { - public RequestGetAdmin build() { - return new RequestGetAdmin(this); + public GetAllThreadAdminsRequest build() { + return new GetAllThreadAdminsRequest(this); } } diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestBlockList.java b/podchat/src/main/java/com/fanap/podchat/requestobject/GetBlockedListRequest.java similarity index 82% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestBlockList.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/GetBlockedListRequest.java index 2eb11354..c9349cfc 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestBlockList.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/GetBlockedListRequest.java @@ -2,11 +2,11 @@ import android.support.annotation.NonNull; -public class RequestBlockList extends GeneralRequestObject { +public class GetBlockedListRequest extends GeneralRequestObject { private long count; private long offset; - RequestBlockList(@NonNull Builder builder){ + GetBlockedListRequest(@NonNull Builder builder){ super(builder); this.count = builder.count; this.offset = builder.offset; @@ -29,8 +29,8 @@ public Builder offset(long offset){ } @NonNull - public RequestBlockList build(){ - return new RequestBlockList(this); + public GetBlockedListRequest build(){ + return new GetBlockedListRequest(this); } @NonNull diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestGetContact.java b/podchat/src/main/java/com/fanap/podchat/requestobject/GetContactRequest.java similarity index 65% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestGetContact.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/GetContactRequest.java index 317347e4..b819563e 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestGetContact.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/GetContactRequest.java @@ -3,17 +3,17 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; -public class RequestGetContact extends BaseRequestObject { +public class GetContactRequest extends BaseRequestObject { - RequestGetContact(@NonNull Builder builder) { + GetContactRequest(@NonNull Builder builder) { super(builder); } public static class Builder extends BaseRequestObject.Builder{ @NonNull - public RequestGetContact build(){ - return new RequestGetContact(this); + public GetContactRequest build(){ + return new GetContactRequest(this); } @Nullable diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestGetUserRoles.java b/podchat/src/main/java/com/fanap/podchat/requestobject/GetCurrentUserRolesRequest.java similarity index 70% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestGetUserRoles.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/GetCurrentUserRolesRequest.java index cd028eab..68191193 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestGetUserRoles.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/GetCurrentUserRolesRequest.java @@ -1,10 +1,10 @@ package com.fanap.podchat.requestobject; -public class RequestGetUserRoles extends GeneralRequestObject { +public class GetCurrentUserRolesRequest extends GeneralRequestObject { long threadId; - RequestGetUserRoles(Builder builder) { + GetCurrentUserRolesRequest(Builder builder) { super(builder); this.threadId = builder.threadId; } @@ -26,8 +26,8 @@ public Builder setThreadId(long threadId) { } @Override - public RequestGetUserRoles build() { - return new RequestGetUserRoles(this) ; + public GetCurrentUserRolesRequest build() { + return new GetCurrentUserRolesRequest(this) ; } @Override diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestGetFile.java b/podchat/src/main/java/com/fanap/podchat/requestobject/GetFileRequest.java similarity index 88% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestGetFile.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/GetFileRequest.java index 2bd31cd4..7ecb4696 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestGetFile.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/GetFileRequest.java @@ -2,9 +2,7 @@ import android.support.annotation.NonNull; -import com.fanap.podchat.mainmodel.RequestSearchContact; - -public class RequestGetFile { +public class GetFileRequest { private long fileId; private String hashCode; private boolean downloadable; @@ -12,7 +10,7 @@ public class RequestGetFile { private boolean useCache = true; - RequestGetFile(Builder builder) { + GetFileRequest(Builder builder) { this.fileId = builder.fileId; this.hashCode = builder.hashCode; this.downloadable = builder.downloadable; @@ -49,8 +47,8 @@ public Builder withNoCache() { } @NonNull - public RequestGetFile build(){ - return new RequestGetFile(this); + public GetFileRequest build(){ + return new GetFileRequest(this); } } diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestGetHistory.java b/podchat/src/main/java/com/fanap/podchat/requestobject/GetHistoryRequest.java similarity index 96% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestGetHistory.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/GetHistoryRequest.java index e684a7a2..c4aea53d 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestGetHistory.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/GetHistoryRequest.java @@ -4,7 +4,7 @@ import com.fanap.podchat.mainmodel.NosqlSearchMetadataCriteria; -public class RequestGetHistory extends BaseRequestObject { +public class GetHistoryRequest extends BaseRequestObject { private long threadId; private String order; private long userId; @@ -20,7 +20,7 @@ public class RequestGetHistory extends BaseRequestObject { private String[] uniqueIds; private int messageType; - public RequestGetHistory(@NonNull Builder builder) { + public GetHistoryRequest(@NonNull Builder builder) { super(builder); this.threadId = builder.threadId; this.order = builder.order; @@ -146,8 +146,8 @@ public Builder setMessageType(int messageType) { } @NonNull - public RequestGetHistory build() { - return new RequestGetHistory(this); + public GetHistoryRequest build() { + return new GetHistoryRequest(this); } @NonNull diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestGetImage.java b/podchat/src/main/java/com/fanap/podchat/requestobject/GetImageRequest.java similarity index 90% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestGetImage.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/GetImageRequest.java index 41bc656b..58774eef 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestGetImage.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/GetImageRequest.java @@ -2,14 +2,14 @@ import android.support.annotation.NonNull; -public class RequestGetImage { +public class GetImageRequest { private long imageId; private String hashCode; private boolean downloadable; private boolean useCache = true; - RequestGetImage(Builder builder) { + GetImageRequest(Builder builder) { this.imageId = builder.imageId; this.hashCode = builder.hashCode; this.downloadable = builder.downloadable; @@ -48,8 +48,8 @@ public Builder withNoCache() { @NonNull - public RequestGetImage build() { - return new RequestGetImage(this); + public GetImageRequest build() { + return new GetImageRequest(this); } } diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestDeliveredMessageList.java b/podchat/src/main/java/com/fanap/podchat/requestobject/GetMessageDeliveredSeenListRequest.java similarity index 72% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestDeliveredMessageList.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/GetMessageDeliveredSeenListRequest.java index 26ea5607..5f745602 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestDeliveredMessageList.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/GetMessageDeliveredSeenListRequest.java @@ -2,11 +2,11 @@ import android.support.annotation.NonNull; -public class RequestDeliveredMessageList extends BaseRequestObject { +public class GetMessageDeliveredSeenListRequest extends BaseRequestObject { private long messageId; - RequestDeliveredMessageList(@NonNull Builder builder){ + GetMessageDeliveredSeenListRequest(@NonNull Builder builder){ super(builder); this.messageId = builder.messageId; } @@ -27,8 +27,8 @@ public Builder(long messageId) { } @NonNull - public RequestDeliveredMessageList build() { - return new RequestDeliveredMessageList(this); + public GetMessageDeliveredSeenListRequest build() { + return new GetMessageDeliveredSeenListRequest(this); } @NonNull diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestThreadParticipant.java b/podchat/src/main/java/com/fanap/podchat/requestobject/GetThreadParticipantsRequest.java similarity index 86% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestThreadParticipant.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/GetThreadParticipantsRequest.java index cc7ccbce..f00824fc 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestThreadParticipant.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/GetThreadParticipantsRequest.java @@ -2,12 +2,12 @@ import android.support.annotation.NonNull; -public class RequestThreadParticipant extends GeneralRequestObject { +public class GetThreadParticipantsRequest extends GeneralRequestObject { private long count; private long offset; private long threadId; - RequestThreadParticipant(@NonNull Builder builder) { + GetThreadParticipantsRequest(@NonNull Builder builder) { super(builder); this.count = builder.count; this.offset = builder.offset; @@ -54,8 +54,8 @@ public Builder threadId(long threadId) { } @NonNull - public RequestThreadParticipant build() { - return new RequestThreadParticipant(this); + public GetThreadParticipantsRequest build() { + return new GetThreadParticipantsRequest(this); } @NonNull diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestThread.java b/podchat/src/main/java/com/fanap/podchat/requestobject/GetThreadsRequest.java similarity index 93% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestThread.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/GetThreadsRequest.java index 61c0262a..e03e8f59 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestThread.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/GetThreadsRequest.java @@ -4,7 +4,7 @@ import java.util.ArrayList; -public class RequestThread extends BaseRequestObject { +public class GetThreadsRequest extends BaseRequestObject { private ArrayList threadIds; private String threadName; @@ -13,7 +13,7 @@ public class RequestThread extends BaseRequestObject { private long partnerCoreContactId; private boolean isNew; - RequestThread(@NonNull Builder builder) { + GetThreadsRequest(@NonNull Builder builder) { super(builder); this.threadIds = builder.threadIds; this.threadName = builder.threadName; @@ -68,8 +68,8 @@ public Builder threadIds(ArrayList threadIds) { @NonNull - public RequestThread build() { - return new RequestThread(this); + public GetThreadsRequest build() { + return new GetThreadsRequest(this); } @NonNull diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestGetLastSeens.java b/podchat/src/main/java/com/fanap/podchat/requestobject/GetUserNotSeenDurationRequest.java similarity index 77% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestGetLastSeens.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/GetUserNotSeenDurationRequest.java index bda64a2c..70db6c56 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestGetLastSeens.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/GetUserNotSeenDurationRequest.java @@ -4,11 +4,11 @@ import java.util.ArrayList; -public class RequestGetLastSeens { +public class GetUserNotSeenDurationRequest { private ArrayList userIds; - public RequestGetLastSeens(@NonNull Builder builder) { + public GetUserNotSeenDurationRequest(@NonNull Builder builder) { this.userIds = builder.userIds; } @@ -31,7 +31,7 @@ public Builder userIds(ArrayList userIds){ } @NonNull - public RequestGetLastSeens build(){return new RequestGetLastSeens(this);} + public GetUserNotSeenDurationRequest build(){return new GetUserNotSeenDurationRequest(this);} diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestLeaveThread.java b/podchat/src/main/java/com/fanap/podchat/requestobject/LeaveThreadRequest.java similarity index 76% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestLeaveThread.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/LeaveThreadRequest.java index a1652350..7412b979 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestLeaveThread.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/LeaveThreadRequest.java @@ -2,11 +2,11 @@ import android.support.annotation.NonNull; -public class RequestLeaveThread extends GeneralRequestObject { +public class LeaveThreadRequest extends GeneralRequestObject { private long threadId; - RequestLeaveThread(@NonNull Builder builder) { + LeaveThreadRequest(@NonNull Builder builder) { super(builder); this.threadId = builder.threadId; @@ -28,8 +28,8 @@ public Builder(long threadId) { } @NonNull - public RequestLeaveThread build() { - return new RequestLeaveThread(this); + public LeaveThreadRequest build() { + return new LeaveThreadRequest(this); } @NonNull diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestMapReverse.java b/podchat/src/main/java/com/fanap/podchat/requestobject/MapReverseRequest.java similarity index 81% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestMapReverse.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/MapReverseRequest.java index d462bf43..3932d370 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestMapReverse.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/MapReverseRequest.java @@ -2,12 +2,12 @@ import android.support.annotation.NonNull; -public class RequestMapReverse { +public class MapReverseRequest { private double lat; private double lng; - RequestMapReverse(Builder builder){ + MapReverseRequest(Builder builder){ this.lat = builder.lat; this.lng = builder.lng; } @@ -22,8 +22,8 @@ public Builder (double lat, double lng){ } @NonNull - public RequestMapReverse build(){ - return new RequestMapReverse(this); + public MapReverseRequest build(){ + return new MapReverseRequest(this); } } diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestMapRouting.java b/podchat/src/main/java/com/fanap/podchat/requestobject/MapRoutingRequest.java similarity index 83% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestMapRouting.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/MapRoutingRequest.java index 73aa5e8a..ff6ce97a 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestMapRouting.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/MapRoutingRequest.java @@ -2,11 +2,11 @@ import android.support.annotation.NonNull; -public class RequestMapRouting { +public class MapRoutingRequest { private String origin; private String destination; - RequestMapRouting(Builder builder){ + MapRoutingRequest(Builder builder){ this.origin = builder.origin; this.destination = builder.destination; @@ -38,8 +38,8 @@ public Builder(String origin,String destination){ } @NonNull - public RequestMapRouting build(){ - return new RequestMapRouting(this); + public MapRoutingRequest build(){ + return new MapRoutingRequest(this); } } diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestMapStaticImage.java b/podchat/src/main/java/com/fanap/podchat/requestobject/MapStaticImageRequest.java similarity index 76% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestMapStaticImage.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/MapStaticImageRequest.java index 8e6c71e8..8f796430 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestMapStaticImage.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/MapStaticImageRequest.java @@ -11,10 +11,10 @@ * {int} width width of image in pixels (default 800px) * {int} height height of image in pixels (default 600px) */ -public class RequestMapStaticImage extends BaseRequestMapStImage { +public class MapStaticImageRequest extends BaseRequestMapStImage { - public RequestMapStaticImage(@NonNull Builder builder) { + public MapStaticImageRequest(@NonNull Builder builder) { super(builder); } @@ -22,8 +22,8 @@ public static class Builder extends BaseRequestMapStImage.Builder{ @NonNull - public RequestMapStaticImage build() { - return new RequestMapStaticImage(this); + public MapStaticImageRequest build() { + return new MapStaticImageRequest(this); } @NonNull diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestMuteThread.java b/podchat/src/main/java/com/fanap/podchat/requestobject/MuteUnmuteThreadRequest.java similarity index 74% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestMuteThread.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/MuteUnmuteThreadRequest.java index dd70682c..9db46a77 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestMuteThread.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/MuteUnmuteThreadRequest.java @@ -2,10 +2,10 @@ import android.support.annotation.NonNull; -public class RequestMuteThread extends GeneralRequestObject { +public class MuteUnmuteThreadRequest extends GeneralRequestObject { private long threadId; - RequestMuteThread(@NonNull Builder builder) { + MuteUnmuteThreadRequest(@NonNull Builder builder) { super(builder); this.threadId = builder.threadId; } @@ -26,8 +26,8 @@ public Builder(long threadId) { } @NonNull - public RequestMuteThread build() { - return new RequestMuteThread(this); + public MuteUnmuteThreadRequest build() { + return new MuteUnmuteThreadRequest(this); } @NonNull diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestRemoveContact.java b/podchat/src/main/java/com/fanap/podchat/requestobject/RemoveContactRequest.java similarity index 75% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestRemoveContact.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/RemoveContactRequest.java index f9a13a9d..4b733c7e 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestRemoveContact.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/RemoveContactRequest.java @@ -2,10 +2,10 @@ import android.support.annotation.NonNull; -public class RequestRemoveContact extends GeneralRequestObject { +public class RemoveContactRequest extends GeneralRequestObject { private long userId; - RequestRemoveContact(@NonNull Builder builder) { + RemoveContactRequest(@NonNull Builder builder) { super(builder); this.userId = builder.userId; } @@ -26,8 +26,8 @@ public Builder(long userId) { } @NonNull - public RequestRemoveContact build() { - return new RequestRemoveContact(this); + public RemoveContactRequest build() { + return new RemoveContactRequest(this); } @NonNull diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestRemoveParticipants.java b/podchat/src/main/java/com/fanap/podchat/requestobject/RemoveParticipantsRequest.java similarity index 83% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestRemoveParticipants.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/RemoveParticipantsRequest.java index 7b50d68f..7dc52c92 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestRemoveParticipants.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/RemoveParticipantsRequest.java @@ -4,11 +4,11 @@ import java.util.List; -public class RequestRemoveParticipants extends GeneralRequestObject { +public class RemoveParticipantsRequest extends GeneralRequestObject { private long threadId; private List participantIds; - RequestRemoveParticipants(@NonNull Builder builder) { + RemoveParticipantsRequest(@NonNull Builder builder) { super(builder); this.participantIds = builder.participantIds; this.threadId = builder.threadId; @@ -47,8 +47,8 @@ protected Builder self() { } @NonNull - public RequestRemoveParticipants build() { - return new RequestRemoveParticipants(this); + public RemoveParticipantsRequest build() { + return new RemoveParticipantsRequest(this); } } diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestReplyMessage.java b/podchat/src/main/java/com/fanap/podchat/requestobject/ReplyTextMessageRequest.java similarity index 91% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestReplyMessage.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/ReplyTextMessageRequest.java index bc3a0d6f..dfece743 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestReplyMessage.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/ReplyTextMessageRequest.java @@ -3,14 +3,14 @@ import android.support.annotation.NonNull; -public class RequestReplyMessage extends GeneralRequestObject { +public class ReplyTextMessageRequest extends GeneralRequestObject { private String messageContent; private long threadId; private long messageId; private String systemMetaData; private int messageType; - RequestReplyMessage(@NonNull Builder builder) { + ReplyTextMessageRequest(@NonNull Builder builder) { super(builder); this.systemMetaData = builder.systemMetaData; this.messageContent = builder.messageContent; @@ -49,8 +49,8 @@ public Builder systemMetaData(String systemMetaData) { } @NonNull - public RequestReplyMessage build() { - return new RequestReplyMessage(this); + public ReplyTextMessageRequest build() { + return new ReplyTextMessageRequest(this); } @NonNull diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestImageMessage.java b/podchat/src/main/java/com/fanap/podchat/requestobject/RequestImageMessage.java index 5dabd0a4..55087505 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestImageMessage.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/RequestImageMessage.java @@ -4,7 +4,7 @@ import android.net.Uri; import android.support.annotation.NonNull; -public class RequestImageMessage extends RequestFileMessage { +public class RequestImageMessage extends FileMessageRequest { private String imageXc; private String imageYc; private String imageHc; @@ -34,7 +34,7 @@ public String getImageWc() { return imageWc; } - public static class Builder extends RequestFileMessage.Builder { + public static class Builder extends FileMessageRequest.Builder { private String imageXc; private String imageYc; private String imageHc; diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestSeenMessage.java b/podchat/src/main/java/com/fanap/podchat/requestobject/SendDeliverSeenRequest.java similarity index 83% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestSeenMessage.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/SendDeliverSeenRequest.java index 259c23d3..c586a8ee 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestSeenMessage.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/SendDeliverSeenRequest.java @@ -2,11 +2,11 @@ import android.support.annotation.NonNull; -public class RequestSeenMessage extends GeneralRequestObject { +public class SendDeliverSeenRequest extends GeneralRequestObject { private long messageId; private long ownerId; - RequestSeenMessage(@NonNull Builder builder) { + SendDeliverSeenRequest(@NonNull Builder builder) { super(builder); this.messageId = builder.messageId; this.ownerId = builder.ownerId; @@ -29,8 +29,8 @@ public Builder ownerId(long ownerId) { } @NonNull - public RequestSeenMessage build() { - return new RequestSeenMessage(this); + public SendDeliverSeenRequest build() { + return new SendDeliverSeenRequest(this); } @NonNull diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestLocationMessage.java b/podchat/src/main/java/com/fanap/podchat/requestobject/SendLocationMessageRequest.java similarity index 92% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestLocationMessage.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/SendLocationMessageRequest.java index 9d1f11db..e53a1fc0 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestLocationMessage.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/SendLocationMessageRequest.java @@ -3,7 +3,7 @@ import android.app.Activity; import android.support.annotation.NonNull; -public class RequestLocationMessage extends BaseRequestMapStImage { +public class SendLocationMessageRequest extends BaseRequestMapStImage { private long threadId; private String userGroupHash; @@ -13,7 +13,7 @@ public class RequestLocationMessage extends BaseRequestMapStImage { private int messageType; private Activity activity; - public RequestLocationMessage(@NonNull Builder builder) { + public SendLocationMessageRequest(@NonNull Builder builder) { super(builder); this.threadId = builder.threadId; this.message = builder.message; @@ -76,8 +76,8 @@ public Builder message(String message) { } @NonNull - public RequestLocationMessage build() { - return new RequestLocationMessage(this); + public SendLocationMessageRequest build() { + return new SendLocationMessageRequest(this); } @NonNull diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestReplyFileMessage.java b/podchat/src/main/java/com/fanap/podchat/requestobject/SendReplyFileMessageRequest.java similarity index 95% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestReplyFileMessage.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/SendReplyFileMessageRequest.java index ea696d4e..7cb25bb2 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestReplyFileMessage.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/SendReplyFileMessageRequest.java @@ -4,7 +4,7 @@ import android.net.Uri; import android.support.annotation.NonNull; -public class RequestReplyFileMessage extends GeneralRequestObject { +public class SendReplyFileMessageRequest extends GeneralRequestObject { private String messageContent; private long threadId; @@ -37,7 +37,7 @@ public String getImageWc() { return imageWc; } - RequestReplyFileMessage(@NonNull Builder builder) { + SendReplyFileMessageRequest(@NonNull Builder builder) { super(builder); this.systemMetaData = builder.systemMetaData; this.messageContent = builder.messageContent; @@ -137,8 +137,8 @@ public Builder setUserGroupHashCode(String userGroupHashCode) { } @NonNull - public RequestReplyFileMessage build() { - return new RequestReplyFileMessage(this); + public SendReplyFileMessageRequest build() { + return new SendReplyFileMessageRequest(this); } @NonNull diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestMessage.java b/podchat/src/main/java/com/fanap/podchat/requestobject/SendTextMessageRequest.java similarity index 90% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestMessage.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/SendTextMessageRequest.java index b747372e..97525d56 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestMessage.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/SendTextMessageRequest.java @@ -2,13 +2,13 @@ import android.support.annotation.NonNull; -public class RequestMessage { +public class SendTextMessageRequest { private String textMessage; private int messageType; private String jsonMetaData; private long threadId; - RequestMessage(Builder builder) { + SendTextMessageRequest(Builder builder) { this.setTextMessage(builder.textMessage); this.setThreadId(builder.threadId); this.setMessageType(builder.messageType); @@ -39,8 +39,8 @@ public Builder jsonMetaData(String jsonMetaData) { } @NonNull - public RequestMessage build() { - return new RequestMessage(this); + public SendTextMessageRequest build() { + return new SendTextMessageRequest(this); } } diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestSetAdmin.java b/podchat/src/main/java/com/fanap/podchat/requestobject/SetRemoveRoleRequest.java similarity index 81% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestSetAdmin.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/SetRemoveRoleRequest.java index ddf0ff2e..c50baee4 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestSetAdmin.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/SetRemoveRoleRequest.java @@ -2,12 +2,12 @@ import java.util.ArrayList; -public class RequestSetAdmin { +public class SetRemoveRoleRequest { private long threadId; private ArrayList roles; - private RequestSetAdmin(Builder builder) { + private SetRemoveRoleRequest(Builder builder) { this.threadId = builder.threadId; this.roles = builder.roles; } @@ -29,8 +29,8 @@ public Builder(long threadId, ArrayList roles) { this.roles = roles; } - public RequestSetAdmin build() { - return new RequestSetAdmin(this); + public SetRemoveRoleRequest build() { + return new SetRemoveRoleRequest(this); } } diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestSpam.java b/podchat/src/main/java/com/fanap/podchat/requestobject/SpamPrivateThreadRequest.java similarity index 75% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestSpam.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/SpamPrivateThreadRequest.java index f37a099c..d638691c 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestSpam.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/SpamPrivateThreadRequest.java @@ -2,11 +2,11 @@ import android.support.annotation.NonNull; -public class RequestSpam extends GeneralRequestObject { +public class SpamPrivateThreadRequest extends GeneralRequestObject { private long threadId; - RequestSpam(@NonNull Builder builder) { + SpamPrivateThreadRequest(@NonNull Builder builder) { super(builder); this.threadId = builder.threadId; } @@ -20,8 +20,8 @@ public Builder threadId(long threadId) { } @NonNull - public RequestSpam build() { - return new RequestSpam(this); + public SpamPrivateThreadRequest build() { + return new SpamPrivateThreadRequest(this); } @NonNull diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestUnBlock.java b/podchat/src/main/java/com/fanap/podchat/requestobject/UnBlockRequest.java similarity index 90% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestUnBlock.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/UnBlockRequest.java index c8f24e09..a10833b8 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestUnBlock.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/UnBlockRequest.java @@ -2,13 +2,13 @@ import android.support.annotation.NonNull; -public class RequestUnBlock extends GeneralRequestObject { +public class UnBlockRequest extends GeneralRequestObject { private long blockId; private long userId; private long threadId; private long contactId; - RequestUnBlock(@NonNull Builder builder) { + UnBlockRequest(@NonNull Builder builder) { super(builder); this.blockId = builder.blockId; this.userId = builder.userId; @@ -46,8 +46,8 @@ public Builder contactId(long contactId) { } @NonNull - public RequestUnBlock build() { - return new RequestUnBlock(this); + public UnBlockRequest build() { + return new UnBlockRequest(this); } @NonNull diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestUpdateContact.java b/podchat/src/main/java/com/fanap/podchat/requestobject/UpdateContactsRequest.java similarity index 90% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestUpdateContact.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/UpdateContactsRequest.java index ea8b8bfd..b0db11e3 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestUpdateContact.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/UpdateContactsRequest.java @@ -3,7 +3,7 @@ import android.support.annotation.NonNull; -public class RequestUpdateContact extends GeneralRequestObject { +public class UpdateContactsRequest extends GeneralRequestObject { private String firstName; private String lastName; @@ -11,7 +11,7 @@ public class RequestUpdateContact extends GeneralRequestObject { private String email; private long userId; - private RequestUpdateContact(@NonNull Builder builder){ + private UpdateContactsRequest(@NonNull Builder builder){ super(builder); this.userId = builder.userId; this.firstName = builder.firstName; @@ -52,8 +52,8 @@ public Builder email(String email){ } @NonNull - public RequestUpdateContact build(){ - return new RequestUpdateContact(this); + public UpdateContactsRequest build(){ + return new UpdateContactsRequest(this); } @NonNull diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestThreadInfo.java b/podchat/src/main/java/com/fanap/podchat/requestobject/UpdateThreadInfoRequest.java similarity index 85% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestThreadInfo.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/UpdateThreadInfoRequest.java index 75ba6047..aaa1b58d 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestThreadInfo.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/UpdateThreadInfoRequest.java @@ -2,7 +2,7 @@ import android.support.annotation.NonNull; -public class RequestThreadInfo extends GeneralRequestObject{ +public class UpdateThreadInfoRequest extends GeneralRequestObject{ private String image; private long threadId; private String name; @@ -10,11 +10,11 @@ public class RequestThreadInfo extends GeneralRequestObject{ private String metadata; //upload thread image - private RequestUploadImage uploadImageRequest; + private UploadImageRequest uploadImageRequest; private String userGroupHash; - private RequestThreadInfo(@NonNull Builder builder){ + private UpdateThreadInfoRequest(@NonNull Builder builder){ super(builder); this.description = builder.description; this.image = builder.image; @@ -25,7 +25,7 @@ private RequestThreadInfo(@NonNull Builder builder){ this.userGroupHash = builder.userGroupHash; } - public RequestUploadImage getUploadThreadImageRequest() { + public UploadImageRequest getUploadThreadImageRequest() { return uploadImageRequest; } @@ -39,7 +39,7 @@ public static class Builder extends GeneralRequestObject.Builder { private String description; private String metadata; private long threadId; - private RequestUploadImage uploadImageRequest; + private UploadImageRequest uploadImageRequest; private String userGroupHash; @@ -77,7 +77,7 @@ public Builder metadata(String metadata) { return this; } - public Builder setUploadThreadImageRequest(RequestUploadImage uploadImageRequest) { + public Builder setUploadThreadImageRequest(UploadImageRequest uploadImageRequest) { this.uploadImageRequest = uploadImageRequest; return this; } @@ -88,8 +88,8 @@ public Builder setUserGroupHash(String userGroupHash) { } @NonNull - public RequestThreadInfo build(){ - return new RequestThreadInfo(this); + public UpdateThreadInfoRequest build(){ + return new UpdateThreadInfoRequest(this); } @NonNull diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestUploadFile.java b/podchat/src/main/java/com/fanap/podchat/requestobject/UploadFileRequest.java similarity index 89% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestUploadFile.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/UploadFileRequest.java index 14b4f1b6..163bf189 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestUploadFile.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/UploadFileRequest.java @@ -4,7 +4,7 @@ import android.net.Uri; import android.support.annotation.NonNull; -public class RequestUploadFile { +public class UploadFileRequest { private Activity activity; @@ -12,7 +12,7 @@ public class RequestUploadFile { private String userGroupHashCode; private boolean isPublic; - RequestUploadFile(Builder builder) { + UploadFileRequest(Builder builder) { activity = builder.activity; fileUri = builder.fileUri; userGroupHashCode = builder.userGroupHashCode; @@ -24,7 +24,7 @@ public String getUserGroupHashCode() { return userGroupHashCode; } - public RequestUploadFile() { + public UploadFileRequest() { } public static class Builder { @@ -60,8 +60,8 @@ public Builder setUserGroupHashCode(String hashCode) { } @NonNull - public RequestUploadFile build() { - return new RequestUploadFile(this); + public UploadFileRequest build() { + return new UploadFileRequest(this); } } diff --git a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestUploadImage.java b/podchat/src/main/java/com/fanap/podchat/requestobject/UploadImageRequest.java similarity index 87% rename from podchat/src/main/java/com/fanap/podchat/requestobject/RequestUploadImage.java rename to podchat/src/main/java/com/fanap/podchat/requestobject/UploadImageRequest.java index 6e8d6723..1130bd90 100644 --- a/podchat/src/main/java/com/fanap/podchat/requestobject/RequestUploadImage.java +++ b/podchat/src/main/java/com/fanap/podchat/requestobject/UploadImageRequest.java @@ -4,14 +4,14 @@ import android.net.Uri; import android.support.annotation.NonNull; -public class RequestUploadImage extends RequestUploadFile { +public class UploadImageRequest extends UploadFileRequest { private int xC; private int yC; private int hC; private int wC; - RequestUploadImage(Builder builder) { + UploadImageRequest(Builder builder) { super(builder); this.xC = builder.xC; this.yC = builder.yC; @@ -19,7 +19,7 @@ public class RequestUploadImage extends RequestUploadFile { this.wC = builder.wC; } - public static class Builder extends RequestUploadFile.Builder { + public static class Builder extends UploadFileRequest.Builder { int xC; int yC; @@ -78,8 +78,8 @@ public Builder setPublic(boolean isPublic) { @NonNull - public RequestUploadImage build() { - return new RequestUploadImage(this); + public UploadImageRequest build() { + return new UploadImageRequest(this); } diff --git a/podchat/src/main/java/com/fanap/podchat/util/RequestMapSearch.java b/podchat/src/main/java/com/fanap/podchat/util/MapSearchRequest.java similarity index 87% rename from podchat/src/main/java/com/fanap/podchat/util/RequestMapSearch.java rename to podchat/src/main/java/com/fanap/podchat/util/MapSearchRequest.java index 1340ee34..05b95429 100644 --- a/podchat/src/main/java/com/fanap/podchat/util/RequestMapSearch.java +++ b/podchat/src/main/java/com/fanap/podchat/util/MapSearchRequest.java @@ -2,12 +2,12 @@ import android.support.annotation.NonNull; -public class RequestMapSearch { +public class MapSearchRequest { private String searchTerm; private double latitude; private double longitude; - RequestMapSearch(Builder builder) { + MapSearchRequest(Builder builder) { this.searchTerm = builder.searchTerm; this.latitude = builder.latitude; this.longitude = builder.longitude; @@ -24,8 +24,8 @@ public Builder(String searchTerm, double latitude, double longitude) { this.longitude = longitude; } @NonNull - public RequestMapSearch build(){ - return new RequestMapSearch(this); + public MapSearchRequest build(){ + return new MapSearchRequest(this); } } From d6a504482c7763fdadddd39824676a8471abb36c Mon Sep 17 00:00:00 2001 From: fanap_soft_90 Date: Tue, 1 Sep 2020 12:18:46 +0430 Subject: [PATCH 2/4] Data Model Integration --- .../application/chatexample/ChatActivity.java | 248 ++++---- .../chatexample/ChatPresenter.java | 285 +++++---- app/src/main/res/layout/activity_chat.xml | 9 +- .../java/com/fanap/podchat/chat/Chat.java | 567 ++++++++---------- 4 files changed, 499 insertions(+), 610 deletions(-) diff --git a/app/src/main/java/com/example/chat/application/chatexample/ChatActivity.java b/app/src/main/java/com/example/chat/application/chatexample/ChatActivity.java index 66b4eefa..78041ec2 100644 --- a/app/src/main/java/com/example/chat/application/chatexample/ChatActivity.java +++ b/app/src/main/java/com/example/chat/application/chatexample/ChatActivity.java @@ -27,11 +27,8 @@ import android.widget.Toast; import com.bumptech.glide.Glide; -import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.load.model.GlideUrl; import com.bumptech.glide.load.model.LazyHeaders; -import com.bumptech.glide.load.resource.bitmap.CenterCrop; -import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.bumptech.glide.request.RequestOptions; import com.fanap.podchat.ProgressHandler; import com.fanap.podchat.chat.Chat; @@ -43,26 +40,25 @@ import com.fanap.podchat.chat.bot.result_model.CreateBotResult; import com.fanap.podchat.chat.bot.result_model.DefineBotCommandResult; import com.fanap.podchat.chat.file_manager.download_file.model.ResultDownloadFile; -import com.fanap.podchat.chat.mention.model.RequestGetMentionList; +import com.fanap.podchat.chat.mention.model.GetMentionedRequest; import com.fanap.podchat.chat.messge.ResultUnreadMessagesCount; -import com.fanap.podchat.chat.pin.pin_message.model.RequestPinMessage; +import com.fanap.podchat.chat.pin.pin_message.model.PinUnpinMessageRequest; import com.fanap.podchat.chat.pin.pin_message.model.ResultPinMessage; -import com.fanap.podchat.chat.pin.pin_thread.model.RequestPinThread; -import com.fanap.podchat.chat.thread.public_thread.RequestCheckIsNameAvailable; +import com.fanap.podchat.chat.pin.pin_thread.model.PinUnpinThreadRequest; +import com.fanap.podchat.chat.thread.public_thread.IsPublicThreadNameAvailableRequest; import com.fanap.podchat.chat.thread.public_thread.RequestCreatePublicThread; -import com.fanap.podchat.chat.thread.public_thread.RequestJoinPublicThread; +import com.fanap.podchat.chat.thread.public_thread.JoinPublicThreadRequest; import com.fanap.podchat.chat.thread.public_thread.ResultIsNameAvailable; import com.fanap.podchat.chat.thread.public_thread.ResultJoinPublicThread; -import com.fanap.podchat.chat.user.profile.RequestUpdateProfile; +import com.fanap.podchat.chat.user.profile.UpdateProfileRequest; import com.fanap.podchat.chat.user.user_roles.model.ResultCurrentUserRoles; import com.fanap.podchat.example.R; -import com.fanap.podchat.mainmodel.Contact; import com.fanap.podchat.mainmodel.FileUpload; import com.fanap.podchat.mainmodel.Invitee; import com.fanap.podchat.mainmodel.Inviter; import com.fanap.podchat.mainmodel.NosqlListMessageCriteriaVO; import com.fanap.podchat.mainmodel.NosqlSearchMetadataCriteria; -import com.fanap.podchat.mainmodel.RequestSearchContact; +import com.fanap.podchat.mainmodel.SearchContactRequest; import com.fanap.podchat.mainmodel.RequestThreadInnerMessage; import com.fanap.podchat.model.ChatResponse; import com.fanap.podchat.model.ErrorOutPut; @@ -70,41 +66,40 @@ import com.fanap.podchat.model.ResultImageFile; import com.fanap.podchat.model.ResultStaticMapImage; import com.fanap.podchat.notification.PodNotificationManager; -import com.fanap.podchat.requestobject.RequestAddContact; -import com.fanap.podchat.requestobject.RequestAddParticipants; -import com.fanap.podchat.requestobject.RequestBlockList; -import com.fanap.podchat.requestobject.RequestClearHistory; -import com.fanap.podchat.requestobject.RequestConnect; -import com.fanap.podchat.requestobject.RequestCreateThread; -import com.fanap.podchat.requestobject.RequestCreateThreadWithFile; -import com.fanap.podchat.requestobject.RequestDeleteMessage; -import com.fanap.podchat.requestobject.RequestDeliveredMessageList; -import com.fanap.podchat.requestobject.RequestFileMessage; -import com.fanap.podchat.requestobject.RequestForwardMessage; -import com.fanap.podchat.requestobject.RequestGetAdmin; -import com.fanap.podchat.requestobject.RequestGetContact; -import com.fanap.podchat.requestobject.RequestGetFile; -import com.fanap.podchat.requestobject.RequestGetHistory; -import com.fanap.podchat.requestobject.RequestGetImage; +import com.fanap.podchat.requestobject.AddContactRequest; +import com.fanap.podchat.requestobject.AddParticipantsRequest; +import com.fanap.podchat.requestobject.GetBlockedListRequest; +import com.fanap.podchat.requestobject.ClearHistoryRequest; +import com.fanap.podchat.requestobject.ConnectRequest; +import com.fanap.podchat.requestobject.CreateThreadRequest; +import com.fanap.podchat.requestobject.CreateThreadWithFileRequest; +import com.fanap.podchat.requestobject.DeleteMessageRequest; +import com.fanap.podchat.requestobject.GetMessageDeliveredSeenListRequest; +import com.fanap.podchat.requestobject.FileMessageRequest; +import com.fanap.podchat.requestobject.ForwardMessageRequest; +import com.fanap.podchat.requestobject.GetAllThreadAdminsRequest; +import com.fanap.podchat.requestobject.GetContactRequest; +import com.fanap.podchat.requestobject.GetFileRequest; +import com.fanap.podchat.requestobject.GetHistoryRequest; +import com.fanap.podchat.requestobject.GetImageRequest; import com.fanap.podchat.requestobject.RequestGetPodSpaceFile; import com.fanap.podchat.requestobject.RequestGetPodSpaceImage; -import com.fanap.podchat.requestobject.RequestGetUserRoles; -import com.fanap.podchat.requestobject.RequestLocationMessage; -import com.fanap.podchat.requestobject.RequestMapReverse; -import com.fanap.podchat.requestobject.RequestMapStaticImage; -import com.fanap.podchat.requestobject.RequestRemoveParticipants; -import com.fanap.podchat.requestobject.RequestReplyFileMessage; -import com.fanap.podchat.requestobject.RequestReplyMessage; +import com.fanap.podchat.requestobject.GetCurrentUserRolesRequest; +import com.fanap.podchat.requestobject.SendLocationMessageRequest; +import com.fanap.podchat.requestobject.MapReverseRequest; +import com.fanap.podchat.requestobject.MapStaticImageRequest; +import com.fanap.podchat.requestobject.RemoveParticipantsRequest; +import com.fanap.podchat.requestobject.SendReplyFileMessageRequest; +import com.fanap.podchat.requestobject.ReplyTextMessageRequest; import com.fanap.podchat.requestobject.RequestRole; -import com.fanap.podchat.requestobject.RequestSeenMessageList; -import com.fanap.podchat.requestobject.RequestSetAdmin; +import com.fanap.podchat.requestobject.SetRemoveRoleRequest; import com.fanap.podchat.requestobject.RequestSetAuditor; -import com.fanap.podchat.requestobject.RequestSpam; -import com.fanap.podchat.requestobject.RequestThread; -import com.fanap.podchat.requestobject.RequestThreadInfo; -import com.fanap.podchat.requestobject.RequestThreadParticipant; -import com.fanap.podchat.requestobject.RequestUploadFile; -import com.fanap.podchat.requestobject.RequestUploadImage; +import com.fanap.podchat.requestobject.SpamPrivateThreadRequest; +import com.fanap.podchat.requestobject.GetThreadsRequest; +import com.fanap.podchat.requestobject.UpdateThreadInfoRequest; +import com.fanap.podchat.requestobject.GetThreadParticipantsRequest; +import com.fanap.podchat.requestobject.UploadFileRequest; +import com.fanap.podchat.requestobject.UploadImageRequest; import com.fanap.podchat.requestobject.RetryUpload; import com.fanap.podchat.util.FilePick; import com.fanap.podchat.util.InviteType; @@ -129,7 +124,7 @@ public class ChatActivity extends AppCompatActivity implements AdapterView.OnItemSelectedListener, View.OnClickListener, ChatContract.view { private static final int FILE_REQUEST_CODE = 2; - public static final String APP_ID = "appid"; + public static final String APP_ID = "POD-Chat"; public static final int REQUEST_WRITE_EXTERNAL_STORAGE = 1007; @@ -214,7 +209,7 @@ public class ChatActivity extends AppCompatActivity /** * Main Server Setting: */ -// + // private static String name = BaseApplication.getInstance().getString(R.string.main_server_name); // private static String socketAddress = BaseApplication.getInstance().getString(R.string.socketAddress); // private static String platformHost = BaseApplication.getInstance().getString(R.string.platformHost); @@ -232,14 +227,16 @@ public class ChatActivity extends AppCompatActivity //sand box / group - public static int TEST_THREAD_ID = 5182; - private static final String TEST_THREAD_HASH = "X6NO3WJRWTUMN8"; +// public static int TEST_THREAD_ID = 5182; +// private static final String TEST_THREAD_HASH = "X6NO3WJRWTUMN8"; // main server / p2p -// public static int TEST_THREAD_ID = 8182; -// private static final String TEST_THREAD_HASH = "7691JPIS2VG4XM"; + // public static int TEST_THREAD_ID = 8915; + public static int TEST_THREAD_ID = 8919; + private static final String TEST_THREAD_HASH = "9JKSQQUYFMC8P9"; + // private static final String TEST_THREAD_HASH = "LYP3CMIQPZNOPX"; // main server / group @@ -660,8 +657,8 @@ public void onBlock(String uniqueId) { // .title("Test File PodSpace") // .build(); - RequestThreadInfo request = - new RequestThreadInfo.Builder(TEST_THREAD_ID) + UpdateThreadInfoRequest request = + new UpdateThreadInfoRequest.Builder(TEST_THREAD_ID) // .name("Test File PodSpace") // .metadata("{}") // .image() @@ -687,14 +684,14 @@ public void onBlock(String uniqueId) { } case 7: { - RequestSeenMessageList requests = new RequestSeenMessageList + GetMessageDeliveredSeenListRequest requests = new GetMessageDeliveredSeenListRequest .Builder(TEST_THREAD_ID).build(); presenter.seenMessageList(requests); break; } case 8: { - RequestDeliveredMessageList requestD = new RequestDeliveredMessageList + GetMessageDeliveredSeenListRequest requestD = new GetMessageDeliveredSeenListRequest .Builder(50532).build(); presenter.deliveredMessageList(requestD); } @@ -834,8 +831,8 @@ public void onExceptionOccurred(String cause) { private void getBlockList() { - RequestBlockList request = - new RequestBlockList.Builder() + GetBlockedListRequest request = + new GetBlockedListRequest.Builder() .count(50) .offset(0) // .withNoCache() @@ -864,7 +861,7 @@ private void createThreadWithMessage() { invite.add(new Invitee(1151568, InviteType.Constants.TO_BE_USER_CONTACT_ID)); invite.add(new Invitee(1512305, InviteType.Constants.TO_BE_USER_CONTACT_ID)); - RequestUploadImage requestUploadThreadImageImage = new RequestUploadImage + UploadImageRequest requestUploadThreadImageImage = new UploadImageRequest .Builder(ChatActivity.this, getUri()) .setwC(140) .sethC(140) @@ -876,7 +873,7 @@ private void createThreadWithMessage() { // .forwardedMessageIds(listForwardIds) .build(); - RequestCreateThread requestCreateThread = new RequestCreateThread + CreateThreadRequest requestCreateThread = new CreateThreadRequest .Builder(ThreadType.Constants.OWNER_GROUP, invite) .message(message) .setUploadThreadImageRequest(requestUploadThreadImageImage) @@ -945,10 +942,10 @@ private void downloadFile() { String fileHashCode = "17077360d4b-0.2366487166443898"; - RequestGetImage requestGetImage = new RequestGetImage.Builder(imageId, imageHashCode, true) + GetImageRequest requestGetImage = new GetImageRequest.Builder(imageId, imageHashCode, true) .build(); - RequestGetFile requestGetFile = new RequestGetFile.Builder(fileId, fileHashCode, true).build(); + GetFileRequest requestGetFile = new GetFileRequest.Builder(fileId, fileHashCode, true).build(); RequestGetPodSpaceFile rePod = new RequestGetPodSpaceFile.Builder("RD2VZRMJ6DXIJQ5W") @@ -1084,7 +1081,7 @@ public void onFileReady(ChatResponse response) { private void getUserRoles() { - RequestGetUserRoles req = new RequestGetUserRoles.Builder() + GetCurrentUserRolesRequest req = new GetCurrentUserRolesRequest.Builder() .setThreadId(TEST_THREAD_ID) .build(); @@ -1103,20 +1100,20 @@ private void createThreadWithFile() { } - RequestUploadImage requestUploadThreadImageImage = new RequestUploadImage + UploadImageRequest requestUploadThreadImageImage = new UploadImageRequest .Builder(this, getUri()) .setwC(140) .sethC(140) .build(); - RequestUploadImage requestUploadImage = new RequestUploadImage.Builder(this, getUri()) + UploadImageRequest requestUploadImage = new UploadImageRequest.Builder(this, getUri()) .setwC(120) .sethC(120) .setxC(1) .setyC(1) .build(); - RequestUploadFile requestUploadFile = new RequestUploadFile.Builder( + UploadFileRequest requestUploadFile = new UploadFileRequest.Builder( this, getUri()).build(); @@ -1141,7 +1138,7 @@ private void createThreadWithFile() { // .build(); - RequestCreateThreadWithFile request = new RequestCreateThreadWithFile + CreateThreadWithFileRequest request = new CreateThreadWithFileRequest .Builder(ThreadType.Constants.OWNER_GROUP, invite, requestUploadFile, @@ -1297,7 +1294,7 @@ private void setAdminRules() { // requestRoles.add(requestRole2); - RequestSetAdmin requestAddAdmin = new RequestSetAdmin + SetRemoveRoleRequest requestAddAdmin = new SetRemoveRoleRequest .Builder(TEST_THREAD_ID, requestRoles) .build(); @@ -1328,7 +1325,7 @@ private void removeAdminRules() { requestRoles.add(requestRole); // requestRoles.add(requestRole2); - RequestSetAdmin requestAddAdmin = new RequestSetAdmin + SetRemoveRoleRequest requestAddAdmin = new SetRemoveRoleRequest .Builder(TEST_THREAD_ID, requestRoles) .build(); @@ -1345,7 +1342,7 @@ private void sendLocationMsg() { String meta = getMetaData(); - RequestLocationMessage requestLocationMessage = new RequestLocationMessage + SendLocationMessageRequest requestLocationMessage = new SendLocationMessageRequest .Builder() .systemMetadata(meta) .center(center) @@ -1423,7 +1420,7 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis String center = "35.7003510,51.3376472"; - RequestLocationMessage requestLocationMessage = new RequestLocationMessage + SendLocationMessageRequest requestLocationMessage = new SendLocationMessageRequest .Builder() .center(center) .message("This is location ") @@ -1443,14 +1440,14 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis public void mapReverse() { double lat = 35.7003510; double lng = 51.3376472; - RequestMapReverse requestMapReverse = new RequestMapReverse.Builder(lat, lng).build(); + MapReverseRequest requestMapReverse = new MapReverseRequest.Builder(lat, lng).build(); presenter.mapReverse(requestMapReverse); } public void mapStatic() { String center = "35.7003510,51.3376472"; - RequestMapStaticImage staticImage = new RequestMapStaticImage.Builder() + MapStaticImageRequest staticImage = new MapStaticImageRequest.Builder() .center(center) .build(); @@ -1477,7 +1474,7 @@ public void onItemSelected(AdapterView parent, View view, int position, long break; case 2: - RequestFileMessage request = new RequestFileMessage.Builder( + FileMessageRequest request = new FileMessageRequest.Builder( ChatActivity.this, TEST_THREAD_ID, getUri(), @@ -1589,7 +1586,7 @@ public void onLeaveThread(String uniqueId) { break; case 9: - RequestSearchContact requestSearchContact = new RequestSearchContact + SearchContactRequest requestSearchContact = new SearchContactRequest .Builder("0", "20") // .id("2247") // .cellphoneNumber("0938") @@ -1644,7 +1641,7 @@ public void onFinishImage(String json, ChatResponse chatRespons break; case 14: { //clear history - RequestClearHistory requestClearHistory = new RequestClearHistory + ClearHistoryRequest requestClearHistory = new ClearHistoryRequest .Builder(TEST_THREAD_ID) .build(); presenter.clearHistory(requestClearHistory); @@ -1739,7 +1736,7 @@ private void createBot() { private void updateUserProfile() { - RequestUpdateProfile request = new RequestUpdateProfile + UpdateProfileRequest request = new UpdateProfileRequest .Builder("عِیب رِندان مَکُن ای زاهِدِ پاکیزه‌سِرِشت") .setMetadata(getMetaData()) .build(); @@ -1758,7 +1755,7 @@ private void seenMessage() { private void spamThread() { - RequestSpam requestSpam = new RequestSpam.Builder() + SpamPrivateThreadRequest requestSpam = new SpamPrivateThreadRequest.Builder() .threadId(TEST_THREAD_ID) .build(); @@ -1771,7 +1768,7 @@ private void getAdminList() { //2116 //2115 //2107 - RequestGetAdmin requestGetAdmin = new RequestGetAdmin + GetAllThreadAdminsRequest requestGetAdmin = new GetAllThreadAdminsRequest // .Builder(10654,true) .Builder(TEST_THREAD_ID) // .admin(true) @@ -1793,7 +1790,7 @@ public void deleteMessage() { // msgIds.add(47564L); - RequestDeleteMessage requestDeleteMessage = new RequestDeleteMessage + DeleteMessageRequest requestDeleteMessage = new DeleteMessageRequest .Builder() .messageIds(msgIds) .deleteForAll(true) @@ -1819,7 +1816,7 @@ private void removeParticipants() { participantIds.add(5581L); participantIds.add(1261L); long threadId = TEST_THREAD_ID; - RequestRemoveParticipants request = new RequestRemoveParticipants + RemoveParticipantsRequest request = new RemoveParticipantsRequest .Builder(threadId, participantIds) .build(); presenter.removeParticipants(request, null); @@ -1877,7 +1874,7 @@ private void addParticipants() { //add with coreUserIds - RequestAddParticipants request = RequestAddParticipants + AddParticipantsRequest request = AddParticipantsRequest .newBuilder() .threadId((long) TEST_THREAD_ID) // .withCoreUserIds(982L, 5241L) @@ -2114,14 +2111,14 @@ public void onUnMuteThread(String uniqueId) { // // // } - RequestAddContact request = new RequestAddContact.Builder() + AddContactRequest request = new AddContactRequest.Builder() .firstName("مسعود") .lastName("امجدی") .username("ma.amjadi") .build(); // presenter.addContact(request); - presenter.addContact("تست", "تست زاده", "", "", "user-15860676455262"); + presenter.addContact("farhad", "kheirkhah", "09157770684", "", ""); break; @@ -2148,7 +2145,7 @@ public void onUnMuteThread(String uniqueId) { * Pin ConversationVO */ - RequestPinThread requestPinThread = new RequestPinThread.Builder(TEST_THREAD_ID) + PinUnpinThreadRequest requestPinThread = new PinUnpinThreadRequest.Builder(TEST_THREAD_ID) .build(); presenter.pinThread(requestPinThread); @@ -2161,7 +2158,7 @@ public void onUnMuteThread(String uniqueId) { * UnPin ConversationVO */ - RequestPinThread requestPinThread = new RequestPinThread.Builder(TEST_THREAD_ID) + PinUnpinThreadRequest requestPinThread = new PinUnpinThreadRequest.Builder(TEST_THREAD_ID) .build(); presenter.unPinThread(requestPinThread); @@ -2174,7 +2171,7 @@ public void onUnMuteThread(String uniqueId) { case 20: { - RequestPinMessage requestPinMessage = new RequestPinMessage.Builder() + PinUnpinMessageRequest requestPinMessage = new PinUnpinMessageRequest.Builder() .setMessageId(TEST_THREAD_ID) .setNotifyAll(true) .build(); @@ -2187,7 +2184,7 @@ public void onUnMuteThread(String uniqueId) { case 21: { - RequestPinMessage requestPinMessage = new RequestPinMessage.Builder() + PinUnpinMessageRequest requestPinMessage = new PinUnpinMessageRequest.Builder() .setMessageId(TEST_THREAD_ID) .build(); @@ -2200,7 +2197,7 @@ public void onUnMuteThread(String uniqueId) { case 22: { - RequestGetMentionList req = new RequestGetMentionList + GetMentionedRequest req = new GetMentionedRequest .Builder(TEST_THREAD_ID) // .setAllMentioned(true) // .setUnreadMentioned(true) @@ -2266,8 +2263,8 @@ public void onUnMuteThread(String uniqueId) { private void getThreadParticipants() { - RequestThreadParticipant request = - new RequestThreadParticipant.Builder() + GetThreadParticipantsRequest request = + new GetThreadParticipantsRequest.Builder() .count(20) .offset(0) .threadId(TEST_THREAD_ID) @@ -2287,12 +2284,12 @@ private void getThreadParticipants() { } - public static final String THREAD_UNIQUE_NAME = "unique_name_4_1584016531111"; + public static final String THREAD_UNIQUE_NAME = "unique_name_44_1584016531111"; // public static final String THREAD_UNIQUE_NAME = "unique_name_4_" + new Date().getTime(); private void joinPublicThread() { - RequestJoinPublicThread request = new RequestJoinPublicThread + JoinPublicThreadRequest request = new JoinPublicThreadRequest .Builder(THREAD_UNIQUE_NAME) .build(); @@ -2332,8 +2329,8 @@ private void createPublicThread() { private void checkIsNameAvailable() { - RequestCheckIsNameAvailable request = - new RequestCheckIsNameAvailable.Builder(THREAD_UNIQUE_NAME) + IsPublicThreadNameAvailableRequest request = + new IsPublicThreadNameAvailableRequest.Builder(THREAD_UNIQUE_NAME) .build(); presenter.checkIsNameAvailable(request); @@ -2464,7 +2461,7 @@ private void createThread() { // .build(); - RequestCreateThread requestCreateThread = new RequestCreateThread + CreateThreadRequest requestCreateThread = new CreateThreadRequest .Builder(ThreadType.Constants.NORMAL, invite) .title("A New Thread " + (new Date().getTime() / 1000)) .withDescription("Description created at " @@ -2492,7 +2489,7 @@ private void updateContact() { public void getThreadHistory() { - RequestGetHistory request = new RequestGetHistory + GetHistoryRequest request = new GetHistoryRequest .Builder(TEST_THREAD_ID) .count(25) .build(); @@ -2609,61 +2606,24 @@ public void getThreads() { // threadIds.add(TEST_THREAD_ID); // threadIds.add(1573); // threadIds.add(351); - - -// new Thread(() -> { -// RequestThread requestThread = new RequestThread -// .Builder() -//// .threadName("Te") -//// .newMessages() -//// .partnerCoreContactId(566) -// .offset(0) -// .count(10) -//// .partnerCoreContactId(21074) -//// .withNoCache() -// .build(); -// -// presenter.getThreads(requestThread, null); -// }).start(); -// -// try { -// Thread.sleep(5000); -// } catch (InterruptedException e) { -// e.printStackTrace(); -// } -//// - - - new Thread(() -> { - - ArrayList ids = new ArrayList<>(); - ids.add(5182); - ids.add(6630); - ids.add(5281); - RequestThread requestThread2 = new RequestThread - .Builder() -// .threadName("Te") - .threadIds(ids) -// .newMessages() + GetThreadsRequest requestThread = new GetThreadsRequest + .Builder() +// .newMessages() // .partnerCoreContactId(566) - .offset(0) - .count(10) + .offset(0) + .count(50) // .partnerCoreContactId(21074) // .withNoCache() - .build(); - - - presenter.getThreads(requestThread2, null); + .build(); - }) - .start(); + presenter.getThreads(requestThread, null); // presenter.getConversationVOS(5, null, null, null, null); } public void replyMessage() { - RequestReplyMessage message = new RequestReplyMessage + ReplyTextMessageRequest message = new ReplyTextMessageRequest .Builder("this is reply from john", TEST_THREAD_ID, 94305, TextMessageType.Constants.TEXT) .build(); @@ -2687,7 +2647,7 @@ public void ForwardMessage() { long threadId = TEST_THREAD_ID; // presenter.forwardMessage(threadId, messageIds); - RequestForwardMessage forwardMessage = new RequestForwardMessage + ForwardMessageRequest forwardMessage = new ForwardMessageRequest .Builder(threadId, messageIds) .build(); @@ -2700,7 +2660,7 @@ public void ForwardMessage() { private void getContacts() { - RequestGetContact request = new RequestGetContact.Builder() + GetContactRequest request = new GetContactRequest.Builder() .count(50) .offset(offset) // .withNoCache() @@ -2725,7 +2685,7 @@ public void onClick(View v) { if (v == buttonConnect) { - RequestConnect rc = new RequestConnect.Builder( + ConnectRequest rc = new ConnectRequest.Builder( socketAddress, APP_ID, serverName, @@ -2803,7 +2763,7 @@ public String getFileUri() { } public void getThreadWithCoreUser() { - RequestThread requestThread = new RequestThread.Builder() + GetThreadsRequest requestThread = new GetThreadsRequest.Builder() .partnerCoreContactId(566) // .threadIds() // .threadName() @@ -2887,7 +2847,7 @@ private void replyFileMessage() { Inviter inviter = new Inviter(); inviter.setName("Me"); String meta = gson.toJson(inviter); - RequestReplyFileMessage fileMessage = new RequestReplyFileMessage + SendReplyFileMessageRequest fileMessage = new SendReplyFileMessageRequest .Builder(messageContent, threadId, messageId, fileUri, this, TextMessageType.Constants.POD_SPACE_PICTURE) .systemMetaData(meta) @@ -3035,7 +2995,7 @@ public void onGetUnreadsMessagesCount(ChatResponse re public void onGetToken(String token) { - RequestConnect rc = new RequestConnect.Builder( + ConnectRequest rc = new ConnectRequest.Builder( socketAddress, APP_ID, serverName, diff --git a/app/src/main/java/com/example/chat/application/chatexample/ChatPresenter.java b/app/src/main/java/com/example/chat/application/chatexample/ChatPresenter.java index 1172332d..ce74af5b 100644 --- a/app/src/main/java/com/example/chat/application/chatexample/ChatPresenter.java +++ b/app/src/main/java/com/example/chat/application/chatexample/ChatPresenter.java @@ -22,23 +22,23 @@ import com.fanap.podchat.chat.bot.result_model.CreateBotResult; import com.fanap.podchat.chat.bot.result_model.DefineBotCommandResult; import com.fanap.podchat.chat.bot.result_model.StartStopBotResult; -import com.fanap.podchat.chat.mention.model.RequestGetMentionList; -import com.fanap.podchat.chat.messge.RequestGetUnreadMessagesCount; +import com.fanap.podchat.chat.mention.model.GetMentionedRequest; +import com.fanap.podchat.chat.messge.GetAllUnreadMessageCountRequest; import com.fanap.podchat.chat.messge.ResultUnreadMessagesCount; -import com.fanap.podchat.chat.thread.public_thread.RequestCheckIsNameAvailable; +import com.fanap.podchat.chat.thread.public_thread.IsPublicThreadNameAvailableRequest; import com.fanap.podchat.chat.thread.public_thread.RequestCreatePublicThread; -import com.fanap.podchat.chat.thread.public_thread.RequestJoinPublicThread; +import com.fanap.podchat.chat.thread.public_thread.JoinPublicThreadRequest; import com.fanap.podchat.chat.thread.public_thread.ResultIsNameAvailable; import com.fanap.podchat.chat.thread.public_thread.ResultJoinPublicThread; -import com.fanap.podchat.chat.user.profile.RequestUpdateProfile; -import com.fanap.podchat.chat.user.profile.ResultUpdateProfile; +import com.fanap.podchat.chat.user.profile.UpdateProfileRequest; +import com.fanap.podchat.chat.user.profile.UpdateProfileResponse; import com.fanap.podchat.chat.user.user_roles.model.ResultCurrentUserRoles; import com.fanap.podchat.example.R; import com.fanap.podchat.mainmodel.History; import com.fanap.podchat.mainmodel.Invitee; import com.fanap.podchat.mainmodel.NosqlListMessageCriteriaVO; import com.fanap.podchat.mainmodel.ResultDeleteMessage; -import com.fanap.podchat.mainmodel.RequestSearchContact; +import com.fanap.podchat.mainmodel.SearchContactRequest; import com.fanap.podchat.mainmodel.ThreadInfoVO; import com.fanap.podchat.model.ChatResponse; import com.fanap.podchat.model.ErrorOutPut; @@ -48,10 +48,10 @@ import com.fanap.podchat.model.OutputSignalMessage; import com.fanap.podchat.model.ResultAddContact; import com.fanap.podchat.model.ResultAddParticipant; -import com.fanap.podchat.model.ResultBlock; -import com.fanap.podchat.model.ResultBlockList; +import com.fanap.podchat.model.BlockUnblockUserResponse; +import com.fanap.podchat.model.GetBlockedUserListResponse; import com.fanap.podchat.model.ResultClearHistory; -import com.fanap.podchat.model.ResultContact; +import com.fanap.podchat.model.GetContactsResponse; import com.fanap.podchat.model.ResultFile; import com.fanap.podchat.model.ResultHistory; import com.fanap.podchat.model.ResultImageFile; @@ -67,51 +67,50 @@ import com.fanap.podchat.model.ResultThread; import com.fanap.podchat.model.ResultThreads; import com.fanap.podchat.model.ResultUpdateContact; -import com.fanap.podchat.model.ResultUserInfo; +import com.fanap.podchat.model.GetUserInfoResponse; import com.fanap.podchat.networking.retrofithelper.TimeoutConfig; import com.fanap.podchat.notification.CustomNotificationConfig; -import com.fanap.podchat.requestobject.RequestBlockList; -import com.fanap.podchat.requestobject.RequestCreateThreadWithFile; -import com.fanap.podchat.requestobject.RequestGetContact; -import com.fanap.podchat.requestobject.RequestGetFile; -import com.fanap.podchat.requestobject.RequestGetImage; +import com.fanap.podchat.requestobject.GetBlockedListRequest; +import com.fanap.podchat.requestobject.CreateThreadWithFileRequest; +import com.fanap.podchat.requestobject.GetContactRequest; +import com.fanap.podchat.requestobject.GetFileRequest; +import com.fanap.podchat.requestobject.GetImageRequest; import com.fanap.podchat.requestobject.RequestGetPodSpaceFile; import com.fanap.podchat.requestobject.RequestGetPodSpaceImage; -import com.fanap.podchat.requestobject.RequestGetUserRoles; -import com.fanap.podchat.chat.pin.pin_message.model.RequestPinMessage; -import com.fanap.podchat.requestobject.RequestSetAdmin; -import com.fanap.podchat.requestobject.RequestAddContact; -import com.fanap.podchat.requestobject.RequestAddParticipants; -import com.fanap.podchat.requestobject.RequestClearHistory; -import com.fanap.podchat.requestobject.RequestConnect; -import com.fanap.podchat.requestobject.RequestCreateThread; -import com.fanap.podchat.requestobject.RequestDeleteMessage; -import com.fanap.podchat.requestobject.RequestDeliveredMessageList; -import com.fanap.podchat.requestobject.RequestFileMessage; -import com.fanap.podchat.requestobject.RequestForwardMessage; -import com.fanap.podchat.requestobject.RequestGetAdmin; -import com.fanap.podchat.requestobject.RequestGetHistory; -import com.fanap.podchat.requestobject.RequestGetLastSeens; -import com.fanap.podchat.requestobject.RequestLeaveThread; -import com.fanap.podchat.requestobject.RequestLocationMessage; -import com.fanap.podchat.requestobject.RequestMapReverse; -import com.fanap.podchat.requestobject.RequestMapStaticImage; -import com.fanap.podchat.requestobject.RequestMessage; -import com.fanap.podchat.chat.pin.pin_thread.model.RequestPinThread; -import com.fanap.podchat.requestobject.RequestRemoveParticipants; -import com.fanap.podchat.requestobject.RequestReplyFileMessage; -import com.fanap.podchat.requestobject.RequestReplyMessage; -import com.fanap.podchat.requestobject.RequestSeenMessageList; +import com.fanap.podchat.requestobject.GetCurrentUserRolesRequest; +import com.fanap.podchat.chat.pin.pin_message.model.PinUnpinMessageRequest; +import com.fanap.podchat.requestobject.SetRemoveRoleRequest; +import com.fanap.podchat.requestobject.AddContactRequest; +import com.fanap.podchat.requestobject.AddParticipantsRequest; +import com.fanap.podchat.requestobject.ClearHistoryRequest; +import com.fanap.podchat.requestobject.ConnectRequest; +import com.fanap.podchat.requestobject.CreateThreadRequest; +import com.fanap.podchat.requestobject.DeleteMessageRequest; +import com.fanap.podchat.requestobject.GetMessageDeliveredSeenListRequest; +import com.fanap.podchat.requestobject.FileMessageRequest; +import com.fanap.podchat.requestobject.ForwardMessageRequest; +import com.fanap.podchat.requestobject.GetAllThreadAdminsRequest; +import com.fanap.podchat.requestobject.GetHistoryRequest; +import com.fanap.podchat.requestobject.GetUserNotSeenDurationRequest; +import com.fanap.podchat.requestobject.LeaveThreadRequest; +import com.fanap.podchat.requestobject.SendLocationMessageRequest; +import com.fanap.podchat.requestobject.MapReverseRequest; +import com.fanap.podchat.requestobject.MapStaticImageRequest; +import com.fanap.podchat.requestobject.SendTextMessageRequest; +import com.fanap.podchat.chat.pin.pin_thread.model.PinUnpinThreadRequest; +import com.fanap.podchat.requestobject.RemoveParticipantsRequest; +import com.fanap.podchat.requestobject.SendReplyFileMessageRequest; +import com.fanap.podchat.requestobject.ReplyTextMessageRequest; import com.fanap.podchat.requestobject.RequestSetAuditor; import com.fanap.podchat.requestobject.RequestSignalMsg; -import com.fanap.podchat.requestobject.RequestSpam; -import com.fanap.podchat.requestobject.RequestThread; -import com.fanap.podchat.requestobject.RequestThreadInfo; -import com.fanap.podchat.requestobject.RequestThreadParticipant; -import com.fanap.podchat.requestobject.RequestUnBlock; -import com.fanap.podchat.requestobject.RequestUpdateContact; -import com.fanap.podchat.requestobject.RequestUploadFile; -import com.fanap.podchat.requestobject.RequestUploadImage; +import com.fanap.podchat.requestobject.SpamPrivateThreadRequest; +import com.fanap.podchat.requestobject.GetThreadsRequest; +import com.fanap.podchat.requestobject.UpdateThreadInfoRequest; +import com.fanap.podchat.requestobject.GetThreadParticipantsRequest; +import com.fanap.podchat.requestobject.UnBlockRequest; +import com.fanap.podchat.requestobject.UpdateContactsRequest; +import com.fanap.podchat.requestobject.UploadFileRequest; +import com.fanap.podchat.requestobject.UploadImageRequest; import com.fanap.podchat.requestobject.RetryUpload; import com.fanap.podchat.util.ChatMessageType; import com.fanap.podchat.util.ChatStateType; @@ -224,7 +223,7 @@ public void connect(String serverAddress, String appId, String severName, } @Override - public void connect(RequestConnect requestConnect) { + public void connect(ConnectRequest requestConnect) { NetworkPingSender.NetworkStateConfig build = new NetworkPingSender.NetworkStateConfig() .setHostName("chat-sandbox.pod.ir") @@ -264,9 +263,9 @@ public void connect(RequestConnect requestConnect) { @Override - public void checkIsNameAvailable(RequestCheckIsNameAvailable request) { + public void checkIsNameAvailable(IsPublicThreadNameAvailableRequest request) { - chat.isNameAvailable(request); + chat.isPublicThreadNameAvailable(request); } @Override @@ -276,22 +275,22 @@ public void createPublicThread(RequestCreatePublicThread request) { } @Override - public void joinPublicThread(RequestJoinPublicThread request) { + public void joinPublicThread(JoinPublicThreadRequest request) { chat.joinPublicThread(request); } @Override - public void getContact(RequestGetContact request) { + public void getContact(GetContactRequest request) { chat.getContacts(request, null); } @Override - public void getBlockList(RequestBlockList request) { + public void getBlockList(GetBlockedListRequest request) { chat.getBlockList(request, null); } @Override - public void getThreadParticipant(RequestThreadParticipant request) { + public void getThreadParticipant(GetThreadParticipantsRequest request) { chat.getThreadParticipants(request, null); } @@ -334,12 +333,12 @@ public String downloadFile(RequestGetPodSpaceImage rePod, ProgressHandler.IDownl } @Override - public String updateThreadInfo(RequestThreadInfo request) { + public String updateThreadInfo(UpdateThreadInfoRequest request) { return chat.updateThreadInfo(request, null); } @Override - public String createThread(RequestCreateThread requestCreateThread) { + public String createThread(CreateThreadRequest requestCreateThread) { return chat.createThread(requestCreateThread); } @@ -433,12 +432,12 @@ public void enableAutoRefresh(Activity activity, String entry) { } @Override - public void sendLocationMessage(RequestLocationMessage request) { + public void sendLocationMessage(SendLocationMessageRequest request) { chat.sendLocationMessage(request); } @Override - public void sendLocationMessage(RequestLocationMessage requestLocationMessage, ProgressHandler.sendFileMessage handler) { + public void sendLocationMessage(SendLocationMessageRequest requestLocationMessage, ProgressHandler.sendFileMessage handler) { chat.sendLocationMessage(requestLocationMessage, handler); } @@ -481,21 +480,21 @@ public void cancelUpload(String uniqueId) { } @Override - public void seenMessageList(RequestSeenMessageList requestParams) { + public void seenMessageList(GetMessageDeliveredSeenListRequest requestParams) { chat.getMessageSeenList(requestParams); } @Override - public void deliveredMessageList(RequestDeliveredMessageList requestParams) { + public void deliveredMessageList(GetMessageDeliveredSeenListRequest requestParams) { chat.getMessageDeliveredList(requestParams); } @Override - public void createThreadWithMessage(RequestCreateThread threadRequest) { + public void createThreadWithMessage(CreateThreadRequest threadRequest) { chat.createThreadWithMessage(threadRequest); } @@ -509,20 +508,20 @@ public String createThread(int threadType, Invitee[] invitee, String threadTitle } @Override - public void getThreads(RequestThread requestThread, ChatHandler handler) { + public void getThreads(GetThreadsRequest requestThread, ChatHandler handler) { chat.getThreads(requestThread, handler); -// try { -// Thread.sleep(2000); -// } catch (InterruptedException ignored) {} -// -// RequestGetUnreadMessagesCount req = new RequestGetUnreadMessagesCount -// .Builder() -// .withMuteThreads() -// .build(); -// -// chat.getAllUnreadMessagesCount(req); + try { + Thread.sleep(2000); + } catch (InterruptedException ignored) {} + + GetAllUnreadMessageCountRequest req = new GetAllUnreadMessageCountRequest + .Builder() + .withMuteThreads() + .build(); + + chat.getAllUnreadMessagesCount(req); } @Override @@ -535,7 +534,7 @@ public void getThreads(Integer count, long partnerCoreContactId, ChatHandler handler) { - RequestThread request = new RequestThread.Builder() + GetThreadsRequest request = new GetThreadsRequest.Builder() .count(count) .offset(offset) .threadIds(threadIds) @@ -553,7 +552,7 @@ public void getThreads(Integer count, public void getThreads(Integer count, Long offset, ArrayList threadIds, String threadName, boolean isNew, ChatHandler handler) { - RequestThread request = new RequestThread.Builder() + GetThreadsRequest request = new GetThreadsRequest.Builder() .count(count) .offset(offset) .threadIds(threadIds) @@ -584,12 +583,12 @@ public void mapRouting(String origin, String originLng) { } @Override - public void mapStaticImage(RequestMapStaticImage request) { + public void mapStaticImage(MapStaticImageRequest request) { chat.mapStaticImage(request); } @Override - public void mapReverse(RequestMapReverse request) { + public void mapReverse(MapReverseRequest request) { chat.mapReverse(request); } @@ -619,7 +618,7 @@ public void getHistory(History history, long threadId, ChatHandler handler) { } @Override - public void getHistory(RequestGetHistory request, ChatHandler handler) { + public void getHistory(GetHistoryRequest request, ChatHandler handler) { chat.getHistory(request, handler); } @@ -645,7 +644,7 @@ public void sendTextMessage(String textMessage, long threadId, Integer messageTy } @Override - public void sendTextMessage(RequestMessage requestMessage, ChatHandler handler) { + public void sendTextMessage(SendTextMessageRequest requestMessage, ChatHandler handler) { chat.sendTextMessage(requestMessage, null); } @@ -655,13 +654,13 @@ public void replyMessage(String messageContent, long threadId, long messageId, I } @Override - public void replyFileMessage(RequestReplyFileMessage request, ProgressHandler.sendFileMessage handler) { + public void replyFileMessage(SendReplyFileMessageRequest request, ProgressHandler.sendFileMessage handler) { chat.replyFileMessage(request, handler); } @Override - public void replyMessage(RequestReplyMessage request, ChatHandler handler) { - chat.replyMessage(request, handler); + public void replyMessage(ReplyTextMessageRequest request, ChatHandler handler) { + chat.replyTextMessage(request, handler); } @Override @@ -687,7 +686,7 @@ public void editMessage(int messageId, String messageContent, String metaData, C @Override public void getThreadParticipant(int count, Long offset, long threadId, ChatHandler handler) { - RequestThreadParticipant participant = new RequestThreadParticipant + GetThreadParticipantsRequest participant = new GetThreadParticipantsRequest .Builder(threadId) .count(50) .offset(0) @@ -721,7 +720,7 @@ public void removeContact(long id) { } @Override - public void searchContact(RequestSearchContact requestSearchContact) { + public void searchContact(SearchContactRequest requestSearchContact) { chat.searchContact(requestSearchContact); } @@ -743,7 +742,7 @@ public void unBlock(Long blockId, Long userId, Long threadId, Long contactId, Ch } @Override - public void unBlock(RequestUnBlock request, ChatHandler handler) { + public void unBlock(UnBlockRequest request, ChatHandler handler) { // RequestUnBlock requestUnBlock = new RequestUnBlock.Builder() // .blockId() @@ -763,20 +762,20 @@ public void unBlock(RequestUnBlock request, ChatHandler handler) { @Override public void spam(long threadId) { - RequestSpam requestSpam = new RequestSpam.Builder() + SpamPrivateThreadRequest requestSpam = new SpamPrivateThreadRequest.Builder() .threadId(threadId) .build(); - chat.spam(requestSpam); + chat.spamPrivateThread(requestSpam); } @Override - public String spam(RequestSpam requestSpam) { + public String spam(SpamPrivateThreadRequest requestSpam) { - return chat.spam(requestSpam); + return chat.spamPrivateThread(requestSpam); } @Override @@ -787,7 +786,7 @@ public void getBlockList(Long count, Long offset, ChatHandler handler) { @Override public String sendFileMessage(Context context, Activity activity, String description, long threadId, Uri fileUri, String metaData, Integer messageType, ProgressHandler.sendFileMessage handler) { - RequestFileMessage request = new RequestFileMessage.Builder(activity, threadId, fileUri, messageType) + FileMessageRequest request = new FileMessageRequest.Builder(activity, threadId, fileUri, messageType) .description(description) .systemMetadata(metaData) @@ -798,7 +797,7 @@ public String sendFileMessage(Context context, Activity activity, String descrip } @Override - public String sendFileMessage(RequestFileMessage requestFileMessage, ProgressHandler.sendFileMessage handler) { + public String sendFileMessage(FileMessageRequest requestFileMessage, ProgressHandler.sendFileMessage handler) { return chat.sendFileMessage(requestFileMessage, handler); } @@ -813,7 +812,7 @@ public void forwardMessage(long threadId, ArrayList messageIds) { } @Override - public void forwardMessage(RequestForwardMessage request) { + public void forwardMessage(ForwardMessageRequest request) { chat.forwardMessage(request); } @@ -823,14 +822,14 @@ public void updateContact(int id, String firstName, String lastName, String cell } @Override - public void updateContact(RequestUpdateContact updateContact) { + public void updateContact(UpdateContactsRequest updateContact) { chat.updateContact(updateContact); } @Override public void uploadImage(Activity activity, Uri fileUri) { - RequestUploadImage req = new RequestUploadImage.Builder(activity, fileUri) + UploadImageRequest req = new UploadImageRequest.Builder(activity, fileUri) .build(); chat.uploadImage(req); } @@ -838,7 +837,7 @@ public void uploadImage(Activity activity, Uri fileUri) { @Override public void uploadFile(@NonNull Activity activity, @NonNull Uri uri) { - RequestUploadFile request = new RequestUploadFile.Builder(activity, uri) + UploadFileRequest request = new UploadFileRequest.Builder(activity, uri) .build(); chat.uploadFile(request); @@ -860,7 +859,7 @@ public void removeParticipants(long threadId, List contactIds, ChatHandler } @Override - public void removeParticipants(RequestRemoveParticipants requestRemoveParticipants, ChatHandler handler) { + public void removeParticipants(RemoveParticipantsRequest requestRemoveParticipants, ChatHandler handler) { chat.removeParticipants(requestRemoveParticipants, handler); } @@ -870,14 +869,14 @@ public void addParticipants(long threadId, List contactIds, ChatHandler ha } @Override - public void addParticipants(RequestAddParticipants requestAddParticipants, ChatHandler handler) { + public void addParticipants(AddParticipantsRequest requestAddParticipants, ChatHandler handler) { chat.addParticipants(requestAddParticipants, handler); } @Override public void leaveThread(long threadId, ChatHandler handler) { - RequestLeaveThread leaveThread = new RequestLeaveThread.Builder(threadId) + LeaveThreadRequest leaveThread = new LeaveThreadRequest.Builder(threadId) .build(); chat.leaveThread(leaveThread, null); } @@ -888,14 +887,14 @@ public void updateThreadInfo(long threadId, ThreadInfoVO threadInfoVO, ChatHandl } @Override - public void updateThreadInfo(RequestThreadInfo request, ChatHandler handler) { + public void updateThreadInfo(UpdateThreadInfoRequest request, ChatHandler handler) { chat.updateThreadInfo(request, handler); } @Override public void deleteMessage(ArrayList messageIds, long threadId, Boolean deleteForAll, ChatHandler handler) { - RequestDeleteMessage requestDeleteMessage = new RequestDeleteMessage + DeleteMessageRequest requestDeleteMessage = new DeleteMessageRequest .Builder() .messageIds(messageIds) .deleteForAll(deleteForAll) @@ -907,7 +906,7 @@ public void deleteMessage(ArrayList messageIds, long threadId, Boolean del } @Override - public void deleteMessage(RequestDeleteMessage deleteMessage, ChatHandler handler) { + public void deleteMessage(DeleteMessageRequest deleteMessage, ChatHandler handler) { String un = chat.deleteMessage(deleteMessage, handler); } @@ -915,7 +914,7 @@ public void deleteMessage(RequestDeleteMessage deleteMessage, ChatHandler handle public void uploadImageProgress(Context context, Activity activity, Uri fileUri, ProgressHandler.onProgress handler) { - RequestUploadImage req = new RequestUploadImage.Builder(activity, fileUri) + UploadImageRequest req = new UploadImageRequest.Builder(activity, fileUri) .setwC(240) .sethC(120) .setxC(10) @@ -933,7 +932,7 @@ public void uploadImageProgress(Context context, Activity activity, Uri fileUri, public void uploadFileProgress(Context context, Activity activity, Uri fileUri, ProgressHandler.onProgressFile handler) { - RequestUploadFile req = new RequestUploadFile + UploadFileRequest req = new UploadFileRequest .Builder(activity, fileUri) .setPublic(false) .build(); @@ -942,38 +941,34 @@ public void uploadFileProgress(Context context, Activity activity, Uri fileUri, } @Override - public void setAdmin(RequestSetAdmin requestAddAdmin) { + public void setAdmin(SetRemoveRoleRequest requestAddAdmin) { chat.addAdmin(requestAddAdmin); } @Override - public void removeAdminRules(RequestSetAdmin requestAddAdmin) { + public void removeAdminRules(SetRemoveRoleRequest requestAddAdmin) { chat.removeAdmin(requestAddAdmin); } @Override - public void clearHistory(RequestClearHistory requestClearHistory) { + public void clearHistory(ClearHistoryRequest requestClearHistory) { chat.clearHistory(requestClearHistory); } @Override - public void getAdminList(RequestGetAdmin requestGetAdmin) { - chat.getAdminList(requestGetAdmin); + public void getAdminList(GetAllThreadAdminsRequest requestGetAdmin) { + chat.getThreadAdmins(requestGetAdmin); } @Override public void getNotSeenDuration(ArrayList userIds) { - - - RequestGetLastSeens requestGetLastSeens = - new RequestGetLastSeens + GetUserNotSeenDurationRequest requestGetLastSeens = + new GetUserNotSeenDurationRequest .Builder(userIds) .build(); - - - chat.getNotSeenDuration(requestGetLastSeens); + chat.getUserNotSeenDuration(requestGetLastSeens); } @@ -1007,14 +1002,14 @@ public void stopAllSignalMessages() { } @Override - public void pinThread(RequestPinThread requestPinThread) { + public void pinThread(PinUnpinThreadRequest requestPinThread) { chat.pinThread(requestPinThread); } @Override - public void unPinThread(RequestPinThread requestPinThread) { + public void unPinThread(PinUnpinThreadRequest requestPinThread) { chat.unPinThread(requestPinThread); } @@ -1027,13 +1022,13 @@ public void setAuditor(RequestSetAuditor requestAddAdmin) { @Override public void removeAuditor(RequestSetAuditor requestAddAdmin) { - - chat.removeAuditor(requestAddAdmin); +// + // chat.removeAuditor(requestAddAdmin); } @Override - public void createThreadWithFile(RequestCreateThreadWithFile request, ProgressHandler.sendFileMessage handler) { + public void createThreadWithFile(CreateThreadWithFileRequest request, ProgressHandler.sendFileMessage handler) { chat.createThreadWithFile(request, handler); } @@ -1055,7 +1050,7 @@ public void onThreadInfoUpdated(String content, ChatResponse respo } @Override - public void onGetContacts(String content, ChatResponse outPutContact) { + public void onGetContacts(String content, ChatResponse outPutContact) { super.onGetContacts(content, outPutContact); view.onGetContacts(); @@ -1068,7 +1063,7 @@ public void onSeen(String content, ChatResponse chatResponse) { } @Override - public void onUserInfo(String content, ChatResponse outPutUserInfo) { + public void onUserInfo(String content, ChatResponse outPutUserInfo) { view.onGetUserInfo(); } @@ -1100,7 +1095,7 @@ public void onError(String content, ErrorOutPut outPutError) { } @Override - public void getUserRoles(RequestGetUserRoles req) { + public void getUserRoles(GetCurrentUserRolesRequest req) { String uniqueId = chat.getCurrentUserRoles(req); @@ -1108,7 +1103,7 @@ public void getUserRoles(RequestGetUserRoles req) { } @Override - public void pinMessage(RequestPinMessage requestPinMessage) { + public void pinMessage(PinUnpinMessageRequest requestPinMessage) { String uniqueId = chat.pinMessage(requestPinMessage); @@ -1116,15 +1111,15 @@ public void pinMessage(RequestPinMessage requestPinMessage) { } @Override - public void unPinMessage(RequestPinMessage requestPinMessage) { + public void unPinMessage(PinUnpinMessageRequest requestPinMessage) { String uniqueId = chat.unPinMessage(requestPinMessage); } @Override - public void getMentionList(RequestGetMentionList req) { + public void getMentionList(GetMentionedRequest req) { - chat.getMentionList(req); + chat.getMentionedMessages(req); } @@ -1136,12 +1131,12 @@ public void startTyping(RequestSignalMsg req) { } @Override - public String downloadFile(RequestGetImage requestGetImage, ProgressHandler.IDownloadFile onProgressFile) { + public String downloadFile(GetImageRequest requestGetImage, ProgressHandler.IDownloadFile onProgressFile) { return chat.getImage(requestGetImage, onProgressFile); } @Override - public String downloadFile(RequestGetFile requestGetFile, ProgressHandler.IDownloadFile onProgressFile) { + public String downloadFile(GetFileRequest requestGetFile, ProgressHandler.IDownloadFile onProgressFile) { return chat.getFile(requestGetFile, onProgressFile); } @@ -1191,12 +1186,12 @@ public void closeChat() { } @Override - public void addContact(RequestAddContact request) { + public void addContact(AddContactRequest request) { chat.addContact(request); } @Override - public void updateChatProfile(RequestUpdateProfile request) { + public void updateChatProfile(UpdateProfileRequest request) { chat.updateChatProfile(request); } @@ -1301,7 +1296,7 @@ public void onThreadLeaveParticipant(String content, ChatResponse response) { + public void onChatProfileUpdated(ChatResponse response) { Log.d("CHAT_SDK_PRESENTER", "Chat profile updated"); @@ -1314,14 +1309,14 @@ public void onChatState(String state) { this.state = state; -// if(state.equals(ChatStateType.ChatSateConstant.CHAT_READY)){ -// -// RequestGetUnreadMessagesCount req = new RequestGetUnreadMessagesCount.Builder() -// .build(); -// -// chat.getAllUnreadMessagesCount(req); -// -// } + if(state.equals(ChatStateType.ChatSateConstant.CHAT_READY)){ + + GetAllUnreadMessageCountRequest req = new GetAllUnreadMessageCountRequest.Builder() + .build(); + + chat.getAllUnreadMessagesCount(req); + + } } @@ -1332,13 +1327,13 @@ public void onNewMessage(String content, ChatResponse chatResp } @Override - public void onBlock(String content, ChatResponse outPutBlock) { + public void onBlock(String content, ChatResponse outPutBlock) { super.onBlock(content, outPutBlock); view.onBlock(); } @Override - public void onUnBlock(String content, ChatResponse outPutBlock) { + public void onUnBlock(String content, ChatResponse outPutBlock) { super.onUnBlock(content, outPutBlock); view.onUnblock(); } @@ -1355,7 +1350,7 @@ public void onMapRouting(String content) { } @Override - public void onGetBlockList(String content, ChatResponse outPutBlockList) { + public void onGetBlockList(String content, ChatResponse outPutBlockList) { super.onGetBlockList(content, outPutBlockList); view.ongetBlockList(); } @@ -1366,7 +1361,7 @@ public void OnSeenMessageList(String content, ChatResponse ch } @Override - public void onSearchContact(String content, ChatResponse chatResponse) { + public void onSearchContact(String content, ChatResponse chatResponse) { super.onSearchContact(content, chatResponse); view.onSearchContact(); } diff --git a/app/src/main/res/layout/activity_chat.xml b/app/src/main/res/layout/activity_chat.xml index 615c0f66..801538c7 100644 --- a/app/src/main/res/layout/activity_chat.xml +++ b/app/src/main/res/layout/activity_chat.xml @@ -26,11 +26,16 @@ android:id="@+id/textViewStateChat" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="29dp" android:layout_marginStart="16dp" + android:layout_marginEnd="8dp" + android:layout_marginBottom="29dp" android:text="State" + android:textSize="12sp" app:layout_constraintBottom_toTopOf="@+id/spinner" - app:layout_constraintStart_toStartOf="parent" /> + app:layout_constraintEnd_toStartOf="@+id/imageMap" + app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@+id/imageMap" />