From e5ef9f63070c038c9cfbb8667ed463cadabf9ad7 Mon Sep 17 00:00:00 2001
From: "a.mochalov" <a.mochalov@corp.vk.com>
Date: Mon, 14 Mar 2022 17:23:30 +0300
Subject: [PATCH] version 3.5.1

---
 .../main/java/com/vk/sdk/api/NewApiRequest.kt |  7 +-
 core/src/main/AndroidManifest.xml             | 27 -------
 core/src/main/java/com/vk/api/sdk/VK.kt       | 29 +------
 .../java/com/vk/api/sdk/VKApiCallListener.kt  | 28 +------
 .../main/java/com/vk/api/sdk/VKApiCallback.kt | 27 -------
 .../main/java/com/vk/api/sdk/VKApiConfig.kt   | 78 +++++++++----------
 .../java/com/vk/api/sdk/VKApiCredentials.kt   | 27 -------
 .../sdk/VKApiIllegalCredentialsListener.kt    | 27 -------
 .../com/vk/api/sdk/VKApiJSONResponseParser.kt | 17 ++++
 .../main/java/com/vk/api/sdk/VKApiManager.kt  | 44 +++--------
 .../com/vk/api/sdk/VKApiProgressListener.kt   | 27 -------
 .../com/vk/api/sdk/VKApiResponseValidator.kt  | 27 -------
 .../com/vk/api/sdk/VKApiValidationHandler.kt  | 51 +++++-------
 .../vk/api/sdk/VKDefaultValidationHandler.kt  | 27 -------
 core/src/main/java/com/vk/api/sdk/VKHost.kt   | 26 +++++++
 .../java/com/vk/api/sdk/VKHttpPostCall.kt     | 27 -------
 .../java/com/vk/api/sdk/VKKeyValueStorage.kt  | 29 +------
 .../main/java/com/vk/api/sdk/VKMethodCall.kt  | 27 -------
 .../java/com/vk/api/sdk/VKOkHttpProvider.kt   | 27 -------
 .../api/sdk/VKPreferencesKeyValueStorage.kt   | 27 -------
 .../main/java/com/vk/api/sdk/VKScheduler.kt   | 27 -------
 .../com/vk/api/sdk/VKTokenExpiredHandler.kt   | 27 -------
 core/src/main/java/com/vk/api/sdk/VkResult.kt | 27 -------
 .../java/com/vk/api/sdk/auth/VKAccessToken.kt | 29 +------
 .../com/vk/api/sdk/auth/VKAuthCallback.kt     | 27 -------
 .../java/com/vk/api/sdk/auth/VKAuthManager.kt | 27 -------
 .../java/com/vk/api/sdk/auth/VKAuthParams.kt  | 27 -------
 .../java/com/vk/api/sdk/auth/VKAuthResult.kt  | 27 -------
 .../vk/api/sdk/auth/VKAuthResultContract.kt   | 27 -------
 .../vk/api/sdk/auth/VKAuthenticationResult.kt | 29 +------
 .../main/java/com/vk/api/sdk/auth/VKScope.kt  | 27 -------
 .../vk/api/sdk/browser/BrowserDescriptor.java | 27 -------
 .../vk/api/sdk/browser/BrowserMatcher.java    | 29 +------
 .../vk/api/sdk/browser/BrowserSelector.java   | 27 -------
 .../java/com/vk/api/sdk/browser/Browsers.java | 27 -------
 .../vk/api/sdk/browser/DelimitedVersion.java  | 27 -------
 .../com/vk/api/sdk/browser/VersionRange.java  | 27 -------
 .../sdk/browser/VersionedBrowserMatcher.java  | 28 -------
 .../sdk/browser/WhiteListedBrowserHelper.java | 29 +------
 .../sdk/chain/ApiMethodPriorityChainCall.kt   | 27 -------
 .../java/com/vk/api/sdk/chain/ChainArgs.kt    | 27 -------
 .../java/com/vk/api/sdk/chain/ChainCall.kt    | 27 -------
 .../com/vk/api/sdk/chain/HttpPostChainCall.kt | 40 ++--------
 .../sdk/chain/InternalErrorRetryChainCall.kt  | 27 -------
 .../InvalidCredentialsObserverChainCall.kt    | 27 -------
 .../com/vk/api/sdk/chain/MethodChainCall.kt   | 55 ++++---------
 .../sdk/chain/RateLimitReachedChainCall.kt    | 27 -------
 .../com/vk/api/sdk/chain/RetryChainCall.kt    | 27 -------
 .../sdk/chain/TooManyRequestRetryChainCall.kt | 27 -------
 .../sdk/chain/ValidationHandlerChainCall.kt   | 45 ++++-------
 .../exceptions/IgnoredAccessTokenException.kt | 27 -------
 .../exceptions/RateLimitReachedException.kt   | 27 -------
 .../com/vk/api/sdk/exceptions/VKApiCodes.kt   | 28 +------
 .../vk/api/sdk/exceptions/VKApiException.kt   | 27 -------
 .../sdk/exceptions/VKApiExecutionException.kt | 27 -------
 .../VKApiIllegalResponseException.kt          | 27 -------
 .../vk/api/sdk/exceptions/VKAuthException.kt  | 27 -------
 .../VKInternalServerErrorException.kt         | 27 -------
 .../sdk/exceptions/VKLargeEntityException.kt  | 27 -------
 .../api/sdk/exceptions/VKLocalIOException.kt  | 27 -------
 .../com/vk/api/sdk/extensions/ContextExt.kt   | 27 -------
 .../vk/api/sdk/extensions/InputStreamExt.kt   | 13 ++++
 .../com/vk/api/sdk/internal/ApiCommand.kt     | 27 -------
 .../vk/api/sdk/internal/HttpMultipartEntry.kt | 27 -------
 .../com/vk/api/sdk/internal/HttpStatus.kt     | 27 -------
 .../java/com/vk/api/sdk/internal/JsonUtils.kt | 27 -------
 .../api/sdk/internal/QueryStringGenerator.kt  | 27 -------
 .../com/vk/api/sdk/internal/VKErrorUtils.kt   | 44 ++---------
 .../com/vk/api/sdk/internal/VKInitProvider.kt | 27 -------
 .../com/vk/api/sdk/internal/Validation.kt     | 27 -------
 .../vk/api/sdk/listeners/ApiCallListener.kt   | 11 +++
 .../CompositeRequestEventListener.kt          | 36 +++++++++
 .../vk/api/sdk/okhttp/FileFullRequestBody.kt  | 27 -------
 .../vk/api/sdk/okhttp/LogLevelRequestTag.kt   | 27 -------
 .../vk/api/sdk/okhttp/LoggingInterceptor.kt   | 27 -------
 .../com/vk/api/sdk/okhttp/OkHttpExecutor.kt   | 76 +++++++-----------
 .../vk/api/sdk/okhttp/OkHttpExecutorConfig.kt | 34 ++------
 .../com/vk/api/sdk/okhttp/OkHttpMethodCall.kt | 27 -------
 .../com/vk/api/sdk/okhttp/OkHttpPostCall.kt   | 27 -------
 .../vk/api/sdk/okhttp/ProgressRequestBody.kt  | 27 -------
 .../java/com/vk/api/sdk/okhttp/RequestTag.kt  | 27 -------
 .../vk/api/sdk/okhttp/UserAgentInterceptor.kt | 27 -------
 .../vk/api/sdk/requests/VKBooleanRequest.kt   | 29 +------
 .../java/com/vk/api/sdk/requests/VKRequest.kt | 48 ++----------
 .../response/DefaultJsonResponseConverter.kt  | 26 +++++++
 .../sdk/response/JsonResponseTypeConverter.kt | 30 +++++++
 .../sdk/response/ResponseBodyJsonConverter.kt | 53 +++++++++++++
 .../com/vk/api/sdk/ui/VKBaseAuthActivity.kt   | 27 -------
 .../com/vk/api/sdk/ui/VKCaptchaActivity.kt    | 27 -------
 .../vk/api/sdk/ui/VKConfirmationActivity.kt   | 27 -------
 .../vk/api/sdk/ui/VKWebViewAuthActivity.kt    | 27 -------
 .../main/java/com/vk/api/sdk/utils/ApiExt.kt  | 38 ++-------
 .../api/sdk/utils/ApiMethodPriorityBackoff.kt | 27 -------
 .../com/vk/api/sdk/utils/DefaultUserAgent.kt  | 27 -------
 .../vk/api/sdk/utils/ExponentialBackoff.kt    | 27 -------
 .../vk/api/sdk/utils/RateLimitTokenBackoff.kt | 29 +------
 .../StartUpMethodPriorityBackoffBaseImpl.kt   | 27 -------
 .../vk/api/sdk/utils/ThreadLocalDelegate.kt   | 29 +------
 .../com/vk/api/sdk/utils/UserAgentProvider.kt | 27 -------
 .../java/com/vk/api/sdk/utils/VKLoader.kt     | 27 -------
 .../com/vk/api/sdk/utils/VKUrlResolver.kt     | 29 +------
 .../main/java/com/vk/api/sdk/utils/VKUtils.kt | 39 +---------
 .../vk/api/sdk/utils/VKValidationLocker.kt    | 27 -------
 core/src/main/res/values/strings.xml          |  4 +-
 .../java/com/vk/api/sdk/ValidationLockTest.kt | 63 +++++++++++++++
 .../vk/sdk/sample/requests/VKUsersCommand.kt  |  8 +-
 .../sdk/sample/requests/VKWallPostCommand.kt  | 26 +++----
 .../app/src/main/res/values-ru/strings.xml    |  1 -
 .../app/src/main/res/values-uz/strings.xml    | 10 +++
 samples/app/src/main/res/values/strings.xml   |  1 +
 110 files changed, 485 insertions(+), 2676 deletions(-)
 create mode 100644 core/src/main/java/com/vk/api/sdk/VKApiJSONResponseParser.kt
 create mode 100644 core/src/main/java/com/vk/api/sdk/VKHost.kt
 create mode 100644 core/src/main/java/com/vk/api/sdk/extensions/InputStreamExt.kt
 create mode 100644 core/src/main/java/com/vk/api/sdk/listeners/ApiCallListener.kt
 create mode 100644 core/src/main/java/com/vk/api/sdk/listeners/CompositeRequestEventListener.kt
 create mode 100644 core/src/main/java/com/vk/api/sdk/response/DefaultJsonResponseConverter.kt
 create mode 100644 core/src/main/java/com/vk/api/sdk/response/JsonResponseTypeConverter.kt
 create mode 100644 core/src/main/java/com/vk/api/sdk/response/ResponseBodyJsonConverter.kt
 create mode 100644 core/src/test/java/com/vk/api/sdk/ValidationLockTest.kt
 create mode 100644 samples/app/src/main/res/values-uz/strings.xml

diff --git a/api/src/main/java/com/vk/sdk/api/NewApiRequest.kt b/api/src/main/java/com/vk/sdk/api/NewApiRequest.kt
index c924ecb1ae..3bc2bda2fc 100644
--- a/api/src/main/java/com/vk/sdk/api/NewApiRequest.kt
+++ b/api/src/main/java/com/vk/sdk/api/NewApiRequest.kt
@@ -37,14 +37,15 @@ import kotlin.Int
 import kotlin.Long
 import kotlin.String
 import kotlin.collections.List
+import org.json.JSONObject
 
 internal class NewApiRequest<T> internal constructor(
     methodName: String,
     parser: ApiResponseParser<T>
 ) : VKRequest<T>(methodName, requestApiVersion = "5.131"), ApiResponseParser<T> by parser {
-    override fun parse(response: String): T {
-        val responseJson = JsonParser.parseString(response).asJsonObject.get("response")
-        return parseResponse(responseJson)
+    override fun parse(responseJson: JSONObject): T {
+        val response = JsonParser.parseString(responseJson.toString()).asJsonObject.get("response")
+        return parseResponse(response)
     }
 
     fun addParam(
diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
index a5a6aa6215..857c7974b5 100644
--- a/core/src/main/AndroidManifest.xml
+++ b/core/src/main/AndroidManifest.xml
@@ -1,30 +1,3 @@
-<!--
-  ~ Copyright (c) 2020 - present, LLC “V Kontakte”
-  ~
-  ~ 1. Permission is hereby granted to any person obtaining a copy of this Software to
-  ~ use the Software without charge.
-  ~
-  ~ 2. Restrictions
-  ~ You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
-  ~ create derivative works based upon the Software or any part thereof.
-  ~
-  ~ 3. Termination
-  ~ This License is effective until terminated. LLC “V Kontakte” may terminate this
-  ~ License at any time without any negative consequences to our rights.
-  ~ You may terminate this License at any time by deleting the Software and all copies
-  ~ thereof. Upon termination of this license for any reason, you shall continue to be
-  ~ bound by the provisions of Section 2 above.
-  ~ Termination will be without prejudice to any rights LLC “V Kontakte” may have as
-  ~ a result of this agreement.
-  ~
-  ~ 4. Disclaimer of warranty and liability
-  ~ THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
-  ~ ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
-  ~ PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
-  ~ SPECIFIC RESULTS OF USE OF THE SOFTWARE.
-  ~ UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
-  ~ THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
--->
 <!-- *******************************************************************************
 # The MIT License (MIT)
 #
diff --git a/core/src/main/java/com/vk/api/sdk/VK.kt b/core/src/main/java/com/vk/api/sdk/VK.kt
index 59252384de..73cea42572 100644
--- a/core/src/main/java/com/vk/api/sdk/VK.kt
+++ b/core/src/main/java/com/vk/api/sdk/VK.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
@@ -165,7 +138,7 @@ object VK {
     @JvmStatic
     fun logout() {
         authManager.clearAccessToken()
-        VKUtils.clearAllCookies(config.context)
+        VKUtils.clearAllCookies()
     }
 
     /**
diff --git a/core/src/main/java/com/vk/api/sdk/VKApiCallListener.kt b/core/src/main/java/com/vk/api/sdk/VKApiCallListener.kt
index b431e54eeb..0bcd082f61 100644
--- a/core/src/main/java/com/vk/api/sdk/VKApiCallListener.kt
+++ b/core/src/main/java/com/vk/api/sdk/VKApiCallListener.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
@@ -53,5 +26,6 @@ package com.vk.api.sdk
 
 interface VKApiCallListener {
     fun onApiCallStart(requestTagId: Long, url: String)
+    fun onApiCallSuccess(requestTagId: Long)
     fun onApiCallFailed(requestTagId: Long, e: Exception)
 }
\ No newline at end of file
diff --git a/core/src/main/java/com/vk/api/sdk/VKApiCallback.kt b/core/src/main/java/com/vk/api/sdk/VKApiCallback.kt
index 822af80367..3f783eed23 100644
--- a/core/src/main/java/com/vk/api/sdk/VKApiCallback.kt
+++ b/core/src/main/java/com/vk/api/sdk/VKApiCallback.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/VKApiConfig.kt b/core/src/main/java/com/vk/api/sdk/VKApiConfig.kt
index ae9d547520..c728dcf003 100644
--- a/core/src/main/java/com/vk/api/sdk/VKApiConfig.kt
+++ b/core/src/main/java/com/vk/api/sdk/VKApiConfig.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
@@ -55,6 +28,9 @@ import android.content.Context
 import com.vk.api.sdk.auth.VKAccessTokenProvider
 import com.vk.api.sdk.okhttp.DefaultLoggingPrefixer
 import com.vk.api.sdk.okhttp.LoggingPrefixer
+import com.vk.api.sdk.response.DefaultJsonResponseConverter
+import com.vk.api.sdk.response.JsonResponseTypeConverter
+import com.vk.api.sdk.response.ResponseBodyJsonConverter
 import com.vk.api.sdk.utils.ApiMethodPriorityBackoff
 import com.vk.api.sdk.utils.log.DefaultApiLogger
 import com.vk.api.sdk.utils.log.Logger
@@ -81,17 +57,27 @@ data class VKApiConfig(
     val logFilterCredentials: Boolean = true,
     val debugCycleCalls: Lazy<Boolean> = lazy { false },
     val callsPerSecondLimit: Int = 3,
-    val httpApiHostProvider: () -> String = { DEFAULT_API_DOMAIN },
+    val apiHostProvider: () -> String = { DEFAULT_API_DOMAIN },
     val langProvider: () -> String = { DEFAULT_LANGUAGE },
     val keyValueStorage: VKKeyValueStorage = VKPreferencesKeyValueStorage(context),
-    val customApiEndpoint: Lazy<String> = lazy { DEFAULT_API_ENDPOINT },
+    val customApiEndpoint: () -> String = { DEFAULT_API_ENDPOINT },
     val rateLimitBackoffTimeoutMs: Long = TimeUnit.HOURS.toMillis(1),
     val apiMethodPriorityBackoff: ApiMethodPriorityBackoff = ApiMethodPriorityBackoff.DEFAULT,
     val externalDeviceId: Lazy<String?> = lazy { null },
     val anonymousTokenProvider: Lazy<VKAccessTokenProvider?> = lazy { null },
-    val responseValidator: Lazy<VKApiResponseValidator>? = null
+    val responseValidator: Lazy<VKApiResponseValidator>? = null,
+    val customJsonResponseTypeConverters: List<JsonResponseTypeConverter> = listOf()
 ) {
 
+    val responseBodyJsonConverter: ResponseBodyJsonConverter by lazy {
+        ResponseBodyJsonConverter(
+            listOf(
+                *customJsonResponseTypeConverters.toTypedArray(),
+                DefaultJsonResponseConverter(),
+            )
+        )
+    }
+
     val lang get() = langProvider()
 
     fun builder(context: Context) = Builder(VKApiConfig(context, validationHandler = VKDefaultValidationHandler(context)))
@@ -100,6 +86,8 @@ data class VKApiConfig(
 
     class Builder internal constructor(private var config: VKApiConfig) {
 
+        private val customJsonResponseTypeConverters = mutableListOf<JsonResponseTypeConverter>()
+
         fun setLogger(logger: Logger) = apply {
             config = config.copy(logger = logger)
         }
@@ -121,7 +109,7 @@ data class VKApiConfig(
         }
 
         fun setCustomApiEndpoint(endpoint: String) = apply {
-            config = config.copy(customApiEndpoint = lazy { endpoint })
+            config = config.copy(customApiEndpoint = { endpoint })
         }
 
         fun setCustomValueStorage(storage: VKKeyValueStorage) = apply {
@@ -132,8 +120,8 @@ data class VKApiConfig(
             config = config.copy(langProvider = langProvider)
         }
 
-        fun setHttpApiHostProvider(hostProvider: () -> String) = apply {
-            config = config.copy(httpApiHostProvider = hostProvider)
+        fun setApiHostProvider(apiHostProvider: () -> String) = apply {
+            config = config.copy(apiHostProvider = apiHostProvider)
         }
 
         fun setAccessToken(accessToken: String) = apply {
@@ -172,18 +160,30 @@ data class VKApiConfig(
             config = config.copy(anonymousTokenProvider = lazy { provider })
         }
 
+        fun addCustomJsonResponseTypeConverter(converter: JsonResponseTypeConverter) = apply {
+            customJsonResponseTypeConverters += converter
+        }
+
+        fun removeCustomJsonResponseTypeConverter(converter: JsonResponseTypeConverter) = apply {
+            customJsonResponseTypeConverters -= converter
+        }
+
         fun build(): VKApiConfig {
-            return config
+            return config.copy(customJsonResponseTypeConverters = customJsonResponseTypeConverters)
         }
     }
 
     companion object {
-        const val DEFAULT_DOMAIN = "vk.com"
         const val DEFAULT_LANGUAGE = "en"
         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"
-        const val DEFAULT_API_ENDPOINT = "https://$DEFAULT_API_DOMAIN/method"
+
+        val DEFAULT_API_DOMAIN: String
+            get() = "api.${VKHost.host}"
+        val DEFAULT_OAUTH_DOMAIN: String
+            get() = "oauth.${VKHost.host}"
+        val DEFAULT_STATIC_DOMAIN: String
+            get() = "static.${VKHost.host}"
+        val DEFAULT_API_ENDPOINT: String
+            get() = "https://${VKHost.host}/method"
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/com/vk/api/sdk/VKApiCredentials.kt b/core/src/main/java/com/vk/api/sdk/VKApiCredentials.kt
index e0032c8ad7..47293431af 100644
--- a/core/src/main/java/com/vk/api/sdk/VKApiCredentials.kt
+++ b/core/src/main/java/com/vk/api/sdk/VKApiCredentials.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 package com.vk.api.sdk
 
 import com.vk.api.sdk.auth.VKAccessToken
diff --git a/core/src/main/java/com/vk/api/sdk/VKApiIllegalCredentialsListener.kt b/core/src/main/java/com/vk/api/sdk/VKApiIllegalCredentialsListener.kt
index 7444feae34..c73d07ddfe 100644
--- a/core/src/main/java/com/vk/api/sdk/VKApiIllegalCredentialsListener.kt
+++ b/core/src/main/java/com/vk/api/sdk/VKApiIllegalCredentialsListener.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/VKApiJSONResponseParser.kt b/core/src/main/java/com/vk/api/sdk/VKApiJSONResponseParser.kt
new file mode 100644
index 0000000000..d419bf8718
--- /dev/null
+++ b/core/src/main/java/com/vk/api/sdk/VKApiJSONResponseParser.kt
@@ -0,0 +1,17 @@
+package com.vk.api.sdk
+
+import com.vk.api.sdk.exceptions.VKApiException
+import com.vk.api.sdk.exceptions.VKApiExecutionException
+import org.json.JSONException
+import org.json.JSONObject
+
+fun interface VKApiJSONResponseParser<Result> {
+
+    @Throws(
+        VKApiException::class,
+        VKApiExecutionException::class,
+        JSONException::class,
+        Exception::class
+    )
+    fun parse(responseJson: JSONObject): Result
+}
\ No newline at end of file
diff --git a/core/src/main/java/com/vk/api/sdk/VKApiManager.kt b/core/src/main/java/com/vk/api/sdk/VKApiManager.kt
index e6c63dccfe..4e32cbd10f 100644
--- a/core/src/main/java/com/vk/api/sdk/VKApiManager.kt
+++ b/core/src/main/java/com/vk/api/sdk/VKApiManager.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
@@ -73,6 +46,8 @@ open class VKApiManager(val config: VKApiConfig) {
         )
     }
 
+    val validationLock = VKApiValidationHandler.ValidationLock()
+
     internal val validationHandler: VKApiValidationHandler? = config.validationHandler
 
     open val executor by lazy { OkHttpExecutor(OkHttpExecutorConfig(config)) }
@@ -111,10 +86,10 @@ open class VKApiManager(val config: VKApiConfig) {
      * Override credentials
      * @param call
      */
-    fun execute(call: VKMethodCall): Unit = execute(call, VKApiResponseParser { Unit })
+    fun execute(call: VKMethodCall): Unit = execute(call) { }
 
     @Throws(InterruptedException::class, IOException::class, VKApiException::class)
-    fun <T> execute(call: VKMethodCall, parser: VKApiResponseParser<T>? = null): T {
+    fun <T> execute(call: VKMethodCall, parser: VKApiJSONResponseParser<T>? = null): T {
         var cc: ChainCall<T> = createMethodChainCall(call, parser)
         cc = wrapCall(call, cc)
         return executeWithExceptionAdjust(cc)
@@ -143,7 +118,7 @@ open class VKApiManager(val config: VKApiConfig) {
 
     @Throws(InterruptedException::class, IOException::class, VKApiException::class)
     @JvmOverloads
-    fun <T> execute(call: VKHttpPostCall, progress: VKApiProgressListener? = null, parser: VKApiResponseParser<T>? = null): T {
+    fun <T> execute(call: VKHttpPostCall, progress: VKApiProgressListener? = null, parser: VKApiJSONResponseParser<T>? = null): T {
         var cc: ChainCall<T> = createPostMethodChainCall(call, progress, parser)
         cc = wrapCall(call, cc)
         return executeWithExceptionAdjust(cc)
@@ -161,7 +136,7 @@ open class VKApiManager(val config: VKApiConfig) {
         retryCount: Int,
         chainCall: ChainCall<T>
     ): ValidationHandlerChainCall<T> {
-        return ValidationHandlerChainCall(this, retryCount, chainCall)
+        return ValidationHandlerChainCall(this, retryCount, chainCall, validationLock)
     }
 
     @Throws(InterruptedException::class, IOException::class, VKApiException::class)
@@ -171,7 +146,7 @@ open class VKApiManager(val config: VKApiConfig) {
 
     protected open fun <T> createMethodChainCall(
         call: VKMethodCall,
-        parser: VKApiResponseParser<T>? = null
+        parser: VKApiJSONResponseParser<T>? = null
     ): ChainCall<T> {
         return MethodChainCall(
             this,
@@ -185,7 +160,8 @@ open class VKApiManager(val config: VKApiConfig) {
 
     protected open fun <T> createPostMethodChainCall(
         call: VKHttpPostCall,
-        progress: VKApiProgressListener?, parser: VKApiResponseParser<T>?
+        progress: VKApiProgressListener?,
+        parser: VKApiJSONResponseParser<T>?
     ): HttpPostChainCall<T> {
         return HttpPostChainCall(this, executor, call, progress, parser)
     }
@@ -196,4 +172,4 @@ open class VKApiManager(val config: VKApiConfig) {
     ): TooManyRequestRetryChainCall<T> {
         return TooManyRequestRetryChainCall(this, call.retryCount, TooManyRequestBackoffGlobal, chainCall)
     }
-}
+}
\ No newline at end of file
diff --git a/core/src/main/java/com/vk/api/sdk/VKApiProgressListener.kt b/core/src/main/java/com/vk/api/sdk/VKApiProgressListener.kt
index 20b2d6224c..e044cc5a15 100644
--- a/core/src/main/java/com/vk/api/sdk/VKApiProgressListener.kt
+++ b/core/src/main/java/com/vk/api/sdk/VKApiProgressListener.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/VKApiResponseValidator.kt b/core/src/main/java/com/vk/api/sdk/VKApiResponseValidator.kt
index 5122aaebe5..ca25e1678b 100644
--- a/core/src/main/java/com/vk/api/sdk/VKApiResponseValidator.kt
+++ b/core/src/main/java/com/vk/api/sdk/VKApiResponseValidator.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 package com.vk.api.sdk
 
 import okhttp3.Headers
diff --git a/core/src/main/java/com/vk/api/sdk/VKApiValidationHandler.kt b/core/src/main/java/com/vk/api/sdk/VKApiValidationHandler.kt
index e6e8c1b8bd..fb60a1fdfc 100644
--- a/core/src/main/java/com/vk/api/sdk/VKApiValidationHandler.kt
+++ b/core/src/main/java/com/vk/api/sdk/VKApiValidationHandler.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
@@ -53,6 +26,7 @@ package com.vk.api.sdk
 
 import com.vk.api.sdk.exceptions.VKApiExecutionException
 import java.util.concurrent.CountDownLatch
+import java.util.concurrent.atomic.AtomicReference
 
 /**
  * Handler for api errors
@@ -76,15 +50,16 @@ interface VKApiValidationHandler {
     @Throws(VKApiExecutionException::class)
     fun tryToHandleException(ex: VKApiExecutionException, apiManager: VKApiManager): Unit = throw ex
 
-    open class Callback<T>(val latch: CountDownLatch) {
+    open class Callback<T>(val lock: ValidationLock) {
         @Volatile var value: T? = null
 
-        open fun cancel() = latch.countDown()
+        open fun cancel() = lock.release()
         open fun submit(value: T) {
             this.value = value
-            latch.countDown()
+            lock.release()
         }
     }
+
     class Credentials(val secret: String?, val token: String?, val uid: Int?) {
         val isValid = !token.isNullOrBlank()
 
@@ -92,4 +67,20 @@ interface VKApiValidationHandler {
             val EMPTY = Credentials("", "", null)
         }
     }
+
+    class ValidationLock {
+
+        private val latchRef = AtomicReference<CountDownLatch?>()
+
+        fun await() {
+            latchRef.get()?.await()
+        }
+
+        fun acquire(): Boolean =
+            latchRef.compareAndSet(null, CountDownLatch(1))
+
+        fun release() {
+            latchRef.getAndSet(null)?.countDown() ?: throw NullPointerException("Latch is null!")
+        }
+    }
 }
\ No newline at end of file
diff --git a/core/src/main/java/com/vk/api/sdk/VKDefaultValidationHandler.kt b/core/src/main/java/com/vk/api/sdk/VKDefaultValidationHandler.kt
index cf450bc04c..6e8204a2b6 100644
--- a/core/src/main/java/com/vk/api/sdk/VKDefaultValidationHandler.kt
+++ b/core/src/main/java/com/vk/api/sdk/VKDefaultValidationHandler.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/VKHost.kt b/core/src/main/java/com/vk/api/sdk/VKHost.kt
new file mode 100644
index 0000000000..baf1a12a5f
--- /dev/null
+++ b/core/src/main/java/com/vk/api/sdk/VKHost.kt
@@ -0,0 +1,26 @@
+package com.vk.api.sdk
+
+object VKHost {
+    private const val DEFAULT_HOST = "vk.com"
+
+    @Volatile
+    private var mutableHost = DEFAULT_HOST
+
+    @JvmStatic
+    val host: String get() = mutableHost
+
+    fun setHost(newHost: String) {
+        mutableHost = newHost
+    }
+
+    fun isDefault() = host == DEFAULT_HOST
+
+    fun allHosts(): ArrayList<String> {
+        val hosts = arrayListOf(host)
+        if (host != DEFAULT_HOST) {
+            hosts.add(DEFAULT_HOST)
+        }
+
+        return hosts
+    }
+}
\ No newline at end of file
diff --git a/core/src/main/java/com/vk/api/sdk/VKHttpPostCall.kt b/core/src/main/java/com/vk/api/sdk/VKHttpPostCall.kt
index c423d16e2c..af681399dd 100644
--- a/core/src/main/java/com/vk/api/sdk/VKHttpPostCall.kt
+++ b/core/src/main/java/com/vk/api/sdk/VKHttpPostCall.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/VKKeyValueStorage.kt b/core/src/main/java/com/vk/api/sdk/VKKeyValueStorage.kt
index 14337ec940..303411e13e 100644
--- a/core/src/main/java/com/vk/api/sdk/VKKeyValueStorage.kt
+++ b/core/src/main/java/com/vk/api/sdk/VKKeyValueStorage.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
@@ -98,4 +71,4 @@ class VKCachedKeyValueStorage(private val storage: VKKeyValueStorage): VKKeyValu
     }
 }
 
-fun VKKeyValueStorage.cached(): VKKeyValueStorage = VKCachedKeyValueStorage(this)
+fun VKKeyValueStorage.cached(): VKKeyValueStorage = VKCachedKeyValueStorage(this)
\ No newline at end of file
diff --git a/core/src/main/java/com/vk/api/sdk/VKMethodCall.kt b/core/src/main/java/com/vk/api/sdk/VKMethodCall.kt
index 108dfa34cc..4b2d2330d9 100644
--- a/core/src/main/java/com/vk/api/sdk/VKMethodCall.kt
+++ b/core/src/main/java/com/vk/api/sdk/VKMethodCall.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/VKOkHttpProvider.kt b/core/src/main/java/com/vk/api/sdk/VKOkHttpProvider.kt
index 9b2938e97b..be42d10043 100644
--- a/core/src/main/java/com/vk/api/sdk/VKOkHttpProvider.kt
+++ b/core/src/main/java/com/vk/api/sdk/VKOkHttpProvider.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/VKPreferencesKeyValueStorage.kt b/core/src/main/java/com/vk/api/sdk/VKPreferencesKeyValueStorage.kt
index 92330fc67a..77f4e8baee 100644
--- a/core/src/main/java/com/vk/api/sdk/VKPreferencesKeyValueStorage.kt
+++ b/core/src/main/java/com/vk/api/sdk/VKPreferencesKeyValueStorage.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/VKScheduler.kt b/core/src/main/java/com/vk/api/sdk/VKScheduler.kt
index ab3c0a9747..d8a0045ba8 100644
--- a/core/src/main/java/com/vk/api/sdk/VKScheduler.kt
+++ b/core/src/main/java/com/vk/api/sdk/VKScheduler.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 package com.vk.api.sdk
 
 import android.os.Handler
diff --git a/core/src/main/java/com/vk/api/sdk/VKTokenExpiredHandler.kt b/core/src/main/java/com/vk/api/sdk/VKTokenExpiredHandler.kt
index 7e17f1e739..db7b41af82 100644
--- a/core/src/main/java/com/vk/api/sdk/VKTokenExpiredHandler.kt
+++ b/core/src/main/java/com/vk/api/sdk/VKTokenExpiredHandler.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/VkResult.kt b/core/src/main/java/com/vk/api/sdk/VkResult.kt
index 28eaee6fcd..d162b3f7d2 100644
--- a/core/src/main/java/com/vk/api/sdk/VkResult.kt
+++ b/core/src/main/java/com/vk/api/sdk/VkResult.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/auth/VKAccessToken.kt b/core/src/main/java/com/vk/api/sdk/auth/VKAccessToken.kt
index a0531b4f5d..398a588f4b 100644
--- a/core/src/main/java/com/vk/api/sdk/auth/VKAccessToken.kt
+++ b/core/src/main/java/com/vk/api/sdk/auth/VKAccessToken.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
@@ -176,4 +149,4 @@ class VKAccessToken(params: Map<String, String?>) {
             else null
         }
     }
-}
+}
\ No newline at end of file
diff --git a/core/src/main/java/com/vk/api/sdk/auth/VKAuthCallback.kt b/core/src/main/java/com/vk/api/sdk/auth/VKAuthCallback.kt
index 4a735438dd..402a86d13b 100644
--- a/core/src/main/java/com/vk/api/sdk/auth/VKAuthCallback.kt
+++ b/core/src/main/java/com/vk/api/sdk/auth/VKAuthCallback.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/auth/VKAuthManager.kt b/core/src/main/java/com/vk/api/sdk/auth/VKAuthManager.kt
index f5b61bf3c7..882d33f697 100644
--- a/core/src/main/java/com/vk/api/sdk/auth/VKAuthManager.kt
+++ b/core/src/main/java/com/vk/api/sdk/auth/VKAuthManager.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/auth/VKAuthParams.kt b/core/src/main/java/com/vk/api/sdk/auth/VKAuthParams.kt
index c2a6853401..7cd6eed584 100644
--- a/core/src/main/java/com/vk/api/sdk/auth/VKAuthParams.kt
+++ b/core/src/main/java/com/vk/api/sdk/auth/VKAuthParams.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/auth/VKAuthResult.kt b/core/src/main/java/com/vk/api/sdk/auth/VKAuthResult.kt
index b305fbedad..8b6275e5c0 100644
--- a/core/src/main/java/com/vk/api/sdk/auth/VKAuthResult.kt
+++ b/core/src/main/java/com/vk/api/sdk/auth/VKAuthResult.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/auth/VKAuthResultContract.kt b/core/src/main/java/com/vk/api/sdk/auth/VKAuthResultContract.kt
index 2a7c4bdd7c..099c16e51e 100644
--- a/core/src/main/java/com/vk/api/sdk/auth/VKAuthResultContract.kt
+++ b/core/src/main/java/com/vk/api/sdk/auth/VKAuthResultContract.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 package com.vk.api.sdk.auth
 
 import android.app.Activity
diff --git a/core/src/main/java/com/vk/api/sdk/auth/VKAuthenticationResult.kt b/core/src/main/java/com/vk/api/sdk/auth/VKAuthenticationResult.kt
index e06c1691ae..000ab38510 100644
--- a/core/src/main/java/com/vk/api/sdk/auth/VKAuthenticationResult.kt
+++ b/core/src/main/java/com/vk/api/sdk/auth/VKAuthenticationResult.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 package com.vk.api.sdk.auth
 
 import com.vk.api.sdk.exceptions.VKAuthException
@@ -44,4 +17,4 @@ sealed class VKAuthenticationResult {
      * @param token contains main user info like user id, access token and etc
      */
     class Success(val token: VKAccessToken): VKAuthenticationResult()
-}
+}
\ No newline at end of file
diff --git a/core/src/main/java/com/vk/api/sdk/auth/VKScope.kt b/core/src/main/java/com/vk/api/sdk/auth/VKScope.kt
index d6a9ef47ac..efbe6bf412 100644
--- a/core/src/main/java/com/vk/api/sdk/auth/VKScope.kt
+++ b/core/src/main/java/com/vk/api/sdk/auth/VKScope.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/browser/BrowserDescriptor.java b/core/src/main/java/com/vk/api/sdk/browser/BrowserDescriptor.java
index d6830ec257..fe124e23fd 100644
--- a/core/src/main/java/com/vk/api/sdk/browser/BrowserDescriptor.java
+++ b/core/src/main/java/com/vk/api/sdk/browser/BrowserDescriptor.java
@@ -1,30 +1,3 @@
-/*
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*
  * Copyright 2016 The AppAuth for Android Authors. All Rights Reserved.
  *
diff --git a/core/src/main/java/com/vk/api/sdk/browser/BrowserMatcher.java b/core/src/main/java/com/vk/api/sdk/browser/BrowserMatcher.java
index a0b90d7f12..e5b5983c57 100644
--- a/core/src/main/java/com/vk/api/sdk/browser/BrowserMatcher.java
+++ b/core/src/main/java/com/vk/api/sdk/browser/BrowserMatcher.java
@@ -1,34 +1,7 @@
-/*
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 package com.vk.api.sdk.browser;
 
 import androidx.annotation.NonNull;
 
 public interface BrowserMatcher {
     boolean matches(@NonNull BrowserDescriptor descriptor);
-}
+}
\ No newline at end of file
diff --git a/core/src/main/java/com/vk/api/sdk/browser/BrowserSelector.java b/core/src/main/java/com/vk/api/sdk/browser/BrowserSelector.java
index 6e99c3832e..987e4df209 100644
--- a/core/src/main/java/com/vk/api/sdk/browser/BrowserSelector.java
+++ b/core/src/main/java/com/vk/api/sdk/browser/BrowserSelector.java
@@ -1,30 +1,3 @@
-/*
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*
  * Copyright 2015 The AppAuth for Android Authors. All Rights Reserved.
  *
diff --git a/core/src/main/java/com/vk/api/sdk/browser/Browsers.java b/core/src/main/java/com/vk/api/sdk/browser/Browsers.java
index 75a1bc7124..d78eb8c72e 100644
--- a/core/src/main/java/com/vk/api/sdk/browser/Browsers.java
+++ b/core/src/main/java/com/vk/api/sdk/browser/Browsers.java
@@ -1,30 +1,3 @@
-/*
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 package com.vk.api.sdk.browser;
 
 /*
diff --git a/core/src/main/java/com/vk/api/sdk/browser/DelimitedVersion.java b/core/src/main/java/com/vk/api/sdk/browser/DelimitedVersion.java
index 2e0bf1e458..ab0f3d2aaf 100644
--- a/core/src/main/java/com/vk/api/sdk/browser/DelimitedVersion.java
+++ b/core/src/main/java/com/vk/api/sdk/browser/DelimitedVersion.java
@@ -1,30 +1,3 @@
-/*
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*
  * Copyright 2016 The AppAuth for Android Authors. All Rights Reserved.
  *
diff --git a/core/src/main/java/com/vk/api/sdk/browser/VersionRange.java b/core/src/main/java/com/vk/api/sdk/browser/VersionRange.java
index dab7fcd7a4..ce08b4c05a 100644
--- a/core/src/main/java/com/vk/api/sdk/browser/VersionRange.java
+++ b/core/src/main/java/com/vk/api/sdk/browser/VersionRange.java
@@ -1,30 +1,3 @@
-/*
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*
  * Copyright 2016 The AppAuth for Android Authors. All Rights Reserved.
  *
diff --git a/core/src/main/java/com/vk/api/sdk/browser/VersionedBrowserMatcher.java b/core/src/main/java/com/vk/api/sdk/browser/VersionedBrowserMatcher.java
index 0ddd70be92..5798e911c3 100644
--- a/core/src/main/java/com/vk/api/sdk/browser/VersionedBrowserMatcher.java
+++ b/core/src/main/java/com/vk/api/sdk/browser/VersionedBrowserMatcher.java
@@ -1,31 +1,3 @@
-/*
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
-
 /*
  * Copyright 2016 The AppAuth for Android Authors. All Rights Reserved.
  *
diff --git a/core/src/main/java/com/vk/api/sdk/browser/WhiteListedBrowserHelper.java b/core/src/main/java/com/vk/api/sdk/browser/WhiteListedBrowserHelper.java
index 9131c70c24..2059174156 100644
--- a/core/src/main/java/com/vk/api/sdk/browser/WhiteListedBrowserHelper.java
+++ b/core/src/main/java/com/vk/api/sdk/browser/WhiteListedBrowserHelper.java
@@ -1,30 +1,3 @@
-/*
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 package com.vk.api.sdk.browser;
 
 import android.content.Context;
@@ -62,4 +35,4 @@ public static BrowserDescriptor selectBestBrowser(Context context) {
             return null;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/core/src/main/java/com/vk/api/sdk/chain/ApiMethodPriorityChainCall.kt b/core/src/main/java/com/vk/api/sdk/chain/ApiMethodPriorityChainCall.kt
index 93b0e9a0f3..3787e7fa30 100644
--- a/core/src/main/java/com/vk/api/sdk/chain/ApiMethodPriorityChainCall.kt
+++ b/core/src/main/java/com/vk/api/sdk/chain/ApiMethodPriorityChainCall.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 package com.vk.api.sdk.chain
 
 import com.vk.api.sdk.VKApiManager
diff --git a/core/src/main/java/com/vk/api/sdk/chain/ChainArgs.kt b/core/src/main/java/com/vk/api/sdk/chain/ChainArgs.kt
index d88ef5a73b..3a4d09ac03 100644
--- a/core/src/main/java/com/vk/api/sdk/chain/ChainArgs.kt
+++ b/core/src/main/java/com/vk/api/sdk/chain/ChainArgs.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/chain/ChainCall.kt b/core/src/main/java/com/vk/api/sdk/chain/ChainCall.kt
index e60dc74943..f34acf5cf7 100644
--- a/core/src/main/java/com/vk/api/sdk/chain/ChainCall.kt
+++ b/core/src/main/java/com/vk/api/sdk/chain/ChainCall.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/chain/HttpPostChainCall.kt b/core/src/main/java/com/vk/api/sdk/chain/HttpPostChainCall.kt
index 152a33f1af..9cc7c1093f 100644
--- a/core/src/main/java/com/vk/api/sdk/chain/HttpPostChainCall.kt
+++ b/core/src/main/java/com/vk/api/sdk/chain/HttpPostChainCall.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
@@ -51,8 +24,8 @@
 
 package com.vk.api.sdk.chain
 
+import com.vk.api.sdk.VKApiJSONResponseParser
 import com.vk.api.sdk.VKApiProgressListener
-import com.vk.api.sdk.VKApiResponseParser
 import com.vk.api.sdk.VKApiManager
 import com.vk.api.sdk.VKHttpPostCall
 import com.vk.api.sdk.exceptions.VKApiException
@@ -65,18 +38,19 @@ open class HttpPostChainCall<T>(manager: VKApiManager,
                            val okHttpExecutor: OkHttpExecutor,
                            val call: VKHttpPostCall,
                            val progressListener: VKApiProgressListener?,
-                           val parser: VKApiResponseParser<T>?) : ChainCall<T>(manager) {
+                           val parser: VKApiJSONResponseParser<T>?) : ChainCall<T>(manager) {
     @Throws(Exception::class)
     override fun call(args: ChainArgs): T? {
         val response = okHttpExecutor.execute(OkHttpPostCall(call), progressListener)
         return handleResponse(response)
     }
 
-    protected fun handleResponse(response: String?): T? {
+    protected fun handleResponse(methodResponse: OkHttpExecutor.ExecutorResponse): T? {
+        val jsonBody = methodResponse.responseBodyJson
         return when {
-            response == null -> throw VKApiException("Response returned null instead of valid string response")
-            response.hasSimpleError() -> throw response.toSimpleError("post")
-            else -> parser?.parse(response)
+            jsonBody == null -> throw VKApiException("Response returned null instead of valid string response")
+            jsonBody.hasSimpleError() -> throw jsonBody.toSimpleError("post")
+            else -> parser?.parse(jsonBody)
         }
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/com/vk/api/sdk/chain/InternalErrorRetryChainCall.kt b/core/src/main/java/com/vk/api/sdk/chain/InternalErrorRetryChainCall.kt
index ae1bb8de37..5d6444c953 100644
--- a/core/src/main/java/com/vk/api/sdk/chain/InternalErrorRetryChainCall.kt
+++ b/core/src/main/java/com/vk/api/sdk/chain/InternalErrorRetryChainCall.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/chain/InvalidCredentialsObserverChainCall.kt b/core/src/main/java/com/vk/api/sdk/chain/InvalidCredentialsObserverChainCall.kt
index 60d34032e1..58ada4e4f5 100644
--- a/core/src/main/java/com/vk/api/sdk/chain/InvalidCredentialsObserverChainCall.kt
+++ b/core/src/main/java/com/vk/api/sdk/chain/InvalidCredentialsObserverChainCall.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/chain/MethodChainCall.kt b/core/src/main/java/com/vk/api/sdk/chain/MethodChainCall.kt
index b2476ad858..e9deaacd7b 100644
--- a/core/src/main/java/com/vk/api/sdk/chain/MethodChainCall.kt
+++ b/core/src/main/java/com/vk/api/sdk/chain/MethodChainCall.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
@@ -51,8 +24,8 @@
 
 package com.vk.api.sdk.chain
 
+import com.vk.api.sdk.VKApiJSONResponseParser
 import com.vk.api.sdk.VKApiManager
-import com.vk.api.sdk.VKApiResponseParser
 import com.vk.api.sdk.exceptions.VKApiCodes
 import com.vk.api.sdk.exceptions.VKApiException
 import com.vk.api.sdk.okhttp.OkHttpExecutor
@@ -69,7 +42,7 @@ open class MethodChainCall<T>(
         val callBuilder: OkHttpMethodCall.Builder,
         var defaultDeviceId: String,
         val defaultLang: String,
-        val parser: VKApiResponseParser<T>?) : ChainCall<T>(manager) {
+        val parser: VKApiJSONResponseParser<T>?) : ChainCall<T>(manager) {
 
     private val responseValidator = manager.config.responseValidator
 
@@ -105,22 +78,26 @@ open class MethodChainCall<T>(
     }
 
     fun parseResult(
-        methodResponse: OkHttpExecutor.MethodResponse,
+        methodResponse: OkHttpExecutor.ExecutorResponse,
         methodName: String,
         extended: Boolean,
         ignoredExecuteErrors: IntArray?
     ): T? {
-        val response = methodResponse.response
+        val jsonBody = methodResponse.responseBodyJson ?: throw VKApiException("Response returned null instead of valid string response")
         return when {
-            response == null -> throw VKApiException("Response returned null instead of valid string response")
-            response.hasSimpleError() -> throw response.toSimpleError(methodName, methodResponse.executorRequestAccessToken)
-            response.hasExecuteError(ignoredExecuteErrors) -> throw response.toExecuteError(methodName, ignoredExecuteErrors)
-            else -> {
-                try {
-                    responseValidator?.value?.validateResponse(methodName, extended, response, methodResponse.headers)
-                } catch (ignore: Throwable) {}
+            jsonBody.hasSimpleError() -> jsonBody.toSimpleError(methodName, methodResponse.executorRequestAccessToken)
+            jsonBody.hasExecuteError(ignoredExecuteErrors) -> jsonBody.toExecuteError(methodName, ignoredExecuteErrors)
+            else -> null
+        }.let { executeEx ->
+            when (executeEx) {
+                null -> {
+                    try {
+                        responseValidator?.value?.validateResponse(methodName, extended, jsonBody.toString(), methodResponse.headers)
+                    } catch (ignore: Throwable) {}
 
-                parser?.parse(response)
+                    parser?.parse(jsonBody)
+                }
+                else -> throw executeEx
             }
         }
     }
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
index 5665dc470a..960582296b 100644
--- a/core/src/main/java/com/vk/api/sdk/chain/RateLimitReachedChainCall.kt
+++ b/core/src/main/java/com/vk/api/sdk/chain/RateLimitReachedChainCall.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 package com.vk.api.sdk.chain
 
 import android.content.Context
diff --git a/core/src/main/java/com/vk/api/sdk/chain/RetryChainCall.kt b/core/src/main/java/com/vk/api/sdk/chain/RetryChainCall.kt
index f09f4fb739..deaaa8a155 100644
--- a/core/src/main/java/com/vk/api/sdk/chain/RetryChainCall.kt
+++ b/core/src/main/java/com/vk/api/sdk/chain/RetryChainCall.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 package com.vk.api.sdk.chain
 
 import com.vk.api.sdk.VKApiManager
diff --git a/core/src/main/java/com/vk/api/sdk/chain/TooManyRequestRetryChainCall.kt b/core/src/main/java/com/vk/api/sdk/chain/TooManyRequestRetryChainCall.kt
index e592fbed74..3a660b60c5 100644
--- a/core/src/main/java/com/vk/api/sdk/chain/TooManyRequestRetryChainCall.kt
+++ b/core/src/main/java/com/vk/api/sdk/chain/TooManyRequestRetryChainCall.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/chain/ValidationHandlerChainCall.kt b/core/src/main/java/com/vk/api/sdk/chain/ValidationHandlerChainCall.kt
index 6d3043be4a..d97e33daf2 100644
--- a/core/src/main/java/com/vk/api/sdk/chain/ValidationHandlerChainCall.kt
+++ b/core/src/main/java/com/vk/api/sdk/chain/ValidationHandlerChainCall.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
@@ -57,11 +30,17 @@ import com.vk.api.sdk.exceptions.VKApiException
 import com.vk.api.sdk.exceptions.VKApiExecutionException
 import java.util.concurrent.CountDownLatch
 
-class ValidationHandlerChainCall<T>(manager: VKApiManager, retryLimit: Int, val chain: ChainCall<T>) : RetryChainCall<T>(manager, retryLimit) {
+class ValidationHandlerChainCall<T>(
+    manager: VKApiManager,
+    retryLimit: Int,
+    val chain: ChainCall<T>,
+    private val validationLock: VKApiValidationHandler.ValidationLock
+) : RetryChainCall<T>(manager, retryLimit) {
     @Throws(Exception::class)
     override fun call(args: ChainArgs): T? {
         for (i in 0..retryLimit) {
             try {
+                validationLock.await()
                 return chain.call(args)
             } catch (ex: VKApiExecutionException) {
                 handleException(ex, args)
@@ -118,11 +97,13 @@ class ValidationHandlerChainCall<T>(manager: VKApiManager, retryLimit: Int, val
     }
 
     protected fun <T, H> awaitValidation(extra: String, handler: H?, handlerMethod: H.(String, VKApiValidationHandler.Callback<T>) -> Unit): T? {
-        handler ?: return null
-        val latch = CountDownLatch(1)
-        val callback = VKApiValidationHandler.Callback<T>(latch)
+        if (handler == null || !validationLock.acquire()) {
+            return null
+        }
+
+        val callback = VKApiValidationHandler.Callback<T>(validationLock)
         handler.handlerMethod(extra, callback)
-        latch.await()
+        validationLock.await()
         return callback.value
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/com/vk/api/sdk/exceptions/IgnoredAccessTokenException.kt b/core/src/main/java/com/vk/api/sdk/exceptions/IgnoredAccessTokenException.kt
index 2a2cff0def..812f331ba1 100644
--- a/core/src/main/java/com/vk/api/sdk/exceptions/IgnoredAccessTokenException.kt
+++ b/core/src/main/java/com/vk/api/sdk/exceptions/IgnoredAccessTokenException.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 package com.vk.api.sdk.exceptions
 
 class IgnoredAccessTokenException(method: String) : VKApiExecutionException(
diff --git a/core/src/main/java/com/vk/api/sdk/exceptions/RateLimitReachedException.kt b/core/src/main/java/com/vk/api/sdk/exceptions/RateLimitReachedException.kt
index 0bd4fd330d..f22bfa74fa 100644
--- a/core/src/main/java/com/vk/api/sdk/exceptions/RateLimitReachedException.kt
+++ b/core/src/main/java/com/vk/api/sdk/exceptions/RateLimitReachedException.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 package com.vk.api.sdk.exceptions
 
 class RateLimitReachedException(method: String, message: String): VKApiExecutionException(
diff --git a/core/src/main/java/com/vk/api/sdk/exceptions/VKApiCodes.kt b/core/src/main/java/com/vk/api/sdk/exceptions/VKApiCodes.kt
index f08f96b763..1e5686b44b 100644
--- a/core/src/main/java/com/vk/api/sdk/exceptions/VKApiCodes.kt
+++ b/core/src/main/java/com/vk/api/sdk/exceptions/VKApiCodes.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
@@ -53,6 +26,7 @@ package com.vk.api.sdk.exceptions
 
 object VKApiCodes {
     const val CODE_COMPOSITE_EXECUTE_ERROR = Int.MIN_VALUE
+    const val CODE_MALFORMED_RESPONSE = -3
     const val CODE_IGNORED_ACCESS_TOKEN = -2
     const val CODE_IO_ERROR = -1
     const val CODE_UNKNOWN_ERROR = 1
diff --git a/core/src/main/java/com/vk/api/sdk/exceptions/VKApiException.kt b/core/src/main/java/com/vk/api/sdk/exceptions/VKApiException.kt
index 770d82e0d7..229c9be86f 100644
--- a/core/src/main/java/com/vk/api/sdk/exceptions/VKApiException.kt
+++ b/core/src/main/java/com/vk/api/sdk/exceptions/VKApiException.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/exceptions/VKApiExecutionException.kt b/core/src/main/java/com/vk/api/sdk/exceptions/VKApiExecutionException.kt
index bd301c9752..85c8b58d6e 100644
--- a/core/src/main/java/com/vk/api/sdk/exceptions/VKApiExecutionException.kt
+++ b/core/src/main/java/com/vk/api/sdk/exceptions/VKApiExecutionException.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/exceptions/VKApiIllegalResponseException.kt b/core/src/main/java/com/vk/api/sdk/exceptions/VKApiIllegalResponseException.kt
index 01eff4ce14..c12caaa535 100644
--- a/core/src/main/java/com/vk/api/sdk/exceptions/VKApiIllegalResponseException.kt
+++ b/core/src/main/java/com/vk/api/sdk/exceptions/VKApiIllegalResponseException.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/exceptions/VKAuthException.kt b/core/src/main/java/com/vk/api/sdk/exceptions/VKAuthException.kt
index 1509ec2d1b..db28ec82ff 100644
--- a/core/src/main/java/com/vk/api/sdk/exceptions/VKAuthException.kt
+++ b/core/src/main/java/com/vk/api/sdk/exceptions/VKAuthException.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 package com.vk.api.sdk.exceptions
 
 /**
diff --git a/core/src/main/java/com/vk/api/sdk/exceptions/VKInternalServerErrorException.kt b/core/src/main/java/com/vk/api/sdk/exceptions/VKInternalServerErrorException.kt
index 55df9d28d2..20e3db3535 100644
--- a/core/src/main/java/com/vk/api/sdk/exceptions/VKInternalServerErrorException.kt
+++ b/core/src/main/java/com/vk/api/sdk/exceptions/VKInternalServerErrorException.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/exceptions/VKLargeEntityException.kt b/core/src/main/java/com/vk/api/sdk/exceptions/VKLargeEntityException.kt
index c868d1e4fa..44a1e5c21c 100644
--- a/core/src/main/java/com/vk/api/sdk/exceptions/VKLargeEntityException.kt
+++ b/core/src/main/java/com/vk/api/sdk/exceptions/VKLargeEntityException.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/exceptions/VKLocalIOException.kt b/core/src/main/java/com/vk/api/sdk/exceptions/VKLocalIOException.kt
index bf7eba79d2..12105bb85f 100644
--- a/core/src/main/java/com/vk/api/sdk/exceptions/VKLocalIOException.kt
+++ b/core/src/main/java/com/vk/api/sdk/exceptions/VKLocalIOException.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
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
index c94bf744e9..6cb07674f8 100644
--- a/core/src/main/java/com/vk/api/sdk/extensions/ContextExt.kt
+++ b/core/src/main/java/com/vk/api/sdk/extensions/ContextExt.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 package com.vk.api.sdk.extensions
 
 import android.app.Activity
diff --git a/core/src/main/java/com/vk/api/sdk/extensions/InputStreamExt.kt b/core/src/main/java/com/vk/api/sdk/extensions/InputStreamExt.kt
new file mode 100644
index 0000000000..b3cf7a395b
--- /dev/null
+++ b/core/src/main/java/com/vk/api/sdk/extensions/InputStreamExt.kt
@@ -0,0 +1,13 @@
+package com.vk.api.sdk.extensions
+
+import okio.buffer
+import okio.source
+import java.io.InputStream
+import java.nio.charset.Charset
+
+fun InputStream.readString(charset: Charset = Charsets.UTF_8): String =
+    use { stream ->
+        stream.source().buffer().use { source ->
+            source.readString(charset)
+        }
+    }
\ No newline at end of file
diff --git a/core/src/main/java/com/vk/api/sdk/internal/ApiCommand.kt b/core/src/main/java/com/vk/api/sdk/internal/ApiCommand.kt
index d45f590354..95c1661dce 100644
--- a/core/src/main/java/com/vk/api/sdk/internal/ApiCommand.kt
+++ b/core/src/main/java/com/vk/api/sdk/internal/ApiCommand.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/internal/HttpMultipartEntry.kt b/core/src/main/java/com/vk/api/sdk/internal/HttpMultipartEntry.kt
index 9e6b4947f6..7c1d904ded 100644
--- a/core/src/main/java/com/vk/api/sdk/internal/HttpMultipartEntry.kt
+++ b/core/src/main/java/com/vk/api/sdk/internal/HttpMultipartEntry.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/internal/HttpStatus.kt b/core/src/main/java/com/vk/api/sdk/internal/HttpStatus.kt
index b99e3b9f2f..de7ff799ac 100644
--- a/core/src/main/java/com/vk/api/sdk/internal/HttpStatus.kt
+++ b/core/src/main/java/com/vk/api/sdk/internal/HttpStatus.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/internal/JsonUtils.kt b/core/src/main/java/com/vk/api/sdk/internal/JsonUtils.kt
index 90d057d15a..14274322b0 100644
--- a/core/src/main/java/com/vk/api/sdk/internal/JsonUtils.kt
+++ b/core/src/main/java/com/vk/api/sdk/internal/JsonUtils.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 package com.vk.api.sdk.internal
 
 import android.util.JsonReader
diff --git a/core/src/main/java/com/vk/api/sdk/internal/QueryStringGenerator.kt b/core/src/main/java/com/vk/api/sdk/internal/QueryStringGenerator.kt
index 7c9d964ca7..ae99662b24 100644
--- a/core/src/main/java/com/vk/api/sdk/internal/QueryStringGenerator.kt
+++ b/core/src/main/java/com/vk/api/sdk/internal/QueryStringGenerator.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/internal/VKErrorUtils.kt b/core/src/main/java/com/vk/api/sdk/internal/VKErrorUtils.kt
index 6ad3456491..f8b139d709 100644
--- a/core/src/main/java/com/vk/api/sdk/internal/VKErrorUtils.kt
+++ b/core/src/main/java/com/vk/api/sdk/internal/VKErrorUtils.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
@@ -62,11 +35,11 @@ import org.json.JSONObject
 
 object VKErrorUtils {
 
-    fun hasSimpleError(response: String) = JsonUtils.containsElement(response, VKApiCodes.PARAM_ERROR)
+    fun hasSimpleError(response: JSONObject) = response.has(VKApiCodes.PARAM_ERROR)
 
-    fun hasExecuteError(response: String, ignoreErrors: IntArray?)
+    fun hasExecuteError(response: JSONObject, ignoreErrors: IntArray?)
         = when {
-            !JsonUtils.containsElement(response, "execute_errors") -> false
+            !response.has("execute_errors") -> false
             ignoreErrors == null -> true
             else -> {
                 val errors = executeErrorsSet(response)
@@ -75,10 +48,9 @@ object VKErrorUtils {
             }
         }
 
-    private fun executeErrorsSet(jsonString: String): MutableSet<Int> {
+    private fun executeErrorsSet(json: JSONObject): MutableSet<Int> {
         val set = HashSet<Int>()
-        val jo = JSONObject(jsonString)
-        val jaErrors = jo.getJSONArray(VKApiCodes.PARAM_EXECUTE_ERRORS)
+        val jaErrors = json.getJSONArray(VKApiCodes.PARAM_EXECUTE_ERRORS)
         for (i in 0 until jaErrors.length()) {
             set.add(jaErrors.getJSONObject(i).getInt(VKApiCodes.PARAM_ERROR_CODE))
         }
@@ -137,8 +109,8 @@ object VKErrorUtils {
         }
     }
 
-    fun parseExecuteError(response: String, method: String, ignoredErrors: IntArray?) =
-            parseExecuteError(JSONObject(response).getJSONArray(VKApiCodes.PARAM_EXECUTE_ERRORS), method, ignoredErrors)
+    fun parseExecuteError(response: JSONObject, method: String, ignoredErrors: IntArray?) =
+            parseExecuteError(response.getJSONArray(VKApiCodes.PARAM_EXECUTE_ERRORS), method, ignoredErrors)
 
     private fun parseExecuteError(errorsJson: JSONArray, method: String, ignoredErrors: IntArray?): VKApiException {
         try {
@@ -179,4 +151,4 @@ object VKErrorUtils {
             return VKApiIllegalResponseException(e)
         }
     }
-}
+}
\ No newline at end of file
diff --git a/core/src/main/java/com/vk/api/sdk/internal/VKInitProvider.kt b/core/src/main/java/com/vk/api/sdk/internal/VKInitProvider.kt
index 4b98e94ff3..13b9c5c1c6 100644
--- a/core/src/main/java/com/vk/api/sdk/internal/VKInitProvider.kt
+++ b/core/src/main/java/com/vk/api/sdk/internal/VKInitProvider.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 package com.vk.api.sdk.internal
 
 import android.content.ContentProvider
diff --git a/core/src/main/java/com/vk/api/sdk/internal/Validation.kt b/core/src/main/java/com/vk/api/sdk/internal/Validation.kt
index 398211c744..8da3732023 100644
--- a/core/src/main/java/com/vk/api/sdk/internal/Validation.kt
+++ b/core/src/main/java/com/vk/api/sdk/internal/Validation.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/listeners/ApiCallListener.kt b/core/src/main/java/com/vk/api/sdk/listeners/ApiCallListener.kt
new file mode 100644
index 0000000000..565934de55
--- /dev/null
+++ b/core/src/main/java/com/vk/api/sdk/listeners/ApiCallListener.kt
@@ -0,0 +1,11 @@
+package com.vk.api.sdk.listeners
+
+interface ApiCallListener {
+    fun onApiCallStart(reqId: Long, url: String) {}
+    fun onApiCallSuccess(reqId: Long) {}
+    fun onApiCallFailed(reqId: Long, throwable: Throwable) {}
+
+    companion object {
+        val EMPTY = object : ApiCallListener {}
+    }
+}
\ No newline at end of file
diff --git a/core/src/main/java/com/vk/api/sdk/listeners/CompositeRequestEventListener.kt b/core/src/main/java/com/vk/api/sdk/listeners/CompositeRequestEventListener.kt
new file mode 100644
index 0000000000..ea1f642e32
--- /dev/null
+++ b/core/src/main/java/com/vk/api/sdk/listeners/CompositeRequestEventListener.kt
@@ -0,0 +1,36 @@
+package com.vk.api.sdk.listeners
+
+class CompositeRequestEventListener : ApiCallListener {
+
+    private val listOfListeners = mutableListOf<ApiCallListener>()
+
+    fun addListener(listener: ApiCallListener){
+        listOfListeners.add(listener)
+    }
+
+    fun addListeners(listener: Iterable<ApiCallListener>){
+        listOfListeners.addAll(listener)
+    }
+
+    fun clear(){
+        listOfListeners.clear()
+    }
+
+    override fun onApiCallStart(reqId: Long, url: String) {
+        listOfListeners.forEach { listener ->
+            listener.onApiCallStart(reqId = reqId, url = url)
+        }
+    }
+
+    override fun onApiCallSuccess(reqId: Long) {
+        listOfListeners.forEach { listener ->
+            listener.onApiCallSuccess(reqId = reqId)
+        }
+    }
+
+    override fun onApiCallFailed(reqId: Long, throwable: Throwable) {
+        listOfListeners.forEach { listener ->
+            listener.onApiCallFailed(reqId = reqId, throwable = throwable)
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/src/main/java/com/vk/api/sdk/okhttp/FileFullRequestBody.kt b/core/src/main/java/com/vk/api/sdk/okhttp/FileFullRequestBody.kt
index ffc352e303..51dbdcfe12 100644
--- a/core/src/main/java/com/vk/api/sdk/okhttp/FileFullRequestBody.kt
+++ b/core/src/main/java/com/vk/api/sdk/okhttp/FileFullRequestBody.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/okhttp/LogLevelRequestTag.kt b/core/src/main/java/com/vk/api/sdk/okhttp/LogLevelRequestTag.kt
index f09de527bf..7d36e41760 100644
--- a/core/src/main/java/com/vk/api/sdk/okhttp/LogLevelRequestTag.kt
+++ b/core/src/main/java/com/vk/api/sdk/okhttp/LogLevelRequestTag.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/okhttp/LoggingInterceptor.kt b/core/src/main/java/com/vk/api/sdk/okhttp/LoggingInterceptor.kt
index 8d8c41fdf1..4ffa33f8d7 100644
--- a/core/src/main/java/com/vk/api/sdk/okhttp/LoggingInterceptor.kt
+++ b/core/src/main/java/com/vk/api/sdk/okhttp/LoggingInterceptor.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/okhttp/OkHttpExecutor.kt b/core/src/main/java/com/vk/api/sdk/okhttp/OkHttpExecutor.kt
index ff2315d863..407e5e8181 100644
--- a/core/src/main/java/com/vk/api/sdk/okhttp/OkHttpExecutor.kt
+++ b/core/src/main/java/com/vk/api/sdk/okhttp/OkHttpExecutor.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
@@ -52,8 +25,10 @@ package com.vk.api.sdk.okhttp
 
 import android.net.Uri
 import android.os.Looper
+import com.vk.api.sdk.VKApiConfig
 import com.vk.api.sdk.VKApiCredentials
 import com.vk.api.sdk.VKApiProgressListener
+import com.vk.api.sdk.VKHost
 import com.vk.api.sdk.VKOkHttpProvider
 import com.vk.api.sdk.exceptions.*
 import com.vk.api.sdk.internal.HttpMultipartEntry
@@ -63,7 +38,9 @@ import okhttp3.*
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.RequestBody.Companion.toRequestBody
+import org.json.JSONObject
 import java.io.IOException
+import java.io.InputStream
 import java.net.HttpURLConnection.HTTP_ENTITY_TOO_LARGE
 import java.net.URLEncoder
 
@@ -106,7 +83,7 @@ open class OkHttpExecutor(protected val config: OkHttpExecutorConfig) {
     }
 
     @Throws(InterruptedException::class, IOException::class, VKApiException::class)
-    open fun execute(call: OkHttpMethodCall): MethodResponse {
+    open fun execute(call: OkHttpMethodCall): ExecutorResponse {
 
         val actualAccessToken = getActualAccessToken(call)
 
@@ -135,11 +112,11 @@ open class OkHttpExecutor(protected val config: OkHttpExecutorConfig) {
         val request = requestBuilder.build()
         val executorAccessToken = accessToken
         val okHttpResponse = executeRequest(request)
-        return MethodResponse(readResponse(okHttpResponse), okHttpResponse.headers, executorAccessToken)
+        return ExecutorResponse(readResponse(okHttpResponse), okHttpResponse.headers, executorAccessToken)
     }
 
     @Throws(InterruptedException::class, IOException::class, VKApiException::class)
-    fun execute(call: OkHttpPostCall, progressListener: VKApiProgressListener?): String? {
+    fun execute(call: OkHttpPostCall, progressListener: VKApiProgressListener?): ExecutorResponse {
         val body = if (call.isMultipart) {
             MultipartBody.Builder()
                 .setType(MultipartBody.FORM)
@@ -159,8 +136,8 @@ open class OkHttpExecutor(protected val config: OkHttpExecutorConfig) {
         val requestBody = ProgressRequestBody(body, progressListener)
 
         val request = makePostCallRequestBuilder(call, requestBody).build()
-
-        return readResponse(executeRequest(request))
+        val response = executeRequest(request)
+        return ExecutorResponse(readResponse(response), response.headers)
     }
 
     protected open fun makePostCallRequestBuilder(call: OkHttpPostCall, requestBody: RequestBody): Request.Builder {
@@ -173,7 +150,7 @@ open class OkHttpExecutor(protected val config: OkHttpExecutorConfig) {
     @Throws(VKApiException::class)
     protected fun validateQueryString(call: OkHttpMethodCall, paramsString: String): String {
         if (call.method.startsWith("execute.")) {
-            val uri = Uri.parse("https://vk.com/?$paramsString")
+            val uri = Uri.parse("https://${VKHost.host}/?$paramsString")
             if (uri.getQueryParameters("method").contains("execute")
                     && !uri.getQueryParameters("code").isNullOrEmpty()) {
                 throw VKApiExecutionException(
@@ -192,16 +169,21 @@ open class OkHttpExecutor(protected val config: OkHttpExecutorConfig) {
         return okHttpProvider.getClient().newCall(request).execute()
     }
 
-    fun readResponse(response: Response): String? {
+    fun readResponse(response: Response): JSONObject? {
         if (response.code == HTTP_ENTITY_TOO_LARGE) {
             throw VKLargeEntityException(response.message)
         }
-
-        val body = response.body?.use { it.string() }
         if (response.code in 500..599) {
-            throw VKInternalServerErrorException(response.code, body ?: "null")
+            throw VKInternalServerErrorException(response.code, response.body?.use { it.string() } ?: "null")
+        }
+
+        return response.body?.byteStream()?.let { inputStream ->
+            config.responseBodyJsonConverter.convertResponse(
+                inputStream,
+                response.headers["content-type"],
+                path = response.request.url.encodedPath
+            )
         }
-        return body
     }
 
     protected open fun getActualAccessToken(call: OkHttpMethodCall): String? = accessToken
@@ -232,10 +214,11 @@ open class OkHttpExecutor(protected val config: OkHttpExecutorConfig) {
         return this
     }
 
-    private fun resolveEndpoint(host: String) = if (customEndpoint.isNotEmpty()) {
-        customEndpoint
-    } else {
-        defaultApiEndpoint(host)
+    private fun resolveEndpoint(host: String): String {
+        if (customEndpoint.isEmpty() || customEndpoint == VKApiConfig.DEFAULT_API_ENDPOINT) {
+            return defaultApiEndpoint(host)
+        }
+        return customEndpoint
     }
 
     private fun updateClient(provider: VKOkHttpProvider) {
@@ -261,10 +244,11 @@ open class OkHttpExecutor(protected val config: OkHttpExecutorConfig) {
         return URLEncoder.encode(fileName.replace("\"", "\\\""), UTF_8)
     }
 
-    data class MethodResponse(
-            val response: String?,
-            val headers: Headers,
-            val executorRequestAccessToken: String?)
+    data class ExecutorResponse(
+        val responseBodyJson: JSONObject?,
+        val headers: Headers,
+        val executorRequestAccessToken: String? = null
+    )
 
     companion object {
         const val MIME_APPLICATION: String = "application/x-www-form-urlencoded; charset=utf-8"
diff --git a/core/src/main/java/com/vk/api/sdk/okhttp/OkHttpExecutorConfig.kt b/core/src/main/java/com/vk/api/sdk/okhttp/OkHttpExecutorConfig.kt
index 79cc3d8a8a..4f98f41f86 100644
--- a/core/src/main/java/com/vk/api/sdk/okhttp/OkHttpExecutorConfig.kt
+++ b/core/src/main/java/com/vk/api/sdk/okhttp/OkHttpExecutorConfig.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
@@ -54,6 +27,7 @@ import android.content.Context
 import com.vk.api.sdk.VKApiConfig
 import com.vk.api.sdk.VKOkHttpProvider
 import com.vk.api.sdk.internal.Validation
+import com.vk.api.sdk.response.ResponseBodyJsonConverter
 import com.vk.api.sdk.utils.log.Logger
 
 @Suppress("ConvertSecondaryConstructorToPrimary")
@@ -63,7 +37,7 @@ class OkHttpExecutorConfig(private val apiConfig: VKApiConfig) {
     val appId: Int
         get() = apiConfig.appId
     val hostProvider: () -> String
-        get() = apiConfig.httpApiHostProvider
+        get() = apiConfig.apiHostProvider
     val accessToken: String
         get() = apiConfig.accessToken.value
     val secret: String?
@@ -77,7 +51,9 @@ class OkHttpExecutorConfig(private val apiConfig: VKApiConfig) {
     val loggingPrefixer: LoggingPrefixer
         get() = apiConfig.loggingPrefixer
     val customEndpoint: String
-        get() = apiConfig.customApiEndpoint.value
+        get() = apiConfig.customApiEndpoint()
+    val responseBodyJsonConverter: ResponseBodyJsonConverter
+        get() = apiConfig.responseBodyJsonConverter
 
     init {
         Validation.assertContextValid(context)
diff --git a/core/src/main/java/com/vk/api/sdk/okhttp/OkHttpMethodCall.kt b/core/src/main/java/com/vk/api/sdk/okhttp/OkHttpMethodCall.kt
index 7245c5d7ee..938bf5f6e7 100644
--- a/core/src/main/java/com/vk/api/sdk/okhttp/OkHttpMethodCall.kt
+++ b/core/src/main/java/com/vk/api/sdk/okhttp/OkHttpMethodCall.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/okhttp/OkHttpPostCall.kt b/core/src/main/java/com/vk/api/sdk/okhttp/OkHttpPostCall.kt
index 38454ef1af..34b1cafad9 100644
--- a/core/src/main/java/com/vk/api/sdk/okhttp/OkHttpPostCall.kt
+++ b/core/src/main/java/com/vk/api/sdk/okhttp/OkHttpPostCall.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/okhttp/ProgressRequestBody.kt b/core/src/main/java/com/vk/api/sdk/okhttp/ProgressRequestBody.kt
index 182c4fa679..714d60cb8a 100644
--- a/core/src/main/java/com/vk/api/sdk/okhttp/ProgressRequestBody.kt
+++ b/core/src/main/java/com/vk/api/sdk/okhttp/ProgressRequestBody.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/okhttp/RequestTag.kt b/core/src/main/java/com/vk/api/sdk/okhttp/RequestTag.kt
index e2584ea2f2..c7df453273 100644
--- a/core/src/main/java/com/vk/api/sdk/okhttp/RequestTag.kt
+++ b/core/src/main/java/com/vk/api/sdk/okhttp/RequestTag.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/okhttp/UserAgentInterceptor.kt b/core/src/main/java/com/vk/api/sdk/okhttp/UserAgentInterceptor.kt
index e414ee287c..86e864f585 100644
--- a/core/src/main/java/com/vk/api/sdk/okhttp/UserAgentInterceptor.kt
+++ b/core/src/main/java/com/vk/api/sdk/okhttp/UserAgentInterceptor.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 package com.vk.api.sdk.okhttp
 
 import com.vk.api.sdk.utils.UserAgentProvider
diff --git a/core/src/main/java/com/vk/api/sdk/requests/VKBooleanRequest.kt b/core/src/main/java/com/vk/api/sdk/requests/VKBooleanRequest.kt
index 424a84c9e2..790b05b36a 100644
--- a/core/src/main/java/com/vk/api/sdk/requests/VKBooleanRequest.kt
+++ b/core/src/main/java/com/vk/api/sdk/requests/VKBooleanRequest.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
@@ -57,5 +30,5 @@ import org.json.JSONObject
  * If you don't need any response you can use this class
  */
 open class VKBooleanRequest(method: String): VKRequest<Boolean>(method) {
-    override fun parse(r: JSONObject) = true
+    override fun parse(responseJson: JSONObject) = true
 }
\ No newline at end of file
diff --git a/core/src/main/java/com/vk/api/sdk/requests/VKRequest.kt b/core/src/main/java/com/vk/api/sdk/requests/VKRequest.kt
index fae1dab50f..f8a6c97d84 100644
--- a/core/src/main/java/com/vk/api/sdk/requests/VKRequest.kt
+++ b/core/src/main/java/com/vk/api/sdk/requests/VKRequest.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
@@ -51,9 +24,10 @@
 
 package com.vk.api.sdk.requests
 
+import android.util.Log
 import com.vk.api.sdk.VKApiConfig
+import com.vk.api.sdk.VKApiJSONResponseParser
 import com.vk.api.sdk.VKApiManager
-import com.vk.api.sdk.VKApiResponseParser
 import com.vk.api.sdk.VKMethodCall
 import com.vk.api.sdk.exceptions.VKApiException
 import com.vk.api.sdk.exceptions.VKApiExecutionException
@@ -69,7 +43,7 @@ import java.util.*
  * Use sdk sample as an example
  * If you need more flexibility, use ApiCommand
  */
-open class VKRequest<T>(var method: String, val requestApiVersion: String? = null) : VKApiResponseParser<T>, ApiCommand<T>() {
+open class VKRequest<T>(var method: String, val requestApiVersion: String? = null) : VKApiJSONResponseParser<T>, ApiCommand<T>() {
 
     @Volatile
     protected var allowNoAuth: Boolean = false
@@ -93,23 +67,13 @@ open class VKRequest<T>(var method: String, val requestApiVersion: String? = nul
     fun addParam(name: String, value: UserId?) = apply { if (value != null) params[name] = value.value.toString() }
     fun addParam(name: CharSequence, values: List<UserId>) = addParam(name.toString(), values.joinToString(",", transform = { it.value.toString() }))
 
-    @Throws(VKApiException::class)
-    override fun parse(response: String): T {
-        try {
-            return parse(JSONObject(response))
-        } catch (e: Throwable) {
-            throw VKApiExecutionException(ERROR_MALFORMED_RESPONSE, method, true,
-                    "[$method] ${e.localizedMessage}")
-        }
-    }
-
     /**
      * The method you need to override to implement response parsing
      */
     @Suppress("UNCHECKED_CAST")
-    @Throws(Exception::class)
-    open fun parse(r: JSONObject): T {
-        return r as T
+    @Throws(Exception::class, VKApiExecutionException::class)
+    override fun parse(responseJson: JSONObject): T {
+        return responseJson as T
     }
 
     @Throws(InterruptedException::class, IOException::class, VKApiException::class)
diff --git a/core/src/main/java/com/vk/api/sdk/response/DefaultJsonResponseConverter.kt b/core/src/main/java/com/vk/api/sdk/response/DefaultJsonResponseConverter.kt
new file mode 100644
index 0000000000..8494bb05a5
--- /dev/null
+++ b/core/src/main/java/com/vk/api/sdk/response/DefaultJsonResponseConverter.kt
@@ -0,0 +1,26 @@
+package com.vk.api.sdk.response
+
+import com.vk.api.sdk.extensions.readString
+import org.json.JSONObject
+import org.json.JSONTokener
+import java.io.InputStream
+
+/**
+ * Default json format deserializer
+ */
+internal class DefaultJsonResponseConverter : JsonResponseTypeConverter {
+
+    override fun isSuitableForContentType(contentType: String): Boolean =
+        contentType.contains("application/json", ignoreCase = true) ||
+            contentType.contains("text/javascript", ignoreCase = true)
+
+    override fun convertResponseBody(responseBodyStream: InputStream): JSONObject {
+        val tokener = JSONTokener(responseBodyStream.readString())
+        return when (val next = tokener.nextValue()) {
+            is JSONObject -> next
+            else -> JSONObject().apply {
+                put(ResponseBodyJsonConverter.FALLBACK_RESPONSE_KEY, next)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/src/main/java/com/vk/api/sdk/response/JsonResponseTypeConverter.kt b/core/src/main/java/com/vk/api/sdk/response/JsonResponseTypeConverter.kt
new file mode 100644
index 0000000000..2bbf09c142
--- /dev/null
+++ b/core/src/main/java/com/vk/api/sdk/response/JsonResponseTypeConverter.kt
@@ -0,0 +1,30 @@
+package com.vk.api.sdk.response
+
+import org.json.JSONException
+import org.json.JSONObject
+import java.io.InputStream
+
+/**
+ * json response body type converter
+ *
+ * Responsible for converting the response body with the specific Content-Type value into [JSONObject]
+ */
+interface JsonResponseTypeConverter {
+
+    /**
+     * @param contentType - Content-Type header value
+     *
+     * @return true if we can convert responseBodyStream into [JSONObject]
+     */
+    fun isSuitableForContentType(contentType: String): Boolean
+
+    /**
+     * read and transform responseBodyStream
+     *
+     * @param responseBodyStream - [InputStream] from the response
+     *
+     * @return [JSONObject]
+     */
+    @Throws(JSONException::class)
+    fun convertResponseBody(responseBodyStream: InputStream): JSONObject
+}
\ No newline at end of file
diff --git a/core/src/main/java/com/vk/api/sdk/response/ResponseBodyJsonConverter.kt b/core/src/main/java/com/vk/api/sdk/response/ResponseBodyJsonConverter.kt
new file mode 100644
index 0000000000..5e3d4a4126
--- /dev/null
+++ b/core/src/main/java/com/vk/api/sdk/response/ResponseBodyJsonConverter.kt
@@ -0,0 +1,53 @@
+package com.vk.api.sdk.response
+
+import com.vk.api.sdk.exceptions.VKApiExecutionException
+import com.vk.api.sdk.extensions.readString
+import com.vk.api.sdk.requests.VKRequest.Companion.ERROR_MALFORMED_RESPONSE
+import org.json.JSONException
+import org.json.JSONObject
+import java.io.InputStream
+
+/**
+ * Main response body to [JSONObject] converter, using [JsonResponseTypeConverter]
+ *
+ * if nothing matches we use the default [JSONObject] from string mapping
+ */
+class ResponseBodyJsonConverter(
+    private val responseTypeConverters: List<JsonResponseTypeConverter>
+) {
+
+    /**
+     * converts the response [InputStream] with the responseContentType into the [JSONObject]
+     *
+     * @param responseBodyStream - [InputStream] from the response
+     * @param responseContentType - contentType of the response
+     * @param method - api method if applicable
+     */
+    fun convertResponse(
+        responseBodyStream: InputStream?,
+        responseContentType: String?,
+        path: String? = null
+    ): JSONObject? {
+        if (responseBodyStream == null) {
+            return null
+        }
+        try {
+            val jsonResponse = responseContentType?.let { contentType ->
+                responseTypeConverters.firstOrNull {
+                    it.isSuitableForContentType(contentType)
+                }?.convertResponseBody(responseBodyStream)
+            }
+            
+            return jsonResponse ?: JSONObject().apply {
+                put(FALLBACK_RESPONSE_KEY, responseBodyStream.readString())
+            }
+        } catch (ex: JSONException) {
+            throw VKApiExecutionException(ERROR_MALFORMED_RESPONSE, path ?: "no_path", true,
+                    "[$path] ${ex.localizedMessage}")
+        }
+    }
+
+    companion object {
+        const val FALLBACK_RESPONSE_KEY = "root_response"
+    }
+}
\ No newline at end of file
diff --git a/core/src/main/java/com/vk/api/sdk/ui/VKBaseAuthActivity.kt b/core/src/main/java/com/vk/api/sdk/ui/VKBaseAuthActivity.kt
index 007e9bb62b..6b787b018a 100644
--- a/core/src/main/java/com/vk/api/sdk/ui/VKBaseAuthActivity.kt
+++ b/core/src/main/java/com/vk/api/sdk/ui/VKBaseAuthActivity.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 package com.vk.api.sdk.ui
 
 import android.app.Activity
diff --git a/core/src/main/java/com/vk/api/sdk/ui/VKCaptchaActivity.kt b/core/src/main/java/com/vk/api/sdk/ui/VKCaptchaActivity.kt
index 640e612429..ec4ca8a67d 100644
--- a/core/src/main/java/com/vk/api/sdk/ui/VKCaptchaActivity.kt
+++ b/core/src/main/java/com/vk/api/sdk/ui/VKCaptchaActivity.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/ui/VKConfirmationActivity.kt b/core/src/main/java/com/vk/api/sdk/ui/VKConfirmationActivity.kt
index 2c0279965b..41c2c035cb 100644
--- a/core/src/main/java/com/vk/api/sdk/ui/VKConfirmationActivity.kt
+++ b/core/src/main/java/com/vk/api/sdk/ui/VKConfirmationActivity.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/ui/VKWebViewAuthActivity.kt b/core/src/main/java/com/vk/api/sdk/ui/VKWebViewAuthActivity.kt
index 1b0fd8dfc6..64267ba46e 100644
--- a/core/src/main/java/com/vk/api/sdk/ui/VKWebViewAuthActivity.kt
+++ b/core/src/main/java/com/vk/api/sdk/ui/VKWebViewAuthActivity.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/utils/ApiExt.kt b/core/src/main/java/com/vk/api/sdk/utils/ApiExt.kt
index 5d56215e56..eb3506847e 100644
--- a/core/src/main/java/com/vk/api/sdk/utils/ApiExt.kt
+++ b/core/src/main/java/com/vk/api/sdk/utils/ApiExt.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
@@ -53,12 +26,15 @@ package com.vk.api.sdk.utils
 
 import android.net.Uri
 import com.vk.api.sdk.VKApiConfig
+import com.vk.api.sdk.exceptions.VKApiCodes
 import com.vk.api.sdk.internal.VKErrorUtils
+import org.json.JSONObject
 
-internal fun String.hasExecuteError(ignoredErrors: IntArray?) = VKErrorUtils.hasExecuteError(this, ignoredErrors)
-internal fun String.hasSimpleError() = VKErrorUtils.hasSimpleError(this)
-internal fun String.toSimpleError(method: String? = null, accessToken: String? = null) = VKErrorUtils.parseSimpleError(this, method, accessToken)
-internal fun String.toExecuteError(method: String, ignoredErrors: IntArray?) = VKErrorUtils.parseExecuteError(this, method, ignoredErrors)
+internal fun JSONObject.hasExecuteError(ignoredErrors: IntArray?) = VKErrorUtils.hasExecuteError(this, ignoredErrors)
+internal fun JSONObject.hasSimpleError() = VKErrorUtils.hasSimpleError(this)
+internal fun JSONObject.toSimpleError(method: String? = null, accessToken: String? = null) =
+    VKErrorUtils.parseSimpleError(optJSONObject(VKApiCodes.PARAM_ERROR) ?: this, method, accessToken)
+internal fun JSONObject.toExecuteError(method: String, ignoredErrors: IntArray?) = VKErrorUtils.parseExecuteError(this, method, ignoredErrors)
 
 operator fun <E> androidx.collection.LongSparseArray<E>.set(key: Long, value: E) = put(key, value)
 
diff --git a/core/src/main/java/com/vk/api/sdk/utils/ApiMethodPriorityBackoff.kt b/core/src/main/java/com/vk/api/sdk/utils/ApiMethodPriorityBackoff.kt
index a221b076c5..ec3e18be05 100644
--- a/core/src/main/java/com/vk/api/sdk/utils/ApiMethodPriorityBackoff.kt
+++ b/core/src/main/java/com/vk/api/sdk/utils/ApiMethodPriorityBackoff.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 package com.vk.api.sdk.utils
 
 interface ApiMethodPriorityBackoff {
diff --git a/core/src/main/java/com/vk/api/sdk/utils/DefaultUserAgent.kt b/core/src/main/java/com/vk/api/sdk/utils/DefaultUserAgent.kt
index 237663ebba..9e7d1f6d39 100644
--- a/core/src/main/java/com/vk/api/sdk/utils/DefaultUserAgent.kt
+++ b/core/src/main/java/com/vk/api/sdk/utils/DefaultUserAgent.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 package com.vk.api.sdk.utils
 
 import android.graphics.Point
diff --git a/core/src/main/java/com/vk/api/sdk/utils/ExponentialBackoff.kt b/core/src/main/java/com/vk/api/sdk/utils/ExponentialBackoff.kt
index 1e1aad8945..de4067c539 100644
--- a/core/src/main/java/com/vk/api/sdk/utils/ExponentialBackoff.kt
+++ b/core/src/main/java/com/vk/api/sdk/utils/ExponentialBackoff.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
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
index e6d5b831c1..90931b4b65 100644
--- a/core/src/main/java/com/vk/api/sdk/utils/RateLimitTokenBackoff.kt
+++ b/core/src/main/java/com/vk/api/sdk/utils/RateLimitTokenBackoff.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 package com.vk.api.sdk.utils
 
 import android.content.Context
@@ -169,4 +142,4 @@ class RateLimitTokenBackoff(
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/core/src/main/java/com/vk/api/sdk/utils/StartUpMethodPriorityBackoffBaseImpl.kt b/core/src/main/java/com/vk/api/sdk/utils/StartUpMethodPriorityBackoffBaseImpl.kt
index 4e58b44b69..76d85abec0 100644
--- a/core/src/main/java/com/vk/api/sdk/utils/StartUpMethodPriorityBackoffBaseImpl.kt
+++ b/core/src/main/java/com/vk/api/sdk/utils/StartUpMethodPriorityBackoffBaseImpl.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 package com.vk.api.sdk.utils
 
 import com.vk.api.sdk.utils.log.Logger
diff --git a/core/src/main/java/com/vk/api/sdk/utils/ThreadLocalDelegate.kt b/core/src/main/java/com/vk/api/sdk/utils/ThreadLocalDelegate.kt
index 4394458698..92c932b4ce 100644
--- a/core/src/main/java/com/vk/api/sdk/utils/ThreadLocalDelegate.kt
+++ b/core/src/main/java/com/vk/api/sdk/utils/ThreadLocalDelegate.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
@@ -76,4 +49,4 @@ internal class ThreadLocalDelegateImpl<T>(val factory: () -> T) : ThreadLocalDel
     override fun get(): T {
         return value.get()!!
     }
-}
+}
\ No newline at end of file
diff --git a/core/src/main/java/com/vk/api/sdk/utils/UserAgentProvider.kt b/core/src/main/java/com/vk/api/sdk/utils/UserAgentProvider.kt
index 4bd332322a..e7ba01e028 100644
--- a/core/src/main/java/com/vk/api/sdk/utils/UserAgentProvider.kt
+++ b/core/src/main/java/com/vk/api/sdk/utils/UserAgentProvider.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 package com.vk.api.sdk.utils
 
 interface UserAgentProvider {
diff --git a/core/src/main/java/com/vk/api/sdk/utils/VKLoader.kt b/core/src/main/java/com/vk/api/sdk/utils/VKLoader.kt
index 02fca2310d..5df077d4e8 100644
--- a/core/src/main/java/com/vk/api/sdk/utils/VKLoader.kt
+++ b/core/src/main/java/com/vk/api/sdk/utils/VKLoader.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/java/com/vk/api/sdk/utils/VKUrlResolver.kt b/core/src/main/java/com/vk/api/sdk/utils/VKUrlResolver.kt
index 6dcca9d882..6655e72b98 100644
--- a/core/src/main/java/com/vk/api/sdk/utils/VKUrlResolver.kt
+++ b/core/src/main/java/com/vk/api/sdk/utils/VKUrlResolver.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
@@ -72,4 +45,4 @@ class VKUrlResolver internal constructor() {
     companion object {
         private const val VK_APP_PACKAGE_NAME = "com.vkontakte.android"
     }
-}
+}
\ No newline at end of file
diff --git a/core/src/main/java/com/vk/api/sdk/utils/VKUtils.kt b/core/src/main/java/com/vk/api/sdk/utils/VKUtils.kt
index 235b33a25a..8e2b484491 100644
--- a/core/src/main/java/com/vk/api/sdk/utils/VKUtils.kt
+++ b/core/src/main/java/com/vk/api/sdk/utils/VKUtils.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
@@ -151,16 +124,8 @@ object VKUtils {
     }
 
     @Suppress("DEPRECATION")
-    fun clearAllCookies(context: Context) {
-        val cookieManager = CookieManager.getInstance()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            cookieManager.removeAllCookies(null)
-        } else {
-            val cookieSyncManager = CookieSyncManager.createInstance(context)
-            cookieSyncManager.startSync()
-            cookieManager.removeAllCookie()
-            cookieSyncManager.stopSync()
-        }
+    fun clearAllCookies() {
+        CookieManager.getInstance().removeAllCookies(null)
     }
 
     private fun toHex(bytes: ByteArray): String {
diff --git a/core/src/main/java/com/vk/api/sdk/utils/VKValidationLocker.kt b/core/src/main/java/com/vk/api/sdk/utils/VKValidationLocker.kt
index 2aded70b76..9bc94e1665 100644
--- a/core/src/main/java/com/vk/api/sdk/utils/VKValidationLocker.kt
+++ b/core/src/main/java/com/vk/api/sdk/utils/VKValidationLocker.kt
@@ -1,30 +1,3 @@
-/**
- * Copyright (c) 2020 - present, LLC “V Kontakte”
- *
- * 1. Permission is hereby granted to any person obtaining a copy of this Software to
- * use the Software without charge.
- *
- * 2. Restrictions
- * You may not modify, merge, publish, distribute, sublicense, and/or sell copies,
- * create derivative works based upon the Software or any part thereof.
- *
- * 3. Termination
- * This License is effective until terminated. LLC “V Kontakte” may terminate this
- * License at any time without any negative consequences to our rights.
- * You may terminate this License at any time by deleting the Software and all copies
- * thereof. Upon termination of this license for any reason, you shall continue to be
- * bound by the provisions of Section 2 above.
- * Termination will be without prejudice to any rights LLC “V Kontakte” may have as
- * a result of this agreement.
- *
- * 4. Disclaimer of warranty and liability
- * THE SOFTWARE IS MADE AVAILABLE ON THE “AS IS” BASIS. LLC “V KONTAKTE” DISCLAIMS
- * ALL WARRANTIES THAT THE SOFTWARE MAY BE SUITABLE OR UNSUITABLE FOR ANY SPECIFIC
- * PURPOSES OF USE. LLC “V KONTAKTE” CAN NOT GUARANTEE AND DOES NOT PROMISE ANY
- * SPECIFIC RESULTS OF USE OF THE SOFTWARE.
- * UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
- * THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
-*/
 /*******************************************************************************
  * The MIT License (MIT)
  *
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 11b25f713c..1333e9d0b2 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -26,8 +26,8 @@
   ~ UNDER NO CIRCUMSTANCES LLC “V KONTAKTE” BEAR LIABILITY TO THE LICENSEE OR ANY
   ~ THIRD PARTIES FOR ANY DAMAGE IN CONNECTION WITH USE OF THE SOFTWARE.
 -->
-<resources>
-    <string name="vk_retry">Retry</string>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="vk_retry" tools:ignore="UnusedResources">Retry</string>
     <string name="vk_captcha_hint">Please enter the code from the picture</string>
     <string name="vk_confirm">Please confirm</string>
     <string name="vk_message_login_error">Login error occurred</string>
diff --git a/core/src/test/java/com/vk/api/sdk/ValidationLockTest.kt b/core/src/test/java/com/vk/api/sdk/ValidationLockTest.kt
new file mode 100644
index 0000000000..f17b052f4e
--- /dev/null
+++ b/core/src/test/java/com/vk/api/sdk/ValidationLockTest.kt
@@ -0,0 +1,63 @@
+package com.vk.api.sdk
+
+import org.junit.Assert
+import org.junit.Test
+import java.util.concurrent.Callable
+import java.util.concurrent.Executors
+import java.util.concurrent.Future
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.TimeoutException
+
+
+class ValidationLockTest {
+
+    private val executor = Executors.newFixedThreadPool(3)
+
+    @Test
+    fun awaitNotAcquired() {
+        val validationLock = VKApiValidationHandler.ValidationLock()
+        val future: Future<Int> =  executor.submit(Callable {
+            validationLock.await()
+            1
+        })
+        Assert.assertEquals(1, future.get(1000, TimeUnit.MILLISECONDS))
+
+    }
+
+    @Test
+    fun awaitAcquired() {
+        val validationLock = VKApiValidationHandler.ValidationLock()
+        validationLock.acquire()
+        val future: Future<Int> =  executor.submit(Callable {
+            validationLock.await()
+            1
+        })
+        val future2 =  executor.submit(Callable {
+            future.get(1000, TimeUnit.MILLISECONDS)
+        })
+        validationLock.release()
+        Assert.assertEquals(1, future2.get(1000, TimeUnit.MILLISECONDS))
+    }
+
+    @Test
+    fun awaitAcquiredNotReleased() {
+        val validationLock = VKApiValidationHandler.ValidationLock()
+        validationLock.acquire()
+        val future: Future<Int> =  executor.submit(Callable {
+            validationLock.await()
+            1
+        })
+        try {
+            future.get(100, TimeUnit.MILLISECONDS)
+        } catch (ex: Throwable) {
+            Assert.assertEquals(TimeoutException::class.java, ex::class.java)
+        }
+    }
+
+    @Test
+    fun doubleAcquire() {
+        val validationLock = VKApiValidationHandler.ValidationLock()
+        Assert.assertTrue(validationLock.acquire())
+        Assert.assertFalse(validationLock.acquire())
+    }
+}
\ No newline at end of file
diff --git a/samples/app/src/main/java/com/vk/sdk/sample/requests/VKUsersCommand.kt b/samples/app/src/main/java/com/vk/sdk/sample/requests/VKUsersCommand.kt
index 0b1b0e22ed..3b88b2e580 100644
--- a/samples/app/src/main/java/com/vk/sdk/sample/requests/VKUsersCommand.kt
+++ b/samples/app/src/main/java/com/vk/sdk/sample/requests/VKUsersCommand.kt
@@ -24,8 +24,8 @@
 
 package com.vk.sdk.sample.requests
 
+import com.vk.api.sdk.VKApiJSONResponseParser
 import com.vk.api.sdk.VKApiManager
-import com.vk.api.sdk.VKApiResponseParser
 import com.vk.api.sdk.VKMethodCall
 import com.vk.api.sdk.exceptions.VKApiIllegalResponseException
 import com.vk.api.sdk.internal.ApiCommand
@@ -64,10 +64,10 @@ class VKUsersCommand(private val uids: IntArray = intArrayOf()): ApiCommand<List
         const val CHUNK_LIMIT = 900
     }
 
-    private class ResponseApiParser : VKApiResponseParser<List<VKUser>> {
-        override fun parse(response: String): List<VKUser> {
+    private class ResponseApiParser : VKApiJSONResponseParser<List<VKUser>> {
+        override fun parse(responseJson: JSONObject): List<VKUser> {
             try {
-                val ja = JSONObject(response).getJSONArray("response")
+                val ja = responseJson.getJSONArray("response")
                 val r = ArrayList<VKUser>(ja.length())
                 for (i in 0 until ja.length()) {
                     val user = VKUser.parse(ja.getJSONObject(i))
diff --git a/samples/app/src/main/java/com/vk/sdk/sample/requests/VKWallPostCommand.kt b/samples/app/src/main/java/com/vk/sdk/sample/requests/VKWallPostCommand.kt
index 381bdc4b0a..65bfbc14a5 100644
--- a/samples/app/src/main/java/com/vk/sdk/sample/requests/VKWallPostCommand.kt
+++ b/samples/app/src/main/java/com/vk/sdk/sample/requests/VKWallPostCommand.kt
@@ -25,8 +25,8 @@
 package com.vk.sdk.sample.requests
 
 import android.net.Uri
+import com.vk.api.sdk.VKApiJSONResponseParser
 import com.vk.api.sdk.VKApiManager
-import com.vk.api.sdk.VKApiResponseParser
 import com.vk.api.sdk.VKHttpPostCall
 import com.vk.api.sdk.VKMethodCall
 import com.vk.api.sdk.exceptions.VKApiIllegalResponseException
@@ -101,20 +101,20 @@ class VKWallPostCommand(private val message: String? = null,
         const val RETRY_COUNT = 3
     }
 
-    private class ResponseApiParser : VKApiResponseParser<Int> {
-        override fun parse(response: String): Int {
+    private class ResponseApiParser : VKApiJSONResponseParser<Int> {
+        override fun parse(responseJson: JSONObject): Int {
             try {
-                return JSONObject(response).getJSONObject("response").getInt("post_id")
+                return responseJson.getJSONObject("response").getInt("post_id")
             } catch (ex: JSONException) {
                 throw VKApiIllegalResponseException(ex)
             }
         }
     }
 
-    private class ServerUploadInfoParser : VKApiResponseParser<VKServerUploadInfo> {
-        override fun parse(response: String): VKServerUploadInfo{
+    private class ServerUploadInfoParser : VKApiJSONResponseParser<VKServerUploadInfo> {
+        override fun parse(responseJson: JSONObject): VKServerUploadInfo{
             try {
-                val joResponse = JSONObject(response).getJSONObject("response")
+                val joResponse = responseJson.getJSONObject("response")
                 return VKServerUploadInfo(
                         uploadUrl = joResponse.getString("upload_url"),
                         albumId = joResponse.getInt("album_id"),
@@ -125,10 +125,10 @@ class VKWallPostCommand(private val message: String? = null,
         }
     }
 
-    private class FileUploadInfoParser: VKApiResponseParser<VKFileUploadInfo> {
-        override fun parse(response: String): VKFileUploadInfo{
+    private class FileUploadInfoParser: VKApiJSONResponseParser<VKFileUploadInfo> {
+        override fun parse(responseJson: JSONObject): VKFileUploadInfo{
             try {
-                val joResponse = JSONObject(response)
+                val joResponse = responseJson
                 return VKFileUploadInfo(
                         server = joResponse.getString("server"),
                         photo = joResponse.getString("photo"),
@@ -140,10 +140,10 @@ class VKWallPostCommand(private val message: String? = null,
         }
     }
 
-    private class SaveInfoParser: VKApiResponseParser<VKSaveInfo> {
-        override fun parse(response: String): VKSaveInfo {
+    private class SaveInfoParser: VKApiJSONResponseParser<VKSaveInfo> {
+        override fun parse(responseJson: JSONObject): VKSaveInfo {
             try {
-                val joResponse = JSONObject(response).getJSONArray("response").getJSONObject(0)
+                val joResponse = responseJson.getJSONArray("response").getJSONObject(0)
                 return VKSaveInfo(
                         id = joResponse.getInt("id"),
                         albumId = joResponse.getInt("album_id"),
diff --git a/samples/app/src/main/res/values-ru/strings.xml b/samples/app/src/main/res/values-ru/strings.xml
index 08ef791f66..8b2c03c6ad 100644
--- a/samples/app/src/main/res/values-ru/strings.xml
+++ b/samples/app/src/main/res/values-ru/strings.xml
@@ -7,5 +7,4 @@
     <string name="wall_ok">Запись опубликована</string>
     <string name="message_connection_error">Ошибка подключения</string>
     <string name="message_unknown_error">Неизвестная ошибка, попробуйте позже</string>
-    <string name="app_name" translatable="false">VK SDK sample</string>
 </resources>
diff --git a/samples/app/src/main/res/values-uz/strings.xml b/samples/app/src/main/res/values-uz/strings.xml
new file mode 100644
index 0000000000..71feeee50d
--- /dev/null
+++ b/samples/app/src/main/res/values-uz/strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="login">Войти</string>
+    <string name="logout">Выйти</string>
+    <string name="share_to_wall">Отправить на стену</string>
+    <string name="message_hint">Ваше сообщение</string>
+    <string name="wall_ok">Запись опубликована</string>
+    <string name="message_connection_error">Bog\‘lanish xatosi</string>
+    <string name="message_unknown_error">Noma\'lum xato, kechroq qayta urunib ko\‘ring</string>
+</resources>
diff --git a/samples/app/src/main/res/values/strings.xml b/samples/app/src/main/res/values/strings.xml
index 3e787738df..4972f64910 100644
--- a/samples/app/src/main/res/values/strings.xml
+++ b/samples/app/src/main/res/values/strings.xml
@@ -7,4 +7,5 @@
     <string name="wall_ok">Запись опубликована</string>
     <string name="message_connection_error">Connection error</string>
     <string name="message_unknown_error">Unknown error. Try again later.</string>
+    <string name="app_name" translatable="false">VK SDK sample</string>
 </resources>