Skip to content

Commit 04917b2

Browse files
committed
Update
1 parent e52899d commit 04917b2

2 files changed

Lines changed: 7 additions & 37 deletions

File tree

app/src/main/java/com/omarea/krscript/WebViewInjector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void inject(final Activity activity, final boolean credible) {
6363
webSettings.setCacheMode(WebSettings.LOAD_DEFAULT); // Sử dụng cache hệ thống
6464

6565
// Tạm thời chặn ảnh để ưu tiên tải cấu trúc HTML và Script Shell
66-
webSettings.setBlockNetworkImage(true);
66+
webSettings.setBlockNetworkImage(false);
6767

6868
webSettings.setAllowFileAccess(credible);
6969
webSettings.setAllowUniversalAccessFromFileURLs(credible);

app/src/main/java/com/tool/tree/ActionPageOnline.kt

Lines changed: 6 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ class ActionPageOnline : AppCompatActivity() {
3939
private lateinit var binding: ActivityActionPageOnlineBinding
4040
private var progressPolling: Timer? = null
4141
private var fileSelectedInterface: ParamsFileChooserRender.FileSelectedInterface? = null
42-
private var isLoading = false // Biến theo dõi trạng thái loading
43-
4442
private val ACTION_FILE_PATH_CHOOSER = 65400
4543
private val MENU_OPEN_BROWSER = 1001
4644

@@ -61,41 +59,23 @@ class ActionPageOnline : AppCompatActivity() {
6159
setHomeButtonEnabled(true)
6260
}
6361

64-
// Xử lý khi nhấn nút Back trên Toolbar
6562
toolbar.setNavigationOnClickListener {
66-
if (isLoading) {
67-
cancelLoading()
68-
} else {
69-
finish()
70-
}
63+
finish()
7164
}
7265

7366
binding.krOnlineWebview.setLayerType(View.LAYER_TYPE_HARDWARE, null)
7467

75-
// Xử lý khi vuốt Back hoặc nhấn nút Back hệ thống
7668
onBackPressedDispatcher.addCallback(this) {
77-
if (isLoading) {
78-
// Nếu đang load thì hủy quá trình load
79-
cancelLoading()
80-
} else if (binding.krOnlineWebview.canGoBack()) {
81-
// Nếu có thể back trong lịch sử web
69+
if (binding.krOnlineWebview.canGoBack()) {
8270
binding.krOnlineWebview.goBack()
8371
} else {
84-
// Thoát activity
8572
finish()
8673
}
8774
}
8875

8976
loadIntentData()
9077
}
9178

92-
// Hàm bổ trợ để hủy load
93-
private fun cancelLoading() {
94-
binding.krOnlineWebview.stopLoading()
95-
progressBarDialog.hideDialog()
96-
isLoading = false
97-
}
98-
9979
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
10080
menu?.add(0, MENU_OPEN_BROWSER, 0, R.string.open_in_browser)?.apply {
10181
setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
@@ -110,9 +90,7 @@ class ActionPageOnline : AppCompatActivity() {
11090
true
11191
}
11292
android.R.id.home -> {
113-
// Toolbar đã được xử lý ở setNavigationOnClickListener,
114-
// nhưng giữ ở đây để đảm bảo tính tương thích
115-
if (isLoading) cancelLoading() else finish()
93+
finish()
11694
true
11795
}
11896
else -> super.onOptionsItemSelected(item)
@@ -204,23 +182,15 @@ class ActionPageOnline : AppCompatActivity() {
204182
}
205183

206184
binding.krOnlineWebview.webViewClient = object : WebViewClient() {
207-
override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
208-
super.onPageStarted(view, url, favicon)
209-
isLoading = true
210-
progressBarDialog.showDialog(getString(R.string.please_wait))
211-
}
212-
213185
override fun onPageFinished(view: WebView?, url: String?) {
214186
super.onPageFinished(view, url)
215-
isLoading = false
216187
progressBarDialog.hideDialog()
217188
view?.title?.let { setTitle(it) }
218189
}
219190

220-
override fun onReceivedError(view: WebView?, request: WebResourceRequest?, error: WebResourceError?) {
221-
super.onReceivedError(view, request, error)
222-
isLoading = false
223-
progressBarDialog.hideDialog()
191+
override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
192+
super.onPageStarted(view, url, favicon)
193+
progressBarDialog.showDialog(getString(R.string.please_wait))
224194
}
225195

226196
override fun shouldOverrideUrlLoading(view: WebView?, request: WebResourceRequest?): Boolean {

0 commit comments

Comments
 (0)