mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 21:55:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #414 from owncloud/remove_folder_size_info

Browse source 
Removed folder size from list of files, and folder size updates in database
This commit is contained in:
David A. Velasco 2014-02-26 13:07:12 +01:00
commit d4b9b531d5
6 changed files with 45 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
src/com/owncloud/android/datamodel/FileDataStorageManager.java
View file

@ -237,11 +237,11 @@ public class FileDataStorageManager {
}
}
if (file.isFolder()) {
updateFolderSize(file.getFileId());
} else {
updateFolderSize(file.getParentId());
}
// if (file.isFolder()) {
// updateFolderSize(file.getFileId());
// } else {
// updateFolderSize(file.getParentId());
// }
return overriden;
}
@ -388,38 +388,38 @@ public class FileDataStorageManager {
}
}
updateFolderSize(folder.getFileId());
//updateFolderSize(folder.getFileId());
}
/**
*
* @param id
*/
private void updateFolderSize(long id) {
if (id > FileDataStorageManager.ROOT_PARENT_ID) {
Log_OC.d(TAG, "Updating size of " + id);
if (getContentResolver() != null) {
getContentResolver().update(ProviderTableMeta.CONTENT_URI_DIR,
new ContentValues(), // won't be used, but cannot be null; crashes in KLP
ProviderTableMeta._ID + "=?",
new String[] { String.valueOf(id) });
} else {
try {
getContentProviderClient().update(ProviderTableMeta.CONTENT_URI_DIR,
new ContentValues(), // won't be used, but cannot be null; crashes in KLP
ProviderTableMeta._ID + "=?",
new String[] { String.valueOf(id) });
} catch (RemoteException e) {
Log_OC.e(TAG, "Exception in update of folder size through compatibility patch " + e.getMessage());
}
}
} else {
Log_OC.e(TAG, "not updating size for folder " + id);
}
}
// /**
// *
// * @param id
// */
// private void updateFolderSize(long id) {
// if (id > FileDataStorageManager.ROOT_PARENT_ID) {
// Log_OC.d(TAG, "Updating size of " + id);
// if (getContentResolver() != null) {
// getContentResolver().update(ProviderTableMeta.CONTENT_URI_DIR,
// new ContentValues(), // won't be used, but cannot be null; crashes in KLP
// ProviderTableMeta._ID + "=?",
// new String[] { String.valueOf(id) });
// } else {
// try {
// getContentProviderClient().update(ProviderTableMeta.CONTENT_URI_DIR,
// new ContentValues(), // won't be used, but cannot be null; crashes in KLP
// ProviderTableMeta._ID + "=?",
// new String[] { String.valueOf(id) });
//
// } catch (RemoteException e) {
// Log_OC.e(TAG, "Exception in update of folder size through compatibility patch " + e.getMessage());
// }
// }
// } else {
// Log_OC.e(TAG, "not updating size for folder " + id);
// }
// }
public void removeFile(OCFile file, boolean removeDBData, boolean removeLocalCopy) {
@ -442,7 +442,7 @@ public class FileDataStorageManager {
} else {
getContentResolver().delete(file_uri, where, whereArgs);
}
updateFolderSize(file.getParentId());
//updateFolderSize(file.getParentId());
}
if (removeLocalCopy && file.isDown() && file.getStoragePath() != null) {
boolean success = new File(file.getStoragePath()).delete();
@ -482,7 +482,7 @@ public class FileDataStorageManager {
} else {
getContentResolver().delete(folder_uri, where, whereArgs);
}
updateFolderSize(folder.getParentId());
//updateFolderSize(folder.getParentId());
}
private void removeLocalFolder(File folder) {

8
src/com/owncloud/android/providers/FileContentProvider.java
View file

@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.db.ProviderMeta;
import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
import com.owncloud.android.lib.resources.shares.ShareType;
@ -235,7 +234,6 @@ public class FileContentProvider extends ContentProvider {
}
// TODO: switch(uri)
@Override
public String getType(Uri uri) {
switch (mUriMatcher.match(uri)) {
@ -442,7 +440,7 @@ public class FileContentProvider extends ContentProvider {
private int update(SQLiteDatabase db, Uri uri, ContentValues values, String selection, String[] selectionArgs) {
switch (mUriMatcher.match(uri)) {
case DIRECTORY:
return updateFolderSize(db, selectionArgs[0]);
return 0; //updateFolderSize(db, selectionArgs[0]);
case SHARES:
return db.update(ProviderTableMeta.OCSHARES_TABLE_NAME, values, selection, selectionArgs);
default:
@ -450,7 +448,7 @@ public class FileContentProvider extends ContentProvider {
}
}
/*
private int updateFolderSize(SQLiteDatabase db, String folderId) {
int count = 0;
String [] whereArgs = new String[] { folderId };
@ -501,7 +499,7 @@ public class FileContentProvider extends ContentProvider {
}
return count;
}
*/
@Override
public ContentProviderResult[] applyBatch (ArrayList<ContentProviderOperation> operations) throws OperationApplicationException {

4
src/com/owncloud/android/syncadapter/FileSyncAdapter.java
View file

@ -75,7 +75,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
public static final String EVENT_FULL_SYNC_START = FileSyncAdapter.class.getName() + ".EVENT_FULL_SYNC_START";
public static final String EVENT_FULL_SYNC_END = FileSyncAdapter.class.getName() + ".EVENT_FULL_SYNC_END";
public static final String EVENT_FULL_SYNC_FOLDER_CONTENTS_SYNCED = FileSyncAdapter.class.getName() + ".EVENT_FULL_SYNC_FOLDER_CONTENTS_SYNCED";
public static final String EVENT_FULL_SYNC_FOLDER_SIZE_SYNCED = FileSyncAdapter.class.getName() + ".EVENT_FULL_SYNC_FOLDER_SIZE_SYNCED";
//public static final String EVENT_FULL_SYNC_FOLDER_SIZE_SYNCED = FileSyncAdapter.class.getName() + ".EVENT_FULL_SYNC_FOLDER_SIZE_SYNCED";
public static final String EXTRA_ACCOUNT_NAME = FileSyncAdapter.class.getName() + ".EXTRA_ACCOUNT_NAME";
public static final String EXTRA_FOLDER_PATH = FileSyncAdapter.class.getName() + ".EXTRA_FOLDER_PATH";
@ -351,7 +351,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
syncDown = (parentEtagChanged || etag == null || etag.length() == 0);
if(syncDown) { */
synchronizeFolder(newFile);
sendLocalBroadcast(EVENT_FULL_SYNC_FOLDER_SIZE_SYNCED, parent.getRemotePath(), null);
//sendLocalBroadcast(EVENT_FULL_SYNC_FOLDER_SIZE_SYNCED, parent.getRemotePath(), null);
//}
}
}

5
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
View file

@ -86,7 +86,6 @@ import com.owncloud.android.ui.fragment.FileDetailFragment;
import com.owncloud.android.ui.fragment.FileFragment;
import com.owncloud.android.ui.fragment.OCFileListFragment;
import com.owncloud.android.ui.preview.PreviewImageActivity;
import com.owncloud.android.ui.preview.PreviewImageFragment;
import com.owncloud.android.ui.preview.PreviewMediaFragment;
import com.owncloud.android.ui.preview.PreviewVideoActivity;
import com.owncloud.android.utils.DisplayUtils;
@ -120,7 +119,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
private static final String KEY_WAITING_TO_PREVIEW = "WAITING_TO_PREVIEW";
private static final String KEY_SYNC_IN_PROGRESS = "SYNC_IN_PROGRESS";
private static final String KEY_REFRESH_SHARES_IN_PROGRESS = "SHARES_IN_PROGRESS";
//private static final String KEY_REFRESH_SHARES_IN_PROGRESS = "SHARES_IN_PROGRESS";
public static final int DIALOG_SHORT_WAIT = 0;
private static final int DIALOG_CHOOSE_UPLOAD_SOURCE = 1;
@ -681,7 +680,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
// Listen for sync messages
IntentFilter syncIntentFilter = new IntentFilter(FileSyncAdapter.EVENT_FULL_SYNC_START);
syncIntentFilter.addAction(FileSyncAdapter.EVENT_FULL_SYNC_END);
syncIntentFilter.addAction(FileSyncAdapter.EVENT_FULL_SYNC_FOLDER_SIZE_SYNCED);
//syncIntentFilter.addAction(FileSyncAdapter.EVENT_FULL_SYNC_FOLDER_SIZE_SYNCED);
syncIntentFilter.addAction(FileSyncAdapter.EVENT_FULL_SYNC_FOLDER_CONTENTS_SYNCED);
syncIntentFilter.addAction(SynchronizeFolderOperation.EVENT_SINGLE_FOLDER_CONTENTS_SYNCED);
syncIntentFilter.addAction(SynchronizeFolderOperation.EVENT_SINGLE_FOLDER_SHARES_SYNCED);

4
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
View file

@ -161,8 +161,8 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
}
else {
fileSizeV.setVisibility(View.VISIBLE);
fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));
fileSizeV.setVisibility(View.INVISIBLE);
//fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));
lastModV.setVisibility(View.VISIBLE);
lastModV.setText(DisplayUtils.unixTimeToHumanReadable(file.getModificationTimestamp()));
checkBoxV.setVisibility(View.GONE);

2
tests/src/com/owncloud/android/test/AccountUtilsTest.java
View file

@ -18,7 +18,7 @@
package com.owncloud.android.test;
import com.owncloud.android.lib.accounts.AccountUtils;
import com.owncloud.android.lib.common.accounts.AccountUtils;
import com.owncloud.android.lib.resources.status.OwnCloudVersion;
import android.test.AndroidTestCase;