...

app/src/main/java/com/base/browserwhite/bean/BookmarkBean.kt

@@ -6,7 +6,7 @@ import com.base.browserwhite.utils.ColorUtils
 class BookmarkBean(
     var folderId: Long = folderRootId,
     var folder: String = folderRoot,
-    var name: String = "",
+    var name: String = "about:black",
     var url: String = "",
     var isFolder: Boolean = false,
     var color: Int = ColorUtils.getRandomColor()

app/src/main/java/com/base/browserwhite/ui/activity/webbrowser/WebBrowserActivity.kt

@@ -24,6 +24,7 @@ import com.base.browserwhite.MyApplication
 import com.base.browserwhite.R
 import com.base.browserwhite.ads.AdmobMaxHelper
 import com.base.browserwhite.ads.AdmobMaxHelper.lastShowInter
+import com.base.browserwhite.bean.BookmarkBean
 import com.base.browserwhite.bean.ConstObject
 import com.base.browserwhite.bean.ConstObject.GOOGLE
 import com.base.browserwhite.bean.ConstObject.searchEngineSp
@@ -35,6 +36,7 @@ import com.base.browserwhite.ui.activity.bookmark.BookmarkActivity
 import com.base.browserwhite.ui.activity.bookmark.BookmarkEditActivity
 import com.base.browserwhite.ui.activity.search.SearchActivity
 import com.base.browserwhite.ui.views.DialogViews.showAddRootBookmarkDialog
+import com.base.browserwhite.ui.views.DialogViews.showDeleteTipDialog
 import com.base.browserwhite.ui.views.DialogViews.showSearchEngineDialog
 import com.base.browserwhite.ui.views.DialogViews.showWebBrowserMoreDialog
 import com.base.browserwhite.utils.BarUtils
@@ -42,15 +44,14 @@ import com.base.browserwhite.utils.LinkSearchUtils.getBaiduSearch
 import com.base.browserwhite.utils.LinkSearchUtils.getBingSearch
 import com.base.browserwhite.utils.LinkSearchUtils.getDuckDuckGoSearch
 import com.base.browserwhite.utils.LinkSearchUtils.getGoogleSearch
-import com.base.browserwhite.utils.LinkSearchUtils.getSearchUrl
 import com.base.browserwhite.utils.LinkSearchUtils.getSpSearchAction
 import com.base.browserwhite.utils.LinkSearchUtils.getYahooSearch
 import com.base.browserwhite.utils.LinkSearchUtils.getYandexSearch
-import com.base.browserwhite.utils.LinkSearchUtils.handleInput
 import com.base.browserwhite.utils.SpBeanUtils
 import com.base.browserwhite.utils.SpBeanUtils.BOOKMARK_SP_KEY
 import com.base.browserwhite.utils.Utils
 import com.base.browserwhite.utils.Utils.dpToPx
+import com.google.gson.Gson
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Observable
 import kotlinx.coroutines.delay
@@ -250,15 +251,24 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
                     startActivity(Intent(this, BookmarkActivity::class.java))
                 },
                 joinAction = {
-                    currentFragment?.bookmarkBean?.let { SpBeanUtils.addSpBean(BOOKMARK_SP_KEY, it) }
-                    val dialog = showAddRootBookmarkDialog {
-                        BookmarkEditActivity.editBookmark = currentFragment?.bookmarkBean
-                        startActivity(Intent(this, BookmarkEditActivity::class.java))
-                    }
-                    lifecycleScope.launch {
-                        delay(2500)
-                        dialog.dismiss()
+                    val json = getAddedBookmarkJson(currentFragment?.bookmarkBean?.url ?: "")
+                    if (json == null) {
+                        currentFragment?.bookmarkBean?.let { SpBeanUtils.addSpBean(BOOKMARK_SP_KEY, it) }
+                        val dialog = showAddRootBookmarkDialog {
+                            BookmarkEditActivity.editBookmark = currentFragment?.bookmarkBean
+                            startActivity(Intent(this, BookmarkEditActivity::class.java))
+                        }
+                        lifecycleScope.launch {
+                            delay(2500)
+                            dialog.dismiss()
+                        }
+                    } else {
+                        val bean = Gson().fromJson(json, BookmarkBean::class.java)
+                        showDeleteTipDialog("Delete Bookmark [${bean.name}]") {
+                            SpBeanUtils.deleteSpBeanCondition(BOOKMARK_SP_KEY, bean.id)
+                        }
                     }
+
                 })
         }
 
@@ -305,4 +315,8 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
 
     }
 
+    private fun getAddedBookmarkJson(url: String): String? {
+        return SpBeanUtils.getSpBeanList(BOOKMARK_SP_KEY).find { Gson().fromJson(it, BookmarkBean::class.java).url == url }
+    }
+
 }
\ No newline at end of file

app/src/main/java/com/base/browserwhite/ui/activity/webbrowser/WebViewFragment.kt

@@ -31,6 +31,7 @@ import com.base.browserwhite.utils.DownloadUtils.getDownloadJsonBean
 import com.base.browserwhite.utils.DownloadUtils.saveDownloadRecordFile
 import com.base.browserwhite.utils.LogEx
 import com.base.browserwhite.utils.SpBeanUtils
+import com.base.browserwhite.utils.SpBeanUtils.BOOKMARK_SP_KEY
 import com.base.browserwhite.utils.SpBeanUtils.HISTORY_SP_KEY
 import com.google.gson.Gson
 import com.liulishuo.filedownloader.FileDownloader