X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/3ce234e6c7858443738b71bd74dba4f754ce13a1..a50d17dcb60db5c2db5cb9e9e6ed1af64dca404b:/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java

diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index e8f9151e..07ca6f53 100644
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -45,6 +45,7 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.ActionBar.OnNavigationListener;
@@ -61,6 +62,7 @@ import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
 import eu.alefzero.owncloud.datamodel.DataStorageManager;
 import eu.alefzero.owncloud.datamodel.FileDataStorageManager;
 import eu.alefzero.owncloud.datamodel.OCFile;
+import eu.alefzero.owncloud.files.services.FileDownloader;
 import eu.alefzero.owncloud.files.services.FileUploader;
 import eu.alefzero.owncloud.syncadapter.FileSyncService;
 import eu.alefzero.owncloud.ui.fragment.FileDetailFragment;
@@ -82,7 +84,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     private String[] mDirs = null;
 
     private DataStorageManager mStorageManager;
-    private SyncBroadcastReceiver syncBroadcastReceiver;
+    private SyncBroadcastReceiver mSyncBroadcastReceiver;
+    private UploadFinishReceiver mUploadFinishReceiver;
     
     private View mLayoutView = null;
     private FileListFragment mFileList;
@@ -300,8 +303,13 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 
             // Listen for sync messages
             IntentFilter syncIntentFilter = new IntentFilter(FileSyncService.SYNC_MESSAGE);
-            syncBroadcastReceiver = new SyncBroadcastReceiver();
-            registerReceiver(syncBroadcastReceiver, syncIntentFilter);
+            mSyncBroadcastReceiver = new SyncBroadcastReceiver();
+            registerReceiver(mSyncBroadcastReceiver, syncIntentFilter);
+            
+            // Listen for upload messages
+            IntentFilter uploadIntentFilter = new IntentFilter(FileUploader.UPLOAD_FINISH_MESSAGE);
+            mUploadFinishReceiver = new UploadFinishReceiver();
+            registerReceiver(mUploadFinishReceiver, uploadIntentFilter);
         
             // Storage manager initialization
             mStorageManager = new FileDataStorageManager(
@@ -374,9 +382,13 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     protected void onPause() {
         Log.i(getClass().toString(), "onPause() start");
         super.onPause();
-        if (syncBroadcastReceiver != null) {
-            unregisterReceiver(syncBroadcastReceiver);
-            syncBroadcastReceiver = null;
+        if (mSyncBroadcastReceiver != null) {
+            unregisterReceiver(mSyncBroadcastReceiver);
+            mSyncBroadcastReceiver = null;
+        }
+        if (mUploadFinishReceiver != null) {
+            unregisterReceiver(mUploadFinishReceiver);
+            mUploadFinishReceiver = null;
         }
         getIntent().putExtra(FileDetailFragment.EXTRA_FILE, mCurrentDir);
         Log.i(getClass().toString(), "onPause() end");
@@ -548,8 +560,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     
         @Override
         public void run() {
-            WebdavClient wdc = new WebdavClient(Uri.parse(mAm.getUserData(
-                    mAccount, AccountAuthenticator.KEY_OC_URL)));
+            WebdavClient wdc = new WebdavClient(mAccount, getApplicationContext());
     
             String username = mAccount.name.substring(0,
                     mAccount.name.lastIndexOf('@'));
@@ -602,6 +613,21 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             Log.d("FileDisplay", "sync of account " + account_name
                     + " is in_progress: " + inProgress);
             setSupportProgressBarIndeterminateVisibility(inProgress);
+            
+            long OCDirId = intent.getLongExtra(FileSyncService.SYNC_FOLDER, -1);
+            if (OCDirId > 0) {
+                OCFile syncDir = mStorageManager.getFileById(OCDirId);
+                if (syncDir != null && (
+                        (mCurrentDir == null && syncDir.getFileName().equals("/")) ||
+                         syncDir.equals(mCurrentDir))
+                    ) {
+                    FileListFragment fileListFragment = (FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);
+                    if (fileListFragment != null) { 
+                        fileListFragment.listDirectory();
+                    }
+                }
+            }
+            
             if (!inProgress) {
                 FileListFragment fileListFragment = (FileListFragment) getSupportFragmentManager()
                         .findFragmentById(R.id.fileList);
@@ -611,7 +637,33 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         }
 
     }
+    
+
+    private class UploadFinishReceiver extends BroadcastReceiver {
+        /**
+         * Once the file upload has finished -> update view
+         *  @author David A. Velasco
+         * {@link BroadcastReceiver} to enable upload feedback in UI
+         */
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            long parentDirId = intent.getLongExtra(FileUploader.EXTRA_PARENT_DIR_ID, -1);
+            OCFile parentDir = mStorageManager.getFileById(parentDirId);
+            
+            if (parentDir != null && (
+                    (mCurrentDir == null && parentDir.getFileName().equals("/")) ||
+                     parentDir.equals(mCurrentDir))
+                ) {
+                FileListFragment fileListFragment = (FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);
+                if (fileListFragment != null) { 
+                    fileListFragment.listDirectory();
+                }
+            }
+        }
+        
+    }
 
+    
     @Override
     public void onClick(View v) {
         if (v.getId() == R.id.setup_account) {