From e89e0300774b57323466760c632700e2900e6d7a Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Mon, 26 Jan 2015 13:37:46 +0100 Subject: [PATCH] Commented excess of logs --- .../files/services/FileDownloader.java | 36 +++++++++---------- .../android/services/OperationsService.java | 10 +++--- .../android/services/SyncFolderHandler.java | 32 ++++++++--------- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/com/owncloud/android/files/services/FileDownloader.java b/src/com/owncloud/android/files/services/FileDownloader.java index 70292af0c3..8919edad72 100644 --- a/src/com/owncloud/android/files/services/FileDownloader.java +++ b/src/com/owncloud/android/files/services/FileDownloader.java @@ -135,10 +135,10 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis final Account account = intent.getParcelableExtra(EXTRA_ACCOUNT); final OCFile file = intent.getParcelableExtra(EXTRA_FILE); - Log_OC.v( + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), "Received request to download file" - ); + );*/ /* if (ACTION_CANCEL_FILE_DOWNLOAD.equals(intent.getAction())) { @@ -163,10 +163,10 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis ); String downloadKey = putResult.first; requestedDownloads.add(downloadKey); - Log_OC.v( + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), "Download on " + file.getRemotePath() + " added to queue" - ); + );*/ // Store file on db with state 'downloading' /* @@ -240,24 +240,24 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis * @param file A file in the queue of pending downloads */ public void cancel(Account account, OCFile file) { - Log_OC.v( + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), "Received request to cancel download of " + file.getRemotePath() ); Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), - "Removing download of " + file.getRemotePath()); + "Removing download of " + file.getRemotePath());*/ Pair removeResult = mPendingDownloads.remove(account, file.getRemotePath()); DownloadFileOperation download = removeResult.first; if (download != null) { - Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), - "Canceling returned download of " + file.getRemotePath()); + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), + "Canceling returned download of " + file.getRemotePath());*/ download.cancel(); } else { if (mCurrentDownload != null && mCurrentAccount != null && mCurrentDownload.getRemotePath().startsWith(file.getRemotePath()) && account.name.equals(mCurrentAccount.name)) { - Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), - "Canceling current sync as descendant: " + mCurrentDownload.getRemotePath()); + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), + "Canceling current sync as descendant: " + mCurrentDownload.getRemotePath());*/ mCurrentDownload.cancel(); } } @@ -355,8 +355,8 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis Iterator it = requestedDownloads.iterator(); while (it.hasNext()) { String next = it.next(); - Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), - "Handling download file " + next); + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), + "Handling download file " + next);*/ mService.downloadFile(next); } } @@ -372,8 +372,8 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis */ private void downloadFile(String downloadKey) { - Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), - "Getting download of " + downloadKey); + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), + "Getting download of " + downloadKey);*/ mCurrentDownload = mPendingDownloads.get(downloadKey); if (mCurrentDownload != null) { @@ -393,8 +393,8 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis } /// perform the download - Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), - "Executing download of " + mCurrentDownload.getRemotePath()); + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), + "Executing download of " + mCurrentDownload.getRemotePath());*/ downloadResult = mCurrentDownload.execute(mDownloadClient); if (downloadResult.isSuccess()) { saveDownloadedFile(); @@ -411,8 +411,8 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis downloadResult = new RemoteOperationResult(e); } finally { - Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), - "Removing payload " + mCurrentDownload.getRemotePath()); + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), + "Removing payload " + mCurrentDownload.getRemotePath());*/ Pair removeResult = mPendingDownloads.removePayload(mCurrentAccount, mCurrentDownload.getRemotePath()); diff --git a/src/com/owncloud/android/services/OperationsService.java b/src/com/owncloud/android/services/OperationsService.java index f6543109b4..2e57ada978 100644 --- a/src/com/owncloud/android/services/OperationsService.java +++ b/src/com/owncloud/android/services/OperationsService.java @@ -169,7 +169,7 @@ public class OperationsService extends Service { // the rest of the operations are requested through the Binder if (ACTION_SYNC_FOLDER.equals(intent.getAction())) { - Log_OC.v("NOW " + TAG + ", thread " + Thread.currentThread().getName(), "Received request to sync folder"); + /*Log_OC.v("NOW " + TAG + ", thread " + Thread.currentThread().getName(), "Received request to sync folder");*/ if (!intent.hasExtra(EXTRA_ACCOUNT) || !intent.hasExtra(EXTRA_REMOTE_PATH)) { Log_OC.e(TAG, "Not enough information provided in intent"); @@ -186,10 +186,10 @@ public class OperationsService extends Service { Message msg = mSyncFolderHandler.obtainMessage(); msg.arg1 = startId; msg.obj = itemSyncKey; - Log_OC.v( + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), "Sync folder " + remotePath + " added to queue" - ); + );*/ mSyncFolderHandler.sendMessage(msg); } @@ -276,10 +276,10 @@ public class OperationsService extends Service { * @param file A folder in the queue of pending synchronizations */ public void cancel(Account account, OCFile file) { - Log_OC.v( + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), "Received request to cancel folder " + file.getRemotePath() - ); + );*/ mSyncFolderHandler.cancel(account, file); } diff --git a/src/com/owncloud/android/services/SyncFolderHandler.java b/src/com/owncloud/android/services/SyncFolderHandler.java index 319a15873a..6d4bc73ed4 100644 --- a/src/com/owncloud/android/services/SyncFolderHandler.java +++ b/src/com/owncloud/android/services/SyncFolderHandler.java @@ -86,8 +86,8 @@ class SyncFolderHandler extends Handler { @Override public void handleMessage(Message msg) { Pair itemSyncKey = (Pair) msg.obj; - Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), - "Handling sync folder " + itemSyncKey.second); + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), + "Handling sync folder " + itemSyncKey.second);*/ doOperation(itemSyncKey.first, itemSyncKey.second); mService.stopSelf(msg.arg1); } @@ -98,8 +98,8 @@ class SyncFolderHandler extends Handler { */ private void doOperation(Account account, String remotePath) { - Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), - "Getting sync folder " + remotePath); + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), + "Getting sync folder " + remotePath);*/ mCurrentSyncOperation = mPendingOperations.get(account, remotePath); if (mCurrentSyncOperation != null) { @@ -119,8 +119,8 @@ class SyncFolderHandler extends Handler { } // else, reuse client from previous operation - Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), - "Executing sync folder " + remotePath); + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), + "Executing sync folder " + remotePath);*/ result = mCurrentSyncOperation.execute(mOwnCloudClient, mStorageManager); } catch (AccountsException e) { @@ -128,8 +128,8 @@ class SyncFolderHandler extends Handler { } catch (IOException e) { Log_OC.e(TAG, "Error while trying to get authorization", e); } finally { - Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), - "Removing payload " + remotePath); + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), + "Removing payload " + remotePath);*/ mPendingOperations.removePayload(account, remotePath); @@ -157,26 +157,26 @@ class SyncFolderHandler extends Handler { Log_OC.e(TAG, "Cannot cancel with NULL parameters"); return; } - Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), - "Removing sync folder " + file.getRemotePath()); + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), + "Removing sync folder " + file.getRemotePath());*/ Pair removeResult = mPendingOperations.remove(account, file.getRemotePath()); SynchronizeFolderOperation synchronization = removeResult.first; if (synchronization != null) { - Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), - "Canceling returned sync of " + file.getRemotePath()); + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), + "Canceling returned sync of " + file.getRemotePath());*/ synchronization.cancel(); } else { // TODO synchronize? if (mCurrentSyncOperation != null && mCurrentAccount != null && mCurrentSyncOperation.getRemotePath().startsWith(file.getRemotePath()) && account.name.equals(mCurrentAccount.name)) { - Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), - "Canceling current sync as descendant: " + mCurrentSyncOperation.getRemotePath()); + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), + "Canceling current sync as descendant: " + mCurrentSyncOperation.getRemotePath());*/ mCurrentSyncOperation.cancel(); } else { - Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), - "Nothing else in cancelation of " + file.getRemotePath()); + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), + "Nothing else in cancelation of " + file.getRemotePath());*/ } }