Update the status of current upload when it finishes

res/layout/upload_list_layout.xml

@@ -4,16 +4,18 @@
         android:layout_height="match_parent"
         android:clickable="true" >
 
-
-    <fragment
-        android:id="@+id/upload_list_fragment"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingLeft="25dp"
-        android:paddingRight="25dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        class="com.owncloud.android.ui.fragment.UploadListFragment"/>
+        android:background="@color/background_color">
+
+        <FrameLayout
+            android:id="@+id/upload_list_fragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"/>
+    </LinearLayout>
 
     <include
         layout="@layout/drawer"

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

@@ -98,6 +98,7 @@ public class FileUploadService extends Service implements OnDatatransferProgress
 
     private static final String TAG = FileUploadService.class.getSimpleName();
 
+    private static final String UPLOAD_START_MESSAGE = "UPLOAD_START";
     private static final String UPLOAD_FINISH_MESSAGE = "UPLOAD_FINISH";
     public static final String EXTRA_UPLOAD_RESULT = "RESULT";
     public static final String EXTRA_REMOTE_PATH = "REMOTE_PATH";
@@ -251,6 +252,10 @@ public class FileUploadService extends Service implements OnDatatransferProgress
     private static final String MIME_TYPE_PDF = "application/pdf";
     private static final String FILE_EXTENSION_PDF = ".pdf";
 
+    public static String getUploadStartMessage() {
+        return FileUploadService.class.getName() + UPLOAD_START_MESSAGE;
+    }
+
     public static String getUploadFinishMessage() {
         return FileUploadService.class.getName() + UPLOAD_FINISH_MESSAGE;
     }
@@ -1189,18 +1194,10 @@ public class FileUploadService extends Service implements OnDatatransferProgress
 
         mNotificationManager.notify(R.string.uploader_upload_in_progress_ticker, mNotificationBuilder.build());
 
-        updateDatabaseUploadStart(mCurrentUpload);
+        sendBroadcastUploadStarted(mCurrentUpload);
     }
 
-    /**
-     * Updates the persistent upload database that upload is in progress.
-     */
-    private void updateDatabaseUploadStart(UploadFileOperation upload) {
-        mUploadsStorageManager.updateUploadStatus(
-                upload.getOriginalStoragePath(),
-                UploadStatus.UPLOAD_IN_PROGRESS, null
-        );
-    }
+
 
     /**
      * Callback method to update the progress bar in the status notification
@@ -1393,6 +1390,35 @@ public class FileUploadService extends Service implements OnDatatransferProgress
 //        }
 //    }
 
+    /**
+     * Updates the persistent upload database that upload is in progress.
+     */
+    private void updateDatabaseUploadStart(UploadFileOperation upload) {
+        mUploadsStorageManager.updateUploadStatus(
+                upload.getOriginalStoragePath(),
+                UploadStatus.UPLOAD_IN_PROGRESS, null
+        );
+    }
+
+    /**
+     * Sends a broadcast in order to the interested activities can update their
+     * view
+     *
+     * @param upload                    Finished upload operation
+     */
+    private void sendBroadcastUploadStarted(
+            UploadFileOperation upload) {
+
+        Intent start = new Intent(getUploadStartMessage());
+        start.putExtra(EXTRA_REMOTE_PATH, upload.getRemotePath()); // real remote
+        start.putExtra(EXTRA_OLD_FILE_PATH, upload.getOriginalStoragePath());
+        start.putExtra(ACCOUNT_NAME, upload.getAccount().name);
+
+        updateDatabaseUploadStart(mCurrentUpload);
+
+        sendStickyBroadcast(start);
+    }
+
     /**
      * Sends a broadcast in order to the interested activities can update their
      * view
@@ -1427,6 +1453,7 @@ public class FileUploadService extends Service implements OnDatatransferProgress
         sendStickyBroadcast(end);
     }
 
+
     // TODO: Remove. Replace by sendBroadcastUploadFinished(UploadFileOperation, RemoteOperationResult, String)
 //    /**
 //     * Sends a broadcast in order to the interested activities can update their

src/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -1064,11 +1064,8 @@ public class FileDisplayActivity extends HookActivity implements
         @Override
         public void onReceive(Context context, Intent intent) {
             try {
-                String uploadedRemotePath = intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH);
+                String uploadedRemotePath = intent.getStringExtra(FileUploadService.EXTRA_REMOTE_PATH);
                 String accountName = intent.getStringExtra(FileUploadService.ACCOUNT_NAME);
-// On master
-//                String uploadedRemotePath = intent.getStringExtra(FileUploader.EXTRA_REMOTE_PATH);
-//                String accountName = intent.getStringExtra(FileUploader.ACCOUNT_NAME);
                 boolean sameAccount = getAccount() != null && accountName.equals(getAccount().name);
                 OCFile currentDir = getCurrentDir();
                 boolean isDescendant = (currentDir != null) && (uploadedRemotePath != null) &&

src/com/owncloud/android/ui/activity/UploadListActivity.java

@@ -19,15 +19,16 @@
  */
 package com.owncloud.android.ui.activity;
 
-import android.app.FragmentManager;
 import android.content.ActivityNotFoundException;
+import android.content.BroadcastReceiver;
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.ServiceConnection;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.view.GravityCompat;
 import android.view.Menu;
@@ -42,7 +43,6 @@ import com.owncloud.android.db.OCUpload;
 import com.owncloud.android.files.services.FileUploadService;
 import com.owncloud.android.files.services.FileUploadService.FileUploaderBinder;
 import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.ui.fragment.OCFileListFragment;
 import com.owncloud.android.ui.fragment.UploadListFragment;
 import com.owncloud.android.ui.preview.PreviewImageActivity;
 
@@ -60,6 +60,8 @@ public class UploadListActivity extends FileActivity implements UploadListFragme
 
     private static final String TAG_UPLOAD_LIST_FRAGMENT = "UPLOAD_LIST_FRAGMENT";
 
+    private UploadMessagesReceiver mUploadMessagesReceiver;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -67,12 +69,12 @@ public class UploadListActivity extends FileActivity implements UploadListFragme
         //Thread.setDefaultUncaughtExceptionHandler(new ExceptionHandler(this));
         setContentView(R.layout.upload_list_layout);
 
-        // Add fragment with a transaction for setting a tag
-        createUploadListFragment();
-
         // Navigation Drawer
         initDrawer();
 
+        // Add fragment with a transaction for setting a tag
+        createUploadListFragment();
+
         // enable ActionBar app icon to behave as action to toggle nav drawer
         getSupportActionBar().setHomeButtonEnabled(true);
         mDrawerToggle.setDrawerIndicatorEnabled(true);
@@ -87,6 +89,34 @@ public class UploadListActivity extends FileActivity implements UploadListFragme
         transaction.commit();
     }
 
+
+    @Override
+    protected void onResume() {
+        Log_OC.v(TAG, "onResume() start");
+        super.onResume();
+
+        // Listen for upload messages
+        mUploadMessagesReceiver = new UploadMessagesReceiver();
+        IntentFilter uploadIntentFilter = new IntentFilter();
+        uploadIntentFilter.addAction(FileUploadService.getUploadStartMessage());
+        uploadIntentFilter.addAction(FileUploadService.getUploadFinishMessage());
+        registerReceiver(mUploadMessagesReceiver, uploadIntentFilter);
+
+        Log_OC.v(TAG, "onResume() end");
+
+    }
+
+    @Override
+    protected void onPause() {
+        Log_OC.v(TAG, "onPause() start");
+        if (mUploadMessagesReceiver != null) {
+            unregisterReceiver(mUploadMessagesReceiver);
+            mUploadMessagesReceiver = null;
+        }
+        super.onPause();
+        Log_OC.v(TAG, "onPause() end");
+    }
+
     // ////////////////////////////////////////
     // UploadListFragment.ContainerActivity
     // ////////////////////////////////////////
@@ -236,4 +266,20 @@ public class UploadListActivity extends FileActivity implements UploadListFragme
         }
     };
 
+    /**
+     * Once the file upload has changed its status -> update uploads list view
+     */
+    private class UploadMessagesReceiver extends BroadcastReceiver {
+        /**
+         * {@link BroadcastReceiver} to enable syncing feedback in UI
+         */
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            UploadListFragment uploadListFragment =
+                    (UploadListFragment) getSupportFragmentManager().findFragmentByTag(TAG_UPLOAD_LIST_FRAGMENT);
+
+            uploadListFragment.updateUploads();
+
+        }
+    }
 }

src/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java

@@ -166,7 +166,6 @@ public class ExpandableUploadListAdapter extends BaseExpandableListAdapter imple
             view = inflator.inflate(R.layout.upload_list_item, null);
         }
 
-        view.invalidate();
 
         if (uploadsItems != null && uploadsItems.length > position) {
             final OCUpload upload = uploadsItems[position];
@@ -334,13 +333,13 @@ public class ExpandableUploadListAdapter extends BaseExpandableListAdapter imple
         for (UploadGroup group : mUploadGroups) {
             group.refresh();
         }
-        mParentActivity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                notifyDataSetChanged();
-            }
-        });
-
+//        mParentActivity.runOnUiThread(new Runnable() {
+//            @Override
+//            public void run() {
+//                notifyDataSetChanged();
+//            }
+//        });
+        notifyDataSetChanged();
     }
 
     @Override
@@ -349,6 +348,12 @@ public class ExpandableUploadListAdapter extends BaseExpandableListAdapter imple
         loadUploadItemsFromDb();
     }
 
+
+    public void refreshView() {
+        Log_OC.d(TAG, "refreshView");
+        loadUploadItemsFromDb();
+    }
+
     @Override
     public Object getChild(int groupPosition, int childPosition) {
         return mUploadGroups[(int) getGroupId(groupPosition)].items[childPosition];

src/com/owncloud/android/ui/fragment/UploadListFragment.java

@@ -215,4 +215,10 @@ public class UploadListFragment extends ExpandableListFragment {
         }
     }
 
+    public void updateUploads(){
+        if (mAdapter != null) {
+            mAdapter.refreshView();
+        }
+    }
+
 }