projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Copyright note fixes
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
files
/
services
/
InstantUploadService.java
diff --git
a/src/com/owncloud/android/files/services/InstantUploadService.java
b/src/com/owncloud/android/files/services/InstantUploadService.java
index
8ebcef4
..
3c1a703
100644
(file)
--- a/
src/com/owncloud/android/files/services/InstantUploadService.java
+++ b/
src/com/owncloud/android/files/services/InstantUploadService.java
@@
-3,9
+3,8
@@
* Copyright (C) 2012-2013 ownCloud Inc.
*
* This program is free software: you can redistribute it and/or modify
* Copyright (C) 2012-2013 ownCloud Inc.
*
* This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-23,16
+22,16
@@
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.LinkedList;
import java.util.List;
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.utils.FileStorageUtils;
+import com.owncloud.android.network.OwnCloudClientUtils;
+
+import eu.alefzero.webdav.WebdavClient;
+
import android.accounts.Account;
import android.app.Service;
import android.content.Intent;
import android.os.IBinder;
import android.accounts.Account;
import android.app.Service;
import android.content.Intent;
import android.os.IBinder;
-import android.util.Log;
-
-import com.owncloud.android.network.OwnCloudClientUtils;
-import com.owncloud.android.utils.FileStorageUtils;
-
-import eu.alefzero.webdav.WebdavClient;
public class InstantUploadService extends Service {
public class InstantUploadService extends Service {
@@
-57,7
+56,7
@@
public class InstantUploadService extends Service {
if (intent == null || !intent.hasExtra(KEY_ACCOUNT) || !intent.hasExtra(KEY_DISPLAY_NAME)
|| !intent.hasExtra(KEY_FILE_PATH) || !intent.hasExtra(KEY_FILE_SIZE)
|| !intent.hasExtra(KEY_MIME_TYPE)) {
if (intent == null || !intent.hasExtra(KEY_ACCOUNT) || !intent.hasExtra(KEY_DISPLAY_NAME)
|| !intent.hasExtra(KEY_FILE_PATH) || !intent.hasExtra(KEY_FILE_SIZE)
|| !intent.hasExtra(KEY_MIME_TYPE)) {
- Log.w(TAG, "Not all required information was provided, abording");
+ Log
_OC
.w(TAG, "Not all required information was provided, abording");
return Service.START_NOT_STICKY;
}
return Service.START_NOT_STICKY;
}
@@
-75,7
+74,7
@@
public class InstantUploadService extends Service {
// starting new thread for new download doesnt seems like a good idea
// maybe some thread pool or single background thread would be better
// starting new thread for new download doesnt seems like a good idea
// maybe some thread pool or single background thread would be better
- Log.d(TAG, "Starting instant upload thread");
+ Log
_OC
.d(TAG, "Starting instant upload thread");
new Thread(mUploaderRunnable).start();
return Service.START_STICKY;
new Thread(mUploaderRunnable).start();
return Service.START_STICKY;