Skip to content

Commit

Permalink
Merge pull request #4015 from owncloud/bump_room_dependency
Browse files Browse the repository at this point in the history
Bump room dependency to 2.5.1
  • Loading branch information
abelgardep authored Apr 14, 2023
2 parents a5dbb44 + e4da44d commit 92381d4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
// Android jetpack
androidxArchCore = "2.2.0"
androidxLifecycle = "2.5.1"
androidxRoom = "2.5.0"
androidxRoom = "2.5.1"
androidxCore = "1.9.0"
androidxFragment = "1.5.5"
androidxAppcompat = "1.5.1"
Expand Down
2 changes: 1 addition & 1 deletion owncloudApp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies {
implementation "androidx.lifecycle:lifecycle-common-java8:$androidxLifecycle"
implementation "androidx.preference:preference-ktx:1.2.0"
implementation "androidx.room:room-runtime:$androidxRoom"
implementation "androidx.sqlite:sqlite-ktx:2.3.0"
implementation "androidx.sqlite:sqlite-ktx:2.3.1"
implementation "androidx.work:work-runtime-ktx:2.8.1"
implementation("androidx.browser:browser:1.5.0") { because "CustomTabs required for OAuth2 and OIDC" }
implementation("androidx.enterprise:enterprise-feedback:1.1.0") { because "MDM feedback" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ open class FolderPickerActivity : FileActivity(),
private lateinit var pickerMode: PickerMode

private lateinit var binding: FilesFolderPickerBinding
override fun onCreate(savedInstanceState:Bundle?) {

override fun onCreate(savedInstanceState: Bundle?) {
Timber.d("onCreate() start")

super.onCreate(savedInstanceState)
Expand All @@ -60,7 +61,6 @@ open class FolderPickerActivity : FileActivity(),
setContentView(binding.root)

// Allow or disallow touches with other visible windows

binding.filesFolderPickerLayout.filterTouchesWhenObscured = PreferenceUtils.shouldDisallowTouchesWithOtherVisibleWindows(this)

pickerMode = intent.getSerializableExtra(EXTRA_PICKER_MODE) as PickerMode
Expand Down

0 comments on commit 92381d4

Please sign in to comment.