Merge pull request #1807 from owncloud/instant_upload_combined_solution

Release 2.1.2

Author: davivel

AndroidManifest.xml

@@ -18,10 +18,9 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="com.owncloud.android"
-    android:versionCode="20100100"
-    android:versionName="2.1.1" >
+    android:versionCode="20100200"
+    android:versionName="2.1.2" >
 
     <uses-sdk
         android:minSdkVersion="14"
@@ -197,19 +196,32 @@
         <activity android:name=".ui.errorhandling.ErrorShowActivity" />
         <activity android:name=".ui.activity.UploadListActivity" />
 
-        <receiver android:name=".files.services.ConnectivityActionReceiver"
-		    android:enabled="true" android:label="ConnectivityActionReceiver">
-		    <intent-filter>
-		        <!--action android:name="android.net.conn.CONNECTIVITY_CHANGE"/-->
-		        <action android:name="android.net.wifi.STATE_CHANGE"/>
-		    </intent-filter>
-		</receiver>
-        <receiver android:name=".files.BootupBroadcastReceiver" >
+        <receiver android:name=".broadcastreceivers.ConnectivityActionReceiver"
+            android:enabled="true" android:label="ConnectivityActionReceiver">
+            <intent-filter>
+                <!--action android:name="android.net.conn.CONNECTIVITY_CHANGE"/-->
+                <action android:name="android.net.wifi.STATE_CHANGE"/>
+            </intent-filter>
+        </receiver>
+
+        <receiver android:name=".broadcastreceivers.BootupBroadcastReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
 
+        <receiver android:name=".broadcastreceivers.InstantUploadBroadcastReceiver">
+            <intent-filter>
+                <action android:name="android.hardware.action.NEW_PICTURE" />
+                <data android:mimeType="image/*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.hardware.action.NEW_VIDEO" />
+                <data android:mimeType="video/*" />
+            </intent-filter>
+        </receiver>
+
+
         <service android:name=".services.observer.FileObserverService" />
 
         <activity

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.1.2 (September 2016)
+- Instant uploads fixed in Android 6.
+
 ## 2.1.1 (September 2016)
 - Instant uploads work in Android 7.
 - Select your camera folder to upload pictures or videos from any

oc_jb_workaround/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.owncloud.android.workaround.accounts"
-    android:versionCode="0100031"
-    android:versionName="1.0.31" >
+    android:versionCode="0100032"
+    android:versionName="1.0.32" >
 
     <uses-sdk
         android:minSdkVersion="16"

res/values/strings.xml

@@ -398,7 +398,9 @@
     <string name="file_list__footer__files">%1$d files</string>
     <string name="file_list__footer__files_and_folder">%1$d files, 1 folder</string>
     <string name="file_list__footer__files_and_folders">%1$d files, %2$d folders</string>
-    <string name="prefs_instant_upload_source_path_title">Camera folder</string>
+    <string name="prefs_instant_upload_source_path_title">Camera folder (%1$s)</string>
+    <string name="prefs_instant_upload_source_path_title_required">required</string>
+    <string name="prefs_instant_upload_source_path_title_optional">optional</string>
     <string name="prefs_instant_behaviour_dialogTitle">Original file will be...</string>
     <string name="prefs_instant_behaviour_title">Original file will be...</string>
     <string name="upload_copy_files">Copy file</string>

src/com/owncloud/android/files/BootupBroadcastReceiver.java renamed to src/com/owncloud/android/broadcastreceivers/BootupBroadcastReceiver.java

@@ -19,7 +19,7 @@
  *
  */
 
-package com.owncloud.android.files;
+package com.owncloud.android.broadcastreceivers;
 
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.services.observer.FileObserverService;

src/com/owncloud/android/files/services/ConnectivityActionReceiver.java renamed to src/com/owncloud/android/broadcastreceivers/ConnectivityActionReceiver.java

@@ -18,7 +18,7 @@
  *
  */
 
-package com.owncloud.android.files.services;
+package com.owncloud.android.broadcastreceivers;
 
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -35,6 +35,7 @@
 import com.owncloud.android.MainApp;
 import com.owncloud.android.db.PreferenceManager;
 import com.owncloud.android.db.UploadResult;
+import com.owncloud.android.files.services.FileUploader;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
 /**

src/com/owncloud/android/broadcastreceivers/InstantUploadBroadcastReceiver.java

@@ -0,0 +1,71 @@
+/**
+ *  ownCloud Android client application
+ *
+ *  @author Bartek Przybylski
+ *  @author David A. Velasco
+ *  Copyright (C) 2012  Bartek Przybylski
+ *  Copyright (C) 2016 ownCloud GmbH.
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  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
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.broadcastreceivers;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+import com.owncloud.android.db.PreferenceManager;
+import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.services.observer.InstantUploadsHandler;
+
+
+public class InstantUploadBroadcastReceiver extends BroadcastReceiver {
+
+    private static String TAG = InstantUploadBroadcastReceiver.class.getName();
+    // Image action
+    // 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(NEW_PHOTO_ACTION)) {
+            InstantUploadsHandler handler = new InstantUploadsHandler();
+            handler.handleNewPictureAction(
+                intent,
+                PreferenceManager.getInstantUploadsConfiguration(context),
+                context
+            );
+            Log_OC.d(TAG, "processed: android.hardware.action.NEW_PICTURE");
+
+        } else if (intent.getAction().equals(NEW_VIDEO_ACTION)) {
+            InstantUploadsHandler handler = new InstantUploadsHandler();
+            handler.handleNewVideoAction(
+                intent,
+                PreferenceManager.getInstantUploadsConfiguration(context),
+                context
+            );
+            Log_OC.d(TAG, "processed: android.hardware.action.NEW_VIDEO");
+
+        } else {
+            Log_OC.e(TAG, "Incorrect intent received: " + intent.getAction());
+        }
+    }
+
+}