Merge pull request #15894 from nextcloud/backport/15756/stable-3.34

alperozturk96 · web-flow · commit 4334eca126fa · 2025-11-13T09:24:07.000+01:00
[stable-3.34] fix: handle slow internet connection better for fetching shares
diff --git a/app/build.gradle b/app/build.gradle
@@ -116,7 +116,7 @@ android {
         applicationId = "com.nextcloud.client"
         minSdk = 27
         targetSdk = 35
-        compileSdk = 35
+        compileSdk = 36
 
         buildConfigField "boolean", "CI", ciBuild.toString()
         buildConfigField "boolean", "RUNTIME_PERF_ANALYSIS", perfAnalysis.toString()
diff --git a/app/src/main/java/com/owncloud/android/ui/AvatarGroupLayout.kt b/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) {
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.kt b/app/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.kt
@@ -707,6 +707,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,
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/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;
@@ -356,8 +356,8 @@ public void onDetach() {
         setOnRefreshListener(null);
         mContainerActivity = null;
 
-        if (remoteOperationAsyncTask != null) {
-            remoteOperationAsyncTask.cancel(true);
+        if (searchTask != null) {
+            searchTask.cancel();
         }
         super.onDetach();
     }
@@ -1914,10 +1914,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;
@@ -1948,11 +1948,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();
     }
 
 
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListSearchAsyncTask.kt b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListSearchAsyncTask.kt
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListSearchTask.kt b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListSearchTask.kt
@@ -0,0 +1,95 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2025 Alper Ozturk <alper.ozturk@nextcloud.com>
+ * SPDX-FileCopyrightText: 2022 Álvaro Brey <alvaro@alvarobrey.com>
+ * SPDX-FileCopyrightText: 2022 Nextcloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+package com.owncloud.android.ui.fragment
+
+import android.annotation.SuppressLint
+import androidx.lifecycle.lifecycleScope
+import com.nextcloud.client.account.User
+import com.owncloud.android.datamodel.FileDataStorageManager
+import com.owncloud.android.lib.common.operations.RemoteOperation
+import com.owncloud.android.lib.common.operations.RemoteOperationResult
+import com.owncloud.android.ui.events.SearchEvent
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeoutOrNull
+import java.lang.ref.WeakReference
+
+@Suppress("LongParameterList")
+@SuppressLint("NotifyDataSetChanged")
+class OCFileListSearchTask(
+    containerActivity: FileFragment.ContainerActivity,
+    fragment: OCFileListFragment,
+    private val remoteOperation: RemoteOperation<List<Any>>,
+    private val currentUser: User,
+    private val event: SearchEvent,
+    private val taskTimeout: Long
+) {
+    private val activityReference: WeakReference<FileFragment.ContainerActivity> = WeakReference(containerActivity)
+    private val fragmentReference: WeakReference<OCFileListFragment> = WeakReference(fragment)
+
+    private val fileDataStorageManager: FileDataStorageManager?
+        get() = activityReference.get()?.storageManager
+
+    private fun RemoteOperationResult<out Any>.hasSuccessfulResult() = this.isSuccess && this.resultData != null
+
+    private var job: Job? = null
+
+    @Suppress("TooGenericExceptionCaught", "DEPRECATION")
+    fun execute() {
+        fragmentReference.get()?.let { fragment ->
+            job = fragment.lifecycleScope.launch(Dispatchers.IO) {
+                val result = withTimeoutOrNull(taskTimeout) {
+                    if (!isActive) {
+                        false
+                    } else {
+                        fragment.setTitle()
+                        lateinit var remoteOperationResult: RemoteOperationResult<List<Any>>
+                        try {
+                            remoteOperationResult = remoteOperation.execute(currentUser, fragment.requireContext())
+                        } catch (_: Exception) {
+                            remoteOperationResult =
+                                remoteOperation.executeNextcloudClient(currentUser, fragment.requireContext())
+                        }
+
+                        if (remoteOperationResult.hasSuccessfulResult() && isActive && fragment.searchFragment) {
+                            fragment.searchEvent = event
+                            if (remoteOperationResult.resultData.isNullOrEmpty()) {
+                                fragment.setEmptyView(event)
+                            } else {
+                                fragment.adapter.setData(
+                                    remoteOperationResult.resultData,
+                                    fragment.currentSearchType,
+                                    fileDataStorageManager,
+                                    fragment.mFile,
+                                    true
+                                )
+                            }
+                        }
+                        remoteOperationResult.isSuccess
+                    }
+                } ?: false
+
+                withContext(Dispatchers.Main) {
+                    if (result && isActive) {
+                        fragment.adapter.notifyDataSetChanged()
+                    } else {
+                        fragment.setEmptyListMessage(EmptyListState.ERROR)
+                    }
+                }
+            }
+        }
+    }
+
+    fun cancel() = job?.cancel(null)
+
+    fun isFinished(): Boolean = job?.isCompleted == true
+}
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/SearchType.kt b/app/src/main/java/com/owncloud/android/ui/fragment/SearchType.kt
@@ -32,5 +32,6 @@ enum class EmptyListState : Parcelable {
     ADD_FOLDER,
     ONLY_ON_DEVICE,
     LOCAL_FILE_LIST_EMPTY_FILE,
-    LOCAL_FILE_LIST_EMPTY_FOLDER
+    LOCAL_FILE_LIST_EMPTY_FOLDER,
+    ERROR
 }
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/SharedListFragment.kt b/app/src/main/java/com/owncloud/android/ui/fragment/SharedListFragment.kt
@@ -14,6 +14,7 @@ import androidx.lifecycle.lifecycleScope
 import com.nextcloud.client.account.User
 import com.nextcloud.client.di.Injectable
 import com.nextcloud.client.logger.Logger
+import com.nextcloud.common.SessionTimeOut
 import com.owncloud.android.R
 import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.lib.common.operations.RemoteOperation
@@ -68,7 +69,7 @@ class SharedListFragment :
     }
 
     override fun getSearchRemoteOperation(currentUser: User?, event: SearchEvent?): RemoteOperation<*> =
-        GetSharesRemoteOperation()
+        GetSharesRemoteOperation(false, SessionTimeOut(TASK_TIMEOUT, TASK_TIMEOUT))
 
     @Suppress("DEPRECATION")
     private suspend fun fetchFileData(partialFile: OCFile): OCFile? = withContext(Dispatchers.IO) {
@@ -185,5 +186,6 @@ class SharedListFragment :
 
     companion object {
         private val SHARED_TAG = SharedListFragment::class.java.simpleName
+        const val TASK_TIMEOUT = 120_000
     }
 }
diff --git a/app/src/main/res/drawable/ic_no_internet.xml b/app/src/main/res/drawable/ic_no_internet.xml
@@ -0,0 +1,17 @@
+<!--
+  ~ SPDX-FileCopyrightText: 2025 Alper Ozturk <alper.ozturk@nextcloud.com>
+  ~ SPDX-FileCopyrightText: 2018-2025 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#626364"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M73,424L2,353Q99,259 222.5,209.5Q346,160 480,160Q614,160 737.5,209.5Q861,259 958,353L887,424Q805,345 700,302.5Q595,260 480,260Q365,260 260,302.5Q155,345 73,424ZM480,800Q447,800 423.5,776.5Q400,753 400,720Q400,687 423.5,663.5Q447,640 480,640Q513,640 536.5,663.5Q560,687 560,720Q560,753 536.5,776.5Q513,800 480,800ZM298,651L228,580Q279,532 344,506Q409,480 480,480Q521,480 560.5,488.5Q600,497 636,514Q619,531 603,552.5Q587,574 574,597Q551,589 527.5,584.5Q504,580 480,580Q429,580 382.5,598Q336,616 298,651ZM186,538L116,467Q190,396 284,358Q378,320 481,320Q584,320 677.5,357.5Q771,395 845,466L830,482Q810,479 793.5,474.5Q777,470 760,470Q746,470 731.5,473.5Q717,477 701,482Q651,452 595,436Q539,420 480,420Q397,420 321.5,450.5Q246,481 186,538ZM760,800Q743,800 731.5,788.5Q720,777 720,760Q720,743 731.5,731.5Q743,720 760,720Q777,720 788.5,731.5Q800,743 800,760Q800,777 788.5,788.5Q777,800 760,800ZM720,680L720,540L800,540L800,680L720,680Z" />
+
+</vector>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -10,8 +10,8 @@
     <string name="bottom_navigation_menu_favorites_label">Favorites</string>
     <string name="bottom_navigation_menu_assistant_label">Assistant</string>
     <string name="bottom_navigation_menu_media_label">Media</string>
-
-
+    <string name="file_list_error_headline">Poor connection</string>
+    <string name="file_list_error_description">Check your internet connection or try again later</string>
     <string name="about_android">%1$s Android app</string>
     <string name="about_version">version %1$s</string>
     <string name="about_version_with_build">version %1$s, build #%2$s</string>
diff --git a/appscan/build.gradle b/appscan/build.gradle
@@ -23,7 +23,7 @@ android {
     defaultConfig {
         minSdk = 27
         targetSdk = 35
-        compileSdk = 35
+        compileSdk = 36
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@
  */
 buildscript {
     ext {
-        androidLibraryVersion = "8c77f600ac942f6eb4e3c4447143fc949d34acc6"
+        androidLibraryVersion = "2.22.1"
         androidCommonLibraryVersion = "0.28.0"
         androidPluginVersion = '8.13.0'
         androidxMediaVersion = "1.5.1"
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml

Original file line number	Diff line number	Diff line change
`@@ -32,5 +32,6 @@ enum class EmptyListState : Parcelable {`
`32`	`32`	`ADD_FOLDER,`
`33`	`33`	`ONLY_ON_DEVICE,`
`34`	`34`	`LOCAL_FILE_LIST_EMPTY_FILE,`
`35`		`- LOCAL_FILE_LIST_EMPTY_FOLDER`
	`35`	`+ LOCAL_FILE_LIST_EMPTY_FOLDER,`
	`36`	`+ ERROR`
`36`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ import androidx.lifecycle.lifecycleScope`
`14`	`14`	`import com.nextcloud.client.account.User`
`15`	`15`	`import com.nextcloud.client.di.Injectable`
`16`	`16`	`import com.nextcloud.client.logger.Logger`
	`17`	`+import com.nextcloud.common.SessionTimeOut`
`17`	`18`	`import com.owncloud.android.R`
`18`	`19`	`import com.owncloud.android.datamodel.OCFile`
`19`	`20`	`import com.owncloud.android.lib.common.operations.RemoteOperation`
`@@ -68,7 +69,7 @@ class SharedListFragment :`
`68`	`69`	`}`
`69`	`70`
`70`	`71`	`override fun getSearchRemoteOperation(currentUser: User?, event: SearchEvent?): RemoteOperation<*> =`
`71`		`- GetSharesRemoteOperation()`
	`72`	`+ GetSharesRemoteOperation(false, SessionTimeOut(TASK_TIMEOUT, TASK_TIMEOUT))`
`72`	`73`
`73`	`74`	`@Suppress("DEPRECATION")`
`74`	`75`	`private suspend fun fetchFileData(partialFile: OCFile): OCFile? = withContext(Dispatchers.IO) {`
`@@ -185,5 +186,6 @@ class SharedListFragment :`
`185`	`186`
`186`	`187`	`companion object {`
`187`	`188`	`private val SHARED_TAG = SharedListFragment::class.java.simpleName`
	`189`	`+ const val TASK_TIMEOUT = 120_000`
`188`	`190`	`}`
`189`	`191`	`}`