From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 11 Oct 2012 09:40:15 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into cancel_in_upload
X-Git-Tag: oc-android-1.4.3~155
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b0ab3ce0872d2702e82b5979dddaa5a897be340b?hp=-c

Merge remote-tracking branch 'origin/master' into cancel_in_upload

Conflicts:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
---

b0ab3ce0872d2702e82b5979dddaa5a897be340b
diff --combined src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index b3202976,3d8f22cf..b6393a51
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@@ -69,7 -69,6 +69,7 @@@ import com.owncloud.android.datamodel.O
  import com.owncloud.android.files.services.FileDownloader;
  import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
  import com.owncloud.android.files.services.FileUploader;
 +import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
  import com.owncloud.android.network.OwnCloudClientUtils;
  import com.owncloud.android.syncadapter.FileSyncService;
  import com.owncloud.android.ui.fragment.FileDetailFragment;
@@@ -97,8 -96,6 +97,8 @@@ public class FileDisplayActivity extend
      private UploadFinishReceiver mUploadFinishReceiver;
      private DownloadFinishReceiver mDownloadFinishReceiver;
      private FileDownloaderBinder mDownloaderBinder = null;
 +    private FileUploaderBinder mUploaderBinder = null;
 +    private ServiceConnection mDownloadConnection = null, mUploadConnection = null;
      
      private OCFileListFragment mFileList;
      
@@@ -143,10 -140,7 +143,10 @@@
              
          }
          
 -        bindService(new Intent(this, FileDownloader.class), mConnection, Context.BIND_AUTO_CREATE);
 +        mUploadConnection = new ListServiceConnection(); 
 +        mDownloadConnection = new ListServiceConnection();
 +        bindService(new Intent(this, FileUploader.class), mUploadConnection, Context.BIND_AUTO_CREATE);
 +        bindService(new Intent(this, FileDownloader.class), mDownloadConnection, Context.BIND_AUTO_CREATE);
  
          // PIN CODE request ;  best location is to decide, let's try this first
          if (getIntent().getAction() != null && getIntent().getAction().equals(Intent.ACTION_MAIN) && savedInstanceState == null) {
@@@ -249,10 -243,7 +249,10 @@@
      @Override
      public void onDestroy() {
          super.onDestroy();
 -        unbindService(mConnection);
 +        if (mDownloadConnection != null)
 +            unbindService(mDownloadConnection);
 +        if (mUploadConnection != null)
 +            unbindService(mUploadConnection);
      }
  
      
@@@ -941,50 -932,27 +941,50 @@@
      public FileDownloaderBinder getFileDownloaderBinder() {
          return mDownloaderBinder;
      }
 +
 +    
 +    /**
 +     * {@inheritDoc}
 +     */
 +    @Override
 +    public FileUploaderBinder getFileUploaderBinder() {
 +        return mUploaderBinder;
 +    }
      
      
      /** Defines callbacks for service binding, passed to bindService() */
 -    private ServiceConnection mConnection = new ServiceConnection() {
 +    private class ListServiceConnection implements ServiceConnection {
  
          @Override
 -        public void onServiceConnected(ComponentName className, IBinder service) {
 -            mDownloaderBinder = (FileDownloaderBinder) service;
 -            // a new chance to get the mDownloadBinder through getDownloadBinder() - THIS IS A MESS
 +        public void onServiceConnected(ComponentName component, IBinder service) {
 +            if (component.equals(new ComponentName(FileDisplayActivity.this, FileDownloader.class))) {
 +                Log.d(TAG, "Download service connected");
 +                mDownloaderBinder = (FileDownloaderBinder) service;
 +            } else if (component.equals(new ComponentName(FileDisplayActivity.this, FileUploader.class))) {
 +                Log.d(TAG, "Upload service connected");
 +                mUploaderBinder = (FileUploaderBinder) service;
 +            } else {
 +                return;
 +            }
 +            // a new chance to get the mDownloadBinder through getFileDownloadBinder() - THIS IS A MESS
-             mFileList.listDirectory();
+             if (mFileList != null)
+                 mFileList.listDirectory();
              if (mDualPane) {
                  FileDetailFragment fragment = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
                  if (fragment != null)
                      fragment.updateFileDetails();
              }
-             
          }
  
          @Override
 -        public void onServiceDisconnected(ComponentName arg0) {
 -            mDownloaderBinder = null;
 +        public void onServiceDisconnected(ComponentName component) {
 +            if (component.equals(new ComponentName(FileDisplayActivity.this, FileDownloader.class))) {
 +                Log.d(TAG, "Download service disconnected");
 +                mDownloaderBinder = null;
 +            } else if (component.equals(new ComponentName(FileDisplayActivity.this, FileUploader.class))) {
 +                Log.d(TAG, "Upload service disconnected");
 +                mUploaderBinder = null;
 +            }
          }
      };