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

Commented excess of logs

Browse source
This commit is contained in:
David A. Velasco 2015-01-26 13:37:46 +01:00
parent 7d16de3c07
commit e89e030077
3 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/com/owncloud/android/files/services/FileDownloader.java
View file

@ -135,10 +135,10 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
final Account account = intent.getParcelableExtra(EXTRA_ACCOUNT); final Account account = intent.getParcelableExtra(EXTRA_ACCOUNT);
final OCFile file = intent.getParcelableExtra(EXTRA_FILE); final OCFile file = intent.getParcelableExtra(EXTRA_FILE);
Log_OC.v( /*Log_OC.v(
"NOW " + TAG + ", thread " + Thread.currentThread().getName(), "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
"Received request to download file" "Received request to download file"
); );*/
/* /*
if (ACTION_CANCEL_FILE_DOWNLOAD.equals(intent.getAction())) { if (ACTION_CANCEL_FILE_DOWNLOAD.equals(intent.getAction())) {
@ -163,10 +163,10 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
); );
String downloadKey = putResult.first; String downloadKey = putResult.first;
requestedDownloads.add(downloadKey); requestedDownloads.add(downloadKey);
Log_OC.v( /*Log_OC.v(
"NOW " + TAG + ", thread " + Thread.currentThread().getName(), "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
"Download on " + file.getRemotePath() + " added to queue" "Download on " + file.getRemotePath() + " added to queue"
); );*/
// Store file on db with state 'downloading' // 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 * @param file A file in the queue of pending downloads
*/ */
public void cancel(Account account, OCFile file) { public void cancel(Account account, OCFile file) {
Log_OC.v( /*Log_OC.v(
"NOW " + TAG + ", thread " + Thread.currentThread().getName(), "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
"Received request to cancel download of " + file.getRemotePath() "Received request to cancel download of " + file.getRemotePath()
); );
Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
"Removing download of " + file.getRemotePath()); "Removing download of " + file.getRemotePath());*/
Pair<DownloadFileOperation, String> removeResult = mPendingDownloads.remove(account, file.getRemotePath()); Pair<DownloadFileOperation, String> removeResult = mPendingDownloads.remove(account, file.getRemotePath());
DownloadFileOperation download = removeResult.first; DownloadFileOperation download = removeResult.first;
if (download != null) { if (download != null) {
Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
"Canceling returned download of " + file.getRemotePath()); "Canceling returned download of " + file.getRemotePath());*/
download.cancel(); download.cancel();
} else { } else {
if (mCurrentDownload != null && mCurrentAccount != null && if (mCurrentDownload != null && mCurrentAccount != null &&
mCurrentDownload.getRemotePath().startsWith(file.getRemotePath()) && mCurrentDownload.getRemotePath().startsWith(file.getRemotePath()) &&
account.name.equals(mCurrentAccount.name)) { account.name.equals(mCurrentAccount.name)) {
Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
"Canceling current sync as descendant: " + mCurrentDownload.getRemotePath()); "Canceling current sync as descendant: " + mCurrentDownload.getRemotePath());*/
mCurrentDownload.cancel(); mCurrentDownload.cancel();
} }
} }
@ -355,8 +355,8 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
Iterator<String> it = requestedDownloads.iterator(); Iterator<String> it = requestedDownloads.iterator();
while (it.hasNext()) { while (it.hasNext()) {
String next = it.next(); String next = it.next();
Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
"Handling download file " + next); "Handling download file " + next);*/
mService.downloadFile(next); mService.downloadFile(next);
} }
} }
@ -372,8 +372,8 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
*/ */
private void downloadFile(String downloadKey) { private void downloadFile(String downloadKey) {
Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
"Getting download of " + downloadKey); "Getting download of " + downloadKey);*/
mCurrentDownload = mPendingDownloads.get(downloadKey); mCurrentDownload = mPendingDownloads.get(downloadKey);
if (mCurrentDownload != null) { if (mCurrentDownload != null) {
@ -393,8 +393,8 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
} }
/// perform the download /// perform the download
Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
"Executing download of " + mCurrentDownload.getRemotePath()); "Executing download of " + mCurrentDownload.getRemotePath());*/
downloadResult = mCurrentDownload.execute(mDownloadClient); downloadResult = mCurrentDownload.execute(mDownloadClient);
if (downloadResult.isSuccess()) { if (downloadResult.isSuccess()) {
saveDownloadedFile(); saveDownloadedFile();
@ -411,8 +411,8 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
downloadResult = new RemoteOperationResult(e); downloadResult = new RemoteOperationResult(e);
} finally { } finally {
Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
"Removing payload " + mCurrentDownload.getRemotePath()); "Removing payload " + mCurrentDownload.getRemotePath());*/
Pair<DownloadFileOperation, String> removeResult = Pair<DownloadFileOperation, String> removeResult =
mPendingDownloads.removePayload(mCurrentAccount, mCurrentDownload.getRemotePath()); mPendingDownloads.removePayload(mCurrentAccount, mCurrentDownload.getRemotePath());

10
src/com/owncloud/android/services/OperationsService.java
View file

@ -169,7 +169,7 @@ public class OperationsService extends Service {
// the rest of the operations are requested through the Binder // the rest of the operations are requested through the Binder
if (ACTION_SYNC_FOLDER.equals(intent.getAction())) { 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)) { if (!intent.hasExtra(EXTRA_ACCOUNT) || !intent.hasExtra(EXTRA_REMOTE_PATH)) {
Log_OC.e(TAG, "Not enough information provided in intent"); Log_OC.e(TAG, "Not enough information provided in intent");
@ -186,10 +186,10 @@ public class OperationsService extends Service {
Message msg = mSyncFolderHandler.obtainMessage(); Message msg = mSyncFolderHandler.obtainMessage();
msg.arg1 = startId; msg.arg1 = startId;
msg.obj = itemSyncKey; msg.obj = itemSyncKey;
Log_OC.v( /*Log_OC.v(
"NOW " + TAG + ", thread " + Thread.currentThread().getName(), "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
"Sync folder " + remotePath + " added to queue" "Sync folder " + remotePath + " added to queue"
); );*/
mSyncFolderHandler.sendMessage(msg); mSyncFolderHandler.sendMessage(msg);
} }
@ -276,10 +276,10 @@ public class OperationsService extends Service {
* @param file A folder in the queue of pending synchronizations * @param file A folder in the queue of pending synchronizations
*/ */
public void cancel(Account account, OCFile file) { public void cancel(Account account, OCFile file) {
Log_OC.v( /*Log_OC.v(
"NOW " + TAG + ", thread " + Thread.currentThread().getName(), "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
"Received request to cancel folder " + file.getRemotePath() "Received request to cancel folder " + file.getRemotePath()
); );*/
mSyncFolderHandler.cancel(account, file); mSyncFolderHandler.cancel(account, file);
} }

32
src/com/owncloud/android/services/SyncFolderHandler.java
View file

@ -86,8 +86,8 @@ class SyncFolderHandler extends Handler {
@Override @Override
public void handleMessage(Message msg) { public void handleMessage(Message msg) {
Pair<Account, String> itemSyncKey = (Pair<Account, String>) msg.obj; Pair<Account, String> itemSyncKey = (Pair<Account, String>) msg.obj;
Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
"Handling sync folder " + itemSyncKey.second); "Handling sync folder " + itemSyncKey.second);*/
doOperation(itemSyncKey.first, itemSyncKey.second); doOperation(itemSyncKey.first, itemSyncKey.second);
mService.stopSelf(msg.arg1); mService.stopSelf(msg.arg1);
} }
@ -98,8 +98,8 @@ class SyncFolderHandler extends Handler {
*/ */
private void doOperation(Account account, String remotePath) { private void doOperation(Account account, String remotePath) {
Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
"Getting sync folder " + remotePath); "Getting sync folder " + remotePath);*/
mCurrentSyncOperation = mPendingOperations.get(account, remotePath); mCurrentSyncOperation = mPendingOperations.get(account, remotePath);
if (mCurrentSyncOperation != null) { if (mCurrentSyncOperation != null) {
@ -119,8 +119,8 @@ class SyncFolderHandler extends Handler {
} // else, reuse client from previous operation } // else, reuse client from previous operation
Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
"Executing sync folder " + remotePath); "Executing sync folder " + remotePath);*/
result = mCurrentSyncOperation.execute(mOwnCloudClient, mStorageManager); result = mCurrentSyncOperation.execute(mOwnCloudClient, mStorageManager);
} catch (AccountsException e) { } catch (AccountsException e) {
@ -128,8 +128,8 @@ class SyncFolderHandler extends Handler {
} catch (IOException e) { } catch (IOException e) {
Log_OC.e(TAG, "Error while trying to get authorization", e); Log_OC.e(TAG, "Error while trying to get authorization", e);
} finally { } finally {
Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
"Removing payload " + remotePath); "Removing payload " + remotePath);*/
mPendingOperations.removePayload(account, remotePath); mPendingOperations.removePayload(account, remotePath);
@ -157,26 +157,26 @@ class SyncFolderHandler extends Handler {
Log_OC.e(TAG, "Cannot cancel with NULL parameters"); Log_OC.e(TAG, "Cannot cancel with NULL parameters");
return; return;
} }
Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
"Removing sync folder " + file.getRemotePath()); "Removing sync folder " + file.getRemotePath());*/
Pair<SynchronizeFolderOperation, String> removeResult = Pair<SynchronizeFolderOperation, String> removeResult =
mPendingOperations.remove(account, file.getRemotePath()); mPendingOperations.remove(account, file.getRemotePath());
SynchronizeFolderOperation synchronization = removeResult.first; SynchronizeFolderOperation synchronization = removeResult.first;
if (synchronization != null) { if (synchronization != null) {
Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
"Canceling returned sync of " + file.getRemotePath()); "Canceling returned sync of " + file.getRemotePath());*/
synchronization.cancel(); synchronization.cancel();
} else { } else {
// TODO synchronize? // TODO synchronize?
if (mCurrentSyncOperation != null && mCurrentAccount != null && if (mCurrentSyncOperation != null && mCurrentAccount != null &&
mCurrentSyncOperation.getRemotePath().startsWith(file.getRemotePath()) && mCurrentSyncOperation.getRemotePath().startsWith(file.getRemotePath()) &&
account.name.equals(mCurrentAccount.name)) { account.name.equals(mCurrentAccount.name)) {
Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
"Canceling current sync as descendant: " + mCurrentSyncOperation.getRemotePath()); "Canceling current sync as descendant: " + mCurrentSyncOperation.getRemotePath());*/
mCurrentSyncOperation.cancel(); mCurrentSyncOperation.cancel();
} else { } else {
Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
"Nothing else in cancelation of " + file.getRemotePath()); "Nothing else in cancelation of " + file.getRemotePath());*/
} }
} }