X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/49849786e5164692481917bcc91e81264c7ac01d..ec6b9d7c70deb50152bfab5cb5f25c9a2dde28e7:/src/com/owncloud/android/files/services/FileUploader.java diff --git a/src/com/owncloud/android/files/services/FileUploader.java b/src/com/owncloud/android/files/services/FileUploader.java index acbc405d..6f77a9c1 100644 --- a/src/com/owncloud/android/files/services/FileUploader.java +++ b/src/com/owncloud/android/files/services/FileUploader.java @@ -161,7 +161,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe @Override public void onCreate() { super.onCreate(); - Log_OC.i(TAG, "mPendingUploads size:" + mPendingUploads.size()); + Log_OC.d(TAG, "Creating service"); mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE); HandlerThread thread = new HandlerThread("FileUploaderThread", Process.THREAD_PRIORITY_BACKGROUND); thread.start(); @@ -171,6 +171,21 @@ public class FileUploader extends Service implements OnDatatransferProgressListe } /** + * Service clean up + */ + @Override + public void onDestroy() { + Log_OC.v(TAG, "Destroying service" ); + mBinder = null; + mServiceHandler = null; + mServiceLooper.quit(); + mServiceLooper = null; + mNotificationManager = null; + super.onDestroy(); + } + + + /** * Entry point to add one or several files to the queue of uploads. * * New uploads are added calling to startService(), resulting in a call to @@ -179,6 +194,8 @@ public class FileUploader extends Service implements OnDatatransferProgressListe */ @Override public int onStartCommand(Intent intent, int flags, int startId) { + Log_OC.d(TAG, "Starting command with id " + startId); + if (!intent.hasExtra(KEY_ACCOUNT) || !intent.hasExtra(KEY_UPLOAD_TYPE) || !(intent.hasExtra(KEY_LOCAL_FILE) || intent.hasExtra(KEY_FILE))) { Log_OC.e(TAG, "Not enough information provided in intent"); @@ -372,10 +389,9 @@ public class FileUploader extends Service implements OnDatatransferProgressListe * * If 'file' is a directory, returns 'true' if some of its descendant files is uploading or waiting to upload. * - * @param account Owncloud account where the remote file will be stored. - * @param file A file that could be in the queue of pending uploads + * @param account ownCloud account where the remote file will be stored. + * @param file A file that could be in the queue of pending uploads */ - /* public boolean isUploading(Account account, OCFile file) { if (account == null || file == null) return false; @@ -394,7 +410,6 @@ public class FileUploader extends Service implements OnDatatransferProgressListe } } } - */ /** @@ -469,6 +484,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe mService.uploadFile(it.next()); } } + Log_OC.d(TAG, "Stopping command after id " + msg.arg1); mService.stopSelf(msg.arg1); } }