Merge branch 'develop' into videoInstandUploads

diff --cc AndroidManifest.xml
Simple merge

diff --cc res/values/strings.xml
Simple merge

diff --cc src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
index 2c2fa91,1943d32..ee004b2
--- 1/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
--- 2/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
+++ b/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
@@@ -1,6 -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,
@@@ -29,30 -37,31 +37,35 @@@ 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.AccountUtils;
- import com.owncloud.android.Log_OC;
- import com.owncloud.android.authenticator.AccountAuthenticator;
- import com.owncloud.android.db.DbHandler;
- import com.owncloud.android.files.services.FileUploader;
- import com.owncloud.android.utils.FileStorageUtils;
  
  public class InstantUploadBroadcastReceiver extends BroadcastReceiver {
  
      private static String TAG = "InstantUploadBroadcastReceiver";
 -    private static final String[] CONTENT_PROJECTION = { Media.DATA, Media.DISPLAY_NAME, Media.MIME_TYPE, Media.SIZE };
++   // private static final String[] CONTENT_PROJECTION = { Media.DATA, Media.DISPLAY_NAME, Media.MIME_TYPE, Media.SIZE };
+     //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
 +    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);
 -            handleNewPhotoAction(context, intent);
+         }else if (intent.getAction().equals(NEW_PHOTO_ACTION_UNOFFICIAL)) {
 -            handleNewPhotoAction(context, intent);
++            handleNewMediaAction(context, intent); //handleNewPhotoAction(context, intent);
+             Log_OC.d(TAG, "UNOFFICIAL processed: com.android.camera.NEW_PICTURE");
+         } else if (intent.getAction().equals(NEW_PHOTO_ACTION)) {
-         } else if (intent.getAction().equals(FileUploader.UPLOAD_FINISH_MESSAGE)) {
++            handleNewMediaAction(context, intent); //handleNewPhotoAction(context, intent);
+             Log_OC.d(TAG, "OFFICIAL processed: android.hardware.action.NEW_PICTURE");
 +        } else if (intent.getAction().equals(NEW_PHOTO_ACTION) || intent.getAction().equals(NEW_VIDEO_ACTION)) {
 +            handleNewMediaAction(context, intent);
+         } else if (intent.getAction().equals(FileUploader.getUploadFinishMessage())) {
              handleUploadFinished(context, intent);
          } else {
              Log_OC.e(TAG, "Incorrect intent sent: " + intent.getAction());
@@@ -69,16 -79,12 +83,17 @@@
              }
              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;
          }