From 16bb8d3dfc256d7f4817bc23bd43f7d6160b2d7f Mon Sep 17 00:00:00 2001 From: Chris Narkiewicz Date: Sun, 12 Apr 2020 13:26:04 +0100 Subject: [PATCH] Don't put User model into ConflictsResolveActivity account extra User model has been put into Intent instead of Account, causing a crash. Convert User into Account before setting extras parameters. Fixes #5849 Signed-off-by: Chris Narkiewicz --- .../com/owncloud/android/ui/helpers/FileOperationsHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java b/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java index 9304a108f75c..84a1f154f6fc 100755 --- a/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java +++ b/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java @@ -254,7 +254,7 @@ private void syncFile(OCFile file, User user, FileDataStorageManager storageMana Intent i = new Intent(fileActivity, ConflictsResolveActivity.class); i.setFlags(i.getFlags() | Intent.FLAG_ACTIVITY_NEW_TASK); i.putExtra(ConflictsResolveActivity.EXTRA_FILE, file); - i.putExtra(ConflictsResolveActivity.EXTRA_ACCOUNT, user); + i.putExtra(ConflictsResolveActivity.EXTRA_ACCOUNT, user.toPlatformAccount()); fileActivity.startActivity(i); } else { if (file.isDown()) {