X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/df4d0355f25795914dd0fcb9d53a9113da047c15..cbdcf7d4572d90a76a4042ce6dbb3552e46b5fd0:/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 1b211079..be437db8 100644 --- a/src/com/owncloud/android/ui/activity/FileActivity.java +++ b/src/com/owncloud/android/ui/activity/FileActivity.java @@ -18,8 +18,6 @@ package com.owncloud.android.ui.activity; -import java.io.File; - import android.accounts.Account; import android.accounts.AccountManager; import android.accounts.AccountManagerCallback; @@ -54,7 +52,6 @@ import com.owncloud.android.operations.UnshareLinkOperation; import com.owncloud.android.services.OperationsService; import com.owncloud.android.services.OperationsService.OperationsServiceBinder; import com.owncloud.android.ui.dialog.LoadingDialog; -import com.owncloud.android.utils.FileStorageUtils; import com.owncloud.android.utils.Log_OC; @@ -154,22 +151,24 @@ public class FileActivity extends SherlockFragmentActivity implements OnRemoteOp @Override protected void onStart() { super.onStart(); + if (mAccountWasSet) { onAccountSet(mAccountWasRestored); } if (mOperationsServiceBinder != null) { mOperationsServiceBinder.addOperationListener(FileActivity.this, mHandler); } - } @Override protected void onStop() { - super.onStop(); + if (mOperationsServiceBinder != null) { mOperationsServiceBinder.removeOperationListener(this); } + + super.onStop(); } @@ -306,6 +305,11 @@ public class FileActivity extends SherlockFragmentActivity implements OnRemoteOp } + public OperationsServiceBinder getOperationsServiceBinder() { + return mOperationsServiceBinder; + } + + /** * Helper class handling a callback from the {@link AccountManager} after the creation of * a new ownCloud {@link Account} finished, successfully or not. @@ -380,7 +384,7 @@ public class FileActivity extends SherlockFragmentActivity implements OnRemoteOp public FileOperationsHelper getFileOperationsHelper() { return mFileOperationsHelper; } - + /** * * @param operation Removal operation performed. @@ -496,23 +500,6 @@ public class FileActivity extends SherlockFragmentActivity implements OnRemoteOp // TODO whatever could be waiting for the service is unbound } } - } - - - @Override - protected void onActivityResult(int requestCode, int resultCode, Intent data) { - super.onActivityResult(requestCode, resultCode, data); - - Log_OC.d(TAG, "requestCode " + String.valueOf(requestCode) ); - if (requestCode == FileOperationsHelper.REQUEST_CODE_FILE_OPEN_HELPER) { - // Remove "send" folder - File folder = new File(FileStorageUtils.getTemporalPath(getAccount().name) + "/send"); - if (folder.exists()) { - FileStorageUtils.deleteFolder(folder); - } - } - - }; - - + }; + }