[WebView Bug. http/https shcema URLs] due to Chromium bug 'crbug.com/…

…1244039', Sometimes WebView's onPageFinished method won't be called
mecoFarid · Aug 27, 2021 · 1913fb3 · 1913fb3
1 parent 955805e
commit 1913fb3
Show file tree

Hide file tree

Showing 11 changed files with 304 additions and 274 deletions.
diff --git a/app/src/main/java/com/mecofarid/pdfkitdemo/MainActivity.kt b/app/src/main/java/com/mecofarid/pdfkitdemo/MainActivity.kt
@@ -1,7 +1,7 @@
 package com.mecofarid.pdfkitdemo
 
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.mecofarid.pdfkit.PdfKit
 import java.io.File
 
@@ -10,40 +10,36 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-//        Thread()
-//        Handler(HandlerThread("PdfConverterHandlerThread").looper) {
-//            getFile("PdfKitDemo_1.pdf").let { outputFile ->
-//                PdfKit(application.applicationContext).startConversion(
-//                        url = "https://stackoverflow.com/",
-//                        outputFile = outputFile,
-//                        onPdfPrintListener = object : PdfKit.OnPdfConversionListener {
-//                            override fun onError(e: Exception) {
-//                                println("PDFPRINT onError: $e")
-//                            }
-//
-//                            override fun onSuccess(pdfFileLocation: File) {
-//                                println("PDFPRINT onSuccess: $outputFile")
-//                            }
-//                        }
-//                )
-//            }
-//        }.start()
-
-
+        getFile("PdfKitDemo_1.pdf").let { outputFile ->
+            PdfKit(application.applicationContext).startConversion(
+                    url = "https://www.github.com/",
+                    outputFile = outputFile,
+                    javascriptEnabled = true,
+                    onPdfPrintListener = object : PdfKit.OnPdfConversionListener {
+                        override fun onError(e: Exception) {
+                            println("PDFPRINT remote onError: $e")
+                        }
 
+                        override fun onSuccess(pdfFileLocation: File) {
+                            println("PDFPRINT remote onSuccess: $outputFile")
+                        }
+                    }
+            )
+        }
 
         getFile("PdfKitDemo_2.pdf").let { outputFile ->
             PdfKit(this).startConversion(
                     baseUrl = getAssetDirectoryPath(),
                     data = PdfConverterDataFactory.htmlData,
+                    javascriptEnabled = true,
                     outputFile = outputFile,
                     onPdfPrintListener = object : PdfKit.OnPdfConversionListener {
                         override fun onError(e: Exception) {
-                            println("PDFPRINT onError: $e")
+                            println("PDFPRINT local onError: $e")
                         }
 
                         override fun onSuccess(pdfFileLocation: File) {
-                            println("PDFPRINT onSuccess: $outputFile")
+                            println("PDFPRINT local onSuccess: $outputFile")
                         }
                     }
             )

diff --git a/app/src/main/java/com/mecofarid/pdfkitdemo/PdfConverterDataFactory.kt b/app/src/main/java/com/mecofarid/pdfkitdemo/PdfConverterDataFactory.kt
@@ -20,7 +20,7 @@ object PdfConverterDataFactory {
             "</head>\n" +
             "<body>\n" +
             "\n" +
-            "<img src=\"../random.jpg\" alt=\"Random image\">\n" +
+            "<img src=\"random.jpg\" alt=\"Random image\">\n" +
             "\n" +
             "<h2>Striped Table</h2>\n" +
             "<p>For zebra-striped tables, use the nth-child() selector and add a background-color to all even (or odd) table rows:</p>\n" +

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -6,13 +6,13 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-    <ProgressBar
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        <ProgressBar
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Hello World!"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/pdfkit/src/androidTest/java/com/mecofarid/pdfkit/PdfKitAndroidTest.kt b/pdfkit/src/androidTest/java/com/mecofarid/pdfkit/PdfKitAndroidTest.kt
@@ -2,6 +2,8 @@ package com.mecofarid.pdfkit
 
 import android.content.Context
 import android.os.Handler
+import android.os.HandlerThread
+import android.os.Message
 import android.util.Log
 import android.webkit.WebView
 import androidx.test.core.app.ApplicationProvider
@@ -13,6 +15,9 @@ import org.junit.runner.RunWith
 import org.junit.Assert.*
 import org.junit.BeforeClass
 import java.io.File
+import java.util.concurrent.LinkedBlockingQueue
+import java.util.concurrent.ThreadPoolExecutor
+import java.util.concurrent.TimeUnit
 
 /**
  * Instrumented test, which will execute on an Android device.
@@ -32,21 +37,19 @@ class PdfKitAndroidTest {
     fun test_startConversion_1() {
         getExternalFilesDir("PdfKitDemo_1.pdf")?.let { outputFile ->
             println(println("Logger a-00"))
-            Handler(getContext().mainLooper).post {
-                PdfKit(getContext()).startConversion(
-                        url = "https://stackoverflow.com/",
-                        outputFile = outputFile,
-                        onPdfPrintListener = object : PdfKit.OnPdfConversionListener {
-                            override fun onError(e: Exception) {
-                                println("PDFPRINT onError: $e")
-                            }
+            PdfKit(getContext()).startConversion(
+                    url = "https://stackoverflow.com/",
+                    outputFile = outputFile,
+                    onPdfPrintListener = object : PdfKit.OnPdfConversionListener {
+                        override fun onError(e: Exception) {
+                            println("PDFPRINT onError: $e")
+                        }
 
-                            override fun onSuccess(pdfFileLocation: File) {
-                                println("PDFPRINT onSuccess: $outputFile")
-                            }
+                        override fun onSuccess(pdfFileLocation: File) {
+                            println("PDFPRINT onSuccess: $outputFile")
                         }
-                )
-            }
+                    }
+            )
         }
     }
 
@@ -74,25 +77,6 @@ class PdfKitAndroidTest {
 
     }
 
-    @Test
-    fun test_startConversion_3() {
-        getExternalFilesDir("PdfKitDemo_3.pdf")?.let {outputFile->
-            PdfKit(getContext()).startConversion(
-                    webView = WebView(getContext()),
-                    outputFile = outputFile,
-                    onPdfPrintListener = object : PdfKit.OnPdfConversionListener {
-                        override fun onError(e: Exception) {
-                            Log.d("TAG", "onError: $e")
-                        }
-
-                        override fun onSuccess(pdfFileLocation: File) {
-                            assertEquals(pdfFileLocation, outputFile)
-                        }
-                    }
-            )
-        }
-    }
-
     private fun getExternalFilesDir(fileName: String): File{
         return File(getContext().getExternalFilesDir("pdf"), fileName).apply {
             createNewFile()
@@ -101,4 +85,5 @@ class PdfKitAndroidTest {
 
     private fun getContext(): Context =
             ApplicationProvider.getApplicationContext()
+
 }
diff --git a/pdfkit/src/main/AndroidManifest.xml b/pdfkit/src/main/AndroidManifest.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="com.mecofarid.pdfkit">
     <uses-permission android:name="android.permission.INTERNET"/>
-    <application
-        tools:targetApi="m"
-        android:usesCleartextTraffic="true"/>
 </manifest>
diff --git a/pdfkit/src/main/java/android/print/InternalConversionHandler.kt b/pdfkit/src/main/java/android/print/InternalConversionHandler.kt
@@ -0,0 +1,32 @@
+package android.print
+
+import android.os.Handler
+import android.os.HandlerThread
+import android.os.Looper
+import android.os.Message
+import android.util.Log
+import java.util.concurrent.LinkedBlockingQueue
+import java.util.concurrent.ThreadFactory
+import java.util.concurrent.ThreadPoolExecutor
+import java.util.concurrent.TimeUnit
+
+internal object InternalConversionHandler{
+
+    private const val CORE_POOL_SIZE = 5
+    private const val MAXIMUM_POOL_SIZE = 20
+    private const val KEEP_ALIVE_SECONDS = 3L
+
+    private val threadPoolExecutor = ThreadPoolExecutor(
+            CORE_POOL_SIZE,
+            MAXIMUM_POOL_SIZE,
+            KEEP_ALIVE_SECONDS,
+            TimeUnit.SECONDS,
+            LinkedBlockingQueue()
+    ).also {
+        it.allowCoreThreadTimeOut(true)
+    }
+
+    fun execute(runnable: Runnable){
+        threadPoolExecutor.execute(runnable)
+    }
+}