Fixed minor bugs inserted in clean-up

[pub/Android/ownCloud.git] / src / com / owncloud / android / syncadapter / FileSyncAdapter.java

diff --git a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
index 4eafeac..c3370f2 100644 (file)
--- a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
+++ b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application\r
  *   Copyright (C) 2011  Bartek Przybylski\r
 /* ownCloud Android client application\r
  *   Copyright (C) 2011  Bartek Przybylski\r

+ *   Copyright (C) 2012-2013 ownCloud Inc.\r

  *\r
  *   This program is free software: you can redistribute it and/or modify\r
  *   it under the terms of the GNU General Public License as published by\r
  *\r
  *   This program is free software: you can redistribute it and/or modify\r
  *   it under the terms of the GNU General Public License as published by\r

- *   the Free Software Foundation, either version 3 of the License, or\r
+ *   the Free Software Foundation, either version 2 of the License, or\r

  *   (at your option) any later version.\r
  *\r
  *   This program is distributed in the hope that it will be useful,\r
  *   (at your option) any later version.\r
  *\r
  *   This program is distributed in the hope that it will be useful,\r


@@ -27,6 +28,7 @@ import java.util.Map;
 import org.apache.jackrabbit.webdav.DavException;\r
 \r
 import com.owncloud.android.R;\r
 import org.apache.jackrabbit.webdav.DavException;\r
 \r
 import com.owncloud.android.R;\r

+import com.owncloud.android.authentication.AuthenticatorActivity;\r

 import com.owncloud.android.datamodel.DataStorageManager;\r
 import com.owncloud.android.datamodel.FileDataStorageManager;\r
 import com.owncloud.android.datamodel.OCFile;\r
 import com.owncloud.android.datamodel.DataStorageManager;\r
 import com.owncloud.android.datamodel.FileDataStorageManager;\r
 import com.owncloud.android.datamodel.OCFile;\r


@@ -34,7 +36,6 @@ import com.owncloud.android.operations.RemoteOperationResult;
 import com.owncloud.android.operations.SynchronizeFolderOperation;\r
 import com.owncloud.android.operations.UpdateOCVersionOperation;\r
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;\r
 import com.owncloud.android.operations.SynchronizeFolderOperation;\r
 import com.owncloud.android.operations.UpdateOCVersionOperation;\r
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;\r

-import com.owncloud.android.ui.activity.AuthenticatorActivity;\r

 import com.owncloud.android.ui.activity.ErrorsWhileCopyingHandlerActivity;\r
 \r
 import android.accounts.Account;\r
 import com.owncloud.android.ui.activity.ErrorsWhileCopyingHandlerActivity;\r
 \r
 import android.accounts.Account;\r


@@ -315,7 +316,6 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
                     getContext().getString(R.string.sync_fail_ticker), \r
                     String.format(getContext().getString(R.string.sync_fail_content_unauthorized), getAccount().name), \r
                     notification.contentIntent);\r
                     getContext().getString(R.string.sync_fail_ticker), \r
                     String.format(getContext().getString(R.string.sync_fail_content_unauthorized), getAccount().name), \r
                     notification.contentIntent);\r

-            Log.e(TAG, "NEEDS TO UPDATE CREDENTIALS");\r

         } else {\r
             notification.setLatestEventInfo(getContext().getApplicationContext(), \r
                     getContext().getString(R.string.sync_fail_ticker), \r
         } else {\r
             notification.setLatestEventInfo(getContext().getApplicationContext(), \r
                     getContext().getString(R.string.sync_fail_ticker), \r