projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #866 from owncloud/download_folder
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
services
/
OperationsService.java
diff --git
a/src/com/owncloud/android/services/OperationsService.java
b/src/com/owncloud/android/services/OperationsService.java
index
a47385b
..
2e57ada
100644
(file)
--- a/
src/com/owncloud/android/services/OperationsService.java
+++ b/
src/com/owncloud/android/services/OperationsService.java
@@
-169,6
+169,8
@@
public class OperationsService extends Service {
// the rest of the operations are requested through the Binder
if (ACTION_SYNC_FOLDER.equals(intent.getAction())) {
// 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");*/
+
if (!intent.hasExtra(EXTRA_ACCOUNT) || !intent.hasExtra(EXTRA_REMOTE_PATH)) {
Log_OC.e(TAG, "Not enough information provided in intent");
return START_NOT_STICKY;
if (!intent.hasExtra(EXTRA_ACCOUNT) || !intent.hasExtra(EXTRA_REMOTE_PATH)) {
Log_OC.e(TAG, "Not enough information provided in intent");
return START_NOT_STICKY;
@@
-184,6
+186,10
@@
public class OperationsService extends Service {
Message msg = mSyncFolderHandler.obtainMessage();
msg.arg1 = startId;
msg.obj = itemSyncKey;
Message msg = mSyncFolderHandler.obtainMessage();
msg.arg1 = startId;
msg.obj = itemSyncKey;
+ /*Log_OC.v(
+ "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
+ "Sync folder " + remotePath + " added to queue"
+ );*/
mSyncFolderHandler.sendMessage(msg);
}
mSyncFolderHandler.sendMessage(msg);
}
@@
-215,7
+221,7
@@
public class OperationsService extends Service {
e.printStackTrace();
}
e.printStackTrace();
}
- //Log_OC.wtf(TAG, "Clear mUndispatchedFinis
i
edOperations" );
+ //Log_OC.wtf(TAG, "Clear mUndispatchedFinis
h
edOperations" );
mUndispatchedFinishedOperations.clear();
//Log_OC.wtf(TAG, "onDestroy end" );
mUndispatchedFinishedOperations.clear();
//Log_OC.wtf(TAG, "onDestroy end" );
@@
-270,6
+276,10
@@
public class OperationsService extends Service {
* @param file A folder in the queue of pending synchronizations
*/
public void cancel(Account account, OCFile file) {
* @param file A folder in the queue of pending synchronizations
*/
public void cancel(Account account, OCFile file) {
+ /*Log_OC.v(
+ "NOW " + TAG + ", thread " + Thread.currentThread().getName(),
+ "Received request to cancel folder " + file.getRemotePath()
+ );*/
mSyncFolderHandler.cancel(account, file);
}
mSyncFolderHandler.cancel(account, file);
}