From: David A. Velasco Date: Wed, 6 Nov 2013 09:36:34 +0000 (+0100) Subject: Merge branch 'develop' into setup_buttons X-Git-Tag: oc-android-1.5.5~139^2~3 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d252a09f53999a90036048d4db33c8b4f2f04c4f?ds=inline;hp=--cc Merge branch 'develop' into setup_buttons --- d252a09f53999a90036048d4db33c8b4f2f04c4f diff --cc src/com/owncloud/android/Uploader.java index 8e69516e,a15ef3ab..29a4d6a4 --- a/src/com/owncloud/android/Uploader.java +++ b/src/com/owncloud/android/Uploader.java @@@ -26,13 -26,6 +26,12 @@@ import java.util.List import java.util.Stack; import java.util.Vector; +import com.owncloud.android.R; +import com.owncloud.android.authentication.AccountAuthenticator; - import com.owncloud.android.datamodel.DataStorageManager; +import com.owncloud.android.datamodel.FileDataStorageManager; +import com.owncloud.android.datamodel.OCFile; +import com.owncloud.android.files.services.FileUploader; + import android.accounts.Account; import android.accounts.AccountManager; import android.app.AlertDialog; @@@ -61,8 -54,13 +60,7 @@@ import android.widget.EditText import android.widget.SimpleAdapter; import android.widget.Toast; -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.R; - /** * This can be used to upload things to an ownCloud instance. * diff --cc src/com/owncloud/android/operations/CreateFolderOperation.java index b3456ee2,c86d2fc3..f28ad29e --- a/src/com/owncloud/android/operations/CreateFolderOperation.java +++ b/src/com/owncloud/android/operations/CreateFolderOperation.java @@@ -23,10 -23,9 +23,10 @@@ import org.apache.commons.httpclient.Ht import org.apache.jackrabbit.webdav.client.methods.MkColMethod; import com.owncloud.android.Log_OC; - import com.owncloud.android.datamodel.DataStorageManager; + import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; + import eu.alefzero.webdav.WebdavClient; import eu.alefzero.webdav.WebdavUtils; diff --cc src/com/owncloud/android/operations/RemoveFileOperation.java index f8a6c4ab,ffb3a91a..659037b6 --- a/src/com/owncloud/android/operations/RemoveFileOperation.java +++ b/src/com/owncloud/android/operations/RemoveFileOperation.java @@@ -21,10 -21,9 +21,10 @@@ import org.apache.commons.httpclient.Ht import org.apache.jackrabbit.webdav.client.methods.DeleteMethod; import com.owncloud.android.Log_OC; - import com.owncloud.android.datamodel.DataStorageManager; + import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; + import eu.alefzero.webdav.WebdavClient; import eu.alefzero.webdav.WebdavUtils; diff --cc src/com/owncloud/android/operations/RenameFileOperation.java index 86d27122,f9bb4242..a2370f3b --- a/src/com/owncloud/android/operations/RenameFileOperation.java +++ b/src/com/owncloud/android/operations/RenameFileOperation.java @@@ -21,9 -21,12 +21,9 @@@ import java.io.File import java.io.IOException; import org.apache.jackrabbit.webdav.client.methods.DavMethodBase; -//import org.apache.jackrabbit.webdav.client.methods.MoveMethod; - -import android.accounts.Account; import com.owncloud.android.Log_OC; - import com.owncloud.android.datamodel.DataStorageManager; + import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.utils.FileStorageUtils; diff --cc src/com/owncloud/android/operations/SynchronizeFileOperation.java index 211ba705,b5f6575a..2e15c2fe --- a/src/com/owncloud/android/operations/SynchronizeFileOperation.java +++ b/src/com/owncloud/android/operations/SynchronizeFileOperation.java @@@ -23,8 -23,12 +23,8 @@@ import org.apache.jackrabbit.webdav.Dav import org.apache.jackrabbit.webdav.MultiStatus; import org.apache.jackrabbit.webdav.client.methods.PropFindMethod; -import android.accounts.Account; -import android.content.Context; -import android.content.Intent; - import com.owncloud.android.Log_OC; - import com.owncloud.android.datamodel.DataStorageManager; + import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.files.services.FileDownloader; import com.owncloud.android.files.services.FileUploader; diff --cc src/com/owncloud/android/providers/FileContentProvider.java index 7f6a1a4f,917fd667..41b643c3 --- a/src/com/owncloud/android/providers/FileContentProvider.java +++ b/src/com/owncloud/android/providers/FileContentProvider.java @@@ -26,8 -28,9 +28,10 @@@ import com.owncloud.android.db.Provider import com.owncloud.android.db.ProviderMeta.ProviderTableMeta; + import android.content.ContentProvider; + import android.content.ContentProviderOperation; + import android.content.ContentProviderResult; import android.content.ContentUris; import android.content.ContentValues; import android.content.Context; diff --cc src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java index 47730995,34ef4524..a3e7926a --- a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java +++ b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java @@@ -27,12 -26,9 +26,10 @@@ import org.apache.http.client.ClientPro import com.owncloud.android.authentication.AccountUtils; import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException; - import com.owncloud.android.datamodel.DataStorageManager; + import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.network.OwnCloudClientUtils; + import android.accounts.Account; import android.accounts.AccountManager; import android.accounts.AuthenticatorException; diff --cc src/com/owncloud/android/ui/adapter/FileListListAdapter.java index a2651fac,5e6d01b2..a864f7a5 --- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java +++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java @@@ -52,9 -51,12 +52,9 @@@ public class FileListListAdapter extend private Context mContext; private OCFile mFile = null; private Vector mFiles = null; - private DataStorageManager mStorageManager; + private FileDataStorageManager mStorageManager; private Account mAccount; private TransferServiceGetter mTransferServiceGetter; - //total size of a directory (recursive) - private Long totalSizeOfDirectoriesRecursive = null; - private Long lastModifiedOfAllSubdirectories = null; public FileListListAdapter(Context context, TransferServiceGetter transferServiceGetter) { mContext = context; diff --cc src/com/owncloud/android/ui/preview/PreviewImageActivity.java index 87ddd562,9c48cc18..ef48d123 --- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java @@@ -35,10 -35,7 +35,9 @@@ import android.view.View.OnTouchListene 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.DataStorageManager; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.files.services.FileDownloader; diff --cc src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java index d17d35f7,6ef06189..de90b4bd --- a/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java +++ b/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java @@@ -22,16 -22,15 +22,16 @@@ import java.util.Map import java.util.Set; import java.util.Vector; - import com.owncloud.android.datamodel.DataStorageManager; +import com.owncloud.android.datamodel.OCFile; +import com.owncloud.android.ui.fragment.FileFragment; + import android.accounts.Account; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentStatePagerAdapter; import android.view.ViewGroup; + import com.owncloud.android.datamodel.FileDataStorageManager; -import com.owncloud.android.datamodel.OCFile; -import com.owncloud.android.ui.fragment.FileFragment; /** * Adapter class that provides Fragment instances diff --cc src/com/owncloud/android/ui/preview/PreviewVideoActivity.java index 56972c65,47441ffb..7db07b35 --- a/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java +++ b/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java @@@ -17,16 -17,6 +17,15 @@@ package com.owncloud.android.ui.preview; +import com.owncloud.android.Log_OC; +import com.owncloud.android.R; +import com.owncloud.android.authentication.AccountUtils; +import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException; - import com.owncloud.android.datamodel.DataStorageManager; +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 android.accounts.Account; import android.app.AlertDialog; import android.content.DialogInterface; @@@ -40,7 -30,15 +39,6 @@@ import android.os.Bundle import android.widget.MediaController; import android.widget.VideoView; -import com.owncloud.android.Log_OC; -import com.owncloud.android.R; -import com.owncloud.android.datamodel.FileDataStorageManager; -import com.owncloud.android.authentication.AccountUtils; -import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException; -import com.owncloud.android.datamodel.OCFile; -import com.owncloud.android.media.MediaService; -import com.owncloud.android.ui.activity.FileActivity; -- /** * Activity implementing a basic video player. *