Skip to content

Commit

Permalink
Update dependencies (#2023)
Browse files Browse the repository at this point in the history
  • Loading branch information
joshliebe authored Jul 1, 2022
1 parent 34e786f commit 31c27e0
Show file tree
Hide file tree
Showing 12 changed files with 27 additions and 28 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ class BookmarksActivity : DuckDuckGoActivity() {
).show()
}

override fun onCreateOptionsMenu(menu: Menu?): Boolean {
override fun onCreateOptionsMenu(menu: Menu): Boolean {
menuInflater.inflate(R.menu.bookmark_activity_menu, menu)
return true
}
Expand Down Expand Up @@ -255,8 +255,8 @@ class BookmarksActivity : DuckDuckGoActivity() {
return super.onOptionsItemSelected(item)
}

override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
searchMenuItem = menu?.findItem(R.id.action_search)
override fun onPrepareOptionsMenu(menu: Menu): Boolean {
searchMenuItem = menu.findItem(R.id.action_search)
setSearchMenuItemVisibility()
initializeSearchBar()
return super.onPrepareOptionsMenu(menu)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class BookmarkFoldersActivity : DuckDuckGoActivity() {
)
}

override fun onCreateOptionsMenu(menu: Menu?): Boolean {
override fun onCreateOptionsMenu(menu: Menu): Boolean {
val addFolderFlag = intent.extras?.getBoolean(KEY_ADD_FOLDER_FLAG) ?: false
if (addFolderFlag) menuInflater.inflate(R.menu.bookmark_folders_activity_menu, menu)
return true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class DownloadsActivity : DuckDuckGoActivity() {
}
}

override fun onCreateOptionsMenu(menu: Menu?): Boolean {
override fun onCreateOptionsMenu(menu: Menu): Boolean {
menuInflater.inflate(R.menu.downloads_activity_menu, menu)
return true
}
Expand All @@ -102,8 +102,8 @@ class DownloadsActivity : DuckDuckGoActivity() {
return super.onOptionsItemSelected(item)
}

override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
searchMenuItem = menu?.findItem(R.id.action_search)
override fun onPrepareOptionsMenu(menu: Menu): Boolean {
searchMenuItem = menu.findItem(R.id.action_search)
initializeSearchBar()
return super.onPrepareOptionsMenu(menu)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class FireproofWebsitesActivity : DuckDuckGoActivity(), FireproofSettingsSelecto
observeViewModel()
}

override fun onCreateOptionsMenu(menu: Menu?): Boolean {
override fun onCreateOptionsMenu(menu: Menu): Boolean {
menuInflater.inflate(R.menu.menu_fireproof_websites_activity, menu)
return true
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ class DefaultBrowserPage : OnboardingPageFragment() {
}
}

viewModel.command.observe(this) {
viewModel.command.observe(viewLifecycleOwner) {
when (it) {
is DefaultBrowserPageViewModel.Command.OpenDialog -> onLaunchDefaultBrowserWithDialogClicked(it.url)
is DefaultBrowserPageViewModel.Command.OpenSettings -> onLaunchDefaultBrowserSettingsClicked()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class WhitelistActivity : DuckDuckGoActivity() {
observeViewModel()
}

override fun onCreateOptionsMenu(menu: Menu?): Boolean {
override fun onCreateOptionsMenu(menu: Menu): Boolean {
menuInflater.inflate(R.menu.whitelist_activity_menu, menu)
return true
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine
}
}

override fun onCreateOptionsMenu(menu: Menu?): Boolean {
override fun onCreateOptionsMenu(menu: Menu): Boolean {
menuInflater.inflate(R.menu.menu_tab_switcher_activity, menu)
return true
}
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("de.fayard.refreshVersions") version "0.40.1"
id("de.fayard.refreshVersions") version "0.40.2"
}

include ':app'
Expand Down
22 changes: 11 additions & 11 deletions versions.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#### Dependencies and Plugin versions with their available updates.
#### Generated by `./gradlew refreshVersions` version 0.40.1
#### Generated by `./gradlew refreshVersions` version 0.40.2
####
#### Don't manually edit or split the comments that start with four hashtags (####),
#### they will be overwritten by refreshVersions.
Expand All @@ -21,11 +21,11 @@ version.androidx.recyclerview=1.2.1

version.androidx.core=1.8.0

version.androidx.fragment=1.4.1
version.androidx.fragment=1.5.0

version.androidx.legacy=1.0.0

version.androidx.lifecycle=2.4.1
version.androidx.lifecycle=2.5.0

version.androidx.room=2.4.2

Expand Down Expand Up @@ -63,7 +63,7 @@ version.com.github.bumptech.glide..okhttp3-integration=4.13.2

version.com.nhaarman.mockitokotlin2..mockito-kotlin=2.2.0

version.google.android.material=1.6.0
version.google.android.material=1.6.1

version.google.dagger=2.42

Expand All @@ -73,17 +73,17 @@ version.jakewharton.timber=5.0.1

version.kotlin=1.6.21

version.kotlinx.coroutines=1.6.2
version.kotlinx.coroutines=1.6.3

version.leakcanary=2.9.1

version.mockito=4.4.0

version.moshi=1.8.0

version.okhttp3=4.9.3
version.okhttp3=4.10.0

version.okio=3.1.0
version.okio=3.2.0

version.org.apache.commons..commons-math3=3.6.1

Expand All @@ -93,23 +93,23 @@ version.retrofit2=2.9.0

version.junit.junit=4.13.2

version.org.jsoup..jsoup=1.14.3
version.org.jsoup..jsoup=1.15.1

version.com.jakewharton.retrofit..retrofit2-kotlin-coroutines-adapter=0.9.2

version.androidx.viewpager2=1.0.0

version.robolectric=4.7.3
version.robolectric=4.8.1

version.com.facebook.shimmer..shimmer=0.5.0

version.com.jakewharton.threetenabp..threetenabp=1.4.0

version.org.threeten..threetenbp=1.6.0

version.com.facebook.flipper..flipper=0.145.0
version.com.facebook.flipper..flipper=0.152.0

version.com.facebook.soloader..soloader=0.10.3
version.com.facebook.soloader..soloader=0.10.4

version.rxjava2.rxandroid=2.0.2

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ class TrackingProtectionExclusionListActivity :
return true
}

override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
val restoreDefault = menu?.findItem(R.id.restoreDefaults)
override fun onPrepareOptionsMenu(menu: Menu): Boolean {
val restoreDefault = menu.findItem(R.id.restoreDefaults)
// onPrepareOptionsMenu is called when overflow menu is being displayed, that's why this can be an imperative call
restoreDefault?.isEnabled = viewModel.canRestoreDefaults()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class ReportBreakageContract : ActivityResultContract<ReportBreakageScreen, Issu

override fun createIntent(
context: Context,
input: ReportBreakageScreen?
input: ReportBreakageScreen
): Intent {
return when (input) {
ReportBreakageScreen.ListOfInstalledApps -> ReportBreakageAppListActivity.intent(context)
Expand All @@ -37,7 +37,6 @@ class ReportBreakageContract : ActivityResultContract<ReportBreakageScreen, Issu
is ReportBreakageScreen.LoginInformation -> {
ReportBreakageSingleChoiceFormActivity.intent(context, BrokenApp(appName = input.appName, appPackageId = input.appPackageId))
}
null -> throw IllegalStateException("Screen must be specified")
}
}

Expand Down
2 changes: 1 addition & 1 deletion vpn/src/main/java/dummy/ui/VpnDiagnosticsActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ class VpnDiagnosticsActivity : DuckDuckGoActivity(), CoroutineScope by MainScope
timerUpdateJob?.cancel()
}

override fun onCreateOptionsMenu(menu: Menu?): Boolean {
override fun onCreateOptionsMenu(menu: Menu): Boolean {
menuInflater.inflate(R.menu.vpn_network_info_menu, menu)
return true
}
Expand Down

0 comments on commit 31c27e0

Please sign in to comment.