Fixes after rebase

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

@@ -412,13 +412,14 @@ public class ReceiveExternalFilesActivity extends FileActivity
                     HashMap<String, Object> h = new HashMap<>();
                     h.put("dirname", f);
                     data.add(h);
+                }
             }
 
             UploaderAdapter sa = new UploaderAdapter(this,
                                                 data,
                                                 R.layout.uploader_list_item_layout,
                                                 new String[] {"dirname"},
-                                                new int[] {R.id.filename, R.id.last_mod});
+                                                new int[] {R.id.filename},
                                                 getStorageManager(), getAccount());
 
             mListView.setAdapter(sa);

src/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java

@@ -251,6 +251,7 @@ public class ExpandableUploadListAdapter extends BaseExpandableListAdapter imple
             accountNameTextView.setVisibility(View.VISIBLE);
             statusTextView.setVisibility(View.VISIBLE);
             progressBar.setVisibility(View.GONE);
+            progressBar.setVisibility(View.GONE);
 
             /// Update information depending of upload details
             String status = getStatusText(upload);

src/com/owncloud/android/utils/DisplayUtils.java

@@ -169,7 +169,7 @@ public class DisplayUtils {
     }
 
     @SuppressWarnings("deprecation")
-    private static CharSequence getRelativeDateTimeString (
+    public static CharSequence getRelativeDateTimeString (
             Context c, long time, long minResolution, long transitionResolution, int flags
             ){