From 1932d5b09b57e799bfb0c10b01ce6d3f91323c7d Mon Sep 17 00:00:00 2001 From: "a.mochalov" Date: Thu, 12 Aug 2021 00:10:21 +0300 Subject: [PATCH] version 3.2.0 --- {vk-sdk-api => api}/.gitignore | 0 {vk-sdk-api => api}/README.md | 2 +- {vk-sdk-api => api}/build.gradle | 4 +- .../src/main/AndroidManifest.xml | 0 .../java/com/vk/sdk/api/ApiResponseParser.kt | 0 .../main/java/com/vk/sdk/api/GsonHolder.kt | 3 + .../main/java/com/vk/sdk/api/NewApiRequest.kt | 2 +- .../com/vk/sdk/api/account/AccountService.kt | 6 +- .../api/account/dto/AccountAccountCounters.kt | 7 +- .../dto/AccountChangePasswordResponse.kt | 0 .../dto/AccountGetActiveOffersResponse.kt | 0 .../account/dto/AccountGetBannedResponse.kt | 4 +- .../com/vk/sdk/api/account/dto/AccountInfo.kt | 0 .../sdk/api/account/dto/AccountNameRequest.kt | 0 .../account/dto/AccountNameRequestStatus.kt | 0 .../vk/sdk/api/account/dto/AccountOffer.kt | 0 .../account/dto/AccountPushConversations.kt | 0 .../dto/AccountPushConversationsItem.kt | 0 .../sdk/api/account/dto/AccountPushParams.kt | 0 .../api/account/dto/AccountPushParamsMode.kt | 0 .../api/account/dto/AccountPushParamsOnoff.kt | 0 .../account/dto/AccountPushParamsSettings.kt | 0 .../api/account/dto/AccountPushSettings.kt | 0 .../dto/AccountSaveProfileInfoResponse.kt | 0 .../api/account/dto/AccountUserSettings.kt | 3 +- .../dto/AccountUserSettingsInterest.kt | 0 .../dto/AccountUserSettingsInterests.kt | 0 .../api/account/dto/BdateVisibilityParam.kt | 0 .../com/vk/sdk/api/account/dto/FieldsParam.kt | 0 .../com/vk/sdk/api/account/dto/FilterParam.kt | 14 +- .../vk/sdk/api/account/dto/RelationParam.kt | 0 .../com/vk/sdk/api/account/dto/SexParam.kt | 0 .../sdk/api/addresses/dto/AddressesFields.kt | 0 .../java/com/vk/sdk/api/ads/AdsService.kt | 38 +- .../com/vk/sdk/api/ads/dto/AdFormatParam.kt | 0 .../com/vk/sdk/api/ads/dto/AdsAccessRole.kt | 0 .../com/vk/sdk/api/ads/dto/AdsAccesses.kt | 0 .../java/com/vk/sdk/api/ads/dto/AdsAccount.kt | 0 .../com/vk/sdk/api/ads/dto/AdsAccountType.kt | 0 .../main/java/com/vk/sdk/api/ads/dto/AdsAd.kt | 0 .../com/vk/sdk/api/ads/dto/AdsAdApproved.kt | 0 .../com/vk/sdk/api/ads/dto/AdsAdCostType.kt | 0 .../com/vk/sdk/api/ads/dto/AdsAdLayout.kt | 0 .../com/vk/sdk/api/ads/dto/AdsAdStatus.kt | 0 .../com/vk/sdk/api/ads/dto/AdsCampaign.kt | 10 + .../vk/sdk/api/ads/dto/AdsCampaignStatus.kt | 0 .../com/vk/sdk/api/ads/dto/AdsCampaignType.kt | 0 .../com/vk/sdk/api/ads/dto/AdsCategory.kt | 0 .../java/com/vk/sdk/api/ads/dto/AdsClient.kt | 0 .../ads/dto/AdsCreateTargetGroupResponse.kt | 0 .../com/vk/sdk/api/ads/dto/AdsCriteriaSex.kt | 0 .../com/vk/sdk/api/ads/dto/AdsDemoStats.kt | 0 .../vk/sdk/api/ads/dto/AdsDemostatsFormat.kt | 0 .../com/vk/sdk/api/ads/dto/AdsFloodStats.kt | 0 .../api/ads/dto/AdsGetCategoriesResponse.kt | 0 .../dto/AdsGetLookalikeRequestsResponse.kt | 0 .../api/ads/dto/AdsGetMusiciansResponse.kt | 0 .../com/vk/sdk/api/ads/dto/AdsLinkStatus.kt | 0 .../vk/sdk/api/ads/dto/AdsLookalikeRequest.kt | 0 .../AdsLookalikeRequestSaveAudienceLevel.kt | 0 .../com/vk/sdk/api/ads/dto/AdsMusician.kt | 0 .../com/vk/sdk/api/ads/dto/AdsObjectType.kt | 0 .../com/vk/sdk/api/ads/dto/AdsParagraphs.kt | 0 .../sdk/api/ads/dto/AdsPromotedPostReach.kt | 0 .../com/vk/sdk/api/ads/dto/AdsRejectReason.kt | 0 .../java/com/vk/sdk/api/ads/dto/AdsRules.kt | 0 .../java/com/vk/sdk/api/ads/dto/AdsStats.kt | 0 .../com/vk/sdk/api/ads/dto/AdsStatsAge.kt | 0 .../com/vk/sdk/api/ads/dto/AdsStatsCities.kt | 0 .../com/vk/sdk/api/ads/dto/AdsStatsFormat.kt | 3 - .../com/vk/sdk/api/ads/dto/AdsStatsSex.kt | 0 .../com/vk/sdk/api/ads/dto/AdsStatsSexAge.kt | 0 .../vk/sdk/api/ads/dto/AdsStatsSexValue.kt | 0 .../vk/sdk/api/ads/dto/AdsStatsViewsTimes.kt | 0 .../com/vk/sdk/api/ads/dto/AdsTargSettings.kt | 0 .../com/vk/sdk/api/ads/dto/AdsTargStats.kt | 0 .../vk/sdk/api/ads/dto/AdsTargSuggestions.kt | 0 .../com/vk/sdk/api/ads/dto/AdsTargetGroup.kt | 0 .../api/ads/dto/AdsUpdateOfficeUsersResult.kt | 4 +- .../java/com/vk/sdk/api/ads/dto/AdsUsers.kt | 4 +- .../com/vk/sdk/api/ads/dto/FieldsParam.kt | 0 .../com/vk/sdk/api/ads/dto/IdsTypeParam.kt | 0 .../java/com/vk/sdk/api/ads/dto/LangParam.kt | 0 .../com/vk/sdk/api/ads/dto/LinkTypeParam.kt | 0 .../com/vk/sdk/api/ads/dto/PeriodParam.kt | 0 .../com/vk/sdk/api/ads/dto/SectionParam.kt | 0 .../vk/sdk/api/ads/dto/StatsFieldsParam.kt | 0 .../aliexpress/dto/AliexpressBlockPanel.kt | 32 +- .../aliexpress/dto/AliexpressCarouselItem.kt | 77 ++- .../sdk/api/appWidgets/AppWidgetsService.kt | 0 ...pWidgetsGetAppImageUploadServerResponse.kt | 0 ...idgetsGetGroupImageUploadServerResponse.kt | 0 .../sdk/api/appWidgets/dto/AppWidgetsPhoto.kt | 0 .../api/appWidgets/dto/AppWidgetsPhotos.kt | 0 .../sdk/api/appWidgets/dto/ImageTypeParam.kt | 0 .../vk/sdk/api/appWidgets/dto/TypeParam.kt | 0 .../java/com/vk/sdk/api/apps/AppsService.kt | 8 +- .../java/com/vk/sdk/api/apps/dto/AppsApp.kt | 0 .../api/apps/dto/AppsAppLeaderboardType.kt | 0 .../com/vk/sdk/api/apps/dto/AppsAppMin.kt | 0 .../com/vk/sdk/api/apps/dto/AppsAppType.kt | 0 .../vk/sdk/api/apps/dto/AppsCatalogList.kt | 6 +- .../apps/dto/AppsGetFriendsListResponse.kt | 0 .../dto/AppsGetLeaderboardExtendedResponse.kt | 0 .../apps/dto/AppsGetLeaderboardResponse.kt | 0 .../dto/AppsGetMiniAppPoliciesResponse.kt | 0 .../vk/sdk/api/apps/dto/AppsGetResponse.kt | 0 .../sdk/api/apps/dto/AppsGetScopesResponse.kt | 0 .../vk/sdk/api/apps/dto/AppsLeaderboard.kt | 3 +- .../java/com/vk/sdk/api/apps/dto/AppsScope.kt | 0 .../com/vk/sdk/api/apps/dto/FilterParam.kt | 0 .../com/vk/sdk/api/apps/dto/NameCaseParam.kt | 0 .../com/vk/sdk/api/apps/dto/PlatformParam.kt | 0 .../java/com/vk/sdk/api/apps/dto/SortParam.kt | 0 .../java/com/vk/sdk/api/apps/dto/TypeParam.kt | 0 .../com/vk/sdk/api/audio/dto/AudioArtist.kt | 0 .../com/vk/sdk/api/audio/dto/AudioAudio.kt | 3 +- .../com/vk/sdk/api/audio/dto/AudioGenre.kt | 0 .../vk/sdk/api/audio/dto/AudioPhotosByType.kt | 0 .../java/com/vk/sdk/api/auth/AuthService.kt | 0 .../sdk/api/auth/dto/AuthRestoreResponse.kt | 0 .../com/vk/sdk/api/base/dto/BaseBoolInt.kt | 0 .../java/com/vk/sdk/api/base/dto/BaseCity.kt | 0 .../vk/sdk/api/base/dto/BaseCommentsInfo.kt | 3 - .../com/vk/sdk/api/base/dto/BaseCountry.kt | 0 .../com/vk/sdk/api/base/dto/BaseCropPhoto.kt | 0 .../vk/sdk/api/base/dto/BaseCropPhotoCrop.kt | 0 .../vk/sdk/api/base/dto/BaseCropPhotoRect.kt | 0 .../java/com/vk/sdk/api/base/dto/BaseError.kt | 0 .../java/com/vk/sdk/api/base/dto/BaseGeo.kt | 0 .../vk/sdk/api/base/dto/BaseGeoCoordinates.kt | 0 .../vk/sdk/api/base/dto/BaseGradientPoint.kt | 0 .../java/com/vk/sdk/api/base/dto/BaseImage.kt | 0 .../java/com/vk/sdk/api/base/dto/BaseLikes.kt | 0 .../com/vk/sdk/api/base/dto/BaseLikesInfo.kt | 0 .../java/com/vk/sdk/api/base/dto/BaseLink.kt | 0 .../sdk/api/base/dto/BaseLinkApplication.kt | 0 .../api/base/dto/BaseLinkApplicationStore.kt | 0 .../com/vk/sdk/api/base/dto/BaseLinkButton.kt | 6 +- .../sdk/api/base/dto/BaseLinkButtonAction.kt | 0 .../api/base/dto/BaseLinkButtonActionType.kt | 5 +- .../sdk/api/base/dto/BaseLinkButtonStyle.kt | 0 .../vk/sdk/api/base/dto/BaseLinkProduct.kt | 12 - .../sdk/api/base/dto/BaseLinkProductStatus.kt | 0 .../com/vk/sdk/api/base/dto/BaseLinkRating.kt | 0 .../com/vk/sdk/api/base/dto/BaseObject.kt | 0 .../vk/sdk/api/base/dto/BaseObjectCount.kt | 0 .../vk/sdk/api/base/dto/BaseObjectWithName.kt | 0 .../com/vk/sdk/api/base/dto/BaseOkResponse.kt | 0 .../java/com/vk/sdk/api/base/dto/BasePlace.kt | 0 .../vk/sdk/api/base/dto/BasePropertyExists.kt | 0 .../vk/sdk/api/base/dto/BaseRepostsInfo.kt | 0 .../vk/sdk/api/base/dto/BaseRequestParam.kt | 0 .../java/com/vk/sdk/api/base/dto/BaseSex.kt | 0 .../com/vk/sdk/api/base/dto/BaseSticker.kt | 0 .../sdk/api/base/dto/BaseStickerAnimation.kt | 0 .../com/vk/sdk/api/base/dto/BaseStickerNew.kt | 41 +- .../vk/sdk/api/base/dto/BaseUploadServer.kt | 0 .../sdk/api/base/dto/BaseUserGroupFields.kt | 3 + .../com/vk/sdk/api/base/dto/BaseUserId.kt | 4 +- .../java/com/vk/sdk/api/board/BoardService.kt | 0 .../vk/sdk/api/board/dto/BoardDefaultOrder.kt | 0 .../dto/BoardGetCommentsExtendedResponse.kt | 0 .../api/board/dto/BoardGetCommentsResponse.kt | 0 .../dto/BoardGetTopicsExtendedResponse.kt | 0 .../api/board/dto/BoardGetTopicsResponse.kt | 0 .../com/vk/sdk/api/board/dto/BoardTopic.kt | 0 .../vk/sdk/api/board/dto/BoardTopicComment.kt | 0 .../vk/sdk/api/board/dto/BoardTopicPoll.kt | 3 +- .../com/vk/sdk/api/board/dto/OrderParam.kt | 0 .../com/vk/sdk/api/board/dto/PreviewParam.kt | 0 .../com/vk/sdk/api/board/dto/SortParam.kt | 0 .../com/vk/sdk/api/calls/dto/CallsCall.kt | 0 .../com/vk/sdk/api/calls/dto/CallsEndState.kt | 0 .../vk/sdk/api/calls/dto/CallsParticipants.kt | 0 .../dto/ClassifiedsYoulaCarouselBlockGroup.kt | 22 +- .../dto/ClassifiedsYoulaItemExtended.kt | 112 ++++ .../dto/ClassifiedsYoulaItemOnClickOptions.kt | 15 +- .../dto/ClassifiedsYoulaItemPhoto.kt | 18 +- .../dto/ClassifiedsYoulaItemVkAuthor.kt | 18 +- .../vk/sdk/api/comment/dto/CommentThread.kt | 0 .../vk/sdk/api/database/DatabaseService.kt | 0 .../vk/sdk/api/database/dto/DatabaseCity.kt | 0 .../sdk/api/database/dto/DatabaseFaculty.kt | 0 .../database/dto/DatabaseGetChairsResponse.kt | 0 .../database/dto/DatabaseGetCitiesResponse.kt | 0 .../dto/DatabaseGetCountriesResponse.kt | 0 .../dto/DatabaseGetFacultiesResponse.kt | 0 .../dto/DatabaseGetMetroStationsResponse.kt | 0 .../dto/DatabaseGetRegionsResponse.kt | 0 .../dto/DatabaseGetSchoolsResponse.kt | 0 .../dto/DatabaseGetUniversitiesResponse.kt | 0 .../vk/sdk/api/database/dto/DatabaseRegion.kt | 0 .../vk/sdk/api/database/dto/DatabaseSchool.kt | 0 .../sdk/api/database/dto/DatabaseStation.kt | 0 .../api/database/dto/DatabaseUniversity.kt | 0 .../discover/dto/DiscoverCarouselButton.kt | 0 .../dto/DiscoverCarouselButtonAction.kt | 0 .../dto/DiscoverCarouselButtonActionTarget.kt | 0 .../dto/DiscoverCarouselButtonActionType.kt | 0 .../dto/DiscoverCarouselButtonContext.kt | 0 .../dto/DiscoverCarouselButtonType.kt | 0 .../api/discover/dto/DiscoverCarouselItem.kt | 0 .../dto/DiscoverCarouselItemDescription.kt | 0 .../DiscoverCarouselItemDescriptionType.kt | 0 .../dto/DiscoverCarouselObjectsType.kt | 0 .../java/com/vk/sdk/api/docs/DocsService.kt | 4 +- .../java/com/vk/sdk/api/docs/dto/DocsDoc.kt | 3 +- .../sdk/api/docs/dto/DocsDocAttachmentType.kt | 0 .../com/vk/sdk/api/docs/dto/DocsDocPreview.kt | 0 .../api/docs/dto/DocsDocPreviewAudioMsg.kt | 0 .../api/docs/dto/DocsDocPreviewGraffiti.kt | 0 .../sdk/api/docs/dto/DocsDocPreviewPhoto.kt | 0 .../api/docs/dto/DocsDocPreviewPhotoSizes.kt | 0 .../sdk/api/docs/dto/DocsDocPreviewVideo.kt | 0 .../com/vk/sdk/api/docs/dto/DocsDocTypes.kt | 0 .../vk/sdk/api/docs/dto/DocsGetResponse.kt | 0 .../sdk/api/docs/dto/DocsGetTypesResponse.kt | 0 .../vk/sdk/api/docs/dto/DocsSaveResponse.kt | 0 .../vk/sdk/api/docs/dto/DocsSearchResponse.kt | 0 .../java/com/vk/sdk/api/docs/dto/TypeParam.kt | 0 .../java/com/vk/sdk/api/donut/DonutService.kt | 0 .../donut/dto/DonutDonatorSubscriptionInfo.kt | 3 +- .../dto/DonutGetSubscriptionsResponse.kt | 0 .../downloadedGames/DownloadedGamesService.kt | 0 .../dto/DownloadedGamesPaidStatusResponse.kt | 0 .../sdk/api/events/dto/EventsEventAttach.kt | 0 .../com/vk/sdk/api/execute/ExecuteService.kt | 0 .../java/com/vk/sdk/api/fave/FaveService.kt | 0 .../com/vk/sdk/api/fave/dto/FaveBookmark.kt | 0 .../vk/sdk/api/fave/dto/FaveBookmarkType.kt | 0 .../api/fave/dto/FaveGetExtendedResponse.kt | 0 .../sdk/api/fave/dto/FaveGetPagesResponse.kt | 0 .../vk/sdk/api/fave/dto/FaveGetResponse.kt | 0 .../sdk/api/fave/dto/FaveGetTagsResponse.kt | 0 .../java/com/vk/sdk/api/fave/dto/FavePage.kt | 0 .../com/vk/sdk/api/fave/dto/FavePageType.kt | 0 .../java/com/vk/sdk/api/fave/dto/FaveTag.kt | 0 .../com/vk/sdk/api/fave/dto/ItemTypeParam.kt | 0 .../com/vk/sdk/api/fave/dto/PositionParam.kt | 0 .../java/com/vk/sdk/api/fave/dto/TypeParam.kt | 0 .../com/vk/sdk/api/friends/FriendsService.kt | 0 .../com/vk/sdk/api/friends/dto/FilterParam.kt | 0 .../api/friends/dto/FriendsAddListResponse.kt | 0 .../sdk/api/friends/dto/FriendsAddResponse.kt | 0 .../api/friends/dto/FriendsDeleteResponse.kt | 0 .../dto/FriendsFriendExtendedStatus.kt | 4 +- .../api/friends/dto/FriendsFriendStatus.kt | 4 +- .../friends/dto/FriendsFriendStatusStatus.kt | 0 .../sdk/api/friends/dto/FriendsFriendsList.kt | 0 .../friends/dto/FriendsGetFieldsResponse.kt | 3 +- .../friends/dto/FriendsGetListsResponse.kt | 0 .../friends/dto/FriendsGetRequestsResponse.kt | 0 .../dto/FriendsGetSuggestionsResponse.kt | 0 .../api/friends/dto/FriendsRequestsMutual.kt | 0 .../api/friends/dto/FriendsSearchResponse.kt | 0 .../api/friends/dto/FriendsUserXtrPhone.kt | 27 +- .../vk/sdk/api/friends/dto/NameCaseParam.kt | 0 .../com/vk/sdk/api/friends/dto/OrderParam.kt | 0 .../com/vk/sdk/api/friends/dto/SortParam.kt | 0 .../java/com/vk/sdk/api/gifts/GiftsService.kt | 0 .../vk/sdk/api/gifts/dto/GiftsGetResponse.kt | 0 .../com/vk/sdk/api/gifts/dto/GiftsGift.kt | 0 .../vk/sdk/api/gifts/dto/GiftsGiftPrivacy.kt | 0 .../com/vk/sdk/api/gifts/dto/GiftsLayout.kt | 0 .../com/vk/sdk/api/groups/GroupsService.kt | 21 +- .../com/vk/sdk/api/groups/dto/ActParam.kt | 0 .../vk/sdk/api/groups/dto/AgeLimitsParam.kt | 0 .../com/vk/sdk/api/groups/dto/FilterParam.kt | 0 .../dto/GroupsAddCallbackServerResponse.kt | 0 .../vk/sdk/api/groups/dto/GroupsAddress.kt | 0 .../api/groups/dto/GroupsAddressTimetable.kt | 0 .../groups/dto/GroupsAddressTimetableDay.kt | 0 .../groups/dto/GroupsAddressWorkInfoStatus.kt | 0 .../sdk/api/groups/dto/GroupsAddressesInfo.kt | 0 .../vk/sdk/api/groups/dto/GroupsAppButton.kt | 20 +- .../vk/sdk/api/groups/dto/GroupsBanInfo.kt | 0 .../sdk/api/groups/dto/GroupsBanInfoReason.kt | 0 .../vk/sdk/api/groups/dto/GroupsBannedItem.kt | 0 .../api/groups/dto/GroupsCallbackServer.kt | 0 .../api/groups/dto/GroupsCallbackSettings.kt | 0 .../sdk/api/groups/dto/GroupsContactsItem.kt | 4 +- .../sdk/api/groups/dto/GroupsCountersGroup.kt | 23 +- .../com/vk/sdk/api/groups/dto/GroupsCover.kt | 0 .../com/vk/sdk/api/groups/dto/GroupsFields.kt | 29 +- .../com/vk/sdk/api/groups/dto/GroupsFilter.kt | 0 .../groups/dto/GroupsGetAddressesResponse.kt | 0 .../api/groups/dto/GroupsGetBannedResponse.kt | 0 ...oupsGetCallbackConfirmationCodeResponse.kt | 0 .../dto/GroupsGetCallbackServersResponse.kt | 0 .../GroupsGetCatalogInfoExtendedResponse.kt | 0 .../dto/GroupsGetCatalogInfoResponse.kt | 0 .../groups/dto/GroupsGetCatalogResponse.kt | 0 .../groups/dto/GroupsGetExtendedResponse.kt | 0 .../dto/GroupsGetInvitedUsersResponse.kt | 0 .../dto/GroupsGetInvitesExtendedResponse.kt | 0 .../groups/dto/GroupsGetInvitesResponse.kt | 0 .../dto/GroupsGetMembersFieldsResponse.kt | 0 .../dto/GroupsGetRequestsFieldsResponse.kt | 0 .../sdk/api/groups/dto/GroupsGetResponse.kt | 0 .../groups/dto/GroupsGetSettingsResponse.kt | 6 +- .../dto/GroupsGetTokenPermissionsResponse.kt | 0 .../com/vk/sdk/api/groups/dto/GroupsGroup.kt | 53 +- .../sdk/api/groups/dto/GroupsGroupAccess.kt | 0 .../api/groups/dto/GroupsGroupAdminLevel.kt | 0 .../api/groups/dto/GroupsGroupAgeLimits.kt | 0 .../sdk/api/groups/dto/GroupsGroupAttach.kt | 0 .../vk/sdk/api/groups/dto/GroupsGroupAudio.kt | 0 .../sdk/api/groups/dto/GroupsGroupBanInfo.kt | 0 .../sdk/api/groups/dto/GroupsGroupCategory.kt | 0 .../api/groups/dto/GroupsGroupCategoryFull.kt | 0 .../api/groups/dto/GroupsGroupCategoryType.kt | 0 .../vk/sdk/api/groups/dto/GroupsGroupDocs.kt | 0 .../vk/sdk/api/groups/dto/GroupsGroupFull.kt | 64 ++- .../groups/dto/GroupsGroupFullAgeLimits.kt | 0 .../groups/dto/GroupsGroupFullMemberStatus.kt | 0 .../api/groups/dto/GroupsGroupFullSection.kt | 19 +- .../sdk/api/groups/dto/GroupsGroupIsClosed.kt | 0 .../vk/sdk/api/groups/dto/GroupsGroupLink.kt | 0 .../sdk/api/groups/dto/GroupsGroupPhotos.kt | 0 .../dto/GroupsGroupPublicCategoryList.kt | 0 .../groups/dto/GroupsGroupSuggestedPrivacy.kt | 0 .../vk/sdk/api/groups/dto/GroupsGroupTag.kt | 0 .../sdk/api/groups/dto/GroupsGroupTopics.kt | 0 .../vk/sdk/api/groups/dto/GroupsGroupType.kt | 0 .../vk/sdk/api/groups/dto/GroupsGroupVideo.kt | 0 .../vk/sdk/api/groups/dto/GroupsGroupWall.kt | 0 .../vk/sdk/api/groups/dto/GroupsGroupWiki.kt | 0 .../sdk/api/groups/dto/GroupsGroupsArray.kt | 0 .../vk/sdk/api/groups/dto/GroupsLinksItem.kt | 5 +- .../vk/sdk/api/groups/dto/GroupsLiveCovers.kt | 0 .../api/groups/dto/GroupsLongPollEvents.kt | 32 +- .../api/groups/dto/GroupsLongPollServer.kt | 0 .../api/groups/dto/GroupsLongPollSettings.kt | 0 .../vk/sdk/api/groups/dto/GroupsMarketInfo.kt | 13 +- .../sdk/api/groups/dto/GroupsOnlineStatus.kt | 0 .../api/groups/dto/GroupsOnlineStatusType.kt | 0 .../groups/dto/GroupsOwnerXtrBanInfoType.kt | 0 .../vk/sdk/api/groups/dto/GroupsPhotoSize.kt | 15 +- .../sdk/api/groups/dto/GroupsRoleOptions.kt | 0 .../api/groups/dto/GroupsSearchResponse.kt | 0 .../api/groups/dto/GroupsSettingsTwitter.kt | 0 .../sdk/api/groups/dto/GroupsSubjectItem.kt | 0 .../vk/sdk/api/groups/dto/GroupsSuggestion.kt | 0 .../dto/GroupsTokenPermissionSetting.kt | 0 .../sdk/api/groups/dto/GroupsUserXtrRole.kt | 27 +- .../vk/sdk/api/groups/dto/NameCaseParam.kt | 0 .../com/vk/sdk/api/groups/dto/SortParam.kt | 0 .../com/vk/sdk/api/groups/dto/StateParam.kt | 0 .../com/vk/sdk/api/groups/dto/SubtypeParam.kt | 0 .../vk/sdk/api/groups/dto/TagColorParam.kt | 0 .../com/vk/sdk/api/groups/dto/TypeParam.kt | 0 .../sdk/api/groups/dto/WorkInfoStatusParam.kt | 0 .../vk/sdk/api/leadForms/LeadFormsService.kt | 0 .../java/com/vk/sdk/api/likes/LikesService.kt | 0 .../com/vk/sdk/api/likes/dto/FilterParam.kt | 0 .../vk/sdk/api/likes/dto/FriendsOnlyParam.kt | 0 .../vk/sdk/api/likes/dto/LikesAddResponse.kt | 0 .../sdk/api/likes/dto/LikesDeleteResponse.kt | 0 .../likes/dto/LikesGetListExtendedResponse.kt | 0 .../sdk/api/likes/dto/LikesGetListResponse.kt | 0 .../sdk/api/likes/dto/LikesIsLikedResponse.kt | 0 .../vk/sdk/api/link/dto/LinkTargetObject.kt | 3 +- .../com/vk/sdk/api/market/MarketService.kt | 75 ++- .../api/market/dto/MarketAddAlbumResponse.kt | 0 .../sdk/api/market/dto/MarketAddResponse.kt | 0 .../vk/sdk/api/market/dto/MarketCurrency.kt | 0 .../market/dto/MarketGetAlbumByIdResponse.kt | 0 .../api/market/dto/MarketGetAlbumsResponse.kt | 0 .../dto/MarketGetByIdExtendedResponse.kt | 0 .../api/market/dto/MarketGetByIdResponse.kt | 0 .../market/dto/MarketGetCategoriesResponse.kt | 8 +- .../market/dto/MarketGetCommentsResponse.kt | 0 .../market/dto/MarketGetExtendedResponse.kt | 0 .../dto/MarketGetGroupOrdersResponse.kt | 0 .../market/dto/MarketGetOrderByIdResponse.kt | 0 .../market/dto/MarketGetOrderItemsResponse.kt | 0 .../dto/MarketGetOrdersExtendedResponse.kt | 0 .../api/market/dto/MarketGetOrdersResponse.kt | 0 .../sdk/api/market/dto/MarketGetResponse.kt | 0 .../sdk/api/market/dto/MarketMarketAlbum.kt | 16 +- .../api/market/dto/MarketMarketCategory.kt | 6 +- .../vk/sdk/api/market/dto/MarketMarketItem.kt | 8 +- .../dto/MarketMarketItemAvailability.kt | 0 .../api/market/dto/MarketMarketItemFull.kt | 15 +- .../com/vk/sdk/api/market/dto/MarketOrder.kt | 20 +- .../vk/sdk/api/market/dto/MarketOrderItem.kt | 3 +- .../com/vk/sdk/api/market/dto/MarketPrice.kt | 40 +- .../dto/MarketSearchExtendedResponse.kt | 0 .../api/market/dto/MarketSearchResponse.kt | 0 .../vk/sdk/api/market/dto/MarketSection.kt | 11 +- .../api/market/dto/MarketServicesViewType.kt | 0 .../sdk/api/market/dto/PaymentStatusParam.kt | 0 .../com/vk/sdk/api/market/dto/ReasonParam.kt | 0 .../com/vk/sdk/api/market/dto/RevParam.kt | 0 .../com/vk/sdk/api/market/dto/SortParam.kt | 0 .../com/vk/sdk/api/market/dto/StatusParam.kt | 0 .../vk/sdk/api/messages/MessagesService.kt | 32 +- .../vk/sdk/api/messages/dto/FilterParam.kt | 0 .../vk/sdk/api/messages/dto/IntentParam.kt | 0 .../vk/sdk/api/messages/dto/MediaTypeParam.kt | 0 .../api/messages/dto/MessagesAudioMessage.kt | 3 +- .../vk/sdk/api/messages/dto/MessagesChat.kt | 0 .../api/messages/dto/MessagesChatPreview.kt | 0 .../messages/dto/MessagesChatPushSettings.kt | 0 .../messages/dto/MessagesChatRestrictions.kt | 0 .../api/messages/dto/MessagesChatSettings.kt | 3 +- .../messages/dto/MessagesChatSettingsAcl.kt | 0 .../dto/MessagesChatSettingsPermissions.kt | 0 .../messages/dto/MessagesChatSettingsPhoto.kt | 0 .../messages/dto/MessagesChatSettingsState.kt | 0 .../api/messages/dto/MessagesConversation.kt | 8 +- .../dto/MessagesConversationCanWrite.kt | 0 .../dto/MessagesConversationMember.kt | 0 .../messages/dto/MessagesConversationPeer.kt | 0 .../dto/MessagesConversationPeerType.kt | 0 .../dto/MessagesConversationSortId.kt | 0 .../dto/MessagesConversationWithMessage.kt | 0 .../dto/MessagesDeleteChatPhotoResponse.kt | 0 .../dto/MessagesDeleteConversationResponse.kt | 0 .../messages/dto/MessagesForeignMessage.kt | 0 ...sagesGetByConversationMessageIdResponse.kt | 0 .../dto/MessagesGetByIdExtendedResponse.kt | 0 .../messages/dto/MessagesGetByIdResponse.kt | 0 .../dto/MessagesGetChatPreviewResponse.kt | 0 .../dto/MessagesGetConversationById.kt | 2 +- .../MessagesGetConversationMembersResponse.kt | 0 .../dto/MessagesGetConversationsResponse.kt | 0 .../MessagesGetHistoryAttachmentsResponse.kt | 0 .../dto/MessagesGetHistoryExtendedResponse.kt | 0 .../dto/MessagesGetHistoryResponse.kt | 0 ...gesGetImportantMessagesExtendedResponse.kt | 0 .../MessagesGetImportantMessagesResponse.kt | 0 .../dto/MessagesGetIntentUsersResponse.kt | 3 +- .../dto/MessagesGetInviteLinkResponse.kt | 0 .../dto/MessagesGetLongPollHistoryResponse.kt | 0 .../sdk/api/messages/dto/MessagesGraffiti.kt | 3 +- .../messages/dto/MessagesHistoryAttachment.kt | 0 .../dto/MessagesHistoryMessageAttachment.kt | 0 .../MessagesHistoryMessageAttachmentType.kt | 0 ...sagesIsMessagesFromGroupAllowedResponse.kt | 0 .../MessagesJoinChatByInviteLinkResponse.kt | 0 .../sdk/api/messages/dto/MessagesKeyboard.kt | 0 .../messages/dto/MessagesKeyboardButton.kt | 0 .../dto/MessagesKeyboardButtonAction.kt | 3 +- .../api/messages/dto/MessagesLastActivity.kt | 0 .../messages/dto/MessagesLongpollMessages.kt | 0 .../messages/dto/MessagesLongpollParams.kt | 0 .../sdk/api/messages/dto/MessagesMessage.kt | 5 +- .../messages/dto/MessagesMessageAttachment.kt | 0 .../dto/MessagesMessageAttachmentType.kt | 0 .../dto/MessagesMessageRequestData.kt | 0 .../api/messages/dto/MessagesMessagesArray.kt | 0 .../sdk/api/messages/dto/MessagesOutReadBy.kt | 0 .../api/messages/dto/MessagesPinnedMessage.kt | 0 .../api/messages/dto/MessagesPushSettings.kt | 0 ...agesSearchConversationsExtendedResponse.kt | 0 .../MessagesSearchConversationsResponse.kt | 0 .../dto/MessagesSearchExtendedResponse.kt | 0 .../messages/dto/MessagesSearchResponse.kt | 0 .../dto/MessagesSetChatPhotoResponse.kt | 0 .../dto/MessagesTemplateActionTypeNames.kt | 0 .../com/vk/sdk/api/messages/dto/RevParam.kt | 0 .../com/vk/sdk/api/messages/dto/TypeParam.kt | 0 .../vk/sdk/api/newsfeed/NewsfeedService.kt | 0 .../vk/sdk/api/newsfeed/dto/NameCaseParam.kt | 0 .../newsfeed/dto/NewsfeedCommentsFilters.kt | 0 .../api/newsfeed/dto/NewsfeedEventActivity.kt | 0 .../newsfeed/dto/NewsfeedExpertCardWidget.kt | 0 .../dto/NewsfeedExpertCardWidgetRating.kt | 0 .../sdk/api/newsfeed/dto/NewsfeedFilters.kt | 0 .../dto/NewsfeedGetBannedExtendedResponse.kt | 8 +- .../newsfeed/dto/NewsfeedGetBannedResponse.kt | 0 .../dto/NewsfeedGetCommentsResponse.kt | 0 .../dto/NewsfeedGetListsExtendedResponse.kt | 0 .../newsfeed/dto/NewsfeedGetListsResponse.kt | 0 .../dto/NewsfeedGetMentionsResponse.kt | 0 .../dto/NewsfeedGetRecommendedResponse.kt | 0 .../api/newsfeed/dto/NewsfeedGetResponse.kt | 0 .../NewsfeedGetSuggestedSourcesResponse.kt | 0 .../dto/NewsfeedItemAnimatedBlockAnimation.kt | 0 .../newsfeed/dto/NewsfeedItemAudioAudio.kt | 0 .../newsfeed/dto/NewsfeedItemDigestButton.kt | 0 .../newsfeed/dto/NewsfeedItemDigestFooter.kt | 0 .../newsfeed/dto/NewsfeedItemDigestHeader.kt | 3 - .../newsfeed/dto/NewsfeedItemDigestItem.kt | 6 +- .../dto/NewsfeedItemFeedbackPollBanner.kt | 0 .../dto/NewsfeedItemFeedbackPollGratitude.kt | 0 .../dto/NewsfeedItemFeedbackPollPoll.kt | 0 .../dto/NewsfeedItemFeedbackPollQuestion.kt | 0 .../NewsfeedItemFeedbackPollQuestionAnswer.kt | 0 .../NewsfeedItemFeedbackPollQuestionEntry.kt | 0 .../newsfeed/dto/NewsfeedItemFriendFriends.kt | 0 .../newsfeed/dto/NewsfeedItemPhotoPhotos.kt | 0 .../dto/NewsfeedItemPhotoTagPhotoTags.kt | 0 .../dto/NewsfeedItemPromoButtonAction.kt | 0 .../dto/NewsfeedItemPromoButtonImage.kt | 0 .../newsfeed/dto/NewsfeedItemVideoVideo.kt | 0 .../dto/NewsfeedItemWallpostFeedback.kt | 0 .../dto/NewsfeedItemWallpostFeedbackAnswer.kt | 0 .../dto/NewsfeedItemWallpostFeedbackType.kt | 0 .../newsfeed/dto/NewsfeedItemWallpostType.kt | 0 .../vk/sdk/api/newsfeed/dto/NewsfeedList.kt | 0 .../sdk/api/newsfeed/dto/NewsfeedListFull.kt | 0 .../api/newsfeed/dto/NewsfeedNewsfeedItem.kt | 243 ++------- .../newsfeed/dto/NewsfeedNewsfeedItemType.kt | 0 .../api/newsfeed/dto/NewsfeedNewsfeedPhoto.kt | 11 +- .../dto/NewsfeedSearchExtendedResponse.kt | 0 .../newsfeed/dto/NewsfeedSearchResponse.kt | 0 .../com/vk/sdk/api/newsfeed/dto/TypeParam.kt | 0 .../java/com/vk/sdk/api/notes/NotesService.kt | 0 .../api/notes/dto/NotesGetCommentsResponse.kt | 0 .../vk/sdk/api/notes/dto/NotesGetResponse.kt | 0 .../com/vk/sdk/api/notes/dto/NotesNote.kt | 3 +- .../vk/sdk/api/notes/dto/NotesNoteComment.kt | 0 .../com/vk/sdk/api/notes/dto/SortParam.kt | 0 .../api/notifications/NotificationsService.kt | 0 .../sdk/api/notifications/dto/FiltersParam.kt | 0 .../dto/NotificationsFeedback.kt | 0 .../dto/NotificationsGetResponse.kt | 0 .../dto/NotificationsNotificationItem.kt | 0 .../dto/NotificationsNotificationParent.kt | 12 +- .../notifications/dto/NotificationsReply.kt | 0 .../dto/NotificationsSendMessageError.kt | 0 .../dto/NotificationsSendMessageItem.kt | 4 +- .../api/notifications/dto/SendingModeParam.kt | 0 .../com/vk/sdk/api/orders/OrdersService.kt | 0 .../com/vk/sdk/api/orders/dto/ActionParam.kt | 0 .../com/vk/sdk/api/orders/dto/OrdersAmount.kt | 0 .../vk/sdk/api/orders/dto/OrdersAmountItem.kt | 0 .../dto/OrdersGetUserSubscriptionsResponse.kt | 0 .../com/vk/sdk/api/orders/dto/OrdersOrder.kt | 3 +- .../sdk/api/orders/dto/OrdersSubscription.kt | 15 + .../com/vk/sdk/api/owner/dto/OwnerState.kt | 0 .../java/com/vk/sdk/api/pages/PagesService.kt | 0 .../com/vk/sdk/api/pages/dto/EditParam.kt | 0 .../sdk/api/pages/dto/PagesPrivacySettings.kt | 0 .../com/vk/sdk/api/pages/dto/PagesWikipage.kt | 3 +- .../vk/sdk/api/pages/dto/PagesWikipageFull.kt | 17 +- .../sdk/api/pages/dto/PagesWikipageHistory.kt | 0 .../com/vk/sdk/api/pages/dto/ViewParam.kt | 0 .../com/vk/sdk/api/photos/PhotosService.kt | 17 +- .../sdk/api/photos/dto/PhotosCommentXtrPid.kt | 0 .../api/photos/dto/PhotosGetAlbumsResponse.kt | 0 .../dto/PhotosGetAllCommentsResponse.kt | 0 .../dto/PhotosGetAllExtendedResponse.kt | 0 .../api/photos/dto/PhotosGetAllResponse.kt | 0 .../dto/PhotosGetCommentsExtendedResponse.kt | 0 .../photos/dto/PhotosGetCommentsResponse.kt | 0 .../photos/dto/PhotosGetExtendedResponse.kt | 0 .../photos/dto/PhotosGetNewTagsResponse.kt | 0 .../sdk/api/photos/dto/PhotosGetResponse.kt | 0 .../PhotosGetUserPhotosExtendedResponse.kt | 0 .../photos/dto/PhotosGetUserPhotosResponse.kt | 0 .../com/vk/sdk/api/photos/dto/PhotosImage.kt | 0 .../vk/sdk/api/photos/dto/PhotosImageType.kt | 0 .../com/vk/sdk/api/photos/dto/PhotosPhoto.kt | 11 +- .../vk/sdk/api/photos/dto/PhotosPhotoAlbum.kt | 3 +- .../api/photos/dto/PhotosPhotoAlbumFull.kt | 3 +- .../vk/sdk/api/photos/dto/PhotosPhotoFull.kt | 5 +- .../dto/PhotosPhotoFullXtrRealOffset.kt | 5 +- .../vk/sdk/api/photos/dto/PhotosPhotoSizes.kt | 0 .../api/photos/dto/PhotosPhotoSizesType.kt | 0 .../vk/sdk/api/photos/dto/PhotosPhotoTag.kt | 3 +- .../sdk/api/photos/dto/PhotosPhotoUpload.kt | 5 +- .../photos/dto/PhotosPhotoXtrRealOffset.kt | 5 +- .../api/photos/dto/PhotosPhotoXtrTagInfo.kt | 5 +- .../dto/PhotosSaveOwnerPhotoResponse.kt | 0 .../api/photos/dto/PhotosSearchResponse.kt | 0 .../photos/dto/PhotosTagsSuggestionItem.kt | 0 .../dto/PhotosTagsSuggestionItemButton.kt | 0 .../dto/PhotosTagsSuggestionItemEndCard.kt | 0 .../com/vk/sdk/api/photos/dto/ReasonParam.kt | 0 .../com/vk/sdk/api/photos/dto/SortParam.kt | 0 .../vk/sdk/api/podcast/dto/PodcastCover.kt | 0 .../api/podcast/dto/PodcastExternalData.kt | 0 .../vk/sdk/api/podcasts/PodcastsService.kt | 0 .../dto/PodcastsSearchPodcastResponse.kt | 0 .../java/com/vk/sdk/api/polls/PollsService.kt | 0 .../vk/sdk/api/polls/dto/BackgroundIdParam.kt | 0 .../com/vk/sdk/api/polls/dto/NameCaseParam.kt | 0 .../com/vk/sdk/api/polls/dto/PollsAnswer.kt | 0 .../vk/sdk/api/polls/dto/PollsBackground.kt | 0 .../com/vk/sdk/api/polls/dto/PollsFriend.kt | 4 +- .../com/vk/sdk/api/polls/dto/PollsPoll.kt | 9 +- .../com/vk/sdk/api/polls/dto/PollsVoters.kt | 0 .../vk/sdk/api/polls/dto/PollsVotersUsers.kt | 0 .../sdk/api/prettyCards/PrettyCardsService.kt | 0 .../dto/PrettyCardsCreateResponse.kt | 4 +- .../dto/PrettyCardsDeleteResponse.kt | 4 +- .../dto/PrettyCardsEditResponse.kt | 4 +- .../prettyCards/dto/PrettyCardsGetResponse.kt | 0 .../prettyCards/dto/PrettyCardsPrettyCard.kt | 0 .../com/vk/sdk/api/search/SearchService.kt | 0 .../api/search/dto/SearchGetHintsResponse.kt | 0 .../com/vk/sdk/api/search/dto/SearchHint.kt | 12 +- .../sdk/api/search/dto/SearchHintSection.kt | 0 .../vk/sdk/api/search/dto/SearchHintType.kt | 5 +- .../com/vk/sdk/api/secure/SecureService.kt | 10 +- .../secure/dto/SecureGiveEventStickerItem.kt | 22 +- .../com/vk/sdk/api/secure/dto/SecureLevel.kt | 0 .../api/secure/dto/SecureSmsNotification.kt | 0 .../sdk/api/secure/dto/SecureTokenChecked.kt | 3 +- .../sdk/api/secure/dto/SecureTransaction.kt | 0 .../java/com/vk/sdk/api/stats/StatsService.kt | 0 .../com/vk/sdk/api/stats/dto/IntervalParam.kt | 0 .../com/vk/sdk/api/stats/dto/StatsActivity.kt | 0 .../com/vk/sdk/api/stats/dto/StatsPeriod.kt | 0 .../com/vk/sdk/api/stats/dto/StatsSexAge.kt | 0 .../vk/sdk/api/stats/dto/StatsWallpostStat.kt | 0 .../com/vk/sdk/api/status/StatusService.kt | 0 .../com/vk/sdk/api/status/dto/StatusStatus.kt | 0 .../com/vk/sdk/api/storage/StorageService.kt | 0 .../vk/sdk/api/storage/dto/StorageValue.kt | 0 .../java/com/vk/sdk/api/store/StoreService.kt | 0 .../dto/StoreGetStickersKeywordsResponse.kt | 0 .../com/vk/sdk/api/store/dto/StoreProduct.kt | 15 +- .../sdk/api/store/dto/StoreStickersKeyword.kt | 0 .../store/dto/StoreStickersKeywordSticker.kt | 0 .../com/vk/sdk/api/stories/StoriesService.kt | 0 .../api/stories/dto/StoriesClickableArea.kt | 0 .../stories/dto/StoriesClickableSticker.kt | 5 +- .../stories/dto/StoriesClickableStickers.kt | 0 .../vk/sdk/api/stories/dto/StoriesFeedItem.kt | 0 .../dto/StoriesGetBannedExtendedResponse.kt | 0 .../stories/dto/StoriesGetBannedResponse.kt | 0 .../dto/StoriesGetByIdExtendedResponse.kt | 0 .../api/stories/dto/StoriesGetByIdResponse.kt | 0 .../StoriesGetPhotoUploadServerResponse.kt | 0 .../stories/dto/StoriesGetV5113Response.kt | 4 +- .../StoriesGetVideoUploadServerResponse.kt | 0 .../StoriesGetViewersExtendedV5115Response.kt | 0 .../sdk/api/stories/dto/StoriesPromoBlock.kt | 0 .../vk/sdk/api/stories/dto/StoriesReplies.kt | 0 .../api/stories/dto/StoriesSaveResponse.kt | 0 .../vk/sdk/api/stories/dto/StoriesStory.kt | 6 +- .../sdk/api/stories/dto/StoriesStoryLink.kt | 0 .../sdk/api/stories/dto/StoriesStoryStats.kt | 0 .../api/stories/dto/StoriesStoryStatsStat.kt | 0 .../api/stories/dto/StoriesStoryStatsState.kt | 0 .../sdk/api/stories/dto/StoriesStoryType.kt | 0 .../sdk/api/stories/dto/StoriesViewersItem.kt | 4 +- .../vk/sdk/api/streaming/StreamingService.kt | 0 .../vk/sdk/api/streaming/dto/IntervalParam.kt | 0 .../sdk/api/streaming/dto/MonthlyTierParam.kt | 0 .../dto/StreamingGetServerUrlResponse.kt | 0 .../com/vk/sdk/api/streaming/dto/TypeParam.kt | 0 .../dto/TextlivesTextliveTextpostBlock.kt | 5 +- .../dto/TextlivesTextpostAttachment.kt | 0 .../java/com/vk/sdk/api/users/UsersService.kt | 0 .../com/vk/sdk/api/users/dto/NameCaseParam.kt | 0 .../java/com/vk/sdk/api/users/dto/SexParam.kt | 0 .../com/vk/sdk/api/users/dto/SortParam.kt | 0 .../com/vk/sdk/api/users/dto/StatusParam.kt | 0 .../com/vk/sdk/api/users/dto/TypeParam.kt | 0 .../com/vk/sdk/api/users/dto/UsersCareer.kt | 3 +- .../com/vk/sdk/api/users/dto/UsersExports.kt | 0 .../com/vk/sdk/api/users/dto/UsersFields.kt | 125 ++++- .../dto/UsersGetFollowersFieldsResponse.kt | 0 .../UsersGetSubscriptionsExtendedResponse.kt | 0 .../dto/UsersGetSubscriptionsResponse.kt | 0 .../com/vk/sdk/api/users/dto/UsersLastSeen.kt | 0 .../com/vk/sdk/api/users/dto/UsersMilitary.kt | 0 .../vk/sdk/api/users/dto/UsersOccupation.kt | 0 .../vk/sdk/api/users/dto/UsersOnlineInfo.kt | 0 .../com/vk/sdk/api/users/dto/UsersPersonal.kt | 0 .../com/vk/sdk/api/users/dto/UsersRelative.kt | 0 .../com/vk/sdk/api/users/dto/UsersSchool.kt | 0 .../sdk/api/users/dto/UsersSearchResponse.kt | 0 .../api/users/dto/UsersSubscriptionsItem.kt | 70 ++- .../vk/sdk/api/users/dto/UsersUniversity.kt | 0 .../com/vk/sdk/api/users/dto/UsersUser.kt | 3 +- .../sdk/api/users/dto/UsersUserConnections.kt | 0 .../vk/sdk/api/users/dto/UsersUserCounters.kt | 0 .../com/vk/sdk/api/users/dto/UsersUserFull.kt | 27 +- .../com/vk/sdk/api/users/dto/UsersUserMin.kt | 3 +- .../vk/sdk/api/users/dto/UsersUserRelation.kt | 0 .../com/vk/sdk/api/users/dto/UsersUserType.kt | 0 .../sdk/api/users/dto/UsersUserXtrCounters.kt | 27 +- .../vk/sdk/api/users/dto/UsersUsersArray.kt | 0 .../java/com/vk/sdk/api/utils/UtilsService.kt | 0 .../com/vk/sdk/api/utils/dto/IntervalParam.kt | 0 .../com/vk/sdk/api/utils/dto/SourceParam.kt | 0 .../sdk/api/utils/dto/UtilsDomainResolved.kt | 3 +- .../api/utils/dto/UtilsDomainResolvedType.kt | 0 .../dto/UtilsGetLastShortenedLinksResponse.kt | 0 .../api/utils/dto/UtilsLastShortenedLink.kt | 0 .../vk/sdk/api/utils/dto/UtilsLinkChecked.kt | 0 .../api/utils/dto/UtilsLinkCheckedStatus.kt | 0 .../vk/sdk/api/utils/dto/UtilsLinkStats.kt | 0 .../api/utils/dto/UtilsLinkStatsExtended.kt | 0 .../vk/sdk/api/utils/dto/UtilsShortLink.kt | 0 .../com/vk/sdk/api/utils/dto/UtilsStats.kt | 0 .../vk/sdk/api/utils/dto/UtilsStatsCity.kt | 0 .../vk/sdk/api/utils/dto/UtilsStatsCountry.kt | 0 .../sdk/api/utils/dto/UtilsStatsExtended.kt | 0 .../vk/sdk/api/utils/dto/UtilsStatsSexAge.kt | 0 .../java/com/vk/sdk/api/video/VideoService.kt | 0 .../com/vk/sdk/api/video/dto/FiltersParam.kt | 0 .../com/vk/sdk/api/video/dto/PrivacyParam.kt | 0 .../com/vk/sdk/api/video/dto/ReasonParam.kt | 0 .../com/vk/sdk/api/video/dto/SortParam.kt | 0 .../api/video/dto/VideoAddAlbumResponse.kt | 0 .../VideoGetAlbumsByVideoExtendedResponse.kt | 0 .../dto/VideoGetAlbumsExtendedResponse.kt | 0 .../api/video/dto/VideoGetAlbumsResponse.kt | 0 .../dto/VideoGetCommentsExtendedResponse.kt | 0 .../api/video/dto/VideoGetCommentsResponse.kt | 0 .../vk/sdk/api/video/dto/VideoGetResponse.kt | 0 .../com/vk/sdk/api/video/dto/VideoLiveInfo.kt | 0 .../vk/sdk/api/video/dto/VideoLiveSettings.kt | 0 .../vk/sdk/api/video/dto/VideoSaveResult.kt | 3 +- .../video/dto/VideoSearchExtendedResponse.kt | 4 +- .../sdk/api/video/dto/VideoSearchResponse.kt | 0 .../com/vk/sdk/api/video/dto/VideoVideo.kt | 9 +- .../sdk/api/video/dto/VideoVideoAlbumFull.kt | 29 +- .../vk/sdk/api/video/dto/VideoVideoFiles.kt | 0 .../vk/sdk/api/video/dto/VideoVideoFull.kt | 9 +- .../vk/sdk/api/video/dto/VideoVideoImage.kt | 0 .../java/com/vk/sdk/api/wall/WallService.kt | 40 +- .../com/vk/sdk/api/wall/dto/ReasonParam.kt | 0 .../java/com/vk/sdk/api/wall/dto/SortParam.kt | 0 .../com/vk/sdk/api/wall/dto/TopicIdParam.kt | 47 +- .../com/vk/sdk/api/wall/dto/WallAppPost.kt | 0 .../vk/sdk/api/wall/dto/WallAttachedNote.kt | 21 +- .../sdk/api/wall/dto/WallCommentAttachment.kt | 0 .../api/wall/dto/WallCommentAttachmentType.kt | 0 .../api/wall/dto/WallCreateCommentResponse.kt | 0 .../vk/sdk/api/wall/dto/WallEditResponse.kt | 0 .../java/com/vk/sdk/api/wall/dto/WallGeo.kt | 0 .../wall/dto/WallGetByIdExtendedResponse.kt | 0 .../dto/WallGetCommentExtendedResponse.kt | 0 .../api/wall/dto/WallGetCommentResponse.kt | 0 .../dto/WallGetCommentsExtendedResponse.kt | 0 .../api/wall/dto/WallGetCommentsResponse.kt | 0 .../api/wall/dto/WallGetExtendedResponse.kt | 0 .../api/wall/dto/WallGetRepostsResponse.kt | 0 .../vk/sdk/api/wall/dto/WallGetResponse.kt | 0 .../com/vk/sdk/api/wall/dto/WallGraffiti.kt | 3 +- .../wall/dto/WallPostAdsStealthResponse.kt | 0 .../vk/sdk/api/wall/dto/WallPostCopyright.kt | 0 .../vk/sdk/api/wall/dto/WallPostResponse.kt | 0 .../com/vk/sdk/api/wall/dto/WallPostSource.kt | 0 .../vk/sdk/api/wall/dto/WallPostSourceType.kt | 0 .../com/vk/sdk/api/wall/dto/WallPostType.kt | 0 .../vk/sdk/api/wall/dto/WallPostedPhoto.kt | 3 +- .../vk/sdk/api/wall/dto/WallRepostResponse.kt | 0 .../wall/dto/WallSearchExtendedResponse.kt | 0 .../vk/sdk/api/wall/dto/WallSearchResponse.kt | 0 .../java/com/vk/sdk/api/wall/dto/WallViews.kt | 0 .../vk/sdk/api/wall/dto/WallWallComment.kt | 3 +- .../sdk/api/wall/dto/WallWallCommentDonut.kt | 0 .../dto/WallWallCommentDonutPlaceholder.kt | 0 .../com/vk/sdk/api/wall/dto/WallWallpost.kt | 6 +- .../api/wall/dto/WallWallpostAttachment.kt | 0 .../wall/dto/WallWallpostAttachmentType.kt | 0 .../api/wall/dto/WallWallpostCommentsDonut.kt | 0 .../WallWallpostCommentsDonutPlaceholder.kt | 0 .../vk/sdk/api/wall/dto/WallWallpostDonut.kt | 0 .../wall/dto/WallWallpostDonutPlaceholder.kt | 0 .../vk/sdk/api/wall/dto/WallWallpostFull.kt | 51 +- .../vk/sdk/api/wall/dto/WallWallpostToId.kt | 0 .../com/vk/sdk/api/widgets/WidgetsService.kt | 0 .../api/widgets/dto/WidgetsCommentMedia.kt | 3 +- .../widgets/dto/WidgetsCommentMediaType.kt | 0 .../api/widgets/dto/WidgetsCommentReplies.kt | 0 .../widgets/dto/WidgetsCommentRepliesItem.kt | 0 .../widgets/dto/WidgetsGetCommentsResponse.kt | 0 .../widgets/dto/WidgetsGetPagesResponse.kt | 0 .../api/widgets/dto/WidgetsWidgetComment.kt | 0 .../sdk/api/widgets/dto/WidgetsWidgetLikes.kt | 0 .../sdk/api/widgets/dto/WidgetsWidgetPage.kt | 0 build.gradle | 1 - {vk-sdk-core => core}/build.gradle | 9 - {vk-sdk-core => core}/gradle.properties | 0 .../src/main/AndroidManifest.xml | 3 +- .../src/main/java/com/vk/api/sdk/VK.kt | 0 .../java/com/vk/api/sdk/VKApiCallListener.kt | 0 .../main/java/com/vk/api/sdk/VKApiCallback.kt | 0 .../main/java/com/vk/api/sdk/VKApiConfig.kt | 8 +- .../java/com/vk/api/sdk/VKApiCredentials.kt | 0 .../sdk/VKApiIllegalCredentialsListener.kt | 0 .../main/java/com/vk/api/sdk/VKApiManager.kt | 54 +- .../com/vk/api/sdk/VKApiProgressListener.kt | 0 .../com/vk/api/sdk/VKApiResponseParser.java | 0 .../com/vk/api/sdk/VKApiValidationHandler.kt | 4 + .../vk/api/sdk/VKDefaultValidationHandler.kt | 0 .../java/com/vk/api/sdk/VKHttpPostCall.kt | 0 .../java/com/vk/api/sdk/VKKeyValueStorage.kt | 0 .../main/java/com/vk/api/sdk/VKMethodCall.kt | 12 +- .../java/com/vk/api/sdk/VKOkHttpProvider.kt | 0 .../api/sdk/VKPreferencesKeyValueStorage.kt | 0 .../main/java/com/vk/api/sdk/VKScheduler.kt | 0 .../com/vk/api/sdk/VKTokenExpiredHandler.kt | 0 .../src/main/java/com/vk/api/sdk/VkResult.kt | 0 .../java/com/vk/api/sdk/auth/VKAccessToken.kt | 0 .../com/vk/api/sdk/auth/VKAuthCallback.kt | 0 .../java/com/vk/api/sdk/auth/VKAuthManager.kt | 0 .../java/com/vk/api/sdk/auth/VKAuthParams.kt | 0 .../java/com/vk/api/sdk/auth/VKAuthResult.kt | 0 .../main/java/com/vk/api/sdk/auth/VKScope.kt | 0 .../vk/api/sdk/browser/BrowserDescriptor.java | 0 .../vk/api/sdk/browser/BrowserMatcher.java | 0 .../vk/api/sdk/browser/BrowserSelector.java | 0 .../java/com/vk/api/sdk/browser/Browsers.java | 0 .../vk/api/sdk/browser/DelimitedVersion.java | 0 .../com/vk/api/sdk/browser/VersionRange.java | 0 .../sdk/browser/VersionedBrowserMatcher.java | 0 .../sdk/browser/WhiteListedBrowserHelper.java | 0 .../sdk/chain/ApiMethodPriorityChainCall.kt | 0 .../java/com/vk/api/sdk/chain/ChainArgs.kt | 0 .../java/com/vk/api/sdk/chain/ChainCall.kt | 0 .../com/vk/api/sdk/chain/HttpPostChainCall.kt | 0 .../sdk/chain/InternalErrorRetryChainCall.kt | 0 .../InvalidCredentialsObserverChainCall.kt | 0 .../com/vk/api/sdk/chain/MethodChainCall.kt | 0 .../sdk/chain/RateLimitReachedChainCall.kt | 50 ++ .../com/vk/api/sdk/chain/RetryChainCall.kt | 0 .../sdk/chain/TooManyRequestRetryChainCall.kt | 55 +- .../sdk/chain/ValidationHandlerChainCall.kt | 3 + .../exceptions/IgnoredAccessTokenException.kt | 0 .../exceptions/RateLimitReachedException.kt | 0 .../com/vk/api/sdk/exceptions/VKApiCodes.kt | 13 + .../vk/api/sdk/exceptions/VKApiException.kt | 0 .../sdk/exceptions/VKApiExecutionException.kt | 18 +- .../VKApiIllegalResponseException.kt | 0 .../VKInternalServerErrorException.kt | 0 .../sdk/exceptions/VKLargeEntityException.kt | 0 .../api/sdk/exceptions/VKLocalIOException.kt | 0 .../com/vk/api/sdk/extensions/ContextExt.kt | 11 + .../com/vk/api/sdk/internal/ApiCommand.kt | 0 .../vk/api/sdk/internal/HttpMultipartEntry.kt | 0 .../com/vk/api/sdk/internal/HttpStatus.kt | 0 .../java/com/vk/api/sdk/internal/JsonUtils.kt | 0 .../api/sdk/internal/QueryStringGenerator.kt | 29 +- .../com/vk/api/sdk/internal/VKErrorUtils.kt | 0 .../com/vk/api/sdk/internal/VKInitProvider.kt | 0 .../com/vk/api/sdk/internal/Validation.kt | 0 .../vk/api/sdk/okhttp/FileFullRequestBody.kt | 0 .../vk/api/sdk/okhttp/LogLevelRequestTag.kt | 0 .../vk/api/sdk/okhttp/LoggingInterceptor.kt | 0 .../com/vk/api/sdk/okhttp/OkHttpExecutor.kt | 5 +- .../vk/api/sdk/okhttp/OkHttpExecutorConfig.kt | 0 .../com/vk/api/sdk/okhttp/OkHttpMethodCall.kt | 13 + .../com/vk/api/sdk/okhttp/OkHttpPostCall.kt | 0 .../vk/api/sdk/okhttp/ProgressRequestBody.kt | 0 .../java/com/vk/api/sdk/okhttp/RequestTag.kt | 0 .../vk/api/sdk/requests/VKBooleanRequest.kt | 0 .../java/com/vk/api/sdk/requests/VKRequest.kt | 7 + .../com/vk/api/sdk/ui/VKBaseAuthActivity.kt | 0 .../com/vk/api/sdk/ui/VKCaptchaActivity.kt | 0 .../vk/api/sdk/ui/VKConfirmationActivity.kt | 0 .../vk/api/sdk/ui/VKWebViewAuthActivity.kt | 65 ++- .../main/java/com/vk/api/sdk/utils/ApiExt.kt | 0 .../api/sdk/utils/ApiMethodPriorityBackoff.kt | 0 .../vk/api/sdk/utils/ExponentialBackoff.kt | 10 +- .../vk/api/sdk/utils/RateLimitTokenBackoff.kt | 145 ++++++ .../StartUpMethodPriorityBackoffBaseImpl.kt | 0 .../vk/api/sdk/utils/ThreadLocalDelegate.kt | 0 .../java/com/vk/api/sdk/utils/VKLoader.kt | 0 .../com/vk/api/sdk/utils/VKUrlResolver.kt | 0 .../main/java/com/vk/api/sdk/utils/VKUtils.kt | 9 + .../vk/api/sdk/utils/VKValidationLocker.kt | 0 .../vk/api/sdk/utils/log/DefaultApiLogger.kt | 0 .../java/com/vk/api/sdk/utils/log/Logger.kt | 0 .../utils/tmr/TooManyRequestBackoffEmpty.kt | 7 + .../utils/tmr/TooManyRequestBackoffGlobal.kt | 48 ++ .../utils/tmr/TooManyRequestLimitBackoff.kt | 8 + .../res/layout/vk_webview_auth_dialog.xml | 0 .../src/main/res/values-ru/string.xml | 0 core/src/main/res/values/booleans.xml | 4 + .../src/main/res/values/strings.xml | 0 .../src/main/res/values/styles.xml | 0 ...tartUpMethodPriorityBackoffBaseImplTest.kt | 0 dependencies.gradle | 15 +- id/.gitignore | 1 + id/build.gradle | 43 ++ id/src/main/AndroidManifest.xml | 3 + id/src/main/java/com/vk/sdk/id/UserId.kt | 93 ++++ publish.gradle | 2 +- samples/app/build.gradle | 5 +- .../app/sdk/src/main/res/values/strings.xml | 8 - .../java/com/vk/sdk/sample/UserActivity.kt | 5 +- .../java/com/vk/sdk/sample/models/VKUser.kt | 8 +- .../app/src/main/res/values-kk/strings.xml | 10 +- settings.gradle | 7 +- .../api/ads/dto/AdsUserSpecificationCutted.kt | 49 -- .../com/vk/sdk/api/audio/dto/AudioPhoto.kt | 71 --- .../vk/sdk/api/audio/dto/AudioPhotoSizes.kt | 83 --- .../com/vk/sdk/api/audio/dto/AudioPlaylist.kt | 183 ------- .../vk/sdk/api/audio/dto/AudioPlaylistMeta.kt | 38 -- .../dto/AudioPlaylistOriginalFollowed.kt | 46 -- .../api/audio/dto/AudioPlaylistPermissions.kt | 57 --- .../api/base/dto/BaseLinkProductCategory.kt | 47 -- .../api/friends/dto/FriendsUserXtrLists.kt | 482 ------------------ .../vk/sdk/api/media/dto/MediaRestriction.kt | 68 --- ...gesGetConversationsByIdExtendedResponse.kt | 51 -- .../dto/PhotosGetByIdExtendedResponse.kt | 39 -- .../api/photos/dto/PhotosGetByIdResponse.kt | 39 -- .../api/video/dto/VideoRestrictionButton.kt | 50 -- .../sdk/api/wall/dto/WallGetByIdResponse.kt | 39 -- .../sdk/chain/RateLimitReachedChainCall.kt | 97 ---- vk.gradle | 0 903 files changed, 2004 insertions(+), 2365 deletions(-) rename {vk-sdk-api => api}/.gitignore (100%) rename {vk-sdk-api => api}/README.md (56%) rename {vk-sdk-api => api}/build.gradle (93%) rename {vk-sdk-api => api}/src/main/AndroidManifest.xml (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ApiResponseParser.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/GsonHolder.kt (92%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/NewApiRequest.kt (96%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/account/AccountService.kt (98%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/account/dto/AccountAccountCounters.kt (93%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/account/dto/AccountChangePasswordResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/account/dto/AccountGetActiveOffersResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/account/dto/AccountGetBannedResponse.kt (95%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/account/dto/AccountInfo.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/account/dto/AccountNameRequest.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/account/dto/AccountNameRequestStatus.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/account/dto/AccountOffer.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/account/dto/AccountPushConversations.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/account/dto/AccountPushConversationsItem.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/account/dto/AccountPushParams.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/account/dto/AccountPushParamsMode.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/account/dto/AccountPushParamsOnoff.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/account/dto/AccountPushParamsSettings.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/account/dto/AccountPushSettings.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/account/dto/AccountSaveProfileInfoResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/account/dto/AccountUserSettings.kt (98%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/account/dto/AccountUserSettingsInterest.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/account/dto/AccountUserSettingsInterests.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/account/dto/BdateVisibilityParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/account/dto/FieldsParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/account/dto/FilterParam.kt (87%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/account/dto/RelationParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/account/dto/SexParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/addresses/dto/AddressesFields.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/AdsService.kt (98%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdFormatParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsAccessRole.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsAccesses.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsAccount.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsAccountType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsAd.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsAdApproved.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsAdCostType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsAdLayout.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsAdStatus.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsCampaign.kt (87%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsCampaignStatus.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsCampaignType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsCategory.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsClient.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsCreateTargetGroupResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsCriteriaSex.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsDemoStats.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsDemostatsFormat.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsFloodStats.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsGetCategoriesResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsGetLookalikeRequestsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsGetMusiciansResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsLinkStatus.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsLookalikeRequest.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsLookalikeRequestSaveAudienceLevel.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsMusician.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsObjectType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsParagraphs.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsPromotedPostReach.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsRejectReason.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsRules.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsStats.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsAge.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsCities.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsFormat.kt (95%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsSex.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsSexAge.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsSexValue.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsViewsTimes.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsTargSettings.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsTargStats.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsTargSuggestions.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsTargetGroup.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsUpdateOfficeUsersResult.kt (96%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/AdsUsers.kt (96%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/FieldsParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/IdsTypeParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/LangParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/LinkTypeParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/PeriodParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/SectionParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/ads/dto/StatsFieldsParam.kt (100%) rename vk-sdk-api/src/main/java/com/vk/sdk/api/shortVideo/dto/ShortVideoChallengeFeedItem.kt => api/src/main/java/com/vk/sdk/api/aliexpress/dto/AliexpressBlockPanel.kt (72%) rename vk-sdk-api/src/main/java/com/vk/sdk/api/media/dto/MediaPopup.kt => api/src/main/java/com/vk/sdk/api/aliexpress/dto/AliexpressCarouselItem.kt (55%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/appWidgets/AppWidgetsService.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/appWidgets/dto/AppWidgetsGetAppImageUploadServerResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/appWidgets/dto/AppWidgetsGetGroupImageUploadServerResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/appWidgets/dto/AppWidgetsPhoto.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/appWidgets/dto/AppWidgetsPhotos.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/appWidgets/dto/ImageTypeParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/appWidgets/dto/TypeParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/apps/AppsService.kt (97%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/apps/dto/AppsApp.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/apps/dto/AppsAppLeaderboardType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/apps/dto/AppsAppMin.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/apps/dto/AppsAppType.kt (100%) rename vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsGetCatalogResponse.kt => api/src/main/java/com/vk/sdk/api/apps/dto/AppsCatalogList.kt (94%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/apps/dto/AppsGetFriendsListResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/apps/dto/AppsGetLeaderboardExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/apps/dto/AppsGetLeaderboardResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/apps/dto/AppsGetMiniAppPoliciesResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/apps/dto/AppsGetResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/apps/dto/AppsGetScopesResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/apps/dto/AppsLeaderboard.kt (96%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/apps/dto/AppsScope.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/apps/dto/FilterParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/apps/dto/NameCaseParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/apps/dto/PlatformParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/apps/dto/SortParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/apps/dto/TypeParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/audio/dto/AudioArtist.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/audio/dto/AudioAudio.kt (97%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/audio/dto/AudioGenre.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/audio/dto/AudioPhotosByType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/auth/AuthService.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/auth/dto/AuthRestoreResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseBoolInt.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseCity.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseCommentsInfo.kt (93%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseCountry.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseCropPhoto.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseCropPhotoCrop.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseCropPhotoRect.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseError.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseGeo.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseGeoCoordinates.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseGradientPoint.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseImage.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseLikes.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseLikesInfo.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseLink.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseLinkApplication.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseLinkApplicationStore.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseLinkButton.kt (94%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseLinkButtonAction.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseLinkButtonActionType.kt (97%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseLinkButtonStyle.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseLinkProduct.kt (83%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseLinkProductStatus.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseLinkRating.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseObject.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseObjectCount.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseObjectWithName.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseOkResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BasePlace.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BasePropertyExists.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseRepostsInfo.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseRequestParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseSex.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseSticker.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseStickerAnimation.kt (100%) rename vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsUserSpecification.kt => api/src/main/java/com/vk/sdk/api/base/dto/BaseStickerNew.kt (62%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseUploadServer.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseUserGroupFields.kt (98%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/base/dto/BaseUserId.kt (95%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/board/BoardService.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/board/dto/BoardDefaultOrder.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/board/dto/BoardGetCommentsExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/board/dto/BoardGetCommentsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/board/dto/BoardGetTopicsExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/board/dto/BoardGetTopicsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/board/dto/BoardTopic.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/board/dto/BoardTopicComment.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/board/dto/BoardTopicPoll.kt (97%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/board/dto/OrderParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/board/dto/PreviewParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/board/dto/SortParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/calls/dto/CallsCall.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/calls/dto/CallsEndState.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/calls/dto/CallsParticipants.kt (100%) rename vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsProfileItem.kt => api/src/main/java/com/vk/sdk/api/classifieds/dto/ClassifiedsYoulaCarouselBlockGroup.kt (73%) create mode 100644 api/src/main/java/com/vk/sdk/api/classifieds/dto/ClassifiedsYoulaItemExtended.kt rename vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioPlaylistView.kt => api/src/main/java/com/vk/sdk/api/classifieds/dto/ClassifiedsYoulaItemOnClickOptions.kt (90%) rename vk-sdk-api/src/main/java/com/vk/sdk/api/store/dto/StoreProductIcon.kt => api/src/main/java/com/vk/sdk/api/classifieds/dto/ClassifiedsYoulaItemPhoto.kt (82%) rename vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketCategoryTree.kt => api/src/main/java/com/vk/sdk/api/classifieds/dto/ClassifiedsYoulaItemVkAuthor.kt (83%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/comment/dto/CommentThread.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/database/DatabaseService.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/database/dto/DatabaseCity.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/database/dto/DatabaseFaculty.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetChairsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetCitiesResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetCountriesResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetFacultiesResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetMetroStationsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetRegionsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetSchoolsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetUniversitiesResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/database/dto/DatabaseRegion.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/database/dto/DatabaseSchool.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/database/dto/DatabaseStation.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/database/dto/DatabaseUniversity.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselButton.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselButtonAction.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselButtonActionTarget.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselButtonActionType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselButtonContext.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselButtonType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselItem.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselItemDescription.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselItemDescriptionType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselObjectsType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/docs/DocsService.kt (99%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/docs/dto/DocsDoc.kt (97%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/docs/dto/DocsDocAttachmentType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/docs/dto/DocsDocPreview.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/docs/dto/DocsDocPreviewAudioMsg.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/docs/dto/DocsDocPreviewGraffiti.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/docs/dto/DocsDocPreviewPhoto.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/docs/dto/DocsDocPreviewPhotoSizes.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/docs/dto/DocsDocPreviewVideo.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/docs/dto/DocsDocTypes.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/docs/dto/DocsGetResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/docs/dto/DocsGetTypesResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/docs/dto/DocsSaveResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/docs/dto/DocsSearchResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/docs/dto/TypeParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/donut/DonutService.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/donut/dto/DonutDonatorSubscriptionInfo.kt (97%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/donut/dto/DonutGetSubscriptionsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/downloadedGames/DownloadedGamesService.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/downloadedGames/dto/DownloadedGamesPaidStatusResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/events/dto/EventsEventAttach.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/execute/ExecuteService.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/fave/FaveService.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/fave/dto/FaveBookmark.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/fave/dto/FaveBookmarkType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/fave/dto/FaveGetExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/fave/dto/FaveGetPagesResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/fave/dto/FaveGetResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/fave/dto/FaveGetTagsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/fave/dto/FavePage.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/fave/dto/FavePageType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/fave/dto/FaveTag.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/fave/dto/ItemTypeParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/fave/dto/PositionParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/fave/dto/TypeParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/friends/FriendsService.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/friends/dto/FilterParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/friends/dto/FriendsAddListResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/friends/dto/FriendsAddResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/friends/dto/FriendsDeleteResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/friends/dto/FriendsFriendExtendedStatus.kt (96%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/friends/dto/FriendsFriendStatus.kt (96%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/friends/dto/FriendsFriendStatusStatus.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/friends/dto/FriendsFriendsList.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/friends/dto/FriendsGetFieldsResponse.kt (95%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/friends/dto/FriendsGetListsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/friends/dto/FriendsGetRequestsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/friends/dto/FriendsGetSuggestionsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/friends/dto/FriendsRequestsMutual.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/friends/dto/FriendsSearchResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/friends/dto/FriendsUserXtrPhone.kt (95%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/friends/dto/NameCaseParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/friends/dto/OrderParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/friends/dto/SortParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/gifts/GiftsService.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/gifts/dto/GiftsGetResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/gifts/dto/GiftsGift.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/gifts/dto/GiftsGiftPrivacy.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/gifts/dto/GiftsLayout.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/GroupsService.kt (99%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/ActParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/AgeLimitsParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/FilterParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsAddCallbackServerResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsAddress.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsAddressTimetable.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsAddressTimetableDay.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsAddressWorkInfoStatus.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsAddressesInfo.kt (100%) rename vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetByIdResponse.kt => api/src/main/java/com/vk/sdk/api/groups/dto/GroupsAppButton.kt (81%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsBanInfo.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsBanInfoReason.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsBannedItem.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsCallbackServer.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsCallbackSettings.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsContactsItem.kt (96%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsCountersGroup.kt (74%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsCover.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsFields.kt (89%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsFilter.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetAddressesResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetBannedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetCallbackConfirmationCodeResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetCallbackServersResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetCatalogInfoExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetCatalogInfoResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetCatalogResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetInvitedUsersResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetInvitesExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetInvitesResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetMembersFieldsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetRequestsFieldsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetSettingsResponse.kt (97%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetTokenPermissionsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroup.kt (61%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupAccess.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupAdminLevel.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupAgeLimits.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupAttach.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupAudio.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupBanInfo.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupCategory.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupCategoryFull.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupCategoryType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupDocs.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupFull.kt (82%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupFullAgeLimits.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupFullMemberStatus.kt (100%) rename vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupFullMainSection.kt => api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupFullSection.kt (86%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupIsClosed.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupLink.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupPhotos.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupPublicCategoryList.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupSuggestedPrivacy.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupTag.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupTopics.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupVideo.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupWall.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupWiki.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupsArray.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsLinksItem.kt (92%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsLiveCovers.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsLongPollEvents.kt (93%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsLongPollServer.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsLongPollSettings.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsMarketInfo.kt (85%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsOnlineStatus.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsOnlineStatusType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsOwnerXtrBanInfoType.kt (100%) rename vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsSectionsListItem.kt => api/src/main/java/com/vk/sdk/api/groups/dto/GroupsPhotoSize.kt (87%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsRoleOptions.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsSearchResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsSettingsTwitter.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsSubjectItem.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsSuggestion.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsTokenPermissionSetting.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/GroupsUserXtrRole.kt (95%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/NameCaseParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/SortParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/StateParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/SubtypeParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/TagColorParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/TypeParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/groups/dto/WorkInfoStatusParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/leadForms/LeadFormsService.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/likes/LikesService.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/likes/dto/FilterParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/likes/dto/FriendsOnlyParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/likes/dto/LikesAddResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/likes/dto/LikesDeleteResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/likes/dto/LikesGetListExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/likes/dto/LikesGetListResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/likes/dto/LikesIsLikedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/link/dto/LinkTargetObject.kt (96%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/market/MarketService.kt (92%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/market/dto/MarketAddAlbumResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/market/dto/MarketAddResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/market/dto/MarketCurrency.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/market/dto/MarketGetAlbumByIdResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/market/dto/MarketGetAlbumsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/market/dto/MarketGetByIdExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/market/dto/MarketGetByIdResponse.kt (100%) rename vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketGetCategoriesNewResponse.kt => api/src/main/java/com/vk/sdk/api/market/dto/MarketGetCategoriesResponse.kt (88%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/market/dto/MarketGetCommentsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/market/dto/MarketGetExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/market/dto/MarketGetGroupOrdersResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/market/dto/MarketGetOrderByIdResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/market/dto/MarketGetOrderItemsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/market/dto/MarketGetOrdersExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/market/dto/MarketGetOrdersResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/market/dto/MarketGetResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/market/dto/MarketMarketAlbum.kt (87%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/market/dto/MarketMarketCategory.kt (94%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/market/dto/MarketMarketItem.kt (95%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/market/dto/MarketMarketItemAvailability.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/market/dto/MarketMarketItemFull.kt (91%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/market/dto/MarketOrder.kt (85%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/market/dto/MarketOrderItem.kt (97%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/market/dto/MarketPrice.kt (72%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/market/dto/MarketSearchExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/market/dto/MarketSearchResponse.kt (100%) rename vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketCategoryNested.kt => api/src/main/java/com/vk/sdk/api/market/dto/MarketSection.kt (88%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/market/dto/MarketServicesViewType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/market/dto/PaymentStatusParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/market/dto/ReasonParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/market/dto/RevParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/market/dto/SortParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/market/dto/StatusParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/MessagesService.kt (98%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/FilterParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/IntentParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MediaTypeParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesAudioMessage.kt (97%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesChat.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatPreview.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatPushSettings.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatRestrictions.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettings.kt (98%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettingsAcl.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettingsPermissions.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettingsPhoto.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettingsState.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversation.kt (92%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationCanWrite.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationMember.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationPeer.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationPeerType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationSortId.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationWithMessage.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesDeleteChatPhotoResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesDeleteConversationResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesForeignMessage.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetByConversationMessageIdResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetByIdExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetByIdResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetChatPreviewResponse.kt (100%) rename vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetConversationsByIdResponse.kt => api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetConversationById.kt (97%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetConversationMembersResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetConversationsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetHistoryAttachmentsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetHistoryExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetHistoryResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetImportantMessagesExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetImportantMessagesResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetIntentUsersResponse.kt (96%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetInviteLinkResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetLongPollHistoryResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesGraffiti.kt (97%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesHistoryAttachment.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesHistoryMessageAttachment.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesHistoryMessageAttachmentType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesIsMessagesFromGroupAllowedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesJoinChatByInviteLinkResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesKeyboard.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesKeyboardButton.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesKeyboardButtonAction.kt (97%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesLastActivity.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesLongpollMessages.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesLongpollParams.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessage.kt (96%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessageAttachment.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessageAttachmentType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessageRequestData.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessagesArray.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesOutReadBy.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesPinnedMessage.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesPushSettings.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesSearchConversationsExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesSearchConversationsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesSearchExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesSearchResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesSetChatPhotoResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/MessagesTemplateActionTypeNames.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/RevParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/messages/dto/TypeParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/NewsfeedService.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NameCaseParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedCommentsFilters.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedEventActivity.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedExpertCardWidget.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedExpertCardWidgetRating.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedFilters.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetBannedExtendedResponse.kt (94%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetBannedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetCommentsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetListsExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetListsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetMentionsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetRecommendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetSuggestedSourcesResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemAnimatedBlockAnimation.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemAudioAudio.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemDigestButton.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemDigestFooter.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemDigestHeader.kt (93%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemDigestItem.kt (96%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFeedbackPollBanner.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFeedbackPollGratitude.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFeedbackPollPoll.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFeedbackPollQuestion.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFeedbackPollQuestionAnswer.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFeedbackPollQuestionEntry.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFriendFriends.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemPhotoPhotos.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemPhotoTagPhotoTags.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemPromoButtonAction.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemPromoButtonImage.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemVideoVideo.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemWallpostFeedback.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemWallpostFeedbackAnswer.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemWallpostFeedbackType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemWallpostType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedList.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedListFull.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedNewsfeedItem.kt (76%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedNewsfeedItemType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedNewsfeedPhoto.kt (93%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedSearchExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedSearchResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/newsfeed/dto/TypeParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/notes/NotesService.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/notes/dto/NotesGetCommentsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/notes/dto/NotesGetResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/notes/dto/NotesNote.kt (97%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/notes/dto/NotesNoteComment.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/notes/dto/SortParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/notifications/NotificationsService.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/notifications/dto/FiltersParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsFeedback.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsGetResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsNotificationItem.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsNotificationParent.kt (97%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsReply.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsSendMessageError.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsSendMessageItem.kt (96%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/notifications/dto/SendingModeParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/orders/OrdersService.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/orders/dto/ActionParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/orders/dto/OrdersAmount.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/orders/dto/OrdersAmountItem.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/orders/dto/OrdersGetUserSubscriptionsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/orders/dto/OrdersOrder.kt (97%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/orders/dto/OrdersSubscription.kt (83%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/owner/dto/OwnerState.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/pages/PagesService.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/pages/dto/EditParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/pages/dto/PagesPrivacySettings.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/pages/dto/PagesWikipage.kt (97%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/pages/dto/PagesWikipageFull.kt (88%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/pages/dto/PagesWikipageHistory.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/pages/dto/ViewParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/PhotosService.kt (99%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/dto/PhotosCommentXtrPid.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetAlbumsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetAllCommentsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetAllExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetAllResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetCommentsExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetCommentsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetNewTagsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetUserPhotosExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetUserPhotosResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/dto/PhotosImage.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/dto/PhotosImageType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhoto.kt (93%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoAlbum.kt (97%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoAlbumFull.kt (98%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoFull.kt (97%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoFullXtrRealOffset.kt (97%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoSizes.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoSizesType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoTag.kt (97%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoUpload.kt (95%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoXtrRealOffset.kt (97%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoXtrTagInfo.kt (97%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/dto/PhotosSaveOwnerPhotoResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/dto/PhotosSearchResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/dto/PhotosTagsSuggestionItem.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/dto/PhotosTagsSuggestionItemButton.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/dto/PhotosTagsSuggestionItemEndCard.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/dto/ReasonParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/photos/dto/SortParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/podcast/dto/PodcastCover.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/podcast/dto/PodcastExternalData.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/podcasts/PodcastsService.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/podcasts/dto/PodcastsSearchPodcastResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/polls/PollsService.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/polls/dto/BackgroundIdParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/polls/dto/NameCaseParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/polls/dto/PollsAnswer.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/polls/dto/PollsBackground.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/polls/dto/PollsFriend.kt (96%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/polls/dto/PollsPoll.kt (97%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/polls/dto/PollsVoters.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/polls/dto/PollsVotersUsers.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/prettyCards/PrettyCardsService.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/prettyCards/dto/PrettyCardsCreateResponse.kt (96%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/prettyCards/dto/PrettyCardsDeleteResponse.kt (96%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/prettyCards/dto/PrettyCardsEditResponse.kt (96%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/prettyCards/dto/PrettyCardsGetResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/prettyCards/dto/PrettyCardsPrettyCard.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/search/SearchService.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/search/dto/SearchGetHintsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/search/dto/SearchHint.kt (92%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/search/dto/SearchHintSection.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/search/dto/SearchHintType.kt (95%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/secure/SecureService.kt (96%) rename vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsAccessRolePublic.kt => api/src/main/java/com/vk/sdk/api/secure/dto/SecureGiveEventStickerItem.kt (84%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/secure/dto/SecureLevel.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/secure/dto/SecureSmsNotification.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/secure/dto/SecureTokenChecked.kt (96%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/secure/dto/SecureTransaction.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/stats/StatsService.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/stats/dto/IntervalParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/stats/dto/StatsActivity.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/stats/dto/StatsPeriod.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/stats/dto/StatsSexAge.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/stats/dto/StatsWallpostStat.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/status/StatusService.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/status/dto/StatusStatus.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/storage/StorageService.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/storage/dto/StorageValue.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/store/StoreService.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/store/dto/StoreGetStickersKeywordsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/store/dto/StoreProduct.kt (88%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/store/dto/StoreStickersKeyword.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/store/dto/StoreStickersKeywordSticker.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/stories/StoriesService.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/stories/dto/StoriesClickableArea.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/stories/dto/StoriesClickableSticker.kt (98%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/stories/dto/StoriesClickableStickers.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/stories/dto/StoriesFeedItem.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetBannedExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetBannedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetByIdExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetByIdResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetPhotoUploadServerResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetV5113Response.kt (95%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetVideoUploadServerResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetViewersExtendedV5115Response.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/stories/dto/StoriesPromoBlock.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/stories/dto/StoriesReplies.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/stories/dto/StoriesSaveResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/stories/dto/StoriesStory.kt (96%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/stories/dto/StoriesStoryLink.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/stories/dto/StoriesStoryStats.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/stories/dto/StoriesStoryStatsStat.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/stories/dto/StoriesStoryStatsState.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/stories/dto/StoriesStoryType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/stories/dto/StoriesViewersItem.kt (96%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/streaming/StreamingService.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/streaming/dto/IntervalParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/streaming/dto/MonthlyTierParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/streaming/dto/StreamingGetServerUrlResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/streaming/dto/TypeParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/textlives/dto/TextlivesTextliveTextpostBlock.kt (97%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/textlives/dto/TextlivesTextpostAttachment.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/users/UsersService.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/users/dto/NameCaseParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/users/dto/SexParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/users/dto/SortParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/users/dto/StatusParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/users/dto/TypeParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/users/dto/UsersCareer.kt (97%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/users/dto/UsersExports.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/users/dto/UsersFields.kt (71%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/users/dto/UsersGetFollowersFieldsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/users/dto/UsersGetSubscriptionsExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/users/dto/UsersGetSubscriptionsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/users/dto/UsersLastSeen.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/users/dto/UsersMilitary.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/users/dto/UsersOccupation.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/users/dto/UsersOnlineInfo.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/users/dto/UsersPersonal.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/users/dto/UsersRelative.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/users/dto/UsersSchool.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/users/dto/UsersSearchResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/users/dto/UsersSubscriptionsItem.kt (86%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/users/dto/UsersUniversity.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/users/dto/UsersUser.kt (98%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/users/dto/UsersUserConnections.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/users/dto/UsersUserCounters.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/users/dto/UsersUserFull.kt (95%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/users/dto/UsersUserMin.kt (97%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/users/dto/UsersUserRelation.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/users/dto/UsersUserType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/users/dto/UsersUserXtrCounters.kt (95%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/users/dto/UsersUsersArray.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/utils/UtilsService.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/utils/dto/IntervalParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/utils/dto/SourceParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/utils/dto/UtilsDomainResolved.kt (96%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/utils/dto/UtilsDomainResolvedType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/utils/dto/UtilsGetLastShortenedLinksResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/utils/dto/UtilsLastShortenedLink.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/utils/dto/UtilsLinkChecked.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/utils/dto/UtilsLinkCheckedStatus.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/utils/dto/UtilsLinkStats.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/utils/dto/UtilsLinkStatsExtended.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/utils/dto/UtilsShortLink.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/utils/dto/UtilsStats.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/utils/dto/UtilsStatsCity.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/utils/dto/UtilsStatsCountry.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/utils/dto/UtilsStatsExtended.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/utils/dto/UtilsStatsSexAge.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/video/VideoService.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/video/dto/FiltersParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/video/dto/PrivacyParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/video/dto/ReasonParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/video/dto/SortParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/video/dto/VideoAddAlbumResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/video/dto/VideoGetAlbumsByVideoExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/video/dto/VideoGetAlbumsExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/video/dto/VideoGetAlbumsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/video/dto/VideoGetCommentsExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/video/dto/VideoGetCommentsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/video/dto/VideoGetResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/video/dto/VideoLiveInfo.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/video/dto/VideoLiveSettings.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/video/dto/VideoSaveResult.kt (96%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/video/dto/VideoSearchExtendedResponse.kt (95%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/video/dto/VideoSearchResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/video/dto/VideoVideo.kt (97%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/video/dto/VideoVideoAlbumFull.kt (92%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/video/dto/VideoVideoFiles.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/video/dto/VideoVideoFull.kt (97%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/video/dto/VideoVideoImage.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/WallService.kt (97%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/ReasonParam.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/SortParam.kt (100%) rename vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/FilterParam.kt => api/src/main/java/com/vk/sdk/api/wall/dto/TopicIdParam.kt (71%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallAppPost.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallAttachedNote.kt (78%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallCommentAttachment.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallCommentAttachmentType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallCreateCommentResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallEditResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallGeo.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallGetByIdExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallGetCommentExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallGetCommentResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallGetCommentsExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallGetCommentsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallGetExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallGetRepostsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallGetResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallGraffiti.kt (96%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallPostAdsStealthResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallPostCopyright.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallPostResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallPostSource.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallPostSourceType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallPostType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallPostedPhoto.kt (96%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallRepostResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallSearchExtendedResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallSearchResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallViews.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallWallComment.kt (97%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallWallCommentDonut.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallWallCommentDonutPlaceholder.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallWallpost.kt (96%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostAttachment.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostAttachmentType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostCommentsDonut.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostCommentsDonutPlaceholder.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostDonut.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostDonutPlaceholder.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostFull.kt (84%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostToId.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/widgets/WidgetsService.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsCommentMedia.kt (96%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsCommentMediaType.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsCommentReplies.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsCommentRepliesItem.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsGetCommentsResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsGetPagesResponse.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsWidgetComment.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsWidgetLikes.kt (100%) rename {vk-sdk-api => api}/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsWidgetPage.kt (100%) rename {vk-sdk-core => core}/build.gradle (89%) rename {vk-sdk-core => core}/gradle.properties (100%) rename {vk-sdk-core => core}/src/main/AndroidManifest.xml (95%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/VK.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/VKApiCallListener.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/VKApiCallback.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/VKApiConfig.kt (96%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/VKApiCredentials.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/VKApiIllegalCredentialsListener.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/VKApiManager.kt (76%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/VKApiProgressListener.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/VKApiResponseParser.java (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/VKApiValidationHandler.kt (96%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/VKDefaultValidationHandler.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/VKHttpPostCall.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/VKKeyValueStorage.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/VKMethodCall.kt (90%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/VKOkHttpProvider.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/VKPreferencesKeyValueStorage.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/VKScheduler.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/VKTokenExpiredHandler.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/VkResult.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/auth/VKAccessToken.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/auth/VKAuthCallback.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/auth/VKAuthManager.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/auth/VKAuthParams.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/auth/VKAuthResult.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/auth/VKScope.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/browser/BrowserDescriptor.java (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/browser/BrowserMatcher.java (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/browser/BrowserSelector.java (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/browser/Browsers.java (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/browser/DelimitedVersion.java (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/browser/VersionRange.java (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/browser/VersionedBrowserMatcher.java (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/browser/WhiteListedBrowserHelper.java (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/chain/ApiMethodPriorityChainCall.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/chain/ChainArgs.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/chain/ChainCall.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/chain/HttpPostChainCall.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/chain/InternalErrorRetryChainCall.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/chain/InvalidCredentialsObserverChainCall.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/chain/MethodChainCall.kt (100%) create mode 100644 core/src/main/java/com/vk/api/sdk/chain/RateLimitReachedChainCall.kt rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/chain/RetryChainCall.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/chain/TooManyRequestRetryChainCall.kt (62%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/chain/ValidationHandlerChainCall.kt (96%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/exceptions/IgnoredAccessTokenException.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/exceptions/RateLimitReachedException.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/exceptions/VKApiCodes.kt (92%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/exceptions/VKApiException.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/exceptions/VKApiExecutionException.kt (92%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/exceptions/VKApiIllegalResponseException.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/exceptions/VKInternalServerErrorException.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/exceptions/VKLargeEntityException.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/exceptions/VKLocalIOException.kt (100%) create mode 100644 core/src/main/java/com/vk/api/sdk/extensions/ContextExt.kt rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/internal/ApiCommand.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/internal/HttpMultipartEntry.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/internal/HttpStatus.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/internal/JsonUtils.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/internal/QueryStringGenerator.kt (83%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/internal/VKErrorUtils.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/internal/VKInitProvider.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/internal/Validation.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/okhttp/FileFullRequestBody.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/okhttp/LogLevelRequestTag.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/okhttp/LoggingInterceptor.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/okhttp/OkHttpExecutor.kt (97%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/okhttp/OkHttpExecutorConfig.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/okhttp/OkHttpMethodCall.kt (86%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/okhttp/OkHttpPostCall.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/okhttp/ProgressRequestBody.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/okhttp/RequestTag.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/requests/VKBooleanRequest.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/requests/VKRequest.kt (95%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/ui/VKBaseAuthActivity.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/ui/VKCaptchaActivity.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/ui/VKConfirmationActivity.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/ui/VKWebViewAuthActivity.kt (82%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/utils/ApiExt.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/utils/ApiMethodPriorityBackoff.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/utils/ExponentialBackoff.kt (90%) create mode 100644 core/src/main/java/com/vk/api/sdk/utils/RateLimitTokenBackoff.kt rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/utils/StartUpMethodPriorityBackoffBaseImpl.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/utils/ThreadLocalDelegate.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/utils/VKLoader.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/utils/VKUrlResolver.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/utils/VKUtils.kt (95%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/utils/VKValidationLocker.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/utils/log/DefaultApiLogger.kt (100%) rename {vk-sdk-core => core}/src/main/java/com/vk/api/sdk/utils/log/Logger.kt (100%) create mode 100644 core/src/main/java/com/vk/api/sdk/utils/tmr/TooManyRequestBackoffEmpty.kt create mode 100644 core/src/main/java/com/vk/api/sdk/utils/tmr/TooManyRequestBackoffGlobal.kt create mode 100644 core/src/main/java/com/vk/api/sdk/utils/tmr/TooManyRequestLimitBackoff.kt rename {vk-sdk-core => core}/src/main/res/layout/vk_webview_auth_dialog.xml (100%) rename {vk-sdk-core => core}/src/main/res/values-ru/string.xml (100%) create mode 100644 core/src/main/res/values/booleans.xml rename {vk-sdk-core => core}/src/main/res/values/strings.xml (100%) rename {vk-sdk-core => core}/src/main/res/values/styles.xml (100%) rename {vk-sdk-core => core}/src/test/java/com/vk/api/sdk/utils/StartUpMethodPriorityBackoffBaseImplTest.kt (100%) create mode 100644 id/.gitignore create mode 100644 id/build.gradle create mode 100644 id/src/main/AndroidManifest.xml create mode 100644 id/src/main/java/com/vk/sdk/id/UserId.kt delete mode 100644 samples/app/sdk/src/main/res/values/strings.xml delete mode 100644 vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsUserSpecificationCutted.kt delete mode 100644 vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioPhoto.kt delete mode 100644 vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioPhotoSizes.kt delete mode 100644 vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioPlaylist.kt delete mode 100644 vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioPlaylistMeta.kt delete mode 100644 vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioPlaylistOriginalFollowed.kt delete mode 100644 vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioPlaylistPermissions.kt delete mode 100644 vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkProductCategory.kt delete mode 100644 vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsUserXtrLists.kt delete mode 100644 vk-sdk-api/src/main/java/com/vk/sdk/api/media/dto/MediaRestriction.kt delete mode 100644 vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetConversationsByIdExtendedResponse.kt delete mode 100644 vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetByIdExtendedResponse.kt delete mode 100644 vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetByIdResponse.kt delete mode 100644 vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoRestrictionButton.kt delete mode 100644 vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallGetByIdResponse.kt delete mode 100644 vk-sdk-core/src/main/java/com/vk/api/sdk/chain/RateLimitReachedChainCall.kt create mode 100644 vk.gradle diff --git a/vk-sdk-api/.gitignore b/api/.gitignore similarity index 100% rename from vk-sdk-api/.gitignore rename to api/.gitignore diff --git a/vk-sdk-api/README.md b/api/README.md similarity index 56% rename from vk-sdk-api/README.md rename to api/README.md index ea5a57a56e..f124877798 100644 --- a/vk-sdk-api/README.md +++ b/api/README.md @@ -1,4 +1,4 @@ VK SDK generated api for Android ========== -Current generated version is 5.130 \ No newline at end of file +Current generated version is 5.131 \ No newline at end of file diff --git a/vk-sdk-api/build.gradle b/api/build.gradle similarity index 93% rename from vk-sdk-api/build.gradle rename to api/build.gradle index f7d7635b9f..0b49a7aa9e 100644 --- a/vk-sdk-api/build.gradle +++ b/api/build.gradle @@ -36,8 +36,8 @@ configurations { } dependencies { - implementation project(':libapi-sdk-core') - + implementation project(':core') + implementation project(":id") implementation sdkLibraries.kotlin implementation sdkLibraries.gson } diff --git a/vk-sdk-api/src/main/AndroidManifest.xml b/api/src/main/AndroidManifest.xml similarity index 100% rename from vk-sdk-api/src/main/AndroidManifest.xml rename to api/src/main/AndroidManifest.xml diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ApiResponseParser.kt b/api/src/main/java/com/vk/sdk/api/ApiResponseParser.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ApiResponseParser.kt rename to api/src/main/java/com/vk/sdk/api/ApiResponseParser.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/GsonHolder.kt b/api/src/main/java/com/vk/sdk/api/GsonHolder.kt similarity index 92% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/GsonHolder.kt rename to api/src/main/java/com/vk/sdk/api/GsonHolder.kt index 35e6bcc0de..c399ccd106 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/GsonHolder.kt +++ b/api/src/main/java/com/vk/sdk/api/GsonHolder.kt @@ -29,6 +29,8 @@ package com.vk.sdk.api import com.google.gson.Gson import com.google.gson.GsonBuilder +import com.vk.dto.common.id.UserId +import com.vk.dto.common.id.UserId.GsonSerializer import com.vk.sdk.api.newsfeed.dto.NewsfeedNewsfeedItem import com.vk.sdk.api.users.dto.UsersSubscriptionsItem @@ -38,6 +40,7 @@ object GsonHolder { .registerTypeAdapter(UsersSubscriptionsItem::class.java, UsersSubscriptionsItem.Deserializer()) .registerTypeAdapter(NewsfeedNewsfeedItem::class.java, NewsfeedNewsfeedItem.Deserializer()) + .registerTypeAdapter(UserId::class.java, UserId.GsonSerializer()) .create() } diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/NewApiRequest.kt b/api/src/main/java/com/vk/sdk/api/NewApiRequest.kt similarity index 96% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/NewApiRequest.kt rename to api/src/main/java/com/vk/sdk/api/NewApiRequest.kt index c38df01ebe..5f7e4a5cb3 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/NewApiRequest.kt +++ b/api/src/main/java/com/vk/sdk/api/NewApiRequest.kt @@ -34,7 +34,7 @@ import kotlin.String internal class NewApiRequest internal constructor( methodName: String, parser: ApiResponseParser -) : VKRequest(methodName, requestApiVersion = "5.130"), ApiResponseParser by parser { +) : VKRequest(methodName, requestApiVersion = "5.131"), ApiResponseParser by parser { override fun parse(response: String): T { val responseJson = JsonParser.parseString(response).asJsonObject.get("response") return parseResponse(responseJson) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/account/AccountService.kt b/api/src/main/java/com/vk/sdk/api/account/AccountService.kt similarity index 98% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/account/AccountService.kt rename to api/src/main/java/com/vk/sdk/api/account/AccountService.kt index d5f72de3d1..2c23588eac 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/account/AccountService.kt +++ b/api/src/main/java/com/vk/sdk/api/account/AccountService.kt @@ -139,10 +139,11 @@ class AccountService { * Returns non-null values of user counters. * * @param filter - Counters to be returned. + * @param userId - User ID * @return [VKRequest] with [AccountAccountCounters] */ - fun accountGetCounters(filter: List? = null): VKRequest = - NewApiRequest("account.getCounters") { + fun accountGetCounters(filter: List? = null, userId: Int? = null): + VKRequest = NewApiRequest("account.getCounters") { GsonHolder.gson.fromJson(it, AccountAccountCounters::class.java) } .apply { @@ -150,6 +151,7 @@ class AccountService { it.value } filterJsonConverted?.let { addParam("filter", it) } + userId?.let { addParam("user_id", it) } } /** diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountAccountCounters.kt b/api/src/main/java/com/vk/sdk/api/account/dto/AccountAccountCounters.kt similarity index 93% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountAccountCounters.kt rename to api/src/main/java/com/vk/sdk/api/account/dto/AccountAccountCounters.kt index d8e2f02725..775b85a117 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountAccountCounters.kt +++ b/api/src/main/java/com/vk/sdk/api/account/dto/AccountAccountCounters.kt @@ -39,7 +39,7 @@ import kotlin.Int * @param friendsRecommendations - New friends recommendations number * @param gifts - New gifts number * @param groups - New groups number - * @param menuDiscoverBadge - + * @param menuDiscoverBadge * @param menuClipsBadge * @param messages - New messages number * @param memories - New memories number @@ -47,7 +47,6 @@ import kotlin.Int * @param notifications - New notifications number * @param photos - New photo tags number * @param sdk - New sdk number - * @param messagesUnreadUnmuted - Unread unmuted dialogs count */ data class AccountAccountCounters( @SerializedName("app_requests") @@ -81,7 +80,5 @@ data class AccountAccountCounters( @SerializedName("photos") val photos: Int? = null, @SerializedName("sdk") - val sdk: Int? = null, - @SerializedName("messages_unread_unmuted") - val messagesUnreadUnmuted: Int? = null + val sdk: Int? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountChangePasswordResponse.kt b/api/src/main/java/com/vk/sdk/api/account/dto/AccountChangePasswordResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountChangePasswordResponse.kt rename to api/src/main/java/com/vk/sdk/api/account/dto/AccountChangePasswordResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountGetActiveOffersResponse.kt b/api/src/main/java/com/vk/sdk/api/account/dto/AccountGetActiveOffersResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountGetActiveOffersResponse.kt rename to api/src/main/java/com/vk/sdk/api/account/dto/AccountGetActiveOffersResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountGetBannedResponse.kt b/api/src/main/java/com/vk/sdk/api/account/dto/AccountGetBannedResponse.kt similarity index 95% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountGetBannedResponse.kt rename to api/src/main/java/com/vk/sdk/api/account/dto/AccountGetBannedResponse.kt index 20a161430f..0193d119fb 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountGetBannedResponse.kt +++ b/api/src/main/java/com/vk/sdk/api/account/dto/AccountGetBannedResponse.kt @@ -29,7 +29,7 @@ package com.vk.sdk.api.account.dto import com.google.gson.annotations.SerializedName import com.vk.sdk.api.groups.dto.GroupsGroup -import com.vk.sdk.api.users.dto.UsersUserMin +import com.vk.sdk.api.users.dto.UsersUserFull import kotlin.Int import kotlin.collections.List @@ -45,7 +45,7 @@ data class AccountGetBannedResponse( @SerializedName("items") val items: List, @SerializedName("profiles") - val profiles: List? = null, + val profiles: List? = null, @SerializedName("groups") val groups: List? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountInfo.kt b/api/src/main/java/com/vk/sdk/api/account/dto/AccountInfo.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountInfo.kt rename to api/src/main/java/com/vk/sdk/api/account/dto/AccountInfo.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountNameRequest.kt b/api/src/main/java/com/vk/sdk/api/account/dto/AccountNameRequest.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountNameRequest.kt rename to api/src/main/java/com/vk/sdk/api/account/dto/AccountNameRequest.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountNameRequestStatus.kt b/api/src/main/java/com/vk/sdk/api/account/dto/AccountNameRequestStatus.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountNameRequestStatus.kt rename to api/src/main/java/com/vk/sdk/api/account/dto/AccountNameRequestStatus.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountOffer.kt b/api/src/main/java/com/vk/sdk/api/account/dto/AccountOffer.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountOffer.kt rename to api/src/main/java/com/vk/sdk/api/account/dto/AccountOffer.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountPushConversations.kt b/api/src/main/java/com/vk/sdk/api/account/dto/AccountPushConversations.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountPushConversations.kt rename to api/src/main/java/com/vk/sdk/api/account/dto/AccountPushConversations.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountPushConversationsItem.kt b/api/src/main/java/com/vk/sdk/api/account/dto/AccountPushConversationsItem.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountPushConversationsItem.kt rename to api/src/main/java/com/vk/sdk/api/account/dto/AccountPushConversationsItem.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountPushParams.kt b/api/src/main/java/com/vk/sdk/api/account/dto/AccountPushParams.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountPushParams.kt rename to api/src/main/java/com/vk/sdk/api/account/dto/AccountPushParams.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountPushParamsMode.kt b/api/src/main/java/com/vk/sdk/api/account/dto/AccountPushParamsMode.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountPushParamsMode.kt rename to api/src/main/java/com/vk/sdk/api/account/dto/AccountPushParamsMode.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountPushParamsOnoff.kt b/api/src/main/java/com/vk/sdk/api/account/dto/AccountPushParamsOnoff.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountPushParamsOnoff.kt rename to api/src/main/java/com/vk/sdk/api/account/dto/AccountPushParamsOnoff.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountPushParamsSettings.kt b/api/src/main/java/com/vk/sdk/api/account/dto/AccountPushParamsSettings.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountPushParamsSettings.kt rename to api/src/main/java/com/vk/sdk/api/account/dto/AccountPushParamsSettings.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountPushSettings.kt b/api/src/main/java/com/vk/sdk/api/account/dto/AccountPushSettings.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountPushSettings.kt rename to api/src/main/java/com/vk/sdk/api/account/dto/AccountPushSettings.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountSaveProfileInfoResponse.kt b/api/src/main/java/com/vk/sdk/api/account/dto/AccountSaveProfileInfoResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountSaveProfileInfoResponse.kt rename to api/src/main/java/com/vk/sdk/api/account/dto/AccountSaveProfileInfoResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountUserSettings.kt b/api/src/main/java/com/vk/sdk/api/account/dto/AccountUserSettings.kt similarity index 98% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountUserSettings.kt rename to api/src/main/java/com/vk/sdk/api/account/dto/AccountUserSettings.kt index a8606d13b8..060b8220c3 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountUserSettings.kt +++ b/api/src/main/java/com/vk/sdk/api/account/dto/AccountUserSettings.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.account.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.audio.dto.AudioAudio import com.vk.sdk.api.base.dto.BaseBoolInt import com.vk.sdk.api.base.dto.BaseCity @@ -85,7 +86,7 @@ data class AccountUserSettings( @SerializedName("hidden") val hidden: Int? = null, @SerializedName("id") - val id: Int? = null, + val id: UserId? = null, @SerializedName("last_name") val lastName: String? = null, @SerializedName("can_access_closed") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountUserSettingsInterest.kt b/api/src/main/java/com/vk/sdk/api/account/dto/AccountUserSettingsInterest.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountUserSettingsInterest.kt rename to api/src/main/java/com/vk/sdk/api/account/dto/AccountUserSettingsInterest.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountUserSettingsInterests.kt b/api/src/main/java/com/vk/sdk/api/account/dto/AccountUserSettingsInterests.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/AccountUserSettingsInterests.kt rename to api/src/main/java/com/vk/sdk/api/account/dto/AccountUserSettingsInterests.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/BdateVisibilityParam.kt b/api/src/main/java/com/vk/sdk/api/account/dto/BdateVisibilityParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/BdateVisibilityParam.kt rename to api/src/main/java/com/vk/sdk/api/account/dto/BdateVisibilityParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/FieldsParam.kt b/api/src/main/java/com/vk/sdk/api/account/dto/FieldsParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/FieldsParam.kt rename to api/src/main/java/com/vk/sdk/api/account/dto/FieldsParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/FilterParam.kt b/api/src/main/java/com/vk/sdk/api/account/dto/FilterParam.kt similarity index 87% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/FilterParam.kt rename to api/src/main/java/com/vk/sdk/api/account/dto/FilterParam.kt index 488497c05e..2d76b8b6c1 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/FilterParam.kt +++ b/api/src/main/java/com/vk/sdk/api/account/dto/FilterParam.kt @@ -42,9 +42,6 @@ enum class FilterParam( @SerializedName("photos") PHOTOS("photos"), - @SerializedName("videos") - VIDEOS("videos"), - @SerializedName("notes") NOTES("notes"), @@ -61,5 +58,14 @@ enum class FilterParam( SDK("sdk"), @SerializedName("friends_suggestions") - FRIENDS_SUGGESTIONS("friends_suggestions"); + FRIENDS_SUGGESTIONS("friends_suggestions"), + + @SerializedName("notifications") + NOTIFICATIONS("notifications"), + + @SerializedName("app_requests") + APP_REQUESTS("app_requests"), + + @SerializedName("friends_recommendations") + FRIENDS_RECOMMENDATIONS("friends_recommendations"); } diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/RelationParam.kt b/api/src/main/java/com/vk/sdk/api/account/dto/RelationParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/RelationParam.kt rename to api/src/main/java/com/vk/sdk/api/account/dto/RelationParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/SexParam.kt b/api/src/main/java/com/vk/sdk/api/account/dto/SexParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/account/dto/SexParam.kt rename to api/src/main/java/com/vk/sdk/api/account/dto/SexParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/addresses/dto/AddressesFields.kt b/api/src/main/java/com/vk/sdk/api/addresses/dto/AddressesFields.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/addresses/dto/AddressesFields.kt rename to api/src/main/java/com/vk/sdk/api/addresses/dto/AddressesFields.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/AdsService.kt b/api/src/main/java/com/vk/sdk/api/ads/AdsService.kt similarity index 98% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/AdsService.kt rename to api/src/main/java/com/vk/sdk/api/ads/AdsService.kt index ac2a7617cc..ceef3e7e27 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/AdsService.kt +++ b/api/src/main/java/com/vk/sdk/api/ads/AdsService.kt @@ -52,8 +52,6 @@ import com.vk.sdk.api.ads.dto.AdsTargStats import com.vk.sdk.api.ads.dto.AdsTargSuggestions import com.vk.sdk.api.ads.dto.AdsTargetGroup import com.vk.sdk.api.ads.dto.AdsUpdateOfficeUsersResult -import com.vk.sdk.api.ads.dto.AdsUserSpecification -import com.vk.sdk.api.ads.dto.AdsUserSpecificationCutted import com.vk.sdk.api.ads.dto.AdsUsers import com.vk.sdk.api.ads.dto.FieldsParam import com.vk.sdk.api.ads.dto.IdsTypeParam @@ -78,16 +76,13 @@ class AdsService { * 'user_specification' objects see below. * @return [VKRequest] with [Boolean] */ - fun adsAddOfficeUsers(accountId: Int, data: List): - VKRequest = NewApiRequest("ads.addOfficeUsers") { + fun adsAddOfficeUsers(accountId: Int, data: String): VKRequest = + NewApiRequest("ads.addOfficeUsers") { GsonHolder.gson.fromJson(it, Boolean::class.java) } .apply { addParam("account_id", accountId) - val dataJsonConverted = data.map { - GsonHolder.gson.toJson(it) - } - addParam("data", dataJsonConverted) + addParam("data", data) } /** @@ -393,13 +388,15 @@ class AdsService { * Returns descriptions of ad layouts. * * @param accountId - Advertising account ID. - * @param adIds - Filter by ads. Serialized JSON array with ad IDs. If the parameter is null, - * all ads will be shown. - * @param campaignIds - Filter by advertising campaigns. Serialized JSON array with campaign - * IDs. If the parameter is null, ads of all campaigns will be shown. * @param clientId - 'For advertising agencies.' ID of the client ads are retrieved from. * @param includeDeleted - Flag that specifies whether archived ads shall be shown. *0 - show * only active ads,, *1 - show all ads. + * @param onlyDeleted - Flag that specifies whether to show only archived ads: *0 - show all + * ads,, *1 - show only archived ads. Available when include_deleted flag is *1 + * @param campaignIds - Filter by advertising campaigns. Serialized JSON array with campaign + * IDs. If the parameter is null, ads of all campaigns will be shown. + * @param adIds - Filter by ads. Serialized JSON array with ad IDs. If the parameter is null, + * all ads will be shown. * @param limit - Limit of number of returned ads. Used only if 'ad_ids' parameter is null, and * 'campaign_ids' parameter contains ID of only one campaign. * @param offset - Offset. Used in the same cases as 'limit' parameter. @@ -407,10 +404,11 @@ class AdsService { */ fun adsGetAdsLayout( accountId: Int, - adIds: String? = null, - campaignIds: String? = null, clientId: Int? = null, includeDeleted: Boolean? = null, + onlyDeleted: Boolean? = null, + campaignIds: String? = null, + adIds: String? = null, limit: Int? = null, offset: Int? = null ): VKRequest> = NewApiRequest("ads.getAdsLayout") { @@ -419,10 +417,11 @@ class AdsService { } .apply { addParam("account_id", accountId) - adIds?.let { addParam("ad_ids", it) } - campaignIds?.let { addParam("campaign_ids", it) } clientId?.let { addParam("client_id", it) } includeDeleted?.let { addParam("include_deleted", it) } + onlyDeleted?.let { addParam("only_deleted", it) } + campaignIds?.let { addParam("campaign_ids", it) } + adIds?.let { addParam("ad_ids", it) } limit?.let { addParam("limit", it) } offset?.let { addParam("offset", it) } } @@ -1075,17 +1074,14 @@ class AdsService { * 'user_specification' objects see below. * @return [VKRequest] with [Unit] */ - fun adsUpdateOfficeUsers(accountId: Int, data: List): + fun adsUpdateOfficeUsers(accountId: Int, data: String): VKRequest> = NewApiRequest("ads.updateOfficeUsers") { val typeToken = object: TypeToken>() {}.type GsonHolder.gson.fromJson>(it, typeToken) } .apply { addParam("account_id", accountId) - val dataJsonConverted = data.map { - GsonHolder.gson.toJson(it) - } - addParam("data", dataJsonConverted) + addParam("data", data) } /** diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdFormatParam.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdFormatParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdFormatParam.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdFormatParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsAccessRole.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsAccessRole.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsAccessRole.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsAccessRole.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsAccesses.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsAccesses.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsAccesses.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsAccesses.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsAccount.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsAccount.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsAccount.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsAccount.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsAccountType.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsAccountType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsAccountType.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsAccountType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsAd.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsAd.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsAd.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsAd.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsAdApproved.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsAdApproved.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsAdApproved.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsAdApproved.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsAdCostType.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsAdCostType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsAdCostType.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsAdCostType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsAdLayout.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsAdLayout.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsAdLayout.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsAdLayout.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsAdStatus.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsAdStatus.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsAdStatus.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsAdStatus.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsCampaign.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsCampaign.kt similarity index 87% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsCampaign.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsCampaign.kt index e0d844f354..341e7e4b86 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsCampaign.kt +++ b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsCampaign.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.ads.dto import com.google.gson.annotations.SerializedName +import kotlin.Boolean import kotlin.Int import kotlin.String @@ -42,6 +43,9 @@ import kotlin.String * @param type * @param adsCount - Amount of active ads in campaign * @param createTime - Campaign create time, as Unixtime + * @param goalType - Campaign goal type + * @param userGoalType - Campaign user goal type + * @param isCboEnabled - Shows if Campaign Budget Optimization is on * @param updateTime - Campaign update time, as Unixtime * @param viewsLimit - Limit of views per user per campaign */ @@ -66,6 +70,12 @@ data class AdsCampaign( val adsCount: Int? = null, @SerializedName("create_time") val createTime: Int? = null, + @SerializedName("goal_type") + val goalType: Int? = null, + @SerializedName("user_goal_type") + val userGoalType: Int? = null, + @SerializedName("is_cbo_enabled") + val isCboEnabled: Boolean? = null, @SerializedName("update_time") val updateTime: Int? = null, @SerializedName("views_limit") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsCampaignStatus.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsCampaignStatus.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsCampaignStatus.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsCampaignStatus.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsCampaignType.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsCampaignType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsCampaignType.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsCampaignType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsCategory.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsCategory.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsCategory.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsCategory.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsClient.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsClient.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsClient.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsClient.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsCreateTargetGroupResponse.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsCreateTargetGroupResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsCreateTargetGroupResponse.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsCreateTargetGroupResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsCriteriaSex.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsCriteriaSex.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsCriteriaSex.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsCriteriaSex.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsDemoStats.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsDemoStats.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsDemoStats.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsDemoStats.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsDemostatsFormat.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsDemostatsFormat.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsDemostatsFormat.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsDemostatsFormat.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsFloodStats.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsFloodStats.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsFloodStats.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsFloodStats.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsGetCategoriesResponse.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsGetCategoriesResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsGetCategoriesResponse.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsGetCategoriesResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsGetLookalikeRequestsResponse.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsGetLookalikeRequestsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsGetLookalikeRequestsResponse.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsGetLookalikeRequestsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsGetMusiciansResponse.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsGetMusiciansResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsGetMusiciansResponse.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsGetMusiciansResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsLinkStatus.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsLinkStatus.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsLinkStatus.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsLinkStatus.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsLookalikeRequest.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsLookalikeRequest.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsLookalikeRequest.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsLookalikeRequest.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsLookalikeRequestSaveAudienceLevel.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsLookalikeRequestSaveAudienceLevel.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsLookalikeRequestSaveAudienceLevel.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsLookalikeRequestSaveAudienceLevel.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsMusician.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsMusician.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsMusician.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsMusician.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsObjectType.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsObjectType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsObjectType.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsObjectType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsParagraphs.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsParagraphs.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsParagraphs.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsParagraphs.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsPromotedPostReach.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsPromotedPostReach.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsPromotedPostReach.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsPromotedPostReach.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsRejectReason.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsRejectReason.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsRejectReason.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsRejectReason.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsRules.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsRules.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsRules.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsRules.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsStats.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsStats.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsStats.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsStats.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsAge.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsAge.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsAge.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsAge.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsCities.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsCities.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsCities.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsCities.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsFormat.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsFormat.kt similarity index 95% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsFormat.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsFormat.kt index 0a30eb1350..a2d3f6fcc7 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsFormat.kt +++ b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsFormat.kt @@ -33,7 +33,6 @@ import kotlin.String /** * @param clicks - Clicks number - * @param linkOwnerClicks - Group clicks number * @param linkExternalClicks - External clicks number * @param day - Day as YYYY-MM-DD * @param impressions - Impressions number @@ -50,8 +49,6 @@ import kotlin.String data class AdsStatsFormat( @SerializedName("clicks") val clicks: Int? = null, - @SerializedName("link_owner_clicks") - val linkOwnerClicks: Int? = null, @SerializedName("link_external_clicks") val linkExternalClicks: Int? = null, @SerializedName("day") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsSex.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsSex.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsSex.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsSex.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsSexAge.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsSexAge.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsSexAge.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsSexAge.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsSexValue.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsSexValue.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsSexValue.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsSexValue.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsViewsTimes.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsViewsTimes.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsViewsTimes.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsStatsViewsTimes.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsTargSettings.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsTargSettings.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsTargSettings.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsTargSettings.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsTargStats.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsTargStats.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsTargStats.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsTargStats.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsTargSuggestions.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsTargSuggestions.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsTargSuggestions.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsTargSuggestions.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsTargetGroup.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsTargetGroup.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsTargetGroup.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsTargetGroup.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsUpdateOfficeUsersResult.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsUpdateOfficeUsersResult.kt similarity index 96% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsUpdateOfficeUsersResult.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsUpdateOfficeUsersResult.kt index df0b6fab91..95bf05d13f 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsUpdateOfficeUsersResult.kt +++ b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsUpdateOfficeUsersResult.kt @@ -28,9 +28,9 @@ package com.vk.sdk.api.ads.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.base.dto.BaseError import kotlin.Boolean -import kotlin.Int /** * @param userId @@ -39,7 +39,7 @@ import kotlin.Int */ data class AdsUpdateOfficeUsersResult( @SerializedName("user_id") - val userId: Int, + val userId: UserId, @SerializedName("is_success") val isSuccess: Boolean, @SerializedName("error") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsUsers.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsUsers.kt similarity index 96% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsUsers.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/AdsUsers.kt index df95d5ea36..f370ccf127 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsUsers.kt +++ b/api/src/main/java/com/vk/sdk/api/ads/dto/AdsUsers.kt @@ -28,7 +28,7 @@ package com.vk.sdk.api.ads.dto import com.google.gson.annotations.SerializedName -import kotlin.Int +import com.vk.dto.common.id.UserId import kotlin.collections.List /** @@ -39,5 +39,5 @@ data class AdsUsers( @SerializedName("accesses") val accesses: List, @SerializedName("user_id") - val userId: Int + val userId: UserId ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/FieldsParam.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/FieldsParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/FieldsParam.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/FieldsParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/IdsTypeParam.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/IdsTypeParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/IdsTypeParam.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/IdsTypeParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/LangParam.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/LangParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/LangParam.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/LangParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/LinkTypeParam.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/LinkTypeParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/LinkTypeParam.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/LinkTypeParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/PeriodParam.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/PeriodParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/PeriodParam.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/PeriodParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/SectionParam.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/SectionParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/SectionParam.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/SectionParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/StatsFieldsParam.kt b/api/src/main/java/com/vk/sdk/api/ads/dto/StatsFieldsParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/StatsFieldsParam.kt rename to api/src/main/java/com/vk/sdk/api/ads/dto/StatsFieldsParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/shortVideo/dto/ShortVideoChallengeFeedItem.kt b/api/src/main/java/com/vk/sdk/api/aliexpress/dto/AliexpressBlockPanel.kt similarity index 72% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/shortVideo/dto/ShortVideoChallengeFeedItem.kt rename to api/src/main/java/com/vk/sdk/api/aliexpress/dto/AliexpressBlockPanel.kt index 265d871f9b..91e5d79a08 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/shortVideo/dto/ShortVideoChallengeFeedItem.kt +++ b/api/src/main/java/com/vk/sdk/api/aliexpress/dto/AliexpressBlockPanel.kt @@ -25,29 +25,27 @@ // THIS FILE IS AUTO GENERATED! // DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. // ********************************************************************* -package com.vk.sdk.api.shortVideo.dto +package com.vk.sdk.api.aliexpress.dto import com.google.gson.annotations.SerializedName -import com.vk.sdk.api.video.dto.VideoVideoFull -import kotlin.Int import kotlin.String /** - * @param title - * @param actionTitle - * @param totalCount - * @param url - * @param video + * @param title - Panel title + * @param subtitle - Panel text + * @param photo62 - URL of photo with 62 pixels in height + * @param photo124 - URL of photo with 124 pixels in height + * @param photo186 - URL of photo with 186 pixels in height */ -data class ShortVideoChallengeFeedItem( +data class AliexpressBlockPanel( @SerializedName("title") val title: String, - @SerializedName("action_title") - val actionTitle: String, - @SerializedName("total_count") - val totalCount: Int, - @SerializedName("url") - val url: String, - @SerializedName("video") - val video: VideoVideoFull + @SerializedName("subtitle") + val subtitle: String? = null, + @SerializedName("photo_62") + val photo62: String? = null, + @SerializedName("photo_124") + val photo124: String? = null, + @SerializedName("photo_186") + val photo186: String? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/media/dto/MediaPopup.kt b/api/src/main/java/com/vk/sdk/api/aliexpress/dto/AliexpressCarouselItem.kt similarity index 55% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/media/dto/MediaPopup.kt rename to api/src/main/java/com/vk/sdk/api/aliexpress/dto/AliexpressCarouselItem.kt index 1a1159b94d..b126f50ead 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/media/dto/MediaPopup.kt +++ b/api/src/main/java/com/vk/sdk/api/aliexpress/dto/AliexpressCarouselItem.kt @@ -25,52 +25,49 @@ // THIS FILE IS AUTO GENERATED! // DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. // ********************************************************************* -package com.vk.sdk.api.media.dto +package com.vk.sdk.api.aliexpress.dto import com.google.gson.annotations.SerializedName -import com.vk.sdk.api.base.dto.BaseImage import com.vk.sdk.api.base.dto.BaseLinkButton +import com.vk.sdk.api.market.dto.MarketPrice +import com.vk.sdk.api.photos.dto.PhotosPhoto +import kotlin.Boolean import kotlin.String -import kotlin.collections.List /** - * @param title - Restriction title - * @param id - Popup id - * @param button - Restriction button - * @param buttons - Restriction button - * @param icons - Restriction icon - * @param musicSubscriptionEvent - Stats param - * @param text - Restriction text - * @param imageMode + * @param id - Item id + * @param title - Item title + * @param price - Aliexpress item price + * @param isFavorite - Information whether the current item has been added to bookmarks + * @param url - Base product url + * @param detailsButton - Details action + * @param discountText - Discount text + * @param deliveryDateText - Delivery details text + * @param label - Any text label for item + * @param actionButton - Button action + * @param photo */ -data class MediaPopup( +data class AliexpressCarouselItem( + @SerializedName("id") + val id: String, @SerializedName("title") val title: String, - @SerializedName("id") - val id: String? = null, - @SerializedName("button") - val button: BaseLinkButton? = null, - @SerializedName("buttons") - val buttons: List? = null, - @SerializedName("icons") - val icons: List? = null, - @SerializedName("music_subscription_event") - val musicSubscriptionEvent: String? = null, - @SerializedName("text") - val text: String? = null, - @SerializedName("image_mode") - val imageMode: MediaPopup.ImageMode? = null -) { - enum class ImageMode( - val value: String - ) { - @SerializedName("round") - ROUND("round"), - - @SerializedName("small") - SMALL("small"), - - @SerializedName("big") - BIG("big"); - } -} + @SerializedName("price") + val price: MarketPrice, + @SerializedName("is_favorite") + val isFavorite: Boolean, + @SerializedName("url") + val url: String, + @SerializedName("details_button") + val detailsButton: BaseLinkButton, + @SerializedName("discount_text") + val discountText: String? = null, + @SerializedName("delivery_date_text") + val deliveryDateText: String? = null, + @SerializedName("label") + val label: String? = null, + @SerializedName("action_button") + val actionButton: BaseLinkButton? = null, + @SerializedName("photo") + val photo: PhotosPhoto? = null +) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/appWidgets/AppWidgetsService.kt b/api/src/main/java/com/vk/sdk/api/appWidgets/AppWidgetsService.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/appWidgets/AppWidgetsService.kt rename to api/src/main/java/com/vk/sdk/api/appWidgets/AppWidgetsService.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/appWidgets/dto/AppWidgetsGetAppImageUploadServerResponse.kt b/api/src/main/java/com/vk/sdk/api/appWidgets/dto/AppWidgetsGetAppImageUploadServerResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/appWidgets/dto/AppWidgetsGetAppImageUploadServerResponse.kt rename to api/src/main/java/com/vk/sdk/api/appWidgets/dto/AppWidgetsGetAppImageUploadServerResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/appWidgets/dto/AppWidgetsGetGroupImageUploadServerResponse.kt b/api/src/main/java/com/vk/sdk/api/appWidgets/dto/AppWidgetsGetGroupImageUploadServerResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/appWidgets/dto/AppWidgetsGetGroupImageUploadServerResponse.kt rename to api/src/main/java/com/vk/sdk/api/appWidgets/dto/AppWidgetsGetGroupImageUploadServerResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/appWidgets/dto/AppWidgetsPhoto.kt b/api/src/main/java/com/vk/sdk/api/appWidgets/dto/AppWidgetsPhoto.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/appWidgets/dto/AppWidgetsPhoto.kt rename to api/src/main/java/com/vk/sdk/api/appWidgets/dto/AppWidgetsPhoto.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/appWidgets/dto/AppWidgetsPhotos.kt b/api/src/main/java/com/vk/sdk/api/appWidgets/dto/AppWidgetsPhotos.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/appWidgets/dto/AppWidgetsPhotos.kt rename to api/src/main/java/com/vk/sdk/api/appWidgets/dto/AppWidgetsPhotos.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/appWidgets/dto/ImageTypeParam.kt b/api/src/main/java/com/vk/sdk/api/appWidgets/dto/ImageTypeParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/appWidgets/dto/ImageTypeParam.kt rename to api/src/main/java/com/vk/sdk/api/appWidgets/dto/ImageTypeParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/appWidgets/dto/TypeParam.kt b/api/src/main/java/com/vk/sdk/api/appWidgets/dto/TypeParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/appWidgets/dto/TypeParam.kt rename to api/src/main/java/com/vk/sdk/api/appWidgets/dto/TypeParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/AppsService.kt b/api/src/main/java/com/vk/sdk/api/apps/AppsService.kt similarity index 97% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/apps/AppsService.kt rename to api/src/main/java/com/vk/sdk/api/apps/AppsService.kt index 2af2f0be5c..dc3dd84e02 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/AppsService.kt +++ b/api/src/main/java/com/vk/sdk/api/apps/AppsService.kt @@ -30,7 +30,7 @@ package com.vk.sdk.api.apps import com.vk.api.sdk.requests.VKRequest import com.vk.sdk.api.GsonHolder import com.vk.sdk.api.NewApiRequest -import com.vk.sdk.api.apps.dto.AppsGetCatalogResponse +import com.vk.sdk.api.apps.dto.AppsCatalogList import com.vk.sdk.api.apps.dto.AppsGetFriendsListResponse import com.vk.sdk.api.apps.dto.AppsGetLeaderboardExtendedResponse import com.vk.sdk.api.apps.dto.AppsGetLeaderboardResponse @@ -116,7 +116,7 @@ class AppsService { * @param q - Search query string. * @param genreId * @param filter - 'installed' - to return list of installed apps (only for mobile platform). - * @return [VKRequest] with [AppsGetCatalogResponse] + * @return [VKRequest] with [AppsCatalogList] */ fun appsGetCatalog( count: Int, @@ -129,8 +129,8 @@ class AppsService { q: String? = null, genreId: Int? = null, filter: FilterParam? = null - ): VKRequest = NewApiRequest("apps.getCatalog") { - GsonHolder.gson.fromJson(it, AppsGetCatalogResponse::class.java) + ): VKRequest = NewApiRequest("apps.getCatalog") { + GsonHolder.gson.fromJson(it, AppsCatalogList::class.java) } .apply { addParam("count", count) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsApp.kt b/api/src/main/java/com/vk/sdk/api/apps/dto/AppsApp.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsApp.kt rename to api/src/main/java/com/vk/sdk/api/apps/dto/AppsApp.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsAppLeaderboardType.kt b/api/src/main/java/com/vk/sdk/api/apps/dto/AppsAppLeaderboardType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsAppLeaderboardType.kt rename to api/src/main/java/com/vk/sdk/api/apps/dto/AppsAppLeaderboardType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsAppMin.kt b/api/src/main/java/com/vk/sdk/api/apps/dto/AppsAppMin.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsAppMin.kt rename to api/src/main/java/com/vk/sdk/api/apps/dto/AppsAppMin.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsAppType.kt b/api/src/main/java/com/vk/sdk/api/apps/dto/AppsAppType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsAppType.kt rename to api/src/main/java/com/vk/sdk/api/apps/dto/AppsAppType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsGetCatalogResponse.kt b/api/src/main/java/com/vk/sdk/api/apps/dto/AppsCatalogList.kt similarity index 94% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsGetCatalogResponse.kt rename to api/src/main/java/com/vk/sdk/api/apps/dto/AppsCatalogList.kt index b7d0dd5ea7..0ca42d0b37 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsGetCatalogResponse.kt +++ b/api/src/main/java/com/vk/sdk/api/apps/dto/AppsCatalogList.kt @@ -37,11 +37,11 @@ import kotlin.collections.List * @param items * @param profiles */ -data class AppsGetCatalogResponse( +data class AppsCatalogList( @SerializedName("count") - val count: Int? = null, + val count: Int, @SerializedName("items") - val items: List? = null, + val items: List, @SerializedName("profiles") val profiles: List? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsGetFriendsListResponse.kt b/api/src/main/java/com/vk/sdk/api/apps/dto/AppsGetFriendsListResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsGetFriendsListResponse.kt rename to api/src/main/java/com/vk/sdk/api/apps/dto/AppsGetFriendsListResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsGetLeaderboardExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/apps/dto/AppsGetLeaderboardExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsGetLeaderboardExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/apps/dto/AppsGetLeaderboardExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsGetLeaderboardResponse.kt b/api/src/main/java/com/vk/sdk/api/apps/dto/AppsGetLeaderboardResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsGetLeaderboardResponse.kt rename to api/src/main/java/com/vk/sdk/api/apps/dto/AppsGetLeaderboardResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsGetMiniAppPoliciesResponse.kt b/api/src/main/java/com/vk/sdk/api/apps/dto/AppsGetMiniAppPoliciesResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsGetMiniAppPoliciesResponse.kt rename to api/src/main/java/com/vk/sdk/api/apps/dto/AppsGetMiniAppPoliciesResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsGetResponse.kt b/api/src/main/java/com/vk/sdk/api/apps/dto/AppsGetResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsGetResponse.kt rename to api/src/main/java/com/vk/sdk/api/apps/dto/AppsGetResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsGetScopesResponse.kt b/api/src/main/java/com/vk/sdk/api/apps/dto/AppsGetScopesResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsGetScopesResponse.kt rename to api/src/main/java/com/vk/sdk/api/apps/dto/AppsGetScopesResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsLeaderboard.kt b/api/src/main/java/com/vk/sdk/api/apps/dto/AppsLeaderboard.kt similarity index 96% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsLeaderboard.kt rename to api/src/main/java/com/vk/sdk/api/apps/dto/AppsLeaderboard.kt index 1e7329c141..131e7f34bd 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsLeaderboard.kt +++ b/api/src/main/java/com/vk/sdk/api/apps/dto/AppsLeaderboard.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.apps.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import kotlin.Int /** @@ -38,7 +39,7 @@ import kotlin.Int */ data class AppsLeaderboard( @SerializedName("user_id") - val userId: Int, + val userId: UserId, @SerializedName("level") val level: Int? = null, @SerializedName("points") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsScope.kt b/api/src/main/java/com/vk/sdk/api/apps/dto/AppsScope.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/AppsScope.kt rename to api/src/main/java/com/vk/sdk/api/apps/dto/AppsScope.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/FilterParam.kt b/api/src/main/java/com/vk/sdk/api/apps/dto/FilterParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/FilterParam.kt rename to api/src/main/java/com/vk/sdk/api/apps/dto/FilterParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/NameCaseParam.kt b/api/src/main/java/com/vk/sdk/api/apps/dto/NameCaseParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/NameCaseParam.kt rename to api/src/main/java/com/vk/sdk/api/apps/dto/NameCaseParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/PlatformParam.kt b/api/src/main/java/com/vk/sdk/api/apps/dto/PlatformParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/PlatformParam.kt rename to api/src/main/java/com/vk/sdk/api/apps/dto/PlatformParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/SortParam.kt b/api/src/main/java/com/vk/sdk/api/apps/dto/SortParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/SortParam.kt rename to api/src/main/java/com/vk/sdk/api/apps/dto/SortParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/TypeParam.kt b/api/src/main/java/com/vk/sdk/api/apps/dto/TypeParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/apps/dto/TypeParam.kt rename to api/src/main/java/com/vk/sdk/api/apps/dto/TypeParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioArtist.kt b/api/src/main/java/com/vk/sdk/api/audio/dto/AudioArtist.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioArtist.kt rename to api/src/main/java/com/vk/sdk/api/audio/dto/AudioArtist.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioAudio.kt b/api/src/main/java/com/vk/sdk/api/audio/dto/AudioAudio.kt similarity index 97% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioAudio.kt rename to api/src/main/java/com/vk/sdk/api/audio/dto/AudioAudio.kt index ab8f63e0f9..746a6713c8 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioAudio.kt +++ b/api/src/main/java/com/vk/sdk/api/audio/dto/AudioAudio.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.audio.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import kotlin.Int import kotlin.String @@ -50,7 +51,7 @@ data class AudioAudio( @SerializedName("id") val id: Int, @SerializedName("owner_id") - val ownerId: Int, + val ownerId: UserId, @SerializedName("title") val title: String, @SerializedName("duration") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioGenre.kt b/api/src/main/java/com/vk/sdk/api/audio/dto/AudioGenre.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioGenre.kt rename to api/src/main/java/com/vk/sdk/api/audio/dto/AudioGenre.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioPhotosByType.kt b/api/src/main/java/com/vk/sdk/api/audio/dto/AudioPhotosByType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioPhotosByType.kt rename to api/src/main/java/com/vk/sdk/api/audio/dto/AudioPhotosByType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/auth/AuthService.kt b/api/src/main/java/com/vk/sdk/api/auth/AuthService.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/auth/AuthService.kt rename to api/src/main/java/com/vk/sdk/api/auth/AuthService.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/auth/dto/AuthRestoreResponse.kt b/api/src/main/java/com/vk/sdk/api/auth/dto/AuthRestoreResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/auth/dto/AuthRestoreResponse.kt rename to api/src/main/java/com/vk/sdk/api/auth/dto/AuthRestoreResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseBoolInt.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseBoolInt.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseBoolInt.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseBoolInt.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseCity.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseCity.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseCity.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseCity.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseCommentsInfo.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseCommentsInfo.kt similarity index 93% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseCommentsInfo.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseCommentsInfo.kt index 650b80aeb5..3b3da83ca2 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseCommentsInfo.kt +++ b/api/src/main/java/com/vk/sdk/api/base/dto/BaseCommentsInfo.kt @@ -34,7 +34,6 @@ import kotlin.Int /** * @param canPost - Information whether current user can comment the post - * @param canView - Information whether current user can view the comments * @param count - Comments number * @param groupsCanPost - Information whether groups can comment the post * @param donut @@ -42,8 +41,6 @@ import kotlin.Int data class BaseCommentsInfo( @SerializedName("can_post") val canPost: BaseBoolInt? = null, - @SerializedName("can_view") - val canView: BaseBoolInt? = null, @SerializedName("count") val count: Int? = null, @SerializedName("groups_can_post") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseCountry.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseCountry.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseCountry.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseCountry.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseCropPhoto.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseCropPhoto.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseCropPhoto.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseCropPhoto.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseCropPhotoCrop.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseCropPhotoCrop.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseCropPhotoCrop.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseCropPhotoCrop.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseCropPhotoRect.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseCropPhotoRect.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseCropPhotoRect.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseCropPhotoRect.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseError.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseError.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseError.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseError.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseGeo.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseGeo.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseGeo.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseGeo.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseGeoCoordinates.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseGeoCoordinates.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseGeoCoordinates.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseGeoCoordinates.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseGradientPoint.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseGradientPoint.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseGradientPoint.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseGradientPoint.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseImage.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseImage.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseImage.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseImage.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLikes.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseLikes.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLikes.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseLikes.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLikesInfo.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseLikesInfo.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLikesInfo.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseLikesInfo.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLink.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseLink.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLink.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseLink.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkApplication.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkApplication.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkApplication.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkApplication.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkApplicationStore.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkApplicationStore.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkApplicationStore.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkApplicationStore.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkButton.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkButton.kt similarity index 94% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkButton.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkButton.kt index d6b7668673..e0795d8c99 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkButton.kt +++ b/api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkButton.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.base.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import kotlin.Int import kotlin.String @@ -36,7 +37,6 @@ import kotlin.String * @param title - Button title * @param blockId - Target block id * @param sectionId - Target section id - * @param artistId - artist id * @param curatorId - curator id * @param ownerId - Owner id * @param icon - Button icon name, e.g. 'phone' or 'gift' @@ -51,12 +51,10 @@ data class BaseLinkButton( val blockId: String? = null, @SerializedName("section_id") val sectionId: String? = null, - @SerializedName("artist_id") - val artistId: String? = null, @SerializedName("curator_id") val curatorId: Int? = null, @SerializedName("owner_id") - val ownerId: Int? = null, + val ownerId: UserId? = null, @SerializedName("icon") val icon: String? = null, @SerializedName("style") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkButtonAction.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkButtonAction.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkButtonAction.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkButtonAction.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkButtonActionType.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkButtonActionType.kt similarity index 97% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkButtonActionType.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkButtonActionType.kt index bf068f9a47..7c2db424bc 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkButtonActionType.kt +++ b/api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkButtonActionType.kt @@ -148,5 +148,8 @@ enum class BaseLinkButtonActionType( CALL("call"), @SerializedName("modal_page") - MODAL_PAGE("modal_page"); + MODAL_PAGE("modal_page"), + + @SerializedName("live_categories") + LIVE_CATEGORIES("live_categories"); } diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkButtonStyle.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkButtonStyle.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkButtonStyle.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkButtonStyle.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkProduct.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkProduct.kt similarity index 83% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkProduct.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkProduct.kt index 4e32633962..7890132cbd 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkProduct.kt +++ b/api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkProduct.kt @@ -35,10 +35,6 @@ import kotlin.String /** * @param price * @param merchant - * @param category - * @param geo - * @param distance - * @param status * @param ordersCount */ data class BaseLinkProduct( @@ -46,14 +42,6 @@ data class BaseLinkProduct( val price: MarketPrice, @SerializedName("merchant") val merchant: String? = null, - @SerializedName("category") - val category: BaseLinkProductCategory? = null, - @SerializedName("geo") - val geo: BaseGeoCoordinates? = null, - @SerializedName("distance") - val distance: Int? = null, - @SerializedName("status") - val status: BaseLinkProductStatus? = null, @SerializedName("orders_count") val ordersCount: Int? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkProductStatus.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkProductStatus.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkProductStatus.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkProductStatus.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkRating.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkRating.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkRating.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkRating.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseObject.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseObject.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseObject.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseObject.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseObjectCount.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseObjectCount.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseObjectCount.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseObjectCount.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseObjectWithName.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseObjectWithName.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseObjectWithName.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseObjectWithName.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseOkResponse.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseOkResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseOkResponse.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseOkResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BasePlace.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BasePlace.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BasePlace.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BasePlace.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BasePropertyExists.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BasePropertyExists.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BasePropertyExists.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BasePropertyExists.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseRepostsInfo.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseRepostsInfo.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseRepostsInfo.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseRepostsInfo.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseRequestParam.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseRequestParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseRequestParam.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseRequestParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseSex.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseSex.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseSex.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseSex.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseSticker.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseSticker.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseSticker.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseSticker.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseStickerAnimation.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseStickerAnimation.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseStickerAnimation.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseStickerAnimation.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsUserSpecification.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseStickerNew.kt similarity index 62% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsUserSpecification.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseStickerNew.kt index 0ef8fc9141..57e9470d26 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsUserSpecification.kt +++ b/api/src/main/java/com/vk/sdk/api/base/dto/BaseStickerNew.kt @@ -25,29 +25,36 @@ // THIS FILE IS AUTO GENERATED! // DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. // ********************************************************************* -package com.vk.sdk.api.ads.dto +package com.vk.sdk.api.base.dto import com.google.gson.annotations.SerializedName import kotlin.Boolean import kotlin.Int +import kotlin.String import kotlin.collections.List /** - * @param userId - * @param role - * @param grantAccessToAllClients - * @param clientIds - * @param viewBudget + * @param stickerId - Sticker ID + * @param productId - Pack ID + * @param images + * @param imagesWithBackground + * @param animationUrl - URL of sticker animation script + * @param animations - Array of sticker animation script objects + * @param isAllowed - Information whether the sticker is allowed */ -data class AdsUserSpecification( - @SerializedName("user_id") - val userId: Int, - @SerializedName("role") - val role: AdsAccessRolePublic, - @SerializedName("grant_access_to_all_clients") - val grantAccessToAllClients: Boolean? = null, - @SerializedName("client_ids") - val clientIds: List? = null, - @SerializedName("view_budget") - val viewBudget: Boolean? = null +data class BaseStickerNew( + @SerializedName("sticker_id") + val stickerId: Int? = null, + @SerializedName("product_id") + val productId: Int? = null, + @SerializedName("images") + val images: List? = null, + @SerializedName("images_with_background") + val imagesWithBackground: List? = null, + @SerializedName("animation_url") + val animationUrl: String? = null, + @SerializedName("animations") + val animations: List? = null, + @SerializedName("is_allowed") + val isAllowed: Boolean? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseUploadServer.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseUploadServer.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseUploadServer.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseUploadServer.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseUserGroupFields.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseUserGroupFields.kt similarity index 98% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseUserGroupFields.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseUserGroupFields.kt index 109171177d..324b92eab9 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseUserGroupFields.kt +++ b/api/src/main/java/com/vk/sdk/api/base/dto/BaseUserGroupFields.kt @@ -78,6 +78,9 @@ enum class BaseUserGroupFields( @SerializedName("can_message") CAN_MESSAGE("can_message"), + @SerializedName("is_widget_messages_enabled") + IS_WIDGET_MESSAGES_ENABLED("is_widget_messages_enabled"), + @SerializedName("can_post") CAN_POST("can_post"), diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseUserId.kt b/api/src/main/java/com/vk/sdk/api/base/dto/BaseUserId.kt similarity index 95% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseUserId.kt rename to api/src/main/java/com/vk/sdk/api/base/dto/BaseUserId.kt index cb28475177..489d00cbb3 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseUserId.kt +++ b/api/src/main/java/com/vk/sdk/api/base/dto/BaseUserId.kt @@ -28,12 +28,12 @@ package com.vk.sdk.api.base.dto import com.google.gson.annotations.SerializedName -import kotlin.Int +import com.vk.dto.common.id.UserId /** * @param userId - User ID */ data class BaseUserId( @SerializedName("user_id") - val userId: Int? = null + val userId: UserId? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/board/BoardService.kt b/api/src/main/java/com/vk/sdk/api/board/BoardService.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/board/BoardService.kt rename to api/src/main/java/com/vk/sdk/api/board/BoardService.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/board/dto/BoardDefaultOrder.kt b/api/src/main/java/com/vk/sdk/api/board/dto/BoardDefaultOrder.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/board/dto/BoardDefaultOrder.kt rename to api/src/main/java/com/vk/sdk/api/board/dto/BoardDefaultOrder.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/board/dto/BoardGetCommentsExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/board/dto/BoardGetCommentsExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/board/dto/BoardGetCommentsExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/board/dto/BoardGetCommentsExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/board/dto/BoardGetCommentsResponse.kt b/api/src/main/java/com/vk/sdk/api/board/dto/BoardGetCommentsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/board/dto/BoardGetCommentsResponse.kt rename to api/src/main/java/com/vk/sdk/api/board/dto/BoardGetCommentsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/board/dto/BoardGetTopicsExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/board/dto/BoardGetTopicsExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/board/dto/BoardGetTopicsExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/board/dto/BoardGetTopicsExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/board/dto/BoardGetTopicsResponse.kt b/api/src/main/java/com/vk/sdk/api/board/dto/BoardGetTopicsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/board/dto/BoardGetTopicsResponse.kt rename to api/src/main/java/com/vk/sdk/api/board/dto/BoardGetTopicsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/board/dto/BoardTopic.kt b/api/src/main/java/com/vk/sdk/api/board/dto/BoardTopic.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/board/dto/BoardTopic.kt rename to api/src/main/java/com/vk/sdk/api/board/dto/BoardTopic.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/board/dto/BoardTopicComment.kt b/api/src/main/java/com/vk/sdk/api/board/dto/BoardTopicComment.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/board/dto/BoardTopicComment.kt rename to api/src/main/java/com/vk/sdk/api/board/dto/BoardTopicComment.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/board/dto/BoardTopicPoll.kt b/api/src/main/java/com/vk/sdk/api/board/dto/BoardTopicPoll.kt similarity index 97% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/board/dto/BoardTopicPoll.kt rename to api/src/main/java/com/vk/sdk/api/board/dto/BoardTopicPoll.kt index 25593141e3..fbc894d4ea 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/board/dto/BoardTopicPoll.kt +++ b/api/src/main/java/com/vk/sdk/api/board/dto/BoardTopicPoll.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.board.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.base.dto.BaseBoolInt import com.vk.sdk.api.polls.dto.PollsAnswer import kotlin.Int @@ -46,7 +47,7 @@ import kotlin.collections.List */ data class BoardTopicPoll( @SerializedName("owner_id") - val ownerId: Int, + val ownerId: UserId, @SerializedName("poll_id") val pollId: Int, @SerializedName("created") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/board/dto/OrderParam.kt b/api/src/main/java/com/vk/sdk/api/board/dto/OrderParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/board/dto/OrderParam.kt rename to api/src/main/java/com/vk/sdk/api/board/dto/OrderParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/board/dto/PreviewParam.kt b/api/src/main/java/com/vk/sdk/api/board/dto/PreviewParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/board/dto/PreviewParam.kt rename to api/src/main/java/com/vk/sdk/api/board/dto/PreviewParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/board/dto/SortParam.kt b/api/src/main/java/com/vk/sdk/api/board/dto/SortParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/board/dto/SortParam.kt rename to api/src/main/java/com/vk/sdk/api/board/dto/SortParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/calls/dto/CallsCall.kt b/api/src/main/java/com/vk/sdk/api/calls/dto/CallsCall.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/calls/dto/CallsCall.kt rename to api/src/main/java/com/vk/sdk/api/calls/dto/CallsCall.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/calls/dto/CallsEndState.kt b/api/src/main/java/com/vk/sdk/api/calls/dto/CallsEndState.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/calls/dto/CallsEndState.kt rename to api/src/main/java/com/vk/sdk/api/calls/dto/CallsEndState.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/calls/dto/CallsParticipants.kt b/api/src/main/java/com/vk/sdk/api/calls/dto/CallsParticipants.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/calls/dto/CallsParticipants.kt rename to api/src/main/java/com/vk/sdk/api/calls/dto/CallsParticipants.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsProfileItem.kt b/api/src/main/java/com/vk/sdk/api/classifieds/dto/ClassifiedsYoulaCarouselBlockGroup.kt similarity index 73% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsProfileItem.kt rename to api/src/main/java/com/vk/sdk/api/classifieds/dto/ClassifiedsYoulaCarouselBlockGroup.kt index 4235f4e9f7..5578d5d12b 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsProfileItem.kt +++ b/api/src/main/java/com/vk/sdk/api/classifieds/dto/ClassifiedsYoulaCarouselBlockGroup.kt @@ -25,25 +25,31 @@ // THIS FILE IS AUTO GENERATED! // DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. // ********************************************************************* -package com.vk.sdk.api.groups.dto +package com.vk.sdk.api.classifieds.dto import com.google.gson.annotations.SerializedName import kotlin.Int import kotlin.String /** - * @param id - User id - * @param photo50 - Url for user photo - * @param photo100 - Url for user photo - * @param firstName - User first name + * @param id - Community id + * @param name - Community name + * @param photo50 - URL of square photo of the community with 50 pixels in width + * @param photo100 - URL of square photo of the community with 100 pixels in width + * @param photo200 - URL of square photo of the community with 200 pixels in width + * @param url - Community url */ -data class GroupsProfileItem( +data class ClassifiedsYoulaCarouselBlockGroup( @SerializedName("id") val id: Int, + @SerializedName("name") + val name: String, @SerializedName("photo_50") val photo50: String, @SerializedName("photo_100") val photo100: String, - @SerializedName("first_name") - val firstName: String + @SerializedName("photo_200") + val photo200: String, + @SerializedName("url") + val url: String ) diff --git a/api/src/main/java/com/vk/sdk/api/classifieds/dto/ClassifiedsYoulaItemExtended.kt b/api/src/main/java/com/vk/sdk/api/classifieds/dto/ClassifiedsYoulaItemExtended.kt new file mode 100644 index 0000000000..a51dd10bf5 --- /dev/null +++ b/api/src/main/java/com/vk/sdk/api/classifieds/dto/ClassifiedsYoulaItemExtended.kt @@ -0,0 +1,112 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2019 vk.com + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +// ********************************************************************* +// THIS FILE IS AUTO GENERATED! +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. +// ********************************************************************* +package com.vk.sdk.api.classifieds.dto + +import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId +import com.vk.sdk.api.base.dto.BaseGeoCoordinates +import com.vk.sdk.api.base.dto.BaseImage +import com.vk.sdk.api.base.dto.BaseLinkButton +import com.vk.sdk.api.base.dto.BaseLinkProductStatus +import com.vk.sdk.api.market.dto.MarketPrice +import com.vk.sdk.api.photos.dto.PhotosPhoto +import kotlin.Boolean +import kotlin.Int +import kotlin.String +import kotlin.collections.List + +/** + * @param internalOwnerId - Internal owner id + * @param internalId - Internal id + * @param description - Item description + * @param geo + * @param distance - Distance to item location + * @param city - Item city name + * @param status + * @param detailsUrl - Youla Item url for classifieds section block + * @param actionUrl - Youla Item snippet url + * @param photos - First 3 youla item photos + * @param photoTotalCountDescription - How many photos are left in the original post + * @param commercialProfileButton - Youla item author's profile + * @param id - Youla item id + * @param ownerId - Youla item owner`s id + * @param author - Author + * @param youlaOwnerName - Youla item owner`s name + * @param title - Item title + * @param price - Youla item price + * @param onClickOptions - On click options + * @param isFavorite - Information whether the current item has been added to bookmarks + * @param thumb + * @param photo + */ +data class ClassifiedsYoulaItemExtended( + @SerializedName("internal_owner_id") + val internalOwnerId: Int? = null, + @SerializedName("internal_id") + val internalId: Int? = null, + @SerializedName("description") + val description: String? = null, + @SerializedName("geo") + val geo: BaseGeoCoordinates? = null, + @SerializedName("distance") + val distance: Int? = null, + @SerializedName("city") + val city: String? = null, + @SerializedName("status") + val status: BaseLinkProductStatus? = null, + @SerializedName("details_url") + val detailsUrl: String? = null, + @SerializedName("action_url") + val actionUrl: String? = null, + @SerializedName("photos") + val photos: List? = null, + @SerializedName("photo_total_count_description") + val photoTotalCountDescription: String? = null, + @SerializedName("commercial_profile_button") + val commercialProfileButton: BaseLinkButton? = null, + @SerializedName("id") + val id: String? = null, + @SerializedName("owner_id") + val ownerId: UserId? = null, + @SerializedName("author") + val author: ClassifiedsYoulaItemVkAuthor? = null, + @SerializedName("youla_owner_name") + val youlaOwnerName: String? = null, + @SerializedName("title") + val title: String? = null, + @SerializedName("price") + val price: MarketPrice? = null, + @SerializedName("on_click_options") + val onClickOptions: ClassifiedsYoulaItemOnClickOptions? = null, + @SerializedName("is_favorite") + val isFavorite: Boolean? = null, + @SerializedName("thumb") + val thumb: List? = null, + @SerializedName("photo") + val photo: PhotosPhoto? = null +) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioPlaylistView.kt b/api/src/main/java/com/vk/sdk/api/classifieds/dto/ClassifiedsYoulaItemOnClickOptions.kt similarity index 90% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioPlaylistView.kt rename to api/src/main/java/com/vk/sdk/api/classifieds/dto/ClassifiedsYoulaItemOnClickOptions.kt index 06bbcb1daf..1a7fdbf0e7 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioPlaylistView.kt +++ b/api/src/main/java/com/vk/sdk/api/classifieds/dto/ClassifiedsYoulaItemOnClickOptions.kt @@ -25,14 +25,15 @@ // THIS FILE IS AUTO GENERATED! // DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. // ********************************************************************* -package com.vk.sdk.api.audio.dto +package com.vk.sdk.api.classifieds.dto import com.google.gson.annotations.SerializedName import kotlin.String -enum class AudioPlaylistView( - val value: String -) { - @SerializedName("compact") - COMPACT("compact"); -} +/** + * @param w - w + */ +data class ClassifiedsYoulaItemOnClickOptions( + @SerializedName("w") + val w: String +) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/store/dto/StoreProductIcon.kt b/api/src/main/java/com/vk/sdk/api/classifieds/dto/ClassifiedsYoulaItemPhoto.kt similarity index 82% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/store/dto/StoreProductIcon.kt rename to api/src/main/java/com/vk/sdk/api/classifieds/dto/ClassifiedsYoulaItemPhoto.kt index 45f3700a38..49465cd06e 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/store/dto/StoreProductIcon.kt +++ b/api/src/main/java/com/vk/sdk/api/classifieds/dto/ClassifiedsYoulaItemPhoto.kt @@ -25,19 +25,19 @@ // THIS FILE IS AUTO GENERATED! // DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. // ********************************************************************* -package com.vk.sdk.api.store.dto +package com.vk.sdk.api.classifieds.dto import com.google.gson.annotations.SerializedName -import kotlin.Int +import com.vk.sdk.api.photos.dto.PhotosPhoto import kotlin.String /** - * @param baseUrl - Base URL for images in set - * @param version - Version number to be appended to the image URL + * @param photo - Youla item photos + * @param url - Youla item photo URL */ -data class StoreProductIcon( - @SerializedName("base_url") - val baseUrl: String? = null, - @SerializedName("version") - val version: Int? = null +data class ClassifiedsYoulaItemPhoto( + @SerializedName("photo") + val photo: PhotosPhoto? = null, + @SerializedName("url") + val url: String? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketCategoryTree.kt b/api/src/main/java/com/vk/sdk/api/classifieds/dto/ClassifiedsYoulaItemVkAuthor.kt similarity index 83% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketCategoryTree.kt rename to api/src/main/java/com/vk/sdk/api/classifieds/dto/ClassifiedsYoulaItemVkAuthor.kt index 9e233678d8..e639c3bc57 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketCategoryTree.kt +++ b/api/src/main/java/com/vk/sdk/api/classifieds/dto/ClassifiedsYoulaItemVkAuthor.kt @@ -25,23 +25,25 @@ // THIS FILE IS AUTO GENERATED! // DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. // ********************************************************************* -package com.vk.sdk.api.market.dto +package com.vk.sdk.api.classifieds.dto import com.google.gson.annotations.SerializedName import kotlin.Int import kotlin.String -import kotlin.collections.List /** - * @param id - Category ID - * @param name - Category name - * @param children + * @param id - ID + * @param name - Name + * @param profileLink - Link to profile + * @param photoUrl - Photo */ -data class MarketMarketCategoryTree( +data class ClassifiedsYoulaItemVkAuthor( @SerializedName("id") val id: Int, @SerializedName("name") val name: String, - @SerializedName("children") - val children: List? = null + @SerializedName("profile_link") + val profileLink: String, + @SerializedName("photo_url") + val photoUrl: String? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/comment/dto/CommentThread.kt b/api/src/main/java/com/vk/sdk/api/comment/dto/CommentThread.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/comment/dto/CommentThread.kt rename to api/src/main/java/com/vk/sdk/api/comment/dto/CommentThread.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/database/DatabaseService.kt b/api/src/main/java/com/vk/sdk/api/database/DatabaseService.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/database/DatabaseService.kt rename to api/src/main/java/com/vk/sdk/api/database/DatabaseService.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/database/dto/DatabaseCity.kt b/api/src/main/java/com/vk/sdk/api/database/dto/DatabaseCity.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/database/dto/DatabaseCity.kt rename to api/src/main/java/com/vk/sdk/api/database/dto/DatabaseCity.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/database/dto/DatabaseFaculty.kt b/api/src/main/java/com/vk/sdk/api/database/dto/DatabaseFaculty.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/database/dto/DatabaseFaculty.kt rename to api/src/main/java/com/vk/sdk/api/database/dto/DatabaseFaculty.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetChairsResponse.kt b/api/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetChairsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetChairsResponse.kt rename to api/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetChairsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetCitiesResponse.kt b/api/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetCitiesResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetCitiesResponse.kt rename to api/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetCitiesResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetCountriesResponse.kt b/api/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetCountriesResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetCountriesResponse.kt rename to api/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetCountriesResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetFacultiesResponse.kt b/api/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetFacultiesResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetFacultiesResponse.kt rename to api/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetFacultiesResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetMetroStationsResponse.kt b/api/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetMetroStationsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetMetroStationsResponse.kt rename to api/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetMetroStationsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetRegionsResponse.kt b/api/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetRegionsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetRegionsResponse.kt rename to api/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetRegionsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetSchoolsResponse.kt b/api/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetSchoolsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetSchoolsResponse.kt rename to api/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetSchoolsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetUniversitiesResponse.kt b/api/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetUniversitiesResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetUniversitiesResponse.kt rename to api/src/main/java/com/vk/sdk/api/database/dto/DatabaseGetUniversitiesResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/database/dto/DatabaseRegion.kt b/api/src/main/java/com/vk/sdk/api/database/dto/DatabaseRegion.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/database/dto/DatabaseRegion.kt rename to api/src/main/java/com/vk/sdk/api/database/dto/DatabaseRegion.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/database/dto/DatabaseSchool.kt b/api/src/main/java/com/vk/sdk/api/database/dto/DatabaseSchool.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/database/dto/DatabaseSchool.kt rename to api/src/main/java/com/vk/sdk/api/database/dto/DatabaseSchool.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/database/dto/DatabaseStation.kt b/api/src/main/java/com/vk/sdk/api/database/dto/DatabaseStation.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/database/dto/DatabaseStation.kt rename to api/src/main/java/com/vk/sdk/api/database/dto/DatabaseStation.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/database/dto/DatabaseUniversity.kt b/api/src/main/java/com/vk/sdk/api/database/dto/DatabaseUniversity.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/database/dto/DatabaseUniversity.kt rename to api/src/main/java/com/vk/sdk/api/database/dto/DatabaseUniversity.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselButton.kt b/api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselButton.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselButton.kt rename to api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselButton.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselButtonAction.kt b/api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselButtonAction.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselButtonAction.kt rename to api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselButtonAction.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselButtonActionTarget.kt b/api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselButtonActionTarget.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselButtonActionTarget.kt rename to api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselButtonActionTarget.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselButtonActionType.kt b/api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselButtonActionType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselButtonActionType.kt rename to api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselButtonActionType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselButtonContext.kt b/api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselButtonContext.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselButtonContext.kt rename to api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselButtonContext.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselButtonType.kt b/api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselButtonType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselButtonType.kt rename to api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselButtonType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselItem.kt b/api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselItem.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselItem.kt rename to api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselItem.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselItemDescription.kt b/api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselItemDescription.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselItemDescription.kt rename to api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselItemDescription.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselItemDescriptionType.kt b/api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselItemDescriptionType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselItemDescriptionType.kt rename to api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselItemDescriptionType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselObjectsType.kt b/api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselObjectsType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselObjectsType.kt rename to api/src/main/java/com/vk/sdk/api/discover/dto/DiscoverCarouselObjectsType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/docs/DocsService.kt b/api/src/main/java/com/vk/sdk/api/docs/DocsService.kt similarity index 99% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/docs/DocsService.kt rename to api/src/main/java/com/vk/sdk/api/docs/DocsService.kt index d7fa518e72..a1f61f2385 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/docs/DocsService.kt +++ b/api/src/main/java/com/vk/sdk/api/docs/DocsService.kt @@ -97,7 +97,7 @@ class DocsService { fun docsEdit( ownerId: Int, docId: Int, - title: String? = null, + title: String, tags: List? = null ): VKRequest = NewApiRequest("docs.edit") { GsonHolder.gson.fromJson(it, BaseOkResponse::class.java) @@ -105,7 +105,7 @@ class DocsService { .apply { addParam("owner_id", ownerId) addParam("doc_id", docId) - title?.let { addParam("title", it) } + addParam("title", title) tags?.let { addParam("tags", it) } } diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsDoc.kt b/api/src/main/java/com/vk/sdk/api/docs/dto/DocsDoc.kt similarity index 97% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsDoc.kt rename to api/src/main/java/com/vk/sdk/api/docs/dto/DocsDoc.kt index d0a764ec24..492840f2e1 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsDoc.kt +++ b/api/src/main/java/com/vk/sdk/api/docs/dto/DocsDoc.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.docs.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.base.dto.BaseBoolInt import kotlin.Int import kotlin.String @@ -51,7 +52,7 @@ data class DocsDoc( @SerializedName("id") val id: Int, @SerializedName("owner_id") - val ownerId: Int, + val ownerId: UserId, @SerializedName("title") val title: String, @SerializedName("size") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocAttachmentType.kt b/api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocAttachmentType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocAttachmentType.kt rename to api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocAttachmentType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocPreview.kt b/api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocPreview.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocPreview.kt rename to api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocPreview.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocPreviewAudioMsg.kt b/api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocPreviewAudioMsg.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocPreviewAudioMsg.kt rename to api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocPreviewAudioMsg.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocPreviewGraffiti.kt b/api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocPreviewGraffiti.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocPreviewGraffiti.kt rename to api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocPreviewGraffiti.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocPreviewPhoto.kt b/api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocPreviewPhoto.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocPreviewPhoto.kt rename to api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocPreviewPhoto.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocPreviewPhotoSizes.kt b/api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocPreviewPhotoSizes.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocPreviewPhotoSizes.kt rename to api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocPreviewPhotoSizes.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocPreviewVideo.kt b/api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocPreviewVideo.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocPreviewVideo.kt rename to api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocPreviewVideo.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocTypes.kt b/api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocTypes.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocTypes.kt rename to api/src/main/java/com/vk/sdk/api/docs/dto/DocsDocTypes.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsGetResponse.kt b/api/src/main/java/com/vk/sdk/api/docs/dto/DocsGetResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsGetResponse.kt rename to api/src/main/java/com/vk/sdk/api/docs/dto/DocsGetResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsGetTypesResponse.kt b/api/src/main/java/com/vk/sdk/api/docs/dto/DocsGetTypesResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsGetTypesResponse.kt rename to api/src/main/java/com/vk/sdk/api/docs/dto/DocsGetTypesResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsSaveResponse.kt b/api/src/main/java/com/vk/sdk/api/docs/dto/DocsSaveResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsSaveResponse.kt rename to api/src/main/java/com/vk/sdk/api/docs/dto/DocsSaveResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsSearchResponse.kt b/api/src/main/java/com/vk/sdk/api/docs/dto/DocsSearchResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/DocsSearchResponse.kt rename to api/src/main/java/com/vk/sdk/api/docs/dto/DocsSearchResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/TypeParam.kt b/api/src/main/java/com/vk/sdk/api/docs/dto/TypeParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/docs/dto/TypeParam.kt rename to api/src/main/java/com/vk/sdk/api/docs/dto/TypeParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/donut/DonutService.kt b/api/src/main/java/com/vk/sdk/api/donut/DonutService.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/donut/DonutService.kt rename to api/src/main/java/com/vk/sdk/api/donut/DonutService.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/donut/dto/DonutDonatorSubscriptionInfo.kt b/api/src/main/java/com/vk/sdk/api/donut/dto/DonutDonatorSubscriptionInfo.kt similarity index 97% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/donut/dto/DonutDonatorSubscriptionInfo.kt rename to api/src/main/java/com/vk/sdk/api/donut/dto/DonutDonatorSubscriptionInfo.kt index fd17ec7b64..865bf11f5c 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/donut/dto/DonutDonatorSubscriptionInfo.kt +++ b/api/src/main/java/com/vk/sdk/api/donut/dto/DonutDonatorSubscriptionInfo.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.donut.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import kotlin.Int import kotlin.String @@ -40,7 +41,7 @@ import kotlin.String */ data class DonutDonatorSubscriptionInfo( @SerializedName("owner_id") - val ownerId: Int, + val ownerId: UserId, @SerializedName("next_payment_date") val nextPaymentDate: Int, @SerializedName("amount") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/donut/dto/DonutGetSubscriptionsResponse.kt b/api/src/main/java/com/vk/sdk/api/donut/dto/DonutGetSubscriptionsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/donut/dto/DonutGetSubscriptionsResponse.kt rename to api/src/main/java/com/vk/sdk/api/donut/dto/DonutGetSubscriptionsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/downloadedGames/DownloadedGamesService.kt b/api/src/main/java/com/vk/sdk/api/downloadedGames/DownloadedGamesService.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/downloadedGames/DownloadedGamesService.kt rename to api/src/main/java/com/vk/sdk/api/downloadedGames/DownloadedGamesService.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/downloadedGames/dto/DownloadedGamesPaidStatusResponse.kt b/api/src/main/java/com/vk/sdk/api/downloadedGames/dto/DownloadedGamesPaidStatusResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/downloadedGames/dto/DownloadedGamesPaidStatusResponse.kt rename to api/src/main/java/com/vk/sdk/api/downloadedGames/dto/DownloadedGamesPaidStatusResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/events/dto/EventsEventAttach.kt b/api/src/main/java/com/vk/sdk/api/events/dto/EventsEventAttach.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/events/dto/EventsEventAttach.kt rename to api/src/main/java/com/vk/sdk/api/events/dto/EventsEventAttach.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/execute/ExecuteService.kt b/api/src/main/java/com/vk/sdk/api/execute/ExecuteService.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/execute/ExecuteService.kt rename to api/src/main/java/com/vk/sdk/api/execute/ExecuteService.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/fave/FaveService.kt b/api/src/main/java/com/vk/sdk/api/fave/FaveService.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/fave/FaveService.kt rename to api/src/main/java/com/vk/sdk/api/fave/FaveService.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/fave/dto/FaveBookmark.kt b/api/src/main/java/com/vk/sdk/api/fave/dto/FaveBookmark.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/fave/dto/FaveBookmark.kt rename to api/src/main/java/com/vk/sdk/api/fave/dto/FaveBookmark.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/fave/dto/FaveBookmarkType.kt b/api/src/main/java/com/vk/sdk/api/fave/dto/FaveBookmarkType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/fave/dto/FaveBookmarkType.kt rename to api/src/main/java/com/vk/sdk/api/fave/dto/FaveBookmarkType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/fave/dto/FaveGetExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/fave/dto/FaveGetExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/fave/dto/FaveGetExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/fave/dto/FaveGetExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/fave/dto/FaveGetPagesResponse.kt b/api/src/main/java/com/vk/sdk/api/fave/dto/FaveGetPagesResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/fave/dto/FaveGetPagesResponse.kt rename to api/src/main/java/com/vk/sdk/api/fave/dto/FaveGetPagesResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/fave/dto/FaveGetResponse.kt b/api/src/main/java/com/vk/sdk/api/fave/dto/FaveGetResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/fave/dto/FaveGetResponse.kt rename to api/src/main/java/com/vk/sdk/api/fave/dto/FaveGetResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/fave/dto/FaveGetTagsResponse.kt b/api/src/main/java/com/vk/sdk/api/fave/dto/FaveGetTagsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/fave/dto/FaveGetTagsResponse.kt rename to api/src/main/java/com/vk/sdk/api/fave/dto/FaveGetTagsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/fave/dto/FavePage.kt b/api/src/main/java/com/vk/sdk/api/fave/dto/FavePage.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/fave/dto/FavePage.kt rename to api/src/main/java/com/vk/sdk/api/fave/dto/FavePage.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/fave/dto/FavePageType.kt b/api/src/main/java/com/vk/sdk/api/fave/dto/FavePageType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/fave/dto/FavePageType.kt rename to api/src/main/java/com/vk/sdk/api/fave/dto/FavePageType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/fave/dto/FaveTag.kt b/api/src/main/java/com/vk/sdk/api/fave/dto/FaveTag.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/fave/dto/FaveTag.kt rename to api/src/main/java/com/vk/sdk/api/fave/dto/FaveTag.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/fave/dto/ItemTypeParam.kt b/api/src/main/java/com/vk/sdk/api/fave/dto/ItemTypeParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/fave/dto/ItemTypeParam.kt rename to api/src/main/java/com/vk/sdk/api/fave/dto/ItemTypeParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/fave/dto/PositionParam.kt b/api/src/main/java/com/vk/sdk/api/fave/dto/PositionParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/fave/dto/PositionParam.kt rename to api/src/main/java/com/vk/sdk/api/fave/dto/PositionParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/fave/dto/TypeParam.kt b/api/src/main/java/com/vk/sdk/api/fave/dto/TypeParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/fave/dto/TypeParam.kt rename to api/src/main/java/com/vk/sdk/api/fave/dto/TypeParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/friends/FriendsService.kt b/api/src/main/java/com/vk/sdk/api/friends/FriendsService.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/friends/FriendsService.kt rename to api/src/main/java/com/vk/sdk/api/friends/FriendsService.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FilterParam.kt b/api/src/main/java/com/vk/sdk/api/friends/dto/FilterParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FilterParam.kt rename to api/src/main/java/com/vk/sdk/api/friends/dto/FilterParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsAddListResponse.kt b/api/src/main/java/com/vk/sdk/api/friends/dto/FriendsAddListResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsAddListResponse.kt rename to api/src/main/java/com/vk/sdk/api/friends/dto/FriendsAddListResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsAddResponse.kt b/api/src/main/java/com/vk/sdk/api/friends/dto/FriendsAddResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsAddResponse.kt rename to api/src/main/java/com/vk/sdk/api/friends/dto/FriendsAddResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsDeleteResponse.kt b/api/src/main/java/com/vk/sdk/api/friends/dto/FriendsDeleteResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsDeleteResponse.kt rename to api/src/main/java/com/vk/sdk/api/friends/dto/FriendsDeleteResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsFriendExtendedStatus.kt b/api/src/main/java/com/vk/sdk/api/friends/dto/FriendsFriendExtendedStatus.kt similarity index 96% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsFriendExtendedStatus.kt rename to api/src/main/java/com/vk/sdk/api/friends/dto/FriendsFriendExtendedStatus.kt index 415df424a6..47e93fc295 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsFriendExtendedStatus.kt +++ b/api/src/main/java/com/vk/sdk/api/friends/dto/FriendsFriendExtendedStatus.kt @@ -28,8 +28,8 @@ package com.vk.sdk.api.friends.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import kotlin.Boolean -import kotlin.Int import kotlin.String /** @@ -46,5 +46,5 @@ data class FriendsFriendExtendedStatus( @SerializedName("sign") val sign: String? = null, @SerializedName("user_id") - val userId: Int? = null + val userId: UserId? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsFriendStatus.kt b/api/src/main/java/com/vk/sdk/api/friends/dto/FriendsFriendStatus.kt similarity index 96% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsFriendStatus.kt rename to api/src/main/java/com/vk/sdk/api/friends/dto/FriendsFriendStatus.kt index 42ea756a28..568f54bb33 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsFriendStatus.kt +++ b/api/src/main/java/com/vk/sdk/api/friends/dto/FriendsFriendStatus.kt @@ -28,7 +28,7 @@ package com.vk.sdk.api.friends.dto import com.google.gson.annotations.SerializedName -import kotlin.Int +import com.vk.dto.common.id.UserId import kotlin.String /** @@ -40,7 +40,7 @@ data class FriendsFriendStatus( @SerializedName("friend_status") val friendStatus: FriendsFriendStatusStatus, @SerializedName("user_id") - val userId: Int, + val userId: UserId, @SerializedName("sign") val sign: String? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsFriendStatusStatus.kt b/api/src/main/java/com/vk/sdk/api/friends/dto/FriendsFriendStatusStatus.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsFriendStatusStatus.kt rename to api/src/main/java/com/vk/sdk/api/friends/dto/FriendsFriendStatusStatus.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsFriendsList.kt b/api/src/main/java/com/vk/sdk/api/friends/dto/FriendsFriendsList.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsFriendsList.kt rename to api/src/main/java/com/vk/sdk/api/friends/dto/FriendsFriendsList.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsGetFieldsResponse.kt b/api/src/main/java/com/vk/sdk/api/friends/dto/FriendsGetFieldsResponse.kt similarity index 95% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsGetFieldsResponse.kt rename to api/src/main/java/com/vk/sdk/api/friends/dto/FriendsGetFieldsResponse.kt index 7cd9d0a3cb..1d479f4f75 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsGetFieldsResponse.kt +++ b/api/src/main/java/com/vk/sdk/api/friends/dto/FriendsGetFieldsResponse.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.friends.dto import com.google.gson.annotations.SerializedName +import com.vk.sdk.api.users.dto.UsersUserFull import kotlin.Int import kotlin.collections.List @@ -39,5 +40,5 @@ data class FriendsGetFieldsResponse( @SerializedName("count") val count: Int, @SerializedName("items") - val items: List + val items: List ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsGetListsResponse.kt b/api/src/main/java/com/vk/sdk/api/friends/dto/FriendsGetListsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsGetListsResponse.kt rename to api/src/main/java/com/vk/sdk/api/friends/dto/FriendsGetListsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsGetRequestsResponse.kt b/api/src/main/java/com/vk/sdk/api/friends/dto/FriendsGetRequestsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsGetRequestsResponse.kt rename to api/src/main/java/com/vk/sdk/api/friends/dto/FriendsGetRequestsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsGetSuggestionsResponse.kt b/api/src/main/java/com/vk/sdk/api/friends/dto/FriendsGetSuggestionsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsGetSuggestionsResponse.kt rename to api/src/main/java/com/vk/sdk/api/friends/dto/FriendsGetSuggestionsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsRequestsMutual.kt b/api/src/main/java/com/vk/sdk/api/friends/dto/FriendsRequestsMutual.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsRequestsMutual.kt rename to api/src/main/java/com/vk/sdk/api/friends/dto/FriendsRequestsMutual.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsSearchResponse.kt b/api/src/main/java/com/vk/sdk/api/friends/dto/FriendsSearchResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsSearchResponse.kt rename to api/src/main/java/com/vk/sdk/api/friends/dto/FriendsSearchResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsUserXtrPhone.kt b/api/src/main/java/com/vk/sdk/api/friends/dto/FriendsUserXtrPhone.kt similarity index 95% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsUserXtrPhone.kt rename to api/src/main/java/com/vk/sdk/api/friends/dto/FriendsUserXtrPhone.kt index d00bbcfa27..abcc537d5e 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsUserXtrPhone.kt +++ b/api/src/main/java/com/vk/sdk/api/friends/dto/FriendsUserXtrPhone.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.friends.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.audio.dto.AudioAudio import com.vk.sdk.api.base.dto.BaseBoolInt import com.vk.sdk.api.base.dto.BaseCity @@ -115,8 +116,10 @@ import kotlin.collections.List * @param photoMaxSize * @param language * @param storiesArchiveCount + * @param hasUnseenStories * @param wallDefault * @param canCall - Information whether current user can call + * @param canCallFromGroup - Information whether group can call user * @param canSeeWishes - Information whether current user can see the user's wishes * @param canSeeGifts - Information whether current user can see the user's gifts * @param interests @@ -175,7 +178,11 @@ import kotlin.collections.List * @param accessKey * @param canUploadDoc * @param hash - * @param hasEmail + * @param isNoIndex - Access to user profile is restricted for search engines + * @param contactId - Contact person ID + * @param isMessageRequest + * @param descriptions + * @param lists * @param sex - User sex * @param screenName - Domain name of the user's page * @param photo50 - URL of square photo of the user with 50 pixels in width @@ -311,10 +318,14 @@ data class FriendsUserXtrPhone( val language: String? = null, @SerializedName("stories_archive_count") val storiesArchiveCount: Int? = null, + @SerializedName("has_unseen_stories") + val hasUnseenStories: Boolean? = null, @SerializedName("wall_default") val wallDefault: FriendsUserXtrPhone.WallDefault? = null, @SerializedName("can_call") val canCall: Boolean? = null, + @SerializedName("can_call_from_group") + val canCallFromGroup: Boolean? = null, @SerializedName("can_see_wishes") val canSeeWishes: Boolean? = null, @SerializedName("can_see_gifts") @@ -429,8 +440,16 @@ data class FriendsUserXtrPhone( val canUploadDoc: BaseBoolInt? = null, @SerializedName("hash") val hash: String? = null, - @SerializedName("has_email") - val hasEmail: Boolean? = null, + @SerializedName("is_no_index") + val isNoIndex: Boolean? = null, + @SerializedName("contact_id") + val contactId: Int? = null, + @SerializedName("is_message_request") + val isMessageRequest: Boolean? = null, + @SerializedName("descriptions") + val descriptions: List? = null, + @SerializedName("lists") + val lists: List? = null, @SerializedName("sex") val sex: BaseSex? = null, @SerializedName("screen_name") @@ -462,7 +481,7 @@ data class FriendsUserXtrPhone( @SerializedName("hidden") val hidden: Int? = null, @SerializedName("id") - val id: Int? = null, + val id: UserId? = null, @SerializedName("last_name") val lastName: String? = null, @SerializedName("can_access_closed") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/NameCaseParam.kt b/api/src/main/java/com/vk/sdk/api/friends/dto/NameCaseParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/NameCaseParam.kt rename to api/src/main/java/com/vk/sdk/api/friends/dto/NameCaseParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/OrderParam.kt b/api/src/main/java/com/vk/sdk/api/friends/dto/OrderParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/OrderParam.kt rename to api/src/main/java/com/vk/sdk/api/friends/dto/OrderParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/SortParam.kt b/api/src/main/java/com/vk/sdk/api/friends/dto/SortParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/SortParam.kt rename to api/src/main/java/com/vk/sdk/api/friends/dto/SortParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/gifts/GiftsService.kt b/api/src/main/java/com/vk/sdk/api/gifts/GiftsService.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/gifts/GiftsService.kt rename to api/src/main/java/com/vk/sdk/api/gifts/GiftsService.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/gifts/dto/GiftsGetResponse.kt b/api/src/main/java/com/vk/sdk/api/gifts/dto/GiftsGetResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/gifts/dto/GiftsGetResponse.kt rename to api/src/main/java/com/vk/sdk/api/gifts/dto/GiftsGetResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/gifts/dto/GiftsGift.kt b/api/src/main/java/com/vk/sdk/api/gifts/dto/GiftsGift.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/gifts/dto/GiftsGift.kt rename to api/src/main/java/com/vk/sdk/api/gifts/dto/GiftsGift.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/gifts/dto/GiftsGiftPrivacy.kt b/api/src/main/java/com/vk/sdk/api/gifts/dto/GiftsGiftPrivacy.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/gifts/dto/GiftsGiftPrivacy.kt rename to api/src/main/java/com/vk/sdk/api/gifts/dto/GiftsGiftPrivacy.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/gifts/dto/GiftsLayout.kt b/api/src/main/java/com/vk/sdk/api/gifts/dto/GiftsLayout.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/gifts/dto/GiftsLayout.kt rename to api/src/main/java/com/vk/sdk/api/gifts/dto/GiftsLayout.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/GroupsService.kt b/api/src/main/java/com/vk/sdk/api/groups/GroupsService.kt similarity index 99% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/GroupsService.kt rename to api/src/main/java/com/vk/sdk/api/groups/GroupsService.kt index 0fde74c009..dae43c05bc 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/GroupsService.kt +++ b/api/src/main/java/com/vk/sdk/api/groups/GroupsService.kt @@ -45,7 +45,6 @@ import com.vk.sdk.api.groups.dto.GroupsFields import com.vk.sdk.api.groups.dto.GroupsFilter import com.vk.sdk.api.groups.dto.GroupsGetAddressesResponse import com.vk.sdk.api.groups.dto.GroupsGetBannedResponse -import com.vk.sdk.api.groups.dto.GroupsGetByIdResponse import com.vk.sdk.api.groups.dto.GroupsGetCallbackConfirmationCodeResponse import com.vk.sdk.api.groups.dto.GroupsGetCallbackServersResponse import com.vk.sdk.api.groups.dto.GroupsGetCatalogInfoExtendedResponse @@ -61,6 +60,7 @@ import com.vk.sdk.api.groups.dto.GroupsGetResponse import com.vk.sdk.api.groups.dto.GroupsGetSettingsResponse import com.vk.sdk.api.groups.dto.GroupsGetTokenPermissionsResponse import com.vk.sdk.api.groups.dto.GroupsGroup +import com.vk.sdk.api.groups.dto.GroupsGroupFull import com.vk.sdk.api.groups.dto.GroupsGroupLink import com.vk.sdk.api.groups.dto.GroupsGroupTag import com.vk.sdk.api.groups.dto.GroupsLongPollServer @@ -226,6 +226,7 @@ class GroupsService { * @param type - Community type. Possible values: *'group' - group,, *'event' - event,, * *'public' - public page * @param publicCategory - Category ID (for 'type' = 'public' only). + * @param publicSubcategory - Public page subcategory ID. * @param subtype - Public page subtype. Possible values: *'1' - place or small business,, * *'2' - company, organization or website,, *'3' - famous person or group of people,, *'4' - * product or work of art. @@ -236,6 +237,7 @@ class GroupsService { description: String? = null, type: TypeParam? = null, publicCategory: Int? = null, + publicSubcategory: Int? = null, subtype: SubtypeParam? = null ): VKRequest = NewApiRequest("groups.create") { GsonHolder.gson.fromJson(it, GroupsGroup::class.java) @@ -245,6 +247,7 @@ class GroupsService { description?.let { addParam("description", it) } type?.let { addParam("type", it.value) } publicCategory?.let { addParam("public_category", it) } + publicSubcategory?.let { addParam("public_subcategory", it) } subtype?.let { addParam("subtype", it.value) } } @@ -772,14 +775,15 @@ class GroupsService { * @param groupIds - IDs or screen names of communities. * @param groupId - ID or screen name of the community. * @param fields - Group fields to return. - * @return [VKRequest] with [GroupsGetByIdResponse] + * @return [VKRequest] with [Unit] */ fun groupsGetById( groupIds: List? = null, groupId: String? = null, fields: List? = null - ): VKRequest = NewApiRequest("groups.getById") { - GsonHolder.gson.fromJson(it, GroupsGetByIdResponse::class.java) + ): VKRequest> = NewApiRequest("groups.getById") { + val typeToken = object: TypeToken>() {}.type + GsonHolder.gson.fromJson>(it, typeToken) } .apply { groupIds?.let { addParam("group_ids", it) } @@ -1732,15 +1736,20 @@ class GroupsService { /** * @param groupId * @param state + * @param ref * @return [VKRequest] with [BaseOkResponse] */ - fun groupsToggleMarket(groupId: Int, state: StateParam): VKRequest = - NewApiRequest("groups.toggleMarket") { + fun groupsToggleMarket( + groupId: Int, + state: StateParam, + ref: String? = null + ): VKRequest = NewApiRequest("groups.toggleMarket") { GsonHolder.gson.fromJson(it, BaseOkResponse::class.java) } .apply { addParam("group_id", groupId) addParam("state", state.value) + ref?.let { addParam("ref", it) } } /** diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/ActParam.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/ActParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/ActParam.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/ActParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/AgeLimitsParam.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/AgeLimitsParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/AgeLimitsParam.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/AgeLimitsParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/FilterParam.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/FilterParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/FilterParam.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/FilterParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsAddCallbackServerResponse.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsAddCallbackServerResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsAddCallbackServerResponse.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsAddCallbackServerResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsAddress.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsAddress.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsAddress.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsAddress.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsAddressTimetable.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsAddressTimetable.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsAddressTimetable.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsAddressTimetable.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsAddressTimetableDay.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsAddressTimetableDay.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsAddressTimetableDay.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsAddressTimetableDay.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsAddressWorkInfoStatus.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsAddressWorkInfoStatus.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsAddressWorkInfoStatus.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsAddressWorkInfoStatus.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsAddressesInfo.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsAddressesInfo.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsAddressesInfo.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsAddressesInfo.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetByIdResponse.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsAppButton.kt similarity index 81% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetByIdResponse.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsAppButton.kt index 1b565e7da1..fe634115ce 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetByIdResponse.kt +++ b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsAppButton.kt @@ -28,15 +28,21 @@ package com.vk.sdk.api.groups.dto import com.google.gson.annotations.SerializedName +import com.vk.sdk.api.base.dto.BaseImage +import kotlin.Int +import kotlin.String import kotlin.collections.List /** - * @param groups - * @param profiles + * @param title + * @param appId + * @param images - images */ -data class GroupsGetByIdResponse( - @SerializedName("groups") - val groups: List? = null, - @SerializedName("profiles") - val profiles: List? = null +data class GroupsAppButton( + @SerializedName("title") + val title: String? = null, + @SerializedName("app_id") + val appId: Int? = null, + @SerializedName("images") + val images: List? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsBanInfo.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsBanInfo.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsBanInfo.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsBanInfo.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsBanInfoReason.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsBanInfoReason.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsBanInfoReason.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsBanInfoReason.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsBannedItem.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsBannedItem.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsBannedItem.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsBannedItem.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsCallbackServer.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsCallbackServer.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsCallbackServer.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsCallbackServer.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsCallbackSettings.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsCallbackSettings.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsCallbackSettings.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsCallbackSettings.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsContactsItem.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsContactsItem.kt similarity index 96% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsContactsItem.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsContactsItem.kt index 9991a9396d..ee41f2fc1e 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsContactsItem.kt +++ b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsContactsItem.kt @@ -28,7 +28,7 @@ package com.vk.sdk.api.groups.dto import com.google.gson.annotations.SerializedName -import kotlin.Int +import com.vk.dto.common.id.UserId import kotlin.String /** @@ -39,7 +39,7 @@ import kotlin.String */ data class GroupsContactsItem( @SerializedName("user_id") - val userId: Int? = null, + val userId: UserId? = null, @SerializedName("desc") val desc: String? = null, @SerializedName("phone") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsCountersGroup.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsCountersGroup.kt similarity index 74% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsCountersGroup.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsCountersGroup.kt index 8c1c0aea53..71d4a0e61f 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsCountersGroup.kt +++ b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsCountersGroup.kt @@ -40,6 +40,13 @@ import kotlin.Int * @param photos - Photos number * @param topics - Topics number * @param videos - Videos number + * @param marketServices - Market services number + * @param podcasts - Podcasts number + * @param articles - Articles number + * @param narratives - Narratives number + * @param clips - Clips number + * @param clipsFollowers - Clips followers number + * @param classifiedYoula - Classified youla number */ data class GroupsCountersGroup( @SerializedName("addresses") @@ -59,5 +66,19 @@ data class GroupsCountersGroup( @SerializedName("topics") val topics: Int? = null, @SerializedName("videos") - val videos: Int? = null + val videos: Int? = null, + @SerializedName("market_services") + val marketServices: Int? = null, + @SerializedName("podcasts") + val podcasts: Int? = null, + @SerializedName("articles") + val articles: Int? = null, + @SerializedName("narratives") + val narratives: Int? = null, + @SerializedName("clips") + val clips: Int? = null, + @SerializedName("clips_followers") + val clipsFollowers: Int? = null, + @SerializedName("classified_youla") + val classifiedYoula: Int? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsCover.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsCover.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsCover.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsCover.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsFields.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsFields.kt similarity index 89% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsFields.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsFields.kt index f0da8a57f4..67949ad2b5 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsFields.kt +++ b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsFields.kt @@ -279,6 +279,9 @@ enum class GroupsFields( @SerializedName("microlanding") MICROLANDING("microlanding"), + @SerializedName("has_unseen_stories") + HAS_UNSEEN_STORIES("has_unseen_stories"), + @SerializedName("like") LIKE("like"), @@ -288,15 +291,21 @@ enum class GroupsFields( @SerializedName("youla_use_wallpost_redirect") YOULA_USE_WALLPOST_REDIRECT("youla_use_wallpost_redirect"), + @SerializedName("youla_use_wallpost_redirect_onboarding") + YOULA_USE_WALLPOST_REDIRECT_ONBOARDING("youla_use_wallpost_redirect_onboarding"), + + @SerializedName("youla_wallpost_redirect_miniapp_url") + YOULA_WALLPOST_REDIRECT_MINIAPP_URL("youla_wallpost_redirect_miniapp_url"), + + @SerializedName("classifieds_antibaraholka_design_version") + CLASSIFIEDS_ANTIBARAHOLKA_DESIGN_VERSION("classifieds_antibaraholka_design_version"), + @SerializedName("worki_use_wallpost_redirect") WORKI_USE_WALLPOST_REDIRECT("worki_use_wallpost_redirect"), @SerializedName("is_business") IS_BUSINESS("is_business"), - @SerializedName("new_posts_count") - NEW_POSTS_COUNT("new_posts_count"), - @SerializedName("textlive") TEXTLIVE("textlive"), @@ -304,5 +313,17 @@ enum class GroupsFields( TEXTLIVES_COUNT("textlives_count"), @SerializedName("friends") - FRIENDS("friends"); + FRIENDS("friends"), + + @SerializedName("is_widget_messages_enabled") + IS_WIDGET_MESSAGES_ENABLED("is_widget_messages_enabled"), + + @SerializedName("deactivated_message") + DEACTIVATED_MESSAGE("deactivated_message"), + + @SerializedName("worki_action_menu_item") + WORKI_ACTION_MENU_ITEM("worki_action_menu_item"), + + @SerializedName("youla_posting_method") + YOULA_POSTING_METHOD("youla_posting_method"); } diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsFilter.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsFilter.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsFilter.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsFilter.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetAddressesResponse.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetAddressesResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetAddressesResponse.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetAddressesResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetBannedResponse.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetBannedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetBannedResponse.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetBannedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetCallbackConfirmationCodeResponse.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetCallbackConfirmationCodeResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetCallbackConfirmationCodeResponse.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetCallbackConfirmationCodeResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetCallbackServersResponse.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetCallbackServersResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetCallbackServersResponse.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetCallbackServersResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetCatalogInfoExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetCatalogInfoExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetCatalogInfoExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetCatalogInfoExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetCatalogInfoResponse.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetCatalogInfoResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetCatalogInfoResponse.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetCatalogInfoResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetCatalogResponse.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetCatalogResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetCatalogResponse.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetCatalogResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetInvitedUsersResponse.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetInvitedUsersResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetInvitedUsersResponse.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetInvitedUsersResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetInvitesExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetInvitesExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetInvitesExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetInvitesExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetInvitesResponse.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetInvitesResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetInvitesResponse.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetInvitesResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetMembersFieldsResponse.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetMembersFieldsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetMembersFieldsResponse.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetMembersFieldsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetRequestsFieldsResponse.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetRequestsFieldsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetRequestsFieldsResponse.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetRequestsFieldsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetResponse.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetResponse.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetSettingsResponse.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetSettingsResponse.kt similarity index 97% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetSettingsResponse.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetSettingsResponse.kt index e477493013..0dba24f4d7 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetSettingsResponse.kt +++ b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetSettingsResponse.kt @@ -118,11 +118,11 @@ data class GroupsGetSettingsResponse( @SerializedName("links") val links: BaseBoolInt? = null, @SerializedName("sections_list") - val sectionsList: List? = null, + val sectionsList: List>? = null, @SerializedName("main_section") - val mainSection: GroupsGroupFullMainSection? = null, + val mainSection: GroupsGroupFullSection? = null, @SerializedName("secondary_section") - val secondarySection: Int? = null, + val secondarySection: GroupsGroupFullSection? = null, @SerializedName("age_limits") val ageLimits: GroupsGroupAgeLimits? = null, @SerializedName("events") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetTokenPermissionsResponse.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetTokenPermissionsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetTokenPermissionsResponse.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGetTokenPermissionsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroup.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroup.kt similarity index 61% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroup.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroup.kt index 4bcc73dec0..b5aaa2f3b5 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroup.kt +++ b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroup.kt @@ -28,9 +28,13 @@ package com.vk.sdk.api.groups.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.base.dto.BaseBoolInt +import com.vk.sdk.api.video.dto.VideoLiveInfo +import kotlin.Boolean import kotlin.Int import kotlin.String +import kotlin.collections.List /** * @param id - Community ID @@ -48,10 +52,25 @@ import kotlin.String * @param photo50 - URL of square photo of the community with 50 pixels in width * @param photo100 - URL of square photo of the community with 100 pixels in width * @param photo200 - URL of square photo of the community with 200 pixels in width + * @param photo200Orig - URL of square photo of the community with 200 pixels in width original + * @param photo400 - URL of square photo of the community with 400 pixels in width + * @param photo400Orig - URL of square photo of the community with 400 pixels in width original + * @param photoMax - URL of square photo of the community with max pixels in width + * @param photoMaxOrig - URL of square photo of the community with max pixels in width original + * @param estDate - Established date + * @param publicDateLabel - Public date label + * @param photoMaxSize + * @param appButton + * @param appButtons + * @param isVideoLiveNotificationsBlocked + * @param videoLive + * @param hadTorch + * @param audioArtistId + * @param audioCuratorId */ data class GroupsGroup( @SerializedName("id") - val id: Int, + val id: UserId, @SerializedName("name") val name: String, @SerializedName("screen_name") @@ -79,5 +98,35 @@ data class GroupsGroup( @SerializedName("photo_100") val photo100: String? = null, @SerializedName("photo_200") - val photo200: String? = null + val photo200: String? = null, + @SerializedName("photo_200_orig") + val photo200Orig: String? = null, + @SerializedName("photo_400") + val photo400: String? = null, + @SerializedName("photo_400_orig") + val photo400Orig: String? = null, + @SerializedName("photo_max") + val photoMax: String? = null, + @SerializedName("photo_max_orig") + val photoMaxOrig: String? = null, + @SerializedName("est_date") + val estDate: String? = null, + @SerializedName("public_date_label") + val publicDateLabel: String? = null, + @SerializedName("photo_max_size") + val photoMaxSize: GroupsPhotoSize? = null, + @SerializedName("app_button") + val appButton: GroupsAppButton? = null, + @SerializedName("app_buttons") + val appButtons: List? = null, + @SerializedName("is_video_live_notifications_blocked") + val isVideoLiveNotificationsBlocked: BaseBoolInt? = null, + @SerializedName("video_live") + val videoLive: VideoLiveInfo? = null, + @SerializedName("had_torch") + val hadTorch: Boolean? = null, + @SerializedName("audio_artist_id") + val audioArtistId: String? = null, + @SerializedName("audio_curator_id") + val audioCuratorId: Int? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupAccess.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupAccess.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupAccess.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupAccess.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupAdminLevel.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupAdminLevel.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupAdminLevel.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupAdminLevel.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupAgeLimits.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupAgeLimits.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupAgeLimits.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupAgeLimits.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupAttach.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupAttach.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupAttach.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupAttach.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupAudio.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupAudio.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupAudio.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupAudio.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupBanInfo.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupBanInfo.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupBanInfo.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupBanInfo.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupCategory.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupCategory.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupCategory.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupCategory.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupCategoryFull.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupCategoryFull.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupCategoryFull.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupCategoryFull.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupCategoryType.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupCategoryType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupCategoryType.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupCategoryType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupDocs.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupDocs.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupDocs.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupDocs.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupFull.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupFull.kt similarity index 82% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupFull.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupFull.kt index cadc8d51f6..04531f4ddb 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupFull.kt +++ b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupFull.kt @@ -28,11 +28,13 @@ package com.vk.sdk.api.groups.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.audio.dto.AudioAudio import com.vk.sdk.api.base.dto.BaseBoolInt import com.vk.sdk.api.base.dto.BaseCountry import com.vk.sdk.api.base.dto.BaseCropPhoto import com.vk.sdk.api.base.dto.BaseObject +import com.vk.sdk.api.video.dto.VideoLiveInfo import kotlin.Boolean import kotlin.Int import kotlin.String @@ -56,14 +58,12 @@ import kotlin.collections.List * @param videoLiveCount - Number of community's live streams * @param clipsCount - Number of community's clips * @param counters - * @param textlivesCount - Textlives number * @param cover * @param canPost - Information whether current user can post on community's wall * @param canSuggest * @param canUploadStory - Information whether current user can upload story * @param canUploadDoc - Information whether current user can upload doc * @param canUploadVideo - Information whether current user can upload video - * @param canUploadClip - Information whether current user can upload clip * @param canSeeAllPosts - Information whether current user can see all posts on community's wall * @param canCreateTopic - Information whether current user can create topic * @param activity - Type of group, start date of event or category of public page @@ -98,6 +98,7 @@ import kotlin.collections.List * @param canSubscribePosts - Can subscribe to wall * @param liveCovers - Live covers state * @param storiesArchiveCount + * @param hasUnseenStories * @param id - Community ID * @param name - Community name * @param screenName - Domain of the community page @@ -113,6 +114,21 @@ import kotlin.collections.List * @param photo50 - URL of square photo of the community with 50 pixels in width * @param photo100 - URL of square photo of the community with 100 pixels in width * @param photo200 - URL of square photo of the community with 200 pixels in width + * @param photo200Orig - URL of square photo of the community with 200 pixels in width original + * @param photo400 - URL of square photo of the community with 400 pixels in width + * @param photo400Orig - URL of square photo of the community with 400 pixels in width original + * @param photoMax - URL of square photo of the community with max pixels in width + * @param photoMaxOrig - URL of square photo of the community with max pixels in width original + * @param estDate - Established date + * @param publicDateLabel - Public date label + * @param photoMaxSize + * @param appButton + * @param appButtons + * @param isVideoLiveNotificationsBlocked + * @param videoLive + * @param hadTorch + * @param audioArtistId + * @param audioCuratorId */ data class GroupsGroupFull( @SerializedName("market") @@ -149,8 +165,6 @@ data class GroupsGroupFull( val clipsCount: Int? = null, @SerializedName("counters") val counters: GroupsCountersGroup? = null, - @SerializedName("textlives_count") - val textlivesCount: Int? = null, @SerializedName("cover") val cover: GroupsCover? = null, @SerializedName("can_post") @@ -163,8 +177,6 @@ data class GroupsGroupFull( val canUploadDoc: BaseBoolInt? = null, @SerializedName("can_upload_video") val canUploadVideo: BaseBoolInt? = null, - @SerializedName("can_upload_clip") - val canUploadClip: BaseBoolInt? = null, @SerializedName("can_see_all_posts") val canSeeAllPosts: BaseBoolInt? = null, @SerializedName("can_create_topic") @@ -192,9 +204,9 @@ data class GroupsGroupFull( @SerializedName("site") val site: String? = null, @SerializedName("main_section") - val mainSection: GroupsGroupFullMainSection? = null, + val mainSection: GroupsGroupFullSection? = null, @SerializedName("secondary_section") - val secondarySection: Int? = null, + val secondarySection: GroupsGroupFullSection? = null, @SerializedName("trending") val trending: BaseBoolInt? = null, @SerializedName("can_message") @@ -229,8 +241,10 @@ data class GroupsGroupFull( val liveCovers: GroupsLiveCovers? = null, @SerializedName("stories_archive_count") val storiesArchiveCount: Int? = null, + @SerializedName("has_unseen_stories") + val hasUnseenStories: Boolean? = null, @SerializedName("id") - val id: Int? = null, + val id: UserId? = null, @SerializedName("name") val name: String? = null, @SerializedName("screen_name") @@ -258,7 +272,37 @@ data class GroupsGroupFull( @SerializedName("photo_100") val photo100: String? = null, @SerializedName("photo_200") - val photo200: String? = null + val photo200: String? = null, + @SerializedName("photo_200_orig") + val photo200Orig: String? = null, + @SerializedName("photo_400") + val photo400: String? = null, + @SerializedName("photo_400_orig") + val photo400Orig: String? = null, + @SerializedName("photo_max") + val photoMax: String? = null, + @SerializedName("photo_max_orig") + val photoMaxOrig: String? = null, + @SerializedName("est_date") + val estDate: String? = null, + @SerializedName("public_date_label") + val publicDateLabel: String? = null, + @SerializedName("photo_max_size") + val photoMaxSize: GroupsPhotoSize? = null, + @SerializedName("app_button") + val appButton: GroupsAppButton? = null, + @SerializedName("app_buttons") + val appButtons: List? = null, + @SerializedName("is_video_live_notifications_blocked") + val isVideoLiveNotificationsBlocked: BaseBoolInt? = null, + @SerializedName("video_live") + val videoLive: VideoLiveInfo? = null, + @SerializedName("had_torch") + val hadTorch: Boolean? = null, + @SerializedName("audio_artist_id") + val audioArtistId: String? = null, + @SerializedName("audio_curator_id") + val audioCuratorId: Int? = null ) { enum class Wall( val value: Int diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupFullAgeLimits.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupFullAgeLimits.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupFullAgeLimits.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupFullAgeLimits.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupFullMemberStatus.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupFullMemberStatus.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupFullMemberStatus.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupFullMemberStatus.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupFullMainSection.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupFullSection.kt similarity index 86% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupFullMainSection.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupFullSection.kt index 966c914e2f..71d1a94ccc 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupFullMainSection.kt +++ b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupFullSection.kt @@ -30,7 +30,7 @@ package com.vk.sdk.api.groups.dto import com.google.gson.annotations.SerializedName import kotlin.Int -enum class GroupsGroupFullMainSection( +enum class GroupsGroupFullSection( val value: Int ) { @SerializedName("0") @@ -49,5 +49,20 @@ enum class GroupsGroupFullMainSection( VIDEO(4), @SerializedName("5") - MARKET(5); + MARKET(5), + + @SerializedName("10") + EVENTS(10), + + @SerializedName("35") + ADDRESSES(35), + + @SerializedName("39") + ARTICLES(39), + + @SerializedName("43") + CHATS(43), + + @SerializedName("51") + MARKET_SERVICES(51); } diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupIsClosed.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupIsClosed.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupIsClosed.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupIsClosed.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupLink.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupLink.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupLink.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupLink.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupPhotos.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupPhotos.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupPhotos.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupPhotos.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupPublicCategoryList.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupPublicCategoryList.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupPublicCategoryList.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupPublicCategoryList.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupSuggestedPrivacy.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupSuggestedPrivacy.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupSuggestedPrivacy.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupSuggestedPrivacy.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupTag.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupTag.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupTag.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupTag.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupTopics.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupTopics.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupTopics.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupTopics.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupType.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupType.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupVideo.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupVideo.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupVideo.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupVideo.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupWall.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupWall.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupWall.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupWall.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupWiki.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupWiki.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupWiki.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupWiki.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupsArray.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupsArray.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupsArray.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsGroupsArray.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsLinksItem.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsLinksItem.kt similarity index 92% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsLinksItem.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsLinksItem.kt index 53a3cfeee9..1ddb5053df 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsLinksItem.kt +++ b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsLinksItem.kt @@ -40,6 +40,7 @@ import kotlin.String * @param photo100 - URL of square image of the link with 100 pixels in width * @param photo50 - URL of square image of the link with 50 pixels in width * @param url - Link URL + * @param imageProcessing - Information whether the image on processing */ data class GroupsLinksItem( @SerializedName("desc") @@ -55,5 +56,7 @@ data class GroupsLinksItem( @SerializedName("photo_50") val photo50: String? = null, @SerializedName("url") - val url: String? = null + val url: String? = null, + @SerializedName("image_processing") + val imageProcessing: BaseBoolInt? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsLiveCovers.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsLiveCovers.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsLiveCovers.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsLiveCovers.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsLongPollEvents.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsLongPollEvents.kt similarity index 93% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsLongPollEvents.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsLongPollEvents.kt index c338496c35..32132d5f91 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsLongPollEvents.kt +++ b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsLongPollEvents.kt @@ -71,9 +71,6 @@ import com.vk.sdk.api.base.dto.BaseBoolInt * @param wallReplyNew * @param wallReplyRestore * @param wallRepost - * @param leadFormsNew - * @param marketOrderNew - * @param marketOrderEdit * @param donutSubscriptionCreate * @param donutSubscriptionProlonged * @param donutSubscriptionCancelled @@ -81,6 +78,9 @@ import com.vk.sdk.api.base.dto.BaseBoolInt * @param donutSubscriptionPriceChanged * @param donutMoneyWithdraw * @param donutMoneyWithdrawError + * @param leadFormsNew + * @param marketOrderNew + * @param marketOrderEdit */ data class GroupsLongPollEvents( @SerializedName("audio_new") @@ -163,24 +163,24 @@ data class GroupsLongPollEvents( val wallReplyRestore: BaseBoolInt, @SerializedName("wall_repost") val wallRepost: BaseBoolInt, - @SerializedName("lead_forms_new") - val leadFormsNew: BaseBoolInt? = null, - @SerializedName("market_order_new") - val marketOrderNew: BaseBoolInt? = null, - @SerializedName("market_order_edit") - val marketOrderEdit: BaseBoolInt? = null, @SerializedName("donut_subscription_create") - val donutSubscriptionCreate: BaseBoolInt? = null, + val donutSubscriptionCreate: BaseBoolInt, @SerializedName("donut_subscription_prolonged") - val donutSubscriptionProlonged: BaseBoolInt? = null, + val donutSubscriptionProlonged: BaseBoolInt, @SerializedName("donut_subscription_cancelled") - val donutSubscriptionCancelled: BaseBoolInt? = null, + val donutSubscriptionCancelled: BaseBoolInt, @SerializedName("donut_subscription_expired") - val donutSubscriptionExpired: BaseBoolInt? = null, + val donutSubscriptionExpired: BaseBoolInt, @SerializedName("donut_subscription_price_changed") - val donutSubscriptionPriceChanged: BaseBoolInt? = null, + val donutSubscriptionPriceChanged: BaseBoolInt, @SerializedName("donut_money_withdraw") - val donutMoneyWithdraw: BaseBoolInt? = null, + val donutMoneyWithdraw: BaseBoolInt, @SerializedName("donut_money_withdraw_error") - val donutMoneyWithdrawError: BaseBoolInt? = null + val donutMoneyWithdrawError: BaseBoolInt, + @SerializedName("lead_forms_new") + val leadFormsNew: BaseBoolInt? = null, + @SerializedName("market_order_new") + val marketOrderNew: BaseBoolInt? = null, + @SerializedName("market_order_edit") + val marketOrderEdit: BaseBoolInt? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsLongPollServer.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsLongPollServer.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsLongPollServer.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsLongPollServer.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsLongPollSettings.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsLongPollSettings.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsLongPollSettings.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsLongPollSettings.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsMarketInfo.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsMarketInfo.kt similarity index 85% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsMarketInfo.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsMarketInfo.kt index 7bd2945fa9..aa1313096a 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsMarketInfo.kt +++ b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsMarketInfo.kt @@ -30,10 +30,13 @@ package com.vk.sdk.api.groups.dto import com.google.gson.annotations.SerializedName import com.vk.sdk.api.base.dto.BaseBoolInt import com.vk.sdk.api.market.dto.MarketCurrency +import com.vk.sdk.api.market.dto.MarketPrice +import com.vk.sdk.api.pages.dto.PagesWikipageFull import kotlin.Int import kotlin.String /** + * @param type - Market type * @param contactId - Contact person ID * @param currency * @param currencyText - Currency name @@ -41,8 +44,12 @@ import kotlin.String * @param mainAlbumId - Main market album ID * @param priceMax - Maximum price * @param priceMin - Minimum price + * @param minOrderPrice + * @param wiki */ data class GroupsMarketInfo( + @SerializedName("type") + val type: String? = null, @SerializedName("contact_id") val contactId: Int? = null, @SerializedName("currency") @@ -56,5 +63,9 @@ data class GroupsMarketInfo( @SerializedName("price_max") val priceMax: String? = null, @SerializedName("price_min") - val priceMin: String? = null + val priceMin: String? = null, + @SerializedName("min_order_price") + val minOrderPrice: MarketPrice? = null, + @SerializedName("wiki") + val wiki: PagesWikipageFull? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsOnlineStatus.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsOnlineStatus.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsOnlineStatus.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsOnlineStatus.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsOnlineStatusType.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsOnlineStatusType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsOnlineStatusType.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsOnlineStatusType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsOwnerXtrBanInfoType.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsOwnerXtrBanInfoType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsOwnerXtrBanInfoType.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsOwnerXtrBanInfoType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsSectionsListItem.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsPhotoSize.kt similarity index 87% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsSectionsListItem.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsPhotoSize.kt index 8ec33aa309..c3df07c11a 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsSectionsListItem.kt +++ b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsPhotoSize.kt @@ -29,15 +29,14 @@ package com.vk.sdk.api.groups.dto import com.google.gson.annotations.SerializedName import kotlin.Int -import kotlin.String /** - * @param id - Object ID - * @param title - Object title + * @param height - Image height + * @param width - Image width */ -data class GroupsSectionsListItem( - @SerializedName("id") - val id: Int? = null, - @SerializedName("title") - val title: String? = null +data class GroupsPhotoSize( + @SerializedName("height") + val height: Int, + @SerializedName("width") + val width: Int ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsRoleOptions.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsRoleOptions.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsRoleOptions.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsRoleOptions.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsSearchResponse.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsSearchResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsSearchResponse.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsSearchResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsSettingsTwitter.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsSettingsTwitter.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsSettingsTwitter.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsSettingsTwitter.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsSubjectItem.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsSubjectItem.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsSubjectItem.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsSubjectItem.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsSuggestion.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsSuggestion.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsSuggestion.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsSuggestion.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsTokenPermissionSetting.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsTokenPermissionSetting.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsTokenPermissionSetting.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsTokenPermissionSetting.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsUserXtrRole.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsUserXtrRole.kt similarity index 95% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsUserXtrRole.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/GroupsUserXtrRole.kt index 9b2e7d26a6..7d32477167 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/GroupsUserXtrRole.kt +++ b/api/src/main/java/com/vk/sdk/api/groups/dto/GroupsUserXtrRole.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.groups.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.audio.dto.AudioAudio import com.vk.sdk.api.base.dto.BaseBoolInt import com.vk.sdk.api.base.dto.BaseCity @@ -117,8 +118,10 @@ import kotlin.collections.List * @param photoMaxSize * @param language * @param storiesArchiveCount + * @param hasUnseenStories * @param wallDefault * @param canCall - Information whether current user can call + * @param canCallFromGroup - Information whether group can call user * @param canSeeWishes - Information whether current user can see the user's wishes * @param canSeeGifts - Information whether current user can see the user's gifts * @param interests @@ -177,7 +180,11 @@ import kotlin.collections.List * @param accessKey * @param canUploadDoc * @param hash - * @param hasEmail + * @param isNoIndex - Access to user profile is restricted for search engines + * @param contactId - Contact person ID + * @param isMessageRequest + * @param descriptions + * @param lists * @param sex - User sex * @param screenName - Domain name of the user's page * @param photo50 - URL of square photo of the user with 50 pixels in width @@ -313,10 +320,14 @@ data class GroupsUserXtrRole( val language: String? = null, @SerializedName("stories_archive_count") val storiesArchiveCount: Int? = null, + @SerializedName("has_unseen_stories") + val hasUnseenStories: Boolean? = null, @SerializedName("wall_default") val wallDefault: GroupsUserXtrRole.WallDefault? = null, @SerializedName("can_call") val canCall: Boolean? = null, + @SerializedName("can_call_from_group") + val canCallFromGroup: Boolean? = null, @SerializedName("can_see_wishes") val canSeeWishes: Boolean? = null, @SerializedName("can_see_gifts") @@ -431,8 +442,16 @@ data class GroupsUserXtrRole( val canUploadDoc: BaseBoolInt? = null, @SerializedName("hash") val hash: String? = null, - @SerializedName("has_email") - val hasEmail: Boolean? = null, + @SerializedName("is_no_index") + val isNoIndex: Boolean? = null, + @SerializedName("contact_id") + val contactId: Int? = null, + @SerializedName("is_message_request") + val isMessageRequest: Boolean? = null, + @SerializedName("descriptions") + val descriptions: List? = null, + @SerializedName("lists") + val lists: List? = null, @SerializedName("sex") val sex: BaseSex? = null, @SerializedName("screen_name") @@ -464,7 +483,7 @@ data class GroupsUserXtrRole( @SerializedName("hidden") val hidden: Int? = null, @SerializedName("id") - val id: Int? = null, + val id: UserId? = null, @SerializedName("last_name") val lastName: String? = null, @SerializedName("can_access_closed") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/NameCaseParam.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/NameCaseParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/NameCaseParam.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/NameCaseParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/SortParam.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/SortParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/SortParam.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/SortParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/StateParam.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/StateParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/StateParam.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/StateParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/SubtypeParam.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/SubtypeParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/SubtypeParam.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/SubtypeParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/TagColorParam.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/TagColorParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/TagColorParam.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/TagColorParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/TypeParam.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/TypeParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/TypeParam.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/TypeParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/WorkInfoStatusParam.kt b/api/src/main/java/com/vk/sdk/api/groups/dto/WorkInfoStatusParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/groups/dto/WorkInfoStatusParam.kt rename to api/src/main/java/com/vk/sdk/api/groups/dto/WorkInfoStatusParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/leadForms/LeadFormsService.kt b/api/src/main/java/com/vk/sdk/api/leadForms/LeadFormsService.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/leadForms/LeadFormsService.kt rename to api/src/main/java/com/vk/sdk/api/leadForms/LeadFormsService.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/likes/LikesService.kt b/api/src/main/java/com/vk/sdk/api/likes/LikesService.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/likes/LikesService.kt rename to api/src/main/java/com/vk/sdk/api/likes/LikesService.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/likes/dto/FilterParam.kt b/api/src/main/java/com/vk/sdk/api/likes/dto/FilterParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/likes/dto/FilterParam.kt rename to api/src/main/java/com/vk/sdk/api/likes/dto/FilterParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/likes/dto/FriendsOnlyParam.kt b/api/src/main/java/com/vk/sdk/api/likes/dto/FriendsOnlyParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/likes/dto/FriendsOnlyParam.kt rename to api/src/main/java/com/vk/sdk/api/likes/dto/FriendsOnlyParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/likes/dto/LikesAddResponse.kt b/api/src/main/java/com/vk/sdk/api/likes/dto/LikesAddResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/likes/dto/LikesAddResponse.kt rename to api/src/main/java/com/vk/sdk/api/likes/dto/LikesAddResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/likes/dto/LikesDeleteResponse.kt b/api/src/main/java/com/vk/sdk/api/likes/dto/LikesDeleteResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/likes/dto/LikesDeleteResponse.kt rename to api/src/main/java/com/vk/sdk/api/likes/dto/LikesDeleteResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/likes/dto/LikesGetListExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/likes/dto/LikesGetListExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/likes/dto/LikesGetListExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/likes/dto/LikesGetListExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/likes/dto/LikesGetListResponse.kt b/api/src/main/java/com/vk/sdk/api/likes/dto/LikesGetListResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/likes/dto/LikesGetListResponse.kt rename to api/src/main/java/com/vk/sdk/api/likes/dto/LikesGetListResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/likes/dto/LikesIsLikedResponse.kt b/api/src/main/java/com/vk/sdk/api/likes/dto/LikesIsLikedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/likes/dto/LikesIsLikedResponse.kt rename to api/src/main/java/com/vk/sdk/api/likes/dto/LikesIsLikedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/link/dto/LinkTargetObject.kt b/api/src/main/java/com/vk/sdk/api/link/dto/LinkTargetObject.kt similarity index 96% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/link/dto/LinkTargetObject.kt rename to api/src/main/java/com/vk/sdk/api/link/dto/LinkTargetObject.kt index 0326856d22..a02779a264 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/link/dto/LinkTargetObject.kt +++ b/api/src/main/java/com/vk/sdk/api/link/dto/LinkTargetObject.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.link.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import kotlin.Int import kotlin.String @@ -40,7 +41,7 @@ data class LinkTargetObject( @SerializedName("type") val type: String? = null, @SerializedName("owner_id") - val ownerId: Int? = null, + val ownerId: UserId? = null, @SerializedName("item_id") val itemId: Int? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/MarketService.kt b/api/src/main/java/com/vk/sdk/api/market/MarketService.kt similarity index 92% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/MarketService.kt rename to api/src/main/java/com/vk/sdk/api/market/MarketService.kt index 164eb0af65..44b6c10a0d 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/MarketService.kt +++ b/api/src/main/java/com/vk/sdk/api/market/MarketService.kt @@ -38,7 +38,7 @@ import com.vk.sdk.api.market.dto.MarketGetAlbumByIdResponse import com.vk.sdk.api.market.dto.MarketGetAlbumsResponse import com.vk.sdk.api.market.dto.MarketGetByIdExtendedResponse import com.vk.sdk.api.market.dto.MarketGetByIdResponse -import com.vk.sdk.api.market.dto.MarketGetCategoriesNewResponse +import com.vk.sdk.api.market.dto.MarketGetCategoriesResponse import com.vk.sdk.api.market.dto.MarketGetCommentsResponse import com.vk.sdk.api.market.dto.MarketGetExtendedResponse import com.vk.sdk.api.market.dto.MarketGetGroupOrdersResponse @@ -126,13 +126,15 @@ class MarketService { * @param title - Collection title. * @param photoId - Cover photo ID. * @param mainAlbum - Set as main ('1' - set, '0' - no). + * @param isHidden - Set as hidden * @return [VKRequest] with [MarketAddAlbumResponse] */ fun marketAddAlbum( ownerId: Int, title: String, photoId: Int? = null, - mainAlbum: Boolean? = null + mainAlbum: Boolean? = null, + isHidden: Boolean? = null ): VKRequest = NewApiRequest("market.addAlbum") { GsonHolder.gson.fromJson(it, MarketAddAlbumResponse::class.java) } @@ -141,26 +143,27 @@ class MarketService { addParam("title", title) photoId?.let { addParam("photo_id", it) } mainAlbum?.let { addParam("main_album", it) } + isHidden?.let { addParam("is_hidden", it) } } /** * Adds an item to one or multiple collections. * * @param ownerId - ID of an item owner community. - * @param itemId - Item ID. + * @param itemIds * @param albumIds - Collections IDs to add item to. * @return [VKRequest] with [BaseOkResponse] */ fun marketAddToAlbum( ownerId: Int, - itemId: Int, + itemIds: List, albumIds: List ): VKRequest = NewApiRequest("market.addToAlbum") { GsonHolder.gson.fromJson(it, BaseOkResponse::class.java) } .apply { addParam("owner_id", ownerId) - addParam("item_id", itemId) + addParam("item_ids", itemIds) addParam("album_ids", albumIds) } @@ -263,9 +266,9 @@ class MarketService { * @param name - Item name. * @param description - Item description. * @param categoryId - Item category ID. - * @param mainPhotoId - Cover photo ID. * @param price - Item price. * @param deleted - Item status ('1' - deleted, '0' - not deleted). + * @param mainPhotoId - Cover photo ID. * @param photoIds - IDs of additional photos. * @param url - Url for button in market item. * @return [VKRequest] with [BaseOkResponse] @@ -276,9 +279,9 @@ class MarketService { name: String, description: String, categoryId: Int, - mainPhotoId: Int, price: Float? = null, deleted: Boolean? = null, + mainPhotoId: Int? = null, photoIds: List? = null, url: String? = null ): VKRequest = NewApiRequest("market.edit") { @@ -290,9 +293,9 @@ class MarketService { addParam("name", name) addParam("description", description) addParam("category_id", categoryId) - addParam("main_photo_id", mainPhotoId) price?.let { addParam("price", it) } deleted?.let { addParam("deleted", it) } + mainPhotoId?.let { addParam("main_photo_id", it) } photoIds?.let { addParam("photo_ids", it) } url?.let { addParam("url", it) } } @@ -305,6 +308,7 @@ class MarketService { * @param title - Collection title. * @param photoId - Cover photo id * @param mainAlbum - Set as main ('1' - set, '0' - no). + * @param isHidden - Set as hidden * @return [VKRequest] with [BaseOkResponse] */ fun marketEditAlbum( @@ -312,7 +316,8 @@ class MarketService { albumId: Int, title: String, photoId: Int? = null, - mainAlbum: Boolean? = null + mainAlbum: Boolean? = null, + isHidden: Boolean? = null ): VKRequest = NewApiRequest("market.editAlbum") { GsonHolder.gson.fromJson(it, BaseOkResponse::class.java) } @@ -322,6 +327,7 @@ class MarketService { addParam("title", title) photoId?.let { addParam("photo_id", it) } mainAlbum?.let { addParam("main_album", it) } + isHidden?.let { addParam("is_hidden", it) } } /** @@ -367,7 +373,6 @@ class MarketService { * @param length * @param height * @param weight - * @param commentForUser * @return [VKRequest] with [BaseOkResponse] */ fun marketEditOrder( @@ -381,8 +386,7 @@ class MarketService { width: Int? = null, length: Int? = null, height: Int? = null, - weight: Int? = null, - commentForUser: String? = null + weight: Int? = null ): VKRequest = NewApiRequest("market.editOrder") { GsonHolder.gson.fromJson(it, BaseOkResponse::class.java) } @@ -398,7 +402,6 @@ class MarketService { length?.let { addParam("length", it) } height?.let { addParam("height", it) } weight?.let { addParam("weight", it) } - commentForUser?.let { addParam("comment_for_user", it) } } /** @@ -410,13 +413,17 @@ class MarketService { * @param albumId * @param count - Number of items to return. * @param offset - Offset needed to return a specific subset of results. + * @param dateFrom - Items update date from (format: yyyy-mm-dd) + * @param dateTo - Items update date to (format: yyyy-mm-dd) * @return [VKRequest] with [MarketGetResponse] */ fun marketGet( ownerId: Int, albumId: Int? = null, count: Int? = null, - offset: Int? = null + offset: Int? = null, + dateFrom: String? = null, + dateTo: String? = null ): VKRequest = NewApiRequest("market.get") { GsonHolder.gson.fromJson(it, MarketGetResponse::class.java) } @@ -425,6 +432,8 @@ class MarketService { albumId?.let { addParam("album_id", it) } count?.let { addParam("count", it) } offset?.let { addParam("offset", it) } + dateFrom?.let { addParam("date_from", it) } + dateTo?.let { addParam("date_to", it) } } /** @@ -436,13 +445,17 @@ class MarketService { * @param albumId * @param count - Number of items to return. * @param offset - Offset needed to return a specific subset of results. + * @param dateFrom - Items update date from (format: yyyy-mm-dd) + * @param dateTo - Items update date to (format: yyyy-mm-dd) * @return [VKRequest] with [MarketGetExtendedResponse] */ fun marketGetExtended( ownerId: Int, albumId: Int? = null, count: Int? = null, - offset: Int? = null + offset: Int? = null, + dateFrom: String? = null, + dateTo: String? = null ): VKRequest = NewApiRequest("market.get") { GsonHolder.gson.fromJson(it, MarketGetExtendedResponse::class.java) } @@ -452,6 +465,8 @@ class MarketService { count?.let { addParam("count", it) } offset?.let { addParam("offset", it) } addParam("extended", true) + dateFrom?.let { addParam("date_from", it) } + dateTo?.let { addParam("date_to", it) } } /** @@ -531,11 +546,11 @@ class MarketService { * * @param count - Number of results to return. * @param offset - Offset needed to return a specific subset of results. - * @return [VKRequest] with [MarketGetCategoriesNewResponse] + * @return [VKRequest] with [MarketGetCategoriesResponse] */ fun marketGetCategories(count: Int? = null, offset: Int? = null): - VKRequest = NewApiRequest("market.getCategories") { - GsonHolder.gson.fromJson(it, MarketGetCategoriesNewResponse::class.java) + VKRequest = NewApiRequest("market.getCategories") { + GsonHolder.gson.fromJson(it, MarketGetCategoriesResponse::class.java) } .apply { count?.let { addParam("count", it) } @@ -646,30 +661,46 @@ class MarketService { /** * @param offset * @param count + * @param dateFrom - Orders status updated date from (format: yyyy-mm-dd) + * @param dateTo - Orders status updated date to (format: yyyy-mm-dd) * @return [VKRequest] with [MarketGetOrdersResponse] */ - fun marketGetOrders(offset: Int? = null, count: Int? = null): VKRequest - = NewApiRequest("market.getOrders") { + fun marketGetOrders( + offset: Int? = null, + count: Int? = null, + dateFrom: String? = null, + dateTo: String? = null + ): VKRequest = NewApiRequest("market.getOrders") { GsonHolder.gson.fromJson(it, MarketGetOrdersResponse::class.java) } .apply { offset?.let { addParam("offset", it) } count?.let { addParam("count", it) } + dateFrom?.let { addParam("date_from", it) } + dateTo?.let { addParam("date_to", it) } } /** * @param offset * @param count + * @param dateFrom - Orders status updated date from (format: yyyy-mm-dd) + * @param dateTo - Orders status updated date to (format: yyyy-mm-dd) * @return [VKRequest] with [MarketGetOrdersExtendedResponse] */ - fun marketGetOrdersExtended(offset: Int? = null, count: Int? = null): - VKRequest = NewApiRequest("market.getOrders") { + fun marketGetOrdersExtended( + offset: Int? = null, + count: Int? = null, + dateFrom: String? = null, + dateTo: String? = null + ): VKRequest = NewApiRequest("market.getOrders") { GsonHolder.gson.fromJson(it, MarketGetOrdersExtendedResponse::class.java) } .apply { offset?.let { addParam("offset", it) } count?.let { addParam("count", it) } addParam("extended", true) + dateFrom?.let { addParam("date_from", it) } + dateTo?.let { addParam("date_to", it) } } /** diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketAddAlbumResponse.kt b/api/src/main/java/com/vk/sdk/api/market/dto/MarketAddAlbumResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketAddAlbumResponse.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/MarketAddAlbumResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketAddResponse.kt b/api/src/main/java/com/vk/sdk/api/market/dto/MarketAddResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketAddResponse.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/MarketAddResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketCurrency.kt b/api/src/main/java/com/vk/sdk/api/market/dto/MarketCurrency.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketCurrency.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/MarketCurrency.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketGetAlbumByIdResponse.kt b/api/src/main/java/com/vk/sdk/api/market/dto/MarketGetAlbumByIdResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketGetAlbumByIdResponse.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/MarketGetAlbumByIdResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketGetAlbumsResponse.kt b/api/src/main/java/com/vk/sdk/api/market/dto/MarketGetAlbumsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketGetAlbumsResponse.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/MarketGetAlbumsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketGetByIdExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/market/dto/MarketGetByIdExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketGetByIdExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/MarketGetByIdExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketGetByIdResponse.kt b/api/src/main/java/com/vk/sdk/api/market/dto/MarketGetByIdResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketGetByIdResponse.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/MarketGetByIdResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketGetCategoriesNewResponse.kt b/api/src/main/java/com/vk/sdk/api/market/dto/MarketGetCategoriesResponse.kt similarity index 88% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketGetCategoriesNewResponse.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/MarketGetCategoriesResponse.kt index fe23290969..21316242a9 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketGetCategoriesNewResponse.kt +++ b/api/src/main/java/com/vk/sdk/api/market/dto/MarketGetCategoriesResponse.kt @@ -28,12 +28,16 @@ package com.vk.sdk.api.market.dto import com.google.gson.annotations.SerializedName +import kotlin.Int import kotlin.collections.List /** + * @param count - Total number * @param items */ -data class MarketGetCategoriesNewResponse( +data class MarketGetCategoriesResponse( + @SerializedName("count") + val count: Int? = null, @SerializedName("items") - val items: List + val items: List? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketGetCommentsResponse.kt b/api/src/main/java/com/vk/sdk/api/market/dto/MarketGetCommentsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketGetCommentsResponse.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/MarketGetCommentsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketGetExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/market/dto/MarketGetExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketGetExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/MarketGetExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketGetGroupOrdersResponse.kt b/api/src/main/java/com/vk/sdk/api/market/dto/MarketGetGroupOrdersResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketGetGroupOrdersResponse.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/MarketGetGroupOrdersResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketGetOrderByIdResponse.kt b/api/src/main/java/com/vk/sdk/api/market/dto/MarketGetOrderByIdResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketGetOrderByIdResponse.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/MarketGetOrderByIdResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketGetOrderItemsResponse.kt b/api/src/main/java/com/vk/sdk/api/market/dto/MarketGetOrderItemsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketGetOrderItemsResponse.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/MarketGetOrderItemsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketGetOrdersExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/market/dto/MarketGetOrdersExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketGetOrdersExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/MarketGetOrdersExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketGetOrdersResponse.kt b/api/src/main/java/com/vk/sdk/api/market/dto/MarketGetOrdersResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketGetOrdersResponse.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/MarketGetOrdersResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketGetResponse.kt b/api/src/main/java/com/vk/sdk/api/market/dto/MarketGetResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketGetResponse.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/MarketGetResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketAlbum.kt b/api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketAlbum.kt similarity index 87% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketAlbum.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketAlbum.kt index 6334d96a2b..1e0d479385 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketAlbum.kt +++ b/api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketAlbum.kt @@ -28,29 +28,37 @@ package com.vk.sdk.api.market.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.photos.dto.PhotosPhoto +import kotlin.Boolean import kotlin.Int import kotlin.String /** - * @param count - Items number * @param id - Market album ID * @param ownerId - Market album owner's ID * @param title - Market album title + * @param count - Items number * @param updatedTime - Date when album has been updated last time in Unixtime + * @param isMain - Is album main for owner + * @param isHidden - Is album hidden * @param photo */ data class MarketMarketAlbum( - @SerializedName("count") - val count: Int, @SerializedName("id") val id: Int, @SerializedName("owner_id") - val ownerId: Int, + val ownerId: UserId, @SerializedName("title") val title: String, + @SerializedName("count") + val count: Int, @SerializedName("updated_time") val updatedTime: Int, + @SerializedName("is_main") + val isMain: Boolean? = null, + @SerializedName("is_hidden") + val isHidden: Boolean? = null, @SerializedName("photo") val photo: PhotosPhoto? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketCategory.kt b/api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketCategory.kt similarity index 94% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketCategory.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketCategory.kt index 6392cbc082..39e296830a 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketCategory.kt +++ b/api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketCategory.kt @@ -34,13 +34,13 @@ import kotlin.String /** * @param id - Category ID * @param name - Category name - * @param parent + * @param section */ data class MarketMarketCategory( @SerializedName("id") val id: Int? = null, @SerializedName("name") val name: String? = null, - @SerializedName("parent") - val parent: MarketMarketCategoryNested? = null + @SerializedName("section") + val section: MarketSection? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketItem.kt b/api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketItem.kt similarity index 95% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketItem.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketItem.kt index 213f879b11..e06a8eb519 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketItem.kt +++ b/api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketItem.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.market.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import kotlin.Boolean import kotlin.Int import kotlin.String @@ -50,7 +51,6 @@ import kotlin.String * @param variantsGroupingId * @param isMainVariant * @param sku - * @param stockAmount - Inventory balances */ data class MarketMarketItem( @SerializedName("availability") @@ -62,7 +62,7 @@ data class MarketMarketItem( @SerializedName("id") val id: Int, @SerializedName("owner_id") - val ownerId: Int, + val ownerId: UserId, @SerializedName("price") val price: MarketPrice, @SerializedName("title") @@ -86,7 +86,5 @@ data class MarketMarketItem( @SerializedName("is_main_variant") val isMainVariant: Boolean? = null, @SerializedName("sku") - val sku: String? = null, - @SerializedName("stock_amount") - val stockAmount: Int? = null + val sku: String? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketItemAvailability.kt b/api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketItemAvailability.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketItemAvailability.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketItemAvailability.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketItemFull.kt b/api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketItemFull.kt similarity index 91% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketItemFull.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketItemFull.kt index 5f5c8b58a4..37f4c49ef7 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketItemFull.kt +++ b/api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketItemFull.kt @@ -28,13 +28,13 @@ package com.vk.sdk.api.market.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.base.dto.BaseBoolInt import com.vk.sdk.api.base.dto.BaseLikes import com.vk.sdk.api.base.dto.BaseLink import com.vk.sdk.api.base.dto.BaseRepostsInfo import com.vk.sdk.api.photos.dto.PhotosPhoto import kotlin.Boolean -import kotlin.Float import kotlin.Int import kotlin.String import kotlin.collections.List @@ -48,8 +48,6 @@ import kotlin.collections.List * @param reposts * @param viewsCount - Views number * @param wishlistItemId - Object identifier in wishlist of viewer - * @param rating - Rating of product - * @param ordersCount - Count of product orders * @param cancelInfo - Information for cancel and revert order * @param userAgreementInfo - User agreement info * @param accessKey - Access key for the market item @@ -69,7 +67,6 @@ import kotlin.collections.List * @param variantsGroupingId * @param isMainVariant * @param sku - * @param stockAmount - Inventory balances */ data class MarketMarketItemFull( @SerializedName("albums_ids") @@ -88,10 +85,6 @@ data class MarketMarketItemFull( val viewsCount: Int? = null, @SerializedName("wishlist_item_id") val wishlistItemId: Int? = null, - @SerializedName("rating") - val rating: Float? = null, - @SerializedName("orders_count") - val ordersCount: Int? = null, @SerializedName("cancel_info") val cancelInfo: BaseLink? = null, @SerializedName("user_agreement_info") @@ -115,7 +108,7 @@ data class MarketMarketItemFull( @SerializedName("is_favorite") val isFavorite: Boolean? = null, @SerializedName("owner_id") - val ownerId: Int? = null, + val ownerId: UserId? = null, @SerializedName("price") val price: MarketPrice? = null, @SerializedName("thumb_photo") @@ -129,7 +122,5 @@ data class MarketMarketItemFull( @SerializedName("is_main_variant") val isMainVariant: Boolean? = null, @SerializedName("sku") - val sku: String? = null, - @SerializedName("stock_amount") - val stockAmount: Int? = null + val sku: String? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketOrder.kt b/api/src/main/java/com/vk/sdk/api/market/dto/MarketOrder.kt similarity index 85% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketOrder.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/MarketOrder.kt index 0682e7634a..7992f7f2c0 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketOrder.kt +++ b/api/src/main/java/com/vk/sdk/api/market/dto/MarketOrder.kt @@ -28,8 +28,8 @@ package com.vk.sdk.api.market.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.base.dto.BaseLink -import kotlin.Boolean import kotlin.Int import kotlin.String import kotlin.collections.List @@ -49,20 +49,16 @@ import kotlin.collections.List * @param address * @param merchantComment * @param weight - * @param discount * @param previewOrderItems - Several order items for preview * @param cancelInfo - Information for cancel and revert order - * @param commentForUser - Seller comment for user - * @param isViewedByAdmin - * @param dateViewed */ data class MarketOrder( @SerializedName("id") val id: Int, @SerializedName("group_id") - val groupId: Int, + val groupId: UserId, @SerializedName("user_id") - val userId: Int, + val userId: UserId, @SerializedName("date") val date: Int, @SerializedName("status") @@ -85,16 +81,8 @@ data class MarketOrder( val merchantComment: String? = null, @SerializedName("weight") val weight: Int? = null, - @SerializedName("discount") - val discount: MarketPrice? = null, @SerializedName("preview_order_items") val previewOrderItems: List? = null, @SerializedName("cancel_info") - val cancelInfo: BaseLink? = null, - @SerializedName("comment_for_user") - val commentForUser: String? = null, - @SerializedName("is_viewed_by_admin") - val isViewedByAdmin: Boolean? = null, - @SerializedName("date_viewed") - val dateViewed: Int? = null + val cancelInfo: BaseLink? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketOrderItem.kt b/api/src/main/java/com/vk/sdk/api/market/dto/MarketOrderItem.kt similarity index 97% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketOrderItem.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/MarketOrderItem.kt index a5aabb166c..6ca2b07676 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketOrderItem.kt +++ b/api/src/main/java/com/vk/sdk/api/market/dto/MarketOrderItem.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.market.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.photos.dto.PhotosPhoto import kotlin.Int import kotlin.String @@ -45,7 +46,7 @@ import kotlin.collections.List */ data class MarketOrderItem( @SerializedName("owner_id") - val ownerId: Int, + val ownerId: UserId, @SerializedName("item_id") val itemId: Int, @SerializedName("price") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketPrice.kt b/api/src/main/java/com/vk/sdk/api/market/dto/MarketPrice.kt similarity index 72% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketPrice.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/MarketPrice.kt index c3330b40e4..7157f3178d 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketPrice.kt +++ b/api/src/main/java/com/vk/sdk/api/market/dto/MarketPrice.kt @@ -35,9 +35,6 @@ import kotlin.String * @param amount - Amount * @param currency * @param text - Text - * @param amountTo - Amount to for price_type=2 - * @param priceType - * @param priceUnit * @param discountRate * @param oldAmount * @param oldAmountText - Textual representation of old price @@ -49,45 +46,10 @@ data class MarketPrice( val currency: MarketCurrency, @SerializedName("text") val text: String, - @SerializedName("amount_to") - val amountTo: String? = null, - @SerializedName("price_type") - val priceType: MarketPrice.PriceType? = null, - @SerializedName("price_unit") - val priceUnit: MarketPrice.PriceUnit? = null, @SerializedName("discount_rate") val discountRate: Int? = null, @SerializedName("old_amount") val oldAmount: String? = null, @SerializedName("old_amount_text") val oldAmountText: String? = null -) { - enum class PriceType( - val value: Int - ) { - @SerializedName("0") - EXACT(0), - - @SerializedName("2") - RANGE(2), - - @SerializedName("3") - BY_AGREEMENT(3); - } - - enum class PriceUnit( - val value: Int - ) { - @SerializedName("0") - ITEM(0), - - @SerializedName("2") - HOUR(2), - - @SerializedName("3") - M2(3), - - @SerializedName("4") - M3(4); - } -} +) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketSearchExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/market/dto/MarketSearchExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketSearchExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/MarketSearchExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketSearchResponse.kt b/api/src/main/java/com/vk/sdk/api/market/dto/MarketSearchResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketSearchResponse.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/MarketSearchResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketCategoryNested.kt b/api/src/main/java/com/vk/sdk/api/market/dto/MarketSection.kt similarity index 88% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketCategoryNested.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/MarketSection.kt index c6e5c9e7d6..1a5b9eee84 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketMarketCategoryNested.kt +++ b/api/src/main/java/com/vk/sdk/api/market/dto/MarketSection.kt @@ -32,15 +32,12 @@ import kotlin.Int import kotlin.String /** - * @param id - Category ID - * @param name - Category name - * @param parent + * @param id - Section ID + * @param name - Section name */ -data class MarketMarketCategoryNested( +data class MarketSection( @SerializedName("id") val id: Int, @SerializedName("name") - val name: String, - @SerializedName("parent") - val parent: MarketMarketCategoryNested? = null + val name: String ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketServicesViewType.kt b/api/src/main/java/com/vk/sdk/api/market/dto/MarketServicesViewType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/MarketServicesViewType.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/MarketServicesViewType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/PaymentStatusParam.kt b/api/src/main/java/com/vk/sdk/api/market/dto/PaymentStatusParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/PaymentStatusParam.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/PaymentStatusParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/ReasonParam.kt b/api/src/main/java/com/vk/sdk/api/market/dto/ReasonParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/ReasonParam.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/ReasonParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/RevParam.kt b/api/src/main/java/com/vk/sdk/api/market/dto/RevParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/RevParam.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/RevParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/SortParam.kt b/api/src/main/java/com/vk/sdk/api/market/dto/SortParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/SortParam.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/SortParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/StatusParam.kt b/api/src/main/java/com/vk/sdk/api/market/dto/StatusParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/market/dto/StatusParam.kt rename to api/src/main/java/com/vk/sdk/api/market/dto/StatusParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/MessagesService.kt b/api/src/main/java/com/vk/sdk/api/messages/MessagesService.kt similarity index 98% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/MessagesService.kt rename to api/src/main/java/com/vk/sdk/api/messages/MessagesService.kt index 206f6c5f98..cba2709cf0 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/MessagesService.kt +++ b/api/src/main/java/com/vk/sdk/api/messages/MessagesService.kt @@ -43,9 +43,8 @@ import com.vk.sdk.api.messages.dto.MessagesGetByConversationMessageIdResponse import com.vk.sdk.api.messages.dto.MessagesGetByIdExtendedResponse import com.vk.sdk.api.messages.dto.MessagesGetByIdResponse import com.vk.sdk.api.messages.dto.MessagesGetChatPreviewResponse +import com.vk.sdk.api.messages.dto.MessagesGetConversationById import com.vk.sdk.api.messages.dto.MessagesGetConversationMembersResponse -import com.vk.sdk.api.messages.dto.MessagesGetConversationsByIdExtendedResponse -import com.vk.sdk.api.messages.dto.MessagesGetConversationsByIdResponse import com.vk.sdk.api.messages.dto.MessagesGetConversationsResponse import com.vk.sdk.api.messages.dto.MessagesGetHistoryAttachmentsResponse import com.vk.sdk.api.messages.dto.MessagesGetHistoryExtendedResponse @@ -141,13 +140,18 @@ class MessagesService { * @param spam - '1' - to mark message as spam. * @param groupId - Group ID (for group messages with user access token) * @param deleteForAll - '1' - delete message for for all. + * @param peerId - Destination ID. "For user: 'User ID', e.g. '12345'. For chat: '2000000000' + + * 'chat_id', e.g. '2000000001'. For community: '- community ID', e.g. '-12345'. " + * @param conversationMessageIds - Conversation message IDs. * @return [VKRequest] with [Any] */ fun messagesDelete( messageIds: List? = null, spam: Boolean? = null, groupId: Int? = null, - deleteForAll: Boolean? = null + deleteForAll: Boolean? = null, + peerId: Int? = null, + conversationMessageIds: List? = null ): VKRequest = NewApiRequest("messages.delete") { GsonHolder.gson.fromJson(it, Any::class.java) } @@ -156,6 +160,8 @@ class MessagesService { spam?.let { addParam("spam", it) } groupId?.let { addParam("group_id", it) } deleteForAll?.let { addParam("delete_for_all", it) } + peerId?.let { addParam("peer_id", it) } + conversationMessageIds?.let { addParam("conversation_message_ids", it) } } /** @@ -397,16 +403,12 @@ class MessagesService { * Returns a list of IDs of users participating in a chat. * * @param peerId - Peer ID. - * @param offset - Offset - * @param count - Count * @param fields - Profile fields to return. * @param groupId - Group ID (for group messages with group access token) * @return [VKRequest] with [MessagesGetConversationMembersResponse] */ fun messagesGetConversationMembers( peerId: Int, - offset: Int? = null, - count: Int? = null, fields: List? = null, groupId: Int? = null ): VKRequest = @@ -415,8 +417,6 @@ class MessagesService { } .apply { addParam("peer_id", peerId) - offset?.let { addParam("offset", it) } - count?.let { addParam("count", it) } val fieldsJsonConverted = fields?.map { it.value } @@ -466,15 +466,14 @@ class MessagesService { * '2000000000' + 'chat_id', e.g. '2000000001'. For community: '- community ID', e.g. '-12345'. " * @param fields - Profile and communities fields to return. * @param groupId - Group ID (for group messages with group access token) - * @return [VKRequest] with [MessagesGetConversationsByIdResponse] + * @return [VKRequest] with [MessagesGetConversationById] */ fun messagesGetConversationsById( peerIds: List, fields: List? = null, groupId: Int? = null - ): VKRequest = - NewApiRequest("messages.getConversationsById") { - GsonHolder.gson.fromJson(it, MessagesGetConversationsByIdResponse::class.java) + ): VKRequest = NewApiRequest("messages.getConversationsById") { + GsonHolder.gson.fromJson(it, MessagesGetConversationById::class.java) } .apply { addParam("peer_ids", peerIds) @@ -492,15 +491,14 @@ class MessagesService { * '2000000000' + 'chat_id', e.g. '2000000001'. For community: '- community ID', e.g. '-12345'. " * @param fields - Profile and communities fields to return. * @param groupId - Group ID (for group messages with group access token) - * @return [VKRequest] with [MessagesGetConversationsByIdExtendedResponse] + * @return [VKRequest] with [Any] */ fun messagesGetConversationsByIdExtended( peerIds: List, fields: List? = null, groupId: Int? = null - ): VKRequest = - NewApiRequest("messages.getConversationsById") { - GsonHolder.gson.fromJson(it, MessagesGetConversationsByIdExtendedResponse::class.java) + ): VKRequest = NewApiRequest("messages.getConversationsById") { + GsonHolder.gson.fromJson(it, Any::class.java) } .apply { addParam("peer_ids", peerIds) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/FilterParam.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/FilterParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/FilterParam.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/FilterParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/IntentParam.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/IntentParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/IntentParam.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/IntentParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MediaTypeParam.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MediaTypeParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MediaTypeParam.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MediaTypeParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesAudioMessage.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesAudioMessage.kt similarity index 97% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesAudioMessage.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesAudioMessage.kt index 953b98da1b..02de4906cc 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesAudioMessage.kt +++ b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesAudioMessage.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.messages.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import kotlin.Int import kotlin.String import kotlin.collections.List @@ -52,7 +53,7 @@ data class MessagesAudioMessage( @SerializedName("link_ogg") val linkOgg: String, @SerializedName("owner_id") - val ownerId: Int, + val ownerId: UserId, @SerializedName("waveform") val waveform: List, @SerializedName("access_key") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChat.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChat.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChat.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChat.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatPreview.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatPreview.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatPreview.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatPreview.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatPushSettings.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatPushSettings.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatPushSettings.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatPushSettings.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatRestrictions.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatRestrictions.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatRestrictions.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatRestrictions.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettings.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettings.kt similarity index 98% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettings.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettings.kt index 47f59c2b35..a9bd360921 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettings.kt +++ b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettings.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.messages.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import kotlin.Boolean import kotlin.Int import kotlin.String @@ -53,7 +54,7 @@ import kotlin.collections.List */ data class MessagesChatSettings( @SerializedName("owner_id") - val ownerId: Int, + val ownerId: UserId, @SerializedName("title") val title: String, @SerializedName("state") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettingsAcl.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettingsAcl.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettingsAcl.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettingsAcl.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettingsPermissions.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettingsPermissions.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettingsPermissions.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettingsPermissions.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettingsPhoto.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettingsPhoto.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettingsPhoto.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettingsPhoto.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettingsState.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettingsState.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettingsState.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesChatSettingsState.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversation.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversation.kt similarity index 92% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversation.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversation.kt index 67f418aa14..cbac990a3e 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversation.kt +++ b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversation.kt @@ -39,6 +39,7 @@ import kotlin.collections.List * @param inRead - Last message user have read * @param outRead - Last outcoming message have been read by the opponent * @param sortId + * @param lastConversationMessageId - Conversation message ID of the last message in conversation * @param unreadCount - Unread messages number * @param isMarkedUnread - Is this conversation uread * @param outReadBy @@ -55,6 +56,7 @@ import kotlin.collections.List * @param canReceiveMoney * @param chatSettings * @param spamExpiration + * @param isNew */ data class MessagesConversation( @SerializedName("peer") @@ -67,6 +69,8 @@ data class MessagesConversation( val outRead: Int, @SerializedName("sort_id") val sortId: MessagesConversationSortId? = null, + @SerializedName("last_conversation_message_id") + val lastConversationMessageId: Int? = null, @SerializedName("unread_count") val unreadCount: Int? = null, @SerializedName("is_marked_unread") @@ -98,7 +102,9 @@ data class MessagesConversation( @SerializedName("chat_settings") val chatSettings: MessagesChatSettings? = null, @SerializedName("spam_expiration") - val spamExpiration: Int? = null + val spamExpiration: Int? = null, + @SerializedName("is_new") + val isNew: Boolean? = null ) { enum class SpecialServiceType( val value: String diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationCanWrite.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationCanWrite.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationCanWrite.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationCanWrite.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationMember.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationMember.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationMember.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationMember.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationPeer.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationPeer.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationPeer.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationPeer.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationPeerType.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationPeerType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationPeerType.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationPeerType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationSortId.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationSortId.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationSortId.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationSortId.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationWithMessage.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationWithMessage.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationWithMessage.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesConversationWithMessage.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesDeleteChatPhotoResponse.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesDeleteChatPhotoResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesDeleteChatPhotoResponse.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesDeleteChatPhotoResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesDeleteConversationResponse.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesDeleteConversationResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesDeleteConversationResponse.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesDeleteConversationResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesForeignMessage.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesForeignMessage.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesForeignMessage.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesForeignMessage.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetByConversationMessageIdResponse.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetByConversationMessageIdResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetByConversationMessageIdResponse.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetByConversationMessageIdResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetByIdExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetByIdExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetByIdExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetByIdExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetByIdResponse.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetByIdResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetByIdResponse.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetByIdResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetChatPreviewResponse.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetChatPreviewResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetChatPreviewResponse.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetChatPreviewResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetConversationsByIdResponse.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetConversationById.kt similarity index 97% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetConversationsByIdResponse.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetConversationById.kt index 6f22b644e4..580cfdb1e1 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetConversationsByIdResponse.kt +++ b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetConversationById.kt @@ -35,7 +35,7 @@ import kotlin.collections.List * @param count - Total number * @param items */ -data class MessagesGetConversationsByIdResponse( +data class MessagesGetConversationById( @SerializedName("count") val count: Int, @SerializedName("items") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetConversationMembersResponse.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetConversationMembersResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetConversationMembersResponse.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetConversationMembersResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetConversationsResponse.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetConversationsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetConversationsResponse.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetConversationsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetHistoryAttachmentsResponse.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetHistoryAttachmentsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetHistoryAttachmentsResponse.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetHistoryAttachmentsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetHistoryExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetHistoryExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetHistoryExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetHistoryExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetHistoryResponse.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetHistoryResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetHistoryResponse.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetHistoryResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetImportantMessagesExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetImportantMessagesExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetImportantMessagesExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetImportantMessagesExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetImportantMessagesResponse.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetImportantMessagesResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetImportantMessagesResponse.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetImportantMessagesResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetIntentUsersResponse.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetIntentUsersResponse.kt similarity index 96% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetIntentUsersResponse.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetIntentUsersResponse.kt index ae71e5bf4d..c042b54ebe 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetIntentUsersResponse.kt +++ b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetIntentUsersResponse.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.messages.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.users.dto.UsersUserFull import kotlin.Int import kotlin.collections.List @@ -41,7 +42,7 @@ data class MessagesGetIntentUsersResponse( @SerializedName("count") val count: Int, @SerializedName("items") - val items: List, + val items: UserId, @SerializedName("profiles") val profiles: List? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetInviteLinkResponse.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetInviteLinkResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetInviteLinkResponse.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetInviteLinkResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetLongPollHistoryResponse.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetLongPollHistoryResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetLongPollHistoryResponse.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetLongPollHistoryResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGraffiti.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGraffiti.kt similarity index 97% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGraffiti.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGraffiti.kt index 04a2f47992..b464a6d228 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGraffiti.kt +++ b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGraffiti.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.messages.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import kotlin.Int import kotlin.String @@ -45,7 +46,7 @@ data class MessagesGraffiti( @SerializedName("id") val id: Int, @SerializedName("owner_id") - val ownerId: Int, + val ownerId: UserId, @SerializedName("url") val url: String, @SerializedName("width") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesHistoryAttachment.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesHistoryAttachment.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesHistoryAttachment.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesHistoryAttachment.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesHistoryMessageAttachment.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesHistoryMessageAttachment.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesHistoryMessageAttachment.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesHistoryMessageAttachment.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesHistoryMessageAttachmentType.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesHistoryMessageAttachmentType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesHistoryMessageAttachmentType.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesHistoryMessageAttachmentType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesIsMessagesFromGroupAllowedResponse.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesIsMessagesFromGroupAllowedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesIsMessagesFromGroupAllowedResponse.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesIsMessagesFromGroupAllowedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesJoinChatByInviteLinkResponse.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesJoinChatByInviteLinkResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesJoinChatByInviteLinkResponse.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesJoinChatByInviteLinkResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesKeyboard.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesKeyboard.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesKeyboard.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesKeyboard.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesKeyboardButton.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesKeyboardButton.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesKeyboardButton.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesKeyboardButton.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesKeyboardButtonAction.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesKeyboardButtonAction.kt similarity index 97% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesKeyboardButtonAction.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesKeyboardButtonAction.kt index 8689d090cd..5ef6dc88e0 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesKeyboardButtonAction.kt +++ b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesKeyboardButtonAction.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.messages.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import kotlin.Int import kotlin.String @@ -53,7 +54,7 @@ data class MessagesKeyboardButtonAction( @SerializedName("link") val link: String? = null, @SerializedName("owner_id") - val ownerId: Int? = null, + val ownerId: UserId? = null, @SerializedName("payload") val payload: String? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesLastActivity.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesLastActivity.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesLastActivity.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesLastActivity.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesLongpollMessages.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesLongpollMessages.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesLongpollMessages.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesLongpollMessages.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesLongpollParams.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesLongpollParams.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesLongpollParams.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesLongpollParams.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessage.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessage.kt similarity index 96% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessage.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessage.kt index 05f00ffa83..66e847fa91 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessage.kt +++ b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessage.kt @@ -64,6 +64,7 @@ import kotlin.collections.List * @param updateTime - Date when the message has been updated in Unixtime * @param wasListened - Was the audio message inside already listened by you * @param pinnedAt - Date when the message has been pinned in Unixtime + * @param isSilent - Is silent message, push without sound */ data class MessagesMessage( @SerializedName("date") @@ -117,5 +118,7 @@ data class MessagesMessage( @SerializedName("was_listened") val wasListened: Boolean? = null, @SerializedName("pinned_at") - val pinnedAt: Int? = null + val pinnedAt: Int? = null, + @SerializedName("is_silent") + val isSilent: Boolean? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessageAttachment.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessageAttachment.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessageAttachment.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessageAttachment.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessageAttachmentType.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessageAttachmentType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessageAttachmentType.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessageAttachmentType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessageRequestData.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessageRequestData.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessageRequestData.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessageRequestData.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessagesArray.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessagesArray.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessagesArray.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesMessagesArray.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesOutReadBy.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesOutReadBy.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesOutReadBy.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesOutReadBy.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesPinnedMessage.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesPinnedMessage.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesPinnedMessage.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesPinnedMessage.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesPushSettings.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesPushSettings.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesPushSettings.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesPushSettings.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSearchConversationsExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSearchConversationsExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSearchConversationsExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSearchConversationsExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSearchConversationsResponse.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSearchConversationsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSearchConversationsResponse.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSearchConversationsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSearchExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSearchExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSearchExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSearchExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSearchResponse.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSearchResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSearchResponse.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSearchResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSetChatPhotoResponse.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSetChatPhotoResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSetChatPhotoResponse.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesSetChatPhotoResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesTemplateActionTypeNames.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/MessagesTemplateActionTypeNames.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesTemplateActionTypeNames.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/MessagesTemplateActionTypeNames.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/RevParam.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/RevParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/RevParam.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/RevParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/TypeParam.kt b/api/src/main/java/com/vk/sdk/api/messages/dto/TypeParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/TypeParam.kt rename to api/src/main/java/com/vk/sdk/api/messages/dto/TypeParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/NewsfeedService.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/NewsfeedService.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/NewsfeedService.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/NewsfeedService.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NameCaseParam.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NameCaseParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NameCaseParam.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NameCaseParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedCommentsFilters.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedCommentsFilters.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedCommentsFilters.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedCommentsFilters.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedEventActivity.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedEventActivity.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedEventActivity.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedEventActivity.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedExpertCardWidget.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedExpertCardWidget.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedExpertCardWidget.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedExpertCardWidget.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedExpertCardWidgetRating.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedExpertCardWidgetRating.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedExpertCardWidgetRating.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedExpertCardWidgetRating.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedFilters.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedFilters.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedFilters.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedFilters.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetBannedExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetBannedExtendedResponse.kt similarity index 94% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetBannedExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetBannedExtendedResponse.kt index 013fa69314..a27dc1f1f7 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetBannedExtendedResponse.kt +++ b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetBannedExtendedResponse.kt @@ -33,12 +33,12 @@ import com.vk.sdk.api.users.dto.UsersUserFull import kotlin.collections.List /** - * @param groups * @param profiles + * @param groups */ data class NewsfeedGetBannedExtendedResponse( - @SerializedName("groups") - val groups: List? = null, @SerializedName("profiles") - val profiles: List? = null + val profiles: List? = null, + @SerializedName("groups") + val groups: List? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetBannedResponse.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetBannedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetBannedResponse.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetBannedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetCommentsResponse.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetCommentsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetCommentsResponse.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetCommentsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetListsExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetListsExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetListsExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetListsExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetListsResponse.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetListsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetListsResponse.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetListsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetMentionsResponse.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetMentionsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetMentionsResponse.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetMentionsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetRecommendedResponse.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetRecommendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetRecommendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetRecommendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetResponse.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetResponse.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetSuggestedSourcesResponse.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetSuggestedSourcesResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetSuggestedSourcesResponse.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedGetSuggestedSourcesResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemAnimatedBlockAnimation.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemAnimatedBlockAnimation.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemAnimatedBlockAnimation.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemAnimatedBlockAnimation.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemAudioAudio.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemAudioAudio.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemAudioAudio.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemAudioAudio.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemDigestButton.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemDigestButton.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemDigestButton.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemDigestButton.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemDigestFooter.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemDigestFooter.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemDigestFooter.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemDigestFooter.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemDigestHeader.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemDigestHeader.kt similarity index 93% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemDigestHeader.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemDigestHeader.kt index 989327447c..b0f750275c 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemDigestHeader.kt +++ b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemDigestHeader.kt @@ -34,7 +34,6 @@ import kotlin.String * @param title - Title of the header * @param style * @param subtitle - Subtitle of the header, when title have two strings - * @param badgeText - Optional field for red badge in Trends feed blocks * @param button */ data class NewsfeedItemDigestHeader( @@ -44,8 +43,6 @@ data class NewsfeedItemDigestHeader( val style: NewsfeedItemDigestHeader.Style, @SerializedName("subtitle") val subtitle: String? = null, - @SerializedName("badge_text") - val badgeText: String? = null, @SerializedName("button") val button: NewsfeedItemDigestButton? = null ) { diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemDigestItem.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemDigestItem.kt similarity index 96% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemDigestItem.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemDigestItem.kt index 8ddac12b55..5552b3d348 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemDigestItem.kt +++ b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemDigestItem.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.newsfeed.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.base.dto.BaseLikesInfo import com.vk.sdk.api.base.dto.BaseRepostsInfo import com.vk.sdk.api.wall.dto.WallGeo @@ -44,6 +45,7 @@ import kotlin.collections.List /** * @param accessKey - Access key to private object + * @param isDeleted * @param attachments * @param copyright - Information about the source of the post * @param date - Date of publishing in Unixtime @@ -68,6 +70,8 @@ import kotlin.collections.List data class NewsfeedItemDigestItem( @SerializedName("access_key") val accessKey: String? = null, + @SerializedName("is_deleted") + val isDeleted: Boolean? = null, @SerializedName("attachments") val attachments: List? = null, @SerializedName("copyright") @@ -89,7 +93,7 @@ data class NewsfeedItemDigestItem( @SerializedName("likes") val likes: BaseLikesInfo? = null, @SerializedName("owner_id") - val ownerId: Int? = null, + val ownerId: UserId? = null, @SerializedName("poster") val poster: Any? = null, @SerializedName("post_id") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFeedbackPollBanner.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFeedbackPollBanner.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFeedbackPollBanner.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFeedbackPollBanner.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFeedbackPollGratitude.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFeedbackPollGratitude.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFeedbackPollGratitude.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFeedbackPollGratitude.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFeedbackPollPoll.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFeedbackPollPoll.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFeedbackPollPoll.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFeedbackPollPoll.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFeedbackPollQuestion.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFeedbackPollQuestion.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFeedbackPollQuestion.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFeedbackPollQuestion.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFeedbackPollQuestionAnswer.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFeedbackPollQuestionAnswer.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFeedbackPollQuestionAnswer.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFeedbackPollQuestionAnswer.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFeedbackPollQuestionEntry.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFeedbackPollQuestionEntry.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFeedbackPollQuestionEntry.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFeedbackPollQuestionEntry.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFriendFriends.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFriendFriends.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFriendFriends.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemFriendFriends.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemPhotoPhotos.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemPhotoPhotos.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemPhotoPhotos.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemPhotoPhotos.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemPhotoTagPhotoTags.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemPhotoTagPhotoTags.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemPhotoTagPhotoTags.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemPhotoTagPhotoTags.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemPromoButtonAction.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemPromoButtonAction.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemPromoButtonAction.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemPromoButtonAction.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemPromoButtonImage.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemPromoButtonImage.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemPromoButtonImage.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemPromoButtonImage.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemVideoVideo.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemVideoVideo.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemVideoVideo.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemVideoVideo.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemWallpostFeedback.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemWallpostFeedback.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemWallpostFeedback.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemWallpostFeedback.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemWallpostFeedbackAnswer.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemWallpostFeedbackAnswer.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemWallpostFeedbackAnswer.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemWallpostFeedbackAnswer.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemWallpostFeedbackType.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemWallpostFeedbackType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemWallpostFeedbackType.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemWallpostFeedbackType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemWallpostType.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemWallpostType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemWallpostType.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedItemWallpostType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedList.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedList.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedList.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedList.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedListFull.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedListFull.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedListFull.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedListFull.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedNewsfeedItem.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedNewsfeedItem.kt similarity index 76% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedNewsfeedItem.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedNewsfeedItem.kt index d381c83368..10f13107c5 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedNewsfeedItem.kt +++ b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedNewsfeedItem.kt @@ -31,10 +31,9 @@ import com.google.gson.JsonDeserializationContext import com.google.gson.JsonDeserializer import com.google.gson.JsonElement import com.google.gson.annotations.SerializedName +import com.vk.sdk.api.aliexpress.dto.AliexpressBlockPanel +import com.vk.sdk.api.aliexpress.dto.AliexpressCarouselItem import com.vk.sdk.api.apps.dto.AppsApp -import com.vk.sdk.api.audio.dto.AudioArtist -import com.vk.sdk.api.audio.dto.AudioAudio -import com.vk.sdk.api.audio.dto.AudioPlaylist import com.vk.sdk.api.base.dto.BaseBoolInt import com.vk.sdk.api.base.dto.BaseCommentsInfo import com.vk.sdk.api.base.dto.BaseGeo @@ -42,17 +41,17 @@ import com.vk.sdk.api.base.dto.BaseImage import com.vk.sdk.api.base.dto.BaseLikesInfo import com.vk.sdk.api.base.dto.BaseLinkButton import com.vk.sdk.api.base.dto.BaseRepostsInfo +import com.vk.sdk.api.classifieds.dto.ClassifiedsYoulaCarouselBlockGroup +import com.vk.sdk.api.classifieds.dto.ClassifiedsYoulaItemExtended import com.vk.sdk.api.discover.dto.DiscoverCarouselButton import com.vk.sdk.api.discover.dto.DiscoverCarouselItem import com.vk.sdk.api.discover.dto.DiscoverCarouselObjectsType import com.vk.sdk.api.groups.dto.GroupsSuggestion import com.vk.sdk.api.photos.dto.PhotosTagsSuggestionItem import com.vk.sdk.api.photos.dto.PhotosTagsSuggestionItemEndCard -import com.vk.sdk.api.shortVideo.dto.ShortVideoChallengeFeedItem import com.vk.sdk.api.stories.dto.StoriesStory import com.vk.sdk.api.textlives.dto.TextlivesTextliveTextpostBlock import com.vk.sdk.api.video.dto.VideoVideo -import com.vk.sdk.api.video.dto.VideoVideoFull import com.vk.sdk.api.wall.dto.WallPostSource import com.vk.sdk.api.wall.dto.WallViews import com.vk.sdk.api.wall.dto.WallWallpost @@ -515,9 +514,9 @@ sealed class NewsfeedNewsfeedItem { /** * @param button * @param items - * @param title * @param objects * @param objectsType + * @param title * @param trackCode * @param type * @param sourceId - Item source ID @@ -525,15 +524,15 @@ sealed class NewsfeedNewsfeedItem { */ data class NewsfeedItemGamesCarousel( @SerializedName("button") - val button: DiscoverCarouselButton, + val button: DiscoverCarouselButton? = null, @SerializedName("items") - val items: List, - @SerializedName("title") - val title: String, + val items: List? = null, @SerializedName("objects") val objects: List? = null, @SerializedName("objects_type") val objectsType: DiscoverCarouselObjectsType? = null, + @SerializedName("title") + val title: String? = null, @SerializedName("track_code") val trackCode: String? = null, @SerializedName("type") @@ -546,6 +545,8 @@ sealed class NewsfeedNewsfeedItem { /** * @param textliveTextpostBlock + * @param trackCode + * @param keepOffline * @param type * @param sourceId - Item source ID * @param date - Date when item has been added in Unixtime @@ -553,29 +554,10 @@ sealed class NewsfeedNewsfeedItem { data class NewsfeedItemTextliveBlock( @SerializedName("textlive_textpost_block") val textliveTextpostBlock: TextlivesTextliveTextpostBlock? = null, - @SerializedName("type") - val type: NewsfeedNewsfeedItemType? = null, - @SerializedName("source_id") - val sourceId: Int? = null, - @SerializedName("date") - val date: Int? = null - ) : NewsfeedNewsfeedItem() - - /** - * @param title - * @param trackCode - * @param item - * @param type - * @param sourceId - Item source ID - * @param date - Date when item has been added in Unixtime - */ - data class NewsfeedItemVideosPromoBlock( - @SerializedName("title") - val title: String? = null, @SerializedName("track_code") val trackCode: String? = null, - @SerializedName("item") - val item: VideoVideoFull? = null, + @SerializedName("keep_offline") + val keepOffline: Boolean? = null, @SerializedName("type") val type: NewsfeedNewsfeedItemType? = null, @SerializedName("source_id") @@ -585,115 +567,71 @@ sealed class NewsfeedNewsfeedItem { ) : NewsfeedNewsfeedItem() /** - * @param title - Title of the block - * @param type - type - * @param button - * @param artists - Items of the block - * @param trackCode - Track code of the block - */ - data class NewsfeedItemRecommendedArtistsBlock( - @SerializedName("title") - val title: String, - @SerializedName("type") - val type: NewsfeedItemRecommendedArtistsBlock.Type, - @SerializedName("button") - val button: BaseLinkButton, - @SerializedName("artists") - val artists: List? = null, - @SerializedName("track_code") - val trackCode: String? = null - ) : NewsfeedNewsfeedItem() { - enum class Type( - val value: String - ) { - @SerializedName("recommended_artists") - RECOMMENDED_ARTISTS("recommended_artists"); - } - } - - /** - * @param title - Title of the block * @param type - type - * @param button - * @param playlists - Items of the block - * @param trackCode - Track code of the block + * @param items + * @param createButtonUrl - Create button url + * @param moreButtonUrl - More button url + * @param blockTitle - Block title + * @param blockDescription - Block description + * @param trackCode + * @param group */ - data class NewsfeedItemMusicSelectionsBlock( - @SerializedName("title") - val title: String, + data class NewsfeedItemYoulaCarouselBlock( @SerializedName("type") - val type: NewsfeedItemMusicSelectionsBlock.Type, - @SerializedName("button") - val button: BaseLinkButton, - @SerializedName("playlists") - val playlists: List? = null, + val type: NewsfeedItemYoulaCarouselBlock.Type, + @SerializedName("items") + val items: List, + @SerializedName("create_button_url") + val createButtonUrl: String, + @SerializedName("more_button_url") + val moreButtonUrl: String, + @SerializedName("block_title") + val blockTitle: String? = null, + @SerializedName("block_description") + val blockDescription: String? = null, @SerializedName("track_code") - val trackCode: String? = null + val trackCode: String? = null, + @SerializedName("group") + val group: ClassifiedsYoulaCarouselBlockGroup? = null ) : NewsfeedNewsfeedItem() { enum class Type( val value: String ) { - @SerializedName("recommended_playlists") - RECOMMENDED_PLAYLISTS("recommended_playlists"); + @SerializedName("youla_carousel") + YOULA_CAROUSEL("youla_carousel"); } } /** - * @param title - Title of the block * @param type - type - * @param button - * @param audios - Items of the block - * @param trackCode - Track code of the block + * @param blockTitle - Block title + * @param items + * @param moreButton - More button url + * @param trackCode + * @param blockPanel - Block top panel */ - data class NewsfeedItemRecommendedAudiosBlock( - @SerializedName("title") - val title: String, + data class NewsfeedItemAliexpressCarouselBlock( @SerializedName("type") - val type: NewsfeedItemRecommendedAudiosBlock.Type, - @SerializedName("button") - val button: BaseLinkButton, - @SerializedName("audios") - val audios: List? = null, + val type: NewsfeedItemAliexpressCarouselBlock.Type, + @SerializedName("block_title") + val blockTitle: String, + @SerializedName("items") + val items: List, + @SerializedName("more_button") + val moreButton: BaseLinkButton, @SerializedName("track_code") - val trackCode: String? = null + val trackCode: String, + @SerializedName("block_panel") + val blockPanel: AliexpressBlockPanel? = null ) : NewsfeedNewsfeedItem() { enum class Type( val value: String ) { - @SerializedName("recommended_audios") - RECOMMENDED_AUDIOS("recommended_audios"); + @SerializedName("aliexpress_carousel") + ALIEXPRESS_CAROUSEL("aliexpress_carousel"); } } - /** - * @param title - * @param trackCode - * @param items - * @param type - * @param sourceId - Item source ID - * @param date - Date when item has been added in Unixtime - * @param nextFrom - Next from value - * @param button - */ - data class NewsfeedItemClipsAutoplayBlock( - @SerializedName("title") - val title: String, - @SerializedName("track_code") - val trackCode: String, - @SerializedName("items") - val items: List, - @SerializedName("type") - val type: NewsfeedNewsfeedItemType, - @SerializedName("source_id") - val sourceId: Int, - @SerializedName("date") - val date: Int, - @SerializedName("next_from") - val nextFrom: String? = null, - @SerializedName("button") - val button: BaseLinkButton? = null - ) : NewsfeedNewsfeedItem() - /** * @param app * @param title @@ -729,29 +667,6 @@ sealed class NewsfeedNewsfeedItem { val date: Int? = null ) : NewsfeedNewsfeedItem() - /** - * @param title - * @param trackCode - * @param items - * @param type - * @param sourceId - Item source ID - * @param date - Date when item has been added in Unixtime - */ - data class NewsfeedItemClipsChallengesBlockWrapped( - @SerializedName("title") - val title: String? = null, - @SerializedName("track_code") - val trackCode: String? = null, - @SerializedName("items") - val items: List? = null, - @SerializedName("type") - val type: NewsfeedNewsfeedItemType? = null, - @SerializedName("source_id") - val sourceId: Int? = null, - @SerializedName("date") - val date: Int? = null - ) : NewsfeedNewsfeedItem() - /** * @param type * @param expertCard @@ -770,29 +685,6 @@ sealed class NewsfeedNewsfeedItem { } } - /** - * @param title - * @param trackCode - * @param items - * @param type - * @param sourceId - Item source ID - * @param date - Date when item has been added in Unixtime - */ - data class NewsfeedItemClipsChallengesBlock( - @SerializedName("title") - val title: String? = null, - @SerializedName("track_code") - val trackCode: String? = null, - @SerializedName("items") - val items: List? = null, - @SerializedName("type") - val type: NewsfeedNewsfeedItemType? = null, - @SerializedName("source_id") - val sourceId: Int? = null, - @SerializedName("date") - val date: Int? = null - ) : NewsfeedNewsfeedItem() - class Deserializer : JsonDeserializer { override fun deserialize( json: JsonElement, @@ -811,31 +703,6 @@ sealed class NewsfeedNewsfeedItem { "topic" -> context.deserialize(json, NewsfeedItemTopic::class.java) "digest" -> context.deserialize(json, NewsfeedItemDigest::class.java) "promo_button" -> context.deserialize(json, NewsfeedItemPromoButton::class.java) - "stories" -> context.deserialize(json, NewsfeedItemStoriesBlock::class.java) - "feedback_poll" -> context.deserialize(json, NewsfeedItemFeedbackPoll::class.java) - "animated_block" -> context.deserialize(json, NewsfeedItemAnimatedBlock::class.java) - "clips" -> context.deserialize(json, NewsfeedItemClipsBlock::class.java) - "recommended_groups" -> context.deserialize(json, - NewsfeedItemRecommendedGroupsBlock::class.java) - "tags_suggestions" -> context.deserialize(json, - NewsfeedItemRecognizeBlock::class.java) - "games_carousel" -> context.deserialize(json, NewsfeedItemGamesCarousel::class.java) - "textlive" -> context.deserialize(json, NewsfeedItemTextliveBlock::class.java) - "videos_promo" -> context.deserialize(json, - NewsfeedItemVideosPromoBlock::class.java) - "recommended_artists" -> context.deserialize(json, - NewsfeedItemRecommendedArtistsBlock::class.java) - "recommended_playlists" -> context.deserialize(json, - NewsfeedItemMusicSelectionsBlock::class.java) - "recommended_audios" -> context.deserialize(json, - NewsfeedItemRecommendedAudiosBlock::class.java) - "clips_autoplay" -> context.deserialize(json, - NewsfeedItemClipsAutoplayBlock::class.java) - "recommended_game" -> context.deserialize(json, - NewsfeedItemRecommendedGameBlock::class.java) - "clips_challenges" -> context.deserialize(json, - NewsfeedItemClipsChallengesBlock::class.java) - "expert_card" -> context.deserialize(json, NewsfeedItemExpertCardWidget::class.java) else -> throw IllegalStateException("no mapping for the type:" + type) } } diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedNewsfeedItemType.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedNewsfeedItemType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedNewsfeedItemType.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedNewsfeedItemType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedNewsfeedPhoto.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedNewsfeedPhoto.kt similarity index 93% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedNewsfeedPhoto.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedNewsfeedPhoto.kt index 42ec55242d..425a00929c 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedNewsfeedPhoto.kt +++ b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedNewsfeedPhoto.kt @@ -28,10 +28,10 @@ package com.vk.sdk.api.newsfeed.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.base.dto.BaseBoolInt import com.vk.sdk.api.base.dto.BaseLikes import com.vk.sdk.api.base.dto.BaseObjectCount -import com.vk.sdk.api.media.dto.MediaRestriction import com.vk.sdk.api.photos.dto.PhotosImage import com.vk.sdk.api.photos.dto.PhotosPhotoSizes import kotlin.Boolean @@ -62,7 +62,6 @@ import kotlin.collections.List * @param userId - ID of the user who have uploaded the photo * @param width - Original photo width * @param hasTags - Whether photo has attached tag links - * @param restrictions */ data class NewsfeedNewsfeedPhoto( @SerializedName("likes") @@ -88,7 +87,7 @@ data class NewsfeedNewsfeedPhoto( @SerializedName("long") val long: Float? = null, @SerializedName("owner_id") - val ownerId: Int? = null, + val ownerId: UserId? = null, @SerializedName("photo_256") val photo256: String? = null, @SerializedName("can_comment") @@ -102,11 +101,9 @@ data class NewsfeedNewsfeedPhoto( @SerializedName("text") val text: String? = null, @SerializedName("user_id") - val userId: Int? = null, + val userId: UserId? = null, @SerializedName("width") val width: Int? = null, @SerializedName("has_tags") - val hasTags: Boolean? = null, - @SerializedName("restrictions") - val restrictions: MediaRestriction? = null + val hasTags: Boolean? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedSearchExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedSearchExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedSearchExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedSearchExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedSearchResponse.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedSearchResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedSearchResponse.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/NewsfeedSearchResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/TypeParam.kt b/api/src/main/java/com/vk/sdk/api/newsfeed/dto/TypeParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/newsfeed/dto/TypeParam.kt rename to api/src/main/java/com/vk/sdk/api/newsfeed/dto/TypeParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/notes/NotesService.kt b/api/src/main/java/com/vk/sdk/api/notes/NotesService.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/notes/NotesService.kt rename to api/src/main/java/com/vk/sdk/api/notes/NotesService.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/notes/dto/NotesGetCommentsResponse.kt b/api/src/main/java/com/vk/sdk/api/notes/dto/NotesGetCommentsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/notes/dto/NotesGetCommentsResponse.kt rename to api/src/main/java/com/vk/sdk/api/notes/dto/NotesGetCommentsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/notes/dto/NotesGetResponse.kt b/api/src/main/java/com/vk/sdk/api/notes/dto/NotesGetResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/notes/dto/NotesGetResponse.kt rename to api/src/main/java/com/vk/sdk/api/notes/dto/NotesGetResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/notes/dto/NotesNote.kt b/api/src/main/java/com/vk/sdk/api/notes/dto/NotesNote.kt similarity index 97% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/notes/dto/NotesNote.kt rename to api/src/main/java/com/vk/sdk/api/notes/dto/NotesNote.kt index 22733ee39c..250d0434a7 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/notes/dto/NotesNote.kt +++ b/api/src/main/java/com/vk/sdk/api/notes/dto/NotesNote.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.notes.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.base.dto.BaseBoolInt import kotlin.Int import kotlin.String @@ -52,7 +53,7 @@ data class NotesNote( @SerializedName("id") val id: Int, @SerializedName("owner_id") - val ownerId: Int, + val ownerId: UserId, @SerializedName("title") val title: String, @SerializedName("view_url") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/notes/dto/NotesNoteComment.kt b/api/src/main/java/com/vk/sdk/api/notes/dto/NotesNoteComment.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/notes/dto/NotesNoteComment.kt rename to api/src/main/java/com/vk/sdk/api/notes/dto/NotesNoteComment.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/notes/dto/SortParam.kt b/api/src/main/java/com/vk/sdk/api/notes/dto/SortParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/notes/dto/SortParam.kt rename to api/src/main/java/com/vk/sdk/api/notes/dto/SortParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/notifications/NotificationsService.kt b/api/src/main/java/com/vk/sdk/api/notifications/NotificationsService.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/notifications/NotificationsService.kt rename to api/src/main/java/com/vk/sdk/api/notifications/NotificationsService.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/notifications/dto/FiltersParam.kt b/api/src/main/java/com/vk/sdk/api/notifications/dto/FiltersParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/notifications/dto/FiltersParam.kt rename to api/src/main/java/com/vk/sdk/api/notifications/dto/FiltersParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsFeedback.kt b/api/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsFeedback.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsFeedback.kt rename to api/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsFeedback.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsGetResponse.kt b/api/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsGetResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsGetResponse.kt rename to api/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsGetResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsNotificationItem.kt b/api/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsNotificationItem.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsNotificationItem.kt rename to api/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsNotificationItem.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsNotificationParent.kt b/api/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsNotificationParent.kt similarity index 97% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsNotificationParent.kt rename to api/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsNotificationParent.kt index 00a804e7d6..f0da206064 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsNotificationParent.kt +++ b/api/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsNotificationParent.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.notifications.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.audio.dto.AudioArtist import com.vk.sdk.api.audio.dto.AudioGenre import com.vk.sdk.api.base.dto.BaseBoolInt @@ -35,7 +36,6 @@ import com.vk.sdk.api.base.dto.BaseLikes import com.vk.sdk.api.base.dto.BasePropertyExists import com.vk.sdk.api.base.dto.BaseRepostsInfo import com.vk.sdk.api.board.dto.BoardTopic -import com.vk.sdk.api.media.dto.MediaRestriction import com.vk.sdk.api.photos.dto.PhotosImage import com.vk.sdk.api.photos.dto.PhotosPhoto import com.vk.sdk.api.photos.dto.PhotosPhotoSizes @@ -83,7 +83,6 @@ import kotlin.collections.List * @param userId - Id of the user who uploaded the video if it was uploaded to a group by member * @param width - Video width * @param hasTags - Whether photo has attached tag links - * @param restrictions * @param created - Date when the topic has been created in Unixtime * @param createdBy - Creator ID * @param isClosed - Information whether the topic is closed @@ -107,7 +106,6 @@ import kotlin.collections.List * @param player - Video embed URL * @param processing - Returns if the video is processing * @param converting - 1 if video is being converted - * @param restriction * @param added - 1 if video is added to user's albums * @param isSubscribed - 1 if user is subscribed to author of the video * @param trackCode @@ -183,7 +181,7 @@ data class NotificationsNotificationParent( @SerializedName("long") val long: Float? = null, @SerializedName("owner_id") - val ownerId: Int? = null, + val ownerId: UserId? = null, @SerializedName("photo_256") val photo256: String? = null, @SerializedName("can_comment") @@ -193,13 +191,11 @@ data class NotificationsNotificationParent( @SerializedName("sizes") val sizes: List? = null, @SerializedName("user_id") - val userId: Int? = null, + val userId: UserId? = null, @SerializedName("width") val width: Int? = null, @SerializedName("has_tags") val hasTags: Boolean? = null, - @SerializedName("restrictions") - val restrictions: MediaRestriction? = null, @SerializedName("created") val created: Int? = null, @SerializedName("created_by") @@ -246,8 +242,6 @@ data class NotificationsNotificationParent( val processing: BasePropertyExists? = null, @SerializedName("converting") val converting: BaseBoolInt? = null, - @SerializedName("restriction") - val restriction: MediaRestriction? = null, @SerializedName("added") val added: BaseBoolInt? = null, @SerializedName("is_subscribed") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsReply.kt b/api/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsReply.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsReply.kt rename to api/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsReply.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsSendMessageError.kt b/api/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsSendMessageError.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsSendMessageError.kt rename to api/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsSendMessageError.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsSendMessageItem.kt b/api/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsSendMessageItem.kt similarity index 96% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsSendMessageItem.kt rename to api/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsSendMessageItem.kt index ef6c229c88..8f9c7ebb5d 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsSendMessageItem.kt +++ b/api/src/main/java/com/vk/sdk/api/notifications/dto/NotificationsSendMessageItem.kt @@ -28,8 +28,8 @@ package com.vk.sdk.api.notifications.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import kotlin.Boolean -import kotlin.Int /** * @param userId - User ID @@ -38,7 +38,7 @@ import kotlin.Int */ data class NotificationsSendMessageItem( @SerializedName("user_id") - val userId: Int? = null, + val userId: UserId? = null, @SerializedName("status") val status: Boolean? = null, @SerializedName("error") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/notifications/dto/SendingModeParam.kt b/api/src/main/java/com/vk/sdk/api/notifications/dto/SendingModeParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/notifications/dto/SendingModeParam.kt rename to api/src/main/java/com/vk/sdk/api/notifications/dto/SendingModeParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/orders/OrdersService.kt b/api/src/main/java/com/vk/sdk/api/orders/OrdersService.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/orders/OrdersService.kt rename to api/src/main/java/com/vk/sdk/api/orders/OrdersService.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/orders/dto/ActionParam.kt b/api/src/main/java/com/vk/sdk/api/orders/dto/ActionParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/orders/dto/ActionParam.kt rename to api/src/main/java/com/vk/sdk/api/orders/dto/ActionParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/orders/dto/OrdersAmount.kt b/api/src/main/java/com/vk/sdk/api/orders/dto/OrdersAmount.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/orders/dto/OrdersAmount.kt rename to api/src/main/java/com/vk/sdk/api/orders/dto/OrdersAmount.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/orders/dto/OrdersAmountItem.kt b/api/src/main/java/com/vk/sdk/api/orders/dto/OrdersAmountItem.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/orders/dto/OrdersAmountItem.kt rename to api/src/main/java/com/vk/sdk/api/orders/dto/OrdersAmountItem.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/orders/dto/OrdersGetUserSubscriptionsResponse.kt b/api/src/main/java/com/vk/sdk/api/orders/dto/OrdersGetUserSubscriptionsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/orders/dto/OrdersGetUserSubscriptionsResponse.kt rename to api/src/main/java/com/vk/sdk/api/orders/dto/OrdersGetUserSubscriptionsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/orders/dto/OrdersOrder.kt b/api/src/main/java/com/vk/sdk/api/orders/dto/OrdersOrder.kt similarity index 97% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/orders/dto/OrdersOrder.kt rename to api/src/main/java/com/vk/sdk/api/orders/dto/OrdersOrder.kt index dc60503b36..88f2b7c276 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/orders/dto/OrdersOrder.kt +++ b/api/src/main/java/com/vk/sdk/api/orders/dto/OrdersOrder.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.orders.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import kotlin.Int import kotlin.String @@ -63,5 +64,5 @@ data class OrdersOrder( @SerializedName("transaction_id") val transactionId: Int? = null, @SerializedName("user_id") - val userId: Int? = null + val userId: UserId? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/orders/dto/OrdersSubscription.kt b/api/src/main/java/com/vk/sdk/api/orders/dto/OrdersSubscription.kt similarity index 83% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/orders/dto/OrdersSubscription.kt rename to api/src/main/java/com/vk/sdk/api/orders/dto/OrdersSubscription.kt index 0ee78cdd9e..846c5a9640 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/orders/dto/OrdersSubscription.kt +++ b/api/src/main/java/com/vk/sdk/api/orders/dto/OrdersSubscription.kt @@ -43,7 +43,12 @@ import kotlin.String * @param updateTime - Date of last change in Unixtime * @param cancelReason - Cancel reason * @param nextBillTime - Date of next bill in Unixtime + * @param expireTime - Subscription expiration time in Unixtime * @param pendingCancel - Pending cancel state + * @param title - Subscription name + * @param appId - Subscription's application id + * @param applicationName - Subscription's application name + * @param photoUrl - Item photo image url * @param testMode - Is test subscription * @param trialExpireTime - Date of trial expire in Unixtime */ @@ -68,8 +73,18 @@ data class OrdersSubscription( val cancelReason: String? = null, @SerializedName("next_bill_time") val nextBillTime: Int? = null, + @SerializedName("expire_time") + val expireTime: Int? = null, @SerializedName("pending_cancel") val pendingCancel: Boolean? = null, + @SerializedName("title") + val title: String? = null, + @SerializedName("app_id") + val appId: Int? = null, + @SerializedName("application_name") + val applicationName: String? = null, + @SerializedName("photo_url") + val photoUrl: String? = null, @SerializedName("test_mode") val testMode: Boolean? = null, @SerializedName("trial_expire_time") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/owner/dto/OwnerState.kt b/api/src/main/java/com/vk/sdk/api/owner/dto/OwnerState.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/owner/dto/OwnerState.kt rename to api/src/main/java/com/vk/sdk/api/owner/dto/OwnerState.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/pages/PagesService.kt b/api/src/main/java/com/vk/sdk/api/pages/PagesService.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/pages/PagesService.kt rename to api/src/main/java/com/vk/sdk/api/pages/PagesService.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/pages/dto/EditParam.kt b/api/src/main/java/com/vk/sdk/api/pages/dto/EditParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/pages/dto/EditParam.kt rename to api/src/main/java/com/vk/sdk/api/pages/dto/EditParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/pages/dto/PagesPrivacySettings.kt b/api/src/main/java/com/vk/sdk/api/pages/dto/PagesPrivacySettings.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/pages/dto/PagesPrivacySettings.kt rename to api/src/main/java/com/vk/sdk/api/pages/dto/PagesPrivacySettings.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/pages/dto/PagesWikipage.kt b/api/src/main/java/com/vk/sdk/api/pages/dto/PagesWikipage.kt similarity index 97% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/pages/dto/PagesWikipage.kt rename to api/src/main/java/com/vk/sdk/api/pages/dto/PagesWikipage.kt index 03889fed0b..d9318b86b4 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/pages/dto/PagesWikipage.kt +++ b/api/src/main/java/com/vk/sdk/api/pages/dto/PagesWikipage.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.pages.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import kotlin.Int import kotlin.String @@ -45,7 +46,7 @@ import kotlin.String */ data class PagesWikipage( @SerializedName("group_id") - val groupId: Int, + val groupId: UserId, @SerializedName("id") val id: Int, @SerializedName("title") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/pages/dto/PagesWikipageFull.kt b/api/src/main/java/com/vk/sdk/api/pages/dto/PagesWikipageFull.kt similarity index 88% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/pages/dto/PagesWikipageFull.kt rename to api/src/main/java/com/vk/sdk/api/pages/dto/PagesWikipageFull.kt index 45f09fd290..b14e599463 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/pages/dto/PagesWikipageFull.kt +++ b/api/src/main/java/com/vk/sdk/api/pages/dto/PagesWikipageFull.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.pages.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.base.dto.BaseBoolInt import kotlin.Int import kotlin.String @@ -49,6 +50,10 @@ import kotlin.String * @param editorId - Last editor ID * @param html - Page content, HTML * @param source - Page content, wiki + * @param url - URL + * @param parent - Parent + * @param parent2 - Parent2 + * @param ownerId - Owner ID */ data class PagesWikipageFull( @SerializedName("created") @@ -56,7 +61,7 @@ data class PagesWikipageFull( @SerializedName("edited") val edited: Int, @SerializedName("group_id") - val groupId: Int, + val groupId: UserId, @SerializedName("id") val id: Int, @SerializedName("title") @@ -80,5 +85,13 @@ data class PagesWikipageFull( @SerializedName("html") val html: String? = null, @SerializedName("source") - val source: String? = null + val source: String? = null, + @SerializedName("url") + val url: String? = null, + @SerializedName("parent") + val parent: String? = null, + @SerializedName("parent2") + val parent2: String? = null, + @SerializedName("owner_id") + val ownerId: UserId? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/pages/dto/PagesWikipageHistory.kt b/api/src/main/java/com/vk/sdk/api/pages/dto/PagesWikipageHistory.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/pages/dto/PagesWikipageHistory.kt rename to api/src/main/java/com/vk/sdk/api/pages/dto/PagesWikipageHistory.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/pages/dto/ViewParam.kt b/api/src/main/java/com/vk/sdk/api/pages/dto/ViewParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/pages/dto/ViewParam.kt rename to api/src/main/java/com/vk/sdk/api/pages/dto/ViewParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/PhotosService.kt b/api/src/main/java/com/vk/sdk/api/photos/PhotosService.kt similarity index 99% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/PhotosService.kt rename to api/src/main/java/com/vk/sdk/api/photos/PhotosService.kt index a62db07f5f..98de7b71d8 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/PhotosService.kt +++ b/api/src/main/java/com/vk/sdk/api/photos/PhotosService.kt @@ -39,8 +39,6 @@ import com.vk.sdk.api.photos.dto.PhotosGetAlbumsResponse import com.vk.sdk.api.photos.dto.PhotosGetAllCommentsResponse import com.vk.sdk.api.photos.dto.PhotosGetAllExtendedResponse import com.vk.sdk.api.photos.dto.PhotosGetAllResponse -import com.vk.sdk.api.photos.dto.PhotosGetByIdExtendedResponse -import com.vk.sdk.api.photos.dto.PhotosGetByIdResponse import com.vk.sdk.api.photos.dto.PhotosGetCommentsExtendedResponse import com.vk.sdk.api.photos.dto.PhotosGetCommentsResponse import com.vk.sdk.api.photos.dto.PhotosGetExtendedResponse @@ -50,6 +48,7 @@ import com.vk.sdk.api.photos.dto.PhotosGetUserPhotosExtendedResponse import com.vk.sdk.api.photos.dto.PhotosGetUserPhotosResponse import com.vk.sdk.api.photos.dto.PhotosPhoto import com.vk.sdk.api.photos.dto.PhotosPhotoAlbumFull +import com.vk.sdk.api.photos.dto.PhotosPhotoFull import com.vk.sdk.api.photos.dto.PhotosPhotoTag import com.vk.sdk.api.photos.dto.PhotosPhotoUpload import com.vk.sdk.api.photos.dto.PhotosSaveOwnerPhotoResponse @@ -581,11 +580,12 @@ class PhotosService { * photo in the group album, you shall specify group ID instead of user ID. Example: * "1_129207899,6492_135055734, , -20629724_271945303" * @param photoSizes - '1' - to return photo sizes in a - * @return [VKRequest] with [PhotosGetByIdResponse] + * @return [VKRequest] with [Unit] */ fun photosGetById(photos: List, photoSizes: Boolean? = null): - VKRequest = NewApiRequest("photos.getById") { - GsonHolder.gson.fromJson(it, PhotosGetByIdResponse::class.java) + VKRequest> = NewApiRequest("photos.getById") { + val typeToken = object: TypeToken>() {}.type + GsonHolder.gson.fromJson>(it, typeToken) } .apply { addParam("photos", photos) @@ -600,11 +600,12 @@ class PhotosService { * photo in the group album, you shall specify group ID instead of user ID. Example: * "1_129207899,6492_135055734, , -20629724_271945303" * @param photoSizes - '1' - to return photo sizes in a - * @return [VKRequest] with [PhotosGetByIdExtendedResponse] + * @return [VKRequest] with [Unit] */ fun photosGetByIdExtended(photos: List, photoSizes: Boolean? = null): - VKRequest = NewApiRequest("photos.getById") { - GsonHolder.gson.fromJson(it, PhotosGetByIdExtendedResponse::class.java) + VKRequest> = NewApiRequest("photos.getById") { + val typeToken = object: TypeToken>() {}.type + GsonHolder.gson.fromJson>(it, typeToken) } .apply { addParam("photos", photos) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosCommentXtrPid.kt b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosCommentXtrPid.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosCommentXtrPid.kt rename to api/src/main/java/com/vk/sdk/api/photos/dto/PhotosCommentXtrPid.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetAlbumsResponse.kt b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetAlbumsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetAlbumsResponse.kt rename to api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetAlbumsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetAllCommentsResponse.kt b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetAllCommentsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetAllCommentsResponse.kt rename to api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetAllCommentsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetAllExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetAllExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetAllExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetAllExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetAllResponse.kt b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetAllResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetAllResponse.kt rename to api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetAllResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetCommentsExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetCommentsExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetCommentsExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetCommentsExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetCommentsResponse.kt b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetCommentsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetCommentsResponse.kt rename to api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetCommentsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetNewTagsResponse.kt b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetNewTagsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetNewTagsResponse.kt rename to api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetNewTagsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetResponse.kt b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetResponse.kt rename to api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetUserPhotosExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetUserPhotosExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetUserPhotosExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetUserPhotosExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetUserPhotosResponse.kt b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetUserPhotosResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetUserPhotosResponse.kt rename to api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetUserPhotosResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosImage.kt b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosImage.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosImage.kt rename to api/src/main/java/com/vk/sdk/api/photos/dto/PhotosImage.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosImageType.kt b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosImageType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosImageType.kt rename to api/src/main/java/com/vk/sdk/api/photos/dto/PhotosImageType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhoto.kt b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhoto.kt similarity index 93% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhoto.kt rename to api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhoto.kt index 454545fe31..b4ad02c628 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhoto.kt +++ b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhoto.kt @@ -28,8 +28,8 @@ package com.vk.sdk.api.photos.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.base.dto.BaseBoolInt -import com.vk.sdk.api.media.dto.MediaRestriction import kotlin.Boolean import kotlin.Float import kotlin.Int @@ -55,7 +55,6 @@ import kotlin.collections.List * @param text - Photo caption * @param userId - ID of the user who have uploaded the photo * @param width - Original photo width - * @param restrictions */ data class PhotosPhoto( @SerializedName("album_id") @@ -65,7 +64,7 @@ data class PhotosPhoto( @SerializedName("id") val id: Int, @SerializedName("owner_id") - val ownerId: Int, + val ownerId: UserId, @SerializedName("has_tags") val hasTags: Boolean, @SerializedName("access_key") @@ -91,9 +90,7 @@ data class PhotosPhoto( @SerializedName("text") val text: String? = null, @SerializedName("user_id") - val userId: Int? = null, + val userId: UserId? = null, @SerializedName("width") - val width: Int? = null, - @SerializedName("restrictions") - val restrictions: MediaRestriction? = null + val width: Int? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoAlbum.kt b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoAlbum.kt similarity index 97% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoAlbum.kt rename to api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoAlbum.kt index 68e1a26bf8..c468a47faa 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoAlbum.kt +++ b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoAlbum.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.photos.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import kotlin.Int import kotlin.String @@ -47,7 +48,7 @@ data class PhotosPhotoAlbum( @SerializedName("id") val id: Int, @SerializedName("owner_id") - val ownerId: Int, + val ownerId: UserId, @SerializedName("size") val size: Int, @SerializedName("title") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoAlbumFull.kt b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoAlbumFull.kt similarity index 98% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoAlbumFull.kt rename to api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoAlbumFull.kt index 75f4ab9fd8..81dbeeebf0 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoAlbumFull.kt +++ b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoAlbumFull.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.photos.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.base.dto.BaseBoolInt import kotlin.Int import kotlin.String @@ -55,7 +56,7 @@ data class PhotosPhotoAlbumFull( @SerializedName("id") val id: Int, @SerializedName("owner_id") - val ownerId: Int, + val ownerId: UserId, @SerializedName("size") val size: Int, @SerializedName("title") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoFull.kt b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoFull.kt similarity index 97% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoFull.kt rename to api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoFull.kt index 39885c7626..867ea7f942 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoFull.kt +++ b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoFull.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.photos.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.base.dto.BaseBoolInt import com.vk.sdk.api.base.dto.BaseLikes import com.vk.sdk.api.base.dto.BaseObjectCount @@ -65,7 +66,7 @@ data class PhotosPhotoFull( @SerializedName("id") val id: Int, @SerializedName("owner_id") - val ownerId: Int, + val ownerId: UserId, @SerializedName("access_key") val accessKey: String? = null, @SerializedName("can_comment") @@ -91,7 +92,7 @@ data class PhotosPhotoFull( @SerializedName("text") val text: String? = null, @SerializedName("user_id") - val userId: Int? = null, + val userId: UserId? = null, @SerializedName("width") val width: Int? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoFullXtrRealOffset.kt b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoFullXtrRealOffset.kt similarity index 97% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoFullXtrRealOffset.kt rename to api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoFullXtrRealOffset.kt index d29489fb5b..8523b4a107 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoFullXtrRealOffset.kt +++ b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoFullXtrRealOffset.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.photos.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.base.dto.BaseBoolInt import com.vk.sdk.api.base.dto.BaseLikes import com.vk.sdk.api.base.dto.BaseObjectCount @@ -73,7 +74,7 @@ data class PhotosPhotoFullXtrRealOffset( @SerializedName("id") val id: Int, @SerializedName("owner_id") - val ownerId: Int, + val ownerId: UserId, @SerializedName("access_key") val accessKey: String? = null, @SerializedName("can_comment") @@ -115,7 +116,7 @@ data class PhotosPhotoFullXtrRealOffset( @SerializedName("text") val text: String? = null, @SerializedName("user_id") - val userId: Int? = null, + val userId: UserId? = null, @SerializedName("width") val width: Int? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoSizes.kt b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoSizes.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoSizes.kt rename to api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoSizes.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoSizesType.kt b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoSizesType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoSizesType.kt rename to api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoSizesType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoTag.kt b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoTag.kt similarity index 97% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoTag.kt rename to api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoTag.kt index 96daf78a03..1606691bee 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoTag.kt +++ b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoTag.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.photos.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.base.dto.BaseBoolInt import kotlin.Float import kotlin.Int @@ -56,7 +57,7 @@ data class PhotosPhotoTag( @SerializedName("tagged_name") val taggedName: String, @SerializedName("user_id") - val userId: Int, + val userId: UserId, @SerializedName("viewed") val viewed: BaseBoolInt, @SerializedName("x") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoUpload.kt b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoUpload.kt similarity index 95% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoUpload.kt rename to api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoUpload.kt index d34d50c219..c3381e7842 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoUpload.kt +++ b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoUpload.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.photos.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import kotlin.Int import kotlin.String @@ -44,9 +45,9 @@ data class PhotosPhotoUpload( @SerializedName("upload_url") val uploadUrl: String, @SerializedName("user_id") - val userId: Int, + val userId: UserId, @SerializedName("fallback_upload_url") val fallbackUploadUrl: String? = null, @SerializedName("group_id") - val groupId: Int? = null + val groupId: UserId? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoXtrRealOffset.kt b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoXtrRealOffset.kt similarity index 97% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoXtrRealOffset.kt rename to api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoXtrRealOffset.kt index 4bbfe3d93a..00d10fb7e5 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoXtrRealOffset.kt +++ b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoXtrRealOffset.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.photos.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.base.dto.BasePropertyExists import kotlin.Float import kotlin.Int @@ -65,7 +66,7 @@ data class PhotosPhotoXtrRealOffset( @SerializedName("id") val id: Int, @SerializedName("owner_id") - val ownerId: Int, + val ownerId: UserId, @SerializedName("access_key") val accessKey: String? = null, @SerializedName("height") @@ -97,7 +98,7 @@ data class PhotosPhotoXtrRealOffset( @SerializedName("text") val text: String? = null, @SerializedName("user_id") - val userId: Int? = null, + val userId: UserId? = null, @SerializedName("width") val width: Int? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoXtrTagInfo.kt b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoXtrTagInfo.kt similarity index 97% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoXtrTagInfo.kt rename to api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoXtrTagInfo.kt index 880271adcb..7d05c0b6e9 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoXtrTagInfo.kt +++ b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosPhotoXtrTagInfo.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.photos.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import kotlin.Float import kotlin.Int import kotlin.String @@ -65,7 +66,7 @@ data class PhotosPhotoXtrTagInfo( @SerializedName("id") val id: Int, @SerializedName("owner_id") - val ownerId: Int, + val ownerId: UserId, @SerializedName("access_key") val accessKey: String? = null, @SerializedName("height") @@ -99,7 +100,7 @@ data class PhotosPhotoXtrTagInfo( @SerializedName("text") val text: String? = null, @SerializedName("user_id") - val userId: Int? = null, + val userId: UserId? = null, @SerializedName("width") val width: Int? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosSaveOwnerPhotoResponse.kt b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosSaveOwnerPhotoResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosSaveOwnerPhotoResponse.kt rename to api/src/main/java/com/vk/sdk/api/photos/dto/PhotosSaveOwnerPhotoResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosSearchResponse.kt b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosSearchResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosSearchResponse.kt rename to api/src/main/java/com/vk/sdk/api/photos/dto/PhotosSearchResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosTagsSuggestionItem.kt b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosTagsSuggestionItem.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosTagsSuggestionItem.kt rename to api/src/main/java/com/vk/sdk/api/photos/dto/PhotosTagsSuggestionItem.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosTagsSuggestionItemButton.kt b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosTagsSuggestionItemButton.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosTagsSuggestionItemButton.kt rename to api/src/main/java/com/vk/sdk/api/photos/dto/PhotosTagsSuggestionItemButton.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosTagsSuggestionItemEndCard.kt b/api/src/main/java/com/vk/sdk/api/photos/dto/PhotosTagsSuggestionItemEndCard.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosTagsSuggestionItemEndCard.kt rename to api/src/main/java/com/vk/sdk/api/photos/dto/PhotosTagsSuggestionItemEndCard.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/ReasonParam.kt b/api/src/main/java/com/vk/sdk/api/photos/dto/ReasonParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/ReasonParam.kt rename to api/src/main/java/com/vk/sdk/api/photos/dto/ReasonParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/SortParam.kt b/api/src/main/java/com/vk/sdk/api/photos/dto/SortParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/SortParam.kt rename to api/src/main/java/com/vk/sdk/api/photos/dto/SortParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/podcast/dto/PodcastCover.kt b/api/src/main/java/com/vk/sdk/api/podcast/dto/PodcastCover.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/podcast/dto/PodcastCover.kt rename to api/src/main/java/com/vk/sdk/api/podcast/dto/PodcastCover.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/podcast/dto/PodcastExternalData.kt b/api/src/main/java/com/vk/sdk/api/podcast/dto/PodcastExternalData.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/podcast/dto/PodcastExternalData.kt rename to api/src/main/java/com/vk/sdk/api/podcast/dto/PodcastExternalData.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/podcasts/PodcastsService.kt b/api/src/main/java/com/vk/sdk/api/podcasts/PodcastsService.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/podcasts/PodcastsService.kt rename to api/src/main/java/com/vk/sdk/api/podcasts/PodcastsService.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/podcasts/dto/PodcastsSearchPodcastResponse.kt b/api/src/main/java/com/vk/sdk/api/podcasts/dto/PodcastsSearchPodcastResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/podcasts/dto/PodcastsSearchPodcastResponse.kt rename to api/src/main/java/com/vk/sdk/api/podcasts/dto/PodcastsSearchPodcastResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/polls/PollsService.kt b/api/src/main/java/com/vk/sdk/api/polls/PollsService.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/polls/PollsService.kt rename to api/src/main/java/com/vk/sdk/api/polls/PollsService.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/polls/dto/BackgroundIdParam.kt b/api/src/main/java/com/vk/sdk/api/polls/dto/BackgroundIdParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/polls/dto/BackgroundIdParam.kt rename to api/src/main/java/com/vk/sdk/api/polls/dto/BackgroundIdParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/polls/dto/NameCaseParam.kt b/api/src/main/java/com/vk/sdk/api/polls/dto/NameCaseParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/polls/dto/NameCaseParam.kt rename to api/src/main/java/com/vk/sdk/api/polls/dto/NameCaseParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/polls/dto/PollsAnswer.kt b/api/src/main/java/com/vk/sdk/api/polls/dto/PollsAnswer.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/polls/dto/PollsAnswer.kt rename to api/src/main/java/com/vk/sdk/api/polls/dto/PollsAnswer.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/polls/dto/PollsBackground.kt b/api/src/main/java/com/vk/sdk/api/polls/dto/PollsBackground.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/polls/dto/PollsBackground.kt rename to api/src/main/java/com/vk/sdk/api/polls/dto/PollsBackground.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/polls/dto/PollsFriend.kt b/api/src/main/java/com/vk/sdk/api/polls/dto/PollsFriend.kt similarity index 96% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/polls/dto/PollsFriend.kt rename to api/src/main/java/com/vk/sdk/api/polls/dto/PollsFriend.kt index 08601a3124..d725733675 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/polls/dto/PollsFriend.kt +++ b/api/src/main/java/com/vk/sdk/api/polls/dto/PollsFriend.kt @@ -28,12 +28,12 @@ package com.vk.sdk.api.polls.dto import com.google.gson.annotations.SerializedName -import kotlin.Int +import com.vk.dto.common.id.UserId /** * @param id */ data class PollsFriend( @SerializedName("id") - val id: Int + val id: UserId ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/polls/dto/PollsPoll.kt b/api/src/main/java/com/vk/sdk/api/polls/dto/PollsPoll.kt similarity index 97% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/polls/dto/PollsPoll.kt rename to api/src/main/java/com/vk/sdk/api/polls/dto/PollsPoll.kt index 885f8fdde2..9ba3412094 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/polls/dto/PollsPoll.kt +++ b/api/src/main/java/com/vk/sdk/api/polls/dto/PollsPoll.kt @@ -28,13 +28,13 @@ package com.vk.sdk.api.polls.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import kotlin.Boolean import kotlin.Int import kotlin.String import kotlin.collections.List /** - * @param anonymous * @param multiple - Information whether the poll with multiple choices * @param endDate * @param closed @@ -50,6 +50,7 @@ import kotlin.collections.List * @param question - Poll question * @param votes - Votes number * @param disableUnvote + * @param anonymous * @param friends * @param answerId - Current user's answer ID * @param answerIds - Current user's answer IDs @@ -59,8 +60,6 @@ import kotlin.collections.List * @param background */ data class PollsPoll( - @SerializedName("anonymous") - val anonymous: Boolean, @SerializedName("multiple") val multiple: Boolean, @SerializedName("end_date") @@ -84,13 +83,15 @@ data class PollsPoll( @SerializedName("id") val id: Int, @SerializedName("owner_id") - val ownerId: Int, + val ownerId: UserId, @SerializedName("question") val question: String, @SerializedName("votes") val votes: Int, @SerializedName("disable_unvote") val disableUnvote: Boolean, + @SerializedName("anonymous") + val anonymous: Boolean? = null, @SerializedName("friends") val friends: List? = null, @SerializedName("answer_id") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/polls/dto/PollsVoters.kt b/api/src/main/java/com/vk/sdk/api/polls/dto/PollsVoters.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/polls/dto/PollsVoters.kt rename to api/src/main/java/com/vk/sdk/api/polls/dto/PollsVoters.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/polls/dto/PollsVotersUsers.kt b/api/src/main/java/com/vk/sdk/api/polls/dto/PollsVotersUsers.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/polls/dto/PollsVotersUsers.kt rename to api/src/main/java/com/vk/sdk/api/polls/dto/PollsVotersUsers.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/prettyCards/PrettyCardsService.kt b/api/src/main/java/com/vk/sdk/api/prettyCards/PrettyCardsService.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/prettyCards/PrettyCardsService.kt rename to api/src/main/java/com/vk/sdk/api/prettyCards/PrettyCardsService.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/prettyCards/dto/PrettyCardsCreateResponse.kt b/api/src/main/java/com/vk/sdk/api/prettyCards/dto/PrettyCardsCreateResponse.kt similarity index 96% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/prettyCards/dto/PrettyCardsCreateResponse.kt rename to api/src/main/java/com/vk/sdk/api/prettyCards/dto/PrettyCardsCreateResponse.kt index 127e03f9ac..7004c1f8f9 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/prettyCards/dto/PrettyCardsCreateResponse.kt +++ b/api/src/main/java/com/vk/sdk/api/prettyCards/dto/PrettyCardsCreateResponse.kt @@ -28,7 +28,7 @@ package com.vk.sdk.api.prettyCards.dto import com.google.gson.annotations.SerializedName -import kotlin.Int +import com.vk.dto.common.id.UserId import kotlin.String /** @@ -37,7 +37,7 @@ import kotlin.String */ data class PrettyCardsCreateResponse( @SerializedName("owner_id") - val ownerId: Int, + val ownerId: UserId, @SerializedName("card_id") val cardId: String ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/prettyCards/dto/PrettyCardsDeleteResponse.kt b/api/src/main/java/com/vk/sdk/api/prettyCards/dto/PrettyCardsDeleteResponse.kt similarity index 96% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/prettyCards/dto/PrettyCardsDeleteResponse.kt rename to api/src/main/java/com/vk/sdk/api/prettyCards/dto/PrettyCardsDeleteResponse.kt index 1528ac444d..0caf9b8052 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/prettyCards/dto/PrettyCardsDeleteResponse.kt +++ b/api/src/main/java/com/vk/sdk/api/prettyCards/dto/PrettyCardsDeleteResponse.kt @@ -28,7 +28,7 @@ package com.vk.sdk.api.prettyCards.dto import com.google.gson.annotations.SerializedName -import kotlin.Int +import com.vk.dto.common.id.UserId import kotlin.String /** @@ -38,7 +38,7 @@ import kotlin.String */ data class PrettyCardsDeleteResponse( @SerializedName("owner_id") - val ownerId: Int, + val ownerId: UserId, @SerializedName("card_id") val cardId: String, @SerializedName("error") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/prettyCards/dto/PrettyCardsEditResponse.kt b/api/src/main/java/com/vk/sdk/api/prettyCards/dto/PrettyCardsEditResponse.kt similarity index 96% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/prettyCards/dto/PrettyCardsEditResponse.kt rename to api/src/main/java/com/vk/sdk/api/prettyCards/dto/PrettyCardsEditResponse.kt index b03dd1ca6e..0eb6c3e4a8 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/prettyCards/dto/PrettyCardsEditResponse.kt +++ b/api/src/main/java/com/vk/sdk/api/prettyCards/dto/PrettyCardsEditResponse.kt @@ -28,7 +28,7 @@ package com.vk.sdk.api.prettyCards.dto import com.google.gson.annotations.SerializedName -import kotlin.Int +import com.vk.dto.common.id.UserId import kotlin.String /** @@ -37,7 +37,7 @@ import kotlin.String */ data class PrettyCardsEditResponse( @SerializedName("owner_id") - val ownerId: Int, + val ownerId: UserId, @SerializedName("card_id") val cardId: String ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/prettyCards/dto/PrettyCardsGetResponse.kt b/api/src/main/java/com/vk/sdk/api/prettyCards/dto/PrettyCardsGetResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/prettyCards/dto/PrettyCardsGetResponse.kt rename to api/src/main/java/com/vk/sdk/api/prettyCards/dto/PrettyCardsGetResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/prettyCards/dto/PrettyCardsPrettyCard.kt b/api/src/main/java/com/vk/sdk/api/prettyCards/dto/PrettyCardsPrettyCard.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/prettyCards/dto/PrettyCardsPrettyCard.kt rename to api/src/main/java/com/vk/sdk/api/prettyCards/dto/PrettyCardsPrettyCard.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/search/SearchService.kt b/api/src/main/java/com/vk/sdk/api/search/SearchService.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/search/SearchService.kt rename to api/src/main/java/com/vk/sdk/api/search/SearchService.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/search/dto/SearchGetHintsResponse.kt b/api/src/main/java/com/vk/sdk/api/search/dto/SearchGetHintsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/search/dto/SearchGetHintsResponse.kt rename to api/src/main/java/com/vk/sdk/api/search/dto/SearchGetHintsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/search/dto/SearchHint.kt b/api/src/main/java/com/vk/sdk/api/search/dto/SearchHint.kt similarity index 92% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/search/dto/SearchHint.kt rename to api/src/main/java/com/vk/sdk/api/search/dto/SearchHint.kt index 19c5f9e554..f71f0d1889 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/search/dto/SearchHint.kt +++ b/api/src/main/java/com/vk/sdk/api/search/dto/SearchHint.kt @@ -30,24 +30,24 @@ package com.vk.sdk.api.search.dto import com.google.gson.annotations.SerializedName import com.vk.sdk.api.apps.dto.AppsApp import com.vk.sdk.api.base.dto.BaseBoolInt +import com.vk.sdk.api.base.dto.BaseLink import com.vk.sdk.api.groups.dto.GroupsGroup import com.vk.sdk.api.users.dto.UsersUserMin import kotlin.String /** * @param description - Object description - * @param section * @param type * @param app * @param global - Information whether the object has been found globally * @param group * @param profile + * @param section + * @param link */ data class SearchHint( @SerializedName("description") val description: String, - @SerializedName("section") - val section: SearchHintSection, @SerializedName("type") val type: SearchHintType, @SerializedName("app") @@ -57,5 +57,9 @@ data class SearchHint( @SerializedName("group") val group: GroupsGroup? = null, @SerializedName("profile") - val profile: UsersUserMin? = null + val profile: UsersUserMin? = null, + @SerializedName("section") + val section: SearchHintSection? = null, + @SerializedName("link") + val link: BaseLink? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/search/dto/SearchHintSection.kt b/api/src/main/java/com/vk/sdk/api/search/dto/SearchHintSection.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/search/dto/SearchHintSection.kt rename to api/src/main/java/com/vk/sdk/api/search/dto/SearchHintSection.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/search/dto/SearchHintType.kt b/api/src/main/java/com/vk/sdk/api/search/dto/SearchHintType.kt similarity index 95% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/search/dto/SearchHintType.kt rename to api/src/main/java/com/vk/sdk/api/search/dto/SearchHintType.kt index c027bf40b3..41f417cbe5 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/search/dto/SearchHintType.kt +++ b/api/src/main/java/com/vk/sdk/api/search/dto/SearchHintType.kt @@ -46,5 +46,8 @@ enum class SearchHintType( APP("app"), @SerializedName("html5_game") - HTML5_GAME("html5_game"); + HTML5_GAME("html5_game"), + + @SerializedName("link") + LINK("link"); } diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/secure/SecureService.kt b/api/src/main/java/com/vk/sdk/api/secure/SecureService.kt similarity index 96% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/secure/SecureService.kt rename to api/src/main/java/com/vk/sdk/api/secure/SecureService.kt index 1e278f035c..3b02a38ba1 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/secure/SecureService.kt +++ b/api/src/main/java/com/vk/sdk/api/secure/SecureService.kt @@ -32,11 +32,11 @@ import com.vk.api.sdk.requests.VKRequest import com.vk.sdk.api.GsonHolder import com.vk.sdk.api.NewApiRequest import com.vk.sdk.api.base.dto.BaseOkResponse +import com.vk.sdk.api.secure.dto.SecureGiveEventStickerItem import com.vk.sdk.api.secure.dto.SecureLevel import com.vk.sdk.api.secure.dto.SecureSmsNotification import com.vk.sdk.api.secure.dto.SecureTokenChecked import com.vk.sdk.api.secure.dto.SecureTransaction -import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String @@ -173,10 +173,10 @@ class SecureService { * @param achievementId * @return [VKRequest] with [Unit] */ - fun secureGiveEventSticker(userIds: List, achievementId: Int): VKRequest> = - NewApiRequest("secure.giveEventSticker") { - val typeToken = object: TypeToken>() {}.type - GsonHolder.gson.fromJson>(it, typeToken) + fun secureGiveEventSticker(userIds: List, achievementId: Int): + VKRequest> = NewApiRequest("secure.giveEventSticker") { + val typeToken = object: TypeToken>() {}.type + GsonHolder.gson.fromJson>(it, typeToken) } .apply { addParam("user_ids", userIds) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsAccessRolePublic.kt b/api/src/main/java/com/vk/sdk/api/secure/dto/SecureGiveEventStickerItem.kt similarity index 84% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsAccessRolePublic.kt rename to api/src/main/java/com/vk/sdk/api/secure/dto/SecureGiveEventStickerItem.kt index 415d47bcdb..e45a65ad00 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsAccessRolePublic.kt +++ b/api/src/main/java/com/vk/sdk/api/secure/dto/SecureGiveEventStickerItem.kt @@ -25,17 +25,19 @@ // THIS FILE IS AUTO GENERATED! // DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. // ********************************************************************* -package com.vk.sdk.api.ads.dto +package com.vk.sdk.api.secure.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import kotlin.String -enum class AdsAccessRolePublic( - val value: String -) { - @SerializedName("manager") - MANAGER("manager"), - - @SerializedName("reports") - REPORTS("reports"); -} +/** + * @param userId + * @param status + */ +data class SecureGiveEventStickerItem( + @SerializedName("user_id") + val userId: UserId? = null, + @SerializedName("status") + val status: String? = null +) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/secure/dto/SecureLevel.kt b/api/src/main/java/com/vk/sdk/api/secure/dto/SecureLevel.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/secure/dto/SecureLevel.kt rename to api/src/main/java/com/vk/sdk/api/secure/dto/SecureLevel.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/secure/dto/SecureSmsNotification.kt b/api/src/main/java/com/vk/sdk/api/secure/dto/SecureSmsNotification.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/secure/dto/SecureSmsNotification.kt rename to api/src/main/java/com/vk/sdk/api/secure/dto/SecureSmsNotification.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/secure/dto/SecureTokenChecked.kt b/api/src/main/java/com/vk/sdk/api/secure/dto/SecureTokenChecked.kt similarity index 96% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/secure/dto/SecureTokenChecked.kt rename to api/src/main/java/com/vk/sdk/api/secure/dto/SecureTokenChecked.kt index 471138bf5c..40c6d80cbf 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/secure/dto/SecureTokenChecked.kt +++ b/api/src/main/java/com/vk/sdk/api/secure/dto/SecureTokenChecked.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.secure.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import kotlin.Int /** @@ -44,5 +45,5 @@ data class SecureTokenChecked( @SerializedName("success") val success: Int? = null, @SerializedName("user_id") - val userId: Int? = null + val userId: UserId? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/secure/dto/SecureTransaction.kt b/api/src/main/java/com/vk/sdk/api/secure/dto/SecureTransaction.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/secure/dto/SecureTransaction.kt rename to api/src/main/java/com/vk/sdk/api/secure/dto/SecureTransaction.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/stats/StatsService.kt b/api/src/main/java/com/vk/sdk/api/stats/StatsService.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/stats/StatsService.kt rename to api/src/main/java/com/vk/sdk/api/stats/StatsService.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/stats/dto/IntervalParam.kt b/api/src/main/java/com/vk/sdk/api/stats/dto/IntervalParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/stats/dto/IntervalParam.kt rename to api/src/main/java/com/vk/sdk/api/stats/dto/IntervalParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/stats/dto/StatsActivity.kt b/api/src/main/java/com/vk/sdk/api/stats/dto/StatsActivity.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/stats/dto/StatsActivity.kt rename to api/src/main/java/com/vk/sdk/api/stats/dto/StatsActivity.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/stats/dto/StatsPeriod.kt b/api/src/main/java/com/vk/sdk/api/stats/dto/StatsPeriod.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/stats/dto/StatsPeriod.kt rename to api/src/main/java/com/vk/sdk/api/stats/dto/StatsPeriod.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/stats/dto/StatsSexAge.kt b/api/src/main/java/com/vk/sdk/api/stats/dto/StatsSexAge.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/stats/dto/StatsSexAge.kt rename to api/src/main/java/com/vk/sdk/api/stats/dto/StatsSexAge.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/stats/dto/StatsWallpostStat.kt b/api/src/main/java/com/vk/sdk/api/stats/dto/StatsWallpostStat.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/stats/dto/StatsWallpostStat.kt rename to api/src/main/java/com/vk/sdk/api/stats/dto/StatsWallpostStat.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/status/StatusService.kt b/api/src/main/java/com/vk/sdk/api/status/StatusService.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/status/StatusService.kt rename to api/src/main/java/com/vk/sdk/api/status/StatusService.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/status/dto/StatusStatus.kt b/api/src/main/java/com/vk/sdk/api/status/dto/StatusStatus.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/status/dto/StatusStatus.kt rename to api/src/main/java/com/vk/sdk/api/status/dto/StatusStatus.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/storage/StorageService.kt b/api/src/main/java/com/vk/sdk/api/storage/StorageService.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/storage/StorageService.kt rename to api/src/main/java/com/vk/sdk/api/storage/StorageService.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/storage/dto/StorageValue.kt b/api/src/main/java/com/vk/sdk/api/storage/dto/StorageValue.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/storage/dto/StorageValue.kt rename to api/src/main/java/com/vk/sdk/api/storage/dto/StorageValue.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/store/StoreService.kt b/api/src/main/java/com/vk/sdk/api/store/StoreService.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/store/StoreService.kt rename to api/src/main/java/com/vk/sdk/api/store/StoreService.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/store/dto/StoreGetStickersKeywordsResponse.kt b/api/src/main/java/com/vk/sdk/api/store/dto/StoreGetStickersKeywordsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/store/dto/StoreGetStickersKeywordsResponse.kt rename to api/src/main/java/com/vk/sdk/api/store/dto/StoreGetStickersKeywordsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/store/dto/StoreProduct.kt b/api/src/main/java/com/vk/sdk/api/store/dto/StoreProduct.kt similarity index 88% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/store/dto/StoreProduct.kt rename to api/src/main/java/com/vk/sdk/api/store/dto/StoreProduct.kt index 56e2270c5f..96e087f42b 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/store/dto/StoreProduct.kt +++ b/api/src/main/java/com/vk/sdk/api/store/dto/StoreProduct.kt @@ -30,7 +30,7 @@ package com.vk.sdk.api.store.dto import com.google.gson.annotations.SerializedName import com.vk.sdk.api.base.dto.BaseBoolInt import com.vk.sdk.api.base.dto.BaseImage -import com.vk.sdk.api.base.dto.BaseSticker +import com.vk.sdk.api.base.dto.BaseStickerNew import kotlin.Boolean import kotlin.Int import kotlin.String @@ -40,9 +40,6 @@ import kotlin.collections.List * @param id - Id of the product * @param type - Product type * @param isNew - Information whether sticker product wasn't used after being purchased - * @param copyright - Product copyright information - * @param baseId - Id of the base pack (for sticker pack styles) - * @param styleIds - Array of style ids available for the sticker pack * @param purchased - Information whether the product is purchased (1 - yes, 0 - no) * @param active - Information whether the product is active (1 - yes, 0 - no) * @param promoted - Information whether the product is promoted (1 - yes, 0 - no) @@ -63,12 +60,6 @@ data class StoreProduct( val type: StoreProduct.Type, @SerializedName("is_new") val isNew: Boolean? = null, - @SerializedName("copyright") - val copyright: String? = null, - @SerializedName("base_id") - val baseId: Int? = null, - @SerializedName("style_ids") - val styleIds: List? = null, @SerializedName("purchased") val purchased: BaseBoolInt? = null, @SerializedName("active") @@ -80,11 +71,11 @@ data class StoreProduct( @SerializedName("title") val title: String? = null, @SerializedName("stickers") - val stickers: List? = null, + val stickers: List? = null, @SerializedName("style_sticker_ids") val styleStickerIds: List? = null, @SerializedName("icon") - val icon: StoreProductIcon? = null, + val icon: List? = null, @SerializedName("previews") val previews: List? = null, @SerializedName("has_animation") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/store/dto/StoreStickersKeyword.kt b/api/src/main/java/com/vk/sdk/api/store/dto/StoreStickersKeyword.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/store/dto/StoreStickersKeyword.kt rename to api/src/main/java/com/vk/sdk/api/store/dto/StoreStickersKeyword.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/store/dto/StoreStickersKeywordSticker.kt b/api/src/main/java/com/vk/sdk/api/store/dto/StoreStickersKeywordSticker.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/store/dto/StoreStickersKeywordSticker.kt rename to api/src/main/java/com/vk/sdk/api/store/dto/StoreStickersKeywordSticker.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/stories/StoriesService.kt b/api/src/main/java/com/vk/sdk/api/stories/StoriesService.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/stories/StoriesService.kt rename to api/src/main/java/com/vk/sdk/api/stories/StoriesService.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesClickableArea.kt b/api/src/main/java/com/vk/sdk/api/stories/dto/StoriesClickableArea.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesClickableArea.kt rename to api/src/main/java/com/vk/sdk/api/stories/dto/StoriesClickableArea.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesClickableSticker.kt b/api/src/main/java/com/vk/sdk/api/stories/dto/StoriesClickableSticker.kt similarity index 98% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesClickableSticker.kt rename to api/src/main/java/com/vk/sdk/api/stories/dto/StoriesClickableSticker.kt index 253949c3d8..7ee62d5985 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesClickableSticker.kt +++ b/api/src/main/java/com/vk/sdk/api/stories/dto/StoriesClickableSticker.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.stories.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.apps.dto.AppsAppMin import com.vk.sdk.api.audio.dto.AudioAudio import com.vk.sdk.api.base.dto.BaseLink @@ -85,7 +86,7 @@ data class StoriesClickableSticker( @SerializedName("tooltip_text") val tooltipText: String? = null, @SerializedName("owner_id") - val ownerId: Int? = null, + val ownerId: UserId? = null, @SerializedName("story_id") val storyId: Int? = null, @SerializedName("question") @@ -105,7 +106,7 @@ data class StoriesClickableSticker( @SerializedName("subtype") val subtype: StoriesClickableSticker.Subtype? = null, @SerializedName("post_owner_id") - val postOwnerId: Int? = null, + val postOwnerId: UserId? = null, @SerializedName("post_id") val postId: Int? = null, @SerializedName("poll") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesClickableStickers.kt b/api/src/main/java/com/vk/sdk/api/stories/dto/StoriesClickableStickers.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesClickableStickers.kt rename to api/src/main/java/com/vk/sdk/api/stories/dto/StoriesClickableStickers.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesFeedItem.kt b/api/src/main/java/com/vk/sdk/api/stories/dto/StoriesFeedItem.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesFeedItem.kt rename to api/src/main/java/com/vk/sdk/api/stories/dto/StoriesFeedItem.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetBannedExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetBannedExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetBannedExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetBannedExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetBannedResponse.kt b/api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetBannedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetBannedResponse.kt rename to api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetBannedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetByIdExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetByIdExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetByIdExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetByIdExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetByIdResponse.kt b/api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetByIdResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetByIdResponse.kt rename to api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetByIdResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetPhotoUploadServerResponse.kt b/api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetPhotoUploadServerResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetPhotoUploadServerResponse.kt rename to api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetPhotoUploadServerResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetV5113Response.kt b/api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetV5113Response.kt similarity index 95% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetV5113Response.kt rename to api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetV5113Response.kt index 461f343ca5..fd2c3cc73d 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetV5113Response.kt +++ b/api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetV5113Response.kt @@ -29,7 +29,7 @@ package com.vk.sdk.api.stories.dto import com.google.gson.annotations.SerializedName import com.vk.sdk.api.groups.dto.GroupsGroup -import com.vk.sdk.api.users.dto.UsersUser +import com.vk.sdk.api.users.dto.UsersUserFull import kotlin.Boolean import kotlin.Int import kotlin.collections.List @@ -47,7 +47,7 @@ data class StoriesGetV5113Response( @SerializedName("items") val items: List, @SerializedName("profiles") - val profiles: List? = null, + val profiles: List? = null, @SerializedName("groups") val groups: List? = null, @SerializedName("need_upload_screen") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetVideoUploadServerResponse.kt b/api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetVideoUploadServerResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetVideoUploadServerResponse.kt rename to api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetVideoUploadServerResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetViewersExtendedV5115Response.kt b/api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetViewersExtendedV5115Response.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetViewersExtendedV5115Response.kt rename to api/src/main/java/com/vk/sdk/api/stories/dto/StoriesGetViewersExtendedV5115Response.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesPromoBlock.kt b/api/src/main/java/com/vk/sdk/api/stories/dto/StoriesPromoBlock.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesPromoBlock.kt rename to api/src/main/java/com/vk/sdk/api/stories/dto/StoriesPromoBlock.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesReplies.kt b/api/src/main/java/com/vk/sdk/api/stories/dto/StoriesReplies.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesReplies.kt rename to api/src/main/java/com/vk/sdk/api/stories/dto/StoriesReplies.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesSaveResponse.kt b/api/src/main/java/com/vk/sdk/api/stories/dto/StoriesSaveResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesSaveResponse.kt rename to api/src/main/java/com/vk/sdk/api/stories/dto/StoriesSaveResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesStory.kt b/api/src/main/java/com/vk/sdk/api/stories/dto/StoriesStory.kt similarity index 96% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesStory.kt rename to api/src/main/java/com/vk/sdk/api/stories/dto/StoriesStory.kt index 58e7891d5b..7d86d6b962 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesStory.kt +++ b/api/src/main/java/com/vk/sdk/api/stories/dto/StoriesStory.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.stories.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.base.dto.BaseBoolInt import com.vk.sdk.api.photos.dto.PhotosPhoto import com.vk.sdk.api.video.dto.VideoVideo @@ -47,6 +48,7 @@ import kotlin.String * @param canHide - Information whether current user can hide the story (0 - no, 1 - yes). * @param date - Date when story has been added in Unixtime. * @param expiresAt - Story expiration time. Unixtime. + * @param deleted - Information whether the story is deleted (0 - no, 1 - yes). * @param isDeleted - Information whether the story is deleted (false - no, true - yes). * @param isExpired - Information whether the story is expired (false - no, true - yes). * @param link @@ -74,7 +76,7 @@ data class StoriesStory( @SerializedName("id") val id: Int, @SerializedName("owner_id") - val ownerId: Int, + val ownerId: UserId, @SerializedName("access_key") val accessKey: String? = null, @SerializedName("can_comment") @@ -93,6 +95,8 @@ data class StoriesStory( val date: Int? = null, @SerializedName("expires_at") val expiresAt: Int? = null, + @SerializedName("deleted") + val deleted: BaseBoolInt? = null, @SerializedName("is_deleted") val isDeleted: Boolean? = null, @SerializedName("is_expired") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesStoryLink.kt b/api/src/main/java/com/vk/sdk/api/stories/dto/StoriesStoryLink.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesStoryLink.kt rename to api/src/main/java/com/vk/sdk/api/stories/dto/StoriesStoryLink.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesStoryStats.kt b/api/src/main/java/com/vk/sdk/api/stories/dto/StoriesStoryStats.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesStoryStats.kt rename to api/src/main/java/com/vk/sdk/api/stories/dto/StoriesStoryStats.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesStoryStatsStat.kt b/api/src/main/java/com/vk/sdk/api/stories/dto/StoriesStoryStatsStat.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesStoryStatsStat.kt rename to api/src/main/java/com/vk/sdk/api/stories/dto/StoriesStoryStatsStat.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesStoryStatsState.kt b/api/src/main/java/com/vk/sdk/api/stories/dto/StoriesStoryStatsState.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesStoryStatsState.kt rename to api/src/main/java/com/vk/sdk/api/stories/dto/StoriesStoryStatsState.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesStoryType.kt b/api/src/main/java/com/vk/sdk/api/stories/dto/StoriesStoryType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesStoryType.kt rename to api/src/main/java/com/vk/sdk/api/stories/dto/StoriesStoryType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesViewersItem.kt b/api/src/main/java/com/vk/sdk/api/stories/dto/StoriesViewersItem.kt similarity index 96% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesViewersItem.kt rename to api/src/main/java/com/vk/sdk/api/stories/dto/StoriesViewersItem.kt index 30b0601b37..4d629b702c 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/stories/dto/StoriesViewersItem.kt +++ b/api/src/main/java/com/vk/sdk/api/stories/dto/StoriesViewersItem.kt @@ -28,9 +28,9 @@ package com.vk.sdk.api.stories.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.users.dto.UsersUserFull import kotlin.Boolean -import kotlin.Int /** * @param isLiked - user has like for this object @@ -41,7 +41,7 @@ data class StoriesViewersItem( @SerializedName("is_liked") val isLiked: Boolean, @SerializedName("user_id") - val userId: Int, + val userId: UserId, @SerializedName("user") val user: UsersUserFull? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/streaming/StreamingService.kt b/api/src/main/java/com/vk/sdk/api/streaming/StreamingService.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/streaming/StreamingService.kt rename to api/src/main/java/com/vk/sdk/api/streaming/StreamingService.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/streaming/dto/IntervalParam.kt b/api/src/main/java/com/vk/sdk/api/streaming/dto/IntervalParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/streaming/dto/IntervalParam.kt rename to api/src/main/java/com/vk/sdk/api/streaming/dto/IntervalParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/streaming/dto/MonthlyTierParam.kt b/api/src/main/java/com/vk/sdk/api/streaming/dto/MonthlyTierParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/streaming/dto/MonthlyTierParam.kt rename to api/src/main/java/com/vk/sdk/api/streaming/dto/MonthlyTierParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/streaming/dto/StreamingGetServerUrlResponse.kt b/api/src/main/java/com/vk/sdk/api/streaming/dto/StreamingGetServerUrlResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/streaming/dto/StreamingGetServerUrlResponse.kt rename to api/src/main/java/com/vk/sdk/api/streaming/dto/StreamingGetServerUrlResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/streaming/dto/TypeParam.kt b/api/src/main/java/com/vk/sdk/api/streaming/dto/TypeParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/streaming/dto/TypeParam.kt rename to api/src/main/java/com/vk/sdk/api/streaming/dto/TypeParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/textlives/dto/TextlivesTextliveTextpostBlock.kt b/api/src/main/java/com/vk/sdk/api/textlives/dto/TextlivesTextliveTextpostBlock.kt similarity index 97% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/textlives/dto/TextlivesTextliveTextpostBlock.kt rename to api/src/main/java/com/vk/sdk/api/textlives/dto/TextlivesTextliveTextpostBlock.kt index 433b43d633..42f9d04830 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/textlives/dto/TextlivesTextliveTextpostBlock.kt +++ b/api/src/main/java/com/vk/sdk/api/textlives/dto/TextlivesTextliveTextpostBlock.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.textlives.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.photos.dto.PhotosPhoto import kotlin.Boolean import kotlin.Int @@ -71,9 +72,9 @@ data class TextlivesTextliveTextpostBlock( @SerializedName("textpost_is_important") val textpostIsImportant: Boolean? = null, @SerializedName("textlive_owner_id") - val textliveOwnerId: Int? = null, + val textliveOwnerId: UserId? = null, @SerializedName("textpost_author_id") - val textpostAuthorId: Int? = null, + val textpostAuthorId: UserId? = null, @SerializedName("textpost_date") val textpostDate: Int? = null, @SerializedName("text") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/textlives/dto/TextlivesTextpostAttachment.kt b/api/src/main/java/com/vk/sdk/api/textlives/dto/TextlivesTextpostAttachment.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/textlives/dto/TextlivesTextpostAttachment.kt rename to api/src/main/java/com/vk/sdk/api/textlives/dto/TextlivesTextpostAttachment.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/UsersService.kt b/api/src/main/java/com/vk/sdk/api/users/UsersService.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/users/UsersService.kt rename to api/src/main/java/com/vk/sdk/api/users/UsersService.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/NameCaseParam.kt b/api/src/main/java/com/vk/sdk/api/users/dto/NameCaseParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/NameCaseParam.kt rename to api/src/main/java/com/vk/sdk/api/users/dto/NameCaseParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/SexParam.kt b/api/src/main/java/com/vk/sdk/api/users/dto/SexParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/SexParam.kt rename to api/src/main/java/com/vk/sdk/api/users/dto/SexParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/SortParam.kt b/api/src/main/java/com/vk/sdk/api/users/dto/SortParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/SortParam.kt rename to api/src/main/java/com/vk/sdk/api/users/dto/SortParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/StatusParam.kt b/api/src/main/java/com/vk/sdk/api/users/dto/StatusParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/StatusParam.kt rename to api/src/main/java/com/vk/sdk/api/users/dto/StatusParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/TypeParam.kt b/api/src/main/java/com/vk/sdk/api/users/dto/TypeParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/TypeParam.kt rename to api/src/main/java/com/vk/sdk/api/users/dto/TypeParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersCareer.kt b/api/src/main/java/com/vk/sdk/api/users/dto/UsersCareer.kt similarity index 97% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersCareer.kt rename to api/src/main/java/com/vk/sdk/api/users/dto/UsersCareer.kt index 495ce87400..e224c59da5 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersCareer.kt +++ b/api/src/main/java/com/vk/sdk/api/users/dto/UsersCareer.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.users.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import kotlin.Int import kotlin.String @@ -54,7 +55,7 @@ data class UsersCareer( @SerializedName("from") val from: Int? = null, @SerializedName("group_id") - val groupId: Int? = null, + val groupId: UserId? = null, @SerializedName("id") val id: Int? = null, @SerializedName("position") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersExports.kt b/api/src/main/java/com/vk/sdk/api/users/dto/UsersExports.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersExports.kt rename to api/src/main/java/com/vk/sdk/api/users/dto/UsersExports.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersFields.kt b/api/src/main/java/com/vk/sdk/api/users/dto/UsersFields.kt similarity index 71% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersFields.kt rename to api/src/main/java/com/vk/sdk/api/users/dto/UsersFields.kt index f2e9758f85..5bf0ab3813 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersFields.kt +++ b/api/src/main/java/com/vk/sdk/api/users/dto/UsersFields.kt @@ -81,6 +81,9 @@ enum class UsersFields( @SerializedName("bdate") BDATE("bdate"), + @SerializedName("birthdate") + BIRTHDATE("birthdate"), + @SerializedName("city") CITY("city"), @@ -93,6 +96,12 @@ enum class UsersFields( @SerializedName("has_photo") HAS_PHOTO("has_photo"), + @SerializedName("photo") + PHOTO("photo"), + + @SerializedName("photo_rec") + PHOTO_REC("photo_rec"), + @SerializedName("photo_50") PHOTO_50("photo_50"), @@ -111,6 +120,15 @@ enum class UsersFields( @SerializedName("photo_400_orig") PHOTO_400_ORIG("photo_400_orig"), + @SerializedName("photo_big") + PHOTO_BIG("photo_big"), + + @SerializedName("photo_medium") + PHOTO_MEDIUM("photo_medium"), + + @SerializedName("photo_medium_rec") + PHOTO_MEDIUM_REC("photo_medium_rec"), + @SerializedName("photo_max") PHOTO_MAX("photo_max"), @@ -120,6 +138,12 @@ enum class UsersFields( @SerializedName("photo_max_size") PHOTO_MAX_SIZE("photo_max_size"), + @SerializedName("profile_buttons") + PROFILE_BUTTONS("profile_buttons"), + + @SerializedName("profile_buttons_tablet") + PROFILE_BUTTONS_TABLET("profile_buttons_tablet"), + @SerializedName("online") ONLINE("online"), @@ -135,6 +159,15 @@ enum class UsersFields( @SerializedName("contacts") CONTACTS("contacts"), + @SerializedName("lang") + LANG("lang"), + + @SerializedName("language") + LANGUAGE("language"), + + @SerializedName("can_call") + CAN_CALL("can_call"), + @SerializedName("site") SITE("site"), @@ -162,6 +195,12 @@ enum class UsersFields( @SerializedName("common_count") COMMON_COUNT("common_count"), + @SerializedName("online_info") + ONLINE_INFO("online_info"), + + @SerializedName("contact_name") + CONTACT_NAME("contact_name"), + @SerializedName("occupation") OCCUPATION("occupation"), @@ -186,15 +225,30 @@ enum class UsersFields( @SerializedName("wall_comments") WALL_COMMENTS("wall_comments"), + @SerializedName("wall_default") + WALL_DEFAULT("wall_default"), + + @SerializedName("is_student") + IS_STUDENT("is_student"), + @SerializedName("activities") ACTIVITIES("activities"), + @SerializedName("activity") + ACTIVITY("activity"), + @SerializedName("interests") INTERESTS("interests"), + @SerializedName("image_status") + IMAGE_STATUS("image_status"), + @SerializedName("music") MUSIC("music"), + @SerializedName("music_awards") + MUSIC_AWARDS("music_awards"), + @SerializedName("movies") MOVIES("movies"), @@ -204,6 +258,12 @@ enum class UsersFields( @SerializedName("books") BOOKS("books"), + @SerializedName("buttons") + BUTTONS("buttons"), + + @SerializedName("is_no_index") + IS_NO_INDEX("is_no_index"), + @SerializedName("games") GAMES("games"), @@ -222,12 +282,27 @@ enum class UsersFields( @SerializedName("can_see_audio") CAN_SEE_AUDIO("can_see_audio"), + @SerializedName("can_see_gifts") + CAN_SEE_GIFTS("can_see_gifts"), + + @SerializedName("work") + WORK("work"), + + @SerializedName("places") + PLACES("places"), + @SerializedName("can_write_private_message") CAN_WRITE_PRIVATE_MESSAGE("can_write_private_message"), @SerializedName("can_send_friend_request") CAN_SEND_FRIEND_REQUEST("can_send_friend_request"), + @SerializedName("can_be_invited_group") + CAN_BE_INVITED_GROUP("can_be_invited_group"), + + @SerializedName("can_upload_doc") + CAN_UPLOAD_DOC("can_upload_doc"), + @SerializedName("is_favorite") IS_FAVORITE("is_favorite"), @@ -285,6 +360,12 @@ enum class UsersFields( @SerializedName("stories_archive_count") STORIES_ARCHIVE_COUNT("stories_archive_count"), + @SerializedName("has_unseen_stories") + HAS_UNSEEN_STORIES("has_unseen_stories"), + + @SerializedName("video_live") + VIDEO_LIVE("video_live"), + @SerializedName("video_live_level") VIDEO_LIVE_LEVEL("video_live_level"), @@ -298,5 +379,47 @@ enum class UsersFields( SERVICE_DESCRIPTION("service_description"), @SerializedName("is_dead") - IS_DEAD("is_dead"); + IS_DEAD("is_dead"), + + @SerializedName("test") + TEST("test"), + + @SerializedName("gifts_tooltip") + GIFTS_TOOLTIP("gifts_tooltip"), + + @SerializedName("emoji_status") + EMOJI_STATUS("emoji_status"), + + @SerializedName("can_call_from_group") + CAN_CALL_FROM_GROUP("can_call_from_group"), + + @SerializedName("can_see_wishes") + CAN_SEE_WISHES("can_see_wishes"), + + @SerializedName("is_video_live_notifications_blocked") + IS_VIDEO_LIVE_NOTIFICATIONS_BLOCKED("is_video_live_notifications_blocked"), + + @SerializedName("is_adult") + IS_ADULT("is_adult"), + + @SerializedName("is_subscribed") + IS_SUBSCRIBED("is_subscribed"), + + @SerializedName("is_subscribed_podcasts") + IS_SUBSCRIBED_PODCASTS("is_subscribed_podcasts"), + + @SerializedName("can_subscribe_podcasts") + CAN_SUBSCRIBE_PODCASTS("can_subscribe_podcasts"), + + @SerializedName("subscription_country") + SUBSCRIPTION_COUNTRY("subscription_country"), + + @SerializedName("has_email") + HAS_EMAIL("has_email"), + + @SerializedName("has_rights") + HAS_RIGHTS("has_rights"), + + @SerializedName("rights_location") + RIGHTS_LOCATION("rights_location"); } diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersGetFollowersFieldsResponse.kt b/api/src/main/java/com/vk/sdk/api/users/dto/UsersGetFollowersFieldsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersGetFollowersFieldsResponse.kt rename to api/src/main/java/com/vk/sdk/api/users/dto/UsersGetFollowersFieldsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersGetSubscriptionsExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/users/dto/UsersGetSubscriptionsExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersGetSubscriptionsExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/users/dto/UsersGetSubscriptionsExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersGetSubscriptionsResponse.kt b/api/src/main/java/com/vk/sdk/api/users/dto/UsersGetSubscriptionsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersGetSubscriptionsResponse.kt rename to api/src/main/java/com/vk/sdk/api/users/dto/UsersGetSubscriptionsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersLastSeen.kt b/api/src/main/java/com/vk/sdk/api/users/dto/UsersLastSeen.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersLastSeen.kt rename to api/src/main/java/com/vk/sdk/api/users/dto/UsersLastSeen.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersMilitary.kt b/api/src/main/java/com/vk/sdk/api/users/dto/UsersMilitary.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersMilitary.kt rename to api/src/main/java/com/vk/sdk/api/users/dto/UsersMilitary.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersOccupation.kt b/api/src/main/java/com/vk/sdk/api/users/dto/UsersOccupation.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersOccupation.kt rename to api/src/main/java/com/vk/sdk/api/users/dto/UsersOccupation.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersOnlineInfo.kt b/api/src/main/java/com/vk/sdk/api/users/dto/UsersOnlineInfo.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersOnlineInfo.kt rename to api/src/main/java/com/vk/sdk/api/users/dto/UsersOnlineInfo.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersPersonal.kt b/api/src/main/java/com/vk/sdk/api/users/dto/UsersPersonal.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersPersonal.kt rename to api/src/main/java/com/vk/sdk/api/users/dto/UsersPersonal.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersRelative.kt b/api/src/main/java/com/vk/sdk/api/users/dto/UsersRelative.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersRelative.kt rename to api/src/main/java/com/vk/sdk/api/users/dto/UsersRelative.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersSchool.kt b/api/src/main/java/com/vk/sdk/api/users/dto/UsersSchool.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersSchool.kt rename to api/src/main/java/com/vk/sdk/api/users/dto/UsersSchool.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersSearchResponse.kt b/api/src/main/java/com/vk/sdk/api/users/dto/UsersSearchResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersSearchResponse.kt rename to api/src/main/java/com/vk/sdk/api/users/dto/UsersSearchResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersSubscriptionsItem.kt b/api/src/main/java/com/vk/sdk/api/users/dto/UsersSubscriptionsItem.kt similarity index 86% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersSubscriptionsItem.kt rename to api/src/main/java/com/vk/sdk/api/users/dto/UsersSubscriptionsItem.kt index 9d33304f0b..62e692fb38 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersSubscriptionsItem.kt +++ b/api/src/main/java/com/vk/sdk/api/users/dto/UsersSubscriptionsItem.kt @@ -31,6 +31,7 @@ import com.google.gson.JsonDeserializationContext import com.google.gson.JsonDeserializer import com.google.gson.JsonElement import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.audio.dto.AudioAudio import com.vk.sdk.api.base.dto.BaseBoolInt import com.vk.sdk.api.base.dto.BaseCountry @@ -40,20 +41,23 @@ import com.vk.sdk.api.base.dto.BaseSex import com.vk.sdk.api.friends.dto.FriendsFriendStatusStatus import com.vk.sdk.api.friends.dto.FriendsRequestsMutual import com.vk.sdk.api.groups.dto.GroupsAddressesInfo +import com.vk.sdk.api.groups.dto.GroupsAppButton import com.vk.sdk.api.groups.dto.GroupsContactsItem import com.vk.sdk.api.groups.dto.GroupsCountersGroup import com.vk.sdk.api.groups.dto.GroupsCover import com.vk.sdk.api.groups.dto.GroupsGroupAdminLevel import com.vk.sdk.api.groups.dto.GroupsGroupBanInfo import com.vk.sdk.api.groups.dto.GroupsGroupFullAgeLimits -import com.vk.sdk.api.groups.dto.GroupsGroupFullMainSection import com.vk.sdk.api.groups.dto.GroupsGroupFullMemberStatus +import com.vk.sdk.api.groups.dto.GroupsGroupFullSection import com.vk.sdk.api.groups.dto.GroupsGroupIsClosed import com.vk.sdk.api.groups.dto.GroupsGroupType import com.vk.sdk.api.groups.dto.GroupsLinksItem import com.vk.sdk.api.groups.dto.GroupsLiveCovers import com.vk.sdk.api.groups.dto.GroupsMarketInfo import com.vk.sdk.api.groups.dto.GroupsOnlineStatus +import com.vk.sdk.api.groups.dto.GroupsPhotoSize +import com.vk.sdk.api.video.dto.VideoLiveInfo import java.lang.IllegalStateException import java.lang.reflect.Type import kotlin.Boolean @@ -118,7 +122,7 @@ sealed class UsersSubscriptionsItem { @SerializedName("hidden") val hidden: Int? = null, @SerializedName("id") - val id: Int? = null, + val id: UserId? = null, @SerializedName("last_name") val lastName: String? = null, @SerializedName("can_access_closed") @@ -146,14 +150,12 @@ sealed class UsersSubscriptionsItem { * @param videoLiveCount - Number of community's live streams * @param clipsCount - Number of community's clips * @param counters - * @param textlivesCount - Textlives number * @param cover * @param canPost - Information whether current user can post on community's wall * @param canSuggest * @param canUploadStory - Information whether current user can upload story * @param canUploadDoc - Information whether current user can upload doc * @param canUploadVideo - Information whether current user can upload video - * @param canUploadClip - Information whether current user can upload clip * @param canSeeAllPosts - Information whether current user can see all posts on community's * wall * @param canCreateTopic - Information whether current user can create topic @@ -189,6 +191,7 @@ sealed class UsersSubscriptionsItem { * @param canSubscribePosts - Can subscribe to wall * @param liveCovers - Live covers state * @param storiesArchiveCount + * @param hasUnseenStories * @param id - Community ID * @param name - Community name * @param screenName - Domain of the community page @@ -204,6 +207,21 @@ sealed class UsersSubscriptionsItem { * @param photo50 - URL of square photo of the community with 50 pixels in width * @param photo100 - URL of square photo of the community with 100 pixels in width * @param photo200 - URL of square photo of the community with 200 pixels in width + * @param photo200Orig - URL of square photo of the community with 200 pixels in width original + * @param photo400 - URL of square photo of the community with 400 pixels in width + * @param photo400Orig - URL of square photo of the community with 400 pixels in width original + * @param photoMax - URL of square photo of the community with max pixels in width + * @param photoMaxOrig - URL of square photo of the community with max pixels in width original + * @param estDate - Established date + * @param publicDateLabel - Public date label + * @param photoMaxSize + * @param appButton + * @param appButtons + * @param isVideoLiveNotificationsBlocked + * @param videoLive + * @param hadTorch + * @param audioArtistId + * @param audioCuratorId */ data class GroupsGroupFull( @SerializedName("market") @@ -240,8 +258,6 @@ sealed class UsersSubscriptionsItem { val clipsCount: Int? = null, @SerializedName("counters") val counters: GroupsCountersGroup? = null, - @SerializedName("textlives_count") - val textlivesCount: Int? = null, @SerializedName("cover") val cover: GroupsCover? = null, @SerializedName("can_post") @@ -254,8 +270,6 @@ sealed class UsersSubscriptionsItem { val canUploadDoc: BaseBoolInt? = null, @SerializedName("can_upload_video") val canUploadVideo: BaseBoolInt? = null, - @SerializedName("can_upload_clip") - val canUploadClip: BaseBoolInt? = null, @SerializedName("can_see_all_posts") val canSeeAllPosts: BaseBoolInt? = null, @SerializedName("can_create_topic") @@ -283,9 +297,9 @@ sealed class UsersSubscriptionsItem { @SerializedName("site") val site: String? = null, @SerializedName("main_section") - val mainSection: GroupsGroupFullMainSection? = null, + val mainSection: GroupsGroupFullSection? = null, @SerializedName("secondary_section") - val secondarySection: Int? = null, + val secondarySection: GroupsGroupFullSection? = null, @SerializedName("trending") val trending: BaseBoolInt? = null, @SerializedName("can_message") @@ -320,8 +334,10 @@ sealed class UsersSubscriptionsItem { val liveCovers: GroupsLiveCovers? = null, @SerializedName("stories_archive_count") val storiesArchiveCount: Int? = null, + @SerializedName("has_unseen_stories") + val hasUnseenStories: Boolean? = null, @SerializedName("id") - val id: Int? = null, + val id: UserId? = null, @SerializedName("name") val name: String? = null, @SerializedName("screen_name") @@ -349,7 +365,37 @@ sealed class UsersSubscriptionsItem { @SerializedName("photo_100") val photo100: String? = null, @SerializedName("photo_200") - val photo200: String? = null + val photo200: String? = null, + @SerializedName("photo_200_orig") + val photo200Orig: String? = null, + @SerializedName("photo_400") + val photo400: String? = null, + @SerializedName("photo_400_orig") + val photo400Orig: String? = null, + @SerializedName("photo_max") + val photoMax: String? = null, + @SerializedName("photo_max_orig") + val photoMaxOrig: String? = null, + @SerializedName("est_date") + val estDate: String? = null, + @SerializedName("public_date_label") + val publicDateLabel: String? = null, + @SerializedName("photo_max_size") + val photoMaxSize: GroupsPhotoSize? = null, + @SerializedName("app_button") + val appButton: GroupsAppButton? = null, + @SerializedName("app_buttons") + val appButtons: List? = null, + @SerializedName("is_video_live_notifications_blocked") + val isVideoLiveNotificationsBlocked: BaseBoolInt? = null, + @SerializedName("video_live") + val videoLive: VideoLiveInfo? = null, + @SerializedName("had_torch") + val hadTorch: Boolean? = null, + @SerializedName("audio_artist_id") + val audioArtistId: String? = null, + @SerializedName("audio_curator_id") + val audioCuratorId: Int? = null ) : UsersSubscriptionsItem() { enum class Wall( val value: Int diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersUniversity.kt b/api/src/main/java/com/vk/sdk/api/users/dto/UsersUniversity.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersUniversity.kt rename to api/src/main/java/com/vk/sdk/api/users/dto/UsersUniversity.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersUser.kt b/api/src/main/java/com/vk/sdk/api/users/dto/UsersUser.kt similarity index 98% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersUser.kt rename to api/src/main/java/com/vk/sdk/api/users/dto/UsersUser.kt index e90c0f3c49..12e1a53c50 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersUser.kt +++ b/api/src/main/java/com/vk/sdk/api/users/dto/UsersUser.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.users.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.base.dto.BaseBoolInt import com.vk.sdk.api.base.dto.BaseSex import com.vk.sdk.api.friends.dto.FriendsFriendStatusStatus @@ -89,7 +90,7 @@ data class UsersUser( @SerializedName("hidden") val hidden: Int? = null, @SerializedName("id") - val id: Int? = null, + val id: UserId? = null, @SerializedName("last_name") val lastName: String? = null, @SerializedName("can_access_closed") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersUserConnections.kt b/api/src/main/java/com/vk/sdk/api/users/dto/UsersUserConnections.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersUserConnections.kt rename to api/src/main/java/com/vk/sdk/api/users/dto/UsersUserConnections.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersUserCounters.kt b/api/src/main/java/com/vk/sdk/api/users/dto/UsersUserCounters.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersUserCounters.kt rename to api/src/main/java/com/vk/sdk/api/users/dto/UsersUserCounters.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersUserFull.kt b/api/src/main/java/com/vk/sdk/api/users/dto/UsersUserFull.kt similarity index 95% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersUserFull.kt rename to api/src/main/java/com/vk/sdk/api/users/dto/UsersUserFull.kt index bfb30fb199..87891d2769 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersUserFull.kt +++ b/api/src/main/java/com/vk/sdk/api/users/dto/UsersUserFull.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.users.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.audio.dto.AudioAudio import com.vk.sdk.api.base.dto.BaseBoolInt import com.vk.sdk.api.base.dto.BaseCity @@ -102,8 +103,10 @@ import kotlin.collections.List * @param photoMaxSize * @param language * @param storiesArchiveCount + * @param hasUnseenStories * @param wallDefault * @param canCall - Information whether current user can call + * @param canCallFromGroup - Information whether group can call user * @param canSeeWishes - Information whether current user can see the user's wishes * @param canSeeGifts - Information whether current user can see the user's gifts * @param interests @@ -162,7 +165,11 @@ import kotlin.collections.List * @param accessKey * @param canUploadDoc * @param hash - * @param hasEmail + * @param isNoIndex - Access to user profile is restricted for search engines + * @param contactId - Contact person ID + * @param isMessageRequest + * @param descriptions + * @param lists * @param sex - User sex * @param screenName - Domain name of the user's page * @param photo50 - URL of square photo of the user with 50 pixels in width @@ -296,10 +303,14 @@ data class UsersUserFull( val language: String? = null, @SerializedName("stories_archive_count") val storiesArchiveCount: Int? = null, + @SerializedName("has_unseen_stories") + val hasUnseenStories: Boolean? = null, @SerializedName("wall_default") val wallDefault: UsersUserFull.WallDefault? = null, @SerializedName("can_call") val canCall: Boolean? = null, + @SerializedName("can_call_from_group") + val canCallFromGroup: Boolean? = null, @SerializedName("can_see_wishes") val canSeeWishes: Boolean? = null, @SerializedName("can_see_gifts") @@ -414,8 +425,16 @@ data class UsersUserFull( val canUploadDoc: BaseBoolInt? = null, @SerializedName("hash") val hash: String? = null, - @SerializedName("has_email") - val hasEmail: Boolean? = null, + @SerializedName("is_no_index") + val isNoIndex: Boolean? = null, + @SerializedName("contact_id") + val contactId: Int? = null, + @SerializedName("is_message_request") + val isMessageRequest: Boolean? = null, + @SerializedName("descriptions") + val descriptions: List? = null, + @SerializedName("lists") + val lists: List? = null, @SerializedName("sex") val sex: BaseSex? = null, @SerializedName("screen_name") @@ -447,7 +466,7 @@ data class UsersUserFull( @SerializedName("hidden") val hidden: Int? = null, @SerializedName("id") - val id: Int? = null, + val id: UserId? = null, @SerializedName("last_name") val lastName: String? = null, @SerializedName("can_access_closed") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersUserMin.kt b/api/src/main/java/com/vk/sdk/api/users/dto/UsersUserMin.kt similarity index 97% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersUserMin.kt rename to api/src/main/java/com/vk/sdk/api/users/dto/UsersUserMin.kt index 9eb52d254f..a0cb55498d 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersUserMin.kt +++ b/api/src/main/java/com/vk/sdk/api/users/dto/UsersUserMin.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.users.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import kotlin.Boolean import kotlin.Int import kotlin.String @@ -45,7 +46,7 @@ data class UsersUserMin( @SerializedName("first_name") val firstName: String, @SerializedName("id") - val id: Int, + val id: UserId, @SerializedName("last_name") val lastName: String, @SerializedName("deactivated") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersUserRelation.kt b/api/src/main/java/com/vk/sdk/api/users/dto/UsersUserRelation.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersUserRelation.kt rename to api/src/main/java/com/vk/sdk/api/users/dto/UsersUserRelation.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersUserType.kt b/api/src/main/java/com/vk/sdk/api/users/dto/UsersUserType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersUserType.kt rename to api/src/main/java/com/vk/sdk/api/users/dto/UsersUserType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersUserXtrCounters.kt b/api/src/main/java/com/vk/sdk/api/users/dto/UsersUserXtrCounters.kt similarity index 95% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersUserXtrCounters.kt rename to api/src/main/java/com/vk/sdk/api/users/dto/UsersUserXtrCounters.kt index 4aaa84757a..b30c2f2972 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersUserXtrCounters.kt +++ b/api/src/main/java/com/vk/sdk/api/users/dto/UsersUserXtrCounters.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.users.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.audio.dto.AudioAudio import com.vk.sdk.api.base.dto.BaseBoolInt import com.vk.sdk.api.base.dto.BaseCity @@ -102,8 +103,10 @@ import kotlin.collections.List * @param photoMaxSize * @param language * @param storiesArchiveCount + * @param hasUnseenStories * @param wallDefault * @param canCall - Information whether current user can call + * @param canCallFromGroup - Information whether group can call user * @param canSeeWishes - Information whether current user can see the user's wishes * @param canSeeGifts - Information whether current user can see the user's gifts * @param interests @@ -162,7 +165,11 @@ import kotlin.collections.List * @param accessKey * @param canUploadDoc * @param hash - * @param hasEmail + * @param isNoIndex - Access to user profile is restricted for search engines + * @param contactId - Contact person ID + * @param isMessageRequest + * @param descriptions + * @param lists * @param sex - User sex * @param screenName - Domain name of the user's page * @param photo50 - URL of square photo of the user with 50 pixels in width @@ -296,10 +303,14 @@ data class UsersUserXtrCounters( val language: String? = null, @SerializedName("stories_archive_count") val storiesArchiveCount: Int? = null, + @SerializedName("has_unseen_stories") + val hasUnseenStories: Boolean? = null, @SerializedName("wall_default") val wallDefault: UsersUserXtrCounters.WallDefault? = null, @SerializedName("can_call") val canCall: Boolean? = null, + @SerializedName("can_call_from_group") + val canCallFromGroup: Boolean? = null, @SerializedName("can_see_wishes") val canSeeWishes: Boolean? = null, @SerializedName("can_see_gifts") @@ -414,8 +425,16 @@ data class UsersUserXtrCounters( val canUploadDoc: BaseBoolInt? = null, @SerializedName("hash") val hash: String? = null, - @SerializedName("has_email") - val hasEmail: Boolean? = null, + @SerializedName("is_no_index") + val isNoIndex: Boolean? = null, + @SerializedName("contact_id") + val contactId: Int? = null, + @SerializedName("is_message_request") + val isMessageRequest: Boolean? = null, + @SerializedName("descriptions") + val descriptions: List? = null, + @SerializedName("lists") + val lists: List? = null, @SerializedName("sex") val sex: BaseSex? = null, @SerializedName("screen_name") @@ -447,7 +466,7 @@ data class UsersUserXtrCounters( @SerializedName("hidden") val hidden: Int? = null, @SerializedName("id") - val id: Int? = null, + val id: UserId? = null, @SerializedName("last_name") val lastName: String? = null, @SerializedName("can_access_closed") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersUsersArray.kt b/api/src/main/java/com/vk/sdk/api/users/dto/UsersUsersArray.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/users/dto/UsersUsersArray.kt rename to api/src/main/java/com/vk/sdk/api/users/dto/UsersUsersArray.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/utils/UtilsService.kt b/api/src/main/java/com/vk/sdk/api/utils/UtilsService.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/utils/UtilsService.kt rename to api/src/main/java/com/vk/sdk/api/utils/UtilsService.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/IntervalParam.kt b/api/src/main/java/com/vk/sdk/api/utils/dto/IntervalParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/IntervalParam.kt rename to api/src/main/java/com/vk/sdk/api/utils/dto/IntervalParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/SourceParam.kt b/api/src/main/java/com/vk/sdk/api/utils/dto/SourceParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/SourceParam.kt rename to api/src/main/java/com/vk/sdk/api/utils/dto/SourceParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/UtilsDomainResolved.kt b/api/src/main/java/com/vk/sdk/api/utils/dto/UtilsDomainResolved.kt similarity index 96% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/UtilsDomainResolved.kt rename to api/src/main/java/com/vk/sdk/api/utils/dto/UtilsDomainResolved.kt index ec518508ef..a631839174 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/UtilsDomainResolved.kt +++ b/api/src/main/java/com/vk/sdk/api/utils/dto/UtilsDomainResolved.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.utils.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import kotlin.Int /** @@ -39,7 +40,7 @@ data class UtilsDomainResolved( @SerializedName("object_id") val objectId: Int? = null, @SerializedName("group_id") - val groupId: Int? = null, + val groupId: UserId? = null, @SerializedName("type") val type: UtilsDomainResolvedType? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/UtilsDomainResolvedType.kt b/api/src/main/java/com/vk/sdk/api/utils/dto/UtilsDomainResolvedType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/UtilsDomainResolvedType.kt rename to api/src/main/java/com/vk/sdk/api/utils/dto/UtilsDomainResolvedType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/UtilsGetLastShortenedLinksResponse.kt b/api/src/main/java/com/vk/sdk/api/utils/dto/UtilsGetLastShortenedLinksResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/UtilsGetLastShortenedLinksResponse.kt rename to api/src/main/java/com/vk/sdk/api/utils/dto/UtilsGetLastShortenedLinksResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/UtilsLastShortenedLink.kt b/api/src/main/java/com/vk/sdk/api/utils/dto/UtilsLastShortenedLink.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/UtilsLastShortenedLink.kt rename to api/src/main/java/com/vk/sdk/api/utils/dto/UtilsLastShortenedLink.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/UtilsLinkChecked.kt b/api/src/main/java/com/vk/sdk/api/utils/dto/UtilsLinkChecked.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/UtilsLinkChecked.kt rename to api/src/main/java/com/vk/sdk/api/utils/dto/UtilsLinkChecked.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/UtilsLinkCheckedStatus.kt b/api/src/main/java/com/vk/sdk/api/utils/dto/UtilsLinkCheckedStatus.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/UtilsLinkCheckedStatus.kt rename to api/src/main/java/com/vk/sdk/api/utils/dto/UtilsLinkCheckedStatus.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/UtilsLinkStats.kt b/api/src/main/java/com/vk/sdk/api/utils/dto/UtilsLinkStats.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/UtilsLinkStats.kt rename to api/src/main/java/com/vk/sdk/api/utils/dto/UtilsLinkStats.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/UtilsLinkStatsExtended.kt b/api/src/main/java/com/vk/sdk/api/utils/dto/UtilsLinkStatsExtended.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/UtilsLinkStatsExtended.kt rename to api/src/main/java/com/vk/sdk/api/utils/dto/UtilsLinkStatsExtended.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/UtilsShortLink.kt b/api/src/main/java/com/vk/sdk/api/utils/dto/UtilsShortLink.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/UtilsShortLink.kt rename to api/src/main/java/com/vk/sdk/api/utils/dto/UtilsShortLink.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/UtilsStats.kt b/api/src/main/java/com/vk/sdk/api/utils/dto/UtilsStats.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/UtilsStats.kt rename to api/src/main/java/com/vk/sdk/api/utils/dto/UtilsStats.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/UtilsStatsCity.kt b/api/src/main/java/com/vk/sdk/api/utils/dto/UtilsStatsCity.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/UtilsStatsCity.kt rename to api/src/main/java/com/vk/sdk/api/utils/dto/UtilsStatsCity.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/UtilsStatsCountry.kt b/api/src/main/java/com/vk/sdk/api/utils/dto/UtilsStatsCountry.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/UtilsStatsCountry.kt rename to api/src/main/java/com/vk/sdk/api/utils/dto/UtilsStatsCountry.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/UtilsStatsExtended.kt b/api/src/main/java/com/vk/sdk/api/utils/dto/UtilsStatsExtended.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/UtilsStatsExtended.kt rename to api/src/main/java/com/vk/sdk/api/utils/dto/UtilsStatsExtended.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/UtilsStatsSexAge.kt b/api/src/main/java/com/vk/sdk/api/utils/dto/UtilsStatsSexAge.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/utils/dto/UtilsStatsSexAge.kt rename to api/src/main/java/com/vk/sdk/api/utils/dto/UtilsStatsSexAge.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/video/VideoService.kt b/api/src/main/java/com/vk/sdk/api/video/VideoService.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/video/VideoService.kt rename to api/src/main/java/com/vk/sdk/api/video/VideoService.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/FiltersParam.kt b/api/src/main/java/com/vk/sdk/api/video/dto/FiltersParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/FiltersParam.kt rename to api/src/main/java/com/vk/sdk/api/video/dto/FiltersParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/PrivacyParam.kt b/api/src/main/java/com/vk/sdk/api/video/dto/PrivacyParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/PrivacyParam.kt rename to api/src/main/java/com/vk/sdk/api/video/dto/PrivacyParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/ReasonParam.kt b/api/src/main/java/com/vk/sdk/api/video/dto/ReasonParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/ReasonParam.kt rename to api/src/main/java/com/vk/sdk/api/video/dto/ReasonParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/SortParam.kt b/api/src/main/java/com/vk/sdk/api/video/dto/SortParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/SortParam.kt rename to api/src/main/java/com/vk/sdk/api/video/dto/SortParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoAddAlbumResponse.kt b/api/src/main/java/com/vk/sdk/api/video/dto/VideoAddAlbumResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoAddAlbumResponse.kt rename to api/src/main/java/com/vk/sdk/api/video/dto/VideoAddAlbumResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoGetAlbumsByVideoExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/video/dto/VideoGetAlbumsByVideoExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoGetAlbumsByVideoExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/video/dto/VideoGetAlbumsByVideoExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoGetAlbumsExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/video/dto/VideoGetAlbumsExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoGetAlbumsExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/video/dto/VideoGetAlbumsExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoGetAlbumsResponse.kt b/api/src/main/java/com/vk/sdk/api/video/dto/VideoGetAlbumsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoGetAlbumsResponse.kt rename to api/src/main/java/com/vk/sdk/api/video/dto/VideoGetAlbumsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoGetCommentsExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/video/dto/VideoGetCommentsExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoGetCommentsExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/video/dto/VideoGetCommentsExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoGetCommentsResponse.kt b/api/src/main/java/com/vk/sdk/api/video/dto/VideoGetCommentsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoGetCommentsResponse.kt rename to api/src/main/java/com/vk/sdk/api/video/dto/VideoGetCommentsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoGetResponse.kt b/api/src/main/java/com/vk/sdk/api/video/dto/VideoGetResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoGetResponse.kt rename to api/src/main/java/com/vk/sdk/api/video/dto/VideoGetResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoLiveInfo.kt b/api/src/main/java/com/vk/sdk/api/video/dto/VideoLiveInfo.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoLiveInfo.kt rename to api/src/main/java/com/vk/sdk/api/video/dto/VideoLiveInfo.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoLiveSettings.kt b/api/src/main/java/com/vk/sdk/api/video/dto/VideoLiveSettings.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoLiveSettings.kt rename to api/src/main/java/com/vk/sdk/api/video/dto/VideoLiveSettings.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoSaveResult.kt b/api/src/main/java/com/vk/sdk/api/video/dto/VideoSaveResult.kt similarity index 96% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoSaveResult.kt rename to api/src/main/java/com/vk/sdk/api/video/dto/VideoSaveResult.kt index e73befb764..d1f0d79688 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoSaveResult.kt +++ b/api/src/main/java/com/vk/sdk/api/video/dto/VideoSaveResult.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.video.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import kotlin.Int import kotlin.String @@ -45,7 +46,7 @@ data class VideoSaveResult( @SerializedName("description") val description: String? = null, @SerializedName("owner_id") - val ownerId: Int? = null, + val ownerId: UserId? = null, @SerializedName("title") val title: String? = null, @SerializedName("upload_url") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoSearchExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/video/dto/VideoSearchExtendedResponse.kt similarity index 95% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoSearchExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/video/dto/VideoSearchExtendedResponse.kt index 1391e4bf41..0d013c20ee 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoSearchExtendedResponse.kt +++ b/api/src/main/java/com/vk/sdk/api/video/dto/VideoSearchExtendedResponse.kt @@ -29,7 +29,7 @@ package com.vk.sdk.api.video.dto import com.google.gson.annotations.SerializedName import com.vk.sdk.api.groups.dto.GroupsGroupFull -import com.vk.sdk.api.users.dto.UsersUserMin +import com.vk.sdk.api.users.dto.UsersUser import kotlin.Int import kotlin.collections.List @@ -45,7 +45,7 @@ data class VideoSearchExtendedResponse( @SerializedName("items") val items: List, @SerializedName("profiles") - val profiles: List, + val profiles: List, @SerializedName("groups") val groups: List ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoSearchResponse.kt b/api/src/main/java/com/vk/sdk/api/video/dto/VideoSearchResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoSearchResponse.kt rename to api/src/main/java/com/vk/sdk/api/video/dto/VideoSearchResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoVideo.kt b/api/src/main/java/com/vk/sdk/api/video/dto/VideoVideo.kt similarity index 97% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoVideo.kt rename to api/src/main/java/com/vk/sdk/api/video/dto/VideoVideo.kt index 4dc1a45243..722781d21f 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoVideo.kt +++ b/api/src/main/java/com/vk/sdk/api/video/dto/VideoVideo.kt @@ -28,13 +28,13 @@ package com.vk.sdk.api.video.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.audio.dto.AudioArtist import com.vk.sdk.api.audio.dto.AudioGenre import com.vk.sdk.api.base.dto.BaseBoolInt import com.vk.sdk.api.base.dto.BaseLikes import com.vk.sdk.api.base.dto.BasePropertyExists import com.vk.sdk.api.base.dto.BaseRepostsInfo -import com.vk.sdk.api.media.dto.MediaRestriction import kotlin.Boolean import kotlin.Int import kotlin.String @@ -68,7 +68,6 @@ import kotlin.collections.List * @param player - Video embed URL * @param processing - Returns if the video is processing * @param converting - 1 if video is being converted - * @param restriction * @param added - 1 if video is added to user's albums * @param isSubscribed - 1 if user is subscribed to author of the video * @param trackCode @@ -138,9 +137,9 @@ data class VideoVideo( @SerializedName("id") val id: Int? = null, @SerializedName("owner_id") - val ownerId: Int? = null, + val ownerId: UserId? = null, @SerializedName("user_id") - val userId: Int? = null, + val userId: UserId? = null, @SerializedName("title") val title: String? = null, @SerializedName("is_favorite") @@ -151,8 +150,6 @@ data class VideoVideo( val processing: BasePropertyExists? = null, @SerializedName("converting") val converting: BaseBoolInt? = null, - @SerializedName("restriction") - val restriction: MediaRestriction? = null, @SerializedName("added") val added: BaseBoolInt? = null, @SerializedName("is_subscribed") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoVideoAlbumFull.kt b/api/src/main/java/com/vk/sdk/api/video/dto/VideoVideoAlbumFull.kt similarity index 92% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoVideoAlbumFull.kt rename to api/src/main/java/com/vk/sdk/api/video/dto/VideoVideoAlbumFull.kt index 32b84c2195..c71c64eae1 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoVideoAlbumFull.kt +++ b/api/src/main/java/com/vk/sdk/api/video/dto/VideoVideoAlbumFull.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.video.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.base.dto.BasePropertyExists import kotlin.Int import kotlin.String @@ -35,29 +36,29 @@ import kotlin.collections.List /** * @param count - Total number of videos in album - * @param ownerId - Album owner's ID - * @param title - Album title - * @param updatedTime - Date when the album has been updated last time in Unixtime - * @param id - Album ID * @param image - Album cover image in different sizes * @param imageBlur - Need blur album thumb or not * @param isSystem - Information whether album is system + * @param updatedTime - Date when the album has been updated last time in Unixtime + * @param id - Album ID + * @param ownerId - Album owner's ID + * @param title - Album title */ data class VideoVideoAlbumFull( @SerializedName("count") - val count: Int, - @SerializedName("owner_id") - val ownerId: Int, - @SerializedName("title") - val title: String, - @SerializedName("updated_time") - val updatedTime: Int, - @SerializedName("id") - val id: Int? = null, + val count: Int? = null, @SerializedName("image") val image: List? = null, @SerializedName("image_blur") val imageBlur: BasePropertyExists? = null, @SerializedName("is_system") - val isSystem: BasePropertyExists? = null + val isSystem: BasePropertyExists? = null, + @SerializedName("updated_time") + val updatedTime: Int? = null, + @SerializedName("id") + val id: Int? = null, + @SerializedName("owner_id") + val ownerId: UserId? = null, + @SerializedName("title") + val title: String? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoVideoFiles.kt b/api/src/main/java/com/vk/sdk/api/video/dto/VideoVideoFiles.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoVideoFiles.kt rename to api/src/main/java/com/vk/sdk/api/video/dto/VideoVideoFiles.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoVideoFull.kt b/api/src/main/java/com/vk/sdk/api/video/dto/VideoVideoFull.kt similarity index 97% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoVideoFull.kt rename to api/src/main/java/com/vk/sdk/api/video/dto/VideoVideoFull.kt index 558bbd2f38..f81e667a56 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoVideoFull.kt +++ b/api/src/main/java/com/vk/sdk/api/video/dto/VideoVideoFull.kt @@ -28,13 +28,13 @@ package com.vk.sdk.api.video.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.audio.dto.AudioArtist import com.vk.sdk.api.audio.dto.AudioGenre import com.vk.sdk.api.base.dto.BaseBoolInt import com.vk.sdk.api.base.dto.BaseLikes import com.vk.sdk.api.base.dto.BasePropertyExists import com.vk.sdk.api.base.dto.BaseRepostsInfo -import com.vk.sdk.api.media.dto.MediaRestriction import kotlin.Boolean import kotlin.Int import kotlin.String @@ -70,7 +70,6 @@ import kotlin.collections.List * @param player - Video embed URL * @param processing - Returns if the video is processing * @param converting - 1 if video is being converted - * @param restriction * @param added - 1 if video is added to user's albums * @param isSubscribed - 1 if user is subscribed to author of the video * @param trackCode @@ -144,9 +143,9 @@ data class VideoVideoFull( @SerializedName("id") val id: Int? = null, @SerializedName("owner_id") - val ownerId: Int? = null, + val ownerId: UserId? = null, @SerializedName("user_id") - val userId: Int? = null, + val userId: UserId? = null, @SerializedName("title") val title: String? = null, @SerializedName("is_favorite") @@ -157,8 +156,6 @@ data class VideoVideoFull( val processing: BasePropertyExists? = null, @SerializedName("converting") val converting: BaseBoolInt? = null, - @SerializedName("restriction") - val restriction: MediaRestriction? = null, @SerializedName("added") val added: BaseBoolInt? = null, @SerializedName("is_subscribed") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoVideoImage.kt b/api/src/main/java/com/vk/sdk/api/video/dto/VideoVideoImage.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoVideoImage.kt rename to api/src/main/java/com/vk/sdk/api/video/dto/VideoVideoImage.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/WallService.kt b/api/src/main/java/com/vk/sdk/api/wall/WallService.kt similarity index 97% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/WallService.kt rename to api/src/main/java/com/vk/sdk/api/wall/WallService.kt index 780aad2a1f..915aa0a970 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/WallService.kt +++ b/api/src/main/java/com/vk/sdk/api/wall/WallService.kt @@ -27,19 +27,19 @@ // ********************************************************************* package com.vk.sdk.api.wall +import com.google.gson.reflect.TypeToken import com.vk.api.sdk.requests.VKRequest import com.vk.sdk.api.GsonHolder import com.vk.sdk.api.NewApiRequest import com.vk.sdk.api.base.dto.BaseBoolInt import com.vk.sdk.api.base.dto.BaseOkResponse import com.vk.sdk.api.base.dto.BaseUserGroupFields -import com.vk.sdk.api.wall.dto.FilterParam import com.vk.sdk.api.wall.dto.ReasonParam import com.vk.sdk.api.wall.dto.SortParam +import com.vk.sdk.api.wall.dto.TopicIdParam import com.vk.sdk.api.wall.dto.WallCreateCommentResponse import com.vk.sdk.api.wall.dto.WallEditResponse import com.vk.sdk.api.wall.dto.WallGetByIdExtendedResponse -import com.vk.sdk.api.wall.dto.WallGetByIdResponse import com.vk.sdk.api.wall.dto.WallGetCommentExtendedResponse import com.vk.sdk.api.wall.dto.WallGetCommentResponse import com.vk.sdk.api.wall.dto.WallGetCommentsExtendedResponse @@ -52,6 +52,7 @@ import com.vk.sdk.api.wall.dto.WallPostResponse import com.vk.sdk.api.wall.dto.WallRepostResponse import com.vk.sdk.api.wall.dto.WallSearchExtendedResponse import com.vk.sdk.api.wall.dto.WallSearchResponse +import com.vk.sdk.api.wall.dto.WallWallpostFull import kotlin.Boolean import kotlin.Float import kotlin.Int @@ -184,6 +185,7 @@ class WallService { * @param posterBkgOwnerId * @param posterBkgAccessHash * @param copyright + * @param topicId - Topic ID. Allowed values can be obtained from newsfeed.getPostTopics method * @return [VKRequest] with [WallEditResponse] */ fun wallEdit( @@ -204,7 +206,8 @@ class WallService { posterBkgId: Int? = null, posterBkgOwnerId: Int? = null, posterBkgAccessHash: String? = null, - copyright: String? = null + copyright: String? = null, + topicId: TopicIdParam? = null ): VKRequest = NewApiRequest("wall.edit") { GsonHolder.gson.fromJson(it, WallEditResponse::class.java) } @@ -227,6 +230,7 @@ class WallService { posterBkgOwnerId?.let { addParam("poster_bkg_owner_id", it) } posterBkgAccessHash?.let { addParam("poster_bkg_access_hash", it) } copyright?.let { addParam("copyright", it) } + topicId?.let { addParam("topic_id", it.value) } } /** @@ -321,10 +325,7 @@ class WallService { * @param domain - User or community short address. * @param offset - Offset needed to return a specific subset of posts. * @param count - Number of posts to return (maximum 100). - * @param filter - Filter to apply: 'owner' - posts by the wall owner, 'others' - posts by - * someone else, 'all' - posts by the wall owner and others (default), 'postponed' - timed posts - * (only available for calls with an 'access_token'), 'suggests' - suggested posts on a community - * wall + * @param filter * @param fields * @return [VKRequest] with [WallGetResponse] */ @@ -333,7 +334,7 @@ class WallService { domain: String? = null, offset: Int? = null, count: Int? = null, - filter: FilterParam? = null, + filter: String? = null, fields: List? = null ): VKRequest = NewApiRequest("wall.get") { GsonHolder.gson.fromJson(it, WallGetResponse::class.java) @@ -343,7 +344,7 @@ class WallService { domain?.let { addParam("domain", it) } offset?.let { addParam("offset", it) } count?.let { addParam("count", it) } - filter?.let { addParam("filter", it.value) } + filter?.let { addParam("filter", it) } val fieldsJsonConverted = fields?.map { it.value } @@ -358,10 +359,7 @@ class WallService { * @param domain - User or community short address. * @param offset - Offset needed to return a specific subset of posts. * @param count - Number of posts to return (maximum 100). - * @param filter - Filter to apply: 'owner' - posts by the wall owner, 'others' - posts by - * someone else, 'all' - posts by the wall owner and others (default), 'postponed' - timed posts - * (only available for calls with an 'access_token'), 'suggests' - suggested posts on a community - * wall + * @param filter * @param fields * @return [VKRequest] with [WallGetExtendedResponse] */ @@ -370,7 +368,7 @@ class WallService { domain: String? = null, offset: Int? = null, count: Int? = null, - filter: FilterParam? = null, + filter: String? = null, fields: List? = null ): VKRequest = NewApiRequest("wall.get") { GsonHolder.gson.fromJson(it, WallGetExtendedResponse::class.java) @@ -380,7 +378,7 @@ class WallService { domain?.let { addParam("domain", it) } offset?.let { addParam("offset", it) } count?.let { addParam("count", it) } - filter?.let { addParam("filter", it.value) } + filter?.let { addParam("filter", it) } addParam("extended", true) val fieldsJsonConverted = fields?.map { it.value @@ -396,14 +394,15 @@ class WallService { * @param copyHistoryDepth - Sets the number of parent elements to include in the array * 'copy_history' that is returned if the post is a repost from another wall. * @param fields - * @return [VKRequest] with [WallGetByIdResponse] + * @return [VKRequest] with [Unit] */ fun wallGetById( posts: List, copyHistoryDepth: Int? = null, fields: List? = null - ): VKRequest = NewApiRequest("wall.getById") { - GsonHolder.gson.fromJson(it, WallGetByIdResponse::class.java) + ): VKRequest> = NewApiRequest("wall.getById") { + val typeToken = object: TypeToken>() {}.type + GsonHolder.gson.fromJson>(it, typeToken) } .apply { addParam("posts", posts) @@ -681,6 +680,7 @@ class WallService { * @param donutPaidDuration * @param muteNotifications * @param copyright + * @param topicId - Topic ID. Allowed values can be obtained from newsfeed.getPostTopics method * @return [VKRequest] with [WallPostResponse] */ fun wallPost( @@ -701,7 +701,8 @@ class WallService { closeComments: Boolean? = null, donutPaidDuration: Int? = null, muteNotifications: Boolean? = null, - copyright: String? = null + copyright: String? = null, + topicId: TopicIdParam? = null ): VKRequest = NewApiRequest("wall.post") { GsonHolder.gson.fromJson(it, WallPostResponse::class.java) } @@ -724,6 +725,7 @@ class WallService { donutPaidDuration?.let { addParam("donut_paid_duration", it) } muteNotifications?.let { addParam("mute_notifications", it) } copyright?.let { addParam("copyright", it) } + topicId?.let { addParam("topic_id", it.value) } } /** diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/ReasonParam.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/ReasonParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/ReasonParam.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/ReasonParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/SortParam.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/SortParam.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/SortParam.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/SortParam.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/FilterParam.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/TopicIdParam.kt similarity index 71% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/FilterParam.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/TopicIdParam.kt index e592baee1b..7856c333e4 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/FilterParam.kt +++ b/api/src/main/java/com/vk/sdk/api/wall/dto/TopicIdParam.kt @@ -28,23 +28,44 @@ package com.vk.sdk.api.wall.dto import com.google.gson.annotations.SerializedName -import kotlin.String +import kotlin.Int -enum class FilterParam( - val value: String +enum class TopicIdParam( + val value: Int ) { - @SerializedName("owner") - OWNER("owner"), + @SerializedName("0") + EMPTY_TOPIC(0), - @SerializedName("others") - OTHERS("others"), + @SerializedName("1") + ART(1), - @SerializedName("all") - ALL("all"), + @SerializedName("7") + IT(7), - @SerializedName("postponed") - POSTPONED("postponed"), + @SerializedName("12") + GAMES(12), - @SerializedName("suggests") - SUGGESTS("suggests"); + @SerializedName("16") + MUSIC(16), + + @SerializedName("19") + PHOTO(19), + + @SerializedName("21") + SCIENCE_AND_TECH(21), + + @SerializedName("23") + SPORT(23), + + @SerializedName("25") + TRAVEL(25), + + @SerializedName("26") + TV_AND_CINEMA(26), + + @SerializedName("32") + HUMOR(32), + + @SerializedName("43") + FASHION(43); } diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallAppPost.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallAppPost.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallAppPost.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallAppPost.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallAttachedNote.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallAttachedNote.kt similarity index 78% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallAttachedNote.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallAttachedNote.kt index 9a9f10f3a2..5cd1d78cd8 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallAttachedNote.kt +++ b/api/src/main/java/com/vk/sdk/api/wall/dto/WallAttachedNote.kt @@ -28,8 +28,10 @@ package com.vk.sdk.api.wall.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import kotlin.Int import kotlin.String +import kotlin.collections.List /** * @param comments - Comments number @@ -39,6 +41,11 @@ import kotlin.String * @param readComments - Read comments number * @param title - Note title * @param viewUrl - URL of the page with note preview + * @param text - Note text + * @param privacyView + * @param privacyComment + * @param canComment + * @param textWiki - Note wiki text */ data class WallAttachedNote( @SerializedName("comments") @@ -48,11 +55,21 @@ data class WallAttachedNote( @SerializedName("id") val id: Int, @SerializedName("owner_id") - val ownerId: Int, + val ownerId: UserId, @SerializedName("read_comments") val readComments: Int, @SerializedName("title") val title: String, @SerializedName("view_url") - val viewUrl: String + val viewUrl: String, + @SerializedName("text") + val text: String? = null, + @SerializedName("privacy_view") + val privacyView: List? = null, + @SerializedName("privacy_comment") + val privacyComment: List? = null, + @SerializedName("can_comment") + val canComment: Int? = null, + @SerializedName("text_wiki") + val textWiki: String? = null ) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallCommentAttachment.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallCommentAttachment.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallCommentAttachment.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallCommentAttachment.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallCommentAttachmentType.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallCommentAttachmentType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallCommentAttachmentType.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallCommentAttachmentType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallCreateCommentResponse.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallCreateCommentResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallCreateCommentResponse.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallCreateCommentResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallEditResponse.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallEditResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallEditResponse.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallEditResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallGeo.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallGeo.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallGeo.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallGeo.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallGetByIdExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallGetByIdExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallGetByIdExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallGetByIdExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallGetCommentExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallGetCommentExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallGetCommentExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallGetCommentExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallGetCommentResponse.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallGetCommentResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallGetCommentResponse.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallGetCommentResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallGetCommentsExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallGetCommentsExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallGetCommentsExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallGetCommentsExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallGetCommentsResponse.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallGetCommentsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallGetCommentsResponse.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallGetCommentsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallGetExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallGetExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallGetExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallGetExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallGetRepostsResponse.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallGetRepostsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallGetRepostsResponse.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallGetRepostsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallGetResponse.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallGetResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallGetResponse.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallGetResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallGraffiti.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallGraffiti.kt similarity index 96% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallGraffiti.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallGraffiti.kt index c369a6cd63..045290580f 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallGraffiti.kt +++ b/api/src/main/java/com/vk/sdk/api/wall/dto/WallGraffiti.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.wall.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import kotlin.Int import kotlin.String @@ -41,7 +42,7 @@ data class WallGraffiti( @SerializedName("id") val id: Int? = null, @SerializedName("owner_id") - val ownerId: Int? = null, + val ownerId: UserId? = null, @SerializedName("photo_200") val photo200: String? = null, @SerializedName("photo_586") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallPostAdsStealthResponse.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallPostAdsStealthResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallPostAdsStealthResponse.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallPostAdsStealthResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallPostCopyright.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallPostCopyright.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallPostCopyright.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallPostCopyright.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallPostResponse.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallPostResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallPostResponse.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallPostResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallPostSource.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallPostSource.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallPostSource.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallPostSource.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallPostSourceType.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallPostSourceType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallPostSourceType.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallPostSourceType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallPostType.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallPostType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallPostType.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallPostType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallPostedPhoto.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallPostedPhoto.kt similarity index 96% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallPostedPhoto.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallPostedPhoto.kt index 1bb241ecd3..2daf58dc2f 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallPostedPhoto.kt +++ b/api/src/main/java/com/vk/sdk/api/wall/dto/WallPostedPhoto.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.wall.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import kotlin.Int import kotlin.String @@ -41,7 +42,7 @@ data class WallPostedPhoto( @SerializedName("id") val id: Int? = null, @SerializedName("owner_id") - val ownerId: Int? = null, + val ownerId: UserId? = null, @SerializedName("photo_130") val photo130: String? = null, @SerializedName("photo_604") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallRepostResponse.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallRepostResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallRepostResponse.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallRepostResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallSearchExtendedResponse.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallSearchExtendedResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallSearchExtendedResponse.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallSearchExtendedResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallSearchResponse.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallSearchResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallSearchResponse.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallSearchResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallViews.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallViews.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallViews.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallViews.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallWallComment.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallWallComment.kt similarity index 97% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallWallComment.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallWallComment.kt index df8ea91038..76173f32e7 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallWallComment.kt +++ b/api/src/main/java/com/vk/sdk/api/wall/dto/WallWallComment.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.wall.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.base.dto.BaseLikesInfo import com.vk.sdk.api.comment.dto.CommentThread import kotlin.Boolean @@ -78,7 +79,7 @@ data class WallWallComment( @SerializedName("post_id") val postId: Int? = null, @SerializedName("owner_id") - val ownerId: Int? = null, + val ownerId: UserId? = null, @SerializedName("parents_stack") val parentsStack: List? = null, @SerializedName("deleted") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallWallCommentDonut.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallWallCommentDonut.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallWallCommentDonut.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallWallCommentDonut.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallWallCommentDonutPlaceholder.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallWallCommentDonutPlaceholder.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallWallCommentDonutPlaceholder.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallWallCommentDonutPlaceholder.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpost.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpost.kt similarity index 96% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpost.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpost.kt index 0f7e78570f..978b3ec24a 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpost.kt +++ b/api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpost.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.wall.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.base.dto.BaseLikesInfo import com.vk.sdk.api.base.dto.BaseRepostsInfo import kotlin.Any @@ -38,6 +39,7 @@ import kotlin.collections.List /** * @param accessKey - Access key to private object + * @param isDeleted * @param attachments * @param copyright - Information about the source of the post * @param date - Date of publishing in Unixtime @@ -62,6 +64,8 @@ import kotlin.collections.List data class WallWallpost( @SerializedName("access_key") val accessKey: String? = null, + @SerializedName("is_deleted") + val isDeleted: Boolean? = null, @SerializedName("attachments") val attachments: List? = null, @SerializedName("copyright") @@ -83,7 +87,7 @@ data class WallWallpost( @SerializedName("likes") val likes: BaseLikesInfo? = null, @SerializedName("owner_id") - val ownerId: Int? = null, + val ownerId: UserId? = null, @SerializedName("poster") val poster: Any? = null, @SerializedName("post_id") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostAttachment.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostAttachment.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostAttachment.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostAttachment.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostAttachmentType.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostAttachmentType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostAttachmentType.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostAttachmentType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostCommentsDonut.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostCommentsDonut.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostCommentsDonut.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostCommentsDonut.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostCommentsDonutPlaceholder.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostCommentsDonutPlaceholder.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostCommentsDonutPlaceholder.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostCommentsDonutPlaceholder.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostDonut.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostDonut.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostDonut.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostDonut.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostDonutPlaceholder.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostDonutPlaceholder.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostDonutPlaceholder.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostDonutPlaceholder.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostFull.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostFull.kt similarity index 84% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostFull.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostFull.kt index 90f95fc40c..156eba3ca2 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostFull.kt +++ b/api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostFull.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.wall.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import com.vk.sdk.api.base.dto.BaseBoolInt import com.vk.sdk.api.base.dto.BaseCommentsInfo import com.vk.sdk.api.base.dto.BaseLikesInfo @@ -49,9 +50,11 @@ import kotlin.collections.List * @param isPinned - Information whether the post is pinned * @param comments * @param markedAsAds - Information whether the post is marked as ads + * @param topicId - Topic ID. Allowed values can be obtained from newsfeed.getPostTopics method * @param shortTextRate - Preview length control parameter * @param carouselOffset - Index of current carousel element * @param accessKey - Access key to private object + * @param isDeleted * @param attachments * @param copyright - Information about the source of the post * @param date - Date of publishing in Unixtime @@ -92,12 +95,16 @@ data class WallWallpostFull( val comments: BaseCommentsInfo? = null, @SerializedName("marked_as_ads") val markedAsAds: BaseBoolInt? = null, + @SerializedName("topic_id") + val topicId: WallWallpostFull.TopicId? = null, @SerializedName("short_text_rate") val shortTextRate: Float? = null, @SerializedName("carousel_offset") val carouselOffset: Int? = null, @SerializedName("access_key") val accessKey: String? = null, + @SerializedName("is_deleted") + val isDeleted: Boolean? = null, @SerializedName("attachments") val attachments: List? = null, @SerializedName("copyright") @@ -119,7 +126,7 @@ data class WallWallpostFull( @SerializedName("likes") val likes: BaseLikesInfo? = null, @SerializedName("owner_id") - val ownerId: Int? = null, + val ownerId: UserId? = null, @SerializedName("poster") val poster: Any? = null, @SerializedName("post_id") @@ -138,4 +145,44 @@ data class WallWallpostFull( val text: String? = null, @SerializedName("views") val views: WallViews? = null -) +) { + enum class TopicId( + val value: Int + ) { + @SerializedName("0") + EMPTY_TOPIC(0), + + @SerializedName("1") + ART(1), + + @SerializedName("7") + IT(7), + + @SerializedName("12") + GAMES(12), + + @SerializedName("16") + MUSIC(16), + + @SerializedName("19") + PHOTO(19), + + @SerializedName("21") + SCIENCE_AND_TECH(21), + + @SerializedName("23") + SPORT(23), + + @SerializedName("25") + TRAVEL(25), + + @SerializedName("26") + TV_AND_CINEMA(26), + + @SerializedName("32") + HUMOR(32), + + @SerializedName("43") + FASHION(43); + } +} diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostToId.kt b/api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostToId.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostToId.kt rename to api/src/main/java/com/vk/sdk/api/wall/dto/WallWallpostToId.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/widgets/WidgetsService.kt b/api/src/main/java/com/vk/sdk/api/widgets/WidgetsService.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/widgets/WidgetsService.kt rename to api/src/main/java/com/vk/sdk/api/widgets/WidgetsService.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsCommentMedia.kt b/api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsCommentMedia.kt similarity index 96% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsCommentMedia.kt rename to api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsCommentMedia.kt index 78db78ca17..6c7a5c49f9 100644 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsCommentMedia.kt +++ b/api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsCommentMedia.kt @@ -28,6 +28,7 @@ package com.vk.sdk.api.widgets.dto import com.google.gson.annotations.SerializedName +import com.vk.dto.common.id.UserId import kotlin.Int import kotlin.String @@ -41,7 +42,7 @@ data class WidgetsCommentMedia( @SerializedName("item_id") val itemId: Int? = null, @SerializedName("owner_id") - val ownerId: Int? = null, + val ownerId: UserId? = null, @SerializedName("thumb_src") val thumbSrc: String? = null, @SerializedName("type") diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsCommentMediaType.kt b/api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsCommentMediaType.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsCommentMediaType.kt rename to api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsCommentMediaType.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsCommentReplies.kt b/api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsCommentReplies.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsCommentReplies.kt rename to api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsCommentReplies.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsCommentRepliesItem.kt b/api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsCommentRepliesItem.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsCommentRepliesItem.kt rename to api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsCommentRepliesItem.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsGetCommentsResponse.kt b/api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsGetCommentsResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsGetCommentsResponse.kt rename to api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsGetCommentsResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsGetPagesResponse.kt b/api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsGetPagesResponse.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsGetPagesResponse.kt rename to api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsGetPagesResponse.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsWidgetComment.kt b/api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsWidgetComment.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsWidgetComment.kt rename to api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsWidgetComment.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsWidgetLikes.kt b/api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsWidgetLikes.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsWidgetLikes.kt rename to api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsWidgetLikes.kt diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsWidgetPage.kt b/api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsWidgetPage.kt similarity index 100% rename from vk-sdk-api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsWidgetPage.kt rename to api/src/main/java/com/vk/sdk/api/widgets/dto/WidgetsWidgetPage.kt diff --git a/build.gradle b/build.gradle index 76147d508e..fb718a4437 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,6 @@ subprojects { Project subproject -> } google() mavenCentral() - maven { url 'https://maven.google.com' } } dependencies { diff --git a/vk-sdk-core/build.gradle b/core/build.gradle similarity index 89% rename from vk-sdk-core/build.gradle rename to core/build.gradle index 1fb76eceff..5e20765acd 100644 --- a/vk-sdk-core/build.gradle +++ b/core/build.gradle @@ -25,15 +25,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' apply from: "../dependencies.gradle" -if (System.getenv('SDK_UPDATE') != "1") { - Project superApp = rootProject.findProject("lib-superapp") - if (superApp == null) { - throw new IllegalStateException("Couldn't find lib-superapp project.") - } - - apply plugin: 'com.vk.build.publish.sak-publish' -} - version = sdkVersions.name group = 'com.vk' ext.POM_ARTIFACT_ID = sdkPublish.POM_ARTIFACT_ID diff --git a/vk-sdk-core/gradle.properties b/core/gradle.properties similarity index 100% rename from vk-sdk-core/gradle.properties rename to core/gradle.properties diff --git a/vk-sdk-core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml similarity index 95% rename from vk-sdk-core/src/main/AndroidManifest.xml rename to core/src/main/AndroidManifest.xml index c335d89add..6012b79215 100644 --- a/vk-sdk-core/src/main/AndroidManifest.xml +++ b/core/src/main/AndroidManifest.xml @@ -52,7 +52,8 @@ + android:exported="false" + android:enabled="@bool/com_vk_sdk_init_provider_enabled"/> \ No newline at end of file diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/VK.kt b/core/src/main/java/com/vk/api/sdk/VK.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/VK.kt rename to core/src/main/java/com/vk/api/sdk/VK.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/VKApiCallListener.kt b/core/src/main/java/com/vk/api/sdk/VKApiCallListener.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/VKApiCallListener.kt rename to core/src/main/java/com/vk/api/sdk/VKApiCallListener.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/VKApiCallback.kt b/core/src/main/java/com/vk/api/sdk/VKApiCallback.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/VKApiCallback.kt rename to core/src/main/java/com/vk/api/sdk/VKApiCallback.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/VKApiConfig.kt b/core/src/main/java/com/vk/api/sdk/VKApiConfig.kt similarity index 96% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/VKApiConfig.kt rename to core/src/main/java/com/vk/api/sdk/VKApiConfig.kt index 1625736681..29b101d375 100644 --- a/vk-sdk-core/src/main/java/com/vk/api/sdk/VKApiConfig.kt +++ b/core/src/main/java/com/vk/api/sdk/VKApiConfig.kt @@ -55,9 +55,9 @@ data class VKApiConfig( val keyValueStorage: VKKeyValueStorage = VKPreferencesKeyValueStorage(context), val customApiEndpoint: Lazy = lazy { DEFAULT_API_ENDPOINT }, val rateLimitBackoffTimeoutMs: Long = TimeUnit.HOURS.toMillis(1), - val useMsgPackSerialization: (String) -> Boolean = { false }, val apiMethodPriorityBackoff: ApiMethodPriorityBackoff = ApiMethodPriorityBackoff.DEFAULT, val externalDeviceId: Lazy = lazy { null }, + val enableAnonymousToken: Boolean = true ) { fun builder(context: Context) = Builder(VKApiConfig(context, validationHandler = VKDefaultValidationHandler(context))) @@ -134,6 +134,10 @@ data class VKApiConfig( config = config.copy(externalDeviceId = lazy { externalDeviceId }) } + fun enableAnonymousToken(enable: Boolean) = apply { + config = config.copy(enableAnonymousToken = enable) + } + fun build(): VKApiConfig { return config } @@ -141,7 +145,7 @@ data class VKApiConfig( companion object { const val DEFAULT_DOMAIN = "vk.com" - const val DEFAULT_API_VERSION = "5.90" + const val DEFAULT_API_VERSION = "5.131" const val DEFAULT_API_DOMAIN = "api.vk.com" const val DEFAULT_OAUTH_DOMAIN = "oauth.vk.com" const val DEFAULT_STATIC_DOMAIN = "static.vk.com" diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/VKApiCredentials.kt b/core/src/main/java/com/vk/api/sdk/VKApiCredentials.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/VKApiCredentials.kt rename to core/src/main/java/com/vk/api/sdk/VKApiCredentials.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/VKApiIllegalCredentialsListener.kt b/core/src/main/java/com/vk/api/sdk/VKApiIllegalCredentialsListener.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/VKApiIllegalCredentialsListener.kt rename to core/src/main/java/com/vk/api/sdk/VKApiIllegalCredentialsListener.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/VKApiManager.kt b/core/src/main/java/com/vk/api/sdk/VKApiManager.kt similarity index 76% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/VKApiManager.kt rename to core/src/main/java/com/vk/api/sdk/VKApiManager.kt index 0439970285..56ccdde36f 100644 --- a/vk-sdk-core/src/main/java/com/vk/api/sdk/VKApiManager.kt +++ b/core/src/main/java/com/vk/api/sdk/VKApiManager.kt @@ -30,6 +30,8 @@ import com.vk.api.sdk.internal.ApiCommand import com.vk.api.sdk.okhttp.OkHttpExecutor import com.vk.api.sdk.okhttp.OkHttpExecutorConfig import com.vk.api.sdk.okhttp.OkHttpMethodCall +import com.vk.api.sdk.utils.RateLimitTokenBackoff +import com.vk.api.sdk.utils.tmr.TooManyRequestBackoffGlobal import java.io.IOException /** @@ -38,10 +40,10 @@ import java.io.IOException @Suppress("UseExpressionBody") open class VKApiManager(val config: VKApiConfig) { - private val rateLimitBackoff by lazy { - RateLimitReachedChainCall.RateLimitBackoff( - context = config.context, - backoffTimeMs = config.rateLimitBackoffTimeoutMs + protected val rateLimitBackoff by lazy { + RateLimitTokenBackoff( + store = RateLimitTokenBackoff.TokenPrefStore(config.context), + minBackoffTime = config.rateLimitBackoffTimeoutMs ) } @@ -105,7 +107,7 @@ open class VKApiManager(val config: VKApiConfig) { } cc = ApiMethodPriorityChainCall(this, cc, call, config.apiMethodPriorityBackoff) cc = InvalidCredentialsObserverChainCall(this, cc, 1) - cc = TooManyRequestRetryChainCall(this, call.retryCount, cc) + cc = createTooManyRequestRetryChainCall(call, cc) cc = RateLimitReachedChainCall(this, call.method, rateLimitBackoff, cc) if (call.retryCount > 0) { cc = InternalErrorRetryChainCall(this, call.retryCount, cc) @@ -129,15 +131,43 @@ open class VKApiManager(val config: VKApiConfig) { return cc } - private fun createValidationHandlerChainCall(retryCount: Int, chainCall: ChainCall) = - ValidationHandlerChainCall(this, retryCount, chainCall) + protected open fun createValidationHandlerChainCall( + retryCount: Int, + chainCall: ChainCall + ): ValidationHandlerChainCall { + return ValidationHandlerChainCall(this, retryCount, chainCall) + } @Throws(InterruptedException::class, IOException::class, VKApiException::class) - protected open fun executeWithExceptionAdjust(cc: ChainCall) = cc.call(ChainArgs())!! + protected open fun executeWithExceptionAdjust(cc: ChainCall): T { + return cc.call(ChainArgs())!! + } - protected open fun createMethodChainCall(call: VKMethodCall, parser: VKApiResponseParser? = null): ChainCall = - MethodChainCall(this, executor, OkHttpMethodCall.Builder().from(call), config.deviceId.value, config.lang, parser) + protected open fun createMethodChainCall( + call: VKMethodCall, + parser: VKApiResponseParser? = null + ): ChainCall { + return MethodChainCall( + this, + executor, + OkHttpMethodCall.Builder().from(call), + config.deviceId.value, + config.lang, + parser + ) + } - protected open fun createPostMethodChainCall(call: VKHttpPostCall, progress: VKApiProgressListener?, parser: VKApiResponseParser?) = - HttpPostChainCall(this, executor, call, progress, parser) + protected open fun createPostMethodChainCall( + call: VKHttpPostCall, + progress: VKApiProgressListener?, parser: VKApiResponseParser? + ): HttpPostChainCall { + return HttpPostChainCall(this, executor, call, progress, parser) + } + + protected open fun createTooManyRequestRetryChainCall( + call: VKMethodCall, + chainCall: ChainCall + ): TooManyRequestRetryChainCall { + return TooManyRequestRetryChainCall(this, call.retryCount, TooManyRequestBackoffGlobal, chainCall) + } } diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/VKApiProgressListener.kt b/core/src/main/java/com/vk/api/sdk/VKApiProgressListener.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/VKApiProgressListener.kt rename to core/src/main/java/com/vk/api/sdk/VKApiProgressListener.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/VKApiResponseParser.java b/core/src/main/java/com/vk/api/sdk/VKApiResponseParser.java similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/VKApiResponseParser.java rename to core/src/main/java/com/vk/api/sdk/VKApiResponseParser.java diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/VKApiValidationHandler.kt b/core/src/main/java/com/vk/api/sdk/VKApiValidationHandler.kt similarity index 96% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/VKApiValidationHandler.kt rename to core/src/main/java/com/vk/api/sdk/VKApiValidationHandler.kt index c4a00c9d69..89b6875f65 100644 --- a/vk-sdk-core/src/main/java/com/vk/api/sdk/VKApiValidationHandler.kt +++ b/core/src/main/java/com/vk/api/sdk/VKApiValidationHandler.kt @@ -60,5 +60,9 @@ interface VKApiValidationHandler { } class Credentials(val secret: String?, val token: String?, val uid: Int?) { val isValid = !token.isNullOrBlank() + + companion object { + val EMPTY = Credentials("", "", null) + } } } \ No newline at end of file diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/VKDefaultValidationHandler.kt b/core/src/main/java/com/vk/api/sdk/VKDefaultValidationHandler.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/VKDefaultValidationHandler.kt rename to core/src/main/java/com/vk/api/sdk/VKDefaultValidationHandler.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/VKHttpPostCall.kt b/core/src/main/java/com/vk/api/sdk/VKHttpPostCall.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/VKHttpPostCall.kt rename to core/src/main/java/com/vk/api/sdk/VKHttpPostCall.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/VKKeyValueStorage.kt b/core/src/main/java/com/vk/api/sdk/VKKeyValueStorage.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/VKKeyValueStorage.kt rename to core/src/main/java/com/vk/api/sdk/VKKeyValueStorage.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/VKMethodCall.kt b/core/src/main/java/com/vk/api/sdk/VKMethodCall.kt similarity index 90% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/VKMethodCall.kt rename to core/src/main/java/com/vk/api/sdk/VKMethodCall.kt index 9b0d0d459f..4b2d2330d9 100644 --- a/vk-sdk-core/src/main/java/com/vk/api/sdk/VKMethodCall.kt +++ b/core/src/main/java/com/vk/api/sdk/VKMethodCall.kt @@ -29,6 +29,8 @@ package com.vk.api.sdk */ open class VKMethodCall { open class Builder { + var requestUrl: String? = null + private set var method: String = "" private set var version: String = "" @@ -45,7 +47,10 @@ open class VKMethodCall { private set var allowNoAuth: Boolean = false private set + var isAnonymous: Boolean = false + private set + open fun url(url: String?) = apply { this.requestUrl = url } /** * Api method name * You can find all methods here: https://vk.com/dev/methods @@ -61,10 +66,12 @@ open class VKMethodCall { open fun awaitNetwork(isAwaitNetwork: Boolean) = apply { this.isAwaitNetwork = isAwaitNetwork } open fun ignoreExecuteErrors(ignoredErrors: IntArray?) = apply { this.ignoreExecuteErrors = ignoredErrors } open fun allowNoAuth(allowNoAuth: Boolean) = apply { this.allowNoAuth = allowNoAuth } + open fun setAnonymous(allow: Boolean) = apply { this.isAnonymous = allow } open fun build() = VKMethodCall(this) } + val requestUrl: String? val method: String val version: String val args: Map @@ -72,11 +79,13 @@ open class VKMethodCall { val skipValidation: Boolean val isAwaitNetwork: Boolean val allowNoAuth: Boolean + val isAnonymous: Boolean val ignoreExecuteErrors: IntArray? protected constructor(b: Builder) { if (b.method.isBlank()) throw IllegalArgumentException("method is null or empty") if (b.version.isBlank()) throw IllegalArgumentException("version is null or empty") + this.requestUrl = b.requestUrl this.method = b.method this.version = b.version this.args = b.args @@ -85,6 +94,7 @@ open class VKMethodCall { this.isAwaitNetwork = b.isAwaitNetwork this.ignoreExecuteErrors = b.ignoreExecuteErrors this.allowNoAuth = b.allowNoAuth + this.isAnonymous = b.isAnonymous } override fun equals(other: Any?): Boolean { @@ -99,6 +109,6 @@ open class VKMethodCall { override fun toString() = "VKMethodCall(method='$method', args=$args)" companion object { - private const val DEFAULT_RETRY_COUNT = 4 + const val DEFAULT_RETRY_COUNT = 4 } } \ No newline at end of file diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/VKOkHttpProvider.kt b/core/src/main/java/com/vk/api/sdk/VKOkHttpProvider.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/VKOkHttpProvider.kt rename to core/src/main/java/com/vk/api/sdk/VKOkHttpProvider.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/VKPreferencesKeyValueStorage.kt b/core/src/main/java/com/vk/api/sdk/VKPreferencesKeyValueStorage.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/VKPreferencesKeyValueStorage.kt rename to core/src/main/java/com/vk/api/sdk/VKPreferencesKeyValueStorage.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/VKScheduler.kt b/core/src/main/java/com/vk/api/sdk/VKScheduler.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/VKScheduler.kt rename to core/src/main/java/com/vk/api/sdk/VKScheduler.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/VKTokenExpiredHandler.kt b/core/src/main/java/com/vk/api/sdk/VKTokenExpiredHandler.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/VKTokenExpiredHandler.kt rename to core/src/main/java/com/vk/api/sdk/VKTokenExpiredHandler.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/VkResult.kt b/core/src/main/java/com/vk/api/sdk/VkResult.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/VkResult.kt rename to core/src/main/java/com/vk/api/sdk/VkResult.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/auth/VKAccessToken.kt b/core/src/main/java/com/vk/api/sdk/auth/VKAccessToken.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/auth/VKAccessToken.kt rename to core/src/main/java/com/vk/api/sdk/auth/VKAccessToken.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/auth/VKAuthCallback.kt b/core/src/main/java/com/vk/api/sdk/auth/VKAuthCallback.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/auth/VKAuthCallback.kt rename to core/src/main/java/com/vk/api/sdk/auth/VKAuthCallback.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/auth/VKAuthManager.kt b/core/src/main/java/com/vk/api/sdk/auth/VKAuthManager.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/auth/VKAuthManager.kt rename to core/src/main/java/com/vk/api/sdk/auth/VKAuthManager.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/auth/VKAuthParams.kt b/core/src/main/java/com/vk/api/sdk/auth/VKAuthParams.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/auth/VKAuthParams.kt rename to core/src/main/java/com/vk/api/sdk/auth/VKAuthParams.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/auth/VKAuthResult.kt b/core/src/main/java/com/vk/api/sdk/auth/VKAuthResult.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/auth/VKAuthResult.kt rename to core/src/main/java/com/vk/api/sdk/auth/VKAuthResult.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/auth/VKScope.kt b/core/src/main/java/com/vk/api/sdk/auth/VKScope.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/auth/VKScope.kt rename to core/src/main/java/com/vk/api/sdk/auth/VKScope.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/browser/BrowserDescriptor.java b/core/src/main/java/com/vk/api/sdk/browser/BrowserDescriptor.java similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/browser/BrowserDescriptor.java rename to core/src/main/java/com/vk/api/sdk/browser/BrowserDescriptor.java diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/browser/BrowserMatcher.java b/core/src/main/java/com/vk/api/sdk/browser/BrowserMatcher.java similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/browser/BrowserMatcher.java rename to core/src/main/java/com/vk/api/sdk/browser/BrowserMatcher.java diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/browser/BrowserSelector.java b/core/src/main/java/com/vk/api/sdk/browser/BrowserSelector.java similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/browser/BrowserSelector.java rename to core/src/main/java/com/vk/api/sdk/browser/BrowserSelector.java diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/browser/Browsers.java b/core/src/main/java/com/vk/api/sdk/browser/Browsers.java similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/browser/Browsers.java rename to core/src/main/java/com/vk/api/sdk/browser/Browsers.java diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/browser/DelimitedVersion.java b/core/src/main/java/com/vk/api/sdk/browser/DelimitedVersion.java similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/browser/DelimitedVersion.java rename to core/src/main/java/com/vk/api/sdk/browser/DelimitedVersion.java diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/browser/VersionRange.java b/core/src/main/java/com/vk/api/sdk/browser/VersionRange.java similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/browser/VersionRange.java rename to core/src/main/java/com/vk/api/sdk/browser/VersionRange.java diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/browser/VersionedBrowserMatcher.java b/core/src/main/java/com/vk/api/sdk/browser/VersionedBrowserMatcher.java similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/browser/VersionedBrowserMatcher.java rename to core/src/main/java/com/vk/api/sdk/browser/VersionedBrowserMatcher.java diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/browser/WhiteListedBrowserHelper.java b/core/src/main/java/com/vk/api/sdk/browser/WhiteListedBrowserHelper.java similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/browser/WhiteListedBrowserHelper.java rename to core/src/main/java/com/vk/api/sdk/browser/WhiteListedBrowserHelper.java diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/chain/ApiMethodPriorityChainCall.kt b/core/src/main/java/com/vk/api/sdk/chain/ApiMethodPriorityChainCall.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/chain/ApiMethodPriorityChainCall.kt rename to core/src/main/java/com/vk/api/sdk/chain/ApiMethodPriorityChainCall.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/chain/ChainArgs.kt b/core/src/main/java/com/vk/api/sdk/chain/ChainArgs.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/chain/ChainArgs.kt rename to core/src/main/java/com/vk/api/sdk/chain/ChainArgs.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/chain/ChainCall.kt b/core/src/main/java/com/vk/api/sdk/chain/ChainCall.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/chain/ChainCall.kt rename to core/src/main/java/com/vk/api/sdk/chain/ChainCall.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/chain/HttpPostChainCall.kt b/core/src/main/java/com/vk/api/sdk/chain/HttpPostChainCall.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/chain/HttpPostChainCall.kt rename to core/src/main/java/com/vk/api/sdk/chain/HttpPostChainCall.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/chain/InternalErrorRetryChainCall.kt b/core/src/main/java/com/vk/api/sdk/chain/InternalErrorRetryChainCall.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/chain/InternalErrorRetryChainCall.kt rename to core/src/main/java/com/vk/api/sdk/chain/InternalErrorRetryChainCall.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/chain/InvalidCredentialsObserverChainCall.kt b/core/src/main/java/com/vk/api/sdk/chain/InvalidCredentialsObserverChainCall.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/chain/InvalidCredentialsObserverChainCall.kt rename to core/src/main/java/com/vk/api/sdk/chain/InvalidCredentialsObserverChainCall.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/chain/MethodChainCall.kt b/core/src/main/java/com/vk/api/sdk/chain/MethodChainCall.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/chain/MethodChainCall.kt rename to core/src/main/java/com/vk/api/sdk/chain/MethodChainCall.kt diff --git a/core/src/main/java/com/vk/api/sdk/chain/RateLimitReachedChainCall.kt b/core/src/main/java/com/vk/api/sdk/chain/RateLimitReachedChainCall.kt new file mode 100644 index 0000000000..960582296b --- /dev/null +++ b/core/src/main/java/com/vk/api/sdk/chain/RateLimitReachedChainCall.kt @@ -0,0 +1,50 @@ +package com.vk.api.sdk.chain + +import android.content.Context +import android.os.SystemClock +import com.vk.api.sdk.VKApiManager +import com.vk.api.sdk.exceptions.RateLimitReachedException +import com.vk.api.sdk.exceptions.VKApiCodes +import com.vk.api.sdk.exceptions.VKApiExecutionException +import com.vk.api.sdk.utils.RateLimitTokenBackoff + +/** + * chain call which handles [VKApiCodes.CODE_RATE_LIMIT_REACHED] error code + * for now if we receive that code we don't have to call this method for the next backoff time + * in most cases normal back off time is 1 hour + * + * if backoff time for the current method is not over we throw our custom [RateLimitReachedException] + * and don't do real api method call + * + * @param manager - [VKApiManager] instance + * @param method - method name + * @param chainCall - current [ChainCall] + */ +class RateLimitReachedChainCall( + manager: VKApiManager, + private val method: String, + private val backoff: RateLimitTokenBackoff, + private val chainCall: ChainCall +): ChainCall(manager) { + + override fun call(args: ChainArgs): T? { + if (backoff.shouldWait(method)) { + throw RateLimitReachedException(method, DETAIL_MESSAGE) + } + + backoff.reset(method) + try { + return chainCall.call(args) + } catch (ex: VKApiExecutionException) { + if (ex.isRateLimitReachedError) { + backoff.backoff(method) + logDebug(DETAIL_MESSAGE, ex) + } + throw ex + } + } + + companion object { + private const val DETAIL_MESSAGE = "Rate limit reached." + } +} \ No newline at end of file diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/chain/RetryChainCall.kt b/core/src/main/java/com/vk/api/sdk/chain/RetryChainCall.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/chain/RetryChainCall.kt rename to core/src/main/java/com/vk/api/sdk/chain/RetryChainCall.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/chain/TooManyRequestRetryChainCall.kt b/core/src/main/java/com/vk/api/sdk/chain/TooManyRequestRetryChainCall.kt similarity index 62% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/chain/TooManyRequestRetryChainCall.kt rename to core/src/main/java/com/vk/api/sdk/chain/TooManyRequestRetryChainCall.kt index a8e09207c9..e65a7e8fb6 100644 --- a/vk-sdk-core/src/main/java/com/vk/api/sdk/chain/TooManyRequestRetryChainCall.kt +++ b/core/src/main/java/com/vk/api/sdk/chain/TooManyRequestRetryChainCall.kt @@ -24,26 +24,32 @@ package com.vk.api.sdk.chain -import android.os.SystemClock import com.vk.api.sdk.VKApiManager import com.vk.api.sdk.exceptions.VKApiException import com.vk.api.sdk.exceptions.VKApiExecutionException import com.vk.api.sdk.utils.ExponentialBackoff -import java.util.* +import com.vk.api.sdk.utils.tmr.TooManyRequestLimitBackoff + +class TooManyRequestRetryChainCall( + manager: VKApiManager, + retryLimit: Int, + val backoff: TooManyRequestLimitBackoff, + val chain: ChainCall, +) : RetryChainCall(manager, retryLimit) { -internal class TooManyRequestRetryChainCall(manager: VKApiManager, retryLimit: Int, val chain: ChainCall) : RetryChainCall(manager, retryLimit) { @Throws(Exception::class) override fun call(args: ChainArgs): T? { for (i in 0..retryLimit) { - Backoff.waitBeforeCall() + errorBackoff.waitIfNeeded() + backoff.waitBeforeCall(MAX_CALLS_PER_SECOND, MAX_LIMIT) try { val result = chain.call(args) - Backoff.reset() + errorBackoff.reset() return result } catch (ex: VKApiExecutionException) { if (ex.isTooManyRequestsError) { logDebug("Too many requests", ex) - Backoff.backoff() + errorBackoff.onError() } else { throw ex } @@ -52,36 +58,15 @@ internal class TooManyRequestRetryChainCall(manager: VKApiManager, retryLimit throw VKApiException("Can't handle too many requests due to retry limit! (retryLimit=$retryLimit)") } - private object Backoff { - const val TIMEOUT: Long = 1000 - private val bf = ExponentialBackoff(minDelayMs = TIMEOUT, maxDelayMs = TIMEOUT * 8, factor = 1.2f) - + companion object { + private const val TIMEOUT: Long = 1000 private const val MAX_CALLS_PER_SECOND = 4 - private const val SECOND_IN_MILLIS = 1000 - private val lastTimestamps = ArrayDeque().apply { // used in synchronized method - repeat(MAX_CALLS_PER_SECOND) { - addLast(0) - } - } - - @Synchronized - fun waitBeforeCall() { - bf.waitIfNeeded() - - val currentTimestamp = SystemClock.elapsedRealtime() - lastTimestamps.addLast(currentTimestamp) - val firstTimestamp = lastTimestamps.removeFirst() - - val waitFor = SECOND_IN_MILLIS - (currentTimestamp - firstTimestamp) - if (waitFor > 0) { - Thread.sleep(waitFor) - } - } - - @Synchronized - fun backoff() = bf.onError() + private const val MAX_LIMIT = 1000L - @Synchronized - fun reset() = bf.reset() + private val errorBackoff = ExponentialBackoff( + minDelayMs = TIMEOUT, + maxDelayMs = TIMEOUT * 8, + factor = 1.2f + ) } } \ No newline at end of file diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/chain/ValidationHandlerChainCall.kt b/core/src/main/java/com/vk/api/sdk/chain/ValidationHandlerChainCall.kt similarity index 96% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/chain/ValidationHandlerChainCall.kt rename to core/src/main/java/com/vk/api/sdk/chain/ValidationHandlerChainCall.kt index dae6b4b3a7..5e167920de 100644 --- a/vk-sdk-core/src/main/java/com/vk/api/sdk/chain/ValidationHandlerChainCall.kt +++ b/core/src/main/java/com/vk/api/sdk/chain/ValidationHandlerChainCall.kt @@ -71,6 +71,9 @@ class ValidationHandlerChainCall(manager: VKApiManager, retryLimit: Int, val protected fun persistToken(credentials: VKApiValidationHandler.Credentials?, ex: VKApiExecutionException) { when { + credentials == VKApiValidationHandler.Credentials.EMPTY -> { + //no need to update credentials use current + } credentials?.isValid == true -> manager.setCredentials(credentials.token!!, credentials.secret) else -> throw ex } diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/exceptions/IgnoredAccessTokenException.kt b/core/src/main/java/com/vk/api/sdk/exceptions/IgnoredAccessTokenException.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/exceptions/IgnoredAccessTokenException.kt rename to core/src/main/java/com/vk/api/sdk/exceptions/IgnoredAccessTokenException.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/exceptions/RateLimitReachedException.kt b/core/src/main/java/com/vk/api/sdk/exceptions/RateLimitReachedException.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/exceptions/RateLimitReachedException.kt rename to core/src/main/java/com/vk/api/sdk/exceptions/RateLimitReachedException.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/exceptions/VKApiCodes.kt b/core/src/main/java/com/vk/api/sdk/exceptions/VKApiCodes.kt similarity index 92% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/exceptions/VKApiCodes.kt rename to core/src/main/java/com/vk/api/sdk/exceptions/VKApiCodes.kt index df6cc150fc..efc332812a 100644 --- a/vk-sdk-core/src/main/java/com/vk/api/sdk/exceptions/VKApiCodes.kt +++ b/core/src/main/java/com/vk/api/sdk/exceptions/VKApiCodes.kt @@ -54,10 +54,14 @@ object VKApiCodes { const val CODE_TOKEN_CONFIRMATION_REQUIRED = 25 const val CODE_RATE_LIMIT_REACHED = 29 const val CODE_PRIVATE_PROFILE = 30 + const val CODE_CLIENT_VERSION_DEPRECATED = 34 const val CODE_CLIENT_UPDATE_NEEDED = 35 const val CODE_REQUIRED_ARG_NOT_FOUND = 100 const val CODE_INVALID_APP_IDENTIFIER = 101 + const val CODE_ERROR_LIMITS = 103 + const val SUBCODE_TOO_MANY_COMMUNITIES = 1 + const val CODE_TOO_MANY_CHAT_USERS = CODE_ERROR_LIMITS const val CODE_NOT_FOUND = 104 const val CODE_INVALID_USER_IDENTIFIER = 113 @@ -99,6 +103,7 @@ object VKApiCodes { const val CODE_CHAT_MR_ALREADY_SEND = 939 const val CODE_ADD_CHAT_MEMBER_ACCESS_TO_GROUP_DENIED = 947 const val CODE_CALL_HAS_BEEN_FINISHED = 951 + const val CODE_CALL_INVALID_SECRET = 952 const val CODE_TOO_MANY_CONTACTS_TO_SYNC = 937 @@ -106,6 +111,7 @@ object VKApiCodes { const val CODE_INVALID_AUDIO_TRANSCRIPTION = 959 const val CODE_CALL_REQUIRES_AUTH = 960 + const val CODE_CALL_LINK_OUTDATED = 961 const val CODE_PHONE_PARAM_PHONE = 1000 const val CODE_PHONE_ALREADY_USED = 1004 @@ -113,12 +119,16 @@ object VKApiCodes { const val CODE_INVALID_SID = 1113 const val CODE_SIGN_UP_CODE_INCORRECT = 1110 const val CODE_SIGN_UP_PASSWORD_UNALLOWABLE = 1111 + const val CODE_ANONYM_TOKEN_EXPIRED = 1114 + const val CODE_SUPER_APP_TOKEN_INVALID = 1115 + const val CODE_ANONYM_TOKEN_INVALID = 1116 const val CODE_STICKERS_DISABLED = 1191 const val CODE_ERROR_APPS_MENU_TOO_MANY_APPS = 1259 const val CODE_ACCOUNT_INVALID_SCREEN_NAME = 1260 const val CODE_ERROR_MARKET_COMMENTS_CLOSED = 1401 + const val CODE_ERROR_MARKET_ITEM_NOT_FOUND = 1403 const val CODE_TEXT_LIVE_EMPTY_MESSAGE = 2600 const val CODE_TEXT_LIVE_MORE_ONE_ATTACH = 2601 @@ -130,6 +140,9 @@ object VKApiCodes { const val CODE_ERROR_NEED_TOKEN_EXTENSION = 3609 const val CODE_ERROR_USER_DEACTIVATED = 3610 + const val CODE_ERROR_ALREADY_HAS_EXTERNAL_BINDING = 3612 + + const val CODE_ERROR_UNAVAILABLE_REGISTRATION = 5400 const val EXTRA_CAPTCHA_SID = "captcha_sid" const val EXTRA_CAPTCHA_KEY = "captcha_key" diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/exceptions/VKApiException.kt b/core/src/main/java/com/vk/api/sdk/exceptions/VKApiException.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/exceptions/VKApiException.kt rename to core/src/main/java/com/vk/api/sdk/exceptions/VKApiException.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/exceptions/VKApiExecutionException.kt b/core/src/main/java/com/vk/api/sdk/exceptions/VKApiExecutionException.kt similarity index 92% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/exceptions/VKApiExecutionException.kt rename to core/src/main/java/com/vk/api/sdk/exceptions/VKApiExecutionException.kt index d7773f0278..85c8b58d6e 100644 --- a/vk-sdk-core/src/main/java/com/vk/api/sdk/exceptions/VKApiExecutionException.kt +++ b/core/src/main/java/com/vk/api/sdk/exceptions/VKApiExecutionException.kt @@ -41,7 +41,15 @@ open class VKApiExecutionException val extra: Bundle? = Bundle.EMPTY, val executeErrors: List? = null, val errorMsg: String? = null, - val requestParams: Map? = null) : VKApiException(detailMessage) { + val requestParams: Map? = null, + val subcode: Int = -1, +) : VKApiException(detailMessage) { + + val isAnonymTokenInvalid: Boolean + get() = code == VKApiCodes.CODE_ANONYM_TOKEN_INVALID + + val isAnonymTokenExpired: Boolean + get() = code == VKApiCodes.CODE_ANONYM_TOKEN_EXPIRED val isCompositeError: Boolean get() = code == VKApiCodes.CODE_COMPOSITE_EXECUTE_ERROR @@ -89,6 +97,9 @@ open class VKApiExecutionException val isAppUpdateNeeded: Boolean get() = code == VKApiCodes.CODE_CLIENT_UPDATE_NEEDED + val isCurrentVersionDeprecated: Boolean + get() = code == VKApiCodes.CODE_CLIENT_VERSION_DEPRECATED + val isUserConfirmRequired: Boolean get() = code == VKApiCodes.CODE_USER_CONFIRM_REQUIRED @@ -175,6 +186,7 @@ open class VKApiExecutionException fun parse(json: JSONObject, methodName: String? = null, extra: Bundle? = null): VKApiExecutionException { val method = methodName ?: json.optString("method") ?: "" val code = json.optInt("error_code", VKApiCodes.CODE_UNKNOWN_ERROR) + val subcode = json.optInt("error_subcode", VKApiCodes.CODE_UNKNOWN_ERROR) val errorMsg = json.optString("error_msg") ?: "" val requestParams = try { json.getJSONArray("request_params") @@ -189,10 +201,10 @@ open class VKApiExecutionException } return if (json.has("error_text")) { VKApiExecutionException(code, method, true, json.optString("error_text") - ?: "", extra, errorMsg = errorMsg, requestParams = paramsMap) + ?: "", extra, errorMsg = errorMsg, requestParams = paramsMap, subcode = subcode) } else { val errorMsg = json.optString("error_msg") ?: json.toString() - VKApiExecutionException(code, method, false, "$errorMsg | by [$method]", extra, errorMsg = errorMsg, requestParams = paramsMap) + VKApiExecutionException(code, method, false, "$errorMsg | by [$method]", extra, errorMsg = errorMsg, requestParams = paramsMap, subcode = subcode) } } } diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/exceptions/VKApiIllegalResponseException.kt b/core/src/main/java/com/vk/api/sdk/exceptions/VKApiIllegalResponseException.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/exceptions/VKApiIllegalResponseException.kt rename to core/src/main/java/com/vk/api/sdk/exceptions/VKApiIllegalResponseException.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/exceptions/VKInternalServerErrorException.kt b/core/src/main/java/com/vk/api/sdk/exceptions/VKInternalServerErrorException.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/exceptions/VKInternalServerErrorException.kt rename to core/src/main/java/com/vk/api/sdk/exceptions/VKInternalServerErrorException.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/exceptions/VKLargeEntityException.kt b/core/src/main/java/com/vk/api/sdk/exceptions/VKLargeEntityException.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/exceptions/VKLargeEntityException.kt rename to core/src/main/java/com/vk/api/sdk/exceptions/VKLargeEntityException.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/exceptions/VKLocalIOException.kt b/core/src/main/java/com/vk/api/sdk/exceptions/VKLocalIOException.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/exceptions/VKLocalIOException.kt rename to core/src/main/java/com/vk/api/sdk/exceptions/VKLocalIOException.kt diff --git a/core/src/main/java/com/vk/api/sdk/extensions/ContextExt.kt b/core/src/main/java/com/vk/api/sdk/extensions/ContextExt.kt new file mode 100644 index 0000000000..e3d53c88db --- /dev/null +++ b/core/src/main/java/com/vk/api/sdk/extensions/ContextExt.kt @@ -0,0 +1,11 @@ +package com.vk.api.sdk.extensions + +import android.app.Activity +import android.content.Context +import android.content.ContextWrapper + +internal fun Context.toActivitySafe(): Activity? { + var context = this + while (context !is Activity && context is ContextWrapper) context = context.baseContext + return if (context is Activity) context else null +} \ No newline at end of file diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/internal/ApiCommand.kt b/core/src/main/java/com/vk/api/sdk/internal/ApiCommand.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/internal/ApiCommand.kt rename to core/src/main/java/com/vk/api/sdk/internal/ApiCommand.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/internal/HttpMultipartEntry.kt b/core/src/main/java/com/vk/api/sdk/internal/HttpMultipartEntry.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/internal/HttpMultipartEntry.kt rename to core/src/main/java/com/vk/api/sdk/internal/HttpMultipartEntry.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/internal/HttpStatus.kt b/core/src/main/java/com/vk/api/sdk/internal/HttpStatus.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/internal/HttpStatus.kt rename to core/src/main/java/com/vk/api/sdk/internal/HttpStatus.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/internal/JsonUtils.kt b/core/src/main/java/com/vk/api/sdk/internal/JsonUtils.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/internal/JsonUtils.kt rename to core/src/main/java/com/vk/api/sdk/internal/JsonUtils.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/internal/QueryStringGenerator.kt b/core/src/main/java/com/vk/api/sdk/internal/QueryStringGenerator.kt similarity index 83% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/internal/QueryStringGenerator.kt rename to core/src/main/java/com/vk/api/sdk/internal/QueryStringGenerator.kt index 3ee337332e..ae99662b24 100644 --- a/vk-sdk-core/src/main/java/com/vk/api/sdk/internal/QueryStringGenerator.kt +++ b/core/src/main/java/com/vk/api/sdk/internal/QueryStringGenerator.kt @@ -62,12 +62,16 @@ object QueryStringGenerator { * Build not signed query string (without adding of sig param). * * This method also adds necessary arguments (v & https & (access_token | app_id)) + * + * The arrayArgs field is necessary because there is a specificity of sending arrays in the request + * (e.g. array_name = ["item1", "item2"] should look like ...&array_name[]=item1&array_name[]=item2&...) */ fun buildNotSignedQueryString( args: Map, version: String, accessToken: String? = null, - appId: Int = 0 + appId: Int = 0, + arrayArgs: Map> = emptyMap() ): String { return buildSignedQueryString( path = "", @@ -75,7 +79,8 @@ object QueryStringGenerator { version = version, accessToken = accessToken, secret = null, - appId = appId + appId = appId, + arrayArgs = arrayArgs ) } @@ -83,6 +88,9 @@ object QueryStringGenerator { * Build signed query string for any path. * * This method also adds necessary arguments (v & https & (access_token | app_id)) + * + * The arrayArgs field is necessary because there is a specificity of sending arrays in the request + * (e.g. array_name = ["item1", "item2"] should look like ...&array_name[]=item1&array_name[]=item2&...) */ fun buildSignedQueryString( path: String, @@ -90,7 +98,8 @@ object QueryStringGenerator { version: String, accessToken: String? = null, secret: String? = null, - appId: Int = 0 + appId: Int = 0, + arrayArgs: Map> = emptyMap() ): String { // Добавляем параметры, которые нужны всем запросам: // Версию api, https=1 (что-то legacy, которое лучше не трогать), AT или api_id @@ -103,16 +112,20 @@ object QueryStringGenerator { actualArgs["api_id"] = appId.toString() } - return buildSignedQueryStringForce(path, actualArgs, secret) + return buildSignedQueryStringForce(path, actualArgs, secret, arrayArgs) } /** * Build signed query without adding any params. + * + * The arrayArgs field is necessary because there is a specificity of sending arrays in the request + * (e.g. array_name = ["item1", "item2"] should look like ...&array_name[]=item1&array_name[]=item2&...) */ fun buildSignedQueryStringForce( path: String, args: Map, - secret: String? + secret: String?, + arrayArgs: Map> = emptyMap() ): String { // Закидываем всё в Uri, чтоб получить энкодинг из коробки val uriBuilder = Uri.Builder() @@ -123,6 +136,12 @@ object QueryStringGenerator { } } + arrayArgs.entries.forEach { (key, list) -> + list.forEach { listItem -> + uriBuilder.appendQueryParameter("$key[]", listItem) + } + } + val uri = uriBuilder.build() // В случае, если подпись не нужна, просто возвращаем правильно заэнкоженные параметры diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/internal/VKErrorUtils.kt b/core/src/main/java/com/vk/api/sdk/internal/VKErrorUtils.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/internal/VKErrorUtils.kt rename to core/src/main/java/com/vk/api/sdk/internal/VKErrorUtils.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/internal/VKInitProvider.kt b/core/src/main/java/com/vk/api/sdk/internal/VKInitProvider.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/internal/VKInitProvider.kt rename to core/src/main/java/com/vk/api/sdk/internal/VKInitProvider.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/internal/Validation.kt b/core/src/main/java/com/vk/api/sdk/internal/Validation.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/internal/Validation.kt rename to core/src/main/java/com/vk/api/sdk/internal/Validation.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/okhttp/FileFullRequestBody.kt b/core/src/main/java/com/vk/api/sdk/okhttp/FileFullRequestBody.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/okhttp/FileFullRequestBody.kt rename to core/src/main/java/com/vk/api/sdk/okhttp/FileFullRequestBody.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/okhttp/LogLevelRequestTag.kt b/core/src/main/java/com/vk/api/sdk/okhttp/LogLevelRequestTag.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/okhttp/LogLevelRequestTag.kt rename to core/src/main/java/com/vk/api/sdk/okhttp/LogLevelRequestTag.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/okhttp/LoggingInterceptor.kt b/core/src/main/java/com/vk/api/sdk/okhttp/LoggingInterceptor.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/okhttp/LoggingInterceptor.kt rename to core/src/main/java/com/vk/api/sdk/okhttp/LoggingInterceptor.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/okhttp/OkHttpExecutor.kt b/core/src/main/java/com/vk/api/sdk/okhttp/OkHttpExecutor.kt similarity index 97% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/okhttp/OkHttpExecutor.kt rename to core/src/main/java/com/vk/api/sdk/okhttp/OkHttpExecutor.kt index 4e399559e5..f9c034460c 100644 --- a/vk-sdk-core/src/main/java/com/vk/api/sdk/okhttp/OkHttpExecutor.kt +++ b/core/src/main/java/com/vk/api/sdk/okhttp/OkHttpExecutor.kt @@ -94,9 +94,10 @@ open class OkHttpExecutor(protected val config: OkHttpExecutorConfig) { ) val requestBody = validateQueryString(call, queryString).toRequestBody(MIME_APPLICATION.toMediaTypeOrNull()) + val reqHost = call.requestUrl ?: host val request = Request.Builder() .post(requestBody) - .url("${resolveEndpoint()}/${call.method}") + .url("${resolveEndpoint(reqHost)}/${call.method}") .cacheControl(CacheControl.FORCE_NETWORK) .tag(Map::class.java, call.tag?.toMap()) .build() @@ -198,7 +199,7 @@ open class OkHttpExecutor(protected val config: OkHttpExecutorConfig) { return this } - private fun resolveEndpoint() = if (customEndpoint.isNotEmpty()) { + private fun resolveEndpoint(host: String) = if (customEndpoint.isNotEmpty()) { customEndpoint } else { defaultApiEndpoint(host) diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/okhttp/OkHttpExecutorConfig.kt b/core/src/main/java/com/vk/api/sdk/okhttp/OkHttpExecutorConfig.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/okhttp/OkHttpExecutorConfig.kt rename to core/src/main/java/com/vk/api/sdk/okhttp/OkHttpExecutorConfig.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/okhttp/OkHttpMethodCall.kt b/core/src/main/java/com/vk/api/sdk/okhttp/OkHttpMethodCall.kt similarity index 86% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/okhttp/OkHttpMethodCall.kt rename to core/src/main/java/com/vk/api/sdk/okhttp/OkHttpMethodCall.kt index dbdf93234c..d4cd281d87 100644 --- a/vk-sdk-core/src/main/java/com/vk/api/sdk/okhttp/OkHttpMethodCall.kt +++ b/core/src/main/java/com/vk/api/sdk/okhttp/OkHttpMethodCall.kt @@ -27,6 +27,8 @@ import com.vk.api.sdk.VKMethodCall open class OkHttpMethodCall { open class Builder { + var requestUrl: String? = null + private set var method: String = "" private set var version: String = "" @@ -37,7 +39,10 @@ open class OkHttpMethodCall { private set var allowNoAuth: Boolean = false private set + var retryCount = VKMethodCall.DEFAULT_RETRY_COUNT + private set + open fun url(url: String?) = apply { this.requestUrl = url } open fun method(method: String) = apply { this.method = method } open fun version(version: String) = apply { this.version = version } @@ -49,29 +54,37 @@ open class OkHttpMethodCall { fun allowNoAuth(allow: Boolean) = apply { this.allowNoAuth = allow } + fun retryCount(count: Int) = apply { this.retryCount = count } + open fun from(call: VKMethodCall) = apply { method(call.method) version(call.version) args(call.args) allowNoAuth(call.allowNoAuth) + retryCount(call.retryCount) + url(call.requestUrl) } open fun build() = OkHttpMethodCall(this) } + val requestUrl: String? val method: String val version: String val args: Map val tag: RequestTag? val allowNoAuth: Boolean + val retryCount: Int protected constructor(b: Builder) { if (b.method.isBlank()) throw IllegalArgumentException("method is null or empty") if (b.version.isBlank()) throw IllegalArgumentException("version is null or empty") + this.requestUrl = b.requestUrl this.method = b.method this.version = b.version this.args = b.args this.tag = b.tag this.allowNoAuth= b.allowNoAuth + this.retryCount = b.retryCount } } \ No newline at end of file diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/okhttp/OkHttpPostCall.kt b/core/src/main/java/com/vk/api/sdk/okhttp/OkHttpPostCall.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/okhttp/OkHttpPostCall.kt rename to core/src/main/java/com/vk/api/sdk/okhttp/OkHttpPostCall.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/okhttp/ProgressRequestBody.kt b/core/src/main/java/com/vk/api/sdk/okhttp/ProgressRequestBody.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/okhttp/ProgressRequestBody.kt rename to core/src/main/java/com/vk/api/sdk/okhttp/ProgressRequestBody.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/okhttp/RequestTag.kt b/core/src/main/java/com/vk/api/sdk/okhttp/RequestTag.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/okhttp/RequestTag.kt rename to core/src/main/java/com/vk/api/sdk/okhttp/RequestTag.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/requests/VKBooleanRequest.kt b/core/src/main/java/com/vk/api/sdk/requests/VKBooleanRequest.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/requests/VKBooleanRequest.kt rename to core/src/main/java/com/vk/api/sdk/requests/VKBooleanRequest.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/requests/VKRequest.kt b/core/src/main/java/com/vk/api/sdk/requests/VKRequest.kt similarity index 95% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/requests/VKRequest.kt rename to core/src/main/java/com/vk/api/sdk/requests/VKRequest.kt index 8f21b0e21b..7600cf95b3 100644 --- a/vk-sdk-core/src/main/java/com/vk/api/sdk/requests/VKRequest.kt +++ b/core/src/main/java/com/vk/api/sdk/requests/VKRequest.kt @@ -46,6 +46,10 @@ open class VKRequest(var method: String, val requestApiVersion: String? = nul @Volatile protected var allowNoAuth: Boolean = false + @Volatile + protected var isAnonymous: Boolean = false + private set + val params = LinkedHashMap() // Params @@ -91,6 +95,7 @@ open class VKRequest(var method: String, val requestApiVersion: String? = nul .args(params) .method(method) .version(version) + .setAnonymous(isAnonymous) .allowNoAuth(allowNoAuth) return manager.execute(callBuilder.build(), this) } @@ -100,6 +105,8 @@ open class VKRequest(var method: String, val requestApiVersion: String? = nul */ open fun allowNoAuth() = apply { allowNoAuth = true } + open fun setAnonymous(allow: Boolean) = apply { isAnonymous = allow } + protected open fun createBaseCallBuilder(config: VKApiConfig): VKMethodCall.Builder { return VKMethodCall.Builder() } diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/ui/VKBaseAuthActivity.kt b/core/src/main/java/com/vk/api/sdk/ui/VKBaseAuthActivity.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/ui/VKBaseAuthActivity.kt rename to core/src/main/java/com/vk/api/sdk/ui/VKBaseAuthActivity.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/ui/VKCaptchaActivity.kt b/core/src/main/java/com/vk/api/sdk/ui/VKCaptchaActivity.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/ui/VKCaptchaActivity.kt rename to core/src/main/java/com/vk/api/sdk/ui/VKCaptchaActivity.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/ui/VKConfirmationActivity.kt b/core/src/main/java/com/vk/api/sdk/ui/VKConfirmationActivity.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/ui/VKConfirmationActivity.kt rename to core/src/main/java/com/vk/api/sdk/ui/VKConfirmationActivity.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/ui/VKWebViewAuthActivity.kt b/core/src/main/java/com/vk/api/sdk/ui/VKWebViewAuthActivity.kt similarity index 82% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/ui/VKWebViewAuthActivity.kt rename to core/src/main/java/com/vk/api/sdk/ui/VKWebViewAuthActivity.kt index f62e52afe4..14165d5876 100644 --- a/vk-sdk-core/src/main/java/com/vk/api/sdk/ui/VKWebViewAuthActivity.kt +++ b/core/src/main/java/com/vk/api/sdk/ui/VKWebViewAuthActivity.kt @@ -45,6 +45,7 @@ import com.vk.api.sdk.VK import com.vk.api.sdk.VKApiValidationHandler import com.vk.api.sdk.auth.VKAuthManager import com.vk.api.sdk.auth.VKAuthParams +import com.vk.api.sdk.extensions.toActivitySafe import com.vk.api.sdk.utils.VKUtils import com.vk.api.sdk.utils.VKValidationLocker @@ -112,7 +113,7 @@ open class VKWebViewAuthActivity: Activity() { webView.loadUrl(urlToLoad) } catch (e: Exception) { - setResult(Activity.RESULT_CANCELED) + setResult(RESULT_CANCELED) finish() } } @@ -146,31 +147,31 @@ open class VKWebViewAuthActivity: Activity() { } private fun handleUrl(url: String?): Boolean { - if (url == null || !url.startsWith(redirectUrl)) return false - - val intent = Intent(VK_RESULT_INTENT_NAME) - val extraData = url.substring(url.indexOf("#") + 1) - intent.putExtra(VKAuthManager.VK_EXTRA_TOKEN_DATA, extraData) - - val resultParams = VKUtils.explodeQueryString(extraData) - val resultCode = if (resultParams != null - && (resultParams.containsKey("error") - || resultParams.containsKey("cancel"))) Activity.RESULT_CANCELED else Activity.RESULT_OK - - setResult(resultCode, intent) + if (url == null) return false if (needValidationResult()) { val uri = Uri.parse(url.replace("#", "?")) if (uri.getQueryParameter("success") != null) { - val token = uri.getQueryParameter("access_token") - val secret = uri.getQueryParameter("secret") - val userId = uri.getQueryParameter("user_id")?.toInt() - validationResult = VKApiValidationHandler.Credentials(secret, token, userId) + handleSuccess(uri) + } else if (uri.getQueryParameter("cancel") != null) { + notifyLockerAndFinish() } - } - VKValidationLocker.signal() + } else { + if (!url.startsWith(redirectUrl)) { + return false + } + val intent = Intent(VK_RESULT_INTENT_NAME) + val extraData = url.substring(url.indexOf("#") + 1) + intent.putExtra(VKAuthManager.VK_EXTRA_TOKEN_DATA, extraData) - finish() + val resultParams = VKUtils.explodeQueryString(extraData) + val resultCode = if (resultParams != null + && (resultParams.containsKey("error") + || resultParams.containsKey("cancel"))) RESULT_CANCELED else RESULT_OK + + setResult(resultCode, intent) + notifyLockerAndFinish() + } return true } @@ -209,19 +210,36 @@ open class VKWebViewAuthActivity: Activity() { loadUrl() } .setNegativeButton(android.R.string.cancel) { _, _ -> - setResult(Activity.RESULT_CANCELED) + setResult(RESULT_CANCELED) finish() } try { builder.show() } catch (e: Exception) { - setResult(Activity.RESULT_CANCELED) + setResult(RESULT_CANCELED) finish() } } } + private fun notifyLockerAndFinish() { + VKValidationLocker.signal() + finish() + } + + private fun handleSuccess(uri: Uri) { + validationResult = if (uri.getQueryParameter("access_token") != null) { + val token = uri.getQueryParameter("access_token") + val secret = uri.getQueryParameter("secret") + val userId = uri.getQueryParameter("user_id")?.toInt() + VKApiValidationHandler.Credentials(secret, token, userId) + } else { + VKApiValidationHandler.Credentials.EMPTY + } + notifyLockerAndFinish() + } + companion object { const val VK_EXTRA_AUTH_PARAMS = "vk_auth_params" const val VK_RESULT_INTENT_NAME = "com.vk.auth-token" @@ -239,6 +257,9 @@ open class VKWebViewAuthActivity: Activity() { fun startForValidation(context: Context, validationUrl: String) { val intent = Intent(context, VKWebViewAuthActivity::class.java) .putExtra(VK_EXTRA_VALIDATION_URL, validationUrl) + if (context.toActivitySafe() == null) { + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + } context.startActivity(intent) } } diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/utils/ApiExt.kt b/core/src/main/java/com/vk/api/sdk/utils/ApiExt.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/utils/ApiExt.kt rename to core/src/main/java/com/vk/api/sdk/utils/ApiExt.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/utils/ApiMethodPriorityBackoff.kt b/core/src/main/java/com/vk/api/sdk/utils/ApiMethodPriorityBackoff.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/utils/ApiMethodPriorityBackoff.kt rename to core/src/main/java/com/vk/api/sdk/utils/ApiMethodPriorityBackoff.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/utils/ExponentialBackoff.kt b/core/src/main/java/com/vk/api/sdk/utils/ExponentialBackoff.kt similarity index 90% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/utils/ExponentialBackoff.kt rename to core/src/main/java/com/vk/api/sdk/utils/ExponentialBackoff.kt index fc64444e53..de4067c539 100644 --- a/vk-sdk-core/src/main/java/com/vk/api/sdk/utils/ExponentialBackoff.kt +++ b/core/src/main/java/com/vk/api/sdk/utils/ExponentialBackoff.kt @@ -37,11 +37,11 @@ import kotlin.math.min * @property jitter */ open class ExponentialBackoff( - private val minDelayMs: Long = TimeUnit.MILLISECONDS.toMillis(100), - private val maxDelayMs: Long = TimeUnit.MINUTES.toMillis(5), - private val factor: Float = 2f, - private val criticalFactor: Float = 5f, - private val jitter: Float = 0.1f + private val minDelayMs: Long = TimeUnit.MILLISECONDS.toMillis(100), + private val maxDelayMs: Long = TimeUnit.MINUTES.toMillis(5), + private val factor: Float = 2f, + private val criticalFactor: Float = 5f, + private val jitter: Float = 0.1f ) { private val random = Random(System.currentTimeMillis()) diff --git a/core/src/main/java/com/vk/api/sdk/utils/RateLimitTokenBackoff.kt b/core/src/main/java/com/vk/api/sdk/utils/RateLimitTokenBackoff.kt new file mode 100644 index 0000000000..5de7091c8f --- /dev/null +++ b/core/src/main/java/com/vk/api/sdk/utils/RateLimitTokenBackoff.kt @@ -0,0 +1,145 @@ +package com.vk.api.sdk.utils + +import android.content.Context +import android.os.SystemClock +import java.util.concurrent.ConcurrentHashMap +import kotlin.math.min + +/** + * Exponential backoff который привязан к токенам,токеном как правило является url запроса + * + * Для токенов необходим стор, есть 2 основные реализации + * - TokenPrefStore: НЕ УМЕЕТ привязывать try count к токену и всегда возвращает 0, хранит токены в SharedPreference + * - TokenMemStore: УМЕЕТ работать с try count, т.к. не забирает никаких накладных расходов, хранит токены в HashMap + */ +class RateLimitTokenBackoff( + private val store: TokenStore, + private val minBackoffTime: Long, + private val maxBackoffTime: Long = minBackoffTime, + private val factor: Float = 1.5f, + private val timeProvider: () -> Long = { SystemClock.elapsedRealtime() } +) { + + fun shouldWait(operationKey: String): Boolean { + return waitTime(operationKey) > 0 + } + + fun waitTime(operationKey: String): Long { + if (!store.has(operationKey)) { + return 0L + } + + val (value, count) = store.restore(operationKey, Long.MAX_VALUE) + val currTime = time() + + val elapsedTime = currTime - value + val backoffTimeMs = calculate(count) + + //we don't want to handle device reboot + if (elapsedTime < 0) { + return 0L + } + + if (elapsedTime >= backoffTimeMs) { + return 0L + } + + return backoffTimeMs - elapsedTime + } + + fun reset(operationKey: String) { + if (!store.has(operationKey)) { + return + } + + store.reset(operationKey) + } + + fun backoff(operationKey: String) { + store.store(operationKey, time()) + } + + private fun time(): Long { + return timeProvider.invoke() + } + + private fun calculate(retry: Int): Long { + var acum = minBackoffTime + + repeat(retry) { // if 0 - minBackoffTime + acum = (acum * factor).toLong() + } + + return min(acum, maxBackoffTime) + } + + interface TokenStore { + fun has(token: String): Boolean + fun reset(token: String) + fun restore(token: String, default: Long): Pair + fun store(token: String, value: Long) + } + + /** + * Unsupported counter yet + */ + class TokenPrefStore(context: Context) : TokenStore { + + private val prefStorage by lazy { + context.getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE) + } + + override fun has(token: String): Boolean { + return prefStorage + .contains(token) + } + + override fun reset(token: String) { + prefStorage.edit() + .remove(token) + .apply() + } + + override fun restore(token: String, default: Long): Pair { + return prefStorage + .getLong(token, default) to 0 + } + + override fun store(token: String, value: Long) { + prefStorage.edit() + .putLong(token, value) + .apply() + } + + companion object { + private const val PREF_NAME = "rate_limit_backoff_storage" + } + } + + class TokenMemStore : TokenStore { + + private val storage = ConcurrentHashMap>() + private val obj = Any() + + override fun has(token: String): Boolean { + return storage.containsKey(token) + } + + override fun reset(token: String) { + synchronized(obj) { + storage.remove(token) + } + } + + override fun restore(token: String, default: Long): Pair { + return storage[token] ?: default to 0 + } + + override fun store(token: String, value: Long) { + synchronized(obj) { + val count = storage[token]?.second?.inc() ?: 0 + storage[token] = value to count + } + } + } +} diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/utils/StartUpMethodPriorityBackoffBaseImpl.kt b/core/src/main/java/com/vk/api/sdk/utils/StartUpMethodPriorityBackoffBaseImpl.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/utils/StartUpMethodPriorityBackoffBaseImpl.kt rename to core/src/main/java/com/vk/api/sdk/utils/StartUpMethodPriorityBackoffBaseImpl.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/utils/ThreadLocalDelegate.kt b/core/src/main/java/com/vk/api/sdk/utils/ThreadLocalDelegate.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/utils/ThreadLocalDelegate.kt rename to core/src/main/java/com/vk/api/sdk/utils/ThreadLocalDelegate.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/utils/VKLoader.kt b/core/src/main/java/com/vk/api/sdk/utils/VKLoader.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/utils/VKLoader.kt rename to core/src/main/java/com/vk/api/sdk/utils/VKLoader.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/utils/VKUrlResolver.kt b/core/src/main/java/com/vk/api/sdk/utils/VKUrlResolver.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/utils/VKUrlResolver.kt rename to core/src/main/java/com/vk/api/sdk/utils/VKUrlResolver.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/utils/VKUtils.kt b/core/src/main/java/com/vk/api/sdk/utils/VKUtils.kt similarity index 95% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/utils/VKUtils.kt rename to core/src/main/java/com/vk/api/sdk/utils/VKUtils.kt index 0fdfdfa2c5..1989c8a803 100644 --- a/vk-sdk-core/src/main/java/com/vk/api/sdk/utils/VKUtils.kt +++ b/core/src/main/java/com/vk/api/sdk/utils/VKUtils.kt @@ -51,6 +51,15 @@ object VKUtils { } } + @JvmStatic + fun isAppEnabled(context: Context, packageName: String): Boolean { + return try { + context.packageManager.getApplicationInfo(packageName, 0).enabled + } catch (e: Throwable) { + false + } + } + /** * @param allowedPackage the only package that allowed for that action */ diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/utils/VKValidationLocker.kt b/core/src/main/java/com/vk/api/sdk/utils/VKValidationLocker.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/utils/VKValidationLocker.kt rename to core/src/main/java/com/vk/api/sdk/utils/VKValidationLocker.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/utils/log/DefaultApiLogger.kt b/core/src/main/java/com/vk/api/sdk/utils/log/DefaultApiLogger.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/utils/log/DefaultApiLogger.kt rename to core/src/main/java/com/vk/api/sdk/utils/log/DefaultApiLogger.kt diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/utils/log/Logger.kt b/core/src/main/java/com/vk/api/sdk/utils/log/Logger.kt similarity index 100% rename from vk-sdk-core/src/main/java/com/vk/api/sdk/utils/log/Logger.kt rename to core/src/main/java/com/vk/api/sdk/utils/log/Logger.kt diff --git a/core/src/main/java/com/vk/api/sdk/utils/tmr/TooManyRequestBackoffEmpty.kt b/core/src/main/java/com/vk/api/sdk/utils/tmr/TooManyRequestBackoffEmpty.kt new file mode 100644 index 0000000000..fd5ef8a2b8 --- /dev/null +++ b/core/src/main/java/com/vk/api/sdk/utils/tmr/TooManyRequestBackoffEmpty.kt @@ -0,0 +1,7 @@ +package com.vk.api.sdk.utils.tmr + +object TooManyRequestBackoffEmpty : TooManyRequestLimitBackoff { + override fun waitBeforeCall(maxRetryCount: Int, maxRetryTime: Long) { + // DO NOTHING + } +} diff --git a/core/src/main/java/com/vk/api/sdk/utils/tmr/TooManyRequestBackoffGlobal.kt b/core/src/main/java/com/vk/api/sdk/utils/tmr/TooManyRequestBackoffGlobal.kt new file mode 100644 index 0000000000..0c1e3acdf9 --- /dev/null +++ b/core/src/main/java/com/vk/api/sdk/utils/tmr/TooManyRequestBackoffGlobal.kt @@ -0,0 +1,48 @@ +package com.vk.api.sdk.utils.tmr + +import android.os.SystemClock +import java.util.ArrayDeque + +/** + * Для блокировки запросов используется Circular buffer + */ +object TooManyRequestBackoffGlobal : TooManyRequestLimitBackoff { + + private val lastTimestamps = ArrayDeque() + + @Synchronized + override fun waitBeforeCall( + maxRetryCount: Int, + maxRetryTime: Long + ) { + fillIfNeeded(maxRetryCount) + + val currentTimestamp = SystemClock.elapsedRealtime() + lastTimestamps.addLast(currentTimestamp) + val firstTimestamp = lastTimestamps.removeFirst() + + val waitFor = maxRetryTime - (currentTimestamp - firstTimestamp) + if (waitFor > 0) { + Thread.sleep(waitFor) + } + } + + @Synchronized + private fun fillIfNeeded(maxRequest: Int) { + if (maxRequest == lastTimestamps.size) { + return + } + + if (maxRequest > lastTimestamps.size) { + val diff = maxRequest - lastTimestamps.size + repeat(diff) { + lastTimestamps.addFirst(0L) + } + } else { + val diff = lastTimestamps.size - maxRequest + repeat(diff) { + lastTimestamps.removeFirst() + } + } + } +} \ No newline at end of file diff --git a/core/src/main/java/com/vk/api/sdk/utils/tmr/TooManyRequestLimitBackoff.kt b/core/src/main/java/com/vk/api/sdk/utils/tmr/TooManyRequestLimitBackoff.kt new file mode 100644 index 0000000000..a36ed1dda3 --- /dev/null +++ b/core/src/main/java/com/vk/api/sdk/utils/tmr/TooManyRequestLimitBackoff.kt @@ -0,0 +1,8 @@ +package com.vk.api.sdk.utils.tmr + +interface TooManyRequestLimitBackoff { + fun waitBeforeCall( + maxRetryCount: Int, + maxRetryTime: Long + ) +} diff --git a/vk-sdk-core/src/main/res/layout/vk_webview_auth_dialog.xml b/core/src/main/res/layout/vk_webview_auth_dialog.xml similarity index 100% rename from vk-sdk-core/src/main/res/layout/vk_webview_auth_dialog.xml rename to core/src/main/res/layout/vk_webview_auth_dialog.xml diff --git a/vk-sdk-core/src/main/res/values-ru/string.xml b/core/src/main/res/values-ru/string.xml similarity index 100% rename from vk-sdk-core/src/main/res/values-ru/string.xml rename to core/src/main/res/values-ru/string.xml diff --git a/core/src/main/res/values/booleans.xml b/core/src/main/res/values/booleans.xml new file mode 100644 index 0000000000..7e935bbf0f --- /dev/null +++ b/core/src/main/res/values/booleans.xml @@ -0,0 +1,4 @@ + + + true + \ No newline at end of file diff --git a/vk-sdk-core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml similarity index 100% rename from vk-sdk-core/src/main/res/values/strings.xml rename to core/src/main/res/values/strings.xml diff --git a/vk-sdk-core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml similarity index 100% rename from vk-sdk-core/src/main/res/values/styles.xml rename to core/src/main/res/values/styles.xml diff --git a/vk-sdk-core/src/test/java/com/vk/api/sdk/utils/StartUpMethodPriorityBackoffBaseImplTest.kt b/core/src/test/java/com/vk/api/sdk/utils/StartUpMethodPriorityBackoffBaseImplTest.kt similarity index 100% rename from vk-sdk-core/src/test/java/com/vk/api/sdk/utils/StartUpMethodPriorityBackoffBaseImplTest.kt rename to core/src/test/java/com/vk/api/sdk/utils/StartUpMethodPriorityBackoffBaseImplTest.kt diff --git a/dependencies.gradle b/dependencies.gradle index bb36b32f21..c1f1c088ed 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -23,8 +23,8 @@ SOFTWARE. */ ext.sdkVersions = [ - code : '24', - name : '3.1.0', + code : '25', + name : '3.2.0', minSdk : 21, targetSdk : 29, @@ -72,17 +72,22 @@ ext.sdkGradlePlugins = [ ] ext.sdkPublish = [ - POM_NAME : "VK API library", - POM_ARTIFACT_ID : 'android-sdk-core', - POM_DESCRIPTION : 'Main VK Android API library', POM_URL : 'https://github.com/VKCOM/vk-android-sdk', POM_SCM_URL : 'https://github.com/VKCOM/vk-android-sdk', POM_SCM_CONNECTION : 'scm:git:git://github.com/VKCOM/vk-android-sdk.git', POM_SCM_DEV_CONNECTION : 'scm:git:git://github.com/VKCOM/vk-android-sdk.git', POM_LICENCE_URL : 'https://github.com/VKCOM/vk-android-sdk/raw/master/LICENSE', + POM_NAME : "VK API library", + POM_ARTIFACT_ID : 'android-sdk-core', + POM_DESCRIPTION : 'Main VK Android API library', + POM_API_NAME : 'VK API Models library', POM_API_ARTIFACT_ID : 'android-sdk-api', POM_API_DESCRIPTION : 'VK Android API generated library', + + POM_ID_NAME : 'VK User Id library', + POM_ID_ARTIFACT_ID : 'android-sdk-id', + POM_ID_DESCRIPTION : 'VK Android User Id library', ] diff --git a/id/.gitignore b/id/.gitignore new file mode 100644 index 0000000000..796b96d1c4 --- /dev/null +++ b/id/.gitignore @@ -0,0 +1 @@ +/build diff --git a/id/build.gradle b/id/build.gradle new file mode 100644 index 0000000000..cff5774835 --- /dev/null +++ b/id/build.gradle @@ -0,0 +1,43 @@ + +apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' +apply from: "../dependencies.gradle" + +version = sdkVersions.name +group = 'com.vk' +sdkPublish.POM_ARTIFACT_ID = sdkPublish.POM_ID_ARTIFACT_ID +sdkPublish.POM_NAME = sdkPublish.POM_ID_ARTIFACT_ID +sdkPublish.POM_DESCRIPTION = sdkPublish.POM_ID_ARTIFACT_ID + +android { + compileSdkVersion "$sdkVersions.compileSdk".toInteger() + buildToolsVersion "$sdkVersions.buildTools" + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + defaultConfig { + minSdkVersion "$sdkVersions.minSdk" + targetSdkVersion "$sdkVersions.targetSdk" + versionCode "$sdkVersions.code".toInteger() + versionName "$sdkVersions.name" + } + + kotlinOptions { + jvmTarget = '1.8' + } +} + +configurations { + // Used for correct javadoc generation + javadocDeps +} + +dependencies { + implementation sdkLibraries.kotlin + implementation sdkLibraries.gson +} + +apply from: "../publish.gradle" diff --git a/id/src/main/AndroidManifest.xml b/id/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..4d5743cc71 --- /dev/null +++ b/id/src/main/AndroidManifest.xml @@ -0,0 +1,3 @@ + + + diff --git a/id/src/main/java/com/vk/sdk/id/UserId.kt b/id/src/main/java/com/vk/sdk/id/UserId.kt new file mode 100644 index 0000000000..8a3923162c --- /dev/null +++ b/id/src/main/java/com/vk/sdk/id/UserId.kt @@ -0,0 +1,93 @@ +package com.vk.dto.common.id + +import android.os.Parcel +import android.os.Parcelable +import com.google.gson.* +import java.lang.reflect.Type +import kotlin.math.absoluteValue + +/** + * wrapper class to support Long user id + */ +data class UserId(val value: Long): Parcelable { + + constructor(parcel: Parcel) : this( + parcel.readLong() + ) + + override fun toString(): String { + return value.toString() + } + + override fun describeContents(): Int = 0 + + override fun writeToParcel(dest: Parcel, flags: Int) { + dest.writeLong(value) + } + + class GsonSerializer : JsonSerializer, JsonDeserializer { + override fun serialize( + src: UserId?, + typeOfSrc: Type?, + context: JsonSerializationContext? + ): JsonElement = JsonPrimitive(src?.value ?: -1) + + override fun deserialize( + json: JsonElement?, + typeOfT: Type?, + context: JsonDeserializationContext? + ): UserId? = if (json != null && !json.isJsonNull) json.asLong.toUserId() else null + } + + companion object { + @JvmField + val DEFAULT = UserId(0) + + @JvmField + val CREATOR = object : Parcelable.Creator { + override fun createFromParcel(source: Parcel): UserId = UserId(source) + override fun newArray(size: Int): Array = arrayOfNulls(size) + } + + @Deprecated(message = "don't use it in new code", + replaceWith = ReplaceWith("UserId()", "com.vk.dto.common.id.UserId") + ) + @JvmStatic + fun fromLegacyValue(value: Int) = UserId(value.toLong()) + + @Deprecated(message = "don't use it in new code", + replaceWith = ReplaceWith("UserId()", "com.vk.dto.common.id.UserId") + ) + @JvmStatic + fun fromLegacyValues(value: Collection) = value.toList().map { fromLegacyValue(it) } + } +} + +fun UserId.isReal() = value != 0L + +fun UserId.abs() = copy(value = value.absoluteValue) + +fun UserId.negative() = copy(value = -value) + +operator fun UserId.unaryMinus() = negative() + +fun UserId.isGroupId() = value < 0 + +fun UserId.isUserId() = value > 0 + +@Deprecated(message = "don't use it in new code", + replaceWith = ReplaceWith("UserId()", "com.vk.dto.common.id.UserId") +) +fun UserId.legacyValue(): Int = value.toInt() + +@Deprecated(message = "don't use it in new code", + replaceWith = ReplaceWith("UserId()", "com.vk.dto.common.id.UserId") +) +fun List.mapLegacyValues(): List = this.map { it.legacyValue() } + +fun Long.toUserId(): UserId = UserId(this) + +@Deprecated(message = "don't use it in new code", + replaceWith = ReplaceWith("toUserId()", "com.vk.dto.common.id") +) +fun Int.toLegacyUserId(): UserId = UserId(this.toLong()) \ No newline at end of file diff --git a/publish.gradle b/publish.gradle index 8adf1efe2a..c466b2db01 100644 --- a/publish.gradle +++ b/publish.gradle @@ -56,7 +56,7 @@ if (System.getenv('SDK_UPDATE') == "1") { uploadArchives { repositories { mavenDeployer { - beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } + beforeDeployment { deployment -> signing.signPom(deployment) } pom.artifactId = getArtifactId() diff --git a/samples/app/build.gradle b/samples/app/build.gradle index 5c7c5bda1f..ef8749e6d2 100644 --- a/samples/app/build.gradle +++ b/samples/app/build.gradle @@ -59,6 +59,7 @@ dependencies { implementation (sdkLibraries.picasso) { transitive = false } implementation sdkLibraries.okHttp - implementation project(':libapi-sdk-core') - implementation project(':libapi-sdk-api') + implementation project(':core') + implementation project(':api') + implementation project(':id') } diff --git a/samples/app/sdk/src/main/res/values/strings.xml b/samples/app/sdk/src/main/res/values/strings.xml deleted file mode 100644 index 7298c9baa9..0000000000 --- a/samples/app/sdk/src/main/res/values/strings.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - Войти - Выйти - Отправить на стену - Ваше сообщение - Posted - diff --git a/samples/app/src/main/java/com/vk/sdk/sample/UserActivity.kt b/samples/app/src/main/java/com/vk/sdk/sample/UserActivity.kt index f60acd27f9..345785dead 100644 --- a/samples/app/src/main/java/com/vk/sdk/sample/UserActivity.kt +++ b/samples/app/src/main/java/com/vk/sdk/sample/UserActivity.kt @@ -45,6 +45,7 @@ import com.vk.sdk.api.users.dto.UsersFields import com.vk.sdk.sample.models.VKUser import com.vk.sdk.sample.requests.VKUsersCommand import com.vk.sdk.sample.requests.VKWallPostCommand +import com.vk.dto.common.id.UserId class UserActivity: Activity() { override fun onCreate(savedInstanceState: Bundle?) { @@ -102,7 +103,7 @@ class UserActivity: Activity() { if (!isFinishing && friends.isNotEmpty()) { val vkUsers = friends.map { friend -> VKUser( - id = friend.id ?: 0, + id = friend.id?.value ?: 0, firstName = friend.firstName ?: "", lastName = friend.lastName ?: "", photo = friend.photo200 ?: "", @@ -164,7 +165,7 @@ class UserActivity: Activity() { }) } - private fun createOnClickListener(userId: Int) = View.OnClickListener { + private fun createOnClickListener(userId: Long) = View.OnClickListener { VK.urlResolver.open(it.context, "https://vk.com/id$userId") } diff --git a/samples/app/src/main/java/com/vk/sdk/sample/models/VKUser.kt b/samples/app/src/main/java/com/vk/sdk/sample/models/VKUser.kt index 7b5987e735..a2598fde6a 100644 --- a/samples/app/src/main/java/com/vk/sdk/sample/models/VKUser.kt +++ b/samples/app/src/main/java/com/vk/sdk/sample/models/VKUser.kt @@ -29,21 +29,21 @@ import android.os.Parcelable import org.json.JSONObject data class VKUser( - val id: Int = 0, + val id: Long = 0, val firstName: String = "", val lastName: String = "", val photo: String = "", val deactivated: Boolean = false) : Parcelable { constructor(parcel: Parcel) : this( - parcel.readInt(), + parcel.readLong(), parcel.readString()!!, parcel.readString()!!, parcel.readString()!!, parcel.readByte() != 0.toByte()) override fun writeToParcel(parcel: Parcel, flags: Int) { - parcel.writeInt(id) + parcel.writeLong(id) parcel.writeString(firstName) parcel.writeString(lastName) parcel.writeString(photo) @@ -64,7 +64,7 @@ data class VKUser( } fun parse(json: JSONObject) - = VKUser(id = json.optInt("id", 0), + = VKUser(id = json.optLong("id", 0), firstName = json.optString("first_name", ""), lastName = json.optString("last_name", ""), photo = json.optString("photo_200", ""), diff --git a/samples/app/src/main/res/values-kk/strings.xml b/samples/app/src/main/res/values-kk/strings.xml index 3d25d4fda2..30daba69f7 100644 --- a/samples/app/src/main/res/values-kk/strings.xml +++ b/samples/app/src/main/res/values-kk/strings.xml @@ -1,8 +1,8 @@ - Войти - Выйти - Отправить на стену - Ваше сообщение - Запись опубликована + Кіру + Шығу + Қабырғаға жіберу + Хабарламаңыз + Жазба жарияланды diff --git a/settings.gradle b/settings.gradle index b130ec8d71..89948fc1ee 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,4 @@ include ':samples:app' -include ':libapi-sdk-core' -project(':libapi-sdk-core').projectDir = new File(rootDir, 'vk-sdk-core') -include ':libapi-sdk-api' -project(':libapi-sdk-api').projectDir = new File(rootDir, 'vk-sdk-api') \ No newline at end of file +include ':core' +include ':api' +include ':id' \ No newline at end of file diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsUserSpecificationCutted.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsUserSpecificationCutted.kt deleted file mode 100644 index 5e9e1343aa..0000000000 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/ads/dto/AdsUserSpecificationCutted.kt +++ /dev/null @@ -1,49 +0,0 @@ -/** - * The MIT License (MIT) - * - * Copyright (c) 2019 vk.com - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. -*/ -// ********************************************************************* -// THIS FILE IS AUTO GENERATED! -// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. -// ********************************************************************* -package com.vk.sdk.api.ads.dto - -import com.google.gson.annotations.SerializedName -import kotlin.Boolean -import kotlin.Int - -/** - * @param userId - * @param role - * @param clientId - * @param viewBudget - */ -data class AdsUserSpecificationCutted( - @SerializedName("user_id") - val userId: Int, - @SerializedName("role") - val role: AdsAccessRolePublic, - @SerializedName("client_id") - val clientId: Int? = null, - @SerializedName("view_budget") - val viewBudget: Boolean? = null -) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioPhoto.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioPhoto.kt deleted file mode 100644 index e4041745cd..0000000000 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioPhoto.kt +++ /dev/null @@ -1,71 +0,0 @@ -/** - * The MIT License (MIT) - * - * Copyright (c) 2019 vk.com - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. -*/ -// ********************************************************************* -// THIS FILE IS AUTO GENERATED! -// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. -// ********************************************************************* -package com.vk.sdk.api.audio.dto - -import com.google.gson.annotations.SerializedName -import kotlin.Int -import kotlin.String -import kotlin.collections.List - -/** - * @param width - Photo width - * @param height - Photo height - * @param id - * @param photo34 - Photo size 34 - * @param photo68 - Photo size 68 - * @param photo135 - Photo size 135 - * @param photo270 - Photo size 270 - * @param photo300 - Photo size 300 - * @param photo600 - Photo size 600 - * @param photo1200 - Photo size 1200 - * @param sizes - Photo sizes - */ -data class AudioPhoto( - @SerializedName("width") - val width: Int, - @SerializedName("height") - val height: Int, - @SerializedName("id") - val id: String? = null, - @SerializedName("photo_34") - val photo34: String? = null, - @SerializedName("photo_68") - val photo68: String? = null, - @SerializedName("photo_135") - val photo135: String? = null, - @SerializedName("photo_270") - val photo270: String? = null, - @SerializedName("photo_300") - val photo300: String? = null, - @SerializedName("photo_600") - val photo600: String? = null, - @SerializedName("photo_1200") - val photo1200: String? = null, - @SerializedName("sizes") - val sizes: List? = null -) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioPhotoSizes.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioPhotoSizes.kt deleted file mode 100644 index a1eab4d5af..0000000000 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioPhotoSizes.kt +++ /dev/null @@ -1,83 +0,0 @@ -/** - * The MIT License (MIT) - * - * Copyright (c) 2019 vk.com - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. -*/ -// ********************************************************************* -// THIS FILE IS AUTO GENERATED! -// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. -// ********************************************************************* -package com.vk.sdk.api.audio.dto - -import com.google.gson.annotations.SerializedName -import kotlin.Int -import kotlin.String - -/** - * @param src - Photo url - * @param width - Photo width - * @param height - Photo height - * @param type - Photo type - */ -data class AudioPhotoSizes( - @SerializedName("src") - val src: String, - @SerializedName("width") - val width: Int, - @SerializedName("height") - val height: Int, - @SerializedName("type") - val type: AudioPhotoSizes.Type -) { - enum class Type( - val value: String - ) { - @SerializedName("s") - S("s"), - - @SerializedName("m") - M("m"), - - @SerializedName("x") - X("x"), - - @SerializedName("y") - Y("y"), - - @SerializedName("z") - Z("z"), - - @SerializedName("w") - W("w"), - - @SerializedName("o") - O("o"), - - @SerializedName("p") - P("p"), - - @SerializedName("q") - Q("q"), - - @SerializedName("r") - R("r"); - } -} diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioPlaylist.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioPlaylist.kt deleted file mode 100644 index 3d547fb60e..0000000000 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioPlaylist.kt +++ /dev/null @@ -1,183 +0,0 @@ -/** - * The MIT License (MIT) - * - * Copyright (c) 2019 vk.com - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. -*/ -// ********************************************************************* -// THIS FILE IS AUTO GENERATED! -// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. -// ********************************************************************* -package com.vk.sdk.api.audio.dto - -import com.google.gson.annotations.SerializedName -import com.vk.sdk.api.media.dto.MediaPopup -import kotlin.Boolean -import kotlin.Int -import kotlin.String -import kotlin.collections.List - -/** - * @param id - Playlist ID - * @param ownerId - Playlist owner ID - * @param type - Playlist type - * @param title - Playlist title - * @param description - Playlist description - * @param count - Playlist tracks count - * @param followers - Playlist followers count - * @param plays - Playlist plays count - * @param createTime - Playlist create time - * @param updateTime - Playlist upload time - * @param playlistId - Original or followed playlist ID - * @param genres - Playlist genres - * @param isFollowing - Is user follow this playlist - * @param noDiscover - If playlist should be hidden from search results and recommendations - * @param audios - Playlist audios - * @param year - Playlist year - * @param original - Original playlist - * @param followed - Followed playlist - * @param photo - Playlist photo - * @param permissions - Playlist permissions - * @param subtitleBadge - Should show badge near playlist subtitle - * @param playButton - Should show playlist play button on cover - * @param thumbs - Playlist photos - * @param accessKey - Playlist access key - * @param umaAlbumId - UMA playlist ID - * @param subtitle - Playlist subtitle - * @param originalYear - Playlist original year - * @param isExplicit - Is playlist exist - * @param artists - Playlist artists - * @param mainArtists - Playlist main artists - * @param mainArtist - Playlist main artist name - * @param featuredArtists - Playlist featured artists - * @param albumType - Playlist type - * @param meta - Playlist meta info - * @param restriction - Playlist restriction popup - */ -data class AudioPlaylist( - @SerializedName("id") - val id: Int, - @SerializedName("owner_id") - val ownerId: Int, - @SerializedName("type") - val type: AudioPlaylist.Type, - @SerializedName("title") - val title: String, - @SerializedName("description") - val description: String, - @SerializedName("count") - val count: Int, - @SerializedName("followers") - val followers: Int, - @SerializedName("plays") - val plays: Int, - @SerializedName("create_time") - val createTime: Int, - @SerializedName("update_time") - val updateTime: Int, - @SerializedName("playlist_id") - val playlistId: Int? = null, - @SerializedName("genres") - val genres: List? = null, - @SerializedName("is_following") - val isFollowing: Boolean? = null, - @SerializedName("no_discover") - val noDiscover: Boolean? = null, - @SerializedName("audios") - val audios: List? = null, - @SerializedName("year") - val year: Int? = null, - @SerializedName("original") - val original: AudioPlaylistOriginalFollowed? = null, - @SerializedName("followed") - val followed: AudioPlaylistOriginalFollowed? = null, - @SerializedName("photo") - val photo: AudioPhoto? = null, - @SerializedName("permissions") - val permissions: AudioPlaylistPermissions? = null, - @SerializedName("subtitle_badge") - val subtitleBadge: Boolean? = null, - @SerializedName("play_button") - val playButton: Boolean? = null, - @SerializedName("thumbs") - val thumbs: List? = null, - @SerializedName("access_key") - val accessKey: String? = null, - @SerializedName("uma_album_id") - val umaAlbumId: Int? = null, - @SerializedName("subtitle") - val subtitle: String? = null, - @SerializedName("original_year") - val originalYear: Int? = null, - @SerializedName("is_explicit") - val isExplicit: Boolean? = null, - @SerializedName("artists") - val artists: List? = null, - @SerializedName("main_artists") - val mainArtists: List? = null, - @SerializedName("main_artist") - val mainArtist: String? = null, - @SerializedName("featured_artists") - val featuredArtists: List? = null, - @SerializedName("album_type") - val albumType: AudioPlaylist.AlbumType? = null, - @SerializedName("meta") - val meta: AudioPlaylistMeta? = null, - @SerializedName("restriction") - val restriction: MediaPopup? = null -) { - enum class Type( - val value: Int - ) { - @SerializedName("0") - NO_ALBUM(0), - - @SerializedName("1") - ALBUM(1), - - @SerializedName("2") - EP(2), - - @SerializedName("3") - COLLECTION(3), - - @SerializedName("4") - SINGLE(4), - - @SerializedName("5") - CHAT(5); - } - - enum class AlbumType( - val value: String - ) { - @SerializedName("playlist") - PLAYLIST("playlist"), - - @SerializedName("main_only") - MAIN_ONLY("main_only"), - - @SerializedName("main_feat") - MAIN_FEAT("main_feat"), - - @SerializedName("collection") - COLLECTION("collection"); - } -} diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioPlaylistMeta.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioPlaylistMeta.kt deleted file mode 100644 index 440567ae11..0000000000 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioPlaylistMeta.kt +++ /dev/null @@ -1,38 +0,0 @@ -/** - * The MIT License (MIT) - * - * Copyright (c) 2019 vk.com - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. -*/ -// ********************************************************************* -// THIS FILE IS AUTO GENERATED! -// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. -// ********************************************************************* -package com.vk.sdk.api.audio.dto - -import com.google.gson.annotations.SerializedName - -/** - * @param view - */ -data class AudioPlaylistMeta( - @SerializedName("view") - val view: AudioPlaylistView? = null -) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioPlaylistOriginalFollowed.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioPlaylistOriginalFollowed.kt deleted file mode 100644 index f845103b97..0000000000 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioPlaylistOriginalFollowed.kt +++ /dev/null @@ -1,46 +0,0 @@ -/** - * The MIT License (MIT) - * - * Copyright (c) 2019 vk.com - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. -*/ -// ********************************************************************* -// THIS FILE IS AUTO GENERATED! -// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. -// ********************************************************************* -package com.vk.sdk.api.audio.dto - -import com.google.gson.annotations.SerializedName -import kotlin.Int -import kotlin.String - -/** - * @param playlistId - Original or followed playlist ID - * @param ownerId - Playlist owner ID - * @param accessKey - Playlist access key - */ -data class AudioPlaylistOriginalFollowed( - @SerializedName("playlist_id") - val playlistId: Int, - @SerializedName("owner_id") - val ownerId: Int, - @SerializedName("access_key") - val accessKey: String? = null -) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioPlaylistPermissions.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioPlaylistPermissions.kt deleted file mode 100644 index 2bf9918182..0000000000 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/audio/dto/AudioPlaylistPermissions.kt +++ /dev/null @@ -1,57 +0,0 @@ -/** - * The MIT License (MIT) - * - * Copyright (c) 2019 vk.com - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. -*/ -// ********************************************************************* -// THIS FILE IS AUTO GENERATED! -// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. -// ********************************************************************* -package com.vk.sdk.api.audio.dto - -import com.google.gson.annotations.SerializedName -import kotlin.Boolean - -/** - * @param play - Permission to play playlist - * @param share - Permission to share playlist - * @param edit - Permission to edit playlist - * @param follow - Permission to follow/unfollow playlist - * @param delete - Permission to delete playlist - * @param boomDownload - Permission to download playlist - * @param saveAsCopy - Permission to save generated playlist as copy of its content - */ -data class AudioPlaylistPermissions( - @SerializedName("play") - val play: Boolean? = null, - @SerializedName("share") - val share: Boolean? = null, - @SerializedName("edit") - val edit: Boolean? = null, - @SerializedName("follow") - val follow: Boolean? = null, - @SerializedName("delete") - val delete: Boolean? = null, - @SerializedName("boom_download") - val boomDownload: Boolean? = null, - @SerializedName("save_as_copy") - val saveAsCopy: Boolean? = null -) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkProductCategory.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkProductCategory.kt deleted file mode 100644 index 36e3392908..0000000000 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/base/dto/BaseLinkProductCategory.kt +++ /dev/null @@ -1,47 +0,0 @@ -/** - * The MIT License (MIT) - * - * Copyright (c) 2019 vk.com - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. -*/ -// ********************************************************************* -// THIS FILE IS AUTO GENERATED! -// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. -// ********************************************************************* -package com.vk.sdk.api.base.dto - -import com.google.gson.annotations.SerializedName -import com.vk.sdk.api.market.dto.MarketMarketCategoryNested -import kotlin.Int -import kotlin.String - -/** - * @param id - Category ID - * @param name - Category name - * @param parent - */ -data class BaseLinkProductCategory( - @SerializedName("id") - val id: Int? = null, - @SerializedName("name") - val name: String? = null, - @SerializedName("parent") - val parent: MarketMarketCategoryNested? = null -) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsUserXtrLists.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsUserXtrLists.kt deleted file mode 100644 index 4714d099f6..0000000000 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/friends/dto/FriendsUserXtrLists.kt +++ /dev/null @@ -1,482 +0,0 @@ -/** - * The MIT License (MIT) - * - * Copyright (c) 2019 vk.com - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. -*/ -// ********************************************************************* -// THIS FILE IS AUTO GENERATED! -// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. -// ********************************************************************* -package com.vk.sdk.api.friends.dto - -import com.google.gson.annotations.SerializedName -import com.vk.sdk.api.audio.dto.AudioAudio -import com.vk.sdk.api.base.dto.BaseBoolInt -import com.vk.sdk.api.base.dto.BaseCity -import com.vk.sdk.api.base.dto.BaseCountry -import com.vk.sdk.api.base.dto.BaseCropPhoto -import com.vk.sdk.api.base.dto.BaseSex -import com.vk.sdk.api.owner.dto.OwnerState -import com.vk.sdk.api.photos.dto.PhotosPhoto -import com.vk.sdk.api.users.dto.UsersCareer -import com.vk.sdk.api.users.dto.UsersExports -import com.vk.sdk.api.users.dto.UsersLastSeen -import com.vk.sdk.api.users.dto.UsersMilitary -import com.vk.sdk.api.users.dto.UsersOccupation -import com.vk.sdk.api.users.dto.UsersOnlineInfo -import com.vk.sdk.api.users.dto.UsersPersonal -import com.vk.sdk.api.users.dto.UsersRelative -import com.vk.sdk.api.users.dto.UsersSchool -import com.vk.sdk.api.users.dto.UsersUniversity -import com.vk.sdk.api.users.dto.UsersUserCounters -import com.vk.sdk.api.users.dto.UsersUserMin -import com.vk.sdk.api.users.dto.UsersUserRelation -import com.vk.sdk.api.users.dto.UsersUserType -import com.vk.sdk.api.video.dto.VideoLiveInfo -import kotlin.Boolean -import kotlin.Float -import kotlin.Int -import kotlin.String -import kotlin.collections.List - -/** - * @param lists - * @param firstNameNom - User's first name in nominative case - * @param firstNameGen - User's first name in genitive case - * @param firstNameDat - User's first name in dative case - * @param firstNameAcc - User's first name in accusative case - * @param firstNameIns - User's first name in instrumental case - * @param firstNameAbl - User's first name in prepositional case - * @param lastNameNom - User's last name in nominative case - * @param lastNameGen - User's last name in genitive case - * @param lastNameDat - User's last name in dative case - * @param lastNameAcc - User's last name in accusative case - * @param lastNameIns - User's last name in instrumental case - * @param lastNameAbl - User's last name in prepositional case - * @param nickname - User nickname - * @param maidenName - User maiden name - * @param contactName - User contact name - * @param domain - Domain name of the user's page - * @param bdate - User's date of birth - * @param city - * @param country - * @param timezone - User's timezone - * @param ownerState - * @param photo200 - URL of square photo of the user with 200 pixels in width - * @param photoMax - URL of square photo of the user with maximum width - * @param photo200Orig - URL of user's photo with 200 pixels in width - * @param photo400Orig - URL of user's photo with 400 pixels in width - * @param photoMaxOrig - URL of user's photo of maximum size - * @param photoId - ID of the user's main photo - * @param hasPhoto - Information whether the user has main photo - * @param hasMobile - Information whether the user specified his phone number - * @param isFriend - Information whether the user is a friend of current user - * @param wallComments - Information whether current user can comment wall posts - * @param canPost - Information whether current user can post on the user's wall - * @param canSeeAllPosts - Information whether current user can see other users' audio on the wall - * @param canSeeAudio - Information whether current user can see the user's audio - * @param type - * @param email - * @param skype - * @param facebook - * @param facebookName - * @param twitter - * @param livejournal - * @param instagram - * @param test - * @param videoLive - * @param isVideoLiveNotificationsBlocked - * @param isService - * @param serviceDescription - * @param photoRec - * @param photoMedium - * @param photoMediumRec - * @param photo - * @param photoBig - * @param photo400 - * @param photoMaxSize - * @param language - * @param storiesArchiveCount - * @param wallDefault - * @param canCall - Information whether current user can call - * @param canSeeWishes - Information whether current user can see the user's wishes - * @param canSeeGifts - Information whether current user can see the user's gifts - * @param interests - * @param books - * @param tv - * @param quotes - * @param about - * @param games - * @param movies - * @param activities - * @param music - * @param canWritePrivateMessage - Information whether current user can write private message - * @param canSendFriendRequest - Information whether current user can send a friend request - * @param canBeInvitedGroup - Information whether current user can be invited to the community - * @param mobilePhone - User's mobile phone number - * @param homePhone - User's additional phone number - * @param site - User's website - * @param statusAudio - * @param status - User's status - * @param activity - User's status - * @param lastSeen - * @param exports - * @param cropPhoto - * @param followersCount - Number of user's followers - * @param videoLiveLevel - User level in live streams achievements - * @param videoLiveCount - Number of user's live streams - * @param clipsCount - Number of user's clips - * @param blacklisted - Information whether current user is in the requested user's blacklist. - * @param blacklistedByMe - Information whether the requested user is in current user's blacklist - * @param isFavorite - Information whether the requested user is in faves of current user - * @param isHiddenFromFeed - Information whether the requested user is hidden from current user's - * newsfeed - * @param commonCount - Number of common friends with current user - * @param occupation - * @param career - * @param military - * @param university - University ID - * @param universityName - University name - * @param universityGroupId - * @param faculty - Faculty ID - * @param facultyName - Faculty name - * @param graduation - Graduation year - * @param educationForm - Education form - * @param educationStatus - User's education status - * @param homeTown - User hometown - * @param relation - User relationship status - * @param relationPartner - * @param personal - * @param universities - * @param schools - * @param relatives - * @param isSubscribedPodcasts - Information whether current user is subscribed to podcasts - * @param canSubscribePodcasts - Owner in whitelist or not - * @param canSubscribePosts - Can subscribe to wall - * @param counters - * @param accessKey - * @param canUploadDoc - * @param hash - * @param hasEmail - * @param sex - User sex - * @param screenName - Domain name of the user's page - * @param photo50 - URL of square photo of the user with 50 pixels in width - * @param photo100 - URL of square photo of the user with 100 pixels in width - * @param onlineInfo - * @param online - Information whether the user is online - * @param onlineMobile - Information whether the user is online in mobile site or application - * @param onlineApp - Application ID - * @param verified - Information whether the user is verified - * @param trending - Information whether the user has a "fire" pictogram. - * @param friendStatus - * @param mutual - * @param deactivated - Returns if a profile is deleted or blocked - * @param firstName - User first name - * @param hidden - Returns if a profile is hidden. - * @param id - User ID - * @param lastName - User last name - * @param canAccessClosed - * @param isClosed - */ -data class FriendsUserXtrLists( - @SerializedName("lists") - val lists: List? = null, - @SerializedName("first_name_nom") - val firstNameNom: String? = null, - @SerializedName("first_name_gen") - val firstNameGen: String? = null, - @SerializedName("first_name_dat") - val firstNameDat: String? = null, - @SerializedName("first_name_acc") - val firstNameAcc: String? = null, - @SerializedName("first_name_ins") - val firstNameIns: String? = null, - @SerializedName("first_name_abl") - val firstNameAbl: String? = null, - @SerializedName("last_name_nom") - val lastNameNom: String? = null, - @SerializedName("last_name_gen") - val lastNameGen: String? = null, - @SerializedName("last_name_dat") - val lastNameDat: String? = null, - @SerializedName("last_name_acc") - val lastNameAcc: String? = null, - @SerializedName("last_name_ins") - val lastNameIns: String? = null, - @SerializedName("last_name_abl") - val lastNameAbl: String? = null, - @SerializedName("nickname") - val nickname: String? = null, - @SerializedName("maiden_name") - val maidenName: String? = null, - @SerializedName("contact_name") - val contactName: String? = null, - @SerializedName("domain") - val domain: String? = null, - @SerializedName("bdate") - val bdate: String? = null, - @SerializedName("city") - val city: BaseCity? = null, - @SerializedName("country") - val country: BaseCountry? = null, - @SerializedName("timezone") - val timezone: Float? = null, - @SerializedName("owner_state") - val ownerState: OwnerState? = null, - @SerializedName("photo_200") - val photo200: String? = null, - @SerializedName("photo_max") - val photoMax: String? = null, - @SerializedName("photo_200_orig") - val photo200Orig: String? = null, - @SerializedName("photo_400_orig") - val photo400Orig: String? = null, - @SerializedName("photo_max_orig") - val photoMaxOrig: String? = null, - @SerializedName("photo_id") - val photoId: String? = null, - @SerializedName("has_photo") - val hasPhoto: BaseBoolInt? = null, - @SerializedName("has_mobile") - val hasMobile: BaseBoolInt? = null, - @SerializedName("is_friend") - val isFriend: BaseBoolInt? = null, - @SerializedName("wall_comments") - val wallComments: BaseBoolInt? = null, - @SerializedName("can_post") - val canPost: BaseBoolInt? = null, - @SerializedName("can_see_all_posts") - val canSeeAllPosts: BaseBoolInt? = null, - @SerializedName("can_see_audio") - val canSeeAudio: BaseBoolInt? = null, - @SerializedName("type") - val type: UsersUserType? = null, - @SerializedName("email") - val email: String? = null, - @SerializedName("skype") - val skype: String? = null, - @SerializedName("facebook") - val facebook: String? = null, - @SerializedName("facebook_name") - val facebookName: String? = null, - @SerializedName("twitter") - val twitter: String? = null, - @SerializedName("livejournal") - val livejournal: String? = null, - @SerializedName("instagram") - val instagram: String? = null, - @SerializedName("test") - val test: BaseBoolInt? = null, - @SerializedName("video_live") - val videoLive: VideoLiveInfo? = null, - @SerializedName("is_video_live_notifications_blocked") - val isVideoLiveNotificationsBlocked: BaseBoolInt? = null, - @SerializedName("is_service") - val isService: Boolean? = null, - @SerializedName("service_description") - val serviceDescription: String? = null, - @SerializedName("photo_rec") - val photoRec: String? = null, - @SerializedName("photo_medium") - val photoMedium: String? = null, - @SerializedName("photo_medium_rec") - val photoMediumRec: String? = null, - @SerializedName("photo") - val photo: String? = null, - @SerializedName("photo_big") - val photoBig: String? = null, - @SerializedName("photo_400") - val photo400: String? = null, - @SerializedName("photo_max_size") - val photoMaxSize: PhotosPhoto? = null, - @SerializedName("language") - val language: String? = null, - @SerializedName("stories_archive_count") - val storiesArchiveCount: Int? = null, - @SerializedName("wall_default") - val wallDefault: FriendsUserXtrLists.WallDefault? = null, - @SerializedName("can_call") - val canCall: Boolean? = null, - @SerializedName("can_see_wishes") - val canSeeWishes: Boolean? = null, - @SerializedName("can_see_gifts") - val canSeeGifts: BaseBoolInt? = null, - @SerializedName("interests") - val interests: String? = null, - @SerializedName("books") - val books: String? = null, - @SerializedName("tv") - val tv: String? = null, - @SerializedName("quotes") - val quotes: String? = null, - @SerializedName("about") - val about: String? = null, - @SerializedName("games") - val games: String? = null, - @SerializedName("movies") - val movies: String? = null, - @SerializedName("activities") - val activities: String? = null, - @SerializedName("music") - val music: String? = null, - @SerializedName("can_write_private_message") - val canWritePrivateMessage: BaseBoolInt? = null, - @SerializedName("can_send_friend_request") - val canSendFriendRequest: BaseBoolInt? = null, - @SerializedName("can_be_invited_group") - val canBeInvitedGroup: Boolean? = null, - @SerializedName("mobile_phone") - val mobilePhone: String? = null, - @SerializedName("home_phone") - val homePhone: String? = null, - @SerializedName("site") - val site: String? = null, - @SerializedName("status_audio") - val statusAudio: AudioAudio? = null, - @SerializedName("status") - val status: String? = null, - @SerializedName("activity") - val activity: String? = null, - @SerializedName("last_seen") - val lastSeen: UsersLastSeen? = null, - @SerializedName("exports") - val exports: UsersExports? = null, - @SerializedName("crop_photo") - val cropPhoto: BaseCropPhoto? = null, - @SerializedName("followers_count") - val followersCount: Int? = null, - @SerializedName("video_live_level") - val videoLiveLevel: Int? = null, - @SerializedName("video_live_count") - val videoLiveCount: Int? = null, - @SerializedName("clips_count") - val clipsCount: Int? = null, - @SerializedName("blacklisted") - val blacklisted: BaseBoolInt? = null, - @SerializedName("blacklisted_by_me") - val blacklistedByMe: BaseBoolInt? = null, - @SerializedName("is_favorite") - val isFavorite: BaseBoolInt? = null, - @SerializedName("is_hidden_from_feed") - val isHiddenFromFeed: BaseBoolInt? = null, - @SerializedName("common_count") - val commonCount: Int? = null, - @SerializedName("occupation") - val occupation: UsersOccupation? = null, - @SerializedName("career") - val career: List? = null, - @SerializedName("military") - val military: List? = null, - @SerializedName("university") - val university: Int? = null, - @SerializedName("university_name") - val universityName: String? = null, - @SerializedName("university_group_id") - val universityGroupId: Int? = null, - @SerializedName("faculty") - val faculty: Int? = null, - @SerializedName("faculty_name") - val facultyName: String? = null, - @SerializedName("graduation") - val graduation: Int? = null, - @SerializedName("education_form") - val educationForm: String? = null, - @SerializedName("education_status") - val educationStatus: String? = null, - @SerializedName("home_town") - val homeTown: String? = null, - @SerializedName("relation") - val relation: UsersUserRelation? = null, - @SerializedName("relation_partner") - val relationPartner: UsersUserMin? = null, - @SerializedName("personal") - val personal: UsersPersonal? = null, - @SerializedName("universities") - val universities: List? = null, - @SerializedName("schools") - val schools: List? = null, - @SerializedName("relatives") - val relatives: List? = null, - @SerializedName("is_subscribed_podcasts") - val isSubscribedPodcasts: Boolean? = null, - @SerializedName("can_subscribe_podcasts") - val canSubscribePodcasts: Boolean? = null, - @SerializedName("can_subscribe_posts") - val canSubscribePosts: Boolean? = null, - @SerializedName("counters") - val counters: UsersUserCounters? = null, - @SerializedName("access_key") - val accessKey: String? = null, - @SerializedName("can_upload_doc") - val canUploadDoc: BaseBoolInt? = null, - @SerializedName("hash") - val hash: String? = null, - @SerializedName("has_email") - val hasEmail: Boolean? = null, - @SerializedName("sex") - val sex: BaseSex? = null, - @SerializedName("screen_name") - val screenName: String? = null, - @SerializedName("photo_50") - val photo50: String? = null, - @SerializedName("photo_100") - val photo100: String? = null, - @SerializedName("online_info") - val onlineInfo: UsersOnlineInfo? = null, - @SerializedName("online") - val online: BaseBoolInt? = null, - @SerializedName("online_mobile") - val onlineMobile: BaseBoolInt? = null, - @SerializedName("online_app") - val onlineApp: Int? = null, - @SerializedName("verified") - val verified: BaseBoolInt? = null, - @SerializedName("trending") - val trending: BaseBoolInt? = null, - @SerializedName("friend_status") - val friendStatus: FriendsFriendStatusStatus? = null, - @SerializedName("mutual") - val mutual: FriendsRequestsMutual? = null, - @SerializedName("deactivated") - val deactivated: String? = null, - @SerializedName("first_name") - val firstName: String? = null, - @SerializedName("hidden") - val hidden: Int? = null, - @SerializedName("id") - val id: Int? = null, - @SerializedName("last_name") - val lastName: String? = null, - @SerializedName("can_access_closed") - val canAccessClosed: Boolean? = null, - @SerializedName("is_closed") - val isClosed: Boolean? = null -) { - enum class WallDefault( - val value: String - ) { - @SerializedName("owner") - OWNER("owner"), - - @SerializedName("all") - ALL("all"); - } -} diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/media/dto/MediaRestriction.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/media/dto/MediaRestriction.kt deleted file mode 100644 index f8cd6fe005..0000000000 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/media/dto/MediaRestriction.kt +++ /dev/null @@ -1,68 +0,0 @@ -/** - * The MIT License (MIT) - * - * Copyright (c) 2019 vk.com - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. -*/ -// ********************************************************************* -// THIS FILE IS AUTO GENERATED! -// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. -// ********************************************************************* -package com.vk.sdk.api.media.dto - -import com.google.gson.annotations.SerializedName -import com.vk.sdk.api.base.dto.BaseBoolInt -import com.vk.sdk.api.base.dto.BaseImage -import com.vk.sdk.api.video.dto.VideoRestrictionButton -import kotlin.String -import kotlin.collections.List - -/** - * Media restrictions - * @param title - * @param text - * @param button - * @param alwaysShown - Need show restriction always or not - * @param blur - Need blur current video or not - * @param canPlay - Can play video or not - * @param canPreview - Can preview video or not - * @param cardIcon - * @param listIcon - */ -data class MediaRestriction( - @SerializedName("title") - val title: String, - @SerializedName("text") - val text: String? = null, - @SerializedName("button") - val button: VideoRestrictionButton? = null, - @SerializedName("always_shown") - val alwaysShown: BaseBoolInt? = null, - @SerializedName("blur") - val blur: BaseBoolInt? = null, - @SerializedName("can_play") - val canPlay: BaseBoolInt? = null, - @SerializedName("can_preview") - val canPreview: BaseBoolInt? = null, - @SerializedName("card_icon") - val cardIcon: List? = null, - @SerializedName("list_icon") - val listIcon: List? = null -) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetConversationsByIdExtendedResponse.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetConversationsByIdExtendedResponse.kt deleted file mode 100644 index 189b34d334..0000000000 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/messages/dto/MessagesGetConversationsByIdExtendedResponse.kt +++ /dev/null @@ -1,51 +0,0 @@ -/** - * The MIT License (MIT) - * - * Copyright (c) 2019 vk.com - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. -*/ -// ********************************************************************* -// THIS FILE IS AUTO GENERATED! -// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. -// ********************************************************************* -package com.vk.sdk.api.messages.dto - -import com.google.gson.annotations.SerializedName -import com.vk.sdk.api.groups.dto.GroupsGroupFull -import com.vk.sdk.api.users.dto.UsersUserFull -import kotlin.Int -import kotlin.collections.List - -/** - * @param count - Total number - * @param items - * @param profiles - * @param groups - */ -data class MessagesGetConversationsByIdExtendedResponse( - @SerializedName("count") - val count: Int, - @SerializedName("items") - val items: List, - @SerializedName("profiles") - val profiles: List? = null, - @SerializedName("groups") - val groups: List? = null -) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetByIdExtendedResponse.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetByIdExtendedResponse.kt deleted file mode 100644 index d10b14532a..0000000000 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetByIdExtendedResponse.kt +++ /dev/null @@ -1,39 +0,0 @@ -/** - * The MIT License (MIT) - * - * Copyright (c) 2019 vk.com - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. -*/ -// ********************************************************************* -// THIS FILE IS AUTO GENERATED! -// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. -// ********************************************************************* -package com.vk.sdk.api.photos.dto - -import com.google.gson.annotations.SerializedName -import kotlin.collections.List - -/** - * @param items - */ -data class PhotosGetByIdExtendedResponse( - @SerializedName("items") - val items: List -) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetByIdResponse.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetByIdResponse.kt deleted file mode 100644 index 6d7c5130af..0000000000 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/photos/dto/PhotosGetByIdResponse.kt +++ /dev/null @@ -1,39 +0,0 @@ -/** - * The MIT License (MIT) - * - * Copyright (c) 2019 vk.com - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. -*/ -// ********************************************************************* -// THIS FILE IS AUTO GENERATED! -// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. -// ********************************************************************* -package com.vk.sdk.api.photos.dto - -import com.google.gson.annotations.SerializedName -import kotlin.collections.List - -/** - * @param items - */ -data class PhotosGetByIdResponse( - @SerializedName("items") - val items: List? = null -) diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoRestrictionButton.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoRestrictionButton.kt deleted file mode 100644 index 07abfd3212..0000000000 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/video/dto/VideoRestrictionButton.kt +++ /dev/null @@ -1,50 +0,0 @@ -/** - * The MIT License (MIT) - * - * Copyright (c) 2019 vk.com - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. -*/ -// ********************************************************************* -// THIS FILE IS AUTO GENERATED! -// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. -// ********************************************************************* -package com.vk.sdk.api.video.dto - -import com.google.gson.annotations.SerializedName -import kotlin.String - -/** - * Video restriction button - * @param action - * @param title - */ -data class VideoRestrictionButton( - @SerializedName("action") - val action: VideoRestrictionButton.Action? = null, - @SerializedName("title") - val title: String? = null -) { - enum class Action( - val value: String - ) { - @SerializedName("play") - PLAY("play"); - } -} diff --git a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallGetByIdResponse.kt b/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallGetByIdResponse.kt deleted file mode 100644 index 6069dc82e7..0000000000 --- a/vk-sdk-api/src/main/java/com/vk/sdk/api/wall/dto/WallGetByIdResponse.kt +++ /dev/null @@ -1,39 +0,0 @@ -/** - * The MIT License (MIT) - * - * Copyright (c) 2019 vk.com - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. -*/ -// ********************************************************************* -// THIS FILE IS AUTO GENERATED! -// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING. -// ********************************************************************* -package com.vk.sdk.api.wall.dto - -import com.google.gson.annotations.SerializedName -import kotlin.collections.List - -/** - * @param items - */ -data class WallGetByIdResponse( - @SerializedName("items") - val items: List? = null -) diff --git a/vk-sdk-core/src/main/java/com/vk/api/sdk/chain/RateLimitReachedChainCall.kt b/vk-sdk-core/src/main/java/com/vk/api/sdk/chain/RateLimitReachedChainCall.kt deleted file mode 100644 index 605890e61a..0000000000 --- a/vk-sdk-core/src/main/java/com/vk/api/sdk/chain/RateLimitReachedChainCall.kt +++ /dev/null @@ -1,97 +0,0 @@ -package com.vk.api.sdk.chain - -import android.content.Context -import android.os.SystemClock -import com.vk.api.sdk.VKApiManager -import com.vk.api.sdk.exceptions.RateLimitReachedException -import com.vk.api.sdk.exceptions.VKApiCodes -import com.vk.api.sdk.exceptions.VKApiExecutionException - -/** - * chain call which handles [VKApiCodes.CODE_RATE_LIMIT_REACHED] error code - * for now if we receive that code we don't have to call this method for the next backoff time - * in most cases normal back off time is 1 hour - * - * if backoff time for the current method is not over we throw our custom [RateLimitReachedException] - * and don't do real api method call - * - * @param manager - [VKApiManager] instance - * @param method - method name - * @param chainCall - current [ChainCall] - */ -class RateLimitReachedChainCall( - manager: VKApiManager, - private val method: String, - private val backoff: RateLimitBackoff, - private val chainCall: ChainCall -): ChainCall(manager) { - - override fun call(args: ChainArgs): T? { - if (backoff.shouldWait(method)) { - throw RateLimitReachedException(method, DETAIL_MESSAGE) - } - - backoff.reset(method) - try { - return chainCall.call(args) - } catch (ex: VKApiExecutionException) { - if (ex.isRateLimitReachedError) { - backoff.backoff(method) - logDebug(DETAIL_MESSAGE, ex) - } - throw ex - } - } - - /** - * backoff implementation for the api rate limit - * - * @param context - android [Context] - * @param backoffTimeMs - backoff time in ms the default is 1 hour - * - * it's based on [SystemClock.elapsedRealtime] and here we don't want to handle system reboot - * - * in case of reboot we will make another api call and then go through a normal [RateLimitBackoff] logic - */ - class RateLimitBackoff( - context: Context, - private val backoffTimeMs: Long, - private val realTimeProvider: () -> Long = { - SystemClock.elapsedRealtime() - } - ) { - - private val prefStorage by lazy { - context.getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE) - } - - fun shouldWait(operationKey: String): Boolean { - if (prefStorage.contains(operationKey).not()) { - return false - } - - val elapsedTime = realTimeProvider() - val value = prefStorage.getLong(operationKey, backoffTimeMs) - - //we don't want to handle device reboot - if (elapsedTime - value >= 0) { - return value + backoffTimeMs > elapsedTime - } - - return false - } - - fun reset(operationKey: String) { - prefStorage.edit().remove(operationKey).apply() - } - - fun backoff(operationKey: String) { - prefStorage.edit().putLong(operationKey, realTimeProvider()).apply() - } - } - - companion object { - private const val DETAIL_MESSAGE = "Rate limit reached." - private const val PREF_NAME = "rate_limit_backoff_storage" - } -} \ No newline at end of file diff --git a/vk.gradle b/vk.gradle new file mode 100644 index 0000000000..e69de29bb2