update to master

res/layout/account_item.xml

@@ -65,6 +65,6 @@
         android:paddingBottom="@dimen/standard_padding"
         android:paddingRight="@dimen/standard_padding"
         android:background="?android:selectableItemBackground"
-        android:src="@drawable/ic_action_delete"/>
+        android:src="@drawable/ic_action_delete_grey"/>
 
 </LinearLayout>         

src/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -984,17 +984,13 @@ public class FileDisplayActivity extends HookActivity
 
                             }
 
-                            if (synchFolderRemotePath.equals(OCFile.ROOT_PATH)) {
-                                setUsernameInDrawer(mDrawerLayout, getAccount());
-                            }
                         }
+                        removeStickyBroadcast(intent);
+                        Log_OC.d(TAG, "Setting progress visibility to " + mSyncInProgress);
+                        setIndeterminate(mSyncInProgress);
 
+                        setBackgroundText();
                     }
-                    removeStickyBroadcast(intent);
-                    Log_OC.d(TAG, "Setting progress visibility to " + mSyncInProgress);
-                    setIndeterminate(mSyncInProgress);
-
-                    setBackgroundText();
                 }
 
                 if (synchResult != null) {

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

@@ -34,6 +34,7 @@ import android.content.DialogInterface;
 import android.content.DialogInterface.OnCancelListener;
 import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.res.Resources.NotFoundException;
 import android.os.Bundle;

src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java

@@ -35,6 +35,8 @@ import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.ui.activity.ComponentsGetter;
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment.ConfirmationDialogFragmentListener;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Vector;
 
 public class RemoveFileDialogFragment extends ConfirmationDialogFragment 
@@ -92,7 +94,9 @@ implements ConfirmationDialogFragmentListener {
         ComponentsGetter cg = (ComponentsGetter)getActivity();
         FileDataStorageManager storageManager = cg.getStorageManager();
         if (storageManager.getFileById(mTargetFile.getFileId()) != null) {
-            cg.getFileOperationsHelper().removeFile(mTargetFile, false);
+            ArrayList<OCFile> list = new ArrayList<>();
+            list.add(mTargetFile);
+            cg.getFileOperationsHelper().removeFiles(list, false);
         }
     }
     
@@ -102,7 +106,9 @@ implements ConfirmationDialogFragmentListener {
     @Override
     public void onCancel(String callerTag) {
         ComponentsGetter cg = (ComponentsGetter)getActivity();
-        cg.getFileOperationsHelper().removeFile(mTargetFile, true);
+        ArrayList<OCFile> list = new ArrayList<>();
+        list.add(mTargetFile);
+        cg.getFileOperationsHelper().removeFiles(list, true);
         
         FileDataStorageManager storageManager = cg.getStorageManager();