From 79ebc75dfa4f0619b9eeccda7b1a32deed264ba2 Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Wed, 13 Nov 2013 11:17:30 +0100 Subject: [PATCH] Moved some classes from root package to .utils --- AndroidManifest.xml | 2 +- src/com/owncloud/android/authentication/AccountAuthenticator.java | 2 +- src/com/owncloud/android/authentication/AuthenticatorActivity.java | 2 +- src/com/owncloud/android/authentication/SsoWebViewClient.java | 2 +- src/com/owncloud/android/datamodel/FileDataStorageManager.java | 2 +- src/com/owncloud/android/datamodel/OCFile.java | 2 +- src/com/owncloud/android/db/DbHandler.java | 2 +- src/com/owncloud/android/files/BootupBroadcastReceiver.java | 2 +- src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java | 2 +- src/com/owncloud/android/files/OwnCloudFileObserver.java | 2 +- src/com/owncloud/android/files/services/FileDownloader.java | 2 +- src/com/owncloud/android/files/services/FileObserverService.java | 2 +- src/com/owncloud/android/files/services/FileUploader.java | 2 +- src/com/owncloud/android/media/MediaService.java | 2 +- src/com/owncloud/android/media/MediaServiceBinder.java | 2 +- .../owncloud/android/operations/ChunkedUploadFileOperation.java | 2 +- src/com/owncloud/android/operations/CreateFolderOperation.java | 2 +- src/com/owncloud/android/operations/DownloadFileOperation.java | 2 +- src/com/owncloud/android/operations/ExistenceCheckOperation.java | 2 +- src/com/owncloud/android/operations/OAuth2GetAccessToken.java | 2 +- .../owncloud/android/operations/OwnCloudServerCheckOperation.java | 2 +- src/com/owncloud/android/operations/RemoveFileOperation.java | 2 +- src/com/owncloud/android/operations/RenameFileOperation.java | 2 +- src/com/owncloud/android/operations/SynchronizeFileOperation.java | 2 +- .../owncloud/android/operations/SynchronizeFolderOperation.java | 2 +- src/com/owncloud/android/operations/UpdateOCVersionOperation.java | 2 +- src/com/owncloud/android/operations/UploadFileOperation.java | 2 +- src/com/owncloud/android/providers/FileContentProvider.java | 2 +- src/com/owncloud/android/syncadapter/FileSyncAdapter.java | 2 +- src/com/owncloud/android/syncadapter/FileSyncService.java | 2 +- src/com/owncloud/android/ui/activity/AccountSelectActivity.java | 2 +- src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java | 2 +- .../android/ui/activity/ErrorsWhileCopyingHandlerActivity.java | 2 +- src/com/owncloud/android/ui/activity/FileActivity.java | 2 +- src/com/owncloud/android/ui/activity/FileDisplayActivity.java | 2 +- src/com/owncloud/android/ui/activity/InstantUploadActivity.java | 2 +- src/com/owncloud/android/ui/activity/Preferences.java | 4 ++-- src/com/owncloud/android/ui/activity/UploadFilesActivity.java | 2 +- src/com/owncloud/android/{ => ui/activity}/Uploader.java | 7 ++++++- src/com/owncloud/android/ui/adapter/FileListListAdapter.java | 2 +- src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java | 2 +- src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java | 2 +- src/com/owncloud/android/ui/dialog/SslValidatorDialog.java | 2 +- .../owncloud/android/ui/fragment/ConfirmationDialogFragment.java | 2 +- src/com/owncloud/android/ui/fragment/ExtendedListFragment.java | 2 +- src/com/owncloud/android/ui/fragment/FileDetailFragment.java | 4 ++-- src/com/owncloud/android/ui/fragment/LocalFileListFragment.java | 2 +- src/com/owncloud/android/ui/fragment/OCFileListFragment.java | 2 +- src/com/owncloud/android/ui/preview/FileDownloadFragment.java | 2 +- src/com/owncloud/android/ui/preview/PreviewImageActivity.java | 2 +- src/com/owncloud/android/ui/preview/PreviewImageFragment.java | 2 +- src/com/owncloud/android/ui/preview/PreviewMediaFragment.java | 2 +- src/com/owncloud/android/ui/preview/PreviewVideoActivity.java | 2 +- src/com/owncloud/android/{ => utils}/DisplayUtils.java | 5 ++++- src/com/owncloud/android/{ => utils}/Log_OC.java | 6 ++++-- src/com/owncloud/android/{ => utils}/OwnCloudSession.java | 2 +- 56 files changed, 69 insertions(+), 59 deletions(-) rename src/com/owncloud/android/{ => ui/activity}/Uploader.java (98%) rename src/com/owncloud/android/{ => utils}/DisplayUtils.java (95%) rename src/com/owncloud/android/{ => utils}/Log_OC.java (96%) rename src/com/owncloud/android/{ => utils}/OwnCloudSession.java (94%) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 767b171b..b1075278 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -63,7 +63,7 @@ - + diff --git a/src/com/owncloud/android/authentication/AccountAuthenticator.java b/src/com/owncloud/android/authentication/AccountAuthenticator.java index 58a13521..78a8575e 100644 --- a/src/com/owncloud/android/authentication/AccountAuthenticator.java +++ b/src/com/owncloud/android/authentication/AccountAuthenticator.java @@ -18,7 +18,6 @@ package com.owncloud.android.authentication; -import com.owncloud.android.Log_OC; import com.owncloud.android.MainApp; import com.owncloud.android.R; @@ -30,6 +29,7 @@ import android.os.Handler; import android.widget.Toast; import com.owncloud.android.oc_framework.accounts.AccountTypeUtils; +import com.owncloud.android.utils.Log_OC; /** diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java index 105d644f..6928d414 100644 --- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java +++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java @@ -51,7 +51,6 @@ import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; import com.actionbarsherlock.app.SherlockDialogFragment; -import com.owncloud.android.Log_OC; import com.owncloud.android.MainApp; import com.owncloud.android.R; import com.owncloud.android.authentication.SsoWebViewClient.SsoWebViewClientListener; @@ -69,6 +68,7 @@ import com.owncloud.android.oc_framework.operations.RemoteOperationResult.Result import com.owncloud.android.ui.dialog.SamlWebViewDialog; import com.owncloud.android.ui.dialog.SslValidatorDialog; import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener; +import com.owncloud.android.utils.Log_OC; import com.owncloud.android.oc_framework.utils.OwnCloudVersion; /** diff --git a/src/com/owncloud/android/authentication/SsoWebViewClient.java b/src/com/owncloud/android/authentication/SsoWebViewClient.java index 5c97931e..8d80e9b7 100644 --- a/src/com/owncloud/android/authentication/SsoWebViewClient.java +++ b/src/com/owncloud/android/authentication/SsoWebViewClient.java @@ -19,7 +19,7 @@ package com.owncloud.android.authentication; import java.lang.ref.WeakReference; -import com.owncloud.android.Log_OC; +import com.owncloud.android.utils.Log_OC; import android.graphics.Bitmap; diff --git a/src/com/owncloud/android/datamodel/FileDataStorageManager.java b/src/com/owncloud/android/datamodel/FileDataStorageManager.java index 0ad985ee..fb55e933 100644 --- a/src/com/owncloud/android/datamodel/FileDataStorageManager.java +++ b/src/com/owncloud/android/datamodel/FileDataStorageManager.java @@ -25,10 +25,10 @@ import java.util.Collections; import java.util.Iterator; import java.util.Vector; -import com.owncloud.android.Log_OC; import com.owncloud.android.MainApp; import com.owncloud.android.db.ProviderMeta.ProviderTableMeta; import com.owncloud.android.utils.FileStorageUtils; +import com.owncloud.android.utils.Log_OC; import android.accounts.Account; diff --git a/src/com/owncloud/android/datamodel/OCFile.java b/src/com/owncloud/android/datamodel/OCFile.java index 67de5009..a6e6a546 100644 --- a/src/com/owncloud/android/datamodel/OCFile.java +++ b/src/com/owncloud/android/datamodel/OCFile.java @@ -20,7 +20,7 @@ package com.owncloud.android.datamodel; import java.io.File; -import com.owncloud.android.Log_OC; +import com.owncloud.android.utils.Log_OC; import android.os.Parcel; diff --git a/src/com/owncloud/android/db/DbHandler.java b/src/com/owncloud/android/db/DbHandler.java index 0ba7b0c9..89864fea 100644 --- a/src/com/owncloud/android/db/DbHandler.java +++ b/src/com/owncloud/android/db/DbHandler.java @@ -17,8 +17,8 @@ */ package com.owncloud.android.db; -import com.owncloud.android.Log_OC; import com.owncloud.android.MainApp; +import com.owncloud.android.utils.Log_OC; import android.content.ContentValues; import android.content.Context; diff --git a/src/com/owncloud/android/files/BootupBroadcastReceiver.java b/src/com/owncloud/android/files/BootupBroadcastReceiver.java index 8a8c4306..e90e8d4a 100644 --- a/src/com/owncloud/android/files/BootupBroadcastReceiver.java +++ b/src/com/owncloud/android/files/BootupBroadcastReceiver.java @@ -18,8 +18,8 @@ package com.owncloud.android.files; -import com.owncloud.android.Log_OC; import com.owncloud.android.files.services.FileObserverService; +import com.owncloud.android.utils.Log_OC; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java b/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java index fbb6888b..1943d320 100644 --- a/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java +++ b/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java @@ -20,12 +20,12 @@ package com.owncloud.android.files; import java.io.File; -import com.owncloud.android.Log_OC; import com.owncloud.android.MainApp; import com.owncloud.android.authentication.AccountUtils; import com.owncloud.android.db.DbHandler; import com.owncloud.android.files.services.FileUploader; import com.owncloud.android.utils.FileStorageUtils; +import com.owncloud.android.utils.Log_OC; import android.accounts.Account; diff --git a/src/com/owncloud/android/files/OwnCloudFileObserver.java b/src/com/owncloud/android/files/OwnCloudFileObserver.java index 9b3c8427..47a66b65 100644 --- a/src/com/owncloud/android/files/OwnCloudFileObserver.java +++ b/src/com/owncloud/android/files/OwnCloudFileObserver.java @@ -20,13 +20,13 @@ package com.owncloud.android.files; import java.io.File; -import com.owncloud.android.Log_OC; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.oc_framework.operations.RemoteOperationResult; import com.owncloud.android.operations.SynchronizeFileOperation; import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.ui.activity.ConflictsResolveActivity; +import com.owncloud.android.utils.Log_OC; diff --git a/src/com/owncloud/android/files/services/FileDownloader.java b/src/com/owncloud/android/files/services/FileDownloader.java index 266cb650..232a042a 100644 --- a/src/com/owncloud/android/files/services/FileDownloader.java +++ b/src/com/owncloud/android/files/services/FileDownloader.java @@ -28,7 +28,6 @@ import java.util.Vector; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import com.owncloud.android.Log_OC; import com.owncloud.android.R; import com.owncloud.android.authentication.AuthenticatorActivity; import com.owncloud.android.datamodel.FileDataStorageManager; @@ -44,6 +43,7 @@ import com.owncloud.android.ui.activity.FileActivity; import com.owncloud.android.ui.activity.FileDisplayActivity; import com.owncloud.android.ui.preview.PreviewImageActivity; import com.owncloud.android.ui.preview.PreviewImageFragment; +import com.owncloud.android.utils.Log_OC; import android.accounts.Account; import android.accounts.AccountsException; diff --git a/src/com/owncloud/android/files/services/FileObserverService.java b/src/com/owncloud/android/files/services/FileObserverService.java index 7aa3fa9a..871d2abf 100644 --- a/src/com/owncloud/android/files/services/FileObserverService.java +++ b/src/com/owncloud/android/files/services/FileObserverService.java @@ -22,13 +22,13 @@ import java.io.File; import java.util.HashMap; import java.util.Map; -import com.owncloud.android.Log_OC; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.db.ProviderMeta.ProviderTableMeta; import com.owncloud.android.files.OwnCloudFileObserver; import com.owncloud.android.operations.SynchronizeFileOperation; import com.owncloud.android.utils.FileStorageUtils; +import com.owncloud.android.utils.Log_OC; import android.accounts.Account; diff --git a/src/com/owncloud/android/files/services/FileUploader.java b/src/com/owncloud/android/files/services/FileUploader.java index 4768911e..74b5556a 100644 --- a/src/com/owncloud/android/files/services/FileUploader.java +++ b/src/com/owncloud/android/files/services/FileUploader.java @@ -33,7 +33,6 @@ import org.apache.jackrabbit.webdav.DavConstants; import org.apache.jackrabbit.webdav.MultiStatus; import org.apache.jackrabbit.webdav.client.methods.PropFindMethod; -import com.owncloud.android.Log_OC; import com.owncloud.android.MainApp; import com.owncloud.android.R; import com.owncloud.android.authentication.AccountAuthenticator; @@ -61,6 +60,7 @@ import com.owncloud.android.ui.activity.FileDisplayActivity; import com.owncloud.android.ui.activity.InstantUploadActivity; import com.owncloud.android.ui.preview.PreviewImageActivity; import com.owncloud.android.ui.preview.PreviewImageFragment; +import com.owncloud.android.utils.Log_OC; import android.accounts.Account; import android.accounts.AccountManager; diff --git a/src/com/owncloud/android/media/MediaService.java b/src/com/owncloud/android/media/MediaService.java index eb57222c..0a746355 100644 --- a/src/com/owncloud/android/media/MediaService.java +++ b/src/com/owncloud/android/media/MediaService.java @@ -37,11 +37,11 @@ import android.widget.Toast; import java.io.IOException; -import com.owncloud.android.Log_OC; import com.owncloud.android.R; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.ui.activity.FileActivity; import com.owncloud.android.ui.activity.FileDisplayActivity; +import com.owncloud.android.utils.Log_OC; /** diff --git a/src/com/owncloud/android/media/MediaServiceBinder.java b/src/com/owncloud/android/media/MediaServiceBinder.java index ab018f67..d2a42c77 100644 --- a/src/com/owncloud/android/media/MediaServiceBinder.java +++ b/src/com/owncloud/android/media/MediaServiceBinder.java @@ -18,9 +18,9 @@ package com.owncloud.android.media; -import com.owncloud.android.Log_OC; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.media.MediaService.State; +import com.owncloud.android.utils.Log_OC; import android.accounts.Account; import android.content.Intent; diff --git a/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java b/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java index ad09615a..fd8a5a6d 100644 --- a/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java +++ b/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java @@ -27,12 +27,12 @@ import java.util.Random; import org.apache.commons.httpclient.HttpException; import org.apache.commons.httpclient.methods.PutMethod; -import com.owncloud.android.Log_OC; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.oc_framework.network.ProgressiveDataTransferer; import com.owncloud.android.oc_framework.network.webdav.ChunkFromFileChannelRequestEntity; import com.owncloud.android.oc_framework.network.webdav.WebdavClient; import com.owncloud.android.oc_framework.network.webdav.WebdavUtils; +import com.owncloud.android.utils.Log_OC; import android.accounts.Account; diff --git a/src/com/owncloud/android/operations/CreateFolderOperation.java b/src/com/owncloud/android/operations/CreateFolderOperation.java index a426b17a..f5e190d6 100644 --- a/src/com/owncloud/android/operations/CreateFolderOperation.java +++ b/src/com/owncloud/android/operations/CreateFolderOperation.java @@ -17,7 +17,6 @@ package com.owncloud.android.operations; -import com.owncloud.android.Log_OC; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.oc_framework.network.webdav.WebdavClient; @@ -26,6 +25,7 @@ import com.owncloud.android.oc_framework.operations.OnRemoteOperationListener; import com.owncloud.android.oc_framework.operations.RemoteOperation; import com.owncloud.android.oc_framework.operations.RemoteOperationResult; import com.owncloud.android.utils.FileStorageUtils; +import com.owncloud.android.utils.Log_OC; /** diff --git a/src/com/owncloud/android/operations/DownloadFileOperation.java b/src/com/owncloud/android/operations/DownloadFileOperation.java index e6599a3b..eb45d4ba 100644 --- a/src/com/owncloud/android/operations/DownloadFileOperation.java +++ b/src/com/owncloud/android/operations/DownloadFileOperation.java @@ -32,7 +32,6 @@ import org.apache.commons.httpclient.HttpException; import org.apache.commons.httpclient.methods.GetMethod; import org.apache.http.HttpStatus; -import com.owncloud.android.Log_OC; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.oc_framework.network.webdav.OnDatatransferProgressListener; import com.owncloud.android.oc_framework.network.webdav.WebdavClient; @@ -41,6 +40,7 @@ import com.owncloud.android.oc_framework.operations.OperationCancelledException; import com.owncloud.android.oc_framework.operations.RemoteOperation; import com.owncloud.android.oc_framework.operations.RemoteOperationResult; import com.owncloud.android.utils.FileStorageUtils; +import com.owncloud.android.utils.Log_OC; import android.accounts.Account; import android.webkit.MimeTypeMap; diff --git a/src/com/owncloud/android/operations/ExistenceCheckOperation.java b/src/com/owncloud/android/operations/ExistenceCheckOperation.java index 56ed4861..d92190c1 100644 --- a/src/com/owncloud/android/operations/ExistenceCheckOperation.java +++ b/src/com/owncloud/android/operations/ExistenceCheckOperation.java @@ -20,11 +20,11 @@ package com.owncloud.android.operations; import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.httpclient.methods.HeadMethod; -import com.owncloud.android.Log_OC; import com.owncloud.android.oc_framework.network.webdav.WebdavClient; import com.owncloud.android.oc_framework.operations.RemoteOperation; import com.owncloud.android.oc_framework.operations.RemoteOperationResult; import com.owncloud.android.oc_framework.network.webdav.WebdavUtils; +import com.owncloud.android.utils.Log_OC; import android.content.Context; import android.net.ConnectivityManager; diff --git a/src/com/owncloud/android/operations/OAuth2GetAccessToken.java b/src/com/owncloud/android/operations/OAuth2GetAccessToken.java index 97f9ed9f..d3926453 100644 --- a/src/com/owncloud/android/operations/OAuth2GetAccessToken.java +++ b/src/com/owncloud/android/operations/OAuth2GetAccessToken.java @@ -8,12 +8,12 @@ import org.apache.commons.httpclient.NameValuePair; import org.json.JSONException; import org.json.JSONObject; -import com.owncloud.android.Log_OC; import com.owncloud.android.authentication.OAuth2Constants; import com.owncloud.android.oc_framework.network.webdav.WebdavClient; import com.owncloud.android.oc_framework.operations.RemoteOperation; import com.owncloud.android.oc_framework.operations.RemoteOperationResult; import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode; +import com.owncloud.android.utils.Log_OC; public class OAuth2GetAccessToken extends RemoteOperation { diff --git a/src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java b/src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java index 9519861b..82096854 100644 --- a/src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java +++ b/src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java @@ -22,12 +22,12 @@ import org.apache.commons.httpclient.methods.GetMethod; import org.json.JSONException; import org.json.JSONObject; -import com.owncloud.android.Log_OC; import com.owncloud.android.authentication.AccountUtils; import com.owncloud.android.oc_framework.network.webdav.WebdavClient; import com.owncloud.android.oc_framework.operations.RemoteOperation; import com.owncloud.android.oc_framework.operations.RemoteOperationResult; import com.owncloud.android.oc_framework.utils.OwnCloudVersion; +import com.owncloud.android.utils.Log_OC; import android.content.Context; import android.net.ConnectivityManager; diff --git a/src/com/owncloud/android/operations/RemoveFileOperation.java b/src/com/owncloud/android/operations/RemoveFileOperation.java index 66f530e1..34926afb 100644 --- a/src/com/owncloud/android/operations/RemoveFileOperation.java +++ b/src/com/owncloud/android/operations/RemoveFileOperation.java @@ -20,13 +20,13 @@ package com.owncloud.android.operations; import org.apache.commons.httpclient.HttpStatus; import org.apache.jackrabbit.webdav.client.methods.DeleteMethod; -import com.owncloud.android.Log_OC; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.oc_framework.network.webdav.WebdavClient; import com.owncloud.android.oc_framework.operations.RemoteOperation; import com.owncloud.android.oc_framework.operations.RemoteOperationResult; import com.owncloud.android.oc_framework.network.webdav.WebdavUtils; +import com.owncloud.android.utils.Log_OC; /** diff --git a/src/com/owncloud/android/operations/RenameFileOperation.java b/src/com/owncloud/android/operations/RenameFileOperation.java index e6828fea..2b352bdd 100644 --- a/src/com/owncloud/android/operations/RenameFileOperation.java +++ b/src/com/owncloud/android/operations/RenameFileOperation.java @@ -22,7 +22,6 @@ import java.io.IOException; import org.apache.jackrabbit.webdav.client.methods.DavMethodBase; -import com.owncloud.android.Log_OC; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.oc_framework.network.webdav.WebdavClient; @@ -31,6 +30,7 @@ import com.owncloud.android.oc_framework.operations.RemoteOperation; import com.owncloud.android.oc_framework.operations.RemoteOperationResult; import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.utils.FileStorageUtils; +import com.owncloud.android.utils.Log_OC; //import org.apache.jackrabbit.webdav.client.methods.MoveMethod; import android.accounts.Account; diff --git a/src/com/owncloud/android/operations/SynchronizeFileOperation.java b/src/com/owncloud/android/operations/SynchronizeFileOperation.java index 5f77a86b..f087aa5e 100644 --- a/src/com/owncloud/android/operations/SynchronizeFileOperation.java +++ b/src/com/owncloud/android/operations/SynchronizeFileOperation.java @@ -23,7 +23,6 @@ import org.apache.jackrabbit.webdav.DavConstants; import org.apache.jackrabbit.webdav.MultiStatus; import org.apache.jackrabbit.webdav.client.methods.PropFindMethod; -import com.owncloud.android.Log_OC; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.files.services.FileDownloader; @@ -34,6 +33,7 @@ import com.owncloud.android.oc_framework.network.webdav.WebdavUtils; import com.owncloud.android.oc_framework.operations.RemoteOperation; import com.owncloud.android.oc_framework.operations.RemoteOperationResult; import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode; +import com.owncloud.android.utils.Log_OC; import android.accounts.Account; import android.content.Context; diff --git a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java index e223553c..780fd42c 100644 --- a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java +++ b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java @@ -37,7 +37,6 @@ import android.accounts.Account; import android.content.Context; import android.content.Intent; -import com.owncloud.android.Log_OC; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.oc_framework.network.webdav.WebdavClient; @@ -48,6 +47,7 @@ import com.owncloud.android.oc_framework.operations.RemoteOperationResult; import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.syncadapter.FileSyncService; import com.owncloud.android.utils.FileStorageUtils; +import com.owncloud.android.utils.Log_OC; diff --git a/src/com/owncloud/android/operations/UpdateOCVersionOperation.java b/src/com/owncloud/android/operations/UpdateOCVersionOperation.java index 9cc7370b..7e330604 100644 --- a/src/com/owncloud/android/operations/UpdateOCVersionOperation.java +++ b/src/com/owncloud/android/operations/UpdateOCVersionOperation.java @@ -22,7 +22,6 @@ import org.apache.commons.httpclient.methods.GetMethod; import org.json.JSONException; import org.json.JSONObject; -import com.owncloud.android.Log_OC; import com.owncloud.android.authentication.AccountUtils; import com.owncloud.android.oc_framework.accounts.OwnCloudAccount; import com.owncloud.android.oc_framework.network.webdav.WebdavClient; @@ -30,6 +29,7 @@ import com.owncloud.android.oc_framework.operations.RemoteOperation; import com.owncloud.android.oc_framework.operations.RemoteOperationResult; import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.oc_framework.utils.OwnCloudVersion; +import com.owncloud.android.utils.Log_OC; import android.accounts.Account; import android.accounts.AccountManager; diff --git a/src/com/owncloud/android/operations/UploadFileOperation.java b/src/com/owncloud/android/operations/UploadFileOperation.java index bc49af23..80a3463b 100644 --- a/src/com/owncloud/android/operations/UploadFileOperation.java +++ b/src/com/owncloud/android/operations/UploadFileOperation.java @@ -32,7 +32,6 @@ import org.apache.commons.httpclient.methods.PutMethod; import org.apache.commons.httpclient.methods.RequestEntity; import org.apache.http.HttpStatus; -import com.owncloud.android.Log_OC; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.files.services.FileUploader; import com.owncloud.android.oc_framework.network.ProgressiveDataTransferer; @@ -45,6 +44,7 @@ import com.owncloud.android.oc_framework.operations.RemoteOperation; import com.owncloud.android.oc_framework.operations.RemoteOperationResult; import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.utils.FileStorageUtils; +import com.owncloud.android.utils.Log_OC; import android.accounts.Account; diff --git a/src/com/owncloud/android/providers/FileContentProvider.java b/src/com/owncloud/android/providers/FileContentProvider.java index 41b643c3..9e7cd3fd 100644 --- a/src/com/owncloud/android/providers/FileContentProvider.java +++ b/src/com/owncloud/android/providers/FileContentProvider.java @@ -21,11 +21,11 @@ package com.owncloud.android.providers; import java.util.ArrayList; import java.util.HashMap; -import com.owncloud.android.Log_OC; import com.owncloud.android.R; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.db.ProviderMeta; import com.owncloud.android.db.ProviderMeta.ProviderTableMeta; +import com.owncloud.android.utils.Log_OC; diff --git a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java index b84aa314..f0bc8709 100644 --- 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 com.owncloud.android.Log_OC; import com.owncloud.android.MainApp; import com.owncloud.android.R; import com.owncloud.android.authentication.AuthenticatorActivity; @@ -37,6 +36,7 @@ import com.owncloud.android.operations.SynchronizeFolderOperation; import com.owncloud.android.operations.UpdateOCVersionOperation; import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.ui.activity.ErrorsWhileCopyingHandlerActivity; +import com.owncloud.android.utils.Log_OC; import android.accounts.Account; diff --git a/src/com/owncloud/android/syncadapter/FileSyncService.java b/src/com/owncloud/android/syncadapter/FileSyncService.java index dafc771b..1e1e11fd 100644 --- a/src/com/owncloud/android/syncadapter/FileSyncService.java +++ b/src/com/owncloud/android/syncadapter/FileSyncService.java @@ -17,7 +17,7 @@ */ package com.owncloud.android.syncadapter; -import com.owncloud.android.Log_OC; +import com.owncloud.android.utils.Log_OC; import android.app.Service; import android.content.Intent; diff --git a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java index c8f2c429..b1ff8453 100644 --- a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java +++ b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java @@ -50,7 +50,7 @@ import com.actionbarsherlock.view.MenuItem; import com.owncloud.android.authentication.AuthenticatorActivity; import com.owncloud.android.authentication.AccountUtils; import com.owncloud.android.oc_framework.accounts.OwnCloudAccount; -import com.owncloud.android.Log_OC; +import com.owncloud.android.utils.Log_OC; import com.owncloud.android.MainApp; import com.owncloud.android.R; diff --git a/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java b/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java index f0895bfb..2d13a66b 100644 --- a/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java +++ b/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java @@ -18,13 +18,13 @@ package com.owncloud.android.ui.activity; -import com.owncloud.android.Log_OC; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.files.services.FileUploader; import com.owncloud.android.ui.dialog.ConflictsResolveDialog; import com.owncloud.android.ui.dialog.ConflictsResolveDialog.Decision; import com.owncloud.android.ui.dialog.ConflictsResolveDialog.OnConflictDecisionMadeListener; +import com.owncloud.android.utils.Log_OC; import android.content.Intent; import android.os.Bundle; diff --git a/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java b/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java index 056ffd6c..cf69a48c 100644 --- a/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java +++ b/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java @@ -39,13 +39,13 @@ import android.widget.TextView; import android.widget.Toast; import com.actionbarsherlock.app.SherlockFragmentActivity; -import com.owncloud.android.Log_OC; import com.owncloud.android.R; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.ui.dialog.IndeterminateProgressDialog; import com.owncloud.android.utils.FileStorageUtils; +import com.owncloud.android.utils.Log_OC; diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java index 5a1f7322..59b44433 100644 --- a/src/com/owncloud/android/ui/activity/FileActivity.java +++ b/src/com/owncloud/android/ui/activity/FileActivity.java @@ -29,12 +29,12 @@ import android.os.Bundle; import android.webkit.MimeTypeMap; import com.actionbarsherlock.app.SherlockFragmentActivity; -import com.owncloud.android.Log_OC; import com.owncloud.android.MainApp; import com.owncloud.android.R; import com.owncloud.android.authentication.AccountUtils; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.oc_framework.network.webdav.WebdavUtils; +import com.owncloud.android.utils.Log_OC; /** diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java index 43a8c97a..13646e8b 100644 --- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -59,7 +59,6 @@ import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuItem; import com.actionbarsherlock.view.Window; -import com.owncloud.android.Log_OC; import com.owncloud.android.MainApp; import com.owncloud.android.R; import com.owncloud.android.datamodel.FileDataStorageManager; @@ -90,6 +89,7 @@ import com.owncloud.android.ui.fragment.OCFileListFragment; import com.owncloud.android.ui.preview.PreviewImageActivity; import com.owncloud.android.ui.preview.PreviewMediaFragment; import com.owncloud.android.ui.preview.PreviewVideoActivity; +import com.owncloud.android.utils.Log_OC; /** diff --git a/src/com/owncloud/android/ui/activity/InstantUploadActivity.java b/src/com/owncloud/android/ui/activity/InstantUploadActivity.java index a851dd18..0d455bd2 100644 --- a/src/com/owncloud/android/ui/activity/InstantUploadActivity.java +++ b/src/com/owncloud/android/ui/activity/InstantUploadActivity.java @@ -19,13 +19,13 @@ package com.owncloud.android.ui.activity; import java.util.ArrayList; import java.util.List; -import com.owncloud.android.Log_OC; import com.owncloud.android.R; import com.owncloud.android.authentication.AccountUtils; import com.owncloud.android.db.DbHandler; import com.owncloud.android.files.InstantUploadBroadcastReceiver; import com.owncloud.android.files.services.FileUploader; import com.owncloud.android.utils.FileStorageUtils; +import com.owncloud.android.utils.Log_OC; import android.accounts.Account; import android.app.Activity; diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java index e94942e2..678dad6d 100644 --- a/src/com/owncloud/android/ui/activity/Preferences.java +++ b/src/com/owncloud/android/ui/activity/Preferences.java @@ -36,10 +36,10 @@ import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.app.SherlockPreferenceActivity; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuItem; -import com.owncloud.android.Log_OC; -import com.owncloud.android.OwnCloudSession; import com.owncloud.android.R; import com.owncloud.android.db.DbHandler; +import com.owncloud.android.utils.Log_OC; +import com.owncloud.android.utils.OwnCloudSession; /** diff --git a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java index cc1f7de1..7c941e8e 100644 --- a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java +++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java @@ -35,13 +35,13 @@ import android.widget.TextView; import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.app.ActionBar.OnNavigationListener; import com.actionbarsherlock.view.MenuItem; -import com.owncloud.android.Log_OC; import com.owncloud.android.R; import com.owncloud.android.ui.dialog.IndeterminateProgressDialog; import com.owncloud.android.ui.fragment.ConfirmationDialogFragment; import com.owncloud.android.ui.fragment.LocalFileListFragment; import com.owncloud.android.ui.fragment.ConfirmationDialogFragment.ConfirmationDialogFragmentListener; import com.owncloud.android.utils.FileStorageUtils; +import com.owncloud.android.utils.Log_OC; /** diff --git a/src/com/owncloud/android/Uploader.java b/src/com/owncloud/android/ui/activity/Uploader.java similarity index 98% rename from src/com/owncloud/android/Uploader.java rename to src/com/owncloud/android/ui/activity/Uploader.java index 29a4d6a4..08e2d215 100644 --- a/src/com/owncloud/android/Uploader.java +++ b/src/com/owncloud/android/ui/activity/Uploader.java @@ -16,7 +16,7 @@ * */ -package com.owncloud.android; +package com.owncloud.android.ui.activity; import java.io.File; import java.util.ArrayList; @@ -26,11 +26,16 @@ import java.util.List; import java.util.Stack; import java.util.Vector; +import com.owncloud.android.MainApp; import com.owncloud.android.R; +import com.owncloud.android.R.id; +import com.owncloud.android.R.layout; +import com.owncloud.android.R.string; import com.owncloud.android.authentication.AccountAuthenticator; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.files.services.FileUploader; +import com.owncloud.android.utils.Log_OC; import android.accounts.Account; import android.accounts.AccountManager; diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java index a864f7a5..841a5d04 100644 --- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java +++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java @@ -31,7 +31,6 @@ import android.widget.TextView; import java.util.Vector; -import com.owncloud.android.DisplayUtils; import com.owncloud.android.R; import com.owncloud.android.authentication.AccountUtils; import com.owncloud.android.datamodel.FileDataStorageManager; @@ -39,6 +38,7 @@ import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder; import com.owncloud.android.files.services.FileUploader.FileUploaderBinder; import com.owncloud.android.ui.activity.TransferServiceGetter; +import com.owncloud.android.utils.DisplayUtils; /** diff --git a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java index ff883c56..7cd2c2a4 100644 --- a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java +++ b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Arrays; import java.util.Comparator; -import com.owncloud.android.DisplayUtils; import com.owncloud.android.R; +import com.owncloud.android.utils.DisplayUtils; import android.content.Context; diff --git a/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java b/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java index 22c46ab3..91c607e4 100644 --- a/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java +++ b/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java @@ -35,11 +35,11 @@ import android.webkit.WebSettings; import android.webkit.WebView; import com.actionbarsherlock.app.SherlockDialogFragment; -import com.owncloud.android.Log_OC; import com.owncloud.android.R; import com.owncloud.android.authentication.SsoWebViewClient; import com.owncloud.android.authentication.SsoWebViewClient.SsoWebViewClientListener; import com.owncloud.android.oc_framework.network.webdav.WebdavClient; +import com.owncloud.android.utils.Log_OC; /** diff --git a/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java b/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java index dd8fee88..a50ecc95 100644 --- a/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java +++ b/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java @@ -29,7 +29,6 @@ import java.util.Map; import javax.security.auth.x500.X500Principal; -import com.owncloud.android.Log_OC; import com.owncloud.android.R; import android.app.Dialog; @@ -43,6 +42,7 @@ import android.widget.TextView; import com.owncloud.android.oc_framework.network.CertificateCombinedException; import com.owncloud.android.oc_framework.network.NetworkUtils; import com.owncloud.android.oc_framework.operations.RemoteOperationResult; +import com.owncloud.android.utils.Log_OC; /** * Dialog to request the user about a certificate that could not be validated with the certificates store in the system. diff --git a/src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java b/src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java index 869cb266..bb9adbe2 100644 --- a/src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java +++ b/src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java @@ -24,7 +24,7 @@ import android.content.DialogInterface; import android.os.Bundle; import com.actionbarsherlock.app.SherlockDialogFragment; -import com.owncloud.android.Log_OC; +import com.owncloud.android.utils.Log_OC; public class ConfirmationDialogFragment extends SherlockDialogFragment { diff --git a/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java b/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java index a57fb095..409c5e61 100644 --- a/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java +++ b/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java @@ -19,9 +19,9 @@ package com.owncloud.android.ui.fragment; import com.actionbarsherlock.app.SherlockFragment; -import com.owncloud.android.Log_OC; import com.owncloud.android.R; import com.owncloud.android.ui.ExtendedListView; +import com.owncloud.android.utils.Log_OC; import android.os.Bundle; diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java index 9c01ce70..01ef8d07 100644 --- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java +++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java @@ -43,8 +43,6 @@ import android.widget.Toast; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuItem; -import com.owncloud.android.DisplayUtils; -import com.owncloud.android.Log_OC; import com.owncloud.android.R; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; @@ -66,6 +64,8 @@ import com.owncloud.android.ui.activity.FileDisplayActivity; import com.owncloud.android.ui.dialog.EditNameDialog; import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener; import com.owncloud.android.ui.preview.PreviewImageFragment; +import com.owncloud.android.utils.DisplayUtils; +import com.owncloud.android.utils.Log_OC; /** diff --git a/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java b/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java index 40c03a46..270a8d5c 100644 --- a/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java +++ b/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java @@ -19,9 +19,9 @@ package com.owncloud.android.ui.fragment; import java.io.File; -import com.owncloud.android.Log_OC; import com.owncloud.android.R; import com.owncloud.android.ui.adapter.LocalFileListAdapter; +import com.owncloud.android.utils.Log_OC; import android.app.Activity; diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java index f1f45fb4..c75eedb4 100644 --- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java +++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java @@ -21,7 +21,6 @@ import java.io.File; import java.util.ArrayList; import java.util.List; -import com.owncloud.android.Log_OC; import com.owncloud.android.R; import com.owncloud.android.authentication.AccountUtils; import com.owncloud.android.datamodel.FileDataStorageManager; @@ -42,6 +41,7 @@ import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener; import com.owncloud.android.ui.fragment.ConfirmationDialogFragment.ConfirmationDialogFragmentListener; import com.owncloud.android.ui.preview.PreviewImageFragment; import com.owncloud.android.ui.preview.PreviewMediaFragment; +import com.owncloud.android.utils.Log_OC; import android.accounts.Account; diff --git a/src/com/owncloud/android/ui/preview/FileDownloadFragment.java b/src/com/owncloud/android/ui/preview/FileDownloadFragment.java index c6f5ff4f..c18f84be 100644 --- a/src/com/owncloud/android/ui/preview/FileDownloadFragment.java +++ b/src/com/owncloud/android/ui/preview/FileDownloadFragment.java @@ -19,11 +19,11 @@ package com.owncloud.android.ui.preview; import java.lang.ref.WeakReference; -import com.owncloud.android.Log_OC; import com.owncloud.android.R; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder; import com.owncloud.android.ui.fragment.FileFragment; +import com.owncloud.android.utils.Log_OC; import android.accounts.Account; import android.app.Activity; diff --git a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java index ef48d123..fde70df0 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java @@ -35,7 +35,6 @@ import android.view.View.OnTouchListener; import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.view.MenuItem; import com.actionbarsherlock.view.Window; -import com.owncloud.android.Log_OC; import com.owncloud.android.R; import com.owncloud.android.authentication.AccountUtils; import com.owncloud.android.datamodel.FileDataStorageManager; @@ -48,6 +47,7 @@ import com.owncloud.android.ui.activity.FileActivity; import com.owncloud.android.ui.activity.FileDisplayActivity; import com.owncloud.android.ui.dialog.LoadingDialog; import com.owncloud.android.ui.fragment.FileFragment; +import com.owncloud.android.utils.Log_OC; /** diff --git a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java index 7ad57ed0..ebc17c61 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java @@ -50,7 +50,6 @@ import android.widget.Toast; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuItem; -import com.owncloud.android.Log_OC; import com.owncloud.android.R; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; @@ -61,6 +60,7 @@ import com.owncloud.android.oc_framework.operations.RemoteOperationResult; import com.owncloud.android.operations.RemoveFileOperation; import com.owncloud.android.ui.fragment.ConfirmationDialogFragment; import com.owncloud.android.ui.fragment.FileFragment; +import com.owncloud.android.utils.Log_OC; /** diff --git a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java index 78c75f8f..0cce76ae 100644 --- a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java @@ -52,7 +52,6 @@ import android.widget.VideoView; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuItem; -import com.owncloud.android.Log_OC; import com.owncloud.android.R; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; @@ -68,6 +67,7 @@ import com.owncloud.android.ui.activity.FileActivity; import com.owncloud.android.ui.activity.FileDisplayActivity; import com.owncloud.android.ui.fragment.ConfirmationDialogFragment; import com.owncloud.android.ui.fragment.FileFragment; +import com.owncloud.android.utils.Log_OC; /** diff --git a/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java b/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java index 1e0d307a..59d96555 100644 --- a/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java +++ b/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java @@ -17,12 +17,12 @@ package com.owncloud.android.ui.preview; -import com.owncloud.android.Log_OC; import com.owncloud.android.R; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.media.MediaService; import com.owncloud.android.ui.activity.FileActivity; +import com.owncloud.android.utils.Log_OC; import android.accounts.Account; import android.app.AlertDialog; diff --git a/src/com/owncloud/android/DisplayUtils.java b/src/com/owncloud/android/utils/DisplayUtils.java similarity index 95% rename from src/com/owncloud/android/DisplayUtils.java rename to src/com/owncloud/android/utils/DisplayUtils.java index 1ee898b3..e4bdd999 100644 --- a/src/com/owncloud/android/DisplayUtils.java +++ b/src/com/owncloud/android/utils/DisplayUtils.java @@ -16,7 +16,7 @@ * */ -package com.owncloud.android; +package com.owncloud.android.utils; import java.util.Arrays; import java.util.Date; @@ -24,6 +24,9 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Set; +import com.owncloud.android.R; +import com.owncloud.android.R.drawable; + /** * A helper class for some string operations. * diff --git a/src/com/owncloud/android/Log_OC.java b/src/com/owncloud/android/utils/Log_OC.java similarity index 96% rename from src/com/owncloud/android/Log_OC.java rename to src/com/owncloud/android/utils/Log_OC.java index 5a1be298..098625ad 100644 --- a/src/com/owncloud/android/Log_OC.java +++ b/src/com/owncloud/android/utils/Log_OC.java @@ -1,4 +1,4 @@ -package com.owncloud.android; +package com.owncloud.android.utils; import java.io.BufferedWriter; import java.io.File; @@ -8,6 +8,8 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; +import com.owncloud.android.MainApp; + import android.util.Log; @@ -22,7 +24,7 @@ public class Log_OC { public static void i(String TAG, String message){ // Printing the message to LogCat console - Log.i(TAG, message); + int a = Log.i(TAG, message); // Write the log message to the file appendLog(TAG+" : "+message); } diff --git a/src/com/owncloud/android/OwnCloudSession.java b/src/com/owncloud/android/utils/OwnCloudSession.java similarity index 94% rename from src/com/owncloud/android/OwnCloudSession.java rename to src/com/owncloud/android/utils/OwnCloudSession.java index d7bb6094..13ead88b 100644 --- a/src/com/owncloud/android/OwnCloudSession.java +++ b/src/com/owncloud/android/utils/OwnCloudSession.java @@ -15,7 +15,7 @@ * along with this program. If not, see . * */ -package com.owncloud.android; +package com.owncloud.android.utils; /** * Represents a session to an ownCloud instance -- 2.11.0