projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
7ec2576
)
OC-577: Modify FileDataStorageManager to call updateSubtreeSize. OC-523
author
masensio
<masensio@solidgear.es>
Fri, 5 Jul 2013 12:54:02 +0000
(14:54 +0200)
committer
David A. Velasco
<dvelasco@solidgear.es>
Tue, 9 Jul 2013 11:20:52 +0000
(13:20 +0200)
src/com/owncloud/android/datamodel/FileDataStorageManager.java
patch
|
blob
|
blame
|
history
src/com/owncloud/android/operations/CreateFolderOperation.java
patch
|
blob
|
blame
|
history
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
patch
|
blob
|
blame
|
history
diff --git
a/src/com/owncloud/android/datamodel/FileDataStorageManager.java
b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
index
8b70d4a
..
69f36ea
100644
(file)
--- a/
src/com/owncloud/android/datamodel/FileDataStorageManager.java
+++ b/
src/com/owncloud/android/datamodel/FileDataStorageManager.java
@@
-25,6
+25,7
@@
import java.util.Iterator;
import java.util.List;
import java.util.Vector;
import java.util.List;
import java.util.Vector;
+import com.owncloud.android.DisplayUtils;
import com.owncloud.android.Log_OC;
import com.owncloud.android.db.ProviderMeta;
import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
import com.owncloud.android.Log_OC;
import com.owncloud.android.db.ProviderMeta;
import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
@@
-179,13
+180,16
@@
public class FileDataStorageManager implements DataStorageManager {
long new_id = Long.parseLong(result_uri.getPathSegments()
.get(1));
file.setFileId(new_id);
long new_id = Long.parseLong(result_uri.getPathSegments()
.get(1));
file.setFileId(new_id);
- }
+ }
}
if (file.isDirectory() && file.needsUpdatingWhileSaving())
for (OCFile f : getDirectoryContent(file))
saveFile(f);
}
if (file.isDirectory() && file.needsUpdatingWhileSaving())
for (OCFile f : getDirectoryContent(file))
saveFile(f);
-
+
+ Log_OC.d(TAG, ".........file Time= " + DisplayUtils.unixTimeToHumanReadable(file.getModificationTimestamp()));
+ updateSubtreeSize(file.getParentId());
+
return overriden;
}
return overriden;
}
@@
-494,6
+498,8
@@
public class FileDataStorageManager implements DataStorageManager {
if (removeDBData) {
removeFile(dir, true);
}
if (removeDBData) {
removeFile(dir, true);
}
+
+ updateSubtreeSize(dir.getParentId());
}
}
}
}
diff --git
a/src/com/owncloud/android/operations/CreateFolderOperation.java
b/src/com/owncloud/android/operations/CreateFolderOperation.java
index
5965db3
..
03c6868
100644
(file)
--- a/
src/com/owncloud/android/operations/CreateFolderOperation.java
+++ b/
src/com/owncloud/android/operations/CreateFolderOperation.java
@@
-73,6
+73,7
@@
public class CreateFolderOperation extends RemoteOperation {
OCFile newDir = new OCFile(mRemotePath);
newDir.setMimetype("DIR");
newDir.setParentId(mParentDirId);
OCFile newDir = new OCFile(mRemotePath);
newDir.setMimetype("DIR");
newDir.setParentId(mParentDirId);
+ newDir.setModificationTimestamp(System.currentTimeMillis());
mStorageManager.saveFile(newDir);
}
mStorageManager.saveFile(newDir);
}
diff --git
a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index
032981b
..
3e8eecd
100644
(file)
--- a/
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@
-98,7
+98,6
@@
public class FileListListAdapter extends BaseAdapter implements ListAdapter {
return 0;
\r
}
\r
\r
return 0;
\r
}
\r
\r
-
\r
@Override
\r
public View getView(int position, View convertView, ViewGroup parent) {
\r
View view = convertView;
\r
@Override
\r
public View getView(int position, View convertView, ViewGroup parent) {
\r
View view = convertView;
\r