opensourcemirror
/
nextcloud-android
mirror of https://github.com/nextcloud/android.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #6918 from jmue/storageProviderCleanup 

unify context access
This commit is contained in:
Tobias Kaminsky 2020-09-11 10:47:16 +02:00 committed by GitHub
parent 32d7dc40f2 a5272c5700
commit fe3ef767cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/main/java/com/owncloud/android/providers/DocumentsStorageProvider.java
View File

@ -153,15 +153,9 @@ public class DocumentsStorageProvider extends DocumentsProvider {
throws FileNotFoundException {
Log.d(TAG, "queryChildDocuments(), id=" + parentDocumentId);
Context context = getContext();
if (context == null) {
throw new FileNotFoundException("Context may not be null");
}
Context context = getNonNullContext();
Document parentFolder = toDocument(parentDocumentId);
FileDataStorageManager storageManager = parentFolder.getStorageManager();
final FileCursor resultCursor = new FileCursor(projection);
for (OCFile file : storageManager.getFolderContent(parentFolder.getFile(), false)) {
@ -171,7 +165,7 @@ public class DocumentsStorageProvider extends DocumentsProvider {
boolean isLoading = false;
if (parentFolder.isExpired()) {
final ReloadFolderDocumentTask task = new ReloadFolderDocumentTask(parentFolder, result ->
getContext().getContentResolver().notifyChange(toNotifyUri(parentFolder), null, false));
context.getContentResolver().notifyChange(toNotifyUri(parentFolder), null, false));
task.executeOnExecutor(executor);
resultCursor.setLoadingTask(task);
isLoading = true;
@ -180,7 +174,7 @@ public class DocumentsStorageProvider extends DocumentsProvider {
final Bundle extra = new Bundle();
extra.putBoolean(DocumentsContract.EXTRA_LOADING, isLoading);
resultCursor.setExtras(extra);
resultCursor.setNotificationUri(getContext().getContentResolver(), toNotifyUri(parentFolder));
resultCursor.setNotificationUri(context.getContentResolver(), toNotifyUri(parentFolder));
return resultCursor;
}
@ -191,7 +185,6 @@ public class DocumentsStorageProvider extends DocumentsProvider {
Log.d(TAG, "openDocument(), id=" + documentId);
Document document = toDocument(documentId);
Context context = getNonNullContext();
OCFile ocFile = document.getFile();
@ -306,16 +299,10 @@ public class DocumentsStorageProvider extends DocumentsProvider {
throws FileNotFoundException {
Log.d(TAG, "openDocumentThumbnail(), id=" + documentId);
Context context = getContext();
if (context == null) {
throw new FileNotFoundException("Context may not be null!");
}
OCFile file = toDocument(documentId).getFile();
boolean exists = ThumbnailsCacheManager.containsBitmap(ThumbnailsCacheManager.PREFIX_THUMBNAIL
+ file.getRemoteId());
if (!exists) {
ThumbnailsCacheManager.generateThumbnailFromOCFile(file);
}
@ -329,11 +316,6 @@ public class DocumentsStorageProvider extends DocumentsProvider {
public String renameDocument(String documentId, String displayName) throws FileNotFoundException {
Log.d(TAG, "renameDocument(), id=" + documentId);
Context context = getContext();
if (context == null) {
throw new FileNotFoundException("Context may not be null!");
}
Document document = toDocument(documentId);
RemoteOperationResult result = new RenameFileOperation(document.getRemotePath(), displayName)
@ -345,6 +327,7 @@ public class DocumentsStorageProvider extends DocumentsProvider {
result.getException());
}
Context context = getNonNullContext();
context.getContentResolver().notifyChange(toNotifyUri(document.getParent()), null, false);
return null;
@ -354,11 +337,6 @@ public class DocumentsStorageProvider extends DocumentsProvider {
public String copyDocument(String sourceDocumentId, String targetParentDocumentId) throws FileNotFoundException {
Log.d(TAG, "copyDocument(), id=" + sourceDocumentId);
Context context = getContext();
if (context == null) {
throw new FileNotFoundException("Context may not be null!");
}
Document document = toDocument(sourceDocumentId);
FileDataStorageManager storageManager = document.getStorageManager();
@ -373,6 +351,7 @@ public class DocumentsStorageProvider extends DocumentsProvider {
+ " to " + targetParentDocumentId);
}
Context context = getNonNullContext();
Account account = document.getAccount();
RemoteOperationResult updateParent = new RefreshFolderOperation(targetFolder.getFile(), System.currentTimeMillis(),
@ -403,11 +382,6 @@ public class DocumentsStorageProvider extends DocumentsProvider {
throws FileNotFoundException {
Log.d(TAG, "moveDocument(), id=" + sourceDocumentId);
Context context = getContext();
if (context == null) {
throw new FileNotFoundException("Context may not be null!");
}
Document document = toDocument(sourceDocumentId);
Document targetFolder = toDocument(targetParentDocumentId);
@ -422,8 +396,9 @@ public class DocumentsStorageProvider extends DocumentsProvider {
Document sourceFolder = toDocument(sourceParentDocumentId);
getContext().getContentResolver().notifyChange(toNotifyUri(sourceFolder), null, false);
getContext().getContentResolver().notifyChange(toNotifyUri(targetFolder), null, false);
Context context = getNonNullContext();
context.getContentResolver().notifyChange(toNotifyUri(sourceFolder), null, false);
context.getContentResolver().notifyChange(toNotifyUri(targetFolder), null, false);
return sourceDocumentId;
}
@ -461,18 +436,13 @@ public class DocumentsStorageProvider extends DocumentsProvider {
private String createFolder(Document targetFolder, String displayName) throws FileNotFoundException {
Context context = getContext();
if (context == null) {
throw new FileNotFoundException("Context may not be null!");
}
Context context = getNonNullContext();
String newDirPath = targetFolder.getRemotePath() + displayName + PATH_SEPARATOR;
FileDataStorageManager storageManager = targetFolder.getStorageManager();
RemoteOperationResult result = new CreateFolderOperation(newDirPath,
accountManager.getUser(),
getContext())
context)
.execute(targetFolder.getClient(), storageManager);
if (!result.isSuccess()) {
@ -499,10 +469,6 @@ public class DocumentsStorageProvider extends DocumentsProvider {
}
private String createFile(Document targetFolder, String displayName, String mimeType) throws FileNotFoundException {
Context context = getContext();
if (context == null) {
throw new FileNotFoundException("Context may not be null!");
}
Account account = targetFolder.getAccount();
@ -546,6 +512,8 @@ public class DocumentsStorageProvider extends DocumentsProvider {
throw new FileNotFoundException("Failed to upload document with path " + newFilePath);
}
Context context = getNonNullContext();
RemoteOperationResult updateParent = new RefreshFolderOperation(targetFolder.getFile(),
System.currentTimeMillis(),
false,
@ -577,10 +545,7 @@ public class DocumentsStorageProvider extends DocumentsProvider {
public void deleteDocument(String documentId) throws FileNotFoundException {
Log.d(TAG, "deleteDocument(), id=" + documentId);
Context context = getContext();
if (context == null) {
throw new FileNotFoundException("Context may not be null!");
}
Context context = getNonNullContext();
Document document = toDocument(documentId);
// get parent here, because it is not available anymore after the document was deleted