Skip to content

Commit 440b22d

Browse files
Merge pull request #17117 from nextcloud/fix/ci-v2
fix ci
2 parents cb6f8b9 + 5e0c50d commit 440b22d

4 files changed

Lines changed: 13 additions & 12 deletions

File tree

app/src/androidTest/java/com/owncloud/android/ui/adapter/UnifiedSearchListAdapterIT.kt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import com.nextcloud.client.preferences.AppPreferences
1515
import com.nextcloud.client.preferences.AppPreferencesImpl
1616
import com.owncloud.android.AbstractIT
1717
import com.owncloud.android.datamodel.OCFile
18-
import com.owncloud.android.datamodel.SyncedFolderProvider
1918
import com.owncloud.android.lib.common.SearchResultEntry
2019
import com.owncloud.android.ui.activity.FileDisplayActivity
2120
import com.owncloud.android.ui.interfaces.UnifiedSearchCurrentDirItemAction
@@ -133,16 +132,9 @@ class UnifiedSearchListAdapterIT : AbstractIT() {
133132
currentDirItems: List<OCFile> = emptyList(),
134133
supportsCalendarContacts: Boolean = false
135134
): UnifiedSearchListAdapter {
136-
val syncedFolderProvider = SyncedFolderProvider(
137-
targetContext.contentResolver,
138-
preferences,
139-
sut.clock
140-
)
141-
142135
val accountManager = UserAccountManagerImpl.fromContext(targetContext)
143136

144137
overlayManager = OverlayManager(
145-
syncedFolderProvider = syncedFolderProvider,
146138
preferences = preferences,
147139
viewThemeUtils = sut.viewThemeUtils,
148140
context = targetContext,

app/src/main/java/com/owncloud/android/ui/asynctasks/GallerySearchTask.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,11 @@ class GallerySearchTask(
7070
ocCapability: com.owncloud.android.lib.resources.status.OCCapability
7171
): SearchRemoteOperation =
7272
SearchRemoteOperation("", SearchRemoteOperation.SearchType.GALLERY_SEARCH, false, ocCapability).apply {
73-
setLimit(limit)
74-
setEndDate(endDate)
73+
limit = this@GallerySearchTask.limit
74+
endDate = this@GallerySearchTask.endDate
75+
7576
// workaround to keep SearchRemoteOperation functioning correctly even if we don't actively use startDate
76-
setStartDate(0L)
77+
startDate = 0L
7778
}
7879

7980
private fun logSearchStart() {

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
androidCommonLibraryVersion = "0.33.2"
66
androidGifDrawableVersion = "1.2.31"
77
androidImageCropperVersion = "4.7.0"
8-
androidLibraryVersion ="1c847678482c739d0b92e27a445d2f5f168f7d33"
8+
androidLibraryVersion ="dd85553abaea1c05dc514268a3cf4a976535bc2b"
99
androidOpensslVersion = "3.5.6"
1010
androidPluginVersion = "9.2.1"
1111
androidsvgVersion = "1.4"

gradle/verification-metadata.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21877,6 +21877,14 @@
2187721877
<sha256 value="4c8a390a4caf47a385c29aa6463399fbb149272d7bc5f3f50e371595f8c73605" origin="Generated by Gradle" reason="Artifact is not signed"/>
2187821878
</artifact>
2187921879
</component>
21880+
<component group="com.github.nextcloud" name="android-library" version="dd85553abaea1c05dc514268a3cf4a976535bc2b">
21881+
<artifact name="android-library-dd85553abaea1c05dc514268a3cf4a976535bc2b.aar">
21882+
<sha256 value="a7cdfc02c68f723b83cd262e6e6447bfe8453aac3084c57fb898208e069459ea" origin="Generated by Gradle" reason="Artifact is not signed"/>
21883+
</artifact>
21884+
<artifact name="android-library-dd85553abaea1c05dc514268a3cf4a976535bc2b.module">
21885+
<sha256 value="26dc1367c9a62c1dd459b9577ec1bbeec653978b2054dd0bb2b754377f6afc71" origin="Generated by Gradle" reason="Artifact is not signed"/>
21886+
</artifact>
21887+
</component>
2188021888
<component group="com.github.nextcloud" name="android-library" version="e0fb84cbb0">
2188121889
<artifact name="android-library-e0fb84cbb0.aar">
2188221890
<sha256 value="195b58450aae3eac4b8f24a8e6bb0e7795ab613a026d1c80cf096ee2df36cbd8" origin="Generated by Gradle" reason="Artifact is not signed"/>

0 commit comments

Comments
 (0)