Merge branch 'feat/action-process-text-support' into feat/translate-task-type

alperozturk96 · web-flow · commit 6e7c54b08bfa · 2026-01-21T11:18:51.000+01:00
Signed-off-by: Alper Öztürk &lt;67455295+alperozturk96@users.noreply.github.com&gt;
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -4,7 +4,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 ENV ANDROID_HOME=/usr/lib/android-sdk
 
 RUN apt-get update -y
-RUN apt-get install -y unzip wget openjdk-17-jdk vim
+RUN apt-get install -y unzip wget openjdk-21-jdk vim
 
 RUN wget https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip -O /tmp/commandlinetools.zip
 RUN cd /tmp && unzip commandlinetools.zip
diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
@@ -56,11 +56,11 @@ jobs:
                     persist-credentials: false
                     repository: ${{ steps.get-vars.outputs.repo }}
                     ref: ${{ steps.get-vars.outputs.branch }}
-            -   name: Set up JDK 17
+            -   name: Set up JDK 21
                 uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
                 with:
                     distribution: "temurin"
-                    java-version: 17
+                    java-version: 21
             -   name: Install dependencies
                 run: |
                     sudo apt install python3-defusedxml
diff --git a/.github/workflows/assembleFlavors.yml b/.github/workflows/assembleFlavors.yml
@@ -23,11 +23,11 @@ jobs:
                 flavor: [ Generic, Gplay, Huawei ]
         steps:
             -   uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-            -   name: set up JDK 17
+            -   name: set up JDK 21
                 uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
                 with:
                     distribution: "temurin"
-                    java-version: 17
+                    java-version: 21
             -   uses: gradle/actions/wrapper-validation@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
             -   name: Build ${{ matrix.flavor }}
                 run: |
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -23,10 +23,10 @@ jobs:
                 task: [ detekt, spotlessKotlinCheck, lint ]
         steps:
             -   uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-            -   name: Set up JDK 17
+            -   name: Set up JDK 21
                 uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
                 with:
                     distribution: "temurin"
-                    java-version: 17
+                    java-version: 21
             -   name: Check ${{ matrix.task }}
                 run: ./gradlew ${{ matrix.task }}
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -46,11 +46,11 @@ jobs:
         uses: github/codeql-action/init@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
         with:
           languages: ${{ matrix.language }}
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
         with:
           distribution: "temurin"
-          java-version: 17
+          java-version: 21
       - name: Assemble
         run: |
           mkdir -p "$HOME/.gradle"
diff --git a/.github/workflows/detectWrongSettings.yml b/.github/workflows/detectWrongSettings.yml
@@ -21,10 +21,10 @@ jobs:
 
         steps:
             -   uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-            -   name: Set up JDK 17
+            -   name: Set up JDK 21
                 uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
                 with:
                     distribution: "temurin"
-                    java-version: 17
+                    java-version: 21
             -   name: Detect SNAPSHOT
                 run: scripts/analysis/detectWrongSettings.sh
diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml
@@ -29,12 +29,12 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: set up JDK 17
+      - name: set up JDK 21
         uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
         if: ${{ steps.check-secrets.outputs.ok == 'true' }}
         with:
           distribution: "temurin"
-          java-version: 17
+          java-version: 21
 
       - name: Build QA
         if: ${{ steps.check-secrets.outputs.ok == 'true' }}
diff --git a/.github/workflows/screenShotTest.yml b/.github/workflows/screenShotTest.yml
@@ -46,7 +46,7 @@ jobs:
             -   uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
                 with:
                     distribution: "temurin"
-                    java-version: 17
+                    java-version: 21
 
             -   name: Enable KVM group perms
                 run: |
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -24,11 +24,11 @@ jobs:
         steps:
             - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
-            - name: Set up JDK 17
+            - name: Set up JDK 21
               uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
               with:
                   distribution: "temurin"
-                  java-version: 17
+                  java-version: 21
 
             - name: Delete old comments
               env:
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -198,8 +198,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
     lint {
@@ -240,7 +240,7 @@ kapt.useBuildCache = true
 
 ksp.arg("room.schemaLocation", "$projectDir/schemas")
 
-kotlin.compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
+kotlin.compilerOptions.jvmTarget.set(JvmTarget.JVM_21)
 
 spotless.kotlin {
     target("**/*.kt")
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/LocalFileListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
@@ -371,8 +371,6 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
     public void swapDirectory(final File directory) {
         localFileListFragmentInterface.setLoading(true);
         currentOffset = 0;
-        mFiles.clear();
-        mFilesAll.clear();
 
         singleThreadExecutor.execute(() -> {
             // Load first page of folders
@@ -398,8 +396,10 @@ public void swapDirectory(final File directory) {
     @SuppressLint("NotifyDataSetChanged")
     private void updateUIForFirstPage(List<File> firstPage) {
         new Handler(Looper.getMainLooper()).post(() -> {
-            mFiles = new ArrayList<>(firstPage);
-            mFilesAll = new ArrayList<>(firstPage);
+            mFiles.clear();
+            mFilesAll.clear();
+            mFiles.addAll(firstPage);
+            mFilesAll.addAll(firstPage);
             notifyDataSetChanged();
             localFileListFragmentInterface.setLoading(false);
         });
@@ -432,15 +432,16 @@ private void loadRemainingEntries(File directory, boolean fetchFolders) {
 
     private void notifyItemRange(List<File> updatedList) {
         new Handler(Looper.getMainLooper()).post(() -> {
-            int from = mFiles.size();
-            int to = updatedList.size();
+            int headerOffset = shouldShowHeader() ? 1 : 0;
+            int startPositionInAdapter = mFiles.size() + headerOffset;
+            int itemCount = updatedList.size();
 
             mFiles.addAll(updatedList);
             mFilesAll.addAll(updatedList);
 
             Log_OC.d(TAG, "notifyItemRange, item size: " + mFilesAll.size());
 
-            notifyItemRangeInserted(from, to);
+            notifyItemRangeInserted(startPositionInAdapter, itemCount);
         });
     }
 
diff --git a/appscan/build.gradle.kts b/appscan/build.gradle.kts
@@ -27,16 +27,16 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
     lint.targetSdk = 36
     testOptions.targetSdk = 36
 }
 
 kotlin.compilerOptions {
-    jvmTarget.set(JvmTarget.JVM_17)
+    jvmTarget.set(JvmTarget.JVM_21)
     freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
 }
 

Original file line number	Diff line number	Diff line change
`@@ -198,8 +198,8 @@ android {`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`compileOptions {`
`201`		`- sourceCompatibility = JavaVersion.VERSION_17`
`202`		`- targetCompatibility = JavaVersion.VERSION_17`
	`201`	`+ sourceCompatibility = JavaVersion.VERSION_21`
	`202`	`+ targetCompatibility = JavaVersion.VERSION_21`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`lint {`
`@@ -240,7 +240,7 @@ kapt.useBuildCache = true`
`240`	`240`
`241`	`241`	`ksp.arg("room.schemaLocation", "$projectDir/schemas")`
`242`	`242`
`243`		`-kotlin.compilerOptions.jvmTarget.set(JvmTarget.JVM_17)`
	`243`	`+kotlin.compilerOptions.jvmTarget.set(JvmTarget.JVM_21)`
`244`	`244`
`245`	`245`	`spotless.kotlin {`
`246`	`246`	`target("*/.kt")`