X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/a4ba6170ea7696e085b07adfef73eeb8b77cb8e2..7382fa84b046ebdd7fd79334ace16553b0bffc09:/src/com/owncloud/android/ui/activity/FileDetailActivity.java

diff --git a/src/com/owncloud/android/ui/activity/FileDetailActivity.java b/src/com/owncloud/android/ui/activity/FileDetailActivity.java
index 3c80a48d..ff39022b 100644
--- a/src/com/owncloud/android/ui/activity/FileDetailActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDetailActivity.java
@@ -20,9 +20,13 @@ package com.owncloud.android.ui.activity;
 import android.accounts.Account;
 import android.app.Dialog;
 import android.app.ProgressDialog;
+import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
+import android.content.ServiceConnection;
 import android.content.res.Configuration;
 import android.os.Bundle;
+import android.os.IBinder;
 import android.support.v4.app.FragmentTransaction;
 
 import com.actionbarsherlock.app.ActionBar;
@@ -30,6 +34,7 @@ import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.view.MenuItem;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileDownloader;
+import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.ui.fragment.FileDetailFragment;
 
 import com.owncloud.android.R;
@@ -46,6 +51,8 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File
     public static final int DIALOG_SHORT_WAIT = 0;
     
     private boolean mConfigurationChangedToLandscape = false;
+    private FileDownloaderBinder mDownloaderBinder = null;
+    private ServiceConnection mConnection = null;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -58,13 +65,16 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File
                                            );
 
         if (!mConfigurationChangedToLandscape) {
+            mConnection = new DetailsServiceConnection();
+            bindService(new Intent(this, FileDownloader.class), mConnection, Context.BIND_AUTO_CREATE);
+            
             setContentView(R.layout.file_activity_details);
         
             ActionBar actionBar = getSupportActionBar();
             actionBar.setDisplayHomeAsUpEnabled(true);
-        
+
             OCFile file = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE);
-            Account account = getIntent().getParcelableExtra(FileDownloader.EXTRA_ACCOUNT);
+            Account account = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_ACCOUNT);
             FileDetailFragment mFileDetail = new FileDetailFragment(file, account);
         
             FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
@@ -77,8 +87,37 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File
         
         
     }
+    
+    
+    /** Defines callbacks for service binding, passed to bindService() */
+    private class DetailsServiceConnection implements ServiceConnection {
+
+        @Override
+        public void onServiceConnected(ComponentName className, IBinder service) {
+            mDownloaderBinder = (FileDownloaderBinder) service;
+            FileDetailFragment fragment = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
+            if (fragment != null)
+                fragment.updateFileDetails();   // let the fragment gets the mDownloadBinder through getDownloadBinder() (see FileDetailFragment#updateFileDetais())
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName arg0) {
+            mDownloaderBinder = null;
+        }
+    };    
+    
 
     @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (mConnection != null) {
+            unbindService(mConnection);
+            mConnection = null;
+        }
+    }
+    
+    
+    @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         boolean returnValue = false;
         
@@ -108,6 +147,7 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File
         Intent intent = new Intent(this, FileDisplayActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         intent.putExtra(FileDetailFragment.EXTRA_FILE, getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE));
+        intent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, getIntent().getParcelableExtra(FileDetailFragment.EXTRA_ACCOUNT));
         startActivity(intent);
         finish();
     }
@@ -141,4 +181,13 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File
         // nothing to do here!
     }
 
+    
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public FileDownloaderBinder getFileDownloaderBinder() {
+        return mDownloaderBinder;
+    }
+    
 }