From 96eb4aecc2cd380b1421402f5f8dd5b80ebf3c39 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Fri, 29 Jun 2018 13:53:15 +0200 Subject: [PATCH] update file via remote id Signed-off-by: tobiasKaminsky --- .../android/datamodel/FileDataStorageManager.java | 11 +++++++++++ .../android/ui/activity/FileDisplayActivity.java | 5 +++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java b/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java index 27de63693aad..c30be30c7d42 100644 --- a/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java +++ b/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java @@ -141,6 +141,17 @@ public OCFile getFileByLocalPath(String path) { return file; } + public @Nullable + OCFile getFileByRemoteId(String remoteId) { + Cursor c = getFileCursorForValue(ProviderTableMeta.FILE_REMOTE_ID, remoteId); + OCFile file = null; + if (c.moveToFirst()) { + file = createFileInstance(c); + } + c.close(); + return file; + } + public boolean fileExists(long id) { return fileExists(ProviderTableMeta._ID, String.valueOf(id)); } diff --git a/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java index 4b5e02881f1c..bde6d8d542d4 100644 --- a/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -1489,8 +1489,9 @@ public void onReceive(Context context, Intent intent) { } if (mWaitingToSend != null) { - mWaitingToSend = getStorageManager().getFileByPath(mWaitingToSend.getRemotePath()); - if (mWaitingToSend.isDown() && downloadBehaviour != null) { + // update file after downloading + mWaitingToSend = getStorageManager().getFileByRemoteId(mWaitingToSend.getRemoteId()); + if (mWaitingToSend != null && mWaitingToSend.isDown() && downloadBehaviour != null) { switch (downloadBehaviour) { case OCFileListFragment.DOWNLOAD_SEND: String packageName = intent.getStringExtra(SendShareDialog.PACKAGE_NAME);