|
@@ -177,12 +177,27 @@ public class InstantUploadBroadcastReceiver extends BroadcastReceiver {
|
|
|
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))) {
|
|
|
DbHandler db = new DbHandler(context);
|
|
|
Cursor c = db.getAwaitingFiles();
|
|
|
- if (c.moveToFirst()) {
|
|
|
+ if (c.moveToFirst() && isOnline(context)
|
|
|
+ && (!instantPictureUploadViaWiFiOnly(context) ||
|
|
|
+ (instantPictureUploadViaWiFiOnly(context) == isConnectedViaWiFi(context) == true))) {
|
|
|
do {
|
|
|
String account_name = c.getString(c.getColumnIndex("account"));
|
|
|
String file_path = c.getString(c.getColumnIndex("path"));
|