From: David A. Velasco Date: Wed, 6 Nov 2013 10:43:22 +0000 (+0100) Subject: Merge branch 'develop' into setup_buttons X-Git-Tag: oc-android-1.5.5~139^2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/a0efedc99d0421554b8f8e93ef631e54a4cb05cd?hp=38baf42813463596bea4def163f395aabdc0b63b Merge branch 'develop' into setup_buttons --- diff --git a/res/drawable-hdpi/common_error.png b/res/drawable-hdpi/common_error.png new file mode 100644 index 00000000..213976c7 Binary files /dev/null and b/res/drawable-hdpi/common_error.png differ diff --git a/res/drawable-ldpi/common_error.png b/res/drawable-ldpi/common_error.png new file mode 100644 index 00000000..f1a804a6 Binary files /dev/null and b/res/drawable-ldpi/common_error.png differ diff --git a/res/drawable-mdpi/common_error.png b/res/drawable-mdpi/common_error.png new file mode 100644 index 00000000..ee60165e Binary files /dev/null and b/res/drawable-mdpi/common_error.png differ diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml index 15e872b1..1025bcff 100644 --- a/res/layout-land/account_setup.xml +++ b/res/layout-land/account_setup.xml @@ -187,29 +187,26 @@ + android:text="@string/uploader_btn_upload_text"/> diff --git a/res/values-v11/versioned_styles.xml b/res/values-v11/versioned_styles.xml new file mode 100644 index 00000000..75cfb9b7 --- /dev/null +++ b/res/values-v11/versioned_styles.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/res/values/setup.xml b/res/values/setup.xml index 31df6da2..a2fb403f 100644 --- a/res/values/setup.xml +++ b/res/values/setup.xml @@ -12,7 +12,8 @@ true - "https://owncloud.com/mobile/new" + true + "https://owncloud.com/mobile/new" off @@ -25,6 +26,9 @@ #1D2D44 #1D2D44 + + #000000 + true @@ -41,3 +45,4 @@ + diff --git a/res/values/styles.xml b/res/values/styles.xml index 3ad0151a..034ca5cb 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -24,17 +24,25 @@ @@ -46,14 +54,14 @@ 1 1 @drawable/split_action_bg + @style/Theme.ownCloud.IndeterminateStyle + @style/Theme.ownCloud.IndeterminateStyle - - + + + + + + + diff --git a/src/com/owncloud/android/Uploader.java b/src/com/owncloud/android/Uploader.java index a15ef3ab..29a4d6a4 100644 --- a/src/com/owncloud/android/Uploader.java +++ b/src/com/owncloud/android/Uploader.java @@ -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.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; @@ -54,12 +60,6 @@ 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 --git a/src/com/owncloud/android/authentication/AccountAuthenticator.java b/src/com/owncloud/android/authentication/AccountAuthenticator.java index ff72d73c..a2a38e89 100644 --- a/src/com/owncloud/android/authentication/AccountAuthenticator.java +++ b/src/com/owncloud/android/authentication/AccountAuthenticator.java @@ -18,6 +18,10 @@ package com.owncloud.android.authentication; +import com.owncloud.android.Log_OC; +import com.owncloud.android.MainApp; +import com.owncloud.android.R; + import android.accounts.*; import android.content.Context; import android.content.Intent; @@ -25,10 +29,7 @@ import android.os.Bundle; import android.os.Handler; import android.widget.Toast; -import com.owncloud.android.Log_OC; -import com.owncloud.android.MainApp; -import com.owncloud.android.R; /** diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java index 53f18bb4..8f7fc2c2 100644 --- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java +++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java @@ -49,7 +49,6 @@ import android.widget.CheckBox; import android.widget.EditText; import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; -import android.widget.Toast; import com.actionbarsherlock.app.SherlockDialogFragment; import com.owncloud.android.Log_OC; @@ -69,6 +68,7 @@ import com.owncloud.android.ui.dialog.SslValidatorDialog; import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener; import com.owncloud.android.utils.OwnCloudVersion; + import eu.alefzero.webdav.WebdavClient; /** @@ -193,11 +193,16 @@ implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList /// set Host Url Input Enabled mHostUrlInputEnabled = getResources().getBoolean(R.bool.show_server_url_input); - - /// complete label for 'register account' button - Button b = (Button) findViewById(R.id.account_register); - if (b != null) { - b.setText(String.format(getString(R.string.auth_register), getString(R.string.app_name))); + /// set visibility of link for new users + boolean accountRegisterVisibility = getResources().getBoolean(R.bool.show_welcome_link); + Button welcomeLink = (Button) findViewById(R.id.welcome_link); + if (welcomeLink != null) { + if (accountRegisterVisibility) { + welcomeLink.setVisibility(View.VISIBLE); + welcomeLink.setText(String.format(getString(R.string.auth_register), getString(R.string.app_name))); + } else { + findViewById(R.id.welcome_link).setVisibility(View.GONE); + } } /// initialization @@ -1397,7 +1402,7 @@ implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList * @param view 'Account register' button */ public void onRegisterClick(View view) { - Intent register = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.url_account_register))); + Intent register = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.welcome_link_url))); setResult(RESULT_CANCELED); startActivity(register); } diff --git a/src/com/owncloud/android/authentication/SsoWebViewClient.java b/src/com/owncloud/android/authentication/SsoWebViewClient.java index 4f26a805..5c97931e 100644 --- a/src/com/owncloud/android/authentication/SsoWebViewClient.java +++ b/src/com/owncloud/android/authentication/SsoWebViewClient.java @@ -21,6 +21,7 @@ import java.lang.ref.WeakReference; import com.owncloud.android.Log_OC; + import android.graphics.Bitmap; import android.os.Handler; import android.os.Message; diff --git a/src/com/owncloud/android/datamodel/FileDataStorageManager.java b/src/com/owncloud/android/datamodel/FileDataStorageManager.java index 6597616a..635e10ca 100644 --- a/src/com/owncloud/android/datamodel/FileDataStorageManager.java +++ b/src/com/owncloud/android/datamodel/FileDataStorageManager.java @@ -30,6 +30,7 @@ import com.owncloud.android.MainApp; import com.owncloud.android.db.ProviderMeta.ProviderTableMeta; import com.owncloud.android.utils.FileStorageUtils; + import android.accounts.Account; import android.content.ContentProviderClient; import android.content.ContentProviderOperation; diff --git a/src/com/owncloud/android/datamodel/OCFile.java b/src/com/owncloud/android/datamodel/OCFile.java index 9bd84abd..67de5009 100644 --- a/src/com/owncloud/android/datamodel/OCFile.java +++ b/src/com/owncloud/android/datamodel/OCFile.java @@ -22,6 +22,7 @@ import java.io.File; import com.owncloud.android.Log_OC; + import android.os.Parcel; import android.os.Parcelable; import android.webkit.MimeTypeMap; diff --git a/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java b/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java index 0e6ad9e0..fbb6888b 100644 --- a/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java +++ b/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java @@ -20,9 +20,13 @@ 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 android.accounts.Account; import android.content.BroadcastReceiver; @@ -36,9 +40,6 @@ import android.preference.PreferenceManager; import android.provider.MediaStore.Images.Media; import android.webkit.MimeTypeMap; -import com.owncloud.android.Log_OC; -import com.owncloud.android.MainApp; -import com.owncloud.android.utils.FileStorageUtils; public class InstantUploadBroadcastReceiver extends BroadcastReceiver { diff --git a/src/com/owncloud/android/files/OwnCloudFileObserver.java b/src/com/owncloud/android/files/OwnCloudFileObserver.java index 5383520e..d887256e 100644 --- a/src/com/owncloud/android/files/OwnCloudFileObserver.java +++ b/src/com/owncloud/android/files/OwnCloudFileObserver.java @@ -29,6 +29,7 @@ import com.owncloud.android.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.ui.activity.ConflictsResolveActivity; + import android.accounts.Account; import android.content.Context; import android.content.Intent; diff --git a/src/com/owncloud/android/files/managers/OCNotificationManager.java b/src/com/owncloud/android/files/managers/OCNotificationManager.java index 55e98ee8..11a8c377 100644 --- a/src/com/owncloud/android/files/managers/OCNotificationManager.java +++ b/src/com/owncloud/android/files/managers/OCNotificationManager.java @@ -21,12 +21,13 @@ package com.owncloud.android.files.managers; import java.util.HashMap; import java.util.Map; +import com.owncloud.android.R; + import android.app.Notification; import android.app.NotificationManager; import android.content.Context; import android.widget.RemoteViews; -import com.owncloud.android.R; public class OCNotificationManager { diff --git a/src/com/owncloud/android/files/services/FileDownloader.java b/src/com/owncloud/android/files/services/FileDownloader.java index 1e2bffa6..2e479f4d 100644 --- a/src/com/owncloud/android/files/services/FileDownloader.java +++ b/src/com/owncloud/android/files/services/FileDownloader.java @@ -28,11 +28,12 @@ import java.util.Vector; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import com.owncloud.android.Log_OC; +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.datamodel.OCFile; -import eu.alefzero.webdav.OnDatatransferProgressListener; - import com.owncloud.android.network.OwnCloudClientUtils; import com.owncloud.android.operations.DownloadFileOperation; import com.owncloud.android.operations.RemoteOperationResult; @@ -42,6 +43,9 @@ import com.owncloud.android.ui.activity.FileDisplayActivity; import com.owncloud.android.ui.preview.PreviewImageActivity; import com.owncloud.android.ui.preview.PreviewImageFragment; +import eu.alefzero.webdav.OnDatatransferProgressListener; + + import android.accounts.Account; import android.accounts.AccountsException; import android.app.Notification; @@ -58,9 +62,6 @@ import android.os.Message; import android.os.Process; import android.widget.RemoteViews; -import com.owncloud.android.Log_OC; -import com.owncloud.android.MainApp; -import com.owncloud.android.R; import eu.alefzero.webdav.WebdavClient; public class FileDownloader extends Service implements OnDatatransferProgressListener { diff --git a/src/com/owncloud/android/files/services/FileObserverService.java b/src/com/owncloud/android/files/services/FileObserverService.java index 8a6fd5a6..7aa3fa9a 100644 --- a/src/com/owncloud/android/files/services/FileObserverService.java +++ b/src/com/owncloud/android/files/services/FileObserverService.java @@ -30,6 +30,7 @@ import com.owncloud.android.files.OwnCloudFileObserver; import com.owncloud.android.operations.SynchronizeFileOperation; import com.owncloud.android.utils.FileStorageUtils; + import android.accounts.Account; import android.accounts.AccountManager; import android.app.Service; diff --git a/src/com/owncloud/android/files/services/FileUploader.java b/src/com/owncloud/android/files/services/FileUploader.java index 4d2df0fe..7f45b6b9 100644 --- a/src/com/owncloud/android/files/services/FileUploader.java +++ b/src/com/owncloud/android/files/services/FileUploader.java @@ -33,10 +33,15 @@ 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; import com.owncloud.android.authentication.AuthenticatorActivity; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; +import com.owncloud.android.db.DbHandler; +import com.owncloud.android.network.OwnCloudClientUtils; import com.owncloud.android.operations.ChunkedUploadFileOperation; import com.owncloud.android.operations.CreateFolderOperation; import com.owncloud.android.operations.ExistenceCheckOperation; @@ -44,13 +49,19 @@ import com.owncloud.android.operations.RemoteOperation; import com.owncloud.android.operations.RemoteOperationResult; import com.owncloud.android.operations.UploadFileOperation; import com.owncloud.android.operations.RemoteOperationResult.ResultCode; +import com.owncloud.android.ui.activity.FailedUploadActivity; +import com.owncloud.android.ui.activity.FileActivity; +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.OwnCloudVersion; + import eu.alefzero.webdav.OnDatatransferProgressListener; import eu.alefzero.webdav.WebdavEntry; import eu.alefzero.webdav.WebdavUtils; -import com.owncloud.android.network.OwnCloudClientUtils; import android.accounts.Account; import android.accounts.AccountManager; @@ -70,16 +81,6 @@ import android.os.Process; import android.webkit.MimeTypeMap; import android.widget.RemoteViews; -import com.owncloud.android.Log_OC; -import com.owncloud.android.MainApp; -import com.owncloud.android.R; -import com.owncloud.android.db.DbHandler; -import com.owncloud.android.ui.activity.FailedUploadActivity; -import com.owncloud.android.ui.activity.FileActivity; -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 eu.alefzero.webdav.WebdavClient; diff --git a/src/com/owncloud/android/media/MediaControlView.java b/src/com/owncloud/android/media/MediaControlView.java index 8047f02e..b257bd37 100644 --- a/src/com/owncloud/android/media/MediaControlView.java +++ b/src/com/owncloud/android/media/MediaControlView.java @@ -42,6 +42,7 @@ import java.util.Locale; import com.owncloud.android.R; + /** * View containing controls for a {@link MediaPlayer}. * diff --git a/src/com/owncloud/android/media/MediaService.java b/src/com/owncloud/android/media/MediaService.java index 992bc7dd..eb57222c 100644 --- a/src/com/owncloud/android/media/MediaService.java +++ b/src/com/owncloud/android/media/MediaService.java @@ -43,6 +43,7 @@ import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.ui.activity.FileActivity; import com.owncloud.android.ui.activity.FileDisplayActivity; + /** * Service that handles media playback, both audio and video. * diff --git a/src/com/owncloud/android/network/AdvancedSslSocketFactory.java b/src/com/owncloud/android/network/AdvancedSslSocketFactory.java index da9a0ffc..6a698713 100644 --- a/src/com/owncloud/android/network/AdvancedSslSocketFactory.java +++ b/src/com/owncloud/android/network/AdvancedSslSocketFactory.java @@ -41,6 +41,7 @@ import org.apache.http.conn.ssl.X509HostnameVerifier; import com.owncloud.android.Log_OC; + /** * AdvancedSSLProtocolSocketFactory allows to create SSL {@link Socket}s with * a custom SSLContext and an optional Hostname Verifier. diff --git a/src/com/owncloud/android/network/AdvancedX509TrustManager.java b/src/com/owncloud/android/network/AdvancedX509TrustManager.java index ad4feb37..81dcdbd7 100644 --- a/src/com/owncloud/android/network/AdvancedX509TrustManager.java +++ b/src/com/owncloud/android/network/AdvancedX509TrustManager.java @@ -33,6 +33,7 @@ import javax.net.ssl.X509TrustManager; import com.owncloud.android.Log_OC; + /** * @author David A. Velasco */ diff --git a/src/com/owncloud/android/network/BearerAuthScheme.java b/src/com/owncloud/android/network/BearerAuthScheme.java index a4267340..16791c23 100644 --- a/src/com/owncloud/android/network/BearerAuthScheme.java +++ b/src/com/owncloud/android/network/BearerAuthScheme.java @@ -29,6 +29,7 @@ import org.apache.commons.httpclient.auth.MalformedChallengeException; import com.owncloud.android.Log_OC; + /** * Bearer authentication scheme as defined in RFC 6750. * diff --git a/src/com/owncloud/android/network/OwnCloudClientUtils.java b/src/com/owncloud/android/network/OwnCloudClientUtils.java index 43104d08..bb299381 100644 --- a/src/com/owncloud/android/network/OwnCloudClientUtils.java +++ b/src/com/owncloud/android/network/OwnCloudClientUtils.java @@ -36,11 +36,12 @@ import org.apache.commons.httpclient.protocol.Protocol; import org.apache.http.conn.ssl.BrowserCompatHostnameVerifier; import org.apache.http.conn.ssl.X509HostnameVerifier; +import com.owncloud.android.Log_OC; +import com.owncloud.android.MainApp; import com.owncloud.android.authentication.AccountAuthenticator; import com.owncloud.android.authentication.AccountUtils; import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException; -import com.owncloud.android.Log_OC; -import com.owncloud.android.MainApp; + import eu.alefzero.webdav.WebdavClient; diff --git a/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java b/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java index 02e1ad04..2649d197 100644 --- a/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java +++ b/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java @@ -31,6 +31,7 @@ import com.owncloud.android.Log_OC; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.network.ProgressiveDataTransferer; + import android.accounts.Account; import eu.alefzero.webdav.ChunkFromFileChannelRequestEntity; diff --git a/src/com/owncloud/android/operations/CreateFolderOperation.java b/src/com/owncloud/android/operations/CreateFolderOperation.java index c86d2fc3..f28ad29e 100644 --- a/src/com/owncloud/android/operations/CreateFolderOperation.java +++ b/src/com/owncloud/android/operations/CreateFolderOperation.java @@ -26,6 +26,7 @@ import com.owncloud.android.Log_OC; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; + import eu.alefzero.webdav.WebdavClient; import eu.alefzero.webdav.WebdavUtils; diff --git a/src/com/owncloud/android/operations/DownloadFileOperation.java b/src/com/owncloud/android/operations/DownloadFileOperation.java index 02098b81..db986f47 100644 --- a/src/com/owncloud/android/operations/DownloadFileOperation.java +++ b/src/com/owncloud/android/operations/DownloadFileOperation.java @@ -38,6 +38,7 @@ import com.owncloud.android.operations.RemoteOperation; import com.owncloud.android.operations.RemoteOperationResult; import com.owncloud.android.utils.FileStorageUtils; + import eu.alefzero.webdav.OnDatatransferProgressListener; import eu.alefzero.webdav.WebdavClient; import eu.alefzero.webdav.WebdavUtils; diff --git a/src/com/owncloud/android/operations/ExistenceCheckOperation.java b/src/com/owncloud/android/operations/ExistenceCheckOperation.java index 136fe224..24336bd6 100644 --- a/src/com/owncloud/android/operations/ExistenceCheckOperation.java +++ b/src/com/owncloud/android/operations/ExistenceCheckOperation.java @@ -22,6 +22,7 @@ import org.apache.commons.httpclient.methods.HeadMethod; import com.owncloud.android.Log_OC; + import eu.alefzero.webdav.WebdavClient; import eu.alefzero.webdav.WebdavUtils; import android.content.Context; diff --git a/src/com/owncloud/android/operations/OAuth2GetAccessToken.java b/src/com/owncloud/android/operations/OAuth2GetAccessToken.java index 5d468041..09a6e1e5 100644 --- a/src/com/owncloud/android/operations/OAuth2GetAccessToken.java +++ b/src/com/owncloud/android/operations/OAuth2GetAccessToken.java @@ -12,6 +12,7 @@ import com.owncloud.android.Log_OC; import com.owncloud.android.authentication.OAuth2Constants; import com.owncloud.android.operations.RemoteOperationResult.ResultCode; + import eu.alefzero.webdav.WebdavClient; public class OAuth2GetAccessToken extends RemoteOperation { diff --git a/src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java b/src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java index d95b3055..62342249 100644 --- a/src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java +++ b/src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java @@ -26,6 +26,7 @@ import com.owncloud.android.Log_OC; import com.owncloud.android.authentication.AccountUtils; import com.owncloud.android.utils.OwnCloudVersion; + import eu.alefzero.webdav.WebdavClient; import android.content.Context; import android.net.ConnectivityManager; diff --git a/src/com/owncloud/android/operations/RemoteOperation.java b/src/com/owncloud/android/operations/RemoteOperation.java index 604d62ea..6e674c46 100644 --- a/src/com/owncloud/android/operations/RemoteOperation.java +++ b/src/com/owncloud/android/operations/RemoteOperation.java @@ -26,6 +26,7 @@ import com.owncloud.android.network.BearerCredentials; import com.owncloud.android.network.OwnCloudClientUtils; import com.owncloud.android.operations.RemoteOperationResult.ResultCode; + import android.accounts.Account; import android.accounts.AccountManager; import android.accounts.AccountsException; diff --git a/src/com/owncloud/android/operations/RemoteOperationResult.java b/src/com/owncloud/android/operations/RemoteOperationResult.java index 4e137c42..8d9b3ee2 100644 --- a/src/com/owncloud/android/operations/RemoteOperationResult.java +++ b/src/com/owncloud/android/operations/RemoteOperationResult.java @@ -33,13 +33,14 @@ import org.apache.commons.httpclient.HttpException; import org.apache.commons.httpclient.HttpStatus; import org.apache.jackrabbit.webdav.DavException; -import android.accounts.Account; -import android.accounts.AccountsException; - import com.owncloud.android.Log_OC; import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException; import com.owncloud.android.network.CertificateCombinedException; +import android.accounts.Account; +import android.accounts.AccountsException; + + /** * The result of a remote operation required to an ownCloud server. * diff --git a/src/com/owncloud/android/operations/RemoveFileOperation.java b/src/com/owncloud/android/operations/RemoveFileOperation.java index ffb3a91a..659037b6 100644 --- a/src/com/owncloud/android/operations/RemoveFileOperation.java +++ b/src/com/owncloud/android/operations/RemoveFileOperation.java @@ -24,6 +24,7 @@ import com.owncloud.android.Log_OC; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; + import eu.alefzero.webdav.WebdavClient; import eu.alefzero.webdav.WebdavUtils; diff --git a/src/com/owncloud/android/operations/RenameFileOperation.java b/src/com/owncloud/android/operations/RenameFileOperation.java index f9bb4242..a2370f3b 100644 --- a/src/com/owncloud/android/operations/RenameFileOperation.java +++ b/src/com/owncloud/android/operations/RenameFileOperation.java @@ -21,15 +21,16 @@ 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.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.utils.FileStorageUtils; +//import org.apache.jackrabbit.webdav.client.methods.MoveMethod; + +import android.accounts.Account; + import eu.alefzero.webdav.WebdavClient; import eu.alefzero.webdav.WebdavUtils; diff --git a/src/com/owncloud/android/operations/SynchronizeFileOperation.java b/src/com/owncloud/android/operations/SynchronizeFileOperation.java index b5f6575a..2e15c2fe 100644 --- a/src/com/owncloud/android/operations/SynchronizeFileOperation.java +++ b/src/com/owncloud/android/operations/SynchronizeFileOperation.java @@ -23,10 +23,6 @@ import org.apache.jackrabbit.webdav.DavConstants; 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.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; @@ -34,6 +30,11 @@ import com.owncloud.android.files.services.FileDownloader; import com.owncloud.android.files.services.FileUploader; import com.owncloud.android.operations.RemoteOperationResult.ResultCode; +import android.accounts.Account; +import android.content.Context; +import android.content.Intent; + + import eu.alefzero.webdav.WebdavClient; import eu.alefzero.webdav.WebdavEntry; import eu.alefzero.webdav.WebdavUtils; diff --git a/src/com/owncloud/android/operations/UpdateOCVersionOperation.java b/src/com/owncloud/android/operations/UpdateOCVersionOperation.java index 1643377b..2e116ac6 100644 --- a/src/com/owncloud/android/operations/UpdateOCVersionOperation.java +++ b/src/com/owncloud/android/operations/UpdateOCVersionOperation.java @@ -22,16 +22,17 @@ import org.apache.commons.httpclient.methods.GetMethod; import org.json.JSONException; import org.json.JSONObject; -import android.accounts.Account; -import android.accounts.AccountManager; -import android.content.Context; - +import com.owncloud.android.Log_OC; import com.owncloud.android.authentication.AccountAuthenticator; import com.owncloud.android.authentication.AccountUtils; -import com.owncloud.android.Log_OC; import com.owncloud.android.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.utils.OwnCloudVersion; +import android.accounts.Account; +import android.accounts.AccountManager; +import android.content.Context; + + import eu.alefzero.webdav.WebdavClient; /** diff --git a/src/com/owncloud/android/operations/UploadFileOperation.java b/src/com/owncloud/android/operations/UploadFileOperation.java index cae1f179..936ac01e 100644 --- a/src/com/owncloud/android/operations/UploadFileOperation.java +++ b/src/com/owncloud/android/operations/UploadFileOperation.java @@ -33,8 +33,6 @@ import org.apache.commons.httpclient.methods.RequestEntity; import org.apache.http.HttpStatus; import com.owncloud.android.Log_OC; -import android.accounts.Account; - import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.files.services.FileUploader; import com.owncloud.android.network.ProgressiveDataTransferer; @@ -43,6 +41,9 @@ import com.owncloud.android.operations.RemoteOperationResult; import com.owncloud.android.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.utils.FileStorageUtils; +import android.accounts.Account; + + import eu.alefzero.webdav.FileRequestEntity; import eu.alefzero.webdav.OnDatatransferProgressListener; import eu.alefzero.webdav.WebdavClient; diff --git a/src/com/owncloud/android/providers/FileContentProvider.java b/src/com/owncloud/android/providers/FileContentProvider.java index 917fd667..41b643c3 100644 --- a/src/com/owncloud/android/providers/FileContentProvider.java +++ b/src/com/owncloud/android/providers/FileContentProvider.java @@ -28,6 +28,7 @@ import com.owncloud.android.db.ProviderMeta; import com.owncloud.android.db.ProviderMeta.ProviderTableMeta; + import android.content.ContentProvider; import android.content.ContentProviderOperation; import android.content.ContentProviderResult; diff --git a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java index 34ef4524..a3e7926a 100644 --- a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java +++ b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java @@ -29,6 +29,7 @@ import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException 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 --git a/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java b/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java index f65e28c2..b07c048a 100644 --- a/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java +++ b/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java @@ -27,6 +27,7 @@ import org.apache.http.entity.ByteArrayEntity; import com.owncloud.android.authentication.AccountAuthenticator; import com.owncloud.android.authentication.AccountUtils; + import android.accounts.Account; import android.accounts.AccountManager; import android.accounts.AuthenticatorException; diff --git a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java index 9204aa0c..7a00b2ef 100644 --- a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java +++ b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java @@ -38,6 +38,7 @@ import com.owncloud.android.operations.UpdateOCVersionOperation; import com.owncloud.android.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.ui.activity.ErrorsWhileCopyingHandlerActivity; + import android.accounts.Account; import android.accounts.AccountsException; import android.app.Notification; diff --git a/src/com/owncloud/android/ui/QuickAction.java b/src/com/owncloud/android/ui/QuickAction.java index 8ae71ec4..86fe3fe3 100644 --- a/src/com/owncloud/android/ui/QuickAction.java +++ b/src/com/owncloud/android/ui/QuickAction.java @@ -38,6 +38,7 @@ import java.util.ArrayList; import com.owncloud.android.R; + /** * Popup window, shows action list as icon and text like the one in Gallery3D * app. diff --git a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java index 1b73c86e..80e38f79 100644 --- a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java +++ b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java @@ -47,13 +47,13 @@ import com.actionbarsherlock.app.SherlockListActivity; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuItem; -import com.owncloud.android.authentication.AccountAuthenticator; -import com.owncloud.android.authentication.AuthenticatorActivity; -import com.owncloud.android.authentication.AccountUtils; import com.owncloud.android.Log_OC; import com.owncloud.android.MainApp; - import com.owncloud.android.R; +import com.owncloud.android.authentication.AccountAuthenticator; +import com.owncloud.android.authentication.AccountUtils; +import com.owncloud.android.authentication.AuthenticatorActivity; + public class AccountSelectActivity extends SherlockListActivity implements AccountManagerCallback { diff --git a/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java b/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java index d61626c0..056ffd6c 100644 --- a/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java +++ b/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java @@ -43,10 +43,12 @@ 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; + /** * Activity reporting errors occurred when local files uploaded to an ownCloud account with an app in * version under 1.3.16 where being copied to the ownCloud local folder. @@ -118,6 +120,7 @@ public class ErrorsWhileCopyingHandlerActivity extends SherlockFragmentActivity /// customize buttons Button cancelBtn = (Button) findViewById(R.id.cancel); Button okBtn = (Button) findViewById(R.id.ok); + okBtn.setText(R.string.foreign_files_move); cancelBtn.setOnClickListener(this); okBtn.setOnClickListener(this); diff --git a/src/com/owncloud/android/ui/activity/FailedUploadActivity.java b/src/com/owncloud/android/ui/activity/FailedUploadActivity.java index 4c13fb27..33432cfb 100644 --- a/src/com/owncloud/android/ui/activity/FailedUploadActivity.java +++ b/src/com/owncloud/android/ui/activity/FailedUploadActivity.java @@ -17,6 +17,8 @@ package com.owncloud.android.ui.activity; +import com.owncloud.android.R; + import android.app.Activity; import android.os.Bundle; import android.view.View; @@ -24,7 +26,6 @@ import android.view.View.OnClickListener; import android.widget.Button; import android.widget.TextView; -import com.owncloud.android.R; /** * This Activity is used to display a detail message for failed uploads @@ -44,8 +45,9 @@ public class FailedUploadActivity extends Activity { String message = getIntent().getStringExtra(MESSAGE); TextView textView = (TextView) findViewById(R.id.faild_upload_message); textView.setText(message); - Button close_button = (Button) findViewById(R.id.failed_uploadactivity_close_button); - close_button.setOnClickListener(new OnClickListener() { + Button closeBtn = (Button) findViewById(R.id.failed_uploadactivity_close_button); + + closeBtn.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { finish(); diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java index 1faf8b1f..cddf9b66 100644 --- a/src/com/owncloud/android/ui/activity/FileActivity.java +++ b/src/com/owncloud/android/ui/activity/FileActivity.java @@ -35,6 +35,7 @@ import com.owncloud.android.R; import com.owncloud.android.authentication.AccountUtils; import com.owncloud.android.datamodel.OCFile; + import eu.alefzero.webdav.WebdavUtils; /** diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java index 6f14c645..0654f1f4 100644 --- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -63,9 +63,9 @@ import com.owncloud.android.R; 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.FileDownloader.FileDownloaderBinder; import com.owncloud.android.files.services.FileObserverService; import com.owncloud.android.files.services.FileUploader; +import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder; import com.owncloud.android.files.services.FileUploader.FileUploaderBinder; import com.owncloud.android.operations.CreateFolderOperation; import com.owncloud.android.operations.OnRemoteOperationListener; @@ -89,6 +89,7 @@ import com.owncloud.android.ui.preview.PreviewImageActivity; import com.owncloud.android.ui.preview.PreviewMediaFragment; import com.owncloud.android.ui.preview.PreviewVideoActivity; + /** * Displays, what files the user has available in his ownCloud. * diff --git a/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java b/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java index 4c433a93..b971c40c 100644 --- a/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java +++ b/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java @@ -33,6 +33,7 @@ import android.widget.TextView; import com.actionbarsherlock.app.SherlockFragmentActivity; import com.owncloud.android.R; + /** * Activity showing a text message and, optionally, a couple list of single or paired text strings. * diff --git a/src/com/owncloud/android/ui/activity/InstantUploadActivity.java b/src/com/owncloud/android/ui/activity/InstantUploadActivity.java index f0ee7219..a851dd18 100644 --- a/src/com/owncloud/android/ui/activity/InstantUploadActivity.java +++ b/src/com/owncloud/android/ui/activity/InstantUploadActivity.java @@ -19,6 +19,14 @@ 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 android.accounts.Account; import android.app.Activity; import android.content.Intent; @@ -41,13 +49,6 @@ import android.widget.LinearLayout; import android.widget.TextView; import android.widget.Toast; -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; /** * This Activity is used to display a list with images they could not be @@ -76,14 +77,14 @@ public class InstantUploadActivity extends Activity { super.onCreate(savedInstanceState); setContentView(R.layout.failed_upload_files); - Button delete_all_btn = (Button) findViewById(R.id.failed_upload_delete_all_btn); - delete_all_btn.setOnClickListener(getDeleteListner()); - Button retry_all_btn = (Button) findViewById(R.id.failed_upload_retry_all_btn); - retry_all_btn.setOnClickListener(getRetryListner()); + Button deleteAllBtn = (Button) findViewById(R.id.failed_upload_delete_all_btn); + deleteAllBtn.setOnClickListener(getDeleteListner()); + Button retryAllBtn = (Button) findViewById(R.id.failed_upload_retry_all_btn); + retryAllBtn.setOnClickListener(getRetryListner()); this.failed_upload_all_cb = (CheckBox) findViewById(R.id.failed_upload_headline_cb); failed_upload_all_cb.setOnCheckedChangeListener(getCheckAllListener()); listView = (LinearLayout) findViewById(R.id.failed_upload_scrollviewlayout); - + loadListView(true); } diff --git a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java b/src/com/owncloud/android/ui/activity/LogHistoryActivity.java index 0c99fcfa..e879cc7e 100644 --- a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java +++ b/src/com/owncloud/android/ui/activity/LogHistoryActivity.java @@ -38,6 +38,7 @@ import com.owncloud.android.utils.FileStorageUtils; + public class LogHistoryActivity extends SherlockPreferenceActivity implements OnPreferenceChangeListener { String logpath = FileStorageUtils.getLogPath(); File logDIR = null; @@ -52,6 +53,7 @@ public class LogHistoryActivity extends SherlockPreferenceActivity implements On actionBar.setDisplayHomeAsUpEnabled(true); ListView listView = (ListView) findViewById(android.R.id.list); Button deleteHistoryButton = (Button) findViewById(R.id.deleteLogHistoryButton); + deleteHistoryButton.setOnClickListener(new OnClickListener() { @Override diff --git a/src/com/owncloud/android/ui/activity/PinCodeActivity.java b/src/com/owncloud/android/ui/activity/PinCodeActivity.java index 215ea45f..c962fb2f 100644 --- a/src/com/owncloud/android/ui/activity/PinCodeActivity.java +++ b/src/com/owncloud/android/ui/activity/PinCodeActivity.java @@ -19,7 +19,6 @@ package com.owncloud.android.ui.activity; import java.util.Arrays; import com.actionbarsherlock.app.SherlockFragmentActivity; - import com.owncloud.android.R; import android.app.AlertDialog; @@ -81,8 +80,6 @@ public class PinCodeActivity extends SherlockFragmentActivity { mText3 = (EditText) findViewById(R.id.txt3); mText4 = (EditText) findViewById(R.id.txt4); - - SharedPreferences appPrefs = PreferenceManager .getDefaultSharedPreferences(getApplicationContext()); diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java index 0d96becb..e94942e2 100644 --- a/src/com/owncloud/android/ui/activity/Preferences.java +++ b/src/com/owncloud/android/ui/activity/Preferences.java @@ -41,6 +41,7 @@ import com.owncloud.android.OwnCloudSession; import com.owncloud.android.R; import com.owncloud.android.db.DbHandler; + /** * An Activity that allows the user to change the application's settings. * diff --git a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java index a6031cdb..cc1f7de1 100644 --- a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java +++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java @@ -35,14 +35,14 @@ 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.Log_OC; -import com.owncloud.android.R; /** * Displays local files and let the user choose what of them wants to upload @@ -107,6 +107,7 @@ public class UploadFilesActivity extends FileActivity implements mCancelBtn.setOnClickListener(this); mUploadBtn = (Button) findViewById(R.id.upload_files_btn_upload); mUploadBtn.setOnClickListener(this); + // Action bar setup ActionBar actionBar = getSupportActionBar(); diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java index 5e6d01b2..a864f7a5 100644 --- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java +++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java @@ -28,6 +28,9 @@ import android.widget.ListAdapter; import android.widget.ListView; import android.widget.TextView; + +import java.util.Vector; + import com.owncloud.android.DisplayUtils; import com.owncloud.android.R; import com.owncloud.android.authentication.AccountUtils; @@ -37,8 +40,6 @@ import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder; import com.owncloud.android.files.services.FileUploader.FileUploaderBinder; import com.owncloud.android.ui.activity.TransferServiceGetter; -import java.util.Vector; - /** * This Adapter populates a ListView with all files and folders in an ownCloud @@ -54,9 +55,6 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter { 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 --git a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java index c93a2d9c..ff883c56 100644 --- a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java +++ b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java @@ -24,6 +24,7 @@ import java.util.Comparator; import com.owncloud.android.DisplayUtils; import com.owncloud.android.R; + import android.content.Context; import android.view.LayoutInflater; import android.view.View; diff --git a/src/com/owncloud/android/ui/adapter/LogListAdapter.java b/src/com/owncloud/android/ui/adapter/LogListAdapter.java index 6b6e8f6f..ae4335ef 100644 --- a/src/com/owncloud/android/ui/adapter/LogListAdapter.java +++ b/src/com/owncloud/android/ui/adapter/LogListAdapter.java @@ -2,6 +2,8 @@ package com.owncloud.android.ui.adapter; import java.io.File; +import com.owncloud.android.R; + import android.content.Context; import android.content.Intent; import android.net.Uri; @@ -13,7 +15,6 @@ import android.view.ViewGroup; import android.widget.ArrayAdapter; import android.widget.TextView; -import com.owncloud.android.R; public class LogListAdapter extends ArrayAdapter { diff --git a/src/com/owncloud/android/ui/dialog/ChangelogDialog.java b/src/com/owncloud/android/ui/dialog/ChangelogDialog.java index 1822ce0a..676bea57 100644 --- a/src/com/owncloud/android/ui/dialog/ChangelogDialog.java +++ b/src/com/owncloud/android/ui/dialog/ChangelogDialog.java @@ -26,6 +26,7 @@ import android.webkit.WebView; import com.actionbarsherlock.app.SherlockDialogFragment; import com.owncloud.android.R; + /** * Dialog to show the contents of res/raw/CHANGELOG.txt */ diff --git a/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java b/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java index 6da58bc1..1998fcb8 100644 --- a/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java +++ b/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java @@ -29,6 +29,7 @@ import com.actionbarsherlock.app.SherlockDialogFragment; import com.actionbarsherlock.app.SherlockFragmentActivity; import com.owncloud.android.R; + /** * Dialog which will be displayed to user upon keep-in-sync file conflict. * diff --git a/src/com/owncloud/android/ui/dialog/EditNameDialog.java b/src/com/owncloud/android/ui/dialog/EditNameDialog.java index d45140e2..4d6243af 100644 --- a/src/com/owncloud/android/ui/dialog/EditNameDialog.java +++ b/src/com/owncloud/android/ui/dialog/EditNameDialog.java @@ -32,6 +32,7 @@ import com.actionbarsherlock.app.SherlockDialogFragment; import com.owncloud.android.R; + /** * Dialog to request the user to input a name, optionally initialized with a former name. * diff --git a/src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java b/src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java index 1dd586dc..dbd3d991 100644 --- a/src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java +++ b/src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java @@ -27,6 +27,7 @@ import android.view.KeyEvent; import com.actionbarsherlock.app.SherlockDialogFragment; import com.owncloud.android.R; + public class IndeterminateProgressDialog extends SherlockDialogFragment { private static final String ARG_MESSAGE_ID = IndeterminateProgressDialog.class.getCanonicalName() + ".ARG_MESSAGE_ID"; diff --git a/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java b/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java index a5219a22..516fce10 100644 --- a/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java +++ b/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java @@ -40,6 +40,7 @@ import com.owncloud.android.R; import com.owncloud.android.authentication.SsoWebViewClient; import com.owncloud.android.authentication.SsoWebViewClient.SsoWebViewClientListener; + import eu.alefzero.webdav.WebdavClient; /** diff --git a/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java b/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java index 6ae4156d..1ccc8fa8 100644 --- a/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java +++ b/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java @@ -29,6 +29,12 @@ import java.util.Map; import javax.security.auth.x500.X500Principal; +import com.owncloud.android.Log_OC; +import com.owncloud.android.R; +import com.owncloud.android.network.CertificateCombinedException; +import com.owncloud.android.network.OwnCloudClientUtils; +import com.owncloud.android.operations.RemoteOperationResult; + import android.app.Dialog; import android.content.Context; import android.os.Bundle; @@ -37,11 +43,6 @@ import android.view.Window; import android.widget.Button; import android.widget.TextView; -import com.owncloud.android.Log_OC; -import com.owncloud.android.R; -import com.owncloud.android.network.CertificateCombinedException; -import com.owncloud.android.network.OwnCloudClientUtils; -import com.owncloud.android.operations.RemoteOperationResult; /** * Dialog to request the user about a certificate that could not be validated with the certificates store in the system. @@ -142,11 +143,11 @@ public class SslValidatorDialog extends Dialog { View detailsScroll = findViewById(R.id.details_scroll); if (detailsScroll.getVisibility() == View.VISIBLE) { detailsScroll.setVisibility(View.GONE); - ((Button)v).setText(R.string.ssl_validator_btn_details_see); + ((Button) v).setText(R.string.ssl_validator_btn_details_see); } else { detailsScroll.setVisibility(View.VISIBLE); - ((Button)v).setText(R.string.ssl_validator_btn_details_hide); + ((Button) v).setText(R.string.ssl_validator_btn_details_hide); } } }); diff --git a/src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java b/src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java index d528b341..869cb266 100644 --- a/src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java +++ b/src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java @@ -26,6 +26,7 @@ import android.os.Bundle; import com.actionbarsherlock.app.SherlockDialogFragment; import com.owncloud.android.Log_OC; + public class ConfirmationDialogFragment extends SherlockDialogFragment { public final static String ARG_CONF_RESOURCE_ID = "resource_id"; diff --git a/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java b/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java index 3e519a8b..a57fb095 100644 --- a/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java +++ b/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java @@ -23,6 +23,7 @@ import com.owncloud.android.Log_OC; import com.owncloud.android.R; import com.owncloud.android.ui.ExtendedListView; + import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java index 75bd4a99..af737662 100644 --- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java +++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java @@ -48,17 +48,17 @@ 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.files.services.FileDownloader.FileDownloaderBinder; import com.owncloud.android.files.services.FileObserverService; import com.owncloud.android.files.services.FileUploader; +import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder; import com.owncloud.android.files.services.FileUploader.FileUploaderBinder; import com.owncloud.android.operations.OnRemoteOperationListener; import com.owncloud.android.operations.RemoteOperation; import com.owncloud.android.operations.RemoteOperationResult; -import com.owncloud.android.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.operations.RemoveFileOperation; import com.owncloud.android.operations.RenameFileOperation; import com.owncloud.android.operations.SynchronizeFileOperation; +import com.owncloud.android.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.ui.activity.ConflictsResolveActivity; import com.owncloud.android.ui.activity.FileActivity; import com.owncloud.android.ui.activity.FileDisplayActivity; @@ -66,6 +66,7 @@ import com.owncloud.android.ui.dialog.EditNameDialog; import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener; import com.owncloud.android.ui.preview.PreviewImageFragment; + import eu.alefzero.webdav.OnDatatransferProgressListener; /** diff --git a/src/com/owncloud/android/ui/fragment/FileFragment.java b/src/com/owncloud/android/ui/fragment/FileFragment.java index 4c6f3e71..b6c65749 100644 --- a/src/com/owncloud/android/ui/fragment/FileFragment.java +++ b/src/com/owncloud/android/ui/fragment/FileFragment.java @@ -24,6 +24,7 @@ import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.files.FileHandler; import com.owncloud.android.ui.activity.TransferServiceGetter; + /** * Common methods for {@link Fragment}s containing {@link OCFile}s * diff --git a/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java b/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java index 24421fa5..40c03a46 100644 --- a/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java +++ b/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java @@ -19,8 +19,11 @@ 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 android.app.Activity; import android.os.Bundle; import android.os.Environment; @@ -32,8 +35,6 @@ import android.widget.AdapterView; import android.widget.ImageView; import android.widget.ListView; -import com.owncloud.android.Log_OC; -import com.owncloud.android.R; /** * A Fragment that lists all files and folders in a given LOCAL path. diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java index 2627f93a..a3c6d3be 100644 --- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java +++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java @@ -43,6 +43,7 @@ import com.owncloud.android.ui.fragment.ConfirmationDialogFragment.ConfirmationD import com.owncloud.android.ui.preview.PreviewImageFragment; import com.owncloud.android.ui.preview.PreviewMediaFragment; + import android.accounts.Account; import android.app.Activity; import android.os.Bundle; diff --git a/src/com/owncloud/android/ui/preview/FileDownloadFragment.java b/src/com/owncloud/android/ui/preview/FileDownloadFragment.java index d3d5fe91..306df1f7 100644 --- a/src/com/owncloud/android/ui/preview/FileDownloadFragment.java +++ b/src/com/owncloud/android/ui/preview/FileDownloadFragment.java @@ -19,6 +19,12 @@ 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 android.accounts.Account; import android.app.Activity; import android.os.Bundle; @@ -31,12 +37,7 @@ import android.widget.ImageButton; import android.widget.ProgressBar; import android.widget.TextView; -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.Log_OC; -import com.owncloud.android.R; import eu.alefzero.webdav.OnDatatransferProgressListener; diff --git a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java index 9c48cc18..ef48d123 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java @@ -35,20 +35,20 @@ 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; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.files.services.FileDownloader; -import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder; import com.owncloud.android.files.services.FileUploader; +import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder; import com.owncloud.android.files.services.FileUploader.FileUploaderBinder; 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.Log_OC; -import com.owncloud.android.R; /** * Holds a swiping galley where image files contained in an ownCloud directory are shown diff --git a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java index 578c56e8..9ef4db4b 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java @@ -50,6 +50,8 @@ 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; import com.owncloud.android.operations.OnRemoteOperationListener; @@ -59,8 +61,6 @@ import com.owncloud.android.operations.RemoveFileOperation; import com.owncloud.android.ui.fragment.ConfirmationDialogFragment; import com.owncloud.android.ui.fragment.FileFragment; -import com.owncloud.android.Log_OC; -import com.owncloud.android.R; import eu.alefzero.webdav.WebdavUtils; diff --git a/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java b/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java index 6ef06189..de90b4bd 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java +++ b/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java @@ -22,6 +22,9 @@ import java.util.Map; import java.util.Set; import java.util.Vector; +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; @@ -29,8 +32,6 @@ 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 --git a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java index 5ffd52ed..815dbbde 100644 --- a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java @@ -52,6 +52,8 @@ 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; import com.owncloud.android.media.MediaControlView; @@ -66,8 +68,6 @@ 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.Log_OC; -import com.owncloud.android.R; import eu.alefzero.webdav.WebdavUtils; /** diff --git a/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java b/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java index 47441ffb..7db07b35 100644 --- a/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java +++ b/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java @@ -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.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; @@ -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. * diff --git a/src/com/owncloud/android/utils/FileStorageUtils.java b/src/com/owncloud/android/utils/FileStorageUtils.java index 55399525..0c7e9911 100644 --- a/src/com/owncloud/android/utils/FileStorageUtils.java +++ b/src/com/owncloud/android/utils/FileStorageUtils.java @@ -19,15 +19,16 @@ package com.owncloud.android.utils; import java.io.File; +import com.owncloud.android.MainApp; +import com.owncloud.android.R; +import com.owncloud.android.datamodel.OCFile; + import android.annotation.SuppressLint; import android.content.Context; import android.net.Uri; import android.os.Environment; import android.os.StatFs; -import com.owncloud.android.MainApp; -import com.owncloud.android.R; -import com.owncloud.android.datamodel.OCFile; /** * Static methods to help in access to local file system. diff --git a/src/com/owncloud/android/widgets/ActionEditText.java b/src/com/owncloud/android/widgets/ActionEditText.java index efa6655b..1077d154 100644 --- a/src/com/owncloud/android/widgets/ActionEditText.java +++ b/src/com/owncloud/android/widgets/ActionEditText.java @@ -22,6 +22,7 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import com.owncloud.android.R; + import android.content.Context; import android.content.res.TypedArray; import android.graphics.Canvas; diff --git a/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java b/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java index 103cd04a..a91b64ea 100644 --- a/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java +++ b/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java @@ -32,6 +32,7 @@ import org.apache.commons.httpclient.methods.RequestEntity; import com.owncloud.android.Log_OC; import com.owncloud.android.network.ProgressiveDataTransferer; + import eu.alefzero.webdav.OnDatatransferProgressListener; diff --git a/src/eu/alefzero/webdav/FileRequestEntity.java b/src/eu/alefzero/webdav/FileRequestEntity.java index a8f01d63..1d525c43 100644 --- a/src/eu/alefzero/webdav/FileRequestEntity.java +++ b/src/eu/alefzero/webdav/FileRequestEntity.java @@ -34,6 +34,7 @@ import org.apache.commons.httpclient.methods.RequestEntity; import com.owncloud.android.Log_OC; import com.owncloud.android.network.ProgressiveDataTransferer; + import eu.alefzero.webdav.OnDatatransferProgressListener; diff --git a/src/eu/alefzero/webdav/WebdavClient.java b/src/eu/alefzero/webdav/WebdavClient.java index 65a8f00a..51209280 100644 --- a/src/eu/alefzero/webdav/WebdavClient.java +++ b/src/eu/alefzero/webdav/WebdavClient.java @@ -43,10 +43,11 @@ import org.apache.http.params.CoreProtocolPNames; import com.owncloud.android.Log_OC; import com.owncloud.android.MainApp; - import com.owncloud.android.network.BearerAuthScheme; import com.owncloud.android.network.BearerCredentials; + + import android.net.Uri; public class WebdavClient extends HttpClient { diff --git a/src/eu/alefzero/webdav/WebdavEntry.java b/src/eu/alefzero/webdav/WebdavEntry.java index 665a850c..1c6ba695 100644 --- a/src/eu/alefzero/webdav/WebdavEntry.java +++ b/src/eu/alefzero/webdav/WebdavEntry.java @@ -25,6 +25,7 @@ import org.apache.jackrabbit.webdav.property.DavPropertySet; import com.owncloud.android.Log_OC; + import android.net.Uri; public class WebdavEntry { diff --git a/tests/.classpath b/tests/.classpath index 2731f9c5..66527241 100644 --- a/tests/.classpath +++ b/tests/.classpath @@ -1,9 +1,10 @@ - - - + + + + diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml index 8c613c20..025e6bd9 100644 --- a/tests/AndroidManifest.xml +++ b/tests/AndroidManifest.xml @@ -11,11 +11,11 @@ + android:targetPackage="com.owncloud.android" + android:label="Tests for com.owncloud.android"/> diff --git a/tests/src/com/owncloud/android/test/AccountUtilsTest.java b/tests/src/com/owncloud/android/test/AccountUtilsTest.java index 51030a55..529776b7 100644 --- a/tests/src/com/owncloud/android/test/AccountUtilsTest.java +++ b/tests/src/com/owncloud/android/test/AccountUtilsTest.java @@ -34,21 +34,21 @@ public class AccountUtilsTest extends AndroidTestCase { OwnCloudVersion ocv45 = new OwnCloudVersion(0x040500); OwnCloudVersion ocv70 = new OwnCloudVersion(0x070000); - assertTrue(AccountUtils.getWebdavPath(ocv12, false).equals("/webdav/owncloud.php")); - assertTrue(AccountUtils.getWebdavPath(ocv12s, false).equals("/webdav/owncloud.php")); - assertTrue(AccountUtils.getWebdavPath(ocv22, false).equals("/files/webdav.php")); - assertTrue(AccountUtils.getWebdavPath(ocv30,false).equals("/files/webdav.php")); - assertTrue(AccountUtils.getWebdavPath(ocv33s, false).equals("/files/webdav.php")); - assertTrue(AccountUtils.getWebdavPath(ocv45, false).equals("/remote.php/webdav")); - assertTrue(AccountUtils.getWebdavPath(ocv70, false).equals("/remote.php/webdav")); - assertNull(AccountUtils.getWebdavPath(null, false)); - assertTrue(AccountUtils.getWebdavPath(ocv12, true).equals("/remote.php/odav")); - assertTrue(AccountUtils.getWebdavPath(ocv12s, true).equals("/remote.php/odav")); - assertTrue(AccountUtils.getWebdavPath(ocv22, true).equals("/remote.php/odav")); - assertTrue(AccountUtils.getWebdavPath(ocv30, true).equals("/remote.php/odav")); - assertTrue(AccountUtils.getWebdavPath(ocv33s, true).equals("/remote.php/odav")); - assertTrue(AccountUtils.getWebdavPath(ocv45, true).equals("/remote.php/odav")); - assertTrue(AccountUtils.getWebdavPath(ocv70, true).equals("/remote.php/odav")); + assertTrue(AccountUtils.getWebdavPath(ocv12, false, false).equals("/webdav/owncloud.php")); + assertTrue(AccountUtils.getWebdavPath(ocv12s, false, false).equals("/webdav/owncloud.php")); + assertTrue(AccountUtils.getWebdavPath(ocv22, false, false).equals("/files/webdav.php")); + assertTrue(AccountUtils.getWebdavPath(ocv30,false, false).equals("/files/webdav.php")); + assertTrue(AccountUtils.getWebdavPath(ocv33s, false, false).equals("/files/webdav.php")); + assertTrue(AccountUtils.getWebdavPath(ocv45, false, false).equals("/remote.php/webdav")); + assertTrue(AccountUtils.getWebdavPath(ocv70, false, false).equals("/remote.php/webdav")); + assertNull(AccountUtils.getWebdavPath(null, false, false)); + assertTrue(AccountUtils.getWebdavPath(ocv12, true, false).equals("/remote.php/odav")); + assertTrue(AccountUtils.getWebdavPath(ocv12s, true, false).equals("/remote.php/odav")); + assertTrue(AccountUtils.getWebdavPath(ocv22, true, false).equals("/remote.php/odav")); + assertTrue(AccountUtils.getWebdavPath(ocv30, true, false).equals("/remote.php/odav")); + assertTrue(AccountUtils.getWebdavPath(ocv33s, true, false).equals("/remote.php/odav")); + assertTrue(AccountUtils.getWebdavPath(ocv45, true, false).equals("/remote.php/odav")); + assertTrue(AccountUtils.getWebdavPath(ocv70, true, false).equals("/remote.php/odav")); OwnCloudVersion invalidVer = new OwnCloudVersion("a.b.c"); assertFalse(invalidVer.isVersionValid()); diff --git a/tests/src/com/owncloud/android/test/FileContentProviderTest.java b/tests/src/com/owncloud/android/test/FileContentProviderTest.java index e0345e78..8f6fe81d 100644 --- a/tests/src/com/owncloud/android/test/FileContentProviderTest.java +++ b/tests/src/com/owncloud/android/test/FileContentProviderTest.java @@ -2,7 +2,6 @@ package com.owncloud.android.test; import com.owncloud.android.db.ProviderMeta.ProviderTableMeta; import com.owncloud.android.providers.FileContentProvider; - import android.annotation.TargetApi; import android.net.Uri; import android.os.Build; @@ -24,7 +23,7 @@ public class FileContentProviderTest extends ProviderTestCase2