From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Mon, 2 Nov 2015 11:32:48 +0000 (+0100)
Subject: Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
X-Git-Tag: beta-20151202~3^2~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ebca7fcb20843f43d54269f6c7b46f3d2d6859bd?hp=ef80135674470b6159f94b0606548ef3aa10f994

Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
---

diff --git a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
index a6839e55..54705dab 100644
--- a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
@@ -120,9 +120,9 @@ public class LocalFileListAdapter extends BaseAdapter implements ListAdapter {
             }
             fileIcon.setTag(file.hashCode());
 
-            TextView fileSizeV = (TextView) view.findViewById(R.id.file_size);
+            TextView fileSizeV = (TextView) view.findViewById(R.id.last_size);
             TextView fileSizeSeparatorV = (TextView) view.findViewById(R.id.file_separator);
-            TextView lastModV = (TextView) view.findViewById(R.id.last_mod);
+            TextView lastModV = (TextView) view.findViewById(R.id.file_mod);
             ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox);
             if (!file.isDirectory()) {
                 fileSizeSeparatorV.setVisibility(View.VISIBLE);