1.5.0

can set no proxy to false
shadowalker77 · Oct 25, 2023 · 1107564 · 1107564
1 parent ae16d8e
commit 1107564
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/ayannetworking/build.gradle b/ayannetworking/build.gradle
@@ -9,7 +9,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 30
         versionCode 1
-        versionName "1.4.2"
+        versionName "1.5.0"
     }
 
     buildTypes {

diff --git a/ayannetworking/src/main/java/ir/ayantech/ayannetworking/api/AyanApi.kt b/ayannetworking/src/main/java/ir/ayantech/ayannetworking/api/AyanApi.kt
@@ -33,6 +33,7 @@ class AyanApi(
     var headers: HashMap<String, String> = HashMap(),
     val stringParameters: Boolean = false,
     val forceEndPoint: String? = null,
+    val setNoProxy: Boolean = true,
     val hostName: String? = null,
     val logItems: List<Int>? = null,
     val feed: Array<Int>? = null,
@@ -82,6 +83,7 @@ class AyanApi(
     fun aaa(
         defaultBaseUrl: String,
         timeout: Long,
+        setNoProxy: Boolean,
         hostName: String? = null,
         logItems: List<Int>? = null,
         feed: Array<Int>?,
@@ -91,6 +93,7 @@ class AyanApi(
             userAgent,
             defaultBaseUrl,
             timeout,
+            setNoProxy,
             hostName,
             logItems,
             feed,
@@ -196,7 +199,7 @@ class AyanApi(
             }
         } catch (e: Exception) {
         }
-        aaa(defaultBaseUrl, timeout, hostName, logItems, feed, gson).callApi(
+        aaa(defaultBaseUrl, timeout, setNoProxy, hostName, logItems, feed, gson).callApi(
             finalUrl,
             request,
             headers
@@ -209,7 +212,7 @@ class AyanApi(
                     try {
                         wrappedPackage.reCallApi = {
                             ayanCallStatus.dispatchLoad()
-                            aaa(defaultBaseUrl, timeout, hostName, logItems, feed, gson).callApi(
+                            aaa(defaultBaseUrl, timeout, setNoProxy, hostName, logItems, feed, gson).callApi(
                                 wrappedPackage.url,
                                 wrappedPackage.request,
                                 headers
@@ -337,7 +340,7 @@ class AyanApi(
                 override fun onFailure(call: Call<ResponseBody>, t: Throwable) {
                     wrappedPackage.reCallApi = {
                         ayanCallStatus.dispatchLoad()
-                        aaa(defaultBaseUrl, timeout, hostName, logItems, feed, gson).callApi(
+                        aaa(defaultBaseUrl, timeout, setNoProxy, hostName, logItems, feed, gson).callApi(
                             wrappedPackage.url,
                             wrappedPackage.request,
                             headers

diff --git a/ayannetworking/src/main/java/ir/ayantech/ayannetworking/networking/RetrofitClient.kt b/ayannetworking/src/main/java/ir/ayantech/ayannetworking/networking/RetrofitClient.kt
@@ -23,6 +23,7 @@ object RetrofitClient {
         userAgent: String,
         defaultBaseUrl: String,
         timeout: Long = 20,
+        setNoProxy: Boolean,
         hostName: String? = null,
         logItems: List<Int>? = null,
         feed: Array<Int>? = null,
@@ -35,13 +36,14 @@ object RetrofitClient {
                     else GsonConverterFactory.create(gson)
                 )
                 .baseUrl(defaultBaseUrl)
-                .client(getOkHttpInstance(userAgent, timeout, hostName, logItems, feed))
+                .client(getOkHttpInstance(userAgent, timeout, setNoProxy, hostName, logItems, feed))
                 .build()
                 .also { retrofit = it }
 
     private fun getOkHttpInstance(
         userAgent: String,
         timeout: Long,
+        setNoProxy: Boolean,
         hostName: String? = null,
         logItems: List<Int>? = null,
         feed: Array<Int>? = null
@@ -51,7 +53,8 @@ object RetrofitClient {
         okHttpClientBuilder.connectTimeout(timeout, TimeUnit.SECONDS)
         okHttpClientBuilder.readTimeout(timeout, TimeUnit.SECONDS)
         okHttpClientBuilder.writeTimeout(timeout, TimeUnit.SECONDS)
-        okHttpClientBuilder.proxy(Proxy.NO_PROXY)
+        if (setNoProxy)
+            okHttpClientBuilder.proxy(Proxy.NO_PROXY)
         okHttpClientBuilder.protocols(arrayListOf(Protocol.HTTP_2, Protocol.HTTP_1_1))
         okHttpClientBuilder.addInterceptor {
             val userAgentRequest = it.request()