mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-22 13:15:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fixes after rebase

Browse source
This commit is contained in:
Andy Scherzinger 2016-03-31 18:27:46 +02:00
parent f2e93657e3
commit df013d2b9c
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
View file

@ -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);

1
src/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java
View file

@ -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);

6
src/com/owncloud/android/ui/adapter/UploaderAdapter.java
View file

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

2
src/com/owncloud/android/utils/DisplayUtils.java
View file

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