From bcef91629294807eba3119cf50ceeed5452ebbc7 Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Wed, 28 Jan 2015 09:40:59 +0100 Subject: [PATCH] Removed commented code --- .../android/files/FileOperationsHelper.java | 28 ++----------------- .../files/services/FileDownloader.java | 13 --------- 2 files changed, 2 insertions(+), 39 deletions(-) diff --git a/src/com/owncloud/android/files/FileOperationsHelper.java b/src/com/owncloud/android/files/FileOperationsHelper.java index 22be2a78ee..cf9f4749a8 100644 --- a/src/com/owncloud/android/files/FileOperationsHelper.java +++ b/src/com/owncloud/android/files/FileOperationsHelper.java @@ -1,5 +1,5 @@ /* ownCloud Android client application - * Copyright (C) 2012-2014 ownCloud Inc. + * Copyright (C) 2012-2015 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, @@ -208,35 +208,11 @@ public class FileOperationsHelper { mFileActivity.showLoadingDialog(); } else { - /* - // Add files recursivly - FileDataStorageManager storageManager = mFileActivity.getStorageManager(); - filesList.addAll(storageManager.getFolderContent(file)); - boolean newfiles; - do { - Vector tmpFolders = new Vector(); - for (OCFile tmpfile : filesList) { - if (tmpfile.isFolder()) { - tmpFolders.add(tmpfile); - } - } - if (tmpFolders.isEmpty()){ - newfiles = false; - }else { - for(OCFile tmpFolder : tmpFolders){ - filesList.remove(tmpFolder); - filesList.addAll(storageManager.getFolderContent(tmpFolder)); - } - newfiles = true; - } - } while(newfiles); - */ Intent intent = new Intent(mFileActivity, OperationsService.class); intent.setAction(OperationsService.ACTION_SYNC_FOLDER); intent.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount()); intent.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath()); - mFileActivity.startService(intent); // reevaluating: with or without Binder? - //mFileActivity.getOperationsServiceBinder().queueNewOperation(intent); + mFileActivity.startService(intent); } } diff --git a/src/com/owncloud/android/files/services/FileDownloader.java b/src/com/owncloud/android/files/services/FileDownloader.java index 7f9d507155..feedc11c03 100644 --- a/src/com/owncloud/android/files/services/FileDownloader.java +++ b/src/com/owncloud/android/files/services/FileDownloader.java @@ -140,19 +140,6 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis "Received request to download file" );*/ - /* - if (ACTION_CANCEL_FILE_DOWNLOAD.equals(intent.getAction())) { - - new Thread(new Runnable() { - public void run() { - // Cancel the download - cancel(account, file); - } - }).start(); - - } else { - */ - AbstractList requestedDownloads = new Vector(); try { DownloadFileOperation newDownload = new DownloadFileOperation(account, file);