mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 21:55:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

Additional changes to apply the new code to the other FileFragments: PreviewMediaFragment, DetailsFragment, PreviewImageFragment

Browse source
This commit is contained in:
masensio 2014-05-05 14:10:15 +02:00
parent 9820893fd9
commit 6cdd830a7b
2 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
View file

@ -1,6 +1,6 @@
/* ownCloud Android client application
* Copyright (C) 2011 Bartek Przybylski
* Copyright (C) 2012-2013 ownCloud Inc.
* Copyright (C) 2012-2014 ownCloud Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2,
@ -182,13 +182,14 @@ public class FileDetailFragment extends FileFragment implements
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
if (mAccount != null) {
OCFile file = ((FileActivity)getActivity()).getStorageManager().
getFileByPath(getFile().getRemotePath());
if (file != null) {
setFile(file);
}
}
// TODO: Remove this code. (Updated no needed)
// if (mAccount != null) {
// OCFile file = ((FileActivity)getActivity()).getStorageManager().
// getFileByPath(getFile().getRemotePath());
// if (file != null) {
// setFile(file);
// }
// }
}

29
src/com/owncloud/android/ui/preview/PreviewImageFragment.java
View file

@ -1,5 +1,5 @@
/* ownCloud Android client application
* Copyright (C) 2012-2013 ownCloud Inc.
* Copyright (C) 2012-2014 ownCloud Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2,
@ -173,20 +173,21 @@ public class PreviewImageFragment extends FileFragment implements OnRemoteOper
if (savedInstanceState != null) {
if (!mIgnoreFirstSavedState) {
OCFile file = (OCFile)savedInstanceState.getParcelable(PreviewImageFragment.EXTRA_FILE);
setFile(file);
mAccount = savedInstanceState.getParcelable(PreviewImageFragment.EXTRA_ACCOUNT);
// Update the file
if (mAccount!= null) {
OCFile updatedFile = ((FileActivity)getSherlockActivity()).
getStorageManager().getFileByPath(file.getRemotePath());
if (updatedFile != null) {
setFile(updatedFile);
} else {
setFile(file);
}
} else {
setFile(file);
}
// TODO remove this code: update file no needed
// // Update the file
//// if (mAccount!= null) {
// OCFile updatedFile = ((FileActivity)getSherlockActivity()).
// getStorageManager().getFileByPath(file.getRemotePath());
// if (updatedFile != null) {
// setFile(updatedFile);
// } else {
// setFile(file);
// }
// } else {
// setFile(file);
// }
} else {
mIgnoreFirstSavedState = false;