From: David A. Velasco Date: Tue, 11 Feb 2014 13:57:37 +0000 (+0100) Subject: Fixed release of connection between FileActivity and OperationService X-Git-Tag: oc-android-1.5.5~48^2~10 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/cae7744ae1ba3790218ce6558227391214c73423 Fixed release of connection between FileActivity and OperationService --- diff --git a/src/com/owncloud/android/operations/CreateShareOperation.java b/src/com/owncloud/android/operations/CreateShareOperation.java index bf462a2c..7b646533 100644 --- a/src/com/owncloud/android/operations/CreateShareOperation.java +++ b/src/com/owncloud/android/operations/CreateShareOperation.java @@ -92,12 +92,10 @@ public class CreateShareOperation extends SyncOperation { OCShare share = (OCShare) result.getData().get(0); // Update DB with the response + share.setPath(mPath); if (mPath.endsWith(FileUtils.PATH_SEPARATOR)) { - share.setPath(mPath.substring(0, mPath.length()-1)); share.setIsFolder(true); - } else { - share.setPath(mPath); share.setIsFolder(false); } share.setPermissions(mPermissions); diff --git a/src/com/owncloud/android/services/OperationsService.java b/src/com/owncloud/android/services/OperationsService.java index 6ff7c6a8..53befed5 100644 --- a/src/com/owncloud/android/services/OperationsService.java +++ b/src/com/owncloud/android/services/OperationsService.java @@ -141,7 +141,7 @@ public class OperationsService extends Service { } mPendingOperations.add(new Pair(target, operation)); - sendBroadcastNewOperation(target, operation); + //sendBroadcastNewOperation(target, operation); Message msg = mServiceHandler.obtainMessage(); msg.arg1 = startId; @@ -324,7 +324,7 @@ public class OperationsService extends Service { } } - sendBroadcastOperationFinished(mLastTarget, mCurrentOperation, result); + //sendBroadcastOperationFinished(mLastTarget, mCurrentOperation, result); callbackOperationListeners(mLastTarget, mCurrentOperation, result); } } diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java index ca9d8d30..28f78750 100644 --- 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(); - if (mOperationsServiceBinder != null) { - mOperationsServiceBinder.removeOperationListener(this); - mOperationsServiceBinder = null; - } } @Override protected void onDestroy() { super.onDestroy(); - if (mOperationsServiceConnection != null) + if (mOperationsServiceConnection != null) { + if (mOperationsServiceBinder != null) { + mOperationsServiceBinder.removeOperationListener(this); + mOperationsServiceBinder = null; + } unbindService(mOperationsServiceConnection); + } }