Fixes after rebase

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

@@ -409,16 +409,16 @@ public class ReceiveExternalFilesActivity extends FileActivity
             for (OCFile f : files) {
                 if (f.isFolder()) {
                     HashMap<String, Object> h = new HashMap<>();
-                    h.put("dirname", f.getFileName());
-                    h.put("last_mod", DisplayUtils.getRelativeTimestamp(this, f));
+                    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/ui/adapter/UploaderAdapter.java

@@ -35,6 +35,7 @@ import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.datamodel.ThumbnailsCacheManager;
 import com.owncloud.android.datamodel.ThumbnailsCacheManager.AsyncDrawable;
+import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.MimetypeIconUtil;
 
 import java.util.HashMap;
@@ -74,9 +75,8 @@ public class UploaderAdapter extends SimpleAdapter {
         ImageView fileIcon = (ImageView) vi.findViewById(R.id.thumbnail);
         fileIcon.setTag(file.getFileId());
 
-        // TODO enable after #1277 is merged
-//        TextView lastModV = (TextView) vi.findViewById(R.id.last_mod);
-//        lastModV.setText(DisplayUtils.getRelativeTimestamp(mContext, file));
+        TextView lastModV = (TextView) vi.findViewById(R.id.last_mod);
+        lastModV.setText(DisplayUtils.getRelativeTimestamp(mContext, file));
         
         // get Thumbnail if file is image
         if (file.isImage() && file.getRemoteId() != null){

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
             ){