projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed according to latest comments
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
files
/
InstantUploadBroadcastReceiver.java
diff --git
a/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
b/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
index
bc00a51
..
b6b8499
100644
(file)
--- a/
src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
+++ b/
src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
@@
-137,17
+137,10
@@
public class InstantUploadBroadcastReceiver extends BroadcastReceiver {
if (behaviour.equalsIgnoreCase("NOTHING")) {
Log_OC.d(TAG, "upload file and do nothing");
i.putExtra(FileUploader.KEY_LOCAL_BEHAVIOUR, FileUploader.LOCAL_BEHAVIOUR_FORGET);
if (behaviour.equalsIgnoreCase("NOTHING")) {
Log_OC.d(TAG, "upload file and do nothing");
i.putExtra(FileUploader.KEY_LOCAL_BEHAVIOUR, FileUploader.LOCAL_BEHAVIOUR_FORGET);
- } else if (behaviour.equalsIgnoreCase("COPY")) {
- i.putExtra(FileUploader.KEY_LOCAL_BEHAVIOUR, FileUploader.LOCAL_BEHAVIOUR_COPY);
- Log_OC.d(TAG, "upload file and copy file to oc folder");
} else if (behaviour.equalsIgnoreCase("MOVE")) {
i.putExtra(FileUploader.KEY_LOCAL_BEHAVIOUR, FileUploader.LOCAL_BEHAVIOUR_MOVE);
Log_OC.d(TAG, "upload file and move file to oc folder");
} else if (behaviour.equalsIgnoreCase("MOVE")) {
i.putExtra(FileUploader.KEY_LOCAL_BEHAVIOUR, FileUploader.LOCAL_BEHAVIOUR_MOVE);
Log_OC.d(TAG, "upload file and move file to oc folder");
- } else if (behaviour.equalsIgnoreCase("DELETE")){
- i.putExtra(FileUploader.KEY_LOCAL_BEHAVIOUR, FileUploader.LOCAL_BEHAVIOUR_REMOVE);
- Log_OC.d(TAG, "upload file and delete file in original place");
}
}
-
return i;
}
return i;
}