Merge pull request nextcloud#15947 from nextcloud/fix/search-task-screen-state-handling

fix: search task screen state handling

Author: alperozturk96

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

@@ -11,13 +11,15 @@ package com.owncloud.android.ui.fragment
 import android.annotation.SuppressLint
 import androidx.lifecycle.lifecycleScope
 import com.nextcloud.client.account.User
+import com.owncloud.android.R
 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.lib.common.utils.Log_OC
 import com.owncloud.android.ui.events.SearchEvent
+import com.owncloud.android.utils.DisplayUtils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeoutOrNull
@@ -33,57 +35,62 @@ class OCFileListSearchTask(
     private val event: SearchEvent,
     private val taskTimeout: Long
 ) {
+    companion object {
+        private const val TAG = "OCFileListSearchTask"
+    }
+
     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")
+    @Suppress("TooGenericExceptionCaught", "DEPRECATION", "ReturnCount")
     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())
-                        }
+        Log_OC.d(TAG, "search task running, query: ${event.searchType}")
+        val fragment = fragmentReference.get() ?: return
+        val context = fragment.context ?: return
 
-                        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
+        job = fragment.lifecycleScope.launch {
+            val result: RemoteOperationResult<List<Any>>? = withContext(Dispatchers.IO) {
+                try {
+                    withTimeoutOrNull(taskTimeout) {
+                        remoteOperation.execute(currentUser, context)
+                    } ?: remoteOperation.executeNextcloudClient(currentUser, context)
+                } catch (e: Exception) {
+                    Log_OC.e(TAG, "exception execute: ", e)
+                    null
+                }
+            }
 
-                withContext(Dispatchers.Main) {
-                    if (result && isActive) {
-                        fragment.adapter.notifyDataSetChanged()
-                    } else {
-                        fragment.setEmptyListMessage(EmptyListState.ERROR)
+            withContext(Dispatchers.Main) {
+                if (!fragment.isAdded || !fragment.searchFragment) {
+                    Log_OC.e(TAG, "cannot fetch sharees fragment is not ready")
+                    return@withContext
+                }
+
+                if (result?.isSuccess == true) {
+                    if (result.resultData.isEmpty()) {
+                        fragment.setEmptyListMessage(SearchType.NO_SEARCH)
+                        return@withContext
                     }
+
+                    fragment.searchEvent = event
+                    fragment.adapter.setData(
+                        result.resultData,
+                        fragment.currentSearchType,
+                        fileDataStorageManager,
+                        fragment.mFile,
+                        true
+                    )
+
+                    return@withContext
+                }
+
+                fragment.activity?.let {
+                    DisplayUtils.showSnackMessage(it, R.string.error_fetching_sharees)
                 }
             }
         }