mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 17:46:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fixed release of connection between FileActivity and OperationService

Browse source
This commit is contained in:
David A. Velasco 2014-02-11 14:57:37 +01:00
parent 04f5cf170f
commit cae7744ae1
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/com/owncloud/android/operations/CreateShareOperation.java
View file

@ -92,12 +92,10 @@ public class CreateShareOperation extends SyncOperation {
OCShare share = (OCShare) result.getData().get(0);
// Update DB with the response
if (mPath.endsWith(FileUtils.PATH_SEPARATOR)) {
share.setPath(mPath.substring(0, mPath.length()-1));
share.setIsFolder(true);
} else {
share.setPath(mPath);
if (mPath.endsWith(FileUtils.PATH_SEPARATOR)) {
share.setIsFolder(true);
} else {
share.setIsFolder(false);
}
share.setPermissions(mPermissions);

4
src/com/owncloud/android/services/OperationsService.java
View file

@ -141,7 +141,7 @@ public class OperationsService extends Service {
}
mPendingOperations.add(new Pair<Target , RemoteOperation>(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);
}
}

11
src/com/owncloud/android/ui/activity/FileActivity.java
View file

@ -160,19 +160,20 @@ 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);
}
}
/**