mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-10-23 04:26:01 +03:00
Code Issues Projects Releases Packages Wiki Activity

added official NEW_PICTURE receiver (supported by Android since SDK 14).

Browse source 
old (unofficial) receiver still works, as well.

this enables instant upload for all Android 4 devices (also HTC!) and has no effect on older devices.
This commit is contained in:
Luke Owncloud 2013-08-05 16:34:21 +02:00
parent b9b95237a7
commit 01cc23802f
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
AndroidManifest.xml
View file

@ -163,7 +163,10 @@
<receiver android:name=".files.InstantUploadBroadcastReceiver">
<intent-filter>
<!-- unofficially supported by many Android phones but not by HTC devices: -->
<action android:name="com.android.camera.NEW_PICTURE" />
<!-- officially supported since Android 4.0 (SDK 14, works even for HTC devices): -->
<action android:name="android.hardware.action.NEW_PICTURE" />
<data android:mimeType="image/*" />
</intent-filter>
<intent-filter>

9
src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
View file

@ -44,13 +44,18 @@ 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";
//Unofficial action, works for most devices but not HTC. See: https://github.com/owncloud/android/issues/6
private static String NEW_PHOTO_ACTION_INOFFICIAL = "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_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_INOFFICIAL)) {
handleNewPhotoAction(context, intent);
} else if (intent.getAction().equals(NEW_PHOTO_ACTION)) {
handleNewPhotoAction(context, intent);
} else if (intent.getAction().equals(FileUploader.UPLOAD_FINISH_MESSAGE)) {
@ -74,7 +79,7 @@ public class InstantUploadBroadcastReceiver extends BroadcastReceiver {
private void handleNewPhotoAction(Context context, Intent intent) {
if (!instantUploadEnabled(context)) {
Log_OC.d(TAG, "Instant upload disabled, abording uploading");
Log_OC.d(TAG, "Instant upload disabled, aborting uploading");
return;
}