HotFix to add Send File option, after PR#311

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / FileActivity.java

diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java
index 894739d..dc3ad0d 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileActivity.java
@@ -156,9 +156,6 @@ public class FileActivity extends SherlockFragmentActivity implements OnRemoteOp
         }
         if (mOperationsServiceBinder != null) {
             mOperationsServiceBinder.addOperationListener(FileActivity.this, mHandler);
         }
         if (mOperationsServiceBinder != null) {
             mOperationsServiceBinder.addOperationListener(FileActivity.this, mHandler);

-            if (!mOperationsServiceBinder.isPerformingBlockingOperation()) {
-                dismissLoadingDialog();
-            }

         }
     }
     
         }
     }
     


@@ -168,7 +165,6 @@ public class FileActivity extends SherlockFragmentActivity implements OnRemoteOp
         super.onStop();
         if (mOperationsServiceBinder != null) {
             mOperationsServiceBinder.removeOperationListener(this);
         super.onStop();
         if (mOperationsServiceBinder != null) {
             mOperationsServiceBinder.removeOperationListener(this);

-            mOperationsServiceBinder = null;

         }
     }
     
         }
     }
     


@@ -178,6 +174,7 @@ public class FileActivity extends SherlockFragmentActivity implements OnRemoteOp
         super.onDestroy();
         if (mOperationsServiceConnection != null) {
             unbindService(mOperationsServiceConnection);
         super.onDestroy();
         if (mOperationsServiceConnection != null) {
             unbindService(mOperationsServiceConnection);

+            mOperationsServiceBinder = null;

         }
     }
     
         }
     }