From 51b8fbf6427b6007188a1a9a2d1e5abd3ba7df59 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Mon, 14 Sep 2020 21:25:37 -0400 Subject: [PATCH 001/161] Add named arguments --- .../browser/lightning/search/SuggestionsAdapter.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.kt b/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.kt index d68f209c7..bc288663b 100644 --- a/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.kt @@ -192,15 +192,15 @@ class SuggestionsAdapter( bookmarksEntries .join( - historyEntries, - { bookmarksEntries }, - { historyEntries } + other = historyEntries, + selectorLeft = { bookmarksEntries }, + selectorRight = { historyEntries } ) { t1, t2 -> Pair(t1, t2) } .compose { bookmarksAndHistory -> bookmarksAndHistory.join( - searchEntries, - { bookmarksAndHistory }, - { searchEntries } + other = searchEntries, + selectorLeft = { bookmarksAndHistory }, + selectorRight = { searchEntries } ) { (bookmarks, history), t2 -> Triple(bookmarks, history, t2) } From 08f4251be8c920fd316b0d053955ea46e70e02a3 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Mon, 14 Sep 2020 21:26:24 -0400 Subject: [PATCH 002/161] Initial browser2 rewrite First stage of the browser2 rewrite. partially functional with search, tab and bookmark navigation. --- app/build.gradle | 4 + app/src/main/AndroidManifest.xml | 2 +- .../lightning/_browser2/BrowserActivity.kt | 145 ++++++ .../lightning/_browser2/BrowserContract.kt | 38 ++ .../lightning/_browser2/BrowserPresenter.kt | 325 ++++++++++++++ .../lightning/_browser2/BrowserViewState.kt | 25 ++ .../bookmark/BookmarkRecyclerViewAdapter.kt | 43 ++ .../_browser2/bookmark/BookmarkViewHolder.kt | 31 ++ .../_browser2/search/SearchListener.kt | 40 ++ .../browser/lightning/_browser2/tab/Tab.kt | 69 +++ .../lightning/_browser2/tab/TabAdapter.kt | 106 +++++ .../lightning/_browser2/tab/TabPager.kt | 33 ++ .../_browser2/tab/TabRecyclerViewAdapter.kt | 73 +++ .../lightning/_browser2/tab/TabViewHolder.kt | 45 ++ .../_browser2/tab/TabWebChromeClient.kt | 24 + .../_browser2/tab/TabWebViewClient.kt | 48 ++ .../lightning/_browser2/tab/TabsRepository.kt | 63 +++ .../lightning/_browser2/tab/WebViewFactory.kt | 179 ++++++++ app/src/main/res/layout/browser_activity.xml | 415 ++++++++++++++++++ 19 files changed, 1707 insertions(+), 1 deletion(-) create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/bookmark/BookmarkRecyclerViewAdapter.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/bookmark/BookmarkViewHolder.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/search/SearchListener.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/tab/Tab.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/tab/TabRecyclerViewAdapter.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/tab/TabViewHolder.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebViewClient.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/tab/WebViewFactory.kt create mode 100644 app/src/main/res/layout/browser_activity.xml diff --git a/app/build.gradle b/app/build.gradle index 0be4b114d..3374d562b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,6 +22,10 @@ android { lightningLite.setRoot('src/LightningLite') } + buildFeatures { + viewBinding true + } + buildTypes { debug { multiDexEnabled true diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 07f408930..6123a3040 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:value="2.1"/> + presenter.onSearchSuggestionClicked(suggestionsAdapter.getItem(position) as WebPage) + } + binding.search.setAdapter(suggestionsAdapter) + val searchListener = SearchListener(onConfirm = { + presenter.onSearch(binding.search.text.toString()) + }) + binding.search.setOnEditorActionListener(searchListener) + binding.search.setOnKeyListener(searchListener) + + binding.actionBack.setOnClickListener { presenter.onBackClick() } + binding.actionForward.setOnClickListener { presenter.onForwardClick() } + binding.actionHome.setOnClickListener { presenter.onHomeClick() } + binding.newTabButton.setOnClickListener { presenter.onNewTabClick() } + binding.searchRefresh.setOnClickListener { presenter.onRefreshOrStopClick() } + } + + override fun onDestroy() { + super.onDestroy() + presenter.onViewDetached() + } + + override fun onCreateOptionsMenu(menu: Menu): Boolean { + menuInflater.inflate(R.menu.main, menu) + return super.onCreateOptionsMenu(menu) + } + + override fun renderState(viewState: BrowserViewState) { + binding.actionBack.isEnabled = viewState.isBackEnabled + binding.actionForward.isEnabled = viewState.isForwardEnabled + binding.search.setText(viewState.displayUrl) + binding.searchSslStatus.setImageDrawable(createSslDrawableForState(viewState.sslState)) + binding.searchSslStatus.updateVisibilityForDrawable() + binding.tabCountView.updateCount(viewState.tabs.size) + binding.progressView.progress = viewState.progress + binding.searchRefresh.setImageResource(if (viewState.isRefresh) { + R.drawable.ic_action_refresh + } else { + R.drawable.ic_action_delete + }) + tabsAdapter.submitList(viewState.tabs) + bookmarksAdapter.submitList(viewState.bookmarks) + } + + private fun ImageView.updateVisibilityForDrawable() { + if (drawable == null) { + visibility = View.GONE + } else { + visibility = View.VISIBLE + } + } +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt new file mode 100644 index 000000000..32b74a34e --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt @@ -0,0 +1,38 @@ +package acr.browser.lightning._browser2 + +import acr.browser.lightning._browser2.tab.TabModel +import io.reactivex.Completable +import io.reactivex.Maybe +import io.reactivex.Observable +import io.reactivex.Single + +/** + * Created by anthonycr on 9/11/20. + */ + + +interface BrowserContract { + + interface View { + + fun renderState(viewState: BrowserViewState) + + } + + interface Model { + + fun deleteTab(id: Int): Completable + + fun createTab(initialUrl: String?): Single + + fun selectTab(id: Int): TabModel + + fun initializeTabs(): Maybe> + + val tabsList: List + + fun tabsListChanges(): Observable> + + } + +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt new file mode 100644 index 000000000..1b37cb7c4 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -0,0 +1,325 @@ +package acr.browser.lightning._browser2 + +import acr.browser.lightning._browser2.tab.Tab +import acr.browser.lightning._browser2.tab.TabModel +import acr.browser.lightning.database.Bookmark +import acr.browser.lightning.database.HistoryEntry +import acr.browser.lightning.database.SearchSuggestion +import acr.browser.lightning.database.WebPage +import acr.browser.lightning.database.bookmark.BookmarkRepository +import acr.browser.lightning.di.DatabaseScheduler +import acr.browser.lightning.di.MainScheduler +import acr.browser.lightning.ssl.SslState +import acr.browser.lightning.utils.smartUrlFilter +import io.reactivex.Scheduler +import io.reactivex.disposables.CompositeDisposable +import io.reactivex.disposables.Disposable +import io.reactivex.rxkotlin.plusAssign + +/** + * Created by anthonycr on 9/11/20. + */ +class BrowserPresenter( + private val model: BrowserContract.Model, + private val bookmarkRepository: BookmarkRepository, + @MainScheduler private val mainScheduler: Scheduler, + @DatabaseScheduler private val databaseScheduler: Scheduler +) { + + private var view: BrowserContract.View? = null + private var viewState: BrowserViewState = BrowserViewState( + displayUrl = "", + isRefresh = true, + sslState = SslState.None, + progress = 0, + tabs = emptyList(), + isForwardEnabled = false, + isBackEnabled = false, + bookmarks = emptyList(), + isBookmarked = false + ) + private var currentTab: TabModel? = null + private var currentFolder: Bookmark.Folder = Bookmark.Folder.Root + + private val compositeDisposable = CompositeDisposable() + private var sslDisposable: Disposable? = null + private var titleDisposable: Disposable? = null + private var urlDisposable: Disposable? = null + private var loadingDisposable: Disposable? = null + private var canGoBackDisposable: Disposable? = null + private var canGoForwardDisposable: Disposable? = null + + fun onViewAttached(view: BrowserContract.View) { + this.view = view + view.updateState(viewState) + + compositeDisposable += bookmarkRepository.getBookmarksFromFolderSorted(folder = null) + .subscribeOn(databaseScheduler) + .observeOn(mainScheduler) + .subscribe { list -> + this.view?.updateState(viewState.copy(bookmarks = list)) + } + + compositeDisposable += model.initializeTabs() + .subscribeOn(databaseScheduler) + .observeOn(mainScheduler) + .switchIfEmpty(model.createTab(initialUrl = null).map(::listOf)) + .subscribe { list -> + this.view.updateState(viewState.copy(tabs = list.map { it.asViewState() })) + selectTab(model.selectTab(list.last().id)) + } + + compositeDisposable += model.tabsListChanges() + .observeOn(mainScheduler) + .subscribe { list -> + this.view.updateState(viewState.copy(tabs = list.map { it.asViewState() })) + } + } + + private fun TabModel.asViewState(): Tab = Tab( + id = id, + icon = "", + title = title, + isSelected = isForeground + ) + + private fun List.updateId(id: Int, map: (Tab) -> Tab): List = map { + if (it.id == id) { + map(it) + } else { + it + } + } + + private fun selectTab(tabModel: TabModel?) { + if (currentTab == tabModel) { + return + } + currentTab?.isForeground = false + currentTab = tabModel + currentTab?.isForeground = true + + view.updateState(viewState.copy( + displayUrl = tabModel?.url.orEmpty(), + isForwardEnabled = tabModel?.canGoForward() ?: false, + isBackEnabled = tabModel?.canGoBack() ?: false, + sslState = tabModel?.sslState ?: SslState.None, + progress = tabModel?.loadingProgress ?: 100, + tabs = viewState.tabs.map { + if (it.id == tabModel?.id) { + it.copy(isSelected = true) + } else { + it.copy(isSelected = false) + } + } + )) + + sslDisposable?.dispose() + sslDisposable = tabModel?.sslChanges() + ?.distinctUntilChanged() + ?.observeOn(mainScheduler) + ?.subscribe { + view.updateState(viewState.copy(sslState = it)) + } + + titleDisposable?.dispose() + titleDisposable = tabModel?.titleChanges() + ?.distinctUntilChanged() + ?.observeOn(mainScheduler) + ?.subscribe { title -> + view.updateState(viewState.copy(tabs = viewState.tabs.updateId(tabModel.id) { + it.copy(title = title) + })) + } + + urlDisposable?.dispose() + urlDisposable = tabModel?.urlChanges() + ?.distinctUntilChanged() + ?.observeOn(mainScheduler) + ?.subscribe { + view.updateState(viewState.copy(displayUrl = it)) + } + + loadingDisposable?.dispose() + loadingDisposable = tabModel?.loadingProgress() + ?.distinctUntilChanged() + ?.observeOn(mainScheduler) + ?.subscribe { + view.updateState(viewState.copy(progress = it, isRefresh = it == 100)) + } + + canGoBackDisposable?.dispose() + canGoBackDisposable = tabModel?.canGoBackChanges() + ?.distinctUntilChanged() + ?.observeOn(mainScheduler) + ?.subscribe { + view.updateState(viewState.copy(isBackEnabled = it)) + } + + canGoForwardDisposable?.dispose() + canGoForwardDisposable = tabModel?.canGoForwardChanges() + ?.distinctUntilChanged() + ?.observeOn(mainScheduler) + ?.subscribe { + view.updateState(viewState.copy(isForwardEnabled = it)) + } + } + + fun onViewDetached() { + view = null + compositeDisposable.dispose() + + sslDisposable?.dispose() + titleDisposable?.dispose() + urlDisposable?.dispose() + loadingDisposable?.dispose() + canGoBackDisposable?.dispose() + canGoForwardDisposable?.dispose() + } + + fun onTabClick(index: Int) { + selectTab(model.selectTab(viewState.tabs[index].id)) + } + + private fun List.nextSelected(removedIndex: Int): T? { + val nextIndex = when { + removedIndex > 0 -> removedIndex - 1 + size > removedIndex + 1 -> removedIndex + 1 + else -> -1 + } + return if (nextIndex >= 0) { + this[nextIndex] + } else { + null + } + } + + fun onTabClose(index: Int) { + val nextTab = viewState.tabs.nextSelected(index) + + val needToSelectNextTab = viewState.tabs[index].id == currentTab?.id + + compositeDisposable += model.deleteTab(viewState.tabs[index].id) + .observeOn(mainScheduler) + .subscribe { + if (needToSelectNextTab) { + nextTab?.id?.let { + selectTab(model.selectTab(it)) + } ?: selectTab(tabModel = null) + } + } + } + + fun onBackClick() { + if (currentTab?.canGoBack() == true) { + currentTab?.goBack() + } + } + + fun onForwardClick() { + if (currentTab?.canGoForward() == true) { + currentTab?.goForward() + } + } + + fun onHomeClick() { + currentTab?.loadUrl("https://google.com") + } + + fun onNewTabClick() { + compositeDisposable += model.createTab(initialUrl = null) + .observeOn(mainScheduler) + .subscribe { tab -> + selectTab(model.selectTab(tab.id)) + } + } + + fun onRefreshOrStopClick() { + if (currentTab?.loadingProgress != 100) { + currentTab?.stopLoading() + } else { + currentTab?.reload() + } + } + + fun onSearch(query: String) { + currentTab?.stopLoading() + val url = smartUrlFilter(query, true, SEARCH) + view?.updateState(viewState.copy(displayUrl = url)) + currentTab?.loadUrl(url) + } + + fun onSearchSuggestionClicked(webPage: WebPage) { + val url = when (webPage) { + is HistoryEntry, + is Bookmark.Entry -> webPage.url + is SearchSuggestion -> webPage.title + else -> null + } ?: error("Other types cannot be search suggestions: $webPage") + + onSearch(url) + } + + fun onSslIconClick() { + + } + + fun onBookmarkClick(index: Int) { + when (val bookmark = viewState.bookmarks[index]) { + is Bookmark.Entry -> currentTab?.loadUrl(bookmark.url) + Bookmark.Folder.Root -> TODO() + is Bookmark.Folder.Entry -> { + currentFolder = bookmark + compositeDisposable += bookmarkRepository + .getBookmarksFromFolderSorted(folder = bookmark.title) + .subscribeOn(databaseScheduler) + .observeOn(mainScheduler) + .subscribe { list -> + view?.updateState(viewState.copy(bookmarks = list)) + } + } + } + + } + + fun onBookmarkLongClick(index: Int) { + + } + + fun onToolsClick() { + + } + + fun onStarClick() { + + } + + fun onReadingModeClick() { + + } + + fun onTabMenuClick() { + + } + + fun onBookmarkMenuClick() { + if (currentFolder != Bookmark.Folder.Root) { + compositeDisposable += bookmarkRepository + .getBookmarksFromFolderSorted(folder = null) + .subscribeOn(databaseScheduler) + .observeOn(mainScheduler) + .subscribe { list -> + view?.updateState(viewState.copy(bookmarks = list)) + } + } + } + + private fun BrowserContract.View?.updateState(state: BrowserViewState) { + viewState = state + this?.renderState(viewState) + } + + private companion object { + private const val SEARCH = "https://www.google.com/search?client=lightning&ie=UTF-8&oe=UTF-8&q=%s" + } +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt new file mode 100644 index 000000000..5d21feb93 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt @@ -0,0 +1,25 @@ +package acr.browser.lightning._browser2 + +import acr.browser.lightning._browser2.tab.Tab +import acr.browser.lightning.database.Bookmark +import acr.browser.lightning.ssl.SslState + +/** + * Created by anthonycr on 9/11/20. + */ +data class BrowserViewState( + // search bar + val displayUrl: String, + val sslState: SslState, + val isRefresh: Boolean, + val progress: Int, + + // Tabs + val tabs: List, + val isForwardEnabled: Boolean, + val isBackEnabled: Boolean, + + // Bookmarks + val bookmarks: List, + val isBookmarked: Boolean +) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/bookmark/BookmarkRecyclerViewAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/bookmark/BookmarkRecyclerViewAdapter.kt new file mode 100644 index 000000000..ac95d5ff1 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/bookmark/BookmarkRecyclerViewAdapter.kt @@ -0,0 +1,43 @@ +package acr.browser.lightning._browser2.bookmark + +import acr.browser.lightning.R +import acr.browser.lightning.database.Bookmark +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.DiffUtil +import androidx.recyclerview.widget.ListAdapter + +/** + * Created by anthonycr on 9/13/20. + */ +class BookmarkRecyclerViewAdapter( + private val onClick: (Int) -> Unit, + private val onLongClick: (Int) -> Unit +) : ListAdapter( + object : DiffUtil.ItemCallback() { + override fun areItemsTheSame(oldItem: Bookmark, newItem: Bookmark): Boolean = + oldItem == newItem + + override fun areContentsTheSame(oldItem: Bookmark, newItem: Bookmark): Boolean = + oldItem == newItem + } +) { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BookmarkViewHolder { + val inflater = LayoutInflater.from(parent.context) + val itemView = inflater.inflate(R.layout.bookmark_list_item, parent, false) + + return BookmarkViewHolder( + itemView, + onItemLongClickListener = onLongClick, + onItemClickListener = onClick + ) + } + + override fun onBindViewHolder(holder: BookmarkViewHolder, position: Int) { + val viewModel = getItem(position) + holder.binding.textBookmark.text = viewModel.title + + val url = viewModel.url + holder.binding.faviconBookmark.tag = url + } +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/bookmark/BookmarkViewHolder.kt b/app/src/main/java/acr/browser/lightning/_browser2/bookmark/BookmarkViewHolder.kt new file mode 100644 index 000000000..0cefc1add --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/bookmark/BookmarkViewHolder.kt @@ -0,0 +1,31 @@ +package acr.browser.lightning._browser2.bookmark + +import acr.browser.lightning.databinding.BookmarkListItemBinding +import android.view.View +import androidx.recyclerview.widget.RecyclerView + +/** + * Created by anthonycr on 9/13/20. + */ +class BookmarkViewHolder( + itemView: View, + private val onItemLongClickListener: (Int) -> Unit, + private val onItemClickListener: (Int) -> Unit +) : RecyclerView.ViewHolder(itemView), View.OnClickListener, View.OnLongClickListener { + + val binding = BookmarkListItemBinding.bind(itemView) + + init { + itemView.setOnLongClickListener(this) + itemView.setOnClickListener(this) + } + + override fun onClick(v: View) { + onItemClickListener(adapterPosition) + } + + override fun onLongClick(v: View): Boolean { + onItemLongClickListener(adapterPosition) + return true + } +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/search/SearchListener.kt b/app/src/main/java/acr/browser/lightning/_browser2/search/SearchListener.kt new file mode 100644 index 000000000..cf7dc8fe7 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/search/SearchListener.kt @@ -0,0 +1,40 @@ +package acr.browser.lightning._browser2.search + +import android.view.KeyEvent +import android.view.View +import android.view.inputmethod.EditorInfo +import android.widget.TextView + +/** + * Created by anthonycr on 9/14/20. + */ +class SearchListener( + private val onConfirm: () -> Unit, +) : View.OnKeyListener, TextView.OnEditorActionListener { + + override fun onKey(view: View, keyCode: Int, keyEvent: KeyEvent): Boolean { + if (keyEvent.action != KeyEvent.ACTION_UP) { + return false + } + return when (keyCode) { + KeyEvent.KEYCODE_ENTER -> { + onConfirm() + true + } + else -> false + } + } + + override fun onEditorAction(v: TextView, actionId: Int, event: KeyEvent?): Boolean { + if (actionId == EditorInfo.IME_ACTION_GO + || actionId == EditorInfo.IME_ACTION_DONE + || actionId == EditorInfo.IME_ACTION_NEXT + || actionId == EditorInfo.IME_ACTION_SEND + || actionId == EditorInfo.IME_ACTION_SEARCH + || event?.action == KeyEvent.KEYCODE_ENTER) { + onConfirm() + return true + } + return false + } +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/Tab.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/Tab.kt new file mode 100644 index 000000000..4b67b5301 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/Tab.kt @@ -0,0 +1,69 @@ +package acr.browser.lightning._browser2.tab + +import acr.browser.lightning.ssl.SslState +import io.reactivex.Observable + +/** + * Created by anthonycr on 9/11/20. + */ +data class Tab( + val id: Int, + val icon: String, + val title: String, + val isSelected: Boolean +) + +/* +probably needs to be an interface + */ + + +interface TabModel { + + val id: Int + + // Navigation + + fun loadUrl(url: String) + + fun goBack() + + fun canGoBack(): Boolean + + fun canGoBackChanges(): Observable + + fun goForward() + + fun canGoForward(): Boolean + + fun canGoForwardChanges(): Observable + + fun reload() + + fun stopLoading() + + // Data + + val url: String + + fun urlChanges(): Observable + + val title: String + + fun titleChanges(): Observable + + val sslState: SslState + + fun sslChanges(): Observable + + val loadingProgress: Int + + fun loadingProgress(): Observable + + // Lifecycle + + var isForeground: Boolean + + fun destroy() + +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt new file mode 100644 index 000000000..719689a88 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt @@ -0,0 +1,106 @@ +package acr.browser.lightning._browser2.tab + +import acr.browser.lightning.ssl.SslState +import acr.browser.lightning.view.TabInitializer +import android.webkit.WebView +import io.reactivex.Observable +import io.reactivex.subjects.PublishSubject + +/** + * Created by anthonycr on 9/12/20. + */ +class TabAdapter( + private val tabInitializer: TabInitializer, + private val webView: WebView, +) : TabModel { + + private val urlObservable = PublishSubject.create() + private val sslStateObservable = PublishSubject.create() + private val progressObservable = PublishSubject.create() + private val titleObservable = PublishSubject.create() + private val goBackObservable = PublishSubject.create() + private val goForwardObservable = PublishSubject.create() + private val tabWebViewClient = TabWebViewClient( + urlObservable = urlObservable, + sslStateObservable = sslStateObservable, + goBackObservable = goBackObservable, + goForwardObservable = goForwardObservable + ) + + init { + webView.webViewClient = tabWebViewClient + webView.webChromeClient = TabWebChromeClient( + progressObservable = progressObservable, + titleObservable = titleObservable + ) + tabInitializer.initialize(webView, emptyMap()) + } + + override val id: Int = webView.id + + override fun loadUrl(url: String) { + webView.loadUrl(url) + } + + override fun goBack() { + webView.goBack() + } + + override fun canGoBack(): Boolean = webView.canGoBack() + + override fun canGoBackChanges(): Observable = goBackObservable.hide() + + override fun goForward() { + webView.goForward() + } + + override fun canGoForward(): Boolean = webView.canGoForward() + + override fun canGoForwardChanges(): Observable = goForwardObservable.hide() + + override fun reload() { + webView.reload() + } + + override fun stopLoading() { + webView.stopLoading() + } + + override val url: String + get() = webView.url.orEmpty() + + override fun urlChanges(): Observable = urlObservable.hide() + + override val title: String + get() = webView.title.orEmpty() + + override fun titleChanges(): Observable = titleObservable.hide() + + override val sslState: SslState + get() = tabWebViewClient.sslState + + override fun sslChanges(): Observable = sslStateObservable.hide() + + override val loadingProgress: Int + get() = webView.progress + + override fun loadingProgress(): Observable = progressObservable.hide() + + override var isForeground: Boolean = false + set(value) { + field = value + if (field) { + webView.onResume() + } else { + webView.onPause() + } + } + + override fun destroy() { + webView.stopLoading() + webView.onPause() + webView.clearHistory() + webView.removeAllViews() + webView.destroy() + } +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt new file mode 100644 index 000000000..128a8cf5b --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt @@ -0,0 +1,33 @@ +package acr.browser.lightning._browser2.tab + +import android.view.ViewGroup +import android.webkit.WebView +import android.widget.FrameLayout + +/** + * Created by anthonycr on 9/12/20. + */ +class TabPager(private val container: FrameLayout) { + + private val webViews: MutableList = mutableListOf() + + fun selectTab(id: Int) { + container.removeAllViews() + container.addView( + webViews.forId(id), + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT + ) + } + + fun clearTab() { + container.removeAllViews() + } + + fun addTab(webView: WebView) { + webViews.add(webView) + } + + private fun List.forId(id: Int): WebView = requireNotNull(find { it.id == id }) + +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabRecyclerViewAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabRecyclerViewAdapter.kt new file mode 100644 index 000000000..da5cd8234 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabRecyclerViewAdapter.kt @@ -0,0 +1,73 @@ +package acr.browser.lightning._browser2.tab + +import acr.browser.lightning.R +import acr.browser.lightning.extensions.desaturate +import acr.browser.lightning.extensions.inflater +import acr.browser.lightning.view.BackgroundDrawable +import android.graphics.Bitmap +import android.view.ViewGroup +import androidx.core.widget.TextViewCompat +import androidx.recyclerview.widget.DiffUtil +import androidx.recyclerview.widget.ListAdapter + +/** + * Created by anthonycr on 9/12/20. + */ +class TabRecyclerViewAdapter( + private val onClick: (Int) -> Unit, + private val onLongClick: (Int) -> Unit, + private val onCloseClick: (Int) -> Unit, +) : ListAdapter( + object : DiffUtil.ItemCallback() { + override fun areItemsTheSame(oldItem: Tab, newItem: Tab): Boolean = + oldItem.id == newItem.id + + override fun areContentsTheSame(oldItem: Tab, newItem: Tab): Boolean = oldItem == newItem + } +) { + + override fun onCreateViewHolder(viewGroup: ViewGroup, i: Int): TabViewHolder { + val view = viewGroup.context.inflater.inflate(R.layout.tab_list_item, viewGroup, false) + view.background = BackgroundDrawable(view.context) + return TabViewHolder(view, onClick = onClick, onLongClick = onLongClick, onCloseClick = onCloseClick) + } + + override fun onBindViewHolder(holder: TabViewHolder, position: Int) { + holder.exitButton.tag = position + + val web = getItem(position) + + holder.txtTitle.text = web.title + updateViewHolderAppearance(holder, null, web.isSelected) + updateViewHolderFavicon(holder, null, web.isSelected) + updateViewHolderBackground(holder, web.isSelected) + } + + private fun updateViewHolderFavicon(viewHolder: TabViewHolder, favicon: Bitmap?, isForeground: Boolean) { + favicon?.let { + if (isForeground) { + viewHolder.favicon.setImageBitmap(it) + } else { + viewHolder.favicon.setImageBitmap(it.desaturate()) + } + } ?: viewHolder.favicon.setImageResource(R.drawable.ic_webpage) + } + + private fun updateViewHolderBackground(viewHolder: TabViewHolder, isForeground: Boolean) { + val verticalBackground = viewHolder.layout.background as BackgroundDrawable + verticalBackground.isCrossFadeEnabled = false + if (isForeground) { + verticalBackground.startTransition(200) + } else { + verticalBackground.reverseTransition(200) + } + } + + private fun updateViewHolderAppearance(viewHolder: TabViewHolder, favicon: Bitmap?, isForeground: Boolean) { + if (isForeground) { + TextViewCompat.setTextAppearance(viewHolder.txtTitle, R.style.boldText) + } else { + TextViewCompat.setTextAppearance(viewHolder.txtTitle, R.style.normalText) + } + } +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabViewHolder.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabViewHolder.kt new file mode 100644 index 000000000..a0f661d9f --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabViewHolder.kt @@ -0,0 +1,45 @@ +package acr.browser.lightning._browser2.tab + +import acr.browser.lightning.R +import acr.browser.lightning.controller.UIController +import android.view.View +import android.widget.ImageView +import android.widget.LinearLayout +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView + +/** + * Created by anthonycr on 9/13/20. + */ + +class TabViewHolder( + view: View, + private val onClick: (Int) -> Unit, + private val onLongClick: (Int) -> Unit, + private val onCloseClick: (Int) -> Unit, +) : RecyclerView.ViewHolder(view), View.OnClickListener, View.OnLongClickListener { + + val txtTitle: TextView = view.findViewById(R.id.textTab) + val favicon: ImageView = view.findViewById(R.id.faviconTab) + val exitButton: View = view.findViewById(R.id.deleteAction) + val layout: LinearLayout = view.findViewById(R.id.tab_item_background) + + init { + exitButton.setOnClickListener(this) + layout.setOnClickListener(this) + layout.setOnLongClickListener(this) + } + + override fun onClick(v: View) { + if (v === exitButton) { + onCloseClick.invoke(adapterPosition) + } else if (v === layout) { + onClick.invoke(adapterPosition) + } + } + + override fun onLongClick(v: View): Boolean { + onLongClick.invoke(adapterPosition) + return true + } +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt new file mode 100644 index 000000000..9e3e42bd1 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt @@ -0,0 +1,24 @@ +package acr.browser.lightning._browser2.tab + +import android.webkit.WebChromeClient +import android.webkit.WebView +import io.reactivex.subjects.PublishSubject + +/** + * Created by anthonycr on 9/12/20. + */ +class TabWebChromeClient( + private val progressObservable: PublishSubject, + private val titleObservable: PublishSubject +) : WebChromeClient() { + + override fun onProgressChanged(view: WebView, newProgress: Int) { + super.onProgressChanged(view, newProgress) + progressObservable.onNext(newProgress) + } + + override fun onReceivedTitle(view: WebView, title: String) { + super.onReceivedTitle(view, title) + titleObservable.onNext(title) + } +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebViewClient.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebViewClient.kt new file mode 100644 index 000000000..d7554050d --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebViewClient.kt @@ -0,0 +1,48 @@ +package acr.browser.lightning._browser2.tab + +import acr.browser.lightning.ssl.SslState +import android.graphics.Bitmap +import android.net.http.SslError +import android.webkit.SslErrorHandler +import android.webkit.URLUtil +import android.webkit.WebView +import android.webkit.WebViewClient +import io.reactivex.subjects.PublishSubject + +/** + * Created by anthonycr on 9/12/20. + */ +class TabWebViewClient( + private val urlObservable: PublishSubject, + private val sslStateObservable: PublishSubject, + private val goBackObservable: PublishSubject, + private val goForwardObservable: PublishSubject +) : WebViewClient() { + + var sslState: SslState = SslState.None + private set + + override fun onPageStarted(view: WebView, url: String, favicon: Bitmap?) { + super.onPageStarted(view, url, favicon) + urlObservable.onNext(url) + sslState = if (URLUtil.isHttpsUrl(url)) { + SslState.Valid + } else { + SslState.None + } + sslStateObservable.onNext(sslState) + } + + override fun onPageFinished(view: WebView, url: String) { + super.onPageFinished(view, url) + urlObservable.onNext(url) + goBackObservable.onNext(view.canGoBack()) + goForwardObservable.onNext(view.canGoForward()) + } + + override fun onReceivedSslError(view: WebView, handler: SslErrorHandler, error: SslError) { + super.onReceivedSslError(view, handler, error) + sslState = SslState.Invalid(error) + sslStateObservable.onNext(sslState) + } +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt new file mode 100644 index 000000000..8117ff0f5 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt @@ -0,0 +1,63 @@ +package acr.browser.lightning._browser2.tab + +import acr.browser.lightning._browser2.BrowserContract +import acr.browser.lightning.view.UrlInitializer +import io.reactivex.Completable +import io.reactivex.Maybe +import io.reactivex.Observable +import io.reactivex.Single +import io.reactivex.subjects.PublishSubject + +/** + * Created by anthonycr on 9/12/20. + */ +class TabsRepository( + private val webViewFactory: WebViewFactory, + private val tabPager: TabPager +) : BrowserContract.Model { + + private var selectedTab: TabModel? = null + private val tabsListObservable = PublishSubject.create>() + + override fun deleteTab(id: Int): Completable = Completable.fromAction { + if (selectedTab?.id == id) { + tabPager.clearTab() + } + val tab = tabsList.forId(id) + tab.destroy() + tabsList -= tab + }.doOnComplete { + tabsListObservable.onNext(tabsList) + } + + override fun createTab(initialUrl: String?): Single = Single.fromCallable { + val webView = webViewFactory.createWebView(isIncognito = false) + tabPager.addTab(webView) + val tabAdapter = TabAdapter(UrlInitializer(initialUrl ?: "https://google.com"), webView) + + tabsList += tabAdapter + + return@fromCallable tabAdapter + }.doOnSuccess { + tabsListObservable.onNext(tabsList) + } + + override fun selectTab(id: Int): TabModel { + val selected = tabsList.forId(id) + selectedTab = selected + tabPager.selectTab(id) + + return selected + } + + override var tabsList = emptyList() + private set + + override fun tabsListChanges(): Observable> = tabsListObservable.hide() + + override fun initializeTabs(): Maybe> = Maybe.empty() + + private fun List.forId(id: Int): TabModel = requireNotNull(find { it.id == id }) + + +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/WebViewFactory.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/WebViewFactory.kt new file mode 100644 index 000000000..a09ac656b --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/WebViewFactory.kt @@ -0,0 +1,179 @@ +package acr.browser.lightning._browser2.tab + +import acr.browser.lightning.Capabilities +import acr.browser.lightning.isSupported +import acr.browser.lightning.log.Logger +import acr.browser.lightning.preference.UserPreferences +import acr.browser.lightning.preference.userAgent +import android.annotation.SuppressLint +import android.app.Activity +import android.graphics.Color +import android.os.Build.VERSION +import android.os.Build.VERSION_CODES +import android.view.View +import android.webkit.CookieManager +import android.webkit.WebSettings +import android.webkit.WebView + +/** + * Created by anthonycr on 9/12/20. + */ +class WebViewFactory( + private val activity: Activity, + private val logger: Logger, + private val userPreferences: UserPreferences +) { + + fun createWebView(isIncognito: Boolean): WebView = WebView(activity).apply { + id = View.generateViewId() + isFocusableInTouchMode = true + isFocusable = true + if (VERSION.SDK_INT < VERSION_CODES.M) { + isAnimationCacheEnabled = false + isAlwaysDrawnWithCacheEnabled = false + } + setBackgroundColor(Color.WHITE) + + if (VERSION.SDK_INT >= VERSION_CODES.O) { + importantForAutofill = View.IMPORTANT_FOR_AUTOFILL_YES + } + + isScrollbarFadingEnabled = true + isSaveEnabled = true + setNetworkAvailable(true) + + settings.apply { + mediaPlaybackRequiresUserGesture = true + + if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP && !isIncognito) { + mixedContentMode = WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE + } else if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { + mixedContentMode = WebSettings.MIXED_CONTENT_NEVER_ALLOW + } + + if (!isIncognito || Capabilities.FULL_INCOGNITO.isSupported) { + domStorageEnabled = true + setAppCacheEnabled(true) + databaseEnabled = true + cacheMode = WebSettings.LOAD_DEFAULT + } else { + domStorageEnabled = false + setAppCacheEnabled(false) + databaseEnabled = false + cacheMode = WebSettings.LOAD_NO_CACHE + } + + setSupportZoom(true) + builtInZoomControls = true + displayZoomControls = false + allowContentAccess = true + allowFileAccess = true + allowFileAccessFromFileURLs = false + allowUniversalAccessFromFileURLs = false + + // TODO: remove? + setAppCachePath(activity.getDir("appcache", 0).path) + setGeolocationDatabasePath(activity.getDir("geolocation", 0).path) + } + + updateForPreferences(userPreferences, isIncognito) + } + + @SuppressLint("SetJavaScriptEnabled") + private fun WebView.updateForPreferences( + userPreferences: UserPreferences, + isIncognito: Boolean + ) { + +// lightningWebClient.updatePreferences() +// + val modifiesHeaders = userPreferences.doNotTrackEnabled + || userPreferences.saveDataEnabled + || userPreferences.removeIdentifyingHeadersEnabled +// +// if (userPreferences.doNotTrackEnabled) { +// requestHeaders[LightningView.HEADER_DNT] = "1" +// } else { +// requestHeaders.remove(LightningView.HEADER_DNT) +// } +// +// if (userPreferences.saveDataEnabled) { +// requestHeaders[LightningView.HEADER_SAVEDATA] = "on" +// } else { +// requestHeaders.remove(LightningView.HEADER_SAVEDATA) +// } +// +// if (userPreferences.removeIdentifyingHeadersEnabled) { +// requestHeaders[LightningView.HEADER_REQUESTED_WITH] = "" +// requestHeaders[LightningView.HEADER_WAP_PROFILE] = "" +// } else { +// requestHeaders.remove(LightningView.HEADER_REQUESTED_WITH) +// requestHeaders.remove(LightningView.HEADER_WAP_PROFILE) +// } + + settings.defaultTextEncodingName = userPreferences.textEncoding +// setColorMode(userPreferences.renderingMode) + + if (!isIncognito) { + settings.setGeolocationEnabled(userPreferences.locationEnabled) + } else { + settings.setGeolocationEnabled(false) + } + + settings.userAgentString = userPreferences.userAgent(activity.application) + + settings.saveFormData = userPreferences.savePasswordsEnabled && !isIncognito + + if (userPreferences.javaScriptEnabled) { + settings.javaScriptEnabled = true + settings.javaScriptCanOpenWindowsAutomatically = true + } else { + settings.javaScriptEnabled = false + settings.javaScriptCanOpenWindowsAutomatically = false + } + + if (userPreferences.textReflowEnabled) { + settings.layoutAlgorithm = WebSettings.LayoutAlgorithm.NARROW_COLUMNS + try { + settings.layoutAlgorithm = WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING + } catch (e: Exception) { + // This shouldn't be necessary, but there are a number + // of KitKat devices that crash trying to set this + logger.log(TAG, "Problem setting LayoutAlgorithm to TEXT_AUTOSIZING") + } + } else { + settings.layoutAlgorithm = WebSettings.LayoutAlgorithm.NORMAL + } + + settings.blockNetworkImage = userPreferences.blockImagesEnabled + // Modifying headers causes SEGFAULTS, so disallow multi window if headers are enabled. + settings.setSupportMultipleWindows(userPreferences.popupsEnabled && !modifiesHeaders) + + settings.useWideViewPort = userPreferences.useWideViewPortEnabled + settings.loadWithOverviewMode = userPreferences.overviewModeEnabled + settings.textZoom = when (userPreferences.textSize) { + 0 -> 200 + 1 -> 150 + 2 -> 125 + 3 -> 100 + 4 -> 75 + 5 -> 50 + else -> throw IllegalArgumentException("Unsupported text size") + } + + if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { + CookieManager.getInstance().setAcceptThirdPartyCookies(this, + !userPreferences.blockThirdPartyCookiesEnabled) + } + } + + private companion object { + private const val TAG = "WebViewFactory" + + private const val HEADER_REQUESTED_WITH = "X-Requested-With" + private const val HEADER_WAP_PROFILE = "X-Wap-Profile" + private const val HEADER_DNT = "DNT" + private const val HEADER_SAVEDATA = "Save-Data" + } + +} diff --git a/app/src/main/res/layout/browser_activity.xml b/app/src/main/res/layout/browser_activity.xml new file mode 100644 index 000000000..8de767036 --- /dev/null +++ b/app/src/main/res/layout/browser_activity.xml @@ -0,0 +1,415 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 9ba9286c820e956a174f4bc4ee4e80090c8f24b4 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Mon, 14 Sep 2020 23:18:46 -0400 Subject: [PATCH 003/161] Add history recording --- .../lightning/_browser2/BrowserActivity.kt | 8 +++++++- .../lightning/_browser2/BrowserPresenter.kt | 9 ++++++++- .../_browser2/history/DefaultHistoryRecord.kt | 19 +++++++++++++++++++ .../_browser2/history/HistoryRecord.kt | 10 ++++++++++ .../_browser2/history/NoOpHistoryRecord.kt | 8 ++++++++ 5 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/history/DefaultHistoryRecord.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/history/HistoryRecord.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/history/NoOpHistoryRecord.kt diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index b15ef524a..8627f37a6 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -2,6 +2,7 @@ package acr.browser.lightning._browser2 import acr.browser.lightning.R import acr.browser.lightning._browser2.bookmark.BookmarkRecyclerViewAdapter +import acr.browser.lightning._browser2.history.DefaultHistoryRecord import acr.browser.lightning._browser2.search.SearchListener import acr.browser.lightning._browser2.tab.TabPager import acr.browser.lightning._browser2.tab.TabRecyclerViewAdapter @@ -13,6 +14,7 @@ import acr.browser.lightning.database.HistoryEntry import acr.browser.lightning.database.SearchSuggestion import acr.browser.lightning.database.WebPage import acr.browser.lightning.database.bookmark.BookmarkDatabase +import acr.browser.lightning.database.history.HistoryDatabase import acr.browser.lightning.databinding.BrowserActivityBinding import acr.browser.lightning.device.ScreenSize import acr.browser.lightning.log.AndroidLogger @@ -60,7 +62,11 @@ class BrowserActivity : ThemableBrowserActivity(), BrowserContract.View { tabPager = TabPager(binding.contentFrame) ), mainScheduler = AndroidSchedulers.mainThread(), - databaseScheduler = Schedulers.single() + databaseScheduler = Schedulers.single(), + historyRecord = DefaultHistoryRecord( + historyRepository = HistoryDatabase(application), + databaseScheduler = Schedulers.single() + ) ) tabsAdapter = TabRecyclerViewAdapter( diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 1b37cb7c4..185d514e4 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -1,5 +1,6 @@ package acr.browser.lightning._browser2 +import acr.browser.lightning._browser2.history.HistoryRecord import acr.browser.lightning._browser2.tab.Tab import acr.browser.lightning._browser2.tab.TabModel import acr.browser.lightning.database.Bookmark @@ -10,6 +11,7 @@ import acr.browser.lightning.database.bookmark.BookmarkRepository import acr.browser.lightning.di.DatabaseScheduler import acr.browser.lightning.di.MainScheduler import acr.browser.lightning.ssl.SslState +import acr.browser.lightning.utils.isSpecialUrl import acr.browser.lightning.utils.smartUrlFilter import io.reactivex.Scheduler import io.reactivex.disposables.CompositeDisposable @@ -23,7 +25,8 @@ class BrowserPresenter( private val model: BrowserContract.Model, private val bookmarkRepository: BookmarkRepository, @MainScheduler private val mainScheduler: Scheduler, - @DatabaseScheduler private val databaseScheduler: Scheduler + @DatabaseScheduler private val databaseScheduler: Scheduler, + private val historyRecord: HistoryRecord ) { private var view: BrowserContract.View? = null @@ -130,6 +133,10 @@ class BrowserPresenter( view.updateState(viewState.copy(tabs = viewState.tabs.updateId(tabModel.id) { it.copy(title = title) })) + + currentTab?.url?.takeIf { !it.isSpecialUrl() }?.let { + historyRecord.recordVisit(title, it) + } } urlDisposable?.dispose() diff --git a/app/src/main/java/acr/browser/lightning/_browser2/history/DefaultHistoryRecord.kt b/app/src/main/java/acr/browser/lightning/_browser2/history/DefaultHistoryRecord.kt new file mode 100644 index 000000000..5bac8a0e5 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/history/DefaultHistoryRecord.kt @@ -0,0 +1,19 @@ +package acr.browser.lightning._browser2.history + +import acr.browser.lightning.database.history.HistoryRepository +import acr.browser.lightning.di.DatabaseScheduler +import io.reactivex.Scheduler + +/** + * Created by anthonycr on 9/14/20. + */ +class DefaultHistoryRecord( + private val historyRepository: HistoryRepository, + @DatabaseScheduler private val databaseScheduler: Scheduler +) : HistoryRecord { + override fun recordVisit(title: String, url: String) { + historyRepository.visitHistoryEntry(url, title) + .subscribeOn(databaseScheduler) + .subscribe() + } +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/history/HistoryRecord.kt b/app/src/main/java/acr/browser/lightning/_browser2/history/HistoryRecord.kt new file mode 100644 index 000000000..d0acb43f6 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/history/HistoryRecord.kt @@ -0,0 +1,10 @@ +package acr.browser.lightning._browser2.history + +/** + * Created by anthonycr on 9/14/20. + */ +interface HistoryRecord { + + fun recordVisit(title: String, url: String) + +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/history/NoOpHistoryRecord.kt b/app/src/main/java/acr/browser/lightning/_browser2/history/NoOpHistoryRecord.kt new file mode 100644 index 000000000..015b4cb51 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/history/NoOpHistoryRecord.kt @@ -0,0 +1,8 @@ +package acr.browser.lightning._browser2.history + +/** + * Created by anthonycr on 9/14/20. + */ +object NoOpHistoryRecord : HistoryRecord { + override fun recordVisit(title: String, url: String) = Unit +} From 6ce04eda5a9f507683bdc93bd1007d3e2bb3fb47 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Mon, 14 Sep 2020 23:25:24 -0400 Subject: [PATCH 004/161] Extract TabModel --- .../browser/lightning/_browser2/tab/Tab.kt | 58 ------------------- .../lightning/_browser2/tab/TabModel.kt | 54 +++++++++++++++++ 2 files changed, 54 insertions(+), 58 deletions(-) create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/Tab.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/Tab.kt index 4b67b5301..082c37fc5 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/Tab.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/Tab.kt @@ -1,8 +1,5 @@ package acr.browser.lightning._browser2.tab -import acr.browser.lightning.ssl.SslState -import io.reactivex.Observable - /** * Created by anthonycr on 9/11/20. */ @@ -12,58 +9,3 @@ data class Tab( val title: String, val isSelected: Boolean ) - -/* -probably needs to be an interface - */ - - -interface TabModel { - - val id: Int - - // Navigation - - fun loadUrl(url: String) - - fun goBack() - - fun canGoBack(): Boolean - - fun canGoBackChanges(): Observable - - fun goForward() - - fun canGoForward(): Boolean - - fun canGoForwardChanges(): Observable - - fun reload() - - fun stopLoading() - - // Data - - val url: String - - fun urlChanges(): Observable - - val title: String - - fun titleChanges(): Observable - - val sslState: SslState - - fun sslChanges(): Observable - - val loadingProgress: Int - - fun loadingProgress(): Observable - - // Lifecycle - - var isForeground: Boolean - - fun destroy() - -} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt new file mode 100644 index 000000000..ac146ccf7 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt @@ -0,0 +1,54 @@ +package acr.browser.lightning._browser2.tab + +import acr.browser.lightning.ssl.SslState +import io.reactivex.Observable + +interface TabModel { + + val id: Int + + // Navigation + + fun loadUrl(url: String) + + fun goBack() + + fun canGoBack(): Boolean + + fun canGoBackChanges(): Observable + + fun goForward() + + fun canGoForward(): Boolean + + fun canGoForwardChanges(): Observable + + fun reload() + + fun stopLoading() + + // Data + + val url: String + + fun urlChanges(): Observable + + val title: String + + fun titleChanges(): Observable + + val sslState: SslState + + fun sslChanges(): Observable + + val loadingProgress: Int + + fun loadingProgress(): Observable + + // Lifecycle + + var isForeground: Boolean + + fun destroy() + +} From bffb31f754822ffe5851624049661ada6d2295a5 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 15 Sep 2020 00:17:49 -0400 Subject: [PATCH 005/161] inject dependencies and create new tabs using home page --- .../lightning/_browser2/BrowserActivity.kt | 44 +++++-------------- .../lightning/_browser2/BrowserContract.kt | 3 +- .../lightning/_browser2/BrowserPresenter.kt | 11 +++-- .../_browser2/di/Browser2Component.kt | 30 +++++++++++++ .../lightning/_browser2/di/Browser2Module.kt | 23 ++++++++++ .../_browser2/history/DefaultHistoryRecord.kt | 3 +- .../lightning/_browser2/tab/TabAdapter.kt | 12 ++++- .../lightning/_browser2/tab/TabPager.kt | 3 +- .../lightning/_browser2/tab/TabsRepository.kt | 8 ++-- .../lightning/_browser2/tab/WebViewFactory.kt | 3 +- .../acr/browser/lightning/di/AppComponent.kt | 10 ++++- 11 files changed, 102 insertions(+), 48 deletions(-) create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index 8627f37a6..36e2004f8 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -2,23 +2,13 @@ package acr.browser.lightning._browser2 import acr.browser.lightning.R import acr.browser.lightning._browser2.bookmark.BookmarkRecyclerViewAdapter -import acr.browser.lightning._browser2.history.DefaultHistoryRecord import acr.browser.lightning._browser2.search.SearchListener -import acr.browser.lightning._browser2.tab.TabPager import acr.browser.lightning._browser2.tab.TabRecyclerViewAdapter -import acr.browser.lightning._browser2.tab.TabsRepository -import acr.browser.lightning._browser2.tab.WebViewFactory import acr.browser.lightning.browser.activity.ThemableBrowserActivity -import acr.browser.lightning.database.Bookmark -import acr.browser.lightning.database.HistoryEntry import acr.browser.lightning.database.SearchSuggestion import acr.browser.lightning.database.WebPage -import acr.browser.lightning.database.bookmark.BookmarkDatabase -import acr.browser.lightning.database.history.HistoryDatabase import acr.browser.lightning.databinding.BrowserActivityBinding -import acr.browser.lightning.device.ScreenSize -import acr.browser.lightning.log.AndroidLogger -import acr.browser.lightning.preference.UserPreferences +import acr.browser.lightning.di.injector import acr.browser.lightning.search.SuggestionsAdapter import acr.browser.lightning.ssl.createSslDrawableForState import android.os.Bundle @@ -28,8 +18,7 @@ import android.view.View import android.widget.AdapterView import android.widget.ImageView import androidx.recyclerview.widget.LinearLayoutManager -import io.reactivex.android.schedulers.AndroidSchedulers -import io.reactivex.schedulers.Schedulers +import javax.inject.Inject /** * Created by anthonycr on 9/11/20. @@ -37,10 +26,12 @@ import io.reactivex.schedulers.Schedulers class BrowserActivity : ThemableBrowserActivity(), BrowserContract.View { private lateinit var binding: BrowserActivityBinding - private lateinit var presenter: BrowserPresenter private lateinit var tabsAdapter: TabRecyclerViewAdapter private lateinit var bookmarksAdapter: BookmarkRecyclerViewAdapter + @Inject + internal lateinit var presenter: BrowserPresenter + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) binding = BrowserActivityBinding.inflate(LayoutInflater.from(this)) @@ -48,26 +39,11 @@ class BrowserActivity : ThemableBrowserActivity(), BrowserContract.View { setContentView(binding.root) setSupportActionBar(binding.toolbar) - presenter = BrowserPresenter( - bookmarkRepository = BookmarkDatabase(application), - model = TabsRepository( - webViewFactory = WebViewFactory( - activity = this, - logger = AndroidLogger(), - userPreferences = UserPreferences( - preferences = application.getSharedPreferences("settings", 0), - screenSize = ScreenSize(this) - ) - ), - tabPager = TabPager(binding.contentFrame) - ), - mainScheduler = AndroidSchedulers.mainThread(), - databaseScheduler = Schedulers.single(), - historyRecord = DefaultHistoryRecord( - historyRepository = HistoryDatabase(application), - databaseScheduler = Schedulers.single() - ) - ) + injector.browser2ComponentBuilder() + .activity(this) + .browserFrame(binding.contentFrame) + .build() + .inject(this) tabsAdapter = TabRecyclerViewAdapter( onClick = presenter::onTabClick, diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt index 32b74a34e..5c30de238 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt @@ -1,6 +1,7 @@ package acr.browser.lightning._browser2 import acr.browser.lightning._browser2.tab.TabModel +import acr.browser.lightning.view.TabInitializer import io.reactivex.Completable import io.reactivex.Maybe import io.reactivex.Observable @@ -23,7 +24,7 @@ interface BrowserContract { fun deleteTab(id: Int): Completable - fun createTab(initialUrl: String?): Single + fun createTab(tabInitializer: TabInitializer): Single fun selectTab(id: Int): TabModel diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 185d514e4..b1901e503 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -13,20 +13,23 @@ import acr.browser.lightning.di.MainScheduler import acr.browser.lightning.ssl.SslState import acr.browser.lightning.utils.isSpecialUrl import acr.browser.lightning.utils.smartUrlFilter +import acr.browser.lightning.view.HomePageInitializer import io.reactivex.Scheduler import io.reactivex.disposables.CompositeDisposable import io.reactivex.disposables.Disposable import io.reactivex.rxkotlin.plusAssign +import javax.inject.Inject /** * Created by anthonycr on 9/11/20. */ -class BrowserPresenter( +class BrowserPresenter @Inject constructor( private val model: BrowserContract.Model, private val bookmarkRepository: BookmarkRepository, @MainScheduler private val mainScheduler: Scheduler, @DatabaseScheduler private val databaseScheduler: Scheduler, - private val historyRecord: HistoryRecord + private val historyRecord: HistoryRecord, + private val homePageInitializer: HomePageInitializer ) { private var view: BrowserContract.View? = null @@ -66,7 +69,7 @@ class BrowserPresenter( compositeDisposable += model.initializeTabs() .subscribeOn(databaseScheduler) .observeOn(mainScheduler) - .switchIfEmpty(model.createTab(initialUrl = null).map(::listOf)) + .switchIfEmpty(model.createTab(homePageInitializer).map(::listOf)) .subscribe { list -> this.view.updateState(viewState.copy(tabs = list.map { it.asViewState() })) selectTab(model.selectTab(list.last().id)) @@ -234,7 +237,7 @@ class BrowserPresenter( } fun onNewTabClick() { - compositeDisposable += model.createTab(initialUrl = null) + compositeDisposable += model.createTab(homePageInitializer) .observeOn(mainScheduler) .subscribe { tab -> selectTab(model.selectTab(tab.id)) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt new file mode 100644 index 000000000..ea1921134 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt @@ -0,0 +1,30 @@ +package acr.browser.lightning._browser2.di + +import acr.browser.lightning._browser2.BrowserActivity +import android.app.Activity +import android.widget.FrameLayout +import dagger.BindsInstance +import dagger.Subcomponent + +/** + * Created by anthonycr on 9/15/20. + */ +@Subcomponent(modules = [Browser2Module::class]) +interface Browser2Component { + + @Subcomponent.Builder + interface Builder { + + @BindsInstance + fun activity(activity: Activity): Builder + + @BindsInstance + fun browserFrame(frameLayout: FrameLayout): Builder + + fun build(): Browser2Component + + } + + fun inject(browserActivity: BrowserActivity) + +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt new file mode 100644 index 000000000..e486e5281 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt @@ -0,0 +1,23 @@ +package acr.browser.lightning._browser2.di + +import acr.browser.lightning._browser2.BrowserContract +import acr.browser.lightning._browser2.history.DefaultHistoryRecord +import acr.browser.lightning._browser2.history.HistoryRecord +import acr.browser.lightning._browser2.tab.TabsRepository +import dagger.Binds +import dagger.Module + +/** + * Created by anthonycr on 9/15/20. + */ +@Module +interface Browser2Module { + + @Binds + fun bindsBrowserModel(tabsRepository: TabsRepository): BrowserContract.Model + + @Binds + fun bindsHistoryRecord(defaultHistoryRecord: DefaultHistoryRecord): HistoryRecord + + +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/history/DefaultHistoryRecord.kt b/app/src/main/java/acr/browser/lightning/_browser2/history/DefaultHistoryRecord.kt index 5bac8a0e5..5aa3567b7 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/history/DefaultHistoryRecord.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/history/DefaultHistoryRecord.kt @@ -3,11 +3,12 @@ package acr.browser.lightning._browser2.history import acr.browser.lightning.database.history.HistoryRepository import acr.browser.lightning.di.DatabaseScheduler import io.reactivex.Scheduler +import javax.inject.Inject /** * Created by anthonycr on 9/14/20. */ -class DefaultHistoryRecord( +class DefaultHistoryRecord @Inject constructor( private val historyRepository: HistoryRepository, @DatabaseScheduler private val databaseScheduler: Scheduler ) : HistoryRecord { diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt index 719689a88..4cbe3c4a9 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt @@ -1,6 +1,7 @@ package acr.browser.lightning._browser2.tab import acr.browser.lightning.ssl.SslState +import acr.browser.lightning.view.FreezableBundleInitializer import acr.browser.lightning.view.TabInitializer import android.webkit.WebView import io.reactivex.Observable @@ -10,7 +11,7 @@ import io.reactivex.subjects.PublishSubject * Created by anthonycr on 9/12/20. */ class TabAdapter( - private val tabInitializer: TabInitializer, + tabInitializer: TabInitializer, private val webView: WebView, ) : TabModel { @@ -26,6 +27,7 @@ class TabAdapter( goBackObservable = goBackObservable, goForwardObservable = goForwardObservable ) + private var latentInitializer: TabInitializer? = null init { webView.webViewClient = tabWebViewClient @@ -33,7 +35,11 @@ class TabAdapter( progressObservable = progressObservable, titleObservable = titleObservable ) - tabInitializer.initialize(webView, emptyMap()) + if (tabInitializer is FreezableBundleInitializer) { + latentInitializer = tabInitializer + } else { + tabInitializer.initialize(webView, emptyMap()) + } } override val id: Int = webView.id @@ -91,6 +97,8 @@ class TabAdapter( field = value if (field) { webView.onResume() + latentInitializer?.initialize(webView, emptyMap()) + latentInitializer = null } else { webView.onPause() } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt index 128a8cf5b..5ae9ae4bf 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt @@ -3,11 +3,12 @@ package acr.browser.lightning._browser2.tab import android.view.ViewGroup import android.webkit.WebView import android.widget.FrameLayout +import javax.inject.Inject /** * Created by anthonycr on 9/12/20. */ -class TabPager(private val container: FrameLayout) { +class TabPager @Inject constructor(private val container: FrameLayout) { private val webViews: MutableList = mutableListOf() diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt index 8117ff0f5..7dd566ff4 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt @@ -1,17 +1,19 @@ package acr.browser.lightning._browser2.tab import acr.browser.lightning._browser2.BrowserContract +import acr.browser.lightning.view.TabInitializer import acr.browser.lightning.view.UrlInitializer import io.reactivex.Completable import io.reactivex.Maybe import io.reactivex.Observable import io.reactivex.Single import io.reactivex.subjects.PublishSubject +import javax.inject.Inject /** * Created by anthonycr on 9/12/20. */ -class TabsRepository( +class TabsRepository @Inject constructor( private val webViewFactory: WebViewFactory, private val tabPager: TabPager ) : BrowserContract.Model { @@ -30,10 +32,10 @@ class TabsRepository( tabsListObservable.onNext(tabsList) } - override fun createTab(initialUrl: String?): Single = Single.fromCallable { + override fun createTab(tabInitializer: TabInitializer): Single = Single.fromCallable { val webView = webViewFactory.createWebView(isIncognito = false) tabPager.addTab(webView) - val tabAdapter = TabAdapter(UrlInitializer(initialUrl ?: "https://google.com"), webView) + val tabAdapter = TabAdapter(tabInitializer, webView) tabsList += tabAdapter diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/WebViewFactory.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/WebViewFactory.kt index a09ac656b..496456e07 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/WebViewFactory.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/WebViewFactory.kt @@ -14,11 +14,12 @@ import android.view.View import android.webkit.CookieManager import android.webkit.WebSettings import android.webkit.WebView +import javax.inject.Inject /** * Created by anthonycr on 9/12/20. */ -class WebViewFactory( +class WebViewFactory @Inject constructor( private val activity: Activity, private val logger: Logger, private val userPreferences: UserPreferences diff --git a/app/src/main/java/acr/browser/lightning/di/AppComponent.kt b/app/src/main/java/acr/browser/lightning/di/AppComponent.kt index c2987ebc5..69a0b7fcf 100644 --- a/app/src/main/java/acr/browser/lightning/di/AppComponent.kt +++ b/app/src/main/java/acr/browser/lightning/di/AppComponent.kt @@ -1,6 +1,7 @@ package acr.browser.lightning.di import acr.browser.lightning.BrowserApp +import acr.browser.lightning._browser2.di.Browser2Component import acr.browser.lightning.adblock.BloomFilterAdBlocker import acr.browser.lightning.adblock.NoOpAdBlocker import acr.browser.lightning.browser.SearchBoxModel @@ -21,10 +22,11 @@ import acr.browser.lightning.view.LightningWebClient import android.app.Application import dagger.BindsInstance import dagger.Component +import dagger.Module import javax.inject.Singleton @Singleton -@Component(modules = [(AppModule::class), (AppBindsModule::class)]) +@Component(modules = [AppModule::class, AppBindsModule::class, Submodules::class]) interface AppComponent { @Component.Builder @@ -85,4 +87,10 @@ interface AppComponent { fun provideNoOpAdBlocker(): NoOpAdBlocker + fun browser2ComponentBuilder(): Browser2Component.Builder + } + + +@Module(subcomponents = [Browser2Component::class]) +internal class Submodules From 2721cd2a3befdf20c4e808ff30a06e285ff1e233 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 15 Sep 2020 00:28:29 -0400 Subject: [PATCH 006/161] Handle url display --- .../lightning/_browser2/BrowserActivity.kt | 6 ++--- .../lightning/_browser2/BrowserPresenter.kt | 26 ++++++++++++++++--- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index 36e2004f8..b3403a5af 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -118,10 +118,10 @@ class BrowserActivity : ThemableBrowserActivity(), BrowserContract.View { } private fun ImageView.updateVisibilityForDrawable() { - if (drawable == null) { - visibility = View.GONE + visibility = if (drawable == null) { + View.GONE } else { - visibility = View.VISIBLE + View.VISIBLE } } } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index b1901e503..9c723807f 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -3,6 +3,7 @@ package acr.browser.lightning._browser2 import acr.browser.lightning._browser2.history.HistoryRecord import acr.browser.lightning._browser2.tab.Tab import acr.browser.lightning._browser2.tab.TabModel +import acr.browser.lightning.browser.SearchBoxModel import acr.browser.lightning.database.Bookmark import acr.browser.lightning.database.HistoryEntry import acr.browser.lightning.database.SearchSuggestion @@ -29,7 +30,8 @@ class BrowserPresenter @Inject constructor( @MainScheduler private val mainScheduler: Scheduler, @DatabaseScheduler private val databaseScheduler: Scheduler, private val historyRecord: HistoryRecord, - private val homePageInitializer: HomePageInitializer + private val homePageInitializer: HomePageInitializer, + private val searchBoxModel: SearchBoxModel ) { private var view: BrowserContract.View? = null @@ -106,7 +108,11 @@ class BrowserPresenter @Inject constructor( currentTab?.isForeground = true view.updateState(viewState.copy( - displayUrl = tabModel?.url.orEmpty(), + displayUrl = searchBoxModel.getDisplayContent( + url = tabModel?.url.orEmpty(), + title = tabModel?.title, + isLoading = (tabModel?.loadingProgress ?: 0) < 100 + ), isForwardEnabled = tabModel?.canGoForward() ?: false, isBackEnabled = tabModel?.canGoBack() ?: false, sslState = tabModel?.sslState ?: SslState.None, @@ -147,7 +153,13 @@ class BrowserPresenter @Inject constructor( ?.distinctUntilChanged() ?.observeOn(mainScheduler) ?.subscribe { - view.updateState(viewState.copy(displayUrl = it)) + view.updateState(viewState.copy( + displayUrl = searchBoxModel.getDisplayContent( + url = tabModel.url, + title = tabModel.title, + isLoading = (tabModel.loadingProgress ?: 0) < 100 + ) + )) } loadingDisposable?.dispose() @@ -255,7 +267,13 @@ class BrowserPresenter @Inject constructor( fun onSearch(query: String) { currentTab?.stopLoading() val url = smartUrlFilter(query, true, SEARCH) - view?.updateState(viewState.copy(displayUrl = url)) + view?.updateState(viewState.copy( + displayUrl = searchBoxModel.getDisplayContent( + url = currentTab?.url.orEmpty(), + title = currentTab?.url, + isLoading = (currentTab?.loadingProgress ?: 0) < 100 + ) + )) currentTab?.loadUrl(url) } From a480079ca09d79f6a3d468854db98de6d46dd27d Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 15 Sep 2020 00:33:56 -0400 Subject: [PATCH 007/161] Support custom search query --- .../browser/lightning/_browser2/BrowserPresenter.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 9c723807f..e868b90f0 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -11,7 +11,9 @@ import acr.browser.lightning.database.WebPage import acr.browser.lightning.database.bookmark.BookmarkRepository import acr.browser.lightning.di.DatabaseScheduler import acr.browser.lightning.di.MainScheduler +import acr.browser.lightning.search.SearchEngineProvider import acr.browser.lightning.ssl.SslState +import acr.browser.lightning.utils.QUERY_PLACE_HOLDER import acr.browser.lightning.utils.isSpecialUrl import acr.browser.lightning.utils.smartUrlFilter import acr.browser.lightning.view.HomePageInitializer @@ -31,7 +33,8 @@ class BrowserPresenter @Inject constructor( @DatabaseScheduler private val databaseScheduler: Scheduler, private val historyRecord: HistoryRecord, private val homePageInitializer: HomePageInitializer, - private val searchBoxModel: SearchBoxModel + private val searchBoxModel: SearchBoxModel, + private val searchEngineProvider: SearchEngineProvider ) { private var view: BrowserContract.View? = null @@ -266,7 +269,8 @@ class BrowserPresenter @Inject constructor( fun onSearch(query: String) { currentTab?.stopLoading() - val url = smartUrlFilter(query, true, SEARCH) + val searchUrl = searchEngineProvider.provideSearchEngine().queryUrl + QUERY_PLACE_HOLDER + val url = smartUrlFilter(query, true, searchUrl) view?.updateState(viewState.copy( displayUrl = searchBoxModel.getDisplayContent( url = currentTab?.url.orEmpty(), @@ -346,8 +350,4 @@ class BrowserPresenter @Inject constructor( viewState = state this?.renderState(viewState) } - - private companion object { - private const val SEARCH = "https://www.google.com/search?client=lightning&ie=UTF-8&oe=UTF-8&q=%s" - } } From bd832d2b05f7361ad926ff47e51262a3c444718b Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 15 Sep 2020 00:42:00 -0400 Subject: [PATCH 008/161] Adding placeholder docs --- .../lightning/_browser2/BrowserPresenter.kt | 59 ++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index e868b90f0..14e958e5b 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -60,6 +60,9 @@ class BrowserPresenter @Inject constructor( private var canGoBackDisposable: Disposable? = null private var canGoForwardDisposable: Disposable? = null + /** + * TODO + */ fun onViewAttached(view: BrowserContract.View) { this.view = view view.updateState(viewState) @@ -190,6 +193,9 @@ class BrowserPresenter @Inject constructor( } } + /** + * TODO + */ fun onViewDetached() { view = null compositeDisposable.dispose() @@ -202,6 +208,9 @@ class BrowserPresenter @Inject constructor( canGoForwardDisposable?.dispose() } + /** + * TODO + */ fun onTabClick(index: Int) { selectTab(model.selectTab(viewState.tabs[index].id)) } @@ -219,6 +228,9 @@ class BrowserPresenter @Inject constructor( } } + /** + * TODO + */ fun onTabClose(index: Int) { val nextTab = viewState.tabs.nextSelected(index) @@ -235,22 +247,34 @@ class BrowserPresenter @Inject constructor( } } + /** + * TODO + */ fun onBackClick() { if (currentTab?.canGoBack() == true) { currentTab?.goBack() } } + /** + * TODO + */ fun onForwardClick() { if (currentTab?.canGoForward() == true) { currentTab?.goForward() } } + /** + * TODO + */ fun onHomeClick() { currentTab?.loadUrl("https://google.com") } + /** + * TODO + */ fun onNewTabClick() { compositeDisposable += model.createTab(homePageInitializer) .observeOn(mainScheduler) @@ -259,6 +283,9 @@ class BrowserPresenter @Inject constructor( } } + /** + * TODO + */ fun onRefreshOrStopClick() { if (currentTab?.loadingProgress != 100) { currentTab?.stopLoading() @@ -267,6 +294,9 @@ class BrowserPresenter @Inject constructor( } } + /** + * TODO + */ fun onSearch(query: String) { currentTab?.stopLoading() val searchUrl = searchEngineProvider.provideSearchEngine().queryUrl + QUERY_PLACE_HOLDER @@ -281,6 +311,9 @@ class BrowserPresenter @Inject constructor( currentTab?.loadUrl(url) } + /** + * TODO + */ fun onSearchSuggestionClicked(webPage: WebPage) { val url = when (webPage) { is HistoryEntry, @@ -292,10 +325,16 @@ class BrowserPresenter @Inject constructor( onSearch(url) } + /** + * TODO + */ fun onSslIconClick() { - + // TODO } + /** + * TODO + */ fun onBookmarkClick(index: Int) { when (val bookmark = viewState.bookmarks[index]) { is Bookmark.Entry -> currentTab?.loadUrl(bookmark.url) @@ -314,26 +353,44 @@ class BrowserPresenter @Inject constructor( } + /** + * TODO + */ fun onBookmarkLongClick(index: Int) { } + /** + * TODO + */ fun onToolsClick() { } + /** + * TODO + */ fun onStarClick() { } + /** + * TODO + */ fun onReadingModeClick() { } + /** + * TODO + */ fun onTabMenuClick() { } + /** + * TODO + */ fun onBookmarkMenuClick() { if (currentFolder != Bookmark.Folder.Root) { compositeDisposable += bookmarkRepository From 152f154313a309d488a46fa28d7606f086c8fea0 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 15 Sep 2020 00:47:42 -0400 Subject: [PATCH 009/161] immediately display URL that will be loaded and set title --- .../java/acr/browser/lightning/_browser2/BrowserPresenter.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 14e958e5b..d1a9a0f2a 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -303,8 +303,8 @@ class BrowserPresenter @Inject constructor( val url = smartUrlFilter(query, true, searchUrl) view?.updateState(viewState.copy( displayUrl = searchBoxModel.getDisplayContent( - url = currentTab?.url.orEmpty(), - title = currentTab?.url, + url = url, + title = currentTab?.title, isLoading = (currentTab?.loadingProgress ?: 0) < 100 ) )) From ddda65c6af0aa5a3023f01e8416a1e9ae5976fed Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 15 Sep 2020 21:31:43 -0400 Subject: [PATCH 010/161] Support loading favicons in tabs and bookmarks --- .../lightning/_browser2/BrowserActivity.kt | 7 +- .../lightning/_browser2/BrowserPresenter.kt | 14 +++- .../bookmark/BookmarkRecyclerViewAdapter.kt | 7 +- .../lightning/_browser2/di/Browser2Module.kt | 5 +- .../_browser2/image/FaviconImageLoader.kt | 74 +++++++++++++++++++ .../lightning/_browser2/image/ImageLoader.kt | 13 ++++ .../browser/lightning/_browser2/tab/Tab.kt | 4 +- .../lightning/_browser2/tab/TabAdapter.kt | 11 ++- .../lightning/_browser2/tab/TabModel.kt | 5 ++ .../_browser2/tab/TabRecyclerViewAdapter.kt | 10 +-- .../_browser2/tab/TabWebChromeClient.kt | 9 ++- 11 files changed, 145 insertions(+), 14 deletions(-) create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/image/FaviconImageLoader.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/image/ImageLoader.kt diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index b3403a5af..e97eecbb9 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -2,6 +2,7 @@ package acr.browser.lightning._browser2 import acr.browser.lightning.R import acr.browser.lightning._browser2.bookmark.BookmarkRecyclerViewAdapter +import acr.browser.lightning._browser2.image.ImageLoader import acr.browser.lightning._browser2.search.SearchListener import acr.browser.lightning._browser2.tab.TabRecyclerViewAdapter import acr.browser.lightning.browser.activity.ThemableBrowserActivity @@ -29,6 +30,9 @@ class BrowserActivity : ThemableBrowserActivity(), BrowserContract.View { private lateinit var tabsAdapter: TabRecyclerViewAdapter private lateinit var bookmarksAdapter: BookmarkRecyclerViewAdapter + @Inject + internal lateinit var imageLoader: ImageLoader + @Inject internal lateinit var presenter: BrowserPresenter @@ -55,7 +59,8 @@ class BrowserActivity : ThemableBrowserActivity(), BrowserContract.View { bookmarksAdapter = BookmarkRecyclerViewAdapter( onClick = presenter::onBookmarkClick, - onLongClick = presenter::onBookmarkLongClick + onLongClick = presenter::onBookmarkLongClick, + imageLoader = imageLoader ) binding.bookmarkListView.adapter = bookmarksAdapter binding.bookmarkListView.layoutManager = LinearLayoutManager(this) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index d1a9a0f2a..54d06a081 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -55,6 +55,7 @@ class BrowserPresenter @Inject constructor( private val compositeDisposable = CompositeDisposable() private var sslDisposable: Disposable? = null private var titleDisposable: Disposable? = null + private var faviconDisposable: Disposable? = null private var urlDisposable: Disposable? = null private var loadingDisposable: Disposable? = null private var canGoBackDisposable: Disposable? = null @@ -92,7 +93,7 @@ class BrowserPresenter @Inject constructor( private fun TabModel.asViewState(): Tab = Tab( id = id, - icon = "", + icon = null, title = title, isSelected = isForeground ) @@ -154,6 +155,16 @@ class BrowserPresenter @Inject constructor( } } + faviconDisposable?.dispose() + faviconDisposable = tabModel?.faviconChanges() + ?.observeOn(mainScheduler) + ?.subscribe { favicon -> + view.updateState(viewState.copy(tabs = viewState.tabs.updateId(tabModel.id) { + it.copy(icon = favicon) + })) + } + + urlDisposable?.dispose() urlDisposable = tabModel?.urlChanges() ?.distinctUntilChanged() @@ -202,6 +213,7 @@ class BrowserPresenter @Inject constructor( sslDisposable?.dispose() titleDisposable?.dispose() + faviconDisposable?.dispose() urlDisposable?.dispose() loadingDisposable?.dispose() canGoBackDisposable?.dispose() diff --git a/app/src/main/java/acr/browser/lightning/_browser2/bookmark/BookmarkRecyclerViewAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/bookmark/BookmarkRecyclerViewAdapter.kt index ac95d5ff1..d9848f747 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/bookmark/BookmarkRecyclerViewAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/bookmark/BookmarkRecyclerViewAdapter.kt @@ -1,6 +1,7 @@ package acr.browser.lightning._browser2.bookmark import acr.browser.lightning.R +import acr.browser.lightning._browser2.image.ImageLoader import acr.browser.lightning.database.Bookmark import android.view.LayoutInflater import android.view.ViewGroup @@ -12,7 +13,8 @@ import androidx.recyclerview.widget.ListAdapter */ class BookmarkRecyclerViewAdapter( private val onClick: (Int) -> Unit, - private val onLongClick: (Int) -> Unit + private val onLongClick: (Int) -> Unit, + private val imageLoader: ImageLoader ) : ListAdapter( object : DiffUtil.ItemCallback() { override fun areItemsTheSame(oldItem: Bookmark, newItem: Bookmark): Boolean = @@ -37,7 +39,6 @@ class BookmarkRecyclerViewAdapter( val viewModel = getItem(position) holder.binding.textBookmark.text = viewModel.title - val url = viewModel.url - holder.binding.faviconBookmark.tag = url + imageLoader.loadImage(holder.binding.faviconBookmark, viewModel) } } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt index e486e5281..3a7215826 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt @@ -3,6 +3,8 @@ package acr.browser.lightning._browser2.di import acr.browser.lightning._browser2.BrowserContract import acr.browser.lightning._browser2.history.DefaultHistoryRecord import acr.browser.lightning._browser2.history.HistoryRecord +import acr.browser.lightning._browser2.image.FaviconImageLoader +import acr.browser.lightning._browser2.image.ImageLoader import acr.browser.lightning._browser2.tab.TabsRepository import dagger.Binds import dagger.Module @@ -19,5 +21,6 @@ interface Browser2Module { @Binds fun bindsHistoryRecord(defaultHistoryRecord: DefaultHistoryRecord): HistoryRecord - + @Binds + fun bindsFaviconImageLoader(faviconImageLoader: FaviconImageLoader): ImageLoader } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/image/FaviconImageLoader.kt b/app/src/main/java/acr/browser/lightning/_browser2/image/FaviconImageLoader.kt new file mode 100644 index 000000000..58837223b --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/image/FaviconImageLoader.kt @@ -0,0 +1,74 @@ +package acr.browser.lightning._browser2.image + +import acr.browser.lightning.R +import acr.browser.lightning.database.Bookmark +import acr.browser.lightning.di.MainScheduler +import acr.browser.lightning.di.NetworkScheduler +import acr.browser.lightning.extensions.drawable +import acr.browser.lightning.favicon.FaviconModel +import android.app.Application +import android.graphics.Bitmap +import android.graphics.drawable.Drawable +import android.util.LruCache +import android.widget.ImageView +import io.reactivex.Scheduler +import io.reactivex.disposables.CompositeDisposable +import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxkotlin.subscribeBy +import javax.inject.Inject + +/** + * Created by anthonycr on 9/15/20. + */ +class FaviconImageLoader @Inject constructor( + private val faviconModel: FaviconModel, + application: Application, + @NetworkScheduler private val networkScheduler: Scheduler, + @MainScheduler private val mainScheduler: Scheduler +) : ImageLoader { + + private val lruCache: LruCache = LruCache(1 * 1000 * 1000) + private val folderIcon = application.drawable(R.drawable.ic_folder) + private val webpageIcon = application.drawable(R.drawable.ic_webpage) + private val compositeDisposable = CompositeDisposable() + + override fun loadImage(imageView: ImageView, bookmark: Bookmark) { + imageView.tag = bookmark.url + lruCache[bookmark.url]?.let { + if (it is Bitmap) { + imageView.setImageBitmap(it) + } else if (it is Drawable) { + imageView.setImageDrawable(it) + } + } ?: run { + when (bookmark) { + is Bookmark.Folder -> { + lruCache.put(bookmark.url, folderIcon) + imageView.setImageDrawable(folderIcon) + } + is Bookmark.Entry -> { + lruCache.put(bookmark.url, webpageIcon) + imageView.setImageDrawable(webpageIcon) + compositeDisposable += faviconModel + .faviconForUrl(bookmark.url, bookmark.title) + .subscribeOn(networkScheduler) + .observeOn(mainScheduler) + .subscribeBy( + onSuccess = { bitmap -> + lruCache.put(bookmark.url, bitmap) + if (imageView.tag == bookmark.url) { + imageView.setImageBitmap(bitmap) + } + } + ) + } + } + } + + fun cleanup() { + compositeDisposable.clear() + } + + + } +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/image/ImageLoader.kt b/app/src/main/java/acr/browser/lightning/_browser2/image/ImageLoader.kt new file mode 100644 index 000000000..034997412 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/image/ImageLoader.kt @@ -0,0 +1,13 @@ +package acr.browser.lightning._browser2.image + +import acr.browser.lightning.database.Bookmark +import android.widget.ImageView + +/** + * Created by anthonycr on 9/15/20. + */ +interface ImageLoader { + + fun loadImage(imageView: ImageView, bookmark: Bookmark) + +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/Tab.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/Tab.kt index 082c37fc5..5acf16b5f 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/Tab.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/Tab.kt @@ -1,11 +1,13 @@ package acr.browser.lightning._browser2.tab +import android.graphics.Bitmap + /** * Created by anthonycr on 9/11/20. */ data class Tab( val id: Int, - val icon: String, + val icon: Bitmap?, val title: String, val isSelected: Boolean ) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt index 4cbe3c4a9..70551bc8f 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt @@ -3,6 +3,7 @@ package acr.browser.lightning._browser2.tab import acr.browser.lightning.ssl.SslState import acr.browser.lightning.view.FreezableBundleInitializer import acr.browser.lightning.view.TabInitializer +import android.graphics.Bitmap import android.webkit.WebView import io.reactivex.Observable import io.reactivex.subjects.PublishSubject @@ -15,6 +16,7 @@ class TabAdapter( private val webView: WebView, ) : TabModel { + private val faviconObservable = PublishSubject.create() private val urlObservable = PublishSubject.create() private val sslStateObservable = PublishSubject.create() private val progressObservable = PublishSubject.create() @@ -33,7 +35,8 @@ class TabAdapter( webView.webViewClient = tabWebViewClient webView.webChromeClient = TabWebChromeClient( progressObservable = progressObservable, - titleObservable = titleObservable + titleObservable = titleObservable, + faviconObservable = faviconObservable ) if (tabInitializer is FreezableBundleInitializer) { latentInitializer = tabInitializer @@ -72,6 +75,12 @@ class TabAdapter( webView.stopLoading() } + override val favicon: Bitmap? + get() = webView.favicon + + override fun faviconChanges(): Observable = faviconObservable.hide() + + // TODO do we show "new tab" override val url: String get() = webView.url.orEmpty() diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt index ac146ccf7..d0c804c6a 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt @@ -1,6 +1,7 @@ package acr.browser.lightning._browser2.tab import acr.browser.lightning.ssl.SslState +import android.graphics.Bitmap import io.reactivex.Observable interface TabModel { @@ -29,6 +30,10 @@ interface TabModel { // Data + val favicon: Bitmap? + + fun faviconChanges(): Observable + val url: String fun urlChanges(): Observable diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabRecyclerViewAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabRecyclerViewAdapter.kt index da5cd8234..835d53e48 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabRecyclerViewAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabRecyclerViewAdapter.kt @@ -35,12 +35,12 @@ class TabRecyclerViewAdapter( override fun onBindViewHolder(holder: TabViewHolder, position: Int) { holder.exitButton.tag = position - val web = getItem(position) + val tab = getItem(position) - holder.txtTitle.text = web.title - updateViewHolderAppearance(holder, null, web.isSelected) - updateViewHolderFavicon(holder, null, web.isSelected) - updateViewHolderBackground(holder, web.isSelected) + holder.txtTitle.text = tab.title + updateViewHolderAppearance(holder, null, tab.isSelected) + updateViewHolderFavicon(holder, tab.icon, tab.isSelected) + updateViewHolderBackground(holder, tab.isSelected) } private fun updateViewHolderFavicon(viewHolder: TabViewHolder, favicon: Bitmap?, isForeground: Boolean) { diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt index 9e3e42bd1..7bb7d6c54 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt @@ -1,5 +1,6 @@ package acr.browser.lightning._browser2.tab +import android.graphics.Bitmap import android.webkit.WebChromeClient import android.webkit.WebView import io.reactivex.subjects.PublishSubject @@ -9,7 +10,8 @@ import io.reactivex.subjects.PublishSubject */ class TabWebChromeClient( private val progressObservable: PublishSubject, - private val titleObservable: PublishSubject + private val titleObservable: PublishSubject, + private val faviconObservable: PublishSubject ) : WebChromeClient() { override fun onProgressChanged(view: WebView, newProgress: Int) { @@ -21,4 +23,9 @@ class TabWebChromeClient( super.onReceivedTitle(view, title) titleObservable.onNext(title) } + + override fun onReceivedIcon(view: WebView, icon: Bitmap) { + super.onReceivedIcon(view, icon) + faviconObservable.onNext(icon) + } } From 176ab385196cef10862a1a9c8a33f172a7d09e48 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 15 Sep 2020 21:51:32 -0400 Subject: [PATCH 011/161] Support menu clicks --- .../lightning/_browser2/BrowserActivity.kt | 25 ++++++++ .../lightning/_browser2/BrowserContract.kt | 23 ++++++++ .../lightning/_browser2/BrowserNavigator.kt | 24 ++++++++ .../lightning/_browser2/BrowserPresenter.kt | 58 +++++++++++++++---- .../lightning/_browser2/di/Browser2Module.kt | 4 ++ 5 files changed, 123 insertions(+), 11 deletions(-) create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/BrowserNavigator.kt diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index e97eecbb9..850505780 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -15,6 +15,7 @@ import acr.browser.lightning.ssl.createSslDrawableForState import android.os.Bundle import android.view.LayoutInflater import android.view.Menu +import android.view.MenuItem import android.view.View import android.widget.AdapterView import android.widget.ImageView @@ -105,6 +106,30 @@ class BrowserActivity : ThemableBrowserActivity(), BrowserContract.View { return super.onCreateOptionsMenu(menu) } + override fun onOptionsItemSelected(item: MenuItem): Boolean { + val menu = when (item.itemId) { + android.R.id.home -> TODO() + R.id.action_back -> TODO() + R.id.action_forward -> TODO() + R.id.action_add_to_homescreen -> BrowserContract.Menu.ADD_TO_HOME + R.id.action_new_tab -> BrowserContract.Menu.NEW_TAB + R.id.action_incognito -> BrowserContract.Menu.NEW_INCOGNITO_TAB + R.id.action_share -> BrowserContract.Menu.SHARE + R.id.action_bookmarks -> BrowserContract.Menu.BOOKMARKS + R.id.action_copy -> BrowserContract.Menu.COPY_LINK + R.id.action_settings -> BrowserContract.Menu.SETTINGS + R.id.action_history -> BrowserContract.Menu.HISTORY + R.id.action_downloads -> BrowserContract.Menu.DOWNLOADS + R.id.action_add_bookmark -> BrowserContract.Menu.ADD_BOOKMARK + R.id.action_find -> BrowserContract.Menu.FIND + R.id.action_reading_mode -> BrowserContract.Menu.READER + else -> null + } + + return menu?.let(presenter::onMenuClick)?.let { true } + ?: super.onOptionsItemSelected(item) + } + override fun renderState(viewState: BrowserViewState) { binding.actionBack.isEnabled = viewState.isBackEnabled binding.actionForward.isEnabled = viewState.isForwardEnabled diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt index 5c30de238..2563f7aa0 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt @@ -36,4 +36,27 @@ interface BrowserContract { } + interface Navigator { + + fun openSettings() + + fun openReaderMode(url: String) + + } + + enum class Menu { + NEW_TAB, + NEW_INCOGNITO_TAB, + SHARE, + HISTORY, + DOWNLOADS, + FIND, + COPY_LINK, + ADD_TO_HOME, + BOOKMARKS, + ADD_BOOKMARK, + READER, + SETTINGS + } + } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserNavigator.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserNavigator.kt new file mode 100644 index 000000000..688ce61e4 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserNavigator.kt @@ -0,0 +1,24 @@ +package acr.browser.lightning._browser2 + +import acr.browser.lightning.reading.activity.ReadingActivity +import acr.browser.lightning.settings.activity.SettingsActivity +import android.app.Activity +import android.content.Intent +import javax.inject.Inject + +/** + * Created by anthonycr on 9/15/20. + */ +class BrowserNavigator @Inject constructor( + private val activity: Activity +) : BrowserContract.Navigator { + + override fun openSettings() { + activity.startActivity(Intent(activity, SettingsActivity::class.java)) + } + + override fun openReaderMode(url: String) { + ReadingActivity.launch(activity, url) + } + +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 54d06a081..08e122ec1 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -16,6 +16,8 @@ import acr.browser.lightning.ssl.SslState import acr.browser.lightning.utils.QUERY_PLACE_HOLDER import acr.browser.lightning.utils.isSpecialUrl import acr.browser.lightning.utils.smartUrlFilter +import acr.browser.lightning.view.DownloadPageInitializer +import acr.browser.lightning.view.HistoryPageInitializer import acr.browser.lightning.view.HomePageInitializer import io.reactivex.Scheduler import io.reactivex.disposables.CompositeDisposable @@ -28,11 +30,14 @@ import javax.inject.Inject */ class BrowserPresenter @Inject constructor( private val model: BrowserContract.Model, + private val navigator: BrowserContract.Navigator, private val bookmarkRepository: BookmarkRepository, @MainScheduler private val mainScheduler: Scheduler, @DatabaseScheduler private val databaseScheduler: Scheduler, private val historyRecord: HistoryRecord, private val homePageInitializer: HomePageInitializer, + private val historyPageInitializer: HistoryPageInitializer, + private val downloadPageInitializer: DownloadPageInitializer, private val searchBoxModel: SearchBoxModel, private val searchEngineProvider: SearchEngineProvider ) { @@ -91,6 +96,22 @@ class BrowserPresenter @Inject constructor( } } + /** + * TODO + */ + fun onViewDetached() { + view = null + compositeDisposable.dispose() + + sslDisposable?.dispose() + titleDisposable?.dispose() + faviconDisposable?.dispose() + urlDisposable?.dispose() + loadingDisposable?.dispose() + canGoBackDisposable?.dispose() + canGoForwardDisposable?.dispose() + } + private fun TabModel.asViewState(): Tab = Tab( id = id, icon = null, @@ -207,17 +228,32 @@ class BrowserPresenter @Inject constructor( /** * TODO */ - fun onViewDetached() { - view = null - compositeDisposable.dispose() - - sslDisposable?.dispose() - titleDisposable?.dispose() - faviconDisposable?.dispose() - urlDisposable?.dispose() - loadingDisposable?.dispose() - canGoBackDisposable?.dispose() - canGoForwardDisposable?.dispose() + fun onMenuClick(menuOption: BrowserContract.Menu) { + when (menuOption) { + BrowserContract.Menu.NEW_TAB -> onNewTabClick() + BrowserContract.Menu.NEW_INCOGNITO_TAB -> TODO() + BrowserContract.Menu.SHARE -> TODO() + BrowserContract.Menu.HISTORY -> + compositeDisposable += model.createTab(historyPageInitializer) + .observeOn(mainScheduler) + .subscribe { tab -> + selectTab(model.selectTab(tab.id)) + } + BrowserContract.Menu.DOWNLOADS -> + compositeDisposable += model.createTab(downloadPageInitializer) + .observeOn(mainScheduler) + .subscribe { tab -> + selectTab(model.selectTab(tab.id)) + } + BrowserContract.Menu.FIND -> TODO() + BrowserContract.Menu.COPY_LINK -> TODO() + BrowserContract.Menu.ADD_TO_HOME -> TODO() + BrowserContract.Menu.BOOKMARKS -> TODO() + BrowserContract.Menu.ADD_BOOKMARK -> TODO() + BrowserContract.Menu.READER -> currentTab?.url?.takeIf { !it.isSpecialUrl() } + ?.let(navigator::openReaderMode) + BrowserContract.Menu.SETTINGS -> navigator.openSettings() + } } /** diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt index 3a7215826..862c21ade 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt @@ -1,6 +1,7 @@ package acr.browser.lightning._browser2.di import acr.browser.lightning._browser2.BrowserContract +import acr.browser.lightning._browser2.BrowserNavigator import acr.browser.lightning._browser2.history.DefaultHistoryRecord import acr.browser.lightning._browser2.history.HistoryRecord import acr.browser.lightning._browser2.image.FaviconImageLoader @@ -23,4 +24,7 @@ interface Browser2Module { @Binds fun bindsFaviconImageLoader(faviconImageLoader: FaviconImageLoader): ImageLoader + + @Binds + fun bindsBrowserNavigator(browserNavigator: BrowserNavigator): BrowserContract.Navigator } From 921519d5d93cce65f817a48bb1fcfff18ce1b277 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 15 Sep 2020 22:42:46 -0400 Subject: [PATCH 012/161] Adding text changed listener to handle style removal --- .../java/acr/browser/lightning/_browser2/BrowserActivity.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index 850505780..2217e84e5 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -5,6 +5,7 @@ import acr.browser.lightning._browser2.bookmark.BookmarkRecyclerViewAdapter import acr.browser.lightning._browser2.image.ImageLoader import acr.browser.lightning._browser2.search.SearchListener import acr.browser.lightning._browser2.tab.TabRecyclerViewAdapter +import acr.browser.lightning.browser.activity.StyleRemovingTextWatcher import acr.browser.lightning.browser.activity.ThemableBrowserActivity import acr.browser.lightning.database.SearchSuggestion import acr.browser.lightning.database.WebPage @@ -88,6 +89,7 @@ class BrowserActivity : ThemableBrowserActivity(), BrowserContract.View { }) binding.search.setOnEditorActionListener(searchListener) binding.search.setOnKeyListener(searchListener) + binding.search.addTextChangedListener(StyleRemovingTextWatcher()) binding.actionBack.setOnClickListener { presenter.onBackClick() } binding.actionForward.setOnClickListener { presenter.onForwardClick() } From 3f4fdad70230c2499a9c60af8a2b50dc22d6b174 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 16 Sep 2020 08:36:15 -0400 Subject: [PATCH 013/161] Handle keyboard combos and handle menu clicks with the same style of adapter --- .../lightning/_browser2/BrowserActivity.kt | 39 ++++------ .../lightning/_browser2/BrowserContract.kt | 15 +--- .../lightning/_browser2/BrowserPresenter.kt | 56 +++++++++++---- .../lightning/_browser2/keys/KeyCombo.kt | 25 +++++++ .../_browser2/keys/KeyEventAdapter.kt | 71 +++++++++++++++++++ .../_browser2/menu/MenuItemAdapter.kt | 33 +++++++++ .../lightning/_browser2/menu/MenuSelection.kt | 19 +++++ 7 files changed, 206 insertions(+), 52 deletions(-) create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/keys/KeyCombo.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/keys/KeyEventAdapter.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/menu/MenuItemAdapter.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/menu/MenuSelection.kt diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index 2217e84e5..b958edaa8 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -3,6 +3,8 @@ package acr.browser.lightning._browser2 import acr.browser.lightning.R import acr.browser.lightning._browser2.bookmark.BookmarkRecyclerViewAdapter import acr.browser.lightning._browser2.image.ImageLoader +import acr.browser.lightning._browser2.keys.KeyEventAdapter +import acr.browser.lightning._browser2.menu.MenuItemAdapter import acr.browser.lightning._browser2.search.SearchListener import acr.browser.lightning._browser2.tab.TabRecyclerViewAdapter import acr.browser.lightning.browser.activity.StyleRemovingTextWatcher @@ -14,10 +16,7 @@ import acr.browser.lightning.di.injector import acr.browser.lightning.search.SuggestionsAdapter import acr.browser.lightning.ssl.createSslDrawableForState import android.os.Bundle -import android.view.LayoutInflater -import android.view.Menu -import android.view.MenuItem -import android.view.View +import android.view.* import android.widget.AdapterView import android.widget.ImageView import androidx.recyclerview.widget.LinearLayoutManager @@ -35,6 +34,12 @@ class BrowserActivity : ThemableBrowserActivity(), BrowserContract.View { @Inject internal lateinit var imageLoader: ImageLoader + @Inject + internal lateinit var keyEventAdapter: KeyEventAdapter + + @Inject + internal lateinit var menuItemAdapter: MenuItemAdapter + @Inject internal lateinit var presenter: BrowserPresenter @@ -109,29 +114,15 @@ class BrowserActivity : ThemableBrowserActivity(), BrowserContract.View { } override fun onOptionsItemSelected(item: MenuItem): Boolean { - val menu = when (item.itemId) { - android.R.id.home -> TODO() - R.id.action_back -> TODO() - R.id.action_forward -> TODO() - R.id.action_add_to_homescreen -> BrowserContract.Menu.ADD_TO_HOME - R.id.action_new_tab -> BrowserContract.Menu.NEW_TAB - R.id.action_incognito -> BrowserContract.Menu.NEW_INCOGNITO_TAB - R.id.action_share -> BrowserContract.Menu.SHARE - R.id.action_bookmarks -> BrowserContract.Menu.BOOKMARKS - R.id.action_copy -> BrowserContract.Menu.COPY_LINK - R.id.action_settings -> BrowserContract.Menu.SETTINGS - R.id.action_history -> BrowserContract.Menu.HISTORY - R.id.action_downloads -> BrowserContract.Menu.DOWNLOADS - R.id.action_add_bookmark -> BrowserContract.Menu.ADD_BOOKMARK - R.id.action_find -> BrowserContract.Menu.FIND - R.id.action_reading_mode -> BrowserContract.Menu.READER - else -> null - } - - return menu?.let(presenter::onMenuClick)?.let { true } + return menuItemAdapter.adaptMenuItem(item)?.let(presenter::onMenuClick)?.let { true } ?: super.onOptionsItemSelected(item) } + override fun dispatchKeyEvent(event: KeyEvent): Boolean { + return keyEventAdapter.adaptKeyEvent(event)?.let(presenter::onKeyComboClick)?.let { true } + ?: super.dispatchKeyEvent(event) + } + override fun renderState(viewState: BrowserViewState) { binding.actionBack.isEnabled = viewState.isBackEnabled binding.actionForward.isEnabled = viewState.isForwardEnabled diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt index 2563f7aa0..d94ff122e 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt @@ -44,19 +44,6 @@ interface BrowserContract { } - enum class Menu { - NEW_TAB, - NEW_INCOGNITO_TAB, - SHARE, - HISTORY, - DOWNLOADS, - FIND, - COPY_LINK, - ADD_TO_HOME, - BOOKMARKS, - ADD_BOOKMARK, - READER, - SETTINGS - } + } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 08e122ec1..9fbb3d24e 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -1,6 +1,8 @@ package acr.browser.lightning._browser2 import acr.browser.lightning._browser2.history.HistoryRecord +import acr.browser.lightning._browser2.keys.KeyCombo +import acr.browser.lightning._browser2.menu.MenuSelection import acr.browser.lightning._browser2.tab.Tab import acr.browser.lightning._browser2.tab.TabModel import acr.browser.lightning.browser.SearchBoxModel @@ -228,31 +230,57 @@ class BrowserPresenter @Inject constructor( /** * TODO */ - fun onMenuClick(menuOption: BrowserContract.Menu) { - when (menuOption) { - BrowserContract.Menu.NEW_TAB -> onNewTabClick() - BrowserContract.Menu.NEW_INCOGNITO_TAB -> TODO() - BrowserContract.Menu.SHARE -> TODO() - BrowserContract.Menu.HISTORY -> + fun onMenuClick(menuSelection: MenuSelection) { + when (menuSelection) { + MenuSelection.NEW_TAB -> onNewTabClick() + MenuSelection.NEW_INCOGNITO_TAB -> TODO() + MenuSelection.SHARE -> TODO() + MenuSelection.HISTORY -> compositeDisposable += model.createTab(historyPageInitializer) .observeOn(mainScheduler) .subscribe { tab -> selectTab(model.selectTab(tab.id)) } - BrowserContract.Menu.DOWNLOADS -> + MenuSelection.DOWNLOADS -> compositeDisposable += model.createTab(downloadPageInitializer) .observeOn(mainScheduler) .subscribe { tab -> selectTab(model.selectTab(tab.id)) } - BrowserContract.Menu.FIND -> TODO() - BrowserContract.Menu.COPY_LINK -> TODO() - BrowserContract.Menu.ADD_TO_HOME -> TODO() - BrowserContract.Menu.BOOKMARKS -> TODO() - BrowserContract.Menu.ADD_BOOKMARK -> TODO() - BrowserContract.Menu.READER -> currentTab?.url?.takeIf { !it.isSpecialUrl() } + MenuSelection.FIND -> TODO() + MenuSelection.COPY_LINK -> TODO() + MenuSelection.ADD_TO_HOME -> TODO() + MenuSelection.BOOKMARKS -> TODO() + MenuSelection.ADD_BOOKMARK -> TODO() + MenuSelection.READER -> currentTab?.url?.takeIf { !it.isSpecialUrl() } ?.let(navigator::openReaderMode) - BrowserContract.Menu.SETTINGS -> navigator.openSettings() + MenuSelection.SETTINGS -> navigator.openSettings() + } + } + + /** + * TODO + */ + fun onKeyComboClick(keyCombo: KeyCombo) { + when (keyCombo) { + KeyCombo.CTRL_F -> TODO() + KeyCombo.CTRL_T -> onNewTabClick() + KeyCombo.CTRL_W -> TODO() + KeyCombo.CTRL_Q -> TODO() + KeyCombo.CTRL_R -> onRefreshOrStopClick() + KeyCombo.CTRL_TAB -> TODO() + KeyCombo.CTRL_SHIFT_TAB -> TODO() + KeyCombo.SEARCH -> TODO() + KeyCombo.ALT_0 -> TODO() + KeyCombo.ALT_1 -> TODO() + KeyCombo.ALT_2 -> TODO() + KeyCombo.ALT_3 -> TODO() + KeyCombo.ALT_4 -> TODO() + KeyCombo.ALT_5 -> TODO() + KeyCombo.ALT_6 -> TODO() + KeyCombo.ALT_7 -> TODO() + KeyCombo.ALT_8 -> TODO() + KeyCombo.ALT_9 -> TODO() } } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/keys/KeyCombo.kt b/app/src/main/java/acr/browser/lightning/_browser2/keys/KeyCombo.kt new file mode 100644 index 000000000..5e2bd5eec --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/keys/KeyCombo.kt @@ -0,0 +1,25 @@ +package acr.browser.lightning._browser2.keys + +/** + * Created by anthonycr on 9/16/20. + */ +enum class KeyCombo { + CTRL_F, + CTRL_T, + CTRL_W, + CTRL_Q, + CTRL_R, + CTRL_TAB, + CTRL_SHIFT_TAB, + SEARCH, + ALT_0, + ALT_1, + ALT_2, + ALT_3, + ALT_4, + ALT_5, + ALT_6, + ALT_7, + ALT_8, + ALT_9, +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/keys/KeyEventAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/keys/KeyEventAdapter.kt new file mode 100644 index 000000000..568037912 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/keys/KeyEventAdapter.kt @@ -0,0 +1,71 @@ +package acr.browser.lightning._browser2.keys + +import android.view.KeyEvent +import javax.inject.Inject + +/** + * Created by anthonycr on 9/16/20. + */ +class KeyEventAdapter @Inject constructor() { + + fun adaptKeyEvent(event: KeyEvent): KeyCombo? { + when { + event.isCtrlPressed -> when (event.keyCode) { + KeyEvent.KEYCODE_F -> { + // Search in page + return KeyCombo.CTRL_F + } + KeyEvent.KEYCODE_T -> { + // New tab + return KeyCombo.CTRL_T + } + KeyEvent.KEYCODE_W -> { + // Close current tab + return KeyCombo.CTRL_W + } + KeyEvent.KEYCODE_Q -> { + // Close browser + return KeyCombo.CTRL_Q + } + KeyEvent.KEYCODE_R -> { + // Refresh + return KeyCombo.CTRL_R + } + KeyEvent.KEYCODE_TAB -> { + return if (event.isShiftPressed) { + // Go back one tab + KeyCombo.CTRL_SHIFT_TAB + } else { + // Go forward one tab + KeyCombo.CTRL_TAB + } + } + } + event.keyCode == KeyEvent.KEYCODE_SEARCH -> { + // Highlight search field + return KeyCombo.SEARCH + } + event.isAltPressed -> { + // Alt + tab number + if (event.keyCode in KeyEvent.KEYCODE_0..KeyEvent.KEYCODE_9) { + // Choose tab by number + return when (event.keyCode) { + KeyEvent.KEYCODE_0 -> KeyCombo.ALT_0 + KeyEvent.KEYCODE_1 -> KeyCombo.ALT_1 + KeyEvent.KEYCODE_2 -> KeyCombo.ALT_2 + KeyEvent.KEYCODE_3 -> KeyCombo.ALT_3 + KeyEvent.KEYCODE_4 -> KeyCombo.ALT_4 + KeyEvent.KEYCODE_5 -> KeyCombo.ALT_5 + KeyEvent.KEYCODE_6 -> KeyCombo.ALT_6 + KeyEvent.KEYCODE_7 -> KeyCombo.ALT_8 + KeyEvent.KEYCODE_8 -> KeyCombo.ALT_8 + KeyEvent.KEYCODE_9 -> KeyCombo.ALT_9 + else -> null + } + } + } + } + return null + } + +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/menu/MenuItemAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/menu/MenuItemAdapter.kt new file mode 100644 index 000000000..476f2c53d --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/menu/MenuItemAdapter.kt @@ -0,0 +1,33 @@ +package acr.browser.lightning._browser2.menu + +import acr.browser.lightning.R +import android.view.MenuItem +import javax.inject.Inject + +/** + * Created by anthonycr on 9/16/20. + */ +class MenuItemAdapter @Inject constructor() { + + fun adaptMenuItem(menuItem: MenuItem): MenuSelection? { + return when (menuItem.itemId) { + android.R.id.home -> TODO() + R.id.action_back -> TODO() + R.id.action_forward -> TODO() + R.id.action_add_to_homescreen -> MenuSelection.ADD_TO_HOME + R.id.action_new_tab -> MenuSelection.NEW_TAB + R.id.action_incognito -> MenuSelection.NEW_INCOGNITO_TAB + R.id.action_share -> MenuSelection.SHARE + R.id.action_bookmarks -> MenuSelection.BOOKMARKS + R.id.action_copy -> MenuSelection.COPY_LINK + R.id.action_settings -> MenuSelection.SETTINGS + R.id.action_history -> MenuSelection.HISTORY + R.id.action_downloads -> MenuSelection.DOWNLOADS + R.id.action_add_bookmark -> MenuSelection.ADD_BOOKMARK + R.id.action_find -> MenuSelection.FIND + R.id.action_reading_mode -> MenuSelection.READER + else -> null + } + } + +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/menu/MenuSelection.kt b/app/src/main/java/acr/browser/lightning/_browser2/menu/MenuSelection.kt new file mode 100644 index 000000000..27df46bf0 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/menu/MenuSelection.kt @@ -0,0 +1,19 @@ +package acr.browser.lightning._browser2.menu + +/** + * Created by anthonycr on 9/16/20. + */ +enum class MenuSelection { + NEW_TAB, + NEW_INCOGNITO_TAB, + SHARE, + HISTORY, + DOWNLOADS, + FIND, + COPY_LINK, + ADD_TO_HOME, + BOOKMARKS, + ADD_BOOKMARK, + READER, + SETTINGS +} From 430f5bf9de19dc4af2b89957bd566f39175398a6 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 16 Sep 2020 08:47:01 -0400 Subject: [PATCH 014/161] Rename Tab to more descriptive TabViewState --- .../acr/browser/lightning/_browser2/BrowserPresenter.kt | 8 ++++---- .../acr/browser/lightning/_browser2/BrowserViewState.kt | 4 ++-- .../lightning/_browser2/tab/TabRecyclerViewAdapter.kt | 8 ++++---- .../lightning/_browser2/tab/{Tab.kt => TabViewState.kt} | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) rename app/src/main/java/acr/browser/lightning/_browser2/tab/{Tab.kt => TabViewState.kt} (89%) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 9fbb3d24e..090f382ac 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -3,7 +3,7 @@ package acr.browser.lightning._browser2 import acr.browser.lightning._browser2.history.HistoryRecord import acr.browser.lightning._browser2.keys.KeyCombo import acr.browser.lightning._browser2.menu.MenuSelection -import acr.browser.lightning._browser2.tab.Tab +import acr.browser.lightning._browser2.tab.TabViewState import acr.browser.lightning._browser2.tab.TabModel import acr.browser.lightning.browser.SearchBoxModel import acr.browser.lightning.database.Bookmark @@ -114,14 +114,14 @@ class BrowserPresenter @Inject constructor( canGoForwardDisposable?.dispose() } - private fun TabModel.asViewState(): Tab = Tab( + private fun TabModel.asViewState(): TabViewState = TabViewState( id = id, - icon = null, + icon = favicon, title = title, isSelected = isForeground ) - private fun List.updateId(id: Int, map: (Tab) -> Tab): List = map { + private fun List.updateId(id: Int, map: (TabViewState) -> TabViewState): List = map { if (it.id == id) { map(it) } else { diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt index 5d21feb93..f9ed9f0a7 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt @@ -1,6 +1,6 @@ package acr.browser.lightning._browser2 -import acr.browser.lightning._browser2.tab.Tab +import acr.browser.lightning._browser2.tab.TabViewState import acr.browser.lightning.database.Bookmark import acr.browser.lightning.ssl.SslState @@ -15,7 +15,7 @@ data class BrowserViewState( val progress: Int, // Tabs - val tabs: List, + val tabs: List, val isForwardEnabled: Boolean, val isBackEnabled: Boolean, diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabRecyclerViewAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabRecyclerViewAdapter.kt index 835d53e48..1626301fc 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabRecyclerViewAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabRecyclerViewAdapter.kt @@ -17,12 +17,12 @@ class TabRecyclerViewAdapter( private val onClick: (Int) -> Unit, private val onLongClick: (Int) -> Unit, private val onCloseClick: (Int) -> Unit, -) : ListAdapter( - object : DiffUtil.ItemCallback() { - override fun areItemsTheSame(oldItem: Tab, newItem: Tab): Boolean = +) : ListAdapter( + object : DiffUtil.ItemCallback() { + override fun areItemsTheSame(oldItem: TabViewState, newItem: TabViewState): Boolean = oldItem.id == newItem.id - override fun areContentsTheSame(oldItem: Tab, newItem: Tab): Boolean = oldItem == newItem + override fun areContentsTheSame(oldItem: TabViewState, newItem: TabViewState): Boolean = oldItem == newItem } ) { diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/Tab.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabViewState.kt similarity index 89% rename from app/src/main/java/acr/browser/lightning/_browser2/tab/Tab.kt rename to app/src/main/java/acr/browser/lightning/_browser2/tab/TabViewState.kt index 5acf16b5f..d02243d58 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/Tab.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabViewState.kt @@ -5,7 +5,7 @@ import android.graphics.Bitmap /** * Created by anthonycr on 9/11/20. */ -data class Tab( +data class TabViewState( val id: Int, val icon: Bitmap?, val title: String, From e29ab821a7b1541e7be7d86624f63f2527f15344 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 16 Sep 2020 22:04:53 -0400 Subject: [PATCH 015/161] Support share and copy link --- .../lightning/_browser2/BrowserContract.kt | 3 +++ .../lightning/_browser2/BrowserNavigator.kt | 17 ++++++++++++++++- .../lightning/_browser2/BrowserPresenter.kt | 7 +++++-- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt index d94ff122e..3f1e4d08b 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt @@ -42,6 +42,9 @@ interface BrowserContract { fun openReaderMode(url: String) + fun sharePage(url: String, title: String?) + + fun copyPageLink(url: String) } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserNavigator.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserNavigator.kt index 688ce61e4..22b663e38 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserNavigator.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserNavigator.kt @@ -1,8 +1,13 @@ package acr.browser.lightning._browser2 +import acr.browser.lightning.R +import acr.browser.lightning.extensions.copyToClipboard +import acr.browser.lightning.extensions.snackbar import acr.browser.lightning.reading.activity.ReadingActivity import acr.browser.lightning.settings.activity.SettingsActivity +import acr.browser.lightning.utils.IntentUtils import android.app.Activity +import android.content.ClipboardManager import android.content.Intent import javax.inject.Inject @@ -10,7 +15,8 @@ import javax.inject.Inject * Created by anthonycr on 9/15/20. */ class BrowserNavigator @Inject constructor( - private val activity: Activity + private val activity: Activity, + private val clipboardManager: ClipboardManager ) : BrowserContract.Navigator { override fun openSettings() { @@ -21,4 +27,13 @@ class BrowserNavigator @Inject constructor( ReadingActivity.launch(activity, url) } + override fun sharePage(url: String, title: String?) { + IntentUtils(activity).shareUrl(url, title) + } + + override fun copyPageLink(url: String) { + clipboardManager.copyToClipboard(url) + activity.snackbar(R.string.message_link_copied) + } + } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 090f382ac..76b5ada0f 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -234,7 +234,9 @@ class BrowserPresenter @Inject constructor( when (menuSelection) { MenuSelection.NEW_TAB -> onNewTabClick() MenuSelection.NEW_INCOGNITO_TAB -> TODO() - MenuSelection.SHARE -> TODO() + MenuSelection.SHARE -> currentTab?.url?.takeIf { !it.isSpecialUrl() }?.let { + navigator.sharePage(url = it, title = currentTab?.title) + } MenuSelection.HISTORY -> compositeDisposable += model.createTab(historyPageInitializer) .observeOn(mainScheduler) @@ -248,7 +250,8 @@ class BrowserPresenter @Inject constructor( selectTab(model.selectTab(tab.id)) } MenuSelection.FIND -> TODO() - MenuSelection.COPY_LINK -> TODO() + MenuSelection.COPY_LINK -> currentTab?.url?.takeIf { !it.isSpecialUrl() } + ?.let(navigator::copyPageLink) MenuSelection.ADD_TO_HOME -> TODO() MenuSelection.BOOKMARKS -> TODO() MenuSelection.ADD_BOOKMARK -> TODO() From 1f857a27887b91f67374381e261a568fd6d85462 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 16 Sep 2020 23:23:49 -0400 Subject: [PATCH 016/161] Handle focus issues in the search view --- .../lightning/_browser2/BrowserActivity.kt | 7 ++- .../lightning/_browser2/BrowserPresenter.kt | 54 +++++++++++++++---- .../_browser2/search/SearchListener.kt | 8 ++- .../acr/browser/lightning/view/SearchView.kt | 4 ++ 4 files changed, 62 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index b958edaa8..a990d6ca3 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -17,6 +17,7 @@ import acr.browser.lightning.search.SuggestionsAdapter import acr.browser.lightning.ssl.createSslDrawableForState import android.os.Bundle import android.view.* +import android.view.inputmethod.InputMethodManager import android.widget.AdapterView import android.widget.ImageView import androidx.recyclerview.widget.LinearLayoutManager @@ -40,6 +41,9 @@ class BrowserActivity : ThemableBrowserActivity(), BrowserContract.View { @Inject internal lateinit var menuItemAdapter: MenuItemAdapter + @Inject + internal lateinit var inputMethodManager: InputMethodManager + @Inject internal lateinit var presenter: BrowserPresenter @@ -91,10 +95,11 @@ class BrowserActivity : ThemableBrowserActivity(), BrowserContract.View { binding.search.setAdapter(suggestionsAdapter) val searchListener = SearchListener(onConfirm = { presenter.onSearch(binding.search.text.toString()) - }) + }, inputMethodManager) binding.search.setOnEditorActionListener(searchListener) binding.search.setOnKeyListener(searchListener) binding.search.addTextChangedListener(StyleRemovingTextWatcher()) + binding.search.setOnFocusChangeListener { _, hasFocus -> presenter.onSearchFocusChanged(hasFocus) } binding.actionBack.setOnClickListener { presenter.onBackClick() } binding.actionForward.setOnClickListener { presenter.onForwardClick() } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 76b5ada0f..c1d5df345 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -58,6 +58,7 @@ class BrowserPresenter @Inject constructor( ) private var currentTab: TabModel? = null private var currentFolder: Bookmark.Folder = Bookmark.Folder.Root + private var isSearchViewFocused = false private val compositeDisposable = CompositeDisposable() private var sslDisposable: Disposable? = null @@ -161,7 +162,13 @@ class BrowserPresenter @Inject constructor( ?.distinctUntilChanged() ?.observeOn(mainScheduler) ?.subscribe { - view.updateState(viewState.copy(sslState = it)) + view.updateState(viewState.copy( + sslState = if (isSearchViewFocused) { + SslState.None + } else { + it + } + )) } titleDisposable?.dispose() @@ -193,13 +200,15 @@ class BrowserPresenter @Inject constructor( ?.distinctUntilChanged() ?.observeOn(mainScheduler) ?.subscribe { - view.updateState(viewState.copy( - displayUrl = searchBoxModel.getDisplayContent( - url = tabModel.url, - title = tabModel.title, - isLoading = (tabModel.loadingProgress ?: 0) < 100 - ) - )) + if (isSearchViewFocused) { + view.updateState(viewState.copy( + displayUrl = searchBoxModel.getDisplayContent( + url = tabModel.url, + title = tabModel.title, + isLoading = tabModel.loadingProgress < 100 + ) + )) + } } loadingDisposable?.dispose() @@ -207,7 +216,10 @@ class BrowserPresenter @Inject constructor( ?.distinctUntilChanged() ?.observeOn(mainScheduler) ?.subscribe { - view.updateState(viewState.copy(progress = it, isRefresh = it == 100)) + view.updateState(viewState.copy( + progress = it, + isRefresh = it == 100 && !isSearchViewFocused + )) } canGoBackDisposable?.dispose() @@ -366,6 +378,10 @@ class BrowserPresenter @Inject constructor( * TODO */ fun onRefreshOrStopClick() { + if (isSearchViewFocused) { + view?.renderState(viewState.copy(displayUrl = "")) + return + } if (currentTab?.loadingProgress != 100) { currentTab?.stopLoading() } else { @@ -373,6 +389,26 @@ class BrowserPresenter @Inject constructor( } } + /** + * TODO + */ + fun onSearchFocusChanged(isFocused: Boolean) { + isSearchViewFocused = isFocused + if (isFocused) { + view?.updateState(viewState.copy(sslState = SslState.None, isRefresh = false)) + } else { + view?.updateState(viewState.copy( + sslState = currentTab?.sslState ?: SslState.None, + isRefresh = (currentTab?.loadingProgress ?: 0) == 100, + displayUrl = searchBoxModel.getDisplayContent( + url = currentTab?.url.orEmpty(), + title = currentTab?.title.orEmpty(), + isLoading = (currentTab?.loadingProgress ?: 0) < 100 + ) + )) + } + } + /** * TODO */ diff --git a/app/src/main/java/acr/browser/lightning/_browser2/search/SearchListener.kt b/app/src/main/java/acr/browser/lightning/_browser2/search/SearchListener.kt index cf7dc8fe7..be3fecbd1 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/search/SearchListener.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/search/SearchListener.kt @@ -3,6 +3,7 @@ package acr.browser.lightning._browser2.search import android.view.KeyEvent import android.view.View import android.view.inputmethod.EditorInfo +import android.view.inputmethod.InputMethodManager import android.widget.TextView /** @@ -10,6 +11,7 @@ import android.widget.TextView */ class SearchListener( private val onConfirm: () -> Unit, + private val inputMethodManager: InputMethodManager ) : View.OnKeyListener, TextView.OnEditorActionListener { override fun onKey(view: View, keyCode: Int, keyEvent: KeyEvent): Boolean { @@ -18,6 +20,8 @@ class SearchListener( } return when (keyCode) { KeyEvent.KEYCODE_ENTER -> { + view.clearFocus() + inputMethodManager.hideSoftInputFromWindow(view.windowToken, 0) onConfirm() true } @@ -25,13 +29,15 @@ class SearchListener( } } - override fun onEditorAction(v: TextView, actionId: Int, event: KeyEvent?): Boolean { + override fun onEditorAction(view: TextView, actionId: Int, event: KeyEvent?): Boolean { if (actionId == EditorInfo.IME_ACTION_GO || actionId == EditorInfo.IME_ACTION_DONE || actionId == EditorInfo.IME_ACTION_NEXT || actionId == EditorInfo.IME_ACTION_SEND || actionId == EditorInfo.IME_ACTION_SEARCH || event?.action == KeyEvent.KEYCODE_ENTER) { + view.clearFocus() + inputMethodManager.hideSoftInputFromWindow(view.windowToken, 0) onConfirm() return true } diff --git a/app/src/main/java/acr/browser/lightning/view/SearchView.kt b/app/src/main/java/acr/browser/lightning/view/SearchView.kt index 5a77221a7..4dceba08b 100644 --- a/app/src/main/java/acr/browser/lightning/view/SearchView.kt +++ b/app/src/main/java/acr/browser/lightning/view/SearchView.kt @@ -22,6 +22,10 @@ class SearchView @JvmOverloads constructor( private var isBeingClicked: Boolean = false private var timePressedNs: Long = 0 + init { + setSelectAllOnFocus(true) + } + override fun onTouchEvent(event: MotionEvent): Boolean { when (event.action) { MotionEvent.ACTION_DOWN -> { From e2f110602af712ea0a71703775b16bacc065d4cc Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 16 Sep 2020 23:50:48 -0400 Subject: [PATCH 017/161] Fixing search focus display of URL --- .../java/acr/browser/lightning/_browser2/BrowserPresenter.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index c1d5df345..dba88df10 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -200,7 +200,7 @@ class BrowserPresenter @Inject constructor( ?.distinctUntilChanged() ?.observeOn(mainScheduler) ?.subscribe { - if (isSearchViewFocused) { + if (!isSearchViewFocused) { view.updateState(viewState.copy( displayUrl = searchBoxModel.getDisplayContent( url = tabModel.url, From 3ff5f8ccd9bd04f2cd391dfdbc79f2917b15c31b Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 16 Sep 2020 23:53:06 -0400 Subject: [PATCH 018/161] Create partial state class that allows the diff in the state to be rendered by the view without re-rendering everything --- .../lightning/_browser2/BrowserActivity.kt | 39 ++++++++++-------- .../_browser2/BrowserStateAdapter.kt | 41 +++++++++++++++++++ .../lightning/_browser2/BrowserViewState.kt | 17 ++++++++ 3 files changed, 80 insertions(+), 17 deletions(-) create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index a990d6ca3..e299ca320 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -26,7 +26,7 @@ import javax.inject.Inject /** * Created by anthonycr on 9/11/20. */ -class BrowserActivity : ThemableBrowserActivity(), BrowserContract.View { +class BrowserActivity : ThemableBrowserActivity() { private lateinit var binding: BrowserActivityBinding private lateinit var tabsAdapter: TabRecyclerViewAdapter @@ -76,7 +76,7 @@ class BrowserActivity : ThemableBrowserActivity(), BrowserContract.View { binding.bookmarkListView.adapter = bookmarksAdapter binding.bookmarkListView.layoutManager = LinearLayoutManager(this) - presenter.onViewAttached(this) + presenter.onViewAttached(BrowserStateAdapter(this)) val suggestionsAdapter = SuggestionsAdapter(this, isIncognito = false).apply { onSuggestionInsertClick = { @@ -128,21 +128,26 @@ class BrowserActivity : ThemableBrowserActivity(), BrowserContract.View { ?: super.dispatchKeyEvent(event) } - override fun renderState(viewState: BrowserViewState) { - binding.actionBack.isEnabled = viewState.isBackEnabled - binding.actionForward.isEnabled = viewState.isForwardEnabled - binding.search.setText(viewState.displayUrl) - binding.searchSslStatus.setImageDrawable(createSslDrawableForState(viewState.sslState)) - binding.searchSslStatus.updateVisibilityForDrawable() - binding.tabCountView.updateCount(viewState.tabs.size) - binding.progressView.progress = viewState.progress - binding.searchRefresh.setImageResource(if (viewState.isRefresh) { - R.drawable.ic_action_refresh - } else { - R.drawable.ic_action_delete - }) - tabsAdapter.submitList(viewState.tabs) - bookmarksAdapter.submitList(viewState.bookmarks) + fun renderState(viewState: PartialBrowserViewState) { + viewState.isBackEnabled?.let { binding.actionBack.isEnabled = it } + viewState.isForwardEnabled?.let { binding.actionForward.isEnabled = it } + viewState.displayUrl?.let(binding.search::setText) + viewState.sslState?.let { + binding.searchSslStatus.setImageDrawable(createSslDrawableForState(it)) + binding.searchSslStatus.updateVisibilityForDrawable() + } + viewState.tabs?.let { binding.tabCountView.updateCount(viewState.tabs.size) } + viewState.progress?.let { binding.progressView.progress = it } + viewState.isRefresh?.let { + binding.searchRefresh.setImageResource(if (viewState.isRefresh) { + R.drawable.ic_action_refresh + } else { + R.drawable.ic_action_delete + }) + } + viewState.tabs?.let { tabsAdapter.submitList(viewState.tabs) } + viewState.bookmarks?.let { bookmarksAdapter.submitList(viewState.bookmarks) } + } private fun ImageView.updateVisibilityForDrawable() { diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt new file mode 100644 index 000000000..b6a6b0dd9 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt @@ -0,0 +1,41 @@ +package acr.browser.lightning._browser2 + + +/** + * Created by anthonycr on 9/16/20. + */ +class BrowserStateAdapter(private val browserActivity: BrowserActivity) : BrowserContract.View { + + private var currentState: BrowserViewState? = null + + override fun renderState(viewState: BrowserViewState) { + val ( + displayUrl, + sslState, + isRefresh, + progress, + tabs, + isForwardEnabled, + isBackEnabled, + bookmarks, + isBookmarked + ) = viewState + + browserActivity.renderState( + PartialBrowserViewState( + displayUrl = displayUrl.takeIf { it != currentState?.displayUrl }, + sslState = sslState.takeIf { it != currentState?.sslState }, + isRefresh = isRefresh.takeIf { it != currentState?.isRefresh }, + progress = progress.takeIf { it != currentState?.progress }, + tabs = tabs.takeIf { it != currentState?.tabs }, + isForwardEnabled = isForwardEnabled.takeIf { it != currentState?.isForwardEnabled }, + isBackEnabled = isBackEnabled.takeIf { it != currentState?.isBackEnabled }, + bookmarks = bookmarks.takeIf { it != currentState?.bookmarks }, + isBookmarked = isBookmarked.takeIf { it != currentState?.isBookmarked } + ) + ) + + currentState = viewState + } + +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt index f9ed9f0a7..5bd26b94a 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt @@ -23,3 +23,20 @@ data class BrowserViewState( val bookmarks: List, val isBookmarked: Boolean ) + +data class PartialBrowserViewState( + // search bar + val displayUrl: String?, + val sslState: SslState?, + val isRefresh: Boolean?, + val progress: Int?, + + // Tabs + val tabs: List?, + val isForwardEnabled: Boolean?, + val isBackEnabled: Boolean?, + + // Bookmarks + val bookmarks: List?, + val isBookmarked: Boolean? +) From bd9e62474c4b99fe44cd93e9689268a0baebc17e Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Thu, 17 Sep 2020 21:00:51 -0400 Subject: [PATCH 019/161] Support adblocking --- .../_browser2/di/Browser2BindsModule.kt | 30 +++++++++++ .../_browser2/di/Browser2Component.kt | 2 +- .../lightning/_browser2/di/Browser2Module.kt | 38 +++++++------ .../lightning/_browser2/tab/TabAdapter.kt | 36 ++++--------- .../_browser2/tab/TabWebChromeClient.kt | 10 ++-- .../_browser2/tab/TabWebViewClient.kt | 53 ++++++++++++++++--- .../lightning/_browser2/tab/TabsRepository.kt | 14 +++-- 7 files changed, 120 insertions(+), 63 deletions(-) create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/di/Browser2BindsModule.kt diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2BindsModule.kt b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2BindsModule.kt new file mode 100644 index 000000000..cd1105558 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2BindsModule.kt @@ -0,0 +1,30 @@ +package acr.browser.lightning._browser2.di + +import acr.browser.lightning._browser2.BrowserContract +import acr.browser.lightning._browser2.BrowserNavigator +import acr.browser.lightning._browser2.history.DefaultHistoryRecord +import acr.browser.lightning._browser2.history.HistoryRecord +import acr.browser.lightning._browser2.image.FaviconImageLoader +import acr.browser.lightning._browser2.image.ImageLoader +import acr.browser.lightning._browser2.tab.TabsRepository +import dagger.Binds +import dagger.Module + +/** + * Created by anthonycr on 9/15/20. + */ +@Module +interface Browser2BindsModule { + + @Binds + fun bindsBrowserModel(tabsRepository: TabsRepository): BrowserContract.Model + + @Binds + fun bindsHistoryRecord(defaultHistoryRecord: DefaultHistoryRecord): HistoryRecord + + @Binds + fun bindsFaviconImageLoader(faviconImageLoader: FaviconImageLoader): ImageLoader + + @Binds + fun bindsBrowserNavigator(browserNavigator: BrowserNavigator): BrowserContract.Navigator +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt index ea1921134..77c5e6fa1 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt @@ -9,7 +9,7 @@ import dagger.Subcomponent /** * Created by anthonycr on 9/15/20. */ -@Subcomponent(modules = [Browser2Module::class]) +@Subcomponent(modules = [Browser2Module::class, Browser2BindsModule::class]) interface Browser2Component { @Subcomponent.Builder diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt index 862c21ade..239182675 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt @@ -1,30 +1,28 @@ package acr.browser.lightning._browser2.di -import acr.browser.lightning._browser2.BrowserContract -import acr.browser.lightning._browser2.BrowserNavigator -import acr.browser.lightning._browser2.history.DefaultHistoryRecord -import acr.browser.lightning._browser2.history.HistoryRecord -import acr.browser.lightning._browser2.image.FaviconImageLoader -import acr.browser.lightning._browser2.image.ImageLoader -import acr.browser.lightning._browser2.tab.TabsRepository -import dagger.Binds +import acr.browser.lightning.adblock.AdBlocker +import acr.browser.lightning.adblock.BloomFilterAdBlocker +import acr.browser.lightning.adblock.NoOpAdBlocker +import acr.browser.lightning.preference.UserPreferences import dagger.Module +import dagger.Provides +import javax.inject.Provider /** - * Created by anthonycr on 9/15/20. + * Created by anthonycr on 9/17/20. */ @Module -interface Browser2Module { +class Browser2Module { - @Binds - fun bindsBrowserModel(tabsRepository: TabsRepository): BrowserContract.Model + @Provides + fun providesAdBlocker( + userPreferences: UserPreferences, + bloomFilterAdBlocker: Provider, + noOpAdBlocker: NoOpAdBlocker + ): AdBlocker = if (userPreferences.adBlockEnabled) { + bloomFilterAdBlocker.get() + } else { + noOpAdBlocker + } - @Binds - fun bindsHistoryRecord(defaultHistoryRecord: DefaultHistoryRecord): HistoryRecord - - @Binds - fun bindsFaviconImageLoader(faviconImageLoader: FaviconImageLoader): ImageLoader - - @Binds - fun bindsBrowserNavigator(browserNavigator: BrowserNavigator): BrowserContract.Navigator } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt index 70551bc8f..8e3462367 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt @@ -6,7 +6,6 @@ import acr.browser.lightning.view.TabInitializer import android.graphics.Bitmap import android.webkit.WebView import io.reactivex.Observable -import io.reactivex.subjects.PublishSubject /** * Created by anthonycr on 9/12/20. @@ -14,30 +13,15 @@ import io.reactivex.subjects.PublishSubject class TabAdapter( tabInitializer: TabInitializer, private val webView: WebView, + private val tabWebViewClient: TabWebViewClient, + private val tabWebChromeClient: TabWebChromeClient ) : TabModel { - private val faviconObservable = PublishSubject.create() - private val urlObservable = PublishSubject.create() - private val sslStateObservable = PublishSubject.create() - private val progressObservable = PublishSubject.create() - private val titleObservable = PublishSubject.create() - private val goBackObservable = PublishSubject.create() - private val goForwardObservable = PublishSubject.create() - private val tabWebViewClient = TabWebViewClient( - urlObservable = urlObservable, - sslStateObservable = sslStateObservable, - goBackObservable = goBackObservable, - goForwardObservable = goForwardObservable - ) private var latentInitializer: TabInitializer? = null init { webView.webViewClient = tabWebViewClient - webView.webChromeClient = TabWebChromeClient( - progressObservable = progressObservable, - titleObservable = titleObservable, - faviconObservable = faviconObservable - ) + webView.webChromeClient = tabWebChromeClient if (tabInitializer is FreezableBundleInitializer) { latentInitializer = tabInitializer } else { @@ -57,7 +41,7 @@ class TabAdapter( override fun canGoBack(): Boolean = webView.canGoBack() - override fun canGoBackChanges(): Observable = goBackObservable.hide() + override fun canGoBackChanges(): Observable = tabWebViewClient.goBackObservable.hide() override fun goForward() { webView.goForward() @@ -65,7 +49,7 @@ class TabAdapter( override fun canGoForward(): Boolean = webView.canGoForward() - override fun canGoForwardChanges(): Observable = goForwardObservable.hide() + override fun canGoForwardChanges(): Observable = tabWebViewClient.goForwardObservable.hide() override fun reload() { webView.reload() @@ -78,28 +62,28 @@ class TabAdapter( override val favicon: Bitmap? get() = webView.favicon - override fun faviconChanges(): Observable = faviconObservable.hide() + override fun faviconChanges(): Observable = tabWebChromeClient.faviconObservable.hide() // TODO do we show "new tab" override val url: String get() = webView.url.orEmpty() - override fun urlChanges(): Observable = urlObservable.hide() + override fun urlChanges(): Observable = tabWebViewClient.urlObservable.hide() override val title: String get() = webView.title.orEmpty() - override fun titleChanges(): Observable = titleObservable.hide() + override fun titleChanges(): Observable = tabWebChromeClient.titleObservable.hide() override val sslState: SslState get() = tabWebViewClient.sslState - override fun sslChanges(): Observable = sslStateObservable.hide() + override fun sslChanges(): Observable = tabWebViewClient.sslStateObservable.hide() override val loadingProgress: Int get() = webView.progress - override fun loadingProgress(): Observable = progressObservable.hide() + override fun loadingProgress(): Observable = tabWebChromeClient.progressObservable.hide() override var isForeground: Boolean = false set(value) { diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt index 7bb7d6c54..d0f15ebe0 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt @@ -8,11 +8,11 @@ import io.reactivex.subjects.PublishSubject /** * Created by anthonycr on 9/12/20. */ -class TabWebChromeClient( - private val progressObservable: PublishSubject, - private val titleObservable: PublishSubject, - private val faviconObservable: PublishSubject -) : WebChromeClient() { +class TabWebChromeClient : WebChromeClient() { + + val progressObservable: PublishSubject = PublishSubject.create() + val titleObservable: PublishSubject = PublishSubject.create() + val faviconObservable: PublishSubject = PublishSubject.create() override fun onProgressChanged(view: WebView, newProgress: Int) { super.onProgressChanged(view, newProgress) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebViewClient.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebViewClient.kt index d7554050d..1cc52e7ce 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebViewClient.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebViewClient.kt @@ -1,29 +1,41 @@ package acr.browser.lightning._browser2.tab +import acr.browser.lightning.adblock.AdBlocker +import acr.browser.lightning.adblock.allowlist.AllowListModel import acr.browser.lightning.ssl.SslState +import android.annotation.TargetApi import android.graphics.Bitmap import android.net.http.SslError -import android.webkit.SslErrorHandler -import android.webkit.URLUtil -import android.webkit.WebView -import android.webkit.WebViewClient +import android.os.Build +import android.webkit.* import io.reactivex.subjects.PublishSubject +import java.io.ByteArrayInputStream /** * Created by anthonycr on 9/12/20. */ class TabWebViewClient( - private val urlObservable: PublishSubject, - private val sslStateObservable: PublishSubject, - private val goBackObservable: PublishSubject, - private val goForwardObservable: PublishSubject + private val adBlocker: AdBlocker, + private val allowListModel: AllowListModel ) : WebViewClient() { + val urlObservable: PublishSubject = PublishSubject.create() + val sslStateObservable: PublishSubject = PublishSubject.create() + val goBackObservable: PublishSubject = PublishSubject.create() + val goForwardObservable: PublishSubject = PublishSubject.create() + var sslState: SslState = SslState.None private set + private var currentUrl: String = "" + + private fun shouldBlockRequest(pageUrl: String, requestUrl: String) = + !allowListModel.isUrlAllowedAds(pageUrl) && + adBlocker.isAd(requestUrl) + override fun onPageStarted(view: WebView, url: String, favicon: Bitmap?) { super.onPageStarted(view, url, favicon) + currentUrl = url urlObservable.onNext(url) sslState = if (URLUtil.isHttpsUrl(url)) { SslState.Valid @@ -45,4 +57,29 @@ class TabWebViewClient( sslState = SslState.Invalid(error) sslStateObservable.onNext(sslState) } + + @TargetApi(Build.VERSION_CODES.LOLLIPOP) + override fun shouldInterceptRequest(view: WebView, request: WebResourceRequest): WebResourceResponse? { + if (shouldBlockRequest(currentUrl, request.url.toString())) { + val empty = ByteArrayInputStream(emptyResponseByteArray) + return WebResourceResponse(BLOCKED_RESPONSE_MIME_TYPE, BLOCKED_RESPONSE_ENCODING, empty) + } + return null + } + + @Suppress("OverridingDeprecatedMember") + override fun shouldInterceptRequest(view: WebView, url: String): WebResourceResponse? { + if (shouldBlockRequest(currentUrl, url)) { + val empty = ByteArrayInputStream(emptyResponseByteArray) + return WebResourceResponse(BLOCKED_RESPONSE_MIME_TYPE, BLOCKED_RESPONSE_ENCODING, empty) + } + return null + } + + companion object { + private val emptyResponseByteArray: ByteArray = byteArrayOf() + + private const val BLOCKED_RESPONSE_MIME_TYPE = "text/plain" + private const val BLOCKED_RESPONSE_ENCODING = "utf-8" + } } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt index 7dd566ff4..52af0e622 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt @@ -1,8 +1,9 @@ package acr.browser.lightning._browser2.tab import acr.browser.lightning._browser2.BrowserContract +import acr.browser.lightning.adblock.AdBlocker +import acr.browser.lightning.adblock.allowlist.AllowListModel import acr.browser.lightning.view.TabInitializer -import acr.browser.lightning.view.UrlInitializer import io.reactivex.Completable import io.reactivex.Maybe import io.reactivex.Observable @@ -15,7 +16,9 @@ import javax.inject.Inject */ class TabsRepository @Inject constructor( private val webViewFactory: WebViewFactory, - private val tabPager: TabPager + private val tabPager: TabPager, + private val adBlocker: AdBlocker, + private val allowListModel: AllowListModel ) : BrowserContract.Model { private var selectedTab: TabModel? = null @@ -35,7 +38,12 @@ class TabsRepository @Inject constructor( override fun createTab(tabInitializer: TabInitializer): Single = Single.fromCallable { val webView = webViewFactory.createWebView(isIncognito = false) tabPager.addTab(webView) - val tabAdapter = TabAdapter(tabInitializer, webView) + val tabAdapter = TabAdapter( + tabInitializer, + webView, + TabWebViewClient(adBlocker, allowListModel), + TabWebChromeClient() + ) tabsList += tabAdapter From 1ba137b87c03be4d7721324124f86965bd42414f Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Thu, 17 Sep 2020 21:12:35 -0400 Subject: [PATCH 020/161] Fixing bug where search sometimes just reloaded tab, caused by focus clear triggering setText, also filtering out empty searches --- .../java/acr/browser/lightning/_browser2/BrowserPresenter.kt | 5 ++++- .../acr/browser/lightning/_browser2/search/SearchListener.kt | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index dba88df10..c221f0414 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -413,9 +413,12 @@ class BrowserPresenter @Inject constructor( * TODO */ fun onSearch(query: String) { + if (query.isEmpty()) { + return + } currentTab?.stopLoading() val searchUrl = searchEngineProvider.provideSearchEngine().queryUrl + QUERY_PLACE_HOLDER - val url = smartUrlFilter(query, true, searchUrl) + val url = smartUrlFilter(query.trim(), true, searchUrl) view?.updateState(viewState.copy( displayUrl = searchBoxModel.getDisplayContent( url = url, diff --git a/app/src/main/java/acr/browser/lightning/_browser2/search/SearchListener.kt b/app/src/main/java/acr/browser/lightning/_browser2/search/SearchListener.kt index be3fecbd1..85688d4ed 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/search/SearchListener.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/search/SearchListener.kt @@ -20,9 +20,9 @@ class SearchListener( } return when (keyCode) { KeyEvent.KEYCODE_ENTER -> { + onConfirm() view.clearFocus() inputMethodManager.hideSoftInputFromWindow(view.windowToken, 0) - onConfirm() true } else -> false @@ -36,9 +36,9 @@ class SearchListener( || actionId == EditorInfo.IME_ACTION_SEND || actionId == EditorInfo.IME_ACTION_SEARCH || event?.action == KeyEvent.KEYCODE_ENTER) { + onConfirm() view.clearFocus() inputMethodManager.hideSoftInputFromWindow(view.windowToken, 0) - onConfirm() return true } return false From 455f96852bb85b2f9e6b68f3d096e04d11f17b58 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Thu, 17 Sep 2020 22:21:01 -0400 Subject: [PATCH 021/161] Support enabling and disabling add bookmark icon, partial bookmark/unbookmark support --- .../lightning/_browser2/BrowserActivity.kt | 4 +- .../lightning/_browser2/BrowserPresenter.kt | 40 +++++++++++++++++-- .../_browser2/BrowserStateAdapter.kt | 6 ++- .../lightning/_browser2/BrowserViewState.kt | 6 ++- 4 files changed, 47 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index e299ca320..f4515b66b 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -106,6 +106,7 @@ class BrowserActivity : ThemableBrowserActivity() { binding.actionHome.setOnClickListener { presenter.onHomeClick() } binding.newTabButton.setOnClickListener { presenter.onNewTabClick() } binding.searchRefresh.setOnClickListener { presenter.onRefreshOrStopClick() } + binding.actionAddBookmark.setOnClickListener { presenter.onStarClick() } } override fun onDestroy() { @@ -147,7 +148,8 @@ class BrowserActivity : ThemableBrowserActivity() { } viewState.tabs?.let { tabsAdapter.submitList(viewState.tabs) } viewState.bookmarks?.let { bookmarksAdapter.submitList(viewState.bookmarks) } - + viewState.isBookmarked?.let { binding.actionAddBookmark.isSelected = it } + viewState.isBookmarkEnabled?.let { binding.actionAddBookmark.isEnabled = it } } private fun ImageView.updateVisibilityForDrawable() { diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index c221f0414..e68f3b1d9 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -54,7 +54,8 @@ class BrowserPresenter @Inject constructor( isForwardEnabled = false, isBackEnabled = false, bookmarks = emptyList(), - isBookmarked = false + isBookmarked = false, + isBookmarkEnabled = true ) private var currentTab: TabModel? = null private var currentFolder: Bookmark.Folder = Bookmark.Folder.Root @@ -197,16 +198,19 @@ class BrowserPresenter @Inject constructor( urlDisposable?.dispose() urlDisposable = tabModel?.urlChanges() + ?.flatMapSingle { url -> bookmarkRepository.isBookmark(url).map { Pair(url, it) } } ?.distinctUntilChanged() ?.observeOn(mainScheduler) - ?.subscribe { + ?.subscribe { (url, isBookmark) -> if (!isSearchViewFocused) { view.updateState(viewState.copy( displayUrl = searchBoxModel.getDisplayContent( url = tabModel.url, title = tabModel.title, isLoading = tabModel.loadingProgress < 100 - ) + ), + isBookmarked = isBookmark, + isBookmarkEnabled = !url.isSpecialUrl() )) } } @@ -489,7 +493,35 @@ class BrowserPresenter @Inject constructor( * TODO */ fun onStarClick() { - + val url = currentTab?.url ?: return + val title = currentTab?.title.orEmpty() + if (url.isSpecialUrl()) { + return + } + compositeDisposable += bookmarkRepository.isBookmark(url) + .flatMap { + if (it) { + bookmarkRepository.deleteBookmark(Bookmark.Entry( + url = url, + title = title, + position = 0, + folder = Bookmark.Folder.Root + )) + } else { + bookmarkRepository.addBookmarkIfNotExists(Bookmark.Entry( + url = url, + title = title, + position = 0, + folder = Bookmark.Folder.Root + )) + } + } + .flatMap { bookmarkRepository.getBookmarksFromFolderSorted(folder = currentFolder.title) } + .subscribeOn(databaseScheduler) + .observeOn(mainScheduler) + .subscribe { list -> + this.view?.updateState(viewState.copy(bookmarks = list)) + } } /** diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt index b6a6b0dd9..5265928f2 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt @@ -18,7 +18,8 @@ class BrowserStateAdapter(private val browserActivity: BrowserActivity) : Browse isForwardEnabled, isBackEnabled, bookmarks, - isBookmarked + isBookmarked, + isBookmarkEnabled ) = viewState browserActivity.renderState( @@ -31,7 +32,8 @@ class BrowserStateAdapter(private val browserActivity: BrowserActivity) : Browse isForwardEnabled = isForwardEnabled.takeIf { it != currentState?.isForwardEnabled }, isBackEnabled = isBackEnabled.takeIf { it != currentState?.isBackEnabled }, bookmarks = bookmarks.takeIf { it != currentState?.bookmarks }, - isBookmarked = isBookmarked.takeIf { it != currentState?.isBookmarked } + isBookmarked = isBookmarked.takeIf { it != currentState?.isBookmarked }, + isBookmarkEnabled = isBookmarkEnabled.takeIf { it != currentState?.isBookmarkEnabled } ) ) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt index 5bd26b94a..a05650734 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt @@ -21,7 +21,8 @@ data class BrowserViewState( // Bookmarks val bookmarks: List, - val isBookmarked: Boolean + val isBookmarked: Boolean, + val isBookmarkEnabled: Boolean ) data class PartialBrowserViewState( @@ -38,5 +39,6 @@ data class PartialBrowserViewState( // Bookmarks val bookmarks: List?, - val isBookmarked: Boolean? + val isBookmarked: Boolean?, + val isBookmarkEnabled: Boolean? ) From 5faf8f887c4a28ab4488f62c99de6ee654ddc9e6 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Fri, 18 Sep 2020 08:49:41 -0400 Subject: [PATCH 022/161] Add missing click bindings --- .../acr/browser/lightning/_browser2/BrowserActivity.kt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index f4515b66b..ffbaa33e4 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -107,6 +107,11 @@ class BrowserActivity : ThemableBrowserActivity() { binding.newTabButton.setOnClickListener { presenter.onNewTabClick() } binding.searchRefresh.setOnClickListener { presenter.onRefreshOrStopClick() } binding.actionAddBookmark.setOnClickListener { presenter.onStarClick() } + binding.actionPageTools.setOnClickListener { presenter.onToolsClick() } + binding.tabHeaderButton.setOnClickListener { presenter.onTabMenuClick() } + binding.actionReading.setOnClickListener { presenter.onReadingModeClick() } + binding.bookmarkBackButton.setOnClickListener { presenter.onBookmarkMenuClick() } + binding.searchSslStatus.setOnClickListener { presenter.onSslIconClick() } } override fun onDestroy() { @@ -129,6 +134,9 @@ class BrowserActivity : ThemableBrowserActivity() { ?: super.dispatchKeyEvent(event) } + /** + * TODO + */ fun renderState(viewState: PartialBrowserViewState) { viewState.isBackEnabled?.let { binding.actionBack.isEnabled = it } viewState.isForwardEnabled?.let { binding.actionForward.isEnabled = it } From a94369e77880389032d777763b312a5cb9d86851 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Fri, 18 Sep 2020 21:09:58 -0400 Subject: [PATCH 023/161] Only handle key up scenarios --- .../acr/browser/lightning/_browser2/keys/KeyEventAdapter.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/keys/KeyEventAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/keys/KeyEventAdapter.kt index 568037912..e18fdae8f 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/keys/KeyEventAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/keys/KeyEventAdapter.kt @@ -9,6 +9,9 @@ import javax.inject.Inject class KeyEventAdapter @Inject constructor() { fun adaptKeyEvent(event: KeyEvent): KeyCombo? { + if (event.action != KeyEvent.ACTION_UP) { + return null + } when { event.isCtrlPressed -> when (event.keyCode) { KeyEvent.KEYCODE_F -> { From d2593984301ae0b16ac3a2199c0792dc1bf55824 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sat, 19 Sep 2020 11:26:33 -0400 Subject: [PATCH 024/161] Simplify key handling --- .../java/acr/browser/lightning/_browser2/BrowserActivity.kt | 4 ++-- .../acr/browser/lightning/_browser2/keys/KeyEventAdapter.kt | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index ffbaa33e4..08d81ddda 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -129,9 +129,9 @@ class BrowserActivity : ThemableBrowserActivity() { ?: super.onOptionsItemSelected(item) } - override fun dispatchKeyEvent(event: KeyEvent): Boolean { + override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean { return keyEventAdapter.adaptKeyEvent(event)?.let(presenter::onKeyComboClick)?.let { true } - ?: super.dispatchKeyEvent(event) + ?: super.onKeyUp(keyCode, event) } /** diff --git a/app/src/main/java/acr/browser/lightning/_browser2/keys/KeyEventAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/keys/KeyEventAdapter.kt index e18fdae8f..568037912 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/keys/KeyEventAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/keys/KeyEventAdapter.kt @@ -9,9 +9,6 @@ import javax.inject.Inject class KeyEventAdapter @Inject constructor() { fun adaptKeyEvent(event: KeyEvent): KeyCombo? { - if (event.action != KeyEvent.ACTION_UP) { - return null - } when { event.isCtrlPressed -> when (event.keyCode) { KeyEvent.KEYCODE_F -> { From b6e5b80a414ae4fd60adedac8bf00b8dfd7ed1ad Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sat, 19 Sep 2020 12:00:07 -0400 Subject: [PATCH 025/161] Load homepage on home press --- .../acr/browser/lightning/_browser2/BrowserPresenter.kt | 2 +- .../lightning/_browser2/image/FaviconImageLoader.kt | 6 +++--- .../acr/browser/lightning/_browser2/tab/TabAdapter.kt | 8 ++++++-- .../java/acr/browser/lightning/_browser2/tab/TabModel.kt | 3 +++ .../acr/browser/lightning/_browser2/tab/TabsRepository.kt | 1 + 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index e68f3b1d9..4a6123164 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -364,7 +364,7 @@ class BrowserPresenter @Inject constructor( * TODO */ fun onHomeClick() { - currentTab?.loadUrl("https://google.com") + currentTab?.loadFromInitializer(homePageInitializer) } /** diff --git a/app/src/main/java/acr/browser/lightning/_browser2/image/FaviconImageLoader.kt b/app/src/main/java/acr/browser/lightning/_browser2/image/FaviconImageLoader.kt index 58837223b..9a0047533 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/image/FaviconImageLoader.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/image/FaviconImageLoader.kt @@ -29,7 +29,7 @@ class FaviconImageLoader @Inject constructor( private val lruCache: LruCache = LruCache(1 * 1000 * 1000) private val folderIcon = application.drawable(R.drawable.ic_folder) - private val webpageIcon = application.drawable(R.drawable.ic_webpage) + private val webPageIcon = application.drawable(R.drawable.ic_webpage) private val compositeDisposable = CompositeDisposable() override fun loadImage(imageView: ImageView, bookmark: Bookmark) { @@ -47,8 +47,8 @@ class FaviconImageLoader @Inject constructor( imageView.setImageDrawable(folderIcon) } is Bookmark.Entry -> { - lruCache.put(bookmark.url, webpageIcon) - imageView.setImageDrawable(webpageIcon) + lruCache.put(bookmark.url, webPageIcon) + imageView.setImageDrawable(webPageIcon) compositeDisposable += faviconModel .faviconForUrl(bookmark.url, bookmark.title) .subscribeOn(networkScheduler) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt index 8e3462367..495179ea2 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt @@ -25,7 +25,7 @@ class TabAdapter( if (tabInitializer is FreezableBundleInitializer) { latentInitializer = tabInitializer } else { - tabInitializer.initialize(webView, emptyMap()) + loadFromInitializer(tabInitializer) } } @@ -35,6 +35,10 @@ class TabAdapter( webView.loadUrl(url) } + override fun loadFromInitializer(tabInitializer: TabInitializer) { + tabInitializer.initialize(webView, emptyMap()) + } + override fun goBack() { webView.goBack() } @@ -90,7 +94,7 @@ class TabAdapter( field = value if (field) { webView.onResume() - latentInitializer?.initialize(webView, emptyMap()) + latentInitializer?.let(::loadFromInitializer) latentInitializer = null } else { webView.onPause() diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt index d0c804c6a..369818499 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt @@ -1,6 +1,7 @@ package acr.browser.lightning._browser2.tab import acr.browser.lightning.ssl.SslState +import acr.browser.lightning.view.TabInitializer import android.graphics.Bitmap import io.reactivex.Observable @@ -12,6 +13,8 @@ interface TabModel { fun loadUrl(url: String) + fun loadFromInitializer(tabInitializer: TabInitializer) + fun goBack() fun canGoBack(): Boolean diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt index 52af0e622..a93d6ae48 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt @@ -3,6 +3,7 @@ package acr.browser.lightning._browser2.tab import acr.browser.lightning._browser2.BrowserContract import acr.browser.lightning.adblock.AdBlocker import acr.browser.lightning.adblock.allowlist.AllowListModel +import acr.browser.lightning.view.HomePageInitializer import acr.browser.lightning.view.TabInitializer import io.reactivex.Completable import io.reactivex.Maybe From 6eabaea3b2acdfd21f8e275253402e432bb22422 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sun, 20 Sep 2020 11:29:24 -0400 Subject: [PATCH 026/161] Handle tab freezing and restoring --- .../lightning/_browser2/BrowserContract.kt | 2 + .../lightning/_browser2/BrowserPresenter.kt | 4 +- .../lightning/_browser2/tab/TabAdapter.kt | 10 +- .../lightning/_browser2/tab/TabModel.kt | 3 + .../lightning/_browser2/tab/TabsRepository.kt | 30 ++++-- .../_browser2/tab/bundle/BundleStore.kt | 91 +++++++++++++++++++ 6 files changed, 127 insertions(+), 13 deletions(-) create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/BundleStore.kt diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt index 3f1e4d08b..fc88f21a3 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt @@ -30,6 +30,8 @@ interface BrowserContract { fun initializeTabs(): Maybe> + fun freeze() + val tabsList: List fun tabsListChanges(): Observable> diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 4a6123164..6558ba2f9 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -85,7 +85,6 @@ class BrowserPresenter @Inject constructor( } compositeDisposable += model.initializeTabs() - .subscribeOn(databaseScheduler) .observeOn(mainScheduler) .switchIfEmpty(model.createTab(homePageInitializer).map(::listOf)) .subscribe { list -> @@ -105,6 +104,9 @@ class BrowserPresenter @Inject constructor( */ fun onViewDetached() { view = null + + model.freeze() + compositeDisposable.dispose() sslDisposable?.dispose() diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt index 495179ea2..a5695361c 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt @@ -4,6 +4,7 @@ import acr.browser.lightning.ssl.SslState import acr.browser.lightning.view.FreezableBundleInitializer import acr.browser.lightning.view.TabInitializer import android.graphics.Bitmap +import android.os.Bundle import android.webkit.WebView import io.reactivex.Observable @@ -17,7 +18,7 @@ class TabAdapter( private val tabWebChromeClient: TabWebChromeClient ) : TabModel { - private var latentInitializer: TabInitializer? = null + private var latentInitializer: FreezableBundleInitializer? = null init { webView.webViewClient = tabWebViewClient @@ -75,7 +76,7 @@ class TabAdapter( override fun urlChanges(): Observable = tabWebViewClient.urlObservable.hide() override val title: String - get() = webView.title.orEmpty() + get() = latentInitializer?.initialTitle ?: webView.title.orEmpty() override fun titleChanges(): Observable = tabWebChromeClient.titleObservable.hide() @@ -108,4 +109,9 @@ class TabAdapter( webView.removeAllViews() webView.destroy() } + + override fun freeze(): Bundle = latentInitializer?.bundle + ?: Bundle(ClassLoader.getSystemClassLoader()).also { + webView.saveState(it) + } } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt index 369818499..111f7e565 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt @@ -3,6 +3,7 @@ package acr.browser.lightning._browser2.tab import acr.browser.lightning.ssl.SslState import acr.browser.lightning.view.TabInitializer import android.graphics.Bitmap +import android.os.Bundle import io.reactivex.Observable interface TabModel { @@ -59,4 +60,6 @@ interface TabModel { fun destroy() + fun freeze(): Bundle + } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt index a93d6ae48..0d7468dfc 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt @@ -1,14 +1,13 @@ package acr.browser.lightning._browser2.tab import acr.browser.lightning._browser2.BrowserContract +import acr.browser.lightning._browser2.tab.bundle.BundleStore import acr.browser.lightning.adblock.AdBlocker import acr.browser.lightning.adblock.allowlist.AllowListModel -import acr.browser.lightning.view.HomePageInitializer -import acr.browser.lightning.view.TabInitializer -import io.reactivex.Completable -import io.reactivex.Maybe -import io.reactivex.Observable -import io.reactivex.Single +import acr.browser.lightning.di.DiskScheduler +import acr.browser.lightning.di.MainScheduler +import acr.browser.lightning.view.* +import io.reactivex.* import io.reactivex.subjects.PublishSubject import javax.inject.Inject @@ -19,7 +18,10 @@ class TabsRepository @Inject constructor( private val webViewFactory: WebViewFactory, private val tabPager: TabPager, private val adBlocker: AdBlocker, - private val allowListModel: AllowListModel + private val allowListModel: AllowListModel, + @DiskScheduler private val diskScheduler: Scheduler, + @MainScheduler private val mainScheduler: Scheduler, + private val bundleStore: BundleStore ) : BrowserContract.Model { private var selectedTab: TabModel? = null @@ -66,9 +68,17 @@ class TabsRepository @Inject constructor( override fun tabsListChanges(): Observable> = tabsListObservable.hide() - override fun initializeTabs(): Maybe> = Maybe.empty() - - private fun List.forId(id: Int): TabModel = requireNotNull(find { it.id == id }) + override fun initializeTabs(): Maybe> = Single.fromCallable(bundleStore::retrieve) + .flatMapObservable { Observable.fromIterable(it) } + .subscribeOn(diskScheduler) + .observeOn(mainScheduler) + .flatMapSingle(::createTab) + .toList() + .filter { it.isNotEmpty() } + override fun freeze() { + bundleStore.save(tabsList) + } + private fun List.forId(id: Int): TabModel = requireNotNull(find { it.id == id }) } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/BundleStore.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/BundleStore.kt new file mode 100644 index 000000000..a00d2919a --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/BundleStore.kt @@ -0,0 +1,91 @@ +package acr.browser.lightning._browser2.tab.bundle + +import acr.browser.lightning.R +import acr.browser.lightning._browser2.tab.TabModel +import acr.browser.lightning.di.DiskScheduler +import acr.browser.lightning.utils.* +import acr.browser.lightning.view.* +import android.app.Application +import android.os.Bundle +import io.reactivex.Scheduler +import javax.inject.Inject + +/** + * Created by anthonycr on 9/20/20. + */ +class BundleStore @Inject constructor( + private val application: Application, + private val bookmarkPageInitializer: BookmarkPageInitializer, + private val homePageInitializer: HomePageInitializer, + private val downloadPageInitializer: DownloadPageInitializer, + private val historyPageInitializer: HistoryPageInitializer, + @DiskScheduler private val diskScheduler: Scheduler +) { + + /** + * TODO + */ + fun save(tabs: List) { + val outState = Bundle(ClassLoader.getSystemClassLoader()) + + tabs.withIndex().forEach { (index, tab) -> + if (!tab.url.isSpecialUrl()) { + outState.putBundle(BUNDLE_KEY + index, tab.freeze()) + outState.putString(TAB_TITLE_KEY + index, tab.title) + } else { + outState.putBundle(BUNDLE_KEY + index, Bundle().apply { + putString(URL_KEY, tab.url) + }) + } + } + + FileUtils.writeBundleToStorage(application, outState, BUNDLE_STORAGE) + .subscribeOn(diskScheduler) + .subscribe() + } + + /** + * TODO + */ + fun retrieve(): List = + FileUtils.readBundleFromStorage(application, BUNDLE_STORAGE)?.let { bundle -> + bundle.keySet() + .filter { it.startsWith(BUNDLE_KEY) } + .mapNotNull { bundleKey -> + bundle.getBundle(bundleKey)?.let { + Pair( + it, + bundle.getString(TAB_TITLE_KEY + bundleKey.extractNumberFromEnd()) + ) + } + } + }?.map { (bundle, title) -> + return@map bundle.getString(URL_KEY)?.let { url -> + when { + url.isBookmarkUrl() -> bookmarkPageInitializer + url.isDownloadsUrl() -> downloadPageInitializer + url.isStartPageUrl() -> homePageInitializer + url.isHistoryUrl() -> historyPageInitializer + else -> homePageInitializer + } + } ?: FreezableBundleInitializer(bundle, title + ?: application.getString(R.string.tab_frozen)) + } ?: emptyList() + + private fun String.extractNumberFromEnd(): String { + val underScore = lastIndexOf('_') + return if (underScore in 0 until length) { + substring(underScore + 1) + } else { + "" + } + } + + companion object { + private const val TAG = "TabsRepository" + private const val BUNDLE_KEY = "WEBVIEW_" + private const val TAB_TITLE_KEY = "TITLE_" + private const val URL_KEY = "URL_KEY" + private const val BUNDLE_STORAGE = "SAVED_TABS.parcel" + } +} From 4c9ff6957ca6a3309e515c39109e34acceb8adb0 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sun, 20 Sep 2020 12:39:25 -0400 Subject: [PATCH 027/161] Handle tab updates that occur in the background --- .../lightning/_browser2/BrowserPresenter.kt | 55 +++++++++++++------ 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 6558ba2f9..8377e3026 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -62,6 +62,7 @@ class BrowserPresenter @Inject constructor( private var isSearchViewFocused = false private val compositeDisposable = CompositeDisposable() + private val allTabsDisposable = CompositeDisposable() private var sslDisposable: Disposable? = null private var titleDisposable: Disposable? = null private var faviconDisposable: Disposable? = null @@ -96,6 +97,9 @@ class BrowserPresenter @Inject constructor( .observeOn(mainScheduler) .subscribe { list -> this.view.updateState(viewState.copy(tabs = list.map { it.asViewState() })) + + allTabsDisposable.clear() + list.subscribeToUpdates(allTabsDisposable) } } @@ -179,25 +183,17 @@ class BrowserPresenter @Inject constructor( ?.distinctUntilChanged() ?.observeOn(mainScheduler) ?.subscribe { title -> - view.updateState(viewState.copy(tabs = viewState.tabs.updateId(tabModel.id) { - it.copy(title = title) - })) - - currentTab?.url?.takeIf { !it.isSpecialUrl() }?.let { - historyRecord.recordVisit(title, it) + if (!isSearchViewFocused) { + view.updateState(viewState.copy( + displayUrl = searchBoxModel.getDisplayContent( + url = tabModel.url, + title = title, + isLoading = tabModel.loadingProgress < 100 + ) + )) } } - faviconDisposable?.dispose() - faviconDisposable = tabModel?.faviconChanges() - ?.observeOn(mainScheduler) - ?.subscribe { favicon -> - view.updateState(viewState.copy(tabs = viewState.tabs.updateId(tabModel.id) { - it.copy(icon = favicon) - })) - } - - urlDisposable?.dispose() urlDisposable = tabModel?.urlChanges() ?.flatMapSingle { url -> bookmarkRepository.isBookmark(url).map { Pair(url, it) } } @@ -207,7 +203,7 @@ class BrowserPresenter @Inject constructor( if (!isSearchViewFocused) { view.updateState(viewState.copy( displayUrl = searchBoxModel.getDisplayContent( - url = tabModel.url, + url = url, title = tabModel.title, isLoading = tabModel.loadingProgress < 100 ), @@ -245,6 +241,31 @@ class BrowserPresenter @Inject constructor( } } + private fun List.subscribeToUpdates(compositeDisposable: CompositeDisposable) { + forEach { tabModel -> + compositeDisposable += tabModel.titleChanges() + .distinctUntilChanged() + .observeOn(mainScheduler) + .subscribe { title -> + view.updateState(viewState.copy(tabs = viewState.tabs.updateId(tabModel.id) { + it.copy(title = title) + })) + + currentTab?.url?.takeIf { !it.isSpecialUrl() }?.let { + historyRecord.recordVisit(title, it) + } + } + + compositeDisposable += tabModel.faviconChanges() + .observeOn(mainScheduler) + .subscribe { favicon -> + view.updateState(viewState.copy(tabs = viewState.tabs.updateId(tabModel.id) { + it.copy(icon = favicon) + })) + } + } + } + /** * TODO */ From d2f08cb05fe337ee0a431cfb0be270ec2b7e926f Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sun, 20 Sep 2020 12:42:21 -0400 Subject: [PATCH 028/161] Remove unnecessary state render --- .../java/acr/browser/lightning/_browser2/BrowserPresenter.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 8377e3026..4bc5499ad 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -89,7 +89,6 @@ class BrowserPresenter @Inject constructor( .observeOn(mainScheduler) .switchIfEmpty(model.createTab(homePageInitializer).map(::listOf)) .subscribe { list -> - this.view.updateState(viewState.copy(tabs = list.map { it.asViewState() })) selectTab(model.selectTab(list.last().id)) } From f1ad6c4adeed50752929a6037146fa7d7a9d51cb Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 22 Sep 2020 19:39:20 -0400 Subject: [PATCH 029/161] Support opening links --- .../lightning/_browser2/BrowserActivity.kt | 1 + .../lightning/_browser2/BrowserPresenter.kt | 28 ++++++++++---- .../_browser2/di/Browser2Component.kt | 11 ++++++ .../lightning/_browser2/di/Browser2Module.kt | 9 +++++ .../_browser2/search/IntentExtractor.kt | 37 +++++++++++++++++++ 5 files changed, 78 insertions(+), 8 deletions(-) create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/search/IntentExtractor.kt diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index 08d81ddda..b24b8bbd0 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -57,6 +57,7 @@ class BrowserActivity : ThemableBrowserActivity() { injector.browser2ComponentBuilder() .activity(this) .browserFrame(binding.contentFrame) + .initialIntent(intent) .build() .inject(this) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 4bc5499ad..ff767de47 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -1,5 +1,6 @@ package acr.browser.lightning._browser2 +import acr.browser.lightning._browser2.di.InitialUrl import acr.browser.lightning._browser2.history.HistoryRecord import acr.browser.lightning._browser2.keys.KeyCombo import acr.browser.lightning._browser2.menu.MenuSelection @@ -21,6 +22,8 @@ import acr.browser.lightning.utils.smartUrlFilter import acr.browser.lightning.view.DownloadPageInitializer import acr.browser.lightning.view.HistoryPageInitializer import acr.browser.lightning.view.HomePageInitializer +import acr.browser.lightning.view.UrlInitializer +import io.reactivex.Maybe import io.reactivex.Scheduler import io.reactivex.disposables.CompositeDisposable import io.reactivex.disposables.Disposable @@ -41,7 +44,8 @@ class BrowserPresenter @Inject constructor( private val historyPageInitializer: HistoryPageInitializer, private val downloadPageInitializer: DownloadPageInitializer, private val searchBoxModel: SearchBoxModel, - private val searchEngineProvider: SearchEngineProvider + private val searchEngineProvider: SearchEngineProvider, + @InitialUrl private val initialUrl: String? ) { private var view: BrowserContract.View? = null @@ -85,13 +89,6 @@ class BrowserPresenter @Inject constructor( this.view?.updateState(viewState.copy(bookmarks = list)) } - compositeDisposable += model.initializeTabs() - .observeOn(mainScheduler) - .switchIfEmpty(model.createTab(homePageInitializer).map(::listOf)) - .subscribe { list -> - selectTab(model.selectTab(list.last().id)) - } - compositeDisposable += model.tabsListChanges() .observeOn(mainScheduler) .subscribe { list -> @@ -100,6 +97,21 @@ class BrowserPresenter @Inject constructor( allTabsDisposable.clear() list.subscribeToUpdates(allTabsDisposable) } + + compositeDisposable += model.initializeTabs() + .observeOn(mainScheduler) + .mergeWith( + Maybe.fromCallable { initialUrl } + .flatMapSingleElement { model.createTab(UrlInitializer(it)) } + .map { listOf(it) } + ) + .toList() + .map { it.flatten() } + .filter { it.isNotEmpty() } + .switchIfEmpty(model.createTab(homePageInitializer).map(::listOf)) + .subscribe { list -> + selectTab(model.selectTab(list.last().id)) + } } /** diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt index 77c5e6fa1..9e793ca28 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt @@ -2,9 +2,11 @@ package acr.browser.lightning._browser2.di import acr.browser.lightning._browser2.BrowserActivity import android.app.Activity +import android.content.Intent import android.widget.FrameLayout import dagger.BindsInstance import dagger.Subcomponent +import javax.inject.Qualifier /** * Created by anthonycr on 9/15/20. @@ -21,6 +23,9 @@ interface Browser2Component { @BindsInstance fun browserFrame(frameLayout: FrameLayout): Builder + @BindsInstance + fun initialIntent(@InitialIntent intent: Intent): Builder + fun build(): Browser2Component } @@ -28,3 +33,9 @@ interface Browser2Component { fun inject(browserActivity: BrowserActivity) } + +@Qualifier +annotation class InitialIntent + +@Qualifier +annotation class InitialUrl diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt index 239182675..be9799110 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt @@ -1,9 +1,11 @@ package acr.browser.lightning._browser2.di +import acr.browser.lightning._browser2.search.IntentExtractor import acr.browser.lightning.adblock.AdBlocker import acr.browser.lightning.adblock.BloomFilterAdBlocker import acr.browser.lightning.adblock.NoOpAdBlocker import acr.browser.lightning.preference.UserPreferences +import android.content.Intent import dagger.Module import dagger.Provides import javax.inject.Provider @@ -25,4 +27,11 @@ class Browser2Module { noOpAdBlocker } + @Provides + @InitialUrl + fun providesInitialUrl( + @InitialIntent initialIntent: Intent, + intentExtractor: IntentExtractor + ): String? = intentExtractor.extractUrlFromIntent(initialIntent) + } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/search/IntentExtractor.kt b/app/src/main/java/acr/browser/lightning/_browser2/search/IntentExtractor.kt new file mode 100644 index 000000000..e048d2bcb --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/search/IntentExtractor.kt @@ -0,0 +1,37 @@ +package acr.browser.lightning._browser2.search + +import acr.browser.lightning.search.SearchEngineProvider +import acr.browser.lightning.utils.QUERY_PLACE_HOLDER +import acr.browser.lightning.utils.smartUrlFilter +import android.app.SearchManager +import android.content.Intent +import javax.inject.Inject + +/** + * Created by anthonycr on 9/20/20. + */ +class IntentExtractor @Inject constructor(private val searchEngineProvider: SearchEngineProvider) { + + /** + * TODO + */ + fun extractUrlFromIntent(intent: Intent): String? { + return if (intent.action == Intent.ACTION_WEB_SEARCH) { + extractSearchFromIntent(intent) + } else { + intent.dataString + } + } + + private fun extractSearchFromIntent(intent: Intent): String? { + val query = intent.getStringExtra(SearchManager.QUERY) + val searchUrl = "${searchEngineProvider.provideSearchEngine().queryUrl}$QUERY_PLACE_HOLDER" + + return if (query?.isNotBlank() == true) { + smartUrlFilter(query, true, searchUrl) + } else { + null + } + } + +} From 29ff9bba87c2a97754d7f8fe78f0fd201643a87f Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 22 Sep 2020 19:47:01 -0400 Subject: [PATCH 030/161] Support new deeplinks --- .../browser/lightning/_browser2/BrowserActivity.kt | 11 +++++++++++ .../browser/lightning/_browser2/BrowserPresenter.kt | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index b24b8bbd0..74b779f81 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -5,6 +5,7 @@ import acr.browser.lightning._browser2.bookmark.BookmarkRecyclerViewAdapter import acr.browser.lightning._browser2.image.ImageLoader import acr.browser.lightning._browser2.keys.KeyEventAdapter import acr.browser.lightning._browser2.menu.MenuItemAdapter +import acr.browser.lightning._browser2.search.IntentExtractor import acr.browser.lightning._browser2.search.SearchListener import acr.browser.lightning._browser2.tab.TabRecyclerViewAdapter import acr.browser.lightning.browser.activity.StyleRemovingTextWatcher @@ -15,6 +16,7 @@ import acr.browser.lightning.databinding.BrowserActivityBinding import acr.browser.lightning.di.injector import acr.browser.lightning.search.SuggestionsAdapter import acr.browser.lightning.ssl.createSslDrawableForState +import android.content.Intent import android.os.Bundle import android.view.* import android.view.inputmethod.InputMethodManager @@ -47,6 +49,9 @@ class BrowserActivity : ThemableBrowserActivity() { @Inject internal lateinit var presenter: BrowserPresenter + @Inject + internal lateinit var intentExtractor: IntentExtractor + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) binding = BrowserActivityBinding.inflate(LayoutInflater.from(this)) @@ -115,6 +120,12 @@ class BrowserActivity : ThemableBrowserActivity() { binding.searchSslStatus.setOnClickListener { presenter.onSslIconClick() } } + override fun onNewIntent(intent: Intent?) { + intent?.let(intentExtractor::extractUrlFromIntent)?.let(presenter::onNewDeepLink) + super.onNewIntent(intent) + + } + override fun onDestroy() { super.onDestroy() presenter.onViewDetached() diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index ff767de47..dd16df21a 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -277,6 +277,17 @@ class BrowserPresenter @Inject constructor( } } + /** + * TODO + */ + fun onNewDeepLink(url: String) { + compositeDisposable += model.createTab(UrlInitializer(url)) + .observeOn(mainScheduler) + .subscribe { tab -> + selectTab(model.selectTab(tab.id)) + } + } + /** * TODO */ From 816743bb159c7e67b12ac6fabd8c361f741b1e21 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 22 Sep 2020 20:03:49 -0400 Subject: [PATCH 031/161] Fix issue where search didn't lose focus and the wrong text was set --- .../main/java/acr/browser/lightning/_browser2/BrowserActivity.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index 74b779f81..71ee3b21c 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -96,6 +96,7 @@ class BrowserActivity : ThemableBrowserActivity() { } } binding.search.onItemClickListener = AdapterView.OnItemClickListener { _, _, position, _ -> + binding.search.clearFocus() presenter.onSearchSuggestionClicked(suggestionsAdapter.getItem(position) as WebPage) } binding.search.setAdapter(suggestionsAdapter) From f8d869cddf8923abad6224dfe08f2aa1c5e41966 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 22 Sep 2020 23:29:53 -0400 Subject: [PATCH 032/161] Simplifying subscriptions --- .../lightning/_browser2/BrowserPresenter.kt | 172 ++++++------------ 1 file changed, 54 insertions(+), 118 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index dd16df21a..e0570cdc7 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -16,18 +16,21 @@ import acr.browser.lightning.di.DatabaseScheduler import acr.browser.lightning.di.MainScheduler import acr.browser.lightning.search.SearchEngineProvider import acr.browser.lightning.ssl.SslState -import acr.browser.lightning.utils.QUERY_PLACE_HOLDER -import acr.browser.lightning.utils.isSpecialUrl -import acr.browser.lightning.utils.smartUrlFilter +import acr.browser.lightning.utils.* import acr.browser.lightning.view.DownloadPageInitializer import acr.browser.lightning.view.HistoryPageInitializer import acr.browser.lightning.view.HomePageInitializer import acr.browser.lightning.view.UrlInitializer +import android.graphics.Bitmap import io.reactivex.Maybe +import io.reactivex.Observable import io.reactivex.Scheduler import io.reactivex.disposables.CompositeDisposable import io.reactivex.disposables.Disposable +import io.reactivex.rxkotlin.Observables import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxkotlin.subscribeBy +import java.util.* import javax.inject.Inject /** @@ -67,13 +70,7 @@ class BrowserPresenter @Inject constructor( private val compositeDisposable = CompositeDisposable() private val allTabsDisposable = CompositeDisposable() - private var sslDisposable: Disposable? = null - private var titleDisposable: Disposable? = null - private var faviconDisposable: Disposable? = null - private var urlDisposable: Disposable? = null - private var loadingDisposable: Disposable? = null - private var canGoBackDisposable: Disposable? = null - private var canGoForwardDisposable: Disposable? = null + private var tabDisposable: Disposable? = null /** * TODO @@ -123,14 +120,7 @@ class BrowserPresenter @Inject constructor( model.freeze() compositeDisposable.dispose() - - sslDisposable?.dispose() - titleDisposable?.dispose() - faviconDisposable?.dispose() - urlDisposable?.dispose() - loadingDisposable?.dispose() - canGoBackDisposable?.dispose() - canGoForwardDisposable?.dispose() + tabDisposable?.dispose() } private fun TabModel.asViewState(): TabViewState = TabViewState( @@ -156,127 +146,74 @@ class BrowserPresenter @Inject constructor( currentTab = tabModel currentTab?.isForeground = true - view.updateState(viewState.copy( + val tab = tabModel ?: return view.updateState(viewState.copy( displayUrl = searchBoxModel.getDisplayContent( - url = tabModel?.url.orEmpty(), - title = tabModel?.title, - isLoading = (tabModel?.loadingProgress ?: 0) < 100 + url = "", + title = null, + isLoading = false ), - isForwardEnabled = tabModel?.canGoForward() ?: false, - isBackEnabled = tabModel?.canGoBack() ?: false, - sslState = tabModel?.sslState ?: SslState.None, - progress = tabModel?.loadingProgress ?: 100, + isForwardEnabled = false, + isBackEnabled = false, + sslState = SslState.None, + progress = 100, tabs = viewState.tabs.map { - if (it.id == tabModel?.id) { - it.copy(isSelected = true) - } else { - it.copy(isSelected = false) - } + it.copy(isSelected = false) } )) - sslDisposable?.dispose() - sslDisposable = tabModel?.sslChanges() - ?.distinctUntilChanged() - ?.observeOn(mainScheduler) - ?.subscribe { - view.updateState(viewState.copy( - sslState = if (isSearchViewFocused) { - SslState.None + tabDisposable?.dispose() + tabDisposable = Observables.combineLatest( + tab.sslChanges().startWith(tab.sslState), + tab.titleChanges().startWith(tab.title), + tab.urlChanges().startWith(tab.url), + tab.loadingProgress().startWith(tab.loadingProgress), + tab.canGoBackChanges().startWith(tab.canGoBack()), + tab.canGoForwardChanges().startWith(tab.canGoForward()) + ) { sslState, title, url, progress, canGoBack, canGoForward -> + viewState.copy( + displayUrl = searchBoxModel.getDisplayContent( + url = url, + title = title, + isLoading = progress < 100 + ), + isRefresh = progress == 100, + isForwardEnabled = canGoForward, + isBackEnabled = canGoBack, + sslState = sslState, + progress = progress, + tabs = viewState.tabs.map { + if (it.id == tabModel.id) { + it.copy(isSelected = true) } else { - it + it.copy(isSelected = false) } - )) - } - - titleDisposable?.dispose() - titleDisposable = tabModel?.titleChanges() - ?.distinctUntilChanged() - ?.observeOn(mainScheduler) - ?.subscribe { title -> - if (!isSearchViewFocused) { - view.updateState(viewState.copy( - displayUrl = searchBoxModel.getDisplayContent( - url = tabModel.url, - title = title, - isLoading = tabModel.loadingProgress < 100 - ) - )) } - } - - urlDisposable?.dispose() - urlDisposable = tabModel?.urlChanges() - ?.flatMapSingle { url -> bookmarkRepository.isBookmark(url).map { Pair(url, it) } } - ?.distinctUntilChanged() - ?.observeOn(mainScheduler) - ?.subscribe { (url, isBookmark) -> - if (!isSearchViewFocused) { - view.updateState(viewState.copy( - displayUrl = searchBoxModel.getDisplayContent( - url = url, - title = tabModel.title, - isLoading = tabModel.loadingProgress < 100 - ), - isBookmarked = isBookmark, - isBookmarkEnabled = !url.isSpecialUrl() - )) - } - } - - loadingDisposable?.dispose() - loadingDisposable = tabModel?.loadingProgress() - ?.distinctUntilChanged() - ?.observeOn(mainScheduler) - ?.subscribe { - view.updateState(viewState.copy( - progress = it, - isRefresh = it == 100 && !isSearchViewFocused - )) - } - - canGoBackDisposable?.dispose() - canGoBackDisposable = tabModel?.canGoBackChanges() - ?.distinctUntilChanged() - ?.observeOn(mainScheduler) - ?.subscribe { - view.updateState(viewState.copy(isBackEnabled = it)) - } - - canGoForwardDisposable?.dispose() - canGoForwardDisposable = tabModel?.canGoForwardChanges() - ?.distinctUntilChanged() - ?.observeOn(mainScheduler) - ?.subscribe { - view.updateState(viewState.copy(isForwardEnabled = it)) - } + ) + }.subscribeOn(mainScheduler) + .subscribe { view.updateState(it) } } private fun List.subscribeToUpdates(compositeDisposable: CompositeDisposable) { forEach { tabModel -> - compositeDisposable += tabModel.titleChanges() - .distinctUntilChanged() - .observeOn(mainScheduler) - .subscribe { title -> + compositeDisposable += Observables.combineLatest( + tabModel.titleChanges().startWith(tabModel.title), + tabModel.faviconChanges().optional().startWith(Option.fromNullable(tabModel.favicon)) + ).distinctUntilChanged() + .subscribeOn(mainScheduler) + .subscribeBy { (title, bitmap) -> view.updateState(viewState.copy(tabs = viewState.tabs.updateId(tabModel.id) { - it.copy(title = title) + it.copy(title = title, icon = bitmap.value()) })) - currentTab?.url?.takeIf { !it.isSpecialUrl() }?.let { + tabModel.url.takeIf { !it.isSpecialUrl() }?.let { historyRecord.recordVisit(title, it) } } - - compositeDisposable += tabModel.faviconChanges() - .observeOn(mainScheduler) - .subscribe { favicon -> - view.updateState(viewState.copy(tabs = viewState.tabs.updateId(tabModel.id) { - it.copy(icon = favicon) - })) - } } } + private fun Observable.optional(): Observable> = map { Option.Some(it) } + /** * TODO */ @@ -517,7 +454,6 @@ class BrowserPresenter @Inject constructor( } } } - } /** From b3a8c8a4d7a3194cbeb136638387d421bbfc591b Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 22 Sep 2020 23:36:01 -0400 Subject: [PATCH 033/161] Simplify map --- .../acr/browser/lightning/_browser2/BrowserPresenter.kt | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index e0570cdc7..51b92cac0 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -181,13 +181,7 @@ class BrowserPresenter @Inject constructor( isBackEnabled = canGoBack, sslState = sslState, progress = progress, - tabs = viewState.tabs.map { - if (it.id == tabModel.id) { - it.copy(isSelected = true) - } else { - it.copy(isSelected = false) - } - } + tabs = viewState.tabs.map { it.copy(isSelected = it.id == tabModel.id) } ) }.subscribeOn(mainScheduler) .subscribe { view.updateState(it) } From 72275e92a54caec26bfb4f4d8770393f6420aad6 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Thu, 24 Sep 2020 21:15:36 -0400 Subject: [PATCH 034/161] Support custom browser headers --- .../lightning/_browser2/BrowserPresenter.kt | 5 ++- .../lightning/_browser2/tab/TabAdapter.kt | 5 ++- .../lightning/_browser2/tab/TabsRepository.kt | 1 + .../lightning/_browser2/tab/WebViewFactory.kt | 45 ++++++++++--------- 4 files changed, 33 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 51b92cac0..d090f7dbd 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -130,7 +130,10 @@ class BrowserPresenter @Inject constructor( isSelected = isForeground ) - private fun List.updateId(id: Int, map: (TabViewState) -> TabViewState): List = map { + private fun List.updateId( + id: Int, + map: (TabViewState) -> TabViewState + ): List = map { if (it.id == id) { map(it) } else { diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt index a5695361c..d3a2551d7 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt @@ -14,6 +14,7 @@ import io.reactivex.Observable class TabAdapter( tabInitializer: TabInitializer, private val webView: WebView, + private val requestHeaders: Map, private val tabWebViewClient: TabWebViewClient, private val tabWebChromeClient: TabWebChromeClient ) : TabModel { @@ -33,11 +34,11 @@ class TabAdapter( override val id: Int = webView.id override fun loadUrl(url: String) { - webView.loadUrl(url) + webView.loadUrl(url, requestHeaders) } override fun loadFromInitializer(tabInitializer: TabInitializer) { - tabInitializer.initialize(webView, emptyMap()) + tabInitializer.initialize(webView, requestHeaders) } override fun goBack() { diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt index 0d7468dfc..f12d8d788 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt @@ -44,6 +44,7 @@ class TabsRepository @Inject constructor( val tabAdapter = TabAdapter( tabInitializer, webView, + webViewFactory.createRequestHeaders(), TabWebViewClient(adBlocker, allowListModel), TabWebChromeClient() ) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/WebViewFactory.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/WebViewFactory.kt index 496456e07..e61bb51d9 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/WebViewFactory.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/WebViewFactory.kt @@ -25,6 +25,31 @@ class WebViewFactory @Inject constructor( private val userPreferences: UserPreferences ) { + fun createRequestHeaders(): Map { + val requestHeaders = mutableMapOf() + if (userPreferences.doNotTrackEnabled) { + requestHeaders[HEADER_DNT] = "1" + } else { + requestHeaders.remove(HEADER_DNT) + } + + if (userPreferences.saveDataEnabled) { + requestHeaders[HEADER_SAVEDATA] = "on" + } else { + requestHeaders.remove(HEADER_SAVEDATA) + } + + if (userPreferences.removeIdentifyingHeadersEnabled) { + requestHeaders[HEADER_REQUESTED_WITH] = "" + requestHeaders[HEADER_WAP_PROFILE] = "" + } else { + requestHeaders.remove(HEADER_REQUESTED_WITH) + requestHeaders.remove(HEADER_WAP_PROFILE) + } + + return requestHeaders + } + fun createWebView(isIncognito: Boolean): WebView = WebView(activity).apply { id = View.generateViewId() isFocusableInTouchMode = true @@ -91,26 +116,6 @@ class WebViewFactory @Inject constructor( val modifiesHeaders = userPreferences.doNotTrackEnabled || userPreferences.saveDataEnabled || userPreferences.removeIdentifyingHeadersEnabled -// -// if (userPreferences.doNotTrackEnabled) { -// requestHeaders[LightningView.HEADER_DNT] = "1" -// } else { -// requestHeaders.remove(LightningView.HEADER_DNT) -// } -// -// if (userPreferences.saveDataEnabled) { -// requestHeaders[LightningView.HEADER_SAVEDATA] = "on" -// } else { -// requestHeaders.remove(LightningView.HEADER_SAVEDATA) -// } -// -// if (userPreferences.removeIdentifyingHeadersEnabled) { -// requestHeaders[LightningView.HEADER_REQUESTED_WITH] = "" -// requestHeaders[LightningView.HEADER_WAP_PROFILE] = "" -// } else { -// requestHeaders.remove(LightningView.HEADER_REQUESTED_WITH) -// requestHeaders.remove(LightningView.HEADER_WAP_PROFILE) -// } settings.defaultTextEncodingName = userPreferences.textEncoding // setColorMode(userPreferences.renderingMode) From 0283085b46591e382dcb40df644107e42ef66d9f Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Thu, 24 Sep 2020 21:32:23 -0400 Subject: [PATCH 035/161] Support back press --- .../acr/browser/lightning/_browser2/BrowserActivity.kt | 4 ++++ .../acr/browser/lightning/_browser2/BrowserContract.kt | 4 ++++ .../acr/browser/lightning/_browser2/BrowserNavigator.kt | 8 ++++++++ .../acr/browser/lightning/_browser2/BrowserPresenter.kt | 6 ++++-- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index 71ee3b21c..0e948bab7 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -132,6 +132,10 @@ class BrowserActivity : ThemableBrowserActivity() { presenter.onViewDetached() } + override fun onBackPressed() { + presenter.onBackClick() + } + override fun onCreateOptionsMenu(menu: Menu): Boolean { menuInflater.inflate(R.menu.main, menu) return super.onCreateOptionsMenu(menu) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt index fc88f21a3..be3c77d54 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt @@ -47,6 +47,10 @@ interface BrowserContract { fun sharePage(url: String, title: String?) fun copyPageLink(url: String) + + fun closeBrowser() + + fun backgroundBrowser() } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserNavigator.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserNavigator.kt index 22b663e38..a79ea4ba1 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserNavigator.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserNavigator.kt @@ -36,4 +36,12 @@ class BrowserNavigator @Inject constructor( activity.snackbar(R.string.message_link_copied) } + override fun closeBrowser() { + activity.finish() + } + + override fun backgroundBrowser() { + activity.moveTaskToBack(true) + } + } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index d090f7dbd..ca157c159 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -325,8 +325,10 @@ class BrowserPresenter @Inject constructor( * TODO */ fun onBackClick() { - if (currentTab?.canGoBack() == true) { - currentTab?.goBack() + when { + currentTab?.canGoBack() == true -> currentTab?.goBack() + currentTab == null -> navigator.closeBrowser() + else -> navigator.backgroundBrowser() } } From 74e5671377a01b3aaf07ce89db520ab8efd1fdac Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 29 Sep 2020 21:27:36 -0400 Subject: [PATCH 036/161] Full support for adding bookmarks --- .../lightning/_browser2/BrowserActivity.kt | 14 ++++ .../lightning/_browser2/BrowserContract.kt | 2 + .../lightning/_browser2/BrowserPresenter.kt | 83 ++++++++++++++----- .../_browser2/BrowserStateAdapter.kt | 5 +- .../dialog/LightningDialogBuilder.kt | 31 +++++++ .../main/res/layout/dialog_edit_bookmark.xml | 1 + 6 files changed, 112 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index 0e948bab7..b50c38e63 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -14,6 +14,7 @@ import acr.browser.lightning.database.SearchSuggestion import acr.browser.lightning.database.WebPage import acr.browser.lightning.databinding.BrowserActivityBinding import acr.browser.lightning.di.injector +import acr.browser.lightning.dialog.LightningDialogBuilder import acr.browser.lightning.search.SuggestionsAdapter import acr.browser.lightning.ssl.createSslDrawableForState import android.content.Intent @@ -52,6 +53,9 @@ class BrowserActivity : ThemableBrowserActivity() { @Inject internal lateinit var intentExtractor: IntentExtractor + @Inject + internal lateinit var lightningDialogBuilder: LightningDialogBuilder + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) binding = BrowserActivityBinding.inflate(LayoutInflater.from(this)) @@ -177,6 +181,16 @@ class BrowserActivity : ThemableBrowserActivity() { viewState.isBookmarkEnabled?.let { binding.actionAddBookmark.isEnabled = it } } + fun showAddBookmarkDialog(title: String, url: String, folders: List) { + lightningDialogBuilder.showAddBookmarkDialog( + activity = this, + currentTitle = title, + currentUrl = url, + folders = folders, + onSave = presenter::onBookmarkConfirmed + ) + } + private fun ImageView.updateVisibilityForDrawable() { visibility = if (drawable == null) { View.GONE diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt index be3c77d54..a46f8cc97 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt @@ -18,6 +18,8 @@ interface BrowserContract { fun renderState(viewState: BrowserViewState) + fun showAddBookmarkDialog(title: String, url: String, folders: List) + } interface Model { diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index ca157c159..948c713ec 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -4,13 +4,10 @@ import acr.browser.lightning._browser2.di.InitialUrl import acr.browser.lightning._browser2.history.HistoryRecord import acr.browser.lightning._browser2.keys.KeyCombo import acr.browser.lightning._browser2.menu.MenuSelection -import acr.browser.lightning._browser2.tab.TabViewState import acr.browser.lightning._browser2.tab.TabModel +import acr.browser.lightning._browser2.tab.TabViewState import acr.browser.lightning.browser.SearchBoxModel -import acr.browser.lightning.database.Bookmark -import acr.browser.lightning.database.HistoryEntry -import acr.browser.lightning.database.SearchSuggestion -import acr.browser.lightning.database.WebPage +import acr.browser.lightning.database.* import acr.browser.lightning.database.bookmark.BookmarkRepository import acr.browser.lightning.di.DatabaseScheduler import acr.browser.lightning.di.MainScheduler @@ -21,16 +18,15 @@ import acr.browser.lightning.view.DownloadPageInitializer import acr.browser.lightning.view.HistoryPageInitializer import acr.browser.lightning.view.HomePageInitializer import acr.browser.lightning.view.UrlInitializer -import android.graphics.Bitmap import io.reactivex.Maybe import io.reactivex.Observable import io.reactivex.Scheduler +import io.reactivex.Single import io.reactivex.disposables.CompositeDisposable import io.reactivex.disposables.Disposable import io.reactivex.rxkotlin.Observables import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.subscribeBy -import java.util.* import javax.inject.Inject /** @@ -79,7 +75,7 @@ class BrowserPresenter @Inject constructor( this.view = view view.updateState(viewState) - compositeDisposable += bookmarkRepository.getBookmarksFromFolderSorted(folder = null) + compositeDisposable += bookmarkRepository.bookmarksAndFolders(folder = null) .subscribeOn(databaseScheduler) .observeOn(mainScheduler) .subscribe { list -> @@ -171,8 +167,10 @@ class BrowserPresenter @Inject constructor( tab.urlChanges().startWith(tab.url), tab.loadingProgress().startWith(tab.loadingProgress), tab.canGoBackChanges().startWith(tab.canGoBack()), - tab.canGoForwardChanges().startWith(tab.canGoForward()) - ) { sslState, title, url, progress, canGoBack, canGoForward -> + tab.canGoForwardChanges().startWith(tab.canGoForward()), + tab.urlChanges().startWith(tab.url).flatMapSingle(bookmarkRepository::isBookmark), + tab.urlChanges().startWith(tab.url).map(String::isSpecialUrl) + ) { sslState, title, url, progress, canGoBack, canGoForward, isBookmark, isSpecialUrl -> viewState.copy( displayUrl = searchBoxModel.getDisplayContent( url = url, @@ -184,7 +182,9 @@ class BrowserPresenter @Inject constructor( isBackEnabled = canGoBack, sslState = sslState, progress = progress, - tabs = viewState.tabs.map { it.copy(isSelected = it.id == tabModel.id) } + tabs = viewState.tabs.map { it.copy(isSelected = it.id == tabModel.id) }, + isBookmarked = isBookmark, + isBookmarkEnabled = !isSpecialUrl ) }.subscribeOn(mainScheduler) .subscribe { view.updateState(it) } @@ -249,7 +249,8 @@ class BrowserPresenter @Inject constructor( ?.let(navigator::copyPageLink) MenuSelection.ADD_TO_HOME -> TODO() MenuSelection.BOOKMARKS -> TODO() - MenuSelection.ADD_BOOKMARK -> TODO() + MenuSelection.ADD_BOOKMARK -> currentTab?.url?.takeIf { !it.isSpecialUrl() } + ?.let { showBookmarkDialog() } MenuSelection.READER -> currentTab?.url?.takeIf { !it.isSpecialUrl() } ?.let(navigator::openReaderMode) MenuSelection.SETTINGS -> navigator.openSettings() @@ -445,7 +446,7 @@ class BrowserPresenter @Inject constructor( is Bookmark.Folder.Entry -> { currentFolder = bookmark compositeDisposable += bookmarkRepository - .getBookmarksFromFolderSorted(folder = bookmark.title) + .bookmarksAndFolders(folder = bookmark) .subscribeOn(databaseScheduler) .observeOn(mainScheduler) .subscribe { list -> @@ -455,6 +456,18 @@ class BrowserPresenter @Inject constructor( } } + private fun BookmarkRepository.bookmarksAndFolders(folder: Bookmark.Folder?): Single> = + getBookmarksFromFolderSorted(folder = folder?.title) + .concatWith(Single.defer { + if (folder == null) { + getFoldersSorted() + } else { + Single.just(emptyList()) + } + }) + .toList() + .map { it.flatten() } + /** * TODO */ @@ -479,24 +492,47 @@ class BrowserPresenter @Inject constructor( return } compositeDisposable += bookmarkRepository.isBookmark(url) - .flatMap { + .flatMapMaybe { if (it) { bookmarkRepository.deleteBookmark(Bookmark.Entry( url = url, title = title, position = 0, folder = Bookmark.Folder.Root - )) + )).toMaybe() } else { - bookmarkRepository.addBookmarkIfNotExists(Bookmark.Entry( - url = url, - title = title, - position = 0, - folder = Bookmark.Folder.Root - )) + Maybe.empty() } } - .flatMap { bookmarkRepository.getBookmarksFromFolderSorted(folder = currentFolder.title) } + .doOnComplete(::showBookmarkDialog) + .flatMapSingleElement { bookmarkRepository.bookmarksAndFolders(folder = currentFolder) } + .subscribeOn(databaseScheduler) + .observeOn(mainScheduler) + .subscribeBy { list -> + this.view?.updateState(viewState.copy(bookmarks = list)) + } + } + + private fun showBookmarkDialog() { + compositeDisposable += bookmarkRepository.getFolderNames() + .subscribeOn(databaseScheduler) + .observeOn(mainScheduler) + .subscribeBy { + view?.showAddBookmarkDialog( + title = currentTab?.title.orEmpty(), + url = currentTab?.url.orEmpty(), + folders = it + ) + } + } + + fun onBookmarkConfirmed(title: String, url: String, folder: String) { + compositeDisposable += bookmarkRepository.addBookmarkIfNotExists(Bookmark.Entry( + url = url, + title = title, + position = 0, + folder = folder.asFolder() + )).flatMap { bookmarkRepository.bookmarksAndFolders(folder = currentFolder) } .subscribeOn(databaseScheduler) .observeOn(mainScheduler) .subscribe { list -> @@ -523,8 +559,9 @@ class BrowserPresenter @Inject constructor( */ fun onBookmarkMenuClick() { if (currentFolder != Bookmark.Folder.Root) { + currentFolder = Bookmark.Folder.Root compositeDisposable += bookmarkRepository - .getBookmarksFromFolderSorted(folder = null) + .bookmarksAndFolders(folder = null) .subscribeOn(databaseScheduler) .observeOn(mainScheduler) .subscribe { list -> diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt index 5265928f2..c11064124 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt @@ -1,6 +1,5 @@ package acr.browser.lightning._browser2 - /** * Created by anthonycr on 9/16/20. */ @@ -40,4 +39,8 @@ class BrowserStateAdapter(private val browserActivity: BrowserActivity) : Browse currentState = viewState } + override fun showAddBookmarkDialog(title: String, url: String, folders: List) { + browserActivity.showAddBookmarkDialog(title, url, folders) + } + } diff --git a/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt b/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt index 997009258..01c08675c 100644 --- a/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt +++ b/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt @@ -9,6 +9,7 @@ import acr.browser.lightning.database.asFolder import acr.browser.lightning.database.bookmark.BookmarkRepository import acr.browser.lightning.database.downloads.DownloadsRepository import acr.browser.lightning.database.history.HistoryRepository +import acr.browser.lightning.databinding.DialogEditBookmarkBinding import acr.browser.lightning.di.DatabaseScheduler import acr.browser.lightning.di.MainScheduler import acr.browser.lightning.download.DownloadHandler @@ -188,6 +189,36 @@ class LightningDialogBuilder @Inject constructor( } } + fun showAddBookmarkDialog( + activity: Activity, + currentTitle: String, + currentUrl: String, + folders: List, + onSave: (title: String, url: String, folder: String) -> Unit + ) { + val editBookmarkDialog = AlertDialog.Builder(activity) + editBookmarkDialog.setTitle(R.string.action_add_bookmark) + val dialogLayout = View.inflate(activity, R.layout.dialog_edit_bookmark, null) + val binding = DialogEditBookmarkBinding.bind(dialogLayout) + binding.bookmarkTitle.setText(currentTitle) + binding.bookmarkUrl.setText(currentUrl) + binding.bookmarkFolder.setText("") + + val suggestionsAdapter = ArrayAdapter(activity, + android.R.layout.simple_dropdown_item_1line, folders) + binding.bookmarkFolder.setAdapter(suggestionsAdapter) + editBookmarkDialog.setView(dialogLayout) + editBookmarkDialog.setPositiveButton(activity.getString(R.string.action_ok)) { _, _ -> + onSave( + binding.bookmarkTitle.text.toString(), + binding.bookmarkUrl.text.toString(), + binding.bookmarkFolder.text.toString() + ) + } + editBookmarkDialog.setNegativeButton(R.string.action_cancel) { _, _ -> } + editBookmarkDialog.resizeAndShow() + } + private fun showEditBookmarkDialog( activity: Activity, uiController: UIController, diff --git a/app/src/main/res/layout/dialog_edit_bookmark.xml b/app/src/main/res/layout/dialog_edit_bookmark.xml index e84b67a36..22f3fe6c1 100644 --- a/app/src/main/res/layout/dialog_edit_bookmark.xml +++ b/app/src/main/res/layout/dialog_edit_bookmark.xml @@ -29,6 +29,7 @@ android:id="@+id/bookmark_folder" android:layout_width="match_parent" android:layout_height="wrap_content" + android:completionThreshold="1" android:hint="@string/folder" android:maxLines="1" android:singleLine="true" /> From 78260d0f0cbe740fb0f242ea4b8e499fa723d33a Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 30 Sep 2020 22:43:04 -0400 Subject: [PATCH 037/161] Add support for editing bookmark and folder --- .../lightning/_browser2/BrowserActivity.kt | 20 +++++++ .../lightning/_browser2/BrowserContract.kt | 3 + .../lightning/_browser2/BrowserPresenter.kt | 58 ++++++++++++++++--- .../_browser2/BrowserStateAdapter.kt | 8 +++ .../dialog/LightningDialogBuilder.kt | 46 +++++++++++++++ 5 files changed, 126 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index b50c38e63..f119af468 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -10,6 +10,7 @@ import acr.browser.lightning._browser2.search.SearchListener import acr.browser.lightning._browser2.tab.TabRecyclerViewAdapter import acr.browser.lightning.browser.activity.StyleRemovingTextWatcher import acr.browser.lightning.browser.activity.ThemableBrowserActivity +import acr.browser.lightning.database.Bookmark import acr.browser.lightning.database.SearchSuggestion import acr.browser.lightning.database.WebPage import acr.browser.lightning.databinding.BrowserActivityBinding @@ -191,6 +192,25 @@ class BrowserActivity : ThemableBrowserActivity() { ) } + fun showEditBookmarkDialog(title: String, url: String, folder: String, folders: List) { + lightningDialogBuilder.showEditBookmarkDialog( + activity = this, + currentTitle = title, + currentUrl = url, + currentFolder = folder, + folders = folders, + onSave = presenter::onBookmarkEditConfirmed + ) + } + + fun showEditFolderDialog(oldTitle: String) { + lightningDialogBuilder.showRenameFolderDialog( + activity = this, + oldTitle = oldTitle, + onSave = presenter::onBookmarkFolderRenameConfirmed + ) + } + private fun ImageView.updateVisibilityForDrawable() { visibility = if (drawable == null) { View.GONE diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt index a46f8cc97..bf32eb348 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt @@ -20,6 +20,9 @@ interface BrowserContract { fun showAddBookmarkDialog(title: String, url: String, folders: List) + fun showEditBookmarkDialog(title: String, url: String, folder: String, folders: List) + + fun showEditFolderDialog(title: String) } interface Model { diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 948c713ec..ebec5025b 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -75,7 +75,8 @@ class BrowserPresenter @Inject constructor( this.view = view view.updateState(viewState) - compositeDisposable += bookmarkRepository.bookmarksAndFolders(folder = null) + currentFolder = Bookmark.Folder.Root + compositeDisposable += bookmarkRepository.bookmarksAndFolders(folder = Bookmark.Folder.Root) .subscribeOn(databaseScheduler) .observeOn(mainScheduler) .subscribe { list -> @@ -250,7 +251,7 @@ class BrowserPresenter @Inject constructor( MenuSelection.ADD_TO_HOME -> TODO() MenuSelection.BOOKMARKS -> TODO() MenuSelection.ADD_BOOKMARK -> currentTab?.url?.takeIf { !it.isSpecialUrl() } - ?.let { showBookmarkDialog() } + ?.let { showAddBookmarkDialog() } MenuSelection.READER -> currentTab?.url?.takeIf { !it.isSpecialUrl() } ?.let(navigator::openReaderMode) MenuSelection.SETTINGS -> navigator.openSettings() @@ -456,10 +457,10 @@ class BrowserPresenter @Inject constructor( } } - private fun BookmarkRepository.bookmarksAndFolders(folder: Bookmark.Folder?): Single> = - getBookmarksFromFolderSorted(folder = folder?.title) + private fun BookmarkRepository.bookmarksAndFolders(folder: Bookmark.Folder): Single> = + getBookmarksFromFolderSorted(folder = folder.title) .concatWith(Single.defer { - if (folder == null) { + if (folder == Bookmark.Folder.Root) { getFoldersSorted() } else { Single.just(emptyList()) @@ -472,7 +473,15 @@ class BrowserPresenter @Inject constructor( * TODO */ fun onBookmarkLongClick(index: Int) { - + compositeDisposable += bookmarkRepository.getFolderNames() + .subscribeOn(databaseScheduler) + .observeOn(mainScheduler) + .subscribeBy { folders -> + when (val item = viewState.bookmarks[index]) { + is Bookmark.Entry -> view?.showEditBookmarkDialog(item.title, item.url, item.folder.title, folders) + is Bookmark.Folder.Entry -> view?.showEditFolderDialog(item.title) + } + } } /** @@ -504,7 +513,7 @@ class BrowserPresenter @Inject constructor( Maybe.empty() } } - .doOnComplete(::showBookmarkDialog) + .doOnComplete(::showAddBookmarkDialog) .flatMapSingleElement { bookmarkRepository.bookmarksAndFolders(folder = currentFolder) } .subscribeOn(databaseScheduler) .observeOn(mainScheduler) @@ -513,7 +522,7 @@ class BrowserPresenter @Inject constructor( } } - private fun showBookmarkDialog() { + private fun showAddBookmarkDialog() { compositeDisposable += bookmarkRepository.getFolderNames() .subscribeOn(databaseScheduler) .observeOn(mainScheduler) @@ -540,6 +549,37 @@ class BrowserPresenter @Inject constructor( } } + fun onBookmarkEditConfirmed(title: String, url: String, folder: String) { + compositeDisposable += bookmarkRepository.editBookmark( + oldBookmark = Bookmark.Entry( + url, + "", + 0, + Bookmark.Folder.Root + ), + newBookmark = Bookmark.Entry( + url = url, + title = title, + position = 0, + folder = folder.asFolder() + )).andThen(bookmarkRepository.bookmarksAndFolders(folder = currentFolder)) + .subscribeOn(databaseScheduler) + .observeOn(mainScheduler) + .subscribe { list -> + this.view?.updateState(viewState.copy(bookmarks = list)) + } + } + + fun onBookmarkFolderRenameConfirmed(oldTitle: String, newTitle: String) { + compositeDisposable += bookmarkRepository.renameFolder(oldTitle, newTitle) + .andThen(bookmarkRepository.bookmarksAndFolders(folder = currentFolder)) + .subscribeOn(databaseScheduler) + .observeOn(mainScheduler) + .subscribe { list -> + this.view?.updateState(viewState.copy(bookmarks = list)) + } + } + /** * TODO */ @@ -561,7 +601,7 @@ class BrowserPresenter @Inject constructor( if (currentFolder != Bookmark.Folder.Root) { currentFolder = Bookmark.Folder.Root compositeDisposable += bookmarkRepository - .bookmarksAndFolders(folder = null) + .bookmarksAndFolders(folder = Bookmark.Folder.Root) .subscribeOn(databaseScheduler) .observeOn(mainScheduler) .subscribe { list -> diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt index c11064124..9631be0ee 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt @@ -43,4 +43,12 @@ class BrowserStateAdapter(private val browserActivity: BrowserActivity) : Browse browserActivity.showAddBookmarkDialog(title, url, folders) } + override fun showEditBookmarkDialog(title: String, url: String, folder: String, folders: List) { + browserActivity.showEditBookmarkDialog(title, url, folder, folders) + } + + override fun showEditFolderDialog(title: String) { + browserActivity.showEditFolderDialog(title) + } + } diff --git a/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt b/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt index 01c08675c..267f454c7 100644 --- a/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt +++ b/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt @@ -260,6 +260,36 @@ class LightningDialogBuilder @Inject constructor( } } + fun showEditBookmarkDialog( + activity: Activity, + currentTitle: String, + currentUrl: String, + currentFolder: String, + folders: List, + onSave: (title: String, url: String, folder: String) -> Unit + ) { + val editBookmarkDialog = AlertDialog.Builder(activity) + editBookmarkDialog.setTitle(R.string.action_add_bookmark) + val dialogLayout = View.inflate(activity, R.layout.dialog_edit_bookmark, null) + val binding = DialogEditBookmarkBinding.bind(dialogLayout) + binding.bookmarkTitle.setText(currentTitle) + binding.bookmarkUrl.setText(currentUrl) + binding.bookmarkFolder.setText(currentFolder) + + val suggestionsAdapter = ArrayAdapter(activity, + android.R.layout.simple_dropdown_item_1line, folders) + binding.bookmarkFolder.setAdapter(suggestionsAdapter) + editBookmarkDialog.setView(dialogLayout) + editBookmarkDialog.setPositiveButton(activity.getString(R.string.action_ok)) { _, _ -> + onSave( + binding.bookmarkTitle.text.toString(), + binding.bookmarkUrl.text.toString(), + binding.bookmarkFolder.text.toString() + ) + } + editBookmarkDialog.resizeAndShow() + } + fun showBookmarkFolderLongPressedDialog( activity: Activity, uiController: UIController, @@ -295,6 +325,22 @@ class LightningDialogBuilder @Inject constructor( } } + fun showRenameFolderDialog( + activity: Activity, + oldTitle: String, + onSave: (oldTitle: String, newTitle: String) -> Unit + ) = BrowserDialog.showEditText( + activity, + R.string.title_rename_folder, + R.string.hint_title, + oldTitle, + R.string.action_ok + ) { text -> + if (text.isNotBlank()) { + onSave(oldTitle, text) + } + } + fun showLongPressedHistoryLinkDialog( activity: Activity, uiController: UIController, From ea3fa166ffbb44796e90d622de5901b26b669d21 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 30 Sep 2020 22:55:07 -0400 Subject: [PATCH 038/161] Show root folder when back is pressed --- .../java/acr/browser/lightning/_browser2/BrowserPresenter.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index ebec5025b..aca4a0c44 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -328,6 +328,7 @@ class BrowserPresenter @Inject constructor( */ fun onBackClick() { when { + currentFolder != Bookmark.Folder.Root -> onBookmarkMenuClick() currentTab?.canGoBack() == true -> currentTab?.goBack() currentTab == null -> navigator.closeBrowser() else -> navigator.backgroundBrowser() From 5b95d366dbae71f049ff41a4a63b8922f37f9319 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 30 Sep 2020 23:00:49 -0400 Subject: [PATCH 039/161] Handle bookmark back button display --- .../lightning/_browser2/BrowserActivity.kt | 15 +++++++++++---- .../lightning/_browser2/BrowserPresenter.kt | 9 +++++---- .../lightning/_browser2/BrowserStateAdapter.kt | 6 ++++-- .../lightning/_browser2/BrowserViewState.kt | 6 ++++-- 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index f119af468..a5725e272 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -167,19 +167,26 @@ class BrowserActivity : ThemableBrowserActivity() { binding.searchSslStatus.setImageDrawable(createSslDrawableForState(it)) binding.searchSslStatus.updateVisibilityForDrawable() } - viewState.tabs?.let { binding.tabCountView.updateCount(viewState.tabs.size) } + viewState.tabs?.let { binding.tabCountView.updateCount(it.size) } viewState.progress?.let { binding.progressView.progress = it } viewState.isRefresh?.let { - binding.searchRefresh.setImageResource(if (viewState.isRefresh) { + binding.searchRefresh.setImageResource(if (it) { R.drawable.ic_action_refresh } else { R.drawable.ic_action_delete }) } - viewState.tabs?.let { tabsAdapter.submitList(viewState.tabs) } - viewState.bookmarks?.let { bookmarksAdapter.submitList(viewState.bookmarks) } + viewState.tabs?.let(tabsAdapter::submitList) + viewState.bookmarks?.let(bookmarksAdapter::submitList) viewState.isBookmarked?.let { binding.actionAddBookmark.isSelected = it } viewState.isBookmarkEnabled?.let { binding.actionAddBookmark.isEnabled = it } + viewState.isRootFolder?.let { + binding.bookmarkBackButton.setImageResource(if (it) { + R.drawable.ic_action_star + } else { + R.drawable.ic_action_back + }) + } } fun showAddBookmarkDialog(title: String, url: String, folders: List) { diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index aca4a0c44..87849b516 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -58,7 +58,8 @@ class BrowserPresenter @Inject constructor( isBackEnabled = false, bookmarks = emptyList(), isBookmarked = false, - isBookmarkEnabled = true + isBookmarkEnabled = true, + isRootFolder = true ) private var currentTab: TabModel? = null private var currentFolder: Bookmark.Folder = Bookmark.Folder.Root @@ -80,7 +81,7 @@ class BrowserPresenter @Inject constructor( .subscribeOn(databaseScheduler) .observeOn(mainScheduler) .subscribe { list -> - this.view?.updateState(viewState.copy(bookmarks = list)) + this.view?.updateState(viewState.copy(bookmarks = list, isRootFolder = true)) } compositeDisposable += model.tabsListChanges() @@ -452,7 +453,7 @@ class BrowserPresenter @Inject constructor( .subscribeOn(databaseScheduler) .observeOn(mainScheduler) .subscribe { list -> - view?.updateState(viewState.copy(bookmarks = list)) + view?.updateState(viewState.copy(bookmarks = list, isRootFolder = false)) } } } @@ -606,7 +607,7 @@ class BrowserPresenter @Inject constructor( .subscribeOn(databaseScheduler) .observeOn(mainScheduler) .subscribe { list -> - view?.updateState(viewState.copy(bookmarks = list)) + view?.updateState(viewState.copy(bookmarks = list, isRootFolder = true)) } } } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt index 9631be0ee..307244ebc 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt @@ -18,7 +18,8 @@ class BrowserStateAdapter(private val browserActivity: BrowserActivity) : Browse isBackEnabled, bookmarks, isBookmarked, - isBookmarkEnabled + isBookmarkEnabled, + isRootFolder ) = viewState browserActivity.renderState( @@ -32,7 +33,8 @@ class BrowserStateAdapter(private val browserActivity: BrowserActivity) : Browse isBackEnabled = isBackEnabled.takeIf { it != currentState?.isBackEnabled }, bookmarks = bookmarks.takeIf { it != currentState?.bookmarks }, isBookmarked = isBookmarked.takeIf { it != currentState?.isBookmarked }, - isBookmarkEnabled = isBookmarkEnabled.takeIf { it != currentState?.isBookmarkEnabled } + isBookmarkEnabled = isBookmarkEnabled.takeIf { it != currentState?.isBookmarkEnabled }, + isRootFolder = isRootFolder.takeIf { it != currentState?.isRootFolder } ) ) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt index a05650734..c921bb423 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt @@ -22,7 +22,8 @@ data class BrowserViewState( // Bookmarks val bookmarks: List, val isBookmarked: Boolean, - val isBookmarkEnabled: Boolean + val isBookmarkEnabled: Boolean, + val isRootFolder: Boolean ) data class PartialBrowserViewState( @@ -40,5 +41,6 @@ data class PartialBrowserViewState( // Bookmarks val bookmarks: List?, val isBookmarked: Boolean?, - val isBookmarkEnabled: Boolean? + val isBookmarkEnabled: Boolean?, + val isRootFolder: Boolean? ) From 1006a9fcdf4958684bd508ceb317841892997b62 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 30 Sep 2020 23:04:56 -0400 Subject: [PATCH 040/161] Add in long click function --- .../acr/browser/lightning/_browser2/BrowserActivity.kt | 3 +-- .../acr/browser/lightning/_browser2/BrowserPresenter.kt | 7 +++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index a5725e272..58d9d9c52 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -10,7 +10,6 @@ import acr.browser.lightning._browser2.search.SearchListener import acr.browser.lightning._browser2.tab.TabRecyclerViewAdapter import acr.browser.lightning.browser.activity.StyleRemovingTextWatcher import acr.browser.lightning.browser.activity.ThemableBrowserActivity -import acr.browser.lightning.database.Bookmark import acr.browser.lightning.database.SearchSuggestion import acr.browser.lightning.database.WebPage import acr.browser.lightning.databinding.BrowserActivityBinding @@ -74,7 +73,7 @@ class BrowserActivity : ThemableBrowserActivity() { tabsAdapter = TabRecyclerViewAdapter( onClick = presenter::onTabClick, onCloseClick = presenter::onTabClose, - onLongClick = {} + onLongClick = presenter::onTabLongClick ) binding.tabsList.adapter = tabsAdapter binding.tabsList.layoutManager = LinearLayoutManager(this) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 87849b516..e84d3ff23 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -292,6 +292,13 @@ class BrowserPresenter @Inject constructor( selectTab(model.selectTab(viewState.tabs[index].id)) } + /** + * TODO + */ + fun onTabLongClick(index: Int) { + // TODO + } + private fun List.nextSelected(removedIndex: Int): T? { val nextIndex = when { removedIndex > 0 -> removedIndex - 1 From c01cad9dae666ca7b866ffb41e090f224f7152f9 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 14 Oct 2020 21:52:54 -0400 Subject: [PATCH 041/161] Support adding URL to home screen --- .../lightning/_browser2/BrowserContract.kt | 3 ++ .../lightning/_browser2/BrowserNavigator.kt | 18 +++++++++++- .../lightning/_browser2/BrowserPresenter.kt | 9 +++++- .../acr/browser/lightning/utils/Utils.java | 29 +++++++++++++++---- 4 files changed, 51 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt index bf32eb348..18423a5e1 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt @@ -2,6 +2,7 @@ package acr.browser.lightning._browser2 import acr.browser.lightning._browser2.tab.TabModel import acr.browser.lightning.view.TabInitializer +import android.graphics.Bitmap import io.reactivex.Completable import io.reactivex.Maybe import io.reactivex.Observable @@ -55,6 +56,8 @@ interface BrowserContract { fun closeBrowser() + fun addToHomeScreen(url: String, title: String, favicon: Bitmap?) + fun backgroundBrowser() } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserNavigator.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserNavigator.kt index a79ea4ba1..174291aed 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserNavigator.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserNavigator.kt @@ -1,14 +1,20 @@ package acr.browser.lightning._browser2 import acr.browser.lightning.R +import acr.browser.lightning.browser.activity.BrowserActivity +import acr.browser.lightning.database.HistoryEntry import acr.browser.lightning.extensions.copyToClipboard import acr.browser.lightning.extensions.snackbar +import acr.browser.lightning.log.Logger import acr.browser.lightning.reading.activity.ReadingActivity import acr.browser.lightning.settings.activity.SettingsActivity import acr.browser.lightning.utils.IntentUtils +import acr.browser.lightning.utils.Utils +import acr.browser.lightning.utils.isSpecialUrl import android.app.Activity import android.content.ClipboardManager import android.content.Intent +import android.graphics.Bitmap import javax.inject.Inject /** @@ -16,7 +22,8 @@ import javax.inject.Inject */ class BrowserNavigator @Inject constructor( private val activity: Activity, - private val clipboardManager: ClipboardManager + private val clipboardManager: ClipboardManager, + private val logger: Logger ) : BrowserContract.Navigator { override fun openSettings() { @@ -40,8 +47,17 @@ class BrowserNavigator @Inject constructor( activity.finish() } + override fun addToHomeScreen(url: String, title: String, favicon: Bitmap?) { + Utils.createShortcut(activity, url, title, favicon) + logger.log(TAG, "Creating shortcut: $title $url") + } + override fun backgroundBrowser() { activity.moveTaskToBack(true) } + companion object { + private const val TAG = "BrowserNavigator" + } + } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index e84d3ff23..4884e1470 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -249,7 +249,8 @@ class BrowserPresenter @Inject constructor( MenuSelection.FIND -> TODO() MenuSelection.COPY_LINK -> currentTab?.url?.takeIf { !it.isSpecialUrl() } ?.let(navigator::copyPageLink) - MenuSelection.ADD_TO_HOME -> TODO() + MenuSelection.ADD_TO_HOME -> currentTab?.url?.takeIf { !it.isSpecialUrl() } + ?.let { addToHomeScreen() } MenuSelection.BOOKMARKS -> TODO() MenuSelection.ADD_BOOKMARK -> currentTab?.url?.takeIf { !it.isSpecialUrl() } ?.let { showAddBookmarkDialog() } @@ -259,6 +260,12 @@ class BrowserPresenter @Inject constructor( } } + private fun addToHomeScreen() { + currentTab?.let { + navigator.addToHomeScreen(it.url, it.title, it.favicon) + } + } + /** * TODO */ diff --git a/app/src/main/java/acr/browser/lightning/utils/Utils.java b/app/src/main/java/acr/browser/lightning/utils/Utils.java index ef8487950..81bc96c05 100644 --- a/app/src/main/java/acr/browser/lightning/utils/Utils.java +++ b/app/src/main/java/acr/browser/lightning/utils/Utils.java @@ -12,6 +12,7 @@ import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; +import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; import android.net.Uri; import android.os.Build; @@ -38,6 +39,8 @@ import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.appcompat.app.AlertDialog; +import androidx.core.content.ContextCompat; +import androidx.core.graphics.drawable.DrawableKt; public final class Utils { @@ -228,17 +231,31 @@ public static void close(@Nullable Closeable closeable) { * browser. The icon, URL, and title are used in * the creation of the shortcut. * - * @param activity the activity needed to create - * the intent and show a snackbar message - * @param historyEntry the HistoryEntity to create the shortcut from + * @param activity the activity needed to create + * the intent and show a snackbar message + * @param historyEntry the HistoryEntity to create the shortcut from */ public static void createShortcut(@NonNull Activity activity, @NonNull HistoryEntry historyEntry, @NonNull Bitmap favicon) { + createShortcut(activity, historyEntry.getUrl(), historyEntry.getTitle(), favicon); + } + + public static void createShortcut(@NonNull Activity activity, + @NonNull String url, + @NonNull String unsafeTitle, + @Nullable Bitmap unsafeFavicon) { Intent shortcutIntent = new Intent(Intent.ACTION_VIEW); - shortcutIntent.setData(Uri.parse(historyEntry.getUrl())); + shortcutIntent.setData(Uri.parse(url)); + + final String title = TextUtils.isEmpty(unsafeTitle) ? activity.getString(R.string.untitled) : unsafeTitle; + final Drawable webPageDrawable = ContextCompat.getDrawable(activity, R.drawable.ic_webpage); + Preconditions.checkNonNull(webPageDrawable); + final Bitmap webPageBitmap = DrawableKt.toBitmap(webPageDrawable, + webPageDrawable.getIntrinsicWidth(), + webPageDrawable.getIntrinsicHeight(), null); - final String title = TextUtils.isEmpty(historyEntry.getTitle()) ? activity.getString(R.string.untitled) : historyEntry.getTitle(); + final Bitmap favicon = unsafeFavicon != null ? unsafeFavicon : webPageBitmap; if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) { Intent addIntent = new Intent(); @@ -252,7 +269,7 @@ public static void createShortcut(@NonNull Activity activity, ShortcutManager shortcutManager = activity.getSystemService(ShortcutManager.class); if (shortcutManager.isRequestPinShortcutSupported()) { ShortcutInfo pinShortcutInfo = - new ShortcutInfo.Builder(activity, "browser-shortcut-" + historyEntry.getUrl().hashCode()) + new ShortcutInfo.Builder(activity, "browser-shortcut-" + url.hashCode()) .setIntent(shortcutIntent) .setIcon(Icon.createWithBitmap(favicon)) .setShortLabel(title) From 127b55593f7ebfebfb4a6f85dc7e8e5aea8e299c Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 18 Nov 2020 21:57:18 -0500 Subject: [PATCH 042/161] Handle back/forward menu items, handle opening tabs and bookmarks --- .../lightning/_browser2/BrowserActivity.kt | 41 +++++++++++++++++++ .../lightning/_browser2/BrowserContract.kt | 4 ++ .../lightning/_browser2/BrowserPresenter.kt | 32 +++++++++++---- .../_browser2/BrowserStateAdapter.kt | 8 ++++ .../lightning/_browser2/di/Browser2Module.kt | 15 +++++++ .../_browser2/menu/MenuItemAdapter.kt | 4 +- .../lightning/_browser2/menu/MenuSelection.kt | 4 +- .../_browser2/ui/BookmarkConfiguration.kt | 9 ++++ .../_browser2/ui/TabConfiguration.kt | 9 ++++ .../lightning/_browser2/ui/UiConfiguration.kt | 9 ++++ .../browser/activity/BrowserActivity.kt | 34 +++++++-------- app/src/main/res/layout/activity_main.xml | 4 +- app/src/main/res/layout/browser_activity.xml | 4 +- 13 files changed, 146 insertions(+), 31 deletions(-) create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/ui/BookmarkConfiguration.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/ui/TabConfiguration.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/ui/UiConfiguration.kt diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index 58d9d9c52..a161454a1 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -8,12 +8,16 @@ import acr.browser.lightning._browser2.menu.MenuItemAdapter import acr.browser.lightning._browser2.search.IntentExtractor import acr.browser.lightning._browser2.search.SearchListener import acr.browser.lightning._browser2.tab.TabRecyclerViewAdapter +import acr.browser.lightning._browser2.ui.BookmarkConfiguration +import acr.browser.lightning._browser2.ui.TabConfiguration +import acr.browser.lightning._browser2.ui.UiConfiguration import acr.browser.lightning.browser.activity.StyleRemovingTextWatcher import acr.browser.lightning.browser.activity.ThemableBrowserActivity import acr.browser.lightning.database.SearchSuggestion import acr.browser.lightning.database.WebPage import acr.browser.lightning.databinding.BrowserActivityBinding import acr.browser.lightning.di.injector +import acr.browser.lightning.dialog.BrowserDialog import acr.browser.lightning.dialog.LightningDialogBuilder import acr.browser.lightning.search.SuggestionsAdapter import acr.browser.lightning.ssl.createSslDrawableForState @@ -23,6 +27,8 @@ import android.view.* import android.view.inputmethod.InputMethodManager import android.widget.AdapterView import android.widget.ImageView +import androidx.core.view.isVisible +import androidx.drawerlayout.widget.DrawerLayout import androidx.recyclerview.widget.LinearLayoutManager import javax.inject.Inject @@ -56,6 +62,9 @@ class BrowserActivity : ThemableBrowserActivity() { @Inject internal lateinit var lightningDialogBuilder: LightningDialogBuilder + @Inject + internal lateinit var uiConfiguration: UiConfiguration + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) binding = BrowserActivityBinding.inflate(LayoutInflater.from(this)) @@ -70,6 +79,27 @@ class BrowserActivity : ThemableBrowserActivity() { .build() .inject(this) + binding.bookmarkDrawer.layoutParams = (binding.bookmarkDrawer.layoutParams as DrawerLayout.LayoutParams).apply { + gravity = when (uiConfiguration.bookmarkConfiguration) { + BookmarkConfiguration.LEFT -> Gravity.START + BookmarkConfiguration.RIGHT -> Gravity.END + } + } + + binding.tabDrawer.layoutParams = (binding.tabDrawer.layoutParams as DrawerLayout.LayoutParams).apply { + gravity = when (uiConfiguration.bookmarkConfiguration) { + BookmarkConfiguration.LEFT -> Gravity.END + BookmarkConfiguration.RIGHT -> Gravity.START + } + } + + binding.homeImageView.isVisible = uiConfiguration.tabConfiguration == TabConfiguration.DESKTOP + binding.tabCountView.isVisible = uiConfiguration.tabConfiguration == TabConfiguration.DRAWER + + if (uiConfiguration.tabConfiguration == TabConfiguration.DESKTOP) { + binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED, binding.tabDrawer) + } + tabsAdapter = TabRecyclerViewAdapter( onClick = presenter::onTabClick, onCloseClick = presenter::onTabClose, @@ -112,6 +142,7 @@ class BrowserActivity : ThemableBrowserActivity() { binding.search.addTextChangedListener(StyleRemovingTextWatcher()) binding.search.setOnFocusChangeListener { _, hasFocus -> presenter.onSearchFocusChanged(hasFocus) } + binding.homeButton.setOnClickListener { presenter.onTabCountViewClick() } binding.actionBack.setOnClickListener { presenter.onBackClick() } binding.actionForward.setOnClickListener { presenter.onForwardClick() } binding.actionHome.setOnClickListener { presenter.onHomeClick() } @@ -217,6 +248,16 @@ class BrowserActivity : ThemableBrowserActivity() { ) } + fun openBookmarkDrawer() { + binding.drawerLayout.closeDrawer(binding.tabDrawer) + binding.drawerLayout.openDrawer(binding.bookmarkDrawer) + } + + fun openTabDrawer() { + binding.drawerLayout.closeDrawer(binding.bookmarkDrawer) + binding.drawerLayout.openDrawer(binding.tabDrawer) + } + private fun ImageView.updateVisibilityForDrawable() { visibility = if (drawable == null) { View.GONE diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt index 18423a5e1..546ce9673 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt @@ -24,6 +24,10 @@ interface BrowserContract { fun showEditBookmarkDialog(title: String, url: String, folder: String, folders: List) fun showEditFolderDialog(title: String) + + fun openBookmarkDrawer() + + fun openTabDrawer() } interface Model { diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 4884e1470..d07145e7e 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -6,6 +6,8 @@ import acr.browser.lightning._browser2.keys.KeyCombo import acr.browser.lightning._browser2.menu.MenuSelection import acr.browser.lightning._browser2.tab.TabModel import acr.browser.lightning._browser2.tab.TabViewState +import acr.browser.lightning._browser2.ui.TabConfiguration +import acr.browser.lightning._browser2.ui.UiConfiguration import acr.browser.lightning.browser.SearchBoxModel import acr.browser.lightning.database.* import acr.browser.lightning.database.bookmark.BookmarkRepository @@ -44,7 +46,8 @@ class BrowserPresenter @Inject constructor( private val downloadPageInitializer: DownloadPageInitializer, private val searchBoxModel: SearchBoxModel, private val searchEngineProvider: SearchEngineProvider, - @InitialUrl private val initialUrl: String? + @InitialUrl private val initialUrl: String?, + private val uiConfiguration: UiConfiguration ) { private var view: BrowserContract.View? = null @@ -251,12 +254,14 @@ class BrowserPresenter @Inject constructor( ?.let(navigator::copyPageLink) MenuSelection.ADD_TO_HOME -> currentTab?.url?.takeIf { !it.isSpecialUrl() } ?.let { addToHomeScreen() } - MenuSelection.BOOKMARKS -> TODO() + MenuSelection.BOOKMARKS -> view?.openBookmarkDrawer() MenuSelection.ADD_BOOKMARK -> currentTab?.url?.takeIf { !it.isSpecialUrl() } ?.let { showAddBookmarkDialog() } MenuSelection.READER -> currentTab?.url?.takeIf { !it.isSpecialUrl() } ?.let(navigator::openReaderMode) MenuSelection.SETTINGS -> navigator.openSettings() + MenuSelection.BACK -> onBackClick() + MenuSelection.FORWARD -> onForwardClick() } } @@ -432,6 +437,10 @@ class BrowserPresenter @Inject constructor( currentTab?.loadUrl(url) } + fun onFindInPage(query: String) { + TODO() + } + /** * TODO */ @@ -459,7 +468,7 @@ class BrowserPresenter @Inject constructor( fun onBookmarkClick(index: Int) { when (val bookmark = viewState.bookmarks[index]) { is Bookmark.Entry -> currentTab?.loadUrl(bookmark.url) - Bookmark.Folder.Root -> TODO() + Bookmark.Folder.Root -> error("Cannot click on root folder") is Bookmark.Folder.Entry -> { currentFolder = bookmark compositeDisposable += bookmarkRepository @@ -568,10 +577,10 @@ class BrowserPresenter @Inject constructor( fun onBookmarkEditConfirmed(title: String, url: String, folder: String) { compositeDisposable += bookmarkRepository.editBookmark( oldBookmark = Bookmark.Entry( - url, - "", - 0, - Bookmark.Folder.Root + url = url, + title = "", + position = 0, + folder = Bookmark.Folder.Root ), newBookmark = Bookmark.Entry( url = url, @@ -603,6 +612,15 @@ class BrowserPresenter @Inject constructor( } + /** + * TODO + */ + fun onTabCountViewClick() { + if (uiConfiguration.tabConfiguration == TabConfiguration.DRAWER) { + view?.openTabDrawer() + } + } + /** * TODO */ diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt index 307244ebc..85a79d6ba 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt @@ -53,4 +53,12 @@ class BrowserStateAdapter(private val browserActivity: BrowserActivity) : Browse browserActivity.showEditFolderDialog(title) } + override fun openBookmarkDrawer() { + browserActivity.openBookmarkDrawer() + } + + override fun openTabDrawer() { + browserActivity.openTabDrawer() + } + } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt index be9799110..0c9fefa2a 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt @@ -1,6 +1,9 @@ package acr.browser.lightning._browser2.di import acr.browser.lightning._browser2.search.IntentExtractor +import acr.browser.lightning._browser2.ui.BookmarkConfiguration +import acr.browser.lightning._browser2.ui.TabConfiguration +import acr.browser.lightning._browser2.ui.UiConfiguration import acr.browser.lightning.adblock.AdBlocker import acr.browser.lightning.adblock.BloomFilterAdBlocker import acr.browser.lightning.adblock.NoOpAdBlocker @@ -34,4 +37,16 @@ class Browser2Module { intentExtractor: IntentExtractor ): String? = intentExtractor.extractUrlFromIntent(initialIntent) + @Provides + fun providesUiConfiguration( + userPreferences: UserPreferences + ): UiConfiguration = UiConfiguration( + tabConfiguration = TabConfiguration.DRAWER, + bookmarkConfiguration = if (userPreferences.bookmarksAndTabsSwapped) { + BookmarkConfiguration.LEFT + } else { + BookmarkConfiguration.RIGHT + } + ) + } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/menu/MenuItemAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/menu/MenuItemAdapter.kt index 476f2c53d..adf5faae0 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/menu/MenuItemAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/menu/MenuItemAdapter.kt @@ -12,8 +12,8 @@ class MenuItemAdapter @Inject constructor() { fun adaptMenuItem(menuItem: MenuItem): MenuSelection? { return when (menuItem.itemId) { android.R.id.home -> TODO() - R.id.action_back -> TODO() - R.id.action_forward -> TODO() + R.id.action_back -> MenuSelection.BACK + R.id.action_forward -> MenuSelection.FORWARD R.id.action_add_to_homescreen -> MenuSelection.ADD_TO_HOME R.id.action_new_tab -> MenuSelection.NEW_TAB R.id.action_incognito -> MenuSelection.NEW_INCOGNITO_TAB diff --git a/app/src/main/java/acr/browser/lightning/_browser2/menu/MenuSelection.kt b/app/src/main/java/acr/browser/lightning/_browser2/menu/MenuSelection.kt index 27df46bf0..83fe0fdf9 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/menu/MenuSelection.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/menu/MenuSelection.kt @@ -15,5 +15,7 @@ enum class MenuSelection { BOOKMARKS, ADD_BOOKMARK, READER, - SETTINGS + SETTINGS, + BACK, + FORWARD } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/ui/BookmarkConfiguration.kt b/app/src/main/java/acr/browser/lightning/_browser2/ui/BookmarkConfiguration.kt new file mode 100644 index 000000000..c90b0a48c --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/ui/BookmarkConfiguration.kt @@ -0,0 +1,9 @@ +package acr.browser.lightning._browser2.ui + +/** + * Created by anthonycr on 11/18/20. + */ +enum class BookmarkConfiguration { + LEFT, + RIGHT +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/ui/TabConfiguration.kt b/app/src/main/java/acr/browser/lightning/_browser2/ui/TabConfiguration.kt new file mode 100644 index 000000000..6afcfc84e --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/ui/TabConfiguration.kt @@ -0,0 +1,9 @@ +package acr.browser.lightning._browser2.ui + +/** + * Created by anthonycr on 11/18/20. + */ +enum class TabConfiguration { + DESKTOP, + DRAWER +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/ui/UiConfiguration.kt b/app/src/main/java/acr/browser/lightning/_browser2/ui/UiConfiguration.kt new file mode 100644 index 000000000..83d0a790c --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/ui/UiConfiguration.kt @@ -0,0 +1,9 @@ +package acr.browser.lightning._browser2.ui + +/** + * Created by anthonycr on 11/18/20. + */ +data class UiConfiguration( + val tabConfiguration: TabConfiguration, + val bookmarkConfiguration: BookmarkConfiguration +) diff --git a/app/src/main/java/acr/browser/lightning/browser/activity/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/browser/activity/BrowserActivity.kt index 8804a33e9..c899d4fbe 100644 --- a/app/src/main/java/acr/browser/lightning/browser/activity/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/browser/activity/BrowserActivity.kt @@ -247,8 +247,8 @@ abstract class BrowserActivity : ThemableBrowserActivity(), BrowserView, UIContr backgroundDrawable.color = primaryColor // Drawer stutters otherwise - left_drawer.setLayerType(LAYER_TYPE_NONE, null) - right_drawer.setLayerType(LAYER_TYPE_NONE, null) + tab_drawer.setLayerType(LAYER_TYPE_NONE, null) + bookmark_drawer.setLayerType(LAYER_TYPE_NONE, null) setNavigationDrawerWidth() drawer_layout.addDrawerListener(DrawerLocker()) @@ -361,31 +361,31 @@ abstract class BrowserActivity : ThemableBrowserActivity(), BrowserView, UIContr } private fun getBookmarksContainerId(): Int = if (swapBookmarksAndTabs) { - R.id.left_drawer + R.id.tab_drawer } else { - R.id.right_drawer + R.id.bookmark_drawer } private fun getTabsContainerId(): Int = if (shouldShowTabsInDrawer) { if (swapBookmarksAndTabs) { - R.id.right_drawer + R.id.bookmark_drawer } else { - R.id.left_drawer + R.id.tab_drawer } } else { R.id.tabs_toolbar_container } private fun getBookmarkDrawer(): View = if (swapBookmarksAndTabs) { - left_drawer + tab_drawer } else { - right_drawer + bookmark_drawer } private fun getTabDrawer(): View = if (swapBookmarksAndTabs) { - right_drawer + bookmark_drawer } else { - left_drawer + tab_drawer } protected fun panicClean() { @@ -510,14 +510,14 @@ abstract class BrowserActivity : ThemableBrowserActivity(), BrowserView, UIContr val width = resources.displayMetrics.widthPixels - dimen(R.dimen.navigation_drawer_minimum_space) val maxWidth = resources.getDimensionPixelSize(R.dimen.navigation_drawer_max_width) if (width < maxWidth) { - val params = left_drawer.layoutParams as DrawerLayout.LayoutParams + val params = tab_drawer.layoutParams as DrawerLayout.LayoutParams params.width = width - left_drawer.layoutParams = params - left_drawer.requestLayout() - val paramsRight = right_drawer.layoutParams as DrawerLayout.LayoutParams + tab_drawer.layoutParams = params + tab_drawer.requestLayout() + val paramsRight = bookmark_drawer.layoutParams as DrawerLayout.LayoutParams paramsRight.width = width - right_drawer.layoutParams = paramsRight - right_drawer.requestLayout() + bookmark_drawer.layoutParams = paramsRight + bookmark_drawer.requestLayout() } } @@ -1303,7 +1303,7 @@ abstract class BrowserActivity : ThemableBrowserActivity(), BrowserView, UIContr * @param runnable an optional runnable to run after the drawers are closed. */ protected fun closeDrawers(runnable: (() -> Unit)?) { - if (!drawer_layout.isDrawerOpen(left_drawer) && !drawer_layout.isDrawerOpen(right_drawer)) { + if (!drawer_layout.isDrawerOpen(tab_drawer) && !drawer_layout.isDrawerOpen(bookmark_drawer)) { if (runnable != null) { runnable() return diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 100998a32..4e0ce2687 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -27,7 +27,7 @@ Date: Wed, 18 Nov 2020 22:03:24 -0500 Subject: [PATCH 043/161] Updating gradle --- .../acr/browser/lightning/_browser2/BrowserActivity.kt | 9 ++++++--- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index a161454a1..3dc9594d2 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -134,9 +134,12 @@ class BrowserActivity : ThemableBrowserActivity() { presenter.onSearchSuggestionClicked(suggestionsAdapter.getItem(position) as WebPage) } binding.search.setAdapter(suggestionsAdapter) - val searchListener = SearchListener(onConfirm = { - presenter.onSearch(binding.search.text.toString()) - }, inputMethodManager) + val searchListener = SearchListener( + onConfirm = { + presenter.onSearch(binding.search.text.toString()) + }, + inputMethodManager = inputMethodManager + ) binding.search.setOnEditorActionListener(searchListener) binding.search.setOnKeyListener(searchListener) binding.search.addTextChangedListener(StyleRemovingTextWatcher()) diff --git a/build.gradle b/build.gradle index e08c30b3a..03933cdfd 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.1' + classpath 'com.android.tools.build:gradle:4.1.1' classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 44c14da00..9919edb6d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Sep 09 21:23:20 EDT 2020 +#Wed Nov 18 22:00:53 EST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip From ef51569a5aa0ab962af7d6c0672711fd44d6ee0d Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Thu, 19 Nov 2020 22:23:00 -0500 Subject: [PATCH 044/161] Handle find in page --- .../lightning/_browser2/BrowserActivity.kt | 22 ++++++++++ .../lightning/_browser2/BrowserContract.kt | 2 + .../lightning/_browser2/BrowserPresenter.kt | 41 ++++++++++++++++--- .../_browser2/BrowserStateAdapter.kt | 10 ++++- .../lightning/_browser2/BrowserViewState.kt | 10 ++++- .../lightning/_browser2/tab/TabAdapter.kt | 23 +++++++++++ .../lightning/_browser2/tab/TabModel.kt | 10 +++++ app/src/main/res/layout/browser_activity.xml | 10 ++--- 8 files changed, 113 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index 3dc9594d2..7d710e01f 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -145,6 +145,10 @@ class BrowserActivity : ThemableBrowserActivity() { binding.search.addTextChangedListener(StyleRemovingTextWatcher()) binding.search.setOnFocusChangeListener { _, hasFocus -> presenter.onSearchFocusChanged(hasFocus) } + binding.findPrevious.setOnClickListener { presenter.onFindPrevious() } + binding.findNext.setOnClickListener { presenter.onFindNext() } + binding.findQuit.setOnClickListener { presenter.onFindDismiss() } + binding.homeButton.setOnClickListener { presenter.onTabCountViewClick() } binding.actionBack.setOnClickListener { presenter.onBackClick() } binding.actionForward.setOnClickListener { presenter.onForwardClick() } @@ -220,6 +224,14 @@ class BrowserActivity : ThemableBrowserActivity() { R.drawable.ic_action_back }) } + viewState.findInPage?.let { + if (it.isEmpty()) { + binding.findBar.isVisible = false + } else { + binding.findBar.isVisible = true + binding.findQuery.text = it + } + } } fun showAddBookmarkDialog(title: String, url: String, folders: List) { @@ -251,6 +263,16 @@ class BrowserActivity : ThemableBrowserActivity() { ) } + fun showFindInPageDialog() { + BrowserDialog.showEditText( + this, + R.string.action_find, + R.string.search_hint, + R.string.search_hint, + presenter::onFindInPage + ) + } + fun openBookmarkDrawer() { binding.drawerLayout.closeDrawer(binding.tabDrawer) binding.drawerLayout.openDrawer(binding.bookmarkDrawer) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt index 546ce9673..600a49e2b 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt @@ -25,6 +25,8 @@ interface BrowserContract { fun showEditFolderDialog(title: String) + fun showFindInPageDialog() + fun openBookmarkDrawer() fun openTabDrawer() diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index d07145e7e..7662607fb 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -62,7 +62,8 @@ class BrowserPresenter @Inject constructor( bookmarks = emptyList(), isBookmarked = false, isBookmarkEnabled = true, - isRootFolder = true + isRootFolder = true, + findInPage = "" ) private var currentTab: TabModel? = null private var currentFolder: Bookmark.Folder = Bookmark.Folder.Root @@ -162,7 +163,8 @@ class BrowserPresenter @Inject constructor( progress = 100, tabs = viewState.tabs.map { it.copy(isSelected = false) - } + }, + findInPage = "" )) tabDisposable?.dispose() @@ -187,9 +189,10 @@ class BrowserPresenter @Inject constructor( isBackEnabled = canGoBack, sslState = sslState, progress = progress, - tabs = viewState.tabs.map { it.copy(isSelected = it.id == tabModel.id) }, + tabs = viewState.tabs.map { it.copy(isSelected = it.id == tab.id) }, isBookmarked = isBookmark, - isBookmarkEnabled = !isSpecialUrl + isBookmarkEnabled = !isSpecialUrl, + findInPage = tab.findQuery.orEmpty() ) }.subscribeOn(mainScheduler) .subscribe { view.updateState(it) } @@ -249,7 +252,7 @@ class BrowserPresenter @Inject constructor( .subscribe { tab -> selectTab(model.selectTab(tab.id)) } - MenuSelection.FIND -> TODO() + MenuSelection.FIND -> view?.showFindInPageDialog() MenuSelection.COPY_LINK -> currentTab?.url?.takeIf { !it.isSpecialUrl() } ?.let(navigator::copyPageLink) MenuSelection.ADD_TO_HOME -> currentTab?.url?.takeIf { !it.isSpecialUrl() } @@ -437,8 +440,34 @@ class BrowserPresenter @Inject constructor( currentTab?.loadUrl(url) } + /** + * TODO + */ fun onFindInPage(query: String) { - TODO() + currentTab?.find(query) + view?.updateState(viewState.copy(findInPage = query)) + } + + /** + * TODO + */ + fun onFindNext() { + currentTab?.findNext() + } + + /** + * TODO + */ + fun onFindPrevious() { + currentTab?.findPrevious() + } + + /** + * TODO + */ + fun onFindDismiss() { + currentTab?.clearFindMatches() + view?.updateState(viewState.copy(findInPage = "")) } /** diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt index 85a79d6ba..0af5718c6 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt @@ -19,7 +19,8 @@ class BrowserStateAdapter(private val browserActivity: BrowserActivity) : Browse bookmarks, isBookmarked, isBookmarkEnabled, - isRootFolder + isRootFolder, + findInPage ) = viewState browserActivity.renderState( @@ -34,7 +35,8 @@ class BrowserStateAdapter(private val browserActivity: BrowserActivity) : Browse bookmarks = bookmarks.takeIf { it != currentState?.bookmarks }, isBookmarked = isBookmarked.takeIf { it != currentState?.isBookmarked }, isBookmarkEnabled = isBookmarkEnabled.takeIf { it != currentState?.isBookmarkEnabled }, - isRootFolder = isRootFolder.takeIf { it != currentState?.isRootFolder } + isRootFolder = isRootFolder.takeIf { it != currentState?.isRootFolder }, + findInPage = findInPage.takeIf { it != currentState?.findInPage } ) ) @@ -53,6 +55,10 @@ class BrowserStateAdapter(private val browserActivity: BrowserActivity) : Browse browserActivity.showEditFolderDialog(title) } + override fun showFindInPageDialog() { + browserActivity.showFindInPageDialog() + } + override fun openBookmarkDrawer() { browserActivity.openBookmarkDrawer() } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt index c921bb423..3ee9224fc 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt @@ -23,7 +23,10 @@ data class BrowserViewState( val bookmarks: List, val isBookmarked: Boolean, val isBookmarkEnabled: Boolean, - val isRootFolder: Boolean + val isRootFolder: Boolean, + + // find + val findInPage: String ) data class PartialBrowserViewState( @@ -42,5 +45,8 @@ data class PartialBrowserViewState( val bookmarks: List?, val isBookmarked: Boolean?, val isBookmarkEnabled: Boolean?, - val isRootFolder: Boolean? + val isRootFolder: Boolean?, + + // find + val findInPage: String? ) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt index d3a2551d7..940d67755 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt @@ -21,6 +21,8 @@ class TabAdapter( private var latentInitializer: FreezableBundleInitializer? = null + private var findInPageQuery: String? = null + init { webView.webViewClient = tabWebViewClient webView.webChromeClient = tabWebChromeClient @@ -65,6 +67,27 @@ class TabAdapter( webView.stopLoading() } + override fun find(query: String) { + webView.findAllAsync(query) + findInPageQuery = query + } + + override fun findNext() { + webView.findNext(true) + } + + override fun findPrevious() { + webView.findNext(false) + } + + override fun clearFindMatches() { + webView.clearMatches() + findInPageQuery = null + } + + override val findQuery: String? + get() = findInPageQuery + override val favicon: Bitmap? get() = webView.favicon diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt index 111f7e565..a9c6668fa 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt @@ -32,6 +32,16 @@ interface TabModel { fun stopLoading() + fun find(query: String) + + fun findNext() + + fun findPrevious() + + fun clearFindMatches() + + val findQuery: String? + // Data val favicon: Bitmap? diff --git a/app/src/main/res/layout/browser_activity.xml b/app/src/main/res/layout/browser_activity.xml index 9a9fbf17d..2dd7ba996 100644 --- a/app/src/main/res/layout/browser_activity.xml +++ b/app/src/main/res/layout/browser_activity.xml @@ -172,7 +172,7 @@ android:clipChildren="true" /> Date: Thu, 19 Nov 2020 22:37:37 -0500 Subject: [PATCH 045/161] Show the ssl state when the icon is clicked --- .../lightning/_browser2/BrowserContract.kt | 3 ++ .../lightning/_browser2/BrowserPresenter.kt | 4 ++- .../_browser2/BrowserStateAdapter.kt | 7 ++++ .../lightning/_browser2/tab/TabAdapter.kt | 13 ++++++++ .../lightning/_browser2/tab/TabModel.kt | 3 ++ .../lightning/ssl/SslCertificateInfo.kt | 15 +++++++++ .../acr/browser/lightning/ssl/SslDialog.kt | 32 +++++++++++++++---- 7 files changed, 69 insertions(+), 8 deletions(-) create mode 100644 app/src/main/java/acr/browser/lightning/ssl/SslCertificateInfo.kt diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt index 600a49e2b..9de241f83 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt @@ -1,6 +1,7 @@ package acr.browser.lightning._browser2 import acr.browser.lightning._browser2.tab.TabModel +import acr.browser.lightning.ssl.SslCertificateInfo import acr.browser.lightning.view.TabInitializer import android.graphics.Bitmap import io.reactivex.Completable @@ -27,6 +28,8 @@ interface BrowserContract { fun showFindInPageDialog() + fun showSslDialog(sslCertificateInfo: SslCertificateInfo) + fun openBookmarkDrawer() fun openTabDrawer() diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 7662607fb..0072f3e3d 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -488,7 +488,9 @@ class BrowserPresenter @Inject constructor( * TODO */ fun onSslIconClick() { - // TODO + currentTab?.sslCertificateInfo?.let { + view?.showSslDialog(it) + } } /** diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt index 0af5718c6..e65ac3766 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt @@ -1,5 +1,8 @@ package acr.browser.lightning._browser2 +import acr.browser.lightning.ssl.SslCertificateInfo +import acr.browser.lightning.ssl.showSslDialog + /** * Created by anthonycr on 9/16/20. */ @@ -59,6 +62,10 @@ class BrowserStateAdapter(private val browserActivity: BrowserActivity) : Browse browserActivity.showFindInPageDialog() } + override fun showSslDialog(sslCertificateInfo: SslCertificateInfo) { + browserActivity.showSslDialog(sslCertificateInfo) + } + override fun openBookmarkDrawer() { browserActivity.openBookmarkDrawer() } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt index 940d67755..1b21c4669 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt @@ -1,5 +1,6 @@ package acr.browser.lightning._browser2.tab +import acr.browser.lightning.ssl.SslCertificateInfo import acr.browser.lightning.ssl.SslState import acr.browser.lightning.view.FreezableBundleInitializer import acr.browser.lightning.view.TabInitializer @@ -104,6 +105,18 @@ class TabAdapter( override fun titleChanges(): Observable = tabWebChromeClient.titleObservable.hide() + override val sslCertificateInfo: SslCertificateInfo? + get() = webView.certificate?.let { + SslCertificateInfo( + issuedByCommonName = it.issuedBy.cName, + issuedToCommonName = it.issuedTo.cName, + issuedToOrganizationName = it.issuedTo.oName, + issueDate = it.validNotBeforeDate, + expireDate = it.validNotAfterDate, + sslState = sslState + ) + } + override val sslState: SslState get() = tabWebViewClient.sslState diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt index a9c6668fa..f972b0183 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt @@ -1,5 +1,6 @@ package acr.browser.lightning._browser2.tab +import acr.browser.lightning.ssl.SslCertificateInfo import acr.browser.lightning.ssl.SslState import acr.browser.lightning.view.TabInitializer import android.graphics.Bitmap @@ -56,6 +57,8 @@ interface TabModel { fun titleChanges(): Observable + val sslCertificateInfo: SslCertificateInfo? + val sslState: SslState fun sslChanges(): Observable diff --git a/app/src/main/java/acr/browser/lightning/ssl/SslCertificateInfo.kt b/app/src/main/java/acr/browser/lightning/ssl/SslCertificateInfo.kt new file mode 100644 index 000000000..160a60080 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/ssl/SslCertificateInfo.kt @@ -0,0 +1,15 @@ +package acr.browser.lightning.ssl + +import java.util.* + +/** + * Created by anthonycr on 11/19/20. + */ +data class SslCertificateInfo( + val issuedByCommonName: String, + val issuedToCommonName: String, + val issuedToOrganizationName: String?, + val issueDate: Date, + val expireDate: Date, + val sslState: SslState +) diff --git a/app/src/main/java/acr/browser/lightning/ssl/SslDialog.kt b/app/src/main/java/acr/browser/lightning/ssl/SslDialog.kt index 5667f08ff..18392c104 100644 --- a/app/src/main/java/acr/browser/lightning/ssl/SslDialog.kt +++ b/app/src/main/java/acr/browser/lightning/ssl/SslDialog.kt @@ -8,6 +8,7 @@ import android.net.http.SslCertificate import android.text.format.DateFormat import android.widget.TextView import androidx.appcompat.app.AlertDialog +import java.util.* /** * Shows an informative dialog with the provided [SslCertificate] information. @@ -18,21 +19,38 @@ fun Context.showSslDialog(sslCertificate: SslCertificate, sslState: SslState) { val issueDate = sslCertificate.validNotBeforeDate val expireDate = sslCertificate.validNotAfterDate + showSslDialog( + SslCertificateInfo( + issuedByCommonName = by.cName, + issuedToCommonName = to.cName, + issuedToOrganizationName = to.oName, + issueDate = sslCertificate.validNotBeforeDate, + expireDate = sslCertificate.validNotAfterDate, + sslState = sslState + ) + ) +} + +fun Context.showSslDialog(sslCertificateInfo: SslCertificateInfo) { val dateFormat = DateFormat.getDateFormat(applicationContext) val contentView = inflater.inflate(R.layout.dialog_ssl_info, null, false).apply { - findViewById(R.id.ssl_layout_issue_by).text = by.cName - findViewById(R.id.ssl_layout_issue_to).text = to.oName?.takeIf(String::isNotBlank) - ?: to.cName - findViewById(R.id.ssl_layout_issue_date).text = dateFormat.format(issueDate) - findViewById(R.id.ssl_layout_expire_date).text = dateFormat.format(expireDate) + findViewById(R.id.ssl_layout_issue_by).text = + sslCertificateInfo.issuedByCommonName + findViewById(R.id.ssl_layout_issue_to).text = + sslCertificateInfo.issuedToOrganizationName?.takeIf(String::isNotBlank) + ?: sslCertificateInfo.issuedToCommonName + findViewById(R.id.ssl_layout_issue_date).text = + dateFormat.format(sslCertificateInfo.issueDate) + findViewById(R.id.ssl_layout_expire_date).text = + dateFormat.format(sslCertificateInfo.expireDate) } - val icon = createSslDrawableForState(sslState) + val icon = createSslDrawableForState(sslCertificateInfo.sslState) AlertDialog.Builder(this) .setIcon(icon) - .setTitle(to.cName) + .setTitle(sslCertificateInfo.issuedToCommonName) .setView(contentView) .setPositiveButton(R.string.action_ok, null) .resizeAndShow() From 982192f3b0c39ab741030f5b359d91aa728c04c9 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Thu, 19 Nov 2020 23:14:04 -0500 Subject: [PATCH 046/161] desktop and drawer tab support --- .../lightning/_browser2/BrowserActivity.kt | 38 +++++-- .../lightning/_browser2/di/Browser2Module.kt | 6 +- .../tab/DesktopTabRecyclerViewAdapter.kt | 104 ++++++++++++++++++ ...ter.kt => DrawerTabRecyclerViewAdapter.kt} | 4 +- .../lightning/browser/tabs/TabsDesktopView.kt | 2 +- .../lightning/browser/tabs/TabsDrawerView.kt | 2 +- app/src/main/res/layout/browser_activity.xml | 19 ++-- app/src/main/res/layout/tab_drawer.xml | 2 +- app/src/main/res/layout/tab_strip.xml | 2 +- 9 files changed, 156 insertions(+), 23 deletions(-) create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/tab/DesktopTabRecyclerViewAdapter.kt rename app/src/main/java/acr/browser/lightning/_browser2/tab/{TabRecyclerViewAdapter.kt => DrawerTabRecyclerViewAdapter.kt} (97%) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index 7d710e01f..5e8a38d8f 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -7,7 +7,10 @@ import acr.browser.lightning._browser2.keys.KeyEventAdapter import acr.browser.lightning._browser2.menu.MenuItemAdapter import acr.browser.lightning._browser2.search.IntentExtractor import acr.browser.lightning._browser2.search.SearchListener -import acr.browser.lightning._browser2.tab.TabRecyclerViewAdapter +import acr.browser.lightning._browser2.tab.DrawerTabRecyclerViewAdapter +import acr.browser.lightning._browser2.tab.DesktopTabRecyclerViewAdapter +import acr.browser.lightning._browser2.tab.TabViewHolder +import acr.browser.lightning._browser2.tab.TabViewState import acr.browser.lightning._browser2.ui.BookmarkConfiguration import acr.browser.lightning._browser2.ui.TabConfiguration import acr.browser.lightning._browser2.ui.UiConfiguration @@ -30,6 +33,8 @@ import android.widget.ImageView import androidx.core.view.isVisible import androidx.drawerlayout.widget.DrawerLayout import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.ListAdapter +import androidx.recyclerview.widget.RecyclerView import javax.inject.Inject /** @@ -38,7 +43,7 @@ import javax.inject.Inject class BrowserActivity : ThemableBrowserActivity() { private lateinit var binding: BrowserActivityBinding - private lateinit var tabsAdapter: TabRecyclerViewAdapter + private lateinit var tabsAdapter: ListAdapter private lateinit var bookmarksAdapter: BookmarkRecyclerViewAdapter @Inject @@ -100,13 +105,28 @@ class BrowserActivity : ThemableBrowserActivity() { binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED, binding.tabDrawer) } - tabsAdapter = TabRecyclerViewAdapter( - onClick = presenter::onTabClick, - onCloseClick = presenter::onTabClose, - onLongClick = presenter::onTabLongClick - ) - binding.tabsList.adapter = tabsAdapter - binding.tabsList.layoutManager = LinearLayoutManager(this) + if (uiConfiguration.tabConfiguration == TabConfiguration.DRAWER) { + tabsAdapter = DrawerTabRecyclerViewAdapter( + onClick = presenter::onTabClick, + onCloseClick = presenter::onTabClose, + onLongClick = presenter::onTabLongClick + ) + binding.drawerTabsList.isVisible = true + binding.drawerTabsList.adapter = tabsAdapter + binding.drawerTabsList.layoutManager = LinearLayoutManager(this) + binding.desktopTabsList.isVisible = false + } else { + tabsAdapter = DesktopTabRecyclerViewAdapter( + context = this, + onClick = presenter::onTabClick, + onCloseClick = presenter::onTabClose, + onLongClick = presenter::onTabLongClick + ) + binding.desktopTabsList.isVisible = true + binding.desktopTabsList.adapter = tabsAdapter + binding.desktopTabsList.layoutManager = LinearLayoutManager(this, RecyclerView.HORIZONTAL, false) + binding.drawerTabsList.isVisible = false + } bookmarksAdapter = BookmarkRecyclerViewAdapter( onClick = presenter::onBookmarkClick, diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt index 0c9fefa2a..df15cfbec 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt @@ -41,7 +41,11 @@ class Browser2Module { fun providesUiConfiguration( userPreferences: UserPreferences ): UiConfiguration = UiConfiguration( - tabConfiguration = TabConfiguration.DRAWER, + tabConfiguration = if (userPreferences.showTabsInDrawer) { + TabConfiguration.DRAWER + } else { + TabConfiguration.DESKTOP + }, bookmarkConfiguration = if (userPreferences.bookmarksAndTabsSwapped) { BookmarkConfiguration.LEFT } else { diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/DesktopTabRecyclerViewAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/DesktopTabRecyclerViewAdapter.kt new file mode 100644 index 000000000..40788c209 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/DesktopTabRecyclerViewAdapter.kt @@ -0,0 +1,104 @@ +package acr.browser.lightning._browser2.tab + +import acr.browser.lightning.R +import acr.browser.lightning.extensions.desaturate +import acr.browser.lightning.extensions.dimen +import acr.browser.lightning.extensions.drawTrapezoid +import acr.browser.lightning.extensions.inflater +import acr.browser.lightning.utils.ThemeUtils +import acr.browser.lightning.utils.Utils +import acr.browser.lightning.view.BackgroundDrawable +import android.content.Context +import android.graphics.Bitmap +import android.graphics.Canvas +import android.graphics.Color +import android.graphics.drawable.BitmapDrawable +import android.graphics.drawable.Drawable +import android.view.ViewGroup +import androidx.core.widget.TextViewCompat +import androidx.recyclerview.widget.DiffUtil +import androidx.recyclerview.widget.ListAdapter + +/** + * Created by anthonycr on 9/12/20. + */ +class DesktopTabRecyclerViewAdapter( + context: Context, + private val onClick: (Int) -> Unit, + private val onLongClick: (Int) -> Unit, + private val onCloseClick: (Int) -> Unit, +) : ListAdapter( + object : DiffUtil.ItemCallback() { + override fun areItemsTheSame(oldItem: TabViewState, newItem: TabViewState): Boolean = + oldItem.id == newItem.id + + override fun areContentsTheSame(oldItem: TabViewState, newItem: TabViewState): Boolean = oldItem == newItem + } +) { + private val backgroundTabDrawable: Drawable? + private val foregroundTabDrawable: Drawable? + + init { + val backgroundColor = Utils.mixTwoColors(ThemeUtils.getPrimaryColor(context), Color.BLACK, 0.75f) + val backgroundTabBitmap = Bitmap.createBitmap( + context.dimen(R.dimen.desktop_tab_width), + context.dimen(R.dimen.desktop_tab_height), + Bitmap.Config.ARGB_8888 + ).also { + Canvas(it).drawTrapezoid(backgroundColor, true) + } + backgroundTabDrawable = BitmapDrawable(context.resources, backgroundTabBitmap) + + val foregroundColor = ThemeUtils.getPrimaryColor(context) + val foregroundTabBitmap = Bitmap.createBitmap( + context.dimen(R.dimen.desktop_tab_width), + context.dimen(R.dimen.desktop_tab_height), + Bitmap.Config.ARGB_8888 + ).also { + Canvas(it).drawTrapezoid(foregroundColor, false) + } + foregroundTabDrawable = BitmapDrawable(context.resources, foregroundTabBitmap) + } + + override fun onCreateViewHolder(viewGroup: ViewGroup, i: Int): TabViewHolder { + val view = viewGroup.context.inflater.inflate(R.layout.tab_list_item_horizontal, viewGroup, false) + return TabViewHolder(view, onClick = onClick, onLongClick = onLongClick, onCloseClick = onCloseClick) + } + + override fun onBindViewHolder(holder: TabViewHolder, position: Int) { + holder.exitButton.tag = position + + val tab = getItem(position) + + holder.txtTitle.text = tab.title + updateViewHolderAppearance(holder, null, tab.isSelected) + updateViewHolderFavicon(holder, tab.icon, tab.isSelected) + updateViewHolderBackground(holder, tab.isSelected) + } + + private fun updateViewHolderFavicon(viewHolder: TabViewHolder, favicon: Bitmap?, isForeground: Boolean) { + favicon?.let { + if (isForeground) { + viewHolder.favicon.setImageBitmap(it) + } else { + viewHolder.favicon.setImageBitmap(it.desaturate()) + } + } ?: viewHolder.favicon.setImageResource(R.drawable.ic_webpage) + } + + private fun updateViewHolderBackground(viewHolder: TabViewHolder, isForeground: Boolean) { + if (isForeground) { + viewHolder.layout.background = foregroundTabDrawable + } else { + viewHolder.layout.background = backgroundTabDrawable + } + } + + private fun updateViewHolderAppearance(viewHolder: TabViewHolder, favicon: Bitmap?, isForeground: Boolean) { + if (isForeground) { + TextViewCompat.setTextAppearance(viewHolder.txtTitle, R.style.boldText) + } else { + TextViewCompat.setTextAppearance(viewHolder.txtTitle, R.style.normalText) + } + } +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabRecyclerViewAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/DrawerTabRecyclerViewAdapter.kt similarity index 97% rename from app/src/main/java/acr/browser/lightning/_browser2/tab/TabRecyclerViewAdapter.kt rename to app/src/main/java/acr/browser/lightning/_browser2/tab/DrawerTabRecyclerViewAdapter.kt index 1626301fc..4cc9fc1bd 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabRecyclerViewAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/DrawerTabRecyclerViewAdapter.kt @@ -11,9 +11,9 @@ import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter /** - * Created by anthonycr on 9/12/20. + * Created by anthonycr on 11/19/20. */ -class TabRecyclerViewAdapter( +class DrawerTabRecyclerViewAdapter( private val onClick: (Int) -> Unit, private val onLongClick: (Int) -> Unit, private val onCloseClick: (Int) -> Unit, diff --git a/app/src/main/java/acr/browser/lightning/browser/tabs/TabsDesktopView.kt b/app/src/main/java/acr/browser/lightning/browser/tabs/TabsDesktopView.kt index fd6221e49..38408e3a6 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tabs/TabsDesktopView.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tabs/TabsDesktopView.kt @@ -54,7 +54,7 @@ class TabsDesktopView @JvmOverloads constructor( tabsAdapter = TabsDesktopAdapter(context, context.resources, uiController = uiController) - tabList = findViewById(R.id.tabs_list).apply { + tabList = findViewById(R.id.drawer_tabs_list).apply { setLayerType(View.LAYER_TYPE_NONE, null) itemAnimator = animator this.layoutManager = layoutManager diff --git a/app/src/main/java/acr/browser/lightning/browser/tabs/TabsDrawerView.kt b/app/src/main/java/acr/browser/lightning/browser/tabs/TabsDrawerView.kt index a385b67c2..2adedfee5 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tabs/TabsDrawerView.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tabs/TabsDrawerView.kt @@ -44,7 +44,7 @@ class TabsDrawerView @JvmOverloads constructor( moveDuration = 200 } - tabList = findViewById(R.id.tabs_list).apply { + tabList = findViewById(R.id.drawer_tabs_list).apply { setLayerType(View.LAYER_TYPE_NONE, null) itemAnimator = animator layoutManager = LinearLayoutManager(context, RecyclerView.VERTICAL, false) diff --git a/app/src/main/res/layout/browser_activity.xml b/app/src/main/res/layout/browser_activity.xml index 2dd7ba996..409374974 100644 --- a/app/src/main/res/layout/browser_activity.xml +++ b/app/src/main/res/layout/browser_activity.xml @@ -28,10 +28,15 @@ android:elevation="3dp" android:fitsSystemWindows="true"> - @@ -47,13 +52,13 @@ app:contentInsetStart="0dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/tabs_toolbar_container"> + app:layout_constraintTop_toBottomOf="@id/desktop_tabs_list"> + android:baselineAligned="false" + android:orientation="horizontal"> Date: Fri, 20 Nov 2020 23:04:31 -0500 Subject: [PATCH 047/161] Handle hiding toolbar while scrolling --- .../lightning/_browser2/BrowserActivity.kt | 3 + .../_browser2/di/Browser2Component.kt | 8 + .../lightning/_browser2/tab/TabPager.kt | 15 +- .../view/WebViewScrollCoordinator.kt | 171 ++++++++++++++++++ 4 files changed, 195 insertions(+), 2 deletions(-) create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/view/WebViewScrollCoordinator.kt diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index 5e8a38d8f..002815869 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -14,6 +14,7 @@ import acr.browser.lightning._browser2.tab.TabViewState import acr.browser.lightning._browser2.ui.BookmarkConfiguration import acr.browser.lightning._browser2.ui.TabConfiguration import acr.browser.lightning._browser2.ui.UiConfiguration +import acr.browser.lightning._browser2.view.WebViewScrollCoordinator import acr.browser.lightning.browser.activity.StyleRemovingTextWatcher import acr.browser.lightning.browser.activity.ThemableBrowserActivity import acr.browser.lightning.database.SearchSuggestion @@ -80,6 +81,8 @@ class BrowserActivity : ThemableBrowserActivity() { injector.browser2ComponentBuilder() .activity(this) .browserFrame(binding.contentFrame) + .toolbarRoot(binding.uiLayout) + .toolbar(binding.toolbarLayout) .initialIntent(intent) .build() .inject(this) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt index 9e793ca28..a976c8fde 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt @@ -3,7 +3,9 @@ package acr.browser.lightning._browser2.di import acr.browser.lightning._browser2.BrowserActivity import android.app.Activity import android.content.Intent +import android.view.View import android.widget.FrameLayout +import android.widget.LinearLayout import dagger.BindsInstance import dagger.Subcomponent import javax.inject.Qualifier @@ -23,6 +25,12 @@ interface Browser2Component { @BindsInstance fun browserFrame(frameLayout: FrameLayout): Builder + @BindsInstance + fun toolbarRoot(linearLayout: LinearLayout): Builder + + @BindsInstance + fun toolbar(toolbar: View): Builder + @BindsInstance fun initialIntent(@InitialIntent intent: Intent): Builder diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt index 5ae9ae4bf..8acdccf33 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt @@ -1,24 +1,35 @@ package acr.browser.lightning._browser2.tab +import acr.browser.lightning._browser2.view.WebViewScrollCoordinator +import acr.browser.lightning.preference.UserPreferences +import android.view.View import android.view.ViewGroup import android.webkit.WebView import android.widget.FrameLayout +import android.widget.LinearLayout import javax.inject.Inject /** * Created by anthonycr on 9/12/20. */ -class TabPager @Inject constructor(private val container: FrameLayout) { +class TabPager @Inject constructor( + private val container: FrameLayout, + private val webViewScrollCoordinator: WebViewScrollCoordinator +) { private val webViews: MutableList = mutableListOf() fun selectTab(id: Int) { container.removeAllViews() + val webView = webViews.forId(id) container.addView( - webViews.forId(id), + webView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT ) + + // TODO: coordinator adds views to the container, which can result in UI flashes. + webViewScrollCoordinator.configure(webView) } fun clearTab() { diff --git a/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewScrollCoordinator.kt b/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewScrollCoordinator.kt new file mode 100644 index 000000000..d2363b361 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewScrollCoordinator.kt @@ -0,0 +1,171 @@ +package acr.browser.lightning._browser2.view + +import acr.browser.lightning.interpolator.BezierDecelerateInterpolator +import acr.browser.lightning.preference.UserPreferences +import acr.browser.lightning.utils.Utils +import android.annotation.SuppressLint +import android.app.Activity +import android.view.* +import android.view.animation.Animation +import android.view.animation.Transformation +import android.webkit.WebView +import android.widget.FrameLayout +import android.widget.LinearLayout +import javax.inject.Inject + +/** + * TODO + */ +class WebViewScrollCoordinator @Inject constructor( + activity: Activity, + private val browserFrame: FrameLayout, + private val toolbarRoot: LinearLayout, + private val toolbar: View, + private val userPreferences: UserPreferences +) { + + private val gestureListener: CustomGestureListener = CustomGestureListener( + ViewConfiguration.get(activity).scaledMaximumFlingVelocity.toFloat() + ) + + private val touchListener = TouchListener(GestureDetector(activity, gestureListener)) + + /** + * TODO + */ + fun configure(webView: WebView) { + if (userPreferences.fullScreenEnabled) { + (toolbar.parent as ViewGroup?)?.removeView(toolbar) + + browserFrame.addView(toolbar) + + toolbar.translationY = 0f + webView.translationY = toolbar.height.toFloat() + coordinate(toolbar, webView) + } else { + (toolbar.parent as ViewGroup?)?.removeView(toolbar) + + toolbarRoot.addView(toolbar, 0) + + toolbar.translationY = 0f + webView.translationY = 0f + } + } + + @SuppressLint("ClickableViewAccessibility") + private fun coordinate(toolbar: View, webView: WebView) { + webView.setOnTouchListener(touchListener) + + val toggleListener = object : ToggleListener { + override fun hideToolbar() { + val height = toolbar.height + if (toolbar.translationY > -0.01f) { + val hideAnimation = object : Animation() { + override fun applyTransformation(interpolatedTime: Float, t: Transformation) { + val trans = interpolatedTime * height + toolbar.translationY = -trans + webView.translationY = height - trans + } + } + hideAnimation.duration = 250 + hideAnimation.interpolator = BezierDecelerateInterpolator() + toolbar.startAnimation(hideAnimation) + } + } + + override fun showToolbar() { + var height = toolbar.height + if (height == 0) { + toolbar.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED) + height = toolbar.measuredHeight + } + + val totalHeight = height + if (toolbar.translationY < -(height - 0.01f)) { + val show = object : Animation() { + override fun applyTransformation(interpolatedTime: Float, t: Transformation) { + val trans = interpolatedTime * totalHeight + toolbar.translationY = trans - totalHeight + webView.translationY = trans + } + } + show.duration = 250 + show.interpolator = BezierDecelerateInterpolator() + toolbar.startAnimation(show) + } + } + } + + touchListener.toggleListener = toggleListener + gestureListener.toggleListener = toggleListener + } + + interface ToggleListener { + fun hideToolbar() + + fun showToolbar() + } + + private class TouchListener( + private val gestureDetector: GestureDetector + ) : View.OnTouchListener { + + private var location: Float = 0f + private var y: Float = 0f + private var action: Int = 0 + + var toggleListener: ToggleListener? = null + + @SuppressLint("ClickableViewAccessibility") + override fun onTouch(view: View?, arg1: MotionEvent): Boolean { + if (view == null) return false + + if (!view.hasFocus()) { + view.requestFocus() + } + action = arg1.action + y = arg1.y + if (action == MotionEvent.ACTION_DOWN) { + location = y + } else if (action == MotionEvent.ACTION_UP) { + val distance = y - location + if (distance > SCROLL_UP_THRESHOLD && view.scrollY < SCROLL_UP_THRESHOLD) { + toggleListener?.showToolbar() + } else if (distance < -SCROLL_UP_THRESHOLD) { + toggleListener?.hideToolbar() + } + location = 0f + } + gestureDetector.onTouchEvent(arg1) + + return false + } + } + + /** + * The SimpleOnGestureListener used by the [TouchListener] + * in order to delegate show/hide events to the action bar when + * the user flings the page. Also handles long press events so + * that we can capture them accurately. + */ + private class CustomGestureListener( + private val maxFling: Float + ) : GestureDetector.SimpleOnGestureListener() { + + var toggleListener: ToggleListener? = null + + override fun onFling(e1: MotionEvent, e2: MotionEvent, velocityX: Float, velocityY: Float): Boolean { + val power = (velocityY * 100 / maxFling).toInt() + if (power < -10) { + toggleListener?.hideToolbar() + } else if (power > 15) { + toggleListener?.showToolbar() + } + return super.onFling(e1, e2, velocityX, velocityY) + } + } + + companion object { + private val SCROLL_UP_THRESHOLD = Utils.dpToPx(10f) + } +} From f335d2bfbca2d341798ef25422dcfc8f6e5bb7fc Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 23 Dec 2020 11:21:17 -0500 Subject: [PATCH 048/161] Updating gradle and dependencies --- app/build.gradle | 21 +++++++++---------- .../acr/browser/lightning/rx/RxExtensions.kt | 2 +- build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3374d562b..ad95947a3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -105,24 +105,24 @@ dependencies { debugImplementation 'androidx.multidex:multidex:2.0.1' // test dependencies - testImplementation 'junit:junit:4.13' - testImplementation 'org.assertj:assertj-core:3.17.2' - testImplementation 'org.mockito:mockito-core:3.5.10' + testImplementation 'junit:junit:4.13.1' + testImplementation 'org.assertj:assertj-core:3.18.1' + testImplementation 'org.mockito:mockito-core:3.6.28' testImplementation 'com.nhaarman:mockito-kotlin:1.6.0', { exclude group: 'org.jetbrains.kotlin' } testImplementation 'org.robolectric:robolectric:4.4' // support libraries - implementation "androidx.palette:palette:1.0.0" + implementation "androidx.palette:palette-ktx:1.0.0" implementation "androidx.annotation:annotation:1.1.0" implementation "androidx.vectordrawable:vectordrawable-animated:1.1.0" implementation "androidx.appcompat:appcompat:1.2.0" implementation "com.google.android.material:material:1.2.1" implementation "androidx.recyclerview:recyclerview:1.1.0" - implementation "androidx.core:core:1.3.1" - implementation "androidx.constraintlayout:constraintlayout:2.0.1" - implementation "androidx.fragment:fragment:1.2.5" + implementation 'androidx.core:core-ktx:1.5.0-alpha05' + implementation "androidx.constraintlayout:constraintlayout:2.0.4" + implementation "androidx.fragment:fragment-ktx:1.2.5" implementation "androidx.drawerlayout:drawerlayout:1.1.1" // html parsing for reading mode @@ -134,13 +134,13 @@ dependencies { kapt "com.anthonycr.mezzanine:mezzanine-compiler:$mezzanineVersion" // dependency injection - final def daggerVersion = '2.29' + final def daggerVersion = '2.30.1' implementation "com.google.dagger:dagger:$daggerVersion" kapt "com.google.dagger:dagger-compiler:$daggerVersion" compileOnly 'javax.annotation:jsr250-api:1.0' // view binding - final def butterKnifeVersion = '10.2.1' + final def butterKnifeVersion = '10.2.3' implementation "com.jakewharton:butterknife:$butterKnifeVersion" kapt "com.jakewharton:butterknife-compiler:$butterKnifeVersion" @@ -155,7 +155,7 @@ dependencies { // rx implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' - implementation 'io.reactivex.rxjava2:rxjava:2.2.19' + implementation 'io.reactivex.rxjava2:rxjava:2.2.20' implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0' // tor proxy @@ -172,7 +172,6 @@ dependencies { // kotlin implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" - implementation 'androidx.core:core-ktx:1.5.0-alpha02' } kapt { diff --git a/app/src/main/java/acr/browser/lightning/rx/RxExtensions.kt b/app/src/main/java/acr/browser/lightning/rx/RxExtensions.kt index 6c3407fa6..b9f3a0d0d 100644 --- a/app/src/main/java/acr/browser/lightning/rx/RxExtensions.kt +++ b/app/src/main/java/acr/browser/lightning/rx/RxExtensions.kt @@ -16,7 +16,7 @@ import org.reactivestreams.Publisher * type. * @see Observable.join */ -inline fun Flowable.join( +inline fun Flowable.join( other: Flowable, crossinline selectorLeft: (T) -> Publisher, crossinline selectorRight: (R) -> Publisher, diff --git a/build.gradle b/build.gradle index 03933cdfd..4a7d07d26 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlinVersion = '1.4.10' + ext.kotlinVersion = '1.4.21' repositories { google() jcenter() @@ -8,7 +8,7 @@ buildscript { classpath 'com.android.tools.build:gradle:4.1.1' classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" - classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0' + classpath 'com.github.ben-manes:gradle-versions-plugin:0.36.0' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9919edb6d..30f4ee20d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Nov 18 22:00:53 EST 2020 +#Wed Dec 23 10:38:29 EST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip From d856a7368a5d0b94ccd0817a941dea28f763a0bd Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 23 Dec 2020 13:49:27 -0500 Subject: [PATCH 049/161] Creating browser scope that scopes browser instance --- .../browser/lightning/_browser2/BrowserPresenter.kt | 2 ++ .../lightning/_browser2/di/Browser2Component.kt | 1 + .../browser/lightning/_browser2/di/Browser2Scope.kt | 10 ++++++++++ 3 files changed, 13 insertions(+) create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Scope.kt diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 0072f3e3d..20c748339 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -1,5 +1,6 @@ package acr.browser.lightning._browser2 +import acr.browser.lightning._browser2.di.Browser2Scope import acr.browser.lightning._browser2.di.InitialUrl import acr.browser.lightning._browser2.history.HistoryRecord import acr.browser.lightning._browser2.keys.KeyCombo @@ -34,6 +35,7 @@ import javax.inject.Inject /** * Created by anthonycr on 9/11/20. */ +@Browser2Scope class BrowserPresenter @Inject constructor( private val model: BrowserContract.Model, private val navigator: BrowserContract.Navigator, diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt index a976c8fde..40afd7aee 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt @@ -13,6 +13,7 @@ import javax.inject.Qualifier /** * Created by anthonycr on 9/15/20. */ +@Browser2Scope @Subcomponent(modules = [Browser2Module::class, Browser2BindsModule::class]) interface Browser2Component { diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Scope.kt b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Scope.kt new file mode 100644 index 000000000..a2ff88009 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Scope.kt @@ -0,0 +1,10 @@ +package acr.browser.lightning._browser2.di + +import javax.inject.Scope + +/** + * Created by anthonycr on 12/23/20. + */ +@Scope +@Retention +annotation class Browser2Scope From 9902a14ddf5641322a951224259c08760b8b215b Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 23 Dec 2020 13:49:42 -0500 Subject: [PATCH 050/161] Cleaning up lambdas --- .../acr/browser/lightning/_browser2/BrowserPresenter.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 20c748339..73a59bc01 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -104,11 +104,11 @@ class BrowserPresenter @Inject constructor( .mergeWith( Maybe.fromCallable { initialUrl } .flatMapSingleElement { model.createTab(UrlInitializer(it)) } - .map { listOf(it) } + .map(::listOf) ) .toList() - .map { it.flatten() } - .filter { it.isNotEmpty() } + .map(MutableList>::flatten) + .filter(List::isNotEmpty) .switchIfEmpty(model.createTab(homePageInitializer).map(::listOf)) .subscribe { list -> selectTab(model.selectTab(list.last().id)) @@ -525,7 +525,7 @@ class BrowserPresenter @Inject constructor( } }) .toList() - .map { it.flatten() } + .map(MutableList>::flatten) /** * TODO From 5a79d26584673f1ca103192cb6fb72bc4596a996 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 23 Dec 2020 13:49:54 -0500 Subject: [PATCH 051/161] Removing unused imports --- .../main/java/acr/browser/lightning/_browser2/tab/TabPager.kt | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt index 8acdccf33..6112692d2 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt @@ -1,12 +1,9 @@ package acr.browser.lightning._browser2.tab import acr.browser.lightning._browser2.view.WebViewScrollCoordinator -import acr.browser.lightning.preference.UserPreferences -import android.view.View import android.view.ViewGroup import android.webkit.WebView import android.widget.FrameLayout -import android.widget.LinearLayout import javax.inject.Inject /** From 76e19d71f26f5a9032ef3d434a49fe0bb33b7bbd Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Mon, 25 Jan 2021 20:28:50 -0500 Subject: [PATCH 052/161] Upgrading gradle tools --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 4a7d07d26..47008812f 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.1' + classpath 'com.android.tools.build:gradle:4.1.2' classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" classpath 'com.github.ben-manes:gradle-versions-plugin:0.36.0' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 30f4ee20d..1ea1674c7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Dec 23 10:38:29 EST 2020 +#Mon Jan 25 20:21:43 EST 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-all.zip From 3a29b1a6ff7b4a27ce374147ef83bd41b847c5c4 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Mon, 25 Jan 2021 21:19:52 -0500 Subject: [PATCH 053/161] Handle long click partially --- .../lightning/_browser2/BrowserActivity.kt | 11 +- .../lightning/_browser2/BrowserPresenter.kt | 8 ++ .../lightning/_browser2/tab/TabPager.kt | 12 +- .../lightning/_browser2/tab/WebViewFactory.kt | 2 + .../_browser2/view/CompositeTouchListener.kt | 20 ++++ .../view/WebViewCompositeTouchExtensions.kt | 14 +++ .../_browser2/view/WebViewLongPressHandler.kt | 113 ++++++++++++++++++ .../view/WebViewScrollCoordinator.kt | 3 +- app/src/main/java/targetUrl/LongPress.kt | 16 +++ 9 files changed, 191 insertions(+), 8 deletions(-) create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/view/CompositeTouchListener.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/view/WebViewCompositeTouchExtensions.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/view/WebViewLongPressHandler.kt create mode 100644 app/src/main/java/targetUrl/LongPress.kt diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index 002815869..d0bdcc85e 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -7,14 +7,10 @@ import acr.browser.lightning._browser2.keys.KeyEventAdapter import acr.browser.lightning._browser2.menu.MenuItemAdapter import acr.browser.lightning._browser2.search.IntentExtractor import acr.browser.lightning._browser2.search.SearchListener -import acr.browser.lightning._browser2.tab.DrawerTabRecyclerViewAdapter -import acr.browser.lightning._browser2.tab.DesktopTabRecyclerViewAdapter -import acr.browser.lightning._browser2.tab.TabViewHolder -import acr.browser.lightning._browser2.tab.TabViewState +import acr.browser.lightning._browser2.tab.* import acr.browser.lightning._browser2.ui.BookmarkConfiguration import acr.browser.lightning._browser2.ui.TabConfiguration import acr.browser.lightning._browser2.ui.UiConfiguration -import acr.browser.lightning._browser2.view.WebViewScrollCoordinator import acr.browser.lightning.browser.activity.StyleRemovingTextWatcher import acr.browser.lightning.browser.activity.ThemableBrowserActivity import acr.browser.lightning.database.SearchSuggestion @@ -62,6 +58,9 @@ class BrowserActivity : ThemableBrowserActivity() { @Inject internal lateinit var presenter: BrowserPresenter + @Inject + internal lateinit var tabPager: TabPager + @Inject internal lateinit var intentExtractor: IntentExtractor @@ -184,6 +183,8 @@ class BrowserActivity : ThemableBrowserActivity() { binding.actionReading.setOnClickListener { presenter.onReadingModeClick() } binding.bookmarkBackButton.setOnClickListener { presenter.onBookmarkMenuClick() } binding.searchSslStatus.setOnClickListener { presenter.onSslIconClick() } + + tabPager.longPressListener = presenter::onPageLongPress } override fun onNewIntent(intent: Intent?) { diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 73a59bc01..ce894a949 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -5,6 +5,7 @@ import acr.browser.lightning._browser2.di.InitialUrl import acr.browser.lightning._browser2.history.HistoryRecord import acr.browser.lightning._browser2.keys.KeyCombo import acr.browser.lightning._browser2.menu.MenuSelection +import targetUrl.LongPress import acr.browser.lightning._browser2.tab.TabModel import acr.browser.lightning._browser2.tab.TabViewState import acr.browser.lightning._browser2.ui.TabConfiguration @@ -677,6 +678,13 @@ class BrowserPresenter @Inject constructor( } } + /** + * TODO + */ + fun onPageLongPress(id: Int, longPress: LongPress) { + + } + private fun BrowserContract.View?.updateState(state: BrowserViewState) { viewState = state this?.renderState(viewState) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt index 6112692d2..de940ff64 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt @@ -1,21 +1,28 @@ package acr.browser.lightning._browser2.tab +import acr.browser.lightning._browser2.di.Browser2Scope +import acr.browser.lightning._browser2.view.WebViewLongPressHandler import acr.browser.lightning._browser2.view.WebViewScrollCoordinator import android.view.ViewGroup import android.webkit.WebView import android.widget.FrameLayout +import targetUrl.LongPress import javax.inject.Inject /** * Created by anthonycr on 9/12/20. */ +@Browser2Scope class TabPager @Inject constructor( private val container: FrameLayout, - private val webViewScrollCoordinator: WebViewScrollCoordinator + private val webViewScrollCoordinator: WebViewScrollCoordinator, + private val webViewLongPressHandler: WebViewLongPressHandler ) { private val webViews: MutableList = mutableListOf() + var longPressListener: ((id: Int, longPress: LongPress) -> Unit)? = null + fun selectTab(id: Int) { container.removeAllViews() val webView = webViews.forId(id) @@ -27,6 +34,9 @@ class TabPager @Inject constructor( // TODO: coordinator adds views to the container, which can result in UI flashes. webViewScrollCoordinator.configure(webView) + webViewLongPressHandler.configure(webView, onLongClick = { + longPressListener?.invoke(id, it) + }) } fun clearTab() { diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/WebViewFactory.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/WebViewFactory.kt index e61bb51d9..249e33384 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/WebViewFactory.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/WebViewFactory.kt @@ -1,6 +1,7 @@ package acr.browser.lightning._browser2.tab import acr.browser.lightning.Capabilities +import acr.browser.lightning._browser2.view.CompositeTouchListener import acr.browser.lightning.isSupported import acr.browser.lightning.log.Logger import acr.browser.lightning.preference.UserPreferences @@ -52,6 +53,7 @@ class WebViewFactory @Inject constructor( fun createWebView(isIncognito: Boolean): WebView = WebView(activity).apply { id = View.generateViewId() + tag = CompositeTouchListener().also(::setOnTouchListener) isFocusableInTouchMode = true isFocusable = true if (VERSION.SDK_INT < VERSION_CODES.M) { diff --git a/app/src/main/java/acr/browser/lightning/_browser2/view/CompositeTouchListener.kt b/app/src/main/java/acr/browser/lightning/_browser2/view/CompositeTouchListener.kt new file mode 100644 index 000000000..0651e5215 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/view/CompositeTouchListener.kt @@ -0,0 +1,20 @@ +package acr.browser.lightning._browser2.view + +import android.annotation.SuppressLint +import android.view.MotionEvent +import android.view.View + +/** + * Created by anthonycr on 12/23/20. + */ +class CompositeTouchListener( + val delegates: MutableMap = mutableMapOf() +) : View.OnTouchListener { + + @SuppressLint("ClickableViewAccessibility") + override fun onTouch(v: View, event: MotionEvent): Boolean { + delegates.values.forEach { it?.onTouch(v, event) } + return false + } + +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewCompositeTouchExtensions.kt b/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewCompositeTouchExtensions.kt new file mode 100644 index 000000000..9a6900138 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewCompositeTouchExtensions.kt @@ -0,0 +1,14 @@ +package acr.browser.lightning._browser2.view + +import android.view.View +import android.webkit.WebView + +/** + * Created by anthonycr on 12/23/20. + */ + + +fun WebView.setCompositeTouchListener(key: String, onTouchListener: View.OnTouchListener?) { + val composite = tag as CompositeTouchListener + composite.delegates[key] = onTouchListener +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewLongPressHandler.kt b/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewLongPressHandler.kt new file mode 100644 index 000000000..f1617ab65 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewLongPressHandler.kt @@ -0,0 +1,113 @@ +package acr.browser.lightning._browser2.view + +import targetUrl.LongPress +import android.annotation.SuppressLint +import android.app.Activity +import android.os.Handler +import android.os.Looper +import android.os.Message +import android.view.GestureDetector +import android.view.MotionEvent +import android.view.View +import android.webkit.WebView +import io.reactivex.functions.Cancellable +import javax.inject.Inject + +/** + * Created by anthonycr on 11/21/20. + */ +class WebViewLongPressHandler @Inject constructor(private val activity: Activity) { + + fun configure( + webView: WebView, + onLongClick: (LongPress) -> Unit + ): Cancellable { + webView.setCompositeTouchListener("long_press", GestureTriggeringTouchListener( + GestureDetector( + activity, + CustomGestureListener( + messageHandler = MessageHandler { + val hitTestResult = webView.hitTestResult + val longPress = LongPress( + targetUrl = it ?: hitTestResult.extra, + hitUrl = hitTestResult.extra, + hitCategory = hitTestResult.type.asLongPressCategory() + ) + onLongClick(longPress) + }, + webView = webView + ) + ) + )) + + return Cancellable { + webView.setCompositeTouchListener("long_press", null) + } + } + + private fun Int.asLongPressCategory(): LongPress.Category = when (this) { + WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE, + WebView.HitTestResult.IMAGE_TYPE -> LongPress.Category.IMAGE + WebView.HitTestResult.UNKNOWN_TYPE -> LongPress.Category.UNKNOWN + else -> LongPress.Category.LINK + } + + private class GestureTriggeringTouchListener( + private val gestureDetector: GestureDetector + ) : View.OnTouchListener { + @SuppressLint("ClickableViewAccessibility") + override fun onTouch(v: View, event: MotionEvent): Boolean { + gestureDetector.onTouchEvent(event) + return false + } + } + + private class MessageHandler( + private val onUrlLongPress: (String?) -> Unit + ) : Handler(Looper.getMainLooper()) { + override fun handleMessage(msg: Message) = onUrlLongPress(msg.data.getString(KEY_URL)) + + companion object { + private const val KEY_URL = "url" + } + } + + private class CustomGestureListener( + private val messageHandler: MessageHandler, + private val webView: WebView + ) : GestureDetector.SimpleOnGestureListener() { + + /** + * Without this, onLongPress is not called when user is zooming using two fingers, but is + * when using only one. + * + * The required behaviour is to avoid triggering this when the user is zooming, it shouldn't + * matter how many fingers the user is using. + */ + private var canTriggerLongPress = true + + override fun onLongPress(e: MotionEvent) { + if (canTriggerLongPress) { + val msg = messageHandler.obtainMessage() + msg.target = messageHandler + webView.requestFocusNodeHref(msg) + } + } + + /** + * Is called when the user is swiping after the doubl tap, which in our case means that they + * are zooming. + */ + override fun onDoubleTapEvent(e: MotionEvent): Boolean { + canTriggerLongPress = false + return false + } + + /** + * Is called when something is starting being pressed, always before onLongPress. + */ + override fun onShowPress(e: MotionEvent) { + canTriggerLongPress = true + } + } +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewScrollCoordinator.kt b/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewScrollCoordinator.kt index d2363b361..7494fd50a 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewScrollCoordinator.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewScrollCoordinator.kt @@ -52,9 +52,8 @@ class WebViewScrollCoordinator @Inject constructor( } } - @SuppressLint("ClickableViewAccessibility") private fun coordinate(toolbar: View, webView: WebView) { - webView.setOnTouchListener(touchListener) + webView.setCompositeTouchListener("scroll", touchListener) val toggleListener = object : ToggleListener { override fun hideToolbar() { diff --git a/app/src/main/java/targetUrl/LongPress.kt b/app/src/main/java/targetUrl/LongPress.kt new file mode 100644 index 000000000..7dfba2544 --- /dev/null +++ b/app/src/main/java/targetUrl/LongPress.kt @@ -0,0 +1,16 @@ +package targetUrl + +/** + * Created by anthonycr on 12/23/20. + */ +data class LongPress( + val targetUrl: String?, + val hitUrl: String?, + val hitCategory: Category = Category.UNKNOWN +) { + enum class Category { + IMAGE, + LINK, + UNKNOWN + } +} From 3c4e7e1b49eb75b0d804a15fc05f2c94000d09a2 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sun, 28 Mar 2021 22:00:16 -0400 Subject: [PATCH 054/161] Update gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 47008812f..bc772cd62 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.2' + classpath 'com.android.tools.build:gradle:4.1.3' classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" classpath 'com.github.ben-manes:gradle-versions-plugin:0.36.0' From 4bd31c10ea3aae19c213163f9b9b787d38f80d76 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sun, 28 Mar 2021 22:36:53 -0400 Subject: [PATCH 055/161] Handle long presses on the webview --- .../lightning/_browser2/BrowserActivity.kt | 51 ++++++++++++ .../lightning/_browser2/BrowserContract.kt | 5 ++ .../lightning/_browser2/BrowserPresenter.kt | 79 ++++++++++++------- .../_browser2/BrowserStateAdapter.kt | 9 +++ .../browser/lightning/browser/BrowserView.kt | 18 +++++ 5 files changed, 135 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index d0bdcc85e..a54460762 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -11,13 +11,16 @@ import acr.browser.lightning._browser2.tab.* import acr.browser.lightning._browser2.ui.BookmarkConfiguration import acr.browser.lightning._browser2.ui.TabConfiguration import acr.browser.lightning._browser2.ui.UiConfiguration +import acr.browser.lightning.browser.BrowserView import acr.browser.lightning.browser.activity.StyleRemovingTextWatcher import acr.browser.lightning.browser.activity.ThemableBrowserActivity +import acr.browser.lightning.constant.HTTP import acr.browser.lightning.database.SearchSuggestion import acr.browser.lightning.database.WebPage import acr.browser.lightning.databinding.BrowserActivityBinding import acr.browser.lightning.di.injector import acr.browser.lightning.dialog.BrowserDialog +import acr.browser.lightning.dialog.DialogItem import acr.browser.lightning.dialog.LightningDialogBuilder import acr.browser.lightning.search.SuggestionsAdapter import acr.browser.lightning.ssl.createSslDrawableForState @@ -32,6 +35,7 @@ import androidx.drawerlayout.widget.DrawerLayout import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView +import targetUrl.LongPress import javax.inject.Inject /** @@ -297,6 +301,53 @@ class BrowserActivity : ThemableBrowserActivity() { ) } + fun showLinkLongPressDialog(longPress: LongPress) { + BrowserDialog.show(this, longPress.targetUrl?.replace(HTTP, ""), + DialogItem(title = R.string.dialog_open_new_tab) { + presenter.onLinkLongPressEvent(longPress, BrowserView.LinkLongPressEvent.NEW_TAB) + }, + DialogItem(title = R.string.dialog_open_background_tab) { + presenter.onLinkLongPressEvent(longPress, BrowserView.LinkLongPressEvent.BACKGROUND_TAB) + }, + DialogItem( + title = R.string.dialog_open_incognito_tab, + isConditionMet = this is BrowserActivity // TODO: Change for incognito + ) { + presenter.onLinkLongPressEvent(longPress, BrowserView.LinkLongPressEvent.INCOGNITO_TAB) + }, + DialogItem(title = R.string.action_share) { + presenter.onLinkLongPressEvent(longPress, BrowserView.LinkLongPressEvent.SHARE) + }, + DialogItem(title = R.string.dialog_copy_link) { + presenter.onLinkLongPressEvent(longPress, BrowserView.LinkLongPressEvent.COPY_LINK) + }) + } + + fun showImageLongPressDialog(longPress: LongPress) { + BrowserDialog.show(this, longPress.targetUrl?.replace(HTTP, ""), + DialogItem(title = R.string.dialog_open_new_tab) { + presenter.onImageLongPressEvent(longPress, BrowserView.ImageLongPressEvent.NEW_TAB) + }, + DialogItem(title = R.string.dialog_open_background_tab) { + presenter.onImageLongPressEvent(longPress, BrowserView.ImageLongPressEvent.BACKGROUND_TAB) + }, + DialogItem( + title = R.string.dialog_open_incognito_tab, + isConditionMet = this is BrowserActivity // TODO: Change for incognito + ) { + presenter.onImageLongPressEvent(longPress, BrowserView.ImageLongPressEvent.INCOGNITO_TAB) + }, + DialogItem(title = R.string.action_share) { + presenter.onImageLongPressEvent(longPress, BrowserView.ImageLongPressEvent.SHARE) + }, + DialogItem(title = R.string.dialog_copy_link) { + presenter.onImageLongPressEvent(longPress, BrowserView.ImageLongPressEvent.COPY_LINK) + }, + DialogItem(title = R.string.dialog_download_image) { + presenter.onImageLongPressEvent(longPress, BrowserView.ImageLongPressEvent.DOWNLOAD) + }) + } + fun openBookmarkDrawer() { binding.drawerLayout.closeDrawer(binding.tabDrawer) binding.drawerLayout.openDrawer(binding.bookmarkDrawer) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt index 9de241f83..3d33a819d 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt @@ -8,6 +8,7 @@ import io.reactivex.Completable import io.reactivex.Maybe import io.reactivex.Observable import io.reactivex.Single +import targetUrl.LongPress /** * Created by anthonycr on 9/11/20. @@ -28,6 +29,10 @@ interface BrowserContract { fun showFindInPageDialog() + fun showLinkLongPressDialog(longPress: LongPress) + + fun showImageLongPressDialog(longPress: LongPress) + fun showSslDialog(sslCertificateInfo: SslCertificateInfo) fun openBookmarkDrawer() diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index ce894a949..922826341 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -10,6 +10,7 @@ import acr.browser.lightning._browser2.tab.TabModel import acr.browser.lightning._browser2.tab.TabViewState import acr.browser.lightning._browser2.ui.TabConfiguration import acr.browser.lightning._browser2.ui.UiConfiguration +import acr.browser.lightning.browser.BrowserView import acr.browser.lightning.browser.SearchBoxModel import acr.browser.lightning.database.* import acr.browser.lightning.database.bookmark.BookmarkRepository @@ -18,10 +19,7 @@ import acr.browser.lightning.di.MainScheduler import acr.browser.lightning.search.SearchEngineProvider import acr.browser.lightning.ssl.SslState import acr.browser.lightning.utils.* -import acr.browser.lightning.view.DownloadPageInitializer -import acr.browser.lightning.view.HistoryPageInitializer -import acr.browser.lightning.view.HomePageInitializer -import acr.browser.lightning.view.UrlInitializer +import acr.browser.lightning.view.* import io.reactivex.Maybe import io.reactivex.Observable import io.reactivex.Scheduler @@ -71,6 +69,7 @@ class BrowserPresenter @Inject constructor( private var currentTab: TabModel? = null private var currentFolder: Bookmark.Folder = Bookmark.Folder.Root private var isSearchViewFocused = false + private var pendingLongPressTabId: Int? = null private val compositeDisposable = CompositeDisposable() private val allTabsDisposable = CompositeDisposable() @@ -226,11 +225,7 @@ class BrowserPresenter @Inject constructor( * TODO */ fun onNewDeepLink(url: String) { - compositeDisposable += model.createTab(UrlInitializer(url)) - .observeOn(mainScheduler) - .subscribe { tab -> - selectTab(model.selectTab(tab.id)) - } + createNewTabAndSelect(UrlInitializer(url), shouldSelect = true) } /** @@ -243,18 +238,8 @@ class BrowserPresenter @Inject constructor( MenuSelection.SHARE -> currentTab?.url?.takeIf { !it.isSpecialUrl() }?.let { navigator.sharePage(url = it, title = currentTab?.title) } - MenuSelection.HISTORY -> - compositeDisposable += model.createTab(historyPageInitializer) - .observeOn(mainScheduler) - .subscribe { tab -> - selectTab(model.selectTab(tab.id)) - } - MenuSelection.DOWNLOADS -> - compositeDisposable += model.createTab(downloadPageInitializer) - .observeOn(mainScheduler) - .subscribe { tab -> - selectTab(model.selectTab(tab.id)) - } + MenuSelection.HISTORY -> createNewTabAndSelect(historyPageInitializer, shouldSelect = true) + MenuSelection.DOWNLOADS -> createNewTabAndSelect(downloadPageInitializer, shouldSelect = true) MenuSelection.FIND -> view?.showFindInPageDialog() MenuSelection.COPY_LINK -> currentTab?.url?.takeIf { !it.isSpecialUrl() } ?.let(navigator::copyPageLink) @@ -277,6 +262,16 @@ class BrowserPresenter @Inject constructor( } } + private fun createNewTabAndSelect(tabInitializer: TabInitializer, shouldSelect: Boolean) { + compositeDisposable += model.createTab(tabInitializer) + .observeOn(mainScheduler) + .subscribe { tab -> + if (shouldSelect) { + selectTab(model.selectTab(tab.id)) + } + } + } + /** * TODO */ @@ -381,11 +376,7 @@ class BrowserPresenter @Inject constructor( * TODO */ fun onNewTabClick() { - compositeDisposable += model.createTab(homePageInitializer) - .observeOn(mainScheduler) - .subscribe { tab -> - selectTab(model.selectTab(tab.id)) - } + createNewTabAndSelect(homePageInitializer, shouldSelect = true) } /** @@ -682,7 +673,41 @@ class BrowserPresenter @Inject constructor( * TODO */ fun onPageLongPress(id: Int, longPress: LongPress) { - + pendingLongPressTabId = id + when (longPress.hitCategory) { + LongPress.Category.IMAGE -> view?.showImageLongPressDialog(longPress) + LongPress.Category.LINK -> view?.showLinkLongPressDialog(longPress) + LongPress.Category.UNKNOWN -> Unit // Do nothing + } + } + + fun onLinkLongPressEvent(longPress: LongPress, linkLongPressEvent: BrowserView.LinkLongPressEvent) { + when (linkLongPressEvent) { + BrowserView.LinkLongPressEvent.NEW_TAB -> + longPress.targetUrl?.let { createNewTabAndSelect(UrlInitializer(it), shouldSelect = true) } + BrowserView.LinkLongPressEvent.BACKGROUND_TAB -> + longPress.targetUrl?.let { createNewTabAndSelect(UrlInitializer(it), shouldSelect = false) } + BrowserView.LinkLongPressEvent.INCOGNITO_TAB -> TODO() + BrowserView.LinkLongPressEvent.SHARE -> + longPress.targetUrl?.let { navigator.sharePage(url = it, title = null) } + BrowserView.LinkLongPressEvent.COPY_LINK -> + longPress.targetUrl?.let(navigator::copyPageLink) + } + } + + fun onImageLongPressEvent(longPress: LongPress, imageLongPressEvent: BrowserView.ImageLongPressEvent) { + when (imageLongPressEvent) { + BrowserView.ImageLongPressEvent.NEW_TAB -> + longPress.targetUrl?.let { createNewTabAndSelect(UrlInitializer(it), shouldSelect = true) } + BrowserView.ImageLongPressEvent.BACKGROUND_TAB -> + longPress.targetUrl?.let { createNewTabAndSelect(UrlInitializer(it), shouldSelect = false) } + BrowserView.ImageLongPressEvent.INCOGNITO_TAB -> TODO() + BrowserView.ImageLongPressEvent.SHARE -> + longPress.targetUrl?.let { navigator.sharePage(url = it, title = null) } + BrowserView.ImageLongPressEvent.COPY_LINK -> + longPress.targetUrl?.let(navigator::copyPageLink) + BrowserView.ImageLongPressEvent.DOWNLOAD -> TODO() + } } private fun BrowserContract.View?.updateState(state: BrowserViewState) { diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt index e65ac3766..1b215a4fd 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt @@ -2,6 +2,7 @@ package acr.browser.lightning._browser2 import acr.browser.lightning.ssl.SslCertificateInfo import acr.browser.lightning.ssl.showSslDialog +import targetUrl.LongPress /** * Created by anthonycr on 9/16/20. @@ -62,6 +63,14 @@ class BrowserStateAdapter(private val browserActivity: BrowserActivity) : Browse browserActivity.showFindInPageDialog() } + override fun showLinkLongPressDialog(longPress: LongPress) { + browserActivity.showLinkLongPressDialog(longPress) + } + + override fun showImageLongPressDialog(longPress: LongPress) { + browserActivity.showImageLongPressDialog(longPress) + } + override fun showSslDialog(sslCertificateInfo: SslCertificateInfo) { browserActivity.showSslDialog(sslCertificateInfo) } diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserView.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserView.kt index e95891c86..ced29db04 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserView.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserView.kt @@ -3,6 +3,7 @@ package acr.browser.lightning.browser import acr.browser.lightning.ssl.SslState import android.view.View import androidx.annotation.StringRes +import targetUrl.LongPress interface BrowserView { @@ -38,4 +39,21 @@ interface BrowserView { fun notifyTabViewInitialized() + enum class LinkLongPressEvent { + NEW_TAB, + BACKGROUND_TAB, + INCOGNITO_TAB, + SHARE, + COPY_LINK + } + + enum class ImageLongPressEvent { + NEW_TAB, + BACKGROUND_TAB, + INCOGNITO_TAB, + SHARE, + COPY_LINK, + DOWNLOAD + } + } From 321e1f102d07f1e4a83e72516dd2383cd832929f Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sun, 28 Mar 2021 22:45:21 -0400 Subject: [PATCH 056/161] Fix lint warnings --- .../acr/browser/lightning/_browser2/tab/TabsRepository.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt index f12d8d788..d4c891834 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt @@ -33,7 +33,7 @@ class TabsRepository @Inject constructor( } val tab = tabsList.forId(id) tab.destroy() - tabsList -= tab + tabsList = tabsList - tab }.doOnComplete { tabsListObservable.onNext(tabsList) } @@ -49,7 +49,7 @@ class TabsRepository @Inject constructor( TabWebChromeClient() ) - tabsList += tabAdapter + tabsList = tabsList + tabAdapter return@fromCallable tabAdapter }.doOnSuccess { @@ -75,7 +75,7 @@ class TabsRepository @Inject constructor( .observeOn(mainScheduler) .flatMapSingle(::createTab) .toList() - .filter { it.isNotEmpty() } + .filter(MutableList::isNotEmpty) override fun freeze() { bundleStore.save(tabsList) From dc5c7a4f7d7d839905c853ce621659259dfd2c2a Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sun, 28 Mar 2021 22:46:47 -0400 Subject: [PATCH 057/161] Add todo for special URL long clicks --- .../acr/browser/lightning/_browser2/BrowserPresenter.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 922826341..c56a0837e 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -69,7 +69,6 @@ class BrowserPresenter @Inject constructor( private var currentTab: TabModel? = null private var currentFolder: Bookmark.Folder = Bookmark.Folder.Root private var isSearchViewFocused = false - private var pendingLongPressTabId: Int? = null private val compositeDisposable = CompositeDisposable() private val allTabsDisposable = CompositeDisposable() @@ -673,7 +672,10 @@ class BrowserPresenter @Inject constructor( * TODO */ fun onPageLongPress(id: Int, longPress: LongPress) { - pendingLongPressTabId = id + if (model.tabsList.find { it.id == id }?.url?.isSpecialUrl() == true) { + // TODO handle differently + return + } when (longPress.hitCategory) { LongPress.Category.IMAGE -> view?.showImageLongPressDialog(longPress) LongPress.Category.LINK -> view?.showLinkLongPressDialog(longPress) From 11e265aeae0c841b8164b99a80286b19d572fc38 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sun, 11 Apr 2021 10:38:13 -0400 Subject: [PATCH 058/161] Fix bug where tab freezing wouldn't work due to freezing the state after it was destroyed --- .../acr/browser/lightning/_browser2/BrowserActivity.kt | 5 +++++ .../acr/browser/lightning/_browser2/BrowserPresenter.kt | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index a54460762..23e5564a4 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -202,6 +202,11 @@ class BrowserActivity : ThemableBrowserActivity() { presenter.onViewDetached() } + override fun onPause() { + super.onPause() + presenter.onViewHidden() + } + override fun onBackPressed() { presenter.onBackClick() } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index c56a0837e..47e329752 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -120,12 +120,17 @@ class BrowserPresenter @Inject constructor( fun onViewDetached() { view = null - model.freeze() - compositeDisposable.dispose() tabDisposable?.dispose() } + /** + * TODO + */ + fun onViewHidden() { + model.freeze() + } + private fun TabModel.asViewState(): TabViewState = TabViewState( id = id, icon = favicon, From 91b7097f78c86a51bde3d4bdc5ae85505f626837 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sun, 11 Apr 2021 10:54:32 -0400 Subject: [PATCH 059/161] Handle panic clean --- .../lightning/_browser2/BrowserActivity.kt | 2 +- .../lightning/_browser2/BrowserContract.kt | 4 +++ .../lightning/_browser2/BrowserPresenter.kt | 29 +++++++++++++++++-- .../_browser2/search/IntentExtractor.kt | 15 ++++++---- .../lightning/_browser2/tab/TabsRepository.kt | 13 +++++++++ .../_browser2/tab/bundle/BundleStore.kt | 8 +++++ .../browser/lightning/browser/BrowserView.kt | 6 ++++ 7 files changed, 68 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index 23e5564a4..3eaf93f71 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -192,7 +192,7 @@ class BrowserActivity : ThemableBrowserActivity() { } override fun onNewIntent(intent: Intent?) { - intent?.let(intentExtractor::extractUrlFromIntent)?.let(presenter::onNewDeepLink) + intent?.let(intentExtractor::extractUrlFromIntent)?.let(presenter::onNewAction) super.onNewIntent(intent) } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt index 3d33a819d..9c3ba186c 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt @@ -44,6 +44,8 @@ interface BrowserContract { fun deleteTab(id: Int): Completable + fun deleteAllTabs(): Completable + fun createTab(tabInitializer: TabInitializer): Single fun selectTab(id: Int): TabModel @@ -52,6 +54,8 @@ interface BrowserContract { fun freeze() + fun clean() + val tabsList: List fun tabsListChanges(): Observable> diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 47e329752..2228a759c 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -16,6 +16,7 @@ import acr.browser.lightning.database.* import acr.browser.lightning.database.bookmark.BookmarkRepository import acr.browser.lightning.di.DatabaseScheduler import acr.browser.lightning.di.MainScheduler +import acr.browser.lightning.html.history.HistoryPageFactory import acr.browser.lightning.search.SearchEngineProvider import acr.browser.lightning.ssl.SslState import acr.browser.lightning.utils.* @@ -30,6 +31,7 @@ import io.reactivex.rxkotlin.Observables import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.subscribeBy import javax.inject.Inject +import kotlin.system.exitProcess /** * Created by anthonycr on 9/11/20. @@ -48,7 +50,8 @@ class BrowserPresenter @Inject constructor( private val searchBoxModel: SearchBoxModel, private val searchEngineProvider: SearchEngineProvider, @InitialUrl private val initialUrl: String?, - private val uiConfiguration: UiConfiguration + private val uiConfiguration: UiConfiguration, + private val historyPageFactory: HistoryPageFactory ) { private var view: BrowserContract.View? = null @@ -228,8 +231,28 @@ class BrowserPresenter @Inject constructor( /** * TODO */ - fun onNewDeepLink(url: String) { - createNewTabAndSelect(UrlInitializer(url), shouldSelect = true) + fun onNewAction(action: BrowserView.Action) { + when (action) { + is BrowserView.Action.LoadUrl -> createNewTabAndSelect( + tabInitializer = UrlInitializer(action.url), + shouldSelect = true + ) + BrowserView.Action.Panic -> panicClean() + } + } + + private fun panicClean() { + createNewTabAndSelect(tabInitializer = NoOpInitializer(), shouldSelect = true) + model.clean() + + historyPageFactory.deleteHistoryPage().subscribe() + model.deleteAllTabs().subscribe() + navigator.closeBrowser() + + // System exit needed in the case of receiving + // the panic intent since finish() isn't completely + // closing the browser + exitProcess(1) } /** diff --git a/app/src/main/java/acr/browser/lightning/_browser2/search/IntentExtractor.kt b/app/src/main/java/acr/browser/lightning/_browser2/search/IntentExtractor.kt index e048d2bcb..9e6efa19b 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/search/IntentExtractor.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/search/IntentExtractor.kt @@ -1,5 +1,6 @@ package acr.browser.lightning._browser2.search +import acr.browser.lightning.browser.BrowserView import acr.browser.lightning.search.SearchEngineProvider import acr.browser.lightning.utils.QUERY_PLACE_HOLDER import acr.browser.lightning.utils.smartUrlFilter @@ -15,11 +16,12 @@ class IntentExtractor @Inject constructor(private val searchEngineProvider: Sear /** * TODO */ - fun extractUrlFromIntent(intent: Intent): String? { - return if (intent.action == Intent.ACTION_WEB_SEARCH) { - extractSearchFromIntent(intent) - } else { - intent.dataString + fun extractUrlFromIntent(intent: Intent): BrowserView.Action? { + return when (intent.action) { + INTENT_PANIC_TRIGGER -> BrowserView.Action.Panic + Intent.ACTION_WEB_SEARCH -> + extractSearchFromIntent(intent)?.let(BrowserView.Action::LoadUrl) + else -> intent.dataString?.let(BrowserView.Action::LoadUrl) } } @@ -34,4 +36,7 @@ class IntentExtractor @Inject constructor(private val searchEngineProvider: Sear } } + companion object { + private const val INTENT_PANIC_TRIGGER = "info.guardianproject.panic.action.TRIGGER" + } } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt index d4c891834..5a02e4f6a 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt @@ -38,6 +38,15 @@ class TabsRepository @Inject constructor( tabsListObservable.onNext(tabsList) } + override fun deleteAllTabs(): Completable = Completable.fromAction { + tabPager.clearTab() + + tabsList.forEach(TabModel::destroy) + tabsList = emptyList() + }.doOnComplete { + tabsListObservable.onNext(tabsList) + } + override fun createTab(tabInitializer: TabInitializer): Single = Single.fromCallable { val webView = webViewFactory.createWebView(isIncognito = false) tabPager.addTab(webView) @@ -81,5 +90,9 @@ class TabsRepository @Inject constructor( bundleStore.save(tabsList) } + override fun clean() { + bundleStore.deleteAll() + } + private fun List.forId(id: Int): TabModel = requireNotNull(find { it.id == id }) } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/BundleStore.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/BundleStore.kt index a00d2919a..f51d5526d 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/BundleStore.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/BundleStore.kt @@ -2,6 +2,7 @@ package acr.browser.lightning._browser2.tab.bundle import acr.browser.lightning.R import acr.browser.lightning._browser2.tab.TabModel +import acr.browser.lightning.browser.TabsManager import acr.browser.lightning.di.DiskScheduler import acr.browser.lightning.utils.* import acr.browser.lightning.view.* @@ -72,6 +73,13 @@ class BundleStore @Inject constructor( ?: application.getString(R.string.tab_frozen)) } ?: emptyList() + /** + * Synchronously delete all stored tabs. + */ + fun deleteAll() { + FileUtils.deleteBundleInStorage(application, BUNDLE_STORAGE) + } + private fun String.extractNumberFromEnd(): String { val underScore = lastIndexOf('_') return if (underScore in 0 until length) { diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserView.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserView.kt index ced29db04..00d8e50d5 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserView.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserView.kt @@ -56,4 +56,10 @@ interface BrowserView { DOWNLOAD } + sealed class Action { + data class LoadUrl(val url: String) : Action() + + object Panic : Action() + } + } From 67c62d4b92c0f91154cf9e2ab0d03263e3b1b082 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sun, 11 Apr 2021 11:27:18 -0400 Subject: [PATCH 060/161] Open another app when navigating to URLs that can be handled outside the app --- .../lightning/_browser2/di/Browser2Module.kt | 10 +- .../_browser2/tab/TabWebViewClient.kt | 16 +- .../lightning/_browser2/tab/TabsRepository.kt | 8 +- .../lightning/_browser2/tab/UrlHandler.kt | 137 ++++++++++++++++++ 4 files changed, 166 insertions(+), 5 deletions(-) create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/tab/UrlHandler.kt diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt index df15cfbec..eb5fde5d5 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt @@ -7,7 +7,10 @@ import acr.browser.lightning._browser2.ui.UiConfiguration import acr.browser.lightning.adblock.AdBlocker import acr.browser.lightning.adblock.BloomFilterAdBlocker import acr.browser.lightning.adblock.NoOpAdBlocker +import acr.browser.lightning.browser.BrowserView import acr.browser.lightning.preference.UserPreferences +import acr.browser.lightning.utils.IntentUtils +import android.app.Activity import android.content.Intent import dagger.Module import dagger.Provides @@ -30,12 +33,17 @@ class Browser2Module { noOpAdBlocker } + // TODO: dont force cast @Provides @InitialUrl fun providesInitialUrl( @InitialIntent initialIntent: Intent, intentExtractor: IntentExtractor - ): String? = intentExtractor.extractUrlFromIntent(initialIntent) + ): String? = (intentExtractor.extractUrlFromIntent(initialIntent) as? BrowserView.Action.LoadUrl)?.url + + // TODO: auto inject intent utils + @Provides + fun providesIntentUtils(activity: Activity): IntentUtils = IntentUtils(activity) @Provides fun providesUiConfiguration( diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebViewClient.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebViewClient.kt index 1cc52e7ce..9c175bad7 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebViewClient.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebViewClient.kt @@ -8,6 +8,7 @@ import android.graphics.Bitmap import android.net.http.SslError import android.os.Build import android.webkit.* +import androidx.annotation.RequiresApi import io.reactivex.subjects.PublishSubject import java.io.ByteArrayInputStream @@ -16,7 +17,9 @@ import java.io.ByteArrayInputStream */ class TabWebViewClient( private val adBlocker: AdBlocker, - private val allowListModel: AllowListModel + private val allowListModel: AllowListModel, + private val urlHandler: UrlHandler, + private val headers: Map ) : WebViewClient() { val urlObservable: PublishSubject = PublishSubject.create() @@ -58,6 +61,17 @@ class TabWebViewClient( sslStateObservable.onNext(sslState) } + override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean { + return urlHandler.shouldOverrideLoading(view, url, headers) || + super.shouldOverrideUrlLoading(view, url) + } + + @RequiresApi(Build.VERSION_CODES.LOLLIPOP) + override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean { + return urlHandler.shouldOverrideLoading(view, request.url.toString(), headers) || + super.shouldOverrideUrlLoading(view, request) + } + @TargetApi(Build.VERSION_CODES.LOLLIPOP) override fun shouldInterceptRequest(view: WebView, request: WebResourceRequest): WebResourceResponse? { if (shouldBlockRequest(currentUrl, request.url.toString())) { diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt index 5a02e4f6a..dbf52c6dd 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt @@ -21,7 +21,8 @@ class TabsRepository @Inject constructor( private val allowListModel: AllowListModel, @DiskScheduler private val diskScheduler: Scheduler, @MainScheduler private val mainScheduler: Scheduler, - private val bundleStore: BundleStore + private val bundleStore: BundleStore, + private val urlHandler: UrlHandler ) : BrowserContract.Model { private var selectedTab: TabModel? = null @@ -49,12 +50,13 @@ class TabsRepository @Inject constructor( override fun createTab(tabInitializer: TabInitializer): Single = Single.fromCallable { val webView = webViewFactory.createWebView(isIncognito = false) + val headers = webViewFactory.createRequestHeaders() tabPager.addTab(webView) val tabAdapter = TabAdapter( tabInitializer, webView, - webViewFactory.createRequestHeaders(), - TabWebViewClient(adBlocker, allowListModel), + headers, + TabWebViewClient(adBlocker, allowListModel, urlHandler, headers), TabWebChromeClient() ) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/UrlHandler.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/UrlHandler.kt new file mode 100644 index 000000000..e52960f67 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/UrlHandler.kt @@ -0,0 +1,137 @@ +package acr.browser.lightning._browser2.tab + +import acr.browser.lightning.BuildConfig +import acr.browser.lightning.R +import acr.browser.lightning.constant.FILE +import acr.browser.lightning.extensions.snackbar +import acr.browser.lightning.log.Logger +import acr.browser.lightning.utils.IntentUtils +import acr.browser.lightning.utils.Utils +import acr.browser.lightning.utils.isSpecialUrl +import acr.browser.lightning.view.LightningWebClient +import android.app.Activity +import android.content.ActivityNotFoundException +import android.content.Intent +import android.net.MailTo +import android.webkit.MimeTypeMap +import android.webkit.URLUtil +import android.webkit.WebView +import androidx.core.content.FileProvider +import java.io.File +import java.net.URISyntaxException +import javax.inject.Inject + +/** + * Created by anthonycr on 9/24/20. + */ +class UrlHandler @Inject constructor( + private val activity: Activity, + private val logger: Logger, + private val intentUtils: IntentUtils +) { + + fun shouldOverrideLoading( + view: WebView, + url: String, + headers: Map + ): Boolean { + // TODO: handle proxy +// // Check if configured proxy is available +// if (!proxyUtils.isProxyReady(activity)) { +// // User has been notified +// return true +// } + + // TODO: handle incognito +// if (lightningView.isIncognito) { +// // If we are in incognito, immediately load, we don't want the url to leave the app +// return continueLoadingUrl(view, url, headers) +// } + if (URLUtil.isAboutUrl(url)) { + // If this is an about page, immediately load, we don't need to leave the app + return continueLoadingUrl(view, url, headers) + } + + return if (isMailOrIntent(url, view) || intentUtils.startActivityForUrl(view, url)) { + // If it was a mailto: link, or an intent, or could be launched elsewhere, do that + true + } else { + // If none of the special conditions was met, continue with loading the url + continueLoadingUrl(view, url, headers) + } + } + + private fun continueLoadingUrl(webView: WebView, url: String, headers: Map): Boolean { + if (!URLUtil.isNetworkUrl(url) + && !URLUtil.isFileUrl(url) + && !URLUtil.isAboutUrl(url) + && !URLUtil.isDataUrl(url) + && !URLUtil.isJavaScriptUrl(url)) { + webView.stopLoading() + return true + } + return when { + headers.isEmpty() -> false + else -> { + webView.loadUrl(url, headers) + true + } + } + } + + private fun isMailOrIntent(url: String, view: WebView): Boolean { + if (url.startsWith("mailto:")) { + val mailTo = MailTo.parse(url) + val i = Utils.newEmailIntent(mailTo.to, mailTo.subject, mailTo.body, mailTo.cc) + activity.startActivity(i) + view.reload() + return true + } else if (url.startsWith("intent://")) { + val intent = try { + Intent.parseUri(url, Intent.URI_INTENT_SCHEME) + } catch (ignored: URISyntaxException) { + null + } + + if (intent != null) { + intent.addCategory(Intent.CATEGORY_BROWSABLE) + intent.component = null + intent.selector = null + try { + activity.startActivity(intent) + } catch (e: ActivityNotFoundException) { + logger.log(TAG, "ActivityNotFoundException") + } + + return true + } + } else if (URLUtil.isFileUrl(url) && !url.isSpecialUrl()) { + val file = File(url.replace(FILE, "")) + + if (file.exists()) { + val newMimeType = MimeTypeMap.getSingleton() + .getMimeTypeFromExtension(Utils.guessFileExtension(file.toString())) + + val intent = Intent(Intent.ACTION_VIEW) + intent.flags = Intent.FLAG_GRANT_READ_URI_PERMISSION + val contentUri = FileProvider.getUriForFile(activity, BuildConfig.APPLICATION_ID + ".fileprovider", file) + intent.setDataAndType(contentUri, newMimeType) + + try { + activity.startActivity(intent) + } catch (e: Exception) { + println("LightningWebClient: cannot open downloaded file") + } + + } else { + activity.snackbar(R.string.message_open_download_fail) + } + return true + } + return false + } + + companion object { + private const val TAG = "UrlHandler" + } +} From adc12308f44bcadde60906c403f94c67dcebcfda Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sun, 18 Apr 2021 19:20:32 -0400 Subject: [PATCH 061/161] Handling tab long press and tab closing dialog --- .../lightning/_browser2/BrowserActivity.kt | 14 +++++++++++ .../lightning/_browser2/BrowserContract.kt | 2 ++ .../lightning/_browser2/BrowserPresenter.kt | 24 +++++++++++++++++-- .../_browser2/BrowserStateAdapter.kt | 4 ++++ .../browser/lightning/browser/BrowserView.kt | 6 +++++ 5 files changed, 48 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index 3eaf93f71..5e08a6580 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -26,6 +26,7 @@ import acr.browser.lightning.search.SuggestionsAdapter import acr.browser.lightning.ssl.createSslDrawableForState import android.content.Intent import android.os.Bundle +import android.os.Handler import android.view.* import android.view.inputmethod.InputMethodManager import android.widget.AdapterView @@ -353,6 +354,19 @@ class BrowserActivity : ThemableBrowserActivity() { }) } + fun showCloseBrowserDialog(id: Int) { + BrowserDialog.show(this, R.string.dialog_title_close_browser, + DialogItem(title = R.string.close_tab) { + presenter.onCloseBrowserEvent(id, BrowserView.CloseTabEvent.CLOSE_CURRENT) + }, + DialogItem(title = R.string.close_other_tabs) { + presenter.onCloseBrowserEvent(id, BrowserView.CloseTabEvent.CLOSE_OTHERS) + }, + DialogItem(title = R.string.close_all_tabs, onClick = { + presenter.onCloseBrowserEvent(id, BrowserView.CloseTabEvent.CLOSE_ALL) + })) + } + fun openBookmarkDrawer() { binding.drawerLayout.closeDrawer(binding.tabDrawer) binding.drawerLayout.openDrawer(binding.bookmarkDrawer) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt index 9c3ba186c..ffb18019e 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt @@ -35,6 +35,8 @@ interface BrowserContract { fun showSslDialog(sslCertificateInfo: SslCertificateInfo) + fun showCloseBrowserDialog(id: Int) + fun openBookmarkDrawer() fun openTabDrawer() diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 2228a759c..352b8e113 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -30,6 +30,7 @@ import io.reactivex.disposables.Disposable import io.reactivex.rxkotlin.Observables import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.subscribeBy +import io.reactivex.rxkotlin.toObservable import javax.inject.Inject import kotlin.system.exitProcess @@ -336,7 +337,7 @@ class BrowserPresenter @Inject constructor( * TODO */ fun onTabLongClick(index: Int) { - // TODO + view?.showCloseBrowserDialog(viewState.tabs[index].id) } private fun List.nextSelected(removedIndex: Int): T? { @@ -677,7 +678,9 @@ class BrowserPresenter @Inject constructor( * TODO */ fun onTabMenuClick() { - + currentTab?.let { + view?.showCloseBrowserDialog(it.id) + } } /** @@ -711,6 +714,23 @@ class BrowserPresenter @Inject constructor( } } + fun onCloseBrowserEvent(id: Int, closeTabEvent: BrowserView.CloseTabEvent) { + when (closeTabEvent) { + BrowserView.CloseTabEvent.CLOSE_CURRENT -> + onTabClose(viewState.tabs.indexOfFirst { it.id == id }) + BrowserView.CloseTabEvent.CLOSE_OTHERS -> model.tabsList + .filter { it.id != id } + .toObservable() + .flatMapCompletable { model.deleteTab(it.id) } + .subscribeOn(mainScheduler) + .subscribe() + BrowserView.CloseTabEvent.CLOSE_ALL -> { + model.deleteAllTabs().subscribeOn(mainScheduler) + .subscribeBy(onComplete = navigator::closeBrowser) + } + } + } + fun onLinkLongPressEvent(longPress: LongPress, linkLongPressEvent: BrowserView.LinkLongPressEvent) { when (linkLongPressEvent) { BrowserView.LinkLongPressEvent.NEW_TAB -> diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt index 1b215a4fd..edf2f20d4 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt @@ -75,6 +75,10 @@ class BrowserStateAdapter(private val browserActivity: BrowserActivity) : Browse browserActivity.showSslDialog(sslCertificateInfo) } + override fun showCloseBrowserDialog(id: Int) { + browserActivity.showCloseBrowserDialog(id) + } + override fun openBookmarkDrawer() { browserActivity.openBookmarkDrawer() } diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserView.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserView.kt index 00d8e50d5..31e6e531a 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserView.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserView.kt @@ -39,6 +39,12 @@ interface BrowserView { fun notifyTabViewInitialized() + enum class CloseTabEvent { + CLOSE_CURRENT, + CLOSE_OTHERS, + CLOSE_ALL + } + enum class LinkLongPressEvent { NEW_TAB, BACKGROUND_TAB, From f7dfa1c06562926109ffbc436014208fbc7d1821 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sun, 18 Apr 2021 21:47:45 -0400 Subject: [PATCH 062/161] Moving enums to correct contract location --- .../lightning/_browser2/BrowserActivity.kt | 28 ++++++------- .../lightning/_browser2/BrowserContract.kt | 27 +++++++++++++ .../lightning/_browser2/BrowserPresenter.kt | 40 +++++++++---------- .../lightning/_browser2/di/Browser2Module.kt | 3 +- .../_browser2/search/IntentExtractor.kt | 10 ++--- .../browser/lightning/browser/BrowserView.kt | 29 -------------- 6 files changed, 68 insertions(+), 69 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index 5e08a6580..9afd27b88 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -310,60 +310,60 @@ class BrowserActivity : ThemableBrowserActivity() { fun showLinkLongPressDialog(longPress: LongPress) { BrowserDialog.show(this, longPress.targetUrl?.replace(HTTP, ""), DialogItem(title = R.string.dialog_open_new_tab) { - presenter.onLinkLongPressEvent(longPress, BrowserView.LinkLongPressEvent.NEW_TAB) + presenter.onLinkLongPressEvent(longPress, BrowserContract.LinkLongPressEvent.NEW_TAB) }, DialogItem(title = R.string.dialog_open_background_tab) { - presenter.onLinkLongPressEvent(longPress, BrowserView.LinkLongPressEvent.BACKGROUND_TAB) + presenter.onLinkLongPressEvent(longPress, BrowserContract.LinkLongPressEvent.BACKGROUND_TAB) }, DialogItem( title = R.string.dialog_open_incognito_tab, isConditionMet = this is BrowserActivity // TODO: Change for incognito ) { - presenter.onLinkLongPressEvent(longPress, BrowserView.LinkLongPressEvent.INCOGNITO_TAB) + presenter.onLinkLongPressEvent(longPress, BrowserContract.LinkLongPressEvent.INCOGNITO_TAB) }, DialogItem(title = R.string.action_share) { - presenter.onLinkLongPressEvent(longPress, BrowserView.LinkLongPressEvent.SHARE) + presenter.onLinkLongPressEvent(longPress, BrowserContract.LinkLongPressEvent.SHARE) }, DialogItem(title = R.string.dialog_copy_link) { - presenter.onLinkLongPressEvent(longPress, BrowserView.LinkLongPressEvent.COPY_LINK) + presenter.onLinkLongPressEvent(longPress, BrowserContract.LinkLongPressEvent.COPY_LINK) }) } fun showImageLongPressDialog(longPress: LongPress) { BrowserDialog.show(this, longPress.targetUrl?.replace(HTTP, ""), DialogItem(title = R.string.dialog_open_new_tab) { - presenter.onImageLongPressEvent(longPress, BrowserView.ImageLongPressEvent.NEW_TAB) + presenter.onImageLongPressEvent(longPress, BrowserContract.ImageLongPressEvent.NEW_TAB) }, DialogItem(title = R.string.dialog_open_background_tab) { - presenter.onImageLongPressEvent(longPress, BrowserView.ImageLongPressEvent.BACKGROUND_TAB) + presenter.onImageLongPressEvent(longPress, BrowserContract.ImageLongPressEvent.BACKGROUND_TAB) }, DialogItem( title = R.string.dialog_open_incognito_tab, isConditionMet = this is BrowserActivity // TODO: Change for incognito ) { - presenter.onImageLongPressEvent(longPress, BrowserView.ImageLongPressEvent.INCOGNITO_TAB) + presenter.onImageLongPressEvent(longPress, BrowserContract.ImageLongPressEvent.INCOGNITO_TAB) }, DialogItem(title = R.string.action_share) { - presenter.onImageLongPressEvent(longPress, BrowserView.ImageLongPressEvent.SHARE) + presenter.onImageLongPressEvent(longPress, BrowserContract.ImageLongPressEvent.SHARE) }, DialogItem(title = R.string.dialog_copy_link) { - presenter.onImageLongPressEvent(longPress, BrowserView.ImageLongPressEvent.COPY_LINK) + presenter.onImageLongPressEvent(longPress, BrowserContract.ImageLongPressEvent.COPY_LINK) }, DialogItem(title = R.string.dialog_download_image) { - presenter.onImageLongPressEvent(longPress, BrowserView.ImageLongPressEvent.DOWNLOAD) + presenter.onImageLongPressEvent(longPress, BrowserContract.ImageLongPressEvent.DOWNLOAD) }) } fun showCloseBrowserDialog(id: Int) { BrowserDialog.show(this, R.string.dialog_title_close_browser, DialogItem(title = R.string.close_tab) { - presenter.onCloseBrowserEvent(id, BrowserView.CloseTabEvent.CLOSE_CURRENT) + presenter.onCloseBrowserEvent(id, BrowserContract.CloseTabEvent.CLOSE_CURRENT) }, DialogItem(title = R.string.close_other_tabs) { - presenter.onCloseBrowserEvent(id, BrowserView.CloseTabEvent.CLOSE_OTHERS) + presenter.onCloseBrowserEvent(id, BrowserContract.CloseTabEvent.CLOSE_OTHERS) }, DialogItem(title = R.string.close_all_tabs, onClick = { - presenter.onCloseBrowserEvent(id, BrowserView.CloseTabEvent.CLOSE_ALL) + presenter.onCloseBrowserEvent(id, BrowserContract.CloseTabEvent.CLOSE_ALL) })) } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt index ffb18019e..101d5ff4e 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt @@ -81,6 +81,33 @@ interface BrowserContract { fun backgroundBrowser() } + enum class CloseTabEvent { + CLOSE_CURRENT, + CLOSE_OTHERS, + CLOSE_ALL + } + + enum class LinkLongPressEvent { + NEW_TAB, + BACKGROUND_TAB, + INCOGNITO_TAB, + SHARE, + COPY_LINK + } + enum class ImageLongPressEvent { + NEW_TAB, + BACKGROUND_TAB, + INCOGNITO_TAB, + SHARE, + COPY_LINK, + DOWNLOAD + } + + sealed class Action { + data class LoadUrl(val url: String) : Action() + + object Panic : Action() + } } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 352b8e113..0d3dbb305 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -232,13 +232,13 @@ class BrowserPresenter @Inject constructor( /** * TODO */ - fun onNewAction(action: BrowserView.Action) { + fun onNewAction(action: BrowserContract.Action) { when (action) { - is BrowserView.Action.LoadUrl -> createNewTabAndSelect( + is BrowserContract.Action.LoadUrl -> createNewTabAndSelect( tabInitializer = UrlInitializer(action.url), shouldSelect = true ) - BrowserView.Action.Panic -> panicClean() + BrowserContract.Action.Panic -> panicClean() } } @@ -714,49 +714,49 @@ class BrowserPresenter @Inject constructor( } } - fun onCloseBrowserEvent(id: Int, closeTabEvent: BrowserView.CloseTabEvent) { + fun onCloseBrowserEvent(id: Int, closeTabEvent: BrowserContract.CloseTabEvent) { when (closeTabEvent) { - BrowserView.CloseTabEvent.CLOSE_CURRENT -> + BrowserContract.CloseTabEvent.CLOSE_CURRENT -> onTabClose(viewState.tabs.indexOfFirst { it.id == id }) - BrowserView.CloseTabEvent.CLOSE_OTHERS -> model.tabsList + BrowserContract.CloseTabEvent.CLOSE_OTHERS -> model.tabsList .filter { it.id != id } .toObservable() .flatMapCompletable { model.deleteTab(it.id) } .subscribeOn(mainScheduler) .subscribe() - BrowserView.CloseTabEvent.CLOSE_ALL -> { + BrowserContract.CloseTabEvent.CLOSE_ALL -> { model.deleteAllTabs().subscribeOn(mainScheduler) .subscribeBy(onComplete = navigator::closeBrowser) } } } - fun onLinkLongPressEvent(longPress: LongPress, linkLongPressEvent: BrowserView.LinkLongPressEvent) { + fun onLinkLongPressEvent(longPress: LongPress, linkLongPressEvent: BrowserContract.LinkLongPressEvent) { when (linkLongPressEvent) { - BrowserView.LinkLongPressEvent.NEW_TAB -> + BrowserContract.LinkLongPressEvent.NEW_TAB -> longPress.targetUrl?.let { createNewTabAndSelect(UrlInitializer(it), shouldSelect = true) } - BrowserView.LinkLongPressEvent.BACKGROUND_TAB -> + BrowserContract.LinkLongPressEvent.BACKGROUND_TAB -> longPress.targetUrl?.let { createNewTabAndSelect(UrlInitializer(it), shouldSelect = false) } - BrowserView.LinkLongPressEvent.INCOGNITO_TAB -> TODO() - BrowserView.LinkLongPressEvent.SHARE -> + BrowserContract.LinkLongPressEvent.INCOGNITO_TAB -> TODO() + BrowserContract.LinkLongPressEvent.SHARE -> longPress.targetUrl?.let { navigator.sharePage(url = it, title = null) } - BrowserView.LinkLongPressEvent.COPY_LINK -> + BrowserContract.LinkLongPressEvent.COPY_LINK -> longPress.targetUrl?.let(navigator::copyPageLink) } } - fun onImageLongPressEvent(longPress: LongPress, imageLongPressEvent: BrowserView.ImageLongPressEvent) { + fun onImageLongPressEvent(longPress: LongPress, imageLongPressEvent: BrowserContract.ImageLongPressEvent) { when (imageLongPressEvent) { - BrowserView.ImageLongPressEvent.NEW_TAB -> + BrowserContract.ImageLongPressEvent.NEW_TAB -> longPress.targetUrl?.let { createNewTabAndSelect(UrlInitializer(it), shouldSelect = true) } - BrowserView.ImageLongPressEvent.BACKGROUND_TAB -> + BrowserContract.ImageLongPressEvent.BACKGROUND_TAB -> longPress.targetUrl?.let { createNewTabAndSelect(UrlInitializer(it), shouldSelect = false) } - BrowserView.ImageLongPressEvent.INCOGNITO_TAB -> TODO() - BrowserView.ImageLongPressEvent.SHARE -> + BrowserContract.ImageLongPressEvent.INCOGNITO_TAB -> TODO() + BrowserContract.ImageLongPressEvent.SHARE -> longPress.targetUrl?.let { navigator.sharePage(url = it, title = null) } - BrowserView.ImageLongPressEvent.COPY_LINK -> + BrowserContract.ImageLongPressEvent.COPY_LINK -> longPress.targetUrl?.let(navigator::copyPageLink) - BrowserView.ImageLongPressEvent.DOWNLOAD -> TODO() + BrowserContract.ImageLongPressEvent.DOWNLOAD -> TODO() } } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt index eb5fde5d5..d86a19011 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt @@ -1,5 +1,6 @@ package acr.browser.lightning._browser2.di +import acr.browser.lightning._browser2.BrowserContract import acr.browser.lightning._browser2.search.IntentExtractor import acr.browser.lightning._browser2.ui.BookmarkConfiguration import acr.browser.lightning._browser2.ui.TabConfiguration @@ -39,7 +40,7 @@ class Browser2Module { fun providesInitialUrl( @InitialIntent initialIntent: Intent, intentExtractor: IntentExtractor - ): String? = (intentExtractor.extractUrlFromIntent(initialIntent) as? BrowserView.Action.LoadUrl)?.url + ): String? = (intentExtractor.extractUrlFromIntent(initialIntent) as? BrowserContract.Action.LoadUrl)?.url // TODO: auto inject intent utils @Provides diff --git a/app/src/main/java/acr/browser/lightning/_browser2/search/IntentExtractor.kt b/app/src/main/java/acr/browser/lightning/_browser2/search/IntentExtractor.kt index 9e6efa19b..294205e78 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/search/IntentExtractor.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/search/IntentExtractor.kt @@ -1,6 +1,6 @@ package acr.browser.lightning._browser2.search -import acr.browser.lightning.browser.BrowserView +import acr.browser.lightning._browser2.BrowserContract import acr.browser.lightning.search.SearchEngineProvider import acr.browser.lightning.utils.QUERY_PLACE_HOLDER import acr.browser.lightning.utils.smartUrlFilter @@ -16,12 +16,12 @@ class IntentExtractor @Inject constructor(private val searchEngineProvider: Sear /** * TODO */ - fun extractUrlFromIntent(intent: Intent): BrowserView.Action? { + fun extractUrlFromIntent(intent: Intent): BrowserContract.Action? { return when (intent.action) { - INTENT_PANIC_TRIGGER -> BrowserView.Action.Panic + INTENT_PANIC_TRIGGER -> BrowserContract.Action.Panic Intent.ACTION_WEB_SEARCH -> - extractSearchFromIntent(intent)?.let(BrowserView.Action::LoadUrl) - else -> intent.dataString?.let(BrowserView.Action::LoadUrl) + extractSearchFromIntent(intent)?.let(BrowserContract.Action::LoadUrl) + else -> intent.dataString?.let(BrowserContract.Action::LoadUrl) } } diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserView.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserView.kt index 31e6e531a..3b9f76a30 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserView.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserView.kt @@ -39,33 +39,4 @@ interface BrowserView { fun notifyTabViewInitialized() - enum class CloseTabEvent { - CLOSE_CURRENT, - CLOSE_OTHERS, - CLOSE_ALL - } - - enum class LinkLongPressEvent { - NEW_TAB, - BACKGROUND_TAB, - INCOGNITO_TAB, - SHARE, - COPY_LINK - } - - enum class ImageLongPressEvent { - NEW_TAB, - BACKGROUND_TAB, - INCOGNITO_TAB, - SHARE, - COPY_LINK, - DOWNLOAD - } - - sealed class Action { - data class LoadUrl(val url: String) : Action() - - object Panic : Action() - } - } From 2aa4137a2eb173587cdfbf747c41961a1befbbf3 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sun, 18 Apr 2021 22:19:03 -0400 Subject: [PATCH 063/161] Add option support to folders --- .../lightning/_browser2/BrowserActivity.kt | 21 ++++++- .../lightning/_browser2/BrowserContract.kt | 20 ++++++ .../lightning/_browser2/BrowserPresenter.kt | 62 +++++++++++++++---- .../_browser2/BrowserStateAdapter.kt | 9 +++ .../dialog/LightningDialogBuilder.kt | 41 ++++++++++++ 5 files changed, 140 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index 9afd27b88..1e208ea1f 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -11,10 +11,10 @@ import acr.browser.lightning._browser2.tab.* import acr.browser.lightning._browser2.ui.BookmarkConfiguration import acr.browser.lightning._browser2.ui.TabConfiguration import acr.browser.lightning._browser2.ui.UiConfiguration -import acr.browser.lightning.browser.BrowserView import acr.browser.lightning.browser.activity.StyleRemovingTextWatcher import acr.browser.lightning.browser.activity.ThemableBrowserActivity import acr.browser.lightning.constant.HTTP +import acr.browser.lightning.database.Bookmark import acr.browser.lightning.database.SearchSuggestion import acr.browser.lightning.database.WebPage import acr.browser.lightning.databinding.BrowserActivityBinding @@ -26,7 +26,6 @@ import acr.browser.lightning.search.SuggestionsAdapter import acr.browser.lightning.ssl.createSslDrawableForState import android.content.Intent import android.os.Bundle -import android.os.Handler import android.view.* import android.view.inputmethod.InputMethodManager import android.widget.AdapterView @@ -278,6 +277,15 @@ class BrowserActivity : ThemableBrowserActivity() { ) } + fun showBookmarkOptionsDialog(bookmark: Bookmark.Entry) { + lightningDialogBuilder.showLongPressedDialogForBookmarkUrl( + activity = this, + onClick = { + presenter.onBookmarkOptionClick(bookmark, it) + } + ) + } + fun showEditBookmarkDialog(title: String, url: String, folder: String, folders: List) { lightningDialogBuilder.showEditBookmarkDialog( activity = this, @@ -289,6 +297,15 @@ class BrowserActivity : ThemableBrowserActivity() { ) } + fun showFolderOptionsDialog(folder: Bookmark.Folder) { + lightningDialogBuilder.showBookmarkFolderLongPressedDialog( + activity = this, + onClick = { + presenter.onFolderOptionClick(folder, it) + } + ) + } + fun showEditFolderDialog(oldTitle: String) { lightningDialogBuilder.showRenameFolderDialog( activity = this, diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt index 101d5ff4e..9ff3080b8 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt @@ -1,6 +1,7 @@ package acr.browser.lightning._browser2 import acr.browser.lightning._browser2.tab.TabModel +import acr.browser.lightning.database.Bookmark import acr.browser.lightning.ssl.SslCertificateInfo import acr.browser.lightning.view.TabInitializer import android.graphics.Bitmap @@ -23,8 +24,12 @@ interface BrowserContract { fun showAddBookmarkDialog(title: String, url: String, folders: List) + fun showBookmarkOptionsDialog(bookmark: Bookmark.Entry) + fun showEditBookmarkDialog(title: String, url: String, folder: String, folders: List) + fun showFolderOptionsDialog(folder: Bookmark.Folder) + fun showEditFolderDialog(title: String) fun showFindInPageDialog() @@ -87,6 +92,21 @@ interface BrowserContract { CLOSE_ALL } + enum class BookmarkOptionEvent { + NEW_TAB, + BACKGROUND_TAB, + INCOGNITO_TAB, + SHARE, + COPY_LINK, + REMOVE, + EDIT + } + + enum class FolderOptionEvent { + RENAME, + REMOVE + } + enum class LinkLongPressEvent { NEW_TAB, BACKGROUND_TAB, diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 0d3dbb305..5a44ae565 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -5,12 +5,10 @@ import acr.browser.lightning._browser2.di.InitialUrl import acr.browser.lightning._browser2.history.HistoryRecord import acr.browser.lightning._browser2.keys.KeyCombo import acr.browser.lightning._browser2.menu.MenuSelection -import targetUrl.LongPress import acr.browser.lightning._browser2.tab.TabModel import acr.browser.lightning._browser2.tab.TabViewState import acr.browser.lightning._browser2.ui.TabConfiguration import acr.browser.lightning._browser2.ui.UiConfiguration -import acr.browser.lightning.browser.BrowserView import acr.browser.lightning.browser.SearchBoxModel import acr.browser.lightning.database.* import acr.browser.lightning.database.bookmark.BookmarkRepository @@ -31,6 +29,7 @@ import io.reactivex.rxkotlin.Observables import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.subscribeBy import io.reactivex.rxkotlin.toObservable +import targetUrl.LongPress import javax.inject.Inject import kotlin.system.exitProcess @@ -551,15 +550,10 @@ class BrowserPresenter @Inject constructor( * TODO */ fun onBookmarkLongClick(index: Int) { - compositeDisposable += bookmarkRepository.getFolderNames() - .subscribeOn(databaseScheduler) - .observeOn(mainScheduler) - .subscribeBy { folders -> - when (val item = viewState.bookmarks[index]) { - is Bookmark.Entry -> view?.showEditBookmarkDialog(item.title, item.url, item.folder.title, folders) - is Bookmark.Folder.Entry -> view?.showEditFolderDialog(item.title) - } - } + when (val item = viewState.bookmarks[index]) { + is Bookmark.Entry -> view?.showBookmarkOptionsDialog(item) + is Bookmark.Folder.Entry -> view?.showFolderOptionsDialog(item) + } } /** @@ -658,6 +652,52 @@ class BrowserPresenter @Inject constructor( } } + /** + * TODO + */ + fun onBookmarkOptionClick(bookmark: Bookmark.Entry, option: BrowserContract.BookmarkOptionEvent) { + when (option) { + BrowserContract.BookmarkOptionEvent.NEW_TAB -> + createNewTabAndSelect(UrlInitializer(bookmark.url), shouldSelect = true) + BrowserContract.BookmarkOptionEvent.BACKGROUND_TAB -> + createNewTabAndSelect(UrlInitializer(bookmark.url), shouldSelect = false) + BrowserContract.BookmarkOptionEvent.INCOGNITO_TAB -> TODO() + BrowserContract.BookmarkOptionEvent.SHARE -> + navigator.sharePage(url = bookmark.url, title = bookmark.title) + BrowserContract.BookmarkOptionEvent.COPY_LINK -> + navigator.copyPageLink(bookmark.url) + BrowserContract.BookmarkOptionEvent.REMOVE -> + compositeDisposable += bookmarkRepository.deleteBookmark(bookmark) + .flatMap { bookmarkRepository.bookmarksAndFolders(folder = currentFolder) } + .subscribeOn(databaseScheduler) + .observeOn(mainScheduler) + .subscribe { list -> + view?.updateState(viewState.copy(bookmarks = list)) + } + BrowserContract.BookmarkOptionEvent.EDIT -> + compositeDisposable += bookmarkRepository.getFolderNames() + .subscribeOn(databaseScheduler) + .observeOn(mainScheduler) + .subscribeBy { folders -> + view?.showEditBookmarkDialog(bookmark.title, bookmark.url, bookmark.folder.title, folders) + } + } + } + + fun onFolderOptionClick(folder: Bookmark.Folder, option: BrowserContract.FolderOptionEvent) { + when (option) { + BrowserContract.FolderOptionEvent.RENAME -> view?.showEditFolderDialog(folder.title) + BrowserContract.FolderOptionEvent.REMOVE -> + compositeDisposable += bookmarkRepository.deleteFolder(folder.title) + .andThen(bookmarkRepository.bookmarksAndFolders(folder = currentFolder)) + .subscribeOn(databaseScheduler) + .observeOn(mainScheduler) + .subscribe { list -> + view?.updateState(viewState.copy(bookmarks = list)) + } + } + } + /** * TODO */ diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt index edf2f20d4..a224647a0 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt @@ -1,5 +1,6 @@ package acr.browser.lightning._browser2 +import acr.browser.lightning.database.Bookmark import acr.browser.lightning.ssl.SslCertificateInfo import acr.browser.lightning.ssl.showSslDialog import targetUrl.LongPress @@ -51,10 +52,18 @@ class BrowserStateAdapter(private val browserActivity: BrowserActivity) : Browse browserActivity.showAddBookmarkDialog(title, url, folders) } + override fun showBookmarkOptionsDialog(bookmark: Bookmark.Entry) { + browserActivity.showBookmarkOptionsDialog(bookmark) + } + override fun showEditBookmarkDialog(title: String, url: String, folder: String, folders: List) { browserActivity.showEditBookmarkDialog(title, url, folder, folders) } + override fun showFolderOptionsDialog(folder: Bookmark.Folder) { + browserActivity.showFolderOptionsDialog(folder) + } + override fun showEditFolderDialog(title: String) { browserActivity.showEditFolderDialog(title) } diff --git a/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt b/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt index 267f454c7..64d78dfbd 100644 --- a/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt +++ b/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt @@ -2,6 +2,7 @@ package acr.browser.lightning.dialog import acr.browser.lightning.MainActivity import acr.browser.lightning.R +import acr.browser.lightning._browser2.BrowserContract import acr.browser.lightning.constant.HTTP import acr.browser.lightning.controller.UIController import acr.browser.lightning.database.Bookmark @@ -120,6 +121,35 @@ class LightningDialogBuilder @Inject constructor( showEditBookmarkDialog(activity, uiController, entry) }) + fun showLongPressedDialogForBookmarkUrl( + activity: Activity, + onClick: (BrowserContract.BookmarkOptionEvent) -> Unit + ) = BrowserDialog.show(activity, R.string.action_bookmarks, + DialogItem(title = R.string.dialog_open_new_tab) { + onClick(BrowserContract.BookmarkOptionEvent.NEW_TAB) + }, + DialogItem(title = R.string.dialog_open_background_tab) { + onClick(BrowserContract.BookmarkOptionEvent.BACKGROUND_TAB) + }, + DialogItem( + title = R.string.dialog_open_incognito_tab, + isConditionMet = activity is MainActivity + ) { + onClick(BrowserContract.BookmarkOptionEvent.INCOGNITO_TAB) + }, + DialogItem(title = R.string.action_share) { + onClick(BrowserContract.BookmarkOptionEvent.SHARE) + }, + DialogItem(title = R.string.dialog_copy_link) { + onClick(BrowserContract.BookmarkOptionEvent.COPY_LINK) + }, + DialogItem(title = R.string.dialog_remove_bookmark) { + onClick(BrowserContract.BookmarkOptionEvent.REMOVE) + }, + DialogItem(title = R.string.dialog_edit_bookmark) { + onClick(BrowserContract.BookmarkOptionEvent.EDIT) + }) + /** * Show the appropriated dialog for the long pressed link. * @@ -307,6 +337,17 @@ class LightningDialogBuilder @Inject constructor( } }) + fun showBookmarkFolderLongPressedDialog( + activity: Activity, + onClick: (BrowserContract.FolderOptionEvent) -> Unit + ) = BrowserDialog.show(activity, R.string.action_folder, + DialogItem(title = R.string.dialog_rename_folder) { + onClick(BrowserContract.FolderOptionEvent.RENAME) + }, + DialogItem(title = R.string.dialog_remove_folder) { + onClick(BrowserContract.FolderOptionEvent.REMOVE) + }) + private fun showRenameFolderDialog( activity: Activity, uiController: UIController, From 524c712586d097e7bbdad2e5c2d3bd8f90fd0908 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sun, 25 Jul 2021 14:07:55 -0400 Subject: [PATCH 064/161] Formatting --- .../lightning/_browser2/BrowserActivity.kt | 116 ++++++++++++------ 1 file changed, 81 insertions(+), 35 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index 1e208ea1f..b6d8c8963 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -90,25 +90,31 @@ class BrowserActivity : ThemableBrowserActivity() { .build() .inject(this) - binding.bookmarkDrawer.layoutParams = (binding.bookmarkDrawer.layoutParams as DrawerLayout.LayoutParams).apply { - gravity = when (uiConfiguration.bookmarkConfiguration) { - BookmarkConfiguration.LEFT -> Gravity.START - BookmarkConfiguration.RIGHT -> Gravity.END + binding.bookmarkDrawer.layoutParams = + (binding.bookmarkDrawer.layoutParams as DrawerLayout.LayoutParams).apply { + gravity = when (uiConfiguration.bookmarkConfiguration) { + BookmarkConfiguration.LEFT -> Gravity.START + BookmarkConfiguration.RIGHT -> Gravity.END + } } - } - binding.tabDrawer.layoutParams = (binding.tabDrawer.layoutParams as DrawerLayout.LayoutParams).apply { - gravity = when (uiConfiguration.bookmarkConfiguration) { - BookmarkConfiguration.LEFT -> Gravity.END - BookmarkConfiguration.RIGHT -> Gravity.START + binding.tabDrawer.layoutParams = + (binding.tabDrawer.layoutParams as DrawerLayout.LayoutParams).apply { + gravity = when (uiConfiguration.bookmarkConfiguration) { + BookmarkConfiguration.LEFT -> Gravity.END + BookmarkConfiguration.RIGHT -> Gravity.START + } } - } - binding.homeImageView.isVisible = uiConfiguration.tabConfiguration == TabConfiguration.DESKTOP + binding.homeImageView.isVisible = + uiConfiguration.tabConfiguration == TabConfiguration.DESKTOP binding.tabCountView.isVisible = uiConfiguration.tabConfiguration == TabConfiguration.DRAWER if (uiConfiguration.tabConfiguration == TabConfiguration.DESKTOP) { - binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED, binding.tabDrawer) + binding.drawerLayout.setDrawerLockMode( + DrawerLayout.LOCK_MODE_LOCKED_CLOSED, + binding.tabDrawer + ) } if (uiConfiguration.tabConfiguration == TabConfiguration.DRAWER) { @@ -130,7 +136,8 @@ class BrowserActivity : ThemableBrowserActivity() { ) binding.desktopTabsList.isVisible = true binding.desktopTabsList.adapter = tabsAdapter - binding.desktopTabsList.layoutManager = LinearLayoutManager(this, RecyclerView.HORIZONTAL, false) + binding.desktopTabsList.layoutManager = + LinearLayoutManager(this, RecyclerView.HORIZONTAL, false) binding.drawerTabsList.isVisible = false } @@ -169,7 +176,11 @@ class BrowserActivity : ThemableBrowserActivity() { binding.search.setOnEditorActionListener(searchListener) binding.search.setOnKeyListener(searchListener) binding.search.addTextChangedListener(StyleRemovingTextWatcher()) - binding.search.setOnFocusChangeListener { _, hasFocus -> presenter.onSearchFocusChanged(hasFocus) } + binding.search.setOnFocusChangeListener { _, hasFocus -> + presenter.onSearchFocusChanged( + hasFocus + ) + } binding.findPrevious.setOnClickListener { presenter.onFindPrevious() } binding.findNext.setOnClickListener { presenter.onFindNext() } @@ -240,22 +251,26 @@ class BrowserActivity : ThemableBrowserActivity() { viewState.tabs?.let { binding.tabCountView.updateCount(it.size) } viewState.progress?.let { binding.progressView.progress = it } viewState.isRefresh?.let { - binding.searchRefresh.setImageResource(if (it) { - R.drawable.ic_action_refresh - } else { - R.drawable.ic_action_delete - }) + binding.searchRefresh.setImageResource( + if (it) { + R.drawable.ic_action_refresh + } else { + R.drawable.ic_action_delete + } + ) } viewState.tabs?.let(tabsAdapter::submitList) viewState.bookmarks?.let(bookmarksAdapter::submitList) viewState.isBookmarked?.let { binding.actionAddBookmark.isSelected = it } viewState.isBookmarkEnabled?.let { binding.actionAddBookmark.isEnabled = it } viewState.isRootFolder?.let { - binding.bookmarkBackButton.setImageResource(if (it) { - R.drawable.ic_action_star - } else { - R.drawable.ic_action_back - }) + binding.bookmarkBackButton.setImageResource( + if (it) { + R.drawable.ic_action_star + } else { + R.drawable.ic_action_back + } + ) } viewState.findInPage?.let { if (it.isEmpty()) { @@ -327,47 +342,77 @@ class BrowserActivity : ThemableBrowserActivity() { fun showLinkLongPressDialog(longPress: LongPress) { BrowserDialog.show(this, longPress.targetUrl?.replace(HTTP, ""), DialogItem(title = R.string.dialog_open_new_tab) { - presenter.onLinkLongPressEvent(longPress, BrowserContract.LinkLongPressEvent.NEW_TAB) + presenter.onLinkLongPressEvent( + longPress, + BrowserContract.LinkLongPressEvent.NEW_TAB + ) }, DialogItem(title = R.string.dialog_open_background_tab) { - presenter.onLinkLongPressEvent(longPress, BrowserContract.LinkLongPressEvent.BACKGROUND_TAB) + presenter.onLinkLongPressEvent( + longPress, + BrowserContract.LinkLongPressEvent.BACKGROUND_TAB + ) }, DialogItem( title = R.string.dialog_open_incognito_tab, isConditionMet = this is BrowserActivity // TODO: Change for incognito ) { - presenter.onLinkLongPressEvent(longPress, BrowserContract.LinkLongPressEvent.INCOGNITO_TAB) + presenter.onLinkLongPressEvent( + longPress, + BrowserContract.LinkLongPressEvent.INCOGNITO_TAB + ) }, DialogItem(title = R.string.action_share) { presenter.onLinkLongPressEvent(longPress, BrowserContract.LinkLongPressEvent.SHARE) }, DialogItem(title = R.string.dialog_copy_link) { - presenter.onLinkLongPressEvent(longPress, BrowserContract.LinkLongPressEvent.COPY_LINK) + presenter.onLinkLongPressEvent( + longPress, + BrowserContract.LinkLongPressEvent.COPY_LINK + ) }) } fun showImageLongPressDialog(longPress: LongPress) { BrowserDialog.show(this, longPress.targetUrl?.replace(HTTP, ""), DialogItem(title = R.string.dialog_open_new_tab) { - presenter.onImageLongPressEvent(longPress, BrowserContract.ImageLongPressEvent.NEW_TAB) + presenter.onImageLongPressEvent( + longPress, + BrowserContract.ImageLongPressEvent.NEW_TAB + ) }, DialogItem(title = R.string.dialog_open_background_tab) { - presenter.onImageLongPressEvent(longPress, BrowserContract.ImageLongPressEvent.BACKGROUND_TAB) + presenter.onImageLongPressEvent( + longPress, + BrowserContract.ImageLongPressEvent.BACKGROUND_TAB + ) }, DialogItem( title = R.string.dialog_open_incognito_tab, isConditionMet = this is BrowserActivity // TODO: Change for incognito ) { - presenter.onImageLongPressEvent(longPress, BrowserContract.ImageLongPressEvent.INCOGNITO_TAB) + presenter.onImageLongPressEvent( + longPress, + BrowserContract.ImageLongPressEvent.INCOGNITO_TAB + ) }, DialogItem(title = R.string.action_share) { - presenter.onImageLongPressEvent(longPress, BrowserContract.ImageLongPressEvent.SHARE) + presenter.onImageLongPressEvent( + longPress, + BrowserContract.ImageLongPressEvent.SHARE + ) }, DialogItem(title = R.string.dialog_copy_link) { - presenter.onImageLongPressEvent(longPress, BrowserContract.ImageLongPressEvent.COPY_LINK) + presenter.onImageLongPressEvent( + longPress, + BrowserContract.ImageLongPressEvent.COPY_LINK + ) }, DialogItem(title = R.string.dialog_download_image) { - presenter.onImageLongPressEvent(longPress, BrowserContract.ImageLongPressEvent.DOWNLOAD) + presenter.onImageLongPressEvent( + longPress, + BrowserContract.ImageLongPressEvent.DOWNLOAD + ) }) } @@ -381,7 +426,8 @@ class BrowserActivity : ThemableBrowserActivity() { }, DialogItem(title = R.string.close_all_tabs, onClick = { presenter.onCloseBrowserEvent(id, BrowserContract.CloseTabEvent.CLOSE_ALL) - })) + }) + ) } fun openBookmarkDrawer() { From 2798feb1e04887643617e062a51ff0801a0d3069 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sun, 25 Jul 2021 14:13:58 -0400 Subject: [PATCH 065/161] Close bookmark and tab drawers after clicking on a tab or bookmark --- .../lightning/_browser2/BrowserActivity.kt | 11 +- .../lightning/_browser2/BrowserContract.kt | 11 +- .../lightning/_browser2/BrowserPresenter.kt | 164 ++++++++++++------ .../_browser2/BrowserStateAdapter.kt | 15 +- 4 files changed, 144 insertions(+), 57 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index b6d8c8963..1b140767a 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -417,7 +417,8 @@ class BrowserActivity : ThemableBrowserActivity() { } fun showCloseBrowserDialog(id: Int) { - BrowserDialog.show(this, R.string.dialog_title_close_browser, + BrowserDialog.show( + this, R.string.dialog_title_close_browser, DialogItem(title = R.string.close_tab) { presenter.onCloseBrowserEvent(id, BrowserContract.CloseTabEvent.CLOSE_CURRENT) }, @@ -435,11 +436,19 @@ class BrowserActivity : ThemableBrowserActivity() { binding.drawerLayout.openDrawer(binding.bookmarkDrawer) } + fun closeBookmarkDrawer() { + binding.drawerLayout.closeDrawer(binding.bookmarkDrawer) + } + fun openTabDrawer() { binding.drawerLayout.closeDrawer(binding.bookmarkDrawer) binding.drawerLayout.openDrawer(binding.tabDrawer) } + fun closeTabDrawer() { + binding.drawerLayout.closeDrawer(binding.tabDrawer) + } + private fun ImageView.updateVisibilityForDrawable() { visibility = if (drawable == null) { View.GONE diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt index 9ff3080b8..959520286 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt @@ -26,7 +26,12 @@ interface BrowserContract { fun showBookmarkOptionsDialog(bookmark: Bookmark.Entry) - fun showEditBookmarkDialog(title: String, url: String, folder: String, folders: List) + fun showEditBookmarkDialog( + title: String, + url: String, + folder: String, + folders: List + ) fun showFolderOptionsDialog(folder: Bookmark.Folder) @@ -44,7 +49,11 @@ interface BrowserContract { fun openBookmarkDrawer() + fun closeBookmarkDrawer() + fun openTabDrawer() + + fun closeTabDrawer() } interface Model { diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 5a44ae565..068af65e9 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -160,21 +160,23 @@ class BrowserPresenter @Inject constructor( currentTab = tabModel currentTab?.isForeground = true - val tab = tabModel ?: return view.updateState(viewState.copy( - displayUrl = searchBoxModel.getDisplayContent( - url = "", - title = null, - isLoading = false - ), - isForwardEnabled = false, - isBackEnabled = false, - sslState = SslState.None, - progress = 100, - tabs = viewState.tabs.map { - it.copy(isSelected = false) - }, - findInPage = "" - )) + val tab = tabModel ?: return view.updateState( + viewState.copy( + displayUrl = searchBoxModel.getDisplayContent( + url = "", + title = null, + isLoading = false + ), + isForwardEnabled = false, + isBackEnabled = false, + sslState = SslState.None, + progress = 100, + tabs = viewState.tabs.map { + it.copy(isSelected = false) + }, + findInPage = "" + ) + ) tabDisposable?.dispose() tabDisposable = Observables.combineLatest( @@ -211,7 +213,8 @@ class BrowserPresenter @Inject constructor( forEach { tabModel -> compositeDisposable += Observables.combineLatest( tabModel.titleChanges().startWith(tabModel.title), - tabModel.faviconChanges().optional().startWith(Option.fromNullable(tabModel.favicon)) + tabModel.faviconChanges().optional() + .startWith(Option.fromNullable(tabModel.favicon)) ).distinctUntilChanged() .subscribeOn(mainScheduler) .subscribeBy { (title, bitmap) -> @@ -265,8 +268,14 @@ class BrowserPresenter @Inject constructor( MenuSelection.SHARE -> currentTab?.url?.takeIf { !it.isSpecialUrl() }?.let { navigator.sharePage(url = it, title = currentTab?.title) } - MenuSelection.HISTORY -> createNewTabAndSelect(historyPageInitializer, shouldSelect = true) - MenuSelection.DOWNLOADS -> createNewTabAndSelect(downloadPageInitializer, shouldSelect = true) + MenuSelection.HISTORY -> createNewTabAndSelect( + historyPageInitializer, + shouldSelect = true + ) + MenuSelection.DOWNLOADS -> createNewTabAndSelect( + downloadPageInitializer, + shouldSelect = true + ) MenuSelection.FIND -> view?.showFindInPageDialog() MenuSelection.COPY_LINK -> currentTab?.url?.takeIf { !it.isSpecialUrl() } ?.let(navigator::copyPageLink) @@ -330,6 +339,7 @@ class BrowserPresenter @Inject constructor( */ fun onTabClick(index: Int) { selectTab(model.selectTab(viewState.tabs[index].id)) + view?.closeTabDrawer() } /** @@ -429,15 +439,17 @@ class BrowserPresenter @Inject constructor( if (isFocused) { view?.updateState(viewState.copy(sslState = SslState.None, isRefresh = false)) } else { - view?.updateState(viewState.copy( - sslState = currentTab?.sslState ?: SslState.None, - isRefresh = (currentTab?.loadingProgress ?: 0) == 100, - displayUrl = searchBoxModel.getDisplayContent( - url = currentTab?.url.orEmpty(), - title = currentTab?.title.orEmpty(), - isLoading = (currentTab?.loadingProgress ?: 0) < 100 + view?.updateState( + viewState.copy( + sslState = currentTab?.sslState ?: SslState.None, + isRefresh = (currentTab?.loadingProgress ?: 0) == 100, + displayUrl = searchBoxModel.getDisplayContent( + url = currentTab?.url.orEmpty(), + title = currentTab?.title.orEmpty(), + isLoading = (currentTab?.loadingProgress ?: 0) < 100 + ) ) - )) + ) } } @@ -451,13 +463,15 @@ class BrowserPresenter @Inject constructor( currentTab?.stopLoading() val searchUrl = searchEngineProvider.provideSearchEngine().queryUrl + QUERY_PLACE_HOLDER val url = smartUrlFilter(query.trim(), true, searchUrl) - view?.updateState(viewState.copy( - displayUrl = searchBoxModel.getDisplayContent( - url = url, - title = currentTab?.title, - isLoading = (currentTab?.loadingProgress ?: 0) < 100 + view?.updateState( + viewState.copy( + displayUrl = searchBoxModel.getDisplayContent( + url = url, + title = currentTab?.title, + isLoading = (currentTab?.loadingProgress ?: 0) < 100 + ) ) - )) + ) currentTab?.loadUrl(url) } @@ -519,7 +533,10 @@ class BrowserPresenter @Inject constructor( */ fun onBookmarkClick(index: Int) { when (val bookmark = viewState.bookmarks[index]) { - is Bookmark.Entry -> currentTab?.loadUrl(bookmark.url) + is Bookmark.Entry -> { + currentTab?.loadUrl(bookmark.url) + view?.closeBookmarkDrawer() + } Bookmark.Folder.Root -> error("Cannot click on root folder") is Bookmark.Folder.Entry -> { currentFolder = bookmark @@ -575,12 +592,14 @@ class BrowserPresenter @Inject constructor( compositeDisposable += bookmarkRepository.isBookmark(url) .flatMapMaybe { if (it) { - bookmarkRepository.deleteBookmark(Bookmark.Entry( - url = url, - title = title, - position = 0, - folder = Bookmark.Folder.Root - )).toMaybe() + bookmarkRepository.deleteBookmark( + Bookmark.Entry( + url = url, + title = title, + position = 0, + folder = Bookmark.Folder.Root + ) + ).toMaybe() } else { Maybe.empty() } @@ -608,12 +627,14 @@ class BrowserPresenter @Inject constructor( } fun onBookmarkConfirmed(title: String, url: String, folder: String) { - compositeDisposable += bookmarkRepository.addBookmarkIfNotExists(Bookmark.Entry( - url = url, - title = title, - position = 0, - folder = folder.asFolder() - )).flatMap { bookmarkRepository.bookmarksAndFolders(folder = currentFolder) } + compositeDisposable += bookmarkRepository.addBookmarkIfNotExists( + Bookmark.Entry( + url = url, + title = title, + position = 0, + folder = folder.asFolder() + ) + ).flatMap { bookmarkRepository.bookmarksAndFolders(folder = currentFolder) } .subscribeOn(databaseScheduler) .observeOn(mainScheduler) .subscribe { list -> @@ -634,7 +655,8 @@ class BrowserPresenter @Inject constructor( title = title, position = 0, folder = folder.asFolder() - )).andThen(bookmarkRepository.bookmarksAndFolders(folder = currentFolder)) + ) + ).andThen(bookmarkRepository.bookmarksAndFolders(folder = currentFolder)) .subscribeOn(databaseScheduler) .observeOn(mainScheduler) .subscribe { list -> @@ -655,7 +677,10 @@ class BrowserPresenter @Inject constructor( /** * TODO */ - fun onBookmarkOptionClick(bookmark: Bookmark.Entry, option: BrowserContract.BookmarkOptionEvent) { + fun onBookmarkOptionClick( + bookmark: Bookmark.Entry, + option: BrowserContract.BookmarkOptionEvent + ) { when (option) { BrowserContract.BookmarkOptionEvent.NEW_TAB -> createNewTabAndSelect(UrlInitializer(bookmark.url), shouldSelect = true) @@ -679,7 +704,12 @@ class BrowserPresenter @Inject constructor( .subscribeOn(databaseScheduler) .observeOn(mainScheduler) .subscribeBy { folders -> - view?.showEditBookmarkDialog(bookmark.title, bookmark.url, bookmark.folder.title, folders) + view?.showEditBookmarkDialog( + bookmark.title, + bookmark.url, + bookmark.folder.title, + folders + ) } } } @@ -771,12 +801,25 @@ class BrowserPresenter @Inject constructor( } } - fun onLinkLongPressEvent(longPress: LongPress, linkLongPressEvent: BrowserContract.LinkLongPressEvent) { + fun onLinkLongPressEvent( + longPress: LongPress, + linkLongPressEvent: BrowserContract.LinkLongPressEvent + ) { when (linkLongPressEvent) { BrowserContract.LinkLongPressEvent.NEW_TAB -> - longPress.targetUrl?.let { createNewTabAndSelect(UrlInitializer(it), shouldSelect = true) } + longPress.targetUrl?.let { + createNewTabAndSelect( + UrlInitializer(it), + shouldSelect = true + ) + } BrowserContract.LinkLongPressEvent.BACKGROUND_TAB -> - longPress.targetUrl?.let { createNewTabAndSelect(UrlInitializer(it), shouldSelect = false) } + longPress.targetUrl?.let { + createNewTabAndSelect( + UrlInitializer(it), + shouldSelect = false + ) + } BrowserContract.LinkLongPressEvent.INCOGNITO_TAB -> TODO() BrowserContract.LinkLongPressEvent.SHARE -> longPress.targetUrl?.let { navigator.sharePage(url = it, title = null) } @@ -785,12 +828,25 @@ class BrowserPresenter @Inject constructor( } } - fun onImageLongPressEvent(longPress: LongPress, imageLongPressEvent: BrowserContract.ImageLongPressEvent) { + fun onImageLongPressEvent( + longPress: LongPress, + imageLongPressEvent: BrowserContract.ImageLongPressEvent + ) { when (imageLongPressEvent) { BrowserContract.ImageLongPressEvent.NEW_TAB -> - longPress.targetUrl?.let { createNewTabAndSelect(UrlInitializer(it), shouldSelect = true) } + longPress.targetUrl?.let { + createNewTabAndSelect( + UrlInitializer(it), + shouldSelect = true + ) + } BrowserContract.ImageLongPressEvent.BACKGROUND_TAB -> - longPress.targetUrl?.let { createNewTabAndSelect(UrlInitializer(it), shouldSelect = false) } + longPress.targetUrl?.let { + createNewTabAndSelect( + UrlInitializer(it), + shouldSelect = false + ) + } BrowserContract.ImageLongPressEvent.INCOGNITO_TAB -> TODO() BrowserContract.ImageLongPressEvent.SHARE -> longPress.targetUrl?.let { navigator.sharePage(url = it, title = null) } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt index a224647a0..2d5097cd0 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt @@ -56,7 +56,12 @@ class BrowserStateAdapter(private val browserActivity: BrowserActivity) : Browse browserActivity.showBookmarkOptionsDialog(bookmark) } - override fun showEditBookmarkDialog(title: String, url: String, folder: String, folders: List) { + override fun showEditBookmarkDialog( + title: String, + url: String, + folder: String, + folders: List + ) { browserActivity.showEditBookmarkDialog(title, url, folder, folders) } @@ -92,8 +97,16 @@ class BrowserStateAdapter(private val browserActivity: BrowserActivity) : Browse browserActivity.openBookmarkDrawer() } + override fun closeBookmarkDrawer() { + browserActivity.closeBookmarkDrawer() + } + override fun openTabDrawer() { browserActivity.openTabDrawer() } + override fun closeTabDrawer() { + browserActivity.closeTabDrawer() + } + } From a62f5cf72df256e3298348c8e7706218a10a9143 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sun, 25 Jul 2021 14:24:33 -0400 Subject: [PATCH 066/161] Upgrade dependencies --- app/build.gradle | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ad95947a3..49efb5c4e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -105,9 +105,9 @@ dependencies { debugImplementation 'androidx.multidex:multidex:2.0.1' // test dependencies - testImplementation 'junit:junit:4.13.1' - testImplementation 'org.assertj:assertj-core:3.18.1' - testImplementation 'org.mockito:mockito-core:3.6.28' + testImplementation 'junit:junit:4.13.2' + testImplementation 'org.assertj:assertj-core:3.20.2' + testImplementation 'org.mockito:mockito-core:3.11.2' testImplementation 'com.nhaarman:mockito-kotlin:1.6.0', { exclude group: 'org.jetbrains.kotlin' } @@ -115,14 +115,14 @@ dependencies { // support libraries implementation "androidx.palette:palette-ktx:1.0.0" - implementation "androidx.annotation:annotation:1.1.0" + implementation "androidx.annotation:annotation:1.2.0" implementation "androidx.vectordrawable:vectordrawable-animated:1.1.0" - implementation "androidx.appcompat:appcompat:1.2.0" - implementation "com.google.android.material:material:1.2.1" - implementation "androidx.recyclerview:recyclerview:1.1.0" - implementation 'androidx.core:core-ktx:1.5.0-alpha05' + implementation "androidx.appcompat:appcompat:1.3.1" + implementation "com.google.android.material:material:1.4.0" + implementation "androidx.recyclerview:recyclerview:1.2.1" + implementation 'androidx.core:core-ktx:1.7.0-alpha01' implementation "androidx.constraintlayout:constraintlayout:2.0.4" - implementation "androidx.fragment:fragment-ktx:1.2.5" + implementation "androidx.fragment:fragment-ktx:1.3.6" implementation "androidx.drawerlayout:drawerlayout:1.1.1" // html parsing for reading mode @@ -134,7 +134,7 @@ dependencies { kapt "com.anthonycr.mezzanine:mezzanine-compiler:$mezzanineVersion" // dependency injection - final def daggerVersion = '2.30.1' + final def daggerVersion = '2.38' implementation "com.google.dagger:dagger:$daggerVersion" kapt "com.google.dagger:dagger-compiler:$daggerVersion" compileOnly 'javax.annotation:jsr250-api:1.0' @@ -155,7 +155,7 @@ dependencies { // rx implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' - implementation 'io.reactivex.rxjava2:rxjava:2.2.20' + implementation 'io.reactivex.rxjava2:rxjava:2.2.21' implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0' // tor proxy From 874e3c1bdd9bf92b3a1329e66cccc735d0720897 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sun, 25 Jul 2021 15:21:01 -0400 Subject: [PATCH 067/161] Properly display dialog for bookmark and folder page and reload the page --- .../lightning/_browser2/BrowserPresenter.kt | 61 ++++++++++++++++++- 1 file changed, 59 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 068af65e9..14b3b007c 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -13,12 +13,15 @@ import acr.browser.lightning.browser.SearchBoxModel import acr.browser.lightning.database.* import acr.browser.lightning.database.bookmark.BookmarkRepository import acr.browser.lightning.di.DatabaseScheduler +import acr.browser.lightning.di.DiskScheduler import acr.browser.lightning.di.MainScheduler +import acr.browser.lightning.html.bookmark.BookmarkPageFactory import acr.browser.lightning.html.history.HistoryPageFactory import acr.browser.lightning.search.SearchEngineProvider import acr.browser.lightning.ssl.SslState import acr.browser.lightning.utils.* import acr.browser.lightning.view.* +import androidx.core.net.toUri import io.reactivex.Maybe import io.reactivex.Observable import io.reactivex.Scheduler @@ -41,9 +44,11 @@ class BrowserPresenter @Inject constructor( private val model: BrowserContract.Model, private val navigator: BrowserContract.Navigator, private val bookmarkRepository: BookmarkRepository, + @DiskScheduler private val diskScheduler: Scheduler, @MainScheduler private val mainScheduler: Scheduler, @DatabaseScheduler private val databaseScheduler: Scheduler, private val historyRecord: HistoryRecord, + private val bookmarkPageFactory: BookmarkPageFactory, private val homePageInitializer: HomePageInitializer, private val historyPageInitializer: HistoryPageInitializer, private val downloadPageInitializer: DownloadPageInitializer, @@ -426,6 +431,28 @@ class BrowserPresenter @Inject constructor( } if (currentTab?.loadingProgress != 100) { currentTab?.stopLoading() + } else { + reload() + } + } + + private fun reload() { + val currentUrl = currentTab?.url + if (currentUrl?.isSpecialUrl() == true) { + when { + currentUrl.isBookmarkUrl() -> + compositeDisposable += bookmarkPageFactory.buildPage() + .subscribeOn(diskScheduler) + .observeOn(mainScheduler) + .subscribeBy { + currentTab?.reload() + } + currentUrl.isDownloadsUrl() -> + currentTab?.loadFromInitializer(downloadPageInitializer) + currentUrl.isHistoryUrl() -> + currentTab?.loadFromInitializer(historyPageInitializer) + else -> currentTab?.reload() + } } else { currentTab?.reload() } @@ -661,6 +688,9 @@ class BrowserPresenter @Inject constructor( .observeOn(mainScheduler) .subscribe { list -> this.view?.updateState(viewState.copy(bookmarks = list)) + if (currentTab?.url?.isBookmarkUrl() == true) { + reload() + } } } @@ -671,6 +701,9 @@ class BrowserPresenter @Inject constructor( .observeOn(mainScheduler) .subscribe { list -> this.view?.updateState(viewState.copy(bookmarks = list)) + if (currentTab?.url?.isBookmarkUrl() == true) { + reload() + } } } @@ -773,8 +806,32 @@ class BrowserPresenter @Inject constructor( * TODO */ fun onPageLongPress(id: Int, longPress: LongPress) { - if (model.tabsList.find { it.id == id }?.url?.isSpecialUrl() == true) { - // TODO handle differently + val pageUrl = model.tabsList.find { it.id == id }?.url + if (pageUrl?.isSpecialUrl() == true) { + if (pageUrl.isBookmarkUrl()) { + val url = longPress.targetUrl ?: return + if (url.isBookmarkUrl()) { + val filename = requireNotNull(longPress.targetUrl.toUri().lastPathSegment) { + "Last segment should always exist for bookmark file" + } + val folderTitle = filename.substring( + 0, + filename.length - BookmarkPageFactory.FILENAME.length - 1 + ) + view?.showFolderOptionsDialog(folderTitle.asFolder()) + } else { + compositeDisposable += bookmarkRepository.findBookmarkForUrl(url) + .subscribeOn(databaseScheduler) + .observeOn(mainScheduler) + .subscribe { bookmarkEntry -> + view?.showBookmarkOptionsDialog(bookmarkEntry) + } + } + } else if (pageUrl.isDownloadsUrl()) { + // TODO + } else if (pageUrl.isHistoryUrl()) { + // TODO + } return } when (longPress.hitCategory) { From d3918ce5ccea68a6684438f395f5fc26ea98986d Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sun, 25 Jul 2021 15:44:10 -0400 Subject: [PATCH 068/161] Support deleting downloads on download page --- .../lightning/_browser2/BrowserActivity.kt | 10 ++++ .../lightning/_browser2/BrowserContract.kt | 8 +++ .../lightning/_browser2/BrowserPresenter.kt | 42 ++++++++++++-- .../_browser2/BrowserStateAdapter.kt | 5 ++ .../dialog/LightningDialogBuilder.kt | 58 ++++++++++++++----- 5 files changed, 106 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index 1b140767a..d06d938f3 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -17,6 +17,7 @@ import acr.browser.lightning.constant.HTTP import acr.browser.lightning.database.Bookmark import acr.browser.lightning.database.SearchSuggestion import acr.browser.lightning.database.WebPage +import acr.browser.lightning.database.downloads.DownloadEntry import acr.browser.lightning.databinding.BrowserActivityBinding import acr.browser.lightning.di.injector import acr.browser.lightning.dialog.BrowserDialog @@ -329,6 +330,15 @@ class BrowserActivity : ThemableBrowserActivity() { ) } + fun showDownloadOptionsDialog(download: DownloadEntry) { + lightningDialogBuilder.showLongPressedDialogForDownloadUrl( + activity = this, + onClick = { + presenter.onDownloadOptionClick(download, it) + } + ) + } + fun showFindInPageDialog() { BrowserDialog.showEditText( this, diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt index 959520286..93bde45de 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt @@ -2,6 +2,7 @@ package acr.browser.lightning._browser2 import acr.browser.lightning._browser2.tab.TabModel import acr.browser.lightning.database.Bookmark +import acr.browser.lightning.database.downloads.DownloadEntry import acr.browser.lightning.ssl.SslCertificateInfo import acr.browser.lightning.view.TabInitializer import android.graphics.Bitmap @@ -37,6 +38,8 @@ interface BrowserContract { fun showEditFolderDialog(title: String) + fun showDownloadOptionsDialog(download: DownloadEntry) + fun showFindInPageDialog() fun showLinkLongPressDialog(longPress: LongPress) @@ -111,6 +114,11 @@ interface BrowserContract { EDIT } + enum class DownloadOptionEvent { + DELETE, + DELETE_ALL + } + enum class FolderOptionEvent { RENAME, REMOVE diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 14b3b007c..497637b2f 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -12,6 +12,8 @@ import acr.browser.lightning._browser2.ui.UiConfiguration import acr.browser.lightning.browser.SearchBoxModel import acr.browser.lightning.database.* import acr.browser.lightning.database.bookmark.BookmarkRepository +import acr.browser.lightning.database.downloads.DownloadEntry +import acr.browser.lightning.database.downloads.DownloadsRepository import acr.browser.lightning.di.DatabaseScheduler import acr.browser.lightning.di.DiskScheduler import acr.browser.lightning.di.MainScheduler @@ -44,6 +46,7 @@ class BrowserPresenter @Inject constructor( private val model: BrowserContract.Model, private val navigator: BrowserContract.Navigator, private val bookmarkRepository: BookmarkRepository, + private val downloadsRepository: DownloadsRepository, @DiskScheduler private val diskScheduler: Scheduler, @MainScheduler private val mainScheduler: Scheduler, @DatabaseScheduler private val databaseScheduler: Scheduler, @@ -761,6 +764,32 @@ class BrowserPresenter @Inject constructor( } } + fun onDownloadOptionClick( + download: DownloadEntry, + option: BrowserContract.DownloadOptionEvent + ) { + when (option) { + BrowserContract.DownloadOptionEvent.DELETE -> + compositeDisposable += downloadsRepository.deleteAllDownloads() + .subscribeOn(databaseScheduler) + .observeOn(mainScheduler) + .subscribeBy { + if (currentTab?.url?.isDownloadsUrl() == true) { + reload() + } + } + BrowserContract.DownloadOptionEvent.DELETE_ALL -> + compositeDisposable += downloadsRepository.deleteDownload(download.url) + .subscribeOn(databaseScheduler) + .observeOn(mainScheduler) + .subscribeBy { + if (currentTab?.url?.isDownloadsUrl() == true) { + reload() + } + } + } + } + /** * TODO */ @@ -808,8 +837,8 @@ class BrowserPresenter @Inject constructor( fun onPageLongPress(id: Int, longPress: LongPress) { val pageUrl = model.tabsList.find { it.id == id }?.url if (pageUrl?.isSpecialUrl() == true) { + val url = longPress.targetUrl ?: return if (pageUrl.isBookmarkUrl()) { - val url = longPress.targetUrl ?: return if (url.isBookmarkUrl()) { val filename = requireNotNull(longPress.targetUrl.toUri().lastPathSegment) { "Last segment should always exist for bookmark file" @@ -823,12 +852,17 @@ class BrowserPresenter @Inject constructor( compositeDisposable += bookmarkRepository.findBookmarkForUrl(url) .subscribeOn(databaseScheduler) .observeOn(mainScheduler) - .subscribe { bookmarkEntry -> - view?.showBookmarkOptionsDialog(bookmarkEntry) + .subscribeBy { + view?.showBookmarkOptionsDialog(it) } } } else if (pageUrl.isDownloadsUrl()) { - // TODO + compositeDisposable += downloadsRepository.findDownloadForUrl(url) + .subscribeOn(databaseScheduler) + .observeOn(mainScheduler) + .subscribeBy { + view?.showDownloadOptionsDialog(it) + } } else if (pageUrl.isHistoryUrl()) { // TODO } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt index 2d5097cd0..6bda1f441 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt @@ -1,6 +1,7 @@ package acr.browser.lightning._browser2 import acr.browser.lightning.database.Bookmark +import acr.browser.lightning.database.downloads.DownloadEntry import acr.browser.lightning.ssl.SslCertificateInfo import acr.browser.lightning.ssl.showSslDialog import targetUrl.LongPress @@ -73,6 +74,10 @@ class BrowserStateAdapter(private val browserActivity: BrowserActivity) : Browse browserActivity.showEditFolderDialog(title) } + override fun showDownloadOptionsDialog(download: DownloadEntry) { + browserActivity.showDownloadOptionsDialog(download) + } + override fun showFindInPageDialog() { browserActivity.showFindInPageDialog() } diff --git a/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt b/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt index 64d78dfbd..cf52138b6 100644 --- a/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt +++ b/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt @@ -70,8 +70,10 @@ class LightningDialogBuilder @Inject constructor( if (url.isBookmarkUrl()) { // TODO hacky, make a better bookmark mechanism in the future val uri = url.toUri() - val filename = requireNotNull(uri.lastPathSegment) { "Last segment should always exist for bookmark file" } - val folderTitle = filename.substring(0, filename.length - BookmarkPageFactory.FILENAME.length - 1) + val filename = + requireNotNull(uri.lastPathSegment) { "Last segment should always exist for bookmark file" } + val folderTitle = + filename.substring(0, filename.length - BookmarkPageFactory.FILENAME.length - 1) showBookmarkFolderLongPressedDialog(activity, uiController, folderTitle.asFolder()) } else { bookmarkManager.findBookmarkForUrl(url) @@ -169,6 +171,18 @@ class LightningDialogBuilder @Inject constructor( .subscribe(uiController::handleDownloadDeleted) }) + fun showLongPressedDialogForDownloadUrl( + activity: Activity, + onClick: (BrowserContract.DownloadOptionEvent) -> Unit + ) = BrowserDialog.show(activity, R.string.action_downloads, + DialogItem(title = R.string.dialog_delete_all_downloads) { + onClick(BrowserContract.DownloadOptionEvent.DELETE_ALL) + }, + DialogItem(title = R.string.dialog_delete_all_downloads) { + onClick(BrowserContract.DownloadOptionEvent.DELETE) + } + ) + /** * Show the add bookmark dialog. Shows a dialog with the title and URL pre-populated. */ @@ -192,8 +206,10 @@ class LightningDialogBuilder @Inject constructor( .subscribeOn(databaseScheduler) .observeOn(mainScheduler) .subscribe { folders -> - val suggestionsAdapter = ArrayAdapter(activity, - android.R.layout.simple_dropdown_item_1line, folders) + val suggestionsAdapter = ArrayAdapter( + activity, + android.R.layout.simple_dropdown_item_1line, folders + ) getFolder.threshold = 1 getFolder.setAdapter(suggestionsAdapter) editBookmarkDialog.setView(dialogLayout) @@ -234,8 +250,10 @@ class LightningDialogBuilder @Inject constructor( binding.bookmarkUrl.setText(currentUrl) binding.bookmarkFolder.setText("") - val suggestionsAdapter = ArrayAdapter(activity, - android.R.layout.simple_dropdown_item_1line, folders) + val suggestionsAdapter = ArrayAdapter( + activity, + android.R.layout.simple_dropdown_item_1line, folders + ) binding.bookmarkFolder.setAdapter(suggestionsAdapter) editBookmarkDialog.setView(dialogLayout) editBookmarkDialog.setPositiveButton(activity.getString(R.string.action_ok)) { _, _ -> @@ -269,8 +287,10 @@ class LightningDialogBuilder @Inject constructor( .subscribeOn(databaseScheduler) .observeOn(mainScheduler) .subscribe { folders -> - val suggestionsAdapter = ArrayAdapter(activity, - android.R.layout.simple_dropdown_item_1line, folders) + val suggestionsAdapter = ArrayAdapter( + activity, + android.R.layout.simple_dropdown_item_1line, folders + ) getFolder.threshold = 1 getFolder.setAdapter(suggestionsAdapter) editBookmarkDialog.setView(dialogLayout) @@ -306,8 +326,10 @@ class LightningDialogBuilder @Inject constructor( binding.bookmarkUrl.setText(currentUrl) binding.bookmarkFolder.setText(currentFolder) - val suggestionsAdapter = ArrayAdapter(activity, - android.R.layout.simple_dropdown_item_1line, folders) + val suggestionsAdapter = ArrayAdapter( + activity, + android.R.layout.simple_dropdown_item_1line, folders + ) binding.bookmarkFolder.setAdapter(suggestionsAdapter) editBookmarkDialog.setView(dialogLayout) editBookmarkDialog.setPositiveButton(activity.getString(R.string.action_ok)) { _, _ -> @@ -352,11 +374,13 @@ class LightningDialogBuilder @Inject constructor( activity: Activity, uiController: UIController, folder: Bookmark.Folder - ) = BrowserDialog.showEditText(activity, + ) = BrowserDialog.showEditText( + activity, R.string.title_rename_folder, R.string.hint_title, folder.title, - R.string.action_ok) { text -> + R.string.action_ok + ) { text -> if (text.isNotBlank()) { val oldTitle = folder.title bookmarkManager.renameFolder(oldTitle, text) @@ -438,7 +462,15 @@ class LightningDialogBuilder @Inject constructor( clipboardManager.copyToClipboard(url) }, DialogItem(title = R.string.dialog_download_image) { - downloadHandler.onDownloadStart(activity, userPreferences, url, userAgent, "attachment", null, "") + downloadHandler.onDownloadStart( + activity, + userPreferences, + url, + userAgent, + "attachment", + null, + "" + ) }) fun showLongPressLinkDialog( From 30e348bd1ee2e84c4af20a94fca311734aee6665 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sun, 25 Jul 2021 16:03:46 -0400 Subject: [PATCH 069/161] Support showing long press options for history page --- .../lightning/_browser2/BrowserActivity.kt | 10 +++++ .../lightning/_browser2/BrowserContract.kt | 12 ++++++ .../lightning/_browser2/BrowserPresenter.kt | 43 ++++++++++++++++++- .../_browser2/BrowserStateAdapter.kt | 5 +++ .../dialog/LightningDialogBuilder.kt | 26 +++++++++++ 5 files changed, 95 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index d06d938f3..cd57a0314 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -15,6 +15,7 @@ import acr.browser.lightning.browser.activity.StyleRemovingTextWatcher import acr.browser.lightning.browser.activity.ThemableBrowserActivity import acr.browser.lightning.constant.HTTP import acr.browser.lightning.database.Bookmark +import acr.browser.lightning.database.HistoryEntry import acr.browser.lightning.database.SearchSuggestion import acr.browser.lightning.database.WebPage import acr.browser.lightning.database.downloads.DownloadEntry @@ -339,6 +340,15 @@ class BrowserActivity : ThemableBrowserActivity() { ) } + fun showHistoryOptionsDialog(historyEntry: HistoryEntry) { + lightningDialogBuilder.showLongPressedHistoryLinkDialog( + activity = this, + onClick = { + presenter.onHistoryOptionClick(historyEntry, it) + } + ) + } + fun showFindInPageDialog() { BrowserDialog.showEditText( this, diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt index 93bde45de..2966eaabf 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt @@ -2,6 +2,7 @@ package acr.browser.lightning._browser2 import acr.browser.lightning._browser2.tab.TabModel import acr.browser.lightning.database.Bookmark +import acr.browser.lightning.database.HistoryEntry import acr.browser.lightning.database.downloads.DownloadEntry import acr.browser.lightning.ssl.SslCertificateInfo import acr.browser.lightning.view.TabInitializer @@ -40,6 +41,8 @@ interface BrowserContract { fun showDownloadOptionsDialog(download: DownloadEntry) + fun showHistoryOptionsDialog(historyEntry: HistoryEntry) + fun showFindInPageDialog() fun showLinkLongPressDialog(longPress: LongPress) @@ -114,6 +117,15 @@ interface BrowserContract { EDIT } + enum class HistoryOptionEvent { + NEW_TAB, + BACKGROUND_TAB, + INCOGNITO_TAB, + SHARE, + COPY_LINK, + REMOVE, + } + enum class DownloadOptionEvent { DELETE, DELETE_ALL diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 497637b2f..1819da62b 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -14,6 +14,7 @@ import acr.browser.lightning.database.* import acr.browser.lightning.database.bookmark.BookmarkRepository import acr.browser.lightning.database.downloads.DownloadEntry import acr.browser.lightning.database.downloads.DownloadsRepository +import acr.browser.lightning.database.history.HistoryRepository import acr.browser.lightning.di.DatabaseScheduler import acr.browser.lightning.di.DiskScheduler import acr.browser.lightning.di.MainScheduler @@ -47,6 +48,7 @@ class BrowserPresenter @Inject constructor( private val navigator: BrowserContract.Navigator, private val bookmarkRepository: BookmarkRepository, private val downloadsRepository: DownloadsRepository, + private val historyRepository: HistoryRepository, @DiskScheduler private val diskScheduler: Scheduler, @MainScheduler private val mainScheduler: Scheduler, @DatabaseScheduler private val databaseScheduler: Scheduler, @@ -734,6 +736,9 @@ class BrowserPresenter @Inject constructor( .observeOn(mainScheduler) .subscribe { list -> view?.updateState(viewState.copy(bookmarks = list)) + if (currentTab?.url?.isBookmarkUrl() == true) { + reload() + } } BrowserContract.BookmarkOptionEvent.EDIT -> compositeDisposable += bookmarkRepository.getFolderNames() @@ -760,6 +765,9 @@ class BrowserPresenter @Inject constructor( .observeOn(mainScheduler) .subscribe { list -> view?.updateState(viewState.copy(bookmarks = list)) + if (currentTab?.url?.isBookmarkUrl() == true) { + reload() + } } } } @@ -790,6 +798,31 @@ class BrowserPresenter @Inject constructor( } } + fun onHistoryOptionClick( + historyEntry: HistoryEntry, + option: BrowserContract.HistoryOptionEvent + ) { + when (option) { + BrowserContract.HistoryOptionEvent.NEW_TAB -> + createNewTabAndSelect(UrlInitializer(historyEntry.url), shouldSelect = true) + BrowserContract.HistoryOptionEvent.BACKGROUND_TAB -> + createNewTabAndSelect(UrlInitializer(historyEntry.url), shouldSelect = false) + BrowserContract.HistoryOptionEvent.INCOGNITO_TAB -> TODO() + BrowserContract.HistoryOptionEvent.SHARE -> + navigator.sharePage(url = historyEntry.url, title = historyEntry.title) + BrowserContract.HistoryOptionEvent.COPY_LINK -> navigator.copyPageLink(historyEntry.url) + BrowserContract.HistoryOptionEvent.REMOVE -> + compositeDisposable += historyRepository.deleteHistoryEntry(historyEntry.url) + .subscribeOn(databaseScheduler) + .observeOn(mainScheduler) + .subscribeBy { + if (currentTab?.url?.isHistoryUrl() == true) { + reload() + } + } + } + } + /** * TODO */ @@ -864,7 +897,15 @@ class BrowserPresenter @Inject constructor( view?.showDownloadOptionsDialog(it) } } else if (pageUrl.isHistoryUrl()) { - // TODO + compositeDisposable += historyRepository.findHistoryEntriesContaining(url) + .subscribeOn(databaseScheduler) + .observeOn(mainScheduler) + .subscribeBy { entries -> + entries.firstOrNull()?.let { + view?.showHistoryOptionsDialog(it) + } ?: view?.showHistoryOptionsDialog(HistoryEntry(url = url, title = "")) + } + } return } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt index 6bda1f441..a982424da 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt @@ -1,6 +1,7 @@ package acr.browser.lightning._browser2 import acr.browser.lightning.database.Bookmark +import acr.browser.lightning.database.HistoryEntry import acr.browser.lightning.database.downloads.DownloadEntry import acr.browser.lightning.ssl.SslCertificateInfo import acr.browser.lightning.ssl.showSslDialog @@ -78,6 +79,10 @@ class BrowserStateAdapter(private val browserActivity: BrowserActivity) : Browse browserActivity.showDownloadOptionsDialog(download) } + override fun showHistoryOptionsDialog(historyEntry: HistoryEntry) { + browserActivity.showHistoryOptionsDialog(historyEntry) + } + override fun showFindInPageDialog() { browserActivity.showFindInPageDialog() } diff --git a/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt b/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt index cf52138b6..b4406b27b 100644 --- a/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt +++ b/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt @@ -436,6 +436,32 @@ class LightningDialogBuilder @Inject constructor( .subscribe(uiController::handleHistoryChange) }) + fun showLongPressedHistoryLinkDialog( + activity: Activity, + onClick: (BrowserContract.HistoryOptionEvent) -> Unit + ) = BrowserDialog.show(activity, R.string.action_history, + DialogItem(title = R.string.dialog_open_new_tab) { + onClick(BrowserContract.HistoryOptionEvent.NEW_TAB) + }, + DialogItem(title = R.string.dialog_open_background_tab) { + onClick(BrowserContract.HistoryOptionEvent.BACKGROUND_TAB) + }, + DialogItem( + title = R.string.dialog_open_incognito_tab, + isConditionMet = activity is MainActivity + ) { + onClick(BrowserContract.HistoryOptionEvent.INCOGNITO_TAB) + }, + DialogItem(title = R.string.action_share) { + onClick(BrowserContract.HistoryOptionEvent.SHARE) + }, + DialogItem(title = R.string.dialog_copy_link) { + onClick(BrowserContract.HistoryOptionEvent.COPY_LINK) + }, + DialogItem(title = R.string.dialog_remove_from_history) { + onClick(BrowserContract.HistoryOptionEvent.REMOVE) + }) + // TODO There should be a way in which we do not need an activity reference to dowload a file fun showLongPressImageDialog( activity: Activity, From e7757c1e8b2bfb204131e18b6cc567d55228b3e1 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sun, 25 Jul 2021 21:07:04 -0400 Subject: [PATCH 070/161] Support downloads --- .../lightning/_browser2/BrowserContract.kt | 3 + .../lightning/_browser2/BrowserNavigator.kt | 16 ++- .../lightning/_browser2/BrowserPresenter.kt | 21 +++- .../download/DownloadPermissionsHelper.kt | 110 ++++++++++++++++++ .../_browser2/download/PendingDownload.kt | 12 ++ .../lightning/_browser2/tab/TabAdapter.kt | 23 +++- .../lightning/_browser2/tab/TabModel.kt | 4 + .../lightning/download/DownloadHandler.java | 37 +++--- 8 files changed, 203 insertions(+), 23 deletions(-) create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/download/DownloadPermissionsHelper.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/download/PendingDownload.kt diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt index 2966eaabf..583e544ab 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt @@ -1,5 +1,6 @@ package acr.browser.lightning._browser2 +import acr.browser.lightning._browser2.download.PendingDownload import acr.browser.lightning._browser2.tab.TabModel import acr.browser.lightning.database.Bookmark import acr.browser.lightning.database.HistoryEntry @@ -98,6 +99,8 @@ interface BrowserContract { fun addToHomeScreen(url: String, title: String, favicon: Bitmap?) + fun download(pendingDownload: PendingDownload) + fun backgroundBrowser() } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserNavigator.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserNavigator.kt index 174291aed..69880029e 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserNavigator.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserNavigator.kt @@ -1,6 +1,8 @@ package acr.browser.lightning._browser2 import acr.browser.lightning.R +import acr.browser.lightning._browser2.download.DownloadPermissionsHelper +import acr.browser.lightning._browser2.download.PendingDownload import acr.browser.lightning.browser.activity.BrowserActivity import acr.browser.lightning.database.HistoryEntry import acr.browser.lightning.extensions.copyToClipboard @@ -23,7 +25,8 @@ import javax.inject.Inject class BrowserNavigator @Inject constructor( private val activity: Activity, private val clipboardManager: ClipboardManager, - private val logger: Logger + private val logger: Logger, + private val downloadPermissionsHelper: DownloadPermissionsHelper ) : BrowserContract.Navigator { override fun openSettings() { @@ -52,6 +55,17 @@ class BrowserNavigator @Inject constructor( logger.log(TAG, "Creating shortcut: $title $url") } + override fun download(pendingDownload: PendingDownload) { + downloadPermissionsHelper.download( + activity = activity, + url = pendingDownload.url, + userAgent = pendingDownload.userAgent, + contentDisposition = pendingDownload.contentDisposition, + mimeType = pendingDownload.mimeType, + contentLength = pendingDownload.contentLength + ) + } + override fun backgroundBrowser() { activity.moveTaskToBack(true) } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 1819da62b..daf79c31c 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -2,6 +2,7 @@ package acr.browser.lightning._browser2 import acr.browser.lightning._browser2.di.Browser2Scope import acr.browser.lightning._browser2.di.InitialUrl +import acr.browser.lightning._browser2.download.PendingDownload import acr.browser.lightning._browser2.history.HistoryRecord import acr.browser.lightning._browser2.keys.KeyCombo import acr.browser.lightning._browser2.menu.MenuSelection @@ -85,7 +86,7 @@ class BrowserPresenter @Inject constructor( private val compositeDisposable = CompositeDisposable() private val allTabsDisposable = CompositeDisposable() - private var tabDisposable: Disposable? = null + private var tabDisposable: CompositeDisposable = CompositeDisposable() /** * TODO @@ -188,8 +189,9 @@ class BrowserPresenter @Inject constructor( ) ) - tabDisposable?.dispose() - tabDisposable = Observables.combineLatest( + tabDisposable.dispose() + tabDisposable = CompositeDisposable() + tabDisposable += Observables.combineLatest( tab.sslChanges().startWith(tab.sslState), tab.titleChanges().startWith(tab.title), tab.urlChanges().startWith(tab.url), @@ -217,6 +219,9 @@ class BrowserPresenter @Inject constructor( ) }.subscribeOn(mainScheduler) .subscribe { view.updateState(it) } + tabDisposable += tab.downloadRequests() + .subscribeOn(mainScheduler) + .subscribeBy(onNext = navigator::download) } private fun List.subscribeToUpdates(compositeDisposable: CompositeDisposable) { @@ -984,7 +989,15 @@ class BrowserPresenter @Inject constructor( longPress.targetUrl?.let { navigator.sharePage(url = it, title = null) } BrowserContract.ImageLongPressEvent.COPY_LINK -> longPress.targetUrl?.let(navigator::copyPageLink) - BrowserContract.ImageLongPressEvent.DOWNLOAD -> TODO() + BrowserContract.ImageLongPressEvent.DOWNLOAD -> navigator.download( + PendingDownload( + url = longPress.targetUrl.orEmpty(), + userAgent = null, + contentDisposition = "attachment", + mimeType = null, + contentLength = 0 + ) + ) } } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/download/DownloadPermissionsHelper.kt b/app/src/main/java/acr/browser/lightning/_browser2/download/DownloadPermissionsHelper.kt new file mode 100644 index 000000000..968646416 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/download/DownloadPermissionsHelper.kt @@ -0,0 +1,110 @@ +package acr.browser.lightning._browser2.download + +import acr.browser.lightning.R +import acr.browser.lightning.database.downloads.DownloadEntry +import acr.browser.lightning.database.downloads.DownloadsRepository +import acr.browser.lightning.di.DatabaseScheduler +import acr.browser.lightning.dialog.BrowserDialog.setDialogSize +import acr.browser.lightning.download.DownloadHandler +import acr.browser.lightning.log.Logger +import acr.browser.lightning.preference.UserPreferences +import android.Manifest +import android.app.Activity +import android.app.Dialog +import android.content.DialogInterface +import android.text.format.Formatter +import android.webkit.URLUtil +import androidx.appcompat.app.AlertDialog +import com.anthonycr.grant.PermissionsManager +import com.anthonycr.grant.PermissionsResultAction +import io.reactivex.Scheduler +import io.reactivex.rxkotlin.subscribeBy +import javax.inject.Inject + +/** + * Created by anthonycr on 7/25/21. + */ +class DownloadPermissionsHelper @Inject constructor( + private val downloadHandler: DownloadHandler, + private val userPreferences: UserPreferences, + private val logger: Logger, + private val downloadsRepository: DownloadsRepository, + @DatabaseScheduler private val databaseScheduler: Scheduler +) { + + fun download( + activity: Activity, + url: String, + userAgent: String?, + contentDisposition: String?, + mimeType: String?, + contentLength: Long + ) { + PermissionsManager.getInstance().requestPermissionsIfNecessaryForResult(activity, arrayOf( + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ), + object : PermissionsResultAction() { + override fun onGranted() { + val fileName = URLUtil.guessFileName(url, contentDisposition, mimeType) + val downloadSize: String = if (contentLength > 0) { + Formatter.formatFileSize(activity, contentLength) + } else { + activity.getString(R.string.unknown_size) + } + val dialogClickListener = DialogInterface.OnClickListener { _, which: Int -> + when (which) { + DialogInterface.BUTTON_POSITIVE -> { + downloadHandler.onDownloadStart( + activity, + userPreferences, + url, + userAgent, + contentDisposition, + mimeType, + downloadSize + ) + downloadsRepository.addDownloadIfNotExists( + DownloadEntry( + url = url, + title = fileName, + contentSize = downloadSize + ) + ).subscribeOn(databaseScheduler) + .subscribeBy { + if (!it) { + logger.log(TAG, "error saving download to database") + } + } + } + DialogInterface.BUTTON_NEGATIVE -> { + } + } + } + val builder = AlertDialog.Builder(activity) // dialog + val message: String = activity.getString(R.string.dialog_download, downloadSize) + val dialog: Dialog = builder.setTitle(fileName) + .setMessage(message) + .setPositiveButton( + activity.resources.getString(R.string.action_download), + dialogClickListener + ) + .setNegativeButton( + activity.resources.getString(R.string.action_cancel), + dialogClickListener + ).show() + setDialogSize(activity, dialog) + logger.log(TAG, "Downloading: $fileName") + } + + override fun onDenied(permission: String) { + //TODO show message + logger.log(TAG, "Download permission denied") + } + }) + } + + companion object { + private const val TAG = "DownloadPermissionsHelper" + } +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/download/PendingDownload.kt b/app/src/main/java/acr/browser/lightning/_browser2/download/PendingDownload.kt new file mode 100644 index 000000000..acde59b4e --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/download/PendingDownload.kt @@ -0,0 +1,12 @@ +package acr.browser.lightning._browser2.download + +/** + * Created by anthonycr on 7/25/21. + */ +data class PendingDownload( + val url: String, + val userAgent: String?, + val contentDisposition: String?, + val mimeType: String?, + val contentLength: Long +) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt index 1b21c4669..c422c7dd7 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt @@ -1,5 +1,6 @@ package acr.browser.lightning._browser2.tab +import acr.browser.lightning._browser2.download.PendingDownload import acr.browser.lightning.ssl.SslCertificateInfo import acr.browser.lightning.ssl.SslState import acr.browser.lightning.view.FreezableBundleInitializer @@ -8,6 +9,7 @@ import android.graphics.Bitmap import android.os.Bundle import android.webkit.WebView import io.reactivex.Observable +import io.reactivex.subjects.PublishSubject /** * Created by anthonycr on 9/12/20. @@ -23,10 +25,22 @@ class TabAdapter( private var latentInitializer: FreezableBundleInitializer? = null private var findInPageQuery: String? = null + private val downloadsSubject = PublishSubject.create() init { webView.webViewClient = tabWebViewClient webView.webChromeClient = tabWebChromeClient + webView.setDownloadListener { url, userAgent, contentDisposition, mimetype, contentLength -> + downloadsSubject.onNext( + PendingDownload( + url = url, + userAgent = userAgent, + contentDisposition = contentDisposition, + mimeType = mimetype, + contentLength = contentLength + ) + ) + } if (tabInitializer is FreezableBundleInitializer) { latentInitializer = tabInitializer } else { @@ -58,7 +72,8 @@ class TabAdapter( override fun canGoForward(): Boolean = webView.canGoForward() - override fun canGoForwardChanges(): Observable = tabWebViewClient.goForwardObservable.hide() + override fun canGoForwardChanges(): Observable = + tabWebViewClient.goForwardObservable.hide() override fun reload() { webView.reload() @@ -127,6 +142,8 @@ class TabAdapter( override fun loadingProgress(): Observable = tabWebChromeClient.progressObservable.hide() + override fun downloadRequests(): Observable = downloadsSubject.hide() + override var isForeground: Boolean = false set(value) { field = value @@ -148,7 +165,5 @@ class TabAdapter( } override fun freeze(): Bundle = latentInitializer?.bundle - ?: Bundle(ClassLoader.getSystemClassLoader()).also { - webView.saveState(it) - } + ?: Bundle(ClassLoader.getSystemClassLoader()).also(webView::saveState) } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt index f972b0183..18640bc94 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt @@ -1,5 +1,6 @@ package acr.browser.lightning._browser2.tab +import acr.browser.lightning._browser2.download.PendingDownload import acr.browser.lightning.ssl.SslCertificateInfo import acr.browser.lightning.ssl.SslState import acr.browser.lightning.view.TabInitializer @@ -67,6 +68,8 @@ interface TabModel { fun loadingProgress(): Observable + fun downloadRequests(): Observable + // Lifecycle var isForeground: Boolean @@ -75,4 +78,5 @@ interface TabModel { fun freeze(): Bundle + } diff --git a/app/src/main/java/acr/browser/lightning/download/DownloadHandler.java b/app/src/main/java/acr/browser/lightning/download/DownloadHandler.java index b55f4e059..3d4dced27 100644 --- a/app/src/main/java/acr/browser/lightning/download/DownloadHandler.java +++ b/app/src/main/java/acr/browser/lightning/download/DownloadHandler.java @@ -89,8 +89,12 @@ public DownloadHandler(DownloadsRepository downloadsRepository, * @param mimeType The mimeType of the content reported by the server * @param contentSize The size of the content */ - public void onDownloadStart(@NonNull Activity context, @NonNull UserPreferences manager, @NonNull String url, String userAgent, - @Nullable String contentDisposition, String mimeType, @NonNull String contentSize) { + public void onDownloadStart(@NonNull Activity context, + @NonNull UserPreferences manager, + @NonNull String url, String userAgent, + @Nullable String contentDisposition, + @Nullable String mimeType, + @NonNull String contentSize) { logger.log(TAG, "DOWNLOAD: Trying to download from URL: " + url); logger.log(TAG, "DOWNLOAD: Content disposition: " + contentDisposition); @@ -174,9 +178,12 @@ private static String encodePath(@NonNull String path) { * @param contentSize The size of the content */ /* package */ - private void onDownloadStartNoStream(@NonNull final Activity context, @NonNull UserPreferences preferences, + private void onDownloadStartNoStream(@NonNull final Activity context, + @NonNull UserPreferences preferences, @NonNull String url, String userAgent, - String contentDisposition, @Nullable String mimetype, @NonNull String contentSize) { + @Nullable String contentDisposition, + @Nullable String mimetype, + @NonNull String contentSize) { final String filename = URLUtil.guessFileName(url, contentDisposition, mimetype); // Check to see if we have an SDCard @@ -293,17 +300,19 @@ private void onDownloadStartNoStream(@NonNull final Activity context, @NonNull U } // save download in database - UIController browserActivity = (UIController) context; - LightningView view = browserActivity.getTabModel().getCurrentTab(); + if (context instanceof UIController) { + UIController browserActivity = (UIController) context; + LightningView view = browserActivity.getTabModel().getCurrentTab(); - if (view != null && !view.isIncognito()) { - downloadsRepository.addDownloadIfNotExists(new DownloadEntry(url, filename, contentSize)) - .subscribeOn(databaseScheduler) - .subscribe(aBoolean -> { - if (!aBoolean) { - logger.log(TAG, "error saving download to database"); - } - }); + if (view != null && !view.isIncognito()) { + downloadsRepository.addDownloadIfNotExists(new DownloadEntry(url, filename, contentSize)) + .subscribeOn(databaseScheduler) + .subscribe(aBoolean -> { + if (!aBoolean) { + logger.log(TAG, "error saving download to database"); + } + }); + } } } From 13c95c4413c426b1cf9e89aade5a09c819fc2c53 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sat, 23 Jul 2022 20:03:44 -0400 Subject: [PATCH 071/161] Upgrading gradle --- app/build.gradle | 24 ++++++++---------------- build.gradle | 3 +-- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 49efb5c4e..864504475 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,13 +2,11 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' -apply plugin: 'com.getkeepsafe.dexcount' apply plugin: 'jacoco' apply plugin: 'com.github.ben-manes.versions' android { compileSdkVersion project.targetSdkVersion - buildToolsVersion project.buildToolsVersion defaultConfig { minSdkVersion project.minSdkVersion @@ -74,32 +72,26 @@ android { versionCode 102 } } - - lintOptions { - abortOnError true - } - packagingOptions { - exclude '.readme' + resources { + excludes += ['.readme'] + } } + + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + lint { + abortOnError true + } } jacoco { toolVersion = '0.7.9' // See http://www.eclemma.org/jacoco/ } -dexcount { - includeClasses = false - includeFieldCount = false - format = "tree" - orderByMethodCount = true - verbose = false -} - dependencies { // multidex debug debugImplementation 'androidx.multidex:multidex:2.0.1' diff --git a/build.gradle b/build.gradle index bc772cd62..0d6d8e0c5 100644 --- a/build.gradle +++ b/build.gradle @@ -5,8 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' - classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.3' + classpath 'com.android.tools.build:gradle:7.1.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" classpath 'com.github.ben-manes:gradle-versions-plugin:0.36.0' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1ea1674c7..a9b83217e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip From fdf68b3a84df7b2c34430be735a90d90a4348acd Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 26 Jul 2022 11:58:53 -0400 Subject: [PATCH 072/161] Updating gradle --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 0d6d8e0c5..cce635885 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' + classpath 'com.android.tools.build:gradle:7.2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" classpath 'com.github.ben-manes:gradle-versions-plugin:0.36.0' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a9b83217e..80fd5b4e4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip From a0499f4e1eae239d2755bb8bd714ff903e01c946 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 26 Jul 2022 11:59:12 -0400 Subject: [PATCH 073/161] Fixing issue where tab close can be triggered on tabs that are in the process of closing --- .../java/acr/browser/lightning/_browser2/BrowserPresenter.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index daf79c31c..bfd9c5ba1 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -381,6 +381,9 @@ class BrowserPresenter @Inject constructor( * TODO */ fun onTabClose(index: Int) { + if (index == -1) { + return + } val nextTab = viewState.tabs.nextSelected(index) val needToSelectNextTab = viewState.tabs[index].id == currentTab?.id From 04f430baaec0fc779936b58dcf1a2cf42547e20c Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 26 Jul 2022 12:15:37 -0400 Subject: [PATCH 074/161] Properly adding subscription to disposable --- .../acr/browser/lightning/_browser2/BrowserPresenter.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index bfd9c5ba1..4d107b9b1 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -135,7 +135,7 @@ class BrowserPresenter @Inject constructor( view = null compositeDisposable.dispose() - tabDisposable?.dispose() + tabDisposable.dispose() } /** @@ -934,10 +934,9 @@ class BrowserPresenter @Inject constructor( .flatMapCompletable { model.deleteTab(it.id) } .subscribeOn(mainScheduler) .subscribe() - BrowserContract.CloseTabEvent.CLOSE_ALL -> { - model.deleteAllTabs().subscribeOn(mainScheduler) + BrowserContract.CloseTabEvent.CLOSE_ALL -> + compositeDisposable += model.deleteAllTabs().subscribeOn(mainScheduler) .subscribeBy(onComplete = navigator::closeBrowser) - } } } From 52727388bcfb9d7d7d648ed2d41447274792a3f7 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 26 Jul 2022 12:17:53 -0400 Subject: [PATCH 075/161] Disable overscroll on webviews since it causes distortion of the webpages and looks weird --- .../java/acr/browser/lightning/_browser2/tab/WebViewFactory.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/WebViewFactory.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/WebViewFactory.kt index 249e33384..33825e121 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/WebViewFactory.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/WebViewFactory.kt @@ -68,6 +68,7 @@ class WebViewFactory @Inject constructor( isScrollbarFadingEnabled = true isSaveEnabled = true + overScrollMode = View.OVER_SCROLL_NEVER setNetworkAvailable(true) settings.apply { From e69fca049a0d04fac55a2ff7fc3d3ce5a50914c8 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 26 Jul 2022 15:51:22 -0400 Subject: [PATCH 076/161] Adjusting dark theme search bar background --- app/src/main/res/drawable/card_bg.xml | 4 ++-- app/src/main/res/drawable/card_bg_elevate.xml | 4 ++-- app/src/main/res/layout/browser_activity.xml | 2 +- app/src/main/res/values/attr.xml | 7 ++++--- app/src/main/res/values/styles.xml | 3 +++ 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/app/src/main/res/drawable/card_bg.xml b/app/src/main/res/drawable/card_bg.xml index f758b275c..11ed27470 100644 --- a/app/src/main/res/drawable/card_bg.xml +++ b/app/src/main/res/drawable/card_bg.xml @@ -7,8 +7,8 @@ android:shape="rectangle" > - + - \ No newline at end of file + diff --git a/app/src/main/res/drawable/card_bg_elevate.xml b/app/src/main/res/drawable/card_bg_elevate.xml index 4f00a5950..7d5fad698 100644 --- a/app/src/main/res/drawable/card_bg_elevate.xml +++ b/app/src/main/res/drawable/card_bg_elevate.xml @@ -16,8 +16,8 @@ android:shape="rectangle" > - + - \ No newline at end of file + diff --git a/app/src/main/res/layout/browser_activity.xml b/app/src/main/res/layout/browser_activity.xml index 409374974..ee809993a 100644 --- a/app/src/main/res/layout/browser_activity.xml +++ b/app/src/main/res/layout/browser_activity.xml @@ -91,7 +91,7 @@ + @@ -15,8 +16,8 @@ - - - + + + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 733e5baea..bfd298e39 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -52,6 +52,7 @@ @color/icon_light_theme @color/state_color_icons_light + @color/white @color/black @color/hint_text_light_theme @@ -81,6 +82,7 @@ @color/icon_dark_theme @color/state_color_icons_dark + @color/divider_dark @color/white @color/hint_text_dark_theme @@ -109,6 +111,7 @@ @color/icon_dark_theme @color/state_color_icons_dark + @color/gray_dark @color/white @color/hint_text_dark_theme From ef6c45f4d575b9d1bb67bd015f459b08eacc335d Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 26 Jul 2022 17:52:16 -0400 Subject: [PATCH 077/161] Support the tools menu in the browser --- .../lightning/_browser2/BrowserActivity.kt | 28 +++++++++ .../lightning/_browser2/BrowserContract.kt | 2 + .../lightning/_browser2/BrowserPresenter.kt | 24 +++++++- .../_browser2/BrowserStateAdapter.kt | 4 ++ .../lightning/_browser2/di/Browser2Module.kt | 12 +++- .../_browser2/tab/DefaultUserAgent.kt | 9 +++ .../lightning/_browser2/tab/TabAdapter.kt | 19 +++++- .../lightning/_browser2/tab/TabModel.kt | 2 + .../lightning/_browser2/tab/TabsRepository.kt | 59 +++++++++++-------- .../preference/UserPreferencesExtensions.kt | 9 +++ 10 files changed, 139 insertions(+), 29 deletions(-) create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/tab/DefaultUserAgent.kt diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index cd57a0314..cfce483a3 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -24,8 +24,12 @@ import acr.browser.lightning.di.injector import acr.browser.lightning.dialog.BrowserDialog import acr.browser.lightning.dialog.DialogItem import acr.browser.lightning.dialog.LightningDialogBuilder +import acr.browser.lightning.extensions.color +import acr.browser.lightning.extensions.drawable import acr.browser.lightning.search.SuggestionsAdapter import acr.browser.lightning.ssl.createSslDrawableForState +import acr.browser.lightning.utils.isSpecialUrl +import android.content.Context import android.content.Intent import android.os.Bundle import android.view.* @@ -469,6 +473,30 @@ class BrowserActivity : ThemableBrowserActivity() { binding.drawerLayout.closeDrawer(binding.tabDrawer) } + fun showToolsDialog(areAdsAllowed: Boolean, shouldShowAdBlockOption: Boolean) { + val whitelistString = if (areAdsAllowed) { + R.string.dialog_adblock_enable_for_site + } else { + R.string.dialog_adblock_disable_for_site + } + + BrowserDialog.showWithIcons( + this, getString(R.string.dialog_tools_title), + DialogItem( + icon = drawable(R.drawable.ic_action_desktop), + title = R.string.dialog_toggle_desktop, + onClick = presenter::onToggleDesktopAgent + ), + DialogItem( + icon = drawable(R.drawable.ic_block), + colorTint = color(R.color.error_red).takeIf { areAdsAllowed }, + title = whitelistString, + isConditionMet = shouldShowAdBlockOption, + onClick = presenter::onToggleAdBlocking + ) + ) + } + private fun ImageView.updateVisibilityForDrawable() { visibility = if (drawable == null) { View.GONE diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt index 583e544ab..0c5e2ed1c 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt @@ -61,6 +61,8 @@ interface BrowserContract { fun openTabDrawer() fun closeTabDrawer() + + fun showToolsDialog(areAdsAllowed: Boolean, shouldShowAdBlockOption: Boolean) } interface Model { diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 4d107b9b1..fa940aa66 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -10,6 +10,7 @@ import acr.browser.lightning._browser2.tab.TabModel import acr.browser.lightning._browser2.tab.TabViewState import acr.browser.lightning._browser2.ui.TabConfiguration import acr.browser.lightning._browser2.ui.UiConfiguration +import acr.browser.lightning.adblock.allowlist.AllowListModel import acr.browser.lightning.browser.SearchBoxModel import acr.browser.lightning.database.* import acr.browser.lightning.database.bookmark.BookmarkRepository @@ -62,7 +63,8 @@ class BrowserPresenter @Inject constructor( private val searchEngineProvider: SearchEngineProvider, @InitialUrl private val initialUrl: String?, private val uiConfiguration: UiConfiguration, - private val historyPageFactory: HistoryPageFactory + private val historyPageFactory: HistoryPageFactory, + private val allowListModel: AllowListModel ) { private var view: BrowserContract.View? = null @@ -610,6 +612,7 @@ class BrowserPresenter @Inject constructor( when (val item = viewState.bookmarks[index]) { is Bookmark.Entry -> view?.showBookmarkOptionsDialog(item) is Bookmark.Folder.Entry -> view?.showFolderOptionsDialog(item) + Bookmark.Folder.Root -> Unit // Root is not clickable } } @@ -617,7 +620,26 @@ class BrowserPresenter @Inject constructor( * TODO */ fun onToolsClick() { + val currentUrl = currentTab?.url ?: return + view?.showToolsDialog( + areAdsAllowed = allowListModel.isUrlAllowedAds(currentUrl), + shouldShowAdBlockOption = !currentUrl.isSpecialUrl() + ) + } + + fun onToggleDesktopAgent() { + currentTab?.toggleDesktopAgent() + currentTab?.reload() + } + fun onToggleAdBlocking() { + val currentUrl = currentTab?.url ?: return + if (allowListModel.isUrlAllowedAds(currentUrl)) { + allowListModel.removeUrlFromAllowList(currentUrl) + } else { + allowListModel.addUrlToAllowList(currentUrl) + } + currentTab?.reload() } /** diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt index a982424da..84155be4e 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt @@ -119,4 +119,8 @@ class BrowserStateAdapter(private val browserActivity: BrowserActivity) : Browse browserActivity.closeTabDrawer() } + override fun showToolsDialog(areAdsAllowed: Boolean, shouldShowAdBlockOption: Boolean) { + browserActivity.showToolsDialog(areAdsAllowed, shouldShowAdBlockOption) + } + } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt index d86a19011..416c5b5f7 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt @@ -2,6 +2,8 @@ package acr.browser.lightning._browser2.di import acr.browser.lightning._browser2.BrowserContract import acr.browser.lightning._browser2.search.IntentExtractor +import acr.browser.lightning._browser2.tab.DefaultUserAgent +import acr.browser.lightning._browser2.tab.WebViewFactory import acr.browser.lightning._browser2.ui.BookmarkConfiguration import acr.browser.lightning._browser2.ui.TabConfiguration import acr.browser.lightning._browser2.ui.UiConfiguration @@ -12,7 +14,9 @@ import acr.browser.lightning.browser.BrowserView import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.utils.IntentUtils import android.app.Activity +import android.app.Application import android.content.Intent +import android.webkit.WebSettings import dagger.Module import dagger.Provides import javax.inject.Provider @@ -40,7 +44,8 @@ class Browser2Module { fun providesInitialUrl( @InitialIntent initialIntent: Intent, intentExtractor: IntentExtractor - ): String? = (intentExtractor.extractUrlFromIntent(initialIntent) as? BrowserContract.Action.LoadUrl)?.url + ): String? = + (intentExtractor.extractUrlFromIntent(initialIntent) as? BrowserContract.Action.LoadUrl)?.url // TODO: auto inject intent utils @Provides @@ -62,4 +67,9 @@ class Browser2Module { } ) + @DefaultUserAgent + @Provides + fun providesDefaultUserAgent(application: Application): String = + WebSettings.getDefaultUserAgent(application) + } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/DefaultUserAgent.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/DefaultUserAgent.kt new file mode 100644 index 000000000..078f65e6d --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/DefaultUserAgent.kt @@ -0,0 +1,9 @@ +package acr.browser.lightning._browser2.tab + +import javax.inject.Qualifier + +/** + * The default user agent marker. + */ +@Qualifier +annotation class DefaultUserAgent diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt index c422c7dd7..b5f1fdb1d 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt @@ -1,6 +1,9 @@ package acr.browser.lightning._browser2.tab import acr.browser.lightning._browser2.download.PendingDownload +import acr.browser.lightning.constant.DESKTOP_USER_AGENT +import acr.browser.lightning.preference.UserPreferences +import acr.browser.lightning.preference.userAgent import acr.browser.lightning.ssl.SslCertificateInfo import acr.browser.lightning.ssl.SslState import acr.browser.lightning.view.FreezableBundleInitializer @@ -19,12 +22,15 @@ class TabAdapter( private val webView: WebView, private val requestHeaders: Map, private val tabWebViewClient: TabWebViewClient, - private val tabWebChromeClient: TabWebChromeClient + private val tabWebChromeClient: TabWebChromeClient, + private val userPreferences: UserPreferences, + private val defaultUserAgent: String ) : TabModel { private var latentInitializer: FreezableBundleInitializer? = null private var findInPageQuery: String? = null + private var toggleDesktop: Boolean = false private val downloadsSubject = PublishSubject.create() init { @@ -75,6 +81,17 @@ class TabAdapter( override fun canGoForwardChanges(): Observable = tabWebViewClient.goForwardObservable.hide() + override fun toggleDesktopAgent() { + if (!toggleDesktop) { + webView.settings.userAgentString = DESKTOP_USER_AGENT + } else { + webView.settings.userAgentString = userPreferences.userAgent(defaultUserAgent) + + } + + toggleDesktop = !toggleDesktop + } + override fun reload() { webView.reload() } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt index 18640bc94..043561e3c 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt @@ -30,6 +30,8 @@ interface TabModel { fun canGoForwardChanges(): Observable + fun toggleDesktopAgent() + fun reload() fun stopLoading() diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt index dbf52c6dd..a2571be14 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt @@ -6,6 +6,7 @@ import acr.browser.lightning.adblock.AdBlocker import acr.browser.lightning.adblock.allowlist.AllowListModel import acr.browser.lightning.di.DiskScheduler import acr.browser.lightning.di.MainScheduler +import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.view.* import io.reactivex.* import io.reactivex.subjects.PublishSubject @@ -22,7 +23,9 @@ class TabsRepository @Inject constructor( @DiskScheduler private val diskScheduler: Scheduler, @MainScheduler private val mainScheduler: Scheduler, private val bundleStore: BundleStore, - private val urlHandler: UrlHandler + private val urlHandler: UrlHandler, + private val userPreferences: UserPreferences, + @DefaultUserAgent private val defaultUserAgent: String ) : BrowserContract.Model { private var selectedTab: TabModel? = null @@ -48,24 +51,27 @@ class TabsRepository @Inject constructor( tabsListObservable.onNext(tabsList) } - override fun createTab(tabInitializer: TabInitializer): Single = Single.fromCallable { - val webView = webViewFactory.createWebView(isIncognito = false) - val headers = webViewFactory.createRequestHeaders() - tabPager.addTab(webView) - val tabAdapter = TabAdapter( - tabInitializer, - webView, - headers, - TabWebViewClient(adBlocker, allowListModel, urlHandler, headers), - TabWebChromeClient() - ) - - tabsList = tabsList + tabAdapter - - return@fromCallable tabAdapter - }.doOnSuccess { - tabsListObservable.onNext(tabsList) - } + override fun createTab(tabInitializer: TabInitializer): Single = + Single.fromCallable { + val webView = webViewFactory.createWebView(isIncognito = false) + val headers = webViewFactory.createRequestHeaders() + tabPager.addTab(webView) + val tabAdapter = TabAdapter( + tabInitializer, + webView, + headers, + TabWebViewClient(adBlocker, allowListModel, urlHandler, headers), + TabWebChromeClient(), + userPreferences, + defaultUserAgent + ) + + tabsList = tabsList + tabAdapter + + return@fromCallable tabAdapter + }.doOnSuccess { + tabsListObservable.onNext(tabsList) + } override fun selectTab(id: Int): TabModel { val selected = tabsList.forId(id) @@ -80,13 +86,14 @@ class TabsRepository @Inject constructor( override fun tabsListChanges(): Observable> = tabsListObservable.hide() - override fun initializeTabs(): Maybe> = Single.fromCallable(bundleStore::retrieve) - .flatMapObservable { Observable.fromIterable(it) } - .subscribeOn(diskScheduler) - .observeOn(mainScheduler) - .flatMapSingle(::createTab) - .toList() - .filter(MutableList::isNotEmpty) + override fun initializeTabs(): Maybe> = + Single.fromCallable(bundleStore::retrieve) + .flatMapObservable { Observable.fromIterable(it) } + .subscribeOn(diskScheduler) + .observeOn(mainScheduler) + .flatMapSingle(::createTab) + .toList() + .filter(MutableList::isNotEmpty) override fun freeze() { bundleStore.save(tabsList) diff --git a/app/src/main/java/acr/browser/lightning/preference/UserPreferencesExtensions.kt b/app/src/main/java/acr/browser/lightning/preference/UserPreferencesExtensions.kt index 8c8e6a24c..8ddcc17fe 100644 --- a/app/src/main/java/acr/browser/lightning/preference/UserPreferencesExtensions.kt +++ b/app/src/main/java/acr/browser/lightning/preference/UserPreferencesExtensions.kt @@ -16,3 +16,12 @@ fun UserPreferences.userAgent(application: Application): String = 4 -> userAgentString.takeIf(String::isNotEmpty) ?: " " else -> throw UnsupportedOperationException("Unknown userAgentChoice: $choice") } + +fun UserPreferences.userAgent(defaultUserAgent: String): String = + when (val choice = userAgentChoice) { + 1 -> defaultUserAgent + 2 -> DESKTOP_USER_AGENT + 3 -> MOBILE_USER_AGENT + 4 -> userAgentString.takeIf(String::isNotEmpty) ?: " " + else -> throw UnsupportedOperationException("Unknown userAgentChoice: $choice") + } From c6f218a38ce5cab359c5ce3acdcda83f831f81b9 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 26 Jul 2022 19:40:02 -0400 Subject: [PATCH 078/161] Fixe reading mode button not working --- .../java/acr/browser/lightning/_browser2/BrowserPresenter.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index fa940aa66..dfdbce3ad 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -857,7 +857,8 @@ class BrowserPresenter @Inject constructor( * TODO */ fun onReadingModeClick() { - + currentTab?.url?.takeIf { !it.isSpecialUrl() } + ?.let(navigator::openReaderMode) } /** From e2ff9e5ee1cb2122b739477a83e703685e1d5718 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 27 Jul 2022 11:23:11 -0400 Subject: [PATCH 079/161] Implementing incognito mode --- app/src/main/AndroidManifest.xml | 8 +- .../lightning/_browser2/BrowserActivity.kt | 38 ++++++-- .../lightning/_browser2/BrowserContract.kt | 2 + .../lightning/_browser2/BrowserNavigator.kt | 4 + .../lightning/_browser2/BrowserPresenter.kt | 30 ++++-- .../_browser2/DefaultBrowserActivity.kt | 14 +++ .../_browser2/IncognitoBrowserActivity.kt | 31 +++++++ .../_browser2/data/CookieAdministrator.kt | 13 +++ .../data/DefaultCookieAdministrator.kt | 24 +++++ .../data/IncognitoCookieAdministrator.kt | 30 ++++++ .../_browser2/di/Browser2BindsModule.kt | 3 - .../_browser2/di/Browser2Component.kt | 6 ++ .../lightning/_browser2/di/Browser2Module.kt | 54 +++++++++++ .../notification/DefaultTabCountNotifier.kt | 8 ++ .../notification/IncognitoTabCountNotifier.kt | 19 ++++ .../notification/TabCountNotifier.kt | 10 ++ .../lightning/_browser2/tab/TabsRepository.kt | 2 +- .../lightning/_browser2/tab/UrlHandler.kt | 28 ++++-- .../lightning/_browser2/tab/WebViewFactory.kt | 18 ++-- .../_browser2/tab/bundle/BundleStore.kt | 92 ++----------------- .../tab/bundle/DefaultBundleStore.kt | 91 ++++++++++++++++++ .../tab/bundle/IncognitoBundleStore.kt | 15 +++ .../notifications/IncognitoNotification.kt | 32 ++++--- 23 files changed, 432 insertions(+), 140 deletions(-) create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/DefaultBrowserActivity.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/IncognitoBrowserActivity.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/data/CookieAdministrator.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/data/DefaultCookieAdministrator.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/data/IncognitoCookieAdministrator.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/notification/DefaultTabCountNotifier.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/notification/IncognitoTabCountNotifier.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/notification/TabCountNotifier.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/DefaultBundleStore.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/IncognitoBundleStore.kt diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6123a3040..029224013 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,12 +48,11 @@ android:value="2.1"/> @@ -139,14 +138,13 @@ diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index cfce483a3..8f15e6860 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -28,14 +28,14 @@ import acr.browser.lightning.extensions.color import acr.browser.lightning.extensions.drawable import acr.browser.lightning.search.SuggestionsAdapter import acr.browser.lightning.ssl.createSslDrawableForState -import acr.browser.lightning.utils.isSpecialUrl -import android.content.Context import android.content.Intent import android.os.Bundle import android.view.* import android.view.inputmethod.InputMethodManager import android.widget.AdapterView import android.widget.ImageView +import androidx.annotation.DrawableRes +import androidx.annotation.MenuRes import androidx.core.view.isVisible import androidx.drawerlayout.widget.DrawerLayout import androidx.recyclerview.widget.LinearLayoutManager @@ -47,7 +47,7 @@ import javax.inject.Inject /** * Created by anthonycr on 9/11/20. */ -class BrowserActivity : ThemableBrowserActivity() { +abstract class BrowserActivity : ThemableBrowserActivity() { private lateinit var binding: BrowserActivityBinding private lateinit var tabsAdapter: ListAdapter @@ -80,6 +80,23 @@ class BrowserActivity : ThemableBrowserActivity() { @Inject internal lateinit var uiConfiguration: UiConfiguration + /** + * True if the activity is operating in incognito mode, false otherwise. + */ + abstract fun isIncognito(): Boolean + + /** + * Provide the menu used by the browser instance. + */ + @MenuRes + abstract fun menu(): Int + + /** + * Provide the home icon used by the browser instance. + */ + @DrawableRes + abstract fun homeIcon(): Int + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) binding = BrowserActivityBinding.inflate(LayoutInflater.from(this)) @@ -93,6 +110,7 @@ class BrowserActivity : ThemableBrowserActivity() { .toolbarRoot(binding.uiLayout) .toolbar(binding.toolbarLayout) .initialIntent(intent) + .incognitoMode(isIncognito()) .build() .inject(this) @@ -113,8 +131,10 @@ class BrowserActivity : ThemableBrowserActivity() { } binding.homeImageView.isVisible = - uiConfiguration.tabConfiguration == TabConfiguration.DESKTOP - binding.tabCountView.isVisible = uiConfiguration.tabConfiguration == TabConfiguration.DRAWER + uiConfiguration.tabConfiguration == TabConfiguration.DESKTOP || isIncognito() + binding.homeImageView.setImageResource(homeIcon()) + binding.tabCountView.isVisible = + uiConfiguration.tabConfiguration == TabConfiguration.DRAWER && !isIncognito() if (uiConfiguration.tabConfiguration == TabConfiguration.DESKTOP) { binding.drawerLayout.setDrawerLockMode( @@ -157,7 +177,7 @@ class BrowserActivity : ThemableBrowserActivity() { presenter.onViewAttached(BrowserStateAdapter(this)) - val suggestionsAdapter = SuggestionsAdapter(this, isIncognito = false).apply { + val suggestionsAdapter = SuggestionsAdapter(this, isIncognito = isIncognito()).apply { onSuggestionInsertClick = { if (it is SearchSuggestion) { binding.search.setText(it.title) @@ -229,7 +249,7 @@ class BrowserActivity : ThemableBrowserActivity() { } override fun onCreateOptionsMenu(menu: Menu): Boolean { - menuInflater.inflate(R.menu.main, menu) + menuInflater.inflate(menu(), menu) return super.onCreateOptionsMenu(menu) } @@ -379,7 +399,7 @@ class BrowserActivity : ThemableBrowserActivity() { }, DialogItem( title = R.string.dialog_open_incognito_tab, - isConditionMet = this is BrowserActivity // TODO: Change for incognito + isConditionMet = !isIncognito() ) { presenter.onLinkLongPressEvent( longPress, @@ -413,7 +433,7 @@ class BrowserActivity : ThemableBrowserActivity() { }, DialogItem( title = R.string.dialog_open_incognito_tab, - isConditionMet = this is BrowserActivity // TODO: Change for incognito + isConditionMet = !isIncognito() ) { presenter.onImageLongPressEvent( longPress, diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt index 0c5e2ed1c..b99e29e62 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt @@ -104,6 +104,8 @@ interface BrowserContract { fun download(pendingDownload: PendingDownload) fun backgroundBrowser() + + fun launchIncognito(url: String?) } enum class CloseTabEvent { diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserNavigator.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserNavigator.kt index 69880029e..7a43e7a4c 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserNavigator.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserNavigator.kt @@ -70,6 +70,10 @@ class BrowserNavigator @Inject constructor( activity.moveTaskToBack(true) } + override fun launchIncognito(url: String?) { + IncognitoBrowserActivity.launch(activity, url) + } + companion object { private const val TAG = "BrowserNavigator" } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index dfdbce3ad..723c31c6c 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -1,11 +1,14 @@ package acr.browser.lightning._browser2 +import acr.browser.lightning._browser2.data.CookieAdministrator import acr.browser.lightning._browser2.di.Browser2Scope +import acr.browser.lightning._browser2.di.IncognitoMode import acr.browser.lightning._browser2.di.InitialUrl import acr.browser.lightning._browser2.download.PendingDownload import acr.browser.lightning._browser2.history.HistoryRecord import acr.browser.lightning._browser2.keys.KeyCombo import acr.browser.lightning._browser2.menu.MenuSelection +import acr.browser.lightning._browser2.notification.TabCountNotifier import acr.browser.lightning._browser2.tab.TabModel import acr.browser.lightning._browser2.tab.TabViewState import acr.browser.lightning._browser2.ui.TabConfiguration @@ -32,7 +35,6 @@ import io.reactivex.Observable import io.reactivex.Scheduler import io.reactivex.Single import io.reactivex.disposables.CompositeDisposable -import io.reactivex.disposables.Disposable import io.reactivex.rxkotlin.Observables import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.subscribeBy @@ -64,7 +66,10 @@ class BrowserPresenter @Inject constructor( @InitialUrl private val initialUrl: String?, private val uiConfiguration: UiConfiguration, private val historyPageFactory: HistoryPageFactory, - private val allowListModel: AllowListModel + private val allowListModel: AllowListModel, + @IncognitoMode private val incognitoMode: Boolean, + private val cookieAdministrator: CookieAdministrator, + private val tabCountNotifier: TabCountNotifier ) { private var view: BrowserContract.View? = null @@ -97,6 +102,8 @@ class BrowserPresenter @Inject constructor( this.view = view view.updateState(viewState) + cookieAdministrator.adjustCookieSettings() + currentFolder = Bookmark.Folder.Root compositeDisposable += bookmarkRepository.bookmarksAndFolders(folder = Bookmark.Folder.Root) .subscribeOn(databaseScheduler) @@ -112,6 +119,8 @@ class BrowserPresenter @Inject constructor( allTabsDisposable.clear() list.subscribeToUpdates(allTabsDisposable) + + tabCountNotifier.notifyTabCountChange(list.size) } compositeDisposable += model.initializeTabs() @@ -281,7 +290,7 @@ class BrowserPresenter @Inject constructor( fun onMenuClick(menuSelection: MenuSelection) { when (menuSelection) { MenuSelection.NEW_TAB -> onNewTabClick() - MenuSelection.NEW_INCOGNITO_TAB -> TODO() + MenuSelection.NEW_INCOGNITO_TAB -> navigator.launchIncognito(url = null) MenuSelection.SHARE -> currentTab?.url?.takeIf { !it.isSpecialUrl() }?.let { navigator.sharePage(url = it, title = currentTab?.title) } @@ -409,7 +418,11 @@ class BrowserPresenter @Inject constructor( currentFolder != Bookmark.Folder.Root -> onBookmarkMenuClick() currentTab?.canGoBack() == true -> currentTab?.goBack() currentTab == null -> navigator.closeBrowser() - else -> navigator.backgroundBrowser() + else -> if (incognitoMode) { + navigator.closeBrowser() + } else { + navigator.backgroundBrowser() + } } } @@ -754,7 +767,7 @@ class BrowserPresenter @Inject constructor( createNewTabAndSelect(UrlInitializer(bookmark.url), shouldSelect = true) BrowserContract.BookmarkOptionEvent.BACKGROUND_TAB -> createNewTabAndSelect(UrlInitializer(bookmark.url), shouldSelect = false) - BrowserContract.BookmarkOptionEvent.INCOGNITO_TAB -> TODO() + BrowserContract.BookmarkOptionEvent.INCOGNITO_TAB -> navigator.launchIncognito(bookmark.url) BrowserContract.BookmarkOptionEvent.SHARE -> navigator.sharePage(url = bookmark.url, title = bookmark.title) BrowserContract.BookmarkOptionEvent.COPY_LINK -> @@ -837,7 +850,8 @@ class BrowserPresenter @Inject constructor( createNewTabAndSelect(UrlInitializer(historyEntry.url), shouldSelect = true) BrowserContract.HistoryOptionEvent.BACKGROUND_TAB -> createNewTabAndSelect(UrlInitializer(historyEntry.url), shouldSelect = false) - BrowserContract.HistoryOptionEvent.INCOGNITO_TAB -> TODO() + BrowserContract.HistoryOptionEvent.INCOGNITO_TAB -> + navigator.launchIncognito(historyEntry.url) BrowserContract.HistoryOptionEvent.SHARE -> navigator.sharePage(url = historyEntry.url, title = historyEntry.title) BrowserContract.HistoryOptionEvent.COPY_LINK -> navigator.copyPageLink(historyEntry.url) @@ -982,7 +996,7 @@ class BrowserPresenter @Inject constructor( shouldSelect = false ) } - BrowserContract.LinkLongPressEvent.INCOGNITO_TAB -> TODO() + BrowserContract.LinkLongPressEvent.INCOGNITO_TAB -> longPress.targetUrl?.let(navigator::launchIncognito) BrowserContract.LinkLongPressEvent.SHARE -> longPress.targetUrl?.let { navigator.sharePage(url = it, title = null) } BrowserContract.LinkLongPressEvent.COPY_LINK -> @@ -1009,7 +1023,7 @@ class BrowserPresenter @Inject constructor( shouldSelect = false ) } - BrowserContract.ImageLongPressEvent.INCOGNITO_TAB -> TODO() + BrowserContract.ImageLongPressEvent.INCOGNITO_TAB -> longPress.targetUrl?.let(navigator::launchIncognito) BrowserContract.ImageLongPressEvent.SHARE -> longPress.targetUrl?.let { navigator.sharePage(url = it, title = null) } BrowserContract.ImageLongPressEvent.COPY_LINK -> diff --git a/app/src/main/java/acr/browser/lightning/_browser2/DefaultBrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/DefaultBrowserActivity.kt new file mode 100644 index 000000000..03227c107 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/DefaultBrowserActivity.kt @@ -0,0 +1,14 @@ +package acr.browser.lightning._browser2 + +import acr.browser.lightning.R + +/** + * Created by anthonycr on 7/26/22. + */ +class DefaultBrowserActivity : BrowserActivity() { + override fun isIncognito(): Boolean = false + + override fun menu(): Int = R.menu.main + + override fun homeIcon(): Int = R.drawable.ic_action_home +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/IncognitoBrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/IncognitoBrowserActivity.kt new file mode 100644 index 000000000..a42f152c8 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/IncognitoBrowserActivity.kt @@ -0,0 +1,31 @@ +package acr.browser.lightning._browser2 + +import acr.browser.lightning.R +import android.app.Activity +import android.content.Intent +import androidx.core.net.toUri + +/** + * Created by anthonycr on 7/26/22. + */ +class IncognitoBrowserActivity : BrowserActivity() { + + override fun provideThemeOverride(): Int = R.style.Theme_DarkTheme + + override fun isIncognito(): Boolean = true + + override fun menu(): Int = R.menu.incognito + + override fun homeIcon(): Int = R.drawable.incognito_mode + + companion object { + fun intent(activity: Activity, url: String? = null): Intent = + Intent(activity, IncognitoBrowserActivity::class.java).apply { + data = url?.let(String::toUri) + } + + fun launch(activity: Activity, url: String?) { + activity.startActivity(intent(activity, url)) + } + } +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/data/CookieAdministrator.kt b/app/src/main/java/acr/browser/lightning/_browser2/data/CookieAdministrator.kt new file mode 100644 index 000000000..d500cfb2b --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/data/CookieAdministrator.kt @@ -0,0 +1,13 @@ +package acr.browser.lightning._browser2.data + +/** + * The administrator used to manage browser cookie preferences. + */ +interface CookieAdministrator { + + /** + * Adjust the cookie setting based on the current preferences. + */ + fun adjustCookieSettings() + +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/data/DefaultCookieAdministrator.kt b/app/src/main/java/acr/browser/lightning/_browser2/data/DefaultCookieAdministrator.kt new file mode 100644 index 000000000..994e5477e --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/data/DefaultCookieAdministrator.kt @@ -0,0 +1,24 @@ +package acr.browser.lightning._browser2.data + +import acr.browser.lightning.preference.UserPreferences +import android.app.Activity +import android.os.Build +import android.webkit.CookieManager +import android.webkit.CookieSyncManager +import javax.inject.Inject + +/** + * The default cookie administrator that sets cookie preferences for the default browser instance. + */ +class DefaultCookieAdministrator @Inject constructor( + private val activity: Activity, + private val userPreferences: UserPreferences +) : CookieAdministrator { + override fun adjustCookieSettings() { + val cookieManager = CookieManager.getInstance() + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { + CookieSyncManager.createInstance(activity) + } + cookieManager.setAcceptCookie(userPreferences.cookiesEnabled) + } +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/data/IncognitoCookieAdministrator.kt b/app/src/main/java/acr/browser/lightning/_browser2/data/IncognitoCookieAdministrator.kt new file mode 100644 index 000000000..87c0ad101 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/data/IncognitoCookieAdministrator.kt @@ -0,0 +1,30 @@ +package acr.browser.lightning._browser2.data + +import acr.browser.lightning.Capabilities +import acr.browser.lightning.isSupported +import acr.browser.lightning.preference.UserPreferences +import android.app.Activity +import android.os.Build +import android.webkit.CookieManager +import android.webkit.CookieSyncManager +import javax.inject.Inject + +/** + * The cookie administrator used to set cookie preferences for the incognito instance. + */ +class IncognitoCookieAdministrator @Inject constructor( + private val activity: Activity, + private val userPreferences: UserPreferences +) : CookieAdministrator { + override fun adjustCookieSettings() { + val cookieManager = CookieManager.getInstance() + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { + CookieSyncManager.createInstance(activity) + } + if (Capabilities.FULL_INCOGNITO.isSupported) { + cookieManager.setAcceptCookie(userPreferences.cookiesEnabled) + } else { + cookieManager.setAcceptCookie(userPreferences.incognitoCookiesEnabled) + } + } +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2BindsModule.kt b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2BindsModule.kt index cd1105558..705e7183c 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2BindsModule.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2BindsModule.kt @@ -19,9 +19,6 @@ interface Browser2BindsModule { @Binds fun bindsBrowserModel(tabsRepository: TabsRepository): BrowserContract.Model - @Binds - fun bindsHistoryRecord(defaultHistoryRecord: DefaultHistoryRecord): HistoryRecord - @Binds fun bindsFaviconImageLoader(faviconImageLoader: FaviconImageLoader): ImageLoader diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt index 40afd7aee..6fa476d83 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt @@ -35,6 +35,9 @@ interface Browser2Component { @BindsInstance fun initialIntent(@InitialIntent intent: Intent): Builder + @BindsInstance + fun incognitoMode(@IncognitoMode incognitoMode: Boolean): Builder + fun build(): Browser2Component } @@ -48,3 +51,6 @@ annotation class InitialIntent @Qualifier annotation class InitialUrl + +@Qualifier +annotation class IncognitoMode diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt index 416c5b5f7..a7814b963 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt @@ -1,9 +1,20 @@ package acr.browser.lightning._browser2.di import acr.browser.lightning._browser2.BrowserContract +import acr.browser.lightning._browser2.data.CookieAdministrator +import acr.browser.lightning._browser2.data.DefaultCookieAdministrator +import acr.browser.lightning._browser2.history.DefaultHistoryRecord +import acr.browser.lightning._browser2.history.HistoryRecord +import acr.browser.lightning._browser2.history.NoOpHistoryRecord +import acr.browser.lightning._browser2.notification.DefaultTabCountNotifier +import acr.browser.lightning._browser2.notification.IncognitoTabCountNotifier +import acr.browser.lightning._browser2.notification.TabCountNotifier import acr.browser.lightning._browser2.search.IntentExtractor import acr.browser.lightning._browser2.tab.DefaultUserAgent import acr.browser.lightning._browser2.tab.WebViewFactory +import acr.browser.lightning._browser2.tab.bundle.BundleStore +import acr.browser.lightning._browser2.tab.bundle.DefaultBundleStore +import acr.browser.lightning._browser2.tab.bundle.IncognitoBundleStore import acr.browser.lightning._browser2.ui.BookmarkConfiguration import acr.browser.lightning._browser2.ui.TabConfiguration import acr.browser.lightning._browser2.ui.UiConfiguration @@ -17,6 +28,7 @@ import android.app.Activity import android.app.Application import android.content.Intent import android.webkit.WebSettings +import dagger.Binds import dagger.Module import dagger.Provides import javax.inject.Provider @@ -72,4 +84,46 @@ class Browser2Module { fun providesDefaultUserAgent(application: Application): String = WebSettings.getDefaultUserAgent(application) + + @Provides + fun providesHistoryRecord( + @IncognitoMode incognitoMode: Boolean, + defaultHistoryRecord: DefaultHistoryRecord + ): HistoryRecord = if (incognitoMode) { + NoOpHistoryRecord + } else { + defaultHistoryRecord + } + + @Provides + fun providesCookieAdministrator( + @IncognitoMode incognitoMode: Boolean, + defaultCookieAdministrator: DefaultCookieAdministrator, + incognitoCookieAdministrator: DefaultCookieAdministrator + ): CookieAdministrator = if (incognitoMode) { + incognitoCookieAdministrator + } else { + defaultCookieAdministrator + } + + @Provides + fun providesTabCountNotifier( + @IncognitoMode incognitoMode: Boolean, + incognitoTabCountNotifier: IncognitoTabCountNotifier + ): TabCountNotifier = if (incognitoMode) { + incognitoTabCountNotifier + } else { + DefaultTabCountNotifier + } + + @Provides + fun providesBundleStore( + @IncognitoMode incognitoMode: Boolean, + defaultBundleStore: DefaultBundleStore + ): BundleStore = if (incognitoMode) { + IncognitoBundleStore + } else { + defaultBundleStore + } + } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/notification/DefaultTabCountNotifier.kt b/app/src/main/java/acr/browser/lightning/_browser2/notification/DefaultTabCountNotifier.kt new file mode 100644 index 000000000..84f0d1241 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/notification/DefaultTabCountNotifier.kt @@ -0,0 +1,8 @@ +package acr.browser.lightning._browser2.notification + +/** + * Created by anthonycr on 7/27/22. + */ +object DefaultTabCountNotifier : TabCountNotifier { + override fun notifyTabCountChange(total: Int) = Unit +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/notification/IncognitoTabCountNotifier.kt b/app/src/main/java/acr/browser/lightning/_browser2/notification/IncognitoTabCountNotifier.kt new file mode 100644 index 000000000..fbc46b89f --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/notification/IncognitoTabCountNotifier.kt @@ -0,0 +1,19 @@ +package acr.browser.lightning._browser2.notification + +import acr.browser.lightning.notifications.IncognitoNotification +import javax.inject.Inject + +/** + * Created by anthonycr on 7/27/22. + */ +class IncognitoTabCountNotifier @Inject constructor( + private val incognitoNotification: IncognitoNotification +) : TabCountNotifier { + override fun notifyTabCountChange(total: Int) { + if (total > 0) { + incognitoNotification.show(total) + } else { + incognitoNotification.hide() + } + } +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/notification/TabCountNotifier.kt b/app/src/main/java/acr/browser/lightning/_browser2/notification/TabCountNotifier.kt new file mode 100644 index 000000000..411e8631e --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/notification/TabCountNotifier.kt @@ -0,0 +1,10 @@ +package acr.browser.lightning._browser2.notification + +/** + * Created by anthonycr on 7/27/22. + */ +interface TabCountNotifier { + + fun notifyTabCountChange(total: Int) + +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt index a2571be14..a5491d806 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt @@ -53,7 +53,7 @@ class TabsRepository @Inject constructor( override fun createTab(tabInitializer: TabInitializer): Single = Single.fromCallable { - val webView = webViewFactory.createWebView(isIncognito = false) + val webView = webViewFactory.createWebView() val headers = webViewFactory.createRequestHeaders() tabPager.addTab(webView) val tabAdapter = TabAdapter( diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/UrlHandler.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/UrlHandler.kt index e52960f67..09674477d 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/UrlHandler.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/UrlHandler.kt @@ -2,6 +2,7 @@ package acr.browser.lightning._browser2.tab import acr.browser.lightning.BuildConfig import acr.browser.lightning.R +import acr.browser.lightning._browser2.di.IncognitoMode import acr.browser.lightning.constant.FILE import acr.browser.lightning.extensions.snackbar import acr.browser.lightning.log.Logger @@ -27,7 +28,8 @@ import javax.inject.Inject class UrlHandler @Inject constructor( private val activity: Activity, private val logger: Logger, - private val intentUtils: IntentUtils + private val intentUtils: IntentUtils, + @IncognitoMode private val incognitoMode: Boolean ) { fun shouldOverrideLoading( @@ -42,11 +44,10 @@ class UrlHandler @Inject constructor( // return true // } - // TODO: handle incognito -// if (lightningView.isIncognito) { -// // If we are in incognito, immediately load, we don't want the url to leave the app -// return continueLoadingUrl(view, url, headers) -// } + if (incognitoMode) { + // If we are in incognito, immediately load, we don't want the url to leave the app + return continueLoadingUrl(view, url, headers) + } if (URLUtil.isAboutUrl(url)) { // If this is an about page, immediately load, we don't need to leave the app return continueLoadingUrl(view, url, headers) @@ -61,12 +62,17 @@ class UrlHandler @Inject constructor( } } - private fun continueLoadingUrl(webView: WebView, url: String, headers: Map): Boolean { + private fun continueLoadingUrl( + webView: WebView, + url: String, + headers: Map + ): Boolean { if (!URLUtil.isNetworkUrl(url) && !URLUtil.isFileUrl(url) && !URLUtil.isAboutUrl(url) && !URLUtil.isDataUrl(url) - && !URLUtil.isJavaScriptUrl(url)) { + && !URLUtil.isJavaScriptUrl(url) + ) { webView.stopLoading() return true } @@ -114,7 +120,11 @@ class UrlHandler @Inject constructor( val intent = Intent(Intent.ACTION_VIEW) intent.flags = Intent.FLAG_GRANT_READ_URI_PERMISSION - val contentUri = FileProvider.getUriForFile(activity, BuildConfig.APPLICATION_ID + ".fileprovider", file) + val contentUri = FileProvider.getUriForFile( + activity, + BuildConfig.APPLICATION_ID + ".fileprovider", + file + ) intent.setDataAndType(contentUri, newMimeType) try { diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/WebViewFactory.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/WebViewFactory.kt index 33825e121..ff9ca4a15 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/WebViewFactory.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/WebViewFactory.kt @@ -1,6 +1,7 @@ package acr.browser.lightning._browser2.tab import acr.browser.lightning.Capabilities +import acr.browser.lightning._browser2.di.IncognitoMode import acr.browser.lightning._browser2.view.CompositeTouchListener import acr.browser.lightning.isSupported import acr.browser.lightning.log.Logger @@ -23,7 +24,8 @@ import javax.inject.Inject class WebViewFactory @Inject constructor( private val activity: Activity, private val logger: Logger, - private val userPreferences: UserPreferences + private val userPreferences: UserPreferences, + @IncognitoMode private val incognitoMode: Boolean ) { fun createRequestHeaders(): Map { @@ -51,7 +53,7 @@ class WebViewFactory @Inject constructor( return requestHeaders } - fun createWebView(isIncognito: Boolean): WebView = WebView(activity).apply { + fun createWebView(): WebView = WebView(activity).apply { id = View.generateViewId() tag = CompositeTouchListener().also(::setOnTouchListener) isFocusableInTouchMode = true @@ -74,13 +76,13 @@ class WebViewFactory @Inject constructor( settings.apply { mediaPlaybackRequiresUserGesture = true - if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP && !isIncognito) { + if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP && !incognitoMode) { mixedContentMode = WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE } else if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { mixedContentMode = WebSettings.MIXED_CONTENT_NEVER_ALLOW } - if (!isIncognito || Capabilities.FULL_INCOGNITO.isSupported) { + if (!incognitoMode || Capabilities.FULL_INCOGNITO.isSupported) { domStorageEnabled = true setAppCacheEnabled(true) databaseEnabled = true @@ -105,7 +107,7 @@ class WebViewFactory @Inject constructor( setGeolocationDatabasePath(activity.getDir("geolocation", 0).path) } - updateForPreferences(userPreferences, isIncognito) + updateForPreferences(userPreferences, incognitoMode) } @SuppressLint("SetJavaScriptEnabled") @@ -171,8 +173,10 @@ class WebViewFactory @Inject constructor( } if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { - CookieManager.getInstance().setAcceptThirdPartyCookies(this, - !userPreferences.blockThirdPartyCookiesEnabled) + CookieManager.getInstance().setAcceptThirdPartyCookies( + this, + !userPreferences.blockThirdPartyCookiesEnabled + ) } } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/BundleStore.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/BundleStore.kt index f51d5526d..231a5c34b 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/BundleStore.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/BundleStore.kt @@ -1,99 +1,19 @@ package acr.browser.lightning._browser2.tab.bundle -import acr.browser.lightning.R import acr.browser.lightning._browser2.tab.TabModel -import acr.browser.lightning.browser.TabsManager -import acr.browser.lightning.di.DiskScheduler -import acr.browser.lightning.utils.* -import acr.browser.lightning.view.* -import android.app.Application -import android.os.Bundle -import io.reactivex.Scheduler -import javax.inject.Inject +import acr.browser.lightning.view.TabInitializer /** - * Created by anthonycr on 9/20/20. + * Created by anthonycr on 7/27/22. */ -class BundleStore @Inject constructor( - private val application: Application, - private val bookmarkPageInitializer: BookmarkPageInitializer, - private val homePageInitializer: HomePageInitializer, - private val downloadPageInitializer: DownloadPageInitializer, - private val historyPageInitializer: HistoryPageInitializer, - @DiskScheduler private val diskScheduler: Scheduler -) { +interface BundleStore { - /** - * TODO - */ - fun save(tabs: List) { - val outState = Bundle(ClassLoader.getSystemClassLoader()) - - tabs.withIndex().forEach { (index, tab) -> - if (!tab.url.isSpecialUrl()) { - outState.putBundle(BUNDLE_KEY + index, tab.freeze()) - outState.putString(TAB_TITLE_KEY + index, tab.title) - } else { - outState.putBundle(BUNDLE_KEY + index, Bundle().apply { - putString(URL_KEY, tab.url) - }) - } - } - - FileUtils.writeBundleToStorage(application, outState, BUNDLE_STORAGE) - .subscribeOn(diskScheduler) - .subscribe() - } + fun save(tabs: List) - /** - * TODO - */ - fun retrieve(): List = - FileUtils.readBundleFromStorage(application, BUNDLE_STORAGE)?.let { bundle -> - bundle.keySet() - .filter { it.startsWith(BUNDLE_KEY) } - .mapNotNull { bundleKey -> - bundle.getBundle(bundleKey)?.let { - Pair( - it, - bundle.getString(TAB_TITLE_KEY + bundleKey.extractNumberFromEnd()) - ) - } - } - }?.map { (bundle, title) -> - return@map bundle.getString(URL_KEY)?.let { url -> - when { - url.isBookmarkUrl() -> bookmarkPageInitializer - url.isDownloadsUrl() -> downloadPageInitializer - url.isStartPageUrl() -> homePageInitializer - url.isHistoryUrl() -> historyPageInitializer - else -> homePageInitializer - } - } ?: FreezableBundleInitializer(bundle, title - ?: application.getString(R.string.tab_frozen)) - } ?: emptyList() + fun retrieve(): List /** * Synchronously delete all stored tabs. */ - fun deleteAll() { - FileUtils.deleteBundleInStorage(application, BUNDLE_STORAGE) - } - - private fun String.extractNumberFromEnd(): String { - val underScore = lastIndexOf('_') - return if (underScore in 0 until length) { - substring(underScore + 1) - } else { - "" - } - } - - companion object { - private const val TAG = "TabsRepository" - private const val BUNDLE_KEY = "WEBVIEW_" - private const val TAB_TITLE_KEY = "TITLE_" - private const val URL_KEY = "URL_KEY" - private const val BUNDLE_STORAGE = "SAVED_TABS.parcel" - } + fun deleteAll() } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/DefaultBundleStore.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/DefaultBundleStore.kt new file mode 100644 index 000000000..b721c85bd --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/DefaultBundleStore.kt @@ -0,0 +1,91 @@ +package acr.browser.lightning._browser2.tab.bundle + +import acr.browser.lightning.R +import acr.browser.lightning._browser2.tab.TabModel +import acr.browser.lightning.browser.TabsManager +import acr.browser.lightning.di.DiskScheduler +import acr.browser.lightning.utils.* +import acr.browser.lightning.view.* +import android.app.Application +import android.os.Bundle +import io.reactivex.Scheduler +import javax.inject.Inject + +/** + * Created by anthonycr on 9/20/20. + */ +class DefaultBundleStore @Inject constructor( + private val application: Application, + private val bookmarkPageInitializer: BookmarkPageInitializer, + private val homePageInitializer: HomePageInitializer, + private val downloadPageInitializer: DownloadPageInitializer, + private val historyPageInitializer: HistoryPageInitializer, + @DiskScheduler private val diskScheduler: Scheduler +) : BundleStore { + + override fun save(tabs: List) { + val outState = Bundle(ClassLoader.getSystemClassLoader()) + + tabs.withIndex().forEach { (index, tab) -> + if (!tab.url.isSpecialUrl()) { + outState.putBundle(BUNDLE_KEY + index, tab.freeze()) + outState.putString(TAB_TITLE_KEY + index, tab.title) + } else { + outState.putBundle(BUNDLE_KEY + index, Bundle().apply { + putString(URL_KEY, tab.url) + }) + } + } + + FileUtils.writeBundleToStorage(application, outState, BUNDLE_STORAGE) + .subscribeOn(diskScheduler) + .subscribe() + } + + override fun retrieve(): List = + FileUtils.readBundleFromStorage(application, BUNDLE_STORAGE)?.let { bundle -> + bundle.keySet() + .filter { it.startsWith(BUNDLE_KEY) } + .mapNotNull { bundleKey -> + bundle.getBundle(bundleKey)?.let { + Pair( + it, + bundle.getString(TAB_TITLE_KEY + bundleKey.extractNumberFromEnd()) + ) + } + } + }?.map { (bundle, title) -> + return@map bundle.getString(URL_KEY)?.let { url -> + when { + url.isBookmarkUrl() -> bookmarkPageInitializer + url.isDownloadsUrl() -> downloadPageInitializer + url.isStartPageUrl() -> homePageInitializer + url.isHistoryUrl() -> historyPageInitializer + else -> homePageInitializer + } + } ?: FreezableBundleInitializer( + bundle, title ?: application.getString(R.string.tab_frozen) + ) + } ?: emptyList() + + override fun deleteAll() { + FileUtils.deleteBundleInStorage(application, BUNDLE_STORAGE) + } + + private fun String.extractNumberFromEnd(): String { + val underScore = lastIndexOf('_') + return if (underScore in 0 until length) { + substring(underScore + 1) + } else { + "" + } + } + + companion object { + private const val TAG = "TabsRepository" + private const val BUNDLE_KEY = "WEBVIEW_" + private const val TAB_TITLE_KEY = "TITLE_" + private const val URL_KEY = "URL_KEY" + private const val BUNDLE_STORAGE = "SAVED_TABS.parcel" + } +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/IncognitoBundleStore.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/IncognitoBundleStore.kt new file mode 100644 index 000000000..9e2e431f7 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/IncognitoBundleStore.kt @@ -0,0 +1,15 @@ +package acr.browser.lightning._browser2.tab.bundle + +import acr.browser.lightning._browser2.tab.TabModel +import acr.browser.lightning.view.TabInitializer + +/** + * A bundle store implementation that no-ops for for incognito mode. + */ +object IncognitoBundleStore : BundleStore { + override fun save(tabs: List) = Unit + + override fun retrieve(): List = emptyList() + + override fun deleteAll() = Unit +} diff --git a/app/src/main/java/acr/browser/lightning/notifications/IncognitoNotification.kt b/app/src/main/java/acr/browser/lightning/notifications/IncognitoNotification.kt index 8655a8be1..44629a5ab 100644 --- a/app/src/main/java/acr/browser/lightning/notifications/IncognitoNotification.kt +++ b/app/src/main/java/acr/browser/lightning/notifications/IncognitoNotification.kt @@ -1,23 +1,24 @@ package acr.browser.lightning.notifications -import acr.browser.lightning.IncognitoActivity import acr.browser.lightning.R +import acr.browser.lightning._browser2.IncognitoBrowserActivity import acr.browser.lightning.utils.ThemeUtils import android.annotation.TargetApi +import android.app.Activity import android.app.NotificationChannel import android.app.NotificationManager import android.app.PendingIntent -import android.content.Context import android.os.Build import androidx.core.app.NotificationCompat +import javax.inject.Inject /** * A notification helper that displays the current number of tabs open in a notification as a * warning. When the notification is pressed, the incognito browser will open. */ -class IncognitoNotification( - private val context: Context, +class IncognitoNotification @Inject constructor( + private val activity: Activity, private val notificationManager: NotificationManager ) { @@ -32,8 +33,9 @@ class IncognitoNotification( @TargetApi(Build.VERSION_CODES.O) private fun createNotificationChannel() { - val channelName = context.getString(R.string.notification_incognito_running_description) - val channel = NotificationChannel(channelId, channelName, NotificationManager.IMPORTANCE_LOW) + val channelName = activity.getString(R.string.notification_incognito_running_description) + val channel = + NotificationChannel(channelId, channelName, NotificationManager.IMPORTANCE_LOW) channel.enableVibration(false) notificationManager.createNotificationChannel(channel) } @@ -46,15 +48,21 @@ class IncognitoNotification( */ fun show(number: Int) { require(number > 0) - val incognitoIntent = IncognitoActivity.createIntent(context) + val incognitoIntent = IncognitoBrowserActivity.intent(activity) - val incognitoNotification = NotificationCompat.Builder(context, channelId) + val incognitoNotification = NotificationCompat.Builder(activity, channelId) .setSmallIcon(R.drawable.ic_notification_incognito) - .setContentTitle(context.resources.getQuantityString(R.plurals.notification_incognito_running_title, number, number)) - .setContentIntent(PendingIntent.getActivity(context, 0, incognitoIntent, 0)) - .setContentText(context.getString(R.string.notification_incognito_running_message)) + .setContentTitle( + activity.resources.getQuantityString( + R.plurals.notification_incognito_running_title, + number, + number + ) + ) + .setContentIntent(PendingIntent.getActivity(activity, 0, incognitoIntent, 0)) + .setContentText(activity.getString(R.string.notification_incognito_running_message)) .setAutoCancel(false) - .setColor(ThemeUtils.getAccentColor(context)) + .setColor(ThemeUtils.getAccentColor(activity)) .setOngoing(true) .build() From e1d3d5864a41978ebc620c1f26849da2e43007ca Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 27 Jul 2022 11:45:29 -0400 Subject: [PATCH 080/161] Need to support going home in certain configurations --- .../java/acr/browser/lightning/_browser2/BrowserPresenter.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 723c31c6c..54de7ba2b 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -881,6 +881,8 @@ class BrowserPresenter @Inject constructor( fun onTabCountViewClick() { if (uiConfiguration.tabConfiguration == TabConfiguration.DRAWER) { view?.openTabDrawer() + } else { + // TODO: GO HOME } } From 853c3fc18e287897b2566c3844328575a8a87836 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 27 Jul 2022 14:59:01 -0400 Subject: [PATCH 081/161] Fix issue where new tabs would be opened before old tabs --- .../java/acr/browser/lightning/_browser2/BrowserPresenter.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 54de7ba2b..e2d516825 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -125,7 +125,7 @@ class BrowserPresenter @Inject constructor( compositeDisposable += model.initializeTabs() .observeOn(mainScheduler) - .mergeWith( + .concatWith( Maybe.fromCallable { initialUrl } .flatMapSingleElement { model.createTab(UrlInitializer(it)) } .map(::listOf) From a00a9d54afb0251ea204790454a89178ff44d596 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 27 Jul 2022 16:13:23 -0400 Subject: [PATCH 082/161] Fix UI flashing when deleting a tab --- .../browser/lightning/_browser2/tab/TabPager.kt | 10 +++++++--- .../_browser2/view/WebViewScrollCoordinator.kt | 17 ++++++++++++++--- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt index de940ff64..26a11fd0b 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt @@ -6,6 +6,7 @@ import acr.browser.lightning._browser2.view.WebViewScrollCoordinator import android.view.ViewGroup import android.webkit.WebView import android.widget.FrameLayout +import androidx.core.view.children import targetUrl.LongPress import javax.inject.Inject @@ -24,7 +25,7 @@ class TabPager @Inject constructor( var longPressListener: ((id: Int, longPress: LongPress) -> Unit)? = null fun selectTab(id: Int) { - container.removeAllViews() + container.removeWebViews() val webView = webViews.forId(id) container.addView( webView, @@ -32,7 +33,6 @@ class TabPager @Inject constructor( ViewGroup.LayoutParams.MATCH_PARENT ) - // TODO: coordinator adds views to the container, which can result in UI flashes. webViewScrollCoordinator.configure(webView) webViewLongPressHandler.configure(webView, onLongClick = { longPressListener?.invoke(id, it) @@ -40,13 +40,17 @@ class TabPager @Inject constructor( } fun clearTab() { - container.removeAllViews() + container.removeWebViews() } fun addTab(webView: WebView) { webViews.add(webView) } + private fun FrameLayout.removeWebViews() { + children.filterIsInstance().forEach(container::removeView) + } + private fun List.forId(id: Int): WebView = requireNotNull(find { it.id == id }) } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewScrollCoordinator.kt b/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewScrollCoordinator.kt index 7494fd50a..106e4f14e 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewScrollCoordinator.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewScrollCoordinator.kt @@ -60,7 +60,10 @@ class WebViewScrollCoordinator @Inject constructor( val height = toolbar.height if (toolbar.translationY > -0.01f) { val hideAnimation = object : Animation() { - override fun applyTransformation(interpolatedTime: Float, t: Transformation) { + override fun applyTransformation( + interpolatedTime: Float, + t: Transformation + ) { val trans = interpolatedTime * height toolbar.translationY = -trans webView.translationY = height - trans @@ -82,7 +85,10 @@ class WebViewScrollCoordinator @Inject constructor( val totalHeight = height if (toolbar.translationY < -(height - 0.01f)) { val show = object : Animation() { - override fun applyTransformation(interpolatedTime: Float, t: Transformation) { + override fun applyTransformation( + interpolatedTime: Float, + t: Transformation + ) { val trans = interpolatedTime * totalHeight toolbar.translationY = trans - totalHeight webView.translationY = trans @@ -153,7 +159,12 @@ class WebViewScrollCoordinator @Inject constructor( var toggleListener: ToggleListener? = null - override fun onFling(e1: MotionEvent, e2: MotionEvent, velocityX: Float, velocityY: Float): Boolean { + override fun onFling( + e1: MotionEvent, + e2: MotionEvent, + velocityX: Float, + velocityY: Float + ): Boolean { val power = (velocityY * 100 / maxFling).toInt() if (power < -10) { toggleListener?.hideToolbar() From def1192a14697bc1ede1227d9607628a81d61010 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 27 Jul 2022 16:14:25 -0400 Subject: [PATCH 083/161] Properly handle the back button in the browser Mostly implement proper back button handling. Currently missing handling for search bar focus and custom view hiding --- .../lightning/_browser2/BrowserActivity.kt | 21 +++++- .../lightning/_browser2/BrowserPresenter.kt | 66 +++++++++++++++---- 2 files changed, 72 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index 8f15e6860..921e2f167 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -114,6 +114,25 @@ abstract class BrowserActivity : ThemableBrowserActivity() { .build() .inject(this) + binding.drawerLayout.addDrawerListener(object : DrawerLayout.SimpleDrawerListener() { + + override fun onDrawerOpened(drawerView: View) { + if (drawerView == binding.tabDrawer) { + presenter.onTabDrawerMoved(isOpen = true) + } else if (drawerView == binding.bookmarkDrawer) { + presenter.onBookmarkDrawerMoved(isOpen = true) + } + } + + override fun onDrawerClosed(drawerView: View) { + if (drawerView == binding.tabDrawer) { + presenter.onTabDrawerMoved(isOpen = false) + } else if (drawerView == binding.bookmarkDrawer) { + presenter.onBookmarkDrawerMoved(isOpen = false) + } + } + }) + binding.bookmarkDrawer.layoutParams = (binding.bookmarkDrawer.layoutParams as DrawerLayout.LayoutParams).apply { gravity = when (uiConfiguration.bookmarkConfiguration) { @@ -245,7 +264,7 @@ abstract class BrowserActivity : ThemableBrowserActivity() { } override fun onBackPressed() { - presenter.onBackClick() + presenter.onNavigateBack() } override fun onCreateOptionsMenu(menu: Menu): Boolean { diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index e2d516825..47598479d 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -67,7 +67,6 @@ class BrowserPresenter @Inject constructor( private val uiConfiguration: UiConfiguration, private val historyPageFactory: HistoryPageFactory, private val allowListModel: AllowListModel, - @IncognitoMode private val incognitoMode: Boolean, private val cookieAdministrator: CookieAdministrator, private val tabCountNotifier: TabCountNotifier ) { @@ -89,7 +88,10 @@ class BrowserPresenter @Inject constructor( ) private var currentTab: TabModel? = null private var currentFolder: Bookmark.Folder = Bookmark.Folder.Root + private var isTabDrawerOpen = false + private var isBookmarkDrawerOpen = false private var isSearchViewFocused = false + private var tabIdOpenedFromAction = -1 private val compositeDisposable = CompositeDisposable() private val allTabsDisposable = CompositeDisposable() @@ -154,6 +156,7 @@ class BrowserPresenter @Inject constructor( */ fun onViewHidden() { model.freeze() + tabIdOpenedFromAction = -1 } private fun TabModel.asViewState(): TabViewState = TabViewState( @@ -264,7 +267,8 @@ class BrowserPresenter @Inject constructor( when (action) { is BrowserContract.Action.LoadUrl -> createNewTabAndSelect( tabInitializer = UrlInitializer(action.url), - shouldSelect = true + shouldSelect = true, + markAsOpenedFromAction = true ) BrowserContract.Action.Panic -> panicClean() } @@ -324,12 +328,19 @@ class BrowserPresenter @Inject constructor( } } - private fun createNewTabAndSelect(tabInitializer: TabInitializer, shouldSelect: Boolean) { + private fun createNewTabAndSelect( + tabInitializer: TabInitializer, + shouldSelect: Boolean, + markAsOpenedFromAction: Boolean = false + ) { compositeDisposable += model.createTab(tabInitializer) .observeOn(mainScheduler) .subscribe { tab -> if (shouldSelect) { selectTab(model.selectTab(tab.id)) + if (markAsOpenedFromAction) { + tabIdOpenedFromAction = tab.id + } } } } @@ -397,7 +408,8 @@ class BrowserPresenter @Inject constructor( } val nextTab = viewState.tabs.nextSelected(index) - val needToSelectNextTab = viewState.tabs[index].id == currentTab?.id + val currentTabId = currentTab?.id + val needToSelectNextTab = viewState.tabs[index].id == currentTabId compositeDisposable += model.deleteTab(viewState.tabs[index].id) .observeOn(mainScheduler) @@ -405,29 +417,55 @@ class BrowserPresenter @Inject constructor( if (needToSelectNextTab) { nextTab?.id?.let { selectTab(model.selectTab(it)) - } ?: selectTab(tabModel = null) + if (tabIdOpenedFromAction == currentTabId) { + tabIdOpenedFromAction = -1 + navigator.backgroundBrowser() + } + } ?: run { + selectTab(tabModel = null) + navigator.closeBrowser() + } + } } } + fun onTabDrawerMoved(isOpen: Boolean) { + isTabDrawerOpen = isOpen + } + + fun onBookmarkDrawerMoved(isOpen: Boolean) { + isBookmarkDrawerOpen = isOpen + } + /** - * TODO + * Called when the user clicks on the device back button or swipes to go back. Differentiated + * from [onBackClick] which is called when the user presses the browser's back button. */ - fun onBackClick() { + fun onNavigateBack() { when { - currentFolder != Bookmark.Folder.Root -> onBookmarkMenuClick() - currentTab?.canGoBack() == true -> currentTab?.goBack() - currentTab == null -> navigator.closeBrowser() - else -> if (incognitoMode) { - navigator.closeBrowser() + isTabDrawerOpen -> view?.closeTabDrawer() + isBookmarkDrawerOpen -> if (currentFolder != Bookmark.Folder.Root) { + onBookmarkMenuClick() } else { - navigator.backgroundBrowser() + view?.closeBookmarkDrawer() } + currentTab?.canGoBack() == true -> currentTab?.goBack() + currentTab?.canGoBack() == false -> onTabClose(viewState.tabs.indexOfFirst { it.id == currentTab?.id }) } } /** - * TODO + * Called when the user presses the browser's back button. + */ + fun onBackClick() { + if (currentTab?.canGoBack() == true) { + currentTab?.goBack() + } + } + + /** + * Called when the user presses the browser's forward button. */ fun onForwardClick() { if (currentTab?.canGoForward() == true) { From db494dcdc1bfa894f7806f0dae1634822038bc6a Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 27 Jul 2022 17:32:37 -0400 Subject: [PATCH 084/161] Hide the keyboard when a search suggestion is clicked --- .../main/java/acr/browser/lightning/_browser2/BrowserActivity.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index 921e2f167..def0632d7 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -210,6 +210,7 @@ abstract class BrowserActivity : ThemableBrowserActivity() { binding.search.onItemClickListener = AdapterView.OnItemClickListener { _, _, position, _ -> binding.search.clearFocus() presenter.onSearchSuggestionClicked(suggestionsAdapter.getItem(position) as WebPage) + inputMethodManager.hideSoftInputFromWindow(binding.root.windowToken, 0) } binding.search.setAdapter(suggestionsAdapter) val searchListener = SearchListener( From 2fcc624de8cea08d13394064c5e1106f01d54b57 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 27 Jul 2022 18:19:22 -0400 Subject: [PATCH 085/161] Close tab drawers whenever the current tab is changed --- .../java/acr/browser/lightning/_browser2/BrowserPresenter.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 47598479d..acefb1094 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -203,6 +203,8 @@ class BrowserPresenter @Inject constructor( ) ) + view?.closeTabDrawer() + tabDisposable.dispose() tabDisposable = CompositeDisposable() tabDisposable += Observables.combineLatest( @@ -376,7 +378,6 @@ class BrowserPresenter @Inject constructor( */ fun onTabClick(index: Int) { selectTab(model.selectTab(viewState.tabs[index].id)) - view?.closeTabDrawer() } /** From a0236fd0106b58db44b81745900c63ed36c4784b Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 27 Jul 2022 18:24:11 -0400 Subject: [PATCH 086/161] Go home when the home button his hit in desktop configuration mode --- .../java/acr/browser/lightning/_browser2/BrowserPresenter.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index acefb1094..028f77108 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -2,7 +2,6 @@ package acr.browser.lightning._browser2 import acr.browser.lightning._browser2.data.CookieAdministrator import acr.browser.lightning._browser2.di.Browser2Scope -import acr.browser.lightning._browser2.di.IncognitoMode import acr.browser.lightning._browser2.di.InitialUrl import acr.browser.lightning._browser2.download.PendingDownload import acr.browser.lightning._browser2.history.HistoryRecord @@ -921,7 +920,7 @@ class BrowserPresenter @Inject constructor( if (uiConfiguration.tabConfiguration == TabConfiguration.DRAWER) { view?.openTabDrawer() } else { - // TODO: GO HOME + currentTab?.loadFromInitializer(homePageInitializer) } } From f6a7ef2ac99214fb83caa0b3467d349341b4b12e Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 27 Jul 2022 22:13:58 -0400 Subject: [PATCH 087/161] Hide keyboard when the webview is focused --- .../lightning/_browser2/view/WebViewScrollCoordinator.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewScrollCoordinator.kt b/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewScrollCoordinator.kt index 106e4f14e..310eee438 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewScrollCoordinator.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewScrollCoordinator.kt @@ -8,6 +8,7 @@ import android.app.Activity import android.view.* import android.view.animation.Animation import android.view.animation.Transformation +import android.view.inputmethod.InputMethodManager import android.webkit.WebView import android.widget.FrameLayout import android.widget.LinearLayout @@ -21,7 +22,8 @@ class WebViewScrollCoordinator @Inject constructor( private val browserFrame: FrameLayout, private val toolbarRoot: LinearLayout, private val toolbar: View, - private val userPreferences: UserPreferences + private val userPreferences: UserPreferences, + private val inputMethodManager: InputMethodManager ) { private val gestureListener: CustomGestureListener = CustomGestureListener( @@ -34,6 +36,11 @@ class WebViewScrollCoordinator @Inject constructor( * TODO */ fun configure(webView: WebView) { + webView.setOnFocusChangeListener { v, hasFocus -> + if (hasFocus) { + inputMethodManager.hideSoftInputFromWindow(v.windowToken, 0) + } + } if (userPreferences.fullScreenEnabled) { (toolbar.parent as ViewGroup?)?.removeView(toolbar) From eb6368d70d326440ce5a3ed782b7a9537066ca7d Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 27 Jul 2022 22:37:22 -0400 Subject: [PATCH 088/161] Properly show the toolbar when switching tabs and when the url changes --- .../lightning/_browser2/BrowserActivity.kt | 4 ++++ .../lightning/_browser2/BrowserContract.kt | 2 ++ .../lightning/_browser2/BrowserPresenter.kt | 7 ++++++ .../_browser2/BrowserStateAdapter.kt | 4 ++++ .../lightning/_browser2/tab/TabPager.kt | 4 ++++ .../view/WebViewScrollCoordinator.kt | 24 +++++++++++++++---- 6 files changed, 40 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index def0632d7..8d83f43fc 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -513,6 +513,10 @@ abstract class BrowserActivity : ThemableBrowserActivity() { binding.drawerLayout.closeDrawer(binding.tabDrawer) } + fun showToolbar() { + tabPager.showToolbar() + } + fun showToolsDialog(areAdsAllowed: Boolean, shouldShowAdBlockOption: Boolean) { val whitelistString = if (areAdsAllowed) { R.string.dialog_adblock_enable_for_site diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt index b99e29e62..3a3a8bae7 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt @@ -62,6 +62,8 @@ interface BrowserContract { fun closeTabDrawer() + fun showToolbar() + fun showToolsDialog(areAdsAllowed: Boolean, shouldShowAdBlockOption: Boolean) } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 028f77108..99abf1c7f 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -202,6 +202,7 @@ class BrowserPresenter @Inject constructor( ) ) + view?.showToolbar() view?.closeTabDrawer() tabDisposable.dispose() @@ -234,9 +235,15 @@ class BrowserPresenter @Inject constructor( ) }.subscribeOn(mainScheduler) .subscribe { view.updateState(it) } + tabDisposable += tab.downloadRequests() .subscribeOn(mainScheduler) .subscribeBy(onNext = navigator::download) + + tabDisposable += tab.urlChanges() + .distinctUntilChanged() + .subscribeOn(mainScheduler) + .subscribeBy { view?.showToolbar() } } private fun List.subscribeToUpdates(compositeDisposable: CompositeDisposable) { diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt index 84155be4e..46184139f 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt @@ -119,6 +119,10 @@ class BrowserStateAdapter(private val browserActivity: BrowserActivity) : Browse browserActivity.closeTabDrawer() } + override fun showToolbar() { + browserActivity.showToolbar() + } + override fun showToolsDialog(areAdsAllowed: Boolean, shouldShowAdBlockOption: Boolean) { browserActivity.showToolsDialog(areAdsAllowed, shouldShowAdBlockOption) } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt index 26a11fd0b..e8962ebfe 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt @@ -47,6 +47,10 @@ class TabPager @Inject constructor( webViews.add(webView) } + fun showToolbar() { + webViewScrollCoordinator.showToolbar() + } + private fun FrameLayout.removeWebViews() { children.filterIsInstance().forEach(container::removeView) } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewScrollCoordinator.kt b/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewScrollCoordinator.kt index 310eee438..62991d493 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewScrollCoordinator.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewScrollCoordinator.kt @@ -32,6 +32,8 @@ class WebViewScrollCoordinator @Inject constructor( private val touchListener = TouchListener(GestureDetector(activity, gestureListener)) + private var currentToggleListener: ToggleListener? = null + /** * TODO */ @@ -42,23 +44,34 @@ class WebViewScrollCoordinator @Inject constructor( } } if (userPreferences.fullScreenEnabled) { - (toolbar.parent as ViewGroup?)?.removeView(toolbar) + if (toolbar.parent != browserFrame) { + (toolbar.parent as ViewGroup?)?.removeView(toolbar) - browserFrame.addView(toolbar) + browserFrame.addView(toolbar) + } + + currentToggleListener?.showToolbar() ?: run { + toolbar.translationY = 0f + } - toolbar.translationY = 0f webView.translationY = toolbar.height.toFloat() coordinate(toolbar, webView) } else { - (toolbar.parent as ViewGroup?)?.removeView(toolbar) + if (toolbar.parent != toolbarRoot) { + (toolbar.parent as ViewGroup?)?.removeView(toolbar) - toolbarRoot.addView(toolbar, 0) + toolbarRoot.addView(toolbar, 0) + } toolbar.translationY = 0f webView.translationY = 0f } } + fun showToolbar() { + currentToggleListener?.showToolbar() + } + private fun coordinate(toolbar: View, webView: WebView) { webView.setCompositeTouchListener("scroll", touchListener) @@ -110,6 +123,7 @@ class WebViewScrollCoordinator @Inject constructor( touchListener.toggleListener = toggleListener gestureListener.toggleListener = toggleListener + currentToggleListener = toggleListener } interface ToggleListener { From 96632f2e96e24d6708e2b0a473dab6b8c9379dc5 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Thu, 28 Jul 2022 10:41:50 -0400 Subject: [PATCH 089/161] Properly handle the back button when the tab can no longer "go back" --- .../lightning/_browser2/BrowserPresenter.kt | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 99abf1c7f..508425f29 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -2,6 +2,7 @@ package acr.browser.lightning._browser2 import acr.browser.lightning._browser2.data.CookieAdministrator import acr.browser.lightning._browser2.di.Browser2Scope +import acr.browser.lightning._browser2.di.IncognitoMode import acr.browser.lightning._browser2.di.InitialUrl import acr.browser.lightning._browser2.download.PendingDownload import acr.browser.lightning._browser2.history.HistoryRecord @@ -67,7 +68,8 @@ class BrowserPresenter @Inject constructor( private val historyPageFactory: HistoryPageFactory, private val allowListModel: AllowListModel, private val cookieAdministrator: CookieAdministrator, - private val tabCountNotifier: TabCountNotifier + private val tabCountNotifier: TabCountNotifier, + @IncognitoMode private val incognitoMode: Boolean ) { private var view: BrowserContract.View? = null @@ -458,7 +460,15 @@ class BrowserPresenter @Inject constructor( view?.closeBookmarkDrawer() } currentTab?.canGoBack() == true -> currentTab?.goBack() - currentTab?.canGoBack() == false -> onTabClose(viewState.tabs.indexOfFirst { it.id == currentTab?.id }) + currentTab?.canGoBack() == false -> if (incognitoMode) { + currentTab?.id?.let { + view?.showCloseBrowserDialog(it) + } + } else if (tabIdOpenedFromAction == currentTab?.id) { + onTabClose(viewState.tabs.indexOfFirst { it.id == currentTab?.id }) + } else { + navigator.backgroundBrowser() + } } } From 67e9f660a81e7ee15e8dc67f4989bf58d823dd88 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Thu, 28 Jul 2022 11:46:53 -0400 Subject: [PATCH 090/161] Fixing behavior issue where the favicon would be incorrect if the page didn't have an icon --- .../acr/browser/lightning/_browser2/BrowserPresenter.kt | 4 +--- .../java/acr/browser/lightning/_browser2/tab/TabAdapter.kt | 6 ++++-- .../java/acr/browser/lightning/_browser2/tab/TabModel.kt | 3 ++- .../browser/lightning/_browser2/tab/TabWebChromeClient.kt | 7 +++++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 508425f29..bc379bca9 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -252,7 +252,7 @@ class BrowserPresenter @Inject constructor( forEach { tabModel -> compositeDisposable += Observables.combineLatest( tabModel.titleChanges().startWith(tabModel.title), - tabModel.faviconChanges().optional() + tabModel.faviconChanges() .startWith(Option.fromNullable(tabModel.favicon)) ).distinctUntilChanged() .subscribeOn(mainScheduler) @@ -268,8 +268,6 @@ class BrowserPresenter @Inject constructor( } } - private fun Observable.optional(): Observable> = map { Option.Some(it) } - /** * TODO */ diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt index b5f1fdb1d..1cda97833 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt @@ -6,6 +6,8 @@ import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.preference.userAgent import acr.browser.lightning.ssl.SslCertificateInfo import acr.browser.lightning.ssl.SslState +import acr.browser.lightning.utils.Option +import acr.browser.lightning.utils.value import acr.browser.lightning.view.FreezableBundleInitializer import acr.browser.lightning.view.TabInitializer import android.graphics.Bitmap @@ -122,9 +124,9 @@ class TabAdapter( get() = findInPageQuery override val favicon: Bitmap? - get() = webView.favicon + get() = tabWebChromeClient.faviconObservable.value?.value() - override fun faviconChanges(): Observable = tabWebChromeClient.faviconObservable.hide() + override fun faviconChanges(): Observable> = tabWebChromeClient.faviconObservable // TODO do we show "new tab" override val url: String diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt index 043561e3c..014310a4f 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt @@ -3,6 +3,7 @@ package acr.browser.lightning._browser2.tab import acr.browser.lightning._browser2.download.PendingDownload import acr.browser.lightning.ssl.SslCertificateInfo import acr.browser.lightning.ssl.SslState +import acr.browser.lightning.utils.Option import acr.browser.lightning.view.TabInitializer import android.graphics.Bitmap import android.os.Bundle @@ -50,7 +51,7 @@ interface TabModel { val favicon: Bitmap? - fun faviconChanges(): Observable + fun faviconChanges(): Observable> val url: String diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt index d0f15ebe0..7df37a8f5 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt @@ -1,8 +1,10 @@ package acr.browser.lightning._browser2.tab +import acr.browser.lightning.utils.Option import android.graphics.Bitmap import android.webkit.WebChromeClient import android.webkit.WebView +import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.PublishSubject /** @@ -12,7 +14,7 @@ class TabWebChromeClient : WebChromeClient() { val progressObservable: PublishSubject = PublishSubject.create() val titleObservable: PublishSubject = PublishSubject.create() - val faviconObservable: PublishSubject = PublishSubject.create() + val faviconObservable: BehaviorSubject> = BehaviorSubject.create() override fun onProgressChanged(view: WebView, newProgress: Int) { super.onProgressChanged(view, newProgress) @@ -22,10 +24,11 @@ class TabWebChromeClient : WebChromeClient() { override fun onReceivedTitle(view: WebView, title: String) { super.onReceivedTitle(view, title) titleObservable.onNext(title) + faviconObservable.onNext(Option.None) } override fun onReceivedIcon(view: WebView, icon: Bitmap) { super.onReceivedIcon(view, icon) - faviconObservable.onNext(icon) + faviconObservable.onNext(Option.Some(icon)) } } From 7b960a87d20c330adc3ab3cd5005120fe1a0203d Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Thu, 28 Jul 2022 11:56:17 -0400 Subject: [PATCH 091/161] Fixing issues with search bar focus and the URL displayed --- .../acr/browser/lightning/_browser2/BrowserActivity.kt | 9 +++------ .../acr/browser/lightning/_browser2/BrowserPresenter.kt | 8 +++++++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index 8d83f43fc..5bccf94f4 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -214,18 +214,15 @@ abstract class BrowserActivity : ThemableBrowserActivity() { } binding.search.setAdapter(suggestionsAdapter) val searchListener = SearchListener( - onConfirm = { - presenter.onSearch(binding.search.text.toString()) - }, + onConfirm = { presenter.onSearch(binding.search.text.toString()) }, inputMethodManager = inputMethodManager ) binding.search.setOnEditorActionListener(searchListener) binding.search.setOnKeyListener(searchListener) binding.search.addTextChangedListener(StyleRemovingTextWatcher()) binding.search.setOnFocusChangeListener { _, hasFocus -> - presenter.onSearchFocusChanged( - hasFocus - ) + binding.search.selectAll() + presenter.onSearchFocusChanged(hasFocus) } binding.findPrevious.setOnClickListener { presenter.onFindPrevious() } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index bc379bca9..4bf8f2ac1 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -545,7 +545,13 @@ class BrowserPresenter @Inject constructor( fun onSearchFocusChanged(isFocused: Boolean) { isSearchViewFocused = isFocused if (isFocused) { - view?.updateState(viewState.copy(sslState = SslState.None, isRefresh = false)) + view?.updateState( + viewState.copy( + sslState = SslState.None, + isRefresh = false, + displayUrl = currentTab?.url?.takeIf { !it.isSpecialUrl() }.orEmpty() + ) + ) } else { view?.updateState( viewState.copy( From 50667a68b503f2511a80c1b8309e56bfc00b36f8 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Thu, 28 Jul 2022 12:59:10 -0400 Subject: [PATCH 092/161] Show the freeze icon as the tab icon when the tab is frozen --- .../browser/lightning/_browser2/di/Browser2Module.kt | 10 ++++++++++ .../browser/lightning/_browser2/image/IconFreeze.kt | 9 +++++++++ .../acr/browser/lightning/_browser2/tab/TabAdapter.kt | 6 ++++-- .../browser/lightning/_browser2/tab/TabsRepository.kt | 8 ++++++-- 4 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/image/IconFreeze.kt diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt index a7814b963..c36856d4a 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt @@ -1,11 +1,13 @@ package acr.browser.lightning._browser2.di +import acr.browser.lightning.R import acr.browser.lightning._browser2.BrowserContract import acr.browser.lightning._browser2.data.CookieAdministrator import acr.browser.lightning._browser2.data.DefaultCookieAdministrator import acr.browser.lightning._browser2.history.DefaultHistoryRecord import acr.browser.lightning._browser2.history.HistoryRecord import acr.browser.lightning._browser2.history.NoOpHistoryRecord +import acr.browser.lightning._browser2.image.IconFreeze import acr.browser.lightning._browser2.notification.DefaultTabCountNotifier import acr.browser.lightning._browser2.notification.IncognitoTabCountNotifier import acr.browser.lightning._browser2.notification.TabCountNotifier @@ -22,12 +24,15 @@ import acr.browser.lightning.adblock.AdBlocker import acr.browser.lightning.adblock.BloomFilterAdBlocker import acr.browser.lightning.adblock.NoOpAdBlocker import acr.browser.lightning.browser.BrowserView +import acr.browser.lightning.extensions.drawable import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.utils.IntentUtils import android.app.Activity import android.app.Application import android.content.Intent +import android.graphics.Bitmap import android.webkit.WebSettings +import androidx.core.graphics.drawable.toBitmap import dagger.Binds import dagger.Module import dagger.Provides @@ -126,4 +131,9 @@ class Browser2Module { defaultBundleStore } + @IconFreeze + @Provides + fun providesFrozenIcon(activity: Activity): Bitmap = + activity.drawable(R.drawable.ic_frozen).toBitmap() + } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/image/IconFreeze.kt b/app/src/main/java/acr/browser/lightning/_browser2/image/IconFreeze.kt new file mode 100644 index 000000000..f4dfea41c --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/image/IconFreeze.kt @@ -0,0 +1,9 @@ +package acr.browser.lightning._browser2.image + +import javax.inject.Qualifier + +/** + * The frozen icon qualifier + */ +@Qualifier +annotation class IconFreeze diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt index 1cda97833..f1cac65c7 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt @@ -26,7 +26,8 @@ class TabAdapter( private val tabWebViewClient: TabWebViewClient, private val tabWebChromeClient: TabWebChromeClient, private val userPreferences: UserPreferences, - private val defaultUserAgent: String + private val defaultUserAgent: String, + private val iconFreeze: Bitmap ) : TabModel { private var latentInitializer: FreezableBundleInitializer? = null @@ -124,7 +125,8 @@ class TabAdapter( get() = findInPageQuery override val favicon: Bitmap? - get() = tabWebChromeClient.faviconObservable.value?.value() + get() = latentInitializer?.let { iconFreeze } + ?: tabWebChromeClient.faviconObservable.value?.value() override fun faviconChanges(): Observable> = tabWebChromeClient.faviconObservable diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt index a5491d806..7cff2ebf5 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt @@ -1,6 +1,7 @@ package acr.browser.lightning._browser2.tab import acr.browser.lightning._browser2.BrowserContract +import acr.browser.lightning._browser2.image.IconFreeze import acr.browser.lightning._browser2.tab.bundle.BundleStore import acr.browser.lightning.adblock.AdBlocker import acr.browser.lightning.adblock.allowlist.AllowListModel @@ -8,6 +9,7 @@ import acr.browser.lightning.di.DiskScheduler import acr.browser.lightning.di.MainScheduler import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.view.* +import android.graphics.Bitmap import io.reactivex.* import io.reactivex.subjects.PublishSubject import javax.inject.Inject @@ -25,7 +27,8 @@ class TabsRepository @Inject constructor( private val bundleStore: BundleStore, private val urlHandler: UrlHandler, private val userPreferences: UserPreferences, - @DefaultUserAgent private val defaultUserAgent: String + @DefaultUserAgent private val defaultUserAgent: String, + @IconFreeze private val iconFreeze: Bitmap ) : BrowserContract.Model { private var selectedTab: TabModel? = null @@ -63,7 +66,8 @@ class TabsRepository @Inject constructor( TabWebViewClient(adBlocker, allowListModel, urlHandler, headers), TabWebChromeClient(), userPreferences, - defaultUserAgent + defaultUserAgent, + iconFreeze ) tabsList = tabsList + tabAdapter From c29f77af7a71312ac1bbdc5d71393ea4afb0ba2b Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Thu, 28 Jul 2022 13:57:29 -0400 Subject: [PATCH 093/161] Enable and disable menu items based on current URL --- .../lightning/_browser2/BrowserActivity.kt | 18 ++++++++++++++++++ .../lightning/_browser2/BrowserPresenter.kt | 3 +++ .../lightning/_browser2/BrowserStateAdapter.kt | 2 ++ .../lightning/_browser2/BrowserViewState.kt | 3 +++ 4 files changed, 26 insertions(+) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index 5bccf94f4..0c5c6aad1 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -53,6 +53,12 @@ abstract class BrowserActivity : ThemableBrowserActivity() { private lateinit var tabsAdapter: ListAdapter private lateinit var bookmarksAdapter: BookmarkRecyclerViewAdapter + private var menuItemShare: MenuItem? = null + private var menuItemCopyLink: MenuItem? = null + private var menuItemAddToHome: MenuItem? = null + private var menuItemAddBookmark: MenuItem? = null + private var menuItemReaderMode: MenuItem? = null + @Inject internal lateinit var imageLoader: ImageLoader @@ -267,6 +273,11 @@ abstract class BrowserActivity : ThemableBrowserActivity() { override fun onCreateOptionsMenu(menu: Menu): Boolean { menuInflater.inflate(menu(), menu) + menuItemShare = menu.findItem(R.id.action_share) + menuItemCopyLink = menu.findItem(R.id.action_copy) + menuItemAddToHome = menu.findItem(R.id.action_add_to_homescreen) + menuItemAddBookmark = menu.findItem(R.id.action_add_bookmark) + menuItemReaderMode = menu.findItem(R.id.action_reading_mode) return super.onCreateOptionsMenu(menu) } @@ -291,6 +302,13 @@ abstract class BrowserActivity : ThemableBrowserActivity() { binding.searchSslStatus.setImageDrawable(createSslDrawableForState(it)) binding.searchSslStatus.updateVisibilityForDrawable() } + viewState.enableFullMenu?.let { + menuItemShare?.isVisible = it + menuItemCopyLink?.isVisible = it + menuItemAddToHome?.isVisible = it + menuItemAddBookmark?.isVisible = it + menuItemReaderMode?.isVisible = it + } viewState.tabs?.let { binding.tabCountView.updateCount(it.size) } viewState.progress?.let { binding.progressView.progress = it } viewState.isRefresh?.let { diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 4bf8f2ac1..397448c13 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -78,6 +78,7 @@ class BrowserPresenter @Inject constructor( isRefresh = true, sslState = SslState.None, progress = 0, + enableFullMenu = true, tabs = emptyList(), isForwardEnabled = false, isBackEnabled = false, @@ -193,6 +194,7 @@ class BrowserPresenter @Inject constructor( title = null, isLoading = false ), + enableFullMenu = false, isForwardEnabled = false, isBackEnabled = false, sslState = SslState.None, @@ -225,6 +227,7 @@ class BrowserPresenter @Inject constructor( title = title, isLoading = progress < 100 ), + enableFullMenu = !url.isSpecialUrl(), isRefresh = progress == 100, isForwardEnabled = canGoForward, isBackEnabled = canGoBack, diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt index 46184139f..7667b38cf 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt @@ -20,6 +20,7 @@ class BrowserStateAdapter(private val browserActivity: BrowserActivity) : Browse sslState, isRefresh, progress, + enableFullMenu, tabs, isForwardEnabled, isBackEnabled, @@ -36,6 +37,7 @@ class BrowserStateAdapter(private val browserActivity: BrowserActivity) : Browse sslState = sslState.takeIf { it != currentState?.sslState }, isRefresh = isRefresh.takeIf { it != currentState?.isRefresh }, progress = progress.takeIf { it != currentState?.progress }, + enableFullMenu = enableFullMenu.takeIf { it != currentState?.enableFullMenu }, tabs = tabs.takeIf { it != currentState?.tabs }, isForwardEnabled = isForwardEnabled.takeIf { it != currentState?.isForwardEnabled }, isBackEnabled = isBackEnabled.takeIf { it != currentState?.isBackEnabled }, diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt index 3ee9224fc..616aaaa9e 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt @@ -13,6 +13,7 @@ data class BrowserViewState( val sslState: SslState, val isRefresh: Boolean, val progress: Int, + val enableFullMenu: Boolean, // Tabs val tabs: List, @@ -27,6 +28,7 @@ data class BrowserViewState( // find val findInPage: String + ) data class PartialBrowserViewState( @@ -35,6 +37,7 @@ data class PartialBrowserViewState( val sslState: SslState?, val isRefresh: Boolean?, val progress: Int?, + val enableFullMenu: Boolean?, // Tabs val tabs: List?, From f09d18748ef87d5cc2e082d4f5ab8f47cd5f4760 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Thu, 28 Jul 2022 14:11:00 -0400 Subject: [PATCH 094/161] Properly cache favicons for use elsewhere --- .../lightning/_browser2/tab/TabWebChromeClient.kt | 11 ++++++++++- .../browser/lightning/_browser2/tab/TabsRepository.kt | 4 +++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt index 7df37a8f5..45b1254a2 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt @@ -1,16 +1,21 @@ package acr.browser.lightning._browser2.tab +import acr.browser.lightning.favicon.FaviconModel import acr.browser.lightning.utils.Option import android.graphics.Bitmap import android.webkit.WebChromeClient import android.webkit.WebView +import io.reactivex.Scheduler import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.PublishSubject /** * Created by anthonycr on 9/12/20. */ -class TabWebChromeClient : WebChromeClient() { +class TabWebChromeClient( + private val faviconModel: FaviconModel, + private val diskScheduler: Scheduler +) : WebChromeClient() { val progressObservable: PublishSubject = PublishSubject.create() val titleObservable: PublishSubject = PublishSubject.create() @@ -30,5 +35,9 @@ class TabWebChromeClient : WebChromeClient() { override fun onReceivedIcon(view: WebView, icon: Bitmap) { super.onReceivedIcon(view, icon) faviconObservable.onNext(Option.Some(icon)) + val url = view.url ?: return + faviconModel.cacheFaviconForUrl(icon, url) + .subscribeOn(diskScheduler) + .subscribe() } } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt index 7cff2ebf5..d32b151cb 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt @@ -7,6 +7,7 @@ import acr.browser.lightning.adblock.AdBlocker import acr.browser.lightning.adblock.allowlist.AllowListModel import acr.browser.lightning.di.DiskScheduler import acr.browser.lightning.di.MainScheduler +import acr.browser.lightning.favicon.FaviconModel import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.view.* import android.graphics.Bitmap @@ -22,6 +23,7 @@ class TabsRepository @Inject constructor( private val tabPager: TabPager, private val adBlocker: AdBlocker, private val allowListModel: AllowListModel, + private val faviconModel: FaviconModel, @DiskScheduler private val diskScheduler: Scheduler, @MainScheduler private val mainScheduler: Scheduler, private val bundleStore: BundleStore, @@ -64,7 +66,7 @@ class TabsRepository @Inject constructor( webView, headers, TabWebViewClient(adBlocker, allowListModel, urlHandler, headers), - TabWebChromeClient(), + TabWebChromeClient(faviconModel, diskScheduler), userPreferences, defaultUserAgent, iconFreeze From ce44cdb24a10719ef811af690bde40d5b2b5ee42 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Thu, 28 Jul 2022 14:11:37 -0400 Subject: [PATCH 095/161] Avoid subscribing to the bookmark repo on the main thread --- .../java/acr/browser/lightning/_browser2/BrowserPresenter.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 397448c13..0f7c07fba 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -218,7 +218,8 @@ class BrowserPresenter @Inject constructor( tab.loadingProgress().startWith(tab.loadingProgress), tab.canGoBackChanges().startWith(tab.canGoBack()), tab.canGoForwardChanges().startWith(tab.canGoForward()), - tab.urlChanges().startWith(tab.url).flatMapSingle(bookmarkRepository::isBookmark), + tab.urlChanges().startWith(tab.url).observeOn(diskScheduler) + .flatMapSingle(bookmarkRepository::isBookmark), tab.urlChanges().startWith(tab.url).map(String::isSpecialUrl) ) { sslState, title, url, progress, canGoBack, canGoForward, isBookmark, isSpecialUrl -> viewState.copy( @@ -238,7 +239,7 @@ class BrowserPresenter @Inject constructor( isBookmarkEnabled = !isSpecialUrl, findInPage = tab.findQuery.orEmpty() ) - }.subscribeOn(mainScheduler) + }.observeOn(mainScheduler) .subscribe { view.updateState(it) } tabDisposable += tab.downloadRequests() From 2656cc03952bd9a881fca2de639b15adb0cbc533 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Thu, 28 Jul 2022 15:27:17 -0400 Subject: [PATCH 096/161] Implementing most key combos --- .../lightning/_browser2/BrowserPresenter.kt | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 0f7c07fba..58005fcde 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -362,24 +362,24 @@ class BrowserPresenter @Inject constructor( */ fun onKeyComboClick(keyCombo: KeyCombo) { when (keyCombo) { - KeyCombo.CTRL_F -> TODO() + KeyCombo.CTRL_F -> view?.showFindInPageDialog() KeyCombo.CTRL_T -> onNewTabClick() - KeyCombo.CTRL_W -> TODO() - KeyCombo.CTRL_Q -> TODO() + KeyCombo.CTRL_W -> onTabClose(viewState.tabs.indexOfFirst { it.id == currentTab?.id }) + KeyCombo.CTRL_Q -> view?.showCloseBrowserDialog(viewState.tabs.indexOfFirst { it.id == currentTab?.id }) KeyCombo.CTRL_R -> onRefreshOrStopClick() KeyCombo.CTRL_TAB -> TODO() KeyCombo.CTRL_SHIFT_TAB -> TODO() KeyCombo.SEARCH -> TODO() - KeyCombo.ALT_0 -> TODO() - KeyCombo.ALT_1 -> TODO() - KeyCombo.ALT_2 -> TODO() - KeyCombo.ALT_3 -> TODO() - KeyCombo.ALT_4 -> TODO() - KeyCombo.ALT_5 -> TODO() - KeyCombo.ALT_6 -> TODO() - KeyCombo.ALT_7 -> TODO() - KeyCombo.ALT_8 -> TODO() - KeyCombo.ALT_9 -> TODO() + KeyCombo.ALT_0 -> onTabClick(0.coerceAtMost(viewState.tabs.size - 1)) + KeyCombo.ALT_1 -> onTabClick(1.coerceAtMost(viewState.tabs.size - 1)) + KeyCombo.ALT_2 -> onTabClick(2.coerceAtMost(viewState.tabs.size - 1)) + KeyCombo.ALT_3 -> onTabClick(3.coerceAtMost(viewState.tabs.size - 1)) + KeyCombo.ALT_4 -> onTabClick(4.coerceAtMost(viewState.tabs.size - 1)) + KeyCombo.ALT_5 -> onTabClick(5.coerceAtMost(viewState.tabs.size - 1)) + KeyCombo.ALT_6 -> onTabClick(6.coerceAtMost(viewState.tabs.size - 1)) + KeyCombo.ALT_7 -> onTabClick(7.coerceAtMost(viewState.tabs.size - 1)) + KeyCombo.ALT_8 -> onTabClick(8.coerceAtMost(viewState.tabs.size - 1)) + KeyCombo.ALT_9 -> onTabClick(9.coerceAtMost(viewState.tabs.size - 1)) } } From f73d17c216de087ab58c12f72705fc027fc11e53 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Thu, 28 Jul 2022 16:52:30 -0400 Subject: [PATCH 097/161] Prevent local file URLs from being unilaterally loaded by the browser without user consent --- .../lightning/_browser2/BrowserActivity.kt | 17 ++++++++++ .../lightning/_browser2/BrowserContract.kt | 2 ++ .../lightning/_browser2/BrowserPresenter.kt | 34 ++++++++++++++++--- .../_browser2/BrowserStateAdapter.kt | 4 +++ .../acr/browser/lightning/utils/UrlUtils.kt | 7 +++- 5 files changed, 58 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index 0c5c6aad1..631003687 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -26,6 +26,7 @@ import acr.browser.lightning.dialog.DialogItem import acr.browser.lightning.dialog.LightningDialogBuilder import acr.browser.lightning.extensions.color import acr.browser.lightning.extensions.drawable +import acr.browser.lightning.extensions.resizeAndShow import acr.browser.lightning.search.SuggestionsAdapter import acr.browser.lightning.ssl.createSslDrawableForState import android.content.Intent @@ -36,6 +37,7 @@ import android.widget.AdapterView import android.widget.ImageView import androidx.annotation.DrawableRes import androidx.annotation.MenuRes +import androidx.appcompat.app.AlertDialog import androidx.core.view.isVisible import androidx.drawerlayout.widget.DrawerLayout import androidx.recyclerview.widget.LinearLayoutManager @@ -556,6 +558,21 @@ abstract class BrowserActivity : ThemableBrowserActivity() { ) } + fun showLocalFileBlockedDialog() { + AlertDialog.Builder(this) + .setCancelable(true) + .setTitle(R.string.title_warning) + .setMessage(R.string.message_blocked_local) + .setNegativeButton(android.R.string.cancel) { _, _ -> + presenter.onConfirmOpenLocalFile(allow = false) + } + .setPositiveButton(R.string.action_open) { _, _ -> + presenter.onConfirmOpenLocalFile(allow = true) + } + .setOnCancelListener { presenter.onConfirmOpenLocalFile(allow = false) } + .resizeAndShow() + } + private fun ImageView.updateVisibilityForDrawable() { visibility = if (drawable == null) { View.GONE diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt index 3a3a8bae7..8ecf7e6e8 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt @@ -65,6 +65,8 @@ interface BrowserContract { fun showToolbar() fun showToolsDialog(areAdsAllowed: Boolean, shouldShowAdBlockOption: Boolean) + + fun showLocalFileBlockedDialog() } interface Model { diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 58005fcde..bb0b00f81 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -94,6 +94,7 @@ class BrowserPresenter @Inject constructor( private var isBookmarkDrawerOpen = false private var isSearchViewFocused = false private var tabIdOpenedFromAction = -1 + private var pendingAction: BrowserContract.Action.LoadUrl? = null private val compositeDisposable = CompositeDisposable() private val allTabsDisposable = CompositeDisposable() @@ -277,15 +278,38 @@ class BrowserPresenter @Inject constructor( */ fun onNewAction(action: BrowserContract.Action) { when (action) { - is BrowserContract.Action.LoadUrl -> createNewTabAndSelect( - tabInitializer = UrlInitializer(action.url), - shouldSelect = true, - markAsOpenedFromAction = true - ) + is BrowserContract.Action.LoadUrl -> if (action.url.isSpecialUrl()) { + view?.showLocalFileBlockedDialog() + pendingAction = action + } else { + createNewTabAndSelect( + tabInitializer = UrlInitializer(action.url), + shouldSelect = true, + markAsOpenedFromAction = true + ) + } BrowserContract.Action.Panic -> panicClean() } } + /** + * Call when the user confirms that they do or do not want to allow a local file to be opened + * in the browser. This is a security gate to prevent malicious local files from being opened + * in the browser without the user's knowledge. + */ + fun onConfirmOpenLocalFile(allow: Boolean) { + if (allow) { + pendingAction?.let { + createNewTabAndSelect( + tabInitializer = UrlInitializer(it.url), + shouldSelect = true, + markAsOpenedFromAction = true + ) + } + } + pendingAction = null + } + private fun panicClean() { createNewTabAndSelect(tabInitializer = NoOpInitializer(), shouldSelect = true) model.clean() diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt index 7667b38cf..5fbb1478b 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt @@ -129,4 +129,8 @@ class BrowserStateAdapter(private val browserActivity: BrowserActivity) : Browse browserActivity.showToolsDialog(areAdsAllowed, shouldShowAdBlockOption) } + override fun showLocalFileBlockedDialog() { + browserActivity.showLocalFileBlockedDialog() + } + } diff --git a/app/src/main/java/acr/browser/lightning/utils/UrlUtils.kt b/app/src/main/java/acr/browser/lightning/utils/UrlUtils.kt index 2651dc7c8..d7c174eea 100644 --- a/app/src/main/java/acr/browser/lightning/utils/UrlUtils.kt +++ b/app/src/main/java/acr/browser/lightning/utils/UrlUtils.kt @@ -67,6 +67,10 @@ fun smartUrlFilter(url: String, canBeSearch: Boolean, searchUrl: String): String } } +/** + * True if the URL is a file URL, false otherwise. + */ +fun String?.isFileUrl(): Boolean = this != null && this.startsWith(FILE) /** * Returns whether the given url is the bookmarks/history page or a normal website @@ -111,6 +115,7 @@ fun String?.isHistoryUrl(): Boolean = fun String?.isStartPageUrl(): Boolean = this != null && this.startsWith(FILE) && this.endsWith(HomePageFactory.FILENAME) -private val ACCEPTED_URI_SCHEMA = Pattern.compile("(?i)((?:http|https|file)://|(?:inline|data|about|javascript):|(?:.*:.*@))(.*)") +private val ACCEPTED_URI_SCHEMA = + Pattern.compile("(?i)((?:http|https|file)://|(?:inline|data|about|javascript):|(?:.*:.*@))(.*)") const val QUERY_PLACE_HOLDER = "%s" private const val URL_ENCODED_SPACE = "%20" From 7c731b37cf4c8641b53a295993fa0db2e48031ff Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Thu, 28 Jul 2022 22:39:21 -0400 Subject: [PATCH 098/161] Support create and close window requests --- .../lightning/_browser2/BrowserPresenter.kt | 19 ++++++++++++++++--- .../lightning/_browser2/tab/TabAdapter.kt | 6 ++++++ .../lightning/_browser2/tab/TabModel.kt | 4 ++++ .../_browser2/tab/TabWebChromeClient.kt | 19 +++++++++++++++++++ 4 files changed, 45 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index bb0b00f81..85d7444ce 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -251,6 +251,14 @@ class BrowserPresenter @Inject constructor( .distinctUntilChanged() .subscribeOn(mainScheduler) .subscribeBy { view?.showToolbar() } + + tabDisposable += tab.createWindowRequests() + .subscribeOn(mainScheduler) + .subscribeBy { createNewTabAndSelect(it, shouldSelect = true) } + + tabDisposable += tab.closeWindowRequests() + .subscribeOn(mainScheduler) + .subscribeBy { onTabClose(viewState.indexOfCurrentTab()) } } private fun List.subscribeToUpdates(compositeDisposable: CompositeDisposable) { @@ -381,6 +389,11 @@ class BrowserPresenter @Inject constructor( } } + private fun BrowserViewState.tabIndexForId(id: Int?): Int = + tabs.indexOfFirst { it.id == id } + + private fun BrowserViewState.indexOfCurrentTab(): Int = tabIndexForId(currentTab?.id) + /** * TODO */ @@ -388,7 +401,7 @@ class BrowserPresenter @Inject constructor( when (keyCombo) { KeyCombo.CTRL_F -> view?.showFindInPageDialog() KeyCombo.CTRL_T -> onNewTabClick() - KeyCombo.CTRL_W -> onTabClose(viewState.tabs.indexOfFirst { it.id == currentTab?.id }) + KeyCombo.CTRL_W -> onTabClose(viewState.indexOfCurrentTab()) KeyCombo.CTRL_Q -> view?.showCloseBrowserDialog(viewState.tabs.indexOfFirst { it.id == currentTab?.id }) KeyCombo.CTRL_R -> onRefreshOrStopClick() KeyCombo.CTRL_TAB -> TODO() @@ -491,7 +504,7 @@ class BrowserPresenter @Inject constructor( view?.showCloseBrowserDialog(it) } } else if (tabIdOpenedFromAction == currentTab?.id) { - onTabClose(viewState.tabs.indexOfFirst { it.id == currentTab?.id }) + onTabClose(viewState.indexOfCurrentTab()) } else { navigator.backgroundBrowser() } @@ -1053,7 +1066,7 @@ class BrowserPresenter @Inject constructor( fun onCloseBrowserEvent(id: Int, closeTabEvent: BrowserContract.CloseTabEvent) { when (closeTabEvent) { BrowserContract.CloseTabEvent.CLOSE_CURRENT -> - onTabClose(viewState.tabs.indexOfFirst { it.id == id }) + onTabClose(viewState.tabIndexForId(id)) BrowserContract.CloseTabEvent.CLOSE_OTHERS -> model.tabsList .filter { it.id != id } .toObservable() diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt index f1cac65c7..3b8858510 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt @@ -165,6 +165,12 @@ class TabAdapter( override fun downloadRequests(): Observable = downloadsSubject.hide() + override fun createWindowRequests(): Observable = + tabWebChromeClient.createWindowObservable.hide() + + override fun closeWindowRequests(): Observable = + tabWebChromeClient.closeWindowObservable.hide() + override var isForeground: Boolean = false set(value) { field = value diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt index 014310a4f..088e560be 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt @@ -75,6 +75,10 @@ interface TabModel { // Lifecycle + fun createWindowRequests(): Observable + + fun closeWindowRequests(): Observable + var isForeground: Boolean fun destroy() diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt index 45b1254a2..4738bf086 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt @@ -2,7 +2,10 @@ package acr.browser.lightning._browser2.tab import acr.browser.lightning.favicon.FaviconModel import acr.browser.lightning.utils.Option +import acr.browser.lightning.view.ResultMessageInitializer +import acr.browser.lightning.view.TabInitializer import android.graphics.Bitmap +import android.os.Message import android.webkit.WebChromeClient import android.webkit.WebView import io.reactivex.Scheduler @@ -20,6 +23,22 @@ class TabWebChromeClient( val progressObservable: PublishSubject = PublishSubject.create() val titleObservable: PublishSubject = PublishSubject.create() val faviconObservable: BehaviorSubject> = BehaviorSubject.create() + val createWindowObservable: PublishSubject = PublishSubject.create() + val closeWindowObservable: PublishSubject = PublishSubject.create() + + override fun onCreateWindow( + view: WebView, + isDialog: Boolean, + isUserGesture: Boolean, + resultMsg: Message + ): Boolean { + createWindowObservable.onNext(ResultMessageInitializer(resultMsg)) + return true + } + + override fun onCloseWindow(window: WebView) { + closeWindowObservable.onNext(Unit) + } override fun onProgressChanged(view: WebView, newProgress: Int) { super.onProgressChanged(view, newProgress) From 04a69b76f73b0ab620e4c2248515f67c966b15b7 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sat, 30 Jul 2022 22:46:37 -0400 Subject: [PATCH 099/161] Fixing issue where subscribing to the url changes from two different subscriptions caused the tabs to be incorrectly updated --- .../lightning/_browser2/BrowserPresenter.kt | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 85d7444ce..445cd3e06 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -31,7 +31,6 @@ import acr.browser.lightning.utils.* import acr.browser.lightning.view.* import androidx.core.net.toUri import io.reactivex.Maybe -import io.reactivex.Observable import io.reactivex.Scheduler import io.reactivex.Single import io.reactivex.disposables.CompositeDisposable @@ -210,6 +209,8 @@ class BrowserPresenter @Inject constructor( view?.showToolbar() view?.closeTabDrawer() + view?.updateState(viewState.copy(tabs = viewState.tabs.map { it.copy(isSelected = it.id == tab.id ) })) + tabDisposable.dispose() tabDisposable = CompositeDisposable() tabDisposable += Observables.combineLatest( @@ -220,9 +221,11 @@ class BrowserPresenter @Inject constructor( tab.canGoBackChanges().startWith(tab.canGoBack()), tab.canGoForwardChanges().startWith(tab.canGoForward()), tab.urlChanges().startWith(tab.url).observeOn(diskScheduler) - .flatMapSingle(bookmarkRepository::isBookmark), - tab.urlChanges().startWith(tab.url).map(String::isSpecialUrl) - ) { sslState, title, url, progress, canGoBack, canGoForward, isBookmark, isSpecialUrl -> + .flatMapSingle(bookmarkRepository::isBookmark).observeOn(mainScheduler), + tab.urlChanges().startWith(tab.url).map(String::isSpecialUrl), + tab.faviconChanges().startWith(Option.fromNullable(tab.favicon)) + ) { sslState, title, url, progress, canGoBack, canGoForward, isBookmark, isSpecialUrl, icon -> + viewState.copy( displayUrl = searchBoxModel.getDisplayContent( url = url, @@ -235,7 +238,9 @@ class BrowserPresenter @Inject constructor( isBackEnabled = canGoBack, sslState = sslState, progress = progress, - tabs = viewState.tabs.map { it.copy(isSelected = it.id == tab.id) }, + tabs = viewState.tabs.updateId(tab.id) { + it.copy(title = title, icon = icon.value()) + }, isBookmarked = isBookmark, isBookmarkEnabled = !isSpecialUrl, findInPage = tab.findQuery.orEmpty() From 8b81521deb594958b706b89dfc1d330d0e7035ba Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sun, 31 Jul 2022 22:55:11 -0400 Subject: [PATCH 100/161] Theming the bookmark page --- app/src/main/html/bookmarks.html | 25 ++++++----- .../_browser2/di/Browser2BindsModule.kt | 5 +++ .../_browser2/theme/DefaultThemeProvider.kt | 14 ++++++ .../_browser2/theme/LegacyThemeProvider.kt | 44 +++++++++++++++++++ .../_browser2/theme/ThemeProvider.kt | 17 +++++++ .../browser/lightning/di/AppBindsModule.kt | 5 +++ .../html/bookmark/BookmarkPageFactory.kt | 29 ++++++++++-- .../lightning/html/jsoup/JsoupExtensions.kt | 9 ++++ 8 files changed, 135 insertions(+), 13 deletions(-) create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/theme/DefaultThemeProvider.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/theme/LegacyThemeProvider.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/theme/ThemeProvider.kt diff --git a/app/src/main/html/bookmarks.html b/app/src/main/html/bookmarks.html index cbfc0e4c6..4c2ae7aec 100644 --- a/app/src/main/html/bookmarks.html +++ b/app/src/main/html/bookmarks.html @@ -11,13 +11,19 @@ diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2BindsModule.kt b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2BindsModule.kt index 705e7183c..ac78a6ad8 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2BindsModule.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2BindsModule.kt @@ -7,6 +7,8 @@ import acr.browser.lightning._browser2.history.HistoryRecord import acr.browser.lightning._browser2.image.FaviconImageLoader import acr.browser.lightning._browser2.image.ImageLoader import acr.browser.lightning._browser2.tab.TabsRepository +import acr.browser.lightning._browser2.theme.LegacyThemeProvider +import acr.browser.lightning._browser2.theme.ThemeProvider import dagger.Binds import dagger.Module @@ -24,4 +26,7 @@ interface Browser2BindsModule { @Binds fun bindsBrowserNavigator(browserNavigator: BrowserNavigator): BrowserContract.Navigator + + @Binds + fun bindsThemeProvider(legacyThemeProvider: LegacyThemeProvider): ThemeProvider } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/theme/DefaultThemeProvider.kt b/app/src/main/java/acr/browser/lightning/_browser2/theme/DefaultThemeProvider.kt new file mode 100644 index 000000000..3d4ba326e --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/theme/DefaultThemeProvider.kt @@ -0,0 +1,14 @@ +package acr.browser.lightning._browser2.theme + +import acr.browser.lightning.utils.ThemeUtils +import android.app.Activity + +/** + * The default theme attribute provider that delegates to the activity. + */ +class DefaultThemeProvider(private val activity: Activity) : ThemeProvider { + + override fun color(attrRes: Int): Int = + ThemeUtils.getColor(activity, attrRes) + +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/theme/LegacyThemeProvider.kt b/app/src/main/java/acr/browser/lightning/_browser2/theme/LegacyThemeProvider.kt new file mode 100644 index 000000000..3f993a929 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/theme/LegacyThemeProvider.kt @@ -0,0 +1,44 @@ +package acr.browser.lightning._browser2.theme + +import acr.browser.lightning.AppTheme +import acr.browser.lightning.R +import acr.browser.lightning.extensions.color +import acr.browser.lightning.preference.UserPreferences +import android.app.Application +import javax.inject.Inject + +/** + * The theme provider that should be used until [DefaultThemeProvider] can be injected safely + * throughout the codebase. + */ +class LegacyThemeProvider @Inject constructor( + private val application: Application, + userPreferences: UserPreferences +) : ThemeProvider { + + val theme = userPreferences.useTheme + + override fun color(attrRes: Int): Int = when (attrRes) { + R.attr.colorPrimary -> when (theme) { + AppTheme.LIGHT -> application.color(R.color.primary_color) + AppTheme.DARK -> application.color(R.color.primary_color_dark) + AppTheme.BLACK -> application.color(R.color.black) + } + R.attr.drawerBackground -> when (theme) { + AppTheme.LIGHT -> application.color(R.color.drawer_background) + AppTheme.DARK -> application.color(R.color.drawer_background_dark) + AppTheme.BLACK -> application.color(R.color.black) + } + R.attr.autoCompleteBackgroundColor -> when (theme) { + AppTheme.LIGHT -> application.color(R.color.white) + AppTheme.DARK -> application.color(R.color.divider_dark) + AppTheme.BLACK -> application.color(R.color.gray_dark) + } + R.attr.autoCompleteTitleColor -> when (theme) { + AppTheme.LIGHT -> application.color(R.color.black) + AppTheme.DARK -> application.color(R.color.white) + AppTheme.BLACK -> application.color(R.color.white) + } + else -> error("Unsupported color") + } +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/theme/ThemeProvider.kt b/app/src/main/java/acr/browser/lightning/_browser2/theme/ThemeProvider.kt new file mode 100644 index 000000000..9b91c1f1a --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/theme/ThemeProvider.kt @@ -0,0 +1,17 @@ +package acr.browser.lightning._browser2.theme + +import androidx.annotation.AttrRes +import androidx.annotation.ColorInt + +/** + * Provides themed attributes. + */ +interface ThemeProvider { + + /** + * Provide a themed color attribute. + */ + @ColorInt + fun color(@AttrRes attrRes: Int): Int + +} diff --git a/app/src/main/java/acr/browser/lightning/di/AppBindsModule.kt b/app/src/main/java/acr/browser/lightning/di/AppBindsModule.kt index 152f58cf2..86d356cac 100644 --- a/app/src/main/java/acr/browser/lightning/di/AppBindsModule.kt +++ b/app/src/main/java/acr/browser/lightning/di/AppBindsModule.kt @@ -1,5 +1,7 @@ package acr.browser.lightning.di +import acr.browser.lightning._browser2.theme.LegacyThemeProvider +import acr.browser.lightning._browser2.theme.ThemeProvider import acr.browser.lightning.adblock.allowlist.AllowListModel import acr.browser.lightning.adblock.allowlist.SessionAllowListModel import acr.browser.lightning.adblock.source.AssetsHostsDataSource @@ -58,4 +60,7 @@ interface AppBindsModule { @Binds fun bindsHostsDataSourceProvider(preferencesHostsDataSourceProvider: PreferencesHostsDataSourceProvider): HostsDataSourceProvider + + @Binds + fun bindsThemeProvider(legacyThemeProvider: LegacyThemeProvider): ThemeProvider } diff --git a/app/src/main/java/acr/browser/lightning/html/bookmark/BookmarkPageFactory.kt b/app/src/main/java/acr/browser/lightning/html/bookmark/BookmarkPageFactory.kt index e4b01d31d..8002cda21 100644 --- a/app/src/main/java/acr/browser/lightning/html/bookmark/BookmarkPageFactory.kt +++ b/app/src/main/java/acr/browser/lightning/html/bookmark/BookmarkPageFactory.kt @@ -1,6 +1,7 @@ package acr.browser.lightning.html.bookmark import acr.browser.lightning.R +import acr.browser.lightning._browser2.theme.ThemeProvider import acr.browser.lightning.constant.FILE import acr.browser.lightning.database.Bookmark import acr.browser.lightning.database.bookmark.BookmarkRepository @@ -12,12 +13,14 @@ import acr.browser.lightning.favicon.toValidUri import acr.browser.lightning.html.HtmlPageFactory import acr.browser.lightning.html.jsoup.* import acr.browser.lightning.utils.ThemeUtils +import android.app.Activity import android.app.Application import android.graphics.Bitmap import androidx.core.net.toUri import dagger.Reusable import io.reactivex.Scheduler import io.reactivex.Single +import org.jsoup.nodes.DataNode import java.io.File import java.io.FileOutputStream import java.io.FileWriter @@ -33,13 +36,24 @@ class BookmarkPageFactory @Inject constructor( private val faviconModel: FaviconModel, @DatabaseScheduler private val databaseScheduler: Scheduler, @DiskScheduler private val diskScheduler: Scheduler, - private val bookmarkPageReader: BookmarkPageReader + private val bookmarkPageReader: BookmarkPageReader, + themeProvider: ThemeProvider ) : HtmlPageFactory { private val title = application.getString(R.string.action_bookmarks) private val folderIconFile by lazy { File(application.cacheDir, FOLDER_ICON) } private val defaultIconFile by lazy { File(application.cacheDir, DEFAULT_ICON) } + private fun Int.toColor(): String { + val string = Integer.toHexString(this) + + return string.substring(2) + string.substring(0, 2) + } + + private val backgroundColor = themeProvider.color(R.attr.colorPrimary).toColor() + private val cardColor = themeProvider.color(R.attr.autoCompleteBackgroundColor).toColor() + private val textColor = themeProvider.color(R.attr.autoCompleteTitleColor).toColor() + override fun buildPage(): Single = bookmarkModel .getAllBookmarksSorted() .flattenAsObservable { it } @@ -50,7 +64,8 @@ class BookmarkPageFactory @Inject constructor( .toList() .concatWith( if (folder == Bookmark.Folder.Root) { - bookmarkModel.getFoldersSorted().map { it.filterIsInstance() } + bookmarkModel.getFoldersSorted() + .map { it.filterIsInstance() } } else { Single.just(emptyList()) } @@ -70,7 +85,10 @@ class BookmarkPageFactory @Inject constructor( } .ignoreElements() .toSingle { - cacheIcon(ThemeUtils.createThemedBitmap(application, R.drawable.ic_folder, false), folderIconFile) + cacheIcon( + ThemeUtils.createThemedBitmap(application, R.drawable.ic_folder, false), + folderIconFile + ) cacheIcon(faviconModel.createDefaultBitmapForTitle(null), defaultIconFile) "$FILE${createBookmarkPage(null)}" @@ -84,6 +102,11 @@ class BookmarkPageFactory @Inject constructor( private fun construct(list: List): String { return parse(bookmarkPageReader.provideHtml()) andBuild { title { title } + style { content -> + content.replace("--body-bg: {COLOR}", "--body-bg: #$backgroundColor;") + .replace("--box-bg: {COLOR}", "--box-bg: #$cardColor;") + .replace("--box-txt: {COLOR}", "--box-txt: #$textColor;") + } body { val repeatableElement = id("repeated").removeElement() id("content") { diff --git a/app/src/main/java/acr/browser/lightning/html/jsoup/JsoupExtensions.kt b/app/src/main/java/acr/browser/lightning/html/jsoup/JsoupExtensions.kt index 16f5b7020..e7475564a 100644 --- a/app/src/main/java/acr/browser/lightning/html/jsoup/JsoupExtensions.kt +++ b/app/src/main/java/acr/browser/lightning/html/jsoup/JsoupExtensions.kt @@ -3,6 +3,7 @@ package acr.browser.lightning.html.jsoup import org.jsoup.Jsoup +import org.jsoup.nodes.DataNode import org.jsoup.nodes.Document import org.jsoup.nodes.Element @@ -17,6 +18,14 @@ inline fun Document.title(provide: () -> String) { this.title(provide()) } +inline fun Document.style(mutate: (String) -> String) { + head().getElementsByTag("style").first().apply { + childNodes().filterIsInstance().first().apply { + wholeData = mutate(wholeData) + } + } +} + inline fun Document.body(build: Element.() -> Unit) { build(body()) } From 188fb3d597d515de59b00859b70f6662ed057c2d Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sun, 31 Jul 2022 23:06:26 -0400 Subject: [PATCH 101/161] Theming download and history pages --- app/src/main/html/list.html | 37 +++++++++++-------- .../_browser2/theme/LegacyThemeProvider.kt | 5 +++ .../html/download/DownloadPageFactory.kt | 21 ++++++++++- .../html/history/HistoryPageFactory.kt | 21 ++++++++++- 4 files changed, 67 insertions(+), 17 deletions(-) diff --git a/app/src/main/html/list.html b/app/src/main/html/list.html index d51ad66b9..0567e8208 100644 --- a/app/src/main/html/list.html +++ b/app/src/main/html/list.html @@ -2,18 +2,27 @@ - - - + + + -
- -
- -

${TITLE}

-

${URL}

-
+
+
+ +

${TITLE}

+

${URL}

+ +
diff --git a/app/src/main/java/acr/browser/lightning/_browser2/theme/LegacyThemeProvider.kt b/app/src/main/java/acr/browser/lightning/_browser2/theme/LegacyThemeProvider.kt index 3f993a929..a5b5b018f 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/theme/LegacyThemeProvider.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/theme/LegacyThemeProvider.kt @@ -39,6 +39,11 @@ class LegacyThemeProvider @Inject constructor( AppTheme.DARK -> application.color(R.color.white) AppTheme.BLACK -> application.color(R.color.white) } + R.attr.autoCompleteUrlColor -> when (theme) { + AppTheme.LIGHT -> application.color(R.color.hint_text_light_theme) + AppTheme.DARK -> application.color(R.color.hint_text_dark_theme) + AppTheme.BLACK -> application.color(R.color.hint_text_dark_theme) + } else -> error("Unsupported color") } } diff --git a/app/src/main/java/acr/browser/lightning/html/download/DownloadPageFactory.kt b/app/src/main/java/acr/browser/lightning/html/download/DownloadPageFactory.kt index f2f075e8b..3afb6fb1a 100644 --- a/app/src/main/java/acr/browser/lightning/html/download/DownloadPageFactory.kt +++ b/app/src/main/java/acr/browser/lightning/html/download/DownloadPageFactory.kt @@ -1,6 +1,7 @@ package acr.browser.lightning.html.download import acr.browser.lightning.R +import acr.browser.lightning._browser2.theme.ThemeProvider import acr.browser.lightning.constant.FILE import acr.browser.lightning.database.downloads.DownloadEntry import acr.browser.lightning.database.downloads.DownloadsRepository @@ -23,14 +24,32 @@ class DownloadPageFactory @Inject constructor( private val application: Application, private val userPreferences: UserPreferences, private val manager: DownloadsRepository, - private val listPageReader: ListPageReader + private val listPageReader: ListPageReader, + themeProvider: ThemeProvider ) : HtmlPageFactory { + private fun Int.toColor(): String { + val string = Integer.toHexString(this) + + return string.substring(2) + string.substring(0, 2) + } + + private val backgroundColor = themeProvider.color(R.attr.colorPrimary).toColor() + private val dividerColor = themeProvider.color(R.attr.autoCompleteBackgroundColor).toColor() + private val textColor = themeProvider.color(R.attr.autoCompleteTitleColor).toColor() + private val subtitleColor = themeProvider.color(R.attr.autoCompleteUrlColor).toColor() + override fun buildPage(): Single = manager .getAllDownloads() .map { list -> parse(listPageReader.provideHtml()) andBuild { title { application.getString(R.string.action_downloads) } + style { content -> + content.replace("--body-bg: {COLOR}", "--body-bg: #$backgroundColor;") + .replace("--divider-color: {COLOR}", "--divider-color: #$dividerColor;") + .replace("--title-color: {COLOR}", "--title-color: #$textColor;") + .replace("--subtitle-color: {COLOR}", "--subtitle-color: #$subtitleColor;") + } body { val repeatableElement = id("repeated").removeElement() id("content") { diff --git a/app/src/main/java/acr/browser/lightning/html/history/HistoryPageFactory.kt b/app/src/main/java/acr/browser/lightning/html/history/HistoryPageFactory.kt index 197509fdd..3cf4ff9b4 100644 --- a/app/src/main/java/acr/browser/lightning/html/history/HistoryPageFactory.kt +++ b/app/src/main/java/acr/browser/lightning/html/history/HistoryPageFactory.kt @@ -1,6 +1,7 @@ package acr.browser.lightning.html.history import acr.browser.lightning.R +import acr.browser.lightning._browser2.theme.ThemeProvider import acr.browser.lightning.constant.FILE import acr.browser.lightning.database.history.HistoryRepository import acr.browser.lightning.html.HtmlPageFactory @@ -21,16 +22,34 @@ import javax.inject.Inject class HistoryPageFactory @Inject constructor( private val listPageReader: ListPageReader, private val application: Application, - private val historyRepository: HistoryRepository + private val historyRepository: HistoryRepository, + themeProvider: ThemeProvider ) : HtmlPageFactory { private val title = application.getString(R.string.action_history) + private fun Int.toColor(): String { + val string = Integer.toHexString(this) + + return string.substring(2) + string.substring(0, 2) + } + + private val backgroundColor = themeProvider.color(R.attr.colorPrimary).toColor() + private val dividerColor = themeProvider.color(R.attr.autoCompleteBackgroundColor).toColor() + private val textColor = themeProvider.color(R.attr.autoCompleteTitleColor).toColor() + private val subtitleColor = themeProvider.color(R.attr.autoCompleteUrlColor).toColor() + override fun buildPage(): Single = historyRepository .lastHundredVisitedHistoryEntries() .map { list -> parse(listPageReader.provideHtml()) andBuild { title { title } + style { content -> + content.replace("--body-bg: {COLOR}", "--body-bg: #$backgroundColor;") + .replace("--divider-color: {COLOR}", "--divider-color: #$dividerColor;") + .replace("--title-color: {COLOR}", "--title-color: #$textColor;") + .replace("--subtitle-color: {COLOR}", "--subtitle-color: #$subtitleColor;") + } body { val repeatedElement = id("repeated").removeElement() id("content") { From d2b9bb07a500c8135b64b92bfa4521ab32167913 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sun, 31 Jul 2022 23:34:25 -0400 Subject: [PATCH 102/161] Implementing theme aware homepage and fixing theme awareness with other pages --- app/src/main/html/homepage.html | 87 +++++++++---------- .../_browser2/theme/LegacyThemeProvider.kt | 5 +- .../html/bookmark/BookmarkPageFactory.kt | 11 ++- .../html/download/DownloadPageFactory.kt | 17 ++-- .../html/history/HistoryPageFactory.kt | 14 +-- .../html/homepage/HomePageFactory.kt | 22 ++++- 6 files changed, 91 insertions(+), 65 deletions(-) diff --git a/app/src/main/html/homepage.html b/app/src/main/html/homepage.html index 312735545..f3c8ae0e2 100644 --- a/app/src/main/html/homepage.html +++ b/app/src/main/html/homepage.html @@ -2,17 +2,28 @@ - - - + + + ${TITLE} -
-
-
- -
-
-
- - - +
+
+
+ +
+
+ + + + - -
-
-
+ +
+
- + + diff --git a/app/src/main/java/acr/browser/lightning/_browser2/theme/LegacyThemeProvider.kt b/app/src/main/java/acr/browser/lightning/_browser2/theme/LegacyThemeProvider.kt index a5b5b018f..982c5f62b 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/theme/LegacyThemeProvider.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/theme/LegacyThemeProvider.kt @@ -13,10 +13,11 @@ import javax.inject.Inject */ class LegacyThemeProvider @Inject constructor( private val application: Application, - userPreferences: UserPreferences + private val userPreferences: UserPreferences ) : ThemeProvider { - val theme = userPreferences.useTheme + val theme: AppTheme + get() = userPreferences.useTheme override fun color(attrRes: Int): Int = when (attrRes) { R.attr.colorPrimary -> when (theme) { diff --git a/app/src/main/java/acr/browser/lightning/html/bookmark/BookmarkPageFactory.kt b/app/src/main/java/acr/browser/lightning/html/bookmark/BookmarkPageFactory.kt index 8002cda21..a78496cf4 100644 --- a/app/src/main/java/acr/browser/lightning/html/bookmark/BookmarkPageFactory.kt +++ b/app/src/main/java/acr/browser/lightning/html/bookmark/BookmarkPageFactory.kt @@ -37,7 +37,7 @@ class BookmarkPageFactory @Inject constructor( @DatabaseScheduler private val databaseScheduler: Scheduler, @DiskScheduler private val diskScheduler: Scheduler, private val bookmarkPageReader: BookmarkPageReader, - themeProvider: ThemeProvider + private val themeProvider: ThemeProvider ) : HtmlPageFactory { private val title = application.getString(R.string.action_bookmarks) @@ -50,9 +50,12 @@ class BookmarkPageFactory @Inject constructor( return string.substring(2) + string.substring(0, 2) } - private val backgroundColor = themeProvider.color(R.attr.colorPrimary).toColor() - private val cardColor = themeProvider.color(R.attr.autoCompleteBackgroundColor).toColor() - private val textColor = themeProvider.color(R.attr.autoCompleteTitleColor).toColor() + private val backgroundColor: String + get() = themeProvider.color(R.attr.colorPrimary).toColor() + private val cardColor: String + get() = themeProvider.color(R.attr.autoCompleteBackgroundColor).toColor() + private val textColor: String + get() = themeProvider.color(R.attr.autoCompleteTitleColor).toColor() override fun buildPage(): Single = bookmarkModel .getAllBookmarksSorted() diff --git a/app/src/main/java/acr/browser/lightning/html/download/DownloadPageFactory.kt b/app/src/main/java/acr/browser/lightning/html/download/DownloadPageFactory.kt index 3afb6fb1a..9125b2b93 100644 --- a/app/src/main/java/acr/browser/lightning/html/download/DownloadPageFactory.kt +++ b/app/src/main/java/acr/browser/lightning/html/download/DownloadPageFactory.kt @@ -25,7 +25,7 @@ class DownloadPageFactory @Inject constructor( private val userPreferences: UserPreferences, private val manager: DownloadsRepository, private val listPageReader: ListPageReader, - themeProvider: ThemeProvider + private val themeProvider: ThemeProvider ) : HtmlPageFactory { private fun Int.toColor(): String { @@ -34,10 +34,14 @@ class DownloadPageFactory @Inject constructor( return string.substring(2) + string.substring(0, 2) } - private val backgroundColor = themeProvider.color(R.attr.colorPrimary).toColor() - private val dividerColor = themeProvider.color(R.attr.autoCompleteBackgroundColor).toColor() - private val textColor = themeProvider.color(R.attr.autoCompleteTitleColor).toColor() - private val subtitleColor = themeProvider.color(R.attr.autoCompleteUrlColor).toColor() + private val backgroundColor: String + get() = themeProvider.color(R.attr.colorPrimary).toColor() + private val dividerColor: String + get() = themeProvider.color(R.attr.autoCompleteBackgroundColor).toColor() + private val textColor: String + get() = themeProvider.color(R.attr.autoCompleteTitleColor).toColor() + private val subtitleColor: String + get() = themeProvider.color(R.attr.autoCompleteUrlColor).toColor() override fun buildPage(): Single = manager .getAllDownloads() @@ -73,7 +77,8 @@ class DownloadPageFactory @Inject constructor( private fun createDownloadsPageFile(): File = File(application.filesDir, FILENAME) - private fun createFileUrl(fileName: String): String = "$FILE${userPreferences.downloadDirectory}/$fileName" + private fun createFileUrl(fileName: String): String = + "$FILE${userPreferences.downloadDirectory}/$fileName" private fun createFileTitle(downloadItem: DownloadEntry): String { val contentSize = if (downloadItem.contentSize.isNotBlank()) { diff --git a/app/src/main/java/acr/browser/lightning/html/history/HistoryPageFactory.kt b/app/src/main/java/acr/browser/lightning/html/history/HistoryPageFactory.kt index 3cf4ff9b4..f2e22c092 100644 --- a/app/src/main/java/acr/browser/lightning/html/history/HistoryPageFactory.kt +++ b/app/src/main/java/acr/browser/lightning/html/history/HistoryPageFactory.kt @@ -23,7 +23,7 @@ class HistoryPageFactory @Inject constructor( private val listPageReader: ListPageReader, private val application: Application, private val historyRepository: HistoryRepository, - themeProvider: ThemeProvider + private val themeProvider: ThemeProvider ) : HtmlPageFactory { private val title = application.getString(R.string.action_history) @@ -34,10 +34,14 @@ class HistoryPageFactory @Inject constructor( return string.substring(2) + string.substring(0, 2) } - private val backgroundColor = themeProvider.color(R.attr.colorPrimary).toColor() - private val dividerColor = themeProvider.color(R.attr.autoCompleteBackgroundColor).toColor() - private val textColor = themeProvider.color(R.attr.autoCompleteTitleColor).toColor() - private val subtitleColor = themeProvider.color(R.attr.autoCompleteUrlColor).toColor() + private val backgroundColor: String + get() = themeProvider.color(R.attr.colorPrimary).toColor() + private val dividerColor: String + get() = themeProvider.color(R.attr.autoCompleteBackgroundColor).toColor() + private val textColor: String + get() = themeProvider.color(R.attr.autoCompleteTitleColor).toColor() + private val subtitleColor: String + get() = themeProvider.color(R.attr.autoCompleteUrlColor).toColor() override fun buildPage(): Single = historyRepository .lastHundredVisitedHistoryEntries() diff --git a/app/src/main/java/acr/browser/lightning/html/homepage/HomePageFactory.kt b/app/src/main/java/acr/browser/lightning/html/homepage/HomePageFactory.kt index 196a745b1..afce5d263 100644 --- a/app/src/main/java/acr/browser/lightning/html/homepage/HomePageFactory.kt +++ b/app/src/main/java/acr/browser/lightning/html/homepage/HomePageFactory.kt @@ -1,6 +1,7 @@ package acr.browser.lightning.html.homepage import acr.browser.lightning.R +import acr.browser.lightning._browser2.theme.ThemeProvider import acr.browser.lightning.constant.FILE import acr.browser.lightning.constant.UTF8 import acr.browser.lightning.html.HtmlPageFactory @@ -20,16 +21,35 @@ import javax.inject.Inject class HomePageFactory @Inject constructor( private val application: Application, private val searchEngineProvider: SearchEngineProvider, - private val homePageReader: HomePageReader + private val homePageReader: HomePageReader, + private val themeProvider: ThemeProvider ) : HtmlPageFactory { private val title = application.getString(R.string.home) + private fun Int.toColor(): String { + val string = Integer.toHexString(this) + + return string.substring(2) + string.substring(0, 2) + } + + private val backgroundColor: String + get() = themeProvider.color(R.attr.colorPrimary).toColor() + private val cardColor: String + get() = themeProvider.color(R.attr.autoCompleteBackgroundColor).toColor() + private val textColor: String + get() = themeProvider.color(R.attr.autoCompleteTitleColor).toColor() + override fun buildPage(): Single = Single .just(searchEngineProvider.provideSearchEngine()) .map { (iconUrl, queryUrl, _) -> parse(homePageReader.provideHtml()) andBuild { title { title } + style { content -> + content.replace("--body-bg: {COLOR}", "--body-bg: #$backgroundColor;") + .replace("--box-bg: {COLOR}", "--box-bg: #$cardColor;") + .replace("--box-txt: {COLOR}", "--box-txt: #$textColor;") + } charset { UTF8 } body { id("image_url") { attr("src", iconUrl) } From 8ce6119c418c28dd5f97afb014e29541a3398d2b Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sun, 31 Jul 2022 23:36:11 -0400 Subject: [PATCH 103/161] Change default homepage to bookmarks --- .../java/acr/browser/lightning/preference/UserPreferences.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/acr/browser/lightning/preference/UserPreferences.kt b/app/src/main/java/acr/browser/lightning/preference/UserPreferences.kt index eacc21956..1751062fc 100644 --- a/app/src/main/java/acr/browser/lightning/preference/UserPreferences.kt +++ b/app/src/main/java/acr/browser/lightning/preference/UserPreferences.kt @@ -5,6 +5,7 @@ import acr.browser.lightning.browser.ProxyChoice import acr.browser.lightning.browser.SearchBoxDisplayChoice import acr.browser.lightning.browser.SearchBoxModel import acr.browser.lightning.constant.DEFAULT_ENCODING +import acr.browser.lightning.constant.SCHEME_BOOKMARKS import acr.browser.lightning.constant.SCHEME_HOMEPAGE import acr.browser.lightning.device.ScreenSize import acr.browser.lightning.di.UserPrefs @@ -71,7 +72,7 @@ class UserPreferences @Inject constructor( /** * The URL of the selected homepage. */ - var homepage by preferences.stringPreference(HOMEPAGE, SCHEME_HOMEPAGE) + var homepage by preferences.stringPreference(HOMEPAGE, SCHEME_BOOKMARKS) /** * True if cookies should be enabled in incognito mode, false otherwise. From de8db1a371360130a12f843a49a405b3ab2a59a4 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Mon, 1 Aug 2022 09:39:03 -0400 Subject: [PATCH 104/161] Don't record history entries with blank URLs --- .../java/acr/browser/lightning/_browser2/BrowserPresenter.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 445cd3e06..426e8f575 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -279,7 +279,7 @@ class BrowserPresenter @Inject constructor( it.copy(title = title, icon = bitmap.value()) })) - tabModel.url.takeIf { !it.isSpecialUrl() }?.let { + tabModel.url.takeIf { !it.isSpecialUrl() && it.isNotBlank() }?.let { historyRecord.recordVisit(title, it) } } From d91bdbcab50e55e77d93f3cbe1f9bfcb3e51d1d4 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Mon, 1 Aug 2022 09:53:32 -0400 Subject: [PATCH 105/161] Separating the tab list state from the view state since they are not directly related Also avoids race conditions from occurring with multiple subscriptions to the tab states that would only be resolved by creating a monolithic subscription to all tabs at once --- .../lightning/_browser2/BrowserActivity.kt | 7 +- .../lightning/_browser2/BrowserContract.kt | 3 + .../lightning/_browser2/BrowserPresenter.kt | 98 ++++++++++--------- .../_browser2/BrowserStateAdapter.kt | 8 +- .../lightning/_browser2/BrowserViewState.kt | 2 - 5 files changed, 64 insertions(+), 54 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index 631003687..b3e846ea2 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -311,7 +311,6 @@ abstract class BrowserActivity : ThemableBrowserActivity() { menuItemAddBookmark?.isVisible = it menuItemReaderMode?.isVisible = it } - viewState.tabs?.let { binding.tabCountView.updateCount(it.size) } viewState.progress?.let { binding.progressView.progress = it } viewState.isRefresh?.let { binding.searchRefresh.setImageResource( @@ -322,7 +321,6 @@ abstract class BrowserActivity : ThemableBrowserActivity() { } ) } - viewState.tabs?.let(tabsAdapter::submitList) viewState.bookmarks?.let(bookmarksAdapter::submitList) viewState.isBookmarked?.let { binding.actionAddBookmark.isSelected = it } viewState.isBookmarkEnabled?.let { binding.actionAddBookmark.isEnabled = it } @@ -345,6 +343,11 @@ abstract class BrowserActivity : ThemableBrowserActivity() { } } + fun renderTabs(tabListState: List) { + binding.tabCountView.updateCount(tabListState.size) + tabsAdapter.submitList(tabListState) + } + fun showAddBookmarkDialog(title: String, url: String, folders: List) { lightningDialogBuilder.showAddBookmarkDialog( activity = this, diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt index 8ecf7e6e8..02be6741c 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt @@ -2,6 +2,7 @@ package acr.browser.lightning._browser2 import acr.browser.lightning._browser2.download.PendingDownload import acr.browser.lightning._browser2.tab.TabModel +import acr.browser.lightning._browser2.tab.TabViewState import acr.browser.lightning.database.Bookmark import acr.browser.lightning.database.HistoryEntry import acr.browser.lightning.database.downloads.DownloadEntry @@ -25,6 +26,8 @@ interface BrowserContract { fun renderState(viewState: BrowserViewState) + fun renderTabs(tabs: List) + fun showAddBookmarkDialog(title: String, url: String, folders: List) fun showBookmarkOptionsDialog(bookmark: Bookmark.Entry) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 426e8f575..0e7b812d8 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -78,7 +78,6 @@ class BrowserPresenter @Inject constructor( sslState = SslState.None, progress = 0, enableFullMenu = true, - tabs = emptyList(), isForwardEnabled = false, isBackEnabled = false, bookmarks = emptyList(), @@ -87,6 +86,7 @@ class BrowserPresenter @Inject constructor( isRootFolder = true, findInPage = "" ) + private var tabListState: List = emptyList() private var currentTab: TabModel? = null private var currentFolder: Bookmark.Folder = Bookmark.Folder.Root private var isTabDrawerOpen = false @@ -119,7 +119,7 @@ class BrowserPresenter @Inject constructor( compositeDisposable += model.tabsListChanges() .observeOn(mainScheduler) .subscribe { list -> - this.view.updateState(viewState.copy(tabs = list.map { it.asViewState() })) + this.view?.updateTabs(list.map { it.asViewState() }) allTabsDisposable.clear() list.subscribeToUpdates(allTabsDisposable) @@ -187,29 +187,29 @@ class BrowserPresenter @Inject constructor( currentTab = tabModel currentTab?.isForeground = true - val tab = tabModel ?: return view.updateState( - viewState.copy( - displayUrl = searchBoxModel.getDisplayContent( - url = "", - title = null, - isLoading = false - ), - enableFullMenu = false, - isForwardEnabled = false, - isBackEnabled = false, - sslState = SslState.None, - progress = 100, - tabs = viewState.tabs.map { - it.copy(isSelected = false) - }, - findInPage = "" + val tab = tabModel ?: return run { + view.updateState( + viewState.copy( + displayUrl = searchBoxModel.getDisplayContent( + url = "", + title = null, + isLoading = false + ), + enableFullMenu = false, + isForwardEnabled = false, + isBackEnabled = false, + sslState = SslState.None, + progress = 100, + findInPage = "" + ) ) - ) + view.updateTabs(tabListState.map { it.copy(isSelected = false) }) + } view?.showToolbar() view?.closeTabDrawer() - view?.updateState(viewState.copy(tabs = viewState.tabs.map { it.copy(isSelected = it.id == tab.id ) })) + view.updateTabs(tabListState.map { it.copy(isSelected = it.id == tab.id) }) tabDisposable.dispose() tabDisposable = CompositeDisposable() @@ -238,9 +238,6 @@ class BrowserPresenter @Inject constructor( isBackEnabled = canGoBack, sslState = sslState, progress = progress, - tabs = viewState.tabs.updateId(tab.id) { - it.copy(title = title, icon = icon.value()) - }, isBookmarked = isBookmark, isBookmarkEnabled = !isSpecialUrl, findInPage = tab.findQuery.orEmpty() @@ -263,7 +260,7 @@ class BrowserPresenter @Inject constructor( tabDisposable += tab.closeWindowRequests() .subscribeOn(mainScheduler) - .subscribeBy { onTabClose(viewState.indexOfCurrentTab()) } + .subscribeBy { onTabClose(tabListState.indexOfCurrentTab()) } } private fun List.subscribeToUpdates(compositeDisposable: CompositeDisposable) { @@ -275,9 +272,9 @@ class BrowserPresenter @Inject constructor( ).distinctUntilChanged() .subscribeOn(mainScheduler) .subscribeBy { (title, bitmap) -> - view.updateState(viewState.copy(tabs = viewState.tabs.updateId(tabModel.id) { + view.updateTabs(tabListState.updateId(tabModel.id) { it.copy(title = title, icon = bitmap.value()) - })) + }) tabModel.url.takeIf { !it.isSpecialUrl() && it.isNotBlank() }?.let { historyRecord.recordVisit(title, it) @@ -394,10 +391,10 @@ class BrowserPresenter @Inject constructor( } } - private fun BrowserViewState.tabIndexForId(id: Int?): Int = - tabs.indexOfFirst { it.id == id } + private fun List.tabIndexForId(id: Int?): Int = + indexOfFirst { it.id == id } - private fun BrowserViewState.indexOfCurrentTab(): Int = tabIndexForId(currentTab?.id) + private fun List.indexOfCurrentTab(): Int = tabIndexForId(currentTab?.id) /** * TODO @@ -406,22 +403,22 @@ class BrowserPresenter @Inject constructor( when (keyCombo) { KeyCombo.CTRL_F -> view?.showFindInPageDialog() KeyCombo.CTRL_T -> onNewTabClick() - KeyCombo.CTRL_W -> onTabClose(viewState.indexOfCurrentTab()) - KeyCombo.CTRL_Q -> view?.showCloseBrowserDialog(viewState.tabs.indexOfFirst { it.id == currentTab?.id }) + KeyCombo.CTRL_W -> onTabClose(tabListState.indexOfCurrentTab()) + KeyCombo.CTRL_Q -> view?.showCloseBrowserDialog(tabListState.indexOfCurrentTab()) KeyCombo.CTRL_R -> onRefreshOrStopClick() KeyCombo.CTRL_TAB -> TODO() KeyCombo.CTRL_SHIFT_TAB -> TODO() KeyCombo.SEARCH -> TODO() - KeyCombo.ALT_0 -> onTabClick(0.coerceAtMost(viewState.tabs.size - 1)) - KeyCombo.ALT_1 -> onTabClick(1.coerceAtMost(viewState.tabs.size - 1)) - KeyCombo.ALT_2 -> onTabClick(2.coerceAtMost(viewState.tabs.size - 1)) - KeyCombo.ALT_3 -> onTabClick(3.coerceAtMost(viewState.tabs.size - 1)) - KeyCombo.ALT_4 -> onTabClick(4.coerceAtMost(viewState.tabs.size - 1)) - KeyCombo.ALT_5 -> onTabClick(5.coerceAtMost(viewState.tabs.size - 1)) - KeyCombo.ALT_6 -> onTabClick(6.coerceAtMost(viewState.tabs.size - 1)) - KeyCombo.ALT_7 -> onTabClick(7.coerceAtMost(viewState.tabs.size - 1)) - KeyCombo.ALT_8 -> onTabClick(8.coerceAtMost(viewState.tabs.size - 1)) - KeyCombo.ALT_9 -> onTabClick(9.coerceAtMost(viewState.tabs.size - 1)) + KeyCombo.ALT_0 -> onTabClick(0.coerceAtMost(tabListState.size - 1)) + KeyCombo.ALT_1 -> onTabClick(1.coerceAtMost(tabListState.size - 1)) + KeyCombo.ALT_2 -> onTabClick(2.coerceAtMost(tabListState.size - 1)) + KeyCombo.ALT_3 -> onTabClick(3.coerceAtMost(tabListState.size - 1)) + KeyCombo.ALT_4 -> onTabClick(4.coerceAtMost(tabListState.size - 1)) + KeyCombo.ALT_5 -> onTabClick(5.coerceAtMost(tabListState.size - 1)) + KeyCombo.ALT_6 -> onTabClick(6.coerceAtMost(tabListState.size - 1)) + KeyCombo.ALT_7 -> onTabClick(7.coerceAtMost(tabListState.size - 1)) + KeyCombo.ALT_8 -> onTabClick(8.coerceAtMost(tabListState.size - 1)) + KeyCombo.ALT_9 -> onTabClick(9.coerceAtMost(tabListState.size - 1)) } } @@ -429,14 +426,14 @@ class BrowserPresenter @Inject constructor( * TODO */ fun onTabClick(index: Int) { - selectTab(model.selectTab(viewState.tabs[index].id)) + selectTab(model.selectTab(tabListState[index].id)) } /** * TODO */ fun onTabLongClick(index: Int) { - view?.showCloseBrowserDialog(viewState.tabs[index].id) + view?.showCloseBrowserDialog(tabListState[index].id) } private fun List.nextSelected(removedIndex: Int): T? { @@ -459,12 +456,12 @@ class BrowserPresenter @Inject constructor( if (index == -1) { return } - val nextTab = viewState.tabs.nextSelected(index) + val nextTab = tabListState.nextSelected(index) val currentTabId = currentTab?.id - val needToSelectNextTab = viewState.tabs[index].id == currentTabId + val needToSelectNextTab = tabListState[index].id == currentTabId - compositeDisposable += model.deleteTab(viewState.tabs[index].id) + compositeDisposable += model.deleteTab(tabListState[index].id) .observeOn(mainScheduler) .subscribe { if (needToSelectNextTab) { @@ -509,7 +506,7 @@ class BrowserPresenter @Inject constructor( view?.showCloseBrowserDialog(it) } } else if (tabIdOpenedFromAction == currentTab?.id) { - onTabClose(viewState.indexOfCurrentTab()) + onTabClose(tabListState.indexOfCurrentTab()) } else { navigator.backgroundBrowser() } @@ -1071,7 +1068,7 @@ class BrowserPresenter @Inject constructor( fun onCloseBrowserEvent(id: Int, closeTabEvent: BrowserContract.CloseTabEvent) { when (closeTabEvent) { BrowserContract.CloseTabEvent.CLOSE_CURRENT -> - onTabClose(viewState.tabIndexForId(id)) + onTabClose(tabListState.tabIndexForId(id)) BrowserContract.CloseTabEvent.CLOSE_OTHERS -> model.tabsList .filter { it.id != id } .toObservable() @@ -1151,4 +1148,9 @@ class BrowserPresenter @Inject constructor( viewState = state this?.renderState(viewState) } + + private fun BrowserContract.View?.updateTabs(tabs: List) { + tabListState = tabs + this?.renderTabs(tabListState) + } } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt index 5fbb1478b..4df3f6ec0 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt @@ -1,5 +1,6 @@ package acr.browser.lightning._browser2 +import acr.browser.lightning._browser2.tab.TabViewState import acr.browser.lightning.database.Bookmark import acr.browser.lightning.database.HistoryEntry import acr.browser.lightning.database.downloads.DownloadEntry @@ -13,6 +14,7 @@ import targetUrl.LongPress class BrowserStateAdapter(private val browserActivity: BrowserActivity) : BrowserContract.View { private var currentState: BrowserViewState? = null + private var currentTabs: List? = null override fun renderState(viewState: BrowserViewState) { val ( @@ -21,7 +23,6 @@ class BrowserStateAdapter(private val browserActivity: BrowserActivity) : Browse isRefresh, progress, enableFullMenu, - tabs, isForwardEnabled, isBackEnabled, bookmarks, @@ -38,7 +39,6 @@ class BrowserStateAdapter(private val browserActivity: BrowserActivity) : Browse isRefresh = isRefresh.takeIf { it != currentState?.isRefresh }, progress = progress.takeIf { it != currentState?.progress }, enableFullMenu = enableFullMenu.takeIf { it != currentState?.enableFullMenu }, - tabs = tabs.takeIf { it != currentState?.tabs }, isForwardEnabled = isForwardEnabled.takeIf { it != currentState?.isForwardEnabled }, isBackEnabled = isBackEnabled.takeIf { it != currentState?.isBackEnabled }, bookmarks = bookmarks.takeIf { it != currentState?.bookmarks }, @@ -52,6 +52,10 @@ class BrowserStateAdapter(private val browserActivity: BrowserActivity) : Browse currentState = viewState } + override fun renderTabs(tabs: List) { + tabs.takeIf { it != currentTabs }?.let(browserActivity::renderTabs) + } + override fun showAddBookmarkDialog(title: String, url: String, folders: List) { browserActivity.showAddBookmarkDialog(title, url, folders) } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt index 616aaaa9e..9361017f9 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt @@ -16,7 +16,6 @@ data class BrowserViewState( val enableFullMenu: Boolean, // Tabs - val tabs: List, val isForwardEnabled: Boolean, val isBackEnabled: Boolean, @@ -40,7 +39,6 @@ data class PartialBrowserViewState( val enableFullMenu: Boolean?, // Tabs - val tabs: List?, val isForwardEnabled: Boolean?, val isBackEnabled: Boolean?, From 56d0de0742b27e5b8e92aa3fc29855f142e57ed5 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Mon, 1 Aug 2022 11:21:15 -0400 Subject: [PATCH 106/161] Go up to the root folder when deleting a folder --- .../java/acr/browser/lightning/_browser2/BrowserPresenter.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 0e7b812d8..6168c1c69 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -912,6 +912,7 @@ class BrowserPresenter @Inject constructor( view?.updateState(viewState.copy(bookmarks = list)) if (currentTab?.url?.isBookmarkUrl() == true) { reload() + currentTab?.goBack() } } } From 131d4cdc3b1a7b242caf7a407646510857379a1a Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Mon, 1 Aug 2022 17:12:22 -0400 Subject: [PATCH 107/161] Disable item animation for desktop tabs it just looks bad --- .../browser/lightning/_browser2/BrowserActivity.kt | 6 +++--- .../acr/browser/lightning/extensions/Extensions.kt | 12 ++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 app/src/main/java/acr/browser/lightning/extensions/Extensions.kt diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index b3e846ea2..83fdd3da2 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -24,9 +24,7 @@ import acr.browser.lightning.di.injector import acr.browser.lightning.dialog.BrowserDialog import acr.browser.lightning.dialog.DialogItem import acr.browser.lightning.dialog.LightningDialogBuilder -import acr.browser.lightning.extensions.color -import acr.browser.lightning.extensions.drawable -import acr.browser.lightning.extensions.resizeAndShow +import acr.browser.lightning.extensions.* import acr.browser.lightning.search.SuggestionsAdapter import acr.browser.lightning.ssl.createSslDrawableForState import android.content.Intent @@ -191,6 +189,8 @@ abstract class BrowserActivity : ThemableBrowserActivity() { binding.desktopTabsList.adapter = tabsAdapter binding.desktopTabsList.layoutManager = LinearLayoutManager(this, RecyclerView.HORIZONTAL, false) + binding.desktopTabsList.itemAnimator?.takeIfInstance() + ?.supportsChangeAnimations = false binding.drawerTabsList.isVisible = false } diff --git a/app/src/main/java/acr/browser/lightning/extensions/Extensions.kt b/app/src/main/java/acr/browser/lightning/extensions/Extensions.kt new file mode 100644 index 000000000..417ec8daf --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/extensions/Extensions.kt @@ -0,0 +1,12 @@ +package acr.browser.lightning.extensions + +/** + * Returns the current object as an instance of [T] if it is the right type. + */ +inline fun Any.takeIfInstance(): T? { + return if (this is T) { + this + } else { + null + } +} From 0eba931dfc584b4d8efce954a76556d9492f7cfd Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Mon, 1 Aug 2022 21:14:21 -0400 Subject: [PATCH 108/161] Support color mode --- .../lightning/_browser2/BrowserActivity.kt | 30 +++++++++++ .../lightning/_browser2/BrowserPresenter.kt | 7 ++- .../_browser2/BrowserStateAdapter.kt | 2 + .../lightning/_browser2/BrowserViewState.kt | 4 +- .../_browser2/color/ColorAnimator.kt | 52 +++++++++++++++++++ .../tab/DesktopTabRecyclerViewAdapter.kt | 49 +++++++++++------ .../lightning/_browser2/tab/TabAdapter.kt | 5 ++ .../lightning/_browser2/tab/TabModel.kt | 4 ++ .../_browser2/tab/TabWebChromeClient.kt | 31 +++++++++++ .../lightning/_browser2/tab/TabsRepository.kt | 4 +- .../acr/browser/lightning/utils/Utils.java | 10 ++++ 11 files changed, 179 insertions(+), 19 deletions(-) create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/color/ColorAnimator.kt diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index 83fdd3da2..43ebc042c 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -1,7 +1,9 @@ package acr.browser.lightning._browser2 +import acr.browser.lightning.AppTheme import acr.browser.lightning.R import acr.browser.lightning._browser2.bookmark.BookmarkRecyclerViewAdapter +import acr.browser.lightning._browser2.color.ColorAnimator import acr.browser.lightning._browser2.image.ImageLoader import acr.browser.lightning._browser2.keys.KeyEventAdapter import acr.browser.lightning._browser2.menu.MenuItemAdapter @@ -27,7 +29,9 @@ import acr.browser.lightning.dialog.LightningDialogBuilder import acr.browser.lightning.extensions.* import acr.browser.lightning.search.SuggestionsAdapter import acr.browser.lightning.ssl.createSslDrawableForState +import acr.browser.lightning.utils.value import android.content.Intent +import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.view.* import android.view.inputmethod.InputMethodManager @@ -41,6 +45,7 @@ import androidx.drawerlayout.widget.DrawerLayout import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView +import androidx.recyclerview.widget.SimpleItemAnimator import targetUrl.LongPress import javax.inject.Inject @@ -59,6 +64,9 @@ abstract class BrowserActivity : ThemableBrowserActivity() { private var menuItemAddBookmark: MenuItem? = null private var menuItemReaderMode: MenuItem? = null + private val defaultColor by lazy { color(R.color.primary_color) } + private val backgroundDrawable by lazy { ColorDrawable(defaultColor) } + @Inject internal lateinit var imageLoader: ImageLoader @@ -311,6 +319,7 @@ abstract class BrowserActivity : ThemableBrowserActivity() { menuItemAddBookmark?.isVisible = it menuItemReaderMode?.isVisible = it } + viewState.themeColor?.value()?.let(::animateColorChange) viewState.progress?.let { binding.progressView.progress = it } viewState.isRefresh?.let { binding.searchRefresh.setImageResource( @@ -576,6 +585,27 @@ abstract class BrowserActivity : ThemableBrowserActivity() { .resizeAndShow() } + private fun animateColorChange(color: Int) { + if (!userPreferences.colorModeEnabled || userPreferences.useTheme != AppTheme.LIGHT || isIncognito()) { + return + } + val shouldShowTabsInDrawer = userPreferences.showTabsInDrawer + val adapter = tabsAdapter as? DesktopTabRecyclerViewAdapter + val colorAnimator = ColorAnimator(defaultColor) + binding.toolbar.startAnimation(colorAnimator.animateTo( + color + ) { mainColor, secondaryColor -> + if (shouldShowTabsInDrawer) { + backgroundDrawable.color = mainColor + window.setBackgroundDrawable(backgroundDrawable) + } else { + adapter?.updateForegroundTabColor(mainColor) + } + binding.toolbar.setBackgroundColor(mainColor) + binding.searchContainer.background?.tint(secondaryColor) + }) + } + private fun ImageView.updateVisibilityForDrawable() { visibility = if (drawable == null) { View.GONE diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 6168c1c69..1f6fd575c 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -29,6 +29,7 @@ import acr.browser.lightning.search.SearchEngineProvider import acr.browser.lightning.ssl.SslState import acr.browser.lightning.utils.* import acr.browser.lightning.view.* +import android.graphics.Color import androidx.core.net.toUri import io.reactivex.Maybe import io.reactivex.Scheduler @@ -78,6 +79,7 @@ class BrowserPresenter @Inject constructor( sslState = SslState.None, progress = 0, enableFullMenu = true, + themeColor = Option.None, isForwardEnabled = false, isBackEnabled = false, bookmarks = emptyList(), @@ -223,8 +225,8 @@ class BrowserPresenter @Inject constructor( tab.urlChanges().startWith(tab.url).observeOn(diskScheduler) .flatMapSingle(bookmarkRepository::isBookmark).observeOn(mainScheduler), tab.urlChanges().startWith(tab.url).map(String::isSpecialUrl), - tab.faviconChanges().startWith(Option.fromNullable(tab.favicon)) - ) { sslState, title, url, progress, canGoBack, canGoForward, isBookmark, isSpecialUrl, icon -> + tab.themeColorChanges().startWith(tab.themeColor) + ) { sslState, title, url, progress, canGoBack, canGoForward, isBookmark, isSpecialUrl, themeColor -> viewState.copy( displayUrl = searchBoxModel.getDisplayContent( @@ -233,6 +235,7 @@ class BrowserPresenter @Inject constructor( isLoading = progress < 100 ), enableFullMenu = !url.isSpecialUrl(), + themeColor = Option.Some(themeColor), isRefresh = progress == 100, isForwardEnabled = canGoForward, isBackEnabled = canGoBack, diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt index 4df3f6ec0..77ef1cf5c 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt @@ -23,6 +23,7 @@ class BrowserStateAdapter(private val browserActivity: BrowserActivity) : Browse isRefresh, progress, enableFullMenu, + themeColor, isForwardEnabled, isBackEnabled, bookmarks, @@ -39,6 +40,7 @@ class BrowserStateAdapter(private val browserActivity: BrowserActivity) : Browse isRefresh = isRefresh.takeIf { it != currentState?.isRefresh }, progress = progress.takeIf { it != currentState?.progress }, enableFullMenu = enableFullMenu.takeIf { it != currentState?.enableFullMenu }, + themeColor = themeColor.takeIf { it != currentState?.themeColor }, isForwardEnabled = isForwardEnabled.takeIf { it != currentState?.isForwardEnabled }, isBackEnabled = isBackEnabled.takeIf { it != currentState?.isBackEnabled }, bookmarks = bookmarks.takeIf { it != currentState?.bookmarks }, diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt index 9361017f9..1e16d65d7 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt @@ -1,8 +1,8 @@ package acr.browser.lightning._browser2 -import acr.browser.lightning._browser2.tab.TabViewState import acr.browser.lightning.database.Bookmark import acr.browser.lightning.ssl.SslState +import acr.browser.lightning.utils.Option /** * Created by anthonycr on 9/11/20. @@ -14,6 +14,7 @@ data class BrowserViewState( val isRefresh: Boolean, val progress: Int, val enableFullMenu: Boolean, + val themeColor: Option, // Tabs val isForwardEnabled: Boolean, @@ -37,6 +38,7 @@ data class PartialBrowserViewState( val isRefresh: Boolean?, val progress: Int?, val enableFullMenu: Boolean?, + val themeColor: Option?, // Tabs val isForwardEnabled: Boolean?, diff --git a/app/src/main/java/acr/browser/lightning/_browser2/color/ColorAnimator.kt b/app/src/main/java/acr/browser/lightning/_browser2/color/ColorAnimator.kt new file mode 100644 index 000000000..d5fbafb93 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/color/ColorAnimator.kt @@ -0,0 +1,52 @@ +package acr.browser.lightning._browser2.color + +import acr.browser.lightning.utils.DrawableUtils +import acr.browser.lightning.utils.Utils +import android.graphics.Color +import android.view.animation.Animation +import android.view.animation.Transformation + +/** + * An animator that creates animations between two different colors. + */ +class ColorAnimator(private val defaultColor: Int) { + + private var currentColor: Int? = null + + private fun mixSearchBarColor(requestedColor: Int, defaultColor: Int): Int = + if (requestedColor == defaultColor) { + Color.WHITE + } else { + DrawableUtils.mixColor(0.25f, requestedColor, Color.WHITE) + } + + /** + * Creates an animation that animates from the current color to the new [color]. + */ + fun animateTo( + color: Int, + onChange: (mainColor: Int, secondaryColor: Int) -> Unit + ): Animation { + val currentUiColor = currentColor ?: defaultColor + val finalUiColor = if (Utils.isColorGrayscale(color)) { + defaultColor + } else { + color + } + + val startSearchColor = mixSearchBarColor(currentUiColor, defaultColor) + val finalSearchColor = mixSearchBarColor(finalUiColor, defaultColor) + val animation = object : Animation() { + override fun applyTransformation(interpolatedTime: Float, t: Transformation) { + val mainColor = + DrawableUtils.mixColor(interpolatedTime, currentUiColor, finalUiColor) + val secondaryColor = + DrawableUtils.mixColor(interpolatedTime, startSearchColor, finalSearchColor) + onChange(mainColor, secondaryColor) + currentColor = mainColor + } + } + animation.duration = 300 + return animation + } +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/DesktopTabRecyclerViewAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/DesktopTabRecyclerViewAdapter.kt index 40788c209..8b432a473 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/DesktopTabRecyclerViewAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/DesktopTabRecyclerViewAdapter.kt @@ -1,13 +1,9 @@ package acr.browser.lightning._browser2.tab import acr.browser.lightning.R -import acr.browser.lightning.extensions.desaturate -import acr.browser.lightning.extensions.dimen -import acr.browser.lightning.extensions.drawTrapezoid -import acr.browser.lightning.extensions.inflater +import acr.browser.lightning.extensions.* import acr.browser.lightning.utils.ThemeUtils import acr.browser.lightning.utils.Utils -import acr.browser.lightning.view.BackgroundDrawable import android.content.Context import android.graphics.Bitmap import android.graphics.Canvas @@ -15,6 +11,7 @@ import android.graphics.Color import android.graphics.drawable.BitmapDrawable import android.graphics.drawable.Drawable import android.view.ViewGroup +import android.widget.LinearLayout import androidx.core.widget.TextViewCompat import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter @@ -32,14 +29,17 @@ class DesktopTabRecyclerViewAdapter( override fun areItemsTheSame(oldItem: TabViewState, newItem: TabViewState): Boolean = oldItem.id == newItem.id - override fun areContentsTheSame(oldItem: TabViewState, newItem: TabViewState): Boolean = oldItem == newItem + override fun areContentsTheSame(oldItem: TabViewState, newItem: TabViewState): Boolean = + oldItem == newItem } ) { - private val backgroundTabDrawable: Drawable? - private val foregroundTabDrawable: Drawable? + private val backgroundTabDrawable: Drawable + private val foregroundTabDrawable: Drawable + private var foregroundLayout: LinearLayout? = null init { - val backgroundColor = Utils.mixTwoColors(ThemeUtils.getPrimaryColor(context), Color.BLACK, 0.75f) + val backgroundColor = + Utils.mixTwoColors(ThemeUtils.getPrimaryColor(context), Color.BLACK, 0.75f) val backgroundTabBitmap = Bitmap.createBitmap( context.dimen(R.dimen.desktop_tab_width), context.dimen(R.dimen.desktop_tab_height), @@ -57,12 +57,23 @@ class DesktopTabRecyclerViewAdapter( ).also { Canvas(it).drawTrapezoid(foregroundColor, false) } - foregroundTabDrawable = BitmapDrawable(context.resources, foregroundTabBitmap) + foregroundTabDrawable = BitmapDrawable(context.resources, foregroundTabBitmap).mutate() + } + + fun updateForegroundTabColor(color: Int) { + foregroundTabDrawable.tint(color) + foregroundLayout?.invalidate() } override fun onCreateViewHolder(viewGroup: ViewGroup, i: Int): TabViewHolder { - val view = viewGroup.context.inflater.inflate(R.layout.tab_list_item_horizontal, viewGroup, false) - return TabViewHolder(view, onClick = onClick, onLongClick = onLongClick, onCloseClick = onCloseClick) + val view = + viewGroup.context.inflater.inflate(R.layout.tab_list_item_horizontal, viewGroup, false) + return TabViewHolder( + view, + onClick = onClick, + onLongClick = onLongClick, + onCloseClick = onCloseClick + ) } override fun onBindViewHolder(holder: TabViewHolder, position: Int) { @@ -71,12 +82,16 @@ class DesktopTabRecyclerViewAdapter( val tab = getItem(position) holder.txtTitle.text = tab.title - updateViewHolderAppearance(holder, null, tab.isSelected) + updateViewHolderAppearance(holder, tab.isSelected) updateViewHolderFavicon(holder, tab.icon, tab.isSelected) updateViewHolderBackground(holder, tab.isSelected) } - private fun updateViewHolderFavicon(viewHolder: TabViewHolder, favicon: Bitmap?, isForeground: Boolean) { + private fun updateViewHolderFavicon( + viewHolder: TabViewHolder, + favicon: Bitmap?, + isForeground: Boolean + ) { favicon?.let { if (isForeground) { viewHolder.favicon.setImageBitmap(it) @@ -88,13 +103,17 @@ class DesktopTabRecyclerViewAdapter( private fun updateViewHolderBackground(viewHolder: TabViewHolder, isForeground: Boolean) { if (isForeground) { + foregroundLayout = viewHolder.layout viewHolder.layout.background = foregroundTabDrawable } else { viewHolder.layout.background = backgroundTabDrawable } } - private fun updateViewHolderAppearance(viewHolder: TabViewHolder, favicon: Bitmap?, isForeground: Boolean) { + private fun updateViewHolderAppearance( + viewHolder: TabViewHolder, + isForeground: Boolean + ) { if (isForeground) { TextViewCompat.setTextAppearance(viewHolder.txtTitle, R.style.boldText) } else { diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt index 3b8858510..d7fe21bcf 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt @@ -130,6 +130,11 @@ class TabAdapter( override fun faviconChanges(): Observable> = tabWebChromeClient.faviconObservable + override val themeColor: Int + get() = requireNotNull(tabWebChromeClient.colorChangeObservable.value) + + override fun themeColorChanges(): Observable = tabWebChromeClient.colorChangeObservable + // TODO do we show "new tab" override val url: String get() = webView.url.orEmpty() diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt index 088e560be..fc323da8f 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt @@ -53,6 +53,10 @@ interface TabModel { fun faviconChanges(): Observable> + val themeColor: Int + + fun themeColorChanges(): Observable + val url: String fun urlChanges(): Observable diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt index 4738bf086..1882b484c 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt @@ -1,13 +1,20 @@ package acr.browser.lightning._browser2.tab +import acr.browser.lightning.R +import acr.browser.lightning.extensions.color import acr.browser.lightning.favicon.FaviconModel import acr.browser.lightning.utils.Option +import acr.browser.lightning.utils.Utils import acr.browser.lightning.view.ResultMessageInitializer import acr.browser.lightning.view.TabInitializer +import android.content.Context import android.graphics.Bitmap +import android.graphics.Color import android.os.Message import android.webkit.WebChromeClient import android.webkit.WebView +import androidx.core.content.ContextCompat +import androidx.palette.graphics.Palette import io.reactivex.Scheduler import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.PublishSubject @@ -16,15 +23,19 @@ import io.reactivex.subjects.PublishSubject * Created by anthonycr on 9/12/20. */ class TabWebChromeClient( + context: Context, private val faviconModel: FaviconModel, private val diskScheduler: Scheduler ) : WebChromeClient() { + private val defaultColor = context.color(R.color.primary_color) + val progressObservable: PublishSubject = PublishSubject.create() val titleObservable: PublishSubject = PublishSubject.create() val faviconObservable: BehaviorSubject> = BehaviorSubject.create() val createWindowObservable: PublishSubject = PublishSubject.create() val closeWindowObservable: PublishSubject = PublishSubject.create() + val colorChangeObservable: BehaviorSubject = BehaviorSubject.createDefault(defaultColor) override fun onCreateWindow( view: WebView, @@ -49,6 +60,7 @@ class TabWebChromeClient( super.onReceivedTitle(view, title) titleObservable.onNext(title) faviconObservable.onNext(Option.None) + generateColorAndPropagate(null) } override fun onReceivedIcon(view: WebView, icon: Bitmap) { @@ -58,5 +70,24 @@ class TabWebChromeClient( faviconModel.cacheFaviconForUrl(icon, url) .subscribeOn(diskScheduler) .subscribe() + generateColorAndPropagate(icon) + } + + fun generateColorAndPropagate(favicon: Bitmap?) { + val icon = favicon ?: return run { + colorChangeObservable.onNext(defaultColor) + } + Palette.from(icon).generate { palette -> + // OR with opaque black to remove transparency glitches + val color = Color.BLACK or (palette?.getDominantColor(defaultColor) ?: defaultColor) + + // Lighten up the dark color if it is too dark + val finalColor = if (Utils.isColorTooDark(color)) { + Utils.mixTwoColors(defaultColor, color, 0.25f) + } else { + color + } + colorChangeObservable.onNext(finalColor) + } } } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt index d32b151cb..401144b52 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt @@ -10,6 +10,7 @@ import acr.browser.lightning.di.MainScheduler import acr.browser.lightning.favicon.FaviconModel import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.view.* +import android.app.Application import android.graphics.Bitmap import io.reactivex.* import io.reactivex.subjects.PublishSubject @@ -19,6 +20,7 @@ import javax.inject.Inject * Created by anthonycr on 9/12/20. */ class TabsRepository @Inject constructor( + private val application: Application, private val webViewFactory: WebViewFactory, private val tabPager: TabPager, private val adBlocker: AdBlocker, @@ -66,7 +68,7 @@ class TabsRepository @Inject constructor( webView, headers, TabWebViewClient(adBlocker, allowListModel, urlHandler, headers), - TabWebChromeClient(faviconModel, diskScheduler), + TabWebChromeClient(application, faviconModel, diskScheduler), userPreferences, defaultUserAgent, iconFreeze diff --git a/app/src/main/java/acr/browser/lightning/utils/Utils.java b/app/src/main/java/acr/browser/lightning/utils/Utils.java index 81bc96c05..338783096 100644 --- a/app/src/main/java/acr/browser/lightning/utils/Utils.java +++ b/app/src/main/java/acr/browser/lightning/utils/Utils.java @@ -166,6 +166,16 @@ private static boolean deleteDir(@Nullable File dir) { return dir != null && dir.delete(); } + public static boolean isColorGrayscale(int pixel) { + int alpha = (pixel & 0xFF000000) >> 24; + int red = (pixel & 0x00FF0000) >> 16; + int green = (pixel & 0x0000FF00) >> 8; + int blue = (pixel & 0x000000FF); + + return red == green && green == blue; + + } + public static boolean isColorTooDark(int color) { final byte RED_CHANNEL = 16; final byte GREEN_CHANNEL = 8; From 41145d1829107867d3ec1e80390076236b4bbfb8 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 2 Aug 2022 14:17:32 -0400 Subject: [PATCH 109/161] Support reopening closed tabs --- .../browser/lightning/_browser2/BrowserActivity.kt | 4 ++++ .../browser/lightning/_browser2/BrowserContract.kt | 2 ++ .../browser/lightning/_browser2/BrowserPresenter.kt | 12 ++++++++++++ .../lightning/_browser2/tab/TabsRepository.kt | 9 ++++++++- .../acr/browser/lightning/browser/RecentTabModel.kt | 3 ++- 5 files changed, 28 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index 43ebc042c..79add3b19 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -250,6 +250,10 @@ abstract class BrowserActivity : ThemableBrowserActivity() { binding.actionForward.setOnClickListener { presenter.onForwardClick() } binding.actionHome.setOnClickListener { presenter.onHomeClick() } binding.newTabButton.setOnClickListener { presenter.onNewTabClick() } + binding.newTabButton.setOnLongClickListener { + presenter.onNewTabLongClick() + true + } binding.searchRefresh.setOnClickListener { presenter.onRefreshOrStopClick() } binding.actionAddBookmark.setOnClickListener { presenter.onStarClick() } binding.actionPageTools.setOnClickListener { presenter.onToolsClick() } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt index 02be6741c..e7f6647d3 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt @@ -80,6 +80,8 @@ interface BrowserContract { fun createTab(tabInitializer: TabInitializer): Single + fun reopenTab(): Maybe + fun selectTab(id: Int): TabModel fun initializeTabs(): Maybe> diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 1f6fd575c..34ab31483 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -548,6 +548,18 @@ class BrowserPresenter @Inject constructor( createNewTabAndSelect(homePageInitializer, shouldSelect = true) } + /** + * Call when the user long clicks on the new tab button, indicating that they want to re-open + * the last closed tab. + */ + fun onNewTabLongClick() { + compositeDisposable += model.reopenTab() + .observeOn(mainScheduler) + .subscribeBy { tab -> + selectTab(model.selectTab(tab.id)) + } + } + /** * TODO */ diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt index 401144b52..9ff8bb585 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt @@ -5,6 +5,7 @@ import acr.browser.lightning._browser2.image.IconFreeze import acr.browser.lightning._browser2.tab.bundle.BundleStore import acr.browser.lightning.adblock.AdBlocker import acr.browser.lightning.adblock.allowlist.AllowListModel +import acr.browser.lightning.browser.RecentTabModel import acr.browser.lightning.di.DiskScheduler import acr.browser.lightning.di.MainScheduler import acr.browser.lightning.favicon.FaviconModel @@ -12,6 +13,7 @@ import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.view.* import android.app.Application import android.graphics.Bitmap +import android.os.Bundle import io.reactivex.* import io.reactivex.subjects.PublishSubject import javax.inject.Inject @@ -32,7 +34,8 @@ class TabsRepository @Inject constructor( private val urlHandler: UrlHandler, private val userPreferences: UserPreferences, @DefaultUserAgent private val defaultUserAgent: String, - @IconFreeze private val iconFreeze: Bitmap + @IconFreeze private val iconFreeze: Bitmap, + private val recentTabModel: RecentTabModel ) : BrowserContract.Model { private var selectedTab: TabModel? = null @@ -43,6 +46,7 @@ class TabsRepository @Inject constructor( tabPager.clearTab() } val tab = tabsList.forId(id) + recentTabModel.addClosedTab(tab.freeze()) tab.destroy() tabsList = tabsList - tab }.doOnComplete { @@ -81,6 +85,9 @@ class TabsRepository @Inject constructor( tabsListObservable.onNext(tabsList) } + override fun reopenTab(): Maybe = Maybe.fromCallable(recentTabModel::lastClosed) + .flatMapSingleElement { createTab(BundleInitializer(it)) } + override fun selectTab(id: Int): TabModel { val selected = tabsList.forId(id) selectedTab = selected diff --git a/app/src/main/java/acr/browser/lightning/browser/RecentTabModel.kt b/app/src/main/java/acr/browser/lightning/browser/RecentTabModel.kt index fec49c930..be97b8578 100644 --- a/app/src/main/java/acr/browser/lightning/browser/RecentTabModel.kt +++ b/app/src/main/java/acr/browser/lightning/browser/RecentTabModel.kt @@ -3,11 +3,12 @@ package acr.browser.lightning.browser import acr.browser.lightning.extensions.popIfNotEmpty import android.os.Bundle import java.util.* +import javax.inject.Inject /** * A model that saves [Bundle] and returns the last returned one. */ -class RecentTabModel { +class RecentTabModel @Inject constructor() { private val bundleStack: Stack = Stack() From f85b0222769b04ed42d7a72408e1993feebe1c4f Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 2 Aug 2022 14:46:29 -0400 Subject: [PATCH 110/161] Reimplementing proxy in new tab impementation --- .../lightning/_browser2/BrowserActivity.kt | 4 ++ .../_browser2/di/Browser2BindsModule.kt | 7 ++- .../lightning/_browser2/proxy/Proxy.kt | 10 ++++ .../lightning/_browser2/proxy/ProxyAdapter.kt | 57 +++++++++++++++++++ .../lightning/_browser2/tab/TabAdapter.kt | 6 +- .../_browser2/tab/TabWebViewClient.kt | 13 ++++- .../lightning/_browser2/tab/TabsRepository.kt | 10 ++-- 7 files changed, 97 insertions(+), 10 deletions(-) create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/proxy/Proxy.kt create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/proxy/ProxyAdapter.kt diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index 79add3b19..c04d82ed8 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -29,6 +29,7 @@ import acr.browser.lightning.dialog.LightningDialogBuilder import acr.browser.lightning.extensions.* import acr.browser.lightning.search.SuggestionsAdapter import acr.browser.lightning.ssl.createSslDrawableForState +import acr.browser.lightning.utils.ProxyUtils import acr.browser.lightning.utils.value import android.content.Intent import android.graphics.drawable.ColorDrawable @@ -94,6 +95,9 @@ abstract class BrowserActivity : ThemableBrowserActivity() { @Inject internal lateinit var uiConfiguration: UiConfiguration + @Inject + internal lateinit var proxyUtils: ProxyUtils + /** * True if the activity is operating in incognito mode, false otherwise. */ diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2BindsModule.kt b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2BindsModule.kt index ac78a6ad8..12716f3ba 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2BindsModule.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2BindsModule.kt @@ -2,10 +2,10 @@ package acr.browser.lightning._browser2.di import acr.browser.lightning._browser2.BrowserContract import acr.browser.lightning._browser2.BrowserNavigator -import acr.browser.lightning._browser2.history.DefaultHistoryRecord -import acr.browser.lightning._browser2.history.HistoryRecord import acr.browser.lightning._browser2.image.FaviconImageLoader import acr.browser.lightning._browser2.image.ImageLoader +import acr.browser.lightning._browser2.proxy.Proxy +import acr.browser.lightning._browser2.proxy.ProxyAdapter import acr.browser.lightning._browser2.tab.TabsRepository import acr.browser.lightning._browser2.theme.LegacyThemeProvider import acr.browser.lightning._browser2.theme.ThemeProvider @@ -29,4 +29,7 @@ interface Browser2BindsModule { @Binds fun bindsThemeProvider(legacyThemeProvider: LegacyThemeProvider): ThemeProvider + + @Binds + fun bindsProxy(proxyAdapter: ProxyAdapter): Proxy } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/proxy/Proxy.kt b/app/src/main/java/acr/browser/lightning/_browser2/proxy/Proxy.kt new file mode 100644 index 000000000..3b4ba2d78 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/proxy/Proxy.kt @@ -0,0 +1,10 @@ +package acr.browser.lightning._browser2.proxy + +/** + * Created by anthonycr on 8/2/22. + */ +interface Proxy { + + fun isProxyReady(): Boolean + +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/proxy/ProxyAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/proxy/ProxyAdapter.kt new file mode 100644 index 000000000..629451383 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/proxy/ProxyAdapter.kt @@ -0,0 +1,57 @@ +package acr.browser.lightning._browser2.proxy + +import acr.browser.lightning._browser2.BrowserActivity +import acr.browser.lightning.utils.ProxyUtils +import android.app.Activity +import android.app.Application +import android.os.Bundle +import javax.inject.Inject + +/** + * An adapter between [ProxyUtils] and [Proxy]. + */ +class ProxyAdapter @Inject constructor( + application: Application, + private val proxyUtils: ProxyUtils +) : Proxy { + + private var currentActivity: Activity? = null + + init { + application.registerActivityLifecycleCallbacks(object : + Application.ActivityLifecycleCallbacks { + override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) { + if (activity !is BrowserActivity) return + currentActivity = activity + } + + override fun onActivityStarted(activity: Activity) { + if (activity !is BrowserActivity) return + proxyUtils.onStart(activity) + } + + override fun onActivityResumed(activity: Activity) { + if (activity !is BrowserActivity) return + proxyUtils.checkForProxy(activity) + proxyUtils.updateProxySettings(activity) + } + + override fun onActivityPaused(activity: Activity) = Unit + + override fun onActivityStopped(activity: Activity) { + if (activity !is BrowserActivity) return + proxyUtils.onStop() + } + + override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) = Unit + + override fun onActivityDestroyed(activity: Activity) { + if (activity !is BrowserActivity) return + currentActivity = null + } + + }) + } + + override fun isProxyReady(): Boolean = currentActivity?.let(proxyUtils::isProxyReady) ?: false +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt index d7fe21bcf..8938f522f 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt @@ -1,6 +1,7 @@ package acr.browser.lightning._browser2.tab import acr.browser.lightning._browser2.download.PendingDownload +import acr.browser.lightning._browser2.proxy.Proxy import acr.browser.lightning.constant.DESKTOP_USER_AGENT import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.preference.userAgent @@ -27,7 +28,8 @@ class TabAdapter( private val tabWebChromeClient: TabWebChromeClient, private val userPreferences: UserPreferences, private val defaultUserAgent: String, - private val iconFreeze: Bitmap + private val iconFreeze: Bitmap, + private val proxy: Proxy ) : TabModel { private var latentInitializer: FreezableBundleInitializer? = null @@ -60,6 +62,7 @@ class TabAdapter( override val id: Int = webView.id override fun loadUrl(url: String) { + if (!proxy.isProxyReady()) return webView.loadUrl(url, requestHeaders) } @@ -96,6 +99,7 @@ class TabAdapter( } override fun reload() { + if (!proxy.isProxyReady()) return webView.reload() } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebViewClient.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebViewClient.kt index 9c175bad7..ccc91ab11 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebViewClient.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebViewClient.kt @@ -1,5 +1,6 @@ package acr.browser.lightning._browser2.tab +import acr.browser.lightning._browser2.proxy.Proxy import acr.browser.lightning.adblock.AdBlocker import acr.browser.lightning.adblock.allowlist.AllowListModel import acr.browser.lightning.ssl.SslState @@ -19,7 +20,8 @@ class TabWebViewClient( private val adBlocker: AdBlocker, private val allowListModel: AllowListModel, private val urlHandler: UrlHandler, - private val headers: Map + private val headers: Map, + private val proxy: Proxy ) : WebViewClient() { val urlObservable: PublishSubject = PublishSubject.create() @@ -62,19 +64,24 @@ class TabWebViewClient( } override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean { + if (!proxy.isProxyReady()) return true return urlHandler.shouldOverrideLoading(view, url, headers) || super.shouldOverrideUrlLoading(view, url) } @RequiresApi(Build.VERSION_CODES.LOLLIPOP) override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean { + if (!proxy.isProxyReady()) return true return urlHandler.shouldOverrideLoading(view, request.url.toString(), headers) || super.shouldOverrideUrlLoading(view, request) } @TargetApi(Build.VERSION_CODES.LOLLIPOP) - override fun shouldInterceptRequest(view: WebView, request: WebResourceRequest): WebResourceResponse? { - if (shouldBlockRequest(currentUrl, request.url.toString())) { + override fun shouldInterceptRequest( + view: WebView, + request: WebResourceRequest + ): WebResourceResponse? { + if (shouldBlockRequest(currentUrl, request.url.toString()) || !proxy.isProxyReady()) { val empty = ByteArrayInputStream(emptyResponseByteArray) return WebResourceResponse(BLOCKED_RESPONSE_MIME_TYPE, BLOCKED_RESPONSE_ENCODING, empty) } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt index 9ff8bb585..fb9c20058 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt @@ -2,6 +2,7 @@ package acr.browser.lightning._browser2.tab import acr.browser.lightning._browser2.BrowserContract import acr.browser.lightning._browser2.image.IconFreeze +import acr.browser.lightning._browser2.proxy.Proxy import acr.browser.lightning._browser2.tab.bundle.BundleStore import acr.browser.lightning.adblock.AdBlocker import acr.browser.lightning.adblock.allowlist.AllowListModel @@ -13,7 +14,6 @@ import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.view.* import android.app.Application import android.graphics.Bitmap -import android.os.Bundle import io.reactivex.* import io.reactivex.subjects.PublishSubject import javax.inject.Inject @@ -35,7 +35,8 @@ class TabsRepository @Inject constructor( private val userPreferences: UserPreferences, @DefaultUserAgent private val defaultUserAgent: String, @IconFreeze private val iconFreeze: Bitmap, - private val recentTabModel: RecentTabModel + private val recentTabModel: RecentTabModel, + private val proxy: Proxy ) : BrowserContract.Model { private var selectedTab: TabModel? = null @@ -71,11 +72,12 @@ class TabsRepository @Inject constructor( tabInitializer, webView, headers, - TabWebViewClient(adBlocker, allowListModel, urlHandler, headers), + TabWebViewClient(adBlocker, allowListModel, urlHandler, headers, proxy), TabWebChromeClient(application, faviconModel, diskScheduler), userPreferences, defaultUserAgent, - iconFreeze + iconFreeze, + proxy ) tabsList = tabsList + tabAdapter From a22a7b6f8363650e50e3d78ca92bc59a53796c96 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 2 Aug 2022 16:25:46 -0400 Subject: [PATCH 111/161] Support proxying --- .../java/acr/browser/lightning/BrowserApp.kt | 35 ++++++++---- .../lightning/_browser2/proxy/ProxyAdapter.kt | 56 +++++++++---------- 2 files changed, 49 insertions(+), 42 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/BrowserApp.kt b/app/src/main/java/acr/browser/lightning/BrowserApp.kt index c979c61ff..e81df204e 100644 --- a/app/src/main/java/acr/browser/lightning/BrowserApp.kt +++ b/app/src/main/java/acr/browser/lightning/BrowserApp.kt @@ -1,5 +1,7 @@ package acr.browser.lightning +import acr.browser.lightning._browser2.proxy.Proxy +import acr.browser.lightning._browser2.proxy.ProxyAdapter import acr.browser.lightning.database.bookmark.BookmarkExporter import acr.browser.lightning.database.bookmark.BookmarkRepository import acr.browser.lightning.device.BuildInfo @@ -34,6 +36,7 @@ class BrowserApp : Application() { @Inject @field:DatabaseScheduler internal lateinit var databaseScheduler: Scheduler @Inject internal lateinit var logger: Logger @Inject internal lateinit var buildInfo: BuildInfo + @Inject internal lateinit var proxyAdapter: ProxyAdapter lateinit var applicationComponent: AppComponent @@ -47,14 +50,18 @@ class BrowserApp : Application() { override fun onCreate() { super.onCreate() if (BuildConfig.DEBUG) { - StrictMode.setThreadPolicy(StrictMode.ThreadPolicy.Builder() - .detectAll() - .penaltyLog() - .build()) - StrictMode.setVmPolicy(StrictMode.VmPolicy.Builder() - .detectAll() - .penaltyLog() - .build()) + StrictMode.setThreadPolicy( + StrictMode.ThreadPolicy.Builder() + .detectAll() + .penaltyLog() + .build() + ) + StrictMode.setVmPolicy( + StrictMode.VmPolicy.Builder() + .detectAll() + .penaltyLog() + .build() + ) } if (Build.VERSION.SDK_INT >= 28) { @@ -112,15 +119,19 @@ class BrowserApp : Application() { MemoryLeakUtils.clearNextServedView(activity, this@BrowserApp) } }) + + registerActivityLifecycleCallbacks(proxyAdapter) } /** * Create the [BuildType] from the [BuildConfig]. */ - private fun createBuildInfo() = BuildInfo(when { - BuildConfig.DEBUG -> BuildType.DEBUG - else -> BuildType.RELEASE - }) + private fun createBuildInfo() = BuildInfo( + when { + BuildConfig.DEBUG -> BuildType.DEBUG + else -> BuildType.RELEASE + } + ) companion object { private const val TAG = "BrowserApp" diff --git a/app/src/main/java/acr/browser/lightning/_browser2/proxy/ProxyAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/proxy/ProxyAdapter.kt index 629451383..31abe2f82 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/proxy/ProxyAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/proxy/ProxyAdapter.kt @@ -1,56 +1,52 @@ package acr.browser.lightning._browser2.proxy import acr.browser.lightning._browser2.BrowserActivity +import acr.browser.lightning._browser2.di.Browser2Scope import acr.browser.lightning.utils.ProxyUtils import android.app.Activity import android.app.Application import android.os.Bundle import javax.inject.Inject +import javax.inject.Singleton /** * An adapter between [ProxyUtils] and [Proxy]. */ +@Singleton class ProxyAdapter @Inject constructor( - application: Application, private val proxyUtils: ProxyUtils -) : Proxy { +) : Proxy, Application.ActivityLifecycleCallbacks { private var currentActivity: Activity? = null - init { - application.registerActivityLifecycleCallbacks(object : - Application.ActivityLifecycleCallbacks { - override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) { - if (activity !is BrowserActivity) return - currentActivity = activity - } - - override fun onActivityStarted(activity: Activity) { - if (activity !is BrowserActivity) return - proxyUtils.onStart(activity) - } + override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) { + if (activity !is BrowserActivity) return + currentActivity = activity + } - override fun onActivityResumed(activity: Activity) { - if (activity !is BrowserActivity) return - proxyUtils.checkForProxy(activity) - proxyUtils.updateProxySettings(activity) - } + override fun onActivityStarted(activity: Activity) { + if (activity !is BrowserActivity) return + proxyUtils.onStart(activity) + } - override fun onActivityPaused(activity: Activity) = Unit + override fun onActivityResumed(activity: Activity) { + if (activity !is BrowserActivity) return + proxyUtils.checkForProxy(activity) + proxyUtils.updateProxySettings(activity) + } - override fun onActivityStopped(activity: Activity) { - if (activity !is BrowserActivity) return - proxyUtils.onStop() - } + override fun onActivityPaused(activity: Activity) = Unit - override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) = Unit + override fun onActivityStopped(activity: Activity) { + if (activity !is BrowserActivity) return + proxyUtils.onStop() + } - override fun onActivityDestroyed(activity: Activity) { - if (activity !is BrowserActivity) return - currentActivity = null - } + override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) = Unit - }) + override fun onActivityDestroyed(activity: Activity) { + if (activity !is BrowserActivity) return + currentActivity = null } override fun isProxyReady(): Boolean = currentActivity?.let(proxyUtils::isProxyReady) ?: false From 2b84ce23249ea65fe19e7760cd46026ca2271204 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 3 Aug 2022 13:15:45 -0400 Subject: [PATCH 112/161] Bump min sdk to 21, RIP kitkat --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index cce635885..eb62e65ed 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ allprojects { } ext { - minSdkVersion = 19 + minSdkVersion = 21 targetSdkVersion = 30 buildToolsVersion = '29.0.3' } From 259cf21a4492b700b7928c748d3c51366d55d8df Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 3 Aug 2022 13:15:52 -0400 Subject: [PATCH 113/161] Support upload in the browser --- .../lightning/_browser2/BrowserActivity.kt | 11 +++++ .../lightning/_browser2/BrowserContract.kt | 4 ++ .../lightning/_browser2/BrowserPresenter.kt | 9 ++++ .../_browser2/BrowserStateAdapter.kt | 4 ++ .../_browser2/di/Browser2Component.kt | 3 +- .../lightning/_browser2/tab/TabAdapter.kt | 9 ++++ .../lightning/_browser2/tab/TabFactory.kt | 48 +++++++++++++++++++ .../lightning/_browser2/tab/TabModel.kt | 6 +++ .../_browser2/tab/TabWebChromeClient.kt | 33 ++++++++++++- .../lightning/_browser2/tab/TabsRepository.kt | 31 +----------- 10 files changed, 126 insertions(+), 32 deletions(-) create mode 100644 app/src/main/java/acr/browser/lightning/_browser2/tab/TabFactory.kt diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index c04d82ed8..5f05c2ada 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -38,6 +38,8 @@ import android.view.* import android.view.inputmethod.InputMethodManager import android.widget.AdapterView import android.widget.ImageView +import androidx.activity.result.contract.ActivityResultContract +import androidx.activity.result.contract.ActivityResultContracts import androidx.annotation.DrawableRes import androidx.annotation.MenuRes import androidx.appcompat.app.AlertDialog @@ -68,6 +70,11 @@ abstract class BrowserActivity : ThemableBrowserActivity() { private val defaultColor by lazy { color(R.color.primary_color) } private val backgroundDrawable by lazy { ColorDrawable(defaultColor) } + @Suppress("ConvertLambdaToReference") + private val launcher = registerForActivityResult( + ActivityResultContracts.StartActivityForResult() + ) { presenter.onFileChooserResult(it) } + @Inject internal lateinit var imageLoader: ImageLoader @@ -593,6 +600,10 @@ abstract class BrowserActivity : ThemableBrowserActivity() { .resizeAndShow() } + fun showFileChooser(intent: Intent) { + launcher.launch(intent) + } + private fun animateColorChange(color: Int) { if (!userPreferences.colorModeEnabled || userPreferences.useTheme != AppTheme.LIGHT || isIncognito()) { return diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt index e7f6647d3..8080e9c6a 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt @@ -8,6 +8,7 @@ import acr.browser.lightning.database.HistoryEntry import acr.browser.lightning.database.downloads.DownloadEntry import acr.browser.lightning.ssl.SslCertificateInfo import acr.browser.lightning.view.TabInitializer +import android.content.Intent import android.graphics.Bitmap import io.reactivex.Completable import io.reactivex.Maybe @@ -70,6 +71,8 @@ interface BrowserContract { fun showToolsDialog(areAdsAllowed: Boolean, shouldShowAdBlockOption: Boolean) fun showLocalFileBlockedDialog() + + fun showFileChooser(intent: Intent) } interface Model { @@ -115,6 +118,7 @@ interface BrowserContract { fun backgroundBrowser() fun launchIncognito(url: String?) + } enum class CloseTabEvent { diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 34ab31483..7111bdc42 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -30,6 +30,7 @@ import acr.browser.lightning.ssl.SslState import acr.browser.lightning.utils.* import acr.browser.lightning.view.* import android.graphics.Color +import androidx.activity.result.ActivityResult import androidx.core.net.toUri import io.reactivex.Maybe import io.reactivex.Scheduler @@ -264,6 +265,10 @@ class BrowserPresenter @Inject constructor( tabDisposable += tab.closeWindowRequests() .subscribeOn(mainScheduler) .subscribeBy { onTabClose(tabListState.indexOfCurrentTab()) } + + tabDisposable += tab.fileChooserRequests() + .subscribeOn(mainScheduler) + .subscribeBy { view?.showFileChooser(it) } } private fun List.subscribeToUpdates(compositeDisposable: CompositeDisposable) { @@ -1160,6 +1165,10 @@ class BrowserPresenter @Inject constructor( } } + fun onFileChooserResult(activityResult: ActivityResult) { + currentTab?.handleFileChooserResult(activityResult) + } + private fun BrowserContract.View?.updateState(state: BrowserViewState) { viewState = state this?.renderState(viewState) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt index 77ef1cf5c..f8e34b9cb 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt @@ -6,6 +6,7 @@ import acr.browser.lightning.database.HistoryEntry import acr.browser.lightning.database.downloads.DownloadEntry import acr.browser.lightning.ssl.SslCertificateInfo import acr.browser.lightning.ssl.showSslDialog +import android.content.Intent import targetUrl.LongPress /** @@ -139,4 +140,7 @@ class BrowserStateAdapter(private val browserActivity: BrowserActivity) : Browse browserActivity.showLocalFileBlockedDialog() } + override fun showFileChooser(intent: Intent) { + browserActivity.showFileChooser(intent) + } } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt index 6fa476d83..2520f390f 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt @@ -6,6 +6,7 @@ import android.content.Intent import android.view.View import android.widget.FrameLayout import android.widget.LinearLayout +import androidx.activity.ComponentActivity import dagger.BindsInstance import dagger.Subcomponent import javax.inject.Qualifier @@ -21,7 +22,7 @@ interface Browser2Component { interface Builder { @BindsInstance - fun activity(activity: Activity): Builder + fun activity(activity: ComponentActivity): Builder @BindsInstance fun browserFrame(frameLayout: FrameLayout): Builder diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt index 8938f522f..e82452604 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt @@ -11,9 +11,11 @@ import acr.browser.lightning.utils.Option import acr.browser.lightning.utils.value import acr.browser.lightning.view.FreezableBundleInitializer import acr.browser.lightning.view.TabInitializer +import android.content.Intent import android.graphics.Bitmap import android.os.Bundle import android.webkit.WebView +import androidx.activity.result.ActivityResult import io.reactivex.Observable import io.reactivex.subjects.PublishSubject @@ -174,6 +176,13 @@ class TabAdapter( override fun downloadRequests(): Observable = downloadsSubject.hide() + override fun fileChooserRequests(): Observable = + tabWebChromeClient.fileChooserObservable.hide() + + override fun handleFileChooserResult(activityResult: ActivityResult) { + tabWebChromeClient.onResult(activityResult) + } + override fun createWindowRequests(): Observable = tabWebChromeClient.createWindowObservable.hide() diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabFactory.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabFactory.kt new file mode 100644 index 000000000..3337afd9c --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabFactory.kt @@ -0,0 +1,48 @@ +package acr.browser.lightning._browser2.tab + +import acr.browser.lightning._browser2.image.IconFreeze +import acr.browser.lightning._browser2.proxy.Proxy +import acr.browser.lightning.adblock.AdBlocker +import acr.browser.lightning.adblock.allowlist.AllowListModel +import acr.browser.lightning.di.DiskScheduler +import acr.browser.lightning.favicon.FaviconModel +import acr.browser.lightning.preference.UserPreferences +import acr.browser.lightning.view.TabInitializer +import android.app.Application +import android.graphics.Bitmap +import android.webkit.WebView +import io.reactivex.Scheduler +import javax.inject.Inject + +/** + * Created by anthonycr on 8/3/22. + */ +class TabFactory @Inject constructor( + private val webViewFactory: WebViewFactory, + private val application: Application, + private val adBlocker: AdBlocker, + private val allowListModel: AllowListModel, + private val faviconModel: FaviconModel, + @DiskScheduler private val diskScheduler: Scheduler, + private val urlHandler: UrlHandler, + private val userPreferences: UserPreferences, + @DefaultUserAgent private val defaultUserAgent: String, + @IconFreeze private val iconFreeze: Bitmap, + private val proxy: Proxy +) { + + fun constructTab(tabInitializer: TabInitializer, webView: WebView): TabModel { + val headers = webViewFactory.createRequestHeaders() + return TabAdapter( + tabInitializer, + webView, + headers, + TabWebViewClient(adBlocker, allowListModel, urlHandler, headers, proxy), + TabWebChromeClient(application, faviconModel, diskScheduler), + userPreferences, + defaultUserAgent, + iconFreeze, + proxy + ) + } +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt index fc323da8f..54cecd62c 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt @@ -5,8 +5,10 @@ import acr.browser.lightning.ssl.SslCertificateInfo import acr.browser.lightning.ssl.SslState import acr.browser.lightning.utils.Option import acr.browser.lightning.view.TabInitializer +import android.content.Intent import android.graphics.Bitmap import android.os.Bundle +import androidx.activity.result.ActivityResult import io.reactivex.Observable interface TabModel { @@ -77,6 +79,10 @@ interface TabModel { fun downloadRequests(): Observable + fun fileChooserRequests(): Observable + + fun handleFileChooserResult(activityResult: ActivityResult) + // Lifecycle fun createWindowRequests(): Observable diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt index 1882b484c..459b62772 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt @@ -8,12 +8,15 @@ import acr.browser.lightning.utils.Utils import acr.browser.lightning.view.ResultMessageInitializer import acr.browser.lightning.view.TabInitializer import android.content.Context +import android.content.Intent import android.graphics.Bitmap import android.graphics.Color +import android.net.Uri import android.os.Message +import android.webkit.ValueCallback import android.webkit.WebChromeClient import android.webkit.WebView -import androidx.core.content.ContextCompat +import androidx.activity.result.ActivityResult import androidx.palette.graphics.Palette import io.reactivex.Scheduler import io.reactivex.subjects.BehaviorSubject @@ -36,6 +39,9 @@ class TabWebChromeClient( val createWindowObservable: PublishSubject = PublishSubject.create() val closeWindowObservable: PublishSubject = PublishSubject.create() val colorChangeObservable: BehaviorSubject = BehaviorSubject.createDefault(defaultColor) + val fileChooserObservable: PublishSubject = PublishSubject.create() + + private var filePathCallback: ValueCallback>? = null override fun onCreateWindow( view: WebView, @@ -73,7 +79,7 @@ class TabWebChromeClient( generateColorAndPropagate(icon) } - fun generateColorAndPropagate(favicon: Bitmap?) { + private fun generateColorAndPropagate(favicon: Bitmap?) { val icon = favicon ?: return run { colorChangeObservable.onNext(defaultColor) } @@ -90,4 +96,27 @@ class TabWebChromeClient( colorChangeObservable.onNext(finalColor) } } + + fun onResult(activityResult: ActivityResult) { + val resultCode = activityResult.resultCode + val intent = activityResult.data + val result = FileChooserParams.parseResult(resultCode, intent) + + filePathCallback?.onReceiveValue(result) + filePathCallback = null + } + + override fun onShowFileChooser( + webView: WebView?, + filePathCallback: ValueCallback>?, + fileChooserParams: FileChooserParams? + ): Boolean { + // Ensure that previously set callbacks are resolved. + this.filePathCallback?.onReceiveValue(null) + this.filePathCallback = null + + this.filePathCallback = filePathCallback + fileChooserParams?.createIntent()?.let(fileChooserObservable::onNext) + return true + } } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt index fb9c20058..93cf97feb 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt @@ -1,19 +1,11 @@ package acr.browser.lightning._browser2.tab import acr.browser.lightning._browser2.BrowserContract -import acr.browser.lightning._browser2.image.IconFreeze -import acr.browser.lightning._browser2.proxy.Proxy import acr.browser.lightning._browser2.tab.bundle.BundleStore -import acr.browser.lightning.adblock.AdBlocker -import acr.browser.lightning.adblock.allowlist.AllowListModel import acr.browser.lightning.browser.RecentTabModel import acr.browser.lightning.di.DiskScheduler import acr.browser.lightning.di.MainScheduler -import acr.browser.lightning.favicon.FaviconModel -import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.view.* -import android.app.Application -import android.graphics.Bitmap import io.reactivex.* import io.reactivex.subjects.PublishSubject import javax.inject.Inject @@ -22,21 +14,13 @@ import javax.inject.Inject * Created by anthonycr on 9/12/20. */ class TabsRepository @Inject constructor( - private val application: Application, private val webViewFactory: WebViewFactory, private val tabPager: TabPager, - private val adBlocker: AdBlocker, - private val allowListModel: AllowListModel, - private val faviconModel: FaviconModel, @DiskScheduler private val diskScheduler: Scheduler, @MainScheduler private val mainScheduler: Scheduler, private val bundleStore: BundleStore, - private val urlHandler: UrlHandler, - private val userPreferences: UserPreferences, - @DefaultUserAgent private val defaultUserAgent: String, - @IconFreeze private val iconFreeze: Bitmap, private val recentTabModel: RecentTabModel, - private val proxy: Proxy + private val tabFactory: TabFactory, ) : BrowserContract.Model { private var selectedTab: TabModel? = null @@ -66,19 +50,8 @@ class TabsRepository @Inject constructor( override fun createTab(tabInitializer: TabInitializer): Single = Single.fromCallable { val webView = webViewFactory.createWebView() - val headers = webViewFactory.createRequestHeaders() tabPager.addTab(webView) - val tabAdapter = TabAdapter( - tabInitializer, - webView, - headers, - TabWebViewClient(adBlocker, allowListModel, urlHandler, headers, proxy), - TabWebChromeClient(application, faviconModel, diskScheduler), - userPreferences, - defaultUserAgent, - iconFreeze, - proxy - ) + val tabAdapter = tabFactory.constructTab(tabInitializer, webView) tabsList = tabsList + tabAdapter From 5e4394215cb5e9fdf10a0a55f1a553319bd98012 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 3 Aug 2022 15:36:41 -0400 Subject: [PATCH 114/161] Fixing lint errors --- app/src/main/res/layout/browser_activity.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/res/layout/browser_activity.xml b/app/src/main/res/layout/browser_activity.xml index ee809993a..c0317b05f 100644 --- a/app/src/main/res/layout/browser_activity.xml +++ b/app/src/main/res/layout/browser_activity.xml @@ -204,8 +204,8 @@ android:layout_height="match_parent" android:background="?selectableItemBackgroundBorderless" android:contentDescription="@null" - android:tint="?attr/iconColor" - app:srcCompat="@drawable/ic_action_collapse" /> + app:srcCompat="@drawable/ic_action_collapse" + app:tint="?attr/iconColor" /> + app:srcCompat="@drawable/ic_action_expand" + app:tint="?attr/iconColor" /> + app:srcCompat="@drawable/ic_action_delete" + app:tint="?attr/iconColor" /> From 3a4945083c718ace443b2a57b1340bc47000f33a Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 3 Aug 2022 15:36:56 -0400 Subject: [PATCH 115/161] Fixing build --- .../acr/browser/lightning/_browser2/di/Browser2Component.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt index 2520f390f..6fa476d83 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt @@ -6,7 +6,6 @@ import android.content.Intent import android.view.View import android.widget.FrameLayout import android.widget.LinearLayout -import androidx.activity.ComponentActivity import dagger.BindsInstance import dagger.Subcomponent import javax.inject.Qualifier @@ -22,7 +21,7 @@ interface Browser2Component { interface Builder { @BindsInstance - fun activity(activity: ComponentActivity): Builder + fun activity(activity: Activity): Builder @BindsInstance fun browserFrame(frameLayout: FrameLayout): Builder From 662ecae7414512be5a6a2bfc931e8d90a055e8e6 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 3 Aug 2022 15:37:20 -0400 Subject: [PATCH 116/161] Support fullscreen video --- .../lightning/_browser2/BrowserActivity.kt | 43 +++++++++++++++++++ .../lightning/_browser2/BrowserContract.kt | 5 +++ .../lightning/_browser2/BrowserPresenter.kt | 19 ++++++++ .../_browser2/BrowserStateAdapter.kt | 9 ++++ .../lightning/_browser2/tab/TabAdapter.kt | 11 +++++ .../lightning/_browser2/tab/TabModel.kt | 9 +++- .../_browser2/tab/TabWebChromeClient.kt | 31 +++++++++++-- 7 files changed, 122 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index 5f05c2ada..2ee918dab 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -31,7 +31,9 @@ import acr.browser.lightning.search.SuggestionsAdapter import acr.browser.lightning.ssl.createSslDrawableForState import acr.browser.lightning.utils.ProxyUtils import acr.browser.lightning.utils.value +import android.app.Activity import android.content.Intent +import android.content.pm.ActivityInfo import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.view.* @@ -69,6 +71,8 @@ abstract class BrowserActivity : ThemableBrowserActivity() { private val defaultColor by lazy { color(R.color.primary_color) } private val backgroundDrawable by lazy { ColorDrawable(defaultColor) } + + private var customView: View? = null @Suppress("ConvertLambdaToReference") private val launcher = registerForActivityResult( @@ -604,6 +608,45 @@ abstract class BrowserActivity : ThemableBrowserActivity() { launcher.launch(intent) } + fun showCustomView(view: View) { + requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE + binding.root.addView(view) + customView = view + setFullscreen(enabled = true, immersive = true) + } + + fun hideCustomView() { + requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED + customView?.let(binding.root::removeView) + customView = null + setFullscreen(enabled = false, immersive = false) + } + + // TODO: update to use non deprecated flags + private fun setFullscreen(enabled: Boolean, immersive: Boolean) { + val window = window + val decor = window.decorView + if (enabled) { + if (immersive) { + decor.systemUiVisibility = (View.SYSTEM_UI_FLAG_LAYOUT_STABLE + or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION + or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION + or View.SYSTEM_UI_FLAG_FULLSCREEN + or View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY) + } else { + decor.systemUiVisibility = View.SYSTEM_UI_FLAG_VISIBLE + } + window.setFlags( + WindowManager.LayoutParams.FLAG_FULLSCREEN, + WindowManager.LayoutParams.FLAG_FULLSCREEN + ) + } else { + window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN) + decor.systemUiVisibility = View.SYSTEM_UI_FLAG_VISIBLE + } + } + private fun animateColorChange(color: Int) { if (!userPreferences.colorModeEnabled || userPreferences.useTheme != AppTheme.LIGHT || isIncognito()) { return diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt index 8080e9c6a..a9837d475 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt @@ -10,6 +10,7 @@ import acr.browser.lightning.ssl.SslCertificateInfo import acr.browser.lightning.view.TabInitializer import android.content.Intent import android.graphics.Bitmap +import android.view.View import io.reactivex.Completable import io.reactivex.Maybe import io.reactivex.Observable @@ -73,6 +74,10 @@ interface BrowserContract { fun showLocalFileBlockedDialog() fun showFileChooser(intent: Intent) + + fun showCustomView(view: android.view.View) + + fun hideCustomView() } interface Model { diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 7111bdc42..70d94c34b 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -97,6 +97,7 @@ class BrowserPresenter @Inject constructor( private var isSearchViewFocused = false private var tabIdOpenedFromAction = -1 private var pendingAction: BrowserContract.Action.LoadUrl? = null + private var isCustomViewShowing = false private val compositeDisposable = CompositeDisposable() private val allTabsDisposable = CompositeDisposable() @@ -269,6 +270,20 @@ class BrowserPresenter @Inject constructor( tabDisposable += tab.fileChooserRequests() .subscribeOn(mainScheduler) .subscribeBy { view?.showFileChooser(it) } + + tabDisposable += tab.showCustomViewRequests() + .subscribeOn(mainScheduler) + .subscribeBy { + view?.showCustomView(it) + isCustomViewShowing = true + } + + tabDisposable += tab.hideCustomViewRequests() + .subscribeOn(mainScheduler) + .subscribeBy { + view?.hideCustomView() + isCustomViewShowing = false + } } private fun List.subscribeToUpdates(compositeDisposable: CompositeDisposable) { @@ -502,6 +517,10 @@ class BrowserPresenter @Inject constructor( */ fun onNavigateBack() { when { + isCustomViewShowing -> { + view?.hideCustomView() + currentTab?.hideCustomView() + } isTabDrawerOpen -> view?.closeTabDrawer() isBookmarkDrawerOpen -> if (currentFolder != Bookmark.Folder.Root) { onBookmarkMenuClick() diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt index f8e34b9cb..d3d35769c 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt @@ -7,6 +7,7 @@ import acr.browser.lightning.database.downloads.DownloadEntry import acr.browser.lightning.ssl.SslCertificateInfo import acr.browser.lightning.ssl.showSslDialog import android.content.Intent +import android.view.View import targetUrl.LongPress /** @@ -143,4 +144,12 @@ class BrowserStateAdapter(private val browserActivity: BrowserActivity) : Browse override fun showFileChooser(intent: Intent) { browserActivity.showFileChooser(intent) } + + override fun showCustomView(view: View) { + browserActivity.showCustomView(view) + } + + override fun hideCustomView() { + browserActivity.hideCustomView() + } } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt index e82452604..214209ee0 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt @@ -14,6 +14,7 @@ import acr.browser.lightning.view.TabInitializer import android.content.Intent import android.graphics.Bitmap import android.os.Bundle +import android.view.View import android.webkit.WebView import androidx.activity.result.ActivityResult import io.reactivex.Observable @@ -183,6 +184,16 @@ class TabAdapter( tabWebChromeClient.onResult(activityResult) } + override fun showCustomViewRequests(): Observable = + tabWebChromeClient.showCustomViewObservable.hide() + + override fun hideCustomViewRequests(): Observable = + tabWebChromeClient.hideCustomViewObservable.hide() + + override fun hideCustomView() { + tabWebChromeClient.hideCustomView() + } + override fun createWindowRequests(): Observable = tabWebChromeClient.createWindowObservable.hide() diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt index 54cecd62c..dad3e7769 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt @@ -8,6 +8,7 @@ import acr.browser.lightning.view.TabInitializer import android.content.Intent import android.graphics.Bitmap import android.os.Bundle +import android.view.View import androidx.activity.result.ActivityResult import io.reactivex.Observable @@ -77,13 +78,19 @@ interface TabModel { fun loadingProgress(): Observable + // Lifecycle + fun downloadRequests(): Observable fun fileChooserRequests(): Observable fun handleFileChooserResult(activityResult: ActivityResult) - // Lifecycle + fun showCustomViewRequests(): Observable + + fun hideCustomViewRequests(): Observable + + fun hideCustomView() fun createWindowRequests(): Observable diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt index 459b62772..174e8b70b 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt @@ -13,6 +13,7 @@ import android.graphics.Bitmap import android.graphics.Color import android.net.Uri import android.os.Message +import android.view.View import android.webkit.ValueCallback import android.webkit.WebChromeClient import android.webkit.WebView @@ -40,8 +41,11 @@ class TabWebChromeClient( val closeWindowObservable: PublishSubject = PublishSubject.create() val colorChangeObservable: BehaviorSubject = BehaviorSubject.createDefault(defaultColor) val fileChooserObservable: PublishSubject = PublishSubject.create() + val showCustomViewObservable: PublishSubject = PublishSubject.create() + val hideCustomViewObservable: PublishSubject = PublishSubject.create() private var filePathCallback: ValueCallback>? = null + private var customViewCallback: CustomViewCallback? = null override fun onCreateWindow( view: WebView, @@ -106,17 +110,36 @@ class TabWebChromeClient( filePathCallback = null } + fun hideCustomView() { + customViewCallback?.onCustomViewHidden() + customViewCallback = null + } + override fun onShowFileChooser( - webView: WebView?, - filePathCallback: ValueCallback>?, - fileChooserParams: FileChooserParams? + webView: WebView, + filePathCallback: ValueCallback>, + fileChooserParams: FileChooserParams ): Boolean { // Ensure that previously set callbacks are resolved. this.filePathCallback?.onReceiveValue(null) this.filePathCallback = null this.filePathCallback = filePathCallback - fileChooserParams?.createIntent()?.let(fileChooserObservable::onNext) + fileChooserParams.createIntent().let(fileChooserObservable::onNext) return true } + + override fun getVideoLoadingProgressView(): View? { + return super.getVideoLoadingProgressView() + } + + override fun onShowCustomView(view: View, callback: CustomViewCallback) { + customViewCallback = callback + showCustomViewObservable.onNext(view) + } + + override fun onHideCustomView() { + hideCustomViewObservable.onNext(Unit) + customViewCallback = null + } } From 183e193b3b4b2a952ede2781eaa4a59640cece7e Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 3 Aug 2022 16:22:04 -0400 Subject: [PATCH 117/161] WebRtc support --- .../lightning/_browser2/BrowserActivity.kt | 2 +- .../lightning/_browser2/tab/TabFactory.kt | 16 ++- .../_browser2/tab/TabWebChromeClient.kt | 108 ++++++++++++++++-- 3 files changed, 109 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index 2ee918dab..2da0cbbdc 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -71,7 +71,7 @@ abstract class BrowserActivity : ThemableBrowserActivity() { private val defaultColor by lazy { color(R.color.primary_color) } private val backgroundDrawable by lazy { ColorDrawable(defaultColor) } - + private var customView: View? = null @Suppress("ConvertLambdaToReference") diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabFactory.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabFactory.kt index 3337afd9c..79a6d155d 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabFactory.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabFactory.kt @@ -8,7 +8,8 @@ import acr.browser.lightning.di.DiskScheduler import acr.browser.lightning.favicon.FaviconModel import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.view.TabInitializer -import android.app.Application +import acr.browser.lightning.view.webrtc.WebRtcPermissionsModel +import android.app.Activity import android.graphics.Bitmap import android.webkit.WebView import io.reactivex.Scheduler @@ -19,7 +20,7 @@ import javax.inject.Inject */ class TabFactory @Inject constructor( private val webViewFactory: WebViewFactory, - private val application: Application, + private val activity: Activity, private val adBlocker: AdBlocker, private val allowListModel: AllowListModel, private val faviconModel: FaviconModel, @@ -28,7 +29,8 @@ class TabFactory @Inject constructor( private val userPreferences: UserPreferences, @DefaultUserAgent private val defaultUserAgent: String, @IconFreeze private val iconFreeze: Bitmap, - private val proxy: Proxy + private val proxy: Proxy, + private val webRtcPermissionsModel: WebRtcPermissionsModel ) { fun constructTab(tabInitializer: TabInitializer, webView: WebView): TabModel { @@ -38,7 +40,13 @@ class TabFactory @Inject constructor( webView, headers, TabWebViewClient(adBlocker, allowListModel, urlHandler, headers, proxy), - TabWebChromeClient(application, faviconModel, diskScheduler), + TabWebChromeClient( + activity, + faviconModel, + diskScheduler, + userPreferences, + webRtcPermissionsModel + ), userPreferences, defaultUserAgent, iconFreeze, diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt index 174e8b70b..3eb4f9772 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt @@ -1,24 +1,32 @@ package acr.browser.lightning._browser2.tab import acr.browser.lightning.R +import acr.browser.lightning.dialog.BrowserDialog +import acr.browser.lightning.dialog.DialogItem import acr.browser.lightning.extensions.color +import acr.browser.lightning.extensions.resizeAndShow import acr.browser.lightning.favicon.FaviconModel +import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.utils.Option import acr.browser.lightning.utils.Utils import acr.browser.lightning.view.ResultMessageInitializer import acr.browser.lightning.view.TabInitializer -import android.content.Context +import acr.browser.lightning.view.webrtc.WebRtcPermissionsModel +import acr.browser.lightning.view.webrtc.WebRtcPermissionsView +import android.Manifest +import android.app.Activity import android.content.Intent import android.graphics.Bitmap import android.graphics.Color import android.net.Uri import android.os.Message import android.view.View -import android.webkit.ValueCallback -import android.webkit.WebChromeClient -import android.webkit.WebView +import android.webkit.* import androidx.activity.result.ActivityResult +import androidx.appcompat.app.AlertDialog import androidx.palette.graphics.Palette +import com.anthonycr.grant.PermissionsManager +import com.anthonycr.grant.PermissionsResultAction import io.reactivex.Scheduler import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.PublishSubject @@ -27,12 +35,15 @@ import io.reactivex.subjects.PublishSubject * Created by anthonycr on 9/12/20. */ class TabWebChromeClient( - context: Context, + private val activity: Activity, private val faviconModel: FaviconModel, - private val diskScheduler: Scheduler -) : WebChromeClient() { + private val diskScheduler: Scheduler, + private val userPreferences: UserPreferences, + private val webRtcPermissionsModel: WebRtcPermissionsModel +) : WebChromeClient(), WebRtcPermissionsView { - private val defaultColor = context.color(R.color.primary_color) + private val defaultColor = activity.color(R.color.primary_color) + private val geoLocationPermissions = arrayOf(Manifest.permission.ACCESS_FINE_LOCATION) val progressObservable: PublishSubject = PublishSubject.create() val titleObservable: PublishSubject = PublishSubject.create() @@ -129,10 +140,6 @@ class TabWebChromeClient( return true } - override fun getVideoLoadingProgressView(): View? { - return super.getVideoLoadingProgressView() - } - override fun onShowCustomView(view: View, callback: CustomViewCallback) { customViewCallback = callback showCustomViewObservable.onNext(view) @@ -142,4 +149,81 @@ class TabWebChromeClient( hideCustomViewObservable.onNext(Unit) customViewCallback = null } + + override fun requestPermissions(permissions: Set, onGrant: (Boolean) -> Unit) { + val missingPermissions = permissions + .filter { PermissionsManager.getInstance().hasPermission(activity, it) } + + if (missingPermissions.isEmpty()) { + onGrant(true) + } else { + PermissionsManager.getInstance().requestPermissionsIfNecessaryForResult( + activity, + missingPermissions.toTypedArray(), + object : PermissionsResultAction() { + override fun onGranted() = onGrant(true) + + override fun onDenied(permission: String?) = onGrant(false) + } + ) + } + } + + override fun requestResources( + source: String, + resources: Array, + onGrant: (Boolean) -> Unit + ) { + activity.runOnUiThread { + val resourcesString = resources.joinToString(separator = "\n") + BrowserDialog.showPositiveNegativeDialog( + activity = activity, + title = R.string.title_permission_request, + message = R.string.message_permission_request, + messageArguments = arrayOf(source, resourcesString), + positiveButton = DialogItem(title = R.string.action_allow) { onGrant(true) }, + negativeButton = DialogItem(title = R.string.action_dont_allow) { onGrant(false) }, + onCancel = { onGrant(false) } + ) + } + } + + override fun onPermissionRequest(request: PermissionRequest) { + if (userPreferences.webRtcEnabled) { + webRtcPermissionsModel.requestPermission(request, this) + } else { + request.deny() + } + } + + override fun onGeolocationPermissionsShowPrompt( + origin: String, + callback: GeolocationPermissions.Callback + ) = PermissionsManager.getInstance().requestPermissionsIfNecessaryForResult( + activity, + geoLocationPermissions, + object : PermissionsResultAction() { + override fun onGranted() { + val remember = true + AlertDialog.Builder(activity).apply { + setTitle(activity.getString(R.string.location)) + val org = if (origin.length > 50) { + "${origin.subSequence(0, 50)}..." + } else { + origin + } + setMessage(org + activity.getString(R.string.message_location)) + setCancelable(true) + setPositiveButton(activity.getString(R.string.action_allow)) { _, _ -> + callback.invoke(origin, true, remember) + } + setNegativeButton(activity.getString(R.string.action_dont_allow)) { _, _ -> + callback.invoke(origin, false, remember) + } + }.resizeAndShow() + } + + //TODO show message and/or turn off setting + override fun onDenied(permission: String) = Unit + }) } From 9b0f9f96f0c7fd7e8d0acde1524f1b948ca660c6 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 3 Aug 2022 16:26:12 -0400 Subject: [PATCH 118/161] Supporting restoring lost tabs preference --- .../acr/browser/lightning/_browser2/tab/TabsRepository.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt index 93cf97feb..bd7de6f38 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt @@ -5,6 +5,7 @@ import acr.browser.lightning._browser2.tab.bundle.BundleStore import acr.browser.lightning.browser.RecentTabModel import acr.browser.lightning.di.DiskScheduler import acr.browser.lightning.di.MainScheduler +import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.view.* import io.reactivex.* import io.reactivex.subjects.PublishSubject @@ -21,6 +22,7 @@ class TabsRepository @Inject constructor( private val bundleStore: BundleStore, private val recentTabModel: RecentTabModel, private val tabFactory: TabFactory, + private val userPreferences: UserPreferences ) : BrowserContract.Model { private var selectedTab: TabModel? = null @@ -86,7 +88,9 @@ class TabsRepository @Inject constructor( .filter(MutableList::isNotEmpty) override fun freeze() { - bundleStore.save(tabsList) + if (userPreferences.restoreLostTabsEnabled) { + bundleStore.save(tabsList) + } } override fun clean() { From cb7a3ca2d985e1a6944fc5baf4d81295650fab29 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 3 Aug 2022 16:35:04 -0400 Subject: [PATCH 119/161] Moving class to appropriate package --- .../java/acr/browser/lightning/_browser2/BrowserActivity.kt | 4 +--- .../java/acr/browser/lightning/_browser2/BrowserContract.kt | 3 +-- .../java/acr/browser/lightning/_browser2/BrowserPresenter.kt | 3 +-- .../acr/browser/lightning/_browser2/BrowserStateAdapter.kt | 2 +- .../main/java/acr/browser/lightning/_browser2/tab/TabPager.kt | 2 +- .../lightning/_browser2/view/WebViewLongPressHandler.kt | 2 +- .../browser/lightning/_browser2/view}/targetUrl/LongPress.kt | 2 +- .../main/java/acr/browser/lightning/browser/BrowserView.kt | 1 - 8 files changed, 7 insertions(+), 12 deletions(-) rename app/src/main/java/{ => acr/browser/lightning/_browser2/view}/targetUrl/LongPress.kt (82%) diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index 2da0cbbdc..2015e951c 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -31,7 +31,6 @@ import acr.browser.lightning.search.SuggestionsAdapter import acr.browser.lightning.ssl.createSslDrawableForState import acr.browser.lightning.utils.ProxyUtils import acr.browser.lightning.utils.value -import android.app.Activity import android.content.Intent import android.content.pm.ActivityInfo import android.graphics.drawable.ColorDrawable @@ -40,7 +39,6 @@ import android.view.* import android.view.inputmethod.InputMethodManager import android.widget.AdapterView import android.widget.ImageView -import androidx.activity.result.contract.ActivityResultContract import androidx.activity.result.contract.ActivityResultContracts import androidx.annotation.DrawableRes import androidx.annotation.MenuRes @@ -51,7 +49,7 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.SimpleItemAnimator -import targetUrl.LongPress +import acr.browser.lightning._browser2.view.targetUrl.LongPress import javax.inject.Inject /** diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt index a9837d475..aecdac72a 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt @@ -10,12 +10,11 @@ import acr.browser.lightning.ssl.SslCertificateInfo import acr.browser.lightning.view.TabInitializer import android.content.Intent import android.graphics.Bitmap -import android.view.View import io.reactivex.Completable import io.reactivex.Maybe import io.reactivex.Observable import io.reactivex.Single -import targetUrl.LongPress +import acr.browser.lightning._browser2.view.targetUrl.LongPress /** * Created by anthonycr on 9/11/20. diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 70d94c34b..84e2ca75d 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -29,7 +29,6 @@ import acr.browser.lightning.search.SearchEngineProvider import acr.browser.lightning.ssl.SslState import acr.browser.lightning.utils.* import acr.browser.lightning.view.* -import android.graphics.Color import androidx.activity.result.ActivityResult import androidx.core.net.toUri import io.reactivex.Maybe @@ -40,7 +39,7 @@ import io.reactivex.rxkotlin.Observables import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.subscribeBy import io.reactivex.rxkotlin.toObservable -import targetUrl.LongPress +import acr.browser.lightning._browser2.view.targetUrl.LongPress import javax.inject.Inject import kotlin.system.exitProcess diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt index d3d35769c..132cbec64 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt @@ -8,7 +8,7 @@ import acr.browser.lightning.ssl.SslCertificateInfo import acr.browser.lightning.ssl.showSslDialog import android.content.Intent import android.view.View -import targetUrl.LongPress +import acr.browser.lightning._browser2.view.targetUrl.LongPress /** * Created by anthonycr on 9/16/20. diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt index e8962ebfe..9a28c5bf4 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt @@ -7,7 +7,7 @@ import android.view.ViewGroup import android.webkit.WebView import android.widget.FrameLayout import androidx.core.view.children -import targetUrl.LongPress +import acr.browser.lightning._browser2.view.targetUrl.LongPress import javax.inject.Inject /** diff --git a/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewLongPressHandler.kt b/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewLongPressHandler.kt index f1617ab65..c9f184a88 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewLongPressHandler.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewLongPressHandler.kt @@ -1,6 +1,6 @@ package acr.browser.lightning._browser2.view -import targetUrl.LongPress +import acr.browser.lightning._browser2.view.targetUrl.LongPress import android.annotation.SuppressLint import android.app.Activity import android.os.Handler diff --git a/app/src/main/java/targetUrl/LongPress.kt b/app/src/main/java/acr/browser/lightning/_browser2/view/targetUrl/LongPress.kt similarity index 82% rename from app/src/main/java/targetUrl/LongPress.kt rename to app/src/main/java/acr/browser/lightning/_browser2/view/targetUrl/LongPress.kt index 7dfba2544..6e126f147 100644 --- a/app/src/main/java/targetUrl/LongPress.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/view/targetUrl/LongPress.kt @@ -1,4 +1,4 @@ -package targetUrl +package acr.browser.lightning._browser2.view.targetUrl /** * Created by anthonycr on 12/23/20. diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserView.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserView.kt index 3b9f76a30..e95891c86 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserView.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserView.kt @@ -3,7 +3,6 @@ package acr.browser.lightning.browser import acr.browser.lightning.ssl.SslState import android.view.View import androidx.annotation.StringRes -import targetUrl.LongPress interface BrowserView { From 08df9a0ecb752b21467dabd7170ed7623740c3a4 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 3 Aug 2022 17:13:58 -0400 Subject: [PATCH 120/161] Removing old browser code --- .../java/acr/browser/lightning/BrowserApp.kt | 9 +- .../browser/lightning/IncognitoActivity.kt | 59 - .../acr/browser/lightning/MainActivity.kt | 66 - .../lightning/_browser2/BrowserActivity.kt | 2 +- .../lightning/_browser2/BrowserNavigator.kt | 3 - .../lightning/_browser2/BrowserPresenter.kt | 6 +- .../{ => _browser2}/di/AppBindsModule.kt | 2 +- .../{ => _browser2}/di/AppComponent.kt | 19 +- .../lightning/{ => _browser2}/di/AppModule.kt | 2 +- .../_browser2/di/Browser2BindsModule.kt | 3 - .../lightning/_browser2/di/Browser2Module.kt | 3 - .../{ => _browser2}/di/DiExtensions.kt | 2 +- .../download/DownloadPermissionsHelper.kt | 2 +- .../_browser2/history/DefaultHistoryRecord.kt | 2 +- .../_browser2/image/FaviconImageLoader.kt | 4 +- .../lightning/_browser2/tab/TabFactory.kt | 2 +- .../lightning/_browser2/tab/TabViewHolder.kt | 1 - .../lightning/_browser2/tab/TabsRepository.kt | 4 +- .../lightning/_browser2/tab/UrlHandler.kt | 1 - .../lightning/_browser2/tab/WebViewFactory.kt | 6 +- .../tab/bundle/DefaultBundleStore.kt | 3 +- .../lightning/adblock/BloomFilterAdBlocker.kt | 4 +- .../allowlist/SessionAllowListModel.kt | 2 +- .../PreferencesHostsDataSourceProvider.kt | 2 +- .../lightning/browser/BookmarksView.kt | 13 - .../lightning/browser/BrowserPresenter.kt | 321 --- .../browser/lightning/browser/BrowserView.kt | 41 - .../browser/lightning/browser/TabsManager.kt | 433 ---- .../browser/activity/BrowserActivity.kt | 1809 ----------------- .../activity/ThemableBrowserActivity.kt | 2 +- .../browser/bookmarks/BookmarkUiModel.kt | 24 - .../browser/bookmarks/BookmarksDrawerView.kt | 377 ---- .../browser/bookmarks/BookmarksViewModel.kt | 15 - .../cleanup/BasicIncognitoExitCleanup.kt | 2 +- .../browser/cleanup/DelegatingExitCleanup.kt | 11 +- .../cleanup/EnhancedIncognitoExitCleanup.kt | 2 +- .../lightning/browser/cleanup/ExitCleanup.kt | 2 +- .../browser/cleanup/NormalExitCleanup.kt | 4 +- .../lightning/browser/tabs/TabViewHolder.kt | 42 - .../lightning/browser/tabs/TabViewState.kt | 27 - .../browser/tabs/TabViewStateDiffCallback.kt | 24 - .../browser/tabs/TabsDesktopAdapter.kt | 103 - .../lightning/browser/tabs/TabsDesktopView.kt | 91 - .../browser/tabs/TabsDrawerAdapter.kt | 77 - .../lightning/browser/tabs/TabsDrawerView.kt | 108 - .../lightning/controller/UIController.kt | 214 -- .../database/adblock/HostsRepositoryInfo.kt | 2 +- .../dialog/LightningDialogBuilder.kt | 339 +-- .../lightning/download/DownloadHandler.java | 37 +- .../download/LightningDownloadListener.java | 2 +- .../html/bookmark/BookmarkPageFactory.kt | 4 +- .../preference/DeveloperPreferences.kt | 2 +- .../lightning/preference/UserPreferences.kt | 2 +- .../reading/activity/ReadingActivity.java | 6 +- .../lightning/search/SearchEngineProvider.kt | 2 +- .../lightning/search/SuggestionsAdapter.kt | 8 +- .../settings/activity/SettingsActivity.kt | 2 +- .../activity/ThemableSettingsActivity.kt | 2 +- .../fragment/AdBlockSettingsFragment.kt | 6 +- .../fragment/AdvancedSettingsFragment.kt | 2 +- .../fragment/BookmarkSettingsFragment.kt | 6 +- .../fragment/DebugSettingsFragment.kt | 2 +- .../fragment/DisplaySettingsFragment.kt | 2 +- .../fragment/GeneralSettingsFragment.kt | 2 +- .../fragment/PrivacySettingsFragment.kt | 10 +- .../lightning/view/LightningChromeClient.kt | 215 -- .../browser/lightning/view/LightningView.kt | 937 --------- .../lightning/view/LightningViewTitle.kt | 52 - .../lightning/view/LightningWebClient.kt | 392 ---- .../browser/lightning/view/TabInitializer.kt | 8 +- .../lightning/view/find/FindResults.kt | 26 - app/src/main/res/layout/activity_main.xml | 3 +- app/src/main/res/layout/browser_activity.xml | 2 +- .../browser/bookmark/BookmarkUiModelTest.kt | 23 - 74 files changed, 86 insertions(+), 5961 deletions(-) delete mode 100644 app/src/main/java/acr/browser/lightning/IncognitoActivity.kt delete mode 100644 app/src/main/java/acr/browser/lightning/MainActivity.kt rename app/src/main/java/acr/browser/lightning/{ => _browser2}/di/AppBindsModule.kt (98%) rename app/src/main/java/acr/browser/lightning/{ => _browser2}/di/AppComponent.kt (79%) rename app/src/main/java/acr/browser/lightning/{ => _browser2}/di/AppModule.kt (99%) rename app/src/main/java/acr/browser/lightning/{ => _browser2}/di/DiExtensions.kt (95%) delete mode 100644 app/src/main/java/acr/browser/lightning/browser/BookmarksView.kt delete mode 100644 app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt delete mode 100644 app/src/main/java/acr/browser/lightning/browser/BrowserView.kt delete mode 100644 app/src/main/java/acr/browser/lightning/browser/TabsManager.kt delete mode 100644 app/src/main/java/acr/browser/lightning/browser/activity/BrowserActivity.kt delete mode 100644 app/src/main/java/acr/browser/lightning/browser/bookmarks/BookmarkUiModel.kt delete mode 100644 app/src/main/java/acr/browser/lightning/browser/bookmarks/BookmarksDrawerView.kt delete mode 100644 app/src/main/java/acr/browser/lightning/browser/bookmarks/BookmarksViewModel.kt delete mode 100644 app/src/main/java/acr/browser/lightning/browser/tabs/TabViewHolder.kt delete mode 100644 app/src/main/java/acr/browser/lightning/browser/tabs/TabViewState.kt delete mode 100644 app/src/main/java/acr/browser/lightning/browser/tabs/TabViewStateDiffCallback.kt delete mode 100644 app/src/main/java/acr/browser/lightning/browser/tabs/TabsDesktopAdapter.kt delete mode 100644 app/src/main/java/acr/browser/lightning/browser/tabs/TabsDesktopView.kt delete mode 100644 app/src/main/java/acr/browser/lightning/browser/tabs/TabsDrawerAdapter.kt delete mode 100644 app/src/main/java/acr/browser/lightning/browser/tabs/TabsDrawerView.kt delete mode 100644 app/src/main/java/acr/browser/lightning/controller/UIController.kt delete mode 100644 app/src/main/java/acr/browser/lightning/view/LightningChromeClient.kt delete mode 100644 app/src/main/java/acr/browser/lightning/view/LightningView.kt delete mode 100644 app/src/main/java/acr/browser/lightning/view/LightningViewTitle.kt delete mode 100644 app/src/main/java/acr/browser/lightning/view/LightningWebClient.kt delete mode 100644 app/src/main/java/acr/browser/lightning/view/find/FindResults.kt delete mode 100644 app/src/test/java/acr/browser/lightning/browser/bookmark/BookmarkUiModelTest.kt diff --git a/app/src/main/java/acr/browser/lightning/BrowserApp.kt b/app/src/main/java/acr/browser/lightning/BrowserApp.kt index e81df204e..e9ef81765 100644 --- a/app/src/main/java/acr/browser/lightning/BrowserApp.kt +++ b/app/src/main/java/acr/browser/lightning/BrowserApp.kt @@ -1,15 +1,14 @@ package acr.browser.lightning -import acr.browser.lightning._browser2.proxy.Proxy import acr.browser.lightning._browser2.proxy.ProxyAdapter import acr.browser.lightning.database.bookmark.BookmarkExporter import acr.browser.lightning.database.bookmark.BookmarkRepository import acr.browser.lightning.device.BuildInfo import acr.browser.lightning.device.BuildType -import acr.browser.lightning.di.AppComponent -import acr.browser.lightning.di.DaggerAppComponent -import acr.browser.lightning.di.DatabaseScheduler -import acr.browser.lightning.di.injector +import acr.browser.lightning._browser2.di.AppComponent +import acr.browser.lightning._browser2.di.DaggerAppComponent +import acr.browser.lightning._browser2.di.DatabaseScheduler +import acr.browser.lightning._browser2.di.injector import acr.browser.lightning.log.Logger import acr.browser.lightning.preference.DeveloperPreferences import acr.browser.lightning.utils.FileUtils diff --git a/app/src/main/java/acr/browser/lightning/IncognitoActivity.kt b/app/src/main/java/acr/browser/lightning/IncognitoActivity.kt deleted file mode 100644 index bf1eebb6c..000000000 --- a/app/src/main/java/acr/browser/lightning/IncognitoActivity.kt +++ /dev/null @@ -1,59 +0,0 @@ -package acr.browser.lightning - -import acr.browser.lightning.browser.activity.BrowserActivity -import android.content.Context -import android.content.Intent -import android.net.Uri -import android.os.Build -import android.view.Menu -import android.webkit.CookieManager -import android.webkit.CookieSyncManager -import io.reactivex.Completable - -class IncognitoActivity : BrowserActivity() { - - override fun provideThemeOverride(): Int? = R.style.Theme_DarkTheme - - @Suppress("DEPRECATION") - public override fun updateCookiePreference(): Completable = Completable.fromAction { - val cookieManager = CookieManager.getInstance() - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { - CookieSyncManager.createInstance(this@IncognitoActivity) - } - if (Capabilities.FULL_INCOGNITO.isSupported) { - cookieManager.setAcceptCookie(userPreferences.cookiesEnabled) - } else { - cookieManager.setAcceptCookie(userPreferences.incognitoCookiesEnabled) - } - } - - override fun onCreateOptionsMenu(menu: Menu): Boolean { - menuInflater.inflate(R.menu.incognito, menu) - return super.onCreateOptionsMenu(menu) - } - - @Suppress("RedundantOverride") - override fun onNewIntent(intent: Intent) { - handleNewIntent(intent) - super.onNewIntent(intent) - } - - @Suppress("RedundantOverride") - override fun onPause() = super.onPause() // saveOpenTabs(); - - override fun updateHistory(title: String?, url: String) = Unit // addItemToHistory(title, url) - - override fun isIncognito() = true - - override fun closeActivity() = closeDrawers(::closeBrowser) - - companion object { - /** - * Creates the intent with which to launch the activity. Adds the reorder to front flag. - */ - fun createIntent(context: Context, uri: Uri? = null) = Intent(context, IncognitoActivity::class.java).apply { - flags = Intent.FLAG_ACTIVITY_REORDER_TO_FRONT - data = uri - } - } -} diff --git a/app/src/main/java/acr/browser/lightning/MainActivity.kt b/app/src/main/java/acr/browser/lightning/MainActivity.kt deleted file mode 100644 index 98a55b316..000000000 --- a/app/src/main/java/acr/browser/lightning/MainActivity.kt +++ /dev/null @@ -1,66 +0,0 @@ -package acr.browser.lightning - -import acr.browser.lightning.browser.activity.BrowserActivity -import android.content.Intent -import android.os.Build -import android.view.KeyEvent -import android.view.Menu -import android.webkit.CookieManager -import android.webkit.CookieSyncManager -import io.reactivex.Completable - -class MainActivity : BrowserActivity() { - - @Suppress("DEPRECATION") - public override fun updateCookiePreference(): Completable = Completable.fromAction { - val cookieManager = CookieManager.getInstance() - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { - CookieSyncManager.createInstance(this@MainActivity) - } - cookieManager.setAcceptCookie(userPreferences.cookiesEnabled) - } - - override fun onCreateOptionsMenu(menu: Menu): Boolean { - menuInflater.inflate(R.menu.main, menu) - return super.onCreateOptionsMenu(menu) - } - - override fun onNewIntent(intent: Intent) = - if (intent.action == INTENT_PANIC_TRIGGER) { - panicClean() - } else { - handleNewIntent(intent) - super.onNewIntent(intent) - } - - override fun onPause() { - super.onPause() - saveOpenTabs() - } - - override fun updateHistory(title: String?, url: String) = addItemToHistory(title, url) - - override fun isIncognito() = false - - override fun closeActivity() = closeDrawers { - performExitCleanUp() - moveTaskToBack(true) - } - - override fun dispatchKeyEvent(event: KeyEvent): Boolean { - if (event.action == KeyEvent.ACTION_DOWN && event.isCtrlPressed) { - when (event.keyCode) { - KeyEvent.KEYCODE_P -> - // Open a new private window - if (event.isShiftPressed) { - startActivity(IncognitoActivity.createIntent(this)) - overridePendingTransition(R.anim.slide_up_in, R.anim.fade_out_scale) - return true - } - } - } - return super.dispatchKeyEvent(event) - } - - -} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt index 2015e951c..cdcd6de5e 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt @@ -22,7 +22,7 @@ import acr.browser.lightning.database.SearchSuggestion import acr.browser.lightning.database.WebPage import acr.browser.lightning.database.downloads.DownloadEntry import acr.browser.lightning.databinding.BrowserActivityBinding -import acr.browser.lightning.di.injector +import acr.browser.lightning._browser2.di.injector import acr.browser.lightning.dialog.BrowserDialog import acr.browser.lightning.dialog.DialogItem import acr.browser.lightning.dialog.LightningDialogBuilder diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserNavigator.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserNavigator.kt index 7a43e7a4c..690b211de 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserNavigator.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserNavigator.kt @@ -3,8 +3,6 @@ package acr.browser.lightning._browser2 import acr.browser.lightning.R import acr.browser.lightning._browser2.download.DownloadPermissionsHelper import acr.browser.lightning._browser2.download.PendingDownload -import acr.browser.lightning.browser.activity.BrowserActivity -import acr.browser.lightning.database.HistoryEntry import acr.browser.lightning.extensions.copyToClipboard import acr.browser.lightning.extensions.snackbar import acr.browser.lightning.log.Logger @@ -12,7 +10,6 @@ import acr.browser.lightning.reading.activity.ReadingActivity import acr.browser.lightning.settings.activity.SettingsActivity import acr.browser.lightning.utils.IntentUtils import acr.browser.lightning.utils.Utils -import acr.browser.lightning.utils.isSpecialUrl import android.app.Activity import android.content.ClipboardManager import android.content.Intent diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt index 84e2ca75d..d9193c7ec 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt @@ -20,9 +20,9 @@ import acr.browser.lightning.database.bookmark.BookmarkRepository import acr.browser.lightning.database.downloads.DownloadEntry import acr.browser.lightning.database.downloads.DownloadsRepository import acr.browser.lightning.database.history.HistoryRepository -import acr.browser.lightning.di.DatabaseScheduler -import acr.browser.lightning.di.DiskScheduler -import acr.browser.lightning.di.MainScheduler +import acr.browser.lightning._browser2.di.DatabaseScheduler +import acr.browser.lightning._browser2.di.DiskScheduler +import acr.browser.lightning._browser2.di.MainScheduler import acr.browser.lightning.html.bookmark.BookmarkPageFactory import acr.browser.lightning.html.history.HistoryPageFactory import acr.browser.lightning.search.SearchEngineProvider diff --git a/app/src/main/java/acr/browser/lightning/di/AppBindsModule.kt b/app/src/main/java/acr/browser/lightning/_browser2/di/AppBindsModule.kt similarity index 98% rename from app/src/main/java/acr/browser/lightning/di/AppBindsModule.kt rename to app/src/main/java/acr/browser/lightning/_browser2/di/AppBindsModule.kt index 86d356cac..d7842ed33 100644 --- a/app/src/main/java/acr/browser/lightning/di/AppBindsModule.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/di/AppBindsModule.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning.di +package acr.browser.lightning._browser2.di import acr.browser.lightning._browser2.theme.LegacyThemeProvider import acr.browser.lightning._browser2.theme.ThemeProvider diff --git a/app/src/main/java/acr/browser/lightning/di/AppComponent.kt b/app/src/main/java/acr/browser/lightning/_browser2/di/AppComponent.kt similarity index 79% rename from app/src/main/java/acr/browser/lightning/di/AppComponent.kt rename to app/src/main/java/acr/browser/lightning/_browser2/di/AppComponent.kt index 69a0b7fcf..2ffb8d38c 100644 --- a/app/src/main/java/acr/browser/lightning/di/AppComponent.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/di/AppComponent.kt @@ -1,13 +1,10 @@ -package acr.browser.lightning.di +package acr.browser.lightning._browser2.di import acr.browser.lightning.BrowserApp -import acr.browser.lightning._browser2.di.Browser2Component import acr.browser.lightning.adblock.BloomFilterAdBlocker import acr.browser.lightning.adblock.NoOpAdBlocker import acr.browser.lightning.browser.SearchBoxModel -import acr.browser.lightning.browser.activity.BrowserActivity import acr.browser.lightning.browser.activity.ThemableBrowserActivity -import acr.browser.lightning.browser.bookmarks.BookmarksDrawerView import acr.browser.lightning.device.BuildInfo import acr.browser.lightning.dialog.LightningDialogBuilder import acr.browser.lightning.download.LightningDownloadListener @@ -16,9 +13,6 @@ import acr.browser.lightning.search.SuggestionsAdapter import acr.browser.lightning.settings.activity.SettingsActivity import acr.browser.lightning.settings.activity.ThemableSettingsActivity import acr.browser.lightning.settings.fragment.* -import acr.browser.lightning.view.LightningChromeClient -import acr.browser.lightning.view.LightningView -import acr.browser.lightning.view.LightningWebClient import android.app.Application import dagger.BindsInstance import dagger.Component @@ -41,14 +35,10 @@ interface AppComponent { fun build(): AppComponent } - fun inject(activity: BrowserActivity) - fun inject(fragment: BookmarkSettingsFragment) fun inject(builder: LightningDialogBuilder) - fun inject(lightningView: LightningView) - fun inject(activity: ThemableBrowserActivity) fun inject(advancedSettingsFragment: AdvancedSettingsFragment) @@ -57,8 +47,6 @@ interface AppComponent { fun inject(activity: ReadingActivity) - fun inject(webClient: LightningWebClient) - fun inject(activity: SettingsActivity) fun inject(activity: ThemableSettingsActivity) @@ -71,8 +59,6 @@ interface AppComponent { fun inject(suggestionsAdapter: SuggestionsAdapter) - fun inject(chromeClient: LightningChromeClient) - fun inject(searchBoxModel: SearchBoxModel) fun inject(generalSettingsFragment: GeneralSettingsFragment) @@ -81,8 +67,6 @@ interface AppComponent { fun inject(adBlockSettingsFragment: AdBlockSettingsFragment) - fun inject(bookmarksView: BookmarksDrawerView) - fun provideBloomFilterAdBlocker(): BloomFilterAdBlocker fun provideNoOpAdBlocker(): NoOpAdBlocker @@ -91,6 +75,5 @@ interface AppComponent { } - @Module(subcomponents = [Browser2Component::class]) internal class Submodules diff --git a/app/src/main/java/acr/browser/lightning/di/AppModule.kt b/app/src/main/java/acr/browser/lightning/_browser2/di/AppModule.kt similarity index 99% rename from app/src/main/java/acr/browser/lightning/di/AppModule.kt rename to app/src/main/java/acr/browser/lightning/_browser2/di/AppModule.kt index 9cde54745..cfd570763 100644 --- a/app/src/main/java/acr/browser/lightning/di/AppModule.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/di/AppModule.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning.di +package acr.browser.lightning._browser2.di import acr.browser.lightning.device.BuildInfo import acr.browser.lightning.device.BuildType diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2BindsModule.kt b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2BindsModule.kt index 12716f3ba..12b4aed1d 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2BindsModule.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2BindsModule.kt @@ -27,9 +27,6 @@ interface Browser2BindsModule { @Binds fun bindsBrowserNavigator(browserNavigator: BrowserNavigator): BrowserContract.Navigator - @Binds - fun bindsThemeProvider(legacyThemeProvider: LegacyThemeProvider): ThemeProvider - @Binds fun bindsProxy(proxyAdapter: ProxyAdapter): Proxy } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt index c36856d4a..b8f1f8f67 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt @@ -13,7 +13,6 @@ import acr.browser.lightning._browser2.notification.IncognitoTabCountNotifier import acr.browser.lightning._browser2.notification.TabCountNotifier import acr.browser.lightning._browser2.search.IntentExtractor import acr.browser.lightning._browser2.tab.DefaultUserAgent -import acr.browser.lightning._browser2.tab.WebViewFactory import acr.browser.lightning._browser2.tab.bundle.BundleStore import acr.browser.lightning._browser2.tab.bundle.DefaultBundleStore import acr.browser.lightning._browser2.tab.bundle.IncognitoBundleStore @@ -23,7 +22,6 @@ import acr.browser.lightning._browser2.ui.UiConfiguration import acr.browser.lightning.adblock.AdBlocker import acr.browser.lightning.adblock.BloomFilterAdBlocker import acr.browser.lightning.adblock.NoOpAdBlocker -import acr.browser.lightning.browser.BrowserView import acr.browser.lightning.extensions.drawable import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.utils.IntentUtils @@ -33,7 +31,6 @@ import android.content.Intent import android.graphics.Bitmap import android.webkit.WebSettings import androidx.core.graphics.drawable.toBitmap -import dagger.Binds import dagger.Module import dagger.Provides import javax.inject.Provider diff --git a/app/src/main/java/acr/browser/lightning/di/DiExtensions.kt b/app/src/main/java/acr/browser/lightning/_browser2/di/DiExtensions.kt similarity index 95% rename from app/src/main/java/acr/browser/lightning/di/DiExtensions.kt rename to app/src/main/java/acr/browser/lightning/_browser2/di/DiExtensions.kt index 4532a3129..eae0a6b49 100644 --- a/app/src/main/java/acr/browser/lightning/di/DiExtensions.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/di/DiExtensions.kt @@ -1,6 +1,6 @@ @file:JvmName("Injector") -package acr.browser.lightning.di +package acr.browser.lightning._browser2.di import acr.browser.lightning.BrowserApp import android.content.Context diff --git a/app/src/main/java/acr/browser/lightning/_browser2/download/DownloadPermissionsHelper.kt b/app/src/main/java/acr/browser/lightning/_browser2/download/DownloadPermissionsHelper.kt index 968646416..d36fa64bf 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/download/DownloadPermissionsHelper.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/download/DownloadPermissionsHelper.kt @@ -3,7 +3,7 @@ package acr.browser.lightning._browser2.download import acr.browser.lightning.R import acr.browser.lightning.database.downloads.DownloadEntry import acr.browser.lightning.database.downloads.DownloadsRepository -import acr.browser.lightning.di.DatabaseScheduler +import acr.browser.lightning._browser2.di.DatabaseScheduler import acr.browser.lightning.dialog.BrowserDialog.setDialogSize import acr.browser.lightning.download.DownloadHandler import acr.browser.lightning.log.Logger diff --git a/app/src/main/java/acr/browser/lightning/_browser2/history/DefaultHistoryRecord.kt b/app/src/main/java/acr/browser/lightning/_browser2/history/DefaultHistoryRecord.kt index 5aa3567b7..dd04d8732 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/history/DefaultHistoryRecord.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/history/DefaultHistoryRecord.kt @@ -1,7 +1,7 @@ package acr.browser.lightning._browser2.history import acr.browser.lightning.database.history.HistoryRepository -import acr.browser.lightning.di.DatabaseScheduler +import acr.browser.lightning._browser2.di.DatabaseScheduler import io.reactivex.Scheduler import javax.inject.Inject diff --git a/app/src/main/java/acr/browser/lightning/_browser2/image/FaviconImageLoader.kt b/app/src/main/java/acr/browser/lightning/_browser2/image/FaviconImageLoader.kt index 9a0047533..37d548564 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/image/FaviconImageLoader.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/image/FaviconImageLoader.kt @@ -2,8 +2,8 @@ package acr.browser.lightning._browser2.image import acr.browser.lightning.R import acr.browser.lightning.database.Bookmark -import acr.browser.lightning.di.MainScheduler -import acr.browser.lightning.di.NetworkScheduler +import acr.browser.lightning._browser2.di.MainScheduler +import acr.browser.lightning._browser2.di.NetworkScheduler import acr.browser.lightning.extensions.drawable import acr.browser.lightning.favicon.FaviconModel import android.app.Application diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabFactory.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabFactory.kt index 79a6d155d..600372ba6 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabFactory.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabFactory.kt @@ -4,7 +4,7 @@ import acr.browser.lightning._browser2.image.IconFreeze import acr.browser.lightning._browser2.proxy.Proxy import acr.browser.lightning.adblock.AdBlocker import acr.browser.lightning.adblock.allowlist.AllowListModel -import acr.browser.lightning.di.DiskScheduler +import acr.browser.lightning._browser2.di.DiskScheduler import acr.browser.lightning.favicon.FaviconModel import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.view.TabInitializer diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabViewHolder.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabViewHolder.kt index a0f661d9f..eb9d4998b 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabViewHolder.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabViewHolder.kt @@ -1,7 +1,6 @@ package acr.browser.lightning._browser2.tab import acr.browser.lightning.R -import acr.browser.lightning.controller.UIController import android.view.View import android.widget.ImageView import android.widget.LinearLayout diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt index bd7de6f38..693b9b099 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt @@ -3,8 +3,8 @@ package acr.browser.lightning._browser2.tab import acr.browser.lightning._browser2.BrowserContract import acr.browser.lightning._browser2.tab.bundle.BundleStore import acr.browser.lightning.browser.RecentTabModel -import acr.browser.lightning.di.DiskScheduler -import acr.browser.lightning.di.MainScheduler +import acr.browser.lightning._browser2.di.DiskScheduler +import acr.browser.lightning._browser2.di.MainScheduler import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.view.* import io.reactivex.* diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/UrlHandler.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/UrlHandler.kt index 09674477d..915c03619 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/UrlHandler.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/UrlHandler.kt @@ -9,7 +9,6 @@ import acr.browser.lightning.log.Logger import acr.browser.lightning.utils.IntentUtils import acr.browser.lightning.utils.Utils import acr.browser.lightning.utils.isSpecialUrl -import acr.browser.lightning.view.LightningWebClient import android.app.Activity import android.content.ActivityNotFoundException import android.content.Intent diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/WebViewFactory.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/WebViewFactory.kt index ff9ca4a15..6e92fe444 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/WebViewFactory.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/WebViewFactory.kt @@ -180,11 +180,11 @@ class WebViewFactory @Inject constructor( } } - private companion object { + companion object { private const val TAG = "WebViewFactory" - private const val HEADER_REQUESTED_WITH = "X-Requested-With" - private const val HEADER_WAP_PROFILE = "X-Wap-Profile" + const val HEADER_REQUESTED_WITH = "X-Requested-With" + const val HEADER_WAP_PROFILE = "X-Wap-Profile" private const val HEADER_DNT = "DNT" private const val HEADER_SAVEDATA = "Save-Data" } diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/DefaultBundleStore.kt b/app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/DefaultBundleStore.kt index b721c85bd..dc6ec53bf 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/DefaultBundleStore.kt +++ b/app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/DefaultBundleStore.kt @@ -2,8 +2,7 @@ package acr.browser.lightning._browser2.tab.bundle import acr.browser.lightning.R import acr.browser.lightning._browser2.tab.TabModel -import acr.browser.lightning.browser.TabsManager -import acr.browser.lightning.di.DiskScheduler +import acr.browser.lightning._browser2.di.DiskScheduler import acr.browser.lightning.utils.* import acr.browser.lightning.view.* import android.app.Application diff --git a/app/src/main/java/acr/browser/lightning/adblock/BloomFilterAdBlocker.kt b/app/src/main/java/acr/browser/lightning/adblock/BloomFilterAdBlocker.kt index 1d9634108..c67cdb78f 100644 --- a/app/src/main/java/acr/browser/lightning/adblock/BloomFilterAdBlocker.kt +++ b/app/src/main/java/acr/browser/lightning/adblock/BloomFilterAdBlocker.kt @@ -13,8 +13,8 @@ import acr.browser.lightning.adblock.util.hash.MurmurHashStringAdapter import acr.browser.lightning.database.adblock.Host import acr.browser.lightning.database.adblock.HostsRepository import acr.browser.lightning.database.adblock.HostsRepositoryInfo -import acr.browser.lightning.di.DatabaseScheduler -import acr.browser.lightning.di.MainScheduler +import acr.browser.lightning._browser2.di.DatabaseScheduler +import acr.browser.lightning._browser2.di.MainScheduler import acr.browser.lightning.extensions.toast import acr.browser.lightning.log.Logger import android.app.Application diff --git a/app/src/main/java/acr/browser/lightning/adblock/allowlist/SessionAllowListModel.kt b/app/src/main/java/acr/browser/lightning/adblock/allowlist/SessionAllowListModel.kt index 6531dd9cd..d4afd0513 100644 --- a/app/src/main/java/acr/browser/lightning/adblock/allowlist/SessionAllowListModel.kt +++ b/app/src/main/java/acr/browser/lightning/adblock/allowlist/SessionAllowListModel.kt @@ -2,7 +2,7 @@ package acr.browser.lightning.adblock.allowlist import acr.browser.lightning.database.allowlist.AdBlockAllowListRepository import acr.browser.lightning.database.allowlist.AllowListEntry -import acr.browser.lightning.di.DatabaseScheduler +import acr.browser.lightning._browser2.di.DatabaseScheduler import acr.browser.lightning.log.Logger import androidx.core.net.toUri import io.reactivex.Completable diff --git a/app/src/main/java/acr/browser/lightning/adblock/source/PreferencesHostsDataSourceProvider.kt b/app/src/main/java/acr/browser/lightning/adblock/source/PreferencesHostsDataSourceProvider.kt index 99d0b1522..4a1e7adab 100644 --- a/app/src/main/java/acr/browser/lightning/adblock/source/PreferencesHostsDataSourceProvider.kt +++ b/app/src/main/java/acr/browser/lightning/adblock/source/PreferencesHostsDataSourceProvider.kt @@ -1,6 +1,6 @@ package acr.browser.lightning.adblock.source -import acr.browser.lightning.di.HostsClient +import acr.browser.lightning._browser2.di.HostsClient import acr.browser.lightning.log.Logger import acr.browser.lightning.preference.UserPreferences import android.app.Application diff --git a/app/src/main/java/acr/browser/lightning/browser/BookmarksView.kt b/app/src/main/java/acr/browser/lightning/browser/BookmarksView.kt deleted file mode 100644 index b44ad0f66..000000000 --- a/app/src/main/java/acr/browser/lightning/browser/BookmarksView.kt +++ /dev/null @@ -1,13 +0,0 @@ -package acr.browser.lightning.browser - -import acr.browser.lightning.database.Bookmark - -interface BookmarksView { - - fun navigateBack() - - fun handleUpdatedUrl(url: String) - - fun handleBookmarkDeleted(bookmark: Bookmark) - -} diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt deleted file mode 100644 index ea0f7a1ae..000000000 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt +++ /dev/null @@ -1,321 +0,0 @@ -package acr.browser.lightning.browser - -import acr.browser.lightning.BuildConfig -import acr.browser.lightning.R -import acr.browser.lightning.constant.FILE -import acr.browser.lightning.constant.INTENT_ORIGIN -import acr.browser.lightning.constant.SCHEME_BOOKMARKS -import acr.browser.lightning.constant.SCHEME_HOMEPAGE -import acr.browser.lightning.di.MainScheduler -import acr.browser.lightning.html.bookmark.BookmarkPageFactory -import acr.browser.lightning.html.homepage.HomePageFactory -import acr.browser.lightning.log.Logger -import acr.browser.lightning.preference.UserPreferences -import acr.browser.lightning.ssl.SslState -import acr.browser.lightning.view.BundleInitializer -import acr.browser.lightning.view.LightningView -import acr.browser.lightning.view.TabInitializer -import acr.browser.lightning.view.UrlInitializer -import acr.browser.lightning.view.find.FindResults -import android.app.Activity -import android.content.Intent -import android.webkit.URLUtil -import io.reactivex.Scheduler -import io.reactivex.disposables.Disposable -import io.reactivex.rxkotlin.subscribeBy - -/** - * Presenter in charge of keeping track of the current tab and setting the current tab of the - * browser. - */ -class BrowserPresenter( - private val view: BrowserView, - private val isIncognito: Boolean, - private val userPreferences: UserPreferences, - private val tabsModel: TabsManager, - @MainScheduler private val mainScheduler: Scheduler, - private val homePageFactory: HomePageFactory, - private val bookmarkPageFactory: BookmarkPageFactory, - private val recentTabModel: RecentTabModel, - private val logger: Logger -) { - - private var currentTab: LightningView? = null - private var shouldClose: Boolean = false - private var sslStateSubscription: Disposable? = null - - init { - tabsModel.addTabNumberChangedListener(view::updateTabNumber) - } - - /** - * Initializes the tab manager with the new intent that is handed in by the BrowserActivity. - * - * @param intent the intent to handle, may be null. - */ - fun setupTabs(intent: Intent?) { - tabsModel.initializeTabs(view as Activity, intent, isIncognito) - .subscribeBy( - onSuccess = { - // At this point we always have at least a tab in the tab manager - view.notifyTabViewInitialized() - view.updateTabNumber(tabsModel.size()) - tabChanged(tabsModel.positionOf(it)) - } - ) - } - - /** - * Notify the presenter that a change occurred to the current tab. Currently doesn't do anything - * other than tell the view to notify the adapter about the change. - * - * @param tab the tab that changed, may be null. - */ - fun tabChangeOccurred(tab: LightningView?) = tab?.let { - view.notifyTabViewChanged(tabsModel.indexOfTab(it)) - } - - private fun onTabChanged(newTab: LightningView?) { - logger.log(TAG, "On tab changed") - view.updateSslState(newTab?.currentSslState() ?: SslState.None) - - sslStateSubscription?.dispose() - sslStateSubscription = newTab - ?.sslStateObservable() - ?.observeOn(mainScheduler) - ?.subscribe(view::updateSslState) - - val webView = newTab?.webView - - if (newTab == null) { - view.removeTabView() - currentTab?.let { - it.pauseTimers() - it.onDestroy() - } - } else { - if (webView == null) { - view.removeTabView() - currentTab?.let { - it.pauseTimers() - it.onDestroy() - } - } else { - currentTab.let { - // TODO: Restore this when Google fixes the bug where the WebView is - // blank after calling onPause followed by onResume. - // currentTab.onPause(); - it?.isForegroundTab = false - } - - newTab.resumeTimers() - newTab.onResume() - newTab.isForegroundTab = true - - view.updateProgress(newTab.progress) - view.setBackButtonEnabled(newTab.canGoBack()) - view.setForwardButtonEnabled(newTab.canGoForward()) - view.updateUrl(newTab.url, false) - view.setTabView(webView) - val index = tabsModel.indexOfTab(newTab) - if (index >= 0) { - view.notifyTabViewChanged(tabsModel.indexOfTab(newTab)) - } - } - } - - currentTab = newTab - } - - /** - * Closes all tabs but the current tab. - */ - fun closeAllOtherTabs() { - - while (tabsModel.last() != tabsModel.indexOfCurrentTab()) { - deleteTab(tabsModel.last()) - } - - while (0 != tabsModel.indexOfCurrentTab()) { - deleteTab(0) - } - - } - - private fun mapHomepageToCurrentUrl(): String = when (val homepage = userPreferences.homepage) { - SCHEME_HOMEPAGE -> "$FILE${homePageFactory.createHomePage()}" - SCHEME_BOOKMARKS -> "$FILE${bookmarkPageFactory.createBookmarkPage(null)}" - else -> homepage - } - - /** - * Deletes the tab at the specified position. - * - * @param position the position at which to delete the tab. - */ - fun deleteTab(position: Int) { - logger.log(TAG, "deleting tab...") - val tabToDelete = tabsModel.getTabAtPosition(position) ?: return - - recentTabModel.addClosedTab(tabToDelete.saveState()) - - val isShown = tabToDelete.isShown - val shouldClose = shouldClose && isShown && tabToDelete.isNewTab - val currentTab = tabsModel.currentTab - if (tabsModel.size() == 1 - && currentTab != null - && URLUtil.isFileUrl(currentTab.url) - && currentTab.url == mapHomepageToCurrentUrl()) { - view.closeActivity() - return - } else { - if (isShown) { - view.removeTabView() - } - val currentDeleted = tabsModel.deleteTab(position) - if (currentDeleted) { - tabChanged(tabsModel.indexOfCurrentTab()) - } - } - - val afterTab = tabsModel.currentTab - view.notifyTabViewRemoved(position) - - if (afterTab == null) { - view.closeBrowser() - return - } else if (afterTab !== currentTab) { - view.notifyTabViewChanged(tabsModel.indexOfCurrentTab()) - } - - if (shouldClose && !isIncognito) { - this.shouldClose = false - view.closeActivity() - } - - view.updateTabNumber(tabsModel.size()) - - logger.log(TAG, "...deleted tab") - } - - /** - * Handle a new intent from the the main BrowserActivity. - * - * @param intent the intent to handle, may be null. - */ - fun onNewIntent(intent: Intent?) = tabsModel.doAfterInitialization { - val url = if (intent?.action == Intent.ACTION_WEB_SEARCH) { - tabsModel.extractSearchFromIntent(intent) - } else { - intent?.dataString - } - - val tabHashCode = intent?.extras?.getInt(INTENT_ORIGIN, 0) ?: 0 - - if (tabHashCode != 0 && url != null) { - tabsModel.getTabForHashCode(tabHashCode)?.loadUrl(url) - } else if (url != null) { - if (URLUtil.isFileUrl(url)) { - view.showBlockedLocalFileDialog { - newTab(UrlInitializer(url), true) - shouldClose = true - tabsModel.lastTab()?.isNewTab = true - } - } else { - newTab(UrlInitializer(url), true) - shouldClose = true - tabsModel.lastTab()?.isNewTab = true - } - } - } - - /** - * Call when the user long presses the new tab button. - */ - fun onNewTabLongClicked() { - recentTabModel.lastClosed()?.let { - newTab(BundleInitializer(it), true) - view.showSnackbar(R.string.reopening_recent_tab) - } - } - - /** - * Loads a URL in the current tab. - * - * @param url the URL to load, must not be null. - */ - fun loadUrlInCurrentView(url: String) { - tabsModel.currentTab?.loadUrl(url) - } - - /** - * Notifies the presenter that it should shut down. This should be called when the - * BrowserActivity is destroyed so that we don't leak any memory. - */ - fun shutdown() { - onTabChanged(null) - tabsModel.cancelPendingWork() - sslStateSubscription?.dispose() - } - - /** - * Notifies the presenter that we wish to switch to a different tab at the specified position. - * If the position is not in the model, this method will do nothing. - * - * @param position the position of the tab to switch to. - */ - fun tabChanged(position: Int) { - if (position < 0 || position >= tabsModel.size()) { - logger.log(TAG, "tabChanged invalid position: $position") - return - } - - logger.log(TAG, "tabChanged: $position") - onTabChanged(tabsModel.switchToTab(position)) - } - - /** - * Open a new tab with the specified URL. You can choose to show the tab or load it in the - * background. - * - * @param tabInitializer the tab initializer to run after the tab as been created. - * @param show whether or not to switch to this tab after opening it. - * @return true if we successfully created the tab, false if we have hit max tabs. - */ - fun newTab(tabInitializer: TabInitializer, show: Boolean): Boolean { - // Limit number of tabs for limited version of app - if (!BuildConfig.FULL_VERSION && tabsModel.size() >= 10) { - view.showSnackbar(R.string.max_tabs) - return false - } - - logger.log(TAG, "New tab, show: $show") - - val startingTab = tabsModel.newTab(view as Activity, tabInitializer, isIncognito) - if (tabsModel.size() == 1) { - startingTab.resumeTimers() - } - - view.notifyTabViewAdded() - view.updateTabNumber(tabsModel.size()) - - if (show) { - onTabChanged(tabsModel.switchToTab(tabsModel.last())) - } - - return true - } - - fun onAutoCompleteItemPressed() { - tabsModel.currentTab?.requestFocus() - } - - fun findInPage(query: String): FindResults? { - return tabsModel.currentTab?.find(query) - } - - companion object { - private const val TAG = "BrowserPresenter" - } - -} diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserView.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserView.kt deleted file mode 100644 index e95891c86..000000000 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserView.kt +++ /dev/null @@ -1,41 +0,0 @@ -package acr.browser.lightning.browser - -import acr.browser.lightning.ssl.SslState -import android.view.View -import androidx.annotation.StringRes - -interface BrowserView { - - fun setTabView(view: View) - - fun removeTabView() - - fun updateUrl(url: String?, isLoading: Boolean) - - fun updateProgress(progress: Int) - - fun updateTabNumber(number: Int) - - fun updateSslState(sslState: SslState) - - fun closeBrowser() - - fun closeActivity() - - fun showBlockedLocalFileDialog(onPositiveClick: () -> Unit) - - fun showSnackbar(@StringRes resource: Int) - - fun setForwardButtonEnabled(enabled: Boolean) - - fun setBackButtonEnabled(enabled: Boolean) - - fun notifyTabViewRemoved(position: Int) - - fun notifyTabViewAdded() - - fun notifyTabViewChanged(position: Int) - - fun notifyTabViewInitialized() - -} diff --git a/app/src/main/java/acr/browser/lightning/browser/TabsManager.kt b/app/src/main/java/acr/browser/lightning/browser/TabsManager.kt deleted file mode 100644 index c9b24df4d..000000000 --- a/app/src/main/java/acr/browser/lightning/browser/TabsManager.kt +++ /dev/null @@ -1,433 +0,0 @@ -package acr.browser.lightning.browser - -import acr.browser.lightning.R -import acr.browser.lightning.di.DatabaseScheduler -import acr.browser.lightning.di.DiskScheduler -import acr.browser.lightning.di.MainScheduler -import acr.browser.lightning.log.Logger -import acr.browser.lightning.search.SearchEngineProvider -import acr.browser.lightning.utils.* -import acr.browser.lightning.view.* -import android.app.Activity -import android.app.Application -import android.app.SearchManager -import android.content.Intent -import android.os.Bundle -import android.webkit.URLUtil -import io.reactivex.Maybe -import io.reactivex.Observable -import io.reactivex.Scheduler -import io.reactivex.Single -import javax.inject.Inject - -/** - * A manager singleton that holds all the [LightningView] and tracks the current tab. It handles - * creation, deletion, restoration, state saving, and switching of tabs. - */ -class TabsManager @Inject constructor( - private val application: Application, - private val searchEngineProvider: SearchEngineProvider, - @DatabaseScheduler private val databaseScheduler: Scheduler, - @DiskScheduler private val diskScheduler: Scheduler, - @MainScheduler private val mainScheduler: Scheduler, - private val homePageInitializer: HomePageInitializer, - private val bookmarkPageInitializer: BookmarkPageInitializer, - private val historyPageInitializer: HistoryPageInitializer, - private val downloadPageInitializer: DownloadPageInitializer, - private val logger: Logger -) { - - private val tabList = arrayListOf() - - /** - * Return the current [LightningView] or null if no current tab has been set. - * - * @return a [LightningView] or null if there is no current tab. - */ - var currentTab: LightningView? = null - private set - - private var tabNumberListeners = emptySet<(Int) -> Unit>() - - private var isInitialized = false - private var postInitializationWorkList = emptyList<() -> Unit>() - - /** - * Adds a listener to be notified when the number of tabs changes. - */ - fun addTabNumberChangedListener(listener: ((Int) -> Unit)) { - tabNumberListeners += listener - } - - /** - * Cancels any pending work that was scheduled to run after initialization. - */ - fun cancelPendingWork() { - postInitializationWorkList = emptyList() - } - - /** - * Executes the [runnable] after the manager has been initialized. - */ - fun doAfterInitialization(runnable: () -> Unit) { - if (isInitialized) { - runnable() - } else { - postInitializationWorkList += runnable - } - } - - private fun finishInitialization() { - isInitialized = true - for (runnable in postInitializationWorkList) { - runnable() - } - } - - /** - * Initialize the state of the [TabsManager] based on previous state of the browser and with the - * new provided [intent] and emit the last tab that should be displayed. By default operates on - * a background scheduler and emits on the foreground scheduler. - */ - fun initializeTabs(activity: Activity, intent: Intent?, incognito: Boolean): Single = - Single - .just(Option.fromNullable( - if (intent?.action == Intent.ACTION_WEB_SEARCH) { - extractSearchFromIntent(intent) - } else { - intent?.dataString - } - )) - .doOnSuccess { shutdown() } - .subscribeOn(mainScheduler) - .observeOn(databaseScheduler) - .flatMapObservable { - if (incognito) { - initializeIncognitoMode(it.value()) - } else { - initializeRegularMode(it.value(), activity) - } - } - .observeOn(mainScheduler) - .map { newTab(activity, it, incognito) } - .lastOrError() - .doAfterSuccess { finishInitialization() } - - /** - * Returns an [Observable] that emits the [TabInitializer] for incognito mode. - */ - private fun initializeIncognitoMode(initialUrl: String?): Observable = - Observable.fromCallable { initialUrl?.let(::UrlInitializer) ?: homePageInitializer } - - /** - * Returns an [Observable] that emits the [TabInitializer] for normal operation mode. - */ - private fun initializeRegularMode(initialUrl: String?, activity: Activity): Observable = - restorePreviousTabs() - .concatWith(Maybe.fromCallable { - return@fromCallable initialUrl?.let { - if (URLUtil.isFileUrl(it)) { - PermissionInitializer(it, activity, homePageInitializer) - } else { - UrlInitializer(it) - } - } - }) - .defaultIfEmpty(homePageInitializer) - - /** - * Returns the URL for a search [Intent]. If the query is empty, then a null URL will be - * returned. - */ - fun extractSearchFromIntent(intent: Intent): String? { - val query = intent.getStringExtra(SearchManager.QUERY) - val searchUrl = "${searchEngineProvider.provideSearchEngine().queryUrl}$QUERY_PLACE_HOLDER" - - return if (query?.isNotBlank() == true) { - smartUrlFilter(query, true, searchUrl) - } else { - null - } - } - - /** - * Returns an observable that emits the [TabInitializer] for each previously opened tab as - * saved on disk. Can potentially be empty. - */ - private fun restorePreviousTabs(): Observable = readSavedStateFromDisk() - .map { (bundle, title) -> - return@map bundle.getString(URL_KEY)?.let { url -> - when { - url.isBookmarkUrl() -> bookmarkPageInitializer - url.isDownloadsUrl() -> downloadPageInitializer - url.isStartPageUrl() -> homePageInitializer - url.isHistoryUrl() -> historyPageInitializer - else -> homePageInitializer - } - } ?: FreezableBundleInitializer(bundle, title - ?: application.getString(R.string.tab_frozen)) - } - - - /** - * Method used to resume all the tabs in the browser. This is necessary because we cannot pause - * the WebView when the application is open currently due to a bug in the WebView, where calling - * onResume doesn't consistently resume it. - */ - fun resumeAll() { - currentTab?.resumeTimers() - for (tab in tabList) { - tab.onResume() - tab.initializePreferences() - } - } - - /** - * Method used to pause all the tabs in the browser. This is necessary because we cannot pause - * the WebView when the application is open currently due to a bug in the WebView, where calling - * onResume doesn't consistently resume it. - */ - fun pauseAll() { - currentTab?.pauseTimers() - tabList.forEach(LightningView::onPause) - } - - /** - * Return the tab at the given position in tabs list, or null if position is not in tabs list - * range. - * - * @param position the index in tabs list - * @return the corespondent [LightningView], or null if the index is invalid - */ - fun getTabAtPosition(position: Int): LightningView? = - if (position < 0 || position >= tabList.size) { - null - } else { - tabList[position] - } - - val allTabs: List - get() = tabList - - /** - * Shutdown the manager. This destroys all tabs and clears the references to those tabs. Current - * tab is also released for garbage collection. - */ - fun shutdown() { - repeat(tabList.size) { deleteTab(0) } - isInitialized = false - currentTab = null - } - - /** - * The current number of tabs in the manager. - * - * @return the number of tabs in the list. - */ - fun size(): Int = tabList.size - - /** - * The index of the last tab in the manager. - * - * @return the last tab in the list or -1 if there are no tabs. - */ - fun last(): Int = tabList.size - 1 - - - /** - * The last tab in the tab manager. - * - * @return the last tab, or null if there are no tabs. - */ - fun lastTab(): LightningView? = tabList.lastOrNull() - - /** - * Create and return a new tab. The tab is automatically added to the tabs list. - * - * @param activity the activity needed to create the tab. - * @param tabInitializer the initializer to run on the tab after it's been created. - * @param isIncognito whether the tab is an incognito tab or not. - * @return a valid initialized tab. - */ - fun newTab( - activity: Activity, - tabInitializer: TabInitializer, - isIncognito: Boolean - ): LightningView { - logger.log(TAG, "New tab") - val tab = LightningView( - activity, - tabInitializer, - isIncognito, - homePageInitializer, - bookmarkPageInitializer, - downloadPageInitializer, - logger - ) - tabList.add(tab) - tabNumberListeners.forEach { it(size()) } - return tab - } - - /** - * Removes a tab from the list and destroys the tab. If the tab removed is the current tab, the - * reference to the current tab will be nullified. - * - * @param position The position of the tab to remove. - */ - private fun removeTab(position: Int) { - if (position >= tabList.size) { - return - } - val tab = tabList.removeAt(position) - if (currentTab == tab) { - currentTab = null - } - tab.onDestroy() - } - - /** - * Deletes a tab from the manager. If the tab being deleted is the current tab, this method will - * switch the current tab to a new valid tab. - * - * @param position the position of the tab to delete. - * @return returns true if the current tab was deleted, false otherwise. - */ - fun deleteTab(position: Int): Boolean { - logger.log(TAG, "Delete tab: $position") - val currentTab = currentTab - val current = positionOf(currentTab) - - if (current == position) { - when { - size() == 1 -> this.currentTab = null - current < size() - 1 -> switchToTab(current + 1) - else -> switchToTab(current - 1) - } - } - - removeTab(position) - tabNumberListeners.forEach { it(size()) } - return current == position - } - - /** - * Return the position of the given tab. - * - * @param tab the tab to look for. - * @return the position of the tab or -1 if the tab is not in the list. - */ - fun positionOf(tab: LightningView?): Int = tabList.indexOf(tab) - - /** - * Saves the state of the current WebViews, to a bundle which is then stored in persistent - * storage and can be unparceled. - */ - fun saveState() { - val outState = Bundle(ClassLoader.getSystemClassLoader()) - logger.log(TAG, "Saving tab state") - tabList - .withIndex() - .forEach { (index, tab) -> - if (!tab.url.isSpecialUrl()) { - outState.putBundle(BUNDLE_KEY + index, tab.saveState()) - outState.putString(TAB_TITLE_KEY + index, tab.title) - } else { - outState.putBundle(BUNDLE_KEY + index, Bundle().apply { - putString(URL_KEY, tab.url) - }) - } - } - FileUtils.writeBundleToStorage(application, outState, BUNDLE_STORAGE) - .subscribeOn(diskScheduler) - .subscribe() - } - - /** - * Use this method to clear the saved state if you do not wish it to be restored when the - * browser next starts. - */ - fun clearSavedState() = FileUtils.deleteBundleInStorage(application, BUNDLE_STORAGE) - - /** - * Creates an [Observable] that emits the [Bundle] state stored for each previously opened tab - * on disk. After the list of bundle [Bundle] is read off disk, the old state will be deleted. - * Can potentially be empty. - */ - private fun readSavedStateFromDisk(): Observable> = Maybe - .fromCallable { FileUtils.readBundleFromStorage(application, BUNDLE_STORAGE) } - .flattenAsObservable { bundle -> - bundle.keySet() - .filter { it.startsWith(BUNDLE_KEY) } - .mapNotNull { bundleKey -> - bundle.getBundle(bundleKey)?.let { - Pair( - it, - bundle.getString(TAB_TITLE_KEY + bundleKey.extractNumberFromEnd()) - ) - } - } - } - .doOnNext { logger.log(TAG, "Restoring previous WebView state now") } - - private fun String.extractNumberFromEnd(): String { - val underScore = lastIndexOf('_') - return if (underScore in 0 until length) { - substring(underScore + 1) - } else { - "" - } - } - - /** - * Returns the index of the current tab. - * - * @return Return the index of the current tab, or -1 if the current tab is null. - */ - fun indexOfCurrentTab(): Int = tabList.indexOf(currentTab) - - /** - * Returns the index of the tab. - * - * @return Return the index of the tab, or -1 if the tab isn't in the list. - */ - fun indexOfTab(tab: LightningView): Int = tabList.indexOf(tab) - - /** - * Returns the [LightningView] with the provided hash, or null if there is no tab with the hash. - * - * @param hashCode the hashcode. - * @return the tab with an identical hash, or null. - */ - fun getTabForHashCode(hashCode: Int): LightningView? = - tabList.firstOrNull { lightningView -> lightningView.webView?.let { it.hashCode() == hashCode } == true } - - /** - * Switch the current tab to the one at the given position. It returns the selected tab that has - * been switched to. - * - * @return the selected tab or null if position is out of tabs range. - */ - fun switchToTab(position: Int): LightningView? { - logger.log(TAG, "switch to tab: $position") - return if (position < 0 || position >= tabList.size) { - logger.log(TAG, "Returning a null LightningView requested for position: $position") - null - } else { - tabList[position].also { - currentTab = it - } - } - } - - companion object { - - private const val TAG = "TabsManager" - - private const val BUNDLE_KEY = "WEBVIEW_" - private const val TAB_TITLE_KEY = "TITLE_" - private const val URL_KEY = "URL_KEY" - private const val BUNDLE_STORAGE = "SAVED_TABS.parcel" - } - -} diff --git a/app/src/main/java/acr/browser/lightning/browser/activity/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/browser/activity/BrowserActivity.kt deleted file mode 100644 index c899d4fbe..000000000 --- a/app/src/main/java/acr/browser/lightning/browser/activity/BrowserActivity.kt +++ /dev/null @@ -1,1809 +0,0 @@ -/* - * Copyright 2015 Anthony Restaino - */ - -package acr.browser.lightning.browser.activity - -import acr.browser.lightning.AppTheme -import acr.browser.lightning.IncognitoActivity -import acr.browser.lightning.R -import acr.browser.lightning.browser.* -import acr.browser.lightning.browser.bookmarks.BookmarksDrawerView -import acr.browser.lightning.browser.cleanup.ExitCleanup -import acr.browser.lightning.browser.tabs.TabsDesktopView -import acr.browser.lightning.browser.tabs.TabsDrawerView -import acr.browser.lightning.controller.UIController -import acr.browser.lightning.database.Bookmark -import acr.browser.lightning.database.HistoryEntry -import acr.browser.lightning.database.SearchSuggestion -import acr.browser.lightning.database.WebPage -import acr.browser.lightning.database.bookmark.BookmarkRepository -import acr.browser.lightning.database.history.HistoryRepository -import acr.browser.lightning.di.* -import acr.browser.lightning.dialog.BrowserDialog -import acr.browser.lightning.dialog.DialogItem -import acr.browser.lightning.dialog.LightningDialogBuilder -import acr.browser.lightning.extensions.* -import acr.browser.lightning.html.bookmark.BookmarkPageFactory -import acr.browser.lightning.html.history.HistoryPageFactory -import acr.browser.lightning.html.homepage.HomePageFactory -import acr.browser.lightning.icon.TabCountView -import acr.browser.lightning.interpolator.BezierDecelerateInterpolator -import acr.browser.lightning.log.Logger -import acr.browser.lightning.notifications.IncognitoNotification -import acr.browser.lightning.reading.activity.ReadingActivity -import acr.browser.lightning.search.SearchEngineProvider -import acr.browser.lightning.search.SuggestionsAdapter -import acr.browser.lightning.settings.activity.SettingsActivity -import acr.browser.lightning.ssl.SslState -import acr.browser.lightning.ssl.createSslDrawableForState -import acr.browser.lightning.ssl.showSslDialog -import acr.browser.lightning.utils.* -import acr.browser.lightning.view.* -import acr.browser.lightning.view.SearchView -import acr.browser.lightning.view.find.FindResults -import android.app.Activity -import android.app.NotificationManager -import android.content.ClipboardManager -import android.content.Intent -import android.content.res.Configuration -import android.graphics.Bitmap -import android.graphics.Color -import android.graphics.drawable.ColorDrawable -import android.graphics.drawable.Drawable -import android.media.MediaPlayer -import android.net.Uri -import android.os.Build -import android.os.Bundle -import android.os.Handler -import android.os.Message -import android.provider.MediaStore -import android.view.* -import android.view.View.* -import android.view.ViewGroup.LayoutParams -import android.view.animation.Animation -import android.view.animation.Transformation -import android.view.inputmethod.EditorInfo -import android.view.inputmethod.InputMethodManager -import android.webkit.ValueCallback -import android.webkit.WebChromeClient.CustomViewCallback -import android.widget.* -import android.widget.AdapterView.OnItemClickListener -import android.widget.TextView.OnEditorActionListener -import androidx.annotation.ColorInt -import androidx.annotation.StringRes -import androidx.appcompat.app.AlertDialog -import androidx.constraintlayout.widget.ConstraintLayout -import androidx.core.content.ContextCompat -import androidx.core.graphics.drawable.toBitmap -import androidx.core.net.toUri -import androidx.core.view.GravityCompat -import androidx.drawerlayout.widget.DrawerLayout -import androidx.palette.graphics.Palette -import butterknife.ButterKnife -import com.anthonycr.grant.PermissionsManager -import io.reactivex.Completable -import io.reactivex.Scheduler -import io.reactivex.rxkotlin.subscribeBy -import kotlinx.android.synthetic.main.activity_main.* -import kotlinx.android.synthetic.main.browser_content.* -import kotlinx.android.synthetic.main.search.* -import kotlinx.android.synthetic.main.search_interface.* -import kotlinx.android.synthetic.main.toolbar.* -import java.io.IOException -import javax.inject.Inject -import kotlin.system.exitProcess - -abstract class BrowserActivity : ThemableBrowserActivity(), BrowserView, UIController, OnClickListener { - - // Toolbar Views - private var searchBackground: View? = null - private var searchView: SearchView? = null - private var homeImageView: ImageView? = null - private var tabCountView: TabCountView? = null - - // Current tab view being displayed - private var currentTabView: View? = null - - // Full Screen Video Views - private var fullscreenContainerView: FrameLayout? = null - private var videoView: VideoView? = null - private var customView: View? = null - - // Adapter - private var suggestionsAdapter: SuggestionsAdapter? = null - - // Callback - private var customViewCallback: CustomViewCallback? = null - private var uploadMessageCallback: ValueCallback? = null - private var filePathCallback: ValueCallback>? = null - - // Primitives - private var isFullScreen: Boolean = false - private var hideStatusBar: Boolean = false - private var isDarkTheme: Boolean = false - private var isImmersiveMode = false - private var shouldShowTabsInDrawer: Boolean = false - private var swapBookmarksAndTabs: Boolean = false - - private var originalOrientation: Int = 0 - private var currentUiColor = Color.BLACK - private var keyDownStartTime: Long = 0 - private var searchText: String? = null - private var cameraPhotoPath: String? = null - - private var findResult: FindResults? = null - - // The singleton BookmarkManager - @Inject lateinit var bookmarkManager: BookmarkRepository - @Inject lateinit var historyModel: HistoryRepository - @Inject lateinit var searchBoxModel: SearchBoxModel - @Inject lateinit var searchEngineProvider: SearchEngineProvider - @Inject lateinit var inputMethodManager: InputMethodManager - @Inject lateinit var clipboardManager: ClipboardManager - @Inject lateinit var notificationManager: NotificationManager - @Inject @field:DiskScheduler lateinit var diskScheduler: Scheduler - @Inject @field:DatabaseScheduler lateinit var databaseScheduler: Scheduler - @Inject @field:MainScheduler lateinit var mainScheduler: Scheduler - @Inject lateinit var tabsManager: TabsManager - @Inject lateinit var homePageFactory: HomePageFactory - @Inject lateinit var bookmarkPageFactory: BookmarkPageFactory - @Inject lateinit var historyPageFactory: HistoryPageFactory - @Inject lateinit var historyPageInitializer: HistoryPageInitializer - @Inject lateinit var downloadPageInitializer: DownloadPageInitializer - @Inject lateinit var homePageInitializer: HomePageInitializer - @Inject @field:MainHandler lateinit var mainHandler: Handler - @Inject lateinit var proxyUtils: ProxyUtils - @Inject lateinit var logger: Logger - @Inject lateinit var bookmarksDialogBuilder: LightningDialogBuilder - @Inject lateinit var exitCleanup: ExitCleanup - - // Image - private var webPageBitmap: Bitmap? = null - private val backgroundDrawable = ColorDrawable() - private var incognitoNotification: IncognitoNotification? = null - - private var presenter: BrowserPresenter? = null - private var tabsView: TabsView? = null - private var bookmarksView: BookmarksView? = null - - // Menu - private var backMenuItem: MenuItem? = null - private var forwardMenuItem: MenuItem? = null - - private val longPressBackRunnable = Runnable { - showCloseDialog(tabsManager.positionOf(tabsManager.currentTab)) - } - - /** - * Determines if the current browser instance is in incognito mode or not. - */ - protected abstract fun isIncognito(): Boolean - - /** - * Choose the behavior when the controller closes the view. - */ - abstract override fun closeActivity() - - /** - * Choose what to do when the browser visits a website. - * - * @param title the title of the site visited. - * @param url the url of the site visited. - */ - abstract override fun updateHistory(title: String?, url: String) - - /** - * An observable which asynchronously updates the user's cookie preferences. - */ - protected abstract fun updateCookiePreference(): Completable - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - injector.inject(this) - setContentView(R.layout.activity_main) - ButterKnife.bind(this) - - if (isIncognito()) { - incognitoNotification = IncognitoNotification(this, notificationManager) - } - tabsManager.addTabNumberChangedListener { - if (isIncognito()) { - if (it == 0) { - incognitoNotification?.hide() - } else { - incognitoNotification?.show(it) - } - } - } - - presenter = BrowserPresenter( - this, - isIncognito(), - userPreferences, - tabsManager, - mainScheduler, - homePageFactory, - bookmarkPageFactory, - RecentTabModel(), - logger - ) - - initialize(savedInstanceState) - } - - private fun initialize(savedInstanceState: Bundle?) { - initializeToolbarHeight(resources.configuration) - setSupportActionBar(toolbar) - val actionBar = requireNotNull(supportActionBar) - - //TODO make sure dark theme flag gets set correctly - isDarkTheme = userPreferences.useTheme != AppTheme.LIGHT || isIncognito() - shouldShowTabsInDrawer = userPreferences.showTabsInDrawer - swapBookmarksAndTabs = userPreferences.bookmarksAndTabsSwapped - - // initialize background ColorDrawable - val primaryColor = ThemeUtils.getPrimaryColor(this) - backgroundDrawable.color = primaryColor - - // Drawer stutters otherwise - tab_drawer.setLayerType(LAYER_TYPE_NONE, null) - bookmark_drawer.setLayerType(LAYER_TYPE_NONE, null) - - setNavigationDrawerWidth() - drawer_layout.addDrawerListener(DrawerLocker()) - - webPageBitmap = drawable(R.drawable.ic_webpage).toBitmap() - - tabsView = if (shouldShowTabsInDrawer) { - TabsDrawerView(this).also(findViewById(getTabsContainerId())::addView) - } else { - TabsDesktopView(this).also(findViewById(getTabsContainerId())::addView) - } - - bookmarksView = BookmarksDrawerView(this).also(findViewById(getBookmarksContainerId())::addView) - - if (shouldShowTabsInDrawer) { - tabs_toolbar_container.visibility = GONE - } - - // set display options of the ActionBar - actionBar.setDisplayShowTitleEnabled(false) - actionBar.setDisplayShowHomeEnabled(false) - actionBar.setDisplayShowCustomEnabled(true) - actionBar.setCustomView(R.layout.toolbar_content) - - val customView = actionBar.customView - customView.layoutParams = customView.layoutParams.apply { - width = LayoutParams.MATCH_PARENT - height = LayoutParams.MATCH_PARENT - } - - tabCountView = customView.findViewById(R.id.tab_count_view) - homeImageView = customView.findViewById(R.id.home_image_view) - if (shouldShowTabsInDrawer && !isIncognito()) { - tabCountView?.visibility = VISIBLE - homeImageView?.visibility = GONE - } else if (shouldShowTabsInDrawer) { - tabCountView?.visibility = GONE - homeImageView?.visibility = VISIBLE - homeImageView?.setImageResource(R.drawable.incognito_mode) - // Post drawer locking in case the activity is being recreated - mainHandler.post { drawer_layout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED, getTabDrawer()) } - } else { - tabCountView?.visibility = GONE - homeImageView?.visibility = VISIBLE - homeImageView?.setImageResource(R.drawable.ic_action_home) - // Post drawer locking in case the activity is being recreated - mainHandler.post { drawer_layout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED, getTabDrawer()) } - } - - // Post drawer locking in case the activity is being recreated - mainHandler.post { drawer_layout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED, getBookmarkDrawer()) } - - customView.findViewById(R.id.home_button).setOnClickListener(this) - - // create the search EditText in the ToolBar - searchView = customView.findViewById(R.id.search).apply { - search_ssl_status.setOnClickListener { - tabsManager.currentTab?.let { tab -> - tab.sslCertificate?.let { showSslDialog(it, tab.currentSslState()) } - } - } - search_ssl_status.updateVisibilityForContent() - search_refresh.setImageResource(R.drawable.ic_action_refresh) - - val searchListener = SearchListenerClass() - setOnKeyListener(searchListener) - onFocusChangeListener = searchListener - setOnEditorActionListener(searchListener) - onPreFocusListener = searchListener - addTextChangedListener(StyleRemovingTextWatcher()) - - initializeSearchSuggestions(this) - } - - search_refresh.setOnClickListener { - if (searchView?.hasFocus() == true) { - searchView?.setText("") - } else { - refreshOrStop() - } - } - - searchBackground = customView.findViewById(R.id.search_container).apply { - // initialize search background color - background.tint(getSearchBarColor(primaryColor, primaryColor)) - } - - drawer_layout.setDrawerShadow(R.drawable.drawer_right_shadow, GravityCompat.END) - drawer_layout.setDrawerShadow(R.drawable.drawer_left_shadow, GravityCompat.START) - - var intent: Intent? = if (savedInstanceState == null) { - intent - } else { - null - } - - val launchedFromHistory = intent != null && intent.flags and Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY != 0 - - if (intent?.action == INTENT_PANIC_TRIGGER) { - setIntent(null) - panicClean() - } else { - if (launchedFromHistory) { - intent = null - } - presenter?.setupTabs(intent) - setIntent(null) - proxyUtils.checkForProxy(this) - } - } - - private fun getBookmarksContainerId(): Int = if (swapBookmarksAndTabs) { - R.id.tab_drawer - } else { - R.id.bookmark_drawer - } - - private fun getTabsContainerId(): Int = if (shouldShowTabsInDrawer) { - if (swapBookmarksAndTabs) { - R.id.bookmark_drawer - } else { - R.id.tab_drawer - } - } else { - R.id.tabs_toolbar_container - } - - private fun getBookmarkDrawer(): View = if (swapBookmarksAndTabs) { - tab_drawer - } else { - bookmark_drawer - } - - private fun getTabDrawer(): View = if (swapBookmarksAndTabs) { - bookmark_drawer - } else { - tab_drawer - } - - protected fun panicClean() { - logger.log(TAG, "Closing browser") - tabsManager.newTab(this, NoOpInitializer(), false) - tabsManager.switchToTab(0) - tabsManager.clearSavedState() - - historyPageFactory.deleteHistoryPage().subscribe() - closeBrowser() - // System exit needed in the case of receiving - // the panic intent since finish() isn't completely - // closing the browser - exitProcess(1) - } - - private inner class SearchListenerClass : OnKeyListener, - OnEditorActionListener, - OnFocusChangeListener, - SearchView.PreFocusListener { - - override fun onKey(view: View, keyCode: Int, keyEvent: KeyEvent): Boolean { - when (keyCode) { - KeyEvent.KEYCODE_ENTER -> { - searchView?.let { - inputMethodManager.hideSoftInputFromWindow(it.windowToken, 0) - searchTheWeb(it.text.toString()) - } - - tabsManager.currentTab?.requestFocus() - return true - } - else -> { - } - } - return false - } - - override fun onEditorAction(arg0: TextView, actionId: Int, arg2: KeyEvent?): Boolean { - // hide the keyboard and search the web when the enter key - // button is pressed - if (actionId == EditorInfo.IME_ACTION_GO - || actionId == EditorInfo.IME_ACTION_DONE - || actionId == EditorInfo.IME_ACTION_NEXT - || actionId == EditorInfo.IME_ACTION_SEND - || actionId == EditorInfo.IME_ACTION_SEARCH - || arg2?.action == KeyEvent.KEYCODE_ENTER) { - searchView?.let { - inputMethodManager.hideSoftInputFromWindow(it.windowToken, 0) - searchTheWeb(it.text.toString()) - } - - tabsManager.currentTab?.requestFocus() - return true - } - return false - } - - override fun onFocusChange(v: View, hasFocus: Boolean) { - val currentView = tabsManager.currentTab - if (!hasFocus && currentView != null) { - setIsLoading(currentView.progress < 100) - updateUrl(currentView.url, false) - } else if (hasFocus && currentView != null) { - - // Hack to make sure the text gets selected - (v as SearchView).selectAll() - search_ssl_status.visibility = GONE - search_refresh.setImageResource(R.drawable.ic_action_delete) - } - - if (!hasFocus) { - search_ssl_status.updateVisibilityForContent() - searchView?.let { - inputMethodManager.hideSoftInputFromWindow(it.windowToken, 0) - } - } - } - - override fun onPreFocus() { - val currentView = tabsManager.currentTab ?: return - val url = currentView.url - if (!url.isSpecialUrl()) { - if (searchView?.hasFocus() == false) { - searchView?.setText(url) - } - } - } - } - - private inner class DrawerLocker : DrawerLayout.DrawerListener { - - override fun onDrawerClosed(v: View) { - val tabsDrawer = getTabDrawer() - val bookmarksDrawer = getBookmarkDrawer() - - if (v === tabsDrawer) { - drawer_layout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED, bookmarksDrawer) - } else if (shouldShowTabsInDrawer) { - drawer_layout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED, tabsDrawer) - } - } - - override fun onDrawerOpened(v: View) { - val tabsDrawer = getTabDrawer() - val bookmarksDrawer = getBookmarkDrawer() - - if (v === tabsDrawer) { - drawer_layout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED, bookmarksDrawer) - } else { - drawer_layout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED, tabsDrawer) - } - } - - override fun onDrawerSlide(v: View, arg: Float) = Unit - - override fun onDrawerStateChanged(arg: Int) = Unit - - } - - private fun setNavigationDrawerWidth() { - val width = resources.displayMetrics.widthPixels - dimen(R.dimen.navigation_drawer_minimum_space) - val maxWidth = resources.getDimensionPixelSize(R.dimen.navigation_drawer_max_width) - if (width < maxWidth) { - val params = tab_drawer.layoutParams as DrawerLayout.LayoutParams - params.width = width - tab_drawer.layoutParams = params - tab_drawer.requestLayout() - val paramsRight = bookmark_drawer.layoutParams as DrawerLayout.LayoutParams - paramsRight.width = width - bookmark_drawer.layoutParams = paramsRight - bookmark_drawer.requestLayout() - } - } - - private fun initializePreferences() { - val currentView = tabsManager.currentTab - isFullScreen = userPreferences.fullScreenEnabled - - webPageBitmap?.let { webBitmap -> - if (!isIncognito() && !isColorMode() && !isDarkTheme) { - changeToolbarBackground(webBitmap, null) - } else if (!isIncognito() && currentView != null && !isDarkTheme) { - changeToolbarBackground(currentView.favicon ?: webBitmap, null) - } else if (!isIncognito() && !isDarkTheme) { - changeToolbarBackground(webBitmap, null) - } - } - - // TODO layout transition causing memory leak - // content_frame.setLayoutTransition(new LayoutTransition()); - - setFullscreen(userPreferences.hideStatusBarEnabled, false) - - val currentSearchEngine = searchEngineProvider.provideSearchEngine() - searchText = currentSearchEngine.queryUrl - - updateCookiePreference().subscribeOn(diskScheduler).subscribe() - proxyUtils.updateProxySettings(this) - } - - public override fun onWindowVisibleToUserAfterResume() { - super.onWindowVisibleToUserAfterResume() - toolbar_layout.translationY = 0f - setWebViewTranslation(toolbar_layout.height.toFloat()) - } - - override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean { - if (keyCode == KeyEvent.KEYCODE_ENTER) { - if (searchView?.hasFocus() == true) { - searchView?.let { searchTheWeb(it.text.toString()) } - } - } else if (keyCode == KeyEvent.KEYCODE_BACK) { - keyDownStartTime = System.currentTimeMillis() - mainHandler.postDelayed(longPressBackRunnable, ViewConfiguration.getLongPressTimeout().toLong()) - } - return super.onKeyDown(keyCode, event) - } - - override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean { - if (keyCode == KeyEvent.KEYCODE_BACK) { - mainHandler.removeCallbacks(longPressBackRunnable) - if (System.currentTimeMillis() - keyDownStartTime > ViewConfiguration.getLongPressTimeout()) { - return true - } - } - return super.onKeyUp(keyCode, event) - } - - override fun dispatchKeyEvent(event: KeyEvent): Boolean { - // Keyboard shortcuts - if (event.action == KeyEvent.ACTION_DOWN) { - when { - event.isCtrlPressed -> when (event.keyCode) { - KeyEvent.KEYCODE_F -> { - // Search in page - findInPage() - return true - } - KeyEvent.KEYCODE_T -> { - // Open new tab - presenter?.newTab( - homePageInitializer, - true - ) - return true - } - KeyEvent.KEYCODE_W -> { - // Close current tab - tabsManager.let { presenter?.deleteTab(it.indexOfCurrentTab()) } - return true - } - KeyEvent.KEYCODE_Q -> { - // Close browser - closeBrowser() - return true - } - KeyEvent.KEYCODE_R -> { - // Refresh current tab - tabsManager.currentTab?.reload() - return true - } - KeyEvent.KEYCODE_TAB -> { - tabsManager.let { - val nextIndex = if (event.isShiftPressed) { - // Go back one tab - if (it.indexOfCurrentTab() > 0) { - it.indexOfCurrentTab() - 1 - } else { - it.last() - } - } else { - // Go forward one tab - if (it.indexOfCurrentTab() < it.last()) { - it.indexOfCurrentTab() + 1 - } else { - 0 - } - } - - presenter?.tabChanged(nextIndex) - } - - return true - } - } - event.keyCode == KeyEvent.KEYCODE_SEARCH -> { - // Highlight search field - searchView?.requestFocus() - searchView?.selectAll() - return true - } - event.isAltPressed -> // Alt + tab number - tabsManager.let { - if (KeyEvent.KEYCODE_0 <= event.keyCode && event.keyCode <= KeyEvent.KEYCODE_9) { - val nextIndex = if (event.keyCode > it.last() + KeyEvent.KEYCODE_1 || event.keyCode == KeyEvent.KEYCODE_0) { - it.last() - } else { - event.keyCode - KeyEvent.KEYCODE_1 - } - presenter?.tabChanged(nextIndex) - return true - } - } - } - } - return super.dispatchKeyEvent(event) - } - - override fun onOptionsItemSelected(item: MenuItem): Boolean { - val currentView = tabsManager.currentTab - val currentUrl = currentView?.url - // Handle action buttons - when (item.itemId) { - android.R.id.home -> { - if (drawer_layout.isDrawerOpen(getBookmarkDrawer())) { - drawer_layout.closeDrawer(getBookmarkDrawer()) - } - return true - } - R.id.action_back -> { - if (currentView?.canGoBack() == true) { - currentView.goBack() - } - return true - } - R.id.action_forward -> { - if (currentView?.canGoForward() == true) { - currentView.goForward() - } - return true - } - R.id.action_add_to_homescreen -> { - if (currentView != null - && currentView.url.isNotBlank() - && !currentView.url.isSpecialUrl()) { - HistoryEntry(currentView.url, currentView.title).also { - Utils.createShortcut(this, it, currentView.favicon ?: webPageBitmap!!) - logger.log(TAG, "Creating shortcut: ${it.title} ${it.url}") - } - } - return true - } - R.id.action_new_tab -> { - presenter?.newTab(homePageInitializer, true) - return true - } - R.id.action_incognito -> { - startActivity(IncognitoActivity.createIntent(this)) - overridePendingTransition(R.anim.slide_up_in, R.anim.fade_out_scale) - return true - } - R.id.action_share -> { - IntentUtils(this).shareUrl(currentUrl, currentView?.title) - return true - } - R.id.action_bookmarks -> { - openBookmarks() - return true - } - R.id.action_copy -> { - if (currentUrl != null && !currentUrl.isSpecialUrl()) { - clipboardManager.copyToClipboard(currentUrl) - snackbar(R.string.message_link_copied) - } - return true - } - R.id.action_settings -> { - startActivity(Intent(this, SettingsActivity::class.java)) - return true - } - R.id.action_history -> { - openHistory() - return true - } - R.id.action_downloads -> { - openDownloads() - return true - } - R.id.action_add_bookmark -> { - if (currentUrl != null && !currentUrl.isSpecialUrl()) { - addBookmark(currentView.title, currentUrl) - } - return true - } - R.id.action_find -> { - findInPage() - return true - } - R.id.action_reading_mode -> { - if (currentUrl != null) { - ReadingActivity.launch(this, currentUrl) - } - return true - } - else -> return super.onOptionsItemSelected(item) - } - } - - // By using a manager, adds a bookmark and notifies third parties about that - private fun addBookmark(title: String, url: String) { - val bookmark = Bookmark.Entry(url, title, 0, Bookmark.Folder.Root) - bookmarksDialogBuilder.showAddBookmarkDialog(this, this, bookmark) - } - - private fun deleteBookmark(title: String, url: String) { - bookmarkManager.deleteBookmark(Bookmark.Entry(url, title, 0, Bookmark.Folder.Root)) - .subscribeOn(databaseScheduler) - .observeOn(mainScheduler) - .subscribe { boolean -> - if (boolean) { - handleBookmarksChange() - } - } - } - - private fun putToolbarInRoot() { - if (toolbar_layout.parent != ui_layout) { - (toolbar_layout.parent as ViewGroup?)?.removeView(toolbar_layout) - - ui_layout.addView(toolbar_layout, 0) - ui_layout.requestLayout() - } - setWebViewTranslation(0f) - } - - private fun overlayToolbarOnWebView() { - if (toolbar_layout.parent != content_frame) { - (toolbar_layout.parent as ViewGroup?)?.removeView(toolbar_layout) - - content_frame.addView(toolbar_layout) - content_frame.requestLayout() - } - setWebViewTranslation(toolbar_layout.height.toFloat()) - } - - private fun setWebViewTranslation(translation: Float) = - if (isFullScreen) { - currentTabView?.translationY = translation - } else { - currentTabView?.translationY = 0f - } - - /** - * method that shows a dialog asking what string the user wishes to search - * for. It highlights the text entered. - */ - private fun findInPage() = BrowserDialog.showEditText( - this, - R.string.action_find, - R.string.search_hint, - R.string.search_hint - ) { text -> - if (text.isNotEmpty()) { - findResult = presenter?.findInPage(text) - showFindInPageControls(text) - } - } - - private fun showFindInPageControls(text: String) { - search_bar.visibility = VISIBLE - - findViewById(R.id.search_query).text = resources.getString(R.string.search_in_page_query, text) - findViewById(R.id.button_next).setOnClickListener(this) - findViewById(R.id.button_back).setOnClickListener(this) - findViewById(R.id.button_quit).setOnClickListener(this) - } - - override fun isColorMode(): Boolean = userPreferences.colorModeEnabled && !isDarkTheme - - override fun getTabModel(): TabsManager = tabsManager - - override fun showCloseDialog(position: Int) { - if (position < 0) { - return - } - BrowserDialog.show(this, R.string.dialog_title_close_browser, - DialogItem(title = R.string.close_tab) { - presenter?.deleteTab(position) - }, - DialogItem(title = R.string.close_other_tabs) { - presenter?.closeAllOtherTabs() - }, - DialogItem(title = R.string.close_all_tabs, onClick = this::closeBrowser)) - } - - override fun notifyTabViewRemoved(position: Int) { - logger.log(TAG, "Notify Tab Removed: $position") - tabsView?.tabRemoved(position) - } - - override fun notifyTabViewAdded() { - logger.log(TAG, "Notify Tab Added") - tabsView?.tabAdded() - } - - override fun notifyTabViewChanged(position: Int) { - logger.log(TAG, "Notify Tab Changed: $position") - tabsView?.tabChanged(position) - } - - override fun notifyTabViewInitialized() { - logger.log(TAG, "Notify Tabs Initialized") - tabsView?.tabsInitialized() - } - - override fun updateSslState(sslState: SslState) { - search_ssl_status.setImageDrawable(createSslDrawableForState(sslState)) - - if (searchView?.hasFocus() == false) { - search_ssl_status.updateVisibilityForContent() - } - } - - private fun ImageView.updateVisibilityForContent() { - drawable?.let { visibility = VISIBLE } ?: run { visibility = GONE } - } - - override fun tabChanged(tab: LightningView) { - presenter?.tabChangeOccurred(tab) - } - - override fun removeTabView() { - - logger.log(TAG, "Remove the tab view") - - currentTabView.removeFromParent() - - currentTabView = null - - // Use a delayed handler to make the transition smooth - // otherwise it will get caught up with the showTab code - // and cause a janky motion - mainHandler.postDelayed(drawer_layout::closeDrawers, 200) - - } - - override fun setTabView(view: View) { - if (currentTabView == view) { - return - } - - logger.log(TAG, "Setting the tab view") - - view.removeFromParent() - currentTabView.removeFromParent() - - content_frame.addView(view, 0, MATCH_PARENT) - if (isFullScreen) { - view.translationY = toolbar_layout.height + toolbar_layout.translationY - } else { - view.translationY = 0f - } - - view.requestFocus() - - currentTabView = view - - showActionBar() - - // Use a delayed handler to make the transition smooth - // otherwise it will get caught up with the showTab code - // and cause a janky motion - mainHandler.postDelayed(drawer_layout::closeDrawers, 200) - } - - override fun showBlockedLocalFileDialog(onPositiveClick: Function0) { - AlertDialog.Builder(this) - .setCancelable(true) - .setTitle(R.string.title_warning) - .setMessage(R.string.message_blocked_local) - .setNegativeButton(android.R.string.cancel, null) - .setPositiveButton(R.string.action_open) { _, _ -> onPositiveClick.invoke() } - .resizeAndShow() - } - - override fun showSnackbar(@StringRes resource: Int) = snackbar(resource) - - override fun tabCloseClicked(position: Int) { - presenter?.deleteTab(position) - } - - override fun tabClicked(position: Int) { - presenter?.tabChanged(position) - } - - override fun newTabButtonClicked() { - presenter?.newTab( - homePageInitializer, - true - ) - } - - override fun newTabButtonLongClicked() { - presenter?.onNewTabLongClicked() - } - - override fun bookmarkButtonClicked() { - val currentTab = tabsManager.currentTab - val url = currentTab?.url - val title = currentTab?.title - if (url == null || title == null) { - return - } - - if (!url.isSpecialUrl()) { - bookmarkManager.isBookmark(url) - .subscribeOn(databaseScheduler) - .observeOn(mainScheduler) - .subscribe { boolean -> - if (boolean) { - deleteBookmark(title, url) - } else { - addBookmark(title, url) - } - } - } - } - - override fun bookmarkItemClicked(entry: Bookmark.Entry) { - presenter?.loadUrlInCurrentView(entry.url) - // keep any jank from happening when the drawer is closed after the URL starts to load - mainHandler.postDelayed({ closeDrawers(null) }, 150) - } - - override fun handleHistoryChange() { - historyPageFactory - .buildPage() - .subscribeOn(databaseScheduler) - .observeOn(mainScheduler) - .subscribeBy(onSuccess = { tabsManager.currentTab?.reload() }) - } - - protected fun handleNewIntent(intent: Intent) { - presenter?.onNewIntent(intent) - } - - protected fun performExitCleanUp() { - exitCleanup.cleanUp(tabsManager.currentTab?.webView, this) - } - - override fun onConfigurationChanged(newConfig: Configuration) { - super.onConfigurationChanged(newConfig) - - logger.log(TAG, "onConfigurationChanged") - - if (isFullScreen) { - showActionBar() - toolbar_layout.translationY = 0f - setWebViewTranslation(toolbar_layout.height.toFloat()) - } - - invalidateOptionsMenu() - initializeToolbarHeight(newConfig) - } - - private fun initializeToolbarHeight(configuration: Configuration) = - ui_layout.doOnLayout { - // TODO externalize the dimensions - val toolbarSize = if (configuration.orientation == Configuration.ORIENTATION_PORTRAIT) { - R.dimen.toolbar_height_portrait - } else { - R.dimen.toolbar_height_landscape - } - toolbar.layoutParams = (toolbar.layoutParams as ConstraintLayout.LayoutParams).apply { - height = dimen(toolbarSize) - } - toolbar.minimumHeight = toolbarSize - toolbar.doOnLayout { setWebViewTranslation(toolbar_layout.height.toFloat()) } - toolbar.requestLayout() - } - - override fun closeBrowser() { - currentTabView.removeFromParent() - performExitCleanUp() - val size = tabsManager.size() - tabsManager.shutdown() - currentTabView = null - for (n in 0 until size) { - tabsView?.tabRemoved(0) - } - finish() - } - - override fun onBackPressed() { - val currentTab = tabsManager.currentTab - if (drawer_layout.isDrawerOpen(getTabDrawer())) { - drawer_layout.closeDrawer(getTabDrawer()) - } else if (drawer_layout.isDrawerOpen(getBookmarkDrawer())) { - bookmarksView?.navigateBack() - } else { - if (currentTab != null) { - logger.log(TAG, "onBackPressed") - if (searchView?.hasFocus() == true) { - currentTab.requestFocus() - } else if (currentTab.canGoBack()) { - if (!currentTab.isShown) { - onHideCustomView() - } else { - currentTab.goBack() - } - } else { - if (customView != null || customViewCallback != null) { - onHideCustomView() - } else { - presenter?.deleteTab(tabsManager.positionOf(currentTab)) - } - } - } else { - logger.log(TAG, "This shouldn't happen ever") - super.onBackPressed() - } - } - } - - override fun onPause() { - super.onPause() - logger.log(TAG, "onPause") - tabsManager.pauseAll() - - if (isIncognito() && isFinishing) { - overridePendingTransition(R.anim.fade_in_scale, R.anim.slide_down_out) - } - } - - protected fun saveOpenTabs() { - if (userPreferences.restoreLostTabsEnabled) { - tabsManager.saveState() - } - } - - override fun onStop() { - super.onStop() - proxyUtils.onStop() - } - - override fun onDestroy() { - logger.log(TAG, "onDestroy") - - incognitoNotification?.hide() - - mainHandler.removeCallbacksAndMessages(null) - - presenter?.shutdown() - - super.onDestroy() - } - - override fun onStart() { - super.onStart() - proxyUtils.onStart(this) - } - - override fun onRestoreInstanceState(savedInstanceState: Bundle) { - super.onRestoreInstanceState(savedInstanceState) - tabsManager.shutdown() - } - - override fun onResume() { - super.onResume() - logger.log(TAG, "onResume") - if (swapBookmarksAndTabs != userPreferences.bookmarksAndTabsSwapped) { - restart() - } - - suggestionsAdapter?.let { - it.refreshPreferences() - it.refreshBookmarks() - } - tabsManager.resumeAll() - initializePreferences() - - if (isFullScreen) { - overlayToolbarOnWebView() - } else { - putToolbarInRoot() - } - } - - /** - * searches the web for the query fixing any and all problems with the input - * checks if it is a search, url, etc. - */ - private fun searchTheWeb(query: String) { - val currentTab = tabsManager.currentTab - if (query.isEmpty()) { - return - } - val searchUrl = "$searchText$QUERY_PLACE_HOLDER" - if (currentTab != null) { - currentTab.stopLoading() - presenter?.loadUrlInCurrentView(smartUrlFilter(query.trim(), true, searchUrl)) - } - } - - /** - * Animates the color of the toolbar from one color to another. Optionally animates - * the color of the tab background, for use when the tabs are displayed on the top - * of the screen. - * - * @param favicon the Bitmap to extract the color from - * @param tabBackground the optional LinearLayout to color - */ - override fun changeToolbarBackground(favicon: Bitmap?, tabBackground: Drawable?) { - if (!isColorMode()) { - return - } - val defaultColor = ContextCompat.getColor(this, R.color.primary_color) - if (currentUiColor == Color.BLACK) { - currentUiColor = defaultColor - } - Palette.from(favicon ?: webPageBitmap!!).generate { palette -> - // OR with opaque black to remove transparency glitches - val color = Color.BLACK or (palette?.getVibrantColor(defaultColor) ?: defaultColor) - - // Lighten up the dark color if it is too dark - val finalColor = if (!shouldShowTabsInDrawer || Utils.isColorTooDark(color)) { - Utils.mixTwoColors(defaultColor, color, 0.25f) - } else { - color - } - - val window = window - if (!shouldShowTabsInDrawer) { - window.setBackgroundDrawable(ColorDrawable(Color.BLACK)) - } - - val startSearchColor = getSearchBarColor(currentUiColor, defaultColor) - val finalSearchColor = getSearchBarColor(finalColor, defaultColor) - - val animation = object : Animation() { - override fun applyTransformation(interpolatedTime: Float, t: Transformation) { - val animatedColor = DrawableUtils.mixColor(interpolatedTime, currentUiColor, finalColor) - if (shouldShowTabsInDrawer) { - backgroundDrawable.color = animatedColor - mainHandler.post { window.setBackgroundDrawable(backgroundDrawable) } - } else { - tabBackground?.tint(animatedColor) - } - currentUiColor = animatedColor - toolbar_layout.setBackgroundColor(animatedColor) - searchBackground?.background?.tint( - DrawableUtils.mixColor(interpolatedTime, startSearchColor, finalSearchColor) - ) - } - } - animation.duration = 300 - toolbar_layout.startAnimation(animation) - } - } - - private fun getSearchBarColor(requestedColor: Int, defaultColor: Int): Int = - if (requestedColor == defaultColor) { - if (isDarkTheme) DrawableUtils.mixColor(0.25f, defaultColor, Color.WHITE) else Color.WHITE - } else { - DrawableUtils.mixColor(0.25f, requestedColor, Color.WHITE) - } - - @ColorInt - override fun getUiColor(): Int = currentUiColor - - override fun updateUrl(url: String?, isLoading: Boolean) { - if (url == null || searchView?.hasFocus() != false) { - return - } - val currentTab = tabsManager.currentTab - bookmarksView?.handleUpdatedUrl(url) - - val currentTitle = currentTab?.title - - searchView?.setText(searchBoxModel.getDisplayContent(url, currentTitle, isLoading)) - } - - override fun updateTabNumber(number: Int) { - if (shouldShowTabsInDrawer && !isIncognito()) { - tabCountView?.updateCount(number) - } - } - - override fun updateProgress(progress: Int) { - setIsLoading(progress < 100) - progress_view.progress = progress - } - - protected fun addItemToHistory(title: String?, url: String) { - if (url.isSpecialUrl()) { - return - } - - historyModel.visitHistoryEntry(url, title) - .subscribeOn(databaseScheduler) - .subscribe() - } - - /** - * method to generate search suggestions for the AutoCompleteTextView from - * previously searched URLs - */ - private fun initializeSearchSuggestions(getUrl: AutoCompleteTextView) { - suggestionsAdapter = SuggestionsAdapter(this, isIncognito()) - suggestionsAdapter?.onSuggestionInsertClick = { - if (it is SearchSuggestion) { - getUrl.setText(it.title) - getUrl.setSelection(it.title.length) - } else { - getUrl.setText(it.url) - getUrl.setSelection(it.url.length) - } - } - getUrl.onItemClickListener = OnItemClickListener { _, _, position, _ -> - val url = when (val selection = suggestionsAdapter?.getItem(position) as WebPage) { - is HistoryEntry, - is Bookmark.Entry -> selection.url - is SearchSuggestion -> selection.title - else -> null - } ?: return@OnItemClickListener - getUrl.setText(url) - searchTheWeb(url) - inputMethodManager.hideSoftInputFromWindow(getUrl.windowToken, 0) - presenter?.onAutoCompleteItemPressed() - } - getUrl.setAdapter(suggestionsAdapter) - } - - /** - * function that opens the HTML history page in the browser - */ - private fun openHistory() { - presenter?.newTab( - historyPageInitializer, - true - ) - } - - private fun openDownloads() { - presenter?.newTab( - downloadPageInitializer, - true - ) - } - - /** - * helper function that opens the bookmark drawer - */ - private fun openBookmarks() { - if (drawer_layout.isDrawerOpen(getTabDrawer())) { - drawer_layout.closeDrawers() - } - drawer_layout.openDrawer(getBookmarkDrawer()) - } - - /** - * This method closes any open drawer and executes the runnable after the drawers are closed. - * - * @param runnable an optional runnable to run after the drawers are closed. - */ - protected fun closeDrawers(runnable: (() -> Unit)?) { - if (!drawer_layout.isDrawerOpen(tab_drawer) && !drawer_layout.isDrawerOpen(bookmark_drawer)) { - if (runnable != null) { - runnable() - return - } - } - drawer_layout.closeDrawers() - - drawer_layout.addDrawerListener(object : DrawerLayout.DrawerListener { - override fun onDrawerSlide(drawerView: View, slideOffset: Float) = Unit - - override fun onDrawerOpened(drawerView: View) = Unit - - override fun onDrawerClosed(drawerView: View) { - runnable?.invoke() - drawer_layout.removeDrawerListener(this) - } - - override fun onDrawerStateChanged(newState: Int) = Unit - }) - } - - override fun setForwardButtonEnabled(enabled: Boolean) { - forwardMenuItem?.isEnabled = enabled - tabsView?.setGoForwardEnabled(enabled) - } - - override fun setBackButtonEnabled(enabled: Boolean) { - backMenuItem?.isEnabled = enabled - tabsView?.setGoBackEnabled(enabled) - } - - override fun onCreateOptionsMenu(menu: Menu): Boolean { - backMenuItem = menu.findItem(R.id.action_back) - forwardMenuItem = menu.findItem(R.id.action_forward) - return super.onCreateOptionsMenu(menu) - } - - /** - * opens a file chooser - * param ValueCallback is the message from the WebView indicating a file chooser - * should be opened - */ - override fun openFileChooser(uploadMsg: ValueCallback) { - uploadMessageCallback = uploadMsg - startActivityForResult(Intent.createChooser(Intent(Intent.ACTION_GET_CONTENT).apply { - addCategory(Intent.CATEGORY_OPENABLE) - type = "*/*" - }, getString(R.string.title_file_chooser)), FILE_CHOOSER_REQUEST_CODE) - } - - /** - * used to allow uploading into the browser - */ - override fun onActivityResult(requestCode: Int, resultCode: Int, intent: Intent?) { - if (requestCode == FILE_CHOOSER_REQUEST_CODE) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { - val result = if (intent == null || resultCode != Activity.RESULT_OK) { - null - } else { - intent.data - } - - uploadMessageCallback?.onReceiveValue(result) - uploadMessageCallback = null - } else { - val results: Array? = if (resultCode == Activity.RESULT_OK) { - if (intent == null) { - // If there is not data, then we may have taken a photo - cameraPhotoPath?.let { arrayOf(it.toUri()) } - } else { - intent.dataString?.let { arrayOf(it.toUri()) } - } - } else { - null - } - - filePathCallback?.onReceiveValue(results) - filePathCallback = null - } - } else { - super.onActivityResult(requestCode, resultCode, intent) - } - } - - override fun showFileChooser(filePathCallback: ValueCallback>) { - this.filePathCallback?.onReceiveValue(null) - this.filePathCallback = filePathCallback - - // Create the File where the photo should go - val intentArray: Array = try { - arrayOf(Intent(MediaStore.ACTION_IMAGE_CAPTURE).apply { - putExtra("PhotoPath", cameraPhotoPath) - putExtra( - MediaStore.EXTRA_OUTPUT, - Uri.fromFile(Utils.createImageFile().also { file -> - cameraPhotoPath = "file:${file.absolutePath}" - }) - ) - }) - } catch (ex: IOException) { - // Error occurred while creating the File - logger.log(TAG, "Unable to create Image File", ex) - emptyArray() - } - - startActivityForResult(Intent(Intent.ACTION_CHOOSER).apply { - putExtra(Intent.EXTRA_INTENT, Intent(Intent.ACTION_GET_CONTENT).apply { - addCategory(Intent.CATEGORY_OPENABLE) - type = "*/*" - }) - putExtra(Intent.EXTRA_TITLE, "Image Chooser") - putExtra(Intent.EXTRA_INITIAL_INTENTS, intentArray) - }, FILE_CHOOSER_REQUEST_CODE) - } - - override fun onShowCustomView(view: View, callback: CustomViewCallback, requestedOrientation: Int) { - val currentTab = tabsManager.currentTab - if (customView != null) { - try { - callback.onCustomViewHidden() - } catch (e: Exception) { - logger.log(TAG, "Error hiding custom view", e) - } - - return - } - - try { - view.keepScreenOn = true - } catch (e: SecurityException) { - logger.log(TAG, "WebView is not allowed to keep the screen on") - } - - originalOrientation = getRequestedOrientation() - customViewCallback = callback - customView = view - - setRequestedOrientation(requestedOrientation) - val decorView = window.decorView as FrameLayout - - fullscreenContainerView = FrameLayout(this) - fullscreenContainerView?.setBackgroundColor(ContextCompat.getColor(this, R.color.black)) - if (view is FrameLayout) { - val child = view.focusedChild - if (child is VideoView) { - videoView = child - child.setOnErrorListener(VideoCompletionListener()) - child.setOnCompletionListener(VideoCompletionListener()) - } - } else if (view is VideoView) { - videoView = view - view.setOnErrorListener(VideoCompletionListener()) - view.setOnCompletionListener(VideoCompletionListener()) - } - decorView.addView(fullscreenContainerView, COVER_SCREEN_PARAMS) - fullscreenContainerView?.addView(customView, COVER_SCREEN_PARAMS) - decorView.requestLayout() - setFullscreen(enabled = true, immersive = true) - currentTab?.setVisibility(INVISIBLE) - } - - override fun onHideCustomView() { - val currentTab = tabsManager.currentTab - if (customView == null || customViewCallback == null || currentTab == null) { - if (customViewCallback != null) { - try { - customViewCallback?.onCustomViewHidden() - } catch (e: Exception) { - logger.log(TAG, "Error hiding custom view", e) - } - - customViewCallback = null - } - return - } - logger.log(TAG, "onHideCustomView") - currentTab.setVisibility(VISIBLE) - try { - customView?.keepScreenOn = false - } catch (e: SecurityException) { - logger.log(TAG, "WebView is not allowed to keep the screen on") - } - - setFullscreen(userPreferences.hideStatusBarEnabled, false) - if (fullscreenContainerView != null) { - val parent = fullscreenContainerView?.parent as ViewGroup - parent.removeView(fullscreenContainerView) - fullscreenContainerView?.removeAllViews() - } - - fullscreenContainerView = null - customView = null - - logger.log(TAG, "VideoView is being stopped") - videoView?.stopPlayback() - videoView?.setOnErrorListener(null) - videoView?.setOnCompletionListener(null) - videoView = null - - try { - customViewCallback?.onCustomViewHidden() - } catch (e: Exception) { - logger.log(TAG, "Error hiding custom view", e) - } - - customViewCallback = null - requestedOrientation = originalOrientation - } - - private inner class VideoCompletionListener : MediaPlayer.OnCompletionListener, MediaPlayer.OnErrorListener { - - override fun onError(mp: MediaPlayer, what: Int, extra: Int): Boolean = false - - override fun onCompletion(mp: MediaPlayer) = onHideCustomView() - - } - - override fun onWindowFocusChanged(hasFocus: Boolean) { - super.onWindowFocusChanged(hasFocus) - logger.log(TAG, "onWindowFocusChanged") - if (hasFocus) { - setFullscreen(hideStatusBar, isImmersiveMode) - } - } - - override fun onBackButtonPressed() { - if (drawer_layout.closeDrawerIfOpen(getTabDrawer())) { - val currentTab = tabsManager.currentTab - if (currentTab?.canGoBack() == true) { - currentTab.goBack() - } else if (currentTab != null) { - tabsManager.let { presenter?.deleteTab(it.positionOf(currentTab)) } - } - } else if (drawer_layout.closeDrawerIfOpen(getBookmarkDrawer())) { - // Don't do anything other than close the bookmarks drawer when the activity is being - // delegated to. - } - } - - override fun onForwardButtonPressed() { - val currentTab = tabsManager.currentTab - if (currentTab?.canGoForward() == true) { - currentTab.goForward() - closeDrawers(null) - } - } - - override fun onHomeButtonPressed() { - tabsManager.currentTab?.loadHomePage() - closeDrawers(null) - } - - /** - * This method sets whether or not the activity will display - * in full-screen mode (i.e. the ActionBar will be hidden) and - * whether or not immersive mode should be set. This is used to - * set both parameters correctly as during a full-screen video, - * both need to be set, but other-wise we leave it up to user - * preference. - * - * @param enabled true to enable full-screen, false otherwise - * @param immersive true to enable immersive mode, false otherwise - */ - private fun setFullscreen(enabled: Boolean, immersive: Boolean) { - hideStatusBar = enabled - isImmersiveMode = immersive - val window = window - val decor = window.decorView - if (enabled) { - if (immersive) { - decor.systemUiVisibility = (SYSTEM_UI_FLAG_LAYOUT_STABLE - or SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION - or SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN - or SYSTEM_UI_FLAG_HIDE_NAVIGATION - or SYSTEM_UI_FLAG_FULLSCREEN - or SYSTEM_UI_FLAG_IMMERSIVE_STICKY) - } else { - decor.systemUiVisibility = SYSTEM_UI_FLAG_VISIBLE - } - window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, - WindowManager.LayoutParams.FLAG_FULLSCREEN) - } else { - window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN) - decor.systemUiVisibility = SYSTEM_UI_FLAG_VISIBLE - } - } - - /** - * This method handles the JavaScript callback to create a new tab. - * Basically this handles the event that JavaScript needs to create - * a popup. - * - * @param resultMsg the transport message used to send the URL to - * the newly created WebView. - */ - override fun onCreateWindow(resultMsg: Message) { - presenter?.newTab(ResultMessageInitializer(resultMsg), true) - } - - /** - * Closes the specified [LightningView]. This implements - * the JavaScript callback that asks the tab to close itself and - * is especially helpful when a page creates a redirect and does - * not need the tab to stay open any longer. - * - * @param tab the LightningView to close, delete it. - */ - override fun onCloseWindow(tab: LightningView) { - presenter?.deleteTab(tabsManager.positionOf(tab)) - } - - /** - * Hide the ActionBar using an animation if we are in full-screen - * mode. This method also re-parents the ActionBar if its parent is - * incorrect so that the animation can happen correctly. - */ - override fun hideActionBar() { - if (isFullScreen) { - if (toolbar_layout == null || content_frame == null) - return - - val height = toolbar_layout.height - if (toolbar_layout.translationY > -0.01f) { - val hideAnimation = object : Animation() { - override fun applyTransformation(interpolatedTime: Float, t: Transformation) { - val trans = interpolatedTime * height - toolbar_layout.translationY = -trans - setWebViewTranslation(height - trans) - } - } - hideAnimation.duration = 250 - hideAnimation.interpolator = BezierDecelerateInterpolator() - content_frame.startAnimation(hideAnimation) - } - } - } - - /** - * Display the ActionBar using an animation if we are in full-screen - * mode. This method also re-parents the ActionBar if its parent is - * incorrect so that the animation can happen correctly. - */ - override fun showActionBar() { - if (isFullScreen) { - logger.log(TAG, "showActionBar") - if (toolbar_layout == null) - return - - var height = toolbar_layout.height - if (height == 0) { - toolbar_layout.measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED) - height = toolbar_layout.measuredHeight - } - - val totalHeight = height - if (toolbar_layout.translationY < -(height - 0.01f)) { - val show = object : Animation() { - override fun applyTransformation(interpolatedTime: Float, t: Transformation) { - val trans = interpolatedTime * totalHeight - toolbar_layout.translationY = trans - totalHeight - setWebViewTranslation(trans) - } - } - show.duration = 250 - show.interpolator = BezierDecelerateInterpolator() - content_frame.startAnimation(show) - } - } - } - - override fun handleBookmarksChange() { - val currentTab = tabsManager.currentTab - if (currentTab != null && currentTab.url.isBookmarkUrl()) { - currentTab.loadBookmarkPage() - } - if (currentTab != null) { - bookmarksView?.handleUpdatedUrl(currentTab.url) - } - suggestionsAdapter?.refreshBookmarks() - } - - override fun handleDownloadDeleted() { - val currentTab = tabsManager.currentTab - if (currentTab != null && currentTab.url.isDownloadsUrl()) { - currentTab.loadDownloadsPage() - } - if (currentTab != null) { - bookmarksView?.handleUpdatedUrl(currentTab.url) - } - } - - override fun handleBookmarkDeleted(bookmark: Bookmark) { - bookmarksView?.handleBookmarkDeleted(bookmark) - handleBookmarksChange() - } - - override fun handleNewTab(newTabType: LightningDialogBuilder.NewTab, url: String) { - val urlInitializer = UrlInitializer(url) - when (newTabType) { - LightningDialogBuilder.NewTab.FOREGROUND -> presenter?.newTab(urlInitializer, true) - LightningDialogBuilder.NewTab.BACKGROUND -> presenter?.newTab(urlInitializer, false) - LightningDialogBuilder.NewTab.INCOGNITO -> { - drawer_layout.closeDrawers() - val intent = IncognitoActivity.createIntent(this, url.toUri()) - startActivity(intent) - overridePendingTransition(R.anim.slide_up_in, R.anim.fade_out_scale) - } - } - } - - /** - * This method lets the search bar know that the page is currently loading - * and that it should display the stop icon to indicate to the user that - * pressing it stops the page from loading - */ - private fun setIsLoading(isLoading: Boolean) { - if (searchView?.hasFocus() == false) { - search_ssl_status.updateVisibilityForContent() - search_refresh.setImageResource(if (isLoading) R.drawable.ic_action_delete else R.drawable.ic_action_refresh) - } - } - - /** - * handle presses on the refresh icon in the search bar, if the page is - * loading, stop the page, if it is done loading refresh the page. - * See setIsFinishedLoading and setIsLoading for displaying the correct icon - */ - private fun refreshOrStop() { - val currentTab = tabsManager.currentTab - if (currentTab != null) { - if (currentTab.progress < 100) { - currentTab.stopLoading() - } else { - currentTab.reload() - } - } - } - - /** - * Handle the click event for the views that are using - * this class as a click listener. This method should - * distinguish between the various views using their IDs. - * - * @param v the view that the user has clicked - */ - override fun onClick(v: View) { - val currentTab = tabsManager.currentTab ?: return - when (v.id) { - R.id.home_button -> when { - searchView?.hasFocus() == true -> currentTab.requestFocus() - shouldShowTabsInDrawer -> drawer_layout.openDrawer(getTabDrawer()) - else -> currentTab.loadHomePage() - } - R.id.button_next -> findResult?.nextResult() - R.id.button_back -> findResult?.previousResult() - R.id.button_quit -> { - findResult?.clearResults() - findResult = null - search_bar.visibility = GONE - } - } - } - - /** - * Handle the callback that permissions requested have been granted or not. - * This method should act upon the results of the permissions request. - * - * @param requestCode the request code sent when initially making the request - * @param permissions the array of the permissions that was requested - * @param grantResults the results of the permissions requests that provides - * information on whether the request was granted or not - */ - override fun onRequestPermissionsResult(requestCode: Int, permissions: Array, grantResults: IntArray) { - PermissionsManager.getInstance().notifyPermissionsChange(permissions, grantResults) - super.onRequestPermissionsResult(requestCode, permissions, grantResults) - } - - /** - * If the [drawer] is open, close it and return true. Return false otherwise. - */ - private fun DrawerLayout.closeDrawerIfOpen(drawer: View): Boolean = - if (isDrawerOpen(drawer)) { - closeDrawer(drawer) - true - } else { - false - } - - companion object { - - private const val TAG = "BrowserActivity" - - const val INTENT_PANIC_TRIGGER = "info.guardianproject.panic.action.TRIGGER" - - private const val FILE_CHOOSER_REQUEST_CODE = 1111 - - // Constant - private val MATCH_PARENT = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT) - private val COVER_SCREEN_PARAMS = FrameLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT) - - } - -} diff --git a/app/src/main/java/acr/browser/lightning/browser/activity/ThemableBrowserActivity.kt b/app/src/main/java/acr/browser/lightning/browser/activity/ThemableBrowserActivity.kt index 8ed76266a..5cc6743ae 100644 --- a/app/src/main/java/acr/browser/lightning/browser/activity/ThemableBrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/browser/activity/ThemableBrowserActivity.kt @@ -2,7 +2,7 @@ package acr.browser.lightning.browser.activity import acr.browser.lightning.AppTheme import acr.browser.lightning.R -import acr.browser.lightning.di.injector +import acr.browser.lightning._browser2.di.injector import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.utils.ThemeUtils import android.content.Intent diff --git a/app/src/main/java/acr/browser/lightning/browser/bookmarks/BookmarkUiModel.kt b/app/src/main/java/acr/browser/lightning/browser/bookmarks/BookmarkUiModel.kt deleted file mode 100644 index e079981b6..000000000 --- a/app/src/main/java/acr/browser/lightning/browser/bookmarks/BookmarkUiModel.kt +++ /dev/null @@ -1,24 +0,0 @@ -package acr.browser.lightning.browser.bookmarks - -import acr.browser.lightning.browser.BookmarksView - -/** - * The UI model representing the current folder shown by the [BookmarksView]. - * - * Created by anthonycr on 5/7/17. - */ -class BookmarkUiModel { - - /** - * Sets the current folder that is being shown. Null represents the root folder. - */ - var currentFolder: String? = null - - /** - * Determines if the current folder is the root folder. - * - * @return true if the current folder is the root, false otherwise. - */ - fun isCurrentFolderRoot(): Boolean = currentFolder == null - -} diff --git a/app/src/main/java/acr/browser/lightning/browser/bookmarks/BookmarksDrawerView.kt b/app/src/main/java/acr/browser/lightning/browser/bookmarks/BookmarksDrawerView.kt deleted file mode 100644 index ac14cbfc7..000000000 --- a/app/src/main/java/acr/browser/lightning/browser/bookmarks/BookmarksDrawerView.kt +++ /dev/null @@ -1,377 +0,0 @@ -package acr.browser.lightning.browser.bookmarks - -import acr.browser.lightning.R -import acr.browser.lightning.adblock.allowlist.AllowListModel -import acr.browser.lightning.animation.AnimationUtils -import acr.browser.lightning.browser.BookmarksView -import acr.browser.lightning.browser.TabsManager -import acr.browser.lightning.controller.UIController -import acr.browser.lightning.database.Bookmark -import acr.browser.lightning.database.bookmark.BookmarkRepository -import acr.browser.lightning.di.DatabaseScheduler -import acr.browser.lightning.di.MainScheduler -import acr.browser.lightning.di.NetworkScheduler -import acr.browser.lightning.di.injector -import acr.browser.lightning.dialog.BrowserDialog -import acr.browser.lightning.dialog.DialogItem -import acr.browser.lightning.dialog.LightningDialogBuilder -import acr.browser.lightning.extensions.color -import acr.browser.lightning.extensions.drawable -import acr.browser.lightning.extensions.inflater -import acr.browser.lightning.favicon.FaviconModel -import acr.browser.lightning.reading.activity.ReadingActivity -import acr.browser.lightning.utils.isSpecialUrl -import android.app.Activity -import android.content.Context -import android.util.AttributeSet -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.LinearLayout -import android.widget.TextView -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.RecyclerView -import io.reactivex.Scheduler -import io.reactivex.Single -import io.reactivex.disposables.Disposable -import io.reactivex.rxkotlin.subscribeBy -import java.util.concurrent.ConcurrentHashMap -import javax.inject.Inject - -/** - * The view that displays bookmarks in a list and some controls. - */ -class BookmarksDrawerView @JvmOverloads constructor( - context: Context, - attrs: AttributeSet? = null, - defStyleAttr: Int = 0 -) : LinearLayout(context, attrs, defStyleAttr), BookmarksView { - - @Inject internal lateinit var bookmarkModel: BookmarkRepository - @Inject internal lateinit var allowListModel: AllowListModel - @Inject internal lateinit var bookmarksDialogBuilder: LightningDialogBuilder - @Inject internal lateinit var faviconModel: FaviconModel - @Inject @field:DatabaseScheduler internal lateinit var databaseScheduler: Scheduler - @Inject @field:NetworkScheduler internal lateinit var networkScheduler: Scheduler - @Inject @field:MainScheduler internal lateinit var mainScheduler: Scheduler - - private val uiController: UIController - - // Adapter - private var bookmarkAdapter: BookmarkListAdapter? = null - - // Colors - private var scrollIndex: Int = 0 - - private var bookmarksSubscription: Disposable? = null - private var bookmarkUpdateSubscription: Disposable? = null - - private val uiModel = BookmarkUiModel() - - private var bookmarkRecyclerView: RecyclerView? = null - private var backNavigationView: ImageView? = null - private var addBookmarkView: ImageView? = null - - init { - context.inflater.inflate(R.layout.bookmark_drawer, this, true) - context.injector.inject(this) - - uiController = context as UIController - - bookmarkRecyclerView = findViewById(R.id.bookmark_list_view) - backNavigationView = findViewById(R.id.bookmark_back_button) - addBookmarkView = findViewById(R.id.action_add_bookmark) - backNavigationView?.setOnClickListener { - if (!uiModel.isCurrentFolderRoot()) { - setBookmarksShown(null, true) - bookmarkRecyclerView?.layoutManager?.scrollToPosition(scrollIndex) - } - } - addBookmarkView?.setOnClickListener { uiController.bookmarkButtonClicked() } - findViewById(R.id.action_reading).setOnClickListener { - getTabsManager().currentTab?.url?.let { - ReadingActivity.launch(context, it) - } - } - findViewById(R.id.action_page_tools).setOnClickListener { showPageToolsDialog(context) } - - bookmarkAdapter = BookmarkListAdapter( - context, - faviconModel, - networkScheduler, - mainScheduler, - ::handleItemLongPress, - ::handleItemClick - ) - - bookmarkRecyclerView?.let { - it.layoutManager = LinearLayoutManager(context) - it.adapter = bookmarkAdapter - } - - setBookmarksShown(null, true) - } - - override fun onDetachedFromWindow() { - super.onDetachedFromWindow() - - bookmarksSubscription?.dispose() - bookmarkUpdateSubscription?.dispose() - - bookmarkAdapter?.cleanupSubscriptions() - } - - private fun getTabsManager(): TabsManager = uiController.getTabModel() - - private fun updateBookmarkIndicator(url: String) { - bookmarkUpdateSubscription?.dispose() - bookmarkUpdateSubscription = bookmarkModel.isBookmark(url) - .subscribeOn(databaseScheduler) - .observeOn(mainScheduler) - .subscribe { isBookmark -> - bookmarkUpdateSubscription = null - addBookmarkView?.isSelected = isBookmark - addBookmarkView?.isEnabled = !url.isSpecialUrl() - } - } - - override fun handleBookmarkDeleted(bookmark: Bookmark) = when (bookmark) { - is Bookmark.Folder -> setBookmarksShown(null, false) - is Bookmark.Entry -> bookmarkAdapter?.deleteItem(BookmarksViewModel(bookmark)) ?: Unit - } - - private fun setBookmarksShown(folder: String?, animate: Boolean) { - bookmarksSubscription?.dispose() - bookmarksSubscription = bookmarkModel.getBookmarksFromFolderSorted(folder) - .concatWith(Single.defer { - if (folder == null) { - bookmarkModel.getFoldersSorted() - } else { - Single.just(emptyList()) - } - }) - .toList() - .map { it.flatten() } - .subscribeOn(databaseScheduler) - .observeOn(mainScheduler) - .subscribe { bookmarksAndFolders -> - uiModel.currentFolder = folder - setBookmarkDataSet(bookmarksAndFolders, animate) - } - } - - private fun setBookmarkDataSet(items: List, animate: Boolean) { - bookmarkAdapter?.updateItems(items.map { BookmarksViewModel(it) }) - val resource = if (uiModel.isCurrentFolderRoot()) { - R.drawable.ic_action_star - } else { - R.drawable.ic_action_back - } - - if (animate) { - backNavigationView?.let { - val transition = AnimationUtils.createRotationTransitionAnimation(it, resource) - it.startAnimation(transition) - } - } else { - backNavigationView?.setImageResource(resource) - } - } - - private fun handleItemLongPress(bookmark: Bookmark): Boolean { - (context as Activity?)?.let { - when (bookmark) { - is Bookmark.Folder -> bookmarksDialogBuilder.showBookmarkFolderLongPressedDialog(it, uiController, bookmark) - is Bookmark.Entry -> bookmarksDialogBuilder.showLongPressedDialogForBookmarkUrl(it, uiController, bookmark) - } - } - return true - } - - private fun handleItemClick(bookmark: Bookmark) = when (bookmark) { - is Bookmark.Folder -> { - scrollIndex = (bookmarkRecyclerView?.layoutManager as LinearLayoutManager).findFirstVisibleItemPosition() - setBookmarksShown(bookmark.title, true) - } - is Bookmark.Entry -> uiController.bookmarkItemClicked(bookmark) - } - - - /** - * Show the page tools dialog. - */ - private fun showPageToolsDialog(context: Context) { - val currentTab = getTabsManager().currentTab ?: return - val isAllowedAds = allowListModel.isUrlAllowedAds(currentTab.url) - val whitelistString = if (isAllowedAds) { - R.string.dialog_adblock_enable_for_site - } else { - R.string.dialog_adblock_disable_for_site - } - - BrowserDialog.showWithIcons(context, context.getString(R.string.dialog_tools_title), - DialogItem( - icon = context.drawable(R.drawable.ic_action_desktop), - title = R.string.dialog_toggle_desktop - ) { - getTabsManager().currentTab?.apply { - toggleDesktopUA() - reload() - // TODO add back drawer closing - } - }, - DialogItem( - icon = context.drawable(R.drawable.ic_block), - colorTint = context.color(R.color.error_red).takeIf { isAllowedAds }, - title = whitelistString, - isConditionMet = !currentTab.url.isSpecialUrl() - ) { - if (isAllowedAds) { - allowListModel.removeUrlFromAllowList(currentTab.url) - } else { - allowListModel.addUrlToAllowList(currentTab.url) - } - getTabsManager().currentTab?.reload() - } - ) - } - - override fun navigateBack() { - if (uiModel.isCurrentFolderRoot()) { - uiController.onBackButtonPressed() - } else { - setBookmarksShown(null, true) - bookmarkRecyclerView?.layoutManager?.scrollToPosition(scrollIndex) - } - } - - override fun handleUpdatedUrl(url: String) { - updateBookmarkIndicator(url) - val folder = uiModel.currentFolder - setBookmarksShown(folder, false) - } - - private class BookmarkViewHolder( - itemView: View, - private val adapter: BookmarkListAdapter, - private val onItemLongClickListener: (Bookmark) -> Boolean, - private val onItemClickListener: (Bookmark) -> Unit - ) : RecyclerView.ViewHolder(itemView), OnClickListener, OnLongClickListener { - - val txtTitle: TextView = itemView.findViewById(R.id.textBookmark) - val favicon: ImageView = itemView.findViewById(R.id.faviconBookmark) - - init { - itemView.setOnLongClickListener(this) - itemView.setOnClickListener(this) - } - - override fun onClick(v: View) { - val index = adapterPosition - if (index.toLong() != RecyclerView.NO_ID) { - onItemClickListener(adapter.itemAt(index).bookmark) - } - } - - override fun onLongClick(v: View): Boolean { - val index = adapterPosition - return index != RecyclerView.NO_POSITION && onItemLongClickListener(adapter.itemAt(index).bookmark) - } - } - - private class BookmarkListAdapter( - context: Context, - private val faviconModel: FaviconModel, - private val networkScheduler: Scheduler, - private val mainScheduler: Scheduler, - private val onItemLongClickListener: (Bookmark) -> Boolean, - private val onItemClickListener: (Bookmark) -> Unit - ) : RecyclerView.Adapter() { - - private var bookmarks: List = listOf() - private val faviconFetchSubscriptions = ConcurrentHashMap() - private val folderIcon = context.drawable(R.drawable.ic_folder) - private val webpageIcon = context.drawable(R.drawable.ic_webpage) - - fun itemAt(position: Int): BookmarksViewModel = bookmarks[position] - - fun deleteItem(item: BookmarksViewModel) { - val newList = bookmarks - item - updateItems(newList) - } - - fun updateItems(newList: List) { - val oldList = bookmarks - bookmarks = newList - - val diffResult = DiffUtil.calculateDiff(object : DiffUtil.Callback() { - override fun getOldListSize() = oldList.size - - override fun getNewListSize() = bookmarks.size - - override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) = - oldList[oldItemPosition].bookmark.url == bookmarks[newItemPosition].bookmark.url - - override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int) = - oldList[oldItemPosition] == bookmarks[newItemPosition] - }) - - diffResult.dispatchUpdatesTo(this) - } - - fun cleanupSubscriptions() { - for (subscription in faviconFetchSubscriptions.values) { - subscription.dispose() - } - faviconFetchSubscriptions.clear() - } - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BookmarkViewHolder { - val inflater = LayoutInflater.from(parent.context) - val itemView = inflater.inflate(R.layout.bookmark_list_item, parent, false) - - return BookmarkViewHolder(itemView, this, onItemLongClickListener, onItemClickListener) - } - - override fun onBindViewHolder(holder: BookmarkViewHolder, position: Int) { - holder.itemView.jumpDrawablesToCurrentState() - - val viewModel = bookmarks[position] - holder.txtTitle.text = viewModel.bookmark.title - - val url = viewModel.bookmark.url - holder.favicon.tag = url - - viewModel.icon?.let { - holder.favicon.setImageBitmap(it) - return - } - - val imageDrawable = when (viewModel.bookmark) { - is Bookmark.Folder -> folderIcon - is Bookmark.Entry -> webpageIcon.also { - faviconFetchSubscriptions[url]?.dispose() - faviconFetchSubscriptions[url] = faviconModel - .faviconForUrl(url, viewModel.bookmark.title) - .subscribeOn(networkScheduler) - .observeOn(mainScheduler) - .subscribeBy( - onSuccess = { bitmap -> - viewModel.icon = bitmap - if (holder.favicon.tag == url) { - holder.favicon.setImageBitmap(bitmap) - } - } - ) - } - } - - holder.favicon.setImageDrawable(imageDrawable) - } - - override fun getItemCount() = bookmarks.size - } - -} diff --git a/app/src/main/java/acr/browser/lightning/browser/bookmarks/BookmarksViewModel.kt b/app/src/main/java/acr/browser/lightning/browser/bookmarks/BookmarksViewModel.kt deleted file mode 100644 index 402c1a065..000000000 --- a/app/src/main/java/acr/browser/lightning/browser/bookmarks/BookmarksViewModel.kt +++ /dev/null @@ -1,15 +0,0 @@ -package acr.browser.lightning.browser.bookmarks - -import acr.browser.lightning.database.Bookmark -import android.graphics.Bitmap - -/** - * The data model representing a [Bookmark] in a list. - * - * @param bookmark The bookmark backing this view model, either an entry or a folder. - * @param icon The icon for this bookmark. - */ -data class BookmarksViewModel( - val bookmark: Bookmark, - var icon: Bitmap? = null -) diff --git a/app/src/main/java/acr/browser/lightning/browser/cleanup/BasicIncognitoExitCleanup.kt b/app/src/main/java/acr/browser/lightning/browser/cleanup/BasicIncognitoExitCleanup.kt index d3e7a474b..b57b8653b 100644 --- a/app/src/main/java/acr/browser/lightning/browser/cleanup/BasicIncognitoExitCleanup.kt +++ b/app/src/main/java/acr/browser/lightning/browser/cleanup/BasicIncognitoExitCleanup.kt @@ -1,6 +1,6 @@ package acr.browser.lightning.browser.cleanup -import acr.browser.lightning.browser.activity.BrowserActivity +import acr.browser.lightning._browser2.BrowserActivity import acr.browser.lightning.utils.WebUtils import android.webkit.WebView import javax.inject.Inject diff --git a/app/src/main/java/acr/browser/lightning/browser/cleanup/DelegatingExitCleanup.kt b/app/src/main/java/acr/browser/lightning/browser/cleanup/DelegatingExitCleanup.kt index 56bf8b76a..64690874e 100644 --- a/app/src/main/java/acr/browser/lightning/browser/cleanup/DelegatingExitCleanup.kt +++ b/app/src/main/java/acr/browser/lightning/browser/cleanup/DelegatingExitCleanup.kt @@ -1,8 +1,8 @@ package acr.browser.lightning.browser.cleanup import acr.browser.lightning.Capabilities -import acr.browser.lightning.MainActivity -import acr.browser.lightning.browser.activity.BrowserActivity +import acr.browser.lightning._browser2.BrowserActivity +import acr.browser.lightning._browser2.DefaultBrowserActivity import acr.browser.lightning.isSupported import android.webkit.WebView import javax.inject.Inject @@ -18,8 +18,11 @@ class DelegatingExitCleanup @Inject constructor( ) : ExitCleanup { override fun cleanUp(webView: WebView?, context: BrowserActivity) { when { - context is MainActivity -> normalExitCleanup.cleanUp(webView, context) - Capabilities.FULL_INCOGNITO.isSupported -> enhancedIncognitoExitCleanup.cleanUp(webView, context) + context is DefaultBrowserActivity -> normalExitCleanup.cleanUp(webView, context) + Capabilities.FULL_INCOGNITO.isSupported -> enhancedIncognitoExitCleanup.cleanUp( + webView, + context + ) else -> basicIncognitoExitCleanup.cleanUp(webView, context) } } diff --git a/app/src/main/java/acr/browser/lightning/browser/cleanup/EnhancedIncognitoExitCleanup.kt b/app/src/main/java/acr/browser/lightning/browser/cleanup/EnhancedIncognitoExitCleanup.kt index eefd6c07e..17f09c054 100644 --- a/app/src/main/java/acr/browser/lightning/browser/cleanup/EnhancedIncognitoExitCleanup.kt +++ b/app/src/main/java/acr/browser/lightning/browser/cleanup/EnhancedIncognitoExitCleanup.kt @@ -1,6 +1,6 @@ package acr.browser.lightning.browser.cleanup -import acr.browser.lightning.browser.activity.BrowserActivity +import acr.browser.lightning._browser2.BrowserActivity import acr.browser.lightning.log.Logger import acr.browser.lightning.utils.WebUtils import android.webkit.WebView diff --git a/app/src/main/java/acr/browser/lightning/browser/cleanup/ExitCleanup.kt b/app/src/main/java/acr/browser/lightning/browser/cleanup/ExitCleanup.kt index 796fa2f28..220b936da 100644 --- a/app/src/main/java/acr/browser/lightning/browser/cleanup/ExitCleanup.kt +++ b/app/src/main/java/acr/browser/lightning/browser/cleanup/ExitCleanup.kt @@ -1,6 +1,6 @@ package acr.browser.lightning.browser.cleanup -import acr.browser.lightning.browser.activity.BrowserActivity +import acr.browser.lightning._browser2.BrowserActivity import android.webkit.WebView /** diff --git a/app/src/main/java/acr/browser/lightning/browser/cleanup/NormalExitCleanup.kt b/app/src/main/java/acr/browser/lightning/browser/cleanup/NormalExitCleanup.kt index 73b7a3d72..0180a035a 100644 --- a/app/src/main/java/acr/browser/lightning/browser/cleanup/NormalExitCleanup.kt +++ b/app/src/main/java/acr/browser/lightning/browser/cleanup/NormalExitCleanup.kt @@ -1,8 +1,8 @@ package acr.browser.lightning.browser.cleanup -import acr.browser.lightning.browser.activity.BrowserActivity +import acr.browser.lightning._browser2.BrowserActivity import acr.browser.lightning.database.history.HistoryDatabase -import acr.browser.lightning.di.DatabaseScheduler +import acr.browser.lightning._browser2.di.DatabaseScheduler import acr.browser.lightning.log.Logger import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.utils.WebUtils diff --git a/app/src/main/java/acr/browser/lightning/browser/tabs/TabViewHolder.kt b/app/src/main/java/acr/browser/lightning/browser/tabs/TabViewHolder.kt deleted file mode 100644 index c3cf3caed..000000000 --- a/app/src/main/java/acr/browser/lightning/browser/tabs/TabViewHolder.kt +++ /dev/null @@ -1,42 +0,0 @@ -package acr.browser.lightning.browser.tabs - -import acr.browser.lightning.R -import acr.browser.lightning.controller.UIController -import android.view.View -import android.widget.ImageView -import android.widget.LinearLayout -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView - -/** - * The [RecyclerView.ViewHolder] for both vertical and horizontal tabs. - */ -class TabViewHolder( - view: View, - private val uiController: UIController -) : RecyclerView.ViewHolder(view), View.OnClickListener, View.OnLongClickListener { - - val txtTitle: TextView = view.findViewById(R.id.textTab) - val favicon: ImageView = view.findViewById(R.id.faviconTab) - val exitButton: View = view.findViewById(R.id.deleteAction) - val layout: LinearLayout = view.findViewById(R.id.tab_item_background) - - init { - exitButton.setOnClickListener(this) - layout.setOnClickListener(this) - layout.setOnLongClickListener(this) - } - - override fun onClick(v: View) { - if (v === exitButton) { - uiController.tabCloseClicked(adapterPosition) - } else if (v === layout) { - uiController.tabClicked(adapterPosition) - } - } - - override fun onLongClick(v: View): Boolean { - uiController.showCloseDialog(adapterPosition) - return true - } -} diff --git a/app/src/main/java/acr/browser/lightning/browser/tabs/TabViewState.kt b/app/src/main/java/acr/browser/lightning/browser/tabs/TabViewState.kt deleted file mode 100644 index d2e503795..000000000 --- a/app/src/main/java/acr/browser/lightning/browser/tabs/TabViewState.kt +++ /dev/null @@ -1,27 +0,0 @@ -package acr.browser.lightning.browser.tabs - -import acr.browser.lightning.view.LightningView -import android.graphics.Bitmap - -/** - * @param id The unique id of the tab. - * @param title The title of the tab. - * @param favicon The favicon of the tab, may be null. - * @param isForegroundTab True if the tab is in the foreground, false otherwise. - */ -data class TabViewState( - val id: Int, - val title: String, - val favicon: Bitmap?, - val isForegroundTab: Boolean -) - -/** - * Converts a [LightningView] to a [TabViewState]. - */ -fun LightningView.asTabViewState() = TabViewState( - id = id, - title = title, - favicon = favicon, - isForegroundTab = isForegroundTab -) diff --git a/app/src/main/java/acr/browser/lightning/browser/tabs/TabViewStateDiffCallback.kt b/app/src/main/java/acr/browser/lightning/browser/tabs/TabViewStateDiffCallback.kt deleted file mode 100644 index 7a93ca4ec..000000000 --- a/app/src/main/java/acr/browser/lightning/browser/tabs/TabViewStateDiffCallback.kt +++ /dev/null @@ -1,24 +0,0 @@ -package acr.browser.lightning.browser.tabs - -import androidx.recyclerview.widget.DiffUtil - -/** - * Diffing callback used to determine whether changes have been made to the list. - * - * @param oldList The old list that is being replaced by the [newList]. - * @param newList The new list replacing the [oldList], which may or may not be different. - */ -class TabViewStateDiffCallback( - private val oldList: List, - private val newList: List -) : DiffUtil.Callback() { - override fun getOldListSize() = oldList.size - - override fun getNewListSize() = newList.size - - override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) = - oldList[oldItemPosition].id == newList[newItemPosition].id - - override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean = - oldList[oldItemPosition] == newList[newItemPosition] -} diff --git a/app/src/main/java/acr/browser/lightning/browser/tabs/TabsDesktopAdapter.kt b/app/src/main/java/acr/browser/lightning/browser/tabs/TabsDesktopAdapter.kt deleted file mode 100644 index 905828189..000000000 --- a/app/src/main/java/acr/browser/lightning/browser/tabs/TabsDesktopAdapter.kt +++ /dev/null @@ -1,103 +0,0 @@ -package acr.browser.lightning.browser.tabs - -import acr.browser.lightning.R -import acr.browser.lightning.controller.UIController -import acr.browser.lightning.extensions.* -import acr.browser.lightning.utils.ThemeUtils -import acr.browser.lightning.utils.Utils -import android.content.Context -import android.content.res.Resources -import android.graphics.Bitmap -import android.graphics.Canvas -import android.graphics.Color -import android.graphics.drawable.BitmapDrawable -import android.graphics.drawable.Drawable -import android.view.ViewGroup -import androidx.core.widget.TextViewCompat -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.RecyclerView - -/** - * The adapter for horizontal desktop style browser tabs. - */ -class TabsDesktopAdapter( - context: Context, - private val resources: Resources, - private val uiController: UIController -) : RecyclerView.Adapter() { - - private val backgroundTabDrawable: Drawable? - private val foregroundTabBitmap: Bitmap? - private var tabList: List = emptyList() - - init { - val backgroundColor = Utils.mixTwoColors(ThemeUtils.getPrimaryColor(context), Color.BLACK, 0.75f) - val backgroundTabBitmap = Bitmap.createBitmap( - context.dimen(R.dimen.desktop_tab_width), - context.dimen(R.dimen.desktop_tab_height), - Bitmap.Config.ARGB_8888 - ).also { - Canvas(it).drawTrapezoid(backgroundColor, true) - } - backgroundTabDrawable = BitmapDrawable(resources, backgroundTabBitmap) - - val foregroundColor = ThemeUtils.getPrimaryColor(context) - foregroundTabBitmap = Bitmap.createBitmap( - context.dimen(R.dimen.desktop_tab_width), - context.dimen(R.dimen.desktop_tab_height), - Bitmap.Config.ARGB_8888 - ).also { - Canvas(it).drawTrapezoid(foregroundColor, false) - } - } - - fun showTabs(tabs: List) { - val oldList = tabList - tabList = tabs - - DiffUtil.calculateDiff(TabViewStateDiffCallback(oldList, tabList)).dispatchUpdatesTo(this) - } - - override fun onCreateViewHolder(viewGroup: ViewGroup, i: Int): TabViewHolder { - val view = viewGroup.context.inflater.inflate(R.layout.tab_list_item_horizontal, viewGroup, false) - return TabViewHolder(view, uiController) - } - - override fun onBindViewHolder(holder: TabViewHolder, position: Int) { - holder.exitButton.tag = position - - val web = tabList[position] - - holder.txtTitle.text = web.title - updateViewHolderAppearance(holder, web.favicon, web.isForegroundTab) - updateViewHolderFavicon(holder, web.favicon, web.isForegroundTab) - } - - private fun updateViewHolderFavicon(viewHolder: TabViewHolder, favicon: Bitmap?, isForeground: Boolean) { - favicon?.let { - if (isForeground) { - viewHolder.favicon.setImageBitmap(it) - } else { - viewHolder.favicon.setImageBitmap(it.desaturate()) - } - } ?: viewHolder.favicon.setImageResource(R.drawable.ic_webpage) - } - - private fun updateViewHolderAppearance(viewHolder: TabViewHolder, favicon: Bitmap?, isForeground: Boolean) { - if (isForeground) { - val foregroundDrawable = BitmapDrawable(resources, foregroundTabBitmap) - if (uiController.isColorMode()) { - foregroundDrawable.tint(uiController.getUiColor()) - } - TextViewCompat.setTextAppearance(viewHolder.txtTitle, R.style.boldText) - viewHolder.layout.background = foregroundDrawable - uiController.changeToolbarBackground(favicon, foregroundDrawable) - } else { - TextViewCompat.setTextAppearance(viewHolder.txtTitle, R.style.normalText) - viewHolder.layout.background = backgroundTabDrawable - } - } - - override fun getItemCount() = tabList.size - -} diff --git a/app/src/main/java/acr/browser/lightning/browser/tabs/TabsDesktopView.kt b/app/src/main/java/acr/browser/lightning/browser/tabs/TabsDesktopView.kt deleted file mode 100644 index 38408e3a6..000000000 --- a/app/src/main/java/acr/browser/lightning/browser/tabs/TabsDesktopView.kt +++ /dev/null @@ -1,91 +0,0 @@ -package acr.browser.lightning.browser.tabs - -import acr.browser.lightning.R -import acr.browser.lightning.browser.TabsView -import acr.browser.lightning.list.HorizontalItemAnimator -import acr.browser.lightning.controller.UIController -import acr.browser.lightning.extensions.color -import acr.browser.lightning.extensions.inflater -import acr.browser.lightning.view.LightningView -import android.content.Context -import android.util.AttributeSet -import android.view.View -import android.widget.ImageView -import androidx.constraintlayout.widget.ConstraintLayout -import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.RecyclerView - -/** - * A view which displays browser tabs in a horizontal [RecyclerView]. - */ -class TabsDesktopView @JvmOverloads constructor( - context: Context, - attrs: AttributeSet? = null, - defStyleAttr: Int = 0 -) : ConstraintLayout(context, attrs, defStyleAttr), TabsView { - - private val uiController = context as UIController - private val tabsAdapter: TabsDesktopAdapter - private val tabList: RecyclerView - - init { - setBackgroundColor(context.color(R.color.black)) - context.inflater.inflate(R.layout.tab_strip, this, true) - findViewById(R.id.new_tab_button).apply { - setColorFilter(context.color(R.color.icon_dark_theme)) - setOnClickListener { - uiController.newTabButtonClicked() - } - setOnLongClickListener { - uiController.newTabButtonLongClicked() - true - } - } - - val layoutManager = LinearLayoutManager(context, RecyclerView.HORIZONTAL, false) - - val animator = HorizontalItemAnimator().apply { - supportsChangeAnimations = false - addDuration = 200 - changeDuration = 0 - removeDuration = 200 - moveDuration = 200 - } - - tabsAdapter = TabsDesktopAdapter(context, context.resources, uiController = uiController) - - tabList = findViewById(R.id.drawer_tabs_list).apply { - setLayerType(View.LAYER_TYPE_NONE, null) - itemAnimator = animator - this.layoutManager = layoutManager - adapter = tabsAdapter - setHasFixedSize(true) - } - } - - override fun tabAdded() { - displayTabs() - tabList.postDelayed({ tabList.smoothScrollToPosition(tabsAdapter.itemCount - 1) }, 500) - } - - override fun tabRemoved(position: Int) { - displayTabs() - } - - override fun tabChanged(position: Int) { - displayTabs() - } - - private fun displayTabs() { - tabsAdapter.showTabs(uiController.getTabModel().allTabs.map(LightningView::asTabViewState)) - } - - override fun tabsInitialized() { - tabsAdapter.notifyDataSetChanged() - } - - override fun setGoBackEnabled(isEnabled: Boolean) = Unit - - override fun setGoForwardEnabled(isEnabled: Boolean) = Unit - -} diff --git a/app/src/main/java/acr/browser/lightning/browser/tabs/TabsDrawerAdapter.kt b/app/src/main/java/acr/browser/lightning/browser/tabs/TabsDrawerAdapter.kt deleted file mode 100644 index 7cfdcd3aa..000000000 --- a/app/src/main/java/acr/browser/lightning/browser/tabs/TabsDrawerAdapter.kt +++ /dev/null @@ -1,77 +0,0 @@ -package acr.browser.lightning.browser.tabs - -import acr.browser.lightning.R -import acr.browser.lightning.controller.UIController -import acr.browser.lightning.extensions.desaturate -import acr.browser.lightning.extensions.inflater -import acr.browser.lightning.view.BackgroundDrawable -import android.graphics.Bitmap -import android.view.ViewGroup -import androidx.core.widget.TextViewCompat -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.RecyclerView - -/** - * The adapter for vertical mobile style browser tabs. - */ -class TabsDrawerAdapter( - private val uiController: UIController -) : RecyclerView.Adapter() { - - private var tabList: List = emptyList() - - fun showTabs(tabs: List) { - val oldList = tabList - tabList = tabs - DiffUtil.calculateDiff(TabViewStateDiffCallback(oldList, tabList)).dispatchUpdatesTo(this) - } - - override fun onCreateViewHolder(viewGroup: ViewGroup, i: Int): TabViewHolder { - val view = viewGroup.context.inflater.inflate(R.layout.tab_list_item, viewGroup, false) - view.background = BackgroundDrawable(view.context) - return TabViewHolder(view, uiController) - } - - override fun onBindViewHolder(holder: TabViewHolder, position: Int) { - holder.exitButton.tag = position - - val web = tabList[position] - - holder.txtTitle.text = web.title - updateViewHolderAppearance(holder, web.favicon, web.isForegroundTab) - updateViewHolderFavicon(holder, web.favicon, web.isForegroundTab) - updateViewHolderBackground(holder, web.isForegroundTab) - } - - private fun updateViewHolderFavicon(viewHolder: TabViewHolder, favicon: Bitmap?, isForeground: Boolean) { - favicon?.let { - if (isForeground) { - viewHolder.favicon.setImageBitmap(it) - } else { - viewHolder.favicon.setImageBitmap(it.desaturate()) - } - } ?: viewHolder.favicon.setImageResource(R.drawable.ic_webpage) - } - - private fun updateViewHolderBackground(viewHolder: TabViewHolder, isForeground: Boolean) { - val verticalBackground = viewHolder.layout.background as BackgroundDrawable - verticalBackground.isCrossFadeEnabled = false - if (isForeground) { - verticalBackground.startTransition(200) - } else { - verticalBackground.reverseTransition(200) - } - } - - private fun updateViewHolderAppearance(viewHolder: TabViewHolder, favicon: Bitmap?, isForeground: Boolean) { - if (isForeground) { - TextViewCompat.setTextAppearance(viewHolder.txtTitle, R.style.boldText) - uiController.changeToolbarBackground(favicon, null) - } else { - TextViewCompat.setTextAppearance(viewHolder.txtTitle, R.style.normalText) - } - } - - override fun getItemCount() = tabList.size - -} diff --git a/app/src/main/java/acr/browser/lightning/browser/tabs/TabsDrawerView.kt b/app/src/main/java/acr/browser/lightning/browser/tabs/TabsDrawerView.kt deleted file mode 100644 index 2adedfee5..000000000 --- a/app/src/main/java/acr/browser/lightning/browser/tabs/TabsDrawerView.kt +++ /dev/null @@ -1,108 +0,0 @@ -package acr.browser.lightning.browser.tabs - -import acr.browser.lightning.R -import acr.browser.lightning.browser.TabsView -import acr.browser.lightning.controller.UIController -import acr.browser.lightning.extensions.inflater -import acr.browser.lightning.list.VerticalItemAnimator -import acr.browser.lightning.view.LightningView -import android.content.Context -import android.util.AttributeSet -import android.view.View -import android.widget.LinearLayout -import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.RecyclerView - -/** - * A view which displays tabs in a vertical [RecyclerView]. - */ -class TabsDrawerView @JvmOverloads constructor( - context: Context, - attrs: AttributeSet? = null, - defStyleAttr: Int = 0 -) : LinearLayout(context, attrs, defStyleAttr), TabsView { - - private val uiController = context as UIController - private val tabsAdapter = TabsDrawerAdapter(uiController) - private val tabList: RecyclerView - private val actionBack: View - private val actionForward: View - - init { - orientation = VERTICAL - isClickable = true - isFocusable = true - context.inflater.inflate(R.layout.tab_drawer, this, true) - actionBack = findViewById(R.id.action_back) - actionForward = findViewById(R.id.action_forward) - - val animator = VerticalItemAnimator().apply { - supportsChangeAnimations = false - addDuration = 200 - changeDuration = 0 - removeDuration = 200 - moveDuration = 200 - } - - tabList = findViewById(R.id.drawer_tabs_list).apply { - setLayerType(View.LAYER_TYPE_NONE, null) - itemAnimator = animator - layoutManager = LinearLayoutManager(context, RecyclerView.VERTICAL, false) - adapter = tabsAdapter - setHasFixedSize(true) - } - - findViewById(R.id.tab_header_button).setOnClickListener { - uiController.showCloseDialog(uiController.getTabModel().indexOfCurrentTab()) - } - findViewById(R.id.new_tab_button).apply { - setOnClickListener { - uiController.newTabButtonClicked() - } - setOnLongClickListener { - uiController.newTabButtonLongClicked() - true - } - } - findViewById(R.id.action_back).setOnClickListener { - uiController.onBackButtonPressed() - } - findViewById(R.id.action_forward).setOnClickListener { - uiController.onForwardButtonPressed() - } - findViewById(R.id.action_home).setOnClickListener { - uiController.onHomeButtonPressed() - } - } - - - override fun tabAdded() { - displayTabs() - tabList.postDelayed({ tabList.smoothScrollToPosition(tabsAdapter.itemCount - 1) }, 500) - } - - override fun tabRemoved(position: Int) { - displayTabs() - } - - override fun tabChanged(position: Int) { - displayTabs() - } - - private fun displayTabs() { - tabsAdapter.showTabs(uiController.getTabModel().allTabs.map(LightningView::asTabViewState)) - } - - override fun tabsInitialized() { - tabsAdapter.notifyDataSetChanged() - } - - override fun setGoBackEnabled(isEnabled: Boolean) { - actionBack.isEnabled = isEnabled - } - - override fun setGoForwardEnabled(isEnabled: Boolean) { - actionForward.isEnabled = isEnabled - } - -} diff --git a/app/src/main/java/acr/browser/lightning/controller/UIController.kt b/app/src/main/java/acr/browser/lightning/controller/UIController.kt deleted file mode 100644 index 10a7817d1..000000000 --- a/app/src/main/java/acr/browser/lightning/controller/UIController.kt +++ /dev/null @@ -1,214 +0,0 @@ -/* - * Copyright 2014 A.C.R. Development - */ -package acr.browser.lightning.controller - -import acr.browser.lightning.browser.TabsManager -import acr.browser.lightning.database.Bookmark -import acr.browser.lightning.dialog.LightningDialogBuilder -import acr.browser.lightning.view.LightningView -import android.content.pm.ActivityInfo -import android.graphics.Bitmap -import android.graphics.drawable.Drawable -import android.net.Uri -import android.os.Message -import android.view.View -import android.webkit.ValueCallback -import android.webkit.WebChromeClient.CustomViewCallback -import androidx.annotation.ColorInt - -/** - * The monolithic controller that routes events between views in the browser. - */ -interface UIController { - - /** - * @return the current color of the UI as a color integer. - */ - @ColorInt - fun getUiColor(): Int - - /** - * @return true if color mode is enabled, false otherwise. - */ - fun isColorMode(): Boolean - - /** - * @return the tab model which contains all the tabs presented to the user. - */ - fun getTabModel(): TabsManager - - /** - * Notifies the controller of a change in the favicon, indicating that the UI should adapt to - * the color of the favicon. - * - * @param favicon the new favicon - * @param tabBackground the background of the tab, only used when tabs are not displayed in the - * drawer. - */ - fun changeToolbarBackground(favicon: Bitmap?, tabBackground: Drawable?) - - /** - * Updates the current URL of the page. - * - * @param url the current URL. - * @param isLoading true if the [url] is currently being loaded, false otherwise. - */ - fun updateUrl(url: String?, isLoading: Boolean) - - /** - * Update the loading progress of the page. - * - * @param progress the loading progress of the page, an integer between 0 and 100. - */ - fun updateProgress(progress: Int) - - /** - * Notify the controller that a [url] has been visited. - * - * @param title the optional title of the current page being viewed. - * @param url the URL of the page being viewed. - */ - fun updateHistory(title: String?, url: String) - - /** - * Notify the controller that it should open the file chooser with the provided callback. - */ - fun openFileChooser(uploadMsg: ValueCallback) - - /** - * Notify the controller that it should open the file chooser with the provided callback. - */ - fun showFileChooser(filePathCallback: ValueCallback>) - - /** - * Notify the controller that it should display the custom [view] in full-screen to the user. - */ - fun onShowCustomView( - view: View, - callback: CustomViewCallback, - requestedOrientation: Int = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE - ) - - /** - * Notify the controller that it should hide the custom view which was previously displayed in - * full screen to the user. - */ - fun onHideCustomView() - - /** - * Called when a website wants to open a link in a new window. - * - * @param resultMsg the message to send to the new web view that is created. - */ - fun onCreateWindow(resultMsg: Message) - - /** - * Notify the browser that the website currently being displayed by the [tab] wants to be - * closed. - */ - fun onCloseWindow(tab: LightningView) - - /** - * Hide the search bar from view via animation. - */ - fun hideActionBar() - - /** - * Show the search bar via animation. - */ - fun showActionBar() - - /** - * Show the close browser dialog for the tab at [position]. - */ - fun showCloseDialog(position: Int) - - /** - * Notify the browser that the new tab button was clicked. - */ - fun newTabButtonClicked() - - /** - * Notify the browser that the new tab button was long pressed by the user. - */ - fun newTabButtonLongClicked() - - /** - * Notify the browser that the tab close button was clicked for the tab at [position]. - */ - fun tabCloseClicked(position: Int) - - /** - * Notify the browser that the tab at [position] was selected by the user for display. - */ - fun tabClicked(position: Int) - - /** - * Notify the browser that the user pressed the bookmark button. - */ - fun bookmarkButtonClicked() - - /** - * Notify the browser that the user clicked on the bookmark [entry]. - */ - fun bookmarkItemClicked(entry: Bookmark.Entry) - - /** - * Notify the UI that the forward button should be [enabled] for interaction. - */ - fun setForwardButtonEnabled(enabled: Boolean) - - /** - * Notify the UI that the back button should be [enabled] for interaction. - */ - fun setBackButtonEnabled(enabled: Boolean) - - /** - * Notify the UI that the [tab] should be displayed. - */ - fun tabChanged(tab: LightningView) - - /** - * Notify the browser that the user pressed the back button. - */ - fun onBackButtonPressed() - - /** - * Notify the browser that the user pressed the forward button. - */ - fun onForwardButtonPressed() - - /** - * Notify the browser that the user pressed the home (not device home) button. - */ - fun onHomeButtonPressed() - - /** - * Notify the browser that the bookmarks list has changed. - */ - fun handleBookmarksChange() - - /** - * Notify the browser that the provided bookmark [bookmark] has changed. - */ - fun handleBookmarkDeleted(bookmark: Bookmark) - - /** - * Notify the browser that the download list has changed. - */ - fun handleDownloadDeleted() - - /** - * Notify the browser that the history list has changed. - */ - fun handleHistoryChange() - - /** - * Notify the controller that a new tab action has originated from a dialog with the [url] and - * the provided [newTabType]. - */ - fun handleNewTab(newTabType: LightningDialogBuilder.NewTab, url: String) - - -} diff --git a/app/src/main/java/acr/browser/lightning/database/adblock/HostsRepositoryInfo.kt b/app/src/main/java/acr/browser/lightning/database/adblock/HostsRepositoryInfo.kt index 4ff424cdf..3cbd31a6f 100644 --- a/app/src/main/java/acr/browser/lightning/database/adblock/HostsRepositoryInfo.kt +++ b/app/src/main/java/acr/browser/lightning/database/adblock/HostsRepositoryInfo.kt @@ -1,6 +1,6 @@ package acr.browser.lightning.database.adblock -import acr.browser.lightning.di.AdBlockPrefs +import acr.browser.lightning._browser2.di.AdBlockPrefs import acr.browser.lightning.preference.delegates.nullableStringPreference import android.content.SharedPreferences import javax.inject.Inject diff --git a/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt b/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt index b4406b27b..12d5b229a 100644 --- a/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt +++ b/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt @@ -1,59 +1,22 @@ package acr.browser.lightning.dialog -import acr.browser.lightning.MainActivity import acr.browser.lightning.R import acr.browser.lightning._browser2.BrowserContract -import acr.browser.lightning.constant.HTTP -import acr.browser.lightning.controller.UIController -import acr.browser.lightning.database.Bookmark -import acr.browser.lightning.database.asFolder -import acr.browser.lightning.database.bookmark.BookmarkRepository -import acr.browser.lightning.database.downloads.DownloadsRepository -import acr.browser.lightning.database.history.HistoryRepository +import acr.browser.lightning._browser2.DefaultBrowserActivity import acr.browser.lightning.databinding.DialogEditBookmarkBinding -import acr.browser.lightning.di.DatabaseScheduler -import acr.browser.lightning.di.MainScheduler -import acr.browser.lightning.download.DownloadHandler -import acr.browser.lightning.extensions.copyToClipboard import acr.browser.lightning.extensions.resizeAndShow -import acr.browser.lightning.extensions.toast -import acr.browser.lightning.html.bookmark.BookmarkPageFactory -import acr.browser.lightning.preference.UserPreferences -import acr.browser.lightning.utils.IntentUtils -import acr.browser.lightning.utils.isBookmarkUrl import android.app.Activity -import android.content.ClipboardManager import android.view.View import android.widget.ArrayAdapter -import android.widget.AutoCompleteTextView -import android.widget.EditText import androidx.appcompat.app.AlertDialog -import androidx.core.net.toUri import dagger.Reusable -import io.reactivex.Scheduler -import io.reactivex.rxkotlin.subscribeBy import javax.inject.Inject /** * A builder of various dialogs. */ @Reusable -class LightningDialogBuilder @Inject constructor( - private val bookmarkManager: BookmarkRepository, - private val downloadsModel: DownloadsRepository, - private val historyModel: HistoryRepository, - private val userPreferences: UserPreferences, - private val downloadHandler: DownloadHandler, - private val clipboardManager: ClipboardManager, - @DatabaseScheduler private val databaseScheduler: Scheduler, - @MainScheduler private val mainScheduler: Scheduler -) { - - enum class NewTab { - FOREGROUND, - BACKGROUND, - INCOGNITO - } +class LightningDialogBuilder @Inject constructor() { /** * Show the appropriated dialog for the long pressed link. It means that we try to understand @@ -62,67 +25,6 @@ class LightningDialogBuilder @Inject constructor( * @param activity used to show the dialog * @param url the long pressed url */ - fun showLongPressedDialogForBookmarkUrl( - activity: Activity, - uiController: UIController, - url: String - ) { - if (url.isBookmarkUrl()) { - // TODO hacky, make a better bookmark mechanism in the future - val uri = url.toUri() - val filename = - requireNotNull(uri.lastPathSegment) { "Last segment should always exist for bookmark file" } - val folderTitle = - filename.substring(0, filename.length - BookmarkPageFactory.FILENAME.length - 1) - showBookmarkFolderLongPressedDialog(activity, uiController, folderTitle.asFolder()) - } else { - bookmarkManager.findBookmarkForUrl(url) - .subscribeOn(databaseScheduler) - .observeOn(mainScheduler) - .subscribe { historyItem -> - // TODO: 6/14/17 figure out solution to case where slashes get appended to root urls causing the item to not exist - showLongPressedDialogForBookmarkUrl(activity, uiController, historyItem) - } - } - } - - fun showLongPressedDialogForBookmarkUrl( - activity: Activity, - uiController: UIController, - entry: Bookmark.Entry - ) = BrowserDialog.show(activity, R.string.action_bookmarks, - DialogItem(title = R.string.dialog_open_new_tab) { - uiController.handleNewTab(NewTab.FOREGROUND, entry.url) - }, - DialogItem(title = R.string.dialog_open_background_tab) { - uiController.handleNewTab(NewTab.BACKGROUND, entry.url) - }, - DialogItem( - title = R.string.dialog_open_incognito_tab, - isConditionMet = activity is MainActivity - ) { - uiController.handleNewTab(NewTab.INCOGNITO, entry.url) - }, - DialogItem(title = R.string.action_share) { - IntentUtils(activity).shareUrl(entry.url, entry.title) - }, - DialogItem(title = R.string.dialog_copy_link) { - clipboardManager.copyToClipboard(entry.url) - }, - DialogItem(title = R.string.dialog_remove_bookmark) { - bookmarkManager.deleteBookmark(entry) - .subscribeOn(databaseScheduler) - .observeOn(mainScheduler) - .subscribe { success -> - if (success) { - uiController.handleBookmarkDeleted(entry) - } - } - }, - DialogItem(title = R.string.dialog_edit_bookmark) { - showEditBookmarkDialog(activity, uiController, entry) - }) - fun showLongPressedDialogForBookmarkUrl( activity: Activity, onClick: (BrowserContract.BookmarkOptionEvent) -> Unit @@ -135,7 +37,7 @@ class LightningDialogBuilder @Inject constructor( }, DialogItem( title = R.string.dialog_open_incognito_tab, - isConditionMet = activity is MainActivity + isConditionMet = activity is DefaultBrowserActivity ) { onClick(BrowserContract.BookmarkOptionEvent.INCOGNITO_TAB) }, @@ -159,18 +61,6 @@ class LightningDialogBuilder @Inject constructor( * @param url the long pressed url */ // TODO allow individual downloads to be deleted. - fun showLongPressedDialogForDownloadUrl( - activity: Activity, - uiController: UIController, - url: String - ) = BrowserDialog.show(activity, R.string.action_downloads, - DialogItem(title = R.string.dialog_delete_all_downloads) { - downloadsModel.deleteAllDownloads() - .subscribeOn(databaseScheduler) - .observeOn(mainScheduler) - .subscribe(uiController::handleDownloadDeleted) - }) - fun showLongPressedDialogForDownloadUrl( activity: Activity, onClick: (BrowserContract.DownloadOptionEvent) -> Unit @@ -186,55 +76,6 @@ class LightningDialogBuilder @Inject constructor( /** * Show the add bookmark dialog. Shows a dialog with the title and URL pre-populated. */ - fun showAddBookmarkDialog( - activity: Activity, - uiController: UIController, - entry: Bookmark.Entry - ) { - val editBookmarkDialog = AlertDialog.Builder(activity) - editBookmarkDialog.setTitle(R.string.action_add_bookmark) - val dialogLayout = View.inflate(activity, R.layout.dialog_edit_bookmark, null) - val getTitle = dialogLayout.findViewById(R.id.bookmark_title) - getTitle.setText(entry.title) - val getUrl = dialogLayout.findViewById(R.id.bookmark_url) - getUrl.setText(entry.url) - val getFolder = dialogLayout.findViewById(R.id.bookmark_folder) - getFolder.setHint(R.string.folder) - getFolder.setText(entry.folder.title) - - val ignored = bookmarkManager.getFolderNames() - .subscribeOn(databaseScheduler) - .observeOn(mainScheduler) - .subscribe { folders -> - val suggestionsAdapter = ArrayAdapter( - activity, - android.R.layout.simple_dropdown_item_1line, folders - ) - getFolder.threshold = 1 - getFolder.setAdapter(suggestionsAdapter) - editBookmarkDialog.setView(dialogLayout) - editBookmarkDialog.setPositiveButton(activity.getString(R.string.action_ok)) { _, _ -> - val editedItem = Bookmark.Entry( - title = getTitle.text.toString(), - url = getUrl.text.toString(), - folder = getFolder.text.toString().asFolder(), - position = entry.position - ) - bookmarkManager.addBookmarkIfNotExists(editedItem) - .subscribeOn(databaseScheduler) - .observeOn(mainScheduler) - .subscribeBy( - onSuccess = { - uiController.handleBookmarksChange() - activity.toast(R.string.message_bookmark_added) - } - ) - } - editBookmarkDialog.setNegativeButton(R.string.action_cancel) { _, _ -> } - editBookmarkDialog.resizeAndShow() - } - } - fun showAddBookmarkDialog( activity: Activity, currentTitle: String, @@ -267,49 +108,6 @@ class LightningDialogBuilder @Inject constructor( editBookmarkDialog.resizeAndShow() } - private fun showEditBookmarkDialog( - activity: Activity, - uiController: UIController, - entry: Bookmark.Entry - ) { - val editBookmarkDialog = AlertDialog.Builder(activity) - editBookmarkDialog.setTitle(R.string.title_edit_bookmark) - val dialogLayout = View.inflate(activity, R.layout.dialog_edit_bookmark, null) - val getTitle = dialogLayout.findViewById(R.id.bookmark_title) - getTitle.setText(entry.title) - val getUrl = dialogLayout.findViewById(R.id.bookmark_url) - getUrl.setText(entry.url) - val getFolder = dialogLayout.findViewById(R.id.bookmark_folder) - getFolder.setHint(R.string.folder) - getFolder.setText(entry.folder.title) - - bookmarkManager.getFolderNames() - .subscribeOn(databaseScheduler) - .observeOn(mainScheduler) - .subscribe { folders -> - val suggestionsAdapter = ArrayAdapter( - activity, - android.R.layout.simple_dropdown_item_1line, folders - ) - getFolder.threshold = 1 - getFolder.setAdapter(suggestionsAdapter) - editBookmarkDialog.setView(dialogLayout) - editBookmarkDialog.setPositiveButton(activity.getString(R.string.action_ok)) { _, _ -> - val editedItem = Bookmark.Entry( - title = getTitle.text.toString(), - url = getUrl.text.toString(), - folder = getFolder.text.toString().asFolder(), - position = entry.position - ) - bookmarkManager.editBookmark(entry, editedItem) - .subscribeOn(databaseScheduler) - .observeOn(mainScheduler) - .subscribe(uiController::handleBookmarksChange) - } - editBookmarkDialog.resizeAndShow() - } - } - fun showEditBookmarkDialog( activity: Activity, currentTitle: String, @@ -342,23 +140,6 @@ class LightningDialogBuilder @Inject constructor( editBookmarkDialog.resizeAndShow() } - fun showBookmarkFolderLongPressedDialog( - activity: Activity, - uiController: UIController, - folder: Bookmark.Folder - ) = BrowserDialog.show(activity, R.string.action_folder, - DialogItem(title = R.string.dialog_rename_folder) { - showRenameFolderDialog(activity, uiController, folder) - }, - DialogItem(title = R.string.dialog_remove_folder) { - bookmarkManager.deleteFolder(folder.title) - .subscribeOn(databaseScheduler) - .observeOn(mainScheduler) - .subscribe { - uiController.handleBookmarkDeleted(folder) - } - }) - fun showBookmarkFolderLongPressedDialog( activity: Activity, onClick: (BrowserContract.FolderOptionEvent) -> Unit @@ -370,26 +151,6 @@ class LightningDialogBuilder @Inject constructor( onClick(BrowserContract.FolderOptionEvent.REMOVE) }) - private fun showRenameFolderDialog( - activity: Activity, - uiController: UIController, - folder: Bookmark.Folder - ) = BrowserDialog.showEditText( - activity, - R.string.title_rename_folder, - R.string.hint_title, - folder.title, - R.string.action_ok - ) { text -> - if (text.isNotBlank()) { - val oldTitle = folder.title - bookmarkManager.renameFolder(oldTitle, text) - .subscribeOn(databaseScheduler) - .observeOn(mainScheduler) - .subscribe(uiController::handleBookmarksChange) - } - } - fun showRenameFolderDialog( activity: Activity, oldTitle: String, @@ -406,36 +167,6 @@ class LightningDialogBuilder @Inject constructor( } } - fun showLongPressedHistoryLinkDialog( - activity: Activity, - uiController: UIController, - url: String - ) = BrowserDialog.show(activity, R.string.action_history, - DialogItem(title = R.string.dialog_open_new_tab) { - uiController.handleNewTab(NewTab.FOREGROUND, url) - }, - DialogItem(title = R.string.dialog_open_background_tab) { - uiController.handleNewTab(NewTab.BACKGROUND, url) - }, - DialogItem( - title = R.string.dialog_open_incognito_tab, - isConditionMet = activity is MainActivity - ) { - uiController.handleNewTab(NewTab.INCOGNITO, url) - }, - DialogItem(title = R.string.action_share) { - IntentUtils(activity).shareUrl(url, null) - }, - DialogItem(title = R.string.dialog_copy_link) { - clipboardManager.copyToClipboard(url) - }, - DialogItem(title = R.string.dialog_remove_from_history) { - historyModel.deleteHistoryEntry(url) - .subscribeOn(databaseScheduler) - .observeOn(mainScheduler) - .subscribe(uiController::handleHistoryChange) - }) - fun showLongPressedHistoryLinkDialog( activity: Activity, onClick: (BrowserContract.HistoryOptionEvent) -> Unit @@ -448,7 +179,7 @@ class LightningDialogBuilder @Inject constructor( }, DialogItem( title = R.string.dialog_open_incognito_tab, - isConditionMet = activity is MainActivity + isConditionMet = activity is DefaultBrowserActivity ) { onClick(BrowserContract.HistoryOptionEvent.INCOGNITO_TAB) }, @@ -461,66 +192,4 @@ class LightningDialogBuilder @Inject constructor( DialogItem(title = R.string.dialog_remove_from_history) { onClick(BrowserContract.HistoryOptionEvent.REMOVE) }) - - // TODO There should be a way in which we do not need an activity reference to dowload a file - fun showLongPressImageDialog( - activity: Activity, - uiController: UIController, - url: String, - userAgent: String - ) = BrowserDialog.show(activity, url.replace(HTTP, ""), - DialogItem(title = R.string.dialog_open_new_tab) { - uiController.handleNewTab(NewTab.FOREGROUND, url) - }, - DialogItem(title = R.string.dialog_open_background_tab) { - uiController.handleNewTab(NewTab.BACKGROUND, url) - }, - DialogItem( - title = R.string.dialog_open_incognito_tab, - isConditionMet = activity is MainActivity - ) { - uiController.handleNewTab(NewTab.INCOGNITO, url) - }, - DialogItem(title = R.string.action_share) { - IntentUtils(activity).shareUrl(url, null) - }, - DialogItem(title = R.string.dialog_copy_link) { - clipboardManager.copyToClipboard(url) - }, - DialogItem(title = R.string.dialog_download_image) { - downloadHandler.onDownloadStart( - activity, - userPreferences, - url, - userAgent, - "attachment", - null, - "" - ) - }) - - fun showLongPressLinkDialog( - activity: Activity, - uiController: UIController, - url: String - ) = BrowserDialog.show(activity, url, - DialogItem(title = R.string.dialog_open_new_tab) { - uiController.handleNewTab(NewTab.FOREGROUND, url) - }, - DialogItem(title = R.string.dialog_open_background_tab) { - uiController.handleNewTab(NewTab.BACKGROUND, url) - }, - DialogItem( - title = R.string.dialog_open_incognito_tab, - isConditionMet = activity is MainActivity - ) { - uiController.handleNewTab(NewTab.INCOGNITO, url) - }, - DialogItem(title = R.string.action_share) { - IntentUtils(activity).shareUrl(url, null) - }, - DialogItem(title = R.string.dialog_copy_link) { - clipboardManager.copyToClipboard(url) - }) - } diff --git a/app/src/main/java/acr/browser/lightning/download/DownloadHandler.java b/app/src/main/java/acr/browser/lightning/download/DownloadHandler.java index 3d4dced27..9ca7ea48e 100644 --- a/app/src/main/java/acr/browser/lightning/download/DownloadHandler.java +++ b/app/src/main/java/acr/browser/lightning/download/DownloadHandler.java @@ -24,22 +24,17 @@ import javax.inject.Singleton; import acr.browser.lightning.BuildConfig; -import acr.browser.lightning.MainActivity; import acr.browser.lightning.R; +import acr.browser.lightning._browser2.DefaultBrowserActivity; +import acr.browser.lightning._browser2.di.MainScheduler; +import acr.browser.lightning._browser2.di.NetworkScheduler; import acr.browser.lightning.constant.Constants; -import acr.browser.lightning.controller.UIController; -import acr.browser.lightning.database.downloads.DownloadEntry; -import acr.browser.lightning.database.downloads.DownloadsRepository; -import acr.browser.lightning.di.DatabaseScheduler; -import acr.browser.lightning.di.MainScheduler; -import acr.browser.lightning.di.NetworkScheduler; import acr.browser.lightning.dialog.BrowserDialog; import acr.browser.lightning.extensions.ActivityExtensions; import acr.browser.lightning.log.Logger; import acr.browser.lightning.preference.UserPreferences; import acr.browser.lightning.utils.FileUtils; import acr.browser.lightning.utils.Utils; -import acr.browser.lightning.view.LightningView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; @@ -56,23 +51,17 @@ public class DownloadHandler { private static final String COOKIE_REQUEST_HEADER = "Cookie"; - private final DownloadsRepository downloadsRepository; private final DownloadManager downloadManager; - private final Scheduler databaseScheduler; private final Scheduler networkScheduler; private final Scheduler mainScheduler; private final Logger logger; @Inject - public DownloadHandler(DownloadsRepository downloadsRepository, - DownloadManager downloadManager, - @DatabaseScheduler Scheduler databaseScheduler, + public DownloadHandler(DownloadManager downloadManager, @NetworkScheduler Scheduler networkScheduler, @MainScheduler Scheduler mainScheduler, Logger logger) { - this.downloadsRepository = downloadsRepository; this.downloadManager = downloadManager; - this.databaseScheduler = databaseScheduler; this.networkScheduler = networkScheduler; this.mainScheduler = mainScheduler; this.logger = logger; @@ -119,7 +108,7 @@ public void onDownloadStart(@NonNull Activity context, // If we resolved to ourselves, we don't want to attempt to // load the url only to try and download it again. if (BuildConfig.APPLICATION_ID.equals(info.activityInfo.packageName) - || MainActivity.class.getName().equals(info.activityInfo.name)) { + || DefaultBrowserActivity.class.getName().equals(info.activityInfo.name)) { // someone (other than us) knows how to handle this mime // type with this scheme, don't download. try { @@ -298,22 +287,6 @@ private void onDownloadStartNoStream(@NonNull final Activity context, } ActivityExtensions.snackbar(context, context.getString(R.string.download_pending) + ' ' + filename); } - - // save download in database - if (context instanceof UIController) { - UIController browserActivity = (UIController) context; - LightningView view = browserActivity.getTabModel().getCurrentTab(); - - if (view != null && !view.isIncognito()) { - downloadsRepository.addDownloadIfNotExists(new DownloadEntry(url, filename, contentSize)) - .subscribeOn(databaseScheduler) - .subscribe(aBoolean -> { - if (!aBoolean) { - logger.log(TAG, "error saving download to database"); - } - }); - } - } } private static boolean isWriteAccessAvailable(@NonNull Uri fileUri) { diff --git a/app/src/main/java/acr/browser/lightning/download/LightningDownloadListener.java b/app/src/main/java/acr/browser/lightning/download/LightningDownloadListener.java index b7dbdb17f..13d442741 100644 --- a/app/src/main/java/acr/browser/lightning/download/LightningDownloadListener.java +++ b/app/src/main/java/acr/browser/lightning/download/LightningDownloadListener.java @@ -18,7 +18,7 @@ import acr.browser.lightning.R; import acr.browser.lightning.database.downloads.DownloadsRepository; -import acr.browser.lightning.di.Injector; +import acr.browser.lightning._browser2.di.Injector; import acr.browser.lightning.dialog.BrowserDialog; import acr.browser.lightning.log.Logger; import acr.browser.lightning.preference.UserPreferences; diff --git a/app/src/main/java/acr/browser/lightning/html/bookmark/BookmarkPageFactory.kt b/app/src/main/java/acr/browser/lightning/html/bookmark/BookmarkPageFactory.kt index a78496cf4..6133ff526 100644 --- a/app/src/main/java/acr/browser/lightning/html/bookmark/BookmarkPageFactory.kt +++ b/app/src/main/java/acr/browser/lightning/html/bookmark/BookmarkPageFactory.kt @@ -5,8 +5,8 @@ import acr.browser.lightning._browser2.theme.ThemeProvider import acr.browser.lightning.constant.FILE import acr.browser.lightning.database.Bookmark import acr.browser.lightning.database.bookmark.BookmarkRepository -import acr.browser.lightning.di.DatabaseScheduler -import acr.browser.lightning.di.DiskScheduler +import acr.browser.lightning._browser2.di.DatabaseScheduler +import acr.browser.lightning._browser2.di.DiskScheduler import acr.browser.lightning.extensions.safeUse import acr.browser.lightning.favicon.FaviconModel import acr.browser.lightning.favicon.toValidUri diff --git a/app/src/main/java/acr/browser/lightning/preference/DeveloperPreferences.kt b/app/src/main/java/acr/browser/lightning/preference/DeveloperPreferences.kt index 0cd523d4b..85de537b3 100644 --- a/app/src/main/java/acr/browser/lightning/preference/DeveloperPreferences.kt +++ b/app/src/main/java/acr/browser/lightning/preference/DeveloperPreferences.kt @@ -1,6 +1,6 @@ package acr.browser.lightning.preference -import acr.browser.lightning.di.DevPrefs +import acr.browser.lightning._browser2.di.DevPrefs import acr.browser.lightning.preference.delegates.booleanPreference import android.content.SharedPreferences import javax.inject.Inject diff --git a/app/src/main/java/acr/browser/lightning/preference/UserPreferences.kt b/app/src/main/java/acr/browser/lightning/preference/UserPreferences.kt index 1751062fc..a35924521 100644 --- a/app/src/main/java/acr/browser/lightning/preference/UserPreferences.kt +++ b/app/src/main/java/acr/browser/lightning/preference/UserPreferences.kt @@ -8,7 +8,7 @@ import acr.browser.lightning.constant.DEFAULT_ENCODING import acr.browser.lightning.constant.SCHEME_BOOKMARKS import acr.browser.lightning.constant.SCHEME_HOMEPAGE import acr.browser.lightning.device.ScreenSize -import acr.browser.lightning.di.UserPrefs +import acr.browser.lightning._browser2.di.UserPrefs import acr.browser.lightning.preference.delegates.* import acr.browser.lightning.search.SearchEngineProvider import acr.browser.lightning.search.engine.GoogleSearch diff --git a/app/src/main/java/acr/browser/lightning/reading/activity/ReadingActivity.java b/app/src/main/java/acr/browser/lightning/reading/activity/ReadingActivity.java index 191cb3ec2..70b675339 100644 --- a/app/src/main/java/acr/browser/lightning/reading/activity/ReadingActivity.java +++ b/app/src/main/java/acr/browser/lightning/reading/activity/ReadingActivity.java @@ -19,9 +19,9 @@ import javax.inject.Inject; import acr.browser.lightning.R; -import acr.browser.lightning.di.Injector; -import acr.browser.lightning.di.MainScheduler; -import acr.browser.lightning.di.NetworkScheduler; +import acr.browser.lightning._browser2.di.Injector; +import acr.browser.lightning._browser2.di.MainScheduler; +import acr.browser.lightning._browser2.di.NetworkScheduler; import acr.browser.lightning.dialog.BrowserDialog; import acr.browser.lightning.preference.UserPreferences; import acr.browser.lightning.reading.HtmlFetcher; diff --git a/app/src/main/java/acr/browser/lightning/search/SearchEngineProvider.kt b/app/src/main/java/acr/browser/lightning/search/SearchEngineProvider.kt index 5577a3aa5..9a1cf58d5 100644 --- a/app/src/main/java/acr/browser/lightning/search/SearchEngineProvider.kt +++ b/app/src/main/java/acr/browser/lightning/search/SearchEngineProvider.kt @@ -1,6 +1,6 @@ package acr.browser.lightning.search -import acr.browser.lightning.di.SuggestionsClient +import acr.browser.lightning._browser2.di.SuggestionsClient import acr.browser.lightning.log.Logger import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.search.engine.* diff --git a/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.kt b/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.kt index bc288663b..b8ca5a878 100644 --- a/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.kt @@ -7,10 +7,10 @@ import acr.browser.lightning.database.SearchSuggestion import acr.browser.lightning.database.WebPage import acr.browser.lightning.database.bookmark.BookmarkRepository import acr.browser.lightning.database.history.HistoryRepository -import acr.browser.lightning.di.DatabaseScheduler -import acr.browser.lightning.di.MainScheduler -import acr.browser.lightning.di.NetworkScheduler -import acr.browser.lightning.di.injector +import acr.browser.lightning._browser2.di.DatabaseScheduler +import acr.browser.lightning._browser2.di.MainScheduler +import acr.browser.lightning._browser2.di.NetworkScheduler +import acr.browser.lightning._browser2.di.injector import acr.browser.lightning.extensions.drawable import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.rx.join diff --git a/app/src/main/java/acr/browser/lightning/settings/activity/SettingsActivity.kt b/app/src/main/java/acr/browser/lightning/settings/activity/SettingsActivity.kt index 041c93cd7..3c3eac02f 100644 --- a/app/src/main/java/acr/browser/lightning/settings/activity/SettingsActivity.kt +++ b/app/src/main/java/acr/browser/lightning/settings/activity/SettingsActivity.kt @@ -6,7 +6,7 @@ package acr.browser.lightning.settings.activity import acr.browser.lightning.R import acr.browser.lightning.device.BuildInfo import acr.browser.lightning.device.BuildType -import acr.browser.lightning.di.injector +import acr.browser.lightning._browser2.di.injector import android.os.Build import android.os.Bundle import android.view.MenuItem diff --git a/app/src/main/java/acr/browser/lightning/settings/activity/ThemableSettingsActivity.kt b/app/src/main/java/acr/browser/lightning/settings/activity/ThemableSettingsActivity.kt index 5d84a9aa8..d91b8d1c4 100644 --- a/app/src/main/java/acr/browser/lightning/settings/activity/ThemableSettingsActivity.kt +++ b/app/src/main/java/acr/browser/lightning/settings/activity/ThemableSettingsActivity.kt @@ -2,7 +2,7 @@ package acr.browser.lightning.settings.activity import acr.browser.lightning.AppTheme import acr.browser.lightning.R -import acr.browser.lightning.di.injector +import acr.browser.lightning._browser2.di.injector import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.utils.ThemeUtils import android.graphics.Color diff --git a/app/src/main/java/acr/browser/lightning/settings/fragment/AdBlockSettingsFragment.kt b/app/src/main/java/acr/browser/lightning/settings/fragment/AdBlockSettingsFragment.kt index f079fc330..32f6b6382 100644 --- a/app/src/main/java/acr/browser/lightning/settings/fragment/AdBlockSettingsFragment.kt +++ b/app/src/main/java/acr/browser/lightning/settings/fragment/AdBlockSettingsFragment.kt @@ -6,9 +6,9 @@ import acr.browser.lightning.adblock.BloomFilterAdBlocker import acr.browser.lightning.adblock.source.HostsSourceType import acr.browser.lightning.adblock.source.selectedHostsSource import acr.browser.lightning.adblock.source.toPreferenceIndex -import acr.browser.lightning.di.DiskScheduler -import acr.browser.lightning.di.MainScheduler -import acr.browser.lightning.di.injector +import acr.browser.lightning._browser2.di.DiskScheduler +import acr.browser.lightning._browser2.di.MainScheduler +import acr.browser.lightning._browser2.di.injector import acr.browser.lightning.dialog.BrowserDialog import acr.browser.lightning.dialog.DialogItem import acr.browser.lightning.extensions.toast diff --git a/app/src/main/java/acr/browser/lightning/settings/fragment/AdvancedSettingsFragment.kt b/app/src/main/java/acr/browser/lightning/settings/fragment/AdvancedSettingsFragment.kt index f20e846f0..5c03566f8 100644 --- a/app/src/main/java/acr/browser/lightning/settings/fragment/AdvancedSettingsFragment.kt +++ b/app/src/main/java/acr/browser/lightning/settings/fragment/AdvancedSettingsFragment.kt @@ -4,7 +4,7 @@ import acr.browser.lightning.Capabilities import acr.browser.lightning.R import acr.browser.lightning.browser.SearchBoxDisplayChoice import acr.browser.lightning.constant.TEXT_ENCODINGS -import acr.browser.lightning.di.injector +import acr.browser.lightning._browser2.di.injector import acr.browser.lightning.extensions.resizeAndShow import acr.browser.lightning.extensions.withSingleChoiceItems import acr.browser.lightning.isSupported diff --git a/app/src/main/java/acr/browser/lightning/settings/fragment/BookmarkSettingsFragment.kt b/app/src/main/java/acr/browser/lightning/settings/fragment/BookmarkSettingsFragment.kt index 5f99ff1db..79cf2d31f 100644 --- a/app/src/main/java/acr/browser/lightning/settings/fragment/BookmarkSettingsFragment.kt +++ b/app/src/main/java/acr/browser/lightning/settings/fragment/BookmarkSettingsFragment.kt @@ -8,9 +8,9 @@ import acr.browser.lightning.bookmark.LegacyBookmarkImporter import acr.browser.lightning.bookmark.NetscapeBookmarkFormatImporter import acr.browser.lightning.database.bookmark.BookmarkExporter import acr.browser.lightning.database.bookmark.BookmarkRepository -import acr.browser.lightning.di.DatabaseScheduler -import acr.browser.lightning.di.MainScheduler -import acr.browser.lightning.di.injector +import acr.browser.lightning._browser2.di.DatabaseScheduler +import acr.browser.lightning._browser2.di.MainScheduler +import acr.browser.lightning._browser2.di.injector import acr.browser.lightning.dialog.BrowserDialog import acr.browser.lightning.dialog.DialogItem import acr.browser.lightning.extensions.resizeAndShow diff --git a/app/src/main/java/acr/browser/lightning/settings/fragment/DebugSettingsFragment.kt b/app/src/main/java/acr/browser/lightning/settings/fragment/DebugSettingsFragment.kt index e50a33664..1c142b161 100644 --- a/app/src/main/java/acr/browser/lightning/settings/fragment/DebugSettingsFragment.kt +++ b/app/src/main/java/acr/browser/lightning/settings/fragment/DebugSettingsFragment.kt @@ -1,7 +1,7 @@ package acr.browser.lightning.settings.fragment import acr.browser.lightning.R -import acr.browser.lightning.di.injector +import acr.browser.lightning._browser2.di.injector import acr.browser.lightning.extensions.snackbar import acr.browser.lightning.preference.DeveloperPreferences import android.os.Bundle diff --git a/app/src/main/java/acr/browser/lightning/settings/fragment/DisplaySettingsFragment.kt b/app/src/main/java/acr/browser/lightning/settings/fragment/DisplaySettingsFragment.kt index 368630e5f..d5b2eeaea 100644 --- a/app/src/main/java/acr/browser/lightning/settings/fragment/DisplaySettingsFragment.kt +++ b/app/src/main/java/acr/browser/lightning/settings/fragment/DisplaySettingsFragment.kt @@ -5,7 +5,7 @@ package acr.browser.lightning.settings.fragment import acr.browser.lightning.AppTheme import acr.browser.lightning.R -import acr.browser.lightning.di.injector +import acr.browser.lightning._browser2.di.injector import acr.browser.lightning.extensions.resizeAndShow import acr.browser.lightning.extensions.withSingleChoiceItems import acr.browser.lightning.preference.UserPreferences diff --git a/app/src/main/java/acr/browser/lightning/settings/fragment/GeneralSettingsFragment.kt b/app/src/main/java/acr/browser/lightning/settings/fragment/GeneralSettingsFragment.kt index d9e42bdcc..4c56c2e28 100644 --- a/app/src/main/java/acr/browser/lightning/settings/fragment/GeneralSettingsFragment.kt +++ b/app/src/main/java/acr/browser/lightning/settings/fragment/GeneralSettingsFragment.kt @@ -5,7 +5,7 @@ import acr.browser.lightning.browser.ProxyChoice import acr.browser.lightning.constant.SCHEME_BLANK import acr.browser.lightning.constant.SCHEME_BOOKMARKS import acr.browser.lightning.constant.SCHEME_HOMEPAGE -import acr.browser.lightning.di.injector +import acr.browser.lightning._browser2.di.injector import acr.browser.lightning.dialog.BrowserDialog import acr.browser.lightning.extensions.withSingleChoiceItems import acr.browser.lightning.preference.UserPreferences diff --git a/app/src/main/java/acr/browser/lightning/settings/fragment/PrivacySettingsFragment.kt b/app/src/main/java/acr/browser/lightning/settings/fragment/PrivacySettingsFragment.kt index 2843b6473..c8a93260a 100644 --- a/app/src/main/java/acr/browser/lightning/settings/fragment/PrivacySettingsFragment.kt +++ b/app/src/main/java/acr/browser/lightning/settings/fragment/PrivacySettingsFragment.kt @@ -3,16 +3,16 @@ package acr.browser.lightning.settings.fragment import acr.browser.lightning.Capabilities import acr.browser.lightning.R import acr.browser.lightning.database.history.HistoryRepository -import acr.browser.lightning.di.DatabaseScheduler -import acr.browser.lightning.di.MainScheduler -import acr.browser.lightning.di.injector +import acr.browser.lightning._browser2.di.DatabaseScheduler +import acr.browser.lightning._browser2.di.MainScheduler +import acr.browser.lightning._browser2.di.injector +import acr.browser.lightning._browser2.tab.WebViewFactory import acr.browser.lightning.dialog.BrowserDialog import acr.browser.lightning.dialog.DialogItem import acr.browser.lightning.extensions.snackbar import acr.browser.lightning.isSupported import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.utils.WebUtils -import acr.browser.lightning.view.LightningView import android.os.Bundle import android.webkit.WebView import io.reactivex.Completable @@ -96,7 +96,7 @@ class PrivacySettingsFragment : AbstractSettingsFragment() { checkBoxPreference( preference = SETTINGS_IDENTIFYINGHEADERS, isChecked = userPreferences.removeIdentifyingHeadersEnabled, - summary = "${LightningView.HEADER_REQUESTED_WITH}, ${LightningView.HEADER_WAP_PROFILE}", + summary = "${WebViewFactory.HEADER_REQUESTED_WITH}, ${WebViewFactory.HEADER_WAP_PROFILE}", onCheckChange = { userPreferences.removeIdentifyingHeadersEnabled = it } ) diff --git a/app/src/main/java/acr/browser/lightning/view/LightningChromeClient.kt b/app/src/main/java/acr/browser/lightning/view/LightningChromeClient.kt deleted file mode 100644 index 8975a6081..000000000 --- a/app/src/main/java/acr/browser/lightning/view/LightningChromeClient.kt +++ /dev/null @@ -1,215 +0,0 @@ -package acr.browser.lightning.view - -import acr.browser.lightning.R -import acr.browser.lightning.controller.UIController -import acr.browser.lightning.di.DiskScheduler -import acr.browser.lightning.di.injector -import acr.browser.lightning.dialog.BrowserDialog -import acr.browser.lightning.dialog.DialogItem -import acr.browser.lightning.extensions.resizeAndShow -import acr.browser.lightning.favicon.FaviconModel -import acr.browser.lightning.preference.UserPreferences -import acr.browser.lightning.view.webrtc.WebRtcPermissionsModel -import acr.browser.lightning.view.webrtc.WebRtcPermissionsView -import android.Manifest -import android.annotation.TargetApi -import android.app.Activity -import android.graphics.Bitmap -import android.graphics.BitmapFactory -import android.net.Uri -import android.os.Build -import android.os.Message -import android.view.LayoutInflater -import android.view.View -import android.webkit.* -import androidx.appcompat.app.AlertDialog -import com.anthonycr.grant.PermissionsManager -import com.anthonycr.grant.PermissionsResultAction -import io.reactivex.Scheduler -import javax.inject.Inject - -class LightningChromeClient( - private val activity: Activity, - private val lightningView: LightningView -) : WebChromeClient(), WebRtcPermissionsView { - - private val geoLocationPermissions = arrayOf(Manifest.permission.ACCESS_FINE_LOCATION) - private val uiController: UIController - @Inject internal lateinit var faviconModel: FaviconModel - @Inject internal lateinit var userPreferences: UserPreferences - @Inject internal lateinit var webRtcPermissionsModel: WebRtcPermissionsModel - @Inject @field:DiskScheduler internal lateinit var diskScheduler: Scheduler - - init { - activity.injector.inject(this) - uiController = activity as UIController - } - - override fun onProgressChanged(view: WebView, newProgress: Int) { - if (lightningView.isShown) { - uiController.updateProgress(newProgress) - } - } - - override fun onReceivedIcon(view: WebView, icon: Bitmap) { - lightningView.titleInfo.setFavicon(icon) - uiController.tabChanged(lightningView) - cacheFavicon(view.url, icon) - } - - /** - * Naive caching of the favicon according to the domain name of the URL - * - * @param icon the icon to cache - */ - private fun cacheFavicon(url: String?, icon: Bitmap?) { - if (icon == null || url == null) { - return - } - - faviconModel.cacheFaviconForUrl(icon, url) - .subscribeOn(diskScheduler) - .subscribe() - } - - - override fun onReceivedTitle(view: WebView?, title: String?) { - if (title?.isNotEmpty() == true) { - lightningView.titleInfo.setTitle(title) - } else { - lightningView.titleInfo.setTitle(activity.getString(R.string.untitled)) - } - uiController.tabChanged(lightningView) - if (view != null && view.url != null) { - uiController.updateHistory(title, view.url.orEmpty()) - } - } - - override fun requestPermissions(permissions: Set, onGrant: (Boolean) -> Unit) { - val missingPermissions = permissions - .filter { PermissionsManager.getInstance().hasPermission(activity, it) } - - if (missingPermissions.isEmpty()) { - onGrant(true) - } else { - PermissionsManager.getInstance().requestPermissionsIfNecessaryForResult( - activity, - missingPermissions.toTypedArray(), - object : PermissionsResultAction() { - override fun onGranted() = onGrant(true) - - override fun onDenied(permission: String?) = onGrant(false) - } - ) - } - } - - override fun requestResources(source: String, - resources: Array, - onGrant: (Boolean) -> Unit) { - activity.runOnUiThread { - val resourcesString = resources.joinToString(separator = "\n") - BrowserDialog.showPositiveNegativeDialog( - activity = activity, - title = R.string.title_permission_request, - message = R.string.message_permission_request, - messageArguments = arrayOf(source, resourcesString), - positiveButton = DialogItem(title = R.string.action_allow) { onGrant(true) }, - negativeButton = DialogItem(title = R.string.action_dont_allow) { onGrant(false) }, - onCancel = { onGrant(false) } - ) - } - } - - @TargetApi(Build.VERSION_CODES.LOLLIPOP) - override fun onPermissionRequest(request: PermissionRequest) { - if (userPreferences.webRtcEnabled) { - webRtcPermissionsModel.requestPermission(request, this) - } else { - request.deny() - } - } - - override fun onGeolocationPermissionsShowPrompt(origin: String, - callback: GeolocationPermissions.Callback) = - PermissionsManager.getInstance().requestPermissionsIfNecessaryForResult(activity, geoLocationPermissions, object : PermissionsResultAction() { - override fun onGranted() { - val remember = true - AlertDialog.Builder(activity).apply { - setTitle(activity.getString(R.string.location)) - val org = if (origin.length > 50) { - "${origin.subSequence(0, 50)}..." - } else { - origin - } - setMessage(org + activity.getString(R.string.message_location)) - setCancelable(true) - setPositiveButton(activity.getString(R.string.action_allow)) { _, _ -> - callback.invoke(origin, true, remember) - } - setNegativeButton(activity.getString(R.string.action_dont_allow)) { _, _ -> - callback.invoke(origin, false, remember) - } - }.resizeAndShow() - } - - override fun onDenied(permission: String) =//TODO show message and/or turn off setting - Unit - }) - - override fun onCreateWindow(view: WebView, isDialog: Boolean, isUserGesture: Boolean, - resultMsg: Message): Boolean { - uiController.onCreateWindow(resultMsg) - return true - } - - override fun onCloseWindow(window: WebView) = uiController.onCloseWindow(lightningView) - - @Suppress("unused", "UNUSED_PARAMETER") - fun openFileChooser(uploadMsg: ValueCallback) = uiController.openFileChooser(uploadMsg) - - @Suppress("unused", "UNUSED_PARAMETER") - fun openFileChooser(uploadMsg: ValueCallback, acceptType: String) = - uiController.openFileChooser(uploadMsg) - - @Suppress("unused", "UNUSED_PARAMETER") - fun openFileChooser(uploadMsg: ValueCallback, acceptType: String, capture: String) = - uiController.openFileChooser(uploadMsg) - - override fun onShowFileChooser(webView: WebView, filePathCallback: ValueCallback>, - fileChooserParams: FileChooserParams): Boolean { - uiController.showFileChooser(filePathCallback) - return true - } - - /** - * Obtain an image that is displayed as a placeholder on a video until the video has initialized - * and can begin loading. - * - * @return a Bitmap that can be used as a place holder for videos. - */ - override fun getDefaultVideoPoster(): Bitmap? { - val resources = activity.resources - return BitmapFactory.decodeResource(resources, android.R.drawable.spinner_background) - } - - /** - * Inflate a view to send to a LightningView when it needs to display a video and has to - * show a loading dialog. Inflates a progress view and returns it. - * - * @return A view that should be used to display the state - * of a video's loading progress. - */ - override fun getVideoLoadingProgressView(): View = - LayoutInflater.from(activity).inflate(R.layout.video_loading_progress, null) - - override fun onHideCustomView() = uiController.onHideCustomView() - - override fun onShowCustomView(view: View, callback: CustomViewCallback) = - uiController.onShowCustomView(view, callback) - - override fun onShowCustomView(view: View, requestedOrientation: Int, - callback: CustomViewCallback) = - uiController.onShowCustomView(view, callback, requestedOrientation) - -} diff --git a/app/src/main/java/acr/browser/lightning/view/LightningView.kt b/app/src/main/java/acr/browser/lightning/view/LightningView.kt deleted file mode 100644 index a46c09b18..000000000 --- a/app/src/main/java/acr/browser/lightning/view/LightningView.kt +++ /dev/null @@ -1,937 +0,0 @@ -/* - * Copyright 2014 A.C.R. Development - */ - -package acr.browser.lightning.view - -import acr.browser.lightning.Capabilities -import acr.browser.lightning.R -import acr.browser.lightning.constant.DESKTOP_USER_AGENT -import acr.browser.lightning.controller.UIController -import acr.browser.lightning.di.DatabaseScheduler -import acr.browser.lightning.di.MainScheduler -import acr.browser.lightning.di.injector -import acr.browser.lightning.dialog.LightningDialogBuilder -import acr.browser.lightning.download.LightningDownloadListener -import acr.browser.lightning.extensions.drawable -import acr.browser.lightning.isSupported -import acr.browser.lightning.log.Logger -import acr.browser.lightning.network.NetworkConnectivityModel -import acr.browser.lightning.preference.UserPreferences -import acr.browser.lightning.preference.userAgent -import acr.browser.lightning.ssl.SslState -import acr.browser.lightning.utils.* -import acr.browser.lightning.view.find.FindResults -import android.annotation.SuppressLint -import android.app.Activity -import android.graphics.* -import android.net.http.SslCertificate -import android.os.Build -import android.os.Bundle -import android.os.Handler -import android.os.Message -import android.view.* -import android.view.GestureDetector.SimpleOnGestureListener -import android.view.View.OnTouchListener -import android.webkit.CookieManager -import android.webkit.WebSettings -import android.webkit.WebSettings.LayoutAlgorithm -import android.webkit.WebView -import androidx.collection.ArrayMap -import androidx.core.graphics.drawable.toBitmap -import io.reactivex.Observable -import io.reactivex.Scheduler -import io.reactivex.Single -import io.reactivex.disposables.Disposable -import java.lang.ref.WeakReference -import javax.inject.Inject - -/** - * [LightningView] acts as a tab for the browser, handling WebView creation and handling logic, as - * well as properly initialing it. All interactions with the WebView should be made through this - * class. - */ -class LightningView( - private val activity: Activity, - tabInitializer: TabInitializer, - val isIncognito: Boolean, - private val homePageInitializer: HomePageInitializer, - private val bookmarkPageInitializer: BookmarkPageInitializer, - private val downloadPageInitializer: DownloadPageInitializer, - private val logger: Logger -) { - - /** - * The unique ID of the view. - */ - val id = View.generateViewId() - - /** - * Getter for the [LightningViewTitle] of the current LightningView instance. - * - * @return a NonNull instance of LightningViewTitle - * @return a NonNull instance of LightningViewTitle - */ - val titleInfo: LightningViewTitle - - /** - * A tab initializer that should be run when the view is first attached. - */ - private var latentTabInitializer: FreezableBundleInitializer? = null - - /** - * Gets the current WebView instance of the tab. - * - * @return the WebView instance of the tab, which can be null. - */ - var webView: WebView? = null - private set - - private val uiController: UIController - private val gestureDetector: GestureDetector - private val paint = Paint() - - /** - * Sets whether this tab was the result of a new intent sent to the browser. - */ - var isNewTab: Boolean = false - - /** - * This method sets the tab as the foreground tab or the background tab. - */ - var isForegroundTab: Boolean = false - set(isForeground) { - field = isForeground - if (isForeground) { - webView?.let { - latentTabInitializer?.initialize(it, requestHeaders) - latentTabInitializer = null - } - } - uiController.tabChanged(this) - } - - /** - * Gets whether or not the page rendering is inverted or not. The main purpose of this is to - * indicate that JavaScript should be run at the end of a page load to invert only the images - * back to their non-inverted states. - * - * @return true if the page is in inverted mode, false otherwise. - */ - var invertPage = false - private set - private var toggleDesktop = false - private val webViewHandler = WebViewHandler(this) - - /** - * This method gets the additional headers that should be added with each request the browser - * makes. - * - * @return a non null Map of Strings with the additional request headers. - */ - internal val requestHeaders = ArrayMap() - - private val maxFling: Float - - @Inject internal lateinit var userPreferences: UserPreferences - @Inject internal lateinit var dialogBuilder: LightningDialogBuilder - @Inject internal lateinit var proxyUtils: ProxyUtils - @Inject @field:DatabaseScheduler internal lateinit var databaseScheduler: Scheduler - @Inject @field:MainScheduler internal lateinit var mainScheduler: Scheduler - @Inject lateinit var networkConnectivityModel: NetworkConnectivityModel - - private val lightningWebClient: LightningWebClient - - private val networkDisposable: Disposable - - /** - * This method determines whether the current tab is visible or not. - * - * @return true if the WebView is non-null and visible, false otherwise. - */ - val isShown: Boolean - get() = webView?.isShown == true - - /** - * Gets the current progress of the WebView. - * - * @return returns a number between 0 and 100 with the current progress of the WebView. If the - * WebView is null, then the progress returned will be 100. - */ - val progress: Int - get() = webView?.progress ?: 100 - - /** - * Get the current user agent used by the WebView. - * - * @return retuns the current user agent of the WebView instance, or an empty string if the - * WebView is null. - */ - private val userAgent: String - get() = webView?.settings?.userAgentString ?: "" - - /** - * Gets the favicon currently in use by the page. If the current page does not have a favicon, - * it returns a default icon. - * - * @return a non-null Bitmap with the current favicon. - */ - val favicon: Bitmap? - get() = titleInfo.getFavicon() - - /** - * Get the current title of the page, retrieved from the title object. - * - * @return the title of the page, or an empty string if there is no title. - */ - val title: String - get() = titleInfo.getTitle() ?: "" - - /** - * Get the current [SslCertificate] if there is any associated with the current page. - */ - val sslCertificate: SslCertificate? - get() = webView?.certificate - - /** - * Get the current URL of the WebView, or an empty string if the WebView is null or the URL is - * null. - * - * @return the current URL or an empty string. - */ - val url: String - get() = webView?.url ?: "" - - init { - activity.injector.inject(this) - uiController = activity as UIController - - titleInfo = LightningViewTitle(activity) - - maxFling = ViewConfiguration.get(activity).scaledMaximumFlingVelocity.toFloat() - lightningWebClient = LightningWebClient(activity, this) - gestureDetector = GestureDetector(activity, CustomGestureListener()) - - val tab = WebView(activity).also { webView = it }.apply { - id = this@LightningView.id - - isFocusableInTouchMode = true - isFocusable = true - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) { - isAnimationCacheEnabled = false - isAlwaysDrawnWithCacheEnabled = false - } - setBackgroundColor(Color.WHITE) - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - importantForAutofill = View.IMPORTANT_FOR_AUTOFILL_YES - } - - isScrollbarFadingEnabled = true - isSaveEnabled = true - setNetworkAvailable(true) - webChromeClient = LightningChromeClient(activity, this@LightningView) - webViewClient = lightningWebClient - - setDownloadListener(LightningDownloadListener(activity)) - setOnTouchListener(TouchListener()) - initializeSettings() - } - initializePreferences() - - if (tabInitializer !is FreezableBundleInitializer) { - tabInitializer.initialize(tab, requestHeaders) - } else { - latentTabInitializer = tabInitializer - titleInfo.setTitle(tabInitializer.initialTitle) - titleInfo.setFavicon(activity.drawable(R.drawable.ic_frozen).toBitmap()) - } - - networkDisposable = networkConnectivityModel.connectivity() - .observeOn(mainScheduler) - .subscribe(::setNetworkAvailable) - } - - fun currentSslState(): SslState = lightningWebClient.sslState - - fun sslStateObservable(): Observable = lightningWebClient.sslStateObservable() - - /** - * This method loads the homepage for the browser. Either it loads the URL stored as the - * homepage, or loads the startpage or bookmark page if either of those are set as the homepage. - */ - fun loadHomePage() { - reinitialize(homePageInitializer) - } - - private fun reinitialize(tabInitializer: TabInitializer) { - webView?.let { tabInitializer.initialize(it, requestHeaders) } - } - - /** - * This function loads the bookmark page via the [BookmarkPageInitializer]. - */ - fun loadBookmarkPage() { - reinitialize(bookmarkPageInitializer) - } - - /** - * This function loads the download page via the [DownloadPageInitializer]. - */ - fun loadDownloadsPage() { - reinitialize(downloadPageInitializer) - } - - /** - * Initialize the preference driven settings of the WebView. This method must be called whenever - * the preferences are changed within SharedPreferences. - */ - @SuppressLint("NewApi", "SetJavaScriptEnabled") - fun initializePreferences() { - val settings = webView?.settings ?: return - - lightningWebClient.updatePreferences() - - val modifiesHeaders = userPreferences.doNotTrackEnabled - || userPreferences.saveDataEnabled - || userPreferences.removeIdentifyingHeadersEnabled - - if (userPreferences.doNotTrackEnabled) { - requestHeaders[HEADER_DNT] = "1" - } else { - requestHeaders.remove(HEADER_DNT) - } - - if (userPreferences.saveDataEnabled) { - requestHeaders[HEADER_SAVEDATA] = "on" - } else { - requestHeaders.remove(HEADER_SAVEDATA) - } - - if (userPreferences.removeIdentifyingHeadersEnabled) { - requestHeaders[HEADER_REQUESTED_WITH] = "" - requestHeaders[HEADER_WAP_PROFILE] = "" - } else { - requestHeaders.remove(HEADER_REQUESTED_WITH) - requestHeaders.remove(HEADER_WAP_PROFILE) - } - - settings.defaultTextEncodingName = userPreferences.textEncoding - setColorMode(userPreferences.renderingMode) - - if (!isIncognito) { - settings.setGeolocationEnabled(userPreferences.locationEnabled) - } else { - settings.setGeolocationEnabled(false) - } - - setUserAgentForPreference(userPreferences) - - settings.saveFormData = userPreferences.savePasswordsEnabled && !isIncognito - - if (userPreferences.javaScriptEnabled) { - settings.javaScriptEnabled = true - settings.javaScriptCanOpenWindowsAutomatically = true - } else { - settings.javaScriptEnabled = false - settings.javaScriptCanOpenWindowsAutomatically = false - } - - if (userPreferences.textReflowEnabled) { - settings.layoutAlgorithm = LayoutAlgorithm.NARROW_COLUMNS - try { - settings.layoutAlgorithm = LayoutAlgorithm.TEXT_AUTOSIZING - } catch (e: Exception) { - // This shouldn't be necessary, but there are a number - // of KitKat devices that crash trying to set this - logger.log(TAG, "Problem setting LayoutAlgorithm to TEXT_AUTOSIZING") - } - } else { - settings.layoutAlgorithm = LayoutAlgorithm.NORMAL - } - - settings.blockNetworkImage = userPreferences.blockImagesEnabled - // Modifying headers causes SEGFAULTS, so disallow multi window if headers are enabled. - settings.setSupportMultipleWindows(userPreferences.popupsEnabled && !modifiesHeaders) - - settings.useWideViewPort = userPreferences.useWideViewPortEnabled - settings.loadWithOverviewMode = userPreferences.overviewModeEnabled - settings.textZoom = when (userPreferences.textSize) { - 0 -> 200 - 1 -> 150 - 2 -> 125 - 3 -> 100 - 4 -> 75 - 5 -> 50 - else -> throw IllegalArgumentException("Unsupported text size") - } - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - CookieManager.getInstance().setAcceptThirdPartyCookies(webView, - !userPreferences.blockThirdPartyCookiesEnabled) - } - } - - /** - * Initialize the settings of the WebView that are intrinsic to Lightning and cannot be altered - * by the user. Distinguish between Incognito and Regular tabs here. - */ - @SuppressLint("NewApi") - private fun WebView.initializeSettings() { - settings.apply { - mediaPlaybackRequiresUserGesture = true - - if (API >= Build.VERSION_CODES.LOLLIPOP && !isIncognito) { - mixedContentMode = WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE - } else if (API >= Build.VERSION_CODES.LOLLIPOP) { - // We're in Incognito mode, reject - mixedContentMode = WebSettings.MIXED_CONTENT_NEVER_ALLOW - } - - if (!isIncognito || Capabilities.FULL_INCOGNITO.isSupported) { - domStorageEnabled = true - setAppCacheEnabled(true) - databaseEnabled = true - cacheMode = WebSettings.LOAD_DEFAULT - } else { - domStorageEnabled = false - setAppCacheEnabled(false) - databaseEnabled = false - cacheMode = WebSettings.LOAD_NO_CACHE - } - - setSupportZoom(true) - builtInZoomControls = true - displayZoomControls = false - allowContentAccess = true - allowFileAccess = true - allowFileAccessFromFileURLs = false - allowUniversalAccessFromFileURLs = false - - getPathObservable("appcache") - .subscribeOn(databaseScheduler) - .observeOn(mainScheduler) - .subscribe { file -> - setAppCachePath(file.path) - } - - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) { - getPathObservable("geolocation") - .subscribeOn(databaseScheduler) - .observeOn(mainScheduler) - .subscribe { file -> - setGeolocationDatabasePath(file.path) - } - } - } - - } - - private fun getPathObservable(subFolder: String) = Single.fromCallable { - activity.getDir(subFolder, 0) - } - - /** - * This method is used to toggle the user agent between desktop and the current preference of - * the user. - */ - fun toggleDesktopUA() { - if (!toggleDesktop) { - webView?.settings?.userAgentString = DESKTOP_USER_AGENT - } else { - setUserAgentForPreference(userPreferences) - } - - toggleDesktop = !toggleDesktop - } - - /** - * This method sets the user agent of the current tab based on the user's preference - */ - private fun setUserAgentForPreference(userPreferences: UserPreferences) { - webView?.settings?.userAgentString = userPreferences.userAgent(activity.application) - } - - /** - * Save the state of the tab and return it as a [Bundle]. - */ - fun saveState(): Bundle = latentTabInitializer?.bundle - ?: Bundle(ClassLoader.getSystemClassLoader()).also { - webView?.saveState(it) - } - - /** - * Pause the current WebView instance. - */ - fun onPause() { - webView?.onPause() - logger.log(TAG, "WebView onPause: ${webView?.id}") - } - - /** - * Resume the current WebView instance. - */ - fun onResume() { - webView?.onResume() - logger.log(TAG, "WebView onResume: ${webView?.id}") - } - - /** - * Notify the WebView to stop the current load. - */ - fun stopLoading() { - webView?.stopLoading() - } - - /** - * This method forces the layer type to hardware, which - * enables hardware rendering on the WebView instance - * of the current LightningView. - */ - private fun setHardwareRendering() { - webView?.setLayerType(View.LAYER_TYPE_HARDWARE, paint) - } - - /** - * This method sets the layer type to none, which - * means that either the GPU and CPU can both compose - * the layers when necessary. - */ - private fun setNormalRendering() { - webView?.setLayerType(View.LAYER_TYPE_NONE, null) - } - - /** - * This method forces the layer type to software, which - * disables hardware rendering on the WebView instance - * of the current LightningView and makes the CPU render - * the view. - */ - fun setSoftwareRendering() { - webView?.setLayerType(View.LAYER_TYPE_SOFTWARE, null) - } - - /** - * Sets the current rendering color of the WebView instance - * of the current LightningView. The for modes are normal - * rendering, inverted rendering, grayscale rendering, - * and inverted grayscale rendering - * - * @param mode the integer mode to set as the rendering mode. - * see the numbers in documentation above for the - * values this method accepts. - */ - private fun setColorMode(mode: RenderingMode) { - invertPage = false - when (mode) { - RenderingMode.NORMAL -> { - paint.colorFilter = null - // setSoftwareRendering(); // Some devices get segfaults - // in the WebView with Hardware Acceleration enabled, - // the only fix is to disable hardware rendering - setNormalRendering() - invertPage = false - } - RenderingMode.INVERTED -> { - val filterInvert = ColorMatrixColorFilter( - negativeColorArray) - paint.colorFilter = filterInvert - setHardwareRendering() - - invertPage = true - } - RenderingMode.GRAYSCALE -> { - val cm = ColorMatrix() - cm.setSaturation(0f) - val filterGray = ColorMatrixColorFilter(cm) - paint.colorFilter = filterGray - setHardwareRendering() - } - RenderingMode.INVERTED_GRAYSCALE -> { - val matrix = ColorMatrix() - matrix.set(negativeColorArray) - val matrixGray = ColorMatrix() - matrixGray.setSaturation(0f) - val concat = ColorMatrix() - concat.setConcat(matrix, matrixGray) - val filterInvertGray = ColorMatrixColorFilter(concat) - paint.colorFilter = filterInvertGray - setHardwareRendering() - - invertPage = true - } - - RenderingMode.INCREASE_CONTRAST -> { - val increaseHighContrast = ColorMatrixColorFilter(increaseContrastColorArray) - paint.colorFilter = increaseHighContrast - setHardwareRendering() - } - } - - } - - /** - * Pauses the JavaScript timers of the - * WebView instance, which will trigger a - * pause for all WebViews in the app. - */ - fun pauseTimers() { - webView?.pauseTimers() - logger.log(TAG, "Pausing JS timers") - } - - /** - * Resumes the JavaScript timers of the - * WebView instance, which will trigger a - * resume for all WebViews in the app. - */ - fun resumeTimers() { - webView?.resumeTimers() - logger.log(TAG, "Resuming JS timers") - } - - /** - * Requests focus down on the WebView instance - * if the view does not already have focus. - */ - fun requestFocus() { - if (webView?.hasFocus() == false) { - webView?.requestFocus() - } - } - - /** - * Sets the visibility of the WebView to either - * View.GONE, View.VISIBLE, or View.INVISIBLE. - * other values passed in will have no effect. - * - * @param visible the visibility to set on the WebView. - */ - fun setVisibility(visible: Int) { - webView?.visibility = visible - } - - /** - * Tells the WebView to reload the current page. - * If the proxy settings are not ready then the - * this method will not have an affect as the - * proxy must start before the load occurs. - */ - fun reload() { - // Check if configured proxy is available - if (!proxyUtils.isProxyReady(activity)) { - // User has been notified - return - } - - webView?.reload() - } - - /** - * Finds all the instances of the text passed to this - * method and highlights the instances of that text - * in the WebView. - * - * @param text the text to search for. - */ - @SuppressLint("NewApi") - fun find(text: String): FindResults { - webView?.findAllAsync(text) - - return object : FindResults { - override fun nextResult() { - webView?.findNext(true) - } - - override fun previousResult() { - webView?.findNext(false) - } - - override fun clearResults() { - webView?.clearMatches() - } - } - } - - /** - * Notify the tab to shutdown and destroy - * its WebView instance and to remove the reference - * to it. After this method is called, the current - * instance of the LightningView is useless as - * the WebView cannot be recreated using the public - * api. - */ - // TODO fix bug where WebView.destroy is being called before the tab - // is removed and would cause a memory leak if the parent check - // was not in place. - fun onDestroy() { - networkDisposable.dispose() - webView?.let { tab -> - // Check to make sure the WebView has been removed - // before calling destroy() so that a memory leak is not created - val parent = tab.parent as? ViewGroup - if (parent != null) { - logger.log(TAG, "WebView was not detached from window before onDestroy") - parent.removeView(webView) - } - tab.stopLoading() - tab.onPause() - tab.clearHistory() - tab.visibility = View.GONE - tab.removeAllViews() - tab.destroyDrawingCache() - tab.destroy() - - webView = null - } - } - - /** - * Tell the WebView to navigate backwards - * in its history to the previous page. - */ - fun goBack() { - webView?.goBack() - } - - /** - * Tell the WebView to navigate forwards - * in its history to the next page. - */ - fun goForward() { - webView?.goForward() - } - - /** - * Notifies the [WebView] whether the network is available or not. - */ - private fun setNetworkAvailable(isAvailable: Boolean) { - webView?.setNetworkAvailable(isAvailable) - } - - /** - * Handles a long click on the page and delegates the URL to the - * proper dialog if it is not null, otherwise, it tries to get the - * URL using HitTestResult. - * - * @param url the url that should have been obtained from the WebView touch node - * thingy, if it is null, this method tries to deal with it and find - * a workaround. - */ - private fun longClickPage(url: String?) { - val result = webView?.hitTestResult - val currentUrl = webView?.url - val newUrl = result?.extra - - if (currentUrl != null && currentUrl.isSpecialUrl()) { - if (currentUrl.isHistoryUrl()) { - if (url != null) { - dialogBuilder.showLongPressedHistoryLinkDialog(activity, uiController, url) - } else if (newUrl != null) { - dialogBuilder.showLongPressedHistoryLinkDialog(activity, uiController, newUrl) - } - } else if (currentUrl.isBookmarkUrl()) { - if (url != null) { - dialogBuilder.showLongPressedDialogForBookmarkUrl(activity, uiController, url) - } else if (newUrl != null) { - dialogBuilder.showLongPressedDialogForBookmarkUrl(activity, uiController, newUrl) - } - } else if (currentUrl.isDownloadsUrl()) { - if (url != null) { - dialogBuilder.showLongPressedDialogForDownloadUrl(activity, uiController, url) - } else if (newUrl != null) { - dialogBuilder.showLongPressedDialogForDownloadUrl(activity, uiController, newUrl) - } - } - } else { - if (url != null) { - if (result != null) { - if (result.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE || result.type == WebView.HitTestResult.IMAGE_TYPE) { - dialogBuilder.showLongPressImageDialog(activity, uiController, url, userAgent) - } else { - dialogBuilder.showLongPressLinkDialog(activity, uiController, url) - } - } else { - dialogBuilder.showLongPressLinkDialog(activity, uiController, url) - } - } else if (newUrl != null) { - if (result.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE || result.type == WebView.HitTestResult.IMAGE_TYPE) { - dialogBuilder.showLongPressImageDialog(activity, uiController, newUrl, userAgent) - } else { - dialogBuilder.showLongPressLinkDialog(activity, uiController, newUrl) - } - } - } - } - - /** - * Determines whether or not the WebView can go - * backward or if it as the end of its history. - * - * @return true if the WebView can go back, false otherwise. - */ - fun canGoBack(): Boolean = webView?.canGoBack() == true - - /** - * Determine whether or not the WebView can go - * forward or if it is at the front of its history. - * - * @return true if it can go forward, false otherwise. - */ - fun canGoForward(): Boolean = webView?.canGoForward() == true - - /** - * Loads the URL in the WebView. If the proxy settings - * are still initializing, then the URL will not load - * as it is necessary to have the settings initialized - * before a load occurs. - * - * @param url the non-null URL to attempt to load in - * the WebView. - */ - fun loadUrl(url: String) { - // Check if configured proxy is available - if (!proxyUtils.isProxyReady(activity)) { - return - } - - webView?.loadUrl(url, requestHeaders) - } - - /** - * The OnTouchListener used by the WebView so we can - * get scroll events and show/hide the action bar when - * the page is scrolled up/down. - */ - private inner class TouchListener : OnTouchListener { - - var location: Float = 0f - var y: Float = 0f - var action: Int = 0 - - @SuppressLint("ClickableViewAccessibility") - override fun onTouch(view: View?, arg1: MotionEvent): Boolean { - if (view == null) return false - - if (!view.hasFocus()) { - view.requestFocus() - } - action = arg1.action - y = arg1.y - if (action == MotionEvent.ACTION_DOWN) { - location = y - } else if (action == MotionEvent.ACTION_UP) { - val distance = y - location - if (distance > SCROLL_UP_THRESHOLD && view.scrollY < SCROLL_UP_THRESHOLD) { - uiController.showActionBar() - } else if (distance < -SCROLL_UP_THRESHOLD) { - uiController.hideActionBar() - } - location = 0f - } - gestureDetector.onTouchEvent(arg1) - - return false - } - } - - /** - * The SimpleOnGestureListener used by the [TouchListener] - * in order to delegate show/hide events to the action bar when - * the user flings the page. Also handles long press events so - * that we can capture them accurately. - */ - private inner class CustomGestureListener : SimpleOnGestureListener() { - - /** - * Without this, onLongPress is not called when user is zooming using - * two fingers, but is when using only one. - * - * - * The required behaviour is to not trigger this when the user is - * zooming, it shouldn't matter how much fingers the user's using. - */ - private var canTriggerLongPress = true - - override fun onFling(e1: MotionEvent, e2: MotionEvent, velocityX: Float, velocityY: Float): Boolean { - val power = (velocityY * 100 / maxFling).toInt() - if (power < -10) { - uiController.hideActionBar() - } else if (power > 15) { - uiController.showActionBar() - } - return super.onFling(e1, e2, velocityX, velocityY) - } - - override fun onLongPress(e: MotionEvent) { - if (canTriggerLongPress) { - val msg = webViewHandler.obtainMessage() - if (msg != null) { - msg.target = webViewHandler - webView?.requestFocusNodeHref(msg) - } - } - } - - /** - * Is called when the user is swiping after the doubletap, which in our - * case means that he is zooming. - */ - override fun onDoubleTapEvent(e: MotionEvent): Boolean { - canTriggerLongPress = false - return false - } - - /** - * Is called when something is starting being pressed, always before - * onLongPress. - */ - override fun onShowPress(e: MotionEvent) { - canTriggerLongPress = true - } - } - - /** - * A Handler used to get the URL from a long click - * event on the WebView. It does not hold a hard - * reference to the WebView and therefore will not - * leak it if the WebView is garbage collected. - */ - private class WebViewHandler(view: LightningView) : Handler() { - - private val reference: WeakReference = WeakReference(view) - - override fun handleMessage(msg: Message) { - super.handleMessage(msg) - val url = msg.data.getString("url") - - reference.get()?.longClickPage(url) - } - } - - companion object { - - private const val TAG = "LightningView" - - const val HEADER_REQUESTED_WITH = "X-Requested-With" - const val HEADER_WAP_PROFILE = "X-Wap-Profile" - private const val HEADER_DNT = "DNT" - private const val HEADER_SAVEDATA = "Save-Data" - - private val API = Build.VERSION.SDK_INT - private val SCROLL_UP_THRESHOLD = Utils.dpToPx(10f) - - private val negativeColorArray = floatArrayOf( - -1.0f, 0f, 0f, 0f, 255f, // red - 0f, -1.0f, 0f, 0f, 255f, // green - 0f, 0f, -1.0f, 0f, 255f, // blue - 0f, 0f, 0f, 1.0f, 0f // alpha - ) - private val increaseContrastColorArray = floatArrayOf( - 2.0f, 0f, 0f, 0f, -160f, // red - 0f, 2.0f, 0f, 0f, -160f, // green - 0f, 0f, 2.0f, 0f, -160f, // blue - 0f, 0f, 0f, 1.0f, 0f // alpha - ) - } -} diff --git a/app/src/main/java/acr/browser/lightning/view/LightningViewTitle.kt b/app/src/main/java/acr/browser/lightning/view/LightningViewTitle.kt deleted file mode 100644 index bb2d963b2..000000000 --- a/app/src/main/java/acr/browser/lightning/view/LightningViewTitle.kt +++ /dev/null @@ -1,52 +0,0 @@ -package acr.browser.lightning.view - -import acr.browser.lightning.R -import acr.browser.lightning.extensions.pad -import android.content.Context -import android.graphics.Bitmap - -/** - * [LightningViewTitle] acts as a container class - * for the favicon and page title, the information used - * by the tab adapters to show the tabs to the user. - */ -class LightningViewTitle(context: Context) { - - private var favicon: Bitmap? = null - private var title = context.getString(R.string.action_new_tab) - - /** - * Set the current favicon to a new Bitmap. - * May be null, if null, the default will be used. - * - * @param favicon the potentially null favicon to set. - */ - fun setFavicon(favicon: Bitmap?) { - this.favicon = favicon?.pad() - } - - /** - * Gets the current title, which is not null. Can be an empty string. - * - * @return the non-null title. - */ - fun getTitle(): String? = title - - /** - * Set the current title to a new title. If the title is null, an empty title will be used. - * - * @param title the title to set. - */ - fun setTitle(title: String?) { - this.title = title ?: "" - } - - /** - * Gets the favicon of the page, which is not null. - * Either the favicon, or a default icon. - * - * @return the favicon or a default if that is null. - */ - fun getFavicon(): Bitmap? = favicon - -} diff --git a/app/src/main/java/acr/browser/lightning/view/LightningWebClient.kt b/app/src/main/java/acr/browser/lightning/view/LightningWebClient.kt deleted file mode 100644 index e6135e4f4..000000000 --- a/app/src/main/java/acr/browser/lightning/view/LightningWebClient.kt +++ /dev/null @@ -1,392 +0,0 @@ -package acr.browser.lightning.view - -import acr.browser.lightning.BuildConfig -import acr.browser.lightning.R -import acr.browser.lightning.adblock.AdBlocker -import acr.browser.lightning.adblock.allowlist.AllowListModel -import acr.browser.lightning.constant.FILE -import acr.browser.lightning.controller.UIController -import acr.browser.lightning.di.injector -import acr.browser.lightning.extensions.resizeAndShow -import acr.browser.lightning.extensions.snackbar -import acr.browser.lightning.js.InvertPage -import acr.browser.lightning.js.TextReflow -import acr.browser.lightning.log.Logger -import acr.browser.lightning.preference.UserPreferences -import acr.browser.lightning.ssl.SslState -import acr.browser.lightning.ssl.SslWarningPreferences -import acr.browser.lightning.utils.IntentUtils -import acr.browser.lightning.utils.ProxyUtils -import acr.browser.lightning.utils.Utils -import acr.browser.lightning.utils.isSpecialUrl -import android.annotation.TargetApi -import android.app.Activity -import android.content.ActivityNotFoundException -import android.content.Intent -import android.graphics.Bitmap -import android.net.MailTo -import android.net.http.SslError -import android.os.Build -import android.os.Message -import android.view.LayoutInflater -import android.webkit.* -import android.widget.CheckBox -import android.widget.EditText -import android.widget.TextView -import androidx.appcompat.app.AlertDialog -import androidx.core.content.FileProvider -import io.reactivex.Observable -import io.reactivex.subjects.PublishSubject -import java.io.ByteArrayInputStream -import java.io.File -import java.net.URISyntaxException -import java.util.* -import javax.inject.Inject -import kotlin.math.abs - -class LightningWebClient( - private val activity: Activity, - private val lightningView: LightningView -) : WebViewClient() { - - private val uiController: UIController - private val intentUtils = IntentUtils(activity) - private val emptyResponseByteArray: ByteArray = byteArrayOf() - - @Inject internal lateinit var proxyUtils: ProxyUtils - @Inject internal lateinit var userPreferences: UserPreferences - @Inject internal lateinit var sslWarningPreferences: SslWarningPreferences - @Inject internal lateinit var whitelistModel: AllowListModel - @Inject internal lateinit var logger: Logger - @Inject internal lateinit var textReflowJs: TextReflow - @Inject internal lateinit var invertPageJs: InvertPage - - private var adBlock: AdBlocker - - private var urlWithSslError: String? = null - - @Volatile private var isRunning = false - private var zoomScale = 0.0f - - private var currentUrl: String = "" - - var sslState: SslState = SslState.None - private set(value) { - sslStateSubject.onNext(value) - field = value - } - - private val sslStateSubject: PublishSubject = PublishSubject.create() - - init { - activity.injector.inject(this) - uiController = activity as UIController - adBlock = chooseAdBlocker() - } - - fun sslStateObservable(): Observable = sslStateSubject.hide() - - fun updatePreferences() { - adBlock = chooseAdBlocker() - } - - private fun chooseAdBlocker(): AdBlocker = if (userPreferences.adBlockEnabled) { - activity.injector.provideBloomFilterAdBlocker() - } else { - activity.injector.provideNoOpAdBlocker() - } - - private fun shouldRequestBeBlocked(pageUrl: String, requestUrl: String) = - !whitelistModel.isUrlAllowedAds(pageUrl) && adBlock.isAd(requestUrl) - - @TargetApi(Build.VERSION_CODES.LOLLIPOP) - override fun shouldInterceptRequest(view: WebView, request: WebResourceRequest): WebResourceResponse? { - if (shouldRequestBeBlocked(currentUrl, request.url.toString())) { - val empty = ByteArrayInputStream(emptyResponseByteArray) - return WebResourceResponse("text/plain", "utf-8", empty) - } - return super.shouldInterceptRequest(view, request) - } - - @Suppress("OverridingDeprecatedMember") - @TargetApi(Build.VERSION_CODES.KITKAT_WATCH) - override fun shouldInterceptRequest(view: WebView, url: String): WebResourceResponse? { - if (shouldRequestBeBlocked(currentUrl, url)) { - val empty = ByteArrayInputStream(emptyResponseByteArray) - return WebResourceResponse("text/plain", "utf-8", empty) - } - return null - } - - override fun onPageFinished(view: WebView, url: String) { - if (view.isShown) { - uiController.updateUrl(url, false) - uiController.setBackButtonEnabled(view.canGoBack()) - uiController.setForwardButtonEnabled(view.canGoForward()) - view.postInvalidate() - } - if (view.title.isNullOrEmpty()) { - lightningView.titleInfo.setTitle(activity.getString(R.string.untitled)) - } else { - lightningView.titleInfo.setTitle(view.title) - } - if (lightningView.invertPage) { - view.evaluateJavascript(invertPageJs.provideJs(), null) - } - uiController.tabChanged(lightningView) - } - - override fun onPageStarted(view: WebView, url: String, favicon: Bitmap?) { - currentUrl = url - // Only set the SSL state if there isn't an error for the current URL. - if (urlWithSslError != url) { - sslState = if (URLUtil.isHttpsUrl(url)) { - SslState.Valid - } else { - SslState.None - } - } - lightningView.titleInfo.setFavicon(null) - if (lightningView.isShown) { - uiController.updateUrl(url, true) - uiController.showActionBar() - } - uiController.tabChanged(lightningView) - } - - override fun onReceivedHttpAuthRequest( - view: WebView, - handler: HttpAuthHandler, - host: String, - realm: String - ) { - AlertDialog.Builder(activity).apply { - val dialogView = LayoutInflater.from(activity).inflate(R.layout.dialog_auth_request, null) - - val realmLabel = dialogView.findViewById(R.id.auth_request_realm_textview) - val name = dialogView.findViewById(R.id.auth_request_username_edittext) - val password = dialogView.findViewById(R.id.auth_request_password_edittext) - - realmLabel.text = activity.getString(R.string.label_realm, realm) - - setView(dialogView) - setTitle(R.string.title_sign_in) - setCancelable(true) - setPositiveButton(R.string.title_sign_in) { _, _ -> - val user = name.text.toString() - val pass = password.text.toString() - handler.proceed(user.trim(), pass.trim()) - logger.log(TAG, "Attempting HTTP Authentication") - } - setNegativeButton(R.string.action_cancel) { _, _ -> - handler.cancel() - } - }.resizeAndShow() - } - - override fun onScaleChanged(view: WebView, oldScale: Float, newScale: Float) { - if (view.isShown && lightningView.userPreferences.textReflowEnabled) { - if (isRunning) - return - val changeInPercent = abs(100 - 100 / zoomScale * newScale) - if (changeInPercent > 2.5f && !isRunning) { - isRunning = view.postDelayed({ - zoomScale = newScale - view.evaluateJavascript(textReflowJs.provideJs()) { isRunning = false } - }, 100) - } - - } - } - - override fun onReceivedSslError(webView: WebView, handler: SslErrorHandler, error: SslError) { - urlWithSslError = webView.url - sslState = SslState.Invalid(error) - - when (sslWarningPreferences.recallBehaviorForDomain(webView.url)) { - SslWarningPreferences.Behavior.PROCEED -> return handler.proceed() - SslWarningPreferences.Behavior.CANCEL -> return handler.cancel() - null -> Unit - } - - val errorCodeMessageCodes = getAllSslErrorMessageCodes(error) - - val stringBuilder = StringBuilder() - for (messageCode in errorCodeMessageCodes) { - stringBuilder.append(" - ").append(activity.getString(messageCode)).append('\n') - } - val alertMessage = activity.getString(R.string.message_insecure_connection, stringBuilder.toString()) - - AlertDialog.Builder(activity).apply { - val view = LayoutInflater.from(activity).inflate(R.layout.dialog_ssl_warning, null) - val dontAskAgain = view.findViewById(R.id.checkBoxDontAskAgain) - setTitle(activity.getString(R.string.title_warning)) - setMessage(alertMessage) - setCancelable(true) - setView(view) - setOnCancelListener { handler.cancel() } - setPositiveButton(activity.getString(R.string.action_yes)) { _, _ -> - if (dontAskAgain.isChecked) { - sslWarningPreferences.rememberBehaviorForDomain(webView.url.orEmpty(), SslWarningPreferences.Behavior.PROCEED) - } - handler.proceed() - } - setNegativeButton(activity.getString(R.string.action_no)) { _, _ -> - if (dontAskAgain.isChecked) { - sslWarningPreferences.rememberBehaviorForDomain(webView.url.orEmpty(), SslWarningPreferences.Behavior.CANCEL) - } - handler.cancel() - } - }.resizeAndShow() - } - - override fun onFormResubmission(view: WebView, dontResend: Message, resend: Message) { - AlertDialog.Builder(activity).apply { - setTitle(activity.getString(R.string.title_form_resubmission)) - setMessage(activity.getString(R.string.message_form_resubmission)) - setCancelable(true) - setPositiveButton(activity.getString(R.string.action_yes)) { _, _ -> - resend.sendToTarget() - } - setNegativeButton(activity.getString(R.string.action_no)) { _, _ -> - dontResend.sendToTarget() - } - }.resizeAndShow() - } - - @TargetApi(Build.VERSION_CODES.LOLLIPOP) - override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean = - shouldOverrideLoading(view, request.url.toString()) || super.shouldOverrideUrlLoading(view, request) - - @Suppress("OverridingDeprecatedMember", "DEPRECATION") - override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean = - shouldOverrideLoading(view, url) || super.shouldOverrideUrlLoading(view, url) - - private fun shouldOverrideLoading(view: WebView, url: String): Boolean { - // Check if configured proxy is available - if (!proxyUtils.isProxyReady(activity)) { - // User has been notified - return true - } - - val headers = lightningView.requestHeaders - - if (lightningView.isIncognito) { - // If we are in incognito, immediately load, we don't want the url to leave the app - return continueLoadingUrl(view, url, headers) - } - if (URLUtil.isAboutUrl(url)) { - // If this is an about page, immediately load, we don't need to leave the app - return continueLoadingUrl(view, url, headers) - } - - return if (isMailOrIntent(url, view) || intentUtils.startActivityForUrl(view, url)) { - // If it was a mailto: link, or an intent, or could be launched elsewhere, do that - true - } else { - // If none of the special conditions was met, continue with loading the url - continueLoadingUrl(view, url, headers) - } - } - - private fun continueLoadingUrl(webView: WebView, url: String, headers: Map): Boolean { - if (!URLUtil.isNetworkUrl(url) - && !URLUtil.isFileUrl(url) - && !URLUtil.isAboutUrl(url) - && !URLUtil.isDataUrl(url) - && !URLUtil.isJavaScriptUrl(url)) { - webView.stopLoading() - return true - } - return when { - headers.isEmpty() -> false - else -> { - webView.loadUrl(url, headers) - true - } - } - } - - private fun isMailOrIntent(url: String, view: WebView): Boolean { - if (url.startsWith("mailto:")) { - val mailTo = MailTo.parse(url) - val i = Utils.newEmailIntent(mailTo.to, mailTo.subject, mailTo.body, mailTo.cc) - activity.startActivity(i) - view.reload() - return true - } else if (url.startsWith("intent://")) { - val intent = try { - Intent.parseUri(url, Intent.URI_INTENT_SCHEME) - } catch (ignored: URISyntaxException) { - null - } - - if (intent != null) { - intent.addCategory(Intent.CATEGORY_BROWSABLE) - intent.component = null - intent.selector = null - try { - activity.startActivity(intent) - } catch (e: ActivityNotFoundException) { - logger.log(TAG, "ActivityNotFoundException") - } - - return true - } - } else if (URLUtil.isFileUrl(url) && !url.isSpecialUrl()) { - val file = File(url.replace(FILE, "")) - - if (file.exists()) { - val newMimeType = MimeTypeMap.getSingleton() - .getMimeTypeFromExtension(Utils.guessFileExtension(file.toString())) - - val intent = Intent(Intent.ACTION_VIEW) - intent.flags = Intent.FLAG_GRANT_READ_URI_PERMISSION - val contentUri = FileProvider.getUriForFile(activity, BuildConfig.APPLICATION_ID + ".fileprovider", file) - intent.setDataAndType(contentUri, newMimeType) - - try { - activity.startActivity(intent) - } catch (e: Exception) { - println("LightningWebClient: cannot open downloaded file") - } - - } else { - activity.snackbar(R.string.message_open_download_fail) - } - return true - } - return false - } - - private fun getAllSslErrorMessageCodes(error: SslError): List { - val errorCodeMessageCodes = ArrayList(1) - - if (error.hasError(SslError.SSL_DATE_INVALID)) { - errorCodeMessageCodes.add(R.string.message_certificate_date_invalid) - } - if (error.hasError(SslError.SSL_EXPIRED)) { - errorCodeMessageCodes.add(R.string.message_certificate_expired) - } - if (error.hasError(SslError.SSL_IDMISMATCH)) { - errorCodeMessageCodes.add(R.string.message_certificate_domain_mismatch) - } - if (error.hasError(SslError.SSL_NOTYETVALID)) { - errorCodeMessageCodes.add(R.string.message_certificate_not_yet_valid) - } - if (error.hasError(SslError.SSL_UNTRUSTED)) { - errorCodeMessageCodes.add(R.string.message_certificate_untrusted) - } - if (error.hasError(SslError.SSL_INVALID)) { - errorCodeMessageCodes.add(R.string.message_certificate_invalid) - } - - return errorCodeMessageCodes - } - - companion object { - - private const val TAG = "LightningWebClient" - - } -} diff --git a/app/src/main/java/acr/browser/lightning/view/TabInitializer.kt b/app/src/main/java/acr/browser/lightning/view/TabInitializer.kt index 23ce5a687..1face7716 100644 --- a/app/src/main/java/acr/browser/lightning/view/TabInitializer.kt +++ b/app/src/main/java/acr/browser/lightning/view/TabInitializer.kt @@ -3,8 +3,8 @@ package acr.browser.lightning.view import acr.browser.lightning.R import acr.browser.lightning.constant.SCHEME_BOOKMARKS import acr.browser.lightning.constant.SCHEME_HOMEPAGE -import acr.browser.lightning.di.DiskScheduler -import acr.browser.lightning.di.MainScheduler +import acr.browser.lightning._browser2.di.DiskScheduler +import acr.browser.lightning._browser2.di.MainScheduler import acr.browser.lightning.extensions.resizeAndShow import acr.browser.lightning.html.HtmlPageFactory import acr.browser.lightning.html.bookmark.BookmarkPageFactory @@ -23,12 +23,12 @@ import io.reactivex.rxkotlin.subscribeBy import javax.inject.Inject /** - * An initializer that is run on a [LightningView] after it is created. + * An initializer that is run on a [WebView] after it is created. */ interface TabInitializer { /** - * Initialize the [WebView] instance held by the [LightningView]. If a url is loaded, the + * Initialize the [WebView] instance held by the tab. If a url is loaded, the * provided [headers] should be used to load the url. */ fun initialize(webView: WebView, headers: Map) diff --git a/app/src/main/java/acr/browser/lightning/view/find/FindResults.kt b/app/src/main/java/acr/browser/lightning/view/find/FindResults.kt deleted file mode 100644 index 3c82addec..000000000 --- a/app/src/main/java/acr/browser/lightning/view/find/FindResults.kt +++ /dev/null @@ -1,26 +0,0 @@ -package acr.browser.lightning.view.find - - -/** - * Defines interactions with the result of a find in page action. - */ -interface FindResults { - - /** - * Select the next result of the find in page results. If [clearResults] has been called then - * has no effect. If the last result is selected, then there will be no effect. - */ - fun nextResult() - - /** - * Select the previous result in the find in page results. If [clearResults] has been called - * then has no effect. If the first result is selected, then there will be no effect. - */ - fun previousResult() - - /** - * Clear the find in page results. - */ - fun clearResults() - -} diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 4e0ce2687..c572f5fcd 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -4,8 +4,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent" - tools:context=".browser.activity.BrowserActivity"> + android:layout_height="match_parent"> + tools:context="._browser2.BrowserActivity"> Date: Wed, 3 Aug 2022 17:57:36 -0400 Subject: [PATCH 121/161] Moving files out of temp package and into main package --- app/src/main/AndroidManifest.xml | 6 +-- .../java/acr/browser/lightning/BrowserApp.kt | 10 ++--- .../_browser2/di/Browser2BindsModule.kt | 32 --------------- .../lightning/adblock/BloomFilterAdBlocker.kt | 4 +- .../allowlist/SessionAllowListModel.kt | 2 +- .../PreferencesHostsDataSourceProvider.kt | 2 +- .../{_browser2 => browser}/BrowserActivity.kt | 31 +++++++------- .../{_browser2 => browser}/BrowserContract.kt | 10 ++--- .../BrowserNavigator.kt | 6 +-- .../BrowserPresenter.kt | 40 +++++++++--------- .../BrowserStateAdapter.kt | 6 +-- .../BrowserViewState.kt | 2 +- .../DefaultBrowserActivity.kt | 2 +- .../IncognitoBrowserActivity.kt | 2 +- .../acr/browser/lightning/browser/TabsView.kt | 41 ------------------- .../{activity => }/ThemableBrowserActivity.kt | 4 +- .../bookmark/BookmarkRecyclerViewAdapter.kt | 4 +- .../bookmark/BookmarkViewHolder.kt | 2 +- .../cleanup/BasicIncognitoExitCleanup.kt | 2 +- .../browser/cleanup/DelegatingExitCleanup.kt | 4 +- .../cleanup/EnhancedIncognitoExitCleanup.kt | 2 +- .../lightning/browser/cleanup/ExitCleanup.kt | 2 +- .../browser/cleanup/NormalExitCleanup.kt | 4 +- .../color/ColorAnimator.kt | 2 +- .../data/CookieAdministrator.kt | 2 +- .../data/DefaultCookieAdministrator.kt | 2 +- .../data/IncognitoCookieAdministrator.kt | 2 +- .../di/AppBindsModule.kt | 6 +-- .../{_browser2 => browser}/di/AppComponent.kt | 6 +-- .../{_browser2 => browser}/di/AppModule.kt | 2 +- .../browser/di/Browser2BindsModule.kt | 30 ++++++++++++++ .../di/Browser2Component.kt | 4 +- .../di/Browser2Module.kt | 38 ++++++++--------- .../di/Browser2Scope.kt | 2 +- .../{_browser2 => browser}/di/DiExtensions.kt | 2 +- .../download/DownloadPermissionsHelper.kt | 4 +- .../download/PendingDownload.kt | 2 +- .../history/DefaultHistoryRecord.kt | 4 +- .../history/HistoryRecord.kt | 2 +- .../history/NoOpHistoryRecord.kt | 2 +- .../image/FaviconImageLoader.kt | 6 +-- .../image/IconFreeze.kt | 2 +- .../image/ImageLoader.kt | 2 +- .../{_browser2 => browser}/keys/KeyCombo.kt | 2 +- .../keys/KeyEventAdapter.kt | 2 +- .../menu/MenuItemAdapter.kt | 2 +- .../menu/MenuSelection.kt | 2 +- .../notification/DefaultTabCountNotifier.kt | 2 +- .../notification/IncognitoTabCountNotifier.kt | 2 +- .../notification/TabCountNotifier.kt | 2 +- .../{_browser2 => browser}/proxy/Proxy.kt | 2 +- .../proxy/ProxyAdapter.kt | 5 +-- .../browser/{ => proxy}/ProxyChoice.kt | 2 +- .../search/IntentExtractor.kt | 4 +- .../{ => search}/SearchBoxDisplayChoice.kt | 2 +- .../browser/{ => search}/SearchBoxModel.kt | 2 +- .../search/SearchListener.kt | 2 +- .../StyleRemovingTextWatcher.kt | 2 +- .../tab/DefaultUserAgent.kt | 2 +- .../tab/DesktopTabRecyclerViewAdapter.kt | 2 +- .../tab/DrawerTabRecyclerViewAdapter.kt | 2 +- .../browser/{ => tab}/RecentTabModel.kt | 2 +- .../{_browser2 => browser}/tab/TabAdapter.kt | 6 +-- .../{_browser2 => browser}/tab/TabFactory.kt | 8 ++-- .../{_browser2 => browser}/tab/TabModel.kt | 4 +- .../{_browser2 => browser}/tab/TabPager.kt | 10 ++--- .../tab/TabViewHolder.kt | 2 +- .../tab/TabViewState.kt | 2 +- .../tab/TabWebChromeClient.kt | 2 +- .../tab/TabWebViewClient.kt | 4 +- .../tab/TabsRepository.kt | 11 +++-- .../{_browser2 => browser}/tab/UrlHandler.kt | 4 +- .../tab/WebViewFactory.kt | 6 +-- .../tab/bundle/BundleStore.kt | 4 +- .../tab/bundle/DefaultBundleStore.kt | 6 +-- .../tab/bundle/IncognitoBundleStore.kt | 4 +- .../theme/DefaultThemeProvider.kt | 2 +- .../theme/LegacyThemeProvider.kt | 2 +- .../theme/ThemeProvider.kt | 2 +- .../ui/BookmarkConfiguration.kt | 2 +- .../ui/TabConfiguration.kt | 2 +- .../ui/UiConfiguration.kt | 2 +- .../view/CompositeTouchListener.kt | 2 +- .../view/WebViewCompositeTouchExtensions.kt | 2 +- .../view/WebViewLongPressHandler.kt | 4 +- .../view/WebViewScrollCoordinator.kt | 2 +- .../view/targetUrl/LongPress.kt | 2 +- .../database/adblock/HostsRepositoryInfo.kt | 2 +- .../dialog/LightningDialogBuilder.kt | 4 +- .../lightning/download/DownloadHandler.java | 6 +-- .../download/LightningDownloadListener.java | 2 +- .../html/bookmark/BookmarkPageFactory.kt | 8 ++-- .../html/download/DownloadPageFactory.kt | 2 +- .../html/history/HistoryPageFactory.kt | 2 +- .../html/homepage/HomePageFactory.kt | 2 +- .../notifications/IncognitoNotification.kt | 2 +- .../preference/DeveloperPreferences.kt | 2 +- .../lightning/preference/UserPreferences.kt | 9 ++-- .../reading/activity/ReadingActivity.java | 6 +-- .../lightning/search/SearchEngineProvider.kt | 2 +- .../lightning/search/SuggestionsAdapter.kt | 8 ++-- .../settings/activity/SettingsActivity.kt | 2 +- .../activity/ThemableSettingsActivity.kt | 2 +- .../fragment/AdBlockSettingsFragment.kt | 6 +-- .../fragment/AdvancedSettingsFragment.kt | 4 +- .../fragment/BookmarkSettingsFragment.kt | 6 +-- .../fragment/DebugSettingsFragment.kt | 2 +- .../fragment/DisplaySettingsFragment.kt | 2 +- .../fragment/GeneralSettingsFragment.kt | 4 +- .../fragment/PrivacySettingsFragment.kt | 8 ++-- .../browser/lightning/utils/ProxyUtils.java | 2 +- .../browser/lightning/view/TabInitializer.kt | 4 +- app/src/main/res/layout/browser_activity.xml | 2 +- 113 files changed, 267 insertions(+), 316 deletions(-) delete mode 100644 app/src/main/java/acr/browser/lightning/_browser2/di/Browser2BindsModule.kt rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/BrowserActivity.kt (96%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/BrowserContract.kt (93%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/BrowserNavigator.kt (92%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/BrowserPresenter.kt (97%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/BrowserStateAdapter.kt (96%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/BrowserViewState.kt (96%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/DefaultBrowserActivity.kt (87%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/IncognitoBrowserActivity.kt (95%) delete mode 100644 app/src/main/java/acr/browser/lightning/browser/TabsView.kt rename app/src/main/java/acr/browser/lightning/browser/{activity => }/ThemableBrowserActivity.kt (97%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/bookmark/BookmarkRecyclerViewAdapter.kt (93%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/bookmark/BookmarkViewHolder.kt (94%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/color/ColorAnimator.kt (97%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/data/CookieAdministrator.kt (83%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/data/DefaultCookieAdministrator.kt (94%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/data/IncognitoCookieAdministrator.kt (95%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/di/AppBindsModule.kt (94%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/di/AppComponent.kt (93%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/di/AppModule.kt (99%) create mode 100644 app/src/main/java/acr/browser/lightning/browser/di/Browser2BindsModule.kt rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/di/Browser2Component.kt (92%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/di/Browser2Module.kt (74%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/di/Browser2Scope.kt (73%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/di/DiExtensions.kt (95%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/download/DownloadPermissionsHelper.kt (97%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/download/PendingDownload.kt (81%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/history/DefaultHistoryRecord.kt (83%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/history/HistoryRecord.kt (71%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/history/NoOpHistoryRecord.kt (76%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/image/FaviconImageLoader.kt (94%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/image/IconFreeze.kt (70%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/image/ImageLoader.kt (82%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/keys/KeyCombo.kt (86%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/keys/KeyEventAdapter.kt (98%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/menu/MenuItemAdapter.kt (96%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/menu/MenuSelection.kt (85%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/notification/DefaultTabCountNotifier.kt (74%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/notification/IncognitoTabCountNotifier.kt (89%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/notification/TabCountNotifier.kt (69%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/proxy/Proxy.kt (68%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/proxy/ProxyAdapter.kt (90%) rename app/src/main/java/acr/browser/lightning/browser/{ => proxy}/ProxyChoice.kt (82%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/search/IntentExtractor.kt (92%) rename app/src/main/java/acr/browser/lightning/browser/{ => search}/SearchBoxDisplayChoice.kt (84%) rename app/src/main/java/acr/browser/lightning/browser/{ => search}/SearchBoxModel.kt (97%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/search/SearchListener.kt (96%) rename app/src/main/java/acr/browser/lightning/browser/{activity => search}/StyleRemovingTextWatcher.kt (93%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/tab/DefaultUserAgent.kt (73%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/tab/DesktopTabRecyclerViewAdapter.kt (98%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/tab/DrawerTabRecyclerViewAdapter.kt (98%) rename app/src/main/java/acr/browser/lightning/browser/{ => tab}/RecentTabModel.kt (94%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/tab/TabAdapter.kt (97%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/tab/TabFactory.kt (89%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/tab/TabModel.kt (94%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/tab/TabPager.kt (82%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/tab/TabViewHolder.kt (96%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/tab/TabViewState.kt (81%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/tab/TabWebChromeClient.kt (99%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/tab/TabWebViewClient.kt (97%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/tab/TabsRepository.kt (90%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/tab/UrlHandler.kt (97%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/tab/WebViewFactory.kt (97%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/tab/bundle/BundleStore.kt (73%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/tab/bundle/DefaultBundleStore.kt (95%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/tab/bundle/IncognitoBundleStore.kt (76%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/theme/DefaultThemeProvider.kt (87%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/theme/LegacyThemeProvider.kt (97%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/theme/ThemeProvider.kt (84%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/ui/BookmarkConfiguration.kt (70%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/ui/TabConfiguration.kt (70%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/ui/UiConfiguration.kt (80%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/view/CompositeTouchListener.kt (91%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/view/WebViewCompositeTouchExtensions.kt (86%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/view/WebViewLongPressHandler.kt (97%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/view/WebViewScrollCoordinator.kt (99%) rename app/src/main/java/acr/browser/lightning/{_browser2 => browser}/view/targetUrl/LongPress.kt (82%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 029224013..0489041a3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:value="2.1"/> diff --git a/app/src/main/java/acr/browser/lightning/BrowserApp.kt b/app/src/main/java/acr/browser/lightning/BrowserApp.kt index e9ef81765..270b8702c 100644 --- a/app/src/main/java/acr/browser/lightning/BrowserApp.kt +++ b/app/src/main/java/acr/browser/lightning/BrowserApp.kt @@ -1,14 +1,14 @@ package acr.browser.lightning -import acr.browser.lightning._browser2.proxy.ProxyAdapter +import acr.browser.lightning.browser.proxy.ProxyAdapter import acr.browser.lightning.database.bookmark.BookmarkExporter import acr.browser.lightning.database.bookmark.BookmarkRepository import acr.browser.lightning.device.BuildInfo import acr.browser.lightning.device.BuildType -import acr.browser.lightning._browser2.di.AppComponent -import acr.browser.lightning._browser2.di.DaggerAppComponent -import acr.browser.lightning._browser2.di.DatabaseScheduler -import acr.browser.lightning._browser2.di.injector +import acr.browser.lightning.browser.di.AppComponent +import acr.browser.lightning.browser.di.DaggerAppComponent +import acr.browser.lightning.browser.di.DatabaseScheduler +import acr.browser.lightning.browser.di.injector import acr.browser.lightning.log.Logger import acr.browser.lightning.preference.DeveloperPreferences import acr.browser.lightning.utils.FileUtils diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2BindsModule.kt b/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2BindsModule.kt deleted file mode 100644 index 12b4aed1d..000000000 --- a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2BindsModule.kt +++ /dev/null @@ -1,32 +0,0 @@ -package acr.browser.lightning._browser2.di - -import acr.browser.lightning._browser2.BrowserContract -import acr.browser.lightning._browser2.BrowserNavigator -import acr.browser.lightning._browser2.image.FaviconImageLoader -import acr.browser.lightning._browser2.image.ImageLoader -import acr.browser.lightning._browser2.proxy.Proxy -import acr.browser.lightning._browser2.proxy.ProxyAdapter -import acr.browser.lightning._browser2.tab.TabsRepository -import acr.browser.lightning._browser2.theme.LegacyThemeProvider -import acr.browser.lightning._browser2.theme.ThemeProvider -import dagger.Binds -import dagger.Module - -/** - * Created by anthonycr on 9/15/20. - */ -@Module -interface Browser2BindsModule { - - @Binds - fun bindsBrowserModel(tabsRepository: TabsRepository): BrowserContract.Model - - @Binds - fun bindsFaviconImageLoader(faviconImageLoader: FaviconImageLoader): ImageLoader - - @Binds - fun bindsBrowserNavigator(browserNavigator: BrowserNavigator): BrowserContract.Navigator - - @Binds - fun bindsProxy(proxyAdapter: ProxyAdapter): Proxy -} diff --git a/app/src/main/java/acr/browser/lightning/adblock/BloomFilterAdBlocker.kt b/app/src/main/java/acr/browser/lightning/adblock/BloomFilterAdBlocker.kt index c67cdb78f..3e39feb1b 100644 --- a/app/src/main/java/acr/browser/lightning/adblock/BloomFilterAdBlocker.kt +++ b/app/src/main/java/acr/browser/lightning/adblock/BloomFilterAdBlocker.kt @@ -13,8 +13,8 @@ import acr.browser.lightning.adblock.util.hash.MurmurHashStringAdapter import acr.browser.lightning.database.adblock.Host import acr.browser.lightning.database.adblock.HostsRepository import acr.browser.lightning.database.adblock.HostsRepositoryInfo -import acr.browser.lightning._browser2.di.DatabaseScheduler -import acr.browser.lightning._browser2.di.MainScheduler +import acr.browser.lightning.browser.di.DatabaseScheduler +import acr.browser.lightning.browser.di.MainScheduler import acr.browser.lightning.extensions.toast import acr.browser.lightning.log.Logger import android.app.Application diff --git a/app/src/main/java/acr/browser/lightning/adblock/allowlist/SessionAllowListModel.kt b/app/src/main/java/acr/browser/lightning/adblock/allowlist/SessionAllowListModel.kt index d4afd0513..783d05178 100644 --- a/app/src/main/java/acr/browser/lightning/adblock/allowlist/SessionAllowListModel.kt +++ b/app/src/main/java/acr/browser/lightning/adblock/allowlist/SessionAllowListModel.kt @@ -2,7 +2,7 @@ package acr.browser.lightning.adblock.allowlist import acr.browser.lightning.database.allowlist.AdBlockAllowListRepository import acr.browser.lightning.database.allowlist.AllowListEntry -import acr.browser.lightning._browser2.di.DatabaseScheduler +import acr.browser.lightning.browser.di.DatabaseScheduler import acr.browser.lightning.log.Logger import androidx.core.net.toUri import io.reactivex.Completable diff --git a/app/src/main/java/acr/browser/lightning/adblock/source/PreferencesHostsDataSourceProvider.kt b/app/src/main/java/acr/browser/lightning/adblock/source/PreferencesHostsDataSourceProvider.kt index 4a1e7adab..1f35a1fa5 100644 --- a/app/src/main/java/acr/browser/lightning/adblock/source/PreferencesHostsDataSourceProvider.kt +++ b/app/src/main/java/acr/browser/lightning/adblock/source/PreferencesHostsDataSourceProvider.kt @@ -1,6 +1,6 @@ package acr.browser.lightning.adblock.source -import acr.browser.lightning._browser2.di.HostsClient +import acr.browser.lightning.browser.di.HostsClient import acr.browser.lightning.log.Logger import acr.browser.lightning.preference.UserPreferences import android.app.Application diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserActivity.kt similarity index 96% rename from app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt rename to app/src/main/java/acr/browser/lightning/browser/BrowserActivity.kt index cdcd6de5e..19d05a623 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserActivity.kt @@ -1,20 +1,19 @@ -package acr.browser.lightning._browser2 +package acr.browser.lightning.browser import acr.browser.lightning.AppTheme import acr.browser.lightning.R -import acr.browser.lightning._browser2.bookmark.BookmarkRecyclerViewAdapter -import acr.browser.lightning._browser2.color.ColorAnimator -import acr.browser.lightning._browser2.image.ImageLoader -import acr.browser.lightning._browser2.keys.KeyEventAdapter -import acr.browser.lightning._browser2.menu.MenuItemAdapter -import acr.browser.lightning._browser2.search.IntentExtractor -import acr.browser.lightning._browser2.search.SearchListener -import acr.browser.lightning._browser2.tab.* -import acr.browser.lightning._browser2.ui.BookmarkConfiguration -import acr.browser.lightning._browser2.ui.TabConfiguration -import acr.browser.lightning._browser2.ui.UiConfiguration -import acr.browser.lightning.browser.activity.StyleRemovingTextWatcher -import acr.browser.lightning.browser.activity.ThemableBrowserActivity +import acr.browser.lightning.browser.bookmark.BookmarkRecyclerViewAdapter +import acr.browser.lightning.browser.color.ColorAnimator +import acr.browser.lightning.browser.image.ImageLoader +import acr.browser.lightning.browser.keys.KeyEventAdapter +import acr.browser.lightning.browser.menu.MenuItemAdapter +import acr.browser.lightning.browser.search.IntentExtractor +import acr.browser.lightning.browser.search.SearchListener +import acr.browser.lightning.browser.tab.* +import acr.browser.lightning.browser.ui.BookmarkConfiguration +import acr.browser.lightning.browser.ui.TabConfiguration +import acr.browser.lightning.browser.ui.UiConfiguration +import acr.browser.lightning.browser.search.StyleRemovingTextWatcher import acr.browser.lightning.constant.HTTP import acr.browser.lightning.database.Bookmark import acr.browser.lightning.database.HistoryEntry @@ -22,7 +21,7 @@ import acr.browser.lightning.database.SearchSuggestion import acr.browser.lightning.database.WebPage import acr.browser.lightning.database.downloads.DownloadEntry import acr.browser.lightning.databinding.BrowserActivityBinding -import acr.browser.lightning._browser2.di.injector +import acr.browser.lightning.browser.di.injector import acr.browser.lightning.dialog.BrowserDialog import acr.browser.lightning.dialog.DialogItem import acr.browser.lightning.dialog.LightningDialogBuilder @@ -49,7 +48,7 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.SimpleItemAnimator -import acr.browser.lightning._browser2.view.targetUrl.LongPress +import acr.browser.lightning.browser.view.targetUrl.LongPress import javax.inject.Inject /** diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserContract.kt similarity index 93% rename from app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt rename to app/src/main/java/acr/browser/lightning/browser/BrowserContract.kt index aecdac72a..158cdd4bf 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserContract.kt @@ -1,8 +1,8 @@ -package acr.browser.lightning._browser2 +package acr.browser.lightning.browser -import acr.browser.lightning._browser2.download.PendingDownload -import acr.browser.lightning._browser2.tab.TabModel -import acr.browser.lightning._browser2.tab.TabViewState +import acr.browser.lightning.browser.download.PendingDownload +import acr.browser.lightning.browser.tab.TabModel +import acr.browser.lightning.browser.tab.TabViewState import acr.browser.lightning.database.Bookmark import acr.browser.lightning.database.HistoryEntry import acr.browser.lightning.database.downloads.DownloadEntry @@ -14,7 +14,7 @@ import io.reactivex.Completable import io.reactivex.Maybe import io.reactivex.Observable import io.reactivex.Single -import acr.browser.lightning._browser2.view.targetUrl.LongPress +import acr.browser.lightning.browser.view.targetUrl.LongPress /** * Created by anthonycr on 9/11/20. diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserNavigator.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserNavigator.kt similarity index 92% rename from app/src/main/java/acr/browser/lightning/_browser2/BrowserNavigator.kt rename to app/src/main/java/acr/browser/lightning/browser/BrowserNavigator.kt index 690b211de..f1797e3ba 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserNavigator.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserNavigator.kt @@ -1,8 +1,8 @@ -package acr.browser.lightning._browser2 +package acr.browser.lightning.browser import acr.browser.lightning.R -import acr.browser.lightning._browser2.download.DownloadPermissionsHelper -import acr.browser.lightning._browser2.download.PendingDownload +import acr.browser.lightning.browser.download.DownloadPermissionsHelper +import acr.browser.lightning.browser.download.PendingDownload import acr.browser.lightning.extensions.copyToClipboard import acr.browser.lightning.extensions.snackbar import acr.browser.lightning.log.Logger diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt similarity index 97% rename from app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt rename to app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt index d9193c7ec..7cfd40f3b 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt @@ -1,28 +1,28 @@ -package acr.browser.lightning._browser2 - -import acr.browser.lightning._browser2.data.CookieAdministrator -import acr.browser.lightning._browser2.di.Browser2Scope -import acr.browser.lightning._browser2.di.IncognitoMode -import acr.browser.lightning._browser2.di.InitialUrl -import acr.browser.lightning._browser2.download.PendingDownload -import acr.browser.lightning._browser2.history.HistoryRecord -import acr.browser.lightning._browser2.keys.KeyCombo -import acr.browser.lightning._browser2.menu.MenuSelection -import acr.browser.lightning._browser2.notification.TabCountNotifier -import acr.browser.lightning._browser2.tab.TabModel -import acr.browser.lightning._browser2.tab.TabViewState -import acr.browser.lightning._browser2.ui.TabConfiguration -import acr.browser.lightning._browser2.ui.UiConfiguration +package acr.browser.lightning.browser + +import acr.browser.lightning.browser.data.CookieAdministrator +import acr.browser.lightning.browser.di.Browser2Scope +import acr.browser.lightning.browser.di.IncognitoMode +import acr.browser.lightning.browser.di.InitialUrl +import acr.browser.lightning.browser.download.PendingDownload +import acr.browser.lightning.browser.history.HistoryRecord +import acr.browser.lightning.browser.keys.KeyCombo +import acr.browser.lightning.browser.menu.MenuSelection +import acr.browser.lightning.browser.notification.TabCountNotifier +import acr.browser.lightning.browser.tab.TabModel +import acr.browser.lightning.browser.tab.TabViewState +import acr.browser.lightning.browser.ui.TabConfiguration +import acr.browser.lightning.browser.ui.UiConfiguration import acr.browser.lightning.adblock.allowlist.AllowListModel -import acr.browser.lightning.browser.SearchBoxModel +import acr.browser.lightning.browser.search.SearchBoxModel import acr.browser.lightning.database.* import acr.browser.lightning.database.bookmark.BookmarkRepository import acr.browser.lightning.database.downloads.DownloadEntry import acr.browser.lightning.database.downloads.DownloadsRepository import acr.browser.lightning.database.history.HistoryRepository -import acr.browser.lightning._browser2.di.DatabaseScheduler -import acr.browser.lightning._browser2.di.DiskScheduler -import acr.browser.lightning._browser2.di.MainScheduler +import acr.browser.lightning.browser.di.DatabaseScheduler +import acr.browser.lightning.browser.di.DiskScheduler +import acr.browser.lightning.browser.di.MainScheduler import acr.browser.lightning.html.bookmark.BookmarkPageFactory import acr.browser.lightning.html.history.HistoryPageFactory import acr.browser.lightning.search.SearchEngineProvider @@ -39,7 +39,7 @@ import io.reactivex.rxkotlin.Observables import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.subscribeBy import io.reactivex.rxkotlin.toObservable -import acr.browser.lightning._browser2.view.targetUrl.LongPress +import acr.browser.lightning.browser.view.targetUrl.LongPress import javax.inject.Inject import kotlin.system.exitProcess diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserStateAdapter.kt similarity index 96% rename from app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt rename to app/src/main/java/acr/browser/lightning/browser/BrowserStateAdapter.kt index 132cbec64..5226ddc2c 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserStateAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserStateAdapter.kt @@ -1,6 +1,6 @@ -package acr.browser.lightning._browser2 +package acr.browser.lightning.browser -import acr.browser.lightning._browser2.tab.TabViewState +import acr.browser.lightning.browser.tab.TabViewState import acr.browser.lightning.database.Bookmark import acr.browser.lightning.database.HistoryEntry import acr.browser.lightning.database.downloads.DownloadEntry @@ -8,7 +8,7 @@ import acr.browser.lightning.ssl.SslCertificateInfo import acr.browser.lightning.ssl.showSslDialog import android.content.Intent import android.view.View -import acr.browser.lightning._browser2.view.targetUrl.LongPress +import acr.browser.lightning.browser.view.targetUrl.LongPress /** * Created by anthonycr on 9/16/20. diff --git a/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserViewState.kt similarity index 96% rename from app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt rename to app/src/main/java/acr/browser/lightning/browser/BrowserViewState.kt index 1e16d65d7..dc03d8a2e 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/BrowserViewState.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserViewState.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2 +package acr.browser.lightning.browser import acr.browser.lightning.database.Bookmark import acr.browser.lightning.ssl.SslState diff --git a/app/src/main/java/acr/browser/lightning/_browser2/DefaultBrowserActivity.kt b/app/src/main/java/acr/browser/lightning/browser/DefaultBrowserActivity.kt similarity index 87% rename from app/src/main/java/acr/browser/lightning/_browser2/DefaultBrowserActivity.kt rename to app/src/main/java/acr/browser/lightning/browser/DefaultBrowserActivity.kt index 03227c107..3523d81f7 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/DefaultBrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/browser/DefaultBrowserActivity.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2 +package acr.browser.lightning.browser import acr.browser.lightning.R diff --git a/app/src/main/java/acr/browser/lightning/_browser2/IncognitoBrowserActivity.kt b/app/src/main/java/acr/browser/lightning/browser/IncognitoBrowserActivity.kt similarity index 95% rename from app/src/main/java/acr/browser/lightning/_browser2/IncognitoBrowserActivity.kt rename to app/src/main/java/acr/browser/lightning/browser/IncognitoBrowserActivity.kt index a42f152c8..adc922b8f 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/IncognitoBrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/browser/IncognitoBrowserActivity.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2 +package acr.browser.lightning.browser import acr.browser.lightning.R import android.app.Activity diff --git a/app/src/main/java/acr/browser/lightning/browser/TabsView.kt b/app/src/main/java/acr/browser/lightning/browser/TabsView.kt deleted file mode 100644 index 18ea12d3b..000000000 --- a/app/src/main/java/acr/browser/lightning/browser/TabsView.kt +++ /dev/null @@ -1,41 +0,0 @@ -package acr.browser.lightning.browser - -/** - * The interface for communicating to the tab list view. - */ -interface TabsView { - - /** - * Called when a tab has been added. - */ - fun tabAdded() - - /** - * Called when a tab has been removed. - * - * @param position the position of the tab that has been removed. - */ - fun tabRemoved(position: Int) - - /** - * Called when a tab's metadata has been changed. - * - * @param position the position of the tab that has been changed. - */ - fun tabChanged(position: Int) - - /** - * Called when the tabs are completely initialized for the first time. - */ - fun tabsInitialized() - - /** - * Enables and disables the go back button. - */ - fun setGoBackEnabled(isEnabled: Boolean) - - /** - * Enables and disables the go forward button. - */ - fun setGoForwardEnabled(isEnabled: Boolean) -} diff --git a/app/src/main/java/acr/browser/lightning/browser/activity/ThemableBrowserActivity.kt b/app/src/main/java/acr/browser/lightning/browser/ThemableBrowserActivity.kt similarity index 97% rename from app/src/main/java/acr/browser/lightning/browser/activity/ThemableBrowserActivity.kt rename to app/src/main/java/acr/browser/lightning/browser/ThemableBrowserActivity.kt index 5cc6743ae..77221889e 100644 --- a/app/src/main/java/acr/browser/lightning/browser/activity/ThemableBrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/browser/ThemableBrowserActivity.kt @@ -1,8 +1,8 @@ -package acr.browser.lightning.browser.activity +package acr.browser.lightning.browser import acr.browser.lightning.AppTheme import acr.browser.lightning.R -import acr.browser.lightning._browser2.di.injector +import acr.browser.lightning.browser.di.injector import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.utils.ThemeUtils import android.content.Intent diff --git a/app/src/main/java/acr/browser/lightning/_browser2/bookmark/BookmarkRecyclerViewAdapter.kt b/app/src/main/java/acr/browser/lightning/browser/bookmark/BookmarkRecyclerViewAdapter.kt similarity index 93% rename from app/src/main/java/acr/browser/lightning/_browser2/bookmark/BookmarkRecyclerViewAdapter.kt rename to app/src/main/java/acr/browser/lightning/browser/bookmark/BookmarkRecyclerViewAdapter.kt index d9848f747..2cc72c7a9 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/bookmark/BookmarkRecyclerViewAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/bookmark/BookmarkRecyclerViewAdapter.kt @@ -1,7 +1,7 @@ -package acr.browser.lightning._browser2.bookmark +package acr.browser.lightning.browser.bookmark import acr.browser.lightning.R -import acr.browser.lightning._browser2.image.ImageLoader +import acr.browser.lightning.browser.image.ImageLoader import acr.browser.lightning.database.Bookmark import android.view.LayoutInflater import android.view.ViewGroup diff --git a/app/src/main/java/acr/browser/lightning/_browser2/bookmark/BookmarkViewHolder.kt b/app/src/main/java/acr/browser/lightning/browser/bookmark/BookmarkViewHolder.kt similarity index 94% rename from app/src/main/java/acr/browser/lightning/_browser2/bookmark/BookmarkViewHolder.kt rename to app/src/main/java/acr/browser/lightning/browser/bookmark/BookmarkViewHolder.kt index 0cefc1add..15ab62b47 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/bookmark/BookmarkViewHolder.kt +++ b/app/src/main/java/acr/browser/lightning/browser/bookmark/BookmarkViewHolder.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.bookmark +package acr.browser.lightning.browser.bookmark import acr.browser.lightning.databinding.BookmarkListItemBinding import android.view.View diff --git a/app/src/main/java/acr/browser/lightning/browser/cleanup/BasicIncognitoExitCleanup.kt b/app/src/main/java/acr/browser/lightning/browser/cleanup/BasicIncognitoExitCleanup.kt index b57b8653b..ce521e9ca 100644 --- a/app/src/main/java/acr/browser/lightning/browser/cleanup/BasicIncognitoExitCleanup.kt +++ b/app/src/main/java/acr/browser/lightning/browser/cleanup/BasicIncognitoExitCleanup.kt @@ -1,6 +1,6 @@ package acr.browser.lightning.browser.cleanup -import acr.browser.lightning._browser2.BrowserActivity +import acr.browser.lightning.browser.BrowserActivity import acr.browser.lightning.utils.WebUtils import android.webkit.WebView import javax.inject.Inject diff --git a/app/src/main/java/acr/browser/lightning/browser/cleanup/DelegatingExitCleanup.kt b/app/src/main/java/acr/browser/lightning/browser/cleanup/DelegatingExitCleanup.kt index 64690874e..3027bb2d3 100644 --- a/app/src/main/java/acr/browser/lightning/browser/cleanup/DelegatingExitCleanup.kt +++ b/app/src/main/java/acr/browser/lightning/browser/cleanup/DelegatingExitCleanup.kt @@ -1,8 +1,8 @@ package acr.browser.lightning.browser.cleanup import acr.browser.lightning.Capabilities -import acr.browser.lightning._browser2.BrowserActivity -import acr.browser.lightning._browser2.DefaultBrowserActivity +import acr.browser.lightning.browser.BrowserActivity +import acr.browser.lightning.browser.DefaultBrowserActivity import acr.browser.lightning.isSupported import android.webkit.WebView import javax.inject.Inject diff --git a/app/src/main/java/acr/browser/lightning/browser/cleanup/EnhancedIncognitoExitCleanup.kt b/app/src/main/java/acr/browser/lightning/browser/cleanup/EnhancedIncognitoExitCleanup.kt index 17f09c054..1bb4df1c1 100644 --- a/app/src/main/java/acr/browser/lightning/browser/cleanup/EnhancedIncognitoExitCleanup.kt +++ b/app/src/main/java/acr/browser/lightning/browser/cleanup/EnhancedIncognitoExitCleanup.kt @@ -1,6 +1,6 @@ package acr.browser.lightning.browser.cleanup -import acr.browser.lightning._browser2.BrowserActivity +import acr.browser.lightning.browser.BrowserActivity import acr.browser.lightning.log.Logger import acr.browser.lightning.utils.WebUtils import android.webkit.WebView diff --git a/app/src/main/java/acr/browser/lightning/browser/cleanup/ExitCleanup.kt b/app/src/main/java/acr/browser/lightning/browser/cleanup/ExitCleanup.kt index 220b936da..b15170107 100644 --- a/app/src/main/java/acr/browser/lightning/browser/cleanup/ExitCleanup.kt +++ b/app/src/main/java/acr/browser/lightning/browser/cleanup/ExitCleanup.kt @@ -1,6 +1,6 @@ package acr.browser.lightning.browser.cleanup -import acr.browser.lightning._browser2.BrowserActivity +import acr.browser.lightning.browser.BrowserActivity import android.webkit.WebView /** diff --git a/app/src/main/java/acr/browser/lightning/browser/cleanup/NormalExitCleanup.kt b/app/src/main/java/acr/browser/lightning/browser/cleanup/NormalExitCleanup.kt index 0180a035a..2961a7fda 100644 --- a/app/src/main/java/acr/browser/lightning/browser/cleanup/NormalExitCleanup.kt +++ b/app/src/main/java/acr/browser/lightning/browser/cleanup/NormalExitCleanup.kt @@ -1,8 +1,8 @@ package acr.browser.lightning.browser.cleanup -import acr.browser.lightning._browser2.BrowserActivity +import acr.browser.lightning.browser.BrowserActivity import acr.browser.lightning.database.history.HistoryDatabase -import acr.browser.lightning._browser2.di.DatabaseScheduler +import acr.browser.lightning.browser.di.DatabaseScheduler import acr.browser.lightning.log.Logger import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.utils.WebUtils diff --git a/app/src/main/java/acr/browser/lightning/_browser2/color/ColorAnimator.kt b/app/src/main/java/acr/browser/lightning/browser/color/ColorAnimator.kt similarity index 97% rename from app/src/main/java/acr/browser/lightning/_browser2/color/ColorAnimator.kt rename to app/src/main/java/acr/browser/lightning/browser/color/ColorAnimator.kt index d5fbafb93..75cb9501d 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/color/ColorAnimator.kt +++ b/app/src/main/java/acr/browser/lightning/browser/color/ColorAnimator.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.color +package acr.browser.lightning.browser.color import acr.browser.lightning.utils.DrawableUtils import acr.browser.lightning.utils.Utils diff --git a/app/src/main/java/acr/browser/lightning/_browser2/data/CookieAdministrator.kt b/app/src/main/java/acr/browser/lightning/browser/data/CookieAdministrator.kt similarity index 83% rename from app/src/main/java/acr/browser/lightning/_browser2/data/CookieAdministrator.kt rename to app/src/main/java/acr/browser/lightning/browser/data/CookieAdministrator.kt index d500cfb2b..ef98a0139 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/data/CookieAdministrator.kt +++ b/app/src/main/java/acr/browser/lightning/browser/data/CookieAdministrator.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.data +package acr.browser.lightning.browser.data /** * The administrator used to manage browser cookie preferences. diff --git a/app/src/main/java/acr/browser/lightning/_browser2/data/DefaultCookieAdministrator.kt b/app/src/main/java/acr/browser/lightning/browser/data/DefaultCookieAdministrator.kt similarity index 94% rename from app/src/main/java/acr/browser/lightning/_browser2/data/DefaultCookieAdministrator.kt rename to app/src/main/java/acr/browser/lightning/browser/data/DefaultCookieAdministrator.kt index 994e5477e..e08f05f85 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/data/DefaultCookieAdministrator.kt +++ b/app/src/main/java/acr/browser/lightning/browser/data/DefaultCookieAdministrator.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.data +package acr.browser.lightning.browser.data import acr.browser.lightning.preference.UserPreferences import android.app.Activity diff --git a/app/src/main/java/acr/browser/lightning/_browser2/data/IncognitoCookieAdministrator.kt b/app/src/main/java/acr/browser/lightning/browser/data/IncognitoCookieAdministrator.kt similarity index 95% rename from app/src/main/java/acr/browser/lightning/_browser2/data/IncognitoCookieAdministrator.kt rename to app/src/main/java/acr/browser/lightning/browser/data/IncognitoCookieAdministrator.kt index 87c0ad101..161050d1d 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/data/IncognitoCookieAdministrator.kt +++ b/app/src/main/java/acr/browser/lightning/browser/data/IncognitoCookieAdministrator.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.data +package acr.browser.lightning.browser.data import acr.browser.lightning.Capabilities import acr.browser.lightning.isSupported diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/AppBindsModule.kt b/app/src/main/java/acr/browser/lightning/browser/di/AppBindsModule.kt similarity index 94% rename from app/src/main/java/acr/browser/lightning/_browser2/di/AppBindsModule.kt rename to app/src/main/java/acr/browser/lightning/browser/di/AppBindsModule.kt index d7842ed33..2f0c211e2 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/di/AppBindsModule.kt +++ b/app/src/main/java/acr/browser/lightning/browser/di/AppBindsModule.kt @@ -1,7 +1,7 @@ -package acr.browser.lightning._browser2.di +package acr.browser.lightning.browser.di -import acr.browser.lightning._browser2.theme.LegacyThemeProvider -import acr.browser.lightning._browser2.theme.ThemeProvider +import acr.browser.lightning.browser.theme.LegacyThemeProvider +import acr.browser.lightning.browser.theme.ThemeProvider import acr.browser.lightning.adblock.allowlist.AllowListModel import acr.browser.lightning.adblock.allowlist.SessionAllowListModel import acr.browser.lightning.adblock.source.AssetsHostsDataSource diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/AppComponent.kt b/app/src/main/java/acr/browser/lightning/browser/di/AppComponent.kt similarity index 93% rename from app/src/main/java/acr/browser/lightning/_browser2/di/AppComponent.kt rename to app/src/main/java/acr/browser/lightning/browser/di/AppComponent.kt index 2ffb8d38c..796f4d730 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/di/AppComponent.kt +++ b/app/src/main/java/acr/browser/lightning/browser/di/AppComponent.kt @@ -1,10 +1,10 @@ -package acr.browser.lightning._browser2.di +package acr.browser.lightning.browser.di import acr.browser.lightning.BrowserApp import acr.browser.lightning.adblock.BloomFilterAdBlocker import acr.browser.lightning.adblock.NoOpAdBlocker -import acr.browser.lightning.browser.SearchBoxModel -import acr.browser.lightning.browser.activity.ThemableBrowserActivity +import acr.browser.lightning.browser.search.SearchBoxModel +import acr.browser.lightning.browser.ThemableBrowserActivity import acr.browser.lightning.device.BuildInfo import acr.browser.lightning.dialog.LightningDialogBuilder import acr.browser.lightning.download.LightningDownloadListener diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/AppModule.kt b/app/src/main/java/acr/browser/lightning/browser/di/AppModule.kt similarity index 99% rename from app/src/main/java/acr/browser/lightning/_browser2/di/AppModule.kt rename to app/src/main/java/acr/browser/lightning/browser/di/AppModule.kt index cfd570763..019c562d3 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/di/AppModule.kt +++ b/app/src/main/java/acr/browser/lightning/browser/di/AppModule.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.di +package acr.browser.lightning.browser.di import acr.browser.lightning.device.BuildInfo import acr.browser.lightning.device.BuildType diff --git a/app/src/main/java/acr/browser/lightning/browser/di/Browser2BindsModule.kt b/app/src/main/java/acr/browser/lightning/browser/di/Browser2BindsModule.kt new file mode 100644 index 000000000..bbd590453 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/browser/di/Browser2BindsModule.kt @@ -0,0 +1,30 @@ +package acr.browser.lightning.browser.di + +import acr.browser.lightning.browser.BrowserContract +import acr.browser.lightning.browser.BrowserNavigator +import acr.browser.lightning.browser.image.FaviconImageLoader +import acr.browser.lightning.browser.image.ImageLoader +import acr.browser.lightning.browser.proxy.Proxy +import acr.browser.lightning.browser.proxy.ProxyAdapter +import acr.browser.lightning.browser.tab.TabsRepository +import dagger.Binds +import dagger.Module + +/** + * Created by anthonycr on 9/15/20. + */ +@Module +interface Browser2BindsModule { + + @Binds + fun bindsBrowserModel(tabsRepository: TabsRepository): BrowserContract.Model + + @Binds + fun bindsFaviconImageLoader(faviconImageLoader: FaviconImageLoader): ImageLoader + + @Binds + fun bindsBrowserNavigator(browserNavigator: BrowserNavigator): BrowserContract.Navigator + + @Binds + fun bindsProxy(proxyAdapter: ProxyAdapter): Proxy +} diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt b/app/src/main/java/acr/browser/lightning/browser/di/Browser2Component.kt similarity index 92% rename from app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt rename to app/src/main/java/acr/browser/lightning/browser/di/Browser2Component.kt index 6fa476d83..1ce4b77d5 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Component.kt +++ b/app/src/main/java/acr/browser/lightning/browser/di/Browser2Component.kt @@ -1,6 +1,6 @@ -package acr.browser.lightning._browser2.di +package acr.browser.lightning.browser.di -import acr.browser.lightning._browser2.BrowserActivity +import acr.browser.lightning.browser.BrowserActivity import android.app.Activity import android.content.Intent import android.view.View diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt b/app/src/main/java/acr/browser/lightning/browser/di/Browser2Module.kt similarity index 74% rename from app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt rename to app/src/main/java/acr/browser/lightning/browser/di/Browser2Module.kt index b8f1f8f67..99ba1187e 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Module.kt +++ b/app/src/main/java/acr/browser/lightning/browser/di/Browser2Module.kt @@ -1,24 +1,24 @@ -package acr.browser.lightning._browser2.di +package acr.browser.lightning.browser.di import acr.browser.lightning.R -import acr.browser.lightning._browser2.BrowserContract -import acr.browser.lightning._browser2.data.CookieAdministrator -import acr.browser.lightning._browser2.data.DefaultCookieAdministrator -import acr.browser.lightning._browser2.history.DefaultHistoryRecord -import acr.browser.lightning._browser2.history.HistoryRecord -import acr.browser.lightning._browser2.history.NoOpHistoryRecord -import acr.browser.lightning._browser2.image.IconFreeze -import acr.browser.lightning._browser2.notification.DefaultTabCountNotifier -import acr.browser.lightning._browser2.notification.IncognitoTabCountNotifier -import acr.browser.lightning._browser2.notification.TabCountNotifier -import acr.browser.lightning._browser2.search.IntentExtractor -import acr.browser.lightning._browser2.tab.DefaultUserAgent -import acr.browser.lightning._browser2.tab.bundle.BundleStore -import acr.browser.lightning._browser2.tab.bundle.DefaultBundleStore -import acr.browser.lightning._browser2.tab.bundle.IncognitoBundleStore -import acr.browser.lightning._browser2.ui.BookmarkConfiguration -import acr.browser.lightning._browser2.ui.TabConfiguration -import acr.browser.lightning._browser2.ui.UiConfiguration +import acr.browser.lightning.browser.BrowserContract +import acr.browser.lightning.browser.data.CookieAdministrator +import acr.browser.lightning.browser.data.DefaultCookieAdministrator +import acr.browser.lightning.browser.history.DefaultHistoryRecord +import acr.browser.lightning.browser.history.HistoryRecord +import acr.browser.lightning.browser.history.NoOpHistoryRecord +import acr.browser.lightning.browser.image.IconFreeze +import acr.browser.lightning.browser.notification.DefaultTabCountNotifier +import acr.browser.lightning.browser.notification.IncognitoTabCountNotifier +import acr.browser.lightning.browser.notification.TabCountNotifier +import acr.browser.lightning.browser.search.IntentExtractor +import acr.browser.lightning.browser.tab.DefaultUserAgent +import acr.browser.lightning.browser.tab.bundle.BundleStore +import acr.browser.lightning.browser.tab.bundle.DefaultBundleStore +import acr.browser.lightning.browser.tab.bundle.IncognitoBundleStore +import acr.browser.lightning.browser.ui.BookmarkConfiguration +import acr.browser.lightning.browser.ui.TabConfiguration +import acr.browser.lightning.browser.ui.UiConfiguration import acr.browser.lightning.adblock.AdBlocker import acr.browser.lightning.adblock.BloomFilterAdBlocker import acr.browser.lightning.adblock.NoOpAdBlocker diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Scope.kt b/app/src/main/java/acr/browser/lightning/browser/di/Browser2Scope.kt similarity index 73% rename from app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Scope.kt rename to app/src/main/java/acr/browser/lightning/browser/di/Browser2Scope.kt index a2ff88009..6d289ba55 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/di/Browser2Scope.kt +++ b/app/src/main/java/acr/browser/lightning/browser/di/Browser2Scope.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.di +package acr.browser.lightning.browser.di import javax.inject.Scope diff --git a/app/src/main/java/acr/browser/lightning/_browser2/di/DiExtensions.kt b/app/src/main/java/acr/browser/lightning/browser/di/DiExtensions.kt similarity index 95% rename from app/src/main/java/acr/browser/lightning/_browser2/di/DiExtensions.kt rename to app/src/main/java/acr/browser/lightning/browser/di/DiExtensions.kt index eae0a6b49..1fff1296a 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/di/DiExtensions.kt +++ b/app/src/main/java/acr/browser/lightning/browser/di/DiExtensions.kt @@ -1,6 +1,6 @@ @file:JvmName("Injector") -package acr.browser.lightning._browser2.di +package acr.browser.lightning.browser.di import acr.browser.lightning.BrowserApp import android.content.Context diff --git a/app/src/main/java/acr/browser/lightning/_browser2/download/DownloadPermissionsHelper.kt b/app/src/main/java/acr/browser/lightning/browser/download/DownloadPermissionsHelper.kt similarity index 97% rename from app/src/main/java/acr/browser/lightning/_browser2/download/DownloadPermissionsHelper.kt rename to app/src/main/java/acr/browser/lightning/browser/download/DownloadPermissionsHelper.kt index d36fa64bf..c208ea7a8 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/download/DownloadPermissionsHelper.kt +++ b/app/src/main/java/acr/browser/lightning/browser/download/DownloadPermissionsHelper.kt @@ -1,9 +1,9 @@ -package acr.browser.lightning._browser2.download +package acr.browser.lightning.browser.download import acr.browser.lightning.R import acr.browser.lightning.database.downloads.DownloadEntry import acr.browser.lightning.database.downloads.DownloadsRepository -import acr.browser.lightning._browser2.di.DatabaseScheduler +import acr.browser.lightning.browser.di.DatabaseScheduler import acr.browser.lightning.dialog.BrowserDialog.setDialogSize import acr.browser.lightning.download.DownloadHandler import acr.browser.lightning.log.Logger diff --git a/app/src/main/java/acr/browser/lightning/_browser2/download/PendingDownload.kt b/app/src/main/java/acr/browser/lightning/browser/download/PendingDownload.kt similarity index 81% rename from app/src/main/java/acr/browser/lightning/_browser2/download/PendingDownload.kt rename to app/src/main/java/acr/browser/lightning/browser/download/PendingDownload.kt index acde59b4e..4cba3ca29 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/download/PendingDownload.kt +++ b/app/src/main/java/acr/browser/lightning/browser/download/PendingDownload.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.download +package acr.browser.lightning.browser.download /** * Created by anthonycr on 7/25/21. diff --git a/app/src/main/java/acr/browser/lightning/_browser2/history/DefaultHistoryRecord.kt b/app/src/main/java/acr/browser/lightning/browser/history/DefaultHistoryRecord.kt similarity index 83% rename from app/src/main/java/acr/browser/lightning/_browser2/history/DefaultHistoryRecord.kt rename to app/src/main/java/acr/browser/lightning/browser/history/DefaultHistoryRecord.kt index dd04d8732..5f04f4e94 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/history/DefaultHistoryRecord.kt +++ b/app/src/main/java/acr/browser/lightning/browser/history/DefaultHistoryRecord.kt @@ -1,7 +1,7 @@ -package acr.browser.lightning._browser2.history +package acr.browser.lightning.browser.history import acr.browser.lightning.database.history.HistoryRepository -import acr.browser.lightning._browser2.di.DatabaseScheduler +import acr.browser.lightning.browser.di.DatabaseScheduler import io.reactivex.Scheduler import javax.inject.Inject diff --git a/app/src/main/java/acr/browser/lightning/_browser2/history/HistoryRecord.kt b/app/src/main/java/acr/browser/lightning/browser/history/HistoryRecord.kt similarity index 71% rename from app/src/main/java/acr/browser/lightning/_browser2/history/HistoryRecord.kt rename to app/src/main/java/acr/browser/lightning/browser/history/HistoryRecord.kt index d0acb43f6..2da298cbe 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/history/HistoryRecord.kt +++ b/app/src/main/java/acr/browser/lightning/browser/history/HistoryRecord.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.history +package acr.browser.lightning.browser.history /** * Created by anthonycr on 9/14/20. diff --git a/app/src/main/java/acr/browser/lightning/_browser2/history/NoOpHistoryRecord.kt b/app/src/main/java/acr/browser/lightning/browser/history/NoOpHistoryRecord.kt similarity index 76% rename from app/src/main/java/acr/browser/lightning/_browser2/history/NoOpHistoryRecord.kt rename to app/src/main/java/acr/browser/lightning/browser/history/NoOpHistoryRecord.kt index 015b4cb51..72c687f8f 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/history/NoOpHistoryRecord.kt +++ b/app/src/main/java/acr/browser/lightning/browser/history/NoOpHistoryRecord.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.history +package acr.browser.lightning.browser.history /** * Created by anthonycr on 9/14/20. diff --git a/app/src/main/java/acr/browser/lightning/_browser2/image/FaviconImageLoader.kt b/app/src/main/java/acr/browser/lightning/browser/image/FaviconImageLoader.kt similarity index 94% rename from app/src/main/java/acr/browser/lightning/_browser2/image/FaviconImageLoader.kt rename to app/src/main/java/acr/browser/lightning/browser/image/FaviconImageLoader.kt index 37d548564..a87d197aa 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/image/FaviconImageLoader.kt +++ b/app/src/main/java/acr/browser/lightning/browser/image/FaviconImageLoader.kt @@ -1,9 +1,9 @@ -package acr.browser.lightning._browser2.image +package acr.browser.lightning.browser.image import acr.browser.lightning.R import acr.browser.lightning.database.Bookmark -import acr.browser.lightning._browser2.di.MainScheduler -import acr.browser.lightning._browser2.di.NetworkScheduler +import acr.browser.lightning.browser.di.MainScheduler +import acr.browser.lightning.browser.di.NetworkScheduler import acr.browser.lightning.extensions.drawable import acr.browser.lightning.favicon.FaviconModel import android.app.Application diff --git a/app/src/main/java/acr/browser/lightning/_browser2/image/IconFreeze.kt b/app/src/main/java/acr/browser/lightning/browser/image/IconFreeze.kt similarity index 70% rename from app/src/main/java/acr/browser/lightning/_browser2/image/IconFreeze.kt rename to app/src/main/java/acr/browser/lightning/browser/image/IconFreeze.kt index f4dfea41c..d74724f0e 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/image/IconFreeze.kt +++ b/app/src/main/java/acr/browser/lightning/browser/image/IconFreeze.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.image +package acr.browser.lightning.browser.image import javax.inject.Qualifier diff --git a/app/src/main/java/acr/browser/lightning/_browser2/image/ImageLoader.kt b/app/src/main/java/acr/browser/lightning/browser/image/ImageLoader.kt similarity index 82% rename from app/src/main/java/acr/browser/lightning/_browser2/image/ImageLoader.kt rename to app/src/main/java/acr/browser/lightning/browser/image/ImageLoader.kt index 034997412..174e94951 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/image/ImageLoader.kt +++ b/app/src/main/java/acr/browser/lightning/browser/image/ImageLoader.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.image +package acr.browser.lightning.browser.image import acr.browser.lightning.database.Bookmark import android.widget.ImageView diff --git a/app/src/main/java/acr/browser/lightning/_browser2/keys/KeyCombo.kt b/app/src/main/java/acr/browser/lightning/browser/keys/KeyCombo.kt similarity index 86% rename from app/src/main/java/acr/browser/lightning/_browser2/keys/KeyCombo.kt rename to app/src/main/java/acr/browser/lightning/browser/keys/KeyCombo.kt index 5e2bd5eec..7c8d38169 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/keys/KeyCombo.kt +++ b/app/src/main/java/acr/browser/lightning/browser/keys/KeyCombo.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.keys +package acr.browser.lightning.browser.keys /** * Created by anthonycr on 9/16/20. diff --git a/app/src/main/java/acr/browser/lightning/_browser2/keys/KeyEventAdapter.kt b/app/src/main/java/acr/browser/lightning/browser/keys/KeyEventAdapter.kt similarity index 98% rename from app/src/main/java/acr/browser/lightning/_browser2/keys/KeyEventAdapter.kt rename to app/src/main/java/acr/browser/lightning/browser/keys/KeyEventAdapter.kt index 568037912..886936ffb 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/keys/KeyEventAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/keys/KeyEventAdapter.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.keys +package acr.browser.lightning.browser.keys import android.view.KeyEvent import javax.inject.Inject diff --git a/app/src/main/java/acr/browser/lightning/_browser2/menu/MenuItemAdapter.kt b/app/src/main/java/acr/browser/lightning/browser/menu/MenuItemAdapter.kt similarity index 96% rename from app/src/main/java/acr/browser/lightning/_browser2/menu/MenuItemAdapter.kt rename to app/src/main/java/acr/browser/lightning/browser/menu/MenuItemAdapter.kt index adf5faae0..779b59ebb 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/menu/MenuItemAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/menu/MenuItemAdapter.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.menu +package acr.browser.lightning.browser.menu import acr.browser.lightning.R import android.view.MenuItem diff --git a/app/src/main/java/acr/browser/lightning/_browser2/menu/MenuSelection.kt b/app/src/main/java/acr/browser/lightning/browser/menu/MenuSelection.kt similarity index 85% rename from app/src/main/java/acr/browser/lightning/_browser2/menu/MenuSelection.kt rename to app/src/main/java/acr/browser/lightning/browser/menu/MenuSelection.kt index 83fe0fdf9..b884460f3 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/menu/MenuSelection.kt +++ b/app/src/main/java/acr/browser/lightning/browser/menu/MenuSelection.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.menu +package acr.browser.lightning.browser.menu /** * Created by anthonycr on 9/16/20. diff --git a/app/src/main/java/acr/browser/lightning/_browser2/notification/DefaultTabCountNotifier.kt b/app/src/main/java/acr/browser/lightning/browser/notification/DefaultTabCountNotifier.kt similarity index 74% rename from app/src/main/java/acr/browser/lightning/_browser2/notification/DefaultTabCountNotifier.kt rename to app/src/main/java/acr/browser/lightning/browser/notification/DefaultTabCountNotifier.kt index 84f0d1241..3611cf7be 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/notification/DefaultTabCountNotifier.kt +++ b/app/src/main/java/acr/browser/lightning/browser/notification/DefaultTabCountNotifier.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.notification +package acr.browser.lightning.browser.notification /** * Created by anthonycr on 7/27/22. diff --git a/app/src/main/java/acr/browser/lightning/_browser2/notification/IncognitoTabCountNotifier.kt b/app/src/main/java/acr/browser/lightning/browser/notification/IncognitoTabCountNotifier.kt similarity index 89% rename from app/src/main/java/acr/browser/lightning/_browser2/notification/IncognitoTabCountNotifier.kt rename to app/src/main/java/acr/browser/lightning/browser/notification/IncognitoTabCountNotifier.kt index fbc46b89f..36c7a0c6f 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/notification/IncognitoTabCountNotifier.kt +++ b/app/src/main/java/acr/browser/lightning/browser/notification/IncognitoTabCountNotifier.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.notification +package acr.browser.lightning.browser.notification import acr.browser.lightning.notifications.IncognitoNotification import javax.inject.Inject diff --git a/app/src/main/java/acr/browser/lightning/_browser2/notification/TabCountNotifier.kt b/app/src/main/java/acr/browser/lightning/browser/notification/TabCountNotifier.kt similarity index 69% rename from app/src/main/java/acr/browser/lightning/_browser2/notification/TabCountNotifier.kt rename to app/src/main/java/acr/browser/lightning/browser/notification/TabCountNotifier.kt index 411e8631e..44f5fa50f 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/notification/TabCountNotifier.kt +++ b/app/src/main/java/acr/browser/lightning/browser/notification/TabCountNotifier.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.notification +package acr.browser.lightning.browser.notification /** * Created by anthonycr on 7/27/22. diff --git a/app/src/main/java/acr/browser/lightning/_browser2/proxy/Proxy.kt b/app/src/main/java/acr/browser/lightning/browser/proxy/Proxy.kt similarity index 68% rename from app/src/main/java/acr/browser/lightning/_browser2/proxy/Proxy.kt rename to app/src/main/java/acr/browser/lightning/browser/proxy/Proxy.kt index 3b4ba2d78..518883bab 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/proxy/Proxy.kt +++ b/app/src/main/java/acr/browser/lightning/browser/proxy/Proxy.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.proxy +package acr.browser.lightning.browser.proxy /** * Created by anthonycr on 8/2/22. diff --git a/app/src/main/java/acr/browser/lightning/_browser2/proxy/ProxyAdapter.kt b/app/src/main/java/acr/browser/lightning/browser/proxy/ProxyAdapter.kt similarity index 90% rename from app/src/main/java/acr/browser/lightning/_browser2/proxy/ProxyAdapter.kt rename to app/src/main/java/acr/browser/lightning/browser/proxy/ProxyAdapter.kt index 31abe2f82..17d11a6a1 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/proxy/ProxyAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/proxy/ProxyAdapter.kt @@ -1,7 +1,6 @@ -package acr.browser.lightning._browser2.proxy +package acr.browser.lightning.browser.proxy -import acr.browser.lightning._browser2.BrowserActivity -import acr.browser.lightning._browser2.di.Browser2Scope +import acr.browser.lightning.browser.BrowserActivity import acr.browser.lightning.utils.ProxyUtils import android.app.Activity import android.app.Application diff --git a/app/src/main/java/acr/browser/lightning/browser/ProxyChoice.kt b/app/src/main/java/acr/browser/lightning/browser/proxy/ProxyChoice.kt similarity index 82% rename from app/src/main/java/acr/browser/lightning/browser/ProxyChoice.kt rename to app/src/main/java/acr/browser/lightning/browser/proxy/ProxyChoice.kt index ed89b18bf..e798c20c4 100644 --- a/app/src/main/java/acr/browser/lightning/browser/ProxyChoice.kt +++ b/app/src/main/java/acr/browser/lightning/browser/proxy/ProxyChoice.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning.browser +package acr.browser.lightning.browser.proxy import acr.browser.lightning.preference.IntEnum diff --git a/app/src/main/java/acr/browser/lightning/_browser2/search/IntentExtractor.kt b/app/src/main/java/acr/browser/lightning/browser/search/IntentExtractor.kt similarity index 92% rename from app/src/main/java/acr/browser/lightning/_browser2/search/IntentExtractor.kt rename to app/src/main/java/acr/browser/lightning/browser/search/IntentExtractor.kt index 294205e78..b1100b1aa 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/search/IntentExtractor.kt +++ b/app/src/main/java/acr/browser/lightning/browser/search/IntentExtractor.kt @@ -1,6 +1,6 @@ -package acr.browser.lightning._browser2.search +package acr.browser.lightning.browser.search -import acr.browser.lightning._browser2.BrowserContract +import acr.browser.lightning.browser.BrowserContract import acr.browser.lightning.search.SearchEngineProvider import acr.browser.lightning.utils.QUERY_PLACE_HOLDER import acr.browser.lightning.utils.smartUrlFilter diff --git a/app/src/main/java/acr/browser/lightning/browser/SearchBoxDisplayChoice.kt b/app/src/main/java/acr/browser/lightning/browser/search/SearchBoxDisplayChoice.kt similarity index 84% rename from app/src/main/java/acr/browser/lightning/browser/SearchBoxDisplayChoice.kt rename to app/src/main/java/acr/browser/lightning/browser/search/SearchBoxDisplayChoice.kt index 0f35b6cc3..fa3d0b8d1 100644 --- a/app/src/main/java/acr/browser/lightning/browser/SearchBoxDisplayChoice.kt +++ b/app/src/main/java/acr/browser/lightning/browser/search/SearchBoxDisplayChoice.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning.browser +package acr.browser.lightning.browser.search import acr.browser.lightning.preference.IntEnum diff --git a/app/src/main/java/acr/browser/lightning/browser/SearchBoxModel.kt b/app/src/main/java/acr/browser/lightning/browser/search/SearchBoxModel.kt similarity index 97% rename from app/src/main/java/acr/browser/lightning/browser/SearchBoxModel.kt rename to app/src/main/java/acr/browser/lightning/browser/search/SearchBoxModel.kt index 286e8f682..4cfc5826e 100644 --- a/app/src/main/java/acr/browser/lightning/browser/SearchBoxModel.kt +++ b/app/src/main/java/acr/browser/lightning/browser/search/SearchBoxModel.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning.browser +package acr.browser.lightning.browser.search import acr.browser.lightning.R import acr.browser.lightning.preference.UserPreferences diff --git a/app/src/main/java/acr/browser/lightning/_browser2/search/SearchListener.kt b/app/src/main/java/acr/browser/lightning/browser/search/SearchListener.kt similarity index 96% rename from app/src/main/java/acr/browser/lightning/_browser2/search/SearchListener.kt rename to app/src/main/java/acr/browser/lightning/browser/search/SearchListener.kt index 85688d4ed..6648ac073 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/search/SearchListener.kt +++ b/app/src/main/java/acr/browser/lightning/browser/search/SearchListener.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.search +package acr.browser.lightning.browser.search import android.view.KeyEvent import android.view.View diff --git a/app/src/main/java/acr/browser/lightning/browser/activity/StyleRemovingTextWatcher.kt b/app/src/main/java/acr/browser/lightning/browser/search/StyleRemovingTextWatcher.kt similarity index 93% rename from app/src/main/java/acr/browser/lightning/browser/activity/StyleRemovingTextWatcher.kt rename to app/src/main/java/acr/browser/lightning/browser/search/StyleRemovingTextWatcher.kt index d8e95e26c..f45d68ab6 100644 --- a/app/src/main/java/acr/browser/lightning/browser/activity/StyleRemovingTextWatcher.kt +++ b/app/src/main/java/acr/browser/lightning/browser/search/StyleRemovingTextWatcher.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning.browser.activity +package acr.browser.lightning.browser.search import android.text.Editable import android.text.TextWatcher diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/DefaultUserAgent.kt b/app/src/main/java/acr/browser/lightning/browser/tab/DefaultUserAgent.kt similarity index 73% rename from app/src/main/java/acr/browser/lightning/_browser2/tab/DefaultUserAgent.kt rename to app/src/main/java/acr/browser/lightning/browser/tab/DefaultUserAgent.kt index 078f65e6d..dbcc55a38 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/DefaultUserAgent.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/DefaultUserAgent.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.tab +package acr.browser.lightning.browser.tab import javax.inject.Qualifier diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/DesktopTabRecyclerViewAdapter.kt b/app/src/main/java/acr/browser/lightning/browser/tab/DesktopTabRecyclerViewAdapter.kt similarity index 98% rename from app/src/main/java/acr/browser/lightning/_browser2/tab/DesktopTabRecyclerViewAdapter.kt rename to app/src/main/java/acr/browser/lightning/browser/tab/DesktopTabRecyclerViewAdapter.kt index 8b432a473..e02e41469 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/DesktopTabRecyclerViewAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/DesktopTabRecyclerViewAdapter.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.tab +package acr.browser.lightning.browser.tab import acr.browser.lightning.R import acr.browser.lightning.extensions.* diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/DrawerTabRecyclerViewAdapter.kt b/app/src/main/java/acr/browser/lightning/browser/tab/DrawerTabRecyclerViewAdapter.kt similarity index 98% rename from app/src/main/java/acr/browser/lightning/_browser2/tab/DrawerTabRecyclerViewAdapter.kt rename to app/src/main/java/acr/browser/lightning/browser/tab/DrawerTabRecyclerViewAdapter.kt index 4cc9fc1bd..3b451455c 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/DrawerTabRecyclerViewAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/DrawerTabRecyclerViewAdapter.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.tab +package acr.browser.lightning.browser.tab import acr.browser.lightning.R import acr.browser.lightning.extensions.desaturate diff --git a/app/src/main/java/acr/browser/lightning/browser/RecentTabModel.kt b/app/src/main/java/acr/browser/lightning/browser/tab/RecentTabModel.kt similarity index 94% rename from app/src/main/java/acr/browser/lightning/browser/RecentTabModel.kt rename to app/src/main/java/acr/browser/lightning/browser/tab/RecentTabModel.kt index be97b8578..8373da5de 100644 --- a/app/src/main/java/acr/browser/lightning/browser/RecentTabModel.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/RecentTabModel.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning.browser +package acr.browser.lightning.browser.tab import acr.browser.lightning.extensions.popIfNotEmpty import android.os.Bundle diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabAdapter.kt similarity index 97% rename from app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt rename to app/src/main/java/acr/browser/lightning/browser/tab/TabAdapter.kt index 214209ee0..20ab1273e 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabAdapter.kt @@ -1,7 +1,7 @@ -package acr.browser.lightning._browser2.tab +package acr.browser.lightning.browser.tab -import acr.browser.lightning._browser2.download.PendingDownload -import acr.browser.lightning._browser2.proxy.Proxy +import acr.browser.lightning.browser.download.PendingDownload +import acr.browser.lightning.browser.proxy.Proxy import acr.browser.lightning.constant.DESKTOP_USER_AGENT import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.preference.userAgent diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabFactory.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabFactory.kt similarity index 89% rename from app/src/main/java/acr/browser/lightning/_browser2/tab/TabFactory.kt rename to app/src/main/java/acr/browser/lightning/browser/tab/TabFactory.kt index 600372ba6..311a9f882 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabFactory.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabFactory.kt @@ -1,10 +1,10 @@ -package acr.browser.lightning._browser2.tab +package acr.browser.lightning.browser.tab -import acr.browser.lightning._browser2.image.IconFreeze -import acr.browser.lightning._browser2.proxy.Proxy +import acr.browser.lightning.browser.image.IconFreeze +import acr.browser.lightning.browser.proxy.Proxy import acr.browser.lightning.adblock.AdBlocker import acr.browser.lightning.adblock.allowlist.AllowListModel -import acr.browser.lightning._browser2.di.DiskScheduler +import acr.browser.lightning.browser.di.DiskScheduler import acr.browser.lightning.favicon.FaviconModel import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.view.TabInitializer diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabModel.kt similarity index 94% rename from app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt rename to app/src/main/java/acr/browser/lightning/browser/tab/TabModel.kt index dad3e7769..549f9703a 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabModel.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabModel.kt @@ -1,6 +1,6 @@ -package acr.browser.lightning._browser2.tab +package acr.browser.lightning.browser.tab -import acr.browser.lightning._browser2.download.PendingDownload +import acr.browser.lightning.browser.download.PendingDownload import acr.browser.lightning.ssl.SslCertificateInfo import acr.browser.lightning.ssl.SslState import acr.browser.lightning.utils.Option diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabPager.kt similarity index 82% rename from app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt rename to app/src/main/java/acr/browser/lightning/browser/tab/TabPager.kt index 9a28c5bf4..4985ec31b 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabPager.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabPager.kt @@ -1,13 +1,13 @@ -package acr.browser.lightning._browser2.tab +package acr.browser.lightning.browser.tab -import acr.browser.lightning._browser2.di.Browser2Scope -import acr.browser.lightning._browser2.view.WebViewLongPressHandler -import acr.browser.lightning._browser2.view.WebViewScrollCoordinator +import acr.browser.lightning.browser.di.Browser2Scope +import acr.browser.lightning.browser.view.WebViewLongPressHandler +import acr.browser.lightning.browser.view.WebViewScrollCoordinator import android.view.ViewGroup import android.webkit.WebView import android.widget.FrameLayout import androidx.core.view.children -import acr.browser.lightning._browser2.view.targetUrl.LongPress +import acr.browser.lightning.browser.view.targetUrl.LongPress import javax.inject.Inject /** diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabViewHolder.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabViewHolder.kt similarity index 96% rename from app/src/main/java/acr/browser/lightning/_browser2/tab/TabViewHolder.kt rename to app/src/main/java/acr/browser/lightning/browser/tab/TabViewHolder.kt index eb9d4998b..94bd3af9c 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabViewHolder.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabViewHolder.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.tab +package acr.browser.lightning.browser.tab import acr.browser.lightning.R import android.view.View diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabViewState.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabViewState.kt similarity index 81% rename from app/src/main/java/acr/browser/lightning/_browser2/tab/TabViewState.kt rename to app/src/main/java/acr/browser/lightning/browser/tab/TabViewState.kt index d02243d58..6c9a4359a 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabViewState.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabViewState.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.tab +package acr.browser.lightning.browser.tab import android.graphics.Bitmap diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabWebChromeClient.kt similarity index 99% rename from app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt rename to app/src/main/java/acr/browser/lightning/browser/tab/TabWebChromeClient.kt index 3eb4f9772..228b29d43 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebChromeClient.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabWebChromeClient.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.tab +package acr.browser.lightning.browser.tab import acr.browser.lightning.R import acr.browser.lightning.dialog.BrowserDialog diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebViewClient.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabWebViewClient.kt similarity index 97% rename from app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebViewClient.kt rename to app/src/main/java/acr/browser/lightning/browser/tab/TabWebViewClient.kt index ccc91ab11..0f0761eed 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabWebViewClient.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabWebViewClient.kt @@ -1,6 +1,6 @@ -package acr.browser.lightning._browser2.tab +package acr.browser.lightning.browser.tab -import acr.browser.lightning._browser2.proxy.Proxy +import acr.browser.lightning.browser.proxy.Proxy import acr.browser.lightning.adblock.AdBlocker import acr.browser.lightning.adblock.allowlist.AllowListModel import acr.browser.lightning.ssl.SslState diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt similarity index 90% rename from app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt rename to app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt index 693b9b099..aa7287b01 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/TabsRepository.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt @@ -1,10 +1,9 @@ -package acr.browser.lightning._browser2.tab +package acr.browser.lightning.browser.tab -import acr.browser.lightning._browser2.BrowserContract -import acr.browser.lightning._browser2.tab.bundle.BundleStore -import acr.browser.lightning.browser.RecentTabModel -import acr.browser.lightning._browser2.di.DiskScheduler -import acr.browser.lightning._browser2.di.MainScheduler +import acr.browser.lightning.browser.BrowserContract +import acr.browser.lightning.browser.tab.bundle.BundleStore +import acr.browser.lightning.browser.di.DiskScheduler +import acr.browser.lightning.browser.di.MainScheduler import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.view.* import io.reactivex.* diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/UrlHandler.kt b/app/src/main/java/acr/browser/lightning/browser/tab/UrlHandler.kt similarity index 97% rename from app/src/main/java/acr/browser/lightning/_browser2/tab/UrlHandler.kt rename to app/src/main/java/acr/browser/lightning/browser/tab/UrlHandler.kt index 915c03619..d3036c060 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/UrlHandler.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/UrlHandler.kt @@ -1,8 +1,8 @@ -package acr.browser.lightning._browser2.tab +package acr.browser.lightning.browser.tab import acr.browser.lightning.BuildConfig import acr.browser.lightning.R -import acr.browser.lightning._browser2.di.IncognitoMode +import acr.browser.lightning.browser.di.IncognitoMode import acr.browser.lightning.constant.FILE import acr.browser.lightning.extensions.snackbar import acr.browser.lightning.log.Logger diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/WebViewFactory.kt b/app/src/main/java/acr/browser/lightning/browser/tab/WebViewFactory.kt similarity index 97% rename from app/src/main/java/acr/browser/lightning/_browser2/tab/WebViewFactory.kt rename to app/src/main/java/acr/browser/lightning/browser/tab/WebViewFactory.kt index 6e92fe444..5bff7699c 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/WebViewFactory.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/WebViewFactory.kt @@ -1,8 +1,8 @@ -package acr.browser.lightning._browser2.tab +package acr.browser.lightning.browser.tab import acr.browser.lightning.Capabilities -import acr.browser.lightning._browser2.di.IncognitoMode -import acr.browser.lightning._browser2.view.CompositeTouchListener +import acr.browser.lightning.browser.di.IncognitoMode +import acr.browser.lightning.browser.view.CompositeTouchListener import acr.browser.lightning.isSupported import acr.browser.lightning.log.Logger import acr.browser.lightning.preference.UserPreferences diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/BundleStore.kt b/app/src/main/java/acr/browser/lightning/browser/tab/bundle/BundleStore.kt similarity index 73% rename from app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/BundleStore.kt rename to app/src/main/java/acr/browser/lightning/browser/tab/bundle/BundleStore.kt index 231a5c34b..f36386754 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/BundleStore.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/bundle/BundleStore.kt @@ -1,6 +1,6 @@ -package acr.browser.lightning._browser2.tab.bundle +package acr.browser.lightning.browser.tab.bundle -import acr.browser.lightning._browser2.tab.TabModel +import acr.browser.lightning.browser.tab.TabModel import acr.browser.lightning.view.TabInitializer /** diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/DefaultBundleStore.kt b/app/src/main/java/acr/browser/lightning/browser/tab/bundle/DefaultBundleStore.kt similarity index 95% rename from app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/DefaultBundleStore.kt rename to app/src/main/java/acr/browser/lightning/browser/tab/bundle/DefaultBundleStore.kt index dc6ec53bf..5654c2c01 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/DefaultBundleStore.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/bundle/DefaultBundleStore.kt @@ -1,8 +1,8 @@ -package acr.browser.lightning._browser2.tab.bundle +package acr.browser.lightning.browser.tab.bundle import acr.browser.lightning.R -import acr.browser.lightning._browser2.tab.TabModel -import acr.browser.lightning._browser2.di.DiskScheduler +import acr.browser.lightning.browser.tab.TabModel +import acr.browser.lightning.browser.di.DiskScheduler import acr.browser.lightning.utils.* import acr.browser.lightning.view.* import android.app.Application diff --git a/app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/IncognitoBundleStore.kt b/app/src/main/java/acr/browser/lightning/browser/tab/bundle/IncognitoBundleStore.kt similarity index 76% rename from app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/IncognitoBundleStore.kt rename to app/src/main/java/acr/browser/lightning/browser/tab/bundle/IncognitoBundleStore.kt index 9e2e431f7..e023b72aa 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/tab/bundle/IncognitoBundleStore.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/bundle/IncognitoBundleStore.kt @@ -1,6 +1,6 @@ -package acr.browser.lightning._browser2.tab.bundle +package acr.browser.lightning.browser.tab.bundle -import acr.browser.lightning._browser2.tab.TabModel +import acr.browser.lightning.browser.tab.TabModel import acr.browser.lightning.view.TabInitializer /** diff --git a/app/src/main/java/acr/browser/lightning/_browser2/theme/DefaultThemeProvider.kt b/app/src/main/java/acr/browser/lightning/browser/theme/DefaultThemeProvider.kt similarity index 87% rename from app/src/main/java/acr/browser/lightning/_browser2/theme/DefaultThemeProvider.kt rename to app/src/main/java/acr/browser/lightning/browser/theme/DefaultThemeProvider.kt index 3d4ba326e..79d8734a0 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/theme/DefaultThemeProvider.kt +++ b/app/src/main/java/acr/browser/lightning/browser/theme/DefaultThemeProvider.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.theme +package acr.browser.lightning.browser.theme import acr.browser.lightning.utils.ThemeUtils import android.app.Activity diff --git a/app/src/main/java/acr/browser/lightning/_browser2/theme/LegacyThemeProvider.kt b/app/src/main/java/acr/browser/lightning/browser/theme/LegacyThemeProvider.kt similarity index 97% rename from app/src/main/java/acr/browser/lightning/_browser2/theme/LegacyThemeProvider.kt rename to app/src/main/java/acr/browser/lightning/browser/theme/LegacyThemeProvider.kt index 982c5f62b..32b28d58e 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/theme/LegacyThemeProvider.kt +++ b/app/src/main/java/acr/browser/lightning/browser/theme/LegacyThemeProvider.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.theme +package acr.browser.lightning.browser.theme import acr.browser.lightning.AppTheme import acr.browser.lightning.R diff --git a/app/src/main/java/acr/browser/lightning/_browser2/theme/ThemeProvider.kt b/app/src/main/java/acr/browser/lightning/browser/theme/ThemeProvider.kt similarity index 84% rename from app/src/main/java/acr/browser/lightning/_browser2/theme/ThemeProvider.kt rename to app/src/main/java/acr/browser/lightning/browser/theme/ThemeProvider.kt index 9b91c1f1a..4236bcf59 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/theme/ThemeProvider.kt +++ b/app/src/main/java/acr/browser/lightning/browser/theme/ThemeProvider.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.theme +package acr.browser.lightning.browser.theme import androidx.annotation.AttrRes import androidx.annotation.ColorInt diff --git a/app/src/main/java/acr/browser/lightning/_browser2/ui/BookmarkConfiguration.kt b/app/src/main/java/acr/browser/lightning/browser/ui/BookmarkConfiguration.kt similarity index 70% rename from app/src/main/java/acr/browser/lightning/_browser2/ui/BookmarkConfiguration.kt rename to app/src/main/java/acr/browser/lightning/browser/ui/BookmarkConfiguration.kt index c90b0a48c..5d71f76ea 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/ui/BookmarkConfiguration.kt +++ b/app/src/main/java/acr/browser/lightning/browser/ui/BookmarkConfiguration.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.ui +package acr.browser.lightning.browser.ui /** * Created by anthonycr on 11/18/20. diff --git a/app/src/main/java/acr/browser/lightning/_browser2/ui/TabConfiguration.kt b/app/src/main/java/acr/browser/lightning/browser/ui/TabConfiguration.kt similarity index 70% rename from app/src/main/java/acr/browser/lightning/_browser2/ui/TabConfiguration.kt rename to app/src/main/java/acr/browser/lightning/browser/ui/TabConfiguration.kt index 6afcfc84e..18a891a97 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/ui/TabConfiguration.kt +++ b/app/src/main/java/acr/browser/lightning/browser/ui/TabConfiguration.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.ui +package acr.browser.lightning.browser.ui /** * Created by anthonycr on 11/18/20. diff --git a/app/src/main/java/acr/browser/lightning/_browser2/ui/UiConfiguration.kt b/app/src/main/java/acr/browser/lightning/browser/ui/UiConfiguration.kt similarity index 80% rename from app/src/main/java/acr/browser/lightning/_browser2/ui/UiConfiguration.kt rename to app/src/main/java/acr/browser/lightning/browser/ui/UiConfiguration.kt index 83d0a790c..f716edc6d 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/ui/UiConfiguration.kt +++ b/app/src/main/java/acr/browser/lightning/browser/ui/UiConfiguration.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.ui +package acr.browser.lightning.browser.ui /** * Created by anthonycr on 11/18/20. diff --git a/app/src/main/java/acr/browser/lightning/_browser2/view/CompositeTouchListener.kt b/app/src/main/java/acr/browser/lightning/browser/view/CompositeTouchListener.kt similarity index 91% rename from app/src/main/java/acr/browser/lightning/_browser2/view/CompositeTouchListener.kt rename to app/src/main/java/acr/browser/lightning/browser/view/CompositeTouchListener.kt index 0651e5215..93b8302d4 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/view/CompositeTouchListener.kt +++ b/app/src/main/java/acr/browser/lightning/browser/view/CompositeTouchListener.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.view +package acr.browser.lightning.browser.view import android.annotation.SuppressLint import android.view.MotionEvent diff --git a/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewCompositeTouchExtensions.kt b/app/src/main/java/acr/browser/lightning/browser/view/WebViewCompositeTouchExtensions.kt similarity index 86% rename from app/src/main/java/acr/browser/lightning/_browser2/view/WebViewCompositeTouchExtensions.kt rename to app/src/main/java/acr/browser/lightning/browser/view/WebViewCompositeTouchExtensions.kt index 9a6900138..bd899cc05 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewCompositeTouchExtensions.kt +++ b/app/src/main/java/acr/browser/lightning/browser/view/WebViewCompositeTouchExtensions.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.view +package acr.browser.lightning.browser.view import android.view.View import android.webkit.WebView diff --git a/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewLongPressHandler.kt b/app/src/main/java/acr/browser/lightning/browser/view/WebViewLongPressHandler.kt similarity index 97% rename from app/src/main/java/acr/browser/lightning/_browser2/view/WebViewLongPressHandler.kt rename to app/src/main/java/acr/browser/lightning/browser/view/WebViewLongPressHandler.kt index c9f184a88..c54086abb 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewLongPressHandler.kt +++ b/app/src/main/java/acr/browser/lightning/browser/view/WebViewLongPressHandler.kt @@ -1,6 +1,6 @@ -package acr.browser.lightning._browser2.view +package acr.browser.lightning.browser.view -import acr.browser.lightning._browser2.view.targetUrl.LongPress +import acr.browser.lightning.browser.view.targetUrl.LongPress import android.annotation.SuppressLint import android.app.Activity import android.os.Handler diff --git a/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewScrollCoordinator.kt b/app/src/main/java/acr/browser/lightning/browser/view/WebViewScrollCoordinator.kt similarity index 99% rename from app/src/main/java/acr/browser/lightning/_browser2/view/WebViewScrollCoordinator.kt rename to app/src/main/java/acr/browser/lightning/browser/view/WebViewScrollCoordinator.kt index 62991d493..da088629d 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/view/WebViewScrollCoordinator.kt +++ b/app/src/main/java/acr/browser/lightning/browser/view/WebViewScrollCoordinator.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.view +package acr.browser.lightning.browser.view import acr.browser.lightning.interpolator.BezierDecelerateInterpolator import acr.browser.lightning.preference.UserPreferences diff --git a/app/src/main/java/acr/browser/lightning/_browser2/view/targetUrl/LongPress.kt b/app/src/main/java/acr/browser/lightning/browser/view/targetUrl/LongPress.kt similarity index 82% rename from app/src/main/java/acr/browser/lightning/_browser2/view/targetUrl/LongPress.kt rename to app/src/main/java/acr/browser/lightning/browser/view/targetUrl/LongPress.kt index 6e126f147..0b154ef70 100644 --- a/app/src/main/java/acr/browser/lightning/_browser2/view/targetUrl/LongPress.kt +++ b/app/src/main/java/acr/browser/lightning/browser/view/targetUrl/LongPress.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning._browser2.view.targetUrl +package acr.browser.lightning.browser.view.targetUrl /** * Created by anthonycr on 12/23/20. diff --git a/app/src/main/java/acr/browser/lightning/database/adblock/HostsRepositoryInfo.kt b/app/src/main/java/acr/browser/lightning/database/adblock/HostsRepositoryInfo.kt index 3cbd31a6f..00d4c1504 100644 --- a/app/src/main/java/acr/browser/lightning/database/adblock/HostsRepositoryInfo.kt +++ b/app/src/main/java/acr/browser/lightning/database/adblock/HostsRepositoryInfo.kt @@ -1,6 +1,6 @@ package acr.browser.lightning.database.adblock -import acr.browser.lightning._browser2.di.AdBlockPrefs +import acr.browser.lightning.browser.di.AdBlockPrefs import acr.browser.lightning.preference.delegates.nullableStringPreference import android.content.SharedPreferences import javax.inject.Inject diff --git a/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt b/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt index 12d5b229a..4adabc3cf 100644 --- a/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt +++ b/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt @@ -1,8 +1,8 @@ package acr.browser.lightning.dialog import acr.browser.lightning.R -import acr.browser.lightning._browser2.BrowserContract -import acr.browser.lightning._browser2.DefaultBrowserActivity +import acr.browser.lightning.browser.BrowserContract +import acr.browser.lightning.browser.DefaultBrowserActivity import acr.browser.lightning.databinding.DialogEditBookmarkBinding import acr.browser.lightning.extensions.resizeAndShow import android.app.Activity diff --git a/app/src/main/java/acr/browser/lightning/download/DownloadHandler.java b/app/src/main/java/acr/browser/lightning/download/DownloadHandler.java index 9ca7ea48e..360924bb8 100644 --- a/app/src/main/java/acr/browser/lightning/download/DownloadHandler.java +++ b/app/src/main/java/acr/browser/lightning/download/DownloadHandler.java @@ -25,9 +25,9 @@ import acr.browser.lightning.BuildConfig; import acr.browser.lightning.R; -import acr.browser.lightning._browser2.DefaultBrowserActivity; -import acr.browser.lightning._browser2.di.MainScheduler; -import acr.browser.lightning._browser2.di.NetworkScheduler; +import acr.browser.lightning.browser.DefaultBrowserActivity; +import acr.browser.lightning.browser.di.MainScheduler; +import acr.browser.lightning.browser.di.NetworkScheduler; import acr.browser.lightning.constant.Constants; import acr.browser.lightning.dialog.BrowserDialog; import acr.browser.lightning.extensions.ActivityExtensions; diff --git a/app/src/main/java/acr/browser/lightning/download/LightningDownloadListener.java b/app/src/main/java/acr/browser/lightning/download/LightningDownloadListener.java index 13d442741..7a3bcc5bf 100644 --- a/app/src/main/java/acr/browser/lightning/download/LightningDownloadListener.java +++ b/app/src/main/java/acr/browser/lightning/download/LightningDownloadListener.java @@ -18,7 +18,7 @@ import acr.browser.lightning.R; import acr.browser.lightning.database.downloads.DownloadsRepository; -import acr.browser.lightning._browser2.di.Injector; +import acr.browser.lightning.browser.di.Injector; import acr.browser.lightning.dialog.BrowserDialog; import acr.browser.lightning.log.Logger; import acr.browser.lightning.preference.UserPreferences; diff --git a/app/src/main/java/acr/browser/lightning/html/bookmark/BookmarkPageFactory.kt b/app/src/main/java/acr/browser/lightning/html/bookmark/BookmarkPageFactory.kt index 6133ff526..a963615d4 100644 --- a/app/src/main/java/acr/browser/lightning/html/bookmark/BookmarkPageFactory.kt +++ b/app/src/main/java/acr/browser/lightning/html/bookmark/BookmarkPageFactory.kt @@ -1,26 +1,24 @@ package acr.browser.lightning.html.bookmark import acr.browser.lightning.R -import acr.browser.lightning._browser2.theme.ThemeProvider +import acr.browser.lightning.browser.theme.ThemeProvider import acr.browser.lightning.constant.FILE import acr.browser.lightning.database.Bookmark import acr.browser.lightning.database.bookmark.BookmarkRepository -import acr.browser.lightning._browser2.di.DatabaseScheduler -import acr.browser.lightning._browser2.di.DiskScheduler +import acr.browser.lightning.browser.di.DatabaseScheduler +import acr.browser.lightning.browser.di.DiskScheduler import acr.browser.lightning.extensions.safeUse import acr.browser.lightning.favicon.FaviconModel import acr.browser.lightning.favicon.toValidUri import acr.browser.lightning.html.HtmlPageFactory import acr.browser.lightning.html.jsoup.* import acr.browser.lightning.utils.ThemeUtils -import android.app.Activity import android.app.Application import android.graphics.Bitmap import androidx.core.net.toUri import dagger.Reusable import io.reactivex.Scheduler import io.reactivex.Single -import org.jsoup.nodes.DataNode import java.io.File import java.io.FileOutputStream import java.io.FileWriter diff --git a/app/src/main/java/acr/browser/lightning/html/download/DownloadPageFactory.kt b/app/src/main/java/acr/browser/lightning/html/download/DownloadPageFactory.kt index 9125b2b93..498cc220c 100644 --- a/app/src/main/java/acr/browser/lightning/html/download/DownloadPageFactory.kt +++ b/app/src/main/java/acr/browser/lightning/html/download/DownloadPageFactory.kt @@ -1,7 +1,7 @@ package acr.browser.lightning.html.download import acr.browser.lightning.R -import acr.browser.lightning._browser2.theme.ThemeProvider +import acr.browser.lightning.browser.theme.ThemeProvider import acr.browser.lightning.constant.FILE import acr.browser.lightning.database.downloads.DownloadEntry import acr.browser.lightning.database.downloads.DownloadsRepository diff --git a/app/src/main/java/acr/browser/lightning/html/history/HistoryPageFactory.kt b/app/src/main/java/acr/browser/lightning/html/history/HistoryPageFactory.kt index f2e22c092..c03ada498 100644 --- a/app/src/main/java/acr/browser/lightning/html/history/HistoryPageFactory.kt +++ b/app/src/main/java/acr/browser/lightning/html/history/HistoryPageFactory.kt @@ -1,7 +1,7 @@ package acr.browser.lightning.html.history import acr.browser.lightning.R -import acr.browser.lightning._browser2.theme.ThemeProvider +import acr.browser.lightning.browser.theme.ThemeProvider import acr.browser.lightning.constant.FILE import acr.browser.lightning.database.history.HistoryRepository import acr.browser.lightning.html.HtmlPageFactory diff --git a/app/src/main/java/acr/browser/lightning/html/homepage/HomePageFactory.kt b/app/src/main/java/acr/browser/lightning/html/homepage/HomePageFactory.kt index afce5d263..6b5b4c462 100644 --- a/app/src/main/java/acr/browser/lightning/html/homepage/HomePageFactory.kt +++ b/app/src/main/java/acr/browser/lightning/html/homepage/HomePageFactory.kt @@ -1,7 +1,7 @@ package acr.browser.lightning.html.homepage import acr.browser.lightning.R -import acr.browser.lightning._browser2.theme.ThemeProvider +import acr.browser.lightning.browser.theme.ThemeProvider import acr.browser.lightning.constant.FILE import acr.browser.lightning.constant.UTF8 import acr.browser.lightning.html.HtmlPageFactory diff --git a/app/src/main/java/acr/browser/lightning/notifications/IncognitoNotification.kt b/app/src/main/java/acr/browser/lightning/notifications/IncognitoNotification.kt index 44629a5ab..f1b23bc3d 100644 --- a/app/src/main/java/acr/browser/lightning/notifications/IncognitoNotification.kt +++ b/app/src/main/java/acr/browser/lightning/notifications/IncognitoNotification.kt @@ -1,7 +1,7 @@ package acr.browser.lightning.notifications import acr.browser.lightning.R -import acr.browser.lightning._browser2.IncognitoBrowserActivity +import acr.browser.lightning.browser.IncognitoBrowserActivity import acr.browser.lightning.utils.ThemeUtils import android.annotation.TargetApi import android.app.Activity diff --git a/app/src/main/java/acr/browser/lightning/preference/DeveloperPreferences.kt b/app/src/main/java/acr/browser/lightning/preference/DeveloperPreferences.kt index 85de537b3..7f905740f 100644 --- a/app/src/main/java/acr/browser/lightning/preference/DeveloperPreferences.kt +++ b/app/src/main/java/acr/browser/lightning/preference/DeveloperPreferences.kt @@ -1,6 +1,6 @@ package acr.browser.lightning.preference -import acr.browser.lightning._browser2.di.DevPrefs +import acr.browser.lightning.browser.di.DevPrefs import acr.browser.lightning.preference.delegates.booleanPreference import android.content.SharedPreferences import javax.inject.Inject diff --git a/app/src/main/java/acr/browser/lightning/preference/UserPreferences.kt b/app/src/main/java/acr/browser/lightning/preference/UserPreferences.kt index a35924521..de799b554 100644 --- a/app/src/main/java/acr/browser/lightning/preference/UserPreferences.kt +++ b/app/src/main/java/acr/browser/lightning/preference/UserPreferences.kt @@ -1,14 +1,13 @@ package acr.browser.lightning.preference import acr.browser.lightning.AppTheme -import acr.browser.lightning.browser.ProxyChoice -import acr.browser.lightning.browser.SearchBoxDisplayChoice -import acr.browser.lightning.browser.SearchBoxModel +import acr.browser.lightning.browser.proxy.ProxyChoice +import acr.browser.lightning.browser.search.SearchBoxDisplayChoice +import acr.browser.lightning.browser.search.SearchBoxModel import acr.browser.lightning.constant.DEFAULT_ENCODING import acr.browser.lightning.constant.SCHEME_BOOKMARKS -import acr.browser.lightning.constant.SCHEME_HOMEPAGE import acr.browser.lightning.device.ScreenSize -import acr.browser.lightning._browser2.di.UserPrefs +import acr.browser.lightning.browser.di.UserPrefs import acr.browser.lightning.preference.delegates.* import acr.browser.lightning.search.SearchEngineProvider import acr.browser.lightning.search.engine.GoogleSearch diff --git a/app/src/main/java/acr/browser/lightning/reading/activity/ReadingActivity.java b/app/src/main/java/acr/browser/lightning/reading/activity/ReadingActivity.java index 70b675339..9c95dfe06 100644 --- a/app/src/main/java/acr/browser/lightning/reading/activity/ReadingActivity.java +++ b/app/src/main/java/acr/browser/lightning/reading/activity/ReadingActivity.java @@ -19,9 +19,9 @@ import javax.inject.Inject; import acr.browser.lightning.R; -import acr.browser.lightning._browser2.di.Injector; -import acr.browser.lightning._browser2.di.MainScheduler; -import acr.browser.lightning._browser2.di.NetworkScheduler; +import acr.browser.lightning.browser.di.Injector; +import acr.browser.lightning.browser.di.MainScheduler; +import acr.browser.lightning.browser.di.NetworkScheduler; import acr.browser.lightning.dialog.BrowserDialog; import acr.browser.lightning.preference.UserPreferences; import acr.browser.lightning.reading.HtmlFetcher; diff --git a/app/src/main/java/acr/browser/lightning/search/SearchEngineProvider.kt b/app/src/main/java/acr/browser/lightning/search/SearchEngineProvider.kt index 9a1cf58d5..2b44a0ba6 100644 --- a/app/src/main/java/acr/browser/lightning/search/SearchEngineProvider.kt +++ b/app/src/main/java/acr/browser/lightning/search/SearchEngineProvider.kt @@ -1,6 +1,6 @@ package acr.browser.lightning.search -import acr.browser.lightning._browser2.di.SuggestionsClient +import acr.browser.lightning.browser.di.SuggestionsClient import acr.browser.lightning.log.Logger import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.search.engine.* diff --git a/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.kt b/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.kt index b8ca5a878..e393c7723 100644 --- a/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.kt @@ -7,10 +7,10 @@ import acr.browser.lightning.database.SearchSuggestion import acr.browser.lightning.database.WebPage import acr.browser.lightning.database.bookmark.BookmarkRepository import acr.browser.lightning.database.history.HistoryRepository -import acr.browser.lightning._browser2.di.DatabaseScheduler -import acr.browser.lightning._browser2.di.MainScheduler -import acr.browser.lightning._browser2.di.NetworkScheduler -import acr.browser.lightning._browser2.di.injector +import acr.browser.lightning.browser.di.DatabaseScheduler +import acr.browser.lightning.browser.di.MainScheduler +import acr.browser.lightning.browser.di.NetworkScheduler +import acr.browser.lightning.browser.di.injector import acr.browser.lightning.extensions.drawable import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.rx.join diff --git a/app/src/main/java/acr/browser/lightning/settings/activity/SettingsActivity.kt b/app/src/main/java/acr/browser/lightning/settings/activity/SettingsActivity.kt index 3c3eac02f..fe055600e 100644 --- a/app/src/main/java/acr/browser/lightning/settings/activity/SettingsActivity.kt +++ b/app/src/main/java/acr/browser/lightning/settings/activity/SettingsActivity.kt @@ -6,7 +6,7 @@ package acr.browser.lightning.settings.activity import acr.browser.lightning.R import acr.browser.lightning.device.BuildInfo import acr.browser.lightning.device.BuildType -import acr.browser.lightning._browser2.di.injector +import acr.browser.lightning.browser.di.injector import android.os.Build import android.os.Bundle import android.view.MenuItem diff --git a/app/src/main/java/acr/browser/lightning/settings/activity/ThemableSettingsActivity.kt b/app/src/main/java/acr/browser/lightning/settings/activity/ThemableSettingsActivity.kt index d91b8d1c4..40b6cba9b 100644 --- a/app/src/main/java/acr/browser/lightning/settings/activity/ThemableSettingsActivity.kt +++ b/app/src/main/java/acr/browser/lightning/settings/activity/ThemableSettingsActivity.kt @@ -2,7 +2,7 @@ package acr.browser.lightning.settings.activity import acr.browser.lightning.AppTheme import acr.browser.lightning.R -import acr.browser.lightning._browser2.di.injector +import acr.browser.lightning.browser.di.injector import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.utils.ThemeUtils import android.graphics.Color diff --git a/app/src/main/java/acr/browser/lightning/settings/fragment/AdBlockSettingsFragment.kt b/app/src/main/java/acr/browser/lightning/settings/fragment/AdBlockSettingsFragment.kt index 32f6b6382..1553b6dfa 100644 --- a/app/src/main/java/acr/browser/lightning/settings/fragment/AdBlockSettingsFragment.kt +++ b/app/src/main/java/acr/browser/lightning/settings/fragment/AdBlockSettingsFragment.kt @@ -6,9 +6,9 @@ import acr.browser.lightning.adblock.BloomFilterAdBlocker import acr.browser.lightning.adblock.source.HostsSourceType import acr.browser.lightning.adblock.source.selectedHostsSource import acr.browser.lightning.adblock.source.toPreferenceIndex -import acr.browser.lightning._browser2.di.DiskScheduler -import acr.browser.lightning._browser2.di.MainScheduler -import acr.browser.lightning._browser2.di.injector +import acr.browser.lightning.browser.di.DiskScheduler +import acr.browser.lightning.browser.di.MainScheduler +import acr.browser.lightning.browser.di.injector import acr.browser.lightning.dialog.BrowserDialog import acr.browser.lightning.dialog.DialogItem import acr.browser.lightning.extensions.toast diff --git a/app/src/main/java/acr/browser/lightning/settings/fragment/AdvancedSettingsFragment.kt b/app/src/main/java/acr/browser/lightning/settings/fragment/AdvancedSettingsFragment.kt index 5c03566f8..349f28304 100644 --- a/app/src/main/java/acr/browser/lightning/settings/fragment/AdvancedSettingsFragment.kt +++ b/app/src/main/java/acr/browser/lightning/settings/fragment/AdvancedSettingsFragment.kt @@ -2,9 +2,9 @@ package acr.browser.lightning.settings.fragment import acr.browser.lightning.Capabilities import acr.browser.lightning.R -import acr.browser.lightning.browser.SearchBoxDisplayChoice +import acr.browser.lightning.browser.search.SearchBoxDisplayChoice import acr.browser.lightning.constant.TEXT_ENCODINGS -import acr.browser.lightning._browser2.di.injector +import acr.browser.lightning.browser.di.injector import acr.browser.lightning.extensions.resizeAndShow import acr.browser.lightning.extensions.withSingleChoiceItems import acr.browser.lightning.isSupported diff --git a/app/src/main/java/acr/browser/lightning/settings/fragment/BookmarkSettingsFragment.kt b/app/src/main/java/acr/browser/lightning/settings/fragment/BookmarkSettingsFragment.kt index 79cf2d31f..6dbb3b507 100644 --- a/app/src/main/java/acr/browser/lightning/settings/fragment/BookmarkSettingsFragment.kt +++ b/app/src/main/java/acr/browser/lightning/settings/fragment/BookmarkSettingsFragment.kt @@ -8,9 +8,9 @@ import acr.browser.lightning.bookmark.LegacyBookmarkImporter import acr.browser.lightning.bookmark.NetscapeBookmarkFormatImporter import acr.browser.lightning.database.bookmark.BookmarkExporter import acr.browser.lightning.database.bookmark.BookmarkRepository -import acr.browser.lightning._browser2.di.DatabaseScheduler -import acr.browser.lightning._browser2.di.MainScheduler -import acr.browser.lightning._browser2.di.injector +import acr.browser.lightning.browser.di.DatabaseScheduler +import acr.browser.lightning.browser.di.MainScheduler +import acr.browser.lightning.browser.di.injector import acr.browser.lightning.dialog.BrowserDialog import acr.browser.lightning.dialog.DialogItem import acr.browser.lightning.extensions.resizeAndShow diff --git a/app/src/main/java/acr/browser/lightning/settings/fragment/DebugSettingsFragment.kt b/app/src/main/java/acr/browser/lightning/settings/fragment/DebugSettingsFragment.kt index 1c142b161..1cc1c1375 100644 --- a/app/src/main/java/acr/browser/lightning/settings/fragment/DebugSettingsFragment.kt +++ b/app/src/main/java/acr/browser/lightning/settings/fragment/DebugSettingsFragment.kt @@ -1,7 +1,7 @@ package acr.browser.lightning.settings.fragment import acr.browser.lightning.R -import acr.browser.lightning._browser2.di.injector +import acr.browser.lightning.browser.di.injector import acr.browser.lightning.extensions.snackbar import acr.browser.lightning.preference.DeveloperPreferences import android.os.Bundle diff --git a/app/src/main/java/acr/browser/lightning/settings/fragment/DisplaySettingsFragment.kt b/app/src/main/java/acr/browser/lightning/settings/fragment/DisplaySettingsFragment.kt index d5b2eeaea..832b25bff 100644 --- a/app/src/main/java/acr/browser/lightning/settings/fragment/DisplaySettingsFragment.kt +++ b/app/src/main/java/acr/browser/lightning/settings/fragment/DisplaySettingsFragment.kt @@ -5,7 +5,7 @@ package acr.browser.lightning.settings.fragment import acr.browser.lightning.AppTheme import acr.browser.lightning.R -import acr.browser.lightning._browser2.di.injector +import acr.browser.lightning.browser.di.injector import acr.browser.lightning.extensions.resizeAndShow import acr.browser.lightning.extensions.withSingleChoiceItems import acr.browser.lightning.preference.UserPreferences diff --git a/app/src/main/java/acr/browser/lightning/settings/fragment/GeneralSettingsFragment.kt b/app/src/main/java/acr/browser/lightning/settings/fragment/GeneralSettingsFragment.kt index 4c56c2e28..b0775a68a 100644 --- a/app/src/main/java/acr/browser/lightning/settings/fragment/GeneralSettingsFragment.kt +++ b/app/src/main/java/acr/browser/lightning/settings/fragment/GeneralSettingsFragment.kt @@ -1,11 +1,11 @@ package acr.browser.lightning.settings.fragment import acr.browser.lightning.R -import acr.browser.lightning.browser.ProxyChoice +import acr.browser.lightning.browser.proxy.ProxyChoice import acr.browser.lightning.constant.SCHEME_BLANK import acr.browser.lightning.constant.SCHEME_BOOKMARKS import acr.browser.lightning.constant.SCHEME_HOMEPAGE -import acr.browser.lightning._browser2.di.injector +import acr.browser.lightning.browser.di.injector import acr.browser.lightning.dialog.BrowserDialog import acr.browser.lightning.extensions.withSingleChoiceItems import acr.browser.lightning.preference.UserPreferences diff --git a/app/src/main/java/acr/browser/lightning/settings/fragment/PrivacySettingsFragment.kt b/app/src/main/java/acr/browser/lightning/settings/fragment/PrivacySettingsFragment.kt index c8a93260a..c978926aa 100644 --- a/app/src/main/java/acr/browser/lightning/settings/fragment/PrivacySettingsFragment.kt +++ b/app/src/main/java/acr/browser/lightning/settings/fragment/PrivacySettingsFragment.kt @@ -3,10 +3,10 @@ package acr.browser.lightning.settings.fragment import acr.browser.lightning.Capabilities import acr.browser.lightning.R import acr.browser.lightning.database.history.HistoryRepository -import acr.browser.lightning._browser2.di.DatabaseScheduler -import acr.browser.lightning._browser2.di.MainScheduler -import acr.browser.lightning._browser2.di.injector -import acr.browser.lightning._browser2.tab.WebViewFactory +import acr.browser.lightning.browser.di.DatabaseScheduler +import acr.browser.lightning.browser.di.MainScheduler +import acr.browser.lightning.browser.di.injector +import acr.browser.lightning.browser.tab.WebViewFactory import acr.browser.lightning.dialog.BrowserDialog import acr.browser.lightning.dialog.DialogItem import acr.browser.lightning.extensions.snackbar diff --git a/app/src/main/java/acr/browser/lightning/utils/ProxyUtils.java b/app/src/main/java/acr/browser/lightning/utils/ProxyUtils.java index d822e8bd6..2f5458344 100644 --- a/app/src/main/java/acr/browser/lightning/utils/ProxyUtils.java +++ b/app/src/main/java/acr/browser/lightning/utils/ProxyUtils.java @@ -16,7 +16,7 @@ import acr.browser.lightning.BrowserApp; import acr.browser.lightning.R; -import acr.browser.lightning.browser.ProxyChoice; +import acr.browser.lightning.browser.proxy.ProxyChoice; import acr.browser.lightning.dialog.BrowserDialog; import acr.browser.lightning.extensions.ActivityExtensions; import acr.browser.lightning.extensions.AlertDialogExtensionsKt; diff --git a/app/src/main/java/acr/browser/lightning/view/TabInitializer.kt b/app/src/main/java/acr/browser/lightning/view/TabInitializer.kt index 1face7716..aa6606b43 100644 --- a/app/src/main/java/acr/browser/lightning/view/TabInitializer.kt +++ b/app/src/main/java/acr/browser/lightning/view/TabInitializer.kt @@ -3,8 +3,8 @@ package acr.browser.lightning.view import acr.browser.lightning.R import acr.browser.lightning.constant.SCHEME_BOOKMARKS import acr.browser.lightning.constant.SCHEME_HOMEPAGE -import acr.browser.lightning._browser2.di.DiskScheduler -import acr.browser.lightning._browser2.di.MainScheduler +import acr.browser.lightning.browser.di.DiskScheduler +import acr.browser.lightning.browser.di.MainScheduler import acr.browser.lightning.extensions.resizeAndShow import acr.browser.lightning.html.HtmlPageFactory import acr.browser.lightning.html.bookmark.BookmarkPageFactory diff --git a/app/src/main/res/layout/browser_activity.xml b/app/src/main/res/layout/browser_activity.xml index 4f2b53609..9c56b257a 100644 --- a/app/src/main/res/layout/browser_activity.xml +++ b/app/src/main/res/layout/browser_activity.xml @@ -4,7 +4,7 @@ android:id="@+id/coordinator_layout" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="._browser2.BrowserActivity"> + tools:context=".browser.BrowserActivity"> Date: Wed, 3 Aug 2022 18:00:52 -0400 Subject: [PATCH 122/161] Moving root activities to the root directory --- app/src/main/AndroidManifest.xml | 6 +++--- .../lightning/{browser => }/DefaultBrowserActivity.kt | 4 ++-- .../lightning/{browser => }/IncognitoBrowserActivity.kt | 4 ++-- .../java/acr/browser/lightning/browser/BrowserNavigator.kt | 1 + .../lightning/browser/cleanup/DelegatingExitCleanup.kt | 2 +- .../acr/browser/lightning/dialog/LightningDialogBuilder.kt | 2 +- .../acr/browser/lightning/download/DownloadHandler.java | 2 +- .../lightning/notifications/IncognitoNotification.kt | 2 +- 8 files changed, 12 insertions(+), 11 deletions(-) rename app/src/main/java/acr/browser/lightning/{browser => }/DefaultBrowserActivity.kt (75%) rename app/src/main/java/acr/browser/lightning/{browser => }/IncognitoBrowserActivity.kt (90%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0489041a3..d8bef9469 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:value="2.1"/> diff --git a/app/src/main/java/acr/browser/lightning/browser/DefaultBrowserActivity.kt b/app/src/main/java/acr/browser/lightning/DefaultBrowserActivity.kt similarity index 75% rename from app/src/main/java/acr/browser/lightning/browser/DefaultBrowserActivity.kt rename to app/src/main/java/acr/browser/lightning/DefaultBrowserActivity.kt index 3523d81f7..fd8b7b37b 100644 --- a/app/src/main/java/acr/browser/lightning/browser/DefaultBrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/DefaultBrowserActivity.kt @@ -1,6 +1,6 @@ -package acr.browser.lightning.browser +package acr.browser.lightning -import acr.browser.lightning.R +import acr.browser.lightning.browser.BrowserActivity /** * Created by anthonycr on 7/26/22. diff --git a/app/src/main/java/acr/browser/lightning/browser/IncognitoBrowserActivity.kt b/app/src/main/java/acr/browser/lightning/IncognitoBrowserActivity.kt similarity index 90% rename from app/src/main/java/acr/browser/lightning/browser/IncognitoBrowserActivity.kt rename to app/src/main/java/acr/browser/lightning/IncognitoBrowserActivity.kt index adc922b8f..378e6392b 100644 --- a/app/src/main/java/acr/browser/lightning/browser/IncognitoBrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/IncognitoBrowserActivity.kt @@ -1,6 +1,6 @@ -package acr.browser.lightning.browser +package acr.browser.lightning -import acr.browser.lightning.R +import acr.browser.lightning.browser.BrowserActivity import android.app.Activity import android.content.Intent import androidx.core.net.toUri diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserNavigator.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserNavigator.kt index f1797e3ba..c2b4cd553 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserNavigator.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserNavigator.kt @@ -1,5 +1,6 @@ package acr.browser.lightning.browser +import acr.browser.lightning.IncognitoBrowserActivity import acr.browser.lightning.R import acr.browser.lightning.browser.download.DownloadPermissionsHelper import acr.browser.lightning.browser.download.PendingDownload diff --git a/app/src/main/java/acr/browser/lightning/browser/cleanup/DelegatingExitCleanup.kt b/app/src/main/java/acr/browser/lightning/browser/cleanup/DelegatingExitCleanup.kt index 3027bb2d3..4d2fbd6b9 100644 --- a/app/src/main/java/acr/browser/lightning/browser/cleanup/DelegatingExitCleanup.kt +++ b/app/src/main/java/acr/browser/lightning/browser/cleanup/DelegatingExitCleanup.kt @@ -2,7 +2,7 @@ package acr.browser.lightning.browser.cleanup import acr.browser.lightning.Capabilities import acr.browser.lightning.browser.BrowserActivity -import acr.browser.lightning.browser.DefaultBrowserActivity +import acr.browser.lightning.DefaultBrowserActivity import acr.browser.lightning.isSupported import android.webkit.WebView import javax.inject.Inject diff --git a/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt b/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt index 4adabc3cf..6987d438e 100644 --- a/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt +++ b/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt @@ -2,7 +2,7 @@ package acr.browser.lightning.dialog import acr.browser.lightning.R import acr.browser.lightning.browser.BrowserContract -import acr.browser.lightning.browser.DefaultBrowserActivity +import acr.browser.lightning.DefaultBrowserActivity import acr.browser.lightning.databinding.DialogEditBookmarkBinding import acr.browser.lightning.extensions.resizeAndShow import android.app.Activity diff --git a/app/src/main/java/acr/browser/lightning/download/DownloadHandler.java b/app/src/main/java/acr/browser/lightning/download/DownloadHandler.java index 360924bb8..3f9b5ed8b 100644 --- a/app/src/main/java/acr/browser/lightning/download/DownloadHandler.java +++ b/app/src/main/java/acr/browser/lightning/download/DownloadHandler.java @@ -25,7 +25,7 @@ import acr.browser.lightning.BuildConfig; import acr.browser.lightning.R; -import acr.browser.lightning.browser.DefaultBrowserActivity; +import acr.browser.lightning.DefaultBrowserActivity; import acr.browser.lightning.browser.di.MainScheduler; import acr.browser.lightning.browser.di.NetworkScheduler; import acr.browser.lightning.constant.Constants; diff --git a/app/src/main/java/acr/browser/lightning/notifications/IncognitoNotification.kt b/app/src/main/java/acr/browser/lightning/notifications/IncognitoNotification.kt index f1b23bc3d..1df8aed0c 100644 --- a/app/src/main/java/acr/browser/lightning/notifications/IncognitoNotification.kt +++ b/app/src/main/java/acr/browser/lightning/notifications/IncognitoNotification.kt @@ -1,7 +1,7 @@ package acr.browser.lightning.notifications import acr.browser.lightning.R -import acr.browser.lightning.browser.IncognitoBrowserActivity +import acr.browser.lightning.IncognitoBrowserActivity import acr.browser.lightning.utils.ThemeUtils import android.annotation.TargetApi import android.app.Activity From abcc020f4da3f215cbedb71749d7eb8831f0e2d5 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 3 Aug 2022 18:02:43 -0400 Subject: [PATCH 123/161] Moving files to the correct package --- .../lightning/DefaultBrowserActivity.kt | 2 +- .../lightning/IncognitoBrowserActivity.kt | 8 ++++++- .../{browser => }/ThemableBrowserActivity.kt | 23 +++++++++++-------- .../lightning/browser/BrowserActivity.kt | 1 + .../lightning/browser/di/AppComponent.kt | 2 +- 5 files changed, 24 insertions(+), 12 deletions(-) rename app/src/main/java/acr/browser/lightning/{browser => }/ThemableBrowserActivity.kt (85%) diff --git a/app/src/main/java/acr/browser/lightning/DefaultBrowserActivity.kt b/app/src/main/java/acr/browser/lightning/DefaultBrowserActivity.kt index fd8b7b37b..dde5a7b0f 100644 --- a/app/src/main/java/acr/browser/lightning/DefaultBrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/DefaultBrowserActivity.kt @@ -3,7 +3,7 @@ package acr.browser.lightning import acr.browser.lightning.browser.BrowserActivity /** - * Created by anthonycr on 7/26/22. + * The default browsing experience. */ class DefaultBrowserActivity : BrowserActivity() { override fun isIncognito(): Boolean = false diff --git a/app/src/main/java/acr/browser/lightning/IncognitoBrowserActivity.kt b/app/src/main/java/acr/browser/lightning/IncognitoBrowserActivity.kt index 378e6392b..4b509dbd5 100644 --- a/app/src/main/java/acr/browser/lightning/IncognitoBrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/IncognitoBrowserActivity.kt @@ -6,7 +6,7 @@ import android.content.Intent import androidx.core.net.toUri /** - * Created by anthonycr on 7/26/22. + * The incognito browsing experience. */ class IncognitoBrowserActivity : BrowserActivity() { @@ -19,11 +19,17 @@ class IncognitoBrowserActivity : BrowserActivity() { override fun homeIcon(): Int = R.drawable.incognito_mode companion object { + /** + * Creates an intent to launch the browser with an optional [url] to load. + */ fun intent(activity: Activity, url: String? = null): Intent = Intent(activity, IncognitoBrowserActivity::class.java).apply { data = url?.let(String::toUri) } + /** + * Launch the browser with an optional [url] to load. + */ fun launch(activity: Activity, url: String?) { activity.startActivity(intent(activity, url)) } diff --git a/app/src/main/java/acr/browser/lightning/browser/ThemableBrowserActivity.kt b/app/src/main/java/acr/browser/lightning/ThemableBrowserActivity.kt similarity index 85% rename from app/src/main/java/acr/browser/lightning/browser/ThemableBrowserActivity.kt rename to app/src/main/java/acr/browser/lightning/ThemableBrowserActivity.kt index 77221889e..a43b5f50d 100644 --- a/app/src/main/java/acr/browser/lightning/browser/ThemableBrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/ThemableBrowserActivity.kt @@ -1,7 +1,5 @@ -package acr.browser.lightning.browser +package acr.browser.lightning -import acr.browser.lightning.AppTheme -import acr.browser.lightning.R import acr.browser.lightning.browser.di.injector import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.utils.ThemeUtils @@ -39,11 +37,13 @@ abstract class ThemableBrowserActivity : AppCompatActivity() { showTabsInDrawer = userPreferences.showTabsInDrawer // set the theme - setTheme(provideThemeOverride() ?: when (userPreferences.useTheme) { - AppTheme.LIGHT -> R.style.Theme_LightTheme - AppTheme.DARK -> R.style.Theme_DarkTheme - AppTheme.BLACK -> R.style.Theme_BlackTheme - }) + setTheme( + provideThemeOverride() ?: when (userPreferences.useTheme) { + AppTheme.LIGHT -> R.style.Theme_LightTheme + AppTheme.DARK -> R.style.Theme_DarkTheme + AppTheme.BLACK -> R.style.Theme_BlackTheme + } + ) super.onCreate(savedInstanceState) resetPreferences() @@ -53,7 +53,12 @@ abstract class ThemableBrowserActivity : AppCompatActivity() { withStyledAttributes(attrs = intArrayOf(R.attr.iconColorState)) { val iconTintList = getColorStateList(0) menu.iterator().forEach { menuItem -> - menuItem.icon?.let { DrawableCompat.setTintList(DrawableCompat.wrap(it), iconTintList) } + menuItem.icon?.let { + DrawableCompat.setTintList( + DrawableCompat.wrap(it), + iconTintList + ) + } } } diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserActivity.kt index 19d05a623..c338e0199 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserActivity.kt @@ -2,6 +2,7 @@ package acr.browser.lightning.browser import acr.browser.lightning.AppTheme import acr.browser.lightning.R +import acr.browser.lightning.ThemableBrowserActivity import acr.browser.lightning.browser.bookmark.BookmarkRecyclerViewAdapter import acr.browser.lightning.browser.color.ColorAnimator import acr.browser.lightning.browser.image.ImageLoader diff --git a/app/src/main/java/acr/browser/lightning/browser/di/AppComponent.kt b/app/src/main/java/acr/browser/lightning/browser/di/AppComponent.kt index 796f4d730..70fa21011 100644 --- a/app/src/main/java/acr/browser/lightning/browser/di/AppComponent.kt +++ b/app/src/main/java/acr/browser/lightning/browser/di/AppComponent.kt @@ -4,7 +4,7 @@ import acr.browser.lightning.BrowserApp import acr.browser.lightning.adblock.BloomFilterAdBlocker import acr.browser.lightning.adblock.NoOpAdBlocker import acr.browser.lightning.browser.search.SearchBoxModel -import acr.browser.lightning.browser.ThemableBrowserActivity +import acr.browser.lightning.ThemableBrowserActivity import acr.browser.lightning.device.BuildInfo import acr.browser.lightning.dialog.LightningDialogBuilder import acr.browser.lightning.download.LightningDownloadListener From 294da78fa6fb5f9fbb3f30977e17b577bff0a0b1 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 3 Aug 2022 18:22:29 -0400 Subject: [PATCH 124/161] Reformatting code --- .../lightning/adblock/BloomFilterAdBlocker.kt | 26 ++-- .../PreferencesHostsDataSourceProvider.kt | 8 +- .../adblock/source/UrlHostsDataSource.kt | 5 +- .../adblock/util/DefaultBloomFilter.kt | 7 +- .../adblock/util/DelegatingBloomFilter.kt | 6 +- .../NetscapeBookmarkFormatImporter.kt | 14 +- .../browser/lightning/browser/di/AppModule.kt | 92 +++++++------ .../browser/search/SearchListener.kt | 3 +- .../tab/DrawerTabRecyclerViewAdapter.kt | 22 ++- .../lightning/browser/tab/TabsRepository.kt | 4 +- .../browser/view/WebViewLongPressHandler.kt | 32 +++-- .../browser/lightning/constant/Constants.kt | 9 +- .../allowlist/AdBlockAllowListDatabase.kt | 23 ++-- .../database/bookmark/BookmarkDatabase.kt | 87 ++++++------ .../database/downloads/DownloadsDatabase.kt | 65 ++++----- .../database/history/HistoryDatabase.kt | 43 +++--- .../dialog/LightningDialogBuilder.kt | 2 - .../extensions/AlertDialogExtensions.kt | 3 +- .../lightning/extensions/BitmapExtensions.kt | 7 +- .../lightning/extensions/ContextExtensions.kt | 6 +- .../extensions/DrawableExtensions.kt | 3 +- .../browser/lightning/favicon/FaviconModel.kt | 32 +++-- .../lightning/preference/UserPreferences.kt | 15 +- .../acr/browser/lightning/rx/RxExtensions.kt | 1 - .../lightning/search/SuggestionsAdapter.kt | 13 +- .../suggestions/BaseSuggestionsModel.kt | 5 +- .../settings/activity/SettingsActivity.kt | 6 +- .../fragment/AdBlockSettingsFragment.kt | 10 +- .../fragment/AdvancedSettingsFragment.kt | 16 ++- .../fragment/BookmarkSettingsFragment.kt | 129 +++++++++++------- .../fragment/DisplaySettingsFragment.kt | 40 +++--- .../fragment/GeneralSettingsFragment.kt | 59 +++++--- .../acr/browser/lightning/ssl/SslDialog.kt | 19 --- 33 files changed, 474 insertions(+), 338 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/adblock/BloomFilterAdBlocker.kt b/app/src/main/java/acr/browser/lightning/adblock/BloomFilterAdBlocker.kt index 3e39feb1b..cc235eb15 100644 --- a/app/src/main/java/acr/browser/lightning/adblock/BloomFilterAdBlocker.kt +++ b/app/src/main/java/acr/browser/lightning/adblock/BloomFilterAdBlocker.kt @@ -50,7 +50,8 @@ class BloomFilterAdBlocker @Inject constructor( ) : AdBlocker { private val bloomFilter: DelegatingBloomFilter = DelegatingBloomFilter() - private val objectStore: ObjectStore> = JvmObjectStore(application, MurmurHashStringAdapter()) + private val objectStore: ObjectStore> = + JvmObjectStore(application, MurmurHashStringAdapter()) private val compositeDisposable = CompositeDisposable() @@ -116,19 +117,20 @@ class BloomFilterAdBlocker @Inject constructor( objectStore.retrieve(BLOOM_FILTER_KEY) } - private fun createAndSaveBloomFilter(hosts: List): Single> = Single.fromCallable { - logger.log(TAG, "Constructing bloom filter from list") + private fun createAndSaveBloomFilter(hosts: List): Single> = + Single.fromCallable { + logger.log(TAG, "Constructing bloom filter from list") - val bloomFilter = DefaultBloomFilter( - numberOfElements = hosts.size, - falsePositiveRate = 0.01, - hashingAlgorithm = MurmurHashHostAdapter() - ) - bloomFilter.putAll(hosts) - objectStore.store(BLOOM_FILTER_KEY, bloomFilter) + val bloomFilter = DefaultBloomFilter( + numberOfElements = hosts.size, + falsePositiveRate = 0.01, + hashingAlgorithm = MurmurHashHostAdapter() + ) + bloomFilter.putAll(hosts) + objectStore.store(BLOOM_FILTER_KEY, bloomFilter) - bloomFilter - } + bloomFilter + } override fun isAd(url: String): Boolean { val domain = url.host() ?: return false diff --git a/app/src/main/java/acr/browser/lightning/adblock/source/PreferencesHostsDataSourceProvider.kt b/app/src/main/java/acr/browser/lightning/adblock/source/PreferencesHostsDataSourceProvider.kt index 1f35a1fa5..45d282471 100644 --- a/app/src/main/java/acr/browser/lightning/adblock/source/PreferencesHostsDataSourceProvider.kt +++ b/app/src/main/java/acr/browser/lightning/adblock/source/PreferencesHostsDataSourceProvider.kt @@ -26,7 +26,13 @@ class PreferencesHostsDataSourceProvider @Inject constructor( when (val source = userPreferences.selectedHostsSource()) { HostsSourceType.Default -> AssetsHostsDataSource(assetManager, logger) is HostsSourceType.Local -> FileHostsDataSource(logger, source.file) - is HostsSourceType.Remote -> UrlHostsDataSource(source.httpUrl, okHttpClient, logger, userPreferences, application) + is HostsSourceType.Remote -> UrlHostsDataSource( + source.httpUrl, + okHttpClient, + logger, + userPreferences, + application + ) } } diff --git a/app/src/main/java/acr/browser/lightning/adblock/source/UrlHostsDataSource.kt b/app/src/main/java/acr/browser/lightning/adblock/source/UrlHostsDataSource.kt index ead73aabe..d0956100b 100644 --- a/app/src/main/java/acr/browser/lightning/adblock/source/UrlHostsDataSource.kt +++ b/app/src/main/java/acr/browser/lightning/adblock/source/UrlHostsDataSource.kt @@ -39,8 +39,9 @@ class UrlHostsDataSource( override fun onResponse(call: Call, response: Response) { val successfulResponse = response.takeIf(Response::isSuccessful) ?: return emitter.onError(IOException("Error reading remote file")) - val input = successfulResponse.body()?.byteStream()?.let(::InputStreamReader) - ?: return emitter.onError(IOException("Empty response")) + val input = + successfulResponse.body()?.byteStream()?.let(::InputStreamReader) + ?: return emitter.onError(IOException("Empty response")) val hostsFileParser = HostsFileParser(logger) diff --git a/app/src/main/java/acr/browser/lightning/adblock/util/DefaultBloomFilter.kt b/app/src/main/java/acr/browser/lightning/adblock/util/DefaultBloomFilter.kt index 07fd7eca6..3b4b639db 100644 --- a/app/src/main/java/acr/browser/lightning/adblock/util/DefaultBloomFilter.kt +++ b/app/src/main/java/acr/browser/lightning/adblock/util/DefaultBloomFilter.kt @@ -38,9 +38,10 @@ class DefaultBloomFilter( private val hashingAlgorithm: HashingAlgorithm ) : BloomFilter, Serializable { - private val numberOfBits: Int = (-numberOfElements * ln(falsePositiveRate) / (ln(2.0) * ln(2.0))) - .roundToInt() - .coerceAtLeast(1) + private val numberOfBits: Int = + (-numberOfElements * ln(falsePositiveRate) / (ln(2.0) * ln(2.0))) + .roundToInt() + .coerceAtLeast(1) private val numberOfHashes: Int = (numberOfBits * ln(2.0) / numberOfElements) .roundToInt() diff --git a/app/src/main/java/acr/browser/lightning/adblock/util/DelegatingBloomFilter.kt b/app/src/main/java/acr/browser/lightning/adblock/util/DelegatingBloomFilter.kt index 352ef6b89..6cde4d15f 100644 --- a/app/src/main/java/acr/browser/lightning/adblock/util/DelegatingBloomFilter.kt +++ b/app/src/main/java/acr/browser/lightning/adblock/util/DelegatingBloomFilter.kt @@ -5,9 +5,11 @@ package acr.browser.lightning.adblock.util */ class DelegatingBloomFilter(var delegate: BloomFilter? = null) : BloomFilter { - override fun put(item: T) = throw IllegalStateException("DelegatingBloomFilter does not support put") + override fun put(item: T) = + throw IllegalStateException("DelegatingBloomFilter does not support put") - override fun putAll(collection: Collection) = throw IllegalStateException("DelegatingBloomFilter does not support putAll") + override fun putAll(collection: Collection) = + throw IllegalStateException("DelegatingBloomFilter does not support putAll") override fun mightContain(item: T): Boolean = delegate?.mightContain(item) ?: false diff --git a/app/src/main/java/acr/browser/lightning/bookmark/NetscapeBookmarkFormatImporter.kt b/app/src/main/java/acr/browser/lightning/bookmark/NetscapeBookmarkFormatImporter.kt index 7531b97f4..d922c85de 100644 --- a/app/src/main/java/acr/browser/lightning/bookmark/NetscapeBookmarkFormatImporter.kt +++ b/app/src/main/java/acr/browser/lightning/bookmark/NetscapeBookmarkFormatImporter.kt @@ -36,12 +36,14 @@ class NetscapeBookmarkFormatImporter @Inject constructor() : BookmarkImporter { immediateChild.nextElementSibling() .processFolder(computeFolderName(folderName, immediateChild.text())) immediateChild.isTag(BOOKMARK_TAG) -> - listOf(Bookmark.Entry( - url = immediateChild.attr(HREF), - title = immediateChild.text(), - position = 0, - folder = folderName.asFolder() - )) + listOf( + Bookmark.Entry( + url = immediateChild.attr(HREF), + title = immediateChild.text(), + position = 0, + folder = folderName.asFolder() + ) + ) else -> emptyList() } } diff --git a/app/src/main/java/acr/browser/lightning/browser/di/AppModule.kt b/app/src/main/java/acr/browser/lightning/browser/di/AppModule.kt index 019c562d3..8dcfd45eb 100644 --- a/app/src/main/java/acr/browser/lightning/browser/di/AppModule.kt +++ b/app/src/main/java/acr/browser/lightning/browser/di/AppModule.kt @@ -58,40 +58,50 @@ class AppModule { @Provides @UserPrefs - fun provideUserPreferences(application: Application): SharedPreferences = application.getSharedPreferences("settings", 0) + fun provideUserPreferences(application: Application): SharedPreferences = + application.getSharedPreferences("settings", 0) @Provides @DevPrefs - fun provideDebugPreferences(application: Application): SharedPreferences = application.getSharedPreferences("developer_settings", 0) + fun provideDebugPreferences(application: Application): SharedPreferences = + application.getSharedPreferences("developer_settings", 0) @Provides @AdBlockPrefs - fun provideAdBlockPreferences(application: Application): SharedPreferences = application.getSharedPreferences("ad_block_settings", 0) + fun provideAdBlockPreferences(application: Application): SharedPreferences = + application.getSharedPreferences("ad_block_settings", 0) @Provides fun providesAssetManager(application: Application): AssetManager = application.assets @Provides - fun providesClipboardManager(application: Application) = application.getSystemService()!! + fun providesClipboardManager(application: Application) = + application.getSystemService()!! @Provides - fun providesInputMethodManager(application: Application) = application.getSystemService()!! + fun providesInputMethodManager(application: Application) = + application.getSystemService()!! @Provides - fun providesDownloadManager(application: Application) = application.getSystemService()!! + fun providesDownloadManager(application: Application) = + application.getSystemService()!! @Provides - fun providesConnectivityManager(application: Application) = application.getSystemService()!! + fun providesConnectivityManager(application: Application) = + application.getSystemService()!! @Provides - fun providesNotificationManager(application: Application) = application.getSystemService()!! + fun providesNotificationManager(application: Application) = + application.getSystemService()!! @Provides - fun providesWindowManager(application: Application) = application.getSystemService()!! + fun providesWindowManager(application: Application) = + application.getSystemService()!! @RequiresApi(Build.VERSION_CODES.N_MR1) @Provides - fun providesShortcutManager(application: Application) = application.getSystemService()!! + fun providesShortcutManager(application: Application) = + application.getSystemService()!! @Provides @DatabaseScheduler @@ -106,7 +116,8 @@ class AppModule { @Provides @NetworkScheduler @Singleton - fun providesNetworkThread(): Scheduler = Schedulers.from(ThreadPoolExecutor(0, 4, 60, TimeUnit.SECONDS, LinkedBlockingDeque())) + fun providesNetworkThread(): Scheduler = + Schedulers.from(ThreadPoolExecutor(0, 4, 60, TimeUnit.SECONDS, LinkedBlockingDeque())) @Provides @MainScheduler @@ -115,18 +126,20 @@ class AppModule { @Singleton @Provides - fun providesSuggestionsCacheControl(): CacheControl = CacheControl.Builder().maxStale(1, TimeUnit.DAYS).build() + fun providesSuggestionsCacheControl(): CacheControl = + CacheControl.Builder().maxStale(1, TimeUnit.DAYS).build() @Singleton @Provides - fun providesSuggestionsRequestFactory(cacheControl: CacheControl): RequestFactory = object : RequestFactory { - override fun createSuggestionsRequest(httpUrl: HttpUrl, encoding: String): Request { - return Request.Builder().url(httpUrl) - .addHeader("Accept-Charset", encoding) - .cacheControl(cacheControl) - .build() + fun providesSuggestionsRequestFactory(cacheControl: CacheControl): RequestFactory = + object : RequestFactory { + override fun createSuggestionsRequest(httpUrl: HttpUrl, encoding: String): Request { + return Request.Builder().url(httpUrl) + .addHeader("Accept-Charset", encoding) + .cacheControl(cacheControl) + .build() + } } - } private fun createInterceptorWithMaxCacheAge(maxCacheAgeSeconds: Long) = Interceptor { chain -> chain.proceed(chain.request()).newBuilder() @@ -137,28 +150,30 @@ class AppModule { @Singleton @Provides @SuggestionsClient - fun providesSuggestionsHttpClient(application: Application): Single = Single.fromCallable { - val intervalDay = TimeUnit.DAYS.toSeconds(1) - val suggestionsCache = File(application.cacheDir, "suggestion_responses") - - return@fromCallable OkHttpClient.Builder() - .cache(Cache(suggestionsCache, FileUtils.megabytesToBytes(1))) - .addNetworkInterceptor(createInterceptorWithMaxCacheAge(intervalDay)) - .build() - }.cache() + fun providesSuggestionsHttpClient(application: Application): Single = + Single.fromCallable { + val intervalDay = TimeUnit.DAYS.toSeconds(1) + val suggestionsCache = File(application.cacheDir, "suggestion_responses") + + return@fromCallable OkHttpClient.Builder() + .cache(Cache(suggestionsCache, FileUtils.megabytesToBytes(1))) + .addNetworkInterceptor(createInterceptorWithMaxCacheAge(intervalDay)) + .build() + }.cache() @Singleton @Provides @HostsClient - fun providesHostsHttpClient(application: Application): Single = Single.fromCallable { - val intervalYear = TimeUnit.DAYS.toSeconds(365) - val suggestionsCache = File(application.cacheDir, "hosts_cache") - - return@fromCallable OkHttpClient.Builder() - .cache(Cache(suggestionsCache, FileUtils.megabytesToBytes(5))) - .addNetworkInterceptor(createInterceptorWithMaxCacheAge(intervalYear)) - .build() - }.cache() + fun providesHostsHttpClient(application: Application): Single = + Single.fromCallable { + val intervalYear = TimeUnit.DAYS.toSeconds(365) + val suggestionsCache = File(application.cacheDir, "hosts_cache") + + return@fromCallable OkHttpClient.Builder() + .cache(Cache(suggestionsCache, FileUtils.megabytesToBytes(5))) + .addNetworkInterceptor(createInterceptorWithMaxCacheAge(intervalYear)) + .build() + }.cache() @Provides @Singleton @@ -170,7 +185,8 @@ class AppModule { @Provides @Singleton - fun provideI2PAndroidHelper(application: Application): I2PAndroidHelper = I2PAndroidHelper(application) + fun provideI2PAndroidHelper(application: Application): I2PAndroidHelper = + I2PAndroidHelper(application) @Provides fun providesListPageReader(): ListPageReader = MezzanineGenerator.ListPageReader() diff --git a/app/src/main/java/acr/browser/lightning/browser/search/SearchListener.kt b/app/src/main/java/acr/browser/lightning/browser/search/SearchListener.kt index 6648ac073..aae3454d5 100644 --- a/app/src/main/java/acr/browser/lightning/browser/search/SearchListener.kt +++ b/app/src/main/java/acr/browser/lightning/browser/search/SearchListener.kt @@ -35,7 +35,8 @@ class SearchListener( || actionId == EditorInfo.IME_ACTION_NEXT || actionId == EditorInfo.IME_ACTION_SEND || actionId == EditorInfo.IME_ACTION_SEARCH - || event?.action == KeyEvent.KEYCODE_ENTER) { + || event?.action == KeyEvent.KEYCODE_ENTER + ) { onConfirm() view.clearFocus() inputMethodManager.hideSoftInputFromWindow(view.windowToken, 0) diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/DrawerTabRecyclerViewAdapter.kt b/app/src/main/java/acr/browser/lightning/browser/tab/DrawerTabRecyclerViewAdapter.kt index 3b451455c..b90a06a59 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/DrawerTabRecyclerViewAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/DrawerTabRecyclerViewAdapter.kt @@ -22,14 +22,20 @@ class DrawerTabRecyclerViewAdapter( override fun areItemsTheSame(oldItem: TabViewState, newItem: TabViewState): Boolean = oldItem.id == newItem.id - override fun areContentsTheSame(oldItem: TabViewState, newItem: TabViewState): Boolean = oldItem == newItem + override fun areContentsTheSame(oldItem: TabViewState, newItem: TabViewState): Boolean = + oldItem == newItem } ) { override fun onCreateViewHolder(viewGroup: ViewGroup, i: Int): TabViewHolder { val view = viewGroup.context.inflater.inflate(R.layout.tab_list_item, viewGroup, false) view.background = BackgroundDrawable(view.context) - return TabViewHolder(view, onClick = onClick, onLongClick = onLongClick, onCloseClick = onCloseClick) + return TabViewHolder( + view, + onClick = onClick, + onLongClick = onLongClick, + onCloseClick = onCloseClick + ) } override fun onBindViewHolder(holder: TabViewHolder, position: Int) { @@ -43,7 +49,11 @@ class DrawerTabRecyclerViewAdapter( updateViewHolderBackground(holder, tab.isSelected) } - private fun updateViewHolderFavicon(viewHolder: TabViewHolder, favicon: Bitmap?, isForeground: Boolean) { + private fun updateViewHolderFavicon( + viewHolder: TabViewHolder, + favicon: Bitmap?, + isForeground: Boolean + ) { favicon?.let { if (isForeground) { viewHolder.favicon.setImageBitmap(it) @@ -63,7 +73,11 @@ class DrawerTabRecyclerViewAdapter( } } - private fun updateViewHolderAppearance(viewHolder: TabViewHolder, favicon: Bitmap?, isForeground: Boolean) { + private fun updateViewHolderAppearance( + viewHolder: TabViewHolder, + favicon: Bitmap?, + isForeground: Boolean + ) { if (isForeground) { TextViewCompat.setTextAppearance(viewHolder.txtTitle, R.style.boldText) } else { diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt index aa7287b01..f03d36d6b 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt @@ -1,9 +1,9 @@ package acr.browser.lightning.browser.tab import acr.browser.lightning.browser.BrowserContract -import acr.browser.lightning.browser.tab.bundle.BundleStore import acr.browser.lightning.browser.di.DiskScheduler import acr.browser.lightning.browser.di.MainScheduler +import acr.browser.lightning.browser.tab.bundle.BundleStore import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.view.* import io.reactivex.* @@ -49,7 +49,7 @@ class TabsRepository @Inject constructor( } override fun createTab(tabInitializer: TabInitializer): Single = - Single.fromCallable { + Single.fromCallable { val webView = webViewFactory.createWebView() tabPager.addTab(webView) val tabAdapter = tabFactory.constructTab(tabInitializer, webView) diff --git a/app/src/main/java/acr/browser/lightning/browser/view/WebViewLongPressHandler.kt b/app/src/main/java/acr/browser/lightning/browser/view/WebViewLongPressHandler.kt index c54086abb..416a351c6 100644 --- a/app/src/main/java/acr/browser/lightning/browser/view/WebViewLongPressHandler.kt +++ b/app/src/main/java/acr/browser/lightning/browser/view/WebViewLongPressHandler.kt @@ -22,23 +22,25 @@ class WebViewLongPressHandler @Inject constructor(private val activity: Activity webView: WebView, onLongClick: (LongPress) -> Unit ): Cancellable { - webView.setCompositeTouchListener("long_press", GestureTriggeringTouchListener( - GestureDetector( - activity, - CustomGestureListener( - messageHandler = MessageHandler { - val hitTestResult = webView.hitTestResult - val longPress = LongPress( - targetUrl = it ?: hitTestResult.extra, - hitUrl = hitTestResult.extra, - hitCategory = hitTestResult.type.asLongPressCategory() - ) - onLongClick(longPress) - }, - webView = webView + webView.setCompositeTouchListener( + "long_press", GestureTriggeringTouchListener( + GestureDetector( + activity, + CustomGestureListener( + messageHandler = MessageHandler { + val hitTestResult = webView.hitTestResult + val longPress = LongPress( + targetUrl = it ?: hitTestResult.extra, + hitUrl = hitTestResult.extra, + hitCategory = hitTestResult.type.asLongPressCategory() + ) + onLongClick(longPress) + }, + webView = webView + ) ) ) - )) + ) return Cancellable { webView.setCompositeTouchListener("long_press", null) diff --git a/app/src/main/java/acr/browser/lightning/constant/Constants.kt b/app/src/main/java/acr/browser/lightning/constant/Constants.kt index 76d7f8f9f..240de4e26 100644 --- a/app/src/main/java/acr/browser/lightning/constant/Constants.kt +++ b/app/src/main/java/acr/browser/lightning/constant/Constants.kt @@ -6,8 +6,10 @@ package acr.browser.lightning.constant // Hardcoded user agents -const val DESKTOP_USER_AGENT = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Safari/537.36" -const val MOBILE_USER_AGENT = "Mozilla/5.0 (Linux; Android 10; Pixel Build/QP1A.190711.019; wv) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Mobile Safari/537.36" +const val DESKTOP_USER_AGENT = + "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Safari/537.36" +const val MOBILE_USER_AGENT = + "Mozilla/5.0 (Linux; Android 10; Pixel Build/QP1A.190711.019; wv) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Mobile Safari/537.36" // URL Schemes const val HTTP = "http://" @@ -28,6 +30,7 @@ const val DEFAULT_ENCODING = UTF8 // Allowable text encodings for the WebView @JvmField -val TEXT_ENCODINGS = arrayOf("ISO-8859-1", UTF8, "GBK", "Big5", "ISO-2022-JP", "SHIFT_JS", "EUC-JP", "EUC-KR") +val TEXT_ENCODINGS = + arrayOf("ISO-8859-1", UTF8, "GBK", "Big5", "ISO-2022-JP", "SHIFT_JS", "EUC-JP", "EUC-KR") const val INTENT_ORIGIN = "URL_INTENT_ORIGIN" diff --git a/app/src/main/java/acr/browser/lightning/database/allowlist/AdBlockAllowListDatabase.kt b/app/src/main/java/acr/browser/lightning/database/allowlist/AdBlockAllowListDatabase.kt index 553d9921a..8777cfd30 100644 --- a/app/src/main/java/acr/browser/lightning/database/allowlist/AdBlockAllowListDatabase.kt +++ b/app/src/main/java/acr/browser/lightning/database/allowlist/AdBlockAllowListDatabase.kt @@ -23,7 +23,8 @@ import javax.inject.Singleton @WorkerThread class AdBlockAllowListDatabase @Inject constructor( application: Application -) : SQLiteOpenHelper(application, DATABASE_NAME, null, DATABASE_VERSION), AdBlockAllowListRepository { +) : SQLiteOpenHelper(application, DATABASE_NAME, null, DATABASE_VERSION), + AdBlockAllowListRepository { private val database: SQLiteDatabase by databaseDelegate() @@ -74,17 +75,19 @@ class AdBlockAllowListDatabase @Inject constructor( ).firstOrNullMap { it.bindToAllowListItem() } } - override fun addAllowListItem(whitelistItem: AllowListEntry): Completable = Completable.fromAction { - val values = ContentValues().apply { - put(KEY_URL, whitelistItem.domain) - put(KEY_CREATED, whitelistItem.timeCreated) + override fun addAllowListItem(whitelistItem: AllowListEntry): Completable = + Completable.fromAction { + val values = ContentValues().apply { + put(KEY_URL, whitelistItem.domain) + put(KEY_CREATED, whitelistItem.timeCreated) + } + database.insert(TABLE_WHITELIST, null, values) } - database.insert(TABLE_WHITELIST, null, values) - } - override fun removeAllowListItem(whitelistItem: AllowListEntry): Completable = Completable.fromAction { - database.delete(TABLE_WHITELIST, "$KEY_URL = ?", arrayOf(whitelistItem.domain)) - } + override fun removeAllowListItem(whitelistItem: AllowListEntry): Completable = + Completable.fromAction { + database.delete(TABLE_WHITELIST, "$KEY_URL = ?", arrayOf(whitelistItem.domain)) + } override fun clearAllowList(): Completable = Completable.fromAction { database.run { diff --git a/app/src/main/java/acr/browser/lightning/database/bookmark/BookmarkDatabase.kt b/app/src/main/java/acr/browser/lightning/database/bookmark/BookmarkDatabase.kt index 3c1a0bc02..355203505 100644 --- a/app/src/main/java/acr/browser/lightning/database/bookmark/BookmarkDatabase.kt +++ b/app/src/main/java/acr/browser/lightning/database/bookmark/BookmarkDatabase.kt @@ -130,46 +130,49 @@ class BookmarkDatabase @Inject constructor( } } - override fun addBookmarkIfNotExists(entry: Bookmark.Entry): Single = Single.fromCallable { - queryWithOptionalEndSlash(entry.url).use { - if (it.moveToFirst()) { - return@fromCallable false + override fun addBookmarkIfNotExists(entry: Bookmark.Entry): Single = + Single.fromCallable { + queryWithOptionalEndSlash(entry.url).use { + if (it.moveToFirst()) { + return@fromCallable false + } } - } - val id = database.insert( - TABLE_BOOKMARK, - null, - entry.bindBookmarkToContentValues() - ) + val id = database.insert( + TABLE_BOOKMARK, + null, + entry.bindBookmarkToContentValues() + ) - return@fromCallable id != -1L - } + return@fromCallable id != -1L + } - override fun addBookmarkList(bookmarkItems: List): Completable = Completable.fromAction { - database.apply { - beginTransaction() + override fun addBookmarkList(bookmarkItems: List): Completable = + Completable.fromAction { + database.apply { + beginTransaction() - for (item in bookmarkItems) { - addBookmarkIfNotExists(item).subscribe() - } + for (item in bookmarkItems) { + addBookmarkIfNotExists(item).subscribe() + } - setTransactionSuccessful() - endTransaction() + setTransactionSuccessful() + endTransaction() + } } - } override fun deleteBookmark(entry: Bookmark.Entry): Single = Single.fromCallable { return@fromCallable deleteWithOptionalEndSlash(entry.url) > 0 } - override fun renameFolder(oldName: String, newName: String): Completable = Completable.fromAction { - val contentValues = ContentValues(1).apply { - put(KEY_FOLDER, newName) - } + override fun renameFolder(oldName: String, newName: String): Completable = + Completable.fromAction { + val contentValues = ContentValues(1).apply { + put(KEY_FOLDER, newName) + } - database.update(TABLE_BOOKMARK, contentValues, "$KEY_FOLDER=?", arrayOf(oldName)) - } + database.update(TABLE_BOOKMARK, contentValues, "$KEY_FOLDER=?", arrayOf(oldName)) + } override fun deleteFolder(folderToDelete: String): Completable = Completable.fromAction(renameFolder(folderToDelete, "")::subscribe) @@ -181,7 +184,10 @@ class BookmarkDatabase @Inject constructor( } } - override fun editBookmark(oldBookmark: Bookmark.Entry, newBookmark: Bookmark.Entry): Completable = Completable.fromAction { + override fun editBookmark( + oldBookmark: Bookmark.Entry, + newBookmark: Bookmark.Entry + ): Completable = Completable.fromAction { val contentValues = newBookmark.bindBookmarkToContentValues() updateWithOptionalEndSlash(oldBookmark.url, contentValues) @@ -199,18 +205,19 @@ class BookmarkDatabase @Inject constructor( ).useMap { it.bindToBookmarkEntry() } } - override fun getBookmarksFromFolderSorted(folder: String?): Single> = Single.fromCallable { - val finalFolder = folder ?: "" - return@fromCallable database.query( - TABLE_BOOKMARK, - null, - "$KEY_FOLDER=?", - arrayOf(finalFolder), - null, - null, - "$KEY_POSITION ASC, $KEY_TITLE COLLATE NOCASE ASC, $KEY_URL ASC" - ).useMap { it.bindToBookmarkEntry() } - } + override fun getBookmarksFromFolderSorted(folder: String?): Single> = + Single.fromCallable { + val finalFolder = folder ?: "" + return@fromCallable database.query( + TABLE_BOOKMARK, + null, + "$KEY_FOLDER=?", + arrayOf(finalFolder), + null, + null, + "$KEY_POSITION ASC, $KEY_TITLE COLLATE NOCASE ASC, $KEY_URL ASC" + ).useMap { it.bindToBookmarkEntry() } + } override fun getFoldersSorted(): Single> = Single.fromCallable { return@fromCallable database diff --git a/app/src/main/java/acr/browser/lightning/database/downloads/DownloadsDatabase.kt b/app/src/main/java/acr/browser/lightning/database/downloads/DownloadsDatabase.kt index ce0a5397b..ef75fae52 100644 --- a/app/src/main/java/acr/browser/lightning/database/downloads/DownloadsDatabase.kt +++ b/app/src/main/java/acr/browser/lightning/database/downloads/DownloadsDatabase.kt @@ -27,12 +27,13 @@ class DownloadsDatabase @Inject constructor( // Creating Tables override fun onCreate(db: SQLiteDatabase) { - val createDownloadsTable = "CREATE TABLE ${DatabaseUtils.sqlEscapeString(TABLE_DOWNLOADS)}(" + - "${DatabaseUtils.sqlEscapeString(KEY_ID)} INTEGER PRIMARY KEY," + - "${DatabaseUtils.sqlEscapeString(KEY_URL)} TEXT," + - "${DatabaseUtils.sqlEscapeString(KEY_TITLE)} TEXT," + - "${DatabaseUtils.sqlEscapeString(KEY_SIZE)} TEXT" + - ')' + val createDownloadsTable = + "CREATE TABLE ${DatabaseUtils.sqlEscapeString(TABLE_DOWNLOADS)}(" + + "${DatabaseUtils.sqlEscapeString(KEY_ID)} INTEGER PRIMARY KEY," + + "${DatabaseUtils.sqlEscapeString(KEY_URL)} TEXT," + + "${DatabaseUtils.sqlEscapeString(KEY_TITLE)} TEXT," + + "${DatabaseUtils.sqlEscapeString(KEY_SIZE)} TEXT" + + ')' db.execSQL(createDownloadsTable) } @@ -71,38 +72,40 @@ class DownloadsDatabase @Inject constructor( } } - override fun addDownloadIfNotExists(entry: DownloadEntry): Single = Single.fromCallable { - database.query( - TABLE_DOWNLOADS, - null, - "$KEY_URL=?", - arrayOf(entry.url), - null, - null, - "1" - ).use { - if (it.moveToFirst()) { - return@fromCallable false + override fun addDownloadIfNotExists(entry: DownloadEntry): Single = + Single.fromCallable { + database.query( + TABLE_DOWNLOADS, + null, + "$KEY_URL=?", + arrayOf(entry.url), + null, + null, + "1" + ).use { + if (it.moveToFirst()) { + return@fromCallable false + } } - } - val id = database.insert(TABLE_DOWNLOADS, null, entry.toContentValues()) + val id = database.insert(TABLE_DOWNLOADS, null, entry.toContentValues()) - return@fromCallable id != -1L - } + return@fromCallable id != -1L + } - override fun addDownloadsList(downloadEntries: List): Completable = Completable.fromAction { - database.apply { - beginTransaction() - setTransactionSuccessful() + override fun addDownloadsList(downloadEntries: List): Completable = + Completable.fromAction { + database.apply { + beginTransaction() + setTransactionSuccessful() - for (item in downloadEntries) { - addDownloadIfNotExists(item).subscribe() - } + for (item in downloadEntries) { + addDownloadIfNotExists(item).subscribe() + } - endTransaction() + endTransaction() + } } - } override fun deleteDownload(url: String): Single = Single.fromCallable { return@fromCallable database.delete(TABLE_DOWNLOADS, "$KEY_URL=?", arrayOf(url)) > 0 diff --git a/app/src/main/java/acr/browser/lightning/database/history/HistoryDatabase.kt b/app/src/main/java/acr/browser/lightning/database/history/HistoryDatabase.kt index c6fd3b160..a15572694 100644 --- a/app/src/main/java/acr/browser/lightning/database/history/HistoryDatabase.kt +++ b/app/src/main/java/acr/browser/lightning/database/history/HistoryDatabase.kt @@ -61,30 +61,31 @@ class HistoryDatabase @Inject constructor( database.delete(TABLE_HISTORY, "$KEY_URL = ?", arrayOf(url)) } - override fun visitHistoryEntry(url: String, title: String?): Completable = Completable.fromAction { - val values = ContentValues().apply { - put(KEY_TITLE, title ?: "") - put(KEY_TIME_VISITED, System.currentTimeMillis()) - } + override fun visitHistoryEntry(url: String, title: String?): Completable = + Completable.fromAction { + val values = ContentValues().apply { + put(KEY_TITLE, title ?: "") + put(KEY_TIME_VISITED, System.currentTimeMillis()) + } - database.query( - false, - TABLE_HISTORY, - arrayOf(KEY_ID), - "$KEY_URL = ?", - arrayOf(url), - null, - null, - null, - "1" - ).use { - if (it.count > 0) { - database.update(TABLE_HISTORY, values, "$KEY_URL = ?", arrayOf(url)) - } else { - addHistoryEntry(HistoryEntry(url, title ?: "")) + database.query( + false, + TABLE_HISTORY, + arrayOf(KEY_ID), + "$KEY_URL = ?", + arrayOf(url), + null, + null, + null, + "1" + ).use { + if (it.count > 0) { + database.update(TABLE_HISTORY, values, "$KEY_URL = ?", arrayOf(url)) + } else { + addHistoryEntry(HistoryEntry(url, title ?: "")) + } } } - } override fun findHistoryEntriesContaining(query: String): Single> = Single.fromCallable { diff --git a/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt b/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt index 6987d438e..80a12efe5 100644 --- a/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt +++ b/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.kt @@ -23,7 +23,6 @@ class LightningDialogBuilder @Inject constructor() { * if the link is relative to a bookmark or is just a folder. * * @param activity used to show the dialog - * @param url the long pressed url */ fun showLongPressedDialogForBookmarkUrl( activity: Activity, @@ -58,7 +57,6 @@ class LightningDialogBuilder @Inject constructor() { * Show the appropriated dialog for the long pressed link. * * @param activity used to show the dialog - * @param url the long pressed url */ // TODO allow individual downloads to be deleted. fun showLongPressedDialogForDownloadUrl( diff --git a/app/src/main/java/acr/browser/lightning/extensions/AlertDialogExtensions.kt b/app/src/main/java/acr/browser/lightning/extensions/AlertDialogExtensions.kt index 0031ce49f..0a9222a13 100644 --- a/app/src/main/java/acr/browser/lightning/extensions/AlertDialogExtensions.kt +++ b/app/src/main/java/acr/browser/lightning/extensions/AlertDialogExtensions.kt @@ -27,4 +27,5 @@ fun AlertDialog.Builder.withSingleChoiceItems( * Ensures that the dialog is appropriately sized and displays it. */ @Suppress("NOTHING_TO_INLINE") -inline fun AlertDialog.Builder.resizeAndShow(): Dialog = show().also { BrowserDialog.setDialogSize(context, it) } +inline fun AlertDialog.Builder.resizeAndShow(): Dialog = + show().also { BrowserDialog.setDialogSize(context, it) } diff --git a/app/src/main/java/acr/browser/lightning/extensions/BitmapExtensions.kt b/app/src/main/java/acr/browser/lightning/extensions/BitmapExtensions.kt index e052ba33d..9188c30c5 100644 --- a/app/src/main/java/acr/browser/lightning/extensions/BitmapExtensions.kt +++ b/app/src/main/java/acr/browser/lightning/extensions/BitmapExtensions.kt @@ -18,7 +18,12 @@ fun Bitmap.pad(): Bitmap = let { Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888).apply { Canvas(this).apply { drawARGB(0x00, 0x00, 0x00, 0x00) // this represents white color - drawBitmap(it, (padding / 2).toFloat(), (padding / 2).toFloat(), Paint(Paint.FILTER_BITMAP_FLAG)) + drawBitmap( + it, + (padding / 2).toFloat(), + (padding / 2).toFloat(), + Paint(Paint.FILTER_BITMAP_FLAG) + ) } } } diff --git a/app/src/main/java/acr/browser/lightning/extensions/ContextExtensions.kt b/app/src/main/java/acr/browser/lightning/extensions/ContextExtensions.kt index 19068e500..ba7c528ac 100644 --- a/app/src/main/java/acr/browser/lightning/extensions/ContextExtensions.kt +++ b/app/src/main/java/acr/browser/lightning/extensions/ContextExtensions.kt @@ -27,7 +27,8 @@ inline fun Context.color(@ColorRes colorRes: Int): Int = ContextCompat.getColor( /** * Shows a toast with the provided [StringRes]. */ -inline fun Context.toast(@StringRes stringRes: Int) = Toast.makeText(this, stringRes, Toast.LENGTH_SHORT).show() +inline fun Context.toast(@StringRes stringRes: Int) = + Toast.makeText(this, stringRes, Toast.LENGTH_SHORT).show() /** * The [LayoutInflater] available on the [Context]. @@ -38,7 +39,8 @@ inline val Context.inflater: LayoutInflater /** * Gets a drawable from the context. */ -inline fun Context.drawable(@DrawableRes drawableRes: Int): Drawable = ContextCompat.getDrawable(this, drawableRes)!! +inline fun Context.drawable(@DrawableRes drawableRes: Int): Drawable = + ContextCompat.getDrawable(this, drawableRes)!! /** * The preferred locale of the user. diff --git a/app/src/main/java/acr/browser/lightning/extensions/DrawableExtensions.kt b/app/src/main/java/acr/browser/lightning/extensions/DrawableExtensions.kt index dcf955436..66cdf72f3 100644 --- a/app/src/main/java/acr/browser/lightning/extensions/DrawableExtensions.kt +++ b/app/src/main/java/acr/browser/lightning/extensions/DrawableExtensions.kt @@ -9,5 +9,6 @@ import androidx.core.graphics.BlendModeCompat * Tint a drawable with the provided [color], using [BlendModeCompat.SRC_IN]. */ fun Drawable.tint(@ColorInt color: Int) { - colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(color, BlendModeCompat.SRC_IN) + colorFilter = + BlendModeColorFilterCompat.createBlendModeColorFilterCompat(color, BlendModeCompat.SRC_IN) } diff --git a/app/src/main/java/acr/browser/lightning/favicon/FaviconModel.kt b/app/src/main/java/acr/browser/lightning/favicon/FaviconModel.kt index 591a6c68b..b65e00421 100644 --- a/app/src/main/java/acr/browser/lightning/favicon/FaviconModel.kt +++ b/app/src/main/java/acr/browser/lightning/favicon/FaviconModel.kt @@ -31,10 +31,12 @@ class FaviconModel @Inject constructor( ) { private val loaderOptions = BitmapFactory.Options() - private val bookmarkIconSize = application.resources.getDimensionPixelSize(R.dimen.material_grid_small_icon) - private val faviconCache = object : LruCache(FileUtils.megabytesToBytes(1).toInt()) { - override fun sizeOf(key: String, value: Bitmap) = value.byteCount - } + private val bookmarkIconSize = + application.resources.getDimensionPixelSize(R.dimen.material_grid_small_icon) + private val faviconCache = + object : LruCache(FileUtils.megabytesToBytes(1).toInt()) { + override fun sizeOf(key: String, value: Bitmap) = value.byteCount + } /** * Retrieves a favicon from the memory cache.Bitmap may not be present if no bitmap has been @@ -52,7 +54,8 @@ class FaviconModel @Inject constructor( fun createDefaultBitmapForTitle(title: String?): Bitmap { val firstTitleCharacter = title?.takeIf(String::isNotBlank)?.let { it[0] } ?: '?' - @ColorInt val defaultFaviconColor = DrawableUtils.characterToColorHash(firstTitleCharacter, application) + @ColorInt val defaultFaviconColor = + DrawableUtils.characterToColorHash(firstTitleCharacter, application) return DrawableUtils.createRoundedLetterImage( firstTitleCharacter, @@ -111,16 +114,17 @@ class FaviconModel @Inject constructor( * @param url the URL to cache the favicon for. * @return an observable that notifies the consumer when it is complete. */ - fun cacheFaviconForUrl(favicon: Bitmap, url: String): Completable = Completable.create { emitter -> - val uri = url.toUri().toValidUri() ?: return@create emitter.onComplete() - - logger.log(TAG, "Caching icon for ${uri.host}") - FileOutputStream(getFaviconCacheFile(application, uri)).safeUse { - favicon.compress(Bitmap.CompressFormat.PNG, 100, it) - it.flush() - emitter.onComplete() + fun cacheFaviconForUrl(favicon: Bitmap, url: String): Completable = + Completable.create { emitter -> + val uri = url.toUri().toValidUri() ?: return@create emitter.onComplete() + + logger.log(TAG, "Caching icon for ${uri.host}") + FileOutputStream(getFaviconCacheFile(application, uri)).safeUse { + favicon.compress(Bitmap.CompressFormat.PNG, 100, it) + it.flush() + emitter.onComplete() + } } - } companion object { diff --git a/app/src/main/java/acr/browser/lightning/preference/UserPreferences.kt b/app/src/main/java/acr/browser/lightning/preference/UserPreferences.kt index de799b554..fbd7a14b6 100644 --- a/app/src/main/java/acr/browser/lightning/preference/UserPreferences.kt +++ b/app/src/main/java/acr/browser/lightning/preference/UserPreferences.kt @@ -54,7 +54,10 @@ class UserPreferences @Inject constructor( /** * The folder into which files will be downloaded. */ - var downloadDirectory by preferences.stringPreference(DOWNLOAD_DIRECTORY, FileUtils.DEFAULT_DOWNLOAD_PATH) + var downloadDirectory by preferences.stringPreference( + DOWNLOAD_DIRECTORY, + FileUtils.DEFAULT_DOWNLOAD_PATH + ) /** * True if the browser should hide the navigation bar when scrolling, false if it should be @@ -186,7 +189,10 @@ class UserPreferences @Inject constructor( * * @see SearchBoxModel */ - var urlBoxContentChoice by preferences.enumPreference(URL_BOX_CONTENTS, SearchBoxDisplayChoice.DOMAIN) + var urlBoxContentChoice by preferences.enumPreference( + URL_BOX_CONTENTS, + SearchBoxDisplayChoice.DOMAIN + ) /** * True if the browser should invert the display colors of the web page content, false @@ -218,7 +224,10 @@ class UserPreferences @Inject constructor( * True if the app should use the navigation drawer UI, false if it should use the traditional * desktop browser tabs UI. */ - var showTabsInDrawer by preferences.booleanPreference(SHOW_TABS_IN_DRAWER, !screenSize.isTablet()) + var showTabsInDrawer by preferences.booleanPreference( + SHOW_TABS_IN_DRAWER, + !screenSize.isTablet() + ) /** * True if the browser should send a do not track (DNT) header with every GET request, false diff --git a/app/src/main/java/acr/browser/lightning/rx/RxExtensions.kt b/app/src/main/java/acr/browser/lightning/rx/RxExtensions.kt index b9f3a0d0d..78ff798d8 100644 --- a/app/src/main/java/acr/browser/lightning/rx/RxExtensions.kt +++ b/app/src/main/java/acr/browser/lightning/rx/RxExtensions.kt @@ -2,7 +2,6 @@ package acr.browser.lightning.rx import io.reactivex.Flowable import io.reactivex.Observable -import io.reactivex.functions.BiFunction import org.reactivestreams.Publisher /** diff --git a/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.kt b/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.kt index e393c7723..3c19d0f01 100644 --- a/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.kt @@ -207,9 +207,16 @@ class SuggestionsAdapter( } } .map { (bookmarks, history, searches) -> - val bookmarkCount = MAX_SUGGESTIONS - 2.coerceAtMost(history.size) - 1.coerceAtMost(searches.size) - val historyCount = MAX_SUGGESTIONS - bookmarkCount.coerceAtMost(bookmarks.size) - 1.coerceAtMost(searches.size) - val searchCount = MAX_SUGGESTIONS - bookmarkCount.coerceAtMost(bookmarks.size) - historyCount.coerceAtMost(history.size) + val bookmarkCount = + MAX_SUGGESTIONS - 2.coerceAtMost(history.size) - 1.coerceAtMost(searches.size) + val historyCount = + MAX_SUGGESTIONS - bookmarkCount.coerceAtMost(bookmarks.size) - 1.coerceAtMost( + searches.size + ) + val searchCount = + MAX_SUGGESTIONS - bookmarkCount.coerceAtMost(bookmarks.size) - historyCount.coerceAtMost( + history.size + ) bookmarks.take(bookmarkCount) + history.take(historyCount) + searches.take(searchCount) } diff --git a/app/src/main/java/acr/browser/lightning/search/suggestions/BaseSuggestionsModel.kt b/app/src/main/java/acr/browser/lightning/search/suggestions/BaseSuggestionsModel.kt index b8312197a..047ebf1ee 100644 --- a/app/src/main/java/acr/browser/lightning/search/suggestions/BaseSuggestionsModel.kt +++ b/app/src/main/java/acr/browser/lightning/search/suggestions/BaseSuggestionsModel.kt @@ -70,7 +70,10 @@ abstract class BaseSuggestionsModel internal constructor( * * @return the cache file containing the suggestions */ - private fun OkHttpClient.downloadSuggestionsForQuery(query: String, language: String): Response? { + private fun OkHttpClient.downloadSuggestionsForQuery( + query: String, + language: String + ): Response? { val queryUrl = createQueryUrl(query, language) val request = requestFactory.createSuggestionsRequest(queryUrl, encoding) return try { diff --git a/app/src/main/java/acr/browser/lightning/settings/activity/SettingsActivity.kt b/app/src/main/java/acr/browser/lightning/settings/activity/SettingsActivity.kt index fe055600e..deacbcfb6 100644 --- a/app/src/main/java/acr/browser/lightning/settings/activity/SettingsActivity.kt +++ b/app/src/main/java/acr/browser/lightning/settings/activity/SettingsActivity.kt @@ -60,7 +60,11 @@ class SettingsActivity : ThemableSettingsActivity() { return true } - override fun onRequestPermissionsResult(requestCode: Int, permissions: Array, grantResults: IntArray) { + override fun onRequestPermissionsResult( + requestCode: Int, + permissions: Array, + grantResults: IntArray + ) { PermissionsManager.getInstance().notifyPermissionsChange(permissions, grantResults) super.onRequestPermissionsResult(requestCode, permissions, grantResults) } diff --git a/app/src/main/java/acr/browser/lightning/settings/fragment/AdBlockSettingsFragment.kt b/app/src/main/java/acr/browser/lightning/settings/fragment/AdBlockSettingsFragment.kt index 1553b6dfa..2f644339d 100644 --- a/app/src/main/java/acr/browser/lightning/settings/fragment/AdBlockSettingsFragment.kt +++ b/app/src/main/java/acr/browser/lightning/settings/fragment/AdBlockSettingsFragment.kt @@ -80,7 +80,8 @@ class AdBlockSettingsFragment : AbstractSettingsFragment() { forceRefreshHostsPreference?.isEnabled = isRefreshHostsEnabled() } - private fun isRefreshHostsEnabled() = userPreferences.selectedHostsSource() is HostsSourceType.Remote + private fun isRefreshHostsEnabled() = + userPreferences.selectedHostsSource() is HostsSourceType.Remote override fun onDestroy() { super.onDestroy() @@ -161,9 +162,12 @@ class AdBlockSettingsFragment : AbstractSettingsFragment() { .subscribeBy( onComplete = { activity?.toast(R.string.action_message_canceled) }, onSuccess = { file -> - userPreferences.hostsSource = HostsSourceType.Local(file).toPreferenceIndex() + userPreferences.hostsSource = + HostsSourceType.Local(file).toPreferenceIndex() userPreferences.hostsLocalFile = file.path - recentSummaryUpdater?.updateSummary(userPreferences.selectedHostsSource().toSummary()) + recentSummaryUpdater?.updateSummary( + userPreferences.selectedHostsSource().toSummary() + ) updateForNewHostsSource() } ) diff --git a/app/src/main/java/acr/browser/lightning/settings/fragment/AdvancedSettingsFragment.kt b/app/src/main/java/acr/browser/lightning/settings/fragment/AdvancedSettingsFragment.kt index 349f28304..b80476b02 100644 --- a/app/src/main/java/acr/browser/lightning/settings/fragment/AdvancedSettingsFragment.kt +++ b/app/src/main/java/acr/browser/lightning/settings/fragment/AdvancedSettingsFragment.kt @@ -155,13 +155,15 @@ class AdvancedSettingsFragment : AbstractSettingsFragment() { } } - private fun RenderingMode.toDisplayString(): String = getString(when (this) { - RenderingMode.NORMAL -> R.string.name_normal - RenderingMode.INVERTED -> R.string.name_inverted - RenderingMode.GRAYSCALE -> R.string.name_grayscale - RenderingMode.INVERTED_GRAYSCALE -> R.string.name_inverted_grayscale - RenderingMode.INCREASE_CONTRAST -> R.string.name_increase_contrast - }) + private fun RenderingMode.toDisplayString(): String = getString( + when (this) { + RenderingMode.NORMAL -> R.string.name_normal + RenderingMode.INVERTED -> R.string.name_inverted + RenderingMode.GRAYSCALE -> R.string.name_grayscale + RenderingMode.INVERTED_GRAYSCALE -> R.string.name_inverted_grayscale + RenderingMode.INCREASE_CONTRAST -> R.string.name_increase_contrast + } + ) companion object { private const val SETTINGS_NEW_WINDOW = "allow_new_window" diff --git a/app/src/main/java/acr/browser/lightning/settings/fragment/BookmarkSettingsFragment.kt b/app/src/main/java/acr/browser/lightning/settings/fragment/BookmarkSettingsFragment.kt index 6dbb3b507..c24b3409a 100644 --- a/app/src/main/java/acr/browser/lightning/settings/fragment/BookmarkSettingsFragment.kt +++ b/app/src/main/java/acr/browser/lightning/settings/fragment/BookmarkSettingsFragment.kt @@ -58,7 +58,10 @@ class BookmarkSettingsFragment : AbstractSettingsFragment() { clickablePreference(preference = SETTINGS_EXPORT, onClick = this::exportBookmarks) clickablePreference(preference = SETTINGS_IMPORT, onClick = this::importBookmarks) - clickablePreference(preference = SETTINGS_DELETE_BOOKMARKS, onClick = this::deleteAllBookmarks) + clickablePreference( + preference = SETTINGS_DELETE_BOOKMARKS, + onClick = this::deleteAllBookmarks + ) } override fun onDestroyView() { @@ -76,62 +79,77 @@ class BookmarkSettingsFragment : AbstractSettingsFragment() { } private fun exportBookmarks() { - PermissionsManager.getInstance().requestPermissionsIfNecessaryForResult(activity, REQUIRED_PERMISSIONS, - object : PermissionsResultAction() { - override fun onGranted() { - bookmarkRepository.getAllBookmarksSorted() - .subscribeOn(databaseScheduler) - .subscribe { list -> - if (!isAdded) { - return@subscribe + PermissionsManager.getInstance() + .requestPermissionsIfNecessaryForResult(activity, REQUIRED_PERMISSIONS, + object : PermissionsResultAction() { + override fun onGranted() { + bookmarkRepository.getAllBookmarksSorted() + .subscribeOn(databaseScheduler) + .subscribe { list -> + if (!isAdded) { + return@subscribe + } + + val exportFile = BookmarkExporter.createNewExportFile() + exportSubscription?.dispose() + exportSubscription = + BookmarkExporter.exportBookmarksToFile(list, exportFile) + .subscribeOn(databaseScheduler) + .observeOn(mainScheduler) + .subscribeBy( + onComplete = { + activity?.apply { + snackbar("${getString(R.string.bookmark_export_path)} ${exportFile.path}") + } + }, + onError = { throwable -> + logger.log( + TAG, + "onError: exporting bookmarks", + throwable + ) + val activity = activity + if (activity != null && !activity.isFinishing && isAdded) { + Utils.createInformativeDialog( + activity, + R.string.title_error, + R.string.bookmark_export_failure + ) + } else { + application.toast(R.string.bookmark_export_failure) + } + } + ) } + } - val exportFile = BookmarkExporter.createNewExportFile() - exportSubscription?.dispose() - exportSubscription = BookmarkExporter.exportBookmarksToFile(list, exportFile) - .subscribeOn(databaseScheduler) - .observeOn(mainScheduler) - .subscribeBy( - onComplete = { - activity?.apply { - snackbar("${getString(R.string.bookmark_export_path)} ${exportFile.path}") - } - }, - onError = { throwable -> - logger.log(TAG, "onError: exporting bookmarks", throwable) - val activity = activity - if (activity != null && !activity.isFinishing && isAdded) { - Utils.createInformativeDialog(activity, R.string.title_error, R.string.bookmark_export_failure) - } else { - application.toast(R.string.bookmark_export_failure) - } - } - ) + override fun onDenied(permission: String) { + val activity = activity + if (activity != null && !activity.isFinishing && isAdded) { + Utils.createInformativeDialog( + activity, + R.string.title_error, + R.string.bookmark_export_failure + ) + } else { + application.toast(R.string.bookmark_export_failure) } - } - - override fun onDenied(permission: String) { - val activity = activity - if (activity != null && !activity.isFinishing && isAdded) { - Utils.createInformativeDialog(activity, R.string.title_error, R.string.bookmark_export_failure) - } else { - application.toast(R.string.bookmark_export_failure) } - } - }) + }) } private fun importBookmarks() { - PermissionsManager.getInstance().requestPermissionsIfNecessaryForResult(activity, REQUIRED_PERMISSIONS, - object : PermissionsResultAction() { - override fun onGranted() { - showImportBookmarkDialog(null) - } - - override fun onDenied(permission: String) { - //TODO Show message - } - }) + PermissionsManager.getInstance() + .requestPermissionsIfNecessaryForResult(activity, REQUIRED_PERMISSIONS, + object : PermissionsResultAction() { + override fun onGranted() { + showImportBookmarkDialog(null) + } + + override fun onDenied(permission: String) { + //TODO Show message + } + }) } private fun deleteAllBookmarks() { @@ -225,7 +243,11 @@ class BookmarkSettingsFragment : AbstractSettingsFragment() { logger.log(TAG, "onError: importing bookmarks", it) val activity = activity if (activity != null && !activity.isFinishing && isAdded) { - Utils.createInformativeDialog(activity, R.string.title_error, R.string.import_bookmark_error) + Utils.createInformativeDialog( + activity, + R.string.title_error, + R.string.import_bookmark_error + ) } else { application.toast(R.string.import_bookmark_error) } @@ -246,6 +268,9 @@ class BookmarkSettingsFragment : AbstractSettingsFragment() { private const val SETTINGS_IMPORT = "import_bookmark" private const val SETTINGS_DELETE_BOOKMARKS = "delete_bookmarks" - private val REQUIRED_PERMISSIONS = arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE) + private val REQUIRED_PERMISSIONS = arrayOf( + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ) } } diff --git a/app/src/main/java/acr/browser/lightning/settings/fragment/DisplaySettingsFragment.kt b/app/src/main/java/acr/browser/lightning/settings/fragment/DisplaySettingsFragment.kt index 832b25bff..040b49e9b 100644 --- a/app/src/main/java/acr/browser/lightning/settings/fragment/DisplaySettingsFragment.kt +++ b/app/src/main/java/acr/browser/lightning/settings/fragment/DisplaySettingsFragment.kt @@ -95,19 +95,23 @@ class DisplaySettingsFragment : AbstractSettingsFragment() { val maxValue = 5 AlertDialog.Builder(activity).apply { val layoutInflater = activity.layoutInflater - val customView = (layoutInflater.inflate(R.layout.dialog_seek_bar, null) as LinearLayout).apply { - val text = TextView(activity).apply { - setText(R.string.untitled) - layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT) - gravity = Gravity.CENTER_HORIZONTAL + val customView = + (layoutInflater.inflate(R.layout.dialog_seek_bar, null) as LinearLayout).apply { + val text = TextView(activity).apply { + setText(R.string.untitled) + layoutParams = ViewGroup.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, + WindowManager.LayoutParams.WRAP_CONTENT + ) + gravity = Gravity.CENTER_HORIZONTAL + } + addView(text) + findViewById(R.id.text_size_seekbar).apply { + setOnSeekBarChangeListener(TextSeekBarListener(text)) + max = maxValue + progress = maxValue - userPreferences.textSize + } } - addView(text) - findViewById(R.id.text_size_seekbar).apply { - setOnSeekBarChangeListener(TextSeekBarListener(text)) - max = maxValue - progress = maxValue - userPreferences.textSize - } - } setView(customView) setTitle(R.string.title_text_size) setPositiveButton(android.R.string.ok) { _, _ -> @@ -139,11 +143,13 @@ class DisplaySettingsFragment : AbstractSettingsFragment() { }.resizeAndShow() } - private fun AppTheme.toDisplayString(): String = getString(when (this) { - AppTheme.LIGHT -> R.string.light_theme - AppTheme.DARK -> R.string.dark_theme - AppTheme.BLACK -> R.string.black_theme - }) + private fun AppTheme.toDisplayString(): String = getString( + when (this) { + AppTheme.LIGHT -> R.string.light_theme + AppTheme.DARK -> R.string.dark_theme + AppTheme.BLACK -> R.string.black_theme + } + ) private class TextSeekBarListener( private val sampleText: TextView diff --git a/app/src/main/java/acr/browser/lightning/settings/fragment/GeneralSettingsFragment.kt b/app/src/main/java/acr/browser/lightning/settings/fragment/GeneralSettingsFragment.kt index b0775a68a..f1029f3be 100644 --- a/app/src/main/java/acr/browser/lightning/settings/fragment/GeneralSettingsFragment.kt +++ b/app/src/main/java/acr/browser/lightning/settings/fragment/GeneralSettingsFragment.kt @@ -124,12 +124,14 @@ class GeneralSettingsFragment : AbstractSettingsFragment() { setTitle(R.string.http_proxy) val stringArray = resources.getStringArray(R.array.proxy_choices_array) val values = ProxyChoice.values().map { - Pair(it, when (it) { - ProxyChoice.NONE -> stringArray[0] - ProxyChoice.ORBOT -> stringArray[1] - ProxyChoice.I2P -> stringArray[2] - ProxyChoice.MANUAL -> stringArray[3] - }) + Pair( + it, when (it) { + ProxyChoice.NONE -> stringArray[0] + ProxyChoice.ORBOT -> stringArray[1] + ProxyChoice.I2P -> stringArray[2] + ProxyChoice.MANUAL -> stringArray[3] + } + ) } withSingleChoiceItems(values, userPreferences.proxyChoice) { updateProxyChoice(it, activity, summaryUpdater) @@ -138,7 +140,11 @@ class GeneralSettingsFragment : AbstractSettingsFragment() { } } - private fun updateProxyChoice(choice: ProxyChoice, activity: Activity, summaryUpdater: SummaryUpdater) { + private fun updateProxyChoice( + choice: ProxyChoice, + activity: Activity, + summaryUpdater: SummaryUpdater + ) { val sanitizedChoice = ProxyUtils.sanitizeProxyChoice(choice, activity) if (sanitizedChoice == ProxyChoice.MANUAL) { showManualProxyPicker(activity, summaryUpdater) @@ -193,7 +199,10 @@ class GeneralSettingsFragment : AbstractSettingsFragment() { private fun showUserAgentChooserDialog(summaryUpdater: SummaryUpdater) { BrowserDialog.showCustomDialog(activity) { setTitle(resources.getString(R.string.title_user_agent)) - setSingleChoiceItems(R.array.user_agent, userPreferences.userAgentChoice - 1) { _, which -> + setSingleChoiceItems( + R.array.user_agent, + userPreferences.userAgentChoice - 1 + ) { _, which -> userPreferences.userAgentChoice = which + 1 summaryUpdater.updateSummary(choiceToUserAgent(userPreferences.userAgentChoice)) when (which) { @@ -210,11 +219,13 @@ class GeneralSettingsFragment : AbstractSettingsFragment() { private fun showCustomUserAgentPicker(summaryUpdater: SummaryUpdater) { activity?.let { - BrowserDialog.showEditText(it, + BrowserDialog.showEditText( + it, R.string.title_user_agent, R.string.title_user_agent, userPreferences.userAgentString, - R.string.action_ok) { s -> + R.string.action_ok + ) { s -> userPreferences.userAgentString = s summaryUpdater.updateSummary(it.getString(R.string.agent_custom)) } @@ -224,11 +235,12 @@ class GeneralSettingsFragment : AbstractSettingsFragment() { private fun showDownloadLocationDialog(summaryUpdater: SummaryUpdater) { BrowserDialog.showCustomDialog(activity) { setTitle(resources.getString(R.string.title_download_location)) - val n: Int = if (userPreferences.downloadDirectory.contains(Environment.DIRECTORY_DOWNLOADS)) { - 0 - } else { - 1 - } + val n: Int = + if (userPreferences.downloadDirectory.contains(Environment.DIRECTORY_DOWNLOADS)) { + 0 + } else { + 1 + } setSingleChoiceItems(R.array.download_folder, n) { _, which -> when (which) { @@ -254,7 +266,13 @@ class GeneralSettingsFragment : AbstractSettingsFragment() { val errorColor = ContextCompat.getColor(activity, R.color.error_red) val regularColor = ThemeUtils.getTextColor(activity) getDownload.setTextColor(regularColor) - getDownload.addTextChangedListener(DownloadLocationTextWatcher(getDownload, errorColor, regularColor)) + getDownload.addTextChangedListener( + DownloadLocationTextWatcher( + getDownload, + errorColor, + regularColor + ) + ) getDownload.setText(userPreferences.downloadDirectory) BrowserDialog.showCustomDialog(activity) { @@ -337,11 +355,13 @@ class GeneralSettingsFragment : AbstractSettingsFragment() { } activity?.let { - BrowserDialog.showEditText(it, + BrowserDialog.showEditText( + it, R.string.title_custom_homepage, R.string.title_custom_homepage, currentHomepage, - R.string.action_ok) { url -> + R.string.action_ok + ) { url -> userPreferences.homepage = url summaryUpdater.updateSummary(url) } @@ -373,7 +393,8 @@ class GeneralSettingsFragment : AbstractSettingsFragment() { val searchEngine = searchEngineList[which] // Store the search engine preference - val preferencesIndex = searchEngineProvider.mapSearchEngineToPreferenceIndex(searchEngine) + val preferencesIndex = + searchEngineProvider.mapSearchEngineToPreferenceIndex(searchEngine) userPreferences.searchChoice = preferencesIndex if (searchEngine is CustomSearch) { diff --git a/app/src/main/java/acr/browser/lightning/ssl/SslDialog.kt b/app/src/main/java/acr/browser/lightning/ssl/SslDialog.kt index 18392c104..5cdf6d4f3 100644 --- a/app/src/main/java/acr/browser/lightning/ssl/SslDialog.kt +++ b/app/src/main/java/acr/browser/lightning/ssl/SslDialog.kt @@ -8,29 +8,10 @@ import android.net.http.SslCertificate import android.text.format.DateFormat import android.widget.TextView import androidx.appcompat.app.AlertDialog -import java.util.* /** * Shows an informative dialog with the provided [SslCertificate] information. */ -fun Context.showSslDialog(sslCertificate: SslCertificate, sslState: SslState) { - val by = sslCertificate.issuedBy - val to = sslCertificate.issuedTo - val issueDate = sslCertificate.validNotBeforeDate - val expireDate = sslCertificate.validNotAfterDate - - showSslDialog( - SslCertificateInfo( - issuedByCommonName = by.cName, - issuedToCommonName = to.cName, - issuedToOrganizationName = to.oName, - issueDate = sslCertificate.validNotBeforeDate, - expireDate = sslCertificate.validNotAfterDate, - sslState = sslState - ) - ) -} - fun Context.showSslDialog(sslCertificateInfo: SslCertificateInfo) { val dateFormat = DateFormat.getDateFormat(applicationContext) From 885e48ab136fee29014dbb5edb961530f28f60be Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 3 Aug 2022 20:58:01 -0400 Subject: [PATCH 125/161] Update documentation --- .../lightning/browser/BrowserPresenter.kt | 134 ++++++++++++++---- 1 file changed, 103 insertions(+), 31 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt index 7cfd40f3b..47794e7c1 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt @@ -44,7 +44,10 @@ import javax.inject.Inject import kotlin.system.exitProcess /** - * Created by anthonycr on 9/11/20. + * The monolithic (oops) presenter that governs the behavior of the browser UI and interactions by + * the user for both default and incognito browsers. This presenter should live for the entire + * duration of the browser activity, which itself should not be recreated during configuration + * changes. */ @Browser2Scope class BrowserPresenter @Inject constructor( @@ -103,7 +106,7 @@ class BrowserPresenter @Inject constructor( private var tabDisposable: CompositeDisposable = CompositeDisposable() /** - * TODO + * Call when the view is attached to the presenter. */ fun onViewAttached(view: BrowserContract.View) { this.view = view @@ -147,7 +150,7 @@ class BrowserPresenter @Inject constructor( } /** - * TODO + * Call when the view is detached from the presenter. */ fun onViewDetached() { view = null @@ -157,7 +160,7 @@ class BrowserPresenter @Inject constructor( } /** - * TODO + * Call when the view is hidden (i.e. the browser is sent to the background). */ fun onViewHidden() { model.freeze() @@ -306,7 +309,7 @@ class BrowserPresenter @Inject constructor( } /** - * TODO + * Call when a new action is triggered, such as the user opening a new URL in the browser. */ fun onNewAction(action: BrowserContract.Action) { when (action) { @@ -357,7 +360,7 @@ class BrowserPresenter @Inject constructor( } /** - * TODO + * Call when the user selects an option from the menu. */ fun onMenuClick(menuSelection: MenuSelection) { when (menuSelection) { @@ -419,7 +422,7 @@ class BrowserPresenter @Inject constructor( private fun List.indexOfCurrentTab(): Int = tabIndexForId(currentTab?.id) /** - * TODO + * Call when the user selects a combination of keys to perform a shortcut. */ fun onKeyComboClick(keyCombo: KeyCombo) { when (keyCombo) { @@ -445,14 +448,14 @@ class BrowserPresenter @Inject constructor( } /** - * TODO + * Call when the user selects a tab to switch to at the provided [index]. */ fun onTabClick(index: Int) { selectTab(model.selectTab(tabListState[index].id)) } /** - * TODO + * Call when the user long presses on a tab at the provided [index]. */ fun onTabLongClick(index: Int) { view?.showCloseBrowserDialog(tabListState[index].id) @@ -472,10 +475,12 @@ class BrowserPresenter @Inject constructor( } /** - * TODO + * Call when the user clicks on the close button for the tab at the provided [index] */ fun onTabClose(index: Int) { if (index == -1) { + // If the user clicks on close multiple times, the index may be -1 if the view is in the + // process of being removed. return } val nextTab = tabListState.nextSelected(index) @@ -502,10 +507,20 @@ class BrowserPresenter @Inject constructor( } } + /** + * Call when the tab drawer is opened or closed. + * + * @param isOpen True if the drawer is now open, false if it is now closed. + */ fun onTabDrawerMoved(isOpen: Boolean) { isTabDrawerOpen = isOpen } + /** + * Call when the bookmark drawer is opened or closed. + * + * @param isOpen True if the drawer is now open, false if it is now closed. + */ fun onBookmarkDrawerMoved(isOpen: Boolean) { isBookmarkDrawerOpen = isOpen } @@ -558,14 +573,14 @@ class BrowserPresenter @Inject constructor( } /** - * TODO + * Call when the user clicks on the home button. */ fun onHomeClick() { currentTab?.loadFromInitializer(homePageInitializer) } /** - * TODO + * Call when the user clicks on the open new tab button. */ fun onNewTabClick() { createNewTabAndSelect(homePageInitializer, shouldSelect = true) @@ -584,7 +599,8 @@ class BrowserPresenter @Inject constructor( } /** - * TODO + * Call when the user clicks on the refresh (or stop/delete) button that is located in the + * search bar. */ fun onRefreshOrStopClick() { if (isSearchViewFocused) { @@ -621,7 +637,9 @@ class BrowserPresenter @Inject constructor( } /** - * TODO + * Call when the focus state changes for the search bar. + * + * @param isFocused True if the view is now focused, false otherwise. */ fun onSearchFocusChanged(isFocused: Boolean) { isSearchViewFocused = isFocused @@ -649,7 +667,8 @@ class BrowserPresenter @Inject constructor( } /** - * TODO + * Call when the user submits a search [query] to the search bar. At this point the user has + * provided intent to search and is no longer trying to manipulate the query. */ fun onSearch(query: String) { if (query.isEmpty()) { @@ -671,7 +690,7 @@ class BrowserPresenter @Inject constructor( } /** - * TODO + * Call when the user enters a [query] to look for in the current web page. */ fun onFindInPage(query: String) { currentTab?.find(query) @@ -679,21 +698,21 @@ class BrowserPresenter @Inject constructor( } /** - * TODO + * Call when the user selects to move to the next highlighted word in the web page. */ fun onFindNext() { currentTab?.findNext() } /** - * TODO + * Call when the user selects to move to the previous highlighted word in the web page. */ fun onFindPrevious() { currentTab?.findPrevious() } /** - * TODO + * Call when the user chooses to dismiss the find in page UI component. */ fun onFindDismiss() { currentTab?.clearFindMatches() @@ -701,7 +720,7 @@ class BrowserPresenter @Inject constructor( } /** - * TODO + * Call when the user selects a search suggestion that was suggested by the search box. */ fun onSearchSuggestionClicked(webPage: WebPage) { val url = when (webPage) { @@ -715,7 +734,7 @@ class BrowserPresenter @Inject constructor( } /** - * TODO + * Call when the user clicks on the SSL icon in the search box. */ fun onSslIconClick() { currentTab?.sslCertificateInfo?.let { @@ -724,7 +743,7 @@ class BrowserPresenter @Inject constructor( } /** - * TODO + * Call when the user clicks on a bookmark from the bookmark list at the provided [index]. */ fun onBookmarkClick(index: Int) { when (val bookmark = viewState.bookmarks[index]) { @@ -759,7 +778,7 @@ class BrowserPresenter @Inject constructor( .map(MutableList>::flatten) /** - * TODO + * Call when the user long presses on a bookmark in the bookmark list at the provided [index]. */ fun onBookmarkLongClick(index: Int) { when (val item = viewState.bookmarks[index]) { @@ -770,7 +789,7 @@ class BrowserPresenter @Inject constructor( } /** - * TODO + * Call when the user clicks on the page tools button. */ fun onToolsClick() { val currentUrl = currentTab?.url ?: return @@ -780,11 +799,17 @@ class BrowserPresenter @Inject constructor( ) } + /** + * Call when the user chooses to toggle the desktop user agent on/off. + */ fun onToggleDesktopAgent() { currentTab?.toggleDesktopAgent() currentTab?.reload() } + /** + * Call when the user chooses to toggle ad blocking on/off for the current web page. + */ fun onToggleAdBlocking() { val currentUrl = currentTab?.url ?: return if (allowListModel.isUrlAllowedAds(currentUrl)) { @@ -796,7 +821,8 @@ class BrowserPresenter @Inject constructor( } /** - * TODO + * Call when the user clicks on the star icon to add a bookmark for the current page or remove + * the existing one. */ fun onStarClick() { val url = currentTab?.url ?: return @@ -841,6 +867,13 @@ class BrowserPresenter @Inject constructor( } } + /** + * Call when the user confirms the details for adding a bookmark. + * + * @param title The title of the bookmark. + * @param url The URL of the bookmark. + * @param folder The name of the folder the bookmark is in. + */ fun onBookmarkConfirmed(title: String, url: String, folder: String) { compositeDisposable += bookmarkRepository.addBookmarkIfNotExists( Bookmark.Entry( @@ -857,6 +890,13 @@ class BrowserPresenter @Inject constructor( } } + /** + * Call when the user confirms the details when editing a bookmark. + * + * @param title The title of the bookmark. + * @param url The URL of the bookmark. + * @param folder The name of the folder the bookmark is in. + */ fun onBookmarkEditConfirmed(title: String, url: String, folder: String) { compositeDisposable += bookmarkRepository.editBookmark( oldBookmark = Bookmark.Entry( @@ -882,6 +922,12 @@ class BrowserPresenter @Inject constructor( } } + /** + * Call when the user confirms a name change to an existing folder. + * + * @param oldTitle The previous title of the folder. + * @param newTitle The new title of the folder. + */ fun onBookmarkFolderRenameConfirmed(oldTitle: String, newTitle: String) { compositeDisposable += bookmarkRepository.renameFolder(oldTitle, newTitle) .andThen(bookmarkRepository.bookmarksAndFolders(folder = currentFolder)) @@ -896,7 +942,7 @@ class BrowserPresenter @Inject constructor( } /** - * TODO + * Call when the user clicks on a menu [option] for the provided [bookmark]. */ fun onBookmarkOptionClick( bookmark: Bookmark.Entry, @@ -938,6 +984,9 @@ class BrowserPresenter @Inject constructor( } } + /** + * Call when the user clicks on a menu [option] for the provided [folder]. + */ fun onFolderOptionClick(folder: Bookmark.Folder, option: BrowserContract.FolderOptionEvent) { when (option) { BrowserContract.FolderOptionEvent.RENAME -> view?.showEditFolderDialog(folder.title) @@ -956,6 +1005,9 @@ class BrowserPresenter @Inject constructor( } } + /** + * Call when the user clicks on a menu [option] for the provided [download] entry. + */ fun onDownloadOptionClick( download: DownloadEntry, option: BrowserContract.DownloadOptionEvent @@ -982,6 +1034,9 @@ class BrowserPresenter @Inject constructor( } } + /** + * Call when the user clicks on a menu [option] for the provided [historyEntry]. + */ fun onHistoryOptionClick( historyEntry: HistoryEntry, option: BrowserContract.HistoryOptionEvent @@ -1009,7 +1064,7 @@ class BrowserPresenter @Inject constructor( } /** - * TODO + * Call when the user clicks on the button to open reading mode.. */ fun onReadingModeClick() { currentTab?.url?.takeIf { !it.isSpecialUrl() } @@ -1017,7 +1072,8 @@ class BrowserPresenter @Inject constructor( } /** - * TODO + * Call when the user clicks on the tab count button (or home button in desktop mode, or + * incognito icon in incognito mode). */ fun onTabCountViewClick() { if (uiConfiguration.tabConfiguration == TabConfiguration.DRAWER) { @@ -1028,7 +1084,7 @@ class BrowserPresenter @Inject constructor( } /** - * TODO + * Call when the user clicks on the tab menu located in the tab drawer. */ fun onTabMenuClick() { currentTab?.let { @@ -1037,7 +1093,8 @@ class BrowserPresenter @Inject constructor( } /** - * TODO + * Call when the user clicks on the bookmark menu (star or back arrow) located in the bookmark + * drawer. */ fun onBookmarkMenuClick() { if (currentFolder != Bookmark.Folder.Root) { @@ -1053,7 +1110,7 @@ class BrowserPresenter @Inject constructor( } /** - * TODO + * Call when the user long presses anywhere on the web page with the provided tab [id]. */ fun onPageLongPress(id: Int, longPress: LongPress) { val pageUrl = model.tabsList.find { it.id == id }?.url @@ -1104,6 +1161,10 @@ class BrowserPresenter @Inject constructor( } } + /** + * Call when the user selects an option from the close browser menu that can be invoked by long + * pressing on individual tabs. + */ fun onCloseBrowserEvent(id: Int, closeTabEvent: BrowserContract.CloseTabEvent) { when (closeTabEvent) { BrowserContract.CloseTabEvent.CLOSE_CURRENT -> @@ -1120,6 +1181,10 @@ class BrowserPresenter @Inject constructor( } } + /** + * Call when the user long presses on a link within the web page and selects what they want to + * do with that link. + */ fun onLinkLongPressEvent( longPress: LongPress, linkLongPressEvent: BrowserContract.LinkLongPressEvent @@ -1147,6 +1212,10 @@ class BrowserPresenter @Inject constructor( } } + /** + * Call when the user long presses on an image within the web page and selects what they want to + * do with that image. + */ fun onImageLongPressEvent( longPress: LongPress, imageLongPressEvent: BrowserContract.ImageLongPressEvent @@ -1183,6 +1252,9 @@ class BrowserPresenter @Inject constructor( } } + /** + * Call when the user has selected a file from the file chooser to upload. + */ fun onFileChooserResult(activityResult: ActivityResult) { currentTab?.handleFileChooserResult(activityResult) } From cb134e3e3ba1db1fb0f3a0323561b92707dc3147 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 3 Aug 2022 21:25:23 -0400 Subject: [PATCH 126/161] Adding interface documentation --- .../lightning/browser/BrowserContract.kt | 189 +++++++++++++++++- 1 file changed, 185 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserContract.kt index 158cdd4bf..14b28bb2e 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserContract.kt @@ -17,22 +17,47 @@ import io.reactivex.Single import acr.browser.lightning.browser.view.targetUrl.LongPress /** - * Created by anthonycr on 9/11/20. + * The contract for the browser. */ - - interface BrowserContract { + /** + * The view that renders the browser state. + */ interface View { + /** + * Render the [viewState] for the current tab in the browser. + */ fun renderState(viewState: BrowserViewState) + /** + * Render the [tabs] in the tabs list. + */ fun renderTabs(tabs: List) + /** + * Show the dialog to add a bookmark for the current page. + * + * @param title The current title of the page. + * @param url The current URL of the page. + * @param folders The available folders that the bookmark can be moved to. + */ fun showAddBookmarkDialog(title: String, url: String, folders: List) + /** + * Show the options dialog for the provided [bookmark]. + */ fun showBookmarkOptionsDialog(bookmark: Bookmark.Entry) + /** + * Show the dialog to edit a bookmark. + * + * @param title The current title of the bookmark. + * @param url The current URL of the bookmark. + * @param folder The current folder the bookmark is in. + * @param folders The available folders that the bookmark can be moved to. + */ fun showEditBookmarkDialog( title: String, url: String, @@ -40,97 +65,229 @@ interface BrowserContract { folders: List ) + /** + * Show the options dialog for the provided [folder]. + */ fun showFolderOptionsDialog(folder: Bookmark.Folder) + /** + * Show the edit folder dialog for the folder with the provided [title]. + */ fun showEditFolderDialog(title: String) + /** + * Show the options dialog for the provided [download]. + */ fun showDownloadOptionsDialog(download: DownloadEntry) + /** + * Show the options dialog for the provided [historyEntry]. + */ fun showHistoryOptionsDialog(historyEntry: HistoryEntry) + /** + * Show the dialog that allows the user to search the web page for a query. + */ fun showFindInPageDialog() + /** + * Show the options menu for long pressing a link in the web page. + */ fun showLinkLongPressDialog(longPress: LongPress) + /** + * Show the options menu for long pressing an image in the web page. + */ fun showImageLongPressDialog(longPress: LongPress) + /** + * Show the informational dialog about the SSL certificate info. + */ fun showSslDialog(sslCertificateInfo: SslCertificateInfo) + /** + * Show the close browser dialog for the dialog with the provide [id]. + */ fun showCloseBrowserDialog(id: Int) + /** + * Open the bookmark drawer if it is closed. + */ fun openBookmarkDrawer() + /** + * Close the bookmark drawer if it is open. + */ fun closeBookmarkDrawer() + /** + * Open the tab drawer if it is closed. + */ fun openTabDrawer() + /** + * Close the tab drawer if it is open. + */ fun closeTabDrawer() + /** + * Show the toolbar/search box if it has been hidden due to scrolling. + */ fun showToolbar() + /** + * Show the tools dialog that allows the user to toggle ad blocking and user agent for the + * current page. + * + * @param areAdsAllowed True if ads are currently allowed on the page, false otherwise. + * @param shouldShowAdBlockOption True if ad block toggling is available for the current + * page. + */ fun showToolsDialog(areAdsAllowed: Boolean, shouldShowAdBlockOption: Boolean) + /** + * Show a warning to the user that they are about to open a local file in the browser that + * could be potentially dangerous. + */ fun showLocalFileBlockedDialog() + /** + * Show the file chooser with the provided [intent]. + */ fun showFileChooser(intent: Intent) + /** + * Show a custom [view] over everything that will play a video. + */ fun showCustomView(view: android.view.View) + /** + * Hide the custom view that was previously shown by calling [showCustomView]. + */ fun hideCustomView() } + /** + * The model used to manage tabs in the browser. + */ interface Model { + /** + * Delete the tab with the provided [id]. + */ fun deleteTab(id: Int): Completable + /** + * Delete all open tabs. + */ fun deleteAllTabs(): Completable + /** + * Create a tab that will be initialized with the [tabInitializer]. + */ fun createTab(tabInitializer: TabInitializer): Single + /** + * Reopen the most recently closed tab if there is a closed tab to re-open. + */ fun reopenTab(): Maybe + /** + * Select the tab with the provide [id] as the currently viewed tab. + */ fun selectTab(id: Int): TabModel + /** + * Initialize all tabs that were previously frozen when the browser was last open. + */ fun initializeTabs(): Maybe> + /** + * Notifies the model that all tabs need to be frozen before the browser shuts down. + */ fun freeze() + /** + * Clean all permanent stored content. + */ fun clean() + /** + * The current open tabs. + */ val tabsList: List + /** + * Changes to the current open tabs. + */ fun tabsListChanges(): Observable> } + /** + * Used by the browser to navigate between screens and perform other navigation events. + */ interface Navigator { + /** + * Open the browser settings screen. + */ fun openSettings() + /** + * Open the reader mode and load the provided [url]. + */ fun openReaderMode(url: String) + /** + * Share the web page with the provided [url] and [title]. + */ fun sharePage(url: String, title: String?) + /** + * Copy the page [url] to the clip board. + */ fun copyPageLink(url: String) + /** + * Close the browser and terminate the session. + */ fun closeBrowser() + /** + * Add a shortcut to the home screen that opens the [url]. Use the provided [title] and + * [favicon] to create the shortcut. + */ fun addToHomeScreen(url: String, title: String, favicon: Bitmap?) + /** + * Download the file provided by the [pendingDownload]. + */ fun download(pendingDownload: PendingDownload) + /** + * Move the browser to the background without terminating the session. + */ fun backgroundBrowser() + /** + * launch the incognito browser and load the provided [url]. + */ fun launchIncognito(url: String?) - } + /** + * The options for the close tab menu dialog. + */ enum class CloseTabEvent { CLOSE_CURRENT, CLOSE_OTHERS, CLOSE_ALL } + /** + * The options for the bookmark menu dialog. + */ enum class BookmarkOptionEvent { NEW_TAB, BACKGROUND_TAB, @@ -141,6 +298,9 @@ interface BrowserContract { EDIT } + /** + * The options for the history menu dialog. + */ enum class HistoryOptionEvent { NEW_TAB, BACKGROUND_TAB, @@ -150,16 +310,25 @@ interface BrowserContract { REMOVE, } + /** + * The options for the download menu dialog. + */ enum class DownloadOptionEvent { DELETE, DELETE_ALL } + /** + * The options for the folder menu dialog. + */ enum class FolderOptionEvent { RENAME, REMOVE } + /** + * The options for the link long press menu dialog. + */ enum class LinkLongPressEvent { NEW_TAB, BACKGROUND_TAB, @@ -168,6 +337,9 @@ interface BrowserContract { COPY_LINK } + /** + * The options for the image long press menu dialog. + */ enum class ImageLongPressEvent { NEW_TAB, BACKGROUND_TAB, @@ -177,9 +349,18 @@ interface BrowserContract { DOWNLOAD } + /** + * Supported actions that can be passed to the browser. + */ sealed class Action { + /** + * The action to load the provided [url]. + */ data class LoadUrl(val url: String) : Action() + /** + * The action to emergency clean the entire browser contents and stored data. + */ object Panic : Action() } From d95767b3ef7d00e686561f926952c9c759b1e908 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 3 Aug 2022 21:34:37 -0400 Subject: [PATCH 127/161] Updating documentation --- .../lightning/browser/BrowserActivity.kt | 71 ++++++++++++++++++- .../lightning/browser/BrowserNavigator.kt | 2 +- .../lightning/browser/BrowserStateAdapter.kt | 3 +- .../lightning/browser/BrowserViewState.kt | 22 +++++- 4 files changed, 93 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserActivity.kt index c338e0199..9b4273be3 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserActivity.kt @@ -53,7 +53,8 @@ import acr.browser.lightning.browser.view.targetUrl.LongPress import javax.inject.Inject /** - * Created by anthonycr on 9/11/20. + * The base browser activity that governs the browsing experience for both default and incognito + * browsers. */ abstract class BrowserActivity : ThemableBrowserActivity() { @@ -319,7 +320,7 @@ abstract class BrowserActivity : ThemableBrowserActivity() { } /** - * TODO + * @see BrowserContract.View.renderState */ fun renderState(viewState: PartialBrowserViewState) { viewState.isBackEnabled?.let { binding.actionBack.isEnabled = it } @@ -369,11 +370,17 @@ abstract class BrowserActivity : ThemableBrowserActivity() { } } + /** + * @see BrowserContract.View.renderTabs + */ fun renderTabs(tabListState: List) { binding.tabCountView.updateCount(tabListState.size) tabsAdapter.submitList(tabListState) } + /** + * @see BrowserContract.View.showAddBookmarkDialog + */ fun showAddBookmarkDialog(title: String, url: String, folders: List) { lightningDialogBuilder.showAddBookmarkDialog( activity = this, @@ -384,6 +391,9 @@ abstract class BrowserActivity : ThemableBrowserActivity() { ) } + /** + * @see BrowserContract.View.showBookmarkOptionsDialog + */ fun showBookmarkOptionsDialog(bookmark: Bookmark.Entry) { lightningDialogBuilder.showLongPressedDialogForBookmarkUrl( activity = this, @@ -393,6 +403,9 @@ abstract class BrowserActivity : ThemableBrowserActivity() { ) } + /** + * @see BrowserContract.View.showEditBookmarkDialog + */ fun showEditBookmarkDialog(title: String, url: String, folder: String, folders: List) { lightningDialogBuilder.showEditBookmarkDialog( activity = this, @@ -404,6 +417,9 @@ abstract class BrowserActivity : ThemableBrowserActivity() { ) } + /** + * @see BrowserContract.View.showFolderOptionsDialog + */ fun showFolderOptionsDialog(folder: Bookmark.Folder) { lightningDialogBuilder.showBookmarkFolderLongPressedDialog( activity = this, @@ -413,6 +429,9 @@ abstract class BrowserActivity : ThemableBrowserActivity() { ) } + /** + * @see BrowserContract.View.showEditFolderDialog + */ fun showEditFolderDialog(oldTitle: String) { lightningDialogBuilder.showRenameFolderDialog( activity = this, @@ -421,6 +440,9 @@ abstract class BrowserActivity : ThemableBrowserActivity() { ) } + /** + * @see BrowserContract.View.showDownloadOptionsDialog + */ fun showDownloadOptionsDialog(download: DownloadEntry) { lightningDialogBuilder.showLongPressedDialogForDownloadUrl( activity = this, @@ -430,6 +452,9 @@ abstract class BrowserActivity : ThemableBrowserActivity() { ) } + /** + * @see BrowserContract.View.showHistoryOptionsDialog + */ fun showHistoryOptionsDialog(historyEntry: HistoryEntry) { lightningDialogBuilder.showLongPressedHistoryLinkDialog( activity = this, @@ -439,6 +464,9 @@ abstract class BrowserActivity : ThemableBrowserActivity() { ) } + /** + * @see BrowserContract.View.showFindInPageDialog + */ fun showFindInPageDialog() { BrowserDialog.showEditText( this, @@ -449,6 +477,9 @@ abstract class BrowserActivity : ThemableBrowserActivity() { ) } + /** + * @see BrowserContract.View.showLinkLongPressDialog + */ fun showLinkLongPressDialog(longPress: LongPress) { BrowserDialog.show(this, longPress.targetUrl?.replace(HTTP, ""), DialogItem(title = R.string.dialog_open_new_tab) { @@ -483,6 +514,9 @@ abstract class BrowserActivity : ThemableBrowserActivity() { }) } + /** + * @see BrowserContract.View.showImageLongPressDialog + */ fun showImageLongPressDialog(longPress: LongPress) { BrowserDialog.show(this, longPress.targetUrl?.replace(HTTP, ""), DialogItem(title = R.string.dialog_open_new_tab) { @@ -526,6 +560,9 @@ abstract class BrowserActivity : ThemableBrowserActivity() { }) } + /** + * @see BrowserContract.View.showCloseBrowserDialog + */ fun showCloseBrowserDialog(id: Int) { BrowserDialog.show( this, R.string.dialog_title_close_browser, @@ -541,28 +578,46 @@ abstract class BrowserActivity : ThemableBrowserActivity() { ) } + /** + * @see BrowserContract.View.openBookmarkDrawer + */ fun openBookmarkDrawer() { binding.drawerLayout.closeDrawer(binding.tabDrawer) binding.drawerLayout.openDrawer(binding.bookmarkDrawer) } + /** + * @see BrowserContract.View.closeBookmarkDrawer + */ fun closeBookmarkDrawer() { binding.drawerLayout.closeDrawer(binding.bookmarkDrawer) } + /** + * @see BrowserContract.View.openTabDrawer + */ fun openTabDrawer() { binding.drawerLayout.closeDrawer(binding.bookmarkDrawer) binding.drawerLayout.openDrawer(binding.tabDrawer) } + /** + * @see BrowserContract.View.closeTabDrawer + */ fun closeTabDrawer() { binding.drawerLayout.closeDrawer(binding.tabDrawer) } + /** + * @see BrowserContract.View.showToolbar + */ fun showToolbar() { tabPager.showToolbar() } + /** + * @see BrowserContract.View.showToolsDialog + */ fun showToolsDialog(areAdsAllowed: Boolean, shouldShowAdBlockOption: Boolean) { val whitelistString = if (areAdsAllowed) { R.string.dialog_adblock_enable_for_site @@ -587,6 +642,9 @@ abstract class BrowserActivity : ThemableBrowserActivity() { ) } + /** + * @see BrowserContract.View.showLocalFileBlockedDialog + */ fun showLocalFileBlockedDialog() { AlertDialog.Builder(this) .setCancelable(true) @@ -602,10 +660,16 @@ abstract class BrowserActivity : ThemableBrowserActivity() { .resizeAndShow() } + /** + * @see BrowserContract.View.showFileChooser + */ fun showFileChooser(intent: Intent) { launcher.launch(intent) } + /** + * @see BrowserContract.View.showCustomView + */ fun showCustomView(view: View) { requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE binding.root.addView(view) @@ -613,6 +677,9 @@ abstract class BrowserActivity : ThemableBrowserActivity() { setFullscreen(enabled = true, immersive = true) } + /** + * @see BrowserContract.View.hideCustomView + */ fun hideCustomView() { requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED customView?.let(binding.root::removeView) diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserNavigator.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserNavigator.kt index c2b4cd553..c6a5e9b7c 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserNavigator.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserNavigator.kt @@ -18,7 +18,7 @@ import android.graphics.Bitmap import javax.inject.Inject /** - * Created by anthonycr on 9/15/20. + * The navigator implementation. */ class BrowserNavigator @Inject constructor( private val activity: Activity, diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserStateAdapter.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserStateAdapter.kt index 5226ddc2c..7485b1f97 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserStateAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserStateAdapter.kt @@ -11,7 +11,8 @@ import android.view.View import acr.browser.lightning.browser.view.targetUrl.LongPress /** - * Created by anthonycr on 9/16/20. + * An adapter between [BrowserContract.View] and the [BrowserActivity] that creates partial states + * to render in the activity. */ class BrowserStateAdapter(private val browserActivity: BrowserActivity) : BrowserContract.View { diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserViewState.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserViewState.kt index dc03d8a2e..28d4810da 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserViewState.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserViewState.kt @@ -5,7 +5,24 @@ import acr.browser.lightning.ssl.SslState import acr.browser.lightning.utils.Option /** - * Created by anthonycr on 9/11/20. + * The browser view state. + * + * @param displayUrl The current text shown in the search box. + * @param sslState The current SSL state shown in the search box. + * @param isRefresh True if the refresh button shows a refresh icon, false if it shows an X. + * @param progress The current page loading progress out of 100. + * @param enableFullMenu True if the full options menu should be shown, false if the limited one + * should be shown for a local web page. + * @param themeColor The UI theme as determined from the current web page. + * @param isForwardEnabled True if the go forward button should be enabled, false otherwise. + * @param isBackEnabled True if the go back button should be enabled, false otherwise. + * @param bookmarks The current list of bookmarks that is displayed. + * @param isBookmarked True if the current page is bookmarked, false otherwise. + * @param isBookmarkEnabled True if the user should be allowed to bookmark the current page, false + * otherwise. + * @param isRootFolder True if the current bookmark folder is the root folder, false if it is a + * child folder. + * @param findInPage The text that we are searching the page for. */ data class BrowserViewState( // search bar @@ -31,6 +48,9 @@ data class BrowserViewState( ) +/** + * A partial copy of [BrowserViewState], where null indicates that the value is unchanged. + */ data class PartialBrowserViewState( // search bar val displayUrl: String?, From 479a93baa741af1dbc0a2b846de0f4405a828515 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 3 Aug 2022 21:40:55 -0400 Subject: [PATCH 128/161] Cleaning up code to remove old SDK int checks --- .../java/acr/browser/lightning/BrowserApp.kt | 22 ++++--------------- .../acr/browser/lightning/Capabilities.kt | 4 ++-- .../lightning/ThemableBrowserActivity.kt | 15 +++++-------- .../cleanup/EnhancedIncognitoExitCleanup.kt | 2 +- .../browser/cleanup/NormalExitCleanup.kt | 2 +- .../data/DefaultCookieAdministrator.kt | 10 +-------- .../data/IncognitoCookieAdministrator.kt | 7 ------ .../settings/activity/SettingsActivity.kt | 8 +------ .../activity/ThemableSettingsActivity.kt | 11 ++++------ .../fragment/PrivacySettingsFragment.kt | 7 +----- .../acr/browser/lightning/utils/MultiDex.kt | 13 ----------- .../browser/lightning/utils/ThemeUtils.java | 11 +--------- .../acr/browser/lightning/utils/WebUtils.java | 13 ++--------- 13 files changed, 24 insertions(+), 101 deletions(-) delete mode 100644 app/src/main/java/acr/browser/lightning/utils/MultiDex.kt diff --git a/app/src/main/java/acr/browser/lightning/BrowserApp.kt b/app/src/main/java/acr/browser/lightning/BrowserApp.kt index 270b8702c..051bde8c7 100644 --- a/app/src/main/java/acr/browser/lightning/BrowserApp.kt +++ b/app/src/main/java/acr/browser/lightning/BrowserApp.kt @@ -1,26 +1,23 @@ package acr.browser.lightning +import acr.browser.lightning.browser.di.AppComponent +import acr.browser.lightning.browser.di.DaggerAppComponent +import acr.browser.lightning.browser.di.DatabaseScheduler +import acr.browser.lightning.browser.di.injector import acr.browser.lightning.browser.proxy.ProxyAdapter import acr.browser.lightning.database.bookmark.BookmarkExporter import acr.browser.lightning.database.bookmark.BookmarkRepository import acr.browser.lightning.device.BuildInfo import acr.browser.lightning.device.BuildType -import acr.browser.lightning.browser.di.AppComponent -import acr.browser.lightning.browser.di.DaggerAppComponent -import acr.browser.lightning.browser.di.DatabaseScheduler -import acr.browser.lightning.browser.di.injector import acr.browser.lightning.log.Logger import acr.browser.lightning.preference.DeveloperPreferences import acr.browser.lightning.utils.FileUtils import acr.browser.lightning.utils.MemoryLeakUtils -import acr.browser.lightning.utils.installMultiDex import android.app.Activity import android.app.Application -import android.content.Context import android.os.Build import android.os.StrictMode import android.webkit.WebView -import androidx.appcompat.app.AppCompatDelegate import com.squareup.leakcanary.LeakCanary import io.reactivex.Scheduler import io.reactivex.Single @@ -39,13 +36,6 @@ class BrowserApp : Application() { lateinit var applicationComponent: AppComponent - override fun attachBaseContext(base: Context) { - super.attachBaseContext(base) - if (BuildConfig.DEBUG && Build.VERSION.SDK_INT < 21) { - installMultiDex(context = base) - } - } - override fun onCreate() { super.onCreate() if (BuildConfig.DEBUG) { @@ -134,10 +124,6 @@ class BrowserApp : Application() { companion object { private const val TAG = "BrowserApp" - - init { - AppCompatDelegate.setCompatVectorFromResourcesEnabled(Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT) - } } } diff --git a/app/src/main/java/acr/browser/lightning/Capabilities.kt b/app/src/main/java/acr/browser/lightning/Capabilities.kt index 5099f16be..9ebaa7361 100644 --- a/app/src/main/java/acr/browser/lightning/Capabilities.kt +++ b/app/src/main/java/acr/browser/lightning/Capabilities.kt @@ -17,6 +17,6 @@ enum class Capabilities { val Capabilities.isSupported: Boolean get() = when (this) { Capabilities.FULL_INCOGNITO -> Build.VERSION.SDK_INT >= 28 - Capabilities.WEB_RTC -> Build.VERSION.SDK_INT >= 21 - Capabilities.THIRD_PARTY_COOKIE_BLOCKING -> Build.VERSION.SDK_INT >= 21 + Capabilities.WEB_RTC -> true + Capabilities.THIRD_PARTY_COOKIE_BLOCKING -> true } diff --git a/app/src/main/java/acr/browser/lightning/ThemableBrowserActivity.kt b/app/src/main/java/acr/browser/lightning/ThemableBrowserActivity.kt index a43b5f50d..2b32cb7d7 100644 --- a/app/src/main/java/acr/browser/lightning/ThemableBrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/ThemableBrowserActivity.kt @@ -5,7 +5,6 @@ import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.utils.ThemeUtils import android.content.Intent import android.graphics.Color -import android.os.Build import android.os.Bundle import android.view.Menu import androidx.annotation.StyleRes @@ -17,8 +16,8 @@ import javax.inject.Inject abstract class ThemableBrowserActivity : AppCompatActivity() { - // TODO reduce protected visibility - @Inject protected lateinit var userPreferences: UserPreferences + @Inject + internal lateinit var userPreferences: UserPreferences private var themeId: AppTheme = AppTheme.LIGHT private var showTabsInDrawer: Boolean = false @@ -66,12 +65,10 @@ abstract class ThemableBrowserActivity : AppCompatActivity() { } private fun resetPreferences() { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - if (userPreferences.useBlackStatusBar || !userPreferences.showTabsInDrawer) { - window.statusBarColor = Color.BLACK - } else { - window.statusBarColor = ThemeUtils.getStatusBarColor(this) - } + if (userPreferences.useBlackStatusBar || !userPreferences.showTabsInDrawer) { + window.statusBarColor = Color.BLACK + } else { + window.statusBarColor = ThemeUtils.getStatusBarColor(this) } } diff --git a/app/src/main/java/acr/browser/lightning/browser/cleanup/EnhancedIncognitoExitCleanup.kt b/app/src/main/java/acr/browser/lightning/browser/cleanup/EnhancedIncognitoExitCleanup.kt index 1bb4df1c1..ccea35e7a 100644 --- a/app/src/main/java/acr/browser/lightning/browser/cleanup/EnhancedIncognitoExitCleanup.kt +++ b/app/src/main/java/acr/browser/lightning/browser/cleanup/EnhancedIncognitoExitCleanup.kt @@ -16,7 +16,7 @@ class EnhancedIncognitoExitCleanup @Inject constructor( override fun cleanUp(webView: WebView?, context: BrowserActivity) { WebUtils.clearCache(webView) logger.log(TAG, "Cache Cleared") - WebUtils.clearCookies(context) + WebUtils.clearCookies() logger.log(TAG, "Cookies Cleared") WebUtils.clearWebStorage() logger.log(TAG, "WebStorage Cleared") diff --git a/app/src/main/java/acr/browser/lightning/browser/cleanup/NormalExitCleanup.kt b/app/src/main/java/acr/browser/lightning/browser/cleanup/NormalExitCleanup.kt index 2961a7fda..644727e8e 100644 --- a/app/src/main/java/acr/browser/lightning/browser/cleanup/NormalExitCleanup.kt +++ b/app/src/main/java/acr/browser/lightning/browser/cleanup/NormalExitCleanup.kt @@ -29,7 +29,7 @@ class NormalExitCleanup @Inject constructor( logger.log(TAG, "History Cleared") } if (userPreferences.clearCookiesExitEnabled) { - WebUtils.clearCookies(context) + WebUtils.clearCookies() logger.log(TAG, "Cookies Cleared") } if (userPreferences.clearWebStorageExitEnabled) { diff --git a/app/src/main/java/acr/browser/lightning/browser/data/DefaultCookieAdministrator.kt b/app/src/main/java/acr/browser/lightning/browser/data/DefaultCookieAdministrator.kt index e08f05f85..d8ce42a08 100644 --- a/app/src/main/java/acr/browser/lightning/browser/data/DefaultCookieAdministrator.kt +++ b/app/src/main/java/acr/browser/lightning/browser/data/DefaultCookieAdministrator.kt @@ -1,24 +1,16 @@ package acr.browser.lightning.browser.data import acr.browser.lightning.preference.UserPreferences -import android.app.Activity -import android.os.Build import android.webkit.CookieManager -import android.webkit.CookieSyncManager import javax.inject.Inject /** * The default cookie administrator that sets cookie preferences for the default browser instance. */ class DefaultCookieAdministrator @Inject constructor( - private val activity: Activity, private val userPreferences: UserPreferences ) : CookieAdministrator { override fun adjustCookieSettings() { - val cookieManager = CookieManager.getInstance() - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { - CookieSyncManager.createInstance(activity) - } - cookieManager.setAcceptCookie(userPreferences.cookiesEnabled) + CookieManager.getInstance().setAcceptCookie(userPreferences.cookiesEnabled) } } diff --git a/app/src/main/java/acr/browser/lightning/browser/data/IncognitoCookieAdministrator.kt b/app/src/main/java/acr/browser/lightning/browser/data/IncognitoCookieAdministrator.kt index 161050d1d..341f5e112 100644 --- a/app/src/main/java/acr/browser/lightning/browser/data/IncognitoCookieAdministrator.kt +++ b/app/src/main/java/acr/browser/lightning/browser/data/IncognitoCookieAdministrator.kt @@ -3,24 +3,17 @@ package acr.browser.lightning.browser.data import acr.browser.lightning.Capabilities import acr.browser.lightning.isSupported import acr.browser.lightning.preference.UserPreferences -import android.app.Activity -import android.os.Build import android.webkit.CookieManager -import android.webkit.CookieSyncManager import javax.inject.Inject /** * The cookie administrator used to set cookie preferences for the incognito instance. */ class IncognitoCookieAdministrator @Inject constructor( - private val activity: Activity, private val userPreferences: UserPreferences ) : CookieAdministrator { override fun adjustCookieSettings() { val cookieManager = CookieManager.getInstance() - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { - CookieSyncManager.createInstance(activity) - } if (Capabilities.FULL_INCOGNITO.isSupported) { cookieManager.setAcceptCookie(userPreferences.cookiesEnabled) } else { diff --git a/app/src/main/java/acr/browser/lightning/settings/activity/SettingsActivity.kt b/app/src/main/java/acr/browser/lightning/settings/activity/SettingsActivity.kt index deacbcfb6..1ece6cda1 100644 --- a/app/src/main/java/acr/browser/lightning/settings/activity/SettingsActivity.kt +++ b/app/src/main/java/acr/browser/lightning/settings/activity/SettingsActivity.kt @@ -4,10 +4,9 @@ package acr.browser.lightning.settings.activity import acr.browser.lightning.R +import acr.browser.lightning.browser.di.injector import acr.browser.lightning.device.BuildInfo import acr.browser.lightning.device.BuildType -import acr.browser.lightning.browser.di.injector -import android.os.Build import android.os.Bundle import android.view.MenuItem import android.view.View @@ -45,11 +44,6 @@ class SettingsActivity : ThemableSettingsActivity() { target.removeAll { it.titleRes == R.string.debug_title } } - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { - // Workaround for bug in the AppCompat support library - target.forEach { it.iconRes = R.drawable.empty } - } - fragments.addAll(target.map(Header::fragment)) } diff --git a/app/src/main/java/acr/browser/lightning/settings/activity/ThemableSettingsActivity.kt b/app/src/main/java/acr/browser/lightning/settings/activity/ThemableSettingsActivity.kt index 40b6cba9b..18ce2b84d 100644 --- a/app/src/main/java/acr/browser/lightning/settings/activity/ThemableSettingsActivity.kt +++ b/app/src/main/java/acr/browser/lightning/settings/activity/ThemableSettingsActivity.kt @@ -7,7 +7,6 @@ import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.utils.ThemeUtils import android.graphics.Color import android.graphics.drawable.ColorDrawable -import android.os.Build import android.os.Bundle import javax.inject.Inject @@ -42,12 +41,10 @@ abstract class ThemableSettingsActivity : AppCompatPreferenceActivity() { } private fun resetPreferences() { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - if (userPreferences.useBlackStatusBar) { - window.statusBarColor = Color.BLACK - } else { - window.statusBarColor = ThemeUtils.getStatusBarColor(this) - } + if (userPreferences.useBlackStatusBar) { + window.statusBarColor = Color.BLACK + } else { + window.statusBarColor = ThemeUtils.getStatusBarColor(this) } } diff --git a/app/src/main/java/acr/browser/lightning/settings/fragment/PrivacySettingsFragment.kt b/app/src/main/java/acr/browser/lightning/settings/fragment/PrivacySettingsFragment.kt index c978926aa..3cd073fd6 100644 --- a/app/src/main/java/acr/browser/lightning/settings/fragment/PrivacySettingsFragment.kt +++ b/app/src/main/java/acr/browser/lightning/settings/fragment/PrivacySettingsFragment.kt @@ -157,12 +157,7 @@ class PrivacySettingsFragment : AbstractSettingsFragment() { } private fun clearCookies(): Completable = Completable.fromAction { - val activity = activity - if (activity != null) { - WebUtils.clearCookies(activity) - } else { - throw RuntimeException("Activity was null in clearCookies") - } + WebUtils.clearCookies() } private fun clearWebStorage() { diff --git a/app/src/main/java/acr/browser/lightning/utils/MultiDex.kt b/app/src/main/java/acr/browser/lightning/utils/MultiDex.kt deleted file mode 100644 index 5248c83c9..000000000 --- a/app/src/main/java/acr/browser/lightning/utils/MultiDex.kt +++ /dev/null @@ -1,13 +0,0 @@ -package acr.browser.lightning.utils - -import android.content.Context - -/** - * Reflectively install multidex to avoid requiring that the Multidex class is on the classpath, - * since it is only needed on debug. - */ -fun installMultiDex(context: Context) { - val clazz = Class.forName("androidx.multidex.MultiDex") - val method = clazz.getMethod("install", Context::class.java) - method.invoke(null, context) -} diff --git a/app/src/main/java/acr/browser/lightning/utils/ThemeUtils.java b/app/src/main/java/acr/browser/lightning/utils/ThemeUtils.java index 52a9cddbc..093769b6a 100644 --- a/app/src/main/java/acr/browser/lightning/utils/ThemeUtils.java +++ b/app/src/main/java/acr/browser/lightning/utils/ThemeUtils.java @@ -10,7 +10,6 @@ import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; import android.graphics.drawable.Drawable; -import android.os.Build; import android.util.TypedValue; import acr.browser.lightning.R; @@ -19,7 +18,6 @@ import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.core.content.ContextCompat; -import androidx.core.graphics.drawable.DrawableCompat; public final class ThemeUtils { @@ -126,14 +124,7 @@ public static int getIconThemeColor(@NonNull Context context, boolean dark) { @NonNull private static Drawable getVectorDrawable(@NonNull Context context, int drawableId) { - Drawable drawable = ContextCompat.getDrawable(context, drawableId); - - Preconditions.checkNonNull(drawable); - - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { - drawable = (DrawableCompat.wrap(drawable)).mutate(); - } - return drawable; + return ContextCompat.getDrawable(context, drawableId); } // http://stackoverflow.com/a/38244327/1499541 diff --git a/app/src/main/java/acr/browser/lightning/utils/WebUtils.java b/app/src/main/java/acr/browser/lightning/utils/WebUtils.java index ac7dc740d..2659675c1 100644 --- a/app/src/main/java/acr/browser/lightning/utils/WebUtils.java +++ b/app/src/main/java/acr/browser/lightning/utils/WebUtils.java @@ -1,9 +1,7 @@ package acr.browser.lightning.utils; import android.content.Context; -import android.os.Build; import android.webkit.CookieManager; -import android.webkit.CookieSyncManager; import android.webkit.WebStorage; import android.webkit.WebView; import android.webkit.WebViewDatabase; @@ -20,15 +18,8 @@ public final class WebUtils { private WebUtils() {} - public static void clearCookies(@NonNull Context context) { - CookieManager c = CookieManager.getInstance(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - c.removeAllCookies(null); - } else { - //noinspection deprecation - CookieSyncManager.createInstance(context); - c.removeAllCookie(); - } + public static void clearCookies() { + CookieManager.getInstance().removeAllCookies(null); } public static void clearWebStorage() { From ba7c641168761999407fa7cdac2ddf23df4956a1 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 3 Aug 2022 21:45:59 -0400 Subject: [PATCH 129/161] Cleaning up unnecessary enums --- app/src/main/java/acr/browser/lightning/Capabilities.kt | 6 +----- .../lightning/settings/fragment/PrivacySettingsFragment.kt | 4 +--- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/Capabilities.kt b/app/src/main/java/acr/browser/lightning/Capabilities.kt index 9ebaa7361..201b7e6a5 100644 --- a/app/src/main/java/acr/browser/lightning/Capabilities.kt +++ b/app/src/main/java/acr/browser/lightning/Capabilities.kt @@ -6,9 +6,7 @@ import android.os.Build * Capabilities that are specific to certain API levels. */ enum class Capabilities { - FULL_INCOGNITO, - WEB_RTC, - THIRD_PARTY_COOKIE_BLOCKING + FULL_INCOGNITO } /** @@ -17,6 +15,4 @@ enum class Capabilities { val Capabilities.isSupported: Boolean get() = when (this) { Capabilities.FULL_INCOGNITO -> Build.VERSION.SDK_INT >= 28 - Capabilities.WEB_RTC -> true - Capabilities.THIRD_PARTY_COOKIE_BLOCKING -> true } diff --git a/app/src/main/java/acr/browser/lightning/settings/fragment/PrivacySettingsFragment.kt b/app/src/main/java/acr/browser/lightning/settings/fragment/PrivacySettingsFragment.kt index 3cd073fd6..8c455d195 100644 --- a/app/src/main/java/acr/browser/lightning/settings/fragment/PrivacySettingsFragment.kt +++ b/app/src/main/java/acr/browser/lightning/settings/fragment/PrivacySettingsFragment.kt @@ -46,7 +46,6 @@ class PrivacySettingsFragment : AbstractSettingsFragment() { checkBoxPreference( preference = SETTINGS_THIRDPCOOKIES, isChecked = userPreferences.blockThirdPartyCookiesEnabled, - isEnabled = Capabilities.THIRD_PARTY_COOKIE_BLOCKING.isSupported, onCheckChange = { userPreferences.blockThirdPartyCookiesEnabled = it } ) @@ -88,8 +87,7 @@ class PrivacySettingsFragment : AbstractSettingsFragment() { checkBoxPreference( preference = SETTINGS_WEBRTC, - isChecked = userPreferences.webRtcEnabled && Capabilities.WEB_RTC.isSupported, - isEnabled = Capabilities.WEB_RTC.isSupported, + isChecked = userPreferences.webRtcEnabled, onCheckChange = { userPreferences.webRtcEnabled = it } ) From 9cac8e594bad8737746ac1cde1fef51c4e63e018 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 3 Aug 2022 21:46:11 -0400 Subject: [PATCH 130/161] Adding missing documentation and improving formatting --- .../java/acr/browser/lightning/BrowserApp.kt | 28 ++++++++++++++----- .../lightning/ThemableBrowserActivity.kt | 3 ++ 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/BrowserApp.kt b/app/src/main/java/acr/browser/lightning/BrowserApp.kt index 051bde8c7..8d6c4e74a 100644 --- a/app/src/main/java/acr/browser/lightning/BrowserApp.kt +++ b/app/src/main/java/acr/browser/lightning/BrowserApp.kt @@ -25,14 +25,29 @@ import io.reactivex.plugins.RxJavaPlugins import javax.inject.Inject import kotlin.system.exitProcess +/** + * The browser application. + */ class BrowserApp : Application() { - @Inject internal lateinit var developerPreferences: DeveloperPreferences - @Inject internal lateinit var bookmarkModel: BookmarkRepository - @Inject @field:DatabaseScheduler internal lateinit var databaseScheduler: Scheduler - @Inject internal lateinit var logger: Logger - @Inject internal lateinit var buildInfo: BuildInfo - @Inject internal lateinit var proxyAdapter: ProxyAdapter + @Inject + internal lateinit var developerPreferences: DeveloperPreferences + + @Inject + internal lateinit var bookmarkModel: BookmarkRepository + + @Inject + @field:DatabaseScheduler + internal lateinit var databaseScheduler: Scheduler + + @Inject + internal lateinit var logger: Logger + + @Inject + internal lateinit var buildInfo: BuildInfo + + @Inject + internal lateinit var proxyAdapter: ProxyAdapter lateinit var applicationComponent: AppComponent @@ -125,5 +140,4 @@ class BrowserApp : Application() { companion object { private const val TAG = "BrowserApp" } - } diff --git a/app/src/main/java/acr/browser/lightning/ThemableBrowserActivity.kt b/app/src/main/java/acr/browser/lightning/ThemableBrowserActivity.kt index 2b32cb7d7..87887be81 100644 --- a/app/src/main/java/acr/browser/lightning/ThemableBrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/ThemableBrowserActivity.kt @@ -14,6 +14,9 @@ import androidx.core.graphics.drawable.DrawableCompat import androidx.core.view.iterator import javax.inject.Inject +/** + * A theme aware activity that updates its theme based on the user preferences. + */ abstract class ThemableBrowserActivity : AppCompatActivity() { @Inject From 78ec83d0d1a89daeb37cba7e85b22da8a74078ad Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 3 Aug 2022 23:27:31 -0400 Subject: [PATCH 131/161] Improving package structure --- .../java/acr/browser/lightning/browser/BrowserContract.kt | 2 +- .../java/acr/browser/lightning/browser/BrowserPresenter.kt | 3 +-- .../notification}/IncognitoNotification.kt | 2 +- .../browser/notification/IncognitoTabCountNotifier.kt | 1 - .../lightning/browser/tab/DrawerTabRecyclerViewAdapter.kt | 2 +- .../java/acr/browser/lightning/browser/tab/TabAdapter.kt | 2 -- .../java/acr/browser/lightning/browser/tab/TabFactory.kt | 3 +-- .../lightning/{view => browser/tab}/TabInitializer.kt | 2 +- .../main/java/acr/browser/lightning/browser/tab/TabModel.kt | 1 - .../acr/browser/lightning/browser/tab/TabWebChromeClient.kt | 6 ++---- .../acr/browser/lightning/browser/tab/bundle/BundleStore.kt | 2 +- .../lightning/browser/tab/bundle/DefaultBundleStore.kt | 3 +-- .../lightning/browser/tab/bundle/IncognitoBundleStore.kt | 2 +- .../lightning/{ => browser/tab}/view/BackgroundDrawable.kt | 2 +- .../browser/lightning/{ => browser}/view/RenderingMode.kt | 2 +- .../{view => browser}/webrtc/WebRtcPermissionsModel.kt | 2 +- .../{view => browser}/webrtc/WebRtcPermissionsView.kt | 2 +- .../acr/browser/lightning/preference/UserPreferences.kt | 2 +- .../acr/browser/lightning/{view => search}/SearchView.kt | 2 +- .../lightning/settings/fragment/AdvancedSettingsFragment.kt | 2 +- app/src/main/res/layout/browser_activity.xml | 2 +- .../{view => browser}/webrtc/WebRtcPermissionsModelTest.kt | 4 ++-- 22 files changed, 21 insertions(+), 30 deletions(-) rename app/src/main/java/acr/browser/lightning/{notifications => browser/notification}/IncognitoNotification.kt (98%) rename app/src/main/java/acr/browser/lightning/{view => browser/tab}/TabInitializer.kt (99%) rename app/src/main/java/acr/browser/lightning/{ => browser/tab}/view/BackgroundDrawable.kt (95%) rename app/src/main/java/acr/browser/lightning/{ => browser}/view/RenderingMode.kt (87%) rename app/src/main/java/acr/browser/lightning/{view => browser}/webrtc/WebRtcPermissionsModel.kt (98%) rename app/src/main/java/acr/browser/lightning/{view => browser}/webrtc/WebRtcPermissionsView.kt (96%) rename app/src/main/java/acr/browser/lightning/{view => search}/SearchView.kt (97%) rename app/src/test/java/acr/browser/lightning/{view => browser}/webrtc/WebRtcPermissionsModelTest.kt (99%) diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserContract.kt index 14b28bb2e..150ab2afe 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserContract.kt @@ -7,7 +7,7 @@ import acr.browser.lightning.database.Bookmark import acr.browser.lightning.database.HistoryEntry import acr.browser.lightning.database.downloads.DownloadEntry import acr.browser.lightning.ssl.SslCertificateInfo -import acr.browser.lightning.view.TabInitializer +import acr.browser.lightning.browser.tab.TabInitializer import android.content.Intent import android.graphics.Bitmap import io.reactivex.Completable diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt index 47794e7c1..e1ddf5acc 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt @@ -9,8 +9,6 @@ import acr.browser.lightning.browser.history.HistoryRecord import acr.browser.lightning.browser.keys.KeyCombo import acr.browser.lightning.browser.menu.MenuSelection import acr.browser.lightning.browser.notification.TabCountNotifier -import acr.browser.lightning.browser.tab.TabModel -import acr.browser.lightning.browser.tab.TabViewState import acr.browser.lightning.browser.ui.TabConfiguration import acr.browser.lightning.browser.ui.UiConfiguration import acr.browser.lightning.adblock.allowlist.AllowListModel @@ -23,6 +21,7 @@ import acr.browser.lightning.database.history.HistoryRepository import acr.browser.lightning.browser.di.DatabaseScheduler import acr.browser.lightning.browser.di.DiskScheduler import acr.browser.lightning.browser.di.MainScheduler +import acr.browser.lightning.browser.tab.* import acr.browser.lightning.html.bookmark.BookmarkPageFactory import acr.browser.lightning.html.history.HistoryPageFactory import acr.browser.lightning.search.SearchEngineProvider diff --git a/app/src/main/java/acr/browser/lightning/notifications/IncognitoNotification.kt b/app/src/main/java/acr/browser/lightning/browser/notification/IncognitoNotification.kt similarity index 98% rename from app/src/main/java/acr/browser/lightning/notifications/IncognitoNotification.kt rename to app/src/main/java/acr/browser/lightning/browser/notification/IncognitoNotification.kt index 1df8aed0c..5a14a3573 100644 --- a/app/src/main/java/acr/browser/lightning/notifications/IncognitoNotification.kt +++ b/app/src/main/java/acr/browser/lightning/browser/notification/IncognitoNotification.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning.notifications +package acr.browser.lightning.browser.notification import acr.browser.lightning.R import acr.browser.lightning.IncognitoBrowserActivity diff --git a/app/src/main/java/acr/browser/lightning/browser/notification/IncognitoTabCountNotifier.kt b/app/src/main/java/acr/browser/lightning/browser/notification/IncognitoTabCountNotifier.kt index 36c7a0c6f..81f005e94 100644 --- a/app/src/main/java/acr/browser/lightning/browser/notification/IncognitoTabCountNotifier.kt +++ b/app/src/main/java/acr/browser/lightning/browser/notification/IncognitoTabCountNotifier.kt @@ -1,6 +1,5 @@ package acr.browser.lightning.browser.notification -import acr.browser.lightning.notifications.IncognitoNotification import javax.inject.Inject /** diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/DrawerTabRecyclerViewAdapter.kt b/app/src/main/java/acr/browser/lightning/browser/tab/DrawerTabRecyclerViewAdapter.kt index b90a06a59..eba580624 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/DrawerTabRecyclerViewAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/DrawerTabRecyclerViewAdapter.kt @@ -1,9 +1,9 @@ package acr.browser.lightning.browser.tab import acr.browser.lightning.R +import acr.browser.lightning.browser.tab.view.BackgroundDrawable import acr.browser.lightning.extensions.desaturate import acr.browser.lightning.extensions.inflater -import acr.browser.lightning.view.BackgroundDrawable import android.graphics.Bitmap import android.view.ViewGroup import androidx.core.widget.TextViewCompat diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabAdapter.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabAdapter.kt index 20ab1273e..1c19874a7 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabAdapter.kt @@ -9,8 +9,6 @@ import acr.browser.lightning.ssl.SslCertificateInfo import acr.browser.lightning.ssl.SslState import acr.browser.lightning.utils.Option import acr.browser.lightning.utils.value -import acr.browser.lightning.view.FreezableBundleInitializer -import acr.browser.lightning.view.TabInitializer import android.content.Intent import android.graphics.Bitmap import android.os.Bundle diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabFactory.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabFactory.kt index 311a9f882..824437dd0 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabFactory.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabFactory.kt @@ -7,8 +7,7 @@ import acr.browser.lightning.adblock.allowlist.AllowListModel import acr.browser.lightning.browser.di.DiskScheduler import acr.browser.lightning.favicon.FaviconModel import acr.browser.lightning.preference.UserPreferences -import acr.browser.lightning.view.TabInitializer -import acr.browser.lightning.view.webrtc.WebRtcPermissionsModel +import acr.browser.lightning.browser.webrtc.WebRtcPermissionsModel import android.app.Activity import android.graphics.Bitmap import android.webkit.WebView diff --git a/app/src/main/java/acr/browser/lightning/view/TabInitializer.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabInitializer.kt similarity index 99% rename from app/src/main/java/acr/browser/lightning/view/TabInitializer.kt rename to app/src/main/java/acr/browser/lightning/browser/tab/TabInitializer.kt index aa6606b43..cbaae0a4d 100644 --- a/app/src/main/java/acr/browser/lightning/view/TabInitializer.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabInitializer.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning.view +package acr.browser.lightning.browser.tab import acr.browser.lightning.R import acr.browser.lightning.constant.SCHEME_BOOKMARKS diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabModel.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabModel.kt index 549f9703a..0c4bea0cf 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabModel.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabModel.kt @@ -4,7 +4,6 @@ import acr.browser.lightning.browser.download.PendingDownload import acr.browser.lightning.ssl.SslCertificateInfo import acr.browser.lightning.ssl.SslState import acr.browser.lightning.utils.Option -import acr.browser.lightning.view.TabInitializer import android.content.Intent import android.graphics.Bitmap import android.os.Bundle diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabWebChromeClient.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabWebChromeClient.kt index 228b29d43..370501ca0 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabWebChromeClient.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabWebChromeClient.kt @@ -9,10 +9,8 @@ import acr.browser.lightning.favicon.FaviconModel import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.utils.Option import acr.browser.lightning.utils.Utils -import acr.browser.lightning.view.ResultMessageInitializer -import acr.browser.lightning.view.TabInitializer -import acr.browser.lightning.view.webrtc.WebRtcPermissionsModel -import acr.browser.lightning.view.webrtc.WebRtcPermissionsView +import acr.browser.lightning.browser.webrtc.WebRtcPermissionsModel +import acr.browser.lightning.browser.webrtc.WebRtcPermissionsView import android.Manifest import android.app.Activity import android.content.Intent diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/bundle/BundleStore.kt b/app/src/main/java/acr/browser/lightning/browser/tab/bundle/BundleStore.kt index f36386754..6594131bc 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/bundle/BundleStore.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/bundle/BundleStore.kt @@ -1,7 +1,7 @@ package acr.browser.lightning.browser.tab.bundle import acr.browser.lightning.browser.tab.TabModel -import acr.browser.lightning.view.TabInitializer +import acr.browser.lightning.browser.tab.TabInitializer /** * Created by anthonycr on 7/27/22. diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/bundle/DefaultBundleStore.kt b/app/src/main/java/acr/browser/lightning/browser/tab/bundle/DefaultBundleStore.kt index 5654c2c01..c1f3e8636 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/bundle/DefaultBundleStore.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/bundle/DefaultBundleStore.kt @@ -1,10 +1,9 @@ package acr.browser.lightning.browser.tab.bundle import acr.browser.lightning.R -import acr.browser.lightning.browser.tab.TabModel import acr.browser.lightning.browser.di.DiskScheduler +import acr.browser.lightning.browser.tab.* import acr.browser.lightning.utils.* -import acr.browser.lightning.view.* import android.app.Application import android.os.Bundle import io.reactivex.Scheduler diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/bundle/IncognitoBundleStore.kt b/app/src/main/java/acr/browser/lightning/browser/tab/bundle/IncognitoBundleStore.kt index e023b72aa..5120696b0 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/bundle/IncognitoBundleStore.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/bundle/IncognitoBundleStore.kt @@ -1,7 +1,7 @@ package acr.browser.lightning.browser.tab.bundle import acr.browser.lightning.browser.tab.TabModel -import acr.browser.lightning.view.TabInitializer +import acr.browser.lightning.browser.tab.TabInitializer /** * A bundle store implementation that no-ops for for incognito mode. diff --git a/app/src/main/java/acr/browser/lightning/view/BackgroundDrawable.kt b/app/src/main/java/acr/browser/lightning/browser/tab/view/BackgroundDrawable.kt similarity index 95% rename from app/src/main/java/acr/browser/lightning/view/BackgroundDrawable.kt rename to app/src/main/java/acr/browser/lightning/browser/tab/view/BackgroundDrawable.kt index b3fff4822..3befd530d 100644 --- a/app/src/main/java/acr/browser/lightning/view/BackgroundDrawable.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/view/BackgroundDrawable.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning.view +package acr.browser.lightning.browser.tab.view import acr.browser.lightning.R import acr.browser.lightning.utils.ThemeUtils diff --git a/app/src/main/java/acr/browser/lightning/view/RenderingMode.kt b/app/src/main/java/acr/browser/lightning/browser/view/RenderingMode.kt similarity index 87% rename from app/src/main/java/acr/browser/lightning/view/RenderingMode.kt rename to app/src/main/java/acr/browser/lightning/browser/view/RenderingMode.kt index c6c03a7fa..8704ac4ab 100644 --- a/app/src/main/java/acr/browser/lightning/view/RenderingMode.kt +++ b/app/src/main/java/acr/browser/lightning/browser/view/RenderingMode.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning.view +package acr.browser.lightning.browser.view import acr.browser.lightning.preference.IntEnum diff --git a/app/src/main/java/acr/browser/lightning/view/webrtc/WebRtcPermissionsModel.kt b/app/src/main/java/acr/browser/lightning/browser/webrtc/WebRtcPermissionsModel.kt similarity index 98% rename from app/src/main/java/acr/browser/lightning/view/webrtc/WebRtcPermissionsModel.kt rename to app/src/main/java/acr/browser/lightning/browser/webrtc/WebRtcPermissionsModel.kt index 41b1adb1b..d7b841e40 100644 --- a/app/src/main/java/acr/browser/lightning/view/webrtc/WebRtcPermissionsModel.kt +++ b/app/src/main/java/acr/browser/lightning/browser/webrtc/WebRtcPermissionsModel.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning.view.webrtc +package acr.browser.lightning.browser.webrtc import acr.browser.lightning.extensions.requiredPermissions import android.annotation.TargetApi diff --git a/app/src/main/java/acr/browser/lightning/view/webrtc/WebRtcPermissionsView.kt b/app/src/main/java/acr/browser/lightning/browser/webrtc/WebRtcPermissionsView.kt similarity index 96% rename from app/src/main/java/acr/browser/lightning/view/webrtc/WebRtcPermissionsView.kt rename to app/src/main/java/acr/browser/lightning/browser/webrtc/WebRtcPermissionsView.kt index b6174177f..7f988aacb 100644 --- a/app/src/main/java/acr/browser/lightning/view/webrtc/WebRtcPermissionsView.kt +++ b/app/src/main/java/acr/browser/lightning/browser/webrtc/WebRtcPermissionsView.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning.view.webrtc +package acr.browser.lightning.browser.webrtc /** * A view which specializes in requesting device permissions and resources from the user. diff --git a/app/src/main/java/acr/browser/lightning/preference/UserPreferences.kt b/app/src/main/java/acr/browser/lightning/preference/UserPreferences.kt index fbd7a14b6..295763c8a 100644 --- a/app/src/main/java/acr/browser/lightning/preference/UserPreferences.kt +++ b/app/src/main/java/acr/browser/lightning/preference/UserPreferences.kt @@ -12,7 +12,7 @@ import acr.browser.lightning.preference.delegates.* import acr.browser.lightning.search.SearchEngineProvider import acr.browser.lightning.search.engine.GoogleSearch import acr.browser.lightning.utils.FileUtils -import acr.browser.lightning.view.RenderingMode +import acr.browser.lightning.browser.view.RenderingMode import android.content.SharedPreferences import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/acr/browser/lightning/view/SearchView.kt b/app/src/main/java/acr/browser/lightning/search/SearchView.kt similarity index 97% rename from app/src/main/java/acr/browser/lightning/view/SearchView.kt rename to app/src/main/java/acr/browser/lightning/search/SearchView.kt index 4dceba08b..9505cbd26 100644 --- a/app/src/main/java/acr/browser/lightning/view/SearchView.kt +++ b/app/src/main/java/acr/browser/lightning/search/SearchView.kt @@ -1,4 +1,4 @@ -package acr.browser.lightning.view +package acr.browser.lightning.search import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/acr/browser/lightning/settings/fragment/AdvancedSettingsFragment.kt b/app/src/main/java/acr/browser/lightning/settings/fragment/AdvancedSettingsFragment.kt index b80476b02..0a24980db 100644 --- a/app/src/main/java/acr/browser/lightning/settings/fragment/AdvancedSettingsFragment.kt +++ b/app/src/main/java/acr/browser/lightning/settings/fragment/AdvancedSettingsFragment.kt @@ -9,7 +9,7 @@ import acr.browser.lightning.extensions.resizeAndShow import acr.browser.lightning.extensions.withSingleChoiceItems import acr.browser.lightning.isSupported import acr.browser.lightning.preference.UserPreferences -import acr.browser.lightning.view.RenderingMode +import acr.browser.lightning.browser.view.RenderingMode import android.os.Bundle import androidx.appcompat.app.AlertDialog import javax.inject.Inject diff --git a/app/src/main/res/layout/browser_activity.xml b/app/src/main/res/layout/browser_activity.xml index 9c56b257a..49acf9670 100644 --- a/app/src/main/res/layout/browser_activity.xml +++ b/app/src/main/res/layout/browser_activity.xml @@ -117,7 +117,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - Date: Wed, 3 Aug 2022 23:27:44 -0400 Subject: [PATCH 132/161] Improving package structure --- app/src/main/res/layout/search.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/search.xml b/app/src/main/res/layout/search.xml index fcae628e8..b463bd0c2 100644 --- a/app/src/main/res/layout/search.xml +++ b/app/src/main/res/layout/search.xml @@ -27,7 +27,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - Date: Wed, 3 Aug 2022 23:39:32 -0400 Subject: [PATCH 133/161] Fixing cursors --- .../browser/lightning/browser/BrowserPresenter.kt | 1 - .../lightning/browser/tab/TabsRepository.kt | 1 - .../lightning/extensions/CursorExtensions.kt | 15 +++------------ 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt index e1ddf5acc..6f3d96a15 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt @@ -27,7 +27,6 @@ import acr.browser.lightning.html.history.HistoryPageFactory import acr.browser.lightning.search.SearchEngineProvider import acr.browser.lightning.ssl.SslState import acr.browser.lightning.utils.* -import acr.browser.lightning.view.* import androidx.activity.result.ActivityResult import androidx.core.net.toUri import io.reactivex.Maybe diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt index f03d36d6b..97fef4984 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt @@ -5,7 +5,6 @@ import acr.browser.lightning.browser.di.DiskScheduler import acr.browser.lightning.browser.di.MainScheduler import acr.browser.lightning.browser.tab.bundle.BundleStore import acr.browser.lightning.preference.UserPreferences -import acr.browser.lightning.view.* import io.reactivex.* import io.reactivex.subjects.PublishSubject import javax.inject.Inject diff --git a/app/src/main/java/acr/browser/lightning/extensions/CursorExtensions.kt b/app/src/main/java/acr/browser/lightning/extensions/CursorExtensions.kt index eb7cdd390..ad0095da3 100644 --- a/app/src/main/java/acr/browser/lightning/extensions/CursorExtensions.kt +++ b/app/src/main/java/acr/browser/lightning/extensions/CursorExtensions.kt @@ -2,17 +2,6 @@ package acr.browser.lightning.extensions import android.database.Cursor -/** - * Map the cursor to a [List] of [T], passing the cursor back into the [block] for convenience. - */ -inline fun Cursor.map(block: (Cursor) -> T): List { - val outputList = mutableListOf() - while (moveToNext()) { - outputList.add(block(this)) - } - return outputList -} - /** * Map the cursor to a [List] of [T], passing the cursor back into the [block] for convenience, and * then closing the cursor upon return. @@ -34,7 +23,9 @@ inline fun Cursor.useMap(block: (Cursor) -> T): List { */ inline fun Cursor.firstOrNullMap(block: (Cursor) -> T): T? { return if (moveToFirst()) { - return block(this) + use { + return block(this) + } } else { null } From c31181dd702ae45927147c1923b56bda0340c07e Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Thu, 4 Aug 2022 09:57:45 -0400 Subject: [PATCH 134/161] Replace star imports with direct imports --- .../adblock/parser/HostsFileParser.kt | 8 ++++++- .../adblock/source/UrlHostsDataSource.kt | 7 +++++- .../adblock/util/DefaultBloomFilter.kt | 2 +- .../lightning/adblock/util/hash/FileHash.kt | 2 +- .../adblock/util/object/JvmObjectStore.kt | 7 +++++- .../lightning/browser/BrowserActivity.kt | 20 +++++++++++++--- .../lightning/browser/BrowserPresenter.kt | 24 ++++++++++++++++--- .../lightning/browser/di/AppComponent.kt | 8 ++++++- .../browser/lightning/browser/di/AppModule.kt | 7 +++++- .../tab/DesktopTabRecyclerViewAdapter.kt | 6 ++++- .../lightning/browser/tab/RecentTabModel.kt | 2 +- .../browser/tab/TabWebChromeClient.kt | 6 ++++- .../lightning/browser/tab/TabWebViewClient.kt | 7 +++++- .../lightning/browser/tab/TabsRepository.kt | 6 ++++- .../browser/tab/bundle/DefaultBundleStore.kt | 15 ++++++++++-- .../browser/view/WebViewScrollCoordinator.kt | 6 ++++- .../lightning/extensions/BitmapExtensions.kt | 6 ++++- .../lightning/extensions/CanvasExtensions.kt | 7 +++++- .../lightning/extensions/ContextExtensions.kt | 8 +++++-- .../lightning/extensions/StackExtensions.kt | 2 +- .../html/bookmark/BookmarkPageFactory.kt | 10 +++++++- .../html/download/DownloadPageFactory.kt | 10 +++++++- .../html/history/HistoryPageFactory.kt | 10 +++++++- .../html/homepage/HomePageFactory.kt | 9 ++++++- .../browser/lightning/icon/TabCountView.kt | 8 ++++++- .../lightning/preference/UserPreferences.kt | 6 ++++- .../lightning/search/SearchEngineProvider.kt | 22 +++++++++++++++-- .../lightning/search/SuggestionsAdapter.kt | 7 ++++-- .../suggestions/BaseSuggestionsModel.kt | 2 +- .../fragment/BookmarkSettingsFragment.kt | 1 - .../lightning/ssl/SslCertificateInfo.kt | 2 +- .../acr/browser/lightning/utils/UrlUtils.kt | 2 +- 32 files changed, 205 insertions(+), 40 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/adblock/parser/HostsFileParser.kt b/app/src/main/java/acr/browser/lightning/adblock/parser/HostsFileParser.kt index 7dcc4d8cc..5abe3da6b 100644 --- a/app/src/main/java/acr/browser/lightning/adblock/parser/HostsFileParser.kt +++ b/app/src/main/java/acr/browser/lightning/adblock/parser/HostsFileParser.kt @@ -1,7 +1,13 @@ package acr.browser.lightning.adblock.parser import acr.browser.lightning.database.adblock.Host -import acr.browser.lightning.extensions.* +import acr.browser.lightning.extensions.containsChar +import acr.browser.lightning.extensions.indexOfChar +import acr.browser.lightning.extensions.inlineReplace +import acr.browser.lightning.extensions.inlineReplaceChar +import acr.browser.lightning.extensions.inlineTrim +import acr.browser.lightning.extensions.stringEquals +import acr.browser.lightning.extensions.substringToBuilder import acr.browser.lightning.log.Logger import java.io.InputStreamReader diff --git a/app/src/main/java/acr/browser/lightning/adblock/source/UrlHostsDataSource.kt b/app/src/main/java/acr/browser/lightning/adblock/source/UrlHostsDataSource.kt index d0956100b..9f546efcf 100644 --- a/app/src/main/java/acr/browser/lightning/adblock/source/UrlHostsDataSource.kt +++ b/app/src/main/java/acr/browser/lightning/adblock/source/UrlHostsDataSource.kt @@ -7,7 +7,12 @@ import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.preference.userAgent import android.app.Application import io.reactivex.Single -import okhttp3.* +import okhttp3.Call +import okhttp3.Callback +import okhttp3.HttpUrl +import okhttp3.OkHttpClient +import okhttp3.Request +import okhttp3.Response import java.io.IOException import java.io.InputStreamReader diff --git a/app/src/main/java/acr/browser/lightning/adblock/util/DefaultBloomFilter.kt b/app/src/main/java/acr/browser/lightning/adblock/util/DefaultBloomFilter.kt index 3b4b639db..211ed0a84 100644 --- a/app/src/main/java/acr/browser/lightning/adblock/util/DefaultBloomFilter.kt +++ b/app/src/main/java/acr/browser/lightning/adblock/util/DefaultBloomFilter.kt @@ -4,7 +4,7 @@ import acr.browser.lightning.adblock.util.hash.HashingAlgorithm import acr.browser.lightning.adblock.util.integer.lowerHalf import acr.browser.lightning.adblock.util.integer.upperHalf import java.io.Serializable -import java.util.* +import java.util.BitSet import kotlin.math.ln import kotlin.math.roundToInt diff --git a/app/src/main/java/acr/browser/lightning/adblock/util/hash/FileHash.kt b/app/src/main/java/acr/browser/lightning/adblock/util/hash/FileHash.kt index 20f2bb89c..dbca65294 100644 --- a/app/src/main/java/acr/browser/lightning/adblock/util/hash/FileHash.kt +++ b/app/src/main/java/acr/browser/lightning/adblock/util/hash/FileHash.kt @@ -2,7 +2,7 @@ package acr.browser.lightning.adblock.util.hash import java.io.InputStream import java.security.MessageDigest -import java.util.* +import java.util.Locale /** * Compute and return the MD5 hash of the [InputStream]. diff --git a/app/src/main/java/acr/browser/lightning/adblock/util/object/JvmObjectStore.kt b/app/src/main/java/acr/browser/lightning/adblock/util/object/JvmObjectStore.kt index 7acbffaf3..33d01b04d 100644 --- a/app/src/main/java/acr/browser/lightning/adblock/util/object/JvmObjectStore.kt +++ b/app/src/main/java/acr/browser/lightning/adblock/util/object/JvmObjectStore.kt @@ -3,7 +3,12 @@ package acr.browser.lightning.adblock.util.`object` import acr.browser.lightning.adblock.util.hash.HashingAlgorithm import acr.browser.lightning.extensions.safeUse import android.app.Application -import java.io.* +import java.io.File +import java.io.FileInputStream +import java.io.FileOutputStream +import java.io.ObjectInputStream +import java.io.ObjectOutputStream +import java.io.Serializable /** * An [ObjectStore] that serializes objects using the [ObjectInputStream]. diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserActivity.kt index 9b4273be3..5713a71f5 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserActivity.kt @@ -10,7 +10,6 @@ import acr.browser.lightning.browser.keys.KeyEventAdapter import acr.browser.lightning.browser.menu.MenuItemAdapter import acr.browser.lightning.browser.search.IntentExtractor import acr.browser.lightning.browser.search.SearchListener -import acr.browser.lightning.browser.tab.* import acr.browser.lightning.browser.ui.BookmarkConfiguration import acr.browser.lightning.browser.ui.TabConfiguration import acr.browser.lightning.browser.ui.UiConfiguration @@ -23,10 +22,14 @@ import acr.browser.lightning.database.WebPage import acr.browser.lightning.database.downloads.DownloadEntry import acr.browser.lightning.databinding.BrowserActivityBinding import acr.browser.lightning.browser.di.injector +import acr.browser.lightning.browser.tab.DesktopTabRecyclerViewAdapter +import acr.browser.lightning.browser.tab.DrawerTabRecyclerViewAdapter +import acr.browser.lightning.browser.tab.TabPager +import acr.browser.lightning.browser.tab.TabViewHolder +import acr.browser.lightning.browser.tab.TabViewState import acr.browser.lightning.dialog.BrowserDialog import acr.browser.lightning.dialog.DialogItem import acr.browser.lightning.dialog.LightningDialogBuilder -import acr.browser.lightning.extensions.* import acr.browser.lightning.search.SuggestionsAdapter import acr.browser.lightning.ssl.createSslDrawableForState import acr.browser.lightning.utils.ProxyUtils @@ -35,7 +38,6 @@ import android.content.Intent import android.content.pm.ActivityInfo import android.graphics.drawable.ColorDrawable import android.os.Bundle -import android.view.* import android.view.inputmethod.InputMethodManager import android.widget.AdapterView import android.widget.ImageView @@ -50,6 +52,18 @@ import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.SimpleItemAnimator import acr.browser.lightning.browser.view.targetUrl.LongPress +import acr.browser.lightning.extensions.color +import acr.browser.lightning.extensions.drawable +import acr.browser.lightning.extensions.resizeAndShow +import acr.browser.lightning.extensions.takeIfInstance +import acr.browser.lightning.extensions.tint +import android.view.Gravity +import android.view.KeyEvent +import android.view.LayoutInflater +import android.view.Menu +import android.view.MenuItem +import android.view.View +import android.view.WindowManager import javax.inject.Inject /** diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt index 6f3d96a15..ffb166c95 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt @@ -13,7 +13,6 @@ import acr.browser.lightning.browser.ui.TabConfiguration import acr.browser.lightning.browser.ui.UiConfiguration import acr.browser.lightning.adblock.allowlist.AllowListModel import acr.browser.lightning.browser.search.SearchBoxModel -import acr.browser.lightning.database.* import acr.browser.lightning.database.bookmark.BookmarkRepository import acr.browser.lightning.database.downloads.DownloadEntry import acr.browser.lightning.database.downloads.DownloadsRepository @@ -21,12 +20,18 @@ import acr.browser.lightning.database.history.HistoryRepository import acr.browser.lightning.browser.di.DatabaseScheduler import acr.browser.lightning.browser.di.DiskScheduler import acr.browser.lightning.browser.di.MainScheduler -import acr.browser.lightning.browser.tab.* +import acr.browser.lightning.browser.tab.DownloadPageInitializer +import acr.browser.lightning.browser.tab.HistoryPageInitializer +import acr.browser.lightning.browser.tab.HomePageInitializer +import acr.browser.lightning.browser.tab.NoOpInitializer +import acr.browser.lightning.browser.tab.TabInitializer +import acr.browser.lightning.browser.tab.TabModel +import acr.browser.lightning.browser.tab.TabViewState +import acr.browser.lightning.browser.tab.UrlInitializer import acr.browser.lightning.html.bookmark.BookmarkPageFactory import acr.browser.lightning.html.history.HistoryPageFactory import acr.browser.lightning.search.SearchEngineProvider import acr.browser.lightning.ssl.SslState -import acr.browser.lightning.utils.* import androidx.activity.result.ActivityResult import androidx.core.net.toUri import io.reactivex.Maybe @@ -38,6 +43,19 @@ import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.subscribeBy import io.reactivex.rxkotlin.toObservable import acr.browser.lightning.browser.view.targetUrl.LongPress +import acr.browser.lightning.database.Bookmark +import acr.browser.lightning.database.HistoryEntry +import acr.browser.lightning.database.SearchSuggestion +import acr.browser.lightning.database.WebPage +import acr.browser.lightning.database.asFolder +import acr.browser.lightning.utils.Option +import acr.browser.lightning.utils.QUERY_PLACE_HOLDER +import acr.browser.lightning.utils.isBookmarkUrl +import acr.browser.lightning.utils.isDownloadsUrl +import acr.browser.lightning.utils.isHistoryUrl +import acr.browser.lightning.utils.isSpecialUrl +import acr.browser.lightning.utils.smartUrlFilter +import acr.browser.lightning.utils.value import javax.inject.Inject import kotlin.system.exitProcess diff --git a/app/src/main/java/acr/browser/lightning/browser/di/AppComponent.kt b/app/src/main/java/acr/browser/lightning/browser/di/AppComponent.kt index 70fa21011..fcf46a5ef 100644 --- a/app/src/main/java/acr/browser/lightning/browser/di/AppComponent.kt +++ b/app/src/main/java/acr/browser/lightning/browser/di/AppComponent.kt @@ -12,7 +12,13 @@ import acr.browser.lightning.reading.activity.ReadingActivity import acr.browser.lightning.search.SuggestionsAdapter import acr.browser.lightning.settings.activity.SettingsActivity import acr.browser.lightning.settings.activity.ThemableSettingsActivity -import acr.browser.lightning.settings.fragment.* +import acr.browser.lightning.settings.fragment.AdBlockSettingsFragment +import acr.browser.lightning.settings.fragment.AdvancedSettingsFragment +import acr.browser.lightning.settings.fragment.BookmarkSettingsFragment +import acr.browser.lightning.settings.fragment.DebugSettingsFragment +import acr.browser.lightning.settings.fragment.DisplaySettingsFragment +import acr.browser.lightning.settings.fragment.GeneralSettingsFragment +import acr.browser.lightning.settings.fragment.PrivacySettingsFragment import android.app.Application import dagger.BindsInstance import dagger.Component diff --git a/app/src/main/java/acr/browser/lightning/browser/di/AppModule.kt b/app/src/main/java/acr/browser/lightning/browser/di/AppModule.kt index 8dcfd45eb..cddd8528d 100644 --- a/app/src/main/java/acr/browser/lightning/browser/di/AppModule.kt +++ b/app/src/main/java/acr/browser/lightning/browser/di/AppModule.kt @@ -37,7 +37,12 @@ import io.reactivex.Single import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers import net.i2p.android.ui.I2PAndroidHelper -import okhttp3.* +import okhttp3.Cache +import okhttp3.CacheControl +import okhttp3.HttpUrl +import okhttp3.Interceptor +import okhttp3.OkHttpClient +import okhttp3.Request import java.io.File import java.util.concurrent.Executors import java.util.concurrent.LinkedBlockingDeque diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/DesktopTabRecyclerViewAdapter.kt b/app/src/main/java/acr/browser/lightning/browser/tab/DesktopTabRecyclerViewAdapter.kt index e02e41469..619c51975 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/DesktopTabRecyclerViewAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/DesktopTabRecyclerViewAdapter.kt @@ -1,7 +1,11 @@ package acr.browser.lightning.browser.tab import acr.browser.lightning.R -import acr.browser.lightning.extensions.* +import acr.browser.lightning.extensions.desaturate +import acr.browser.lightning.extensions.dimen +import acr.browser.lightning.extensions.drawTrapezoid +import acr.browser.lightning.extensions.inflater +import acr.browser.lightning.extensions.tint import acr.browser.lightning.utils.ThemeUtils import acr.browser.lightning.utils.Utils import android.content.Context diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/RecentTabModel.kt b/app/src/main/java/acr/browser/lightning/browser/tab/RecentTabModel.kt index 8373da5de..ecaf38866 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/RecentTabModel.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/RecentTabModel.kt @@ -2,7 +2,7 @@ package acr.browser.lightning.browser.tab import acr.browser.lightning.extensions.popIfNotEmpty import android.os.Bundle -import java.util.* +import java.util.Stack import javax.inject.Inject /** diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabWebChromeClient.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabWebChromeClient.kt index 370501ca0..382b0725f 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabWebChromeClient.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabWebChromeClient.kt @@ -19,7 +19,11 @@ import android.graphics.Color import android.net.Uri import android.os.Message import android.view.View -import android.webkit.* +import android.webkit.GeolocationPermissions +import android.webkit.PermissionRequest +import android.webkit.ValueCallback +import android.webkit.WebChromeClient +import android.webkit.WebView import androidx.activity.result.ActivityResult import androidx.appcompat.app.AlertDialog import androidx.palette.graphics.Palette diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabWebViewClient.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabWebViewClient.kt index 0f0761eed..2803cc50f 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabWebViewClient.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabWebViewClient.kt @@ -8,7 +8,12 @@ import android.annotation.TargetApi import android.graphics.Bitmap import android.net.http.SslError import android.os.Build -import android.webkit.* +import android.webkit.SslErrorHandler +import android.webkit.URLUtil +import android.webkit.WebResourceRequest +import android.webkit.WebResourceResponse +import android.webkit.WebView +import android.webkit.WebViewClient import androidx.annotation.RequiresApi import io.reactivex.subjects.PublishSubject import java.io.ByteArrayInputStream diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt index 97fef4984..f674d7816 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt @@ -5,7 +5,11 @@ import acr.browser.lightning.browser.di.DiskScheduler import acr.browser.lightning.browser.di.MainScheduler import acr.browser.lightning.browser.tab.bundle.BundleStore import acr.browser.lightning.preference.UserPreferences -import io.reactivex.* +import io.reactivex.Completable +import io.reactivex.Maybe +import io.reactivex.Observable +import io.reactivex.Scheduler +import io.reactivex.Single import io.reactivex.subjects.PublishSubject import javax.inject.Inject diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/bundle/DefaultBundleStore.kt b/app/src/main/java/acr/browser/lightning/browser/tab/bundle/DefaultBundleStore.kt index c1f3e8636..d53592479 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/bundle/DefaultBundleStore.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/bundle/DefaultBundleStore.kt @@ -2,8 +2,19 @@ package acr.browser.lightning.browser.tab.bundle import acr.browser.lightning.R import acr.browser.lightning.browser.di.DiskScheduler -import acr.browser.lightning.browser.tab.* -import acr.browser.lightning.utils.* +import acr.browser.lightning.browser.tab.BookmarkPageInitializer +import acr.browser.lightning.browser.tab.DownloadPageInitializer +import acr.browser.lightning.browser.tab.FreezableBundleInitializer +import acr.browser.lightning.browser.tab.HistoryPageInitializer +import acr.browser.lightning.browser.tab.HomePageInitializer +import acr.browser.lightning.browser.tab.TabInitializer +import acr.browser.lightning.browser.tab.TabModel +import acr.browser.lightning.utils.FileUtils +import acr.browser.lightning.utils.isBookmarkUrl +import acr.browser.lightning.utils.isDownloadsUrl +import acr.browser.lightning.utils.isHistoryUrl +import acr.browser.lightning.utils.isSpecialUrl +import acr.browser.lightning.utils.isStartPageUrl import android.app.Application import android.os.Bundle import io.reactivex.Scheduler diff --git a/app/src/main/java/acr/browser/lightning/browser/view/WebViewScrollCoordinator.kt b/app/src/main/java/acr/browser/lightning/browser/view/WebViewScrollCoordinator.kt index da088629d..fa93e6f41 100644 --- a/app/src/main/java/acr/browser/lightning/browser/view/WebViewScrollCoordinator.kt +++ b/app/src/main/java/acr/browser/lightning/browser/view/WebViewScrollCoordinator.kt @@ -5,7 +5,11 @@ import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.utils.Utils import android.annotation.SuppressLint import android.app.Activity -import android.view.* +import android.view.GestureDetector +import android.view.MotionEvent +import android.view.View +import android.view.ViewConfiguration +import android.view.ViewGroup import android.view.animation.Animation import android.view.animation.Transformation import android.view.inputmethod.InputMethodManager diff --git a/app/src/main/java/acr/browser/lightning/extensions/BitmapExtensions.kt b/app/src/main/java/acr/browser/lightning/extensions/BitmapExtensions.kt index 9188c30c5..2a1a947bc 100644 --- a/app/src/main/java/acr/browser/lightning/extensions/BitmapExtensions.kt +++ b/app/src/main/java/acr/browser/lightning/extensions/BitmapExtensions.kt @@ -1,7 +1,11 @@ package acr.browser.lightning.extensions import acr.browser.lightning.utils.Utils -import android.graphics.* +import android.graphics.Bitmap +import android.graphics.Canvas +import android.graphics.ColorMatrix +import android.graphics.ColorMatrixColorFilter +import android.graphics.Paint import androidx.core.graphics.createBitmap /** diff --git a/app/src/main/java/acr/browser/lightning/extensions/CanvasExtensions.kt b/app/src/main/java/acr/browser/lightning/extensions/CanvasExtensions.kt index ad1435f91..2bb13a0a4 100644 --- a/app/src/main/java/acr/browser/lightning/extensions/CanvasExtensions.kt +++ b/app/src/main/java/acr/browser/lightning/extensions/CanvasExtensions.kt @@ -1,7 +1,12 @@ package acr.browser.lightning.extensions import acr.browser.lightning.utils.Utils.mixTwoColors -import android.graphics.* +import android.graphics.Canvas +import android.graphics.Color +import android.graphics.LinearGradient +import android.graphics.Paint +import android.graphics.Path +import android.graphics.Shader import kotlin.math.tan /** diff --git a/app/src/main/java/acr/browser/lightning/extensions/ContextExtensions.kt b/app/src/main/java/acr/browser/lightning/extensions/ContextExtensions.kt index ba7c528ac..c4998b334 100644 --- a/app/src/main/java/acr/browser/lightning/extensions/ContextExtensions.kt +++ b/app/src/main/java/acr/browser/lightning/extensions/ContextExtensions.kt @@ -7,9 +7,13 @@ import android.graphics.drawable.Drawable import android.os.Build import android.view.LayoutInflater import android.widget.Toast -import androidx.annotation.* +import androidx.annotation.ColorInt +import androidx.annotation.ColorRes +import androidx.annotation.DimenRes +import androidx.annotation.DrawableRes +import androidx.annotation.StringRes import androidx.core.content.ContextCompat -import java.util.* +import java.util.Locale /** * Returns the dimension in pixels. diff --git a/app/src/main/java/acr/browser/lightning/extensions/StackExtensions.kt b/app/src/main/java/acr/browser/lightning/extensions/StackExtensions.kt index ca43b2200..111b4f9fc 100644 --- a/app/src/main/java/acr/browser/lightning/extensions/StackExtensions.kt +++ b/app/src/main/java/acr/browser/lightning/extensions/StackExtensions.kt @@ -1,6 +1,6 @@ package acr.browser.lightning.extensions -import java.util.* +import java.util.Stack /** * If the [Stack] is empty, null is returned, otherwise the item at the top of the stack is diff --git a/app/src/main/java/acr/browser/lightning/html/bookmark/BookmarkPageFactory.kt b/app/src/main/java/acr/browser/lightning/html/bookmark/BookmarkPageFactory.kt index a963615d4..03edc779d 100644 --- a/app/src/main/java/acr/browser/lightning/html/bookmark/BookmarkPageFactory.kt +++ b/app/src/main/java/acr/browser/lightning/html/bookmark/BookmarkPageFactory.kt @@ -11,7 +11,15 @@ import acr.browser.lightning.extensions.safeUse import acr.browser.lightning.favicon.FaviconModel import acr.browser.lightning.favicon.toValidUri import acr.browser.lightning.html.HtmlPageFactory -import acr.browser.lightning.html.jsoup.* +import acr.browser.lightning.html.jsoup.andBuild +import acr.browser.lightning.html.jsoup.body +import acr.browser.lightning.html.jsoup.clone +import acr.browser.lightning.html.jsoup.id +import acr.browser.lightning.html.jsoup.parse +import acr.browser.lightning.html.jsoup.removeElement +import acr.browser.lightning.html.jsoup.style +import acr.browser.lightning.html.jsoup.tag +import acr.browser.lightning.html.jsoup.title import acr.browser.lightning.utils.ThemeUtils import android.app.Application import android.graphics.Bitmap diff --git a/app/src/main/java/acr/browser/lightning/html/download/DownloadPageFactory.kt b/app/src/main/java/acr/browser/lightning/html/download/DownloadPageFactory.kt index 498cc220c..6bb25b5b4 100644 --- a/app/src/main/java/acr/browser/lightning/html/download/DownloadPageFactory.kt +++ b/app/src/main/java/acr/browser/lightning/html/download/DownloadPageFactory.kt @@ -7,7 +7,15 @@ import acr.browser.lightning.database.downloads.DownloadEntry import acr.browser.lightning.database.downloads.DownloadsRepository import acr.browser.lightning.html.HtmlPageFactory import acr.browser.lightning.html.ListPageReader -import acr.browser.lightning.html.jsoup.* +import acr.browser.lightning.html.jsoup.andBuild +import acr.browser.lightning.html.jsoup.body +import acr.browser.lightning.html.jsoup.clone +import acr.browser.lightning.html.jsoup.id +import acr.browser.lightning.html.jsoup.parse +import acr.browser.lightning.html.jsoup.removeElement +import acr.browser.lightning.html.jsoup.style +import acr.browser.lightning.html.jsoup.tag +import acr.browser.lightning.html.jsoup.title import acr.browser.lightning.preference.UserPreferences import android.app.Application import dagger.Reusable diff --git a/app/src/main/java/acr/browser/lightning/html/history/HistoryPageFactory.kt b/app/src/main/java/acr/browser/lightning/html/history/HistoryPageFactory.kt index c03ada498..813627878 100644 --- a/app/src/main/java/acr/browser/lightning/html/history/HistoryPageFactory.kt +++ b/app/src/main/java/acr/browser/lightning/html/history/HistoryPageFactory.kt @@ -6,7 +6,15 @@ import acr.browser.lightning.constant.FILE import acr.browser.lightning.database.history.HistoryRepository import acr.browser.lightning.html.HtmlPageFactory import acr.browser.lightning.html.ListPageReader -import acr.browser.lightning.html.jsoup.* +import acr.browser.lightning.html.jsoup.andBuild +import acr.browser.lightning.html.jsoup.body +import acr.browser.lightning.html.jsoup.clone +import acr.browser.lightning.html.jsoup.id +import acr.browser.lightning.html.jsoup.parse +import acr.browser.lightning.html.jsoup.removeElement +import acr.browser.lightning.html.jsoup.style +import acr.browser.lightning.html.jsoup.tag +import acr.browser.lightning.html.jsoup.title import android.app.Application import dagger.Reusable import io.reactivex.Completable diff --git a/app/src/main/java/acr/browser/lightning/html/homepage/HomePageFactory.kt b/app/src/main/java/acr/browser/lightning/html/homepage/HomePageFactory.kt index 6b5b4c462..9e818e5c1 100644 --- a/app/src/main/java/acr/browser/lightning/html/homepage/HomePageFactory.kt +++ b/app/src/main/java/acr/browser/lightning/html/homepage/HomePageFactory.kt @@ -5,7 +5,14 @@ import acr.browser.lightning.browser.theme.ThemeProvider import acr.browser.lightning.constant.FILE import acr.browser.lightning.constant.UTF8 import acr.browser.lightning.html.HtmlPageFactory -import acr.browser.lightning.html.jsoup.* +import acr.browser.lightning.html.jsoup.andBuild +import acr.browser.lightning.html.jsoup.body +import acr.browser.lightning.html.jsoup.charset +import acr.browser.lightning.html.jsoup.id +import acr.browser.lightning.html.jsoup.parse +import acr.browser.lightning.html.jsoup.style +import acr.browser.lightning.html.jsoup.tag +import acr.browser.lightning.html.jsoup.title import acr.browser.lightning.search.SearchEngineProvider import android.app.Application import dagger.Reusable diff --git a/app/src/main/java/acr/browser/lightning/icon/TabCountView.kt b/app/src/main/java/acr/browser/lightning/icon/TabCountView.kt index d528093ce..6f5ac8a0a 100644 --- a/app/src/main/java/acr/browser/lightning/icon/TabCountView.kt +++ b/app/src/main/java/acr/browser/lightning/icon/TabCountView.kt @@ -3,7 +3,13 @@ package acr.browser.lightning.icon import acr.browser.lightning.R import acr.browser.lightning.extensions.preferredLocale import android.content.Context -import android.graphics.* +import android.graphics.Canvas +import android.graphics.Color +import android.graphics.Paint +import android.graphics.PorterDuff +import android.graphics.PorterDuffXfermode +import android.graphics.RectF +import android.graphics.Typeface import android.util.AttributeSet import android.view.View import androidx.core.content.withStyledAttributes diff --git a/app/src/main/java/acr/browser/lightning/preference/UserPreferences.kt b/app/src/main/java/acr/browser/lightning/preference/UserPreferences.kt index 295763c8a..f468a12d2 100644 --- a/app/src/main/java/acr/browser/lightning/preference/UserPreferences.kt +++ b/app/src/main/java/acr/browser/lightning/preference/UserPreferences.kt @@ -8,11 +8,15 @@ import acr.browser.lightning.constant.DEFAULT_ENCODING import acr.browser.lightning.constant.SCHEME_BOOKMARKS import acr.browser.lightning.device.ScreenSize import acr.browser.lightning.browser.di.UserPrefs -import acr.browser.lightning.preference.delegates.* import acr.browser.lightning.search.SearchEngineProvider import acr.browser.lightning.search.engine.GoogleSearch import acr.browser.lightning.utils.FileUtils import acr.browser.lightning.browser.view.RenderingMode +import acr.browser.lightning.preference.delegates.booleanPreference +import acr.browser.lightning.preference.delegates.enumPreference +import acr.browser.lightning.preference.delegates.intPreference +import acr.browser.lightning.preference.delegates.nullableStringPreference +import acr.browser.lightning.preference.delegates.stringPreference import android.content.SharedPreferences import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/acr/browser/lightning/search/SearchEngineProvider.kt b/app/src/main/java/acr/browser/lightning/search/SearchEngineProvider.kt index 2b44a0ba6..224f8833a 100644 --- a/app/src/main/java/acr/browser/lightning/search/SearchEngineProvider.kt +++ b/app/src/main/java/acr/browser/lightning/search/SearchEngineProvider.kt @@ -3,8 +3,26 @@ package acr.browser.lightning.search import acr.browser.lightning.browser.di.SuggestionsClient import acr.browser.lightning.log.Logger import acr.browser.lightning.preference.UserPreferences -import acr.browser.lightning.search.engine.* -import acr.browser.lightning.search.suggestions.* +import acr.browser.lightning.search.engine.AskSearch +import acr.browser.lightning.search.engine.BaiduSearch +import acr.browser.lightning.search.engine.BaseSearchEngine +import acr.browser.lightning.search.engine.BingSearch +import acr.browser.lightning.search.engine.CustomSearch +import acr.browser.lightning.search.engine.DuckLiteSearch +import acr.browser.lightning.search.engine.DuckSearch +import acr.browser.lightning.search.engine.GoogleSearch +import acr.browser.lightning.search.engine.NaverSearch +import acr.browser.lightning.search.engine.StartPageMobileSearch +import acr.browser.lightning.search.engine.StartPageSearch +import acr.browser.lightning.search.engine.YahooSearch +import acr.browser.lightning.search.engine.YandexSearch +import acr.browser.lightning.search.suggestions.BaiduSuggestionsModel +import acr.browser.lightning.search.suggestions.DuckSuggestionsModel +import acr.browser.lightning.search.suggestions.GoogleSuggestionsModel +import acr.browser.lightning.search.suggestions.NaverSuggestionsModel +import acr.browser.lightning.search.suggestions.NoOpSuggestionsRepository +import acr.browser.lightning.search.suggestions.RequestFactory +import acr.browser.lightning.search.suggestions.SuggestionsRepository import android.app.Application import dagger.Reusable import io.reactivex.Single diff --git a/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.kt b/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.kt index 3c19d0f01..1c6cc6794 100644 --- a/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.kt @@ -23,10 +23,13 @@ import android.view.ViewGroup import android.widget.BaseAdapter import android.widget.Filter import android.widget.Filterable -import io.reactivex.* +import io.reactivex.BackpressureStrategy +import io.reactivex.Flowable import io.reactivex.Observable +import io.reactivex.Scheduler +import io.reactivex.Single import io.reactivex.subjects.PublishSubject -import java.util.* +import java.util.Locale import javax.inject.Inject class SuggestionsAdapter( diff --git a/app/src/main/java/acr/browser/lightning/search/suggestions/BaseSuggestionsModel.kt b/app/src/main/java/acr/browser/lightning/search/suggestions/BaseSuggestionsModel.kt index 047ebf1ee..2be7c618a 100644 --- a/app/src/main/java/acr/browser/lightning/search/suggestions/BaseSuggestionsModel.kt +++ b/app/src/main/java/acr/browser/lightning/search/suggestions/BaseSuggestionsModel.kt @@ -11,7 +11,7 @@ import okhttp3.ResponseBody import java.io.IOException import java.io.UnsupportedEncodingException import java.net.URLEncoder -import java.util.* +import java.util.Locale /** * The base search suggestions API. Provides common fetching and caching functionality for each diff --git a/app/src/main/java/acr/browser/lightning/settings/fragment/BookmarkSettingsFragment.kt b/app/src/main/java/acr/browser/lightning/settings/fragment/BookmarkSettingsFragment.kt index c24b3409a..17536497d 100644 --- a/app/src/main/java/acr/browser/lightning/settings/fragment/BookmarkSettingsFragment.kt +++ b/app/src/main/java/acr/browser/lightning/settings/fragment/BookmarkSettingsFragment.kt @@ -30,7 +30,6 @@ import io.reactivex.Single import io.reactivex.disposables.Disposable import io.reactivex.rxkotlin.subscribeBy import java.io.File -import java.util.* import javax.inject.Inject class BookmarkSettingsFragment : AbstractSettingsFragment() { diff --git a/app/src/main/java/acr/browser/lightning/ssl/SslCertificateInfo.kt b/app/src/main/java/acr/browser/lightning/ssl/SslCertificateInfo.kt index 160a60080..946203927 100644 --- a/app/src/main/java/acr/browser/lightning/ssl/SslCertificateInfo.kt +++ b/app/src/main/java/acr/browser/lightning/ssl/SslCertificateInfo.kt @@ -1,6 +1,6 @@ package acr.browser.lightning.ssl -import java.util.* +import java.util.Date /** * Created by anthonycr on 11/19/20. diff --git a/app/src/main/java/acr/browser/lightning/utils/UrlUtils.kt b/app/src/main/java/acr/browser/lightning/utils/UrlUtils.kt index d7c174eea..30990bf5b 100644 --- a/app/src/main/java/acr/browser/lightning/utils/UrlUtils.kt +++ b/app/src/main/java/acr/browser/lightning/utils/UrlUtils.kt @@ -24,7 +24,7 @@ import acr.browser.lightning.html.history.HistoryPageFactory import acr.browser.lightning.html.homepage.HomePageFactory import android.util.Patterns import android.webkit.URLUtil -import java.util.* +import java.util.Locale import java.util.regex.Pattern /** From c48e02bf90af0b029aa06c76c4ccfab6453ffc9e Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Thu, 4 Aug 2022 10:15:40 -0400 Subject: [PATCH 135/161] Improving documentation --- .../browser/bookmark/BookmarkRecyclerViewAdapter.kt | 6 +++++- .../lightning/browser/bookmark/BookmarkViewHolder.kt | 5 ++++- .../browser/lightning/browser/di/Browser2BindsModule.kt | 2 +- .../acr/browser/lightning/browser/di/Browser2Component.kt | 2 +- .../acr/browser/lightning/browser/di/Browser2Module.kt | 2 +- .../acr/browser/lightning/browser/di/Browser2Scope.kt | 2 +- .../browser/download/DownloadPermissionsHelper.kt | 5 ++++- .../browser/lightning/browser/download/PendingDownload.kt | 8 +++++++- .../lightning/browser/history/DefaultHistoryRecord.kt | 2 +- .../browser/lightning/browser/history/HistoryRecord.kt | 5 ++++- .../lightning/browser/history/NoOpHistoryRecord.kt | 2 +- .../browser/lightning/browser/image/FaviconImageLoader.kt | 3 ++- .../acr/browser/lightning/browser/image/ImageLoader.kt | 5 ++++- .../java/acr/browser/lightning/browser/keys/KeyCombo.kt | 2 +- .../acr/browser/lightning/browser/keys/KeyEventAdapter.kt | 5 ++++- .../acr/browser/lightning/browser/menu/MenuItemAdapter.kt | 5 ++++- .../acr/browser/lightning/browser/menu/MenuSelection.kt | 2 +- .../browser/notification/DefaultTabCountNotifier.kt | 2 +- .../browser/notification/IncognitoTabCountNotifier.kt | 2 +- .../lightning/browser/notification/TabCountNotifier.kt | 5 ++++- .../java/acr/browser/lightning/browser/proxy/Proxy.kt | 5 ++++- .../browser/lightning/browser/search/IntentExtractor.kt | 4 ++-- .../browser/lightning/browser/search/SearchListener.kt | 5 ++++- 23 files changed, 62 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/browser/bookmark/BookmarkRecyclerViewAdapter.kt b/app/src/main/java/acr/browser/lightning/browser/bookmark/BookmarkRecyclerViewAdapter.kt index 2cc72c7a9..39cfa7030 100644 --- a/app/src/main/java/acr/browser/lightning/browser/bookmark/BookmarkRecyclerViewAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/bookmark/BookmarkRecyclerViewAdapter.kt @@ -9,7 +9,11 @@ import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter /** - * Created by anthonycr on 9/13/20. + * An adapter that creates the views for bookmark list items and binds the bookmark data to them. + * + * @param onClick Invoked when the cell is clicked. + * @param onLongClick Invoked when the cell is long pressed. + * @param imageLoader The image loader needed to load favicons. */ class BookmarkRecyclerViewAdapter( private val onClick: (Int) -> Unit, diff --git a/app/src/main/java/acr/browser/lightning/browser/bookmark/BookmarkViewHolder.kt b/app/src/main/java/acr/browser/lightning/browser/bookmark/BookmarkViewHolder.kt index 15ab62b47..2bab65886 100644 --- a/app/src/main/java/acr/browser/lightning/browser/bookmark/BookmarkViewHolder.kt +++ b/app/src/main/java/acr/browser/lightning/browser/bookmark/BookmarkViewHolder.kt @@ -5,7 +5,10 @@ import android.view.View import androidx.recyclerview.widget.RecyclerView /** - * Created by anthonycr on 9/13/20. + * The view holder that shows bookmark items. + * + * @param onItemClickListener Invoked when the cell is clicked. + * @param onItemLongClickListener Invoked when the cell is long pressed. */ class BookmarkViewHolder( itemView: View, diff --git a/app/src/main/java/acr/browser/lightning/browser/di/Browser2BindsModule.kt b/app/src/main/java/acr/browser/lightning/browser/di/Browser2BindsModule.kt index bbd590453..ae02e8e93 100644 --- a/app/src/main/java/acr/browser/lightning/browser/di/Browser2BindsModule.kt +++ b/app/src/main/java/acr/browser/lightning/browser/di/Browser2BindsModule.kt @@ -11,7 +11,7 @@ import dagger.Binds import dagger.Module /** - * Created by anthonycr on 9/15/20. + * Binds implementations to interfaces for the browser scope. */ @Module interface Browser2BindsModule { diff --git a/app/src/main/java/acr/browser/lightning/browser/di/Browser2Component.kt b/app/src/main/java/acr/browser/lightning/browser/di/Browser2Component.kt index 1ce4b77d5..0635f055f 100644 --- a/app/src/main/java/acr/browser/lightning/browser/di/Browser2Component.kt +++ b/app/src/main/java/acr/browser/lightning/browser/di/Browser2Component.kt @@ -11,7 +11,7 @@ import dagger.Subcomponent import javax.inject.Qualifier /** - * Created by anthonycr on 9/15/20. + * The component for the browser scope. */ @Browser2Scope @Subcomponent(modules = [Browser2Module::class, Browser2BindsModule::class]) diff --git a/app/src/main/java/acr/browser/lightning/browser/di/Browser2Module.kt b/app/src/main/java/acr/browser/lightning/browser/di/Browser2Module.kt index 99ba1187e..fa2b13a86 100644 --- a/app/src/main/java/acr/browser/lightning/browser/di/Browser2Module.kt +++ b/app/src/main/java/acr/browser/lightning/browser/di/Browser2Module.kt @@ -36,7 +36,7 @@ import dagger.Provides import javax.inject.Provider /** - * Created by anthonycr on 9/17/20. + * Constructs dependencies for the browser scope. */ @Module class Browser2Module { diff --git a/app/src/main/java/acr/browser/lightning/browser/di/Browser2Scope.kt b/app/src/main/java/acr/browser/lightning/browser/di/Browser2Scope.kt index 6d289ba55..7dcf5e220 100644 --- a/app/src/main/java/acr/browser/lightning/browser/di/Browser2Scope.kt +++ b/app/src/main/java/acr/browser/lightning/browser/di/Browser2Scope.kt @@ -3,7 +3,7 @@ package acr.browser.lightning.browser.di import javax.inject.Scope /** - * Created by anthonycr on 12/23/20. + * The dependency scope for the browser screen. */ @Scope @Retention diff --git a/app/src/main/java/acr/browser/lightning/browser/download/DownloadPermissionsHelper.kt b/app/src/main/java/acr/browser/lightning/browser/download/DownloadPermissionsHelper.kt index c208ea7a8..4c5a1ceab 100644 --- a/app/src/main/java/acr/browser/lightning/browser/download/DownloadPermissionsHelper.kt +++ b/app/src/main/java/acr/browser/lightning/browser/download/DownloadPermissionsHelper.kt @@ -22,7 +22,7 @@ import io.reactivex.rxkotlin.subscribeBy import javax.inject.Inject /** - * Created by anthonycr on 7/25/21. + * Wraps [DownloadHandler] for a better download API. */ class DownloadPermissionsHelper @Inject constructor( private val downloadHandler: DownloadHandler, @@ -32,6 +32,9 @@ class DownloadPermissionsHelper @Inject constructor( @DatabaseScheduler private val databaseScheduler: Scheduler ) { + /** + * Download a file with the provided [url]. + */ fun download( activity: Activity, url: String, diff --git a/app/src/main/java/acr/browser/lightning/browser/download/PendingDownload.kt b/app/src/main/java/acr/browser/lightning/browser/download/PendingDownload.kt index 4cba3ca29..5b618d373 100644 --- a/app/src/main/java/acr/browser/lightning/browser/download/PendingDownload.kt +++ b/app/src/main/java/acr/browser/lightning/browser/download/PendingDownload.kt @@ -1,7 +1,13 @@ package acr.browser.lightning.browser.download /** - * Created by anthonycr on 7/25/21. + * Represents a file that will be downloaded. + * + * @param url The URL of the file. + * @param userAgent The user agent we will use when making the download request. + * @param contentDisposition The description of content we are downloading. + * @param mimeType The type of content we are downloading. + * @param contentLength The size of the file we are downloading. */ data class PendingDownload( val url: String, diff --git a/app/src/main/java/acr/browser/lightning/browser/history/DefaultHistoryRecord.kt b/app/src/main/java/acr/browser/lightning/browser/history/DefaultHistoryRecord.kt index 5f04f4e94..999cc9788 100644 --- a/app/src/main/java/acr/browser/lightning/browser/history/DefaultHistoryRecord.kt +++ b/app/src/main/java/acr/browser/lightning/browser/history/DefaultHistoryRecord.kt @@ -6,7 +6,7 @@ import io.reactivex.Scheduler import javax.inject.Inject /** - * Created by anthonycr on 9/14/20. + * The default history record that records the history in a permanent data store. */ class DefaultHistoryRecord @Inject constructor( private val historyRepository: HistoryRepository, diff --git a/app/src/main/java/acr/browser/lightning/browser/history/HistoryRecord.kt b/app/src/main/java/acr/browser/lightning/browser/history/HistoryRecord.kt index 2da298cbe..953c627c5 100644 --- a/app/src/main/java/acr/browser/lightning/browser/history/HistoryRecord.kt +++ b/app/src/main/java/acr/browser/lightning/browser/history/HistoryRecord.kt @@ -1,10 +1,13 @@ package acr.browser.lightning.browser.history /** - * Created by anthonycr on 9/14/20. + * Records browser history. */ interface HistoryRecord { + /** + * Record a visit to the [url] with the provided [title]. + */ fun recordVisit(title: String, url: String) } diff --git a/app/src/main/java/acr/browser/lightning/browser/history/NoOpHistoryRecord.kt b/app/src/main/java/acr/browser/lightning/browser/history/NoOpHistoryRecord.kt index 72c687f8f..eb904a46c 100644 --- a/app/src/main/java/acr/browser/lightning/browser/history/NoOpHistoryRecord.kt +++ b/app/src/main/java/acr/browser/lightning/browser/history/NoOpHistoryRecord.kt @@ -1,7 +1,7 @@ package acr.browser.lightning.browser.history /** - * Created by anthonycr on 9/14/20. + * A non functional history record that ignores all attempts to record a visit. */ object NoOpHistoryRecord : HistoryRecord { override fun recordVisit(title: String, url: String) = Unit diff --git a/app/src/main/java/acr/browser/lightning/browser/image/FaviconImageLoader.kt b/app/src/main/java/acr/browser/lightning/browser/image/FaviconImageLoader.kt index a87d197aa..1fe025ef5 100644 --- a/app/src/main/java/acr/browser/lightning/browser/image/FaviconImageLoader.kt +++ b/app/src/main/java/acr/browser/lightning/browser/image/FaviconImageLoader.kt @@ -18,7 +18,8 @@ import io.reactivex.rxkotlin.subscribeBy import javax.inject.Inject /** - * Created by anthonycr on 9/15/20. + * An image loader implementation that caches icons in memory after reading them from the disk + * cache. */ class FaviconImageLoader @Inject constructor( private val faviconModel: FaviconModel, diff --git a/app/src/main/java/acr/browser/lightning/browser/image/ImageLoader.kt b/app/src/main/java/acr/browser/lightning/browser/image/ImageLoader.kt index 174e94951..77b4f11bd 100644 --- a/app/src/main/java/acr/browser/lightning/browser/image/ImageLoader.kt +++ b/app/src/main/java/acr/browser/lightning/browser/image/ImageLoader.kt @@ -4,10 +4,13 @@ import acr.browser.lightning.database.Bookmark import android.widget.ImageView /** - * Created by anthonycr on 9/15/20. + * Loads images for bookmark entries. */ interface ImageLoader { + /** + * Load a the favicon into the [imageView] for the provided [bookmark]. + */ fun loadImage(imageView: ImageView, bookmark: Bookmark) } diff --git a/app/src/main/java/acr/browser/lightning/browser/keys/KeyCombo.kt b/app/src/main/java/acr/browser/lightning/browser/keys/KeyCombo.kt index 7c8d38169..17e033042 100644 --- a/app/src/main/java/acr/browser/lightning/browser/keys/KeyCombo.kt +++ b/app/src/main/java/acr/browser/lightning/browser/keys/KeyCombo.kt @@ -1,7 +1,7 @@ package acr.browser.lightning.browser.keys /** - * Created by anthonycr on 9/16/20. + * Supported key shortcut combinations. */ enum class KeyCombo { CTRL_F, diff --git a/app/src/main/java/acr/browser/lightning/browser/keys/KeyEventAdapter.kt b/app/src/main/java/acr/browser/lightning/browser/keys/KeyEventAdapter.kt index 886936ffb..679afe527 100644 --- a/app/src/main/java/acr/browser/lightning/browser/keys/KeyEventAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/keys/KeyEventAdapter.kt @@ -4,10 +4,13 @@ import android.view.KeyEvent import javax.inject.Inject /** - * Created by anthonycr on 9/16/20. + * Adapts [KeyEvents][KeyEvent] to [KeyCombos][KeyCombo]. */ class KeyEventAdapter @Inject constructor() { + /** + * Adapt the [event] or return null if the key combo is unsupported. + */ fun adaptKeyEvent(event: KeyEvent): KeyCombo? { when { event.isCtrlPressed -> when (event.keyCode) { diff --git a/app/src/main/java/acr/browser/lightning/browser/menu/MenuItemAdapter.kt b/app/src/main/java/acr/browser/lightning/browser/menu/MenuItemAdapter.kt index 779b59ebb..c4fbf2cab 100644 --- a/app/src/main/java/acr/browser/lightning/browser/menu/MenuItemAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/menu/MenuItemAdapter.kt @@ -5,10 +5,13 @@ import android.view.MenuItem import javax.inject.Inject /** - * Created by anthonycr on 9/16/20. + * Adapts a click on a menu item to a [MenuSelection]. */ class MenuItemAdapter @Inject constructor() { + /** + * Adapt the [menuItem] or return null if the item is unsupported. + */ fun adaptMenuItem(menuItem: MenuItem): MenuSelection? { return when (menuItem.itemId) { android.R.id.home -> TODO() diff --git a/app/src/main/java/acr/browser/lightning/browser/menu/MenuSelection.kt b/app/src/main/java/acr/browser/lightning/browser/menu/MenuSelection.kt index b884460f3..bf673c509 100644 --- a/app/src/main/java/acr/browser/lightning/browser/menu/MenuSelection.kt +++ b/app/src/main/java/acr/browser/lightning/browser/menu/MenuSelection.kt @@ -1,7 +1,7 @@ package acr.browser.lightning.browser.menu /** - * Created by anthonycr on 9/16/20. + * Supported browser menu options. */ enum class MenuSelection { NEW_TAB, diff --git a/app/src/main/java/acr/browser/lightning/browser/notification/DefaultTabCountNotifier.kt b/app/src/main/java/acr/browser/lightning/browser/notification/DefaultTabCountNotifier.kt index 3611cf7be..0634ba1eb 100644 --- a/app/src/main/java/acr/browser/lightning/browser/notification/DefaultTabCountNotifier.kt +++ b/app/src/main/java/acr/browser/lightning/browser/notification/DefaultTabCountNotifier.kt @@ -1,7 +1,7 @@ package acr.browser.lightning.browser.notification /** - * Created by anthonycr on 7/27/22. + * Do nothing when notified about the new tab count. */ object DefaultTabCountNotifier : TabCountNotifier { override fun notifyTabCountChange(total: Int) = Unit diff --git a/app/src/main/java/acr/browser/lightning/browser/notification/IncognitoTabCountNotifier.kt b/app/src/main/java/acr/browser/lightning/browser/notification/IncognitoTabCountNotifier.kt index 81f005e94..7bf30875a 100644 --- a/app/src/main/java/acr/browser/lightning/browser/notification/IncognitoTabCountNotifier.kt +++ b/app/src/main/java/acr/browser/lightning/browser/notification/IncognitoTabCountNotifier.kt @@ -3,7 +3,7 @@ package acr.browser.lightning.browser.notification import javax.inject.Inject /** - * Created by anthonycr on 7/27/22. + * Shows a notification about the number of incognito tabs currently open. */ class IncognitoTabCountNotifier @Inject constructor( private val incognitoNotification: IncognitoNotification diff --git a/app/src/main/java/acr/browser/lightning/browser/notification/TabCountNotifier.kt b/app/src/main/java/acr/browser/lightning/browser/notification/TabCountNotifier.kt index 44f5fa50f..988b8aa20 100644 --- a/app/src/main/java/acr/browser/lightning/browser/notification/TabCountNotifier.kt +++ b/app/src/main/java/acr/browser/lightning/browser/notification/TabCountNotifier.kt @@ -1,10 +1,13 @@ package acr.browser.lightning.browser.notification /** - * Created by anthonycr on 7/27/22. + * Notify the browser outside of the regular view that the tab count has changed. */ interface TabCountNotifier { + /** + * The open tab count has changed to the new [total]. + */ fun notifyTabCountChange(total: Int) } diff --git a/app/src/main/java/acr/browser/lightning/browser/proxy/Proxy.kt b/app/src/main/java/acr/browser/lightning/browser/proxy/Proxy.kt index 518883bab..c7ff9a783 100644 --- a/app/src/main/java/acr/browser/lightning/browser/proxy/Proxy.kt +++ b/app/src/main/java/acr/browser/lightning/browser/proxy/Proxy.kt @@ -1,10 +1,13 @@ package acr.browser.lightning.browser.proxy /** - * Created by anthonycr on 8/2/22. + * A proxy for the proxy that determines if the proxy is ready (proxy-ception). */ interface Proxy { + /** + * True if the proxy is ready for use or if no proxy is being used, false otherwise. + */ fun isProxyReady(): Boolean } diff --git a/app/src/main/java/acr/browser/lightning/browser/search/IntentExtractor.kt b/app/src/main/java/acr/browser/lightning/browser/search/IntentExtractor.kt index b1100b1aa..e2aab796a 100644 --- a/app/src/main/java/acr/browser/lightning/browser/search/IntentExtractor.kt +++ b/app/src/main/java/acr/browser/lightning/browser/search/IntentExtractor.kt @@ -9,12 +9,12 @@ import android.content.Intent import javax.inject.Inject /** - * Created by anthonycr on 9/20/20. + * Extracts data from an [Intent] and into a [BrowserContract.Action]. */ class IntentExtractor @Inject constructor(private val searchEngineProvider: SearchEngineProvider) { /** - * TODO + * Extract the action from the [intent] or return null if no data was extracted. */ fun extractUrlFromIntent(intent: Intent): BrowserContract.Action? { return when (intent.action) { diff --git a/app/src/main/java/acr/browser/lightning/browser/search/SearchListener.kt b/app/src/main/java/acr/browser/lightning/browser/search/SearchListener.kt index aae3454d5..ffb44d77b 100644 --- a/app/src/main/java/acr/browser/lightning/browser/search/SearchListener.kt +++ b/app/src/main/java/acr/browser/lightning/browser/search/SearchListener.kt @@ -7,7 +7,10 @@ import android.view.inputmethod.InputMethodManager import android.widget.TextView /** - * Created by anthonycr on 9/14/20. + * Listens for actions on the search bar. + * + * @param onConfirm Invoked when the user has confirmed what they are searching for. + * @param inputMethodManager Used to manage keyboard visibility. */ class SearchListener( private val onConfirm: () -> Unit, From 383396c23b1ea6589cfcadcb69cfe85d076936da Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Thu, 4 Aug 2022 10:42:38 -0400 Subject: [PATCH 136/161] Documenting browser apis --- .../tab/DesktopTabRecyclerViewAdapter.kt | 6 +- .../tab/DrawerTabRecyclerViewAdapter.kt | 6 +- .../lightning/browser/tab/TabAdapter.kt | 2 +- .../lightning/browser/tab/TabFactory.kt | 5 +- .../browser/lightning/browser/tab/TabModel.kt | 137 +++++++++++++++++- .../browser/tab/bundle/BundleStore.kt | 8 +- .../browser/tab/bundle/DefaultBundleStore.kt | 2 +- 7 files changed, 158 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/DesktopTabRecyclerViewAdapter.kt b/app/src/main/java/acr/browser/lightning/browser/tab/DesktopTabRecyclerViewAdapter.kt index 619c51975..d9ec3a76a 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/DesktopTabRecyclerViewAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/DesktopTabRecyclerViewAdapter.kt @@ -21,7 +21,11 @@ import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter /** - * Created by anthonycr on 9/12/20. + * The adapter that renders tabs in the desktop form. + * + * @param onClick Invoked when the tab is clicked. + * @param onLongClick Invoked when the tab is long pressed. + * @param onCloseClick Invoked when the tab's close button is clicked. */ class DesktopTabRecyclerViewAdapter( context: Context, diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/DrawerTabRecyclerViewAdapter.kt b/app/src/main/java/acr/browser/lightning/browser/tab/DrawerTabRecyclerViewAdapter.kt index eba580624..85a0165a1 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/DrawerTabRecyclerViewAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/DrawerTabRecyclerViewAdapter.kt @@ -11,7 +11,11 @@ import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter /** - * Created by anthonycr on 11/19/20. + * The adapter that renders tabs in the drawer list form. + * + * @param onClick Invoked when the tab is clicked. + * @param onLongClick Invoked when the tab is long pressed. + * @param onCloseClick Invoked when the tab's close button is clicked. */ class DrawerTabRecyclerViewAdapter( private val onClick: (Int) -> Unit, diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabAdapter.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabAdapter.kt index 1c19874a7..de7ffce63 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabAdapter.kt @@ -19,7 +19,7 @@ import io.reactivex.Observable import io.reactivex.subjects.PublishSubject /** - * Created by anthonycr on 9/12/20. + * Creates the adaptation between a [WebView] and the [TabModel] interface used by the browser. */ class TabAdapter( tabInitializer: TabInitializer, diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabFactory.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabFactory.kt index 824437dd0..7559db854 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabFactory.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabFactory.kt @@ -15,7 +15,7 @@ import io.reactivex.Scheduler import javax.inject.Inject /** - * Created by anthonycr on 8/3/22. + * Constructs a [TabModel]. */ class TabFactory @Inject constructor( private val webViewFactory: WebViewFactory, @@ -32,6 +32,9 @@ class TabFactory @Inject constructor( private val webRtcPermissionsModel: WebRtcPermissionsModel ) { + /** + * Constructs a tab from the [webView] with the provided [tabInitializer]. + */ fun constructTab(tabInitializer: TabInitializer, webView: WebView): TabModel { val headers = webViewFactory.createRequestHeaders() return TabAdapter( diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabModel.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabModel.kt index 0c4bea0cf..29308b9d1 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabModel.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabModel.kt @@ -9,97 +9,230 @@ import android.graphics.Bitmap import android.os.Bundle import android.view.View import androidx.activity.result.ActivityResult +import androidx.annotation.ColorInt import io.reactivex.Observable +/** + * The representation of a browser tab. + */ interface TabModel { + /** + * The tab identifier. + */ val id: Int // Navigation + /** + * Load a [url] in the tab. + */ fun loadUrl(url: String) + /** + * Load a URL using the provided [tabInitializer]. + */ fun loadFromInitializer(tabInitializer: TabInitializer) + /** + * Go back in the navigation tree. + */ fun goBack() + /** + * True if [goBack] has something to go back to, false otherwise. + */ fun canGoBack(): Boolean + /** + * Emits changes to the [canGoBack] status. + */ fun canGoBackChanges(): Observable + /** + * Go forward in the navigation tree. + */ fun goForward() + /** + * True if [goForward] has something to go forward to, false otherwise. + */ fun canGoForward(): Boolean + /** + * Emits changes to the [canGoForward] status. + */ fun canGoForwardChanges(): Observable + /** + * Toggle the user agent used by the browser to a desktop one or back to the default one. + */ fun toggleDesktopAgent() + /** + * Reload the page the browser is currently showing. + */ fun reload() + /** + * Stop loading the current page if it is loading. If the page is not loading, has no effect. + */ fun stopLoading() + /** + * Highlight words in the webpage that match the [query]. + */ fun find(query: String) + /** + * Move to the next word highlighted by [find]. + */ fun findNext() + /** + * Move to the previous word highlighted by [find]. + */ fun findPrevious() + /** + * Remove highlighting from all words highlighted by [find]. + */ fun clearFindMatches() + /** + * The current query that is being highlighted by [find]. + */ val findQuery: String? // Data + /** + * The current favicon of the webpage or null if there isn't one. + */ val favicon: Bitmap? + /** + * Emits changes to the [favicon]. + */ fun faviconChanges(): Observable> + /** + * The thematic color of the current webpage. + */ + @get:ColorInt val themeColor: Int + /** + * Emits changes to the [themeColor]. + */ fun themeColorChanges(): Observable + /** + * The URL of the currently displayed webpage. + */ val url: String + /** + * Emits changes to the [url]. + */ fun urlChanges(): Observable + /** + * The title of the current webpage. + */ val title: String + /** + * Emits changes to the [title]. + */ fun titleChanges(): Observable + /** + * The current SSL certificate information about the webpage. + */ val sslCertificateInfo: SslCertificateInfo? + /** + * The current state of the SSL certificate. + */ val sslState: SslState + /** + * Emits changes to [sslState]. + */ fun sslChanges(): Observable + /** + * The loading progress for the current webpage on a scale of 0-100. If the page is completely + * loaded, then the progress will be 100. + */ val loadingProgress: Int + /** + * Emits changes to [sslState]. + */ fun loadingProgress(): Observable // Lifecycle + /** + * Emits requests to download a file represented by [PendingDownload] that are triggered by the + * browser. + */ fun downloadRequests(): Observable + /** + * Emits requests to open the file chooser that are triggered by the browser. + */ fun fileChooserRequests(): Observable + /** + * Handle a resulting file to upload after selecting a file from the file chooser. + */ fun handleFileChooserResult(activityResult: ActivityResult) + /** + * Emits requests by the browser to display a custom view (i.e. full screen video) over the + * regular webpage content. + */ fun showCustomViewRequests(): Observable + /** + * Emits requests by the browser to hide the custom view it previously requested to display via + * [showCustomViewRequests]. + */ fun hideCustomViewRequests(): Observable + /** + * Notify the browser that we are manually hiding the custom view requested to be shown by + * [showCustomViewRequests]. + */ fun hideCustomView() + /** + * Emits requests by the browser to automatically open a new tab and load the URL provided by + * the [TabInitializer]. + */ fun createWindowRequests(): Observable + /** + * Emits requests by the browser to automatically close the current tab. + */ fun closeWindowRequests(): Observable + /** + * True if the tab is in the foreground, false if it is in the background. Used to prevent + * background tabs from consuming disproportionate amounts of resources when they are unused. + */ var isForeground: Boolean + /** + * Teardown the current tab and release held resources. + */ fun destroy() + /** + * Freeze the current state of the tab and return it as a [Bundle]. + */ fun freeze(): Bundle - - } diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/bundle/BundleStore.kt b/app/src/main/java/acr/browser/lightning/browser/tab/bundle/BundleStore.kt index 6594131bc..9659498a0 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/bundle/BundleStore.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/bundle/BundleStore.kt @@ -4,12 +4,18 @@ import acr.browser.lightning.browser.tab.TabModel import acr.browser.lightning.browser.tab.TabInitializer /** - * Created by anthonycr on 7/27/22. + * Used to save tab data for future restoration when the browser goes into hibernation. */ interface BundleStore { + /** + * Save the tab data for the list of [tabs]. + */ fun save(tabs: List) + /** + * Synchronously previously stored tab data. + */ fun retrieve(): List /** diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/bundle/DefaultBundleStore.kt b/app/src/main/java/acr/browser/lightning/browser/tab/bundle/DefaultBundleStore.kt index d53592479..882b3337d 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/bundle/DefaultBundleStore.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/bundle/DefaultBundleStore.kt @@ -21,7 +21,7 @@ import io.reactivex.Scheduler import javax.inject.Inject /** - * Created by anthonycr on 9/20/20. + * A bundle store that serializes each tab state to disk and supports its retrieval. */ class DefaultBundleStore @Inject constructor( private val application: Application, From 4338fbad46ff55693c41bba2f02bfb533b77fe9c Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Thu, 4 Aug 2022 11:12:49 -0400 Subject: [PATCH 137/161] Improving documentation of tab classes --- .../browser/lightning/browser/tab/TabPager.kt | 15 +++- .../lightning/browser/tab/TabViewHolder.kt | 7 +- .../lightning/browser/tab/TabViewState.kt | 7 +- .../browser/tab/TabWebChromeClient.kt | 72 +++++++++++++++---- .../lightning/browser/tab/TabWebViewClient.kt | 20 +++++- .../lightning/browser/tab/TabsRepository.kt | 3 +- .../lightning/browser/tab/UrlHandler.kt | 14 ++-- .../lightning/browser/tab/WebViewFactory.kt | 9 ++- .../browser/ui/BookmarkConfiguration.kt | 2 +- .../lightning/browser/ui/TabConfiguration.kt | 2 +- .../lightning/browser/ui/UiConfiguration.kt | 5 +- .../browser/view/CompositeTouchListener.kt | 4 +- .../view/WebViewCompositeTouchExtensions.kt | 5 +- .../browser/view/WebViewLongPressHandler.kt | 6 +- .../browser/view/WebViewScrollCoordinator.kt | 10 ++- .../browser/view/targetUrl/LongPress.kt | 11 ++- 16 files changed, 150 insertions(+), 42 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabPager.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabPager.kt index 4985ec31b..bc5705762 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabPager.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabPager.kt @@ -11,7 +11,8 @@ import acr.browser.lightning.browser.view.targetUrl.LongPress import javax.inject.Inject /** - * Created by anthonycr on 9/12/20. + * A sort of coordinator that manages the relationship between [WebViews][WebView] and the container + * the views are placed in. */ @Browser2Scope class TabPager @Inject constructor( @@ -24,6 +25,9 @@ class TabPager @Inject constructor( var longPressListener: ((id: Int, longPress: LongPress) -> Unit)? = null + /** + * Select the tab with the provided [id] to be displayed by the pager. + */ fun selectTab(id: Int) { container.removeWebViews() val webView = webViews.forId(id) @@ -39,14 +43,23 @@ class TabPager @Inject constructor( }) } + /** + * Clear the container of the [WebView] currently shown. + */ fun clearTab() { container.removeWebViews() } + /** + * Add a [WebView] to the list of views shown by this pager. + */ fun addTab(webView: WebView) { webViews.add(webView) } + /** + * Show the toolbar/search box if it is currently hidden. + */ fun showToolbar() { webViewScrollCoordinator.showToolbar() } diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabViewHolder.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabViewHolder.kt index 94bd3af9c..ba0ed1454 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabViewHolder.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabViewHolder.kt @@ -8,9 +8,12 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView /** - * Created by anthonycr on 9/13/20. + * The view holder for a tab. + * + * @param onClick Invoked when the tab is clicked. + * @param onLongClick Invoked when the tab is long pressed. + * @param onCloseClick Invoked when the tab's close button is clicked. */ - class TabViewHolder( view: View, private val onClick: (Int) -> Unit, diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabViewState.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabViewState.kt index 6c9a4359a..648d3f458 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabViewState.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabViewState.kt @@ -3,7 +3,12 @@ package acr.browser.lightning.browser.tab import android.graphics.Bitmap /** - * Created by anthonycr on 9/11/20. + * The view state for a tab. + * + * @param id The tab identifier. + * @param icon The icon for the current webpage, null if there is none. + * @param title The title of the current webpage. + * @param isSelected True if the tab is in the foreground, false if it is in the background. */ data class TabViewState( val id: Int, diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabWebChromeClient.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabWebChromeClient.kt index 382b0725f..1ec3ec838 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabWebChromeClient.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabWebChromeClient.kt @@ -34,7 +34,7 @@ import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.PublishSubject /** - * Created by anthonycr on 9/12/20. + * A [WebChromeClient] that supports the tab adaptation. */ class TabWebChromeClient( private val activity: Activity, @@ -47,19 +47,75 @@ class TabWebChromeClient( private val defaultColor = activity.color(R.color.primary_color) private val geoLocationPermissions = arrayOf(Manifest.permission.ACCESS_FINE_LOCATION) + /** + * Emits changes to the page loading progress. + */ val progressObservable: PublishSubject = PublishSubject.create() + + /** + * Emits changes to the page title. + */ val titleObservable: PublishSubject = PublishSubject.create() + + /** + * Emits changes to the page favicon. Always emits the last emitted favicon. + */ val faviconObservable: BehaviorSubject> = BehaviorSubject.create() + + /** + * Emits create window requests. + */ val createWindowObservable: PublishSubject = PublishSubject.create() + + /** + * Emits close window requests. + */ val closeWindowObservable: PublishSubject = PublishSubject.create() + + /** + * Emits changes to the thematic color of the current page. + */ val colorChangeObservable: BehaviorSubject = BehaviorSubject.createDefault(defaultColor) + + /** + * Emits requests to open the file chooser for upload. + */ val fileChooserObservable: PublishSubject = PublishSubject.create() + + /** + * Emits requests to show a custom view (i.e. full screen video). + */ val showCustomViewObservable: PublishSubject = PublishSubject.create() + + /** + * Emits requests to hide the custom view that was shown prior. + */ val hideCustomViewObservable: PublishSubject = PublishSubject.create() private var filePathCallback: ValueCallback>? = null private var customViewCallback: CustomViewCallback? = null + + /** + * Handle the [activityResult] that was returned by the file chooser. + */ + fun onResult(activityResult: ActivityResult) { + val resultCode = activityResult.resultCode + val intent = activityResult.data + val result = FileChooserParams.parseResult(resultCode, intent) + + filePathCallback?.onReceiveValue(result) + filePathCallback = null + } + + /** + * Notify the client that we have manually hidden the custom view. + */ + fun hideCustomView() { + customViewCallback?.onCustomViewHidden() + customViewCallback = null + } + override fun onCreateWindow( view: WebView, isDialog: Boolean, @@ -114,20 +170,6 @@ class TabWebChromeClient( } } - fun onResult(activityResult: ActivityResult) { - val resultCode = activityResult.resultCode - val intent = activityResult.data - val result = FileChooserParams.parseResult(resultCode, intent) - - filePathCallback?.onReceiveValue(result) - filePathCallback = null - } - - fun hideCustomView() { - customViewCallback?.onCustomViewHidden() - customViewCallback = null - } - override fun onShowFileChooser( webView: WebView, filePathCallback: ValueCallback>, diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabWebViewClient.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabWebViewClient.kt index 2803cc50f..f9fa950e1 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabWebViewClient.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabWebViewClient.kt @@ -19,7 +19,7 @@ import io.reactivex.subjects.PublishSubject import java.io.ByteArrayInputStream /** - * Created by anthonycr on 9/12/20. + * A [WebViewClient] that supports the tab adaptation. */ class TabWebViewClient( private val adBlocker: AdBlocker, @@ -29,11 +29,29 @@ class TabWebViewClient( private val proxy: Proxy ) : WebViewClient() { + /** + * Emits changes to the current URL. + */ val urlObservable: PublishSubject = PublishSubject.create() + + /** + * Emits changes to the current SSL state. + */ val sslStateObservable: PublishSubject = PublishSubject.create() + + /** + * Emits changes to the can go back state of the browser. + */ val goBackObservable: PublishSubject = PublishSubject.create() + + /** + * Emits changes to the can go forward state of the browser. + */ val goForwardObservable: PublishSubject = PublishSubject.create() + /** + * The current SSL state of the page. + */ var sslState: SslState = SslState.None private set diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt index f674d7816..1458be6fe 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt @@ -14,7 +14,8 @@ import io.reactivex.subjects.PublishSubject import javax.inject.Inject /** - * Created by anthonycr on 9/12/20. + * The repository for tabs that implements the [BrowserContract.Model] interface. Manages the state + * of the tabs list and adding new tabs to it or removing tabs from it. */ class TabsRepository @Inject constructor( private val webViewFactory: WebViewFactory, diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/UrlHandler.kt b/app/src/main/java/acr/browser/lightning/browser/tab/UrlHandler.kt index d3036c060..fb6d895d4 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/UrlHandler.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/UrlHandler.kt @@ -22,7 +22,8 @@ import java.net.URISyntaxException import javax.inject.Inject /** - * Created by anthonycr on 9/24/20. + * Handle URLs loaded by the [WebView] and determine if they should be loaded by the browser or + * another app. */ class UrlHandler @Inject constructor( private val activity: Activity, @@ -31,18 +32,15 @@ class UrlHandler @Inject constructor( @IncognitoMode private val incognitoMode: Boolean ) { + /** + * Return true if the [url] should be loaded by another app or in another way, false if the + * browser can let the [view] continue loading as it wants. + */ fun shouldOverrideLoading( view: WebView, url: String, headers: Map ): Boolean { - // TODO: handle proxy -// // Check if configured proxy is available -// if (!proxyUtils.isProxyReady(activity)) { -// // User has been notified -// return true -// } - if (incognitoMode) { // If we are in incognito, immediately load, we don't want the url to leave the app return continueLoadingUrl(view, url, headers) diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/WebViewFactory.kt b/app/src/main/java/acr/browser/lightning/browser/tab/WebViewFactory.kt index 5bff7699c..d4d199215 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/WebViewFactory.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/WebViewFactory.kt @@ -19,7 +19,8 @@ import android.webkit.WebView import javax.inject.Inject /** - * Created by anthonycr on 9/12/20. + * Constructs [WebView] instances configured for the browser based on user's preferences and create + * the headers we will send with requests. */ class WebViewFactory @Inject constructor( private val activity: Activity, @@ -28,6 +29,9 @@ class WebViewFactory @Inject constructor( @IncognitoMode private val incognitoMode: Boolean ) { + /** + * Create the request headers that notify websites of various privacy and data preferences. + */ fun createRequestHeaders(): Map { val requestHeaders = mutableMapOf() if (userPreferences.doNotTrackEnabled) { @@ -53,6 +57,9 @@ class WebViewFactory @Inject constructor( return requestHeaders } + /** + * Construct a [WebView] based on the user's preferences. + */ fun createWebView(): WebView = WebView(activity).apply { id = View.generateViewId() tag = CompositeTouchListener().also(::setOnTouchListener) diff --git a/app/src/main/java/acr/browser/lightning/browser/ui/BookmarkConfiguration.kt b/app/src/main/java/acr/browser/lightning/browser/ui/BookmarkConfiguration.kt index 5d71f76ea..b3e0e833f 100644 --- a/app/src/main/java/acr/browser/lightning/browser/ui/BookmarkConfiguration.kt +++ b/app/src/main/java/acr/browser/lightning/browser/ui/BookmarkConfiguration.kt @@ -1,7 +1,7 @@ package acr.browser.lightning.browser.ui /** - * Created by anthonycr on 11/18/20. + * Supported bookmark drawer orientations. */ enum class BookmarkConfiguration { LEFT, diff --git a/app/src/main/java/acr/browser/lightning/browser/ui/TabConfiguration.kt b/app/src/main/java/acr/browser/lightning/browser/ui/TabConfiguration.kt index 18a891a97..eec5e3a88 100644 --- a/app/src/main/java/acr/browser/lightning/browser/ui/TabConfiguration.kt +++ b/app/src/main/java/acr/browser/lightning/browser/ui/TabConfiguration.kt @@ -1,7 +1,7 @@ package acr.browser.lightning.browser.ui /** - * Created by anthonycr on 11/18/20. + * Supported tab display configurations. */ enum class TabConfiguration { DESKTOP, diff --git a/app/src/main/java/acr/browser/lightning/browser/ui/UiConfiguration.kt b/app/src/main/java/acr/browser/lightning/browser/ui/UiConfiguration.kt index f716edc6d..569d0778c 100644 --- a/app/src/main/java/acr/browser/lightning/browser/ui/UiConfiguration.kt +++ b/app/src/main/java/acr/browser/lightning/browser/ui/UiConfiguration.kt @@ -1,7 +1,10 @@ package acr.browser.lightning.browser.ui /** - * Created by anthonycr on 11/18/20. + * The configuration of the adjustable UI elements. + * + * @param tabConfiguration The configuration of the tabs. + * @param bookmarkConfiguration The configuration of the bookmarks. */ data class UiConfiguration( val tabConfiguration: TabConfiguration, diff --git a/app/src/main/java/acr/browser/lightning/browser/view/CompositeTouchListener.kt b/app/src/main/java/acr/browser/lightning/browser/view/CompositeTouchListener.kt index 93b8302d4..22ec67292 100644 --- a/app/src/main/java/acr/browser/lightning/browser/view/CompositeTouchListener.kt +++ b/app/src/main/java/acr/browser/lightning/browser/view/CompositeTouchListener.kt @@ -5,7 +5,9 @@ import android.view.MotionEvent import android.view.View /** - * Created by anthonycr on 12/23/20. + * A composite [View.OnTouchListener] that delegates touches to multiple listeners. + * + * @param delegates The actual listeners we are delegating to. */ class CompositeTouchListener( val delegates: MutableMap = mutableMapOf() diff --git a/app/src/main/java/acr/browser/lightning/browser/view/WebViewCompositeTouchExtensions.kt b/app/src/main/java/acr/browser/lightning/browser/view/WebViewCompositeTouchExtensions.kt index bd899cc05..8d4232344 100644 --- a/app/src/main/java/acr/browser/lightning/browser/view/WebViewCompositeTouchExtensions.kt +++ b/app/src/main/java/acr/browser/lightning/browser/view/WebViewCompositeTouchExtensions.kt @@ -4,10 +4,9 @@ import android.view.View import android.webkit.WebView /** - * Created by anthonycr on 12/23/20. + * A helper for adding a [View.OnTouchListener] to the [CompositeTouchListener] of a [WebView] + * marked by the unique [key]. */ - - fun WebView.setCompositeTouchListener(key: String, onTouchListener: View.OnTouchListener?) { val composite = tag as CompositeTouchListener composite.delegates[key] = onTouchListener diff --git a/app/src/main/java/acr/browser/lightning/browser/view/WebViewLongPressHandler.kt b/app/src/main/java/acr/browser/lightning/browser/view/WebViewLongPressHandler.kt index 416a351c6..7bdddf33b 100644 --- a/app/src/main/java/acr/browser/lightning/browser/view/WebViewLongPressHandler.kt +++ b/app/src/main/java/acr/browser/lightning/browser/view/WebViewLongPressHandler.kt @@ -14,10 +14,14 @@ import io.reactivex.functions.Cancellable import javax.inject.Inject /** - * Created by anthonycr on 11/21/20. + * Handles long presses on a [WebView] and converts them into [LongPress] events. */ class WebViewLongPressHandler @Inject constructor(private val activity: Activity) { + /** + * Configure the provided [webView] for listening to long press events and invoke [onLongClick] + * whenever a long press is detected. + */ fun configure( webView: WebView, onLongClick: (LongPress) -> Unit diff --git a/app/src/main/java/acr/browser/lightning/browser/view/WebViewScrollCoordinator.kt b/app/src/main/java/acr/browser/lightning/browser/view/WebViewScrollCoordinator.kt index fa93e6f41..4fbfb7264 100644 --- a/app/src/main/java/acr/browser/lightning/browser/view/WebViewScrollCoordinator.kt +++ b/app/src/main/java/acr/browser/lightning/browser/view/WebViewScrollCoordinator.kt @@ -19,7 +19,7 @@ import android.widget.LinearLayout import javax.inject.Inject /** - * TODO + * Coordinates scrolling behavior between a [WebView] and a toolbar/search box. */ class WebViewScrollCoordinator @Inject constructor( activity: Activity, @@ -39,7 +39,7 @@ class WebViewScrollCoordinator @Inject constructor( private var currentToggleListener: ToggleListener? = null /** - * TODO + * Configure the [webView] to match its scrolling behavior with showing an hiding the toolbar. */ fun configure(webView: WebView) { webView.setOnFocusChangeListener { v, hasFocus -> @@ -72,6 +72,10 @@ class WebViewScrollCoordinator @Inject constructor( } } + /** + * Show the toolbar if it is hidden via scrolling. Has no effect if the toolbar is already + * visible. + */ fun showToolbar() { currentToggleListener?.showToolbar() } @@ -130,7 +134,7 @@ class WebViewScrollCoordinator @Inject constructor( currentToggleListener = toggleListener } - interface ToggleListener { + private interface ToggleListener { fun hideToolbar() fun showToolbar() diff --git a/app/src/main/java/acr/browser/lightning/browser/view/targetUrl/LongPress.kt b/app/src/main/java/acr/browser/lightning/browser/view/targetUrl/LongPress.kt index 0b154ef70..c9a7cc660 100644 --- a/app/src/main/java/acr/browser/lightning/browser/view/targetUrl/LongPress.kt +++ b/app/src/main/java/acr/browser/lightning/browser/view/targetUrl/LongPress.kt @@ -1,13 +1,22 @@ package acr.browser.lightning.browser.view.targetUrl /** - * Created by anthonycr on 12/23/20. + * Represents a long press event by the user on a webpage. + * + * @param targetUrl The URL that the browser thinks the user is long pressing on (e.g. when the user + * presses on an image button, this would be the URL that clicking on the button navigates to). + * @param hitUrl The URL of the element that user user is directly long pressing on (e.g. when the + * user presses on an image button, this would be the image URL). + * @param hitCategory The type of URL that is being pressed on. */ data class LongPress( val targetUrl: String?, val hitUrl: String?, val hitCategory: Category = Category.UNKNOWN ) { + /** + * The category of the long press. + */ enum class Category { IMAGE, LINK, From fbbf90b1fd3a91a6a45de08e473b2baefe938a27 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Thu, 4 Aug 2022 11:21:00 -0400 Subject: [PATCH 138/161] Fixing focus issue with search box --- .../main/java/acr/browser/lightning/browser/BrowserActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserActivity.kt index 5713a71f5..1cb84967d 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserActivity.kt @@ -265,8 +265,8 @@ abstract class BrowserActivity : ThemableBrowserActivity() { binding.search.setOnKeyListener(searchListener) binding.search.addTextChangedListener(StyleRemovingTextWatcher()) binding.search.setOnFocusChangeListener { _, hasFocus -> - binding.search.selectAll() presenter.onSearchFocusChanged(hasFocus) + binding.search.selectAll() } binding.findPrevious.setOnClickListener { presenter.onFindPrevious() } From 30b4a89a1e1126e727575a75d3916dc251151c9a Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Thu, 4 Aug 2022 11:21:11 -0400 Subject: [PATCH 139/161] Cleaning up code --- .../lightning/browser/BrowserPresenter.kt | 18 +++++++++--------- .../browser/image/FaviconImageLoader.kt | 2 -- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt index ffb166c95..a415ee1b3 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt @@ -901,7 +901,7 @@ class BrowserPresenter @Inject constructor( ).flatMap { bookmarkRepository.bookmarksAndFolders(folder = currentFolder) } .subscribeOn(databaseScheduler) .observeOn(mainScheduler) - .subscribe { list -> + .subscribeBy { list -> this.view?.updateState(viewState.copy(bookmarks = list)) } } @@ -930,7 +930,7 @@ class BrowserPresenter @Inject constructor( ).andThen(bookmarkRepository.bookmarksAndFolders(folder = currentFolder)) .subscribeOn(databaseScheduler) .observeOn(mainScheduler) - .subscribe { list -> + .subscribeBy { list -> this.view?.updateState(viewState.copy(bookmarks = list)) if (currentTab?.url?.isBookmarkUrl() == true) { reload() @@ -1119,7 +1119,7 @@ class BrowserPresenter @Inject constructor( .bookmarksAndFolders(folder = Bookmark.Folder.Root) .subscribeOn(databaseScheduler) .observeOn(mainScheduler) - .subscribe { list -> + .subscribeBy { list -> view?.updateState(viewState.copy(bookmarks = list, isRootFolder = true)) } } @@ -1168,12 +1168,12 @@ class BrowserPresenter @Inject constructor( } } - return - } - when (longPress.hitCategory) { - LongPress.Category.IMAGE -> view?.showImageLongPressDialog(longPress) - LongPress.Category.LINK -> view?.showLinkLongPressDialog(longPress) - LongPress.Category.UNKNOWN -> Unit // Do nothing + } else { + when (longPress.hitCategory) { + LongPress.Category.IMAGE -> view?.showImageLongPressDialog(longPress) + LongPress.Category.LINK -> view?.showLinkLongPressDialog(longPress) + LongPress.Category.UNKNOWN -> Unit // Do nothing + } } } diff --git a/app/src/main/java/acr/browser/lightning/browser/image/FaviconImageLoader.kt b/app/src/main/java/acr/browser/lightning/browser/image/FaviconImageLoader.kt index 1fe025ef5..5c22f49f4 100644 --- a/app/src/main/java/acr/browser/lightning/browser/image/FaviconImageLoader.kt +++ b/app/src/main/java/acr/browser/lightning/browser/image/FaviconImageLoader.kt @@ -69,7 +69,5 @@ class FaviconImageLoader @Inject constructor( fun cleanup() { compositeDisposable.clear() } - - } } From b70882b89bdb284a0e0bd7959f18440f7c75281b Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Fri, 5 Aug 2022 10:13:41 -0400 Subject: [PATCH 140/161] Animate back button transition in bookmark tab --- .../browser/lightning/browser/BrowserActivity.kt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserActivity.kt index 1cb84967d..6a9ff5ba9 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserActivity.kt @@ -3,6 +3,7 @@ package acr.browser.lightning.browser import acr.browser.lightning.AppTheme import acr.browser.lightning.R import acr.browser.lightning.ThemableBrowserActivity +import acr.browser.lightning.animation.AnimationUtils import acr.browser.lightning.browser.bookmark.BookmarkRecyclerViewAdapter import acr.browser.lightning.browser.color.ColorAnimator import acr.browser.lightning.browser.image.ImageLoader @@ -366,12 +367,15 @@ abstract class BrowserActivity : ThemableBrowserActivity() { viewState.isBookmarked?.let { binding.actionAddBookmark.isSelected = it } viewState.isBookmarkEnabled?.let { binding.actionAddBookmark.isEnabled = it } viewState.isRootFolder?.let { - binding.bookmarkBackButton.setImageResource( - if (it) { - R.drawable.ic_action_star - } else { - R.drawable.ic_action_back - } + binding.bookmarkBackButton.startAnimation( + AnimationUtils.createRotationTransitionAnimation( + binding.bookmarkBackButton, + if (it) { + R.drawable.ic_action_star + } else { + R.drawable.ic_action_back + } + ) ) } viewState.findInPage?.let { From c20796c0175e5d6c31fb56f5841f44e016f47796 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Fri, 5 Aug 2022 14:13:22 -0400 Subject: [PATCH 141/161] Executing exit cleanup when the browser closes --- .../browser/lightning/browser/BrowserNavigator.kt | 5 ++++- .../browser/cleanup/BasicIncognitoExitCleanup.kt | 4 +--- .../browser/cleanup/DelegatingExitCleanup.kt | 15 +++++++-------- .../cleanup/EnhancedIncognitoExitCleanup.kt | 10 +++++----- .../lightning/browser/cleanup/ExitCleanup.kt | 7 ++----- .../browser/cleanup/NormalExitCleanup.kt | 14 +++++++------- .../lightning/browser/di/AppBindsModule.kt | 3 --- .../lightning/browser/di/Browser2BindsModule.kt | 5 +++++ .../acr/browser/lightning/utils/WebUtils.java | 9 +++++---- 9 files changed, 36 insertions(+), 36 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserNavigator.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserNavigator.kt index c6a5e9b7c..35ea07500 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserNavigator.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserNavigator.kt @@ -2,6 +2,7 @@ package acr.browser.lightning.browser import acr.browser.lightning.IncognitoBrowserActivity import acr.browser.lightning.R +import acr.browser.lightning.browser.cleanup.ExitCleanup import acr.browser.lightning.browser.download.DownloadPermissionsHelper import acr.browser.lightning.browser.download.PendingDownload import acr.browser.lightning.extensions.copyToClipboard @@ -24,7 +25,8 @@ class BrowserNavigator @Inject constructor( private val activity: Activity, private val clipboardManager: ClipboardManager, private val logger: Logger, - private val downloadPermissionsHelper: DownloadPermissionsHelper + private val downloadPermissionsHelper: DownloadPermissionsHelper, + private val exitCleanup: ExitCleanup ) : BrowserContract.Navigator { override fun openSettings() { @@ -45,6 +47,7 @@ class BrowserNavigator @Inject constructor( } override fun closeBrowser() { + exitCleanup.cleanUp() activity.finish() } diff --git a/app/src/main/java/acr/browser/lightning/browser/cleanup/BasicIncognitoExitCleanup.kt b/app/src/main/java/acr/browser/lightning/browser/cleanup/BasicIncognitoExitCleanup.kt index ce521e9ca..0c32679fb 100644 --- a/app/src/main/java/acr/browser/lightning/browser/cleanup/BasicIncognitoExitCleanup.kt +++ b/app/src/main/java/acr/browser/lightning/browser/cleanup/BasicIncognitoExitCleanup.kt @@ -1,8 +1,6 @@ package acr.browser.lightning.browser.cleanup -import acr.browser.lightning.browser.BrowserActivity import acr.browser.lightning.utils.WebUtils -import android.webkit.WebView import javax.inject.Inject /** @@ -10,7 +8,7 @@ import javax.inject.Inject * significantly less secure than on API > 28 since we can separate WebView data from */ class BasicIncognitoExitCleanup @Inject constructor() : ExitCleanup { - override fun cleanUp(webView: WebView?, context: BrowserActivity) { + override fun cleanUp() { // We want to make sure incognito mode is secure as possible without also breaking existing // browser instances. WebUtils.clearWebStorage() diff --git a/app/src/main/java/acr/browser/lightning/browser/cleanup/DelegatingExitCleanup.kt b/app/src/main/java/acr/browser/lightning/browser/cleanup/DelegatingExitCleanup.kt index 4d2fbd6b9..24b962112 100644 --- a/app/src/main/java/acr/browser/lightning/browser/cleanup/DelegatingExitCleanup.kt +++ b/app/src/main/java/acr/browser/lightning/browser/cleanup/DelegatingExitCleanup.kt @@ -4,6 +4,7 @@ import acr.browser.lightning.Capabilities import acr.browser.lightning.browser.BrowserActivity import acr.browser.lightning.DefaultBrowserActivity import acr.browser.lightning.isSupported +import android.app.Activity import android.webkit.WebView import javax.inject.Inject @@ -14,16 +15,14 @@ import javax.inject.Inject class DelegatingExitCleanup @Inject constructor( private val basicIncognitoExitCleanup: BasicIncognitoExitCleanup, private val enhancedIncognitoExitCleanup: EnhancedIncognitoExitCleanup, - private val normalExitCleanup: NormalExitCleanup + private val normalExitCleanup: NormalExitCleanup, + private val activity: Activity ) : ExitCleanup { - override fun cleanUp(webView: WebView?, context: BrowserActivity) { + override fun cleanUp() { when { - context is DefaultBrowserActivity -> normalExitCleanup.cleanUp(webView, context) - Capabilities.FULL_INCOGNITO.isSupported -> enhancedIncognitoExitCleanup.cleanUp( - webView, - context - ) - else -> basicIncognitoExitCleanup.cleanUp(webView, context) + activity is DefaultBrowserActivity -> normalExitCleanup.cleanUp() + Capabilities.FULL_INCOGNITO.isSupported -> enhancedIncognitoExitCleanup.cleanUp() + else -> basicIncognitoExitCleanup.cleanUp() } } } diff --git a/app/src/main/java/acr/browser/lightning/browser/cleanup/EnhancedIncognitoExitCleanup.kt b/app/src/main/java/acr/browser/lightning/browser/cleanup/EnhancedIncognitoExitCleanup.kt index ccea35e7a..75e3a3c6d 100644 --- a/app/src/main/java/acr/browser/lightning/browser/cleanup/EnhancedIncognitoExitCleanup.kt +++ b/app/src/main/java/acr/browser/lightning/browser/cleanup/EnhancedIncognitoExitCleanup.kt @@ -1,9 +1,8 @@ package acr.browser.lightning.browser.cleanup -import acr.browser.lightning.browser.BrowserActivity import acr.browser.lightning.log.Logger import acr.browser.lightning.utils.WebUtils -import android.webkit.WebView +import android.app.Activity import javax.inject.Inject /** @@ -11,10 +10,11 @@ import javax.inject.Inject * clears cookies and all web data, which can be done without affecting */ class EnhancedIncognitoExitCleanup @Inject constructor( - private val logger: Logger + private val logger: Logger, + private val activity: Activity ) : ExitCleanup { - override fun cleanUp(webView: WebView?, context: BrowserActivity) { - WebUtils.clearCache(webView) + override fun cleanUp() { + WebUtils.clearCache(activity) logger.log(TAG, "Cache Cleared") WebUtils.clearCookies() logger.log(TAG, "Cookies Cleared") diff --git a/app/src/main/java/acr/browser/lightning/browser/cleanup/ExitCleanup.kt b/app/src/main/java/acr/browser/lightning/browser/cleanup/ExitCleanup.kt index b15170107..4a0d68925 100644 --- a/app/src/main/java/acr/browser/lightning/browser/cleanup/ExitCleanup.kt +++ b/app/src/main/java/acr/browser/lightning/browser/cleanup/ExitCleanup.kt @@ -1,8 +1,5 @@ package acr.browser.lightning.browser.cleanup -import acr.browser.lightning.browser.BrowserActivity -import android.webkit.WebView - /** * A command that runs as the browser instance is shutting down to clean up anything that needs to * be cleaned up. For instance, if the user has chosen to clear cache on exit or if incognito mode @@ -11,8 +8,8 @@ import android.webkit.WebView interface ExitCleanup { /** - * Clean up the instance of the browser with the provided [webView] and [context]. + * Clean up the instance of the browser with the provided. */ - fun cleanUp(webView: WebView?, context: BrowserActivity) + fun cleanUp() } diff --git a/app/src/main/java/acr/browser/lightning/browser/cleanup/NormalExitCleanup.kt b/app/src/main/java/acr/browser/lightning/browser/cleanup/NormalExitCleanup.kt index 644727e8e..6b0907cfd 100644 --- a/app/src/main/java/acr/browser/lightning/browser/cleanup/NormalExitCleanup.kt +++ b/app/src/main/java/acr/browser/lightning/browser/cleanup/NormalExitCleanup.kt @@ -1,12 +1,11 @@ package acr.browser.lightning.browser.cleanup -import acr.browser.lightning.browser.BrowserActivity -import acr.browser.lightning.database.history.HistoryDatabase import acr.browser.lightning.browser.di.DatabaseScheduler +import acr.browser.lightning.database.history.HistoryDatabase import acr.browser.lightning.log.Logger import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.utils.WebUtils -import android.webkit.WebView +import android.app.Activity import io.reactivex.Scheduler import javax.inject.Inject @@ -17,15 +16,16 @@ class NormalExitCleanup @Inject constructor( private val userPreferences: UserPreferences, private val logger: Logger, private val historyDatabase: HistoryDatabase, - @DatabaseScheduler private val databaseScheduler: Scheduler + @DatabaseScheduler private val databaseScheduler: Scheduler, + private val activity: Activity ) : ExitCleanup { - override fun cleanUp(webView: WebView?, context: BrowserActivity) { + override fun cleanUp() { if (userPreferences.clearCacheExit) { - WebUtils.clearCache(webView) + WebUtils.clearCache(activity) logger.log(TAG, "Cache Cleared") } if (userPreferences.clearHistoryExitEnabled) { - WebUtils.clearHistory(context, historyDatabase, databaseScheduler) + WebUtils.clearHistory(activity, historyDatabase, databaseScheduler) logger.log(TAG, "History Cleared") } if (userPreferences.clearCookiesExitEnabled) { diff --git a/app/src/main/java/acr/browser/lightning/browser/di/AppBindsModule.kt b/app/src/main/java/acr/browser/lightning/browser/di/AppBindsModule.kt index 2f0c211e2..fdd305914 100644 --- a/app/src/main/java/acr/browser/lightning/browser/di/AppBindsModule.kt +++ b/app/src/main/java/acr/browser/lightning/browser/di/AppBindsModule.kt @@ -31,9 +31,6 @@ import dagger.Module @Module interface AppBindsModule { - @Binds - fun bindsExitCleanup(delegatingExitCleanup: DelegatingExitCleanup): ExitCleanup - @Binds fun bindsBookmarkModel(bookmarkDatabase: BookmarkDatabase): BookmarkRepository diff --git a/app/src/main/java/acr/browser/lightning/browser/di/Browser2BindsModule.kt b/app/src/main/java/acr/browser/lightning/browser/di/Browser2BindsModule.kt index ae02e8e93..dae224c68 100644 --- a/app/src/main/java/acr/browser/lightning/browser/di/Browser2BindsModule.kt +++ b/app/src/main/java/acr/browser/lightning/browser/di/Browser2BindsModule.kt @@ -2,6 +2,8 @@ package acr.browser.lightning.browser.di import acr.browser.lightning.browser.BrowserContract import acr.browser.lightning.browser.BrowserNavigator +import acr.browser.lightning.browser.cleanup.DelegatingExitCleanup +import acr.browser.lightning.browser.cleanup.ExitCleanup import acr.browser.lightning.browser.image.FaviconImageLoader import acr.browser.lightning.browser.image.ImageLoader import acr.browser.lightning.browser.proxy.Proxy @@ -27,4 +29,7 @@ interface Browser2BindsModule { @Binds fun bindsProxy(proxyAdapter: ProxyAdapter): Proxy + + @Binds + fun bindsExitCleanup(delegatingExitCleanup: DelegatingExitCleanup): ExitCleanup } diff --git a/app/src/main/java/acr/browser/lightning/utils/WebUtils.java b/app/src/main/java/acr/browser/lightning/utils/WebUtils.java index 2659675c1..1205b4c21 100644 --- a/app/src/main/java/acr/browser/lightning/utils/WebUtils.java +++ b/app/src/main/java/acr/browser/lightning/utils/WebUtils.java @@ -1,5 +1,6 @@ package acr.browser.lightning.utils; +import android.app.Activity; import android.content.Context; import android.webkit.CookieManager; import android.webkit.WebStorage; @@ -8,7 +9,6 @@ import acr.browser.lightning.database.history.HistoryRepository; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import io.reactivex.Scheduler; /** @@ -38,9 +38,10 @@ public static void clearHistory(@NonNull Context context, Utils.trimCache(context); } - public static void clearCache(@Nullable WebView view) { - if (view == null) return; - view.clearCache(true); + public static void clearCache(@NonNull Activity activity) { + final WebView webView = new WebView(activity); + webView.clearCache(true); + webView.destroy(); } } From 194e8333ae39483b45281abcf0ed4d6ff880b121 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Fri, 5 Aug 2022 17:10:24 -0400 Subject: [PATCH 142/161] Fixing formatting --- .../java/acr/browser/lightning/dialog/BrowserDialog.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/dialog/BrowserDialog.kt b/app/src/main/java/acr/browser/lightning/dialog/BrowserDialog.kt index 608a1b07f..581c44c87 100644 --- a/app/src/main/java/acr/browser/lightning/dialog/BrowserDialog.kt +++ b/app/src/main/java/acr/browser/lightning/dialog/BrowserDialog.kt @@ -106,7 +106,10 @@ object BrowserDialog { val itemList = items.filter(DialogItem::isConditionMet) - val adapter = RecyclerViewStringAdapter(itemList, convertToString = { activity.getString(this.title) }) + val adapter = RecyclerViewStringAdapter( + listItems = itemList, + convertToString = { activity.getString(this.title) } + ) if (title?.isNotEmpty() == true) { titleView.text = title @@ -181,8 +184,7 @@ object BrowserDialog { AlertDialog.Builder(activity) .setTitle(title) .setView(dialogView) - .setPositiveButton(action - ) { _, _ -> textInputListener(editText.text.toString()) } + .setPositiveButton(action) { _, _ -> textInputListener(editText.text.toString()) } .resizeAndShow() } From 332fbd91df1d68ce6106982530f87f576fbe41b2 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Fri, 5 Aug 2022 17:10:32 -0400 Subject: [PATCH 143/161] Adding missing documentation --- .../main/java/acr/browser/lightning/favicon/FaviconModel.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/java/acr/browser/lightning/favicon/FaviconModel.kt b/app/src/main/java/acr/browser/lightning/favicon/FaviconModel.kt index b65e00421..2b166ff0c 100644 --- a/app/src/main/java/acr/browser/lightning/favicon/FaviconModel.kt +++ b/app/src/main/java/acr/browser/lightning/favicon/FaviconModel.kt @@ -51,6 +51,9 @@ class FaviconModel @Inject constructor( } } + /** + * Create the default favicon for a bookmark with the provided [title]. + */ fun createDefaultBitmapForTitle(title: String?): Bitmap { val firstTitleCharacter = title?.takeIf(String::isNotBlank)?.let { it[0] } ?: '?' From 58c441717fee528294265de9e9434e23fd9477e9 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Fri, 5 Aug 2022 17:14:58 -0400 Subject: [PATCH 144/161] Reducing visibility on unused functions Keeping functions since they are historically useful for context --- .../browser/lightning/database/history/HistoryDatabase.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/database/history/HistoryDatabase.kt b/app/src/main/java/acr/browser/lightning/database/history/HistoryDatabase.kt index a15572694..c0c336645 100644 --- a/app/src/main/java/acr/browser/lightning/database/history/HistoryDatabase.kt +++ b/app/src/main/java/acr/browser/lightning/database/history/HistoryDatabase.kt @@ -123,7 +123,7 @@ class HistoryDatabase @Inject constructor( } @WorkerThread - fun getHistoryEntry(url: String): String? = + private fun getHistoryEntry(url: String): String? = database.query( TABLE_HISTORY, arrayOf(KEY_ID, KEY_URL, KEY_TITLE), @@ -136,7 +136,7 @@ class HistoryDatabase @Inject constructor( ).firstOrNullMap { it.getString(0) } - fun getAllHistoryEntries(): List { + private fun getAllHistoryEntries(): List { return database.query( TABLE_HISTORY, null, @@ -148,7 +148,8 @@ class HistoryDatabase @Inject constructor( ).useMap { it.bindToHistoryEntry() } } - fun getHistoryEntriesCount(): Long = DatabaseUtils.queryNumEntries(database, TABLE_HISTORY) + private fun getHistoryEntriesCount(): Long = + DatabaseUtils.queryNumEntries(database, TABLE_HISTORY) private fun HistoryEntry.toContentValues() = ContentValues().apply { put(KEY_URL, url) From c5202c04e2157103352203a0f9181a4ba33002d3 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sun, 7 Aug 2022 14:08:16 -0400 Subject: [PATCH 145/161] Fixing problematic initialization sequence that mutated the tabs list from multiple places --- .../acr/browser/lightning/browser/BrowserContract.kt | 2 +- .../acr/browser/lightning/browser/BrowserPresenter.kt | 11 +++++------ .../browser/lightning/browser/tab/TabsRepository.kt | 5 ++--- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserContract.kt index 150ab2afe..716a9e6e1 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserContract.kt @@ -200,7 +200,7 @@ interface BrowserContract { /** * Initialize all tabs that were previously frozen when the browser was last open. */ - fun initializeTabs(): Maybe> + fun initializeTabs(): Maybe> /** * Notifies the model that all tabs need to be frozen before the browser shuts down. diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt index a415ee1b3..b04a29fd1 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt @@ -56,6 +56,8 @@ import acr.browser.lightning.utils.isHistoryUrl import acr.browser.lightning.utils.isSpecialUrl import acr.browser.lightning.utils.smartUrlFilter import acr.browser.lightning.utils.value +import io.reactivex.Flowable +import io.reactivex.Observable import javax.inject.Inject import kotlin.system.exitProcess @@ -151,13 +153,10 @@ class BrowserPresenter @Inject constructor( compositeDisposable += model.initializeTabs() .observeOn(mainScheduler) - .concatWith( - Maybe.fromCallable { initialUrl } - .flatMapSingleElement { model.createTab(UrlInitializer(it)) } - .map(::listOf) - ) + .concatWith(Maybe.fromCallable { initialUrl }.map { listOf(UrlInitializer(it)) }) + .flatMap { Flowable.fromIterable(it) } + .flatMapSingle(model::createTab) .toList() - .map(MutableList>::flatten) .filter(List::isNotEmpty) .switchIfEmpty(model.createTab(homePageInitializer).map(::listOf)) .subscribe { list -> diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt index 1458be6fe..7f446d52d 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt @@ -81,14 +81,13 @@ class TabsRepository @Inject constructor( override fun tabsListChanges(): Observable> = tabsListObservable.hide() - override fun initializeTabs(): Maybe> = + override fun initializeTabs(): Maybe> = Single.fromCallable(bundleStore::retrieve) .flatMapObservable { Observable.fromIterable(it) } .subscribeOn(diskScheduler) .observeOn(mainScheduler) - .flatMapSingle(::createTab) .toList() - .filter(MutableList::isNotEmpty) + .filter(List::isNotEmpty) override fun freeze() { if (userPreferences.restoreLostTabsEnabled) { From 81e99cb88981c66c27b48f3125b28c1ae85f71e5 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Mon, 8 Aug 2022 10:36:20 -0400 Subject: [PATCH 146/161] Revert "Fixing problematic initialization sequence that mutated the tabs list from multiple places" This reverts commit c5202c04e2157103352203a0f9181a4ba33002d3. --- .../acr/browser/lightning/browser/BrowserContract.kt | 2 +- .../acr/browser/lightning/browser/BrowserPresenter.kt | 11 ++++++----- .../browser/lightning/browser/tab/TabsRepository.kt | 5 +++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserContract.kt index 716a9e6e1..150ab2afe 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserContract.kt @@ -200,7 +200,7 @@ interface BrowserContract { /** * Initialize all tabs that were previously frozen when the browser was last open. */ - fun initializeTabs(): Maybe> + fun initializeTabs(): Maybe> /** * Notifies the model that all tabs need to be frozen before the browser shuts down. diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt index b04a29fd1..a415ee1b3 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt @@ -56,8 +56,6 @@ import acr.browser.lightning.utils.isHistoryUrl import acr.browser.lightning.utils.isSpecialUrl import acr.browser.lightning.utils.smartUrlFilter import acr.browser.lightning.utils.value -import io.reactivex.Flowable -import io.reactivex.Observable import javax.inject.Inject import kotlin.system.exitProcess @@ -153,10 +151,13 @@ class BrowserPresenter @Inject constructor( compositeDisposable += model.initializeTabs() .observeOn(mainScheduler) - .concatWith(Maybe.fromCallable { initialUrl }.map { listOf(UrlInitializer(it)) }) - .flatMap { Flowable.fromIterable(it) } - .flatMapSingle(model::createTab) + .concatWith( + Maybe.fromCallable { initialUrl } + .flatMapSingleElement { model.createTab(UrlInitializer(it)) } + .map(::listOf) + ) .toList() + .map(MutableList>::flatten) .filter(List::isNotEmpty) .switchIfEmpty(model.createTab(homePageInitializer).map(::listOf)) .subscribe { list -> diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt index 7f446d52d..1458be6fe 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt @@ -81,13 +81,14 @@ class TabsRepository @Inject constructor( override fun tabsListChanges(): Observable> = tabsListObservable.hide() - override fun initializeTabs(): Maybe> = + override fun initializeTabs(): Maybe> = Single.fromCallable(bundleStore::retrieve) .flatMapObservable { Observable.fromIterable(it) } .subscribeOn(diskScheduler) .observeOn(mainScheduler) + .flatMapSingle(::createTab) .toList() - .filter(List::isNotEmpty) + .filter(MutableList::isNotEmpty) override fun freeze() { if (userPreferences.restoreLostTabsEnabled) { From 1aecff66bdd81741ec4ab1ea28d703ae6a858661 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Mon, 8 Aug 2022 11:07:58 -0400 Subject: [PATCH 147/161] Internalize the initialization of the tabs to the repository to handle the initial URL correctly --- .../lightning/browser/BrowserContract.kt | 3 +- .../lightning/browser/BrowserPresenter.kt | 58 ++++++++----------- .../lightning/browser/tab/TabInitializer.kt | 20 ++++++- .../lightning/browser/tab/TabsRepository.kt | 13 ++++- 4 files changed, 56 insertions(+), 38 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserContract.kt index 150ab2afe..532ec0bf2 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserContract.kt @@ -198,7 +198,8 @@ interface BrowserContract { fun selectTab(id: Int): TabModel /** - * Initialize all tabs that were previously frozen when the browser was last open. + * Initialize all tabs that were previously frozen when the browser was last open, and + * initialize any tabs that should be opened from the initial browser action. */ fun initializeTabs(): Maybe> diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt index a415ee1b3..3145cda6e 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt @@ -1,25 +1,18 @@ package acr.browser.lightning.browser +import acr.browser.lightning.adblock.allowlist.AllowListModel import acr.browser.lightning.browser.data.CookieAdministrator import acr.browser.lightning.browser.di.Browser2Scope +import acr.browser.lightning.browser.di.DatabaseScheduler +import acr.browser.lightning.browser.di.DiskScheduler import acr.browser.lightning.browser.di.IncognitoMode -import acr.browser.lightning.browser.di.InitialUrl +import acr.browser.lightning.browser.di.MainScheduler import acr.browser.lightning.browser.download.PendingDownload import acr.browser.lightning.browser.history.HistoryRecord import acr.browser.lightning.browser.keys.KeyCombo import acr.browser.lightning.browser.menu.MenuSelection import acr.browser.lightning.browser.notification.TabCountNotifier -import acr.browser.lightning.browser.ui.TabConfiguration -import acr.browser.lightning.browser.ui.UiConfiguration -import acr.browser.lightning.adblock.allowlist.AllowListModel import acr.browser.lightning.browser.search.SearchBoxModel -import acr.browser.lightning.database.bookmark.BookmarkRepository -import acr.browser.lightning.database.downloads.DownloadEntry -import acr.browser.lightning.database.downloads.DownloadsRepository -import acr.browser.lightning.database.history.HistoryRepository -import acr.browser.lightning.browser.di.DatabaseScheduler -import acr.browser.lightning.browser.di.DiskScheduler -import acr.browser.lightning.browser.di.MainScheduler import acr.browser.lightning.browser.tab.DownloadPageInitializer import acr.browser.lightning.browser.tab.HistoryPageInitializer import acr.browser.lightning.browser.tab.HomePageInitializer @@ -28,26 +21,22 @@ import acr.browser.lightning.browser.tab.TabInitializer import acr.browser.lightning.browser.tab.TabModel import acr.browser.lightning.browser.tab.TabViewState import acr.browser.lightning.browser.tab.UrlInitializer -import acr.browser.lightning.html.bookmark.BookmarkPageFactory -import acr.browser.lightning.html.history.HistoryPageFactory -import acr.browser.lightning.search.SearchEngineProvider -import acr.browser.lightning.ssl.SslState -import androidx.activity.result.ActivityResult -import androidx.core.net.toUri -import io.reactivex.Maybe -import io.reactivex.Scheduler -import io.reactivex.Single -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.Observables -import io.reactivex.rxkotlin.plusAssign -import io.reactivex.rxkotlin.subscribeBy -import io.reactivex.rxkotlin.toObservable +import acr.browser.lightning.browser.ui.TabConfiguration +import acr.browser.lightning.browser.ui.UiConfiguration import acr.browser.lightning.browser.view.targetUrl.LongPress import acr.browser.lightning.database.Bookmark import acr.browser.lightning.database.HistoryEntry import acr.browser.lightning.database.SearchSuggestion import acr.browser.lightning.database.WebPage import acr.browser.lightning.database.asFolder +import acr.browser.lightning.database.bookmark.BookmarkRepository +import acr.browser.lightning.database.downloads.DownloadEntry +import acr.browser.lightning.database.downloads.DownloadsRepository +import acr.browser.lightning.database.history.HistoryRepository +import acr.browser.lightning.html.bookmark.BookmarkPageFactory +import acr.browser.lightning.html.history.HistoryPageFactory +import acr.browser.lightning.search.SearchEngineProvider +import acr.browser.lightning.ssl.SslState import acr.browser.lightning.utils.Option import acr.browser.lightning.utils.QUERY_PLACE_HOLDER import acr.browser.lightning.utils.isBookmarkUrl @@ -56,6 +45,16 @@ import acr.browser.lightning.utils.isHistoryUrl import acr.browser.lightning.utils.isSpecialUrl import acr.browser.lightning.utils.smartUrlFilter import acr.browser.lightning.utils.value +import androidx.activity.result.ActivityResult +import androidx.core.net.toUri +import io.reactivex.Maybe +import io.reactivex.Scheduler +import io.reactivex.Single +import io.reactivex.disposables.CompositeDisposable +import io.reactivex.rxkotlin.Observables +import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxkotlin.subscribeBy +import io.reactivex.rxkotlin.toObservable import javax.inject.Inject import kotlin.system.exitProcess @@ -82,7 +81,6 @@ class BrowserPresenter @Inject constructor( private val downloadPageInitializer: DownloadPageInitializer, private val searchBoxModel: SearchBoxModel, private val searchEngineProvider: SearchEngineProvider, - @InitialUrl private val initialUrl: String?, private val uiConfiguration: UiConfiguration, private val historyPageFactory: HistoryPageFactory, private val allowListModel: AllowListModel, @@ -151,14 +149,6 @@ class BrowserPresenter @Inject constructor( compositeDisposable += model.initializeTabs() .observeOn(mainScheduler) - .concatWith( - Maybe.fromCallable { initialUrl } - .flatMapSingleElement { model.createTab(UrlInitializer(it)) } - .map(::listOf) - ) - .toList() - .map(MutableList>::flatten) - .filter(List::isNotEmpty) .switchIfEmpty(model.createTab(homePageInitializer).map(::listOf)) .subscribe { list -> selectTab(model.selectTab(list.last().id)) diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabInitializer.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabInitializer.kt index cbaae0a4d..28e7656bb 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabInitializer.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabInitializer.kt @@ -18,6 +18,9 @@ import android.os.Message import android.webkit.WebView import androidx.appcompat.app.AlertDialog import dagger.Reusable +import dagger.assisted.Assisted +import dagger.assisted.AssistedFactory +import dagger.assisted.AssistedInject import io.reactivex.Scheduler import io.reactivex.rxkotlin.subscribeBy import javax.inject.Inject @@ -175,8 +178,8 @@ class NoOpInitializer : TabInitializer { * permission. Useful for scenarios where another app may attempt to open a malicious URL in the * browser via an intent. */ -class PermissionInitializer( - private val url: String, +class PermissionInitializer @AssistedInject constructor( + @Assisted private val url: String, private val activity: Activity, private val homePageInitializer: HomePageInitializer ) : TabInitializer { @@ -196,4 +199,17 @@ class PermissionInitializer( }.resizeAndShow() } + /** + * The factory for constructing the permission initializer. + */ + @AssistedFactory + interface Factory { + + /** + * Creates the initializer. + */ + fun create(url: String): PermissionInitializer + + } + } diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt index 1458be6fe..14aa18613 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt @@ -2,9 +2,11 @@ package acr.browser.lightning.browser.tab import acr.browser.lightning.browser.BrowserContract import acr.browser.lightning.browser.di.DiskScheduler +import acr.browser.lightning.browser.di.InitialUrl import acr.browser.lightning.browser.di.MainScheduler import acr.browser.lightning.browser.tab.bundle.BundleStore import acr.browser.lightning.preference.UserPreferences +import acr.browser.lightning.utils.isFileUrl import io.reactivex.Completable import io.reactivex.Maybe import io.reactivex.Observable @@ -25,7 +27,9 @@ class TabsRepository @Inject constructor( private val bundleStore: BundleStore, private val recentTabModel: RecentTabModel, private val tabFactory: TabFactory, - private val userPreferences: UserPreferences + private val userPreferences: UserPreferences, + @InitialUrl private val initialUrl: String?, + private val permissionInitializerFactory: PermissionInitializer.Factory ) : BrowserContract.Model { private var selectedTab: TabModel? = null @@ -86,6 +90,13 @@ class TabsRepository @Inject constructor( .flatMapObservable { Observable.fromIterable(it) } .subscribeOn(diskScheduler) .observeOn(mainScheduler) + .concatWith(Maybe.fromCallable { initialUrl }.map { + if (it.isFileUrl()) { + permissionInitializerFactory.create(it) + } else { + UrlInitializer(it) + } + }) .flatMapSingle(::createTab) .toList() .filter(MutableList::isNotEmpty) From 8fe26e0f20920c3c0c95e1e8a2d63101679609d3 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Mon, 8 Aug 2022 11:25:22 -0400 Subject: [PATCH 148/161] Removing unnecessary super calls --- .../java/acr/browser/lightning/browser/BrowserPresenter.kt | 1 - .../acr/browser/lightning/browser/tab/TabWebChromeClient.kt | 3 --- 2 files changed, 4 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt index 3145cda6e..0067212ba 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt @@ -237,7 +237,6 @@ class BrowserPresenter @Inject constructor( tab.urlChanges().startWith(tab.url).map(String::isSpecialUrl), tab.themeColorChanges().startWith(tab.themeColor) ) { sslState, title, url, progress, canGoBack, canGoForward, isBookmark, isSpecialUrl, themeColor -> - viewState.copy( displayUrl = searchBoxModel.getDisplayContent( url = url, diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabWebChromeClient.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabWebChromeClient.kt index 1ec3ec838..67826482d 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabWebChromeClient.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabWebChromeClient.kt @@ -131,19 +131,16 @@ class TabWebChromeClient( } override fun onProgressChanged(view: WebView, newProgress: Int) { - super.onProgressChanged(view, newProgress) progressObservable.onNext(newProgress) } override fun onReceivedTitle(view: WebView, title: String) { - super.onReceivedTitle(view, title) titleObservable.onNext(title) faviconObservable.onNext(Option.None) generateColorAndPropagate(null) } override fun onReceivedIcon(view: WebView, icon: Bitmap) { - super.onReceivedIcon(view, icon) faviconObservable.onNext(Option.Some(icon)) val url = view.url ?: return faviconModel.cacheFaviconForUrl(icon, url) From 6154fb56ffb9d7d19ac7cfcb5c1256c9ab286688 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Mon, 8 Aug 2022 15:56:37 -0400 Subject: [PATCH 149/161] Fixing search bar focus issues --- .../acr/browser/lightning/browser/BrowserActivity.kt | 7 +++++++ .../acr/browser/lightning/browser/BrowserContract.kt | 5 +++++ .../acr/browser/lightning/browser/BrowserPresenter.kt | 9 ++++++--- .../acr/browser/lightning/browser/BrowserStateAdapter.kt | 4 ++++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserActivity.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserActivity.kt index 6a9ff5ba9..92679c2db 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserActivity.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserActivity.kt @@ -705,6 +705,13 @@ abstract class BrowserActivity : ThemableBrowserActivity() { setFullscreen(enabled = false, immersive = false) } + /** + * @see BrowserContract.View.clearSearchFocus + */ + fun clearSearchFocus() { + binding.search.clearFocus() + } + // TODO: update to use non deprecated flags private fun setFullscreen(enabled: Boolean, immersive: Boolean) { val window = window diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserContract.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserContract.kt index 532ec0bf2..7ec0eea9f 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserContract.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserContract.kt @@ -165,6 +165,11 @@ interface BrowserContract { * Hide the custom view that was previously shown by calling [showCustomView]. */ fun hideCustomView() + + /** + * Clear focus from the search view if it has focus. + */ + fun clearSearchFocus() } /** diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt index 0067212ba..9bede1a6e 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserPresenter.kt @@ -199,6 +199,8 @@ class BrowserPresenter @Inject constructor( currentTab = tabModel currentTab?.isForeground = true + view?.clearSearchFocus() + val tab = tabModel ?: return run { view.updateState( viewState.copy( @@ -242,13 +244,14 @@ class BrowserPresenter @Inject constructor( url = url, title = title, isLoading = progress < 100 - ), + ).takeIf { !isSearchViewFocused } ?: viewState.displayUrl, enableFullMenu = !url.isSpecialUrl(), themeColor = Option.Some(themeColor), - isRefresh = progress == 100, + isRefresh = (progress == 100).takeIf { !isSearchViewFocused } + ?: viewState.isRefresh, isForwardEnabled = canGoForward, isBackEnabled = canGoBack, - sslState = sslState, + sslState = sslState.takeIf { !isSearchViewFocused } ?: viewState.sslState, progress = progress, isBookmarked = isBookmark, isBookmarkEnabled = !isSpecialUrl, diff --git a/app/src/main/java/acr/browser/lightning/browser/BrowserStateAdapter.kt b/app/src/main/java/acr/browser/lightning/browser/BrowserStateAdapter.kt index 7485b1f97..21398c87d 100644 --- a/app/src/main/java/acr/browser/lightning/browser/BrowserStateAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/BrowserStateAdapter.kt @@ -153,4 +153,8 @@ class BrowserStateAdapter(private val browserActivity: BrowserActivity) : Browse override fun hideCustomView() { browserActivity.hideCustomView() } + + override fun clearSearchFocus() { + browserActivity.clearSearchFocus() + } } From 5ef4bf200aa0063ce6fb4456585dfd40377e3680 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 9 Aug 2022 10:19:17 -0400 Subject: [PATCH 150/161] Support zoom scale changing --- .../lightning/browser/tab/TabFactory.kt | 14 +++++++++-- .../lightning/browser/tab/TabWebViewClient.kt | 25 ++++++++++++++++++- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabFactory.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabFactory.kt index 7559db854..fbb35b15e 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabFactory.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabFactory.kt @@ -8,6 +8,7 @@ import acr.browser.lightning.browser.di.DiskScheduler import acr.browser.lightning.favicon.FaviconModel import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.browser.webrtc.WebRtcPermissionsModel +import acr.browser.lightning.js.TextReflow import android.app.Activity import android.graphics.Bitmap import android.webkit.WebView @@ -29,7 +30,8 @@ class TabFactory @Inject constructor( @DefaultUserAgent private val defaultUserAgent: String, @IconFreeze private val iconFreeze: Bitmap, private val proxy: Proxy, - private val webRtcPermissionsModel: WebRtcPermissionsModel + private val webRtcPermissionsModel: WebRtcPermissionsModel, + private val textReflow: TextReflow ) { /** @@ -41,7 +43,15 @@ class TabFactory @Inject constructor( tabInitializer, webView, headers, - TabWebViewClient(adBlocker, allowListModel, urlHandler, headers, proxy), + TabWebViewClient( + adBlocker, + allowListModel, + urlHandler, + headers, + proxy, + userPreferences, + textReflow + ), TabWebChromeClient( activity, faviconModel, diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabWebViewClient.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabWebViewClient.kt index f9fa950e1..a5227c6c6 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabWebViewClient.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabWebViewClient.kt @@ -3,6 +3,8 @@ package acr.browser.lightning.browser.tab import acr.browser.lightning.browser.proxy.Proxy import acr.browser.lightning.adblock.AdBlocker import acr.browser.lightning.adblock.allowlist.AllowListModel +import acr.browser.lightning.js.TextReflow +import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.ssl.SslState import android.annotation.TargetApi import android.graphics.Bitmap @@ -17,6 +19,7 @@ import android.webkit.WebViewClient import androidx.annotation.RequiresApi import io.reactivex.subjects.PublishSubject import java.io.ByteArrayInputStream +import kotlin.math.abs /** * A [WebViewClient] that supports the tab adaptation. @@ -26,7 +29,9 @@ class TabWebViewClient( private val allowListModel: AllowListModel, private val urlHandler: UrlHandler, private val headers: Map, - private val proxy: Proxy + private val proxy: Proxy, + private val userPreferences: UserPreferences, + private val textReflow: TextReflow ) : WebViewClient() { /** @@ -56,6 +61,8 @@ class TabWebViewClient( private set private var currentUrl: String = "" + private var isReflowRunning: Boolean = false + private var zoomScale: Float = 0.0F private fun shouldBlockRequest(pageUrl: String, requestUrl: String) = !allowListModel.isUrlAllowedAds(pageUrl) && @@ -80,6 +87,22 @@ class TabWebViewClient( goForwardObservable.onNext(view.canGoForward()) } + + override fun onScaleChanged(view: WebView, oldScale: Float, newScale: Float) { + if (view.isShown && userPreferences.textReflowEnabled) { + if (isReflowRunning) + return + val changeInPercent = abs(100 - 100 / zoomScale * newScale) + if (changeInPercent > 2.5f && !isReflowRunning) { + isReflowRunning = view.postDelayed({ + zoomScale = newScale + view.evaluateJavascript(textReflow.provideJs()) { isReflowRunning = false } + }, 100) + } + + } + } + override fun onReceivedSslError(view: WebView, handler: SslErrorHandler, error: SslError) { super.onReceivedSslError(view, handler, error) sslState = SslState.Invalid(error) From 1a55cbf12de259db50810c90dd0113a77024d074 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 9 Aug 2022 10:41:57 -0400 Subject: [PATCH 151/161] Implementing http auth request, ssl error, and form resubmission handling --- .../lightning/browser/tab/TabFactory.kt | 37 +--- .../browser/tab/TabWebChromeClient.kt | 6 +- .../lightning/browser/tab/TabWebViewClient.kt | 174 +++++++++++++++++- 3 files changed, 174 insertions(+), 43 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabFactory.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabFactory.kt index fbb35b15e..567539eb9 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabFactory.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabFactory.kt @@ -2,36 +2,23 @@ package acr.browser.lightning.browser.tab import acr.browser.lightning.browser.image.IconFreeze import acr.browser.lightning.browser.proxy.Proxy -import acr.browser.lightning.adblock.AdBlocker -import acr.browser.lightning.adblock.allowlist.AllowListModel -import acr.browser.lightning.browser.di.DiskScheduler -import acr.browser.lightning.favicon.FaviconModel import acr.browser.lightning.preference.UserPreferences -import acr.browser.lightning.browser.webrtc.WebRtcPermissionsModel -import acr.browser.lightning.js.TextReflow -import android.app.Activity import android.graphics.Bitmap import android.webkit.WebView -import io.reactivex.Scheduler import javax.inject.Inject +import javax.inject.Provider /** * Constructs a [TabModel]. */ class TabFactory @Inject constructor( private val webViewFactory: WebViewFactory, - private val activity: Activity, - private val adBlocker: AdBlocker, - private val allowListModel: AllowListModel, - private val faviconModel: FaviconModel, - @DiskScheduler private val diskScheduler: Scheduler, - private val urlHandler: UrlHandler, private val userPreferences: UserPreferences, @DefaultUserAgent private val defaultUserAgent: String, @IconFreeze private val iconFreeze: Bitmap, private val proxy: Proxy, - private val webRtcPermissionsModel: WebRtcPermissionsModel, - private val textReflow: TextReflow + private val tabWebViewClientFactory: TabWebViewClient.Factory, + private val tabWebChromeClientProvider: Provider ) { /** @@ -43,22 +30,8 @@ class TabFactory @Inject constructor( tabInitializer, webView, headers, - TabWebViewClient( - adBlocker, - allowListModel, - urlHandler, - headers, - proxy, - userPreferences, - textReflow - ), - TabWebChromeClient( - activity, - faviconModel, - diskScheduler, - userPreferences, - webRtcPermissionsModel - ), + tabWebViewClientFactory.create(headers), + tabWebChromeClientProvider.get(), userPreferences, defaultUserAgent, iconFreeze, diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabWebChromeClient.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabWebChromeClient.kt index 67826482d..b27d15a7d 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabWebChromeClient.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabWebChromeClient.kt @@ -1,6 +1,7 @@ package acr.browser.lightning.browser.tab import acr.browser.lightning.R +import acr.browser.lightning.browser.di.DiskScheduler import acr.browser.lightning.dialog.BrowserDialog import acr.browser.lightning.dialog.DialogItem import acr.browser.lightning.extensions.color @@ -32,14 +33,15 @@ import com.anthonycr.grant.PermissionsResultAction import io.reactivex.Scheduler import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.PublishSubject +import javax.inject.Inject /** * A [WebChromeClient] that supports the tab adaptation. */ -class TabWebChromeClient( +class TabWebChromeClient @Inject constructor( private val activity: Activity, private val faviconModel: FaviconModel, - private val diskScheduler: Scheduler, + @DiskScheduler private val diskScheduler: Scheduler, private val userPreferences: UserPreferences, private val webRtcPermissionsModel: WebRtcPermissionsModel ) : WebChromeClient(), WebRtcPermissionsView { diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabWebViewClient.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabWebViewClient.kt index a5227c6c6..97d3bed61 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabWebViewClient.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabWebViewClient.kt @@ -1,37 +1,57 @@ package acr.browser.lightning.browser.tab +import acr.browser.lightning.R import acr.browser.lightning.browser.proxy.Proxy import acr.browser.lightning.adblock.AdBlocker import acr.browser.lightning.adblock.allowlist.AllowListModel +import acr.browser.lightning.databinding.DialogAuthRequestBinding +import acr.browser.lightning.databinding.DialogSslWarningBinding +import acr.browser.lightning.extensions.resizeAndShow import acr.browser.lightning.js.TextReflow +import acr.browser.lightning.log.Logger import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.ssl.SslState +import acr.browser.lightning.ssl.SslWarningPreferences +import android.annotation.SuppressLint import android.annotation.TargetApi import android.graphics.Bitmap import android.net.http.SslError import android.os.Build +import android.os.Message +import android.view.LayoutInflater +import android.webkit.HttpAuthHandler import android.webkit.SslErrorHandler import android.webkit.URLUtil import android.webkit.WebResourceRequest import android.webkit.WebResourceResponse import android.webkit.WebView import android.webkit.WebViewClient +import android.widget.CheckBox +import android.widget.EditText +import android.widget.TextView import androidx.annotation.RequiresApi +import androidx.appcompat.app.AlertDialog +import dagger.assisted.Assisted +import dagger.assisted.AssistedFactory +import dagger.assisted.AssistedInject import io.reactivex.subjects.PublishSubject import java.io.ByteArrayInputStream +import java.util.ArrayList import kotlin.math.abs /** * A [WebViewClient] that supports the tab adaptation. */ -class TabWebViewClient( +class TabWebViewClient @AssistedInject constructor( private val adBlocker: AdBlocker, private val allowListModel: AllowListModel, private val urlHandler: UrlHandler, - private val headers: Map, + @Assisted private val headers: Map, private val proxy: Proxy, private val userPreferences: UserPreferences, - private val textReflow: TextReflow + private val sslWarningPreferences: SslWarningPreferences, + private val textReflow: TextReflow, + private val logger: Logger ) : WebViewClient() { /** @@ -63,6 +83,7 @@ class TabWebViewClient( private var currentUrl: String = "" private var isReflowRunning: Boolean = false private var zoomScale: Float = 0.0F + private var urlWithSslError: String? = null private fun shouldBlockRequest(pageUrl: String, requestUrl: String) = !allowListModel.isUrlAllowedAds(pageUrl) && @@ -72,10 +93,13 @@ class TabWebViewClient( super.onPageStarted(view, url, favicon) currentUrl = url urlObservable.onNext(url) - sslState = if (URLUtil.isHttpsUrl(url)) { - SslState.Valid - } else { - SslState.None + if (urlWithSslError != url) { + urlWithSslError = null + sslState = if (URLUtil.isHttpsUrl(url)) { + SslState.Valid + } else { + SslState.None + } } sslStateObservable.onNext(sslState) } @@ -103,10 +127,103 @@ class TabWebViewClient( } } - override fun onReceivedSslError(view: WebView, handler: SslErrorHandler, error: SslError) { - super.onReceivedSslError(view, handler, error) + override fun onReceivedHttpAuthRequest( + view: WebView, + handler: HttpAuthHandler, + host: String, + realm: String + ) { + val context = view.context + AlertDialog.Builder(context).apply { + val dialogView = DialogAuthRequestBinding.inflate(LayoutInflater.from(context)) + + val realmLabel = dialogView.authRequestRealmTextview + val name = dialogView.authRequestUsernameEdittext + val password = dialogView.authRequestPasswordEdittext + + realmLabel.text = context.getString(R.string.label_realm, realm) + + setView(dialogView.root) + setTitle(R.string.title_sign_in) + setCancelable(true) + setPositiveButton(R.string.title_sign_in) { _, _ -> + val user = name.text.toString() + val pass = password.text.toString() + handler.proceed(user.trim(), pass.trim()) + logger.log(TAG, "Attempting HTTP Authentication") + } + setNegativeButton(R.string.action_cancel) { _, _ -> + handler.cancel() + } + }.resizeAndShow() + } + + override fun onFormResubmission(view: WebView, dontResend: Message, resend: Message) { + val context = view.context + AlertDialog.Builder(context).apply { + setTitle(context.getString(R.string.title_form_resubmission)) + setMessage(context.getString(R.string.message_form_resubmission)) + setCancelable(true) + setPositiveButton(context.getString(R.string.action_yes)) { _, _ -> + resend.sendToTarget() + } + setNegativeButton(context.getString(R.string.action_no)) { _, _ -> + dontResend.sendToTarget() + } + }.resizeAndShow() + } + + @SuppressLint("WebViewClientOnReceivedSslError") + override fun onReceivedSslError(webView: WebView, handler: SslErrorHandler, error: SslError) { + val context = webView.context + urlWithSslError = webView.url + sslState = SslState.Invalid(error) sslStateObservable.onNext(sslState) + sslState = SslState.Invalid(error) + + when (sslWarningPreferences.recallBehaviorForDomain(webView.url)) { + SslWarningPreferences.Behavior.PROCEED -> return handler.proceed() + SslWarningPreferences.Behavior.CANCEL -> return handler.cancel() + null -> Unit + } + + val errorCodeMessageCodes = error.getAllSslErrorMessageCodes() + + val stringBuilder = StringBuilder() + for (messageCode in errorCodeMessageCodes) { + stringBuilder.append(" - ").append(context.getString(messageCode)).append('\n') + } + val alertMessage = + context.getString(R.string.message_insecure_connection, stringBuilder.toString()) + + AlertDialog.Builder(context).apply { + val view = DialogSslWarningBinding.inflate(LayoutInflater.from(context)) + val dontAskAgain = view.checkBoxDontAskAgain + setTitle(context.getString(R.string.title_warning)) + setMessage(alertMessage) + setCancelable(true) + setView(view.root) + setOnCancelListener { handler.cancel() } + setPositiveButton(context.getString(R.string.action_yes)) { _, _ -> + if (dontAskAgain.isChecked) { + sslWarningPreferences.rememberBehaviorForDomain( + webView.url.orEmpty(), + SslWarningPreferences.Behavior.PROCEED + ) + } + handler.proceed() + } + setNegativeButton(context.getString(R.string.action_no)) { _, _ -> + if (dontAskAgain.isChecked) { + sslWarningPreferences.rememberBehaviorForDomain( + webView.url.orEmpty(), + SslWarningPreferences.Behavior.CANCEL + ) + } + handler.cancel() + } + }.resizeAndShow() } override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean { @@ -143,7 +260,46 @@ class TabWebViewClient( return null } + private fun SslError.getAllSslErrorMessageCodes(): List { + val errorCodeMessageCodes = ArrayList(1) + + if (hasError(SslError.SSL_DATE_INVALID)) { + errorCodeMessageCodes.add(R.string.message_certificate_date_invalid) + } + if (hasError(SslError.SSL_EXPIRED)) { + errorCodeMessageCodes.add(R.string.message_certificate_expired) + } + if (hasError(SslError.SSL_IDMISMATCH)) { + errorCodeMessageCodes.add(R.string.message_certificate_domain_mismatch) + } + if (hasError(SslError.SSL_NOTYETVALID)) { + errorCodeMessageCodes.add(R.string.message_certificate_not_yet_valid) + } + if (hasError(SslError.SSL_UNTRUSTED)) { + errorCodeMessageCodes.add(R.string.message_certificate_untrusted) + } + if (hasError(SslError.SSL_INVALID)) { + errorCodeMessageCodes.add(R.string.message_certificate_invalid) + } + + return errorCodeMessageCodes + } + + /** + * The factory for constructing the client. + */ + @AssistedFactory + interface Factory { + + /** + * Create the client. + */ + fun create(headers: Map): TabWebViewClient + } + companion object { + private const val TAG = "TabWebViewClient" + private val emptyResponseByteArray: ByteArray = byteArrayOf() private const val BLOCKED_RESPONSE_MIME_TYPE = "text/plain" From 300e461f4a8da2470ff496b1bee46acac6935f75 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 9 Aug 2022 10:46:41 -0400 Subject: [PATCH 152/161] Removing deprecated code that isn't needed --- .../lightning/browser/tab/TabWebViewClient.kt | 19 ++----------------- .../browser/webrtc/WebRtcPermissionsModel.kt | 3 --- .../extensions/PermissionRequestExtensions.kt | 3 --- 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabWebViewClient.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabWebViewClient.kt index 97d3bed61..8be1d7bf8 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabWebViewClient.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabWebViewClient.kt @@ -1,9 +1,9 @@ package acr.browser.lightning.browser.tab import acr.browser.lightning.R -import acr.browser.lightning.browser.proxy.Proxy import acr.browser.lightning.adblock.AdBlocker import acr.browser.lightning.adblock.allowlist.AllowListModel +import acr.browser.lightning.browser.proxy.Proxy import acr.browser.lightning.databinding.DialogAuthRequestBinding import acr.browser.lightning.databinding.DialogSslWarningBinding import acr.browser.lightning.extensions.resizeAndShow @@ -13,7 +13,6 @@ import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.ssl.SslState import acr.browser.lightning.ssl.SslWarningPreferences import android.annotation.SuppressLint -import android.annotation.TargetApi import android.graphics.Bitmap import android.net.http.SslError import android.os.Build @@ -26,9 +25,6 @@ import android.webkit.WebResourceRequest import android.webkit.WebResourceResponse import android.webkit.WebView import android.webkit.WebViewClient -import android.widget.CheckBox -import android.widget.EditText -import android.widget.TextView import androidx.annotation.RequiresApi import androidx.appcompat.app.AlertDialog import dagger.assisted.Assisted @@ -36,7 +32,6 @@ import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject import io.reactivex.subjects.PublishSubject import java.io.ByteArrayInputStream -import java.util.ArrayList import kotlin.math.abs /** @@ -232,14 +227,13 @@ class TabWebViewClient @AssistedInject constructor( super.shouldOverrideUrlLoading(view, url) } - @RequiresApi(Build.VERSION_CODES.LOLLIPOP) + @RequiresApi(Build.VERSION_CODES.N) override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean { if (!proxy.isProxyReady()) return true return urlHandler.shouldOverrideLoading(view, request.url.toString(), headers) || super.shouldOverrideUrlLoading(view, request) } - @TargetApi(Build.VERSION_CODES.LOLLIPOP) override fun shouldInterceptRequest( view: WebView, request: WebResourceRequest @@ -251,15 +245,6 @@ class TabWebViewClient @AssistedInject constructor( return null } - @Suppress("OverridingDeprecatedMember") - override fun shouldInterceptRequest(view: WebView, url: String): WebResourceResponse? { - if (shouldBlockRequest(currentUrl, url)) { - val empty = ByteArrayInputStream(emptyResponseByteArray) - return WebResourceResponse(BLOCKED_RESPONSE_MIME_TYPE, BLOCKED_RESPONSE_ENCODING, empty) - } - return null - } - private fun SslError.getAllSslErrorMessageCodes(): List { val errorCodeMessageCodes = ArrayList(1) diff --git a/app/src/main/java/acr/browser/lightning/browser/webrtc/WebRtcPermissionsModel.kt b/app/src/main/java/acr/browser/lightning/browser/webrtc/WebRtcPermissionsModel.kt index d7b841e40..be1f9f2aa 100644 --- a/app/src/main/java/acr/browser/lightning/browser/webrtc/WebRtcPermissionsModel.kt +++ b/app/src/main/java/acr/browser/lightning/browser/webrtc/WebRtcPermissionsModel.kt @@ -1,8 +1,6 @@ package acr.browser.lightning.browser.webrtc import acr.browser.lightning.extensions.requiredPermissions -import android.annotation.TargetApi -import android.os.Build import android.webkit.PermissionRequest import javax.inject.Inject import javax.inject.Singleton @@ -10,7 +8,6 @@ import javax.inject.Singleton /** * The model that manages permission requests originating from a web page. */ -@TargetApi(Build.VERSION_CODES.LOLLIPOP) @Singleton class WebRtcPermissionsModel @Inject constructor() { diff --git a/app/src/main/java/acr/browser/lightning/extensions/PermissionRequestExtensions.kt b/app/src/main/java/acr/browser/lightning/extensions/PermissionRequestExtensions.kt index 347e058a3..2792f191a 100644 --- a/app/src/main/java/acr/browser/lightning/extensions/PermissionRequestExtensions.kt +++ b/app/src/main/java/acr/browser/lightning/extensions/PermissionRequestExtensions.kt @@ -1,15 +1,12 @@ package acr.browser.lightning.extensions import android.Manifest -import android.annotation.TargetApi -import android.os.Build import android.webkit.PermissionRequest /** * Returns the permissions retrieved from [Manifest.permission] which are required by the requested * resources. If none of the resources require a permission, the list will be empty. */ -@TargetApi(Build.VERSION_CODES.LOLLIPOP) fun PermissionRequest.requiredPermissions(): Set { return resources.flatMap { when (it) { From c06b67b573992dcf9d6915321954524a7c6d0dbf Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 9 Aug 2022 20:52:30 -0400 Subject: [PATCH 153/161] Subscribe to whole upstream observable on the same thread --- .../acr/browser/lightning/browser/tab/TabsRepository.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt index 14aa18613..954ef7c79 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt @@ -88,8 +88,6 @@ class TabsRepository @Inject constructor( override fun initializeTabs(): Maybe> = Single.fromCallable(bundleStore::retrieve) .flatMapObservable { Observable.fromIterable(it) } - .subscribeOn(diskScheduler) - .observeOn(mainScheduler) .concatWith(Maybe.fromCallable { initialUrl }.map { if (it.isFileUrl()) { permissionInitializerFactory.create(it) @@ -97,9 +95,11 @@ class TabsRepository @Inject constructor( UrlInitializer(it) } }) + .subscribeOn(diskScheduler) + .observeOn(mainScheduler) .flatMapSingle(::createTab) .toList() - .filter(MutableList::isNotEmpty) + .filter(List::isNotEmpty) override fun freeze() { if (userPreferences.restoreLostTabsEnabled) { From 902d2e15a5ada30bab8faf483ca334ddc734de3b Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 9 Aug 2022 22:44:28 -0400 Subject: [PATCH 154/161] Don't allow new tabs to be created before initialization is complete --- .../lightning/browser/tab/TabsRepository.kt | 33 ++++++++++++++----- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt index 954ef7c79..4cb5892ca 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt @@ -12,6 +12,7 @@ import io.reactivex.Maybe import io.reactivex.Observable import io.reactivex.Scheduler import io.reactivex.Single +import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.PublishSubject import javax.inject.Inject @@ -32,9 +33,13 @@ class TabsRepository @Inject constructor( private val permissionInitializerFactory: PermissionInitializer.Factory ) : BrowserContract.Model { + private var isInitialized = BehaviorSubject.createDefault(false) private var selectedTab: TabModel? = null private val tabsListObservable = PublishSubject.create>() + private fun afterInitialization(): Single = + isInitialized.filter { it }.firstOrError() + override fun deleteTab(id: Int): Completable = Completable.fromAction { if (selectedTab?.id == id) { tabPager.clearTab() @@ -47,16 +52,25 @@ class TabsRepository @Inject constructor( tabsListObservable.onNext(tabsList) } - override fun deleteAllTabs(): Completable = Completable.fromAction { - tabPager.clearTab() + override fun deleteAllTabs(): Completable = + afterInitialization().flatMapCompletable { + Completable.fromAction { + tabPager.clearTab() - tabsList.forEach(TabModel::destroy) - tabsList = emptyList() - }.doOnComplete { - tabsListObservable.onNext(tabsList) - } + tabsList.forEach(TabModel::destroy) + tabsList = emptyList() + } + }.doOnComplete { + tabsListObservable.onNext(tabsList) + } override fun createTab(tabInitializer: TabInitializer): Single = + afterInitialization().flatMap { createTabUnsafe(tabInitializer) } + + /** + * Creates a tab without waiting for the browser to be initialized. + */ + private fun createTabUnsafe(tabInitializer: TabInitializer): Single = Single.fromCallable { val webView = webViewFactory.createWebView() tabPager.addTab(webView) @@ -97,8 +111,11 @@ class TabsRepository @Inject constructor( }) .subscribeOn(diskScheduler) .observeOn(mainScheduler) - .flatMapSingle(::createTab) + .flatMapSingle(::createTabUnsafe) .toList() + .doOnSuccess { + isInitialized.onNext(true) + } .filter(List::isNotEmpty) override fun freeze() { From 19381386671672be3392347582d9c09580ba9d8d Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Thu, 11 Aug 2022 22:13:48 -0400 Subject: [PATCH 155/161] Remove legacy theme provider as it is no longer needed after removing old browser code --- .../lightning/browser/di/AppBindsModule.kt | 7 --- .../browser/di/Browser2BindsModule.kt | 5 ++ .../browser/theme/DefaultThemeProvider.kt | 3 +- .../browser/theme/LegacyThemeProvider.kt | 50 ------------------- .../html/bookmark/BookmarkPageFactory.kt | 1 - .../html/download/DownloadPageFactory.kt | 1 - .../html/history/HistoryPageFactory.kt | 1 - .../html/homepage/HomePageFactory.kt | 1 - 8 files changed, 7 insertions(+), 62 deletions(-) delete mode 100644 app/src/main/java/acr/browser/lightning/browser/theme/LegacyThemeProvider.kt diff --git a/app/src/main/java/acr/browser/lightning/browser/di/AppBindsModule.kt b/app/src/main/java/acr/browser/lightning/browser/di/AppBindsModule.kt index fdd305914..bc39fa274 100644 --- a/app/src/main/java/acr/browser/lightning/browser/di/AppBindsModule.kt +++ b/app/src/main/java/acr/browser/lightning/browser/di/AppBindsModule.kt @@ -1,15 +1,11 @@ package acr.browser.lightning.browser.di -import acr.browser.lightning.browser.theme.LegacyThemeProvider -import acr.browser.lightning.browser.theme.ThemeProvider import acr.browser.lightning.adblock.allowlist.AllowListModel import acr.browser.lightning.adblock.allowlist.SessionAllowListModel import acr.browser.lightning.adblock.source.AssetsHostsDataSource import acr.browser.lightning.adblock.source.HostsDataSource import acr.browser.lightning.adblock.source.HostsDataSourceProvider import acr.browser.lightning.adblock.source.PreferencesHostsDataSourceProvider -import acr.browser.lightning.browser.cleanup.DelegatingExitCleanup -import acr.browser.lightning.browser.cleanup.ExitCleanup import acr.browser.lightning.database.adblock.HostsDatabase import acr.browser.lightning.database.adblock.HostsRepository import acr.browser.lightning.database.allowlist.AdBlockAllowListDatabase @@ -57,7 +53,4 @@ interface AppBindsModule { @Binds fun bindsHostsDataSourceProvider(preferencesHostsDataSourceProvider: PreferencesHostsDataSourceProvider): HostsDataSourceProvider - - @Binds - fun bindsThemeProvider(legacyThemeProvider: LegacyThemeProvider): ThemeProvider } diff --git a/app/src/main/java/acr/browser/lightning/browser/di/Browser2BindsModule.kt b/app/src/main/java/acr/browser/lightning/browser/di/Browser2BindsModule.kt index dae224c68..d5df628bb 100644 --- a/app/src/main/java/acr/browser/lightning/browser/di/Browser2BindsModule.kt +++ b/app/src/main/java/acr/browser/lightning/browser/di/Browser2BindsModule.kt @@ -9,6 +9,8 @@ import acr.browser.lightning.browser.image.ImageLoader import acr.browser.lightning.browser.proxy.Proxy import acr.browser.lightning.browser.proxy.ProxyAdapter import acr.browser.lightning.browser.tab.TabsRepository +import acr.browser.lightning.browser.theme.DefaultThemeProvider +import acr.browser.lightning.browser.theme.ThemeProvider import dagger.Binds import dagger.Module @@ -32,4 +34,7 @@ interface Browser2BindsModule { @Binds fun bindsExitCleanup(delegatingExitCleanup: DelegatingExitCleanup): ExitCleanup + + @Binds + fun bindsThemeProvider(legacyThemeProvider: DefaultThemeProvider): ThemeProvider } diff --git a/app/src/main/java/acr/browser/lightning/browser/theme/DefaultThemeProvider.kt b/app/src/main/java/acr/browser/lightning/browser/theme/DefaultThemeProvider.kt index 79d8734a0..f9b463792 100644 --- a/app/src/main/java/acr/browser/lightning/browser/theme/DefaultThemeProvider.kt +++ b/app/src/main/java/acr/browser/lightning/browser/theme/DefaultThemeProvider.kt @@ -2,11 +2,12 @@ package acr.browser.lightning.browser.theme import acr.browser.lightning.utils.ThemeUtils import android.app.Activity +import javax.inject.Inject /** * The default theme attribute provider that delegates to the activity. */ -class DefaultThemeProvider(private val activity: Activity) : ThemeProvider { +class DefaultThemeProvider @Inject constructor(private val activity: Activity) : ThemeProvider { override fun color(attrRes: Int): Int = ThemeUtils.getColor(activity, attrRes) diff --git a/app/src/main/java/acr/browser/lightning/browser/theme/LegacyThemeProvider.kt b/app/src/main/java/acr/browser/lightning/browser/theme/LegacyThemeProvider.kt deleted file mode 100644 index 32b28d58e..000000000 --- a/app/src/main/java/acr/browser/lightning/browser/theme/LegacyThemeProvider.kt +++ /dev/null @@ -1,50 +0,0 @@ -package acr.browser.lightning.browser.theme - -import acr.browser.lightning.AppTheme -import acr.browser.lightning.R -import acr.browser.lightning.extensions.color -import acr.browser.lightning.preference.UserPreferences -import android.app.Application -import javax.inject.Inject - -/** - * The theme provider that should be used until [DefaultThemeProvider] can be injected safely - * throughout the codebase. - */ -class LegacyThemeProvider @Inject constructor( - private val application: Application, - private val userPreferences: UserPreferences -) : ThemeProvider { - - val theme: AppTheme - get() = userPreferences.useTheme - - override fun color(attrRes: Int): Int = when (attrRes) { - R.attr.colorPrimary -> when (theme) { - AppTheme.LIGHT -> application.color(R.color.primary_color) - AppTheme.DARK -> application.color(R.color.primary_color_dark) - AppTheme.BLACK -> application.color(R.color.black) - } - R.attr.drawerBackground -> when (theme) { - AppTheme.LIGHT -> application.color(R.color.drawer_background) - AppTheme.DARK -> application.color(R.color.drawer_background_dark) - AppTheme.BLACK -> application.color(R.color.black) - } - R.attr.autoCompleteBackgroundColor -> when (theme) { - AppTheme.LIGHT -> application.color(R.color.white) - AppTheme.DARK -> application.color(R.color.divider_dark) - AppTheme.BLACK -> application.color(R.color.gray_dark) - } - R.attr.autoCompleteTitleColor -> when (theme) { - AppTheme.LIGHT -> application.color(R.color.black) - AppTheme.DARK -> application.color(R.color.white) - AppTheme.BLACK -> application.color(R.color.white) - } - R.attr.autoCompleteUrlColor -> when (theme) { - AppTheme.LIGHT -> application.color(R.color.hint_text_light_theme) - AppTheme.DARK -> application.color(R.color.hint_text_dark_theme) - AppTheme.BLACK -> application.color(R.color.hint_text_dark_theme) - } - else -> error("Unsupported color") - } -} diff --git a/app/src/main/java/acr/browser/lightning/html/bookmark/BookmarkPageFactory.kt b/app/src/main/java/acr/browser/lightning/html/bookmark/BookmarkPageFactory.kt index 03edc779d..5759c99aa 100644 --- a/app/src/main/java/acr/browser/lightning/html/bookmark/BookmarkPageFactory.kt +++ b/app/src/main/java/acr/browser/lightning/html/bookmark/BookmarkPageFactory.kt @@ -35,7 +35,6 @@ import javax.inject.Inject /** * Created by anthonycr on 9/23/18. */ -@Reusable class BookmarkPageFactory @Inject constructor( private val application: Application, private val bookmarkModel: BookmarkRepository, diff --git a/app/src/main/java/acr/browser/lightning/html/download/DownloadPageFactory.kt b/app/src/main/java/acr/browser/lightning/html/download/DownloadPageFactory.kt index 6bb25b5b4..956337708 100644 --- a/app/src/main/java/acr/browser/lightning/html/download/DownloadPageFactory.kt +++ b/app/src/main/java/acr/browser/lightning/html/download/DownloadPageFactory.kt @@ -27,7 +27,6 @@ import javax.inject.Inject /** * The factory for the downloads page. */ -@Reusable class DownloadPageFactory @Inject constructor( private val application: Application, private val userPreferences: UserPreferences, diff --git a/app/src/main/java/acr/browser/lightning/html/history/HistoryPageFactory.kt b/app/src/main/java/acr/browser/lightning/html/history/HistoryPageFactory.kt index 813627878..b863d7932 100644 --- a/app/src/main/java/acr/browser/lightning/html/history/HistoryPageFactory.kt +++ b/app/src/main/java/acr/browser/lightning/html/history/HistoryPageFactory.kt @@ -26,7 +26,6 @@ import javax.inject.Inject /** * Factory for the history page. */ -@Reusable class HistoryPageFactory @Inject constructor( private val listPageReader: ListPageReader, private val application: Application, diff --git a/app/src/main/java/acr/browser/lightning/html/homepage/HomePageFactory.kt b/app/src/main/java/acr/browser/lightning/html/homepage/HomePageFactory.kt index 9e818e5c1..e89299517 100644 --- a/app/src/main/java/acr/browser/lightning/html/homepage/HomePageFactory.kt +++ b/app/src/main/java/acr/browser/lightning/html/homepage/HomePageFactory.kt @@ -24,7 +24,6 @@ import javax.inject.Inject /** * A factory for the home page. */ -@Reusable class HomePageFactory @Inject constructor( private val application: Application, private val searchEngineProvider: SearchEngineProvider, From 4ec162a401060d5d51bdb12edeb8426652d8392c Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Thu, 11 Aug 2022 22:21:36 -0400 Subject: [PATCH 156/161] Removing unused and dead code --- .../browser/tab/DrawerTabRecyclerViewAdapter.kt | 3 +-- .../lightning/browser/tab/WebViewFactory.kt | 16 +++++++--------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/DrawerTabRecyclerViewAdapter.kt b/app/src/main/java/acr/browser/lightning/browser/tab/DrawerTabRecyclerViewAdapter.kt index 85a0165a1..f34b1dd56 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/DrawerTabRecyclerViewAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/DrawerTabRecyclerViewAdapter.kt @@ -48,7 +48,7 @@ class DrawerTabRecyclerViewAdapter( val tab = getItem(position) holder.txtTitle.text = tab.title - updateViewHolderAppearance(holder, null, tab.isSelected) + updateViewHolderAppearance(holder, tab.isSelected) updateViewHolderFavicon(holder, tab.icon, tab.isSelected) updateViewHolderBackground(holder, tab.isSelected) } @@ -79,7 +79,6 @@ class DrawerTabRecyclerViewAdapter( private fun updateViewHolderAppearance( viewHolder: TabViewHolder, - favicon: Bitmap?, isForeground: Boolean ) { if (isForeground) { diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/WebViewFactory.kt b/app/src/main/java/acr/browser/lightning/browser/tab/WebViewFactory.kt index d4d199215..b7c8f009d 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/WebViewFactory.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/WebViewFactory.kt @@ -83,9 +83,9 @@ class WebViewFactory @Inject constructor( settings.apply { mediaPlaybackRequiresUserGesture = true - if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP && !incognitoMode) { + if (!incognitoMode) { mixedContentMode = WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE - } else if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { + } else { mixedContentMode = WebSettings.MIXED_CONTENT_NEVER_ALLOW } @@ -151,7 +151,7 @@ class WebViewFactory @Inject constructor( } if (userPreferences.textReflowEnabled) { - settings.layoutAlgorithm = WebSettings.LayoutAlgorithm.NARROW_COLUMNS + settings.layoutAlgorithm = WebSettings.LayoutAlgorithm.NORMAL try { settings.layoutAlgorithm = WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING } catch (e: Exception) { @@ -179,12 +179,10 @@ class WebViewFactory @Inject constructor( else -> throw IllegalArgumentException("Unsupported text size") } - if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { - CookieManager.getInstance().setAcceptThirdPartyCookies( - this, - !userPreferences.blockThirdPartyCookiesEnabled - ) - } + CookieManager.getInstance().setAcceptThirdPartyCookies( + this, + !userPreferences.blockThirdPartyCookiesEnabled + ) } companion object { From 149e279d4396e7a2bdcc742dc64480ec309e01be Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Fri, 12 Aug 2022 11:56:16 -0400 Subject: [PATCH 157/161] Fixing lint warning --- .../acr/browser/lightning/browser/tab/WebViewFactory.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/WebViewFactory.kt b/app/src/main/java/acr/browser/lightning/browser/tab/WebViewFactory.kt index b7c8f009d..25accbb41 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/WebViewFactory.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/WebViewFactory.kt @@ -83,10 +83,10 @@ class WebViewFactory @Inject constructor( settings.apply { mediaPlaybackRequiresUserGesture = true - if (!incognitoMode) { - mixedContentMode = WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE + mixedContentMode = if (!incognitoMode) { + WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE } else { - mixedContentMode = WebSettings.MIXED_CONTENT_NEVER_ALLOW + WebSettings.MIXED_CONTENT_NEVER_ALLOW } if (!incognitoMode || Capabilities.FULL_INCOGNITO.isSupported) { From b005d3aa267d7e936e9aadbee8d5e330917d249d Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sun, 14 Aug 2022 21:06:48 -0400 Subject: [PATCH 158/161] Simplifying data source provider by injecting the data sources --- .../adblock/parser/HostsFileParser.kt | 3 ++- .../adblock/source/AssetsHostsDataSource.kt | 8 ++++-- .../adblock/source/FileHostsDataSource.kt | 18 +++++++++++-- .../PreferencesHostsDataSourceProvider.kt | 26 +++++-------------- .../adblock/source/UrlHostsDataSource.kt | 21 ++++++++++++--- 5 files changed, 48 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/adblock/parser/HostsFileParser.kt b/app/src/main/java/acr/browser/lightning/adblock/parser/HostsFileParser.kt index 5abe3da6b..936cb072d 100644 --- a/app/src/main/java/acr/browser/lightning/adblock/parser/HostsFileParser.kt +++ b/app/src/main/java/acr/browser/lightning/adblock/parser/HostsFileParser.kt @@ -10,11 +10,12 @@ import acr.browser.lightning.extensions.stringEquals import acr.browser.lightning.extensions.substringToBuilder import acr.browser.lightning.log.Logger import java.io.InputStreamReader +import javax.inject.Inject /** * A single threaded parser for a hosts file. */ -class HostsFileParser( +class HostsFileParser @Inject constructor( private val logger: Logger ) { diff --git a/app/src/main/java/acr/browser/lightning/adblock/source/AssetsHostsDataSource.kt b/app/src/main/java/acr/browser/lightning/adblock/source/AssetsHostsDataSource.kt index 557fd2cba..b1fff8155 100644 --- a/app/src/main/java/acr/browser/lightning/adblock/source/AssetsHostsDataSource.kt +++ b/app/src/main/java/acr/browser/lightning/adblock/source/AssetsHostsDataSource.kt @@ -6,15 +6,19 @@ import acr.browser.lightning.log.Logger import android.content.res.AssetManager import io.reactivex.Single import java.io.InputStreamReader +import javax.inject.Inject +import javax.inject.Provider /** * A [HostsDataSource] that reads from the hosts list in assets. * * @param assetManager The store for application assets. + * @param hostsFileParserProvider The provider used to construct the parser. * @param logger The logger used to log status. */ -class AssetsHostsDataSource constructor( +class AssetsHostsDataSource @Inject constructor( private val assetManager: AssetManager, + private val hostsFileParserProvider: Provider, private val logger: Logger ) : HostsDataSource { @@ -28,7 +32,7 @@ class AssetsHostsDataSource constructor( */ override fun loadHosts(): Single = Single.create { emitter -> val reader = InputStreamReader(assetManager.open(BLOCKED_DOMAINS_LIST_FILE_NAME)) - val hostsFileParser = HostsFileParser(logger) + val hostsFileParser = hostsFileParserProvider.get() val domains = hostsFileParser.parseInput(reader) diff --git a/app/src/main/java/acr/browser/lightning/adblock/source/FileHostsDataSource.kt b/app/src/main/java/acr/browser/lightning/adblock/source/FileHostsDataSource.kt index eda1ed21e..2e90e5876 100644 --- a/app/src/main/java/acr/browser/lightning/adblock/source/FileHostsDataSource.kt +++ b/app/src/main/java/acr/browser/lightning/adblock/source/FileHostsDataSource.kt @@ -5,6 +5,9 @@ import acr.browser.lightning.adblock.util.hash.computeMD5 import acr.browser.lightning.extensions.onIOExceptionResumeNext import acr.browser.lightning.log.Logger import acr.browser.lightning.preference.UserPreferences +import dagger.assisted.Assisted +import dagger.assisted.AssistedFactory +import dagger.assisted.AssistedInject import io.reactivex.Single import java.io.File import java.io.InputStreamReader @@ -15,9 +18,9 @@ import java.io.InputStreamReader * @param logger The logger used to log information about the loading process. * @param file The file from which hosts will be loaded. Must have read access to the file. */ -class FileHostsDataSource constructor( +class FileHostsDataSource @AssistedInject constructor( private val logger: Logger, - private val file: File + @Assisted private val file: File ) : HostsDataSource { /** @@ -44,4 +47,15 @@ class FileHostsDataSource constructor( private const val TAG = "FileHostsDataSource" } + /** + * The factory used to construct the data source. + */ + @AssistedFactory + interface Factory { + /** + * Create the data source for the provided file. + */ + fun create(file: File): FileHostsDataSource + } + } diff --git a/app/src/main/java/acr/browser/lightning/adblock/source/PreferencesHostsDataSourceProvider.kt b/app/src/main/java/acr/browser/lightning/adblock/source/PreferencesHostsDataSourceProvider.kt index 45d282471..bc06934d5 100644 --- a/app/src/main/java/acr/browser/lightning/adblock/source/PreferencesHostsDataSourceProvider.kt +++ b/app/src/main/java/acr/browser/lightning/adblock/source/PreferencesHostsDataSourceProvider.kt @@ -1,13 +1,7 @@ package acr.browser.lightning.adblock.source -import acr.browser.lightning.browser.di.HostsClient -import acr.browser.lightning.log.Logger import acr.browser.lightning.preference.UserPreferences -import android.app.Application -import android.content.res.AssetManager import dagger.Reusable -import io.reactivex.Single -import okhttp3.OkHttpClient import javax.inject.Inject /** @@ -16,23 +10,15 @@ import javax.inject.Inject @Reusable class PreferencesHostsDataSourceProvider @Inject constructor( private val userPreferences: UserPreferences, - private val assetManager: AssetManager, - private val logger: Logger, - @HostsClient private val okHttpClient: Single, - private val application: Application + private val assetsHostsDataSource: AssetsHostsDataSource, + private val fileHostsDataSourceFactory: FileHostsDataSource.Factory, + private val urlHostsDataSourceFactory: UrlHostsDataSource.Factory ) : HostsDataSourceProvider { override fun createHostsDataSource(): HostsDataSource = when (val source = userPreferences.selectedHostsSource()) { - HostsSourceType.Default -> AssetsHostsDataSource(assetManager, logger) - is HostsSourceType.Local -> FileHostsDataSource(logger, source.file) - is HostsSourceType.Remote -> UrlHostsDataSource( - source.httpUrl, - okHttpClient, - logger, - userPreferences, - application - ) + HostsSourceType.Default -> assetsHostsDataSource + is HostsSourceType.Local -> fileHostsDataSourceFactory.create(source.file) + is HostsSourceType.Remote -> urlHostsDataSourceFactory.create(source.httpUrl) } - } diff --git a/app/src/main/java/acr/browser/lightning/adblock/source/UrlHostsDataSource.kt b/app/src/main/java/acr/browser/lightning/adblock/source/UrlHostsDataSource.kt index 9f546efcf..2f2c3ae5b 100644 --- a/app/src/main/java/acr/browser/lightning/adblock/source/UrlHostsDataSource.kt +++ b/app/src/main/java/acr/browser/lightning/adblock/source/UrlHostsDataSource.kt @@ -1,11 +1,15 @@ package acr.browser.lightning.adblock.source import acr.browser.lightning.adblock.parser.HostsFileParser +import acr.browser.lightning.browser.di.HostsClient import acr.browser.lightning.extensions.onIOExceptionResumeNext import acr.browser.lightning.log.Logger import acr.browser.lightning.preference.UserPreferences import acr.browser.lightning.preference.userAgent import android.app.Application +import dagger.assisted.Assisted +import dagger.assisted.AssistedFactory +import dagger.assisted.AssistedInject import io.reactivex.Single import okhttp3.Call import okhttp3.Callback @@ -19,9 +23,9 @@ import java.io.InputStreamReader /** * A [HostsDataSource] that loads hosts from an [HttpUrl]. */ -class UrlHostsDataSource( - private val url: HttpUrl, - private val okHttpClient: Single, +class UrlHostsDataSource @AssistedInject constructor( + @Assisted private val url: HttpUrl, + @HostsClient private val okHttpClient: Single, private val logger: Logger, private val userPreferences: UserPreferences, private val application: Application @@ -65,4 +69,15 @@ class UrlHostsDataSource( private const val TAG = "UrlHostsDataSource" } + /** + * Used to create the data source. + */ + @AssistedFactory + interface Factory { + /** + * Create the data source for the provided URL. + */ + fun create(url: HttpUrl): UrlHostsDataSource + } + } From 0dd9eb9403c182ee291f430c525615faf5fe4488 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Wed, 17 Aug 2022 21:16:32 -0400 Subject: [PATCH 159/161] Ensure that repository functions operate on the correct scheduler --- .../browser/lightning/browser/tab/TabsRepository.kt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt index 4cb5892ca..36e24329f 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabsRepository.kt @@ -50,7 +50,7 @@ class TabsRepository @Inject constructor( tabsList = tabsList - tab }.doOnComplete { tabsListObservable.onNext(tabsList) - } + }.subscribeOn(mainScheduler) override fun deleteAllTabs(): Completable = afterInitialization().flatMapCompletable { @@ -62,10 +62,11 @@ class TabsRepository @Inject constructor( } }.doOnComplete { tabsListObservable.onNext(tabsList) - } + }.subscribeOn(mainScheduler) override fun createTab(tabInitializer: TabInitializer): Single = afterInitialization().flatMap { createTabUnsafe(tabInitializer) } + .subscribeOn(mainScheduler) /** * Creates a tab without waiting for the browser to be initialized. @@ -81,10 +82,11 @@ class TabsRepository @Inject constructor( return@fromCallable tabAdapter }.doOnSuccess { tabsListObservable.onNext(tabsList) - } + }.subscribeOn(mainScheduler) override fun reopenTab(): Maybe = Maybe.fromCallable(recentTabModel::lastClosed) .flatMapSingleElement { createTab(BundleInitializer(it)) } + .subscribeOn(mainScheduler) override fun selectTab(id: Int): TabModel { val selected = tabsList.forId(id) @@ -101,6 +103,8 @@ class TabsRepository @Inject constructor( override fun initializeTabs(): Maybe> = Single.fromCallable(bundleStore::retrieve) + .subscribeOn(diskScheduler) + .observeOn(mainScheduler) .flatMapObservable { Observable.fromIterable(it) } .concatWith(Maybe.fromCallable { initialUrl }.map { if (it.isFileUrl()) { @@ -109,8 +113,6 @@ class TabsRepository @Inject constructor( UrlInitializer(it) } }) - .subscribeOn(diskScheduler) - .observeOn(mainScheduler) .flatMapSingle(::createTabUnsafe) .toList() .doOnSuccess { From 0e8730ee7e1eca2c9b6a7f92c0c3073e35633801 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Fri, 26 Aug 2022 09:51:02 -0400 Subject: [PATCH 160/161] Utilize a default title so that the tab title isn't ever blank --- .../browser/lightning/browser/di/AppModule.kt | 7 +++++++ .../lightning/browser/tab/DefaultTabTitle.kt | 9 +++++++++ .../lightning/browser/tab/TabAdapter.kt | 4 ++-- .../lightning/browser/tab/TabFactory.kt | 20 ++++++++++--------- 4 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 app/src/main/java/acr/browser/lightning/browser/tab/DefaultTabTitle.kt diff --git a/app/src/main/java/acr/browser/lightning/browser/di/AppModule.kt b/app/src/main/java/acr/browser/lightning/browser/di/AppModule.kt index cddd8528d..cc066707d 100644 --- a/app/src/main/java/acr/browser/lightning/browser/di/AppModule.kt +++ b/app/src/main/java/acr/browser/lightning/browser/di/AppModule.kt @@ -1,5 +1,7 @@ package acr.browser.lightning.browser.di +import acr.browser.lightning.R +import acr.browser.lightning.browser.tab.DefaultTabTitle import acr.browser.lightning.device.BuildInfo import acr.browser.lightning.device.BuildType import acr.browser.lightning.html.ListPageReader @@ -211,6 +213,11 @@ class AppModule { @Provides fun providesInvertPage(): InvertPage = MezzanineGenerator.InvertPage() + @DefaultTabTitle + @Provides + fun providesDefaultTabTitle(application: Application): String = + application.getString(R.string.untitled) + } @Qualifier diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/DefaultTabTitle.kt b/app/src/main/java/acr/browser/lightning/browser/tab/DefaultTabTitle.kt new file mode 100644 index 000000000..afc040a22 --- /dev/null +++ b/app/src/main/java/acr/browser/lightning/browser/tab/DefaultTabTitle.kt @@ -0,0 +1,9 @@ +package acr.browser.lightning.browser.tab + +import javax.inject.Qualifier + +/** + * The default title of a tab + */ +@Qualifier +annotation class DefaultTabTitle diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabAdapter.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabAdapter.kt index de7ffce63..e33264241 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabAdapter.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabAdapter.kt @@ -29,6 +29,7 @@ class TabAdapter( private val tabWebChromeClient: TabWebChromeClient, private val userPreferences: UserPreferences, private val defaultUserAgent: String, + private val defaultTabTitle: String, private val iconFreeze: Bitmap, private val proxy: Proxy ) : TabModel { @@ -140,14 +141,13 @@ class TabAdapter( override fun themeColorChanges(): Observable = tabWebChromeClient.colorChangeObservable - // TODO do we show "new tab" override val url: String get() = webView.url.orEmpty() override fun urlChanges(): Observable = tabWebViewClient.urlObservable.hide() override val title: String - get() = latentInitializer?.initialTitle ?: webView.title.orEmpty() + get() = latentInitializer?.initialTitle ?: webView.title ?: defaultTabTitle override fun titleChanges(): Observable = tabWebChromeClient.titleObservable.hide() diff --git a/app/src/main/java/acr/browser/lightning/browser/tab/TabFactory.kt b/app/src/main/java/acr/browser/lightning/browser/tab/TabFactory.kt index 567539eb9..d8ce45e47 100644 --- a/app/src/main/java/acr/browser/lightning/browser/tab/TabFactory.kt +++ b/app/src/main/java/acr/browser/lightning/browser/tab/TabFactory.kt @@ -15,6 +15,7 @@ class TabFactory @Inject constructor( private val webViewFactory: WebViewFactory, private val userPreferences: UserPreferences, @DefaultUserAgent private val defaultUserAgent: String, + @DefaultTabTitle private val defaultTabTitle: String, @IconFreeze private val iconFreeze: Bitmap, private val proxy: Proxy, private val tabWebViewClientFactory: TabWebViewClient.Factory, @@ -27,15 +28,16 @@ class TabFactory @Inject constructor( fun constructTab(tabInitializer: TabInitializer, webView: WebView): TabModel { val headers = webViewFactory.createRequestHeaders() return TabAdapter( - tabInitializer, - webView, - headers, - tabWebViewClientFactory.create(headers), - tabWebChromeClientProvider.get(), - userPreferences, - defaultUserAgent, - iconFreeze, - proxy + tabInitializer = tabInitializer, + webView = webView, + requestHeaders = headers, + tabWebViewClient = tabWebViewClientFactory.create(headers), + tabWebChromeClient = tabWebChromeClientProvider.get(), + userPreferences = userPreferences, + defaultUserAgent = defaultUserAgent, + defaultTabTitle = defaultTabTitle, + iconFreeze = iconFreeze, + proxy = proxy ) } } From 57f2642ef24c6af8f38020c361c889e4b1453c7e Mon Sep 17 00:00:00 2001 From: damiasgr <113806681+damiasgr@users.noreply.github.com> Date: Sun, 18 Sep 2022 04:42:07 +0430 Subject: [PATCH 161/161] Create SECURITY.pv Don't miss any updates from the following URL Adobe systems and processes of this privacy --- SECURITY.pv | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 SECURITY.pv diff --git a/SECURITY.pv b/SECURITY.pv new file mode 100644 index 000000000..9fc27cdf1 --- /dev/null +++ b/SECURITY.pv @@ -0,0 +1,5 @@ +# Security Policy + +##not Supported Versions + +#keep privare