Skip to content

fix build #17047

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alperozturk96 merged 2 commits into from
May 13, 2026
Merged

fix build #17047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2e7620
fix build
alperozturk96 May 13, 2026
92c8897
fix build
alperozturk96 May 13, 2026
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
1 change: 0 additions & 1 deletion app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,6 @@ class FileUploadHelper {
files: List<OCFile>,
accountName: String
): Pair<List<SyncedFolderEntity>, List<OCFile>> {

val autoUploadFolders = mutableListOf<SyncedFolderEntity>()
val nonAutoUploadFiles = mutableListOf<OCFile>()

Expand Down
5 changes: 0 additions & 5 deletions app/src/main/java/com/owncloud/android/ui/navigation/NavigatorActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,8 @@ class NavigatorActivity : DrawerActivity() {
this,
object : OnBackPressedCallback(true) {
override fun handleOnBackPressed() {
val onBackPressListener = supportFragmentManager.fragments
.filterIsInstance<NavigatorOnBackPressListener>()
.firstOrNull()

when {
isDrawerOpen -> closeDrawer()
onBackPressListener?.canInterceptBackPress() == true -> onBackPressListener.interceptBackPress()
supportFragmentManager.backStackEntryCount == 1 -> finish()
else -> pop()
}
Expand Down
7 changes: 4 additions & 3 deletions app/src/main/java/com/owncloud/android/utils/EncryptionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.nextcloud.client.account.User;
import com.nextcloud.common.SessionTimeOutKt;
import com.nextcloud.utils.e2ee.E2EVersionHelper;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.ArbitraryDataProvider;
Expand All @@ -42,7 +43,6 @@
import com.owncloud.android.lib.resources.e2ee.StoreMetadataRemoteOperation;
import com.owncloud.android.lib.resources.e2ee.StoreMetadataV2RemoteOperation;
import com.owncloud.android.lib.resources.e2ee.UnlockFileRemoteOperation;
import com.owncloud.android.lib.resources.e2ee.UnlockFileV1RemoteOperation;
import com.owncloud.android.lib.resources.e2ee.UpdateMetadataRemoteOperation;
import com.owncloud.android.lib.resources.e2ee.UpdateMetadataV2RemoteOperation;
import com.owncloud.android.lib.resources.files.model.ServerFileInterface;
Expand Down Expand Up @@ -1166,7 +1166,8 @@ public static boolean verifySHA512(String hashWithSalt, String compareToken) {
public static String lockFolder(ServerFileInterface parentFile, OwnCloudClient client, long counter) throws UploadException {
// Lock folder
LockFileRemoteOperation lockFileOperation = new LockFileRemoteOperation(parentFile.getLocalId(),
counter);
counter,
SessionTimeOutKt.getDefaultSessionTimeOut());
RemoteOperationResult<String> lockFileOperationResult = lockFileOperation.execute(client);

if (lockFileOperationResult.isSuccess() &&
Expand Down Expand Up @@ -1366,7 +1367,7 @@ public static RemoteOperationResult<Void> unlockFolder(ServerFileInterface paren

public static RemoteOperationResult<Void> unlockFolderV1(ServerFileInterface parentFolder, OwnCloudClient client, String token) {
if (token != null) {
return new UnlockFileV1RemoteOperation(parentFolder.getLocalId(), token).execute(client);
return new UnlockFileRemoteOperation(parentFolder.getLocalId(), token, SessionTimeOutKt.getDefaultSessionTimeOut(), false).execute(client);
} else {
return new RemoteOperationResult<>(new Exception("No token available"));
}
Expand Down
6 changes: 5 additions & 1 deletion app/src/test/java/com/nextcloud/client/jobs/BackgroundJobFactoryTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import com.owncloud.android.MainApp
import com.owncloud.android.datamodel.ArbitraryDataProvider
import com.owncloud.android.datamodel.SyncedFolderProvider
import com.owncloud.android.datamodel.UploadsStorageManager
import com.owncloud.android.operations.factory.UploadFileOperationFactory
import com.owncloud.android.utils.theme.ViewThemeUtils
import io.mockk.every
import io.mockk.mockk
Expand Down Expand Up @@ -112,6 +113,8 @@ class BackgroundJobFactoryTest {

@Mock private lateinit var fileDao: FileDao

@Mock private lateinit var uploadFileOperationFactory: UploadFileOperationFactory

private lateinit var factory: BackgroundJobFactory

@Before
Expand Down Expand Up @@ -143,7 +146,8 @@ class BackgroundJobFactoryTest {
{ localBroadcastManager },
generatePDFUseCase,
syncedFolderProvider,
db
db,
uploadFileOperationFactory
)
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
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 ="cd6ef9c073cd7c23bd36f9712d1f8c1030cc6804"
androidLibraryVersion ="rc-2.23.1"
androidPluginVersion = "9.1.0"
androidsvgVersion = "1.4"
androidxMediaVersion = "1.5.1"
Expand Down
22 changes: 22 additions & 0 deletions gradle/verification-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
<trusting group="^com[.]android($|([.].*))" regex="true"/>
</trusted-key>
<trusted-key id="0F06FF86BEEAF4E71866EE5232EE5355A6BC6E42">
<trusting group="androidx.annotation"/>
<trusting group="androidx.annotation" name="annotation-experimental" version="1.5.0"/>
<trusting group="androidx.appcompat"/>
<trusting group="androidx.collection"/>
Expand Down Expand Up @@ -20909,6 +20910,14 @@
<sha256 value="e7ab2429aded8474972439b212bc68e7bd7dd9663abf0cdbd1d448df2476acab" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud" name="android-library" version="21d2e1cae1b9d6c6fb472f356c05a215a88e2856">
<artifact name="android-library-21d2e1cae1b9d6c6fb472f356c05a215a88e2856.aar">
<sha256 value="2fbe1710b99ab094a4a0c7d1fb6cb32241dfc78188af994fd1ea6e214a754d84" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
<artifact name="android-library-21d2e1cae1b9d6c6fb472f356c05a215a88e2856.module">
<sha256 value="05ce1ac44f5290dee015ba5df5c0da39baab86eec068c747622057b60a0c52ef" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud" name="android-library" version="264b979b78f04ed2885c0c06f589fbf4080be932">
<artifact name="android-library-264b979b78f04ed2885c0c06f589fbf4080be932.aar">
<sha256 value="94784ab20e947be2b8d08cca16a1bc6ea393d1f7513c6df38d04ff6b61ddb846" origin="Generated by Gradle" reason="Artifact is not signed"/>
Expand Down Expand Up @@ -21978,6 +21987,14 @@
<sha256 value="6e59167e6060955b1ff344cc87870b2386a5b03375ede40288f907c316326851" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud" name="android-library" version="rc-2.23.1">
<artifact name="android-library-rc-2.23.1.aar">
<sha256 value="2fbe1710b99ab094a4a0c7d1fb6cb32241dfc78188af994fd1ea6e214a754d84" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
<artifact name="android-library-rc-2.23.1.module">
<sha256 value="0632e2c7b2a9be39b6902f6fb3b5e788cb6cca05d9db3d07fefbb8b5a7130902" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud-deps" name="qrcodescanner" version="0.1.2.4">
<artifact name="qrcodescanner-0.1.2.4.aar">
<sha256 value="b286128792cc04f59b0defa2c937c86d9e2fc824a8011b9af9eea7fd0ea84303" origin="Generated by Gradle" reason="Artifact is not signed"/>
Expand Down Expand Up @@ -26084,6 +26101,11 @@
<sha256 value="77ed42c8c8b2cebbb93ac9e07543ff6418aa24bdb8517580cf5324e9a6510956" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.guava" name="guava" version="33.6.0-jre">
<artifact name="guava-33.6.0-android.jar">
<sha256 value="9532ca9ba8aceb4cd2067171f981c799988b7f5844e3e274811a3bb757034bc4" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.google.guava" name="guava-parent" version="26.0-android">
<artifact name="guava-parent-26.0-android.pom">
<sha256 value="f8698ab46ca996ce889c1afc8ca4f25eb8ac6b034dc898d4583742360016cc04" origin="Generated by Gradle"/>
Expand Down
Loading