Merge pull request #312 from nextcloud/fixVideoCharging

Fix instant video waiting for charging

src/com/owncloud/android/operations/UploadFileOperation.java

@@ -485,11 +485,9 @@ public class UploadFileOperation extends SyncOperation {
         boolean delayInstantPicture = isInstantPicture() &&
                 PreferenceManager.instantPictureUploadWhenChargingOnly(mContext);
 
-        boolean delayInstantVideo = isInstantVideo() &&
-                PreferenceManager.instantVideoUploadViaWiFiOnly(mContext);
+        boolean delayInstantVideo = isInstantVideo() && PreferenceManager.instantVideoUploadWhenChargingOnly(mContext);
 
-        return ((delayInstantPicture || delayInstantVideo)
-                && !ConnectivityUtils.isCharging(mContext));
+        return ((delayInstantPicture || delayInstantVideo) && !ConnectivityUtils.isCharging(mContext));
     }