Skip to content

Commit d94a039

Browse files
committed
Intent works with folders and files by displaying the file's detail
1 parent 3595960 commit d94a039

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1663,7 +1663,7 @@ class FileDisplayActivity : FileActivity(), FileFragment.ContainerActivity, OnEn
16631663
} else if (uri != null && AccountUtils.getAccounts(applicationContext).size == 1) {
16641664
isFileDiscovered(uri).let { OCFile ->
16651665
if (OCFile != null) {
1666-
openFile(OCFile)
1666+
manageItem(OCFile)
16671667
} else {
16681668
showMessageInToast(getString(R.string.no_file_found))
16691669
}
@@ -1673,10 +1673,16 @@ class FileDisplayActivity : FileActivity(), FileFragment.ContainerActivity, OnEn
16731673

16741674
private fun isFileDiscovered(uri: Uri?): OCFile? = storageManager.getFileByPrivateLink(uri.toString())
16751675

1676-
private fun openFile(file: OCFile) {
1676+
private fun manageItem(file: OCFile) {
1677+
onBrowsedDownTo(file)
16771678
setFile(file)
16781679
setAccount(AccountUtils.getOwnCloudAccountByName(this, file.owner))
1679-
initFragmentsWithFile()
1680+
1681+
if (PreviewImageFragment.canBePreviewed(file)) {
1682+
startImagePreview(file)
1683+
} else {
1684+
initFragmentsWithFile()
1685+
}
16801686
}
16811687

16821688
companion object {

owncloudApp/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ public void syncFile(OCFile file) {
222222
intent.setAction(OperationsService.ACTION_SYNC_FILE);
223223
intent.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount());
224224
intent.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath());
225+
225226
mWaitingForOpId = mFileActivity.getOperationsServiceBinder().queueNewOperation(intent);
226227

227228
} else {

0 commit comments

Comments
 (0)