Code refractoring

Signed-off-by: Gaurav Goel <[email protected]>

Author: grvgoel81

.idea/thriftCompiler.xml

@@ -6,7 +6,6 @@ import android.content.pm.PackageManager
 import android.net.Uri
 import android.util.Base64
 import android.util.Patterns
-import android.widget.Toast
 import androidx.browser.customtabs.CustomTabsService
 
 const val BASE64_URL_FLAGS = Base64.URL_SAFE or Base64.NO_WRAP or Base64.NO_PADDING

core/src/main/java/com/web3auth/core/Utils.kt

@@ -74,7 +74,7 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions) {
         initiateKeyStoreManager()
 
         //authorize session
-        if(ApiHelper.isNetworkAvailable(context)) {
+        if (ApiHelper.isNetworkAvailable(context)) {
             authorizeSession()
         }
     }
@@ -183,7 +183,7 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions) {
     }
 
     fun logout(params: Map<String, Any>? = null): CompletableFuture<Void> {
-        if(ApiHelper.isNetworkAvailable(context)) {
+        if (ApiHelper.isNetworkAvailable(context)) {
             sessionTimeOutAPI()
         }
         request("logout", extraParams = params)

core/src/main/java/com/web3auth/core/Web3Auth.kt

@@ -18,7 +18,7 @@ object ApiHelper {
 
     private val okHttpClient = OkHttpClient().newBuilder()
         .readTimeout(60, TimeUnit.SECONDS)
-        .connectTimeout(60, TimeUnit.SECONDS)
+        .connectTimeout(20, TimeUnit.SECONDS)
         .addInterceptor(HttpLoggingInterceptor().apply {
             if (BuildConfig.DEBUG) {
                 level = HttpLoggingInterceptor.Level.BODY
@@ -37,9 +37,11 @@ object ApiHelper {
 
     fun isNetworkAvailable(context: Context?): Boolean {
         if (context == null) return false
-        val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+        val connectivityManager =
+            context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            val capabilities = connectivityManager.getNetworkCapabilities(connectivityManager.activeNetwork)
+            val capabilities =
+                connectivityManager.getNetworkCapabilities(connectivityManager.activeNetwork)
             if (capabilities != null) {
                 when {
                     capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> {