X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/c38a3b2ef12a3f6b4b1f0dad611d31cbd0686793..185aae4bc345f453479f94e2a78da62e8c9930b0:/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 d2490743..930e2b23 100644 --- a/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java +++ b/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java @@ -1,10 +1,10 @@ /* ownCloud Android client application * Copyright (C) 2012 Bartek Przybylski + * 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 as published by - * the Free Software Foundation, either version 3 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 @@ -20,110 +20,148 @@ package com.owncloud.android.files; import java.io.File; -import com.owncloud.android.AccountUtils; -import com.owncloud.android.authenticator.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.database.Cursor; 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.provider.MediaStore.Images; +import android.provider.MediaStore.Video; import android.webkit.MimeTypeMap; + public class InstantUploadBroadcastReceiver extends BroadcastReceiver { - public static String INSTANT_UPLOAD_DIR = "/InstantUpload/"; - 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.class.getName(); + // 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.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 (intent.getAction().equals(NEW_PHOTO_ACTION_UNOFFICIAL)) { + handleNewPictureAction(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)) { - handleUploadFinished(context, intent); + handleNewPictureAction(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"); + handleNewVideoAction(context, intent); } else { - Log.e(TAG, "Incorrect intent sent: " + intent.getAction()); + Log_OC.e(TAG, "Incorrect intent sent: " + intent.getAction()); } } - 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); - if (!db.removeIUPendingFile(localPath, - intent.getStringExtra(FileUploader.ACCOUNT_NAME))) { - Log.w(TAG, "Tried to remove non existing instant upload file " + localPath); - } - db.close(); - } - } + private void handleNewPictureAction(Context context, Intent intent) { + Cursor c = null; + String file_path = null; + String file_name = null; + String mime_type = null; - private void handleNewPhotoAction(Context context, Intent intent) { - if (!instantUploadEnabled(context)) { - Log.d(TAG, "Instant upload disabled, abording uploading"); + Log_OC.w(TAG, "New photo received"); + + if (!instantPictureUploadEnabled(context)) { + Log_OC.d(TAG, "Instant picture upload disabled, ignoring new picture"); 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); - + 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.e(TAG, "Couldn't resolve given uri: " + intent.getDataString()); + Log_OC.e(TAG, "Couldn't resolve given uri: " + intent.getDataString()); return; } - - 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)); - + 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)); c.close(); - Log.e(TAG, file_path+""); - if (!isOnline(context) || - (instantUploadViaWiFiOnly(context) && !isConnectedViaWiFi(context))) { - DbHandler db = new DbHandler(context); - db.putFileForLater(file_path, account.name); - db.close(); + Log_OC.d(TAG, file_path + ""); + + // save always temporally the picture to upload + DbHandler db = new DbHandler(context); + db.putFileForLater(file_path, account.name, null); + db.close(); + + if (!isOnline(context) || (instantPictureUploadViaWiFiOnly(context) && !isConnectedViaWiFi(context))) { return; } + + 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(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); + context.startService(i); + } + + private void handleNewVideoAction(Context context, Intent intent) { + Cursor c = null; + String file_path = null; + String file_name = null; + String mime_type = null; + + Log_OC.w(TAG, "New video received"); - // register for upload finishe message - // there is a litte problem with android API, we can register for particular - // intent in registerReceiver but we cannot unregister from precise intent - // 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); - + if (!instantVideoUploadEnabled(context)) { + Log_OC.d(TAG, "Instant video upload disabled, ignoring new video"); + return; + } + + Account account = AccountUtils.getCurrentOwnCloudAccount(context); + if (account == null) { + Log_OC.w(TAG, "No owncloud account found for instant upload, aborting"); + 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)); + c.close(); + Log_OC.d(TAG, file_path + ""); + + if (!isOnline(context) || (instantVideoUploadViaWiFiOnly(context) && !isConnectedViaWiFi(context))) { + return; + } + 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, INSTANT_UPLOAD_DIR + 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); @@ -132,75 +170,79 @@ public class InstantUploadBroadcastReceiver extends BroadcastReceiver { } private void handleConnectivityAction(Context context, Intent intent) { - if (!instantUploadEnabled(context)) { - Log.d(TAG, "Instant upload disabled, abording uploading"); + if (!instantPictureUploadEnabled(context)) { + Log_OC.d(TAG, "Instant upload disabled, don't upload anything"); return; } - - if (!intent.hasExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY) && - isOnline(context) && - (!instantUploadViaWiFiOnly(context) || - (instantUploadViaWiFiOnly(context) == isConnectedViaWiFi(context) == true)) ) { + + 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()) { - 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 { - mimeType = MimeTypeMap.getSingleton() - .getMimeTypeFromExtension( - f.getName().substring(f.getName().lastIndexOf('.') + 1)); - + mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension( + 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"; - + 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, INSTANT_UPLOAD_DIR + 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()); + } while (c.moveToNext()); } c.close(); db.close(); } - + } - private boolean isOnline(Context context) { + public static boolean isOnline(Context context) { ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); return cm.getActiveNetworkInfo() != null && cm.getActiveNetworkInfo().isConnected(); } - - private boolean isConnectedViaWiFi(Context context) { + + public static boolean isConnectedViaWiFi(Context context) { ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); - return cm != null && cm.getActiveNetworkInfo() != null && - cm.getActiveNetworkInfo().getType() == ConnectivityManager.TYPE_WIFI && - cm.getActiveNetworkInfo().getState() == State.CONNECTED; + return cm != null && cm.getActiveNetworkInfo() != null + && cm.getActiveNetworkInfo().getType() == ConnectivityManager.TYPE_WIFI + && cm.getActiveNetworkInfo().getState() == State.CONNECTED; } - - private boolean instantUploadEnabled(Context context) { + + public static boolean instantPictureUploadEnabled(Context context) { return PreferenceManager.getDefaultSharedPreferences(context).getBoolean("instant_uploading", false); } - - private boolean instantUploadViaWiFiOnly(Context context) { + + public static boolean instantVideoUploadEnabled(Context context) { + return PreferenceManager.getDefaultSharedPreferences(context).getBoolean("instant_video_uploading", false); + } + + public static boolean instantPictureUploadViaWiFiOnly(Context context) { return PreferenceManager.getDefaultSharedPreferences(context).getBoolean("instant_upload_on_wifi", false); } + + public static boolean instantVideoUploadViaWiFiOnly(Context context) { + return PreferenceManager.getDefaultSharedPreferences(context).getBoolean("instant_video_upload_on_wifi", false); + } }