Merge remote-tracking branch 'remotes/upstream/cancelUploadOnWlanExit' into beta

diff --cc src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
index 676a12c,eb628f0..e152daf
--- 1/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
--- 2/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
+++ b/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
@@@ -227,13 -177,22 +227,26 @@@ public class InstantUploadBroadcastRece
              return;
          }
  
+         if (instantPictureUploadViaWiFiOnly(context) && !isConnectedViaWiFi(context)){
+             Account account = AccountUtils.getCurrentOwnCloudAccount(context);
+             if (account == null) {
+                 Log_OC.w(TAG, "No owncloud account found for instant upload, aborting");
+                 return;
+             }
+ 
+             Intent i = new Intent(context, FileUploader.class);
+             i.putExtra(FileUploader.KEY_ACCOUNT, account);
+             i.putExtra(FileUploader.KEY_CANCEL_ALL, true);
+             context.startService(i);
+         }
+ 
          if (!intent.hasExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY)
                  && isOnline(context)
 -                && (!instantPictureUploadViaWiFiOnly(context) || (instantPictureUploadViaWiFiOnly(context) == isConnectedViaWiFi(context) == true))) {
 +                && (!instantUploadWhenChargingOnly(context) || (instantUploadWhenChargingOnly(context) && isCharging(context)))
 +                && (!instantVideoUploadWhenChargingOnly(context) || (instantVideoUploadWhenChargingOnly(context) && isCharging(context)))
 +                && (!instantPictureUploadViaWiFiOnly(context) || (instantPictureUploadViaWiFiOnly(context) && isConnectedViaWiFi(context)))
 +                && (!instantVideoUploadViaWiFiOnly(context) || (instantVideoUploadViaWiFiOnly(context) && isConnectedViaWiFi(context)))
 +            ) {
              DbHandler db = new DbHandler(context);
              Cursor c = db.getAwaitingFiles();
              if (c.moveToFirst()) {

diff --cc src/com/owncloud/android/files/services/FileUploader.java
Simple merge

diff --cc src/com/owncloud/android/operations/UploadFileOperation.java
Simple merge