Skip to content

Commit 1d85b71

Browse files
malmsteinmalmstein
committed
instead of just swallowing the error, we make sure the condition for the crash is not met
1 parent b7d7023 commit 1d85b71

File tree

1 file changed

+46
-27
lines changed

1 file changed

+46
-27
lines changed

‎app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt‎

Lines changed: 46 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,7 @@ import android.view.KeyEvent
4343
import android.view.LayoutInflater
4444
import android.view.MenuItem
4545
import android.view.View
46-
import android.view.View.GONE
47-
import android.view.View.OnFocusChangeListener
48-
import android.view.View.VISIBLE
49-
import android.view.View.inflate
46+
import android.view.View.*
5047
import android.view.ViewGroup
5148
import android.view.inputmethod.EditorInfo
5249
import android.webkit.ValueCallback
@@ -55,9 +52,7 @@ import android.webkit.WebSettings
5552
import android.webkit.WebView
5653
import android.webkit.WebView.FindListener
5754
import android.webkit.WebView.HitTestResult
58-
import android.webkit.WebView.HitTestResult.IMAGE_TYPE
59-
import android.webkit.WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE
60-
import android.webkit.WebView.HitTestResult.UNKNOWN_TYPE
55+
import android.webkit.WebView.HitTestResult.*
6156
import android.webkit.WebViewDatabase
6257
import android.widget.EditText
6358
import android.widget.TextView
@@ -84,14 +79,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
8479
import com.duckduckgo.app.autocomplete.api.AutoComplete.AutoCompleteSuggestion
8580
import com.duckduckgo.app.bookmarks.ui.EditBookmarkDialogFragment
8681
import com.duckduckgo.app.brokensite.BrokenSiteActivity
87-
import com.duckduckgo.app.browser.BrowserTabViewModel.AutoCompleteViewState
88-
import com.duckduckgo.app.browser.BrowserTabViewModel.BrowserViewState
89-
import com.duckduckgo.app.browser.BrowserTabViewModel.Command
90-
import com.duckduckgo.app.browser.BrowserTabViewModel.CtaViewState
91-
import com.duckduckgo.app.browser.BrowserTabViewModel.FindInPageViewState
92-
import com.duckduckgo.app.browser.BrowserTabViewModel.GlobalLayoutViewState
93-
import com.duckduckgo.app.browser.BrowserTabViewModel.LoadingViewState
94-
import com.duckduckgo.app.browser.BrowserTabViewModel.OmnibarViewState
82+
import com.duckduckgo.app.browser.BrowserTabViewModel.*
9583
import com.duckduckgo.app.browser.autocomplete.BrowserAutoCompleteSuggestionsAdapter
9684
import com.duckduckgo.app.browser.downloader.FileDownloadNotificationManager
9785
import com.duckduckgo.app.browser.downloader.FileDownloader
@@ -118,7 +106,20 @@ import com.duckduckgo.app.cta.ui.HomeTopPanelCta
118106
import com.duckduckgo.app.global.ViewModelFactory
119107
import com.duckduckgo.app.global.device.DeviceInfo
120108
import com.duckduckgo.app.global.model.orderedTrackingEntities
121-
import com.duckduckgo.app.global.view.*
109+
import com.duckduckgo.app.global.view.DaxDialog
110+
import com.duckduckgo.app.global.view.DaxDialogListener
111+
import com.duckduckgo.app.global.view.NonDismissibleBehavior
112+
import com.duckduckgo.app.global.view.TextChangedWatcher
113+
import com.duckduckgo.app.global.view.gone
114+
import com.duckduckgo.app.global.view.hide
115+
import com.duckduckgo.app.global.view.hideKeyboard
116+
import com.duckduckgo.app.global.view.isDifferent
117+
import com.duckduckgo.app.global.view.isImmersiveModeEnabled
118+
import com.duckduckgo.app.global.view.renderIfChanged
119+
import com.duckduckgo.app.global.view.show
120+
import com.duckduckgo.app.global.view.showKeyboard
121+
import com.duckduckgo.app.global.view.toPx
122+
import com.duckduckgo.app.global.view.toggleFullScreen
122123
import com.duckduckgo.app.privacy.model.PrivacyGrade
123124
import com.duckduckgo.app.privacy.renderer.icon
124125
import com.duckduckgo.app.privacy.store.PrivacySettingsStore
@@ -155,7 +156,16 @@ import kotlinx.android.synthetic.main.include_new_browser_tab.ctaContainer
155156
import kotlinx.android.synthetic.main.include_new_browser_tab.ctaTopContainer
156157
import kotlinx.android.synthetic.main.include_new_browser_tab.ddgLogo
157158
import kotlinx.android.synthetic.main.include_new_browser_tab.newTabLayout
158-
import kotlinx.android.synthetic.main.include_omnibar_toolbar.*
159+
import kotlinx.android.synthetic.main.include_omnibar_toolbar.appBarLayout
160+
import kotlinx.android.synthetic.main.include_omnibar_toolbar.browserMenu
161+
import kotlinx.android.synthetic.main.include_omnibar_toolbar.clearTextButton
162+
import kotlinx.android.synthetic.main.include_omnibar_toolbar.networksContainer
163+
import kotlinx.android.synthetic.main.include_omnibar_toolbar.omnibarTextInput
164+
import kotlinx.android.synthetic.main.include_omnibar_toolbar.pageLoadingIndicator
165+
import kotlinx.android.synthetic.main.include_omnibar_toolbar.privacyGradeButton
166+
import kotlinx.android.synthetic.main.include_omnibar_toolbar.searchIcon
167+
import kotlinx.android.synthetic.main.include_omnibar_toolbar.toolbar
168+
import kotlinx.android.synthetic.main.include_omnibar_toolbar.toolbarContainer
159169
import kotlinx.android.synthetic.main.include_omnibar_toolbar.view.browserMenu
160170
import kotlinx.android.synthetic.main.include_omnibar_toolbar.view.fireIconMenu
161171
import kotlinx.android.synthetic.main.include_omnibar_toolbar.view.privacyGradeButton
@@ -166,7 +176,18 @@ import kotlinx.android.synthetic.main.layout_browser_bottom_navigation_bar.botto
166176
import kotlinx.android.synthetic.main.layout_browser_bottom_navigation_bar.bottomBarSearchItem
167177
import kotlinx.android.synthetic.main.layout_browser_bottom_navigation_bar.bottomBarTabsItem
168178
import kotlinx.android.synthetic.main.popup_window_browser_bottom_tab_menu.view.sharePopupMenuItem
169-
import kotlinx.android.synthetic.main.popup_window_browser_menu.view.*
179+
import kotlinx.android.synthetic.main.popup_window_browser_menu.view.addBookmarksPopupMenuItem
180+
import kotlinx.android.synthetic.main.popup_window_browser_menu.view.addToHome
181+
import kotlinx.android.synthetic.main.popup_window_browser_menu.view.backPopupMenuItem
182+
import kotlinx.android.synthetic.main.popup_window_browser_menu.view.bookmarksPopupMenuItem
183+
import kotlinx.android.synthetic.main.popup_window_browser_menu.view.brokenSitePopupMenuItem
184+
import kotlinx.android.synthetic.main.popup_window_browser_menu.view.findInPageMenuItem
185+
import kotlinx.android.synthetic.main.popup_window_browser_menu.view.forwardPopupMenuItem
186+
import kotlinx.android.synthetic.main.popup_window_browser_menu.view.newTabPopupMenuItem
187+
import kotlinx.android.synthetic.main.popup_window_browser_menu.view.refreshPopupMenuItem
188+
import kotlinx.android.synthetic.main.popup_window_browser_menu.view.requestDesktopSiteCheckMenuItem
189+
import kotlinx.android.synthetic.main.popup_window_browser_menu.view.settingsPopupMenuItem
190+
import kotlinx.android.synthetic.main.popup_window_browser_menu.view.sharePageMenuItem
170191
import kotlinx.coroutines.CoroutineScope
171192
import kotlinx.coroutines.Dispatchers
172193
import kotlinx.coroutines.GlobalScope
@@ -1439,17 +1460,15 @@ class BrowserTabFragment : Fragment(), FindListener, CoroutineScope, DaxDialogLi
14391460
}
14401461

14411462
private fun showBottomBar(shouldAnimate: Boolean) {
1442-
try {
1443-
if (shouldAnimate) {
1444-
bottomNavigationBar.show()
1445-
bottomNavigationBar.animateBarVisibility(isVisible = true)
1446-
} else {
1447-
bottomNavigationBar.postDelayed(KEYBOARD_DELAY) {
1463+
if (shouldAnimate) {
1464+
bottomNavigationBar.show()
1465+
bottomNavigationBar.animateBarVisibility(isVisible = true)
1466+
} else {
1467+
bottomNavigationBar.postDelayed(KEYBOARD_DELAY) {
1468+
if (bottomNavigationBar != null) {
14481469
bottomNavigationBar.show()
14491470
}
14501471
}
1451-
} catch (e: Exception){
1452-
Timber.d("Could not show Bottom Bar, ${e.localizedMessage}")
14531472
}
14541473
}
14551474

@@ -1500,7 +1519,7 @@ class BrowserTabFragment : Fragment(), FindListener, CoroutineScope, DaxDialogLi
15001519
}
15011520

15021521
fun incrementTabs() {
1503-
if (isBottomNavigationFeatureEnabled()){
1522+
if (isBottomNavigationFeatureEnabled()) {
15041523
bottomBarTabsItem.increment {
15051524
addTabsObserver()
15061525
}

0 commit comments

Comments
 (0)