Remove big spinner

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

src/androidTest/java/com/nextcloud/client/FileDisplayActivityScreenshotIT.java

@@ -54,7 +54,7 @@ public class FileDisplayActivityScreenshotIT extends AbstractIT {
         FileDisplayActivity sut = activityRule.launchActivity(null);
 
         sut.getListOfFilesFragment().setFabEnabled(false);
-        sut.getListOfFilesFragment().setEmptyListLoadingMessage(false);
+        sut.getListOfFilesFragment().setEmptyListLoadingMessage();
         sut.getListOfFilesFragment().setLoading(false);
         waitForIdleSync();
 
@@ -69,7 +69,7 @@ public class FileDisplayActivityScreenshotIT extends AbstractIT {
         onView(withId(R.id.drawer_layout)).perform(DrawerActions.open());
 
         sut.getListOfFilesFragment().setFabEnabled(false);
-        sut.getListOfFilesFragment().setEmptyListLoadingMessage(false);
+        sut.getListOfFilesFragment().setEmptyListLoadingMessage();
         sut.getListOfFilesFragment().setLoading(false);
         waitForIdleSync();
 

src/main/java/com/owncloud/android/ui/activities/ActivitiesActivity.java

@@ -19,13 +19,11 @@
 package com.owncloud.android.ui.activities;
 
 import android.content.Intent;
-import android.graphics.PorterDuff;
 import android.os.Bundle;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.nextcloud.client.network.ClientFactory;
@@ -82,9 +80,6 @@ public class ActivitiesActivity extends DrawerActivity implements ActivityListIn
     @BindView(R.id.empty_list_icon)
     public ImageView emptyContentIcon;
 
-    @BindView(R.id.empty_list_progress)
-    public ProgressBar emptyContentProgressBar;
-
     @BindView(android.R.id.list)
     public RecyclerView recyclerView;
 
@@ -133,7 +128,6 @@ public class ActivitiesActivity extends DrawerActivity implements ActivityListIn
 
         // Since we use swipe-to-refresh for progress indication we can hide the inherited
         // progressBar, message and headline
-        emptyContentProgressBar.setVisibility(View.GONE);
         emptyContentMessage.setVisibility(View.INVISIBLE);
         emptyContentHeadline.setVisibility(View.INVISIBLE);
     }
@@ -149,8 +143,6 @@ public class ActivitiesActivity extends DrawerActivity implements ActivityListIn
      */
     private void setupContent() {
         emptyContentIcon.setImageResource(R.drawable.ic_activity);
-        emptyContentProgressBar.getIndeterminateDrawable().setColorFilter(ThemeUtils.primaryAccentColor(this),
-                                                                          PorterDuff.Mode.SRC_IN);
 
         FileDataStorageManager storageManager = new FileDataStorageManager(getAccount(), getContentResolver());
         adapter = new ActivityListAdapter(this,
@@ -280,9 +272,7 @@ public class ActivitiesActivity extends DrawerActivity implements ActivityListIn
     public void showLoadingMessage() {
         emptyContentHeadline.setText(R.string.file_list_loading);
         emptyContentMessage.setText("");
-
         emptyContentIcon.setVisibility(View.GONE);
-        emptyContentProgressBar.setVisibility(View.VISIBLE);
     }
 
     @Override
@@ -290,8 +280,6 @@ public class ActivitiesActivity extends DrawerActivity implements ActivityListIn
         if (emptyContentContainer != null && emptyContentMessage != null) {
             emptyContentHeadline.setText(headline);
             emptyContentMessage.setText(message);
-
-            emptyContentProgressBar.setVisibility(View.GONE);
             emptyContentIcon.setVisibility(View.VISIBLE);
             emptyContentHeadline.setVisibility(View.VISIBLE);
             emptyContentMessage.setVisibility(View.VISIBLE);

src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java

@@ -91,9 +91,6 @@ public class NotificationsActivity extends DrawerActivity implements Notificatio
     @BindView(R.id.empty_list_icon)
     public ImageView emptyContentIcon;
 
-    @BindView(R.id.empty_list_progress)
-    public ProgressBar emptyContentProgressBar;
-
     @BindView(android.R.id.list)
     public RecyclerView recyclerView;
 
@@ -230,8 +227,6 @@ public class NotificationsActivity extends DrawerActivity implements Notificatio
      */
     private void setupContent() {
         emptyContentIcon.setImageResource(R.drawable.ic_notification);
-        emptyContentProgressBar.getIndeterminateDrawable().setColorFilter(ThemeUtils.primaryAccentColor(this),
-                                                                          PorterDuff.Mode.SRC_IN);
         setLoadingMessage();
 
         LinearLayoutManager layoutManager = new LinearLayoutManager(this);
@@ -331,9 +326,7 @@ public class NotificationsActivity extends DrawerActivity implements Notificatio
     private void setLoadingMessage() {
         emptyContentHeadline.setText(R.string.notifications_loading_activity);
         emptyContentMessage.setText("");
-
         emptyContentIcon.setVisibility(View.GONE);
-        emptyContentProgressBar.setVisibility(View.VISIBLE);
     }
 
     @VisibleForTesting
@@ -342,8 +335,6 @@ public class NotificationsActivity extends DrawerActivity implements Notificatio
             emptyContentHeadline.setText(headline);
             emptyContentMessage.setText(message);
             emptyContentMessage.setVisibility(View.VISIBLE);
-
-            emptyContentProgressBar.setVisibility(View.GONE);
             emptyContentIcon.setImageResource(R.drawable.ic_notification);
             emptyContentIcon.setVisibility(View.VISIBLE);
         }

src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java

@@ -36,7 +36,6 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.Resources.NotFoundException;
 import android.graphics.Color;
-import android.graphics.PorterDuff;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -57,7 +56,6 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
-import android.widget.ProgressBar;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -166,7 +164,6 @@ public class ReceiveExternalFilesActivity extends FileActivity
     private TextView mEmptyListMessage;
     private TextView mEmptyListHeadline;
     private ImageView mEmptyListIcon;
-    private ProgressBar mEmptyListProgress;
     private MaterialButton sortButton;
 
     @Override
@@ -332,7 +329,7 @@ public class ReceiveExternalFilesActivity extends FileActivity
         }
 
         @Override
-        public void onAttach(Context context) {
+        public void onAttach(@NonNull Context context) {
             super.onAttach(context);
         }
 
@@ -800,9 +797,6 @@ public class ReceiveExternalFilesActivity extends FileActivity
         mEmptyListMessage = findViewById(R.id.empty_list_view_text);
         mEmptyListHeadline = findViewById(R.id.empty_list_view_headline);
         mEmptyListIcon = findViewById(R.id.empty_list_icon);
-        mEmptyListProgress = findViewById(R.id.empty_list_progress);
-        mEmptyListProgress.getIndeterminateDrawable().setColorFilter(ThemeUtils.primaryColor(this),
-                PorterDuff.Mode.SRC_IN);
     }
 
     public void setMessageForEmptyList(@StringRes final int headline, @StringRes final int message,
@@ -811,11 +805,8 @@ public class ReceiveExternalFilesActivity extends FileActivity
             if (mEmptyListContainer != null && mEmptyListMessage != null) {
                 mEmptyListHeadline.setText(headline);
                 mEmptyListMessage.setText(message);
-
                 mEmptyListIcon.setImageDrawable(ThemeUtils.tintDrawable(icon, ThemeUtils.primaryColor(this, true)));
-
                 mEmptyListIcon.setVisibility(View.VISIBLE);
-                mEmptyListProgress.setVisibility(View.GONE);
                 mEmptyListMessage.setVisibility(View.VISIBLE);
             }
         });

src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.java

@@ -491,7 +491,6 @@ public class SyncedFoldersActivity extends FileActivity implements SyncedFolderA
      */
     private void showList() {
         binding.list.setVisibility(View.VISIBLE);
-        binding.emptyList.emptyListProgress.setVisibility(View.GONE);
         checkAndShowEmptyListContent();
     }
 
@@ -632,10 +631,8 @@ public class SyncedFoldersActivity extends FileActivity implements SyncedFolderA
         binding.emptyList.emptyListViewText.setVisibility(View.VISIBLE);
 
         if (loading) {
-            binding.emptyList.emptyListProgress.setVisibility(View.VISIBLE);
             binding.emptyList.emptyListIcon.setVisibility(View.GONE);
         } else {
-            binding.emptyList.emptyListProgress.setVisibility(View.GONE);
             binding.emptyList.emptyListIcon.setVisibility(View.VISIBLE);
         }
     }

src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java

@@ -140,7 +140,6 @@ public class UploadListActivity extends FileActivity {
     private void setupContent() {
         binding.list.setEmptyView(binding.emptyList.getRoot());
         binding.emptyList.getRoot().setVisibility(View.GONE);
-        binding.emptyList.emptyListProgress.setVisibility(View.GONE);
         binding.emptyList.emptyListIcon.setImageResource(R.drawable.uploads);
         binding.emptyList.emptyListIcon.getDrawable().mutate();
         binding.emptyList.emptyListIcon.setAlpha(0.5f);

src/main/java/com/owncloud/android/ui/activity/UserInfoActivity.java

@@ -27,7 +27,6 @@
 
 package com.owncloud.android.ui.activity;
 
-import android.graphics.PorterDuff;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
@@ -194,9 +193,6 @@ public class UserInfoActivity extends DrawerActivity implements Injectable {
 
         binding.emptyList.emptyListIcon.setVisibility(View.GONE);
         binding.emptyList.emptyListViewText.setVisibility(View.GONE);
-        binding.emptyList.emptyListProgress.getIndeterminateDrawable().setColorFilter(ThemeUtils.primaryColor(this),
-                                                                                      PorterDuff.Mode.SRC_IN);
-        binding.emptyList.emptyListProgress.setVisibility(View.VISIBLE);
     }
 
     private void setErrorMessageForMultiList(String headline, String message, @DrawableRes int errorResource) {
@@ -204,7 +200,6 @@ public class UserInfoActivity extends DrawerActivity implements Injectable {
         binding.emptyList.emptyListViewText.setText(message);
         binding.emptyList.emptyListIcon.setImageResource(errorResource);
 
-        binding.emptyList.emptyListProgress.setVisibility(View.GONE);
         binding.emptyList.emptyListIcon.setVisibility(View.VISIBLE);
         binding.emptyList.emptyListViewText.setVisibility(View.VISIBLE);
     }

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

@@ -28,7 +28,6 @@ import android.animation.LayoutTransition;
 import android.app.Activity;
 import android.content.Context;
 import android.content.res.Configuration;
-import android.graphics.PorterDuff;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -49,7 +48,6 @@ import android.widget.AdapterView.OnItemClickListener;
 import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.google.android.material.button.MaterialButton;
@@ -123,7 +121,6 @@ public class ExtendedListFragment extends Fragment implements
     protected TextView mEmptyListMessage;
     protected TextView mEmptyListHeadline;
     protected ImageView mEmptyListIcon;
-    protected ProgressBar mEmptyListProgress;
 
     // Save the state of the scroll in browsing
     private ArrayList<Integer> mIndexes;
@@ -419,9 +416,6 @@ public class ExtendedListFragment extends Fragment implements
         mEmptyListMessage = view.findViewById(R.id.empty_list_view_text);
         mEmptyListHeadline = view.findViewById(R.id.empty_list_view_headline);
         mEmptyListIcon = view.findViewById(R.id.empty_list_icon);
-        mEmptyListProgress = view.findViewById(R.id.empty_list_progress);
-        mEmptyListProgress.getIndeterminateDrawable().setColorFilter(ThemeUtils.primaryColor(getContext(), true),
-                                                                     PorterDuff.Mode.SRC_IN);
     }
 
     /**
@@ -621,7 +615,6 @@ public class ExtendedListFragment extends Fragment implements
                     }
 
                     mEmptyListIcon.setVisibility(View.VISIBLE);
-                    mEmptyListProgress.setVisibility(View.GONE);
                     mEmptyListMessage.setVisibility(View.VISIBLE);
                 }
             }
@@ -667,24 +660,16 @@ public class ExtendedListFragment extends Fragment implements
         });
     }
 
-    public void setEmptyListLoadingMessage() {
-        setEmptyListLoadingMessage(true);
-    }
-
     /**
      * Set message for empty list view.
      */
-    public void setEmptyListLoadingMessage(boolean showSpinner) {
-        new Handler(Looper.getMainLooper()).post(new Runnable() {
-            @Override
-            public void run() {
-                if (mEmptyListContainer != null && mEmptyListMessage != null) {
-                    mEmptyListHeadline.setText(R.string.file_list_loading);
-                    mEmptyListMessage.setText("");
+    public void setEmptyListLoadingMessage() {
+        new Handler(Looper.getMainLooper()).post(() -> {
+            if (mEmptyListContainer != null && mEmptyListMessage != null) {
+                mEmptyListHeadline.setText(R.string.file_list_loading);
+                mEmptyListMessage.setText("");
 
-                    mEmptyListIcon.setVisibility(View.GONE);
-                    mEmptyListProgress.setVisibility(showSpinner ? View.VISIBLE : View.INVISIBLE);
-                }
+                mEmptyListIcon.setVisibility(View.GONE);
             }
         });
     }

src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java

@@ -200,7 +200,6 @@ public class FileDetailActivitiesFragment extends Fragment implements
         binding.emptyList.emptyListViewHeadline.setText(R.string.file_list_loading);
         binding.emptyList.emptyListViewText.setText("");
         binding.emptyList.emptyListIcon.setVisibility(View.GONE);
-        binding.emptyList.emptyListProgress.setVisibility(View.VISIBLE);
     }
 
     @Override
@@ -217,8 +216,6 @@ public class FileDetailActivitiesFragment extends Fragment implements
         OCCapability capability = storageManager.getCapability(user.getAccountName());
         restoreFileVersionSupported = capability.getFilesVersioning().isTrue();
 
-        binding.emptyList.emptyListProgress.getIndeterminateDrawable().setColorFilter(ThemeUtils.primaryAccentColor(getContext()),
-                                                                          PorterDuff.Mode.SRC_IN);
         binding.emptyList.emptyListIcon.setImageDrawable(ResourcesCompat.getDrawable(getResources(), R.drawable.ic_activity, null));
 
         adapter = new ActivityAndVersionListAdapter(getContext(),
@@ -396,7 +393,6 @@ public class FileDetailActivitiesFragment extends Fragment implements
         binding.emptyList.emptyListViewText.setText(message);
 
         binding.emptyList.emptyListViewText.setVisibility(View.VISIBLE);
-        binding.emptyList.emptyListProgress.setVisibility(View.GONE);
         binding.emptyList.emptyListIcon.setVisibility(View.VISIBLE);
     }
 
@@ -409,7 +405,6 @@ public class FileDetailActivitiesFragment extends Fragment implements
         binding.emptyList.emptyListViewText.setText(message);
 
         binding.emptyList.emptyListViewText.setVisibility(View.VISIBLE);
-        binding.emptyList.emptyListProgress.setVisibility(View.GONE);
         binding.emptyList.emptyListIcon.setVisibility(View.VISIBLE);
         binding.swipeContainingList.setVisibility(View.GONE);
         binding.swipeContainingEmpty.setVisibility(View.VISIBLE);

src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java

@@ -682,7 +682,6 @@ public class FileDetailFragment extends FileFragment implements OnClickListener,
 
         binding.emptyList.emptyListViewHeadline.setText(R.string.file_details_no_content);
 
-        binding.emptyList.emptyListProgress.setVisibility(View.GONE);
         binding.emptyList.emptyListIcon.setImageResource(R.drawable.ic_list_empty_error);
         binding.emptyList.emptyListIcon.setVisibility(View.VISIBLE);
     }

src/main/java/com/owncloud/android/ui/fragment/GalleryFragment.java

@@ -129,7 +129,7 @@ public class GalleryFragment extends OCFileListFragment {
     private void handleSearchEvent() {
         prepareCurrentSearch(searchEvent);
         searchFragment = true;
-        setEmptyListLoadingMessage(false);
+        setEmptyListLoadingMessage();
 
         if (refresh || preferences.getPhotoSearchTimestamp() == 0 ||
             System.currentTimeMillis() - preferences.getPhotoSearchTimestamp() >= 30 * 1000) {

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

@@ -959,7 +959,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
                     } else {
                         // update state and view of this fragment
                         searchFragment = false;
-                        setEmptyListLoadingMessage(false);
+                        setEmptyListLoadingMessage();
                         listDirectory(file, MainApp.isOnlyOnDevice(), false);
                         // then, notify parent activity to let it update its state and view
                         mContainerActivity.onBrowsedDownTo(file);

src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactListFragment.java

@@ -46,7 +46,6 @@ import android.widget.Button;
 import android.widget.CheckedTextView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -137,9 +136,6 @@ public class ContactListFragment extends FileFragment implements Injectable {
     @BindView(R.id.empty_list_icon)
     public ImageView emptyContentIcon;
 
-    @BindView(R.id.empty_list_progress)
-    public ProgressBar emptyContentProgressBar;
-
     @BindView(R.id.empty_list_container)
     public RelativeLayout emptyListContainer;
 
@@ -316,7 +312,6 @@ public class ContactListFragment extends FileFragment implements Injectable {
         emptyContentMessage.setText("");
 
         emptyContentIcon.setVisibility(View.GONE);
-        emptyContentProgressBar.setVisibility(View.VISIBLE);
     }
 
     private void setSelectAllMenuItem(MenuItem selectAll, boolean checked) {

src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java

@@ -48,7 +48,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.caverock.androidsvg.SVG;
@@ -114,11 +113,10 @@ public class PreviewImageFragment extends FileFragment implements Injectable {
 
     private PhotoView imageView;
 
-    private LinearLayout multiListContainer;
-    private TextView multiListMessage;
-    private TextView multiListHeadline;
-    private ImageView multiListIcon;
-    private ProgressBar multiListProgress;
+    private LinearLayout mMultiListContainer;
+    private TextView mMultiListMessage;
+    private TextView mMultiListHeadline;
+    private ImageView mMultiListIcon;
 
     private Boolean showResizedImage;
 
@@ -218,7 +216,6 @@ public class PreviewImageFragment extends FileFragment implements Injectable {
         multiListMessage = binding.emptyList.emptyListViewText;
         multiListHeadline = binding.emptyList.emptyListViewHeadline;
         multiListIcon = binding.emptyList.emptyListIcon;
-        multiListProgress = binding.emptyList.emptyListProgress;
     }
 
     /**
@@ -706,8 +703,7 @@ public class PreviewImageFragment extends FileFragment implements Injectable {
             multiListHeadline.setText(R.string.file_list_loading);
             multiListMessage.setText("");
 
-            multiListIcon.setVisibility(View.GONE);
-            multiListProgress.setVisibility(View.VISIBLE);
+            mMultiListIcon.setVisibility(View.GONE);
         }
     }
 
@@ -721,9 +717,8 @@ public class PreviewImageFragment extends FileFragment implements Injectable {
             multiListHeadline.setTextColor(getResources().getColor(R.color.standard_grey));
             multiListMessage.setTextColor(getResources().getColor(R.color.standard_grey));
 
-            multiListMessage.setVisibility(View.VISIBLE);
-            multiListIcon.setVisibility(View.VISIBLE);
-            multiListProgress.setVisibility(View.GONE);
+            mMultiListMessage.setVisibility(View.VISIBLE);
+            mMultiListIcon.setVisibility(View.VISIBLE);
         }
     }
 

src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java

@@ -47,7 +47,6 @@ import android.view.View.OnTouchListener;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.VideoView;
@@ -118,7 +117,6 @@ public class PreviewMediaFragment extends FileFragment implements OnTouchListene
     private TextView mMultiListMessage;
     private TextView mMultiListHeadline;
     private ImageView mMultiListIcon;
-    private ProgressBar mMultiListProgress;
 
     private MediaControlView mMediaController;
     private boolean mAutoplay;
@@ -207,16 +205,13 @@ public class PreviewMediaFragment extends FileFragment implements OnTouchListene
         mMultiListMessage = view.findViewById(R.id.empty_list_view_text);
         mMultiListHeadline = view.findViewById(R.id.empty_list_view_headline);
         mMultiListIcon = view.findViewById(R.id.empty_list_icon);
-        mMultiListProgress = view.findViewById(R.id.empty_list_progress);
     }
 
     private void setMultiListLoadingMessage() {
         if (mMultiListContainer != null) {
             mMultiListHeadline.setText(R.string.file_list_loading);
             mMultiListMessage.setText("");
-
             mMultiListIcon.setVisibility(View.GONE);
-            mMultiListProgress.setVisibility(View.VISIBLE);
         }
     }
 
@@ -225,10 +220,8 @@ public class PreviewMediaFragment extends FileFragment implements OnTouchListene
             mMultiListHeadline.setText(headline);
             mMultiListMessage.setText(message);
             mMultiListIcon.setImageResource(icon);
-
             mMultiListMessage.setVisibility(View.VISIBLE);
             mMultiListIcon.setVisibility(View.VISIBLE);
-            mMultiListProgress.setVisibility(View.GONE);
         }
     }
 
@@ -340,14 +333,14 @@ public class PreviewMediaFragment extends FileFragment implements OnTouchListene
     }
 
     @Override
-    public void onCreateOptionsMenu(@NonNull Menu menu, MenuInflater inflater) {
+    public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
         menu.removeItem(R.id.action_search);
         inflater.inflate(R.menu.item_file, menu);
     }
 
     @Override
-    public void onPrepareOptionsMenu(Menu menu) {
+    public void onPrepareOptionsMenu(@NonNull Menu menu) {
         super.onPrepareOptionsMenu(menu);
 
         if (containerActivity.getStorageManager() != null) {

src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.java

@@ -33,7 +33,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.nextcloud.client.account.UserAccountManager;
@@ -91,7 +90,6 @@ public abstract class PreviewTextFragment extends FileFragment implements Search
     private TextView mMultiListMessage;
     private TextView mMultiListHeadline;
     private ImageView mMultiListIcon;
-    private ProgressBar mMultiListProgress;
 
     @Inject UserAccountManager accountManager;
     @Inject DeviceInfo deviceInfo;
@@ -119,16 +117,13 @@ public abstract class PreviewTextFragment extends FileFragment implements Search
         mMultiListMessage = view.findViewById(R.id.empty_list_view_text);
         mMultiListHeadline = view.findViewById(R.id.empty_list_view_headline);
         mMultiListIcon = view.findViewById(R.id.empty_list_icon);
-        mMultiListProgress = view.findViewById(R.id.empty_list_progress);
     }
 
     private void setMultiListLoadingMessage() {
         if (mMultiListContainer != null) {
             mMultiListHeadline.setText(R.string.file_list_loading);
             mMultiListMessage.setText("");
-
             mMultiListIcon.setVisibility(View.GONE);
-            mMultiListProgress.setVisibility(View.VISIBLE);
         }
     }
 

src/main/java/com/owncloud/android/ui/trashbin/TrashbinActivity.java

@@ -236,7 +236,6 @@ public class TrashbinActivity extends DrawerActivity implements
         if (active) {
             trashbinListAdapter.setTrashbinFiles(trashbinFiles, true);
             binding.swipeContainingList.setRefreshing(false);
-            binding.emptyList.emptyListProgress.setVisibility(View.GONE);
         }
     }
 
@@ -275,7 +274,6 @@ public class TrashbinActivity extends DrawerActivity implements
             binding.emptyList.emptyListViewText.setVisibility(View.VISIBLE);
             binding.emptyList.emptyListIcon.setVisibility(View.VISIBLE);
             binding.emptyList.emptyListView.setVisibility(View.VISIBLE);
-            binding.emptyList.emptyListProgress.setVisibility(View.GONE);
         }
     }
 }

src/main/res/layout/empty_list.xml

@@ -36,12 +36,6 @@
         android:src="@drawable/ic_list_empty_folder"
         android:visibility="gone" />
 
-    <ProgressBar
-        android:id="@+id/empty_list_progress"
-        android:layout_width="@dimen/empty_list_progress_layout_width"
-        android:layout_height="@dimen/empty_list_progress_layout_height"
-        android:layout_gravity="center_horizontal" />
-
     <TextView
         android:id="@+id/empty_list_view_headline"
         android:layout_width="match_parent"

src/main/res/values/dims.xml

@@ -101,8 +101,6 @@
     <dimen name="contactlist_item_icon_layout_height">40dp</dimen>
     <dimen name="empty_list_icon_layout_width">72dp</dimen>
     <dimen name="empty_list_icon_layout_height">72dp</dimen>
-    <dimen name="empty_list_progress_layout_width">72dp</dimen>
-    <dimen name="empty_list_progress_layout_height">72dp</dimen>
     <dimen name="file_details_username_text_size">16sp</dimen>
     <dimen name="grid_image_shared_icon_layout_top_margin">24dp</dimen>
     <dimen name="grid_image_local_file_indicator_layout_width">16dp</dimen>