X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/31f6e61f894efd0867d1a34c8d3cb53d7bb5fc4a..da7ea9b8d99af3175cf53383c5ed47a7d30a975c:/src/com/owncloud/android/files/services/FileDownloader.java diff --git a/src/com/owncloud/android/files/services/FileDownloader.java b/src/com/owncloud/android/files/services/FileDownloader.java index 07c4257c..2e479f4d 100644 --- a/src/com/owncloud/android/files/services/FileDownloader.java +++ b/src/com/owncloud/android/files/services/FileDownloader.java @@ -28,11 +28,12 @@ import java.util.Vector; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import com.owncloud.android.Log_OC; +import com.owncloud.android.MainApp; +import com.owncloud.android.R; import com.owncloud.android.authentication.AuthenticatorActivity; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; -import eu.alefzero.webdav.OnDatatransferProgressListener; - import com.owncloud.android.network.OwnCloudClientUtils; import com.owncloud.android.operations.DownloadFileOperation; import com.owncloud.android.operations.RemoteOperationResult; @@ -42,6 +43,9 @@ import com.owncloud.android.ui.activity.FileDisplayActivity; import com.owncloud.android.ui.preview.PreviewImageActivity; import com.owncloud.android.ui.preview.PreviewImageFragment; +import eu.alefzero.webdav.OnDatatransferProgressListener; + + import android.accounts.Account; import android.accounts.AccountsException; import android.app.Notification; @@ -58,9 +62,6 @@ import android.os.Message; import android.os.Process; import android.widget.RemoteViews; -import com.owncloud.android.Log_OC; -import com.owncloud.android.MainApp; -import com.owncloud.android.R; import eu.alefzero.webdav.WebdavClient; public class FileDownloader extends Service implements OnDatatransferProgressListener { @@ -92,12 +93,12 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis private int mLastPercent; - public String getDownloadAddedMessage() { - return getClass().getName().toString() + DOWNLOAD_ADDED_MESSAGE; + public static String getDownloadAddedMessage() { + return FileDownloader.class.getName().toString() + DOWNLOAD_ADDED_MESSAGE; } - public String getDownloadFinishMessage() { - return getClass().getName().toString() + DOWNLOAD_FINISH_MESSAGE; + public static String getDownloadFinishMessage() { + return FileDownloader.class.getName().toString() + DOWNLOAD_FINISH_MESSAGE; } /** @@ -239,7 +240,7 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis if (account == null || file == null) return false; String targetKey = buildRemoteName(account, file); synchronized (mPendingDownloads) { - if (file.isDirectory()) { + if (file.isFolder()) { // this can be slow if there are many downloads :( Iterator it = mPendingDownloads.keySet().iterator(); boolean found = false;