mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 09:39:25 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fixed bug relative to details from Image Preview

Browse source
This commit is contained in:
Kilian Périsset 2019-12-06 11:52:47 +01:00
parent d8722b52de
commit 25d9c46f82
No known key found for this signature in database
GPG key ID: 82E3444C03B10ECF
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/owncloud/android/datamodel/OCFile.java
View file

@ -155,6 +155,8 @@ public class OCFile implements Parcelable, Comparable<OCFile>, ServerFileInterfa
favorite = source.readInt() == 1; favorite = source.readInt() == 1;
encrypted = source.readInt() == 1; encrypted = source.readInt() == 1;
encryptedFileName = source.readString(); encryptedFileName = source.readString();
ownerId = source.readString();
ownerDisplayName = source.readString();
mountType = (WebdavEntry.MountType) source.readSerializable(); mountType = (WebdavEntry.MountType) source.readSerializable();
} }
@ -185,6 +187,8 @@ public class OCFile implements Parcelable, Comparable<OCFile>, ServerFileInterfa
dest.writeInt(favorite ? 1 : 0); dest.writeInt(favorite ? 1 : 0);
dest.writeInt(encrypted ? 1 : 0); dest.writeInt(encrypted ? 1 : 0);
dest.writeString(encryptedFileName); dest.writeString(encryptedFileName);
dest.writeString(ownerId);
dest.writeString(ownerDisplayName);
dest.writeSerializable(mountType); dest.writeSerializable(mountType);
} }

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

@ -502,9 +502,13 @@ public class FileDisplayActivity extends FileActivity
protected void onNewIntent(Intent intent) { protected void onNewIntent(Intent intent) {
super.onNewIntent(intent); super.onNewIntent(intent);
if (ACTION_DETAILS.equalsIgnoreCase(intent.getAction())) { if (ACTION_DETAILS.equalsIgnoreCase(intent.getAction())) {
OCFile file = intent.getParcelableExtra(EXTRA_FILE);
setFile(file);
setIntent(intent); setIntent(intent);
setFile(intent.getParcelableExtra(EXTRA_FILE)); setFile(intent.getParcelableExtra(EXTRA_FILE));
showDetails(file);
} else if (Intent.ACTION_VIEW.equals(intent.getAction())) { } else if (Intent.ACTION_VIEW.equals(intent.getAction())) {
handleOpenFileViaIntent(intent); handleOpenFileViaIntent(intent);
} else if (RESTART.equals(intent.getAction())) { } else if (RESTART.equals(intent.getAction())) {