diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 9b81857cd6..6b8d740b7b 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:noble@sha256:6015f66923d7afbc53558d7ccffd325d43b4e249f41a6e93eef074c9505d2233 +FROM ubuntu:noble@sha256:b59d21599a2b151e23eea5f6602f4af4d7d31c4e236d22bf0b62b86d2e386b8f ARG DEBIAN_FRONTEND=noninteractive ENV ANDROID_HOME=/usr/lib/android-sdk diff --git a/Gemfile.lock b/Gemfile.lock index 35847a855e..bb65c22ba4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,25 +9,26 @@ GEM public_suffix (>= 2.0.2, < 7.0) artifactory (3.0.17) atomos (0.1.3) - aws-eventstream (1.3.2) - aws-partitions (1.1066.0) - aws-sdk-core (3.220.2) + aws-eventstream (1.4.0) + aws-partitions (1.1115.0) + aws-sdk-core (3.225.2) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) base64 jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.99.0) - aws-sdk-core (~> 3, >= 3.216.0) + logger + aws-sdk-kms (1.104.0) + aws-sdk-core (~> 3, >= 3.225.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.182.0) - aws-sdk-core (~> 3, >= 3.216.0) + aws-sdk-s3 (1.189.1) + aws-sdk-core (~> 3, >= 3.225.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) - aws-sigv4 (1.11.0) + aws-sigv4 (1.12.1) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) - base64 (0.2.0) + base64 (0.3.0) cgi (0.4.1) claide (1.1.0) colored (1.2) @@ -70,7 +71,7 @@ GEM faraday_middleware (1.2.1) faraday (~> 1.0) fastimage (2.4.0) - fastlane (2.227.2) + fastlane (2.228.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -159,22 +160,23 @@ GEM httpclient (2.9.0) mutex_m jmespath (1.6.2) - json (2.10.2) + json (2.12.2) jwt (2.10.1) base64 + logger (1.7.0) mini_magick (4.13.2) mini_mime (1.1.5) multi_json (1.15.0) multipart-post (2.4.1) mutex_m (0.3.0) nanaimo (0.4.0) - naturally (2.2.1) + naturally (2.2.2) nkf (0.2.0) optparse (0.6.0) os (1.1.4) plist (3.7.2) public_suffix (6.0.2) - rake (13.2.1) + rake (13.3.0) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -185,7 +187,7 @@ GEM ruby2_keywords (0.0.5) rubyzip (2.4.1) security (0.1.5) - signet (0.19.0) + signet (0.20.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) diff --git a/app/build.gradle b/app/build.gradle index d94907dd70..74ccb14765 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -313,19 +313,19 @@ dependencies { implementation "androidx.appcompat:appcompat:$appCompatVersion" implementation "androidx.webkit:webkit:1.12.1" implementation "androidx.cardview:cardview:1.0.0" - implementation "androidx.exifinterface:exifinterface:1.4.0" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7" - implementation "androidx.lifecycle:lifecycle-service:2.8.7" + implementation "androidx.exifinterface:exifinterface:1.4.1" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.1" + implementation "androidx.lifecycle:lifecycle-service:2.9.1" implementation "androidx.work:work-runtime:$workRuntime" implementation "androidx.work:work-runtime-ktx:$workRuntime" - implementation "androidx.fragment:fragment-ktx:1.8.6" + implementation "androidx.fragment:fragment-ktx:1.8.8" implementation "com.github.albfernandez:juniversalchardet:2.0.3" // need this version for Android <7 compileOnly "com.google.code.findbugs:annotations:3.0.1u2" implementation "commons-io:commons-io:2.18.0" implementation "org.greenrobot:eventbus:3.3.1" implementation "com.googlecode.ez-vcard:ez-vcard:0.12.1" implementation "org.lukhnos:nnio:0.3.1" - implementation "org.bouncycastle:bcpkix-jdk18on:1.80" + implementation "org.bouncycastle:bcpkix-jdk18on:1.81" implementation "com.google.code.gson:gson:2.13.1" implementation "com.github.nextcloud-deps:sectioned-recyclerview:0.6.1" implementation "com.github.chrisbanes:PhotoView:2.3.0" @@ -338,7 +338,7 @@ dependencies { implementation "com.caverock:androidsvg:1.4" implementation "androidx.annotation:annotation:1.9.1" implementation "com.vanniktech:emoji-google:0.21.0" - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.1") // document scanner not available on FDroid (generic) due to OpenCV binaries gplayImplementation project(":appscan") @@ -346,7 +346,7 @@ dependencies { qaImplementation project(":appscan") spotbugsPlugins "com.h3xstream.findsecbugs:findsecbugs-plugin:1.14.0" - spotbugsPlugins "com.mebigfatguy.fb-contrib:fb-contrib:7.6.9" + spotbugsPlugins "com.mebigfatguy.fb-contrib:fb-contrib:7.6.10" implementation "com.google.dagger:dagger:$daggerVersion" implementation "com.google.dagger:dagger-android:$daggerVersion" @@ -391,7 +391,7 @@ dependencies { testImplementation "junit:junit:4.13.2" testImplementation "org.mockito:mockito-core:$mockitoVersion" testImplementation "androidx.test:core:$androidxTestVersion" - testImplementation "org.json:json:20250107" + testImplementation "org.json:json:20250517" testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion" testImplementation "androidx.arch.core:core-testing:2.2.0" testImplementation "io.mockk:mockk:$mockkVersion" diff --git a/app/src/androidTest/java/com/owncloud/android/ui/fragment/OCFileListFragmentStaticServerIT.kt b/app/src/androidTest/java/com/owncloud/android/ui/fragment/OCFileListFragmentStaticServerIT.kt index cbacb56a4b..05e4a0d847 100644 --- a/app/src/androidTest/java/com/owncloud/android/ui/fragment/OCFileListFragmentStaticServerIT.kt +++ b/app/src/androidTest/java/com/owncloud/android/ui/fragment/OCFileListFragmentStaticServerIT.kt @@ -392,7 +392,7 @@ class OCFileListFragmentStaticServerIT : AbstractIT() { testFolder.richWorkspace = "1" activity.storageManager.saveFile(testFolder) - sut.adapter.currentDirectory = testFolder + sut.adapter.setCurrentDirectory(testFolder) Assert.assertTrue(sut.adapter.shouldShowHeader()) } } diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java index 47c2148817..d81f0b5e4c 100644 --- a/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java +++ b/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java @@ -119,7 +119,6 @@ public class OCFileListAdapter extends RecyclerView.Adapter mFiles = new ArrayList<>(); private final List mFilesAll = new ArrayList<>(); private final boolean hideItemOptions; - private long lastTimestamp; private boolean gridView; public ArrayList listOfHiddenFiles = new ArrayList<>(); private FileDataStorageManager mStorageManager; @@ -144,7 +143,6 @@ public class OCFileListAdapter extends RecyclerView.Adapter recommendedFiles = new ArrayList<>(); @@ -179,7 +177,6 @@ public class OCFileListAdapter extends RecyclerView.Adapter 0 && mStorageManager != null) { + if (!objects.isEmpty() && mStorageManager != null) { if (searchType == SearchType.SHARED_FILTER) { parseShares(objects); } else { @@ -1004,16 +1000,6 @@ public class OCFileListAdapter extends RecyclerView.Adapter getAllFiles() { - return mFilesAll; - } - - public OCFile getCurrentDirectory() { - return currentDirectory; - } - @Override public int getFilesCount() { return mFiles.size(); @@ -1264,4 +1214,9 @@ public class OCFileListAdapter extends RecyclerView.Adapter + + + @@ -35,11 +38,17 @@ + + + + + + @@ -309,6 +318,7 @@ + @@ -396,6 +406,7 @@ + @@ -799,6 +810,11 @@ + + + + + @@ -1134,6 +1150,11 @@ + + + + + @@ -3320,6 +3341,11 @@ + + + + + @@ -3645,6 +3671,11 @@ + + + + + @@ -4235,6 +4266,14 @@ + + + + + + + + @@ -4291,6 +4330,14 @@ + + + + + + + + @@ -4347,6 +4394,14 @@ + + + + + + + + @@ -4403,6 +4458,14 @@ + + + + + + + + @@ -4459,6 +4522,14 @@ + + + + + + + + @@ -4515,6 +4586,14 @@ + + + + + + + + @@ -4571,6 +4650,14 @@ + + + + + + + + @@ -4627,6 +4714,14 @@ + + + + + + + + @@ -4651,6 +4746,14 @@ + + + + + + + + @@ -4707,6 +4810,14 @@ + + + + + + + + @@ -14686,6 +14797,14 @@ + + + + + + + +