start FileUploadService on app start

add comments
filter duplicate photos in InstantUploadBroadcastReceiver

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

@@ -18,6 +18,8 @@
 
 package com.owncloud.android.files;
 
+import java.util.Map.Entry;
+
 import android.accounts.Account;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -50,6 +52,7 @@ public class InstantUploadBroadcastReceiver extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
+        android.os.Debug.waitForDebugger();
         Log_OC.d(TAG, "Received: " + intent.getAction());
         if (intent.getAction().equals(NEW_PHOTO_ACTION_UNOFFICIAL)) {
             handleNewPictureAction(context, intent); 
@@ -58,13 +61,19 @@ public class InstantUploadBroadcastReceiver extends BroadcastReceiver {
             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);
+            Log_OC.d(TAG, "OFFICIAL processed: android.hardware.action.NEW_VIDEO");            
         } else {
             Log_OC.e(TAG, "Incorrect intent sent: " + intent.getAction());
         }
     }
 
+    /**
+     * Because we support NEW_PHOTO_ACTION and NEW_PHOTO_ACTION_UNOFFICIAL it can happen that 
+     * handleNewPictureAction is called twice for the same photo. Use this simple static variable to
+     * remember last uploaded photo to filter duplicates. Must not be null!
+     */
+    static String lastUploadedPhotoPath = "";
     private void handleNewPictureAction(Context context, Intent intent) {
         Cursor c = null;
         String file_path = null;
@@ -95,8 +104,13 @@ public class InstantUploadBroadcastReceiver extends BroadcastReceiver {
         mime_type = c.getString(c.getColumnIndex(Images.Media.MIME_TYPE));
         c.close();
         
-        Log_OC.d(TAG, file_path + "");
-
+        if(file_path.equals(lastUploadedPhotoPath)) {
+            Log_OC.d(TAG, "Duplicate detected: " + file_path + ". Ignore.");
+            return;
+        }
+        lastUploadedPhotoPath = file_path;
+        Log_OC.d(TAG, "Path: " + file_path + "");        
+        
         Intent i = new Intent(context, FileUploadService.class);
         i.putExtra(FileUploadService.KEY_ACCOUNT, account);
         i.putExtra(FileUploadService.KEY_LOCAL_FILE, file_path);

src/com/owncloud/android/files/services/ConnectivityActionReceiver.java

@@ -11,12 +11,24 @@ import android.util.Log;
 
 import com.owncloud.android.files.InstantUploadBroadcastReceiver;
 
+/**
+ * Receives all connectivity action from Android OS at all times and performs required OC actions.
+ * For now that are:
+ *   - Signal connectivity to {@link FileUploadService}.
+ *   
+ * Later can be added:
+ *   - Signal connectivity to download service, deletion service, ...
+ *   - Handle offline mode (cf. https://github.com/owncloud/android/issues/162)
+ *   
+ * @author LukeOwncloud
+ *
+ */
 public class ConnectivityActionReceiver extends BroadcastReceiver {
     private static final String TAG = "ConnectivityActionReceiver";
 
     @Override
     public void onReceive(final Context context, Intent intent) {
-        if (intent.getAction().equals(ConnectivityManager.CONNECTIVITY_ACTION)) {
+//        if (intent.getAction().equals(ConnectivityManager.CONNECTIVITY_ACTION)) {
             Log.v(TAG, "action: " + intent.getAction());
             Log.v(TAG, "component: " + intent.getComponent());
             Bundle extras = intent.getExtras();
@@ -31,7 +43,7 @@ public class ConnectivityActionReceiver extends BroadcastReceiver {
             if (InstantUploadBroadcastReceiver.isOnline(context)) {
                 FileUploadService.retry(context);
             }
-        }
+//        }
     }
     
     static public void enable(Context context) {

src/com/owncloud/android/files/services/FileUploadService.java

@@ -79,9 +79,15 @@ import com.owncloud.android.utils.ErrorMessageAdapter;
 import com.owncloud.android.utils.UriUtils;
 
 /**
- * Service for uploading files. Invoke using context.startService(...). This
- * service retries until upload succeeded. Files to be uploaded are stored
- * persistent using {@link UploadDbHandler}.
+ * Service for uploading files. Invoke using context.startService(...). Files to
+ * be uploaded are stored persistently using {@link UploadDbHandler}.
+ * 
+ * On next invocation of {@link FileUploadService} uploaded files which
+ * previously failed will be uploaded again until either upload succeeded or a
+ * fatal error occured.
+ * 
+ * Every file passed to this service is uploaded. No filtering is performed.
+ * However, Intent keys (e.g., KEY_WIFI_ONLY) are obeyed.
  * 
  * @author LukeOwncloud
  * 
@@ -244,7 +250,11 @@ public class FileUploadService extends IntentService {
         for (UploadDbObject uploadDbObject : current) {
             uploadDbObject.setUploadStatus(UploadStatus.UPLOAD_LATER);
             mDb.updateUpload(uploadDbObject);   
-        }        
+        }
+        
+        if(InstantUploadBroadcastReceiver.isOnline(getApplicationContext())) {
+            FileUploadService.retry(getApplicationContext());
+        }
     }
 
     /**