OC-2887: Fix bug, refresh share icon, share menu refresh

[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 ca9d8d3..28f7875 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileActivity.java
@@ -160,18 +160,19 @@ public class FileActivity extends SherlockFragmentActivity implements OnRemoteOp
     @Override 
     protected void onStop() {
         super.onStop();
     @Override 
     protected void onStop() {
         super.onStop();

-        if (mOperationsServiceBinder != null) {
-            mOperationsServiceBinder.removeOperationListener(this);
-            mOperationsServiceBinder = null;
-        }

     }
     
     
     @Override
     protected void onDestroy() {
         super.onDestroy();
     }
     
     
     @Override
     protected void onDestroy() {
         super.onDestroy();

-        if (mOperationsServiceConnection != null)
+        if (mOperationsServiceConnection != null) {
+            if (mOperationsServiceBinder != null) {
+                mOperationsServiceBinder.removeOperationListener(this);
+                mOperationsServiceBinder = null;
+            }

             unbindService(mOperationsServiceConnection);
             unbindService(mOperationsServiceConnection);

+        }

     }
     
     
     }