mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 17:46:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

changes according to CR (code review)

Browse source
This commit is contained in:
tobiasKaminsky 2015-11-21 09:03:53 +01:00
parent 2aac1e5270
commit 4471d3beb9
2 changed files with 11 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
View file

@ -125,6 +125,12 @@ public class InstantUploadBroadcastReceiver extends BroadcastReceiver {
i.putExtra(FileUploader.KEY_INSTANT_UPLOAD, true);
// instant upload behaviour
i = addInstantUploadBehaviour(i, context);
context.startService(i);
}
private Intent addInstantUploadBehaviour(Intent i, Context context){
SharedPreferences appPreferences = PreferenceManager.getDefaultSharedPreferences(context);
String behaviour = appPreferences.getString("prefs_instant_behaviour", "NOTHING");
@ -142,7 +148,7 @@ public class InstantUploadBroadcastReceiver extends BroadcastReceiver {
Log_OC.d(TAG, "upload file and delete file in original place");
}
context.startService(i);
return i;
}
private void handleNewVideoAction(Context context, Intent intent) {
@ -189,22 +195,7 @@ public class InstantUploadBroadcastReceiver extends BroadcastReceiver {
i.putExtra(FileUploader.KEY_INSTANT_UPLOAD, true);
// instant upload behaviour
SharedPreferences appPreferences = PreferenceManager.getDefaultSharedPreferences(context);
String behaviour = appPreferences.getString("prefs_instant_behaviour", "NOTHING");
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("DELETE")){
i.putExtra(FileUploader.KEY_LOCAL_BEHAVIOUR, FileUploader.LOCAL_BEHAVIOUR_REMOVE);
Log_OC.d(TAG, "upload file and delete file in original place");
}
i = addInstantUploadBehaviour(i, context);
context.startService(i);
@ -248,22 +239,7 @@ public class InstantUploadBroadcastReceiver extends BroadcastReceiver {
i.putExtra(FileUploader.KEY_INSTANT_UPLOAD, true);
// instant upload behaviour
SharedPreferences appPreferences = PreferenceManager.getDefaultSharedPreferences(context);
String behaviour = appPreferences.getString("prefs_instant_behaviour", "NOTHING");
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("DELETE")){
i.putExtra(FileUploader.KEY_LOCAL_BEHAVIOUR, FileUploader.LOCAL_BEHAVIOUR_REMOVE);
Log_OC.d(TAG, "upload file and delete file in original place");
}
i = addInstantUploadBehaviour(i, context);
context.startService(i);

2
src/com/owncloud/android/operations/UploadFileOperation.java
View file

@ -325,6 +325,8 @@ public class UploadFileOperation extends RemoteOperation {
throw new OperationCancelledException();
}
result = mUploadOperation.execute(client);
/// move local temporal file or original file to its corresponding
// location in the ownCloud local folder
if (result.isSuccess()) {