projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
685c265
)
Clean some import warnings
author
masensio
<masensio@solidgear.es>
Thu, 19 Dec 2013 08:30:27 +0000
(09:30 +0100)
committer
masensio
<masensio@solidgear.es>
Thu, 19 Dec 2013 08:30:27 +0000
(09:30 +0100)
oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/DownloadFileTest.java
patch
|
blob
|
blame
|
history
src/com/owncloud/android/syncadapter/ContactSyncAdapter.java
patch
|
blob
|
blame
|
history
src/com/owncloud/android/syncadapter/FileSyncAdapter.java
patch
|
blob
|
blame
|
history
src/com/owncloud/android/syncadapter/FileSyncService.java
patch
|
blob
|
blame
|
history
diff --git
a/oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/DownloadFileTest.java
b/oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/DownloadFileTest.java
index
74cfb40
..
040deec
100644
(file)
--- a/
oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/DownloadFileTest.java
+++ b/
oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/DownloadFileTest.java
@@
-25,7
+25,6
@@
import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
import com.owncloud.android.oc_framework_test_project.TestActivity;
import android.test.ActivityInstrumentationTestCase2;
import com.owncloud.android.oc_framework_test_project.TestActivity;
import android.test.ActivityInstrumentationTestCase2;
-import android.util.Log;
/**
* Class to test Download File Operation
/**
* Class to test Download File Operation
@@
-35,7
+34,6
@@
import android.util.Log;
public class DownloadFileTest extends ActivityInstrumentationTestCase2<TestActivity> {
public class DownloadFileTest extends ActivityInstrumentationTestCase2<TestActivity> {
- private final String TAG = DownloadFileTest.class.getSimpleName();
/* Files to download. These files must exist on the account */
private final String mRemoteFilePng = "/fileToDownload.png";
/* Files to download. These files must exist on the account */
private final String mRemoteFilePng = "/fileToDownload.png";
diff --git
a/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java
b/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java
index
9bf5d83
..
db7f4c2
100644
(file)
--- a/
src/com/owncloud/android/syncadapter/ContactSyncAdapter.java
+++ b/
src/com/owncloud/android/syncadapter/ContactSyncAdapter.java
@@
-24,7
+24,6
@@
import java.io.IOException;
import org.apache.http.client.methods.HttpPut;
import org.apache.http.entity.ByteArrayEntity;
import org.apache.http.client.methods.HttpPut;
import org.apache.http.entity.ByteArrayEntity;
-import com.owncloud.android.authentication.AccountAuthenticator;
import com.owncloud.android.authentication.AccountUtils;
import com.owncloud.android.oc_framework.accounts.OwnCloudAccount;
import com.owncloud.android.authentication.AccountUtils;
import com.owncloud.android.oc_framework.accounts.OwnCloudAccount;
diff --git
a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
index
e7867e2
..
058cfbc
100644
(file)
--- a/
src/com/owncloud/android/syncadapter/FileSyncAdapter.java
+++ b/
src/com/owncloud/android/syncadapter/FileSyncAdapter.java
@@
-26,7
+26,6
@@
import java.util.Map;
import org.apache.jackrabbit.webdav.DavException;
import org.apache.jackrabbit.webdav.DavException;
-import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.authentication.AuthenticatorActivity;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.R;
import com.owncloud.android.authentication.AuthenticatorActivity;
import com.owncloud.android.datamodel.FileDataStorageManager;
@@
-323,8
+322,8
@@
public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
private void fetchChildren(OCFile parent, List<OCFile> files, boolean parentEtagChanged) {
int i;
OCFile newFile = null;
private void fetchChildren(OCFile parent, List<OCFile> files, boolean parentEtagChanged) {
int i;
OCFile newFile = null;
- String etag = null;
- boolean syncDown = false;
+
//
String etag = null;
+
//
boolean syncDown = false;
for (i=0; i < files.size() && !mCancellation; i++) {
newFile = files.get(i);
if (newFile.isFolder()) {
for (i=0; i < files.size() && !mCancellation; i++) {
newFile = files.get(i);
if (newFile.isFolder()) {
diff --git
a/src/com/owncloud/android/syncadapter/FileSyncService.java
b/src/com/owncloud/android/syncadapter/FileSyncService.java
index
1e1e11f
..
9ae051c
100644
(file)
--- a/
src/com/owncloud/android/syncadapter/FileSyncService.java
+++ b/
src/com/owncloud/android/syncadapter/FileSyncService.java
@@
-17,8
+17,6
@@
*/
\r
package com.owncloud.android.syncadapter;
\r
\r
*/
\r
package com.owncloud.android.syncadapter;
\r
\r
-import com.owncloud.android.utils.Log_OC;
\r
-
\r
import android.app.Service;
\r
import android.content.Intent;
\r
import android.os.IBinder;
\r
import android.app.Service;
\r
import android.content.Intent;
\r
import android.os.IBinder;
\r