X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/7392cfe5aba6d60f7d84dd335b759e08c94693a6..a8fade7369bc8d1752dc4ba5fe07935cac84e96f:/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 1232fa13..21ee975d 100644 --- a/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java +++ b/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,6 +20,11 @@ package com.owncloud.android.files; import java.io.File; +import com.owncloud.android.authentication.AccountAuthenticator; +import com.owncloud.android.authentication.AccountUtils; +import com.owncloud.android.db.DbHandler; +import com.owncloud.android.files.services.FileUploader; + import android.accounts.Account; import android.content.BroadcastReceiver; import android.content.Context; @@ -31,32 +35,36 @@ import android.net.ConnectivityManager; import android.net.NetworkInfo.State; import android.preference.PreferenceManager; import android.provider.MediaStore.Images.Media; -import android.util.Log; import android.webkit.MimeTypeMap; -import com.owncloud.android.AccountUtils; -import com.owncloud.android.authenticator.AccountAuthenticator; -import com.owncloud.android.db.DbHandler; -import com.owncloud.android.files.services.FileUploader; +import com.owncloud.android.Log_OC; import com.owncloud.android.utils.FileStorageUtils; public class InstantUploadBroadcastReceiver extends BroadcastReceiver { - private static String TAG = "PhotoTakenBroadcastReceiver"; + private static String TAG = "InstantUploadBroadcastReceiver"; 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"; + //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"; @Override public void onReceive(Context context, Intent intent) { - Log.d(TAG, "Received: " + intent.getAction()); + Log_OC.d(TAG, "Received: " + intent.getAction()); if (intent.getAction().equals(android.net.ConnectivityManager.CONNECTIVITY_ACTION)) { handleConnectivityAction(context, intent); + } else if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH && + intent.getAction().equals(NEW_PHOTO_ACTION_UNOFFICIAL)) { + handleNewPhotoAction(context, intent); + Log_OC.d(TAG, "UNOFFICIAL processed: com.android.camera.NEW_PICTURE"); } else if (intent.getAction().equals(NEW_PHOTO_ACTION)) { handleNewPhotoAction(context, intent); + Log_OC.d(TAG, "OFFICIAL processed: android.hardware.action.NEW_PICTURE"); } else if (intent.getAction().equals(FileUploader.UPLOAD_FINISH_MESSAGE)) { handleUploadFinished(context, intent); } else { - Log.e(TAG, "Incorrect intent sent: " + intent.getAction()); + Log_OC.e(TAG, "Incorrect intent sent: " + intent.getAction()); } } @@ -66,7 +74,7 @@ public class InstantUploadBroadcastReceiver extends BroadcastReceiver { DbHandler db = new DbHandler(context); String localPath = intent.getStringExtra(FileUploader.EXTRA_OLD_FILE_PATH); if (!db.removeIUPendingFile(localPath)) { - Log.w(TAG, "Tried to remove non existing instant upload file " + localPath); + Log_OC.w(TAG, "Tried to remove non existing instant upload file " + localPath); } db.close(); } @@ -74,20 +82,20 @@ public class InstantUploadBroadcastReceiver extends BroadcastReceiver { private void handleNewPhotoAction(Context context, Intent intent) { if (!instantUploadEnabled(context)) { - Log.d(TAG, "Instant upload disabled, abording uploading"); + Log_OC.d(TAG, "Instant upload disabled, aborting uploading"); return; } Account account = AccountUtils.getCurrentOwnCloudAccount(context); if (account == null) { - Log.w(TAG, "No owncloud account found for instant upload, aborting"); + Log_OC.w(TAG, "No owncloud account found for instant upload, aborting"); return; } Cursor c = context.getContentResolver().query(intent.getData(), CONTENT_PROJECTION, null, null, null); if (!c.moveToFirst()) { - Log.e(TAG, "Couldn't resolve given uri: " + intent.getDataString()); + Log_OC.e(TAG, "Couldn't resolve given uri: " + intent.getDataString()); return; } @@ -96,7 +104,7 @@ public class InstantUploadBroadcastReceiver extends BroadcastReceiver { String mime_type = c.getString(c.getColumnIndex(Media.MIME_TYPE)); c.close(); - Log.e(TAG, file_path + ""); + Log_OC.e(TAG, file_path + ""); // same always temporally the picture to upload DbHandler db = new DbHandler(context); @@ -121,7 +129,7 @@ public class InstantUploadBroadcastReceiver extends BroadcastReceiver { Intent i = new Intent(context, FileUploader.class); i.putExtra(FileUploader.KEY_ACCOUNT, account); i.putExtra(FileUploader.KEY_LOCAL_FILE, file_path); - i.putExtra(FileUploader.KEY_REMOTE_FILE, FileStorageUtils.getInstantUploadFilePath(file_name)); + i.putExtra(FileUploader.KEY_REMOTE_FILE, FileStorageUtils.getInstantUploadFilePath(context, file_name)); i.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_SINGLE_FILE); i.putExtra(FileUploader.KEY_MIME_TYPE, mime_type); i.putExtra(FileUploader.KEY_INSTANT_UPLOAD, true); @@ -131,7 +139,7 @@ public class InstantUploadBroadcastReceiver extends BroadcastReceiver { private void handleConnectivityAction(Context context, Intent intent) { if (!instantUploadEnabled(context)) { - Log.d(TAG, "Instant upload disabled, abording uploading"); + Log_OC.d(TAG, "Instant upload disabled, abording uploading"); return; } @@ -156,7 +164,7 @@ public class InstantUploadBroadcastReceiver extends BroadcastReceiver { f.getName().substring(f.getName().lastIndexOf('.') + 1)); } catch (Throwable e) { - Log.e(TAG, "Trying to find out MIME type of a file without extension: " + f.getName()); + Log_OC.e(TAG, "Trying to find out MIME type of a file without extension: " + f.getName()); } if (mimeType == null) mimeType = "application/octet-stream"; @@ -164,13 +172,13 @@ public class InstantUploadBroadcastReceiver extends BroadcastReceiver { Intent i = new Intent(context, FileUploader.class); i.putExtra(FileUploader.KEY_ACCOUNT, account); i.putExtra(FileUploader.KEY_LOCAL_FILE, file_path); - i.putExtra(FileUploader.KEY_REMOTE_FILE, FileStorageUtils.getInstantUploadFilePath(f.getName())); + i.putExtra(FileUploader.KEY_REMOTE_FILE, FileStorageUtils.getInstantUploadFilePath(context, f.getName())); i.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_SINGLE_FILE); i.putExtra(FileUploader.KEY_INSTANT_UPLOAD, true); context.startService(i); } else { - Log.w(TAG, "Instant upload file " + f.getAbsolutePath() + " dont exist anymore"); + Log_OC.w(TAG, "Instant upload file " + f.getAbsolutePath() + " dont exist anymore"); } } while (c.moveToNext()); }