mirror of
https://github.com/nextcloud/android.git
synced 2024-11-27 17:46:37 +03:00
Get share resources ONLY for the current folder being refreshed
This commit is contained in:
David A. Velasco
parent
62c382b1dc
commit
533924f538
7 changed files with 280 additions and 98 deletions
|
|
@ -1 +1 @@
|
|||
Subproject commit d96e31b5e595518dc6365e5b290dba124140dc26
|
||||
Subproject commit 858d5f106468ab2b78ee8f3ec6eeb8b00e8ff9a5
|
||||
|
|
@ -790,33 +790,23 @@ public class FileDataStorageManager {
|
|||
cv.put(ProviderTableMeta.OCSHARES_EXPIRATION_DATE, share.getExpirationDate());
|
||||
cv.put(ProviderTableMeta.OCSHARES_TOKEN, share.getToken());
|
||||
cv.put(ProviderTableMeta.OCSHARES_SHARE_WITH_DISPLAY_NAME, share.getSharedWithDisplayName());
|
||||
cv.put(ProviderTableMeta.OCSHARES_IS_DIRECTORY, share.isDirectory() ? 1 : 0);
|
||||
cv.put(ProviderTableMeta.OCSHARES_IS_DIRECTORY, share.isFolder() ? 1 : 0);
|
||||
cv.put(ProviderTableMeta.OCSHARES_USER_ID, share.getUserId());
|
||||
cv.put(ProviderTableMeta.OCSHARES_ID_REMOTE_SHARED, share.getIdRemoteShared());
|
||||
cv.put(ProviderTableMeta.OCSHARES_ACCOUNT_OWNER, mAccount.name);
|
||||
|
||||
boolean samePath = shareExists(share.getPath());
|
||||
if (samePath ||
|
||||
shareExists(share.getId())) { // for renamed files; no more delete and create
|
||||
|
||||
OCShare oldFile = null;
|
||||
if (samePath) {
|
||||
oldFile = getShareByPath(share.getPath());
|
||||
share.setId(oldFile.getId());
|
||||
} else {
|
||||
oldFile = getShareById(share.getId());
|
||||
}
|
||||
if (shareExists(share.getIdRemoteShared())) { // for renamed files; no more delete and create
|
||||
|
||||
overriden = true;
|
||||
if (getContentResolver() != null) {
|
||||
getContentResolver().update(ProviderTableMeta.CONTENT_URI_SHARE, cv,
|
||||
ProviderTableMeta._ID + "=?",
|
||||
new String[] { String.valueOf(share.getId()) });
|
||||
ProviderTableMeta.OCSHARES_ID_REMOTE_SHARED + "=?",
|
||||
new String[] { String.valueOf(share.getIdRemoteShared()) });
|
||||
} else {
|
||||
try {
|
||||
getContentProviderClient().update(ProviderTableMeta.CONTENT_URI_SHARE,
|
||||
cv, ProviderTableMeta._ID + "=?",
|
||||
new String[] { String.valueOf(share.getId()) });
|
||||
cv, ProviderTableMeta.OCSHARES_ID_REMOTE_SHARED + "=?",
|
||||
new String[] { String.valueOf(share.getIdRemoteShared()) });
|
||||
} catch (RemoteException e) {
|
||||
Log_OC.e(TAG,
|
||||
"Fail to insert insert file to database "
|
||||
|
|
@ -858,6 +848,16 @@ public class FileDataStorageManager {
|
|||
return share;
|
||||
}
|
||||
|
||||
private OCShare getShareByRemoteId(long remoteId) {
|
||||
Cursor c = getShareCursorForValue(ProviderTableMeta.OCSHARES_ID_REMOTE_SHARED, String.valueOf(remoteId));
|
||||
OCShare share = null;
|
||||
if (c.moveToFirst()) {
|
||||
share = createShareInstance(c);
|
||||
}
|
||||
c.close();
|
||||
return share;
|
||||
}
|
||||
|
||||
public OCShare getShareByPath(String path) {
|
||||
Cursor c = getShareCursorForValue(ProviderTableMeta.OCSHARES_PATH, path);
|
||||
OCShare share = null;
|
||||
|
|
@ -888,7 +888,7 @@ public class FileDataStorageManager {
|
|||
.getColumnIndex(ProviderTableMeta.OCSHARES_TOKEN)));
|
||||
share.setSharedWithDisplayName(c.getString(c
|
||||
.getColumnIndex(ProviderTableMeta.OCSHARES_SHARE_WITH_DISPLAY_NAME)));
|
||||
share.setIsDirectory(c.getInt(
|
||||
share.setIsFolder(c.getInt(
|
||||
c.getColumnIndex(ProviderTableMeta.OCSHARES_IS_DIRECTORY)) == 1 ? true : false);
|
||||
share.setUserId(c.getLong(c.getColumnIndex(ProviderTableMeta.OCSHARES_USER_ID)));
|
||||
share.setIdRemoteShared(c.getLong(c.getColumnIndex(ProviderTableMeta.OCSHARES_ID_REMOTE_SHARED)));
|
||||
|
|
@ -927,12 +927,8 @@ public class FileDataStorageManager {
|
|||
return retval;
|
||||
}
|
||||
|
||||
public boolean shareExists(long id) {
|
||||
return shareExists(ProviderTableMeta._ID, String.valueOf(id));
|
||||
}
|
||||
|
||||
public boolean shareExists(String path) {
|
||||
return shareExists(ProviderTableMeta.OCSHARES_PATH, path);
|
||||
private boolean shareExists(long remoteId) {
|
||||
return shareExists(ProviderTableMeta.OCSHARES_ID_REMOTE_SHARED, String.valueOf(remoteId));
|
||||
}
|
||||
|
||||
private void cleanSharedFiles() {
|
||||
|
|
@ -955,6 +951,26 @@ public class FileDataStorageManager {
|
|||
}
|
||||
}
|
||||
|
||||
private void cleanSharedFilesInFolder(OCFile folder) {
|
||||
ContentValues cv = new ContentValues();
|
||||
cv.put(ProviderTableMeta.FILE_SHARE_BY_LINK, false);
|
||||
cv.put(ProviderTableMeta.FILE_PUBLIC_LINK, "");
|
||||
String where = ProviderTableMeta.FILE_ACCOUNT_OWNER + "=? AND " + ProviderTableMeta.FILE_PARENT + "=?";
|
||||
String [] whereArgs = new String[] { mAccount.name , String.valueOf(folder.getFileId()) };
|
||||
|
||||
if (getContentResolver() != null) {
|
||||
getContentResolver().update(ProviderTableMeta.CONTENT_URI, cv, where, whereArgs);
|
||||
|
||||
} else {
|
||||
try {
|
||||
getContentProviderClient().update(ProviderTableMeta.CONTENT_URI, cv, where, whereArgs);
|
||||
|
||||
} catch (RemoteException e) {
|
||||
Log_OC.e(TAG, "Exception in cleanSharedFilesInFolder " + e.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void cleanShares() {
|
||||
String where = ProviderTableMeta.OCSHARES_ACCOUNT_OWNER + "=?";
|
||||
String [] whereArgs = new String[]{mAccount.name};
|
||||
|
|
@ -990,18 +1006,17 @@ public class FileDataStorageManager {
|
|||
cv.put(ProviderTableMeta.OCSHARES_EXPIRATION_DATE, share.getExpirationDate());
|
||||
cv.put(ProviderTableMeta.OCSHARES_TOKEN, share.getToken());
|
||||
cv.put(ProviderTableMeta.OCSHARES_SHARE_WITH_DISPLAY_NAME, share.getSharedWithDisplayName());
|
||||
cv.put(ProviderTableMeta.OCSHARES_IS_DIRECTORY, share.isDirectory() ? 1 : 0);
|
||||
cv.put(ProviderTableMeta.OCSHARES_IS_DIRECTORY, share.isFolder() ? 1 : 0);
|
||||
cv.put(ProviderTableMeta.OCSHARES_USER_ID, share.getUserId());
|
||||
cv.put(ProviderTableMeta.OCSHARES_ID_REMOTE_SHARED, share.getIdRemoteShared());
|
||||
cv.put(ProviderTableMeta.OCSHARES_ACCOUNT_OWNER, mAccount.name);
|
||||
|
||||
boolean existsByPath = shareExists(share.getPath());
|
||||
if (existsByPath || shareExists(share.getId())) {
|
||||
if (shareExists(share.getIdRemoteShared())) {
|
||||
// updating an existing file
|
||||
operations.add(ContentProviderOperation.newUpdate(ProviderTableMeta.CONTENT_URI_SHARE).
|
||||
withValues(cv).
|
||||
withSelection( ProviderTableMeta._ID + "=?",
|
||||
new String[] { String.valueOf(share.getId()) })
|
||||
withSelection( ProviderTableMeta.OCSHARES_ID_REMOTE_SHARED + "=?",
|
||||
new String[] { String.valueOf(share.getIdRemoteShared()) })
|
||||
.build());
|
||||
|
||||
} else {
|
||||
|
|
@ -1110,7 +1125,7 @@ public class FileDataStorageManager {
|
|||
for (OCShare share : shares) {
|
||||
// Get the path
|
||||
String path = share.getPath();
|
||||
if (share.isDirectory()) {
|
||||
if (share.isFolder()) {
|
||||
path = path + FileUtils.PATH_SEPARATOR;
|
||||
}
|
||||
|
||||
|
|
@ -1126,4 +1141,125 @@ public class FileDataStorageManager {
|
|||
|
||||
updateSharedFiles(sharedFiles);
|
||||
}
|
||||
|
||||
|
||||
public void saveSharesInFolder(ArrayList<OCShare> shares, OCFile folder) {
|
||||
cleanSharedFilesInFolder(folder);
|
||||
ArrayList<ContentProviderOperation> operations = new ArrayList<ContentProviderOperation>();
|
||||
operations = prepareRemoveSharesInFolder(folder, operations);
|
||||
|
||||
if (shares != null) {
|
||||
// prepare operations to insert or update files to save in the given folder
|
||||
for (OCShare share : shares) {
|
||||
ContentValues cv = new ContentValues();
|
||||
cv.put(ProviderTableMeta.OCSHARES_FILE_SOURCE, share.getFileSource());
|
||||
cv.put(ProviderTableMeta.OCSHARES_ITEM_SOURCE, share.getItemSource());
|
||||
cv.put(ProviderTableMeta.OCSHARES_SHARE_TYPE, share.getShareType().getValue());
|
||||
cv.put(ProviderTableMeta.OCSHARES_SHARE_WITH, share.getShareWith());
|
||||
cv.put(ProviderTableMeta.OCSHARES_PATH, share.getPath());
|
||||
cv.put(ProviderTableMeta.OCSHARES_PERMISSIONS, share.getPermissions());
|
||||
cv.put(ProviderTableMeta.OCSHARES_SHARED_DATE, share.getSharedDate());
|
||||
cv.put(ProviderTableMeta.OCSHARES_EXPIRATION_DATE, share.getExpirationDate());
|
||||
cv.put(ProviderTableMeta.OCSHARES_TOKEN, share.getToken());
|
||||
cv.put(ProviderTableMeta.OCSHARES_SHARE_WITH_DISPLAY_NAME, share.getSharedWithDisplayName());
|
||||
cv.put(ProviderTableMeta.OCSHARES_IS_DIRECTORY, share.isFolder() ? 1 : 0);
|
||||
cv.put(ProviderTableMeta.OCSHARES_USER_ID, share.getUserId());
|
||||
cv.put(ProviderTableMeta.OCSHARES_ID_REMOTE_SHARED, share.getIdRemoteShared());
|
||||
cv.put(ProviderTableMeta.OCSHARES_ACCOUNT_OWNER, mAccount.name);
|
||||
|
||||
/*
|
||||
if (shareExists(share.getIdRemoteShared())) {
|
||||
// updating an existing share resource
|
||||
operations.add(ContentProviderOperation.newUpdate(ProviderTableMeta.CONTENT_URI_SHARE).
|
||||
withValues(cv).
|
||||
withSelection( ProviderTableMeta.OCSHARES_ID_REMOTE_SHARED + "=?",
|
||||
new String[] { String.valueOf(share.getIdRemoteShared()) })
|
||||
.build());
|
||||
|
||||
} else {
|
||||
*/
|
||||
// adding a new share resource
|
||||
operations.add(ContentProviderOperation.newInsert(ProviderTableMeta.CONTENT_URI_SHARE).withValues(cv).build());
|
||||
//}
|
||||
}
|
||||
}
|
||||
|
||||
// apply operations in batch
|
||||
if (operations.size() > 0) {
|
||||
@SuppressWarnings("unused")
|
||||
ContentProviderResult[] results = null;
|
||||
Log_OC.d(TAG, "Sending " + operations.size() + " operations to FileContentProvider");
|
||||
try {
|
||||
if (getContentResolver() != null) {
|
||||
results = getContentResolver().applyBatch(MainApp.getAuthority(), operations);
|
||||
|
||||
} else {
|
||||
results = getContentProviderClient().applyBatch(operations);
|
||||
}
|
||||
|
||||
} catch (OperationApplicationException e) {
|
||||
Log_OC.e(TAG, "Exception in batch of operations " + e.getMessage());
|
||||
|
||||
} catch (RemoteException e) {
|
||||
Log_OC.e(TAG, "Exception in batch of operations " + e.getMessage());
|
||||
}
|
||||
}
|
||||
//}
|
||||
|
||||
}
|
||||
|
||||
private ArrayList<ContentProviderOperation> prepareRemoveSharesInFolder(OCFile folder, ArrayList<ContentProviderOperation> preparedOperations) {
|
||||
if (folder != null) {
|
||||
String where = ProviderTableMeta.OCSHARES_PATH + "=?" + " AND " + ProviderTableMeta.OCSHARES_ACCOUNT_OWNER + "=?";
|
||||
String [] whereArgs = new String[]{ "", mAccount.name };
|
||||
|
||||
Vector<OCFile> files = getFolderContent(folder);
|
||||
|
||||
for (OCFile file : files) {
|
||||
whereArgs[0] = file.getRemotePath();
|
||||
preparedOperations.add(ContentProviderOperation.newDelete(ProviderTableMeta.CONTENT_URI_SHARE)
|
||||
.withSelection(where, whereArgs)
|
||||
.build());
|
||||
}
|
||||
}
|
||||
return preparedOperations;
|
||||
|
||||
/*
|
||||
if (operations.size() > 0) {
|
||||
try {
|
||||
if (getContentResolver() != null) {
|
||||
getContentResolver().applyBatch(MainApp.getAuthority(), operations);
|
||||
|
||||
} else {
|
||||
getContentProviderClient().applyBatch(operations);
|
||||
}
|
||||
|
||||
} catch (OperationApplicationException e) {
|
||||
Log_OC.e(TAG, "Exception in batch of operations " + e.getMessage());
|
||||
|
||||
} catch (RemoteException e) {
|
||||
Log_OC.e(TAG, "Exception in batch of operations " + e.getMessage());
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
/*
|
||||
if (getContentResolver() != null) {
|
||||
|
||||
getContentResolver().delete(ProviderTableMeta.CONTENT_URI_SHARE,
|
||||
where,
|
||||
whereArgs);
|
||||
} else {
|
||||
try {
|
||||
getContentProviderClient().delete( ProviderTableMeta.CONTENT_URI_SHARE,
|
||||
where,
|
||||
whereArgs);
|
||||
|
||||
} catch (RemoteException e) {
|
||||
Log_OC.e(TAG, "Exception deleting shares in a folder " + e.getMessage());
|
||||
}
|
||||
}
|
||||
*/
|
||||
//}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -94,11 +94,11 @@ public class CreateShareOperation extends SyncOperation {
|
|||
// Update DB with the response
|
||||
if (mPath.endsWith(FileUtils.PATH_SEPARATOR)) {
|
||||
share.setPath(mPath.substring(0, mPath.length()-1));
|
||||
share.setIsDirectory(true);
|
||||
share.setIsFolder(true);
|
||||
|
||||
} else {
|
||||
share.setPath(mPath);
|
||||
share.setIsDirectory(false);
|
||||
share.setIsFolder(false);
|
||||
}
|
||||
share.setPermissions(mPermissions);
|
||||
|
||||
|
|
|
|||
|
|
@ -38,9 +38,11 @@ import android.support.v4.content.LocalBroadcastManager;
|
|||
import com.owncloud.android.datamodel.FileDataStorageManager;
|
||||
import com.owncloud.android.datamodel.OCFile;
|
||||
import com.owncloud.android.lib.network.OwnCloudClient;
|
||||
import com.owncloud.android.lib.operations.common.OCShare;
|
||||
import com.owncloud.android.lib.operations.common.RemoteOperation;
|
||||
import com.owncloud.android.lib.operations.common.RemoteOperationResult;
|
||||
import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode;
|
||||
import com.owncloud.android.lib.operations.remote.GetSharesForFileRemoteOperation;
|
||||
import com.owncloud.android.lib.operations.remote.ReadRemoteFileOperation;
|
||||
import com.owncloud.android.lib.operations.remote.ReadRemoteFolderOperation;
|
||||
import com.owncloud.android.lib.operations.common.RemoteFile;
|
||||
|
|
@ -65,7 +67,8 @@ public class SynchronizeFolderOperation extends RemoteOperation {
|
|||
|
||||
private static final String TAG = SynchronizeFolderOperation.class.getSimpleName();
|
||||
|
||||
public static final String EVENT_SINGLE_FOLDER_SYNCED = SynchronizeFolderOperation.class.getName() + ".EVENT_SINGLE_FOLDER_SYNCED";
|
||||
public static final String EVENT_SINGLE_FOLDER_CONTENTS_SYNCED = SynchronizeFolderOperation.class.getName() + ".EVENT_SINGLE_FOLDER_CONTENTS_SYNCED";
|
||||
public static final String EVENT_SINGLE_FOLDER_SHARES_SYNCED = SynchronizeFolderOperation.class.getName() + ".EVENT_SINGLE_FOLDER_SHARES_SYNCED";
|
||||
|
||||
/** Time stamp for the synchronization process in progress */
|
||||
private long mCurrentSyncTime;
|
||||
|
|
@ -174,45 +177,53 @@ public class SynchronizeFolderOperation extends RemoteOperation {
|
|||
}
|
||||
|
||||
if (!mSyncFullAccount) {
|
||||
sendLocalBroadcast(mLocalFolder.getRemotePath(), result);
|
||||
sendLocalBroadcast(EVENT_SINGLE_FOLDER_CONTENTS_SYNCED, mLocalFolder.getRemotePath(), result);
|
||||
}
|
||||
|
||||
if (result.isSuccess()) {
|
||||
result = refreshSharesForFolder(client);
|
||||
}
|
||||
|
||||
if (!mSyncFullAccount) {
|
||||
sendLocalBroadcast(EVENT_SINGLE_FOLDER_SHARES_SYNCED, mLocalFolder.getRemotePath(), result);
|
||||
}
|
||||
|
||||
return result;
|
||||
|
||||
}
|
||||
|
||||
|
||||
private RemoteOperationResult checkForChanges(OwnCloudClient client) {
|
||||
mRemoteFolderChanged = false;
|
||||
RemoteOperationResult result = null;
|
||||
String remotePath = null;
|
||||
|
||||
remotePath = mLocalFolder.getRemotePath();
|
||||
Log_OC.d(TAG, "Checking changes in " + mAccount.name + remotePath);
|
||||
remotePath = mLocalFolder.getRemotePath();
|
||||
Log_OC.d(TAG, "Checking changes in " + mAccount.name + remotePath);
|
||||
|
||||
// remote request
|
||||
ReadRemoteFileOperation operation = new ReadRemoteFileOperation(remotePath);
|
||||
result = operation.execute(client);
|
||||
if (result.isSuccess()){
|
||||
OCFile remoteFolder = FileStorageUtils.fillOCFile((RemoteFile) result.getData().get(0));
|
||||
// remote request
|
||||
ReadRemoteFileOperation operation = new ReadRemoteFileOperation(remotePath);
|
||||
result = operation.execute(client);
|
||||
if (result.isSuccess()){
|
||||
OCFile remoteFolder = FileStorageUtils.fillOCFile((RemoteFile) result.getData().get(0));
|
||||
|
||||
// check if remote and local folder are different
|
||||
mRemoteFolderChanged = !(remoteFolder.getEtag().equalsIgnoreCase(mLocalFolder.getEtag()));
|
||||
// check if remote and local folder are different
|
||||
mRemoteFolderChanged = !(remoteFolder.getEtag().equalsIgnoreCase(mLocalFolder.getEtag()));
|
||||
|
||||
result = new RemoteOperationResult(ResultCode.OK);
|
||||
result = new RemoteOperationResult(ResultCode.OK);
|
||||
|
||||
Log_OC.i(TAG, "Checked " + mAccount.name + remotePath + " : " + (mRemoteFolderChanged ? "changed" : "not changed"));
|
||||
} else {
|
||||
// check failed
|
||||
if (result.getCode() == ResultCode.FILE_NOT_FOUND) {
|
||||
removeLocalFolder();
|
||||
}
|
||||
if (result.isException()) {
|
||||
Log_OC.e(TAG, "Checked " + mAccount.name + remotePath + " : " + result.getLogMessage(), result.getException());
|
||||
} else {
|
||||
Log_OC.e(TAG, "Checked " + mAccount.name + remotePath + " : " + result.getLogMessage());
|
||||
}
|
||||
Log_OC.i(TAG, "Checked " + mAccount.name + remotePath + " : " + (mRemoteFolderChanged ? "changed" : "not changed"));
|
||||
|
||||
} else {
|
||||
// check failed
|
||||
if (result.getCode() == ResultCode.FILE_NOT_FOUND) {
|
||||
removeLocalFolder();
|
||||
}
|
||||
if (result.isException()) {
|
||||
Log_OC.e(TAG, "Checked " + mAccount.name + remotePath + " : " + result.getLogMessage(), result.getException());
|
||||
} else {
|
||||
Log_OC.e(TAG, "Checked " + mAccount.name + remotePath + " : " + result.getLogMessage());
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
|
@ -332,13 +343,7 @@ public class SynchronizeFolderOperation extends RemoteOperation {
|
|||
// request for the synchronization of file contents AFTER saving current remote properties
|
||||
startContentSynchronizations(filesToSyncContents, client);
|
||||
|
||||
// removal of obsolete files
|
||||
//removeObsoleteFiles();
|
||||
|
||||
// must be done AFTER saving all the children information, so that eTag is not updated in the database in case of unexpected exceptions
|
||||
//mStorageManager.saveFile(remoteFolder);
|
||||
mChildren = updatedFiles;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -454,6 +459,27 @@ public class SynchronizeFolderOperation extends RemoteOperation {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
private RemoteOperationResult refreshSharesForFolder(OwnCloudClient client) {
|
||||
RemoteOperationResult result = null;
|
||||
|
||||
// remote request
|
||||
GetSharesForFileRemoteOperation operation = new GetSharesForFileRemoteOperation(mLocalFolder.getRemotePath(), false, true);
|
||||
result = operation.execute(client);
|
||||
|
||||
if (result.isSuccess()) {
|
||||
// update local database
|
||||
ArrayList<OCShare> shares = new ArrayList<OCShare>();
|
||||
for(Object obj: result.getData()) {
|
||||
shares.add((OCShare) obj);
|
||||
}
|
||||
mStorageManager.saveSharesInFolder(shares, mLocalFolder);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Scans the default location for saving local copies of files searching for
|
||||
* a 'lost' file with the same full name as the {@link OCFile} received as
|
||||
|
|
@ -475,11 +501,12 @@ public class SynchronizeFolderOperation extends RemoteOperation {
|
|||
/**
|
||||
* Sends a message to any application component interested in the progress of the synchronization.
|
||||
*
|
||||
* @param inProgress 'True' when the synchronization progress is not finished.
|
||||
* @param event
|
||||
* @param dirRemotePath Remote path of a folder that was just synchronized (with or without success)
|
||||
* @param result
|
||||
*/
|
||||
private void sendLocalBroadcast(String dirRemotePath, RemoteOperationResult result) {
|
||||
Intent intent = new Intent(EVENT_SINGLE_FOLDER_SYNCED);
|
||||
private void sendLocalBroadcast(String event, String dirRemotePath, RemoteOperationResult result) {
|
||||
Intent intent = new Intent(event);
|
||||
intent.putExtra(FileSyncAdapter.EXTRA_ACCOUNT_NAME, mAccount.name);
|
||||
if (dirRemotePath != null) {
|
||||
intent.putExtra(FileSyncAdapter.EXTRA_FOLDER_PATH, dirRemotePath);
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ 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.operations.common.ShareType;
|
||||
import com.owncloud.android.utils.Log_OC;
|
||||
|
||||
|
||||
|
|
@ -298,23 +299,23 @@ public class FileContentProvider extends ContentProvider {
|
|||
String[] projectionShare = new String[] {ProviderTableMeta._ID, ProviderTableMeta.OCSHARES_PATH, ProviderTableMeta.OCSHARES_ACCOUNT_OWNER };
|
||||
String whereShare = ProviderTableMeta.OCSHARES_PATH + "=? AND " + ProviderTableMeta.OCSHARES_ACCOUNT_OWNER + "=?";
|
||||
String[] whereArgsShare = new String[] {path, accountNameShare};
|
||||
Uri insertedShareUri = null;
|
||||
Cursor doubleCheckShare = query(db, uri, projectionShare, whereShare, whereArgsShare, null);
|
||||
if (doubleCheckShare == null || !doubleCheckShare.moveToFirst()) { // ugly patch; serious refactorization is needed to reduce work in FileDataStorageManager and bring it to FileContentProvider
|
||||
long rowId = db.insert(ProviderTableMeta.OCSHARES_TABLE_NAME, null, values);
|
||||
if (rowId >0) {
|
||||
Uri insertedShareUri = ContentUris.withAppendedId(ProviderTableMeta.CONTENT_URI_SHARE, rowId);
|
||||
return insertedShareUri;
|
||||
insertedShareUri = ContentUris.withAppendedId(ProviderTableMeta.CONTENT_URI_SHARE, rowId);
|
||||
} else {
|
||||
throw new SQLException("ERROR " + uri);
|
||||
|
||||
}
|
||||
} else {
|
||||
// file is already inserted; race condition, let's avoid a duplicated entry
|
||||
Uri insertedFileUri = ContentUris.withAppendedId(ProviderTableMeta.CONTENT_URI_SHARE, doubleCheckShare.getLong(doubleCheckShare.getColumnIndex(ProviderTableMeta._ID)));
|
||||
insertedShareUri = ContentUris.withAppendedId(ProviderTableMeta.CONTENT_URI_SHARE, doubleCheckShare.getLong(doubleCheckShare.getColumnIndex(ProviderTableMeta._ID)));
|
||||
doubleCheckShare.close();
|
||||
|
||||
return insertedFileUri;
|
||||
}
|
||||
updateFilesTableAccordingToShareInsertion(db, uri, values);
|
||||
return insertedShareUri;
|
||||
|
||||
|
||||
default:
|
||||
|
|
@ -323,6 +324,18 @@ public class FileContentProvider extends ContentProvider {
|
|||
|
||||
}
|
||||
|
||||
private void updateFilesTableAccordingToShareInsertion(SQLiteDatabase db, Uri uri, ContentValues shareValues) {
|
||||
ContentValues fileValues = new ContentValues();
|
||||
fileValues.put(ProviderTableMeta.FILE_SHARE_BY_LINK,
|
||||
ShareType.PUBLIC_LINK.getValue() == shareValues.getAsInteger(ProviderTableMeta.OCSHARES_SHARE_TYPE)? 1 : 0);
|
||||
String whereShare = ProviderTableMeta.FILE_PATH + "=? AND " + ProviderTableMeta.FILE_ACCOUNT_OWNER + "=?";
|
||||
String[] whereArgsShare = new String[] {
|
||||
shareValues.getAsString(ProviderTableMeta.OCSHARES_PATH),
|
||||
shareValues.getAsString(ProviderTableMeta.OCSHARES_ACCOUNT_OWNER)
|
||||
};
|
||||
db.update(ProviderTableMeta.FILE_TABLE_NAME, fileValues, whereShare, whereArgsShare);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean onCreate() {
|
||||
|
|
|
|||
|
|
@ -72,8 +72,8 @@ 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_FOLDER_CONTENTS_SYNCED = FileSyncAdapter.class.getName() + ".EVENT_FOLDER_CONTENTS_SYNCED";
|
||||
public static final String EVENT_FOLDER_SIZE_SYNCED = FileSyncAdapter.class.getName() + ".EVENT_FOLDER_SIZE_SYNCED";
|
||||
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 EXTRA_ACCOUNT_NAME = FileSyncAdapter.class.getName() + ".EXTRA_ACCOUNT_NAME";
|
||||
public static final String EXTRA_FOLDER_PATH = FileSyncAdapter.class.getName() + ".EXTRA_FOLDER_PATH";
|
||||
|
|
@ -269,7 +269,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
|
|||
|
||||
|
||||
// synchronized folder -> notice to UI - ALWAYS, although !result.isSuccess
|
||||
sendLocalBroadcast(EVENT_FOLDER_CONTENTS_SYNCED, folder.getRemotePath(), result);
|
||||
sendLocalBroadcast(EVENT_FULL_SYNC_FOLDER_CONTENTS_SYNCED, folder.getRemotePath(), result);
|
||||
|
||||
// check the result of synchronizing the folder
|
||||
if (result.isSuccess() || result.getCode() == ResultCode.SYNC_CONFLICT) {
|
||||
|
|
@ -343,7 +343,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
|
|||
syncDown = (parentEtagChanged || etag == null || etag.length() == 0);
|
||||
if(syncDown) { */
|
||||
synchronizeFolder(newFile);
|
||||
sendLocalBroadcast(EVENT_FOLDER_SIZE_SYNCED, parent.getRemotePath(), null);
|
||||
sendLocalBroadcast(EVENT_FULL_SYNC_FOLDER_SIZE_SYNCED, parent.getRemotePath(), null);
|
||||
//}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
|
|||
private SyncBroadcastReceiver mSyncBroadcastReceiver;
|
||||
private UploadFinishReceiver mUploadFinishReceiver;
|
||||
private DownloadFinishReceiver mDownloadFinishReceiver;
|
||||
private OperationsServiceReceiver mOperationsServiceReceiver;
|
||||
//private OperationsServiceReceiver mOperationsServiceReceiver;
|
||||
private FileDownloaderBinder mDownloaderBinder = null;
|
||||
private FileUploaderBinder mUploaderBinder = null;
|
||||
private ServiceConnection mDownloadConnection = null, mUploadConnection = null;
|
||||
|
|
@ -138,7 +138,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
|
|||
private OCFile mWaitingToPreview;
|
||||
|
||||
private boolean mSyncInProgress = false;
|
||||
private boolean mRefreshSharesInProgress = false;
|
||||
//private boolean mRefreshSharesInProgress = false;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
|
|
@ -169,12 +169,12 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
|
|||
if(savedInstanceState != null) {
|
||||
mWaitingToPreview = (OCFile) savedInstanceState.getParcelable(FileDisplayActivity.KEY_WAITING_TO_PREVIEW);
|
||||
mSyncInProgress = savedInstanceState.getBoolean(KEY_SYNC_IN_PROGRESS);
|
||||
mRefreshSharesInProgress = savedInstanceState.getBoolean(KEY_REFRESH_SHARES_IN_PROGRESS);
|
||||
//mRefreshSharesInProgress = savedInstanceState.getBoolean(KEY_REFRESH_SHARES_IN_PROGRESS);
|
||||
|
||||
} else {
|
||||
mWaitingToPreview = null;
|
||||
mSyncInProgress = false;
|
||||
mRefreshSharesInProgress = false;
|
||||
//mRefreshSharesInProgress = false;
|
||||
}
|
||||
|
||||
/// USER INTERFACE
|
||||
|
|
@ -191,7 +191,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
|
|||
// Action bar setup
|
||||
mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);
|
||||
getSupportActionBar().setHomeButtonEnabled(true); // mandatory since Android ICS, according to the official documentation
|
||||
setSupportProgressBarIndeterminateVisibility(mSyncInProgress || mRefreshSharesInProgress); // always AFTER setContentView(...) ; to work around bug in its implementation
|
||||
setSupportProgressBarIndeterminateVisibility(mSyncInProgress /*|| mRefreshSharesInProgress*/); // always AFTER setContentView(...) ; to work around bug in its implementation
|
||||
|
||||
Log_OC.d(TAG, "onCreate() end");
|
||||
}
|
||||
|
|
@ -657,7 +657,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
|
|||
super.onSaveInstanceState(outState);
|
||||
outState.putParcelable(FileDisplayActivity.KEY_WAITING_TO_PREVIEW, mWaitingToPreview);
|
||||
outState.putBoolean(FileDisplayActivity.KEY_SYNC_IN_PROGRESS, mSyncInProgress);
|
||||
outState.putBoolean(FileDisplayActivity.KEY_REFRESH_SHARES_IN_PROGRESS, mRefreshSharesInProgress);
|
||||
//outState.putBoolean(FileDisplayActivity.KEY_REFRESH_SHARES_IN_PROGRESS, mRefreshSharesInProgress);
|
||||
|
||||
Log_OC.d(TAG, "onSaveInstanceState() end");
|
||||
}
|
||||
|
|
@ -672,9 +672,10 @@ 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_FOLDER_SIZE_SYNCED);
|
||||
syncIntentFilter.addAction(FileSyncAdapter.EVENT_FOLDER_CONTENTS_SYNCED);
|
||||
syncIntentFilter.addAction(SynchronizeFolderOperation.EVENT_SINGLE_FOLDER_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);
|
||||
mSyncBroadcastReceiver = new SyncBroadcastReceiver();
|
||||
//registerReceiver(mSyncBroadcastReceiver, syncIntentFilter);
|
||||
LocalBroadcastManager.getInstance(this).registerReceiver(mSyncBroadcastReceiver, syncIntentFilter);
|
||||
|
|
@ -691,10 +692,12 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
|
|||
registerReceiver(mDownloadFinishReceiver, downloadIntentFilter);
|
||||
|
||||
// Listen for messages from the OperationsService
|
||||
/*
|
||||
IntentFilter operationsIntentFilter = new IntentFilter(OperationsService.ACTION_OPERATION_ADDED);
|
||||
operationsIntentFilter.addAction(OperationsService.ACTION_OPERATION_FINISHED);
|
||||
mOperationsServiceReceiver = new OperationsServiceReceiver();
|
||||
LocalBroadcastManager.getInstance(this).registerReceiver(mOperationsServiceReceiver, operationsIntentFilter);
|
||||
*/
|
||||
|
||||
Log_OC.d(TAG, "onResume() end");
|
||||
}
|
||||
|
|
@ -717,10 +720,12 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
|
|||
unregisterReceiver(mDownloadFinishReceiver);
|
||||
mDownloadFinishReceiver = null;
|
||||
}
|
||||
/*
|
||||
if (mOperationsServiceReceiver != null) {
|
||||
LocalBroadcastManager.getInstance(this).unregisterReceiver(mOperationsServiceReceiver);
|
||||
mOperationsServiceReceiver = null;
|
||||
}
|
||||
*/
|
||||
Log_OC.d(TAG, "onPause() end");
|
||||
}
|
||||
|
||||
|
|
@ -926,24 +931,24 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
|
|||
setFile(currentFile);
|
||||
}
|
||||
|
||||
mSyncInProgress = (!FileSyncAdapter.EVENT_FULL_SYNC_END.equals(event) &&
|
||||
!SynchronizeFolderOperation.EVENT_SINGLE_FOLDER_SYNCED.equals(event) &&
|
||||
(synchResult == null || synchResult.isSuccess())) ;
|
||||
mSyncInProgress = (!FileSyncAdapter.EVENT_FULL_SYNC_END.equals(event) && !SynchronizeFolderOperation.EVENT_SINGLE_FOLDER_SHARES_SYNCED.equals(event));
|
||||
|
||||
/*
|
||||
if (synchResult != null &&
|
||||
synchResult.isSuccess() &&
|
||||
(SynchronizeFolderOperation.EVENT_SINGLE_FOLDER_SYNCED.equals(event) ||
|
||||
FileSyncAdapter.EVENT_FOLDER_CONTENTS_SYNCED.equals(event)
|
||||
FileSyncAdapter.EVENT_FULL_SYNC_FOLDER_CONTENTS_SYNCED.equals(event)
|
||||
) &&
|
||||
!mRefreshSharesInProgress &&
|
||||
getFileOperationsHelper().isSharedSupported(FileDisplayActivity.this)
|
||||
) {
|
||||
startGetShares();
|
||||
}
|
||||
*/
|
||||
|
||||
}
|
||||
//removeStickyBroadcast(intent);
|
||||
setSupportProgressBarIndeterminateVisibility(mSyncInProgress || mRefreshSharesInProgress);
|
||||
setSupportProgressBarIndeterminateVisibility(mSyncInProgress /*|| mRefreshSharesInProgress*/);
|
||||
}
|
||||
|
||||
if (synchResult != null) {
|
||||
|
|
@ -1026,7 +1031,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
|
|||
if (OperationsService.ACTION_OPERATION_ADDED.equals(intent.getAction())) {
|
||||
|
||||
} else if (OperationsService.ACTION_OPERATION_FINISHED.equals(intent.getAction())) {
|
||||
mRefreshSharesInProgress = false;
|
||||
//mRefreshSharesInProgress = false;
|
||||
|
||||
Account account = intent.getParcelableExtra(OperationsService.EXTRA_ACCOUNT);
|
||||
RemoteOperationResult getSharesResult = (RemoteOperationResult)intent.getSerializableExtra(OperationsService.EXTRA_RESULT);
|
||||
|
|
@ -1041,7 +1046,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
|
|||
showDialog(DIALOG_SSL_VALIDATOR);
|
||||
}
|
||||
|
||||
setSupportProgressBarIndeterminateVisibility(mRefreshSharesInProgress || mSyncInProgress);
|
||||
//setSupportProgressBarIndeterminateVisibility(mRefreshSharesInProgress || mSyncInProgress);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1526,7 +1531,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
|
|||
setSupportProgressBarIndeterminateVisibility(true);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
private void startGetShares() {
|
||||
// Get shared files/folders
|
||||
Intent intent = new Intent(this, OperationsService.class);
|
||||
|
|
@ -1535,5 +1540,6 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
|
|||
|
||||
mRefreshSharesInProgress = true;
|
||||
}
|
||||
*/
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue