add: idle empty list state

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

Author: alperozturk96

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

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

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

@@ -21,6 +21,7 @@ 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.di.Injectable
 import com.nextcloud.utils.fileNameValidator.FileNameValidator
@@ -48,6 +49,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 +63,6 @@ open class FolderPickerActivity :
     OnSortingOrderListener {
 
     private var mSyncBroadcastReceiver: SyncBroadcastReceiver? = null
-    private var mSyncInProgress = false
     private var mSearchOnlyFolders = false
     var isDoNotEnterEncryptedFolder = false
         private set
@@ -105,8 +107,13 @@ open class FolderPickerActivity :
         }
 
         updateActionBarTitleAndHomeButtonByString(captionText)
-        setBackgroundText()
         handleBackPress()
+        listOfFilesFragment?.let {
+            if (it.isEmpty) {
+                it.setEmptyListMessage(EmptyListState.ADD_FOLDER)
+                return
+            }
+        }
     }
 
     override fun onDestroy() {
@@ -211,25 +218,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 +247,27 @@ 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)
+        listOfFilesFragment?.setEmptyListMessage(EmptyListState.LOADING)
+        lifecycleScope.launch(Dispatchers.IO) {
+            val currentSyncTime = System.currentTimeMillis()
+            val operation = RefreshFolderOperation(
+                folder,
+                currentSyncTime,
+                false,
+                ignoreETag,
+                storageManager,
+                user.orElseThrow { RuntimeException("User not set") },
+                applicationContext
+            )
+            operation.execute(
+                account,
+                this@FolderPickerActivity,
+                { _, _ ->
+                    listOfFilesFragment?.setEmptyListMessage(EmptyListState.IDLE)
+                },
+                null
+            )
         }
-        setBackgroundText()
     }
 
     override fun onResume() {
@@ -554,9 +548,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 +564,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.IDLE)
             }
         }
 

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

@@ -548,6 +548,14 @@ open class ExtendedListFragment :
         }
     }
 
+    private fun setIdleState() {
+        Handler(Looper.getMainLooper()).post {
+            mEmptyListIcon?.visibility = View.GONE
+            mEmptyListHeadline?.text = ""
+            mEmptyListMessage?.text = ""
+        }
+    }
+
     /**
      * displays an empty list information with a headline, a message and an icon.
      *
@@ -704,13 +712,11 @@ open class ExtendedListFragment :
                     true
                 )
             }
+            EmptyListState.IDLE -> {
+                setIdleState()
+            }
             else -> {
-                setMessageForEmptyList(
-                    R.string.file_list_empty_headline,
-                    getEmptyListViewTextId(),
-                    R.drawable.ic_list_empty_folder,
-                    true
-                )
+                setIdleState()
             }
         }
     }

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

@@ -1806,11 +1806,11 @@ protected void setEmptyView(SearchEvent event) {
                     break;
 
                 default:
-                    setEmptyListMessage(NO_SEARCH);
+                    setEmptyListMessage(EmptyListState.IDLE);
                     break;
             }
         } else {
-            setEmptyListMessage(NO_SEARCH);
+            setEmptyListMessage(EmptyListState.IDLE);
         }
     }
 

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,
+    IDLE
 }