X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/2a04c6ae5da009baa78c243606297b5a039925c2..d29a3658c9b22cd60f0900aabd987fdb0d48ed5b:/src/eu/alefzero/owncloud/datamodel/OCFile.java?ds=sidebyside diff --git a/src/eu/alefzero/owncloud/datamodel/OCFile.java b/src/eu/alefzero/owncloud/datamodel/OCFile.java index 32d36de3..01a1f58f 100644 --- a/src/eu/alefzero/owncloud/datamodel/OCFile.java +++ b/src/eu/alefzero/owncloud/datamodel/OCFile.java @@ -22,6 +22,8 @@ import java.io.File; import java.net.MalformedURLException; import java.net.URL; +import eu.alefzero.owncloud.files.services.FileDownloader; + import android.net.Uri; import android.os.Parcel; import android.os.Parcelable; @@ -144,34 +146,17 @@ public class OCFile implements Parcelable, Comparable { /** * Use this to check if this file is available locally * - * TODO use a better condition not dependent upon mLenght being synchronized; to change when downloads are done through a temporal file - * * @return true if it is */ public boolean isDown() { if (mLocalPath != null && mLocalPath.length() > 0) { File file = new File(mLocalPath); - return (file.exists() && file.length() == mLength); + return (file.exists()); } return false; } /** - * Use this to check if this file is downloading - * - * TODO use a better condition not dependent upon mLenght being synchronized; to change when downloads are done through a temporal file - * - * @return true if it is in a download in progress - */ - public boolean isDownloading() { - if (mLocalPath != null && mLocalPath.length() > 0) { - File file = new File(mLocalPath); - return (file.exists() && file.length() < mLength); - } - return false; - } - - /** * The path, where the file is stored locally * * @return The local path to the file @@ -388,8 +373,8 @@ public class OCFile implements Parcelable, Comparable { @Override public String toString() { - String asString = "[id=%s, name=%s, mime=%s, downloaded=%s, local=%s, remote=%s]"; - asString = String.format(asString, new Long(mId), getFileName(), mMimeType, isDown(), mLocalPath, mRemotePath); + String asString = "[id=%s, name=%s, mime=%s, downloaded=%s, local=%s, remote=%s, parentId=%s, keepInSinc=%s]"; + asString = String.format(asString, new Long(mId), getFileName(), mMimeType, isDown(), mLocalPath, mRemotePath, new Long(mParentId), new Boolean(mKeepInSync)); return asString; }