fix: empty folder appearance

Signed-off-by: alperozturk <alper_ozturk@proton.me>

Author: alperozturk96

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

@@ -1604,7 +1604,9 @@ class FileDisplayActivity :
                 MainApp.isOnlyOnDevice() -> {
                     ocFileListFragment.setEmptyListMessage(EmptyListState.ONLY_ON_DEVICE)
                 }
-                result == true -> ocFileListFragment.setEmptyListMessage(EmptyListState.IDLE)
+                result == true -> {
+                    ocFileListFragment.setEmptyListStateToIdleOrNoSearch()
+                }
                 else -> ocFileListFragment.setEmptyListMessage(EmptyListState.OFFLINE_MODE)
             }
         }

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

@@ -23,6 +23,7 @@ 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
@@ -247,7 +248,13 @@ open class FolderPickerActivity :
     }
 
     private fun startSyncFolderOperation(folder: OCFile?, ignoreETag: Boolean) {
+        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(
@@ -256,14 +263,14 @@ open class FolderPickerActivity :
                 false,
                 ignoreETag,
                 storageManager,
-                user.orElseThrow { RuntimeException("User not set") },
+                user,
                 applicationContext
             )
             operation.execute(
                 account,
                 this@FolderPickerActivity,
                 { _, _ ->
-                    listOfFilesFragment?.setEmptyListMessage(EmptyListState.IDLE)
+                    listOfFilesFragment?.setEmptyListStateToIdleOrNoSearch()
                 },
                 null
             )
@@ -574,7 +581,7 @@ open class FolderPickerActivity :
                 // in owncloud library with broadcast notifications pending to process
                 DataHolderUtil.getInstance().delete(intent.getStringExtra(FileSyncAdapter.EXTRA_RESULT))
             } finally {
-                listOfFilesFragment?.setEmptyListMessage(EmptyListState.IDLE)
+                listOfFilesFragment?.setEmptyListStateToIdleOrNoSearch()
             }
         }
 

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

@@ -1806,11 +1806,11 @@ protected void setEmptyView(SearchEvent event) {
                     break;
 
                 default:
-                    setEmptyListMessage(EmptyListState.IDLE);
+                    setEmptyListStateToIdleOrNoSearch();
                     break;
             }
         } else {
-            setEmptyListMessage(EmptyListState.IDLE);
+            setEmptyListStateToIdleOrNoSearch();
         }
     }
 
@@ -2330,4 +2330,12 @@ public boolean isSearchEventFavorite() {
     public boolean shouldNavigateBackToAllFiles() {
         return ((this instanceof GalleryFragment) || isSearchEventFavorite() || DrawerActivity.menuItemId == R.id.nav_favorites);
     }
+
+    public void setEmptyListStateToIdleOrNoSearch() {
+        if (isEmpty()) {
+            setEmptyListMessage(NO_SEARCH);
+        } else {
+            setEmptyListMessage(EmptyListState.IDLE);
+        }
+    }
 }