fix git conflict

Signed-off-by: alperozturk <[email protected]>

Author: alperozturk96

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

@@ -57,6 +57,7 @@ import com.nextcloud.client.preferences.AppPreferences
 import com.nextcloud.client.preferences.AppPreferencesImpl
 import com.nextcloud.utils.extensions.getTypedActivity
 import com.nextcloud.utils.extensions.mainThread
+import com.nextcloud.utils.extensions.setVisibleIf
 import com.owncloud.android.MainApp
 import com.owncloud.android.R
 import com.owncloud.android.databinding.ListFragmentBinding
@@ -777,6 +778,17 @@ open class ExtendedListFragment :
         }
     }
 
+    protected fun toggleEmptyListView(showEmptyListState: Boolean) {
+        mEmptyListContainer.setVisibleIf(showEmptyListState)
+
+        // clear previous state
+        if (!showEmptyListState) {
+            mEmptyListMessage?.text = ""
+            mEmptyListHeadline?.text = ""
+            mEmptyListIcon?.setImageDrawable(null)
+        }
+    }
+
     protected fun isAccountManagerInitialized(): Boolean = ::accountManager.isInitialized
 
     private data class EmptyListData(val headline: Int, val message: Int, val icon: Int?, val tintIcon: Boolean)