From 974308c95954baca0b511221664325fc4e1c990a Mon Sep 17 00:00:00 2001 From: Daniel Kao Date: Tue, 4 Jan 2022 17:36:43 +0800 Subject: [PATCH] remove synchronized annotation --- .../main/java/de/baumann/browser/activity/BrowserActivity.kt | 4 ---- app/src/main/java/de/baumann/browser/browser/AdBlock.kt | 3 --- .../main/java/de/baumann/browser/browser/BrowserContainer.kt | 5 ----- .../java/de/baumann/browser/browser/NinjaWebViewClient.kt | 2 +- app/src/main/java/de/baumann/browser/view/NinjaWebView.kt | 5 ----- .../main/java/de/baumann/browser/view/dialog/MenuDialog.kt | 2 +- 6 files changed, 2 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/de/baumann/browser/activity/BrowserActivity.kt b/app/src/main/java/de/baumann/browser/activity/BrowserActivity.kt index 1deef2c79..2b2902989 100755 --- a/app/src/main/java/de/baumann/browser/activity/BrowserActivity.kt +++ b/app/src/main/java/de/baumann/browser/activity/BrowserActivity.kt @@ -391,7 +391,6 @@ open class BrowserActivity : ComponentActivity(), BrowserController, OnClickList return false } - @Synchronized override fun showAlbum(controller: AlbumController) { if (currentAlbumController != null) { if (currentAlbumController == controller) { @@ -1057,7 +1056,6 @@ open class BrowserActivity : ComponentActivity(), BrowserController, OnClickList private var preloadedWebView: NinjaWebView? = null - @Synchronized private fun addAlbum( title: String = "", url: String? = config.favoriteUrl, @@ -1129,7 +1127,6 @@ open class BrowserActivity : ComponentActivity(), BrowserController, OnClickList ) } - @Synchronized private fun updateAlbum(url: String?) { if (url == null) return (currentAlbumController as NinjaWebView).loadUrl(url) @@ -1149,7 +1146,6 @@ open class BrowserActivity : ComponentActivity(), BrowserController, OnClickList } } - @Synchronized override fun removeAlbum(controller: AlbumController) { updateSavedAlbumInfo() diff --git a/app/src/main/java/de/baumann/browser/browser/AdBlock.kt b/app/src/main/java/de/baumann/browser/browser/AdBlock.kt index f5b4402e7..3a570f4ad 100755 --- a/app/src/main/java/de/baumann/browser/browser/AdBlock.kt +++ b/app/src/main/java/de/baumann/browser/browser/AdBlock.kt @@ -43,7 +43,6 @@ class AdBlock(private val context: Context): KoinComponent { return config.adSites.any { url.contains(it, true) } } - @Synchronized fun addDomain(domain: String?) { with(RecordDb(context)) { open(true) @@ -53,7 +52,6 @@ class AdBlock(private val context: Context): KoinComponent { whitelist.add(domain) } - @Synchronized fun removeDomain(domain: String?) { with(RecordDb(context)) { open(true) @@ -63,7 +61,6 @@ class AdBlock(private val context: Context): KoinComponent { whitelist.remove(domain) } - @Synchronized fun clearDomains() { with(RecordDb(context)) { open(true) diff --git a/app/src/main/java/de/baumann/browser/browser/BrowserContainer.kt b/app/src/main/java/de/baumann/browser/browser/BrowserContainer.kt index 0bca03a71..627c2f258 100755 --- a/app/src/main/java/de/baumann/browser/browser/BrowserContainer.kt +++ b/app/src/main/java/de/baumann/browser/browser/BrowserContainer.kt @@ -1,6 +1,5 @@ package de.baumann.browser.browser -import kotlin.jvm.Synchronized import de.baumann.browser.view.NinjaWebView import java.util.* @@ -10,13 +9,10 @@ class BrowserContainer { return list[index] } - @Synchronized fun add(controller: AlbumController) = list.add(controller) - @Synchronized fun add(controller: AlbumController, index: Int) = list.add(index, controller) - @Synchronized fun remove(controller: AlbumController) { (controller as NinjaWebView).destroy() list.remove(controller) @@ -28,7 +24,6 @@ class BrowserContainer { fun size(): Int = list.size - @Synchronized fun clear() { for (albumController in list) { (albumController as NinjaWebView).destroy() diff --git a/app/src/main/java/de/baumann/browser/browser/NinjaWebViewClient.kt b/app/src/main/java/de/baumann/browser/browser/NinjaWebViewClient.kt index 89b6dfd0a..c83d4955a 100755 --- a/app/src/main/java/de/baumann/browser/browser/NinjaWebViewClient.kt +++ b/app/src/main/java/de/baumann/browser/browser/NinjaWebViewClient.kt @@ -161,7 +161,7 @@ class NinjaWebViewClient( } override fun shouldInterceptRequest(view: WebView, url: String): WebResourceResponse? { - if (hasAdBlock && !white && adBlock.isAd(url)) { + if (hasAdBlock && !white && adBlock.isAd(url)) { return adTxtResponse } if (!sp.getBoolean(context.getString(R.string.sp_cookies), true)) { diff --git a/app/src/main/java/de/baumann/browser/view/NinjaWebView.kt b/app/src/main/java/de/baumann/browser/view/NinjaWebView.kt index b8449fe83..39b8f0823 100755 --- a/app/src/main/java/de/baumann/browser/view/NinjaWebView.kt +++ b/app/src/main/java/de/baumann/browser/view/NinjaWebView.kt @@ -300,7 +300,6 @@ class NinjaWebView : WebView, AlbumController, KoinComponent { override fun keepPlaying(): Boolean = keepPlaying - @Synchronized override fun activate() { requestFocus() isForeground = true @@ -313,14 +312,12 @@ class NinjaWebView : WebView, AlbumController, KoinComponent { } } - @Synchronized override fun deactivate() { clearFocus() isForeground = false album.deactivate() } - @Synchronized fun update(progress: Int) { if (isForeground) { browserController?.updateProgress(progress) @@ -335,14 +332,12 @@ class NinjaWebView : WebView, AlbumController, KoinComponent { } } - @Synchronized fun update(title: String?) { album.albumTitle = title ?: "" // so that title on bottom bar can be updated browserController?.updateTitle(album.albumTitle) } - @Synchronized override fun destroy() { stopLoading() onPause() diff --git a/app/src/main/java/de/baumann/browser/view/dialog/MenuDialog.kt b/app/src/main/java/de/baumann/browser/view/dialog/MenuDialog.kt index 3714ff075..708604028 100644 --- a/app/src/main/java/de/baumann/browser/view/dialog/MenuDialog.kt +++ b/app/src/main/java/de/baumann/browser/view/dialog/MenuDialog.kt @@ -56,7 +56,7 @@ class MenuDialog( binding.buttonSplitScreen.setOnClickListener { dialog.dismissWithAction(toggleSplitScreenAction) } binding.buttonFontSize.setOnClickListener { dialog.dismissWithAction(fontSizeAction) } binding.buttonCloseTab.setOnClickListener { dialog.dismissWithAction(closeTabAction) } - binding.buttonQuit.setOnClickListener { dialog.dismissWithAction { (context as Activity).finish() } } + binding.buttonQuit.setOnClickListener { dialog.dismissWithAction { (context as Activity).finishAndRemoveTask() } } binding.buttonBold.setOnClickListener { dialog.dismissWithAction { config.boldFontStyle = !config.boldFontStyle } } binding.buttonWhiteBackground.setOnClickListener { dialog.dismissWithAction { config.whiteBackground = !config.whiteBackground} } binding.buttonReader.setOnClickListener { dialog.dismissWithAction { ninjaWebView.toggleReaderMode() } }