Merge branch 'master' into skip-auto-rename-if-wcf-disabled

Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>

Author: alperozturk96

.github/workflows/analysis.yml

@@ -73,6 +73,7 @@ jobs:
                     {
                         echo "org.gradle.jvmargs=-Xmx5g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g"
                         echo "org.gradle.configureondemand=true"
+                        echo "org.gradle.configuration-cache=false"
                         echo "kapt.incremental.apt=true"
                     } > "$HOME/.gradle/gradle.properties"
                     scripts/analysis/analysis-wrapper.sh "${{ steps.get-vars.outputs.branch }}" "${{ secrets.LOG_USERNAME }}" "${{ secrets.LOG_PASSWORD }}" "$GITHUB_RUN_NUMBER" "${{ steps.get-vars.outputs.pr }}"

.github/workflows/codeql.yml

@@ -43,7 +43,7 @@ jobs:
         with:
           swap-size-gb: 10
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
+        uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
         with:
           languages: ${{ matrix.language }}
       - name: Set up JDK 17
@@ -57,4 +57,4 @@ jobs:
           echo "org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
           ./gradlew assembleDebug
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
+        uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2

.github/workflows/qa.yml

@@ -48,8 +48,8 @@ jobs:
           mkdir -p "$HOME/.gradle"
           echo "org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g" > "$HOME/.gradle/gradle.properties"
           echo "org.gradle.caching=true; org.gradle.parallel=true; org.gradle.configureondemand=true; kapt.incremental.apt=true" >> "$HOME/.gradle/gradle.properties"
-          sed -i "/qa/,/\}/ s/versionCode .*/versionCode ${{github.event.number}} /" "app/build.gradle"
-          sed -i "/qa/,/\}/ s/versionName .*/versionName \"${{github.event.number}}\"/" "app/build.gradle"
+          sed -i "/qa/,/\}/ s/versionCode.*/versionCode = ${{ github.event.number }}/" app/build.gradle.kts
+          sed -i "/qa/,/\}/ s/versionName.*/versionName = \"${{ github.event.number }}\"/" app/build.gradle.kts
           ./gradlew assembleQaDebug
           $(find /usr/local/lib/android/sdk/build-tools/*/apksigner | sort | tail -n1) sign  --ks-pass pass:"$KS_PASS" --key-pass pass:"$KEY_PASS" --ks-key-alias key0 --ks ".github/workflows/QA_keystore.jks" app/build/outputs/apk/qa/debug/*qa-debug*.apk
           .github/workflows/uploadArtifact.sh "$LOG_USERNAME" "$LOG_PASSWORD" "${{github.event.number}}" "${{github.event.number}}" "$GITHUB_TOKEN"

.github/workflows/scorecard.yml

@@ -42,6 +42,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
+        uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
         with:
           sarif_file: results.sarif

app/build.gradle.kts

@@ -297,18 +297,19 @@ tasks.withType<SpotBugsTask>().configureEach {
     val variantName = variantNameCap.substring(0, 1).lowercase() + variantNameCap.substring(1)
     dependsOn("compile${variantNameCap}Sources")
 
-    classes =
-        fileTree(layout.buildDirectory.get().asFile.toString() + "/intermediates/javac/${variantName}/compile${variantNameCap}JavaWithJavac/classes/")
-    excludeFilter = file("${project.rootDir}/scripts/analysis/spotbugs-filter.xml")
-    reports {
-        register("xml") {
-            required = true
-        }
-        register("html") {
-            required = true
-            outputLocation = layout.buildDirectory.file("reports/spotbugs/spotbugs.html").get().asFile
-            setStylesheet("fancy.xsl")
-        }
+    classes = fileTree(
+        layout.buildDirectory.get().asFile.toString() +
+            "/intermediates/javac/${variantName}/compile${variantNameCap}JavaWithJavac/classes/"
+    )
+    excludeFilter.set(file("${project.rootDir}/scripts/analysis/spotbugs-filter.xml"))
+
+    reports.create("xml") {
+        required.set(true)
+    }
+    reports.create("html") {
+        required.set(true)
+        outputLocation.set(layout.buildDirectory.file("reports/spotbugs/spotbugs.html"))
+        setStylesheet("fancy.xsl")
     }
 }
 
@@ -514,4 +515,4 @@ dependencies {
 
     // kotlinx.serialization
     implementation(libs.kotlinx.serialization.json)
-}
+}

app/src/main/java/com/owncloud/android/ui/AvatarGroupLayout.kt

@@ -138,30 +138,34 @@ class AvatarGroupLayout @JvmOverloads constructor(
         avatar: ImageView,
         viewThemeUtils: ViewThemeUtils
     ) {
-        // maybe federated share
-        val split = user.split("@".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
-        val userId: String? = split[0]
-        val server = split[1]
-
-        val url = "https://" + server + "/index.php/avatar/" + userId + "/" +
-            resources.getInteger(R.integer.file_avatar_px)
-        var placeholder: Drawable?
-        try {
-            placeholder = TextDrawable.createAvatarByUserId(userId, avatarRadius)
+        val split = user.split("@")
+        val userId = split.getOrNull(0) ?: user
+        val server = split.getOrNull(1)
+
+        val url = if (server != null) {
+            "https://$server/index.php/avatar/$userId/${resources.getInteger(R.integer.file_avatar_px)}"
+        } else {
+            // fallback: no federated server, maybe use local avatar
+            null
+        }
+
+        val placeholder: Drawable = try {
+            TextDrawable.createAvatarByUserId(userId, avatarRadius)
         } catch (e: Exception) {
             Log_OC.e(TAG, "Error calculating RGB value for active account icon.", e)
-            placeholder = viewThemeUtils.platform.colorDrawable(
-                ResourcesCompat.getDrawable(
-                    resources,
-                    R.drawable.account_circle_white,
-                    null
-                )!!,
+            viewThemeUtils.platform.colorDrawable(
+                ResourcesCompat
+                    .getDrawable(resources, R.drawable.account_circle_white, null)!!,
                 ContextCompat.getColor(context, R.color.black)
             )
         }
 
         avatar.tag = null
-        loadCircularBitmapIntoImageView(context, url, avatar, placeholder)
+        if (url != null) {
+            loadCircularBitmapIntoImageView(context, url, avatar, placeholder)
+        } else {
+            avatar.setImageDrawable(placeholder)
+        }
     }
 
     override fun avatarGenerated(avatarDrawable: Drawable?, callContext: Any) {

app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt

@@ -1311,10 +1311,11 @@ class FileDisplayActivity :
         val ocFileListFragment = leftFragment
         syncAndUpdateFolder(ignoreETag = true, ignoreFocus = true)
 
-        var startFile: OCFile? = null
-        if (intent != null) {
-            startFile = getFileFromIntent(intent)
-            file = startFile
+        // Try to get the OCFile from the intent, if one was provided when launching this activity.
+        // 'file' comes from the FileActivity base class and represents the currently opened file or folder.
+        // We update it only when a valid file is found in the intent.
+        val startFile = intent?.let { getFileFromIntent(it) }?.also {
+            file = it
         }
 
         // refresh list of files

app/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt

@@ -21,7 +21,9 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import androidx.activity.OnBackPressedCallback
+import androidx.lifecycle.lifecycleScope
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
+import com.nextcloud.client.account.User
 import com.nextcloud.client.di.Injectable
 import com.nextcloud.utils.fileNameValidator.FileNameValidator
 import com.owncloud.android.R
@@ -48,6 +50,8 @@ import com.owncloud.android.utils.DisplayUtils
 import com.owncloud.android.utils.ErrorMessageAdapter
 import com.owncloud.android.utils.FileSortOrder
 import com.owncloud.android.utils.PathUtils
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import java.io.File
 import javax.inject.Inject
 
@@ -60,7 +64,6 @@ open class FolderPickerActivity :
     OnSortingOrderListener {
 
     private var mSyncBroadcastReceiver: SyncBroadcastReceiver? = null
-    private var mSyncInProgress = false
     private var mSearchOnlyFolders = false
     var isDoNotEnterEncryptedFolder = false
         private set
@@ -105,7 +108,6 @@ open class FolderPickerActivity :
         }
 
         updateActionBarTitleAndHomeButtonByString(captionText)
-        setBackgroundText()
         handleBackPress()
     }
 
@@ -211,25 +213,6 @@ open class FolderPickerActivity :
         transaction.commit()
     }
 
-    /**
-     * Show a text message on screen view for notifying user if content is loading or folder is empty
-     */
-    private fun setBackgroundText() {
-        val listFragment = listOfFilesFragment
-
-        if (listFragment == null) {
-            Log_OC.e(TAG, "OCFileListFragment is null")
-        }
-
-        listFragment?.let {
-            if (mSyncInProgress) {
-                it.setEmptyListMessage(EmptyListState.LOADING)
-            } else {
-                it.setEmptyListMessage(EmptyListState.ADD_FOLDER)
-            }
-        }
-    }
-
     protected val listOfFilesFragment: OCFileListFragment?
         get() {
             val listOfFiles = supportFragmentManager.findFragmentByTag(TAG_LIST_OF_FOLDERS)
@@ -259,21 +242,33 @@ open class FolderPickerActivity :
     }
 
     private fun startSyncFolderOperation(folder: OCFile?, ignoreETag: Boolean) {
-        val currentSyncTime = System.currentTimeMillis()
-        mSyncInProgress = true
-
-        RefreshFolderOperation(
-            folder,
-            currentSyncTime,
-            false,
-            ignoreETag,
-            storageManager,
-            user.orElseThrow { RuntimeException("User not set") },
-            applicationContext
-        ).also {
-            it.execute(account, this, null, null)
+        val optionalUser = user ?: return
+        if (optionalUser.isEmpty) {
+            return
+        }
+        val user: User = optionalUser.get()
+        listOfFilesFragment?.setEmptyListMessage(EmptyListState.LOADING)
+
+        lifecycleScope.launch(Dispatchers.IO) {
+            val currentSyncTime = System.currentTimeMillis()
+            val operation = RefreshFolderOperation(
+                folder,
+                currentSyncTime,
+                false,
+                ignoreETag,
+                storageManager,
+                user,
+                applicationContext
+            )
+            operation.execute(
+                account,
+                this@FolderPickerActivity,
+                { _, _ ->
+                    listOfFilesFragment?.setEmptyListMessage(EmptyListState.LOCAL_FILE_LIST_EMPTY_FILE)
+                },
+                null
+            )
         }
-        setBackgroundText()
     }
 
     override fun onResume() {
@@ -554,9 +549,7 @@ open class FolderPickerActivity :
                     return
                 }
 
-                if (FileSyncAdapter.EVENT_FULL_SYNC_START == event) {
-                    mSyncInProgress = true
-                } else {
+                if (FileSyncAdapter.EVENT_FULL_SYNC_START != event) {
                     var (currentFile, currentDir) = getCurrentFileAndDirectory()
 
                     if (currentDir == null) {
@@ -572,22 +565,17 @@ open class FolderPickerActivity :
                         file = currentFile
                     }
 
-                    mSyncInProgress = (
-                        FileSyncAdapter.EVENT_FULL_SYNC_END != event &&
-                            RefreshFolderOperation.EVENT_SINGLE_FOLDER_SHARES_SYNCED != event
-                        )
-
                     checkCredentials(syncResult, event)
                 }
 
                 DataHolderUtil.getInstance().delete(intent.getStringExtra(FileSyncAdapter.EXTRA_RESULT))
-                Log_OC.d(TAG, "Setting progress visibility to $mSyncInProgress")
-                setBackgroundText()
             } catch (e: RuntimeException) {
                 Log_OC.e(TAG, "Error on broadcast receiver", e)
                 // avoid app crashes after changing the serial id of RemoteOperationResult
                 // in owncloud library with broadcast notifications pending to process
                 DataHolderUtil.getInstance().delete(intent.getStringExtra(FileSyncAdapter.EXTRA_RESULT))
+            } finally {
+                listOfFilesFragment?.setEmptyListMessage(EmptyListState.LOCAL_FILE_LIST_EMPTY_FILE)
             }
         }
 

app/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.kt

@@ -704,6 +704,14 @@ open class ExtendedListFragment :
                     true
                 )
             }
+            EmptyListState.ERROR -> {
+                setMessageForEmptyList(
+                    R.string.file_list_error_headline,
+                    R.string.file_list_error_description,
+                    R.drawable.ic_no_internet,
+                    false
+                )
+            }
             else -> {
                 setMessageForEmptyList(
                     R.string.file_list_empty_headline,

app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -225,7 +225,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
     protected SearchType currentSearchType;
     protected boolean searchFragment;
     protected SearchEvent searchEvent;
-    protected AsyncTask<Void, Void, Boolean> remoteOperationAsyncTask;
+    private OCFileListSearchTask searchTask;
     protected String mLimitToMimeType;
     private FloatingActionButton mFabMain;
     public static boolean isMultipleFileSelectedForCopyOrMove = false;
@@ -350,8 +350,8 @@ public void onDetach() {
         setOnRefreshListener(null);
         mContainerActivity = null;
 
-        if (remoteOperationAsyncTask != null) {
-            remoteOperationAsyncTask.cancel(true);
+        if (searchTask != null) {
+            searchTask.cancel();
         }
         super.onDetach();
     }
@@ -1907,10 +1907,10 @@ protected void handleSearchEvent(SearchEvent event) {
             return;
         }
 
-        // avoid calling api multiple times if async task is already executing
-        if (remoteOperationAsyncTask != null && remoteOperationAsyncTask.getStatus() != AsyncTask.Status.FINISHED) {
+        // avoid calling api multiple times if task is already executing
+        if (searchTask != null && !searchTask.isFinished()) {
             if (searchEvent != null) {
-                Log_OC.d(TAG, "OCFileListSearchAsyncTask already running skipping new api call for search event: " + searchEvent.getSearchType());
+                Log_OC.d(TAG, "OCFileListSearchTask already running skipping new api call for search event: " + searchEvent.getSearchType());
             }
 
             return;
@@ -1941,11 +1941,10 @@ protected void handleSearchEvent(SearchEvent event) {
 
         final User currentUser = accountManager.getUser();
 
-        final RemoteOperation remoteOperation = getSearchRemoteOperation(currentUser, event);
+        final var remoteOperation = getSearchRemoteOperation(currentUser, event);
 
-        remoteOperationAsyncTask = new OCFileListSearchAsyncTask(mContainerActivity, this, remoteOperation, currentUser, event);
-
-        remoteOperationAsyncTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+        searchTask = new OCFileListSearchTask(mContainerActivity, this, remoteOperation, currentUser, event, SharedListFragment.TASK_TIMEOUT);
+        searchTask.execute();
     }