Skip to content
Merged

fix ci #17117

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import com.nextcloud.client.preferences.AppPreferences
import com.nextcloud.client.preferences.AppPreferencesImpl
import com.owncloud.android.AbstractIT
import com.owncloud.android.datamodel.OCFile
import com.owncloud.android.datamodel.SyncedFolderProvider
import com.owncloud.android.lib.common.SearchResultEntry
import com.owncloud.android.ui.activity.FileDisplayActivity
import com.owncloud.android.ui.interfaces.UnifiedSearchCurrentDirItemAction
Expand Down Expand Up @@ -133,16 +132,9 @@ class UnifiedSearchListAdapterIT : AbstractIT() {
currentDirItems: List<OCFile> = emptyList(),
supportsCalendarContacts: Boolean = false
): UnifiedSearchListAdapter {
val syncedFolderProvider = SyncedFolderProvider(
targetContext.contentResolver,
preferences,
sut.clock
)

val accountManager = UserAccountManagerImpl.fromContext(targetContext)

overlayManager = OverlayManager(
syncedFolderProvider = syncedFolderProvider,
preferences = preferences,
viewThemeUtils = sut.viewThemeUtils,
context = targetContext,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,11 @@ class GallerySearchTask(
ocCapability: com.owncloud.android.lib.resources.status.OCCapability
): SearchRemoteOperation =
SearchRemoteOperation("", SearchRemoteOperation.SearchType.GALLERY_SEARCH, false, ocCapability).apply {
setLimit(limit)
setEndDate(endDate)
limit = this@GallerySearchTask.limit
endDate = this@GallerySearchTask.endDate

// workaround to keep SearchRemoteOperation functioning correctly even if we don't actively use startDate
setStartDate(0L)
startDate = 0L
}

private fun logSearchStart() {
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
androidCommonLibraryVersion = "0.33.2"
androidGifDrawableVersion = "1.2.31"
androidImageCropperVersion = "4.7.0"
androidLibraryVersion ="1c847678482c739d0b92e27a445d2f5f168f7d33"
androidLibraryVersion ="dd85553abaea1c05dc514268a3cf4a976535bc2b"
androidOpensslVersion = "3.5.6"
androidPluginVersion = "9.2.1"
androidsvgVersion = "1.4"
Expand Down
8 changes: 8 additions & 0 deletions gradle/verification-metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21877,6 +21877,14 @@
<sha256 value="4c8a390a4caf47a385c29aa6463399fbb149272d7bc5f3f50e371595f8c73605" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud" name="android-library" version="dd85553abaea1c05dc514268a3cf4a976535bc2b">
<artifact name="android-library-dd85553abaea1c05dc514268a3cf4a976535bc2b.aar">
<sha256 value="a7cdfc02c68f723b83cd262e6e6447bfe8453aac3084c57fb898208e069459ea" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
<artifact name="android-library-dd85553abaea1c05dc514268a3cf4a976535bc2b.module">
<sha256 value="26dc1367c9a62c1dd459b9577ec1bbeec653978b2054dd0bb2b754377f6afc71" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud" name="android-library" version="e0fb84cbb0">
<artifact name="android-library-e0fb84cbb0.aar">
<sha256 value="195b58450aae3eac4b8f24a8e6bb0e7795ab613a026d1c80cf096ee2df36cbd8" origin="Generated by Gradle" reason="Artifact is not signed"/>
Expand Down
Loading