X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/5781090e2be3fddcb47d2d7e504e859321eb2ede..1a33e4cf6582c480be3097fcd65fb7ccd876f51a:/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java diff --git a/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java b/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java index 1f09b9b7..b0a361aa 100644 --- a/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java +++ b/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java @@ -1,6 +1,6 @@ /* ownCloud Android client application * Copyright (C) 2012 Bartek Przybylski - * Copyright (C) 2012-2013 ownCloud Inc. + * Copyright (C) 2012-2014 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -20,40 +20,54 @@ package com.owncloud.android.files; import java.io.File; -import com.owncloud.android.authentication.AccountAuthenticator; +import com.owncloud.android.MainApp; import com.owncloud.android.authentication.AccountUtils; import com.owncloud.android.db.DbHandler; import com.owncloud.android.files.services.FileUploader; +import com.owncloud.android.utils.FileStorageUtils; +import com.owncloud.android.utils.Log_OC; + import android.accounts.Account; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import android.content.IntentFilter; +//import android.content.IntentFilter; import android.database.Cursor; import android.net.ConnectivityManager; import android.net.NetworkInfo.State; import android.preference.PreferenceManager; -import android.provider.MediaStore.Images.Media; +import android.provider.MediaStore.*; import android.webkit.MimeTypeMap; -import com.owncloud.android.Log_OC; -import com.owncloud.android.utils.FileStorageUtils; public class InstantUploadBroadcastReceiver extends BroadcastReceiver { - private static String TAG = "PhotoTakenBroadcastReceiver"; - private static final String[] CONTENT_PROJECTION = { Media.DATA, Media.DISPLAY_NAME, Media.MIME_TYPE, Media.SIZE }; - private static String NEW_PHOTO_ACTION = "com.android.camera.NEW_PICTURE"; + private static String TAG = "InstantUploadBroadcastReceiver"; + // Image action + // Unofficial action, works for most devices but not HTC. See: https://github.com/owncloud/android/issues/6 + private static String NEW_PHOTO_ACTION_UNOFFICIAL = "com.android.camera.NEW_PICTURE"; + // Officially supported action since SDK 14: http://developer.android.com/reference/android/hardware/Camera.html#ACTION_NEW_PICTURE + private static String NEW_PHOTO_ACTION = "android.hardware.action.NEW_PICTURE"; + // Video action + // Officially supported action since SDK 14: http://developer.android.com/reference/android/hardware/Camera.html#ACTION_NEW_VIDEO + private static String NEW_VIDEO_ACTION = "android.hardware.action.NEW_VIDEO"; @Override public void onReceive(Context context, Intent intent) { Log_OC.d(TAG, "Received: " + intent.getAction()); if (intent.getAction().equals(android.net.ConnectivityManager.CONNECTIVITY_ACTION)) { handleConnectivityAction(context, intent); + }else if (intent.getAction().equals(NEW_PHOTO_ACTION_UNOFFICIAL)) { + handleNewMediaAction(context, intent); + Log_OC.d(TAG, "UNOFFICIAL processed: com.android.camera.NEW_PICTURE"); } else if (intent.getAction().equals(NEW_PHOTO_ACTION)) { - handleNewPhotoAction(context, intent); - } else if (intent.getAction().equals(FileUploader.UPLOAD_FINISH_MESSAGE)) { + handleNewMediaAction(context, intent); + Log_OC.d(TAG, "OFFICIAL processed: android.hardware.action.NEW_PICTURE"); + } else if (intent.getAction().equals(NEW_VIDEO_ACTION)) { + Log_OC.d(TAG, "OFFICIAL processed: android.hardware.action.NEW_VIDEO"); + handleNewMediaAction(context, intent); + } else if (intent.getAction().equals(FileUploader.getUploadFinishMessage())) { handleUploadFinished(context, intent); } else { Log_OC.e(TAG, "Incorrect intent sent: " + intent.getAction()); @@ -62,6 +76,7 @@ public class InstantUploadBroadcastReceiver extends BroadcastReceiver { private void handleUploadFinished(Context context, Intent intent) { // remove successfull uploading, ignore rest for reupload on reconnect + /* if (intent.getBooleanExtra(FileUploader.EXTRA_UPLOAD_RESULT, false)) { DbHandler db = new DbHandler(context); String localPath = intent.getStringExtra(FileUploader.EXTRA_OLD_FILE_PATH); @@ -70,11 +85,17 @@ public class InstantUploadBroadcastReceiver extends BroadcastReceiver { } db.close(); } + */ } - private void handleNewPhotoAction(Context context, Intent intent) { + private void handleNewMediaAction(Context context, Intent intent) { + Cursor c = null; + String file_path = null; + String file_name = null; + String mime_type = null; + if (!instantUploadEnabled(context)) { - Log_OC.d(TAG, "Instant upload disabled, abording uploading"); + Log_OC.d(TAG, "Instant upload disabled, aborting uploading"); return; } @@ -84,19 +105,36 @@ public class InstantUploadBroadcastReceiver extends BroadcastReceiver { return; } - Cursor c = context.getContentResolver().query(intent.getData(), CONTENT_PROJECTION, null, null, null); - - if (!c.moveToFirst()) { - Log_OC.e(TAG, "Couldn't resolve given uri: " + intent.getDataString()); - return; + if (intent.getAction().equals(NEW_PHOTO_ACTION) || intent.getAction().equals(NEW_PHOTO_ACTION_UNOFFICIAL)) { + String[] CONTENT_PROJECTION = { Images.Media.DATA, Images.Media.DISPLAY_NAME, Images.Media.MIME_TYPE, Images.Media.SIZE }; + c = context.getContentResolver().query(intent.getData(), CONTENT_PROJECTION, null, null, null); + if (!c.moveToFirst()) { + Log_OC.e(TAG, "Couldn't resolve given uri: " + intent.getDataString()); + return; + } + file_path = c.getString(c.getColumnIndex(Images.Media.DATA)); + file_name = c.getString(c.getColumnIndex(Images.Media.DISPLAY_NAME)); + mime_type = c.getString(c.getColumnIndex(Images.Media.MIME_TYPE)); + Log_OC.w(TAG, "New photo received"); + } + else if (intent.getAction().equals(NEW_VIDEO_ACTION)) { + if (!isConnectedViaWiFi(context)) { + Log_OC.e(TAG, "No Wifi available .. Video instant upload only possible if WiFi is on"); + return; + } + String[] CONTENT_PROJECTION = { Video.Media.DATA, Video.Media.DISPLAY_NAME, Video.Media.MIME_TYPE, Video.Media.SIZE }; + c = context.getContentResolver().query(intent.getData(), CONTENT_PROJECTION, null, null, null); + if (!c.moveToFirst()) { + Log_OC.e(TAG, "Couldn't resolve given uri: " + intent.getDataString()); + return; + } + file_path = c.getString(c.getColumnIndex(Video.Media.DATA)); + file_name = c.getString(c.getColumnIndex(Video.Media.DISPLAY_NAME)); + mime_type = c.getString(c.getColumnIndex(Video.Media.MIME_TYPE)); + Log_OC.w(TAG, "New video received"); } - - String file_path = c.getString(c.getColumnIndex(Media.DATA)); - String file_name = c.getString(c.getColumnIndex(Media.DISPLAY_NAME)); - String mime_type = c.getString(c.getColumnIndex(Media.MIME_TYPE)); - c.close(); - Log_OC.e(TAG, file_path + ""); + Log_OC.d(TAG, file_path + ""); // same always temporally the picture to upload DbHandler db = new DbHandler(context); @@ -115,8 +153,8 @@ public class InstantUploadBroadcastReceiver extends BroadcastReceiver { // we can unregister from entire listenings but thats suck a bit. // On the other hand this might be only for dynamicly registered // broadcast receivers, needs investigation. - IntentFilter filter = new IntentFilter(FileUploader.UPLOAD_FINISH_MESSAGE); - context.getApplicationContext().registerReceiver(this, filter); + /*IntentFilter filter = new IntentFilter(FileUploader.UPLOAD_FINISH_MESSAGE); + context.getApplicationContext().registerReceiver(this, filter);*/ Intent i = new Intent(context, FileUploader.class); i.putExtra(FileUploader.KEY_ACCOUNT, account); @@ -141,14 +179,14 @@ public class InstantUploadBroadcastReceiver extends BroadcastReceiver { DbHandler db = new DbHandler(context); Cursor c = db.getAwaitingFiles(); if (c.moveToFirst()) { - IntentFilter filter = new IntentFilter(FileUploader.UPLOAD_FINISH_MESSAGE); - context.getApplicationContext().registerReceiver(this, filter); + //IntentFilter filter = new IntentFilter(FileUploader.UPLOAD_FINISH_MESSAGE); + //context.getApplicationContext().registerReceiver(this, filter); do { String account_name = c.getString(c.getColumnIndex("account")); String file_path = c.getString(c.getColumnIndex("path")); File f = new File(file_path); if (f.exists()) { - Account account = new Account(account_name, AccountAuthenticator.ACCOUNT_TYPE); + Account account = new Account(account_name, MainApp.getAccountType()); String mimeType = null; try {