fix: load issue

ja7ad · ja7ad · commit 220903185e9a · 2025-07-28T10:15:53.000+03:30
diff --git a/app/build.gradle b/app/build.gradle
@@ -65,6 +65,8 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'com.airbnb.android:lottie:6.6.7'
+    implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.2.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
diff --git a/app/src/main/java/com/book/gofarsi/CacheInterceptor.kt b/app/src/main/java/com/book/gofarsi/CacheInterceptor.kt
@@ -0,0 +1,72 @@
+package com.book.gofarsi
+
+import android.content.Context
+import android.webkit.WebResourceRequest
+import android.webkit.WebResourceResponse
+import java.io.File
+import java.io.FileInputStream
+import java.io.FileOutputStream
+import java.io.IOException
+import java.math.BigInteger
+import java.net.URLConnection
+import java.security.MessageDigest
+
+class CacheInterceptor(context: Context) {
+    private val cacheDir = File(context.cacheDir, "web_cache")
+    private val maxCacheSize = 50 * 1024 * 1024 // 50 MB
+
+    init {
+        if (!cacheDir.exists()) cacheDir.mkdirs()
+    }
+
+    fun getResponse(request: WebResourceRequest): WebResourceResponse? {
+        val url = request.url.toString()
+        val cacheFile = File(cacheDir, url.toMD5())
+
+        if (cacheFile.exists()) {
+            return createResponse(cacheFile, URLConnection.guessContentTypeFromName(url))
+        }
+        return null
+    }
+
+    fun saveResponse(url: String, response: WebResourceResponse) {
+        val cacheFile = File(cacheDir, url.toMD5())
+        response.data?.let { data ->
+            try {
+                FileOutputStream(cacheFile).use { output ->
+                    data.copyTo(output)
+                }
+            } catch (e: IOException) {
+                e.printStackTrace()
+            }
+        }
+        manageCacheSize()
+    }
+
+    private fun manageCacheSize() {
+        var totalSize = cacheDir.listFiles()?.sumOf { it.length() } ?: 0
+        if (totalSize > maxCacheSize) {
+            cacheDir.listFiles()
+                ?.sortedBy { it.lastModified() }
+                ?.forEach {
+                    if (totalSize > maxCacheSize) {
+                        totalSize -= it.length()
+                        it.delete()
+                    }
+                }
+        }
+    }
+
+    private fun createResponse(file: File, mimeType: String?): WebResourceResponse {
+        return WebResourceResponse(
+            mimeType,
+            "UTF-8",
+            FileInputStream(file)
+        )
+    }
+
+    private fun String.toMD5(): String {
+        val md = MessageDigest.getInstance("MD5")
+        return BigInteger(1, md.digest(toByteArray())).toString(16).padStart(32, '0')
+    }
+}
diff --git a/app/src/main/java/com/book/gofarsi/WebActivity.kt b/app/src/main/java/com/book/gofarsi/WebActivity.kt
@@ -14,7 +14,11 @@ import android.widget.TextView
 import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
 import kotlinx.coroutines.*
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import java.io.IOException
 import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.TimeUnit
 import kotlin.system.measureTimeMillis
 
 
@@ -24,15 +28,24 @@ class WebActivity : AppCompatActivity() {
     var myWebView: WebView? = null
     private val list = arrayListOf(
         "https://book.gofarsi.ir/",
-        "https://cloud-book.gofarsi.ir/",
-        "https://ir1-book.gofarsi.ir/",
-        "https://ipfs-book.gofarsi.ir/",
-        "https://hku1-book.gofarsi.ir/",
-        "https://aws1-book.gofarsi.ir/"
+       // "https://cloud-book.gofarsi.ir/",
+       // "https://ir1-book.gofarsi.ir/",
+       // "https://ipfs-book.gofarsi.ir/",
+      //  "https://hku1-book.gofarsi.ir/",
+       // "https://aws1-book.gofarsi.ir/"
     )
     var urlIndex = 0
     var hasErrorInLoading = false
     var currentUrl = ""
+    private val client = OkHttpClient.Builder()
+        .connectTimeout(3, TimeUnit.SECONDS)
+        .readTimeout(3, TimeUnit.SECONDS)
+        .build()
+
+    private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
+    private val job = Job()
+    private val coroutineScope = CoroutineScope(Dispatchers.Main + job)
+    private lateinit var cacheInterceptor:CacheInterceptor
 
     companion object {
         private const val TAG = "WebActivity" // Better log tag
@@ -83,7 +96,7 @@ class WebActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         try {
             setContentView(R.layout.activity_web)
-
+            cacheInterceptor = CacheInterceptor(applicationContext)
             // Find the fastest URL before loading
             findViewById<TextView>(R.id.tvVersion).text = BuildConfig.VERSION_NAME
             myWebView = findViewById(R.id.webview)
@@ -97,23 +110,38 @@ class WebActivity : AppCompatActivity() {
             // Note: allowFileAccessFromFileURLs and allowUniversalAccessFromFileURLs are deprecated
             // and removed for security reasons. Modern apps should use alternative approaches.
             webSettings.mixedContentMode = WebSettings.MIXED_CONTENT_ALWAYS_ALLOW
-            webSettings.cacheMode = if (isNetworkAvailable()) {
-                WebSettings.LOAD_DEFAULT
-            } else {
-                WebSettings.LOAD_CACHE_ELSE_NETWORK
+           // webSettings.cacheMode = if (isNetworkAvailable()) {
+           //     WebSettings.LOAD_DEFAULT
+           // } else {
+           //     WebSettings.LOAD_CACHE_ELSE_NETWORK
+           // }
+            if (!isNetworkAvailable()){
+                myWebView?.loadUrl("javascript:document.body.innerHTML='" +
+                        getOfflineHtml() + "'")
             }
 
             if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
                 ServiceWorkerController.getInstance().setServiceWorkerClient(object : ServiceWorkerClient() {
                     override fun shouldInterceptRequest(request: WebResourceRequest): WebResourceResponse? {
-                        return null
+                        //return null
+                        if (!isNetworkAvailable()) {
+                            return cacheInterceptor.getResponse(request)
+                        }
+
+
+                        val networkResponse = super.shouldInterceptRequest(request)
+                        networkResponse?.let {
+                            cacheInterceptor.saveResponse(request.url.toString(), it)
+                        }
+                        return networkResponse
                     }
                 })
             }
             // --- End WebView settings ---
 
             // Launch coroutine to find fastest URL
-            findFastestUrlAndLoad()
+            //findFastestUrlAndLoad(list)
+            myWebView?.loadUrl(list[0])
         } catch (e: Exception) {
             Log.e("WebActivity", "Error in onCreate: ${e.message}", e)
             finish()
@@ -146,7 +174,8 @@ class WebActivity : AppCompatActivity() {
             override fun onPageFinished(view: WebView?, url: String?) {
                 super.onPageFinished(view, url)
                 currentUrl = url ?: ""
-                if (!hasErrorInLoading) findViewById<RelativeLayout>(R.id.loading).visibility = View.INVISIBLE
+               // if (!hasErrorInLoading)
+                findViewById<RelativeLayout>(R.id.loading).visibility = View.INVISIBLE
                 Log.d(TAG, "onPageFinished: $url")
             }
 
@@ -165,6 +194,21 @@ class WebActivity : AppCompatActivity() {
         onBackPressedDispatcher.addCallback(this, callback)
     }
 
+
+    private fun getOfflineHtml(): String {
+        return try {
+            val inputStream = application.assets.open("offline.html")
+            val size = inputStream.available()
+            val buffer = ByteArray(size)
+            inputStream.read(buffer)
+            inputStream.close()
+            String(buffer)
+        } catch (e: IOException) {
+            "<h1>You're offline</h1><p>No cached content available</p>"
+        }
+    }
+
+
     private fun findFastestUrlAndLoad() {
         CoroutineScope(Dispatchers.IO).launch {
             val fastestUrl = findFastestUrlOptimized()
@@ -238,6 +282,7 @@ class WebActivity : AppCompatActivity() {
                 Log.e("WebActivity", "Error in concurrent URL testing: ${e.message}")
             }
 
+
             fastestResult?.first
         }
     }
@@ -263,6 +308,7 @@ class WebActivity : AppCompatActivity() {
                         throw Exception("HTTP $responseCode")
                     }
                 }
+                Log.i("aaa",responseTime.toString())
                 responseTime
             } catch (e: Exception) {
                 Log.d("WebActivity", "URL $url failed: ${e.message}")
@@ -271,6 +317,48 @@ class WebActivity : AppCompatActivity() {
         }
     }
 
+
+    private fun findFastestUrlAndLoad(urls: List<String>) {
+        coroutineScope.launch {
+            val fastestUrl = findFastestUrl(urls)
+            fastestUrl?.let {
+                myWebView?.loadUrl(it)
+            } ?: run {
+                myWebView?.loadUrl(list[0])
+            }
+        }
+    }
+
+    private suspend fun findFastestUrl(urls: List<String>): String? = coroutineScope {
+        val jobs = urls.map { url ->
+            async(Dispatchers.IO) {
+                try {
+                    val request = Request.Builder()
+                        .url(url)
+                        .head() // فقط هدرها را دریافت می‌کند
+                        .build()
+
+                    val responseTime = measureTimeMillis {
+                        client.newCall(request).execute().use { response ->
+                            if (!response.isSuccessful) null
+                        }
+                    }
+
+                    if (responseTime > 0) url to responseTime else null
+                } catch (e: Exception) {
+                    null
+                }
+            }
+        }
+
+        // منتظر ماندن برای اولین پاسخ موفق
+        val results = jobs.awaitAll().filterNotNull()
+
+        // پیدا کردن سریع‌ترین پاسخ
+        results.minByOrNull { it.second }?.first
+    }
+
+
     fun loadBrowser(url:String){
         val uri: Uri = Uri.parse(url)
         val intent = Intent(Intent.ACTION_VIEW, uri)
@@ -341,6 +429,7 @@ class WebActivity : AppCompatActivity() {
         super.onResume()
         try {
             myWebView?.onResume()
+            scope.cancel()
         } catch (e: Exception) {
             Log.e("WebActivity", "Error in onResume: ${e.message}")
         }
diff --git a/app/src/main/res/layout/activity_web.xml b/app/src/main/res/layout/activity_web.xml
@@ -2,6 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/white">
 
     <WebView
@@ -27,8 +28,26 @@
             android:layout_height="34dp"
             android:layout_above="@id/tvVersion"
             android:layout_centerHorizontal="true"
+            android:visibility="gone"
             android:layout_marginBottom="30dp" />
 
+
+        <com.airbnb.lottie.LottieAnimationView
+            android:id="@+id/animation_view"
+            android:layout_width="match_parent"
+            android:layout_height="150dp"
+            android:layout_above="@id/tvVersion"
+            android:layout_centerHorizontal="true"
+            android:layout_gravity="center"
+            android:scaleType="fitCenter"
+            app:lottie_autoPlay="true"
+            app:lottie_loop="true"
+            app:lottie_progress="0.5"
+            app:lottie_rawRes="@raw/bookblue"
+            app:lottie_renderMode="automatic"
+            app:lottie_repeatMode="restart"
+            app:lottie_speed="1.0" />
+
         <TextView
             android:id="@+id/tvVersion"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/raw/bookblue.json b/app/src/main/res/raw/bookblue.json
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
@@ -10,7 +10,9 @@
         <item name="colorSecondaryVariant">@color/teal_200</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:windowTranslucentStatus">false</item>
         <!-- Customize your theme here. -->
     </style>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -10,7 +10,9 @@
         <item name="colorSecondaryVariant">@color/teal_700</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:windowTranslucentStatus">false</item>
         <!-- Customize your theme here. -->
     </style>
 </resources>
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.7.3' apply false
+    id 'com.android.application' version '8.8.0' apply false
     id 'com.android.library' version '8.7.3' apply false
     id 'org.jetbrains.kotlin.android' version '2.0.21' apply false
 }
diff --git a/generate-keystore.sh b/generate-keystore.sh
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Nov 28 09:08:13 IRST 2022
+#Sat Jul 26 16:14:10 IRST 2025
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
diff --git a/test-keystore-access.sh b/test-keystore-access.sh

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`// Top-level build file where you can add configuration options common to all sub-projects/modules.`
`2`	`2`	`plugins {`
`3`		`- id 'com.android.application' version '8.7.3' apply false`
	`3`	`+ id 'com.android.application' version '8.8.0' apply false`
`4`	`4`	`id 'com.android.library' version '8.7.3' apply false`
`5`	`5`	`id 'org.jetbrains.kotlin.android' version '2.0.21' apply false`
`6`	`6`	`}`