From 4b8a5a9c9243dd4a68c6bc71a03f0a365524f281 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Sat, 19 Sep 2015 14:33:29 +0200 Subject: [PATCH] #819, part 2: Instant uploads, depends on setting --- res/values/attrs.xml | 14 ++++++++++++ res/values/strings.xml | 2 ++ res/xml/preferences.xml | 9 +++++++- .../android/datamodel/FileDataStorageManager.java | 2 +- .../files/InstantUploadBroadcastReceiver.java | 25 ++++++++++++++++++++++ .../android/files/services/FileUploader.java | 1 + .../android/operations/UploadFileOperation.java | 7 +++++- 7 files changed, 57 insertions(+), 3 deletions(-) diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 800a4b6d..54d63f06 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -11,4 +11,18 @@ + + do nothing + copy file to OC folder + move file to OC folder + delete origin file + + + + NOTHING + COPY + MOVE + DELETE + + \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 8f1aec21..80701fd0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -364,5 +364,7 @@ %1$d files %1$d files, 1 folder %1$d files, %2$d folders + Upload file to server and ... + Behaviour diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 4823a83f..3158356f 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -26,7 +26,14 @@ - + +