From 6ace8ab1c18b23a4c016986256075cfda8e50104 Mon Sep 17 00:00:00 2001 From: masensio Date: Tue, 29 Oct 2013 14:10:42 +0100 Subject: [PATCH] Update packageName --- AndroidManifest.xml | 6 +- oc_jb_workaround/AndroidManifest.xml | 2 +- .../accounts/AccountAuthenticatorService.java | 4 +- pom.xml | 2 +- res/layout-land/account_setup.xml | 2 +- res/layout-v14/generic_explanation.xml | 4 +- res/layout/account_setup.xml | 2 +- res/layout/extensions_available_dialog.xml | 4 +- res/layout/failed_upload_files.xml | 4 +- res/layout/failed_upload_message_view.xml | 2 +- res/layout/file_preview.xml | 2 +- res/layout/generic_explanation.xml | 4 +- res/layout/list_fragment.xml | 2 +- res/layout/log_send_file.xml | 2 +- res/layout/no_account_available.xml | 2 +- res/layout/pincodelock.xml | 2 +- res/layout/ssl_validator_layout.xml | 6 +- res/layout/sso_dialog.xml | 2 +- res/layout/upload_files_layout.xml | 6 +- res/layout/uploader_layout.xml | 2 +- res/raw-de/changelog.html | 2 +- res/raw-es/changelog.html | 2 +- res/raw/changelog.html | 2 +- res/values/oauth2_configuration.xml | 2 +- res/values/setup.xml | 2 +- .../owncloud}/android/DisplayUtils.java | 2 +- .../cloud => com/owncloud}/android/Log_OC.java | 2 +- .../cloud => com/owncloud}/android/MainApp.java | 2 +- .../owncloud}/android/OwnCloudSession.java | 2 +- .../cloud => com/owncloud}/android/Uploader.java | 17 +++--- .../authentication/AccountAuthenticator.java | 15 ++--- .../AccountAuthenticatorActivity.java | 2 +- .../AccountAuthenticatorService.java | 2 +- .../android/authentication/AccountUtils.java | 6 +- .../authentication/AuthenticatorActivity.java | 36 ++++++------ .../android/authentication/OAuth2Constants.java | 2 +- .../android/authentication/SsoWebViewClient.java | 5 +- .../android/datamodel/DataStorageManager.java | 2 +- .../android/datamodel/FileDataStorageManager.java | 11 ++-- .../owncloud}/android/datamodel/OCFile.java | 5 +- .../owncloud}/android/db/DbHandler.java | 6 +- .../owncloud}/android/db/ProviderMeta.java | 4 +- .../extensions/ExtensionsAvailableActivity.java | 2 +- .../extensions/ExtensionsAvailableDialog.java | 9 +-- .../android/extensions/ExtensionsListActivity.java | 7 ++- .../android/files/BootupBroadcastReceiver.java | 6 +- .../owncloud}/android/files/FileHandler.java | 4 +- .../files/InstantUploadBroadcastReceiver.java | 15 ++--- .../android/files/OwnCloudFileObserver.java | 17 +++--- .../files/managers/OCNotificationManager.java | 5 +- .../android/files/services/FileDownloader.java | 31 +++++----- .../files/services/FileObserverService.java | 17 +++--- .../android/files/services/FileUploader.java | 49 ++++++++-------- .../files/services/OnUploadCompletedListener.java | 2 +- .../location/LocationServiceLauncherReciever.java | 8 +-- .../android/location/LocationUpdateService.java | 7 ++- .../owncloud}/android/media/MediaControlView.java | 5 +- .../owncloud}/android/media/MediaService.java | 15 ++--- .../android/media/MediaServiceBinder.java | 8 +-- .../android/network/AdvancedSslSocketFactory.java | 5 +- .../android/network/AdvancedX509TrustManager.java | 5 +- .../android/network/BearerAuthScheme.java | 5 +- .../android/network/BearerCredentials.java | 2 +- .../network/CertificateCombinedException.java | 2 +- .../android/network/OwnCloudClientUtils.java | 13 +++-- .../android/network/ProgressiveDataTransferer.java | 2 +- .../operations/ChunkedUploadFileOperation.java | 9 +-- .../android/operations/CreateFolderOperation.java | 9 +-- .../android/operations/DownloadFileOperation.java | 13 +++-- .../operations/ExistenceCheckOperation.java | 5 +- .../android/operations/OAuth2GetAccessToken.java | 9 +-- .../operations/OnRemoteOperationListener.java | 2 +- .../operations/OperationCancelledException.java | 2 +- .../operations/OwnCloudServerCheckOperation.java | 9 +-- .../android/operations/RemoteOperation.java | 13 +++-- .../android/operations/RemoteOperationResult.java | 9 +-- .../android/operations/RemoveFileOperation.java | 9 +-- .../android/operations/RenameFileOperation.java | 13 +++-- .../operations/SynchronizeFileOperation.java | 15 ++--- .../operations/SynchronizeFolderOperation.java | 13 +++-- .../operations/UpdateOCVersionOperation.java | 13 +++-- .../android/operations/UploadFileOperation.java | 19 ++++--- .../android/providers/FileContentProvider.java | 11 ++-- .../syncadapter/AbstractOwnCloudSyncAdapter.java | 11 ++-- .../android/syncadapter/ContactSyncAdapter.java | 7 ++- .../android/syncadapter/ContactSyncService.java | 2 +- .../android/syncadapter/FileSyncAdapter.java | 27 ++++----- .../android/syncadapter/FileSyncService.java | 2 +- .../owncloud}/android/ui/ActionItem.java | 2 +- .../owncloud}/android/ui/CustomButton.java | 5 +- .../owncloud}/android/ui/CustomPopup.java | 2 +- .../owncloud}/android/ui/ExtendedListView.java | 2 +- .../owncloud}/android/ui/QuickAction.java | 5 +- .../android/ui/activity/AccountSelectActivity.java | 14 ++--- .../ui/activity/ConflictsResolveActivity.java | 18 +++--- .../ErrorsWhileCopyingHandlerActivity.java | 16 +++--- .../android/ui/activity/FailedUploadActivity.java | 7 ++- .../android/ui/activity/FileActivity.java | 18 +++--- .../android/ui/activity/FileDisplayActivity.java | 66 +++++++++++----------- .../ui/activity/GenericExplanationActivity.java | 4 +- .../android/ui/activity/InstantUploadActivity.java | 21 +++---- .../android/ui/activity/LandingActivity.java | 10 ++-- .../android/ui/activity/LogHistoryActivity.java | 10 ++-- .../android/ui/activity/PinCodeActivity.java | 10 ++-- .../owncloud}/android/ui/activity/Preferences.java | 14 ++--- .../android/ui/activity/PreferencesNewSession.java | 2 +- .../android/ui/activity/TransferServiceGetter.java | 6 +- .../android/ui/activity/UploadFilesActivity.java | 18 +++--- .../android/ui/adapter/FileListListAdapter.java | 19 ++++--- .../android/ui/adapter/LandingScreenAdapter.java | 11 ++-- .../android/ui/adapter/LocalFileListAdapter.java | 7 ++- .../android/ui/adapter/LogListAdapter.java | 5 +- .../android/ui/dialog/ChangelogDialog.java | 4 +- .../android/ui/dialog/ConflictsResolveDialog.java | 4 +- .../android/ui/dialog/EditNameDialog.java | 4 +- .../ui/dialog/IndeterminateProgressDialog.java | 4 +- .../owncloud}/android/ui/dialog/LoadingDialog.java | 4 +- .../android/ui/dialog/SamlWebViewDialog.java | 10 ++-- .../android/ui/dialog/SslValidatorDialog.java | 15 ++--- .../owncloud}/android/ui/dialog/SsoWebView.java | 2 +- .../AuthenticatorAccountDetailsFragment.java | 2 +- .../fragment/AuthenticatorGetStartedFragment.java | 2 +- .../ui/fragment/ConfirmationDialogFragment.java | 4 +- .../android/ui/fragment/ExtendedListFragment.java | 8 +-- .../android/ui/fragment/FileDetailFragment.java | 46 +++++++-------- .../android/ui/fragment/FileFragment.java | 8 +-- .../android/ui/fragment/LandingPageFragment.java | 8 +-- .../android/ui/fragment/LocalFileListFragment.java | 9 +-- .../android/ui/fragment/OCFileListFragment.java | 47 +++++++-------- .../android/ui/preview/FileDownloadFragment.java | 13 +++-- .../android/ui/preview/PreviewImageActivity.java | 30 +++++----- .../android/ui/preview/PreviewImageFragment.java | 22 ++++---- .../ui/preview/PreviewImagePagerAdapter.java | 9 +-- .../android/ui/preview/PreviewMediaFragment.java | 32 +++++------ .../android/ui/preview/PreviewVideoActivity.java | 21 +++---- .../owncloud}/android/utils/FileStorageUtils.java | 9 +-- .../owncloud}/android/utils/OwnCloudVersion.java | 2 +- .../android/utils/RecursiveFileObserver.java | 2 +- .../owncloud}/android/widgets/ActionEditText.java | 5 +- .../webdav/ChunkFromFileChannelRequestEntity.java | 5 +- src/eu/alefzero/webdav/FileRequestEntity.java | 5 +- src/eu/alefzero/webdav/WebdavClient.java | 9 +-- src/eu/alefzero/webdav/WebdavEntry.java | 3 +- tests/AndroidManifest.xml | 6 +- .../owncloud}/android/test/AccountUtilsTest.java | 7 +-- .../android/test/FileContentProviderTest.java | 10 ++-- 146 files changed, 687 insertions(+), 632 deletions(-) rename oc_jb_workaround/src/{de/mobilcom/debitel/cloud => com/owncloud}/android/workaround/accounts/AccountAuthenticatorService.java (96%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/DisplayUtils.java (96%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/Log_OC.java (98%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/MainApp.java (98%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/OwnCloudSession.java (93%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/Uploader.java (97%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/authentication/AccountAuthenticator.java (96%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/authentication/AccountAuthenticatorActivity.java (98%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/authentication/AccountAuthenticatorService.java (95%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/authentication/AccountUtils.java (95%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/authentication/AuthenticatorActivity.java (95%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/authentication/OAuth2Constants.java (97%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/authentication/SsoWebViewClient.java (98%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/datamodel/DataStorageManager.java (96%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/datamodel/FileDataStorageManager.java (98%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/datamodel/OCFile.java (99%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/db/DbHandler.java (96%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/db/ProviderMeta.java (94%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/extensions/ExtensionsAvailableActivity.java (95%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/extensions/ExtensionsAvailableDialog.java (91%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/extensions/ExtensionsListActivity.java (96%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/files/BootupBroadcastReceiver.java (89%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/files/FileHandler.java (88%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/files/InstantUploadBroadcastReceiver.java (95%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/files/OwnCloudFileObserver.java (89%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/files/managers/OCNotificationManager.java (98%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/files/services/FileDownloader.java (95%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/files/services/FileObserverService.java (95%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/files/services/FileUploader.java (96%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/files/services/OnUploadCompletedListener.java (93%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/location/LocationServiceLauncherReciever.java (91%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/location/LocationUpdateService.java (96%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/media/MediaControlView.java (99%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/media/MediaService.java (98%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/media/MediaServiceBinder.java (96%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/network/AdvancedSslSocketFactory.java (98%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/network/AdvancedX509TrustManager.java (98%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/network/BearerAuthScheme.java (98%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/network/BearerCredentials.java (97%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/network/CertificateCombinedException.java (98%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/network/OwnCloudClientUtils.java (97%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/network/ProgressiveDataTransferer.java (95%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/operations/ChunkedUploadFileOperation.java (94%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/operations/CreateFolderOperation.java (95%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/operations/DownloadFileOperation.java (95%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/operations/ExistenceCheckOperation.java (97%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/operations/OAuth2GetAccessToken.java (96%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/operations/OnRemoteOperationListener.java (94%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/operations/OperationCancelledException.java (94%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/operations/OwnCloudServerCheckOperation.java (95%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/operations/RemoteOperation.java (97%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/operations/RemoteOperationResult.java (97%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/operations/RemoveFileOperation.java (94%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/operations/RenameFileOperation.java (96%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/operations/SynchronizeFileOperation.java (95%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/operations/SynchronizeFolderOperation.java (97%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/operations/UpdateOCVersionOperation.java (91%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/operations/UploadFileOperation.java (96%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/providers/FileContentProvider.java (97%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/syncadapter/AbstractOwnCloudSyncAdapter.java (90%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/syncadapter/ContactSyncAdapter.java (95%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/syncadapter/ContactSyncService.java (96%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/syncadapter/FileSyncAdapter.java (95%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/syncadapter/FileSyncService.java (93%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/ActionItem.java (93%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/CustomButton.java (92%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/CustomPopup.java (95%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/ExtendedListView.java (98%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/QuickAction.java (96%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/activity/AccountSelectActivity.java (96%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/activity/ConflictsResolveActivity.java (84%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java (95%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/activity/FailedUploadActivity.java (89%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/activity/FileActivity.java (94%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/activity/FileDisplayActivity.java (95%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/activity/GenericExplanationActivity.java (97%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/activity/InstantUploadActivity.java (96%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/activity/LandingActivity.java (91%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/activity/LogHistoryActivity.java (93%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/activity/PinCodeActivity.java (98%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/activity/Preferences.java (97%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/activity/PreferencesNewSession.java (96%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/activity/TransferServiceGetter.java (84%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/activity/UploadFilesActivity.java (95%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/adapter/FileListListAdapter.java (90%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/adapter/LandingScreenAdapter.java (89%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/adapter/LocalFileListAdapter.java (97%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/adapter/LogListAdapter.java (95%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/dialog/ChangelogDialog.java (97%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/dialog/ConflictsResolveDialog.java (97%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/dialog/EditNameDialog.java (98%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/dialog/IndeterminateProgressDialog.java (97%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/dialog/LoadingDialog.java (93%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/dialog/SamlWebViewDialog.java (96%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/dialog/SslValidatorDialog.java (96%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/dialog/SsoWebView.java (95%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/fragment/AuthenticatorAccountDetailsFragment.java (94%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/fragment/AuthenticatorGetStartedFragment.java (94%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/fragment/ConfirmationDialogFragment.java (98%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/fragment/ExtendedListFragment.java (94%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/fragment/FileDetailFragment.java (95%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/fragment/FileFragment.java (91%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/fragment/LandingPageFragment.java (85%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/fragment/LocalFileListFragment.java (97%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/fragment/OCFileListFragment.java (91%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/preview/FileDownloadFragment.java (97%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/preview/PreviewImageActivity.java (94%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/preview/PreviewImageFragment.java (96%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/preview/PreviewImagePagerAdapter.java (97%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/preview/PreviewMediaFragment.java (96%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/ui/preview/PreviewVideoActivity.java (93%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/utils/FileStorageUtils.java (93%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/utils/OwnCloudVersion.java (98%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/utils/RecursiveFileObserver.java (98%) rename src/{de/mobilcom/debitel/cloud => com/owncloud}/android/widgets/ActionEditText.java (98%) rename tests/src/{de/mobilcom/debitel/cloud => com/owncloud}/android/test/AccountUtilsTest.java (92%) rename tests/src/{de/mobilcom/debitel/cloud => com/owncloud}/android/test/FileContentProviderTest.java (81%) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 0b2e9100..f448d533 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . --> - @@ -153,8 +153,8 @@ - - + + diff --git a/oc_jb_workaround/AndroidManifest.xml b/oc_jb_workaround/AndroidManifest.xml index 31ec731d..c987c824 100644 --- a/oc_jb_workaround/AndroidManifest.xml +++ b/oc_jb_workaround/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/oc_jb_workaround/src/de/mobilcom/debitel/cloud/android/workaround/accounts/AccountAuthenticatorService.java b/oc_jb_workaround/src/com/owncloud/android/workaround/accounts/AccountAuthenticatorService.java similarity index 96% rename from oc_jb_workaround/src/de/mobilcom/debitel/cloud/android/workaround/accounts/AccountAuthenticatorService.java rename to oc_jb_workaround/src/com/owncloud/android/workaround/accounts/AccountAuthenticatorService.java index e8e4933b..5a7c57e6 100644 --- a/oc_jb_workaround/src/de/mobilcom/debitel/cloud/android/workaround/accounts/AccountAuthenticatorService.java +++ b/oc_jb_workaround/src/com/owncloud/android/workaround/accounts/AccountAuthenticatorService.java @@ -16,7 +16,7 @@ */ -package de.mobilcom.debitel.cloud.android.workaround.accounts; +package com.owncloud.android.workaround.accounts; import android.accounts.AbstractAccountAuthenticator; import android.accounts.Account; @@ -63,7 +63,7 @@ public class AccountAuthenticatorService extends Service { String[] requiredFeatures, Bundle options) throws NetworkErrorException { //Log.e("WORKAROUND", "Yes, WORKAROUND takes the control here"); - final Intent intent = new Intent("de.mobilcom.debitel.cloud.android.workaround.accounts.CREATE"); + final Intent intent = new Intent("com.owncloud.android.workaround.accounts.CREATE"); intent.putExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response); intent.putExtra(KEY_AUTH_TOKEN_TYPE, authTokenType); diff --git a/pom.xml b/pom.xml index e13b7ab2..a55a77a1 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - de.mobilcom.debitel.cloud.android + com.owncloud.android owncloud 1.3.21-SNAPSHOT apk diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml index b0a42ae6..3500c0fd 100644 --- a/res/layout-land/account_setup.xml +++ b/res/layout-land/account_setup.xml @@ -185,7 +185,7 @@ - - - - - - - - - - - - - - - - - - - - + class="com.owncloud.android.ui.fragment.LocalFileListFragment" /> - - - diff --git a/res/raw-de/changelog.html b/res/raw-de/changelog.html index 7f6b7464..a54a6643 100644 --- a/res/raw-de/changelog.html +++ b/res/raw-de/changelog.html @@ -24,7 +24,7 @@ In dieser Version von Android existiert ein Bug, der nach jedem Neustart eine erneute Eingabe der ownCloud Login-Informationen nötig macht. Um das zu umgehen installieren Sie bitte diese kostenlose Hilfs-App:

- ownCloud Jelly Bean Workaround + ownCloud Jelly Bean Workaround

diff --git a/res/raw-es/changelog.html b/res/raw-es/changelog.html index 0802d390..9321d520 100644 --- a/res/raw-es/changelog.html +++ b/res/raw-es/changelog.html @@ -24,7 +24,7 @@ Para prevenir la pérdida de las credenciales de sus cuentas ownCloud en cada reinicio, por favor, instale esta app gratuita que evita el problema en Jelly Bean:

- ownCloud Jelly Bean Workaround + ownCloud Jelly Bean Workaround

diff --git a/res/raw/changelog.html b/res/raw/changelog.html index f388f0fc..754cf6f2 100644 --- a/res/raw/changelog.html +++ b/res/raw/changelog.html @@ -24,7 +24,7 @@ To prevent losing your ownCloud account credentials on every reboot, please, install this free helper app to work around the bug in Jelly Bean:

- ownCloud Jelly Bean Workaround + ownCloud Jelly Bean Workaround

diff --git a/res/values/oauth2_configuration.xml b/res/values/oauth2_configuration.xml index c81f54ac..f8e0f51c 100644 --- a/res/values/oauth2_configuration.xml +++ b/res/values/oauth2_configuration.xml @@ -12,7 +12,7 @@ code - de.mobilcom.debitel.cloud.android + com.owncloud.android diff --git a/res/values/setup.xml b/res/values/setup.xml index 4b497015..e2460d95 100644 --- a/res/values/setup.xml +++ b/res/values/setup.xml @@ -39,7 +39,7 @@ "https://webapi.md.de/about/imprint" "mailto:" "mailto:appservice@cloud.md.de" - + diff --git a/src/de/mobilcom/debitel/cloud/android/DisplayUtils.java b/src/com/owncloud/android/DisplayUtils.java similarity index 96% rename from src/de/mobilcom/debitel/cloud/android/DisplayUtils.java rename to src/com/owncloud/android/DisplayUtils.java index 4b177554..1ee898b3 100644 --- a/src/de/mobilcom/debitel/cloud/android/DisplayUtils.java +++ b/src/com/owncloud/android/DisplayUtils.java @@ -16,7 +16,7 @@ * */ -package de.mobilcom.debitel.cloud.android; +package com.owncloud.android; import java.util.Arrays; import java.util.Date; diff --git a/src/de/mobilcom/debitel/cloud/android/Log_OC.java b/src/com/owncloud/android/Log_OC.java similarity index 98% rename from src/de/mobilcom/debitel/cloud/android/Log_OC.java rename to src/com/owncloud/android/Log_OC.java index 48d42779..5a1be298 100644 --- a/src/de/mobilcom/debitel/cloud/android/Log_OC.java +++ b/src/com/owncloud/android/Log_OC.java @@ -1,4 +1,4 @@ -package de.mobilcom.debitel.cloud.android; +package com.owncloud.android; import java.io.BufferedWriter; import java.io.File; diff --git a/src/de/mobilcom/debitel/cloud/android/MainApp.java b/src/com/owncloud/android/MainApp.java similarity index 98% rename from src/de/mobilcom/debitel/cloud/android/MainApp.java rename to src/com/owncloud/android/MainApp.java index 21bf3055..6cd88fe1 100644 --- a/src/de/mobilcom/debitel/cloud/android/MainApp.java +++ b/src/com/owncloud/android/MainApp.java @@ -14,7 +14,7 @@ * along with this program. If not, see . * */ -package de.mobilcom.debitel.cloud.android; +package com.owncloud.android; import android.app.Application; import android.content.Context; diff --git a/src/de/mobilcom/debitel/cloud/android/OwnCloudSession.java b/src/com/owncloud/android/OwnCloudSession.java similarity index 93% rename from src/de/mobilcom/debitel/cloud/android/OwnCloudSession.java rename to src/com/owncloud/android/OwnCloudSession.java index 4e815784..d7bb6094 100644 --- a/src/de/mobilcom/debitel/cloud/android/OwnCloudSession.java +++ b/src/com/owncloud/android/OwnCloudSession.java @@ -15,7 +15,7 @@ * along with this program. If not, see . * */ -package de.mobilcom.debitel.cloud.android; +package com.owncloud.android; /** * Represents a session to an ownCloud instance diff --git a/src/de/mobilcom/debitel/cloud/android/Uploader.java b/src/com/owncloud/android/Uploader.java similarity index 97% rename from src/de/mobilcom/debitel/cloud/android/Uploader.java rename to src/com/owncloud/android/Uploader.java index d7881365..ddd3f4ca 100644 --- a/src/de/mobilcom/debitel/cloud/android/Uploader.java +++ b/src/com/owncloud/android/Uploader.java @@ -16,7 +16,7 @@ * */ -package de.mobilcom.debitel.cloud.android; +package com.owncloud.android; import java.io.File; import java.util.ArrayList; @@ -26,6 +26,14 @@ 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 com.owncloud.android.ui.CustomButton; + import android.accounts.Account; import android.accounts.AccountManager; import android.app.AlertDialog; @@ -54,13 +62,6 @@ import android.widget.SimpleAdapter; import android.widget.Toast; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.authentication.AccountAuthenticator; -import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager; -import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager; -import de.mobilcom.debitel.cloud.android.datamodel.OCFile; -import de.mobilcom.debitel.cloud.android.files.services.FileUploader; -import de.mobilcom.debitel.cloud.android.ui.CustomButton; /** * This can be used to upload things to an ownCloud instance. diff --git a/src/de/mobilcom/debitel/cloud/android/authentication/AccountAuthenticator.java b/src/com/owncloud/android/authentication/AccountAuthenticator.java similarity index 96% rename from src/de/mobilcom/debitel/cloud/android/authentication/AccountAuthenticator.java rename to src/com/owncloud/android/authentication/AccountAuthenticator.java index 1c27e896..a2a38e89 100644 --- a/src/de/mobilcom/debitel/cloud/android/authentication/AccountAuthenticator.java +++ b/src/com/owncloud/android/authentication/AccountAuthenticator.java @@ -16,7 +16,11 @@ * */ -package de.mobilcom.debitel.cloud.android.authentication; +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; @@ -26,9 +30,6 @@ import android.os.Handler; import android.widget.Toast; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.MainApp; -import de.mobilcom.debitel.cloud.android.R; /** @@ -64,15 +65,15 @@ public class AccountAuthenticator extends AbstractAccountAuthenticator { /** * Value under this key should handle path to webdav php script. Will be * removed and usage should be replaced by combining - * {@link de.mobilcom.debitel.cloud.android.authentication.AuthenticatorActivity.KEY_OC_BASE_URL} and - * {@link de.mobilcom.debitel.cloud.android.utils.OwnCloudVersion} + * {@link com.owncloud.android.authentication.AuthenticatorActivity.KEY_OC_BASE_URL} and + * {@link com.owncloud.android.utils.OwnCloudVersion} * * @deprecated */ public static final String KEY_OC_URL = "oc_url"; /** * Version should be 3 numbers separated by dot so it can be parsed by - * {@link de.mobilcom.debitel.cloud.android.utils.OwnCloudVersion} + * {@link com.owncloud.android.utils.OwnCloudVersion} */ public static final String KEY_OC_VERSION = "oc_version"; /** diff --git a/src/de/mobilcom/debitel/cloud/android/authentication/AccountAuthenticatorActivity.java b/src/com/owncloud/android/authentication/AccountAuthenticatorActivity.java similarity index 98% rename from src/de/mobilcom/debitel/cloud/android/authentication/AccountAuthenticatorActivity.java rename to src/com/owncloud/android/authentication/AccountAuthenticatorActivity.java index 9a6c9807..62c8825f 100644 --- a/src/de/mobilcom/debitel/cloud/android/authentication/AccountAuthenticatorActivity.java +++ b/src/com/owncloud/android/authentication/AccountAuthenticatorActivity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package de.mobilcom.debitel.cloud.android.authentication; +package com.owncloud.android.authentication; import android.accounts.AccountAuthenticatorResponse; import android.accounts.AccountManager; diff --git a/src/de/mobilcom/debitel/cloud/android/authentication/AccountAuthenticatorService.java b/src/com/owncloud/android/authentication/AccountAuthenticatorService.java similarity index 95% rename from src/de/mobilcom/debitel/cloud/android/authentication/AccountAuthenticatorService.java rename to src/com/owncloud/android/authentication/AccountAuthenticatorService.java index 9f00be13..4c91f6e4 100644 --- a/src/de/mobilcom/debitel/cloud/android/authentication/AccountAuthenticatorService.java +++ b/src/com/owncloud/android/authentication/AccountAuthenticatorService.java @@ -16,7 +16,7 @@ * */ -package de.mobilcom.debitel.cloud.android.authentication; +package com.owncloud.android.authentication; import android.app.Service; import android.content.Intent; diff --git a/src/de/mobilcom/debitel/cloud/android/authentication/AccountUtils.java b/src/com/owncloud/android/authentication/AccountUtils.java similarity index 95% rename from src/de/mobilcom/debitel/cloud/android/authentication/AccountUtils.java rename to src/com/owncloud/android/authentication/AccountUtils.java index db0ea0d4..3b79c39b 100644 --- a/src/de/mobilcom/debitel/cloud/android/authentication/AccountUtils.java +++ b/src/com/owncloud/android/authentication/AccountUtils.java @@ -16,10 +16,10 @@ * */ -package de.mobilcom.debitel.cloud.android.authentication; +package com.owncloud.android.authentication; -import de.mobilcom.debitel.cloud.android.MainApp; -import de.mobilcom.debitel.cloud.android.utils.OwnCloudVersion; +import com.owncloud.android.MainApp; +import com.owncloud.android.utils.OwnCloudVersion; import android.accounts.Account; import android.accounts.AccountManager; diff --git a/src/de/mobilcom/debitel/cloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java similarity index 95% rename from src/de/mobilcom/debitel/cloud/android/authentication/AuthenticatorActivity.java rename to src/com/owncloud/android/authentication/AuthenticatorActivity.java index 37097797..69872d73 100644 --- a/src/de/mobilcom/debitel/cloud/android/authentication/AuthenticatorActivity.java +++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java @@ -16,7 +16,7 @@ * */ -package de.mobilcom.debitel.cloud.android.authentication; +package com.owncloud.android.authentication; import android.accounts.Account; import android.accounts.AccountManager; @@ -51,24 +51,24 @@ 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; +import com.owncloud.android.network.OwnCloudClientUtils; +import com.owncloud.android.operations.ExistenceCheckOperation; +import com.owncloud.android.operations.OAuth2GetAccessToken; +import com.owncloud.android.operations.OnRemoteOperationListener; +import com.owncloud.android.operations.OwnCloudServerCheckOperation; +import com.owncloud.android.operations.RemoteOperation; +import com.owncloud.android.operations.RemoteOperationResult; +import com.owncloud.android.operations.RemoteOperationResult.ResultCode; +import com.owncloud.android.ui.CustomButton; +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.OwnCloudVersion; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.MainApp; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.authentication.SsoWebViewClient.SsoWebViewClientListener; -import de.mobilcom.debitel.cloud.android.network.OwnCloudClientUtils; -import de.mobilcom.debitel.cloud.android.operations.ExistenceCheckOperation; -import de.mobilcom.debitel.cloud.android.operations.OAuth2GetAccessToken; -import de.mobilcom.debitel.cloud.android.operations.OnRemoteOperationListener; -import de.mobilcom.debitel.cloud.android.operations.OwnCloudServerCheckOperation; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperation; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode; -import de.mobilcom.debitel.cloud.android.ui.CustomButton; -import de.mobilcom.debitel.cloud.android.ui.dialog.SamlWebViewDialog; -import de.mobilcom.debitel.cloud.android.ui.dialog.SslValidatorDialog; -import de.mobilcom.debitel.cloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener; -import de.mobilcom.debitel.cloud.android.utils.OwnCloudVersion; import eu.alefzero.webdav.WebdavClient; diff --git a/src/de/mobilcom/debitel/cloud/android/authentication/OAuth2Constants.java b/src/com/owncloud/android/authentication/OAuth2Constants.java similarity index 97% rename from src/de/mobilcom/debitel/cloud/android/authentication/OAuth2Constants.java rename to src/com/owncloud/android/authentication/OAuth2Constants.java index bf812706..f96b6278 100644 --- a/src/de/mobilcom/debitel/cloud/android/authentication/OAuth2Constants.java +++ b/src/com/owncloud/android/authentication/OAuth2Constants.java @@ -15,7 +15,7 @@ * */ -package de.mobilcom.debitel.cloud.android.authentication; +package com.owncloud.android.authentication; /** * Constant values for OAuth 2 protocol. diff --git a/src/de/mobilcom/debitel/cloud/android/authentication/SsoWebViewClient.java b/src/com/owncloud/android/authentication/SsoWebViewClient.java similarity index 98% rename from src/de/mobilcom/debitel/cloud/android/authentication/SsoWebViewClient.java rename to src/com/owncloud/android/authentication/SsoWebViewClient.java index 550fa6d0..5c97931e 100644 --- a/src/de/mobilcom/debitel/cloud/android/authentication/SsoWebViewClient.java +++ b/src/com/owncloud/android/authentication/SsoWebViewClient.java @@ -15,11 +15,12 @@ * */ -package de.mobilcom.debitel.cloud.android.authentication; +package com.owncloud.android.authentication; import java.lang.ref.WeakReference; -import de.mobilcom.debitel.cloud.android.Log_OC; +import com.owncloud.android.Log_OC; + import android.graphics.Bitmap; import android.os.Handler; diff --git a/src/de/mobilcom/debitel/cloud/android/datamodel/DataStorageManager.java b/src/com/owncloud/android/datamodel/DataStorageManager.java similarity index 96% rename from src/de/mobilcom/debitel/cloud/android/datamodel/DataStorageManager.java rename to src/com/owncloud/android/datamodel/DataStorageManager.java index bbe06fc9..133ab8de 100644 --- a/src/de/mobilcom/debitel/cloud/android/datamodel/DataStorageManager.java +++ b/src/com/owncloud/android/datamodel/DataStorageManager.java @@ -16,7 +16,7 @@ * */ -package de.mobilcom.debitel.cloud.android.datamodel; +package com.owncloud.android.datamodel; import java.util.List; import java.util.Vector; diff --git a/src/de/mobilcom/debitel/cloud/android/datamodel/FileDataStorageManager.java b/src/com/owncloud/android/datamodel/FileDataStorageManager.java similarity index 98% rename from src/de/mobilcom/debitel/cloud/android/datamodel/FileDataStorageManager.java rename to src/com/owncloud/android/datamodel/FileDataStorageManager.java index 32aa09c0..9933e360 100644 --- a/src/de/mobilcom/debitel/cloud/android/datamodel/FileDataStorageManager.java +++ b/src/com/owncloud/android/datamodel/FileDataStorageManager.java @@ -16,7 +16,7 @@ * */ -package de.mobilcom.debitel.cloud.android.datamodel; +package com.owncloud.android.datamodel; import java.io.File; import java.util.ArrayList; @@ -25,10 +25,11 @@ import java.util.Iterator; import java.util.List; import java.util.Vector; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.MainApp; -import de.mobilcom.debitel.cloud.android.db.ProviderMeta.ProviderTableMeta; -import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils; +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 android.accounts.Account; import android.content.ContentProviderClient; diff --git a/src/de/mobilcom/debitel/cloud/android/datamodel/OCFile.java b/src/com/owncloud/android/datamodel/OCFile.java similarity index 99% rename from src/de/mobilcom/debitel/cloud/android/datamodel/OCFile.java rename to src/com/owncloud/android/datamodel/OCFile.java index 1865768f..76fb6b2f 100644 --- a/src/de/mobilcom/debitel/cloud/android/datamodel/OCFile.java +++ b/src/com/owncloud/android/datamodel/OCFile.java @@ -16,11 +16,12 @@ * */ -package de.mobilcom.debitel.cloud.android.datamodel; +package com.owncloud.android.datamodel; import java.io.File; -import de.mobilcom.debitel.cloud.android.Log_OC; +import com.owncloud.android.Log_OC; + import android.os.Parcel; import android.os.Parcelable; diff --git a/src/de/mobilcom/debitel/cloud/android/db/DbHandler.java b/src/com/owncloud/android/db/DbHandler.java similarity index 96% rename from src/de/mobilcom/debitel/cloud/android/db/DbHandler.java rename to src/com/owncloud/android/db/DbHandler.java index c04c8014..8f535629 100644 --- a/src/de/mobilcom/debitel/cloud/android/db/DbHandler.java +++ b/src/com/owncloud/android/db/DbHandler.java @@ -15,10 +15,10 @@ * along with this program. If not, see . * */ -package de.mobilcom.debitel.cloud.android.db; +package com.owncloud.android.db; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.MainApp; +import com.owncloud.android.Log_OC; +import com.owncloud.android.MainApp; import android.content.ContentValues; import android.content.Context; diff --git a/src/de/mobilcom/debitel/cloud/android/db/ProviderMeta.java b/src/com/owncloud/android/db/ProviderMeta.java similarity index 94% rename from src/de/mobilcom/debitel/cloud/android/db/ProviderMeta.java rename to src/com/owncloud/android/db/ProviderMeta.java index 28032c03..a082a84e 100644 --- a/src/de/mobilcom/debitel/cloud/android/db/ProviderMeta.java +++ b/src/com/owncloud/android/db/ProviderMeta.java @@ -15,9 +15,9 @@ * along with this program. If not, see . * */ -package de.mobilcom.debitel.cloud.android.db; +package com.owncloud.android.db; -import de.mobilcom.debitel.cloud.android.MainApp; +import com.owncloud.android.MainApp; import android.net.Uri; import android.provider.BaseColumns; diff --git a/src/de/mobilcom/debitel/cloud/android/extensions/ExtensionsAvailableActivity.java b/src/com/owncloud/android/extensions/ExtensionsAvailableActivity.java similarity index 95% rename from src/de/mobilcom/debitel/cloud/android/extensions/ExtensionsAvailableActivity.java rename to src/com/owncloud/android/extensions/ExtensionsAvailableActivity.java index e75d39ea..7b39931c 100644 --- a/src/de/mobilcom/debitel/cloud/android/extensions/ExtensionsAvailableActivity.java +++ b/src/com/owncloud/android/extensions/ExtensionsAvailableActivity.java @@ -16,7 +16,7 @@ * */ -package de.mobilcom.debitel.cloud.android.extensions; +package com.owncloud.android.extensions; import android.os.Bundle; import android.support.v4.app.FragmentManager; diff --git a/src/de/mobilcom/debitel/cloud/android/extensions/ExtensionsAvailableDialog.java b/src/com/owncloud/android/extensions/ExtensionsAvailableDialog.java similarity index 91% rename from src/de/mobilcom/debitel/cloud/android/extensions/ExtensionsAvailableDialog.java rename to src/com/owncloud/android/extensions/ExtensionsAvailableDialog.java index e7e899f0..efd4e01f 100644 --- a/src/de/mobilcom/debitel/cloud/android/extensions/ExtensionsAvailableDialog.java +++ b/src/com/owncloud/android/extensions/ExtensionsAvailableDialog.java @@ -16,11 +16,12 @@ * */ -package de.mobilcom.debitel.cloud.android.extensions; +package com.owncloud.android.extensions; + +import com.owncloud.android.Log_OC; +import com.owncloud.android.R; +import com.owncloud.android.ui.CustomButton; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.ui.CustomButton; import android.content.Intent; import android.os.Bundle; import android.support.v4.app.DialogFragment; diff --git a/src/de/mobilcom/debitel/cloud/android/extensions/ExtensionsListActivity.java b/src/com/owncloud/android/extensions/ExtensionsListActivity.java similarity index 96% rename from src/de/mobilcom/debitel/cloud/android/extensions/ExtensionsListActivity.java rename to src/com/owncloud/android/extensions/ExtensionsListActivity.java index 040a86cb..02fb4a9f 100644 --- a/src/de/mobilcom/debitel/cloud/android/extensions/ExtensionsListActivity.java +++ b/src/com/owncloud/android/extensions/ExtensionsListActivity.java @@ -16,7 +16,7 @@ * */ -package de.mobilcom.debitel.cloud.android.extensions; +package com.owncloud.android.extensions; import java.util.HashMap; import java.util.LinkedList; @@ -27,8 +27,9 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.utils.OwnCloudVersion; +import com.owncloud.android.Log_OC; +import com.owncloud.android.utils.OwnCloudVersion; + import android.R; diff --git a/src/de/mobilcom/debitel/cloud/android/files/BootupBroadcastReceiver.java b/src/com/owncloud/android/files/BootupBroadcastReceiver.java similarity index 89% rename from src/de/mobilcom/debitel/cloud/android/files/BootupBroadcastReceiver.java rename to src/com/owncloud/android/files/BootupBroadcastReceiver.java index 9dc26d83..8a8c4306 100644 --- a/src/de/mobilcom/debitel/cloud/android/files/BootupBroadcastReceiver.java +++ b/src/com/owncloud/android/files/BootupBroadcastReceiver.java @@ -16,10 +16,10 @@ * */ -package de.mobilcom.debitel.cloud.android.files; +package com.owncloud.android.files; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.files.services.FileObserverService; +import com.owncloud.android.Log_OC; +import com.owncloud.android.files.services.FileObserverService; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/src/de/mobilcom/debitel/cloud/android/files/FileHandler.java b/src/com/owncloud/android/files/FileHandler.java similarity index 88% rename from src/de/mobilcom/debitel/cloud/android/files/FileHandler.java rename to src/com/owncloud/android/files/FileHandler.java index 917ffeab..2eb754dd 100644 --- a/src/de/mobilcom/debitel/cloud/android/files/FileHandler.java +++ b/src/com/owncloud/android/files/FileHandler.java @@ -15,9 +15,9 @@ * */ -package de.mobilcom.debitel.cloud.android.files; +package com.owncloud.android.files; -import de.mobilcom.debitel.cloud.android.datamodel.OCFile; +import com.owncloud.android.datamodel.OCFile; public interface FileHandler { diff --git a/src/de/mobilcom/debitel/cloud/android/files/InstantUploadBroadcastReceiver.java b/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java similarity index 95% rename from src/de/mobilcom/debitel/cloud/android/files/InstantUploadBroadcastReceiver.java rename to src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java index 3db31aa6..8d453f62 100644 --- a/src/de/mobilcom/debitel/cloud/android/files/InstantUploadBroadcastReceiver.java +++ b/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java @@ -16,10 +16,17 @@ * */ -package de.mobilcom.debitel.cloud.android.files; +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; @@ -33,12 +40,6 @@ import android.preference.PreferenceManager; import android.provider.MediaStore.Images.Media; import android.webkit.MimeTypeMap; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.MainApp; -import de.mobilcom.debitel.cloud.android.authentication.AccountUtils; -import de.mobilcom.debitel.cloud.android.db.DbHandler; -import de.mobilcom.debitel.cloud.android.files.services.FileUploader; -import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils; public class InstantUploadBroadcastReceiver extends BroadcastReceiver { diff --git a/src/de/mobilcom/debitel/cloud/android/files/OwnCloudFileObserver.java b/src/com/owncloud/android/files/OwnCloudFileObserver.java similarity index 89% rename from src/de/mobilcom/debitel/cloud/android/files/OwnCloudFileObserver.java rename to src/com/owncloud/android/files/OwnCloudFileObserver.java index 79f4c18a..8f2e3ee6 100644 --- a/src/de/mobilcom/debitel/cloud/android/files/OwnCloudFileObserver.java +++ b/src/com/owncloud/android/files/OwnCloudFileObserver.java @@ -16,17 +16,18 @@ * */ -package de.mobilcom.debitel.cloud.android.files; +package com.owncloud.android.files; import java.io.File; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager; -import de.mobilcom.debitel.cloud.android.datamodel.OCFile; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult; -import de.mobilcom.debitel.cloud.android.operations.SynchronizeFileOperation; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode; -import de.mobilcom.debitel.cloud.android.ui.activity.ConflictsResolveActivity; +import com.owncloud.android.Log_OC; +import com.owncloud.android.datamodel.FileDataStorageManager; +import com.owncloud.android.datamodel.OCFile; +import com.owncloud.android.operations.RemoteOperationResult; +import com.owncloud.android.operations.SynchronizeFileOperation; +import com.owncloud.android.operations.RemoteOperationResult.ResultCode; +import com.owncloud.android.ui.activity.ConflictsResolveActivity; + import android.accounts.Account; diff --git a/src/de/mobilcom/debitel/cloud/android/files/managers/OCNotificationManager.java b/src/com/owncloud/android/files/managers/OCNotificationManager.java similarity index 98% rename from src/de/mobilcom/debitel/cloud/android/files/managers/OCNotificationManager.java rename to src/com/owncloud/android/files/managers/OCNotificationManager.java index f1f57d22..11a8c377 100644 --- a/src/de/mobilcom/debitel/cloud/android/files/managers/OCNotificationManager.java +++ b/src/com/owncloud/android/files/managers/OCNotificationManager.java @@ -16,17 +16,18 @@ * */ -package de.mobilcom.debitel.cloud.android.files.managers; +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 de.mobilcom.debitel.cloud.android.R; public class OCNotificationManager { diff --git a/src/de/mobilcom/debitel/cloud/android/files/services/FileDownloader.java b/src/com/owncloud/android/files/services/FileDownloader.java similarity index 95% rename from src/de/mobilcom/debitel/cloud/android/files/services/FileDownloader.java rename to src/com/owncloud/android/files/services/FileDownloader.java index b0040703..64d5d3ed 100644 --- a/src/de/mobilcom/debitel/cloud/android/files/services/FileDownloader.java +++ b/src/com/owncloud/android/files/services/FileDownloader.java @@ -16,7 +16,7 @@ * */ -package de.mobilcom.debitel.cloud.android.files.services; +package com.owncloud.android.files.services; import java.io.File; import java.io.IOException; @@ -28,6 +28,21 @@ 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 com.owncloud.android.network.OwnCloudClientUtils; +import com.owncloud.android.operations.DownloadFileOperation; +import com.owncloud.android.operations.RemoteOperationResult; +import com.owncloud.android.operations.RemoteOperationResult.ResultCode; +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 eu.alefzero.webdav.OnDatatransferProgressListener; @@ -47,20 +62,6 @@ import android.os.Message; import android.os.Process; import android.widget.RemoteViews; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.MainApp; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.authentication.AuthenticatorActivity; -import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager; -import de.mobilcom.debitel.cloud.android.datamodel.OCFile; -import de.mobilcom.debitel.cloud.android.network.OwnCloudClientUtils; -import de.mobilcom.debitel.cloud.android.operations.DownloadFileOperation; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode; -import de.mobilcom.debitel.cloud.android.ui.activity.FileActivity; -import de.mobilcom.debitel.cloud.android.ui.activity.FileDisplayActivity; -import de.mobilcom.debitel.cloud.android.ui.preview.PreviewImageActivity; -import de.mobilcom.debitel.cloud.android.ui.preview.PreviewImageFragment; import eu.alefzero.webdav.WebdavClient; public class FileDownloader extends Service implements OnDatatransferProgressListener { diff --git a/src/de/mobilcom/debitel/cloud/android/files/services/FileObserverService.java b/src/com/owncloud/android/files/services/FileObserverService.java similarity index 95% rename from src/de/mobilcom/debitel/cloud/android/files/services/FileObserverService.java rename to src/com/owncloud/android/files/services/FileObserverService.java index 773faaa6..a0003bec 100644 --- a/src/de/mobilcom/debitel/cloud/android/files/services/FileObserverService.java +++ b/src/com/owncloud/android/files/services/FileObserverService.java @@ -16,19 +16,20 @@ * */ -package de.mobilcom.debitel.cloud.android.files.services; +package com.owncloud.android.files.services; import java.io.File; import java.util.HashMap; import java.util.Map; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager; -import de.mobilcom.debitel.cloud.android.datamodel.OCFile; -import de.mobilcom.debitel.cloud.android.db.ProviderMeta.ProviderTableMeta; -import de.mobilcom.debitel.cloud.android.files.OwnCloudFileObserver; -import de.mobilcom.debitel.cloud.android.operations.SynchronizeFileOperation; -import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils; +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 android.accounts.Account; import android.accounts.AccountManager; diff --git a/src/de/mobilcom/debitel/cloud/android/files/services/FileUploader.java b/src/com/owncloud/android/files/services/FileUploader.java similarity index 96% rename from src/de/mobilcom/debitel/cloud/android/files/services/FileUploader.java rename to src/com/owncloud/android/files/services/FileUploader.java index 26f29ba4..11084623 100644 --- a/src/de/mobilcom/debitel/cloud/android/files/services/FileUploader.java +++ b/src/com/owncloud/android/files/services/FileUploader.java @@ -16,7 +16,7 @@ * */ -package de.mobilcom.debitel.cloud.android.files.services; +package com.owncloud.android.files.services; import java.io.File; import java.io.IOException; @@ -33,6 +33,30 @@ 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; +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; @@ -57,29 +81,6 @@ import android.os.Process; import android.webkit.MimeTypeMap; import android.widget.RemoteViews; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.MainApp; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.authentication.AccountAuthenticator; -import de.mobilcom.debitel.cloud.android.authentication.AuthenticatorActivity; -import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager; -import de.mobilcom.debitel.cloud.android.datamodel.OCFile; -import de.mobilcom.debitel.cloud.android.db.DbHandler; -import de.mobilcom.debitel.cloud.android.network.OwnCloudClientUtils; -import de.mobilcom.debitel.cloud.android.operations.ChunkedUploadFileOperation; -import de.mobilcom.debitel.cloud.android.operations.CreateFolderOperation; -import de.mobilcom.debitel.cloud.android.operations.ExistenceCheckOperation; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperation; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult; -import de.mobilcom.debitel.cloud.android.operations.UploadFileOperation; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode; -import de.mobilcom.debitel.cloud.android.ui.activity.FailedUploadActivity; -import de.mobilcom.debitel.cloud.android.ui.activity.FileActivity; -import de.mobilcom.debitel.cloud.android.ui.activity.FileDisplayActivity; -import de.mobilcom.debitel.cloud.android.ui.activity.InstantUploadActivity; -import de.mobilcom.debitel.cloud.android.ui.preview.PreviewImageActivity; -import de.mobilcom.debitel.cloud.android.ui.preview.PreviewImageFragment; -import de.mobilcom.debitel.cloud.android.utils.OwnCloudVersion; import eu.alefzero.webdav.WebdavClient; diff --git a/src/de/mobilcom/debitel/cloud/android/files/services/OnUploadCompletedListener.java b/src/com/owncloud/android/files/services/OnUploadCompletedListener.java similarity index 93% rename from src/de/mobilcom/debitel/cloud/android/files/services/OnUploadCompletedListener.java rename to src/com/owncloud/android/files/services/OnUploadCompletedListener.java index 7f8039e0..b6ee1aca 100644 --- a/src/de/mobilcom/debitel/cloud/android/files/services/OnUploadCompletedListener.java +++ b/src/com/owncloud/android/files/services/OnUploadCompletedListener.java @@ -16,7 +16,7 @@ * */ -package de.mobilcom.debitel.cloud.android.files.services; +package com.owncloud.android.files.services; public interface OnUploadCompletedListener extends Runnable { diff --git a/src/de/mobilcom/debitel/cloud/android/location/LocationServiceLauncherReciever.java b/src/com/owncloud/android/location/LocationServiceLauncherReciever.java similarity index 91% rename from src/de/mobilcom/debitel/cloud/android/location/LocationServiceLauncherReciever.java rename to src/com/owncloud/android/location/LocationServiceLauncherReciever.java index 0c77a25a..a974c565 100644 --- a/src/de/mobilcom/debitel/cloud/android/location/LocationServiceLauncherReciever.java +++ b/src/com/owncloud/android/location/LocationServiceLauncherReciever.java @@ -15,9 +15,9 @@ * along with this program. If not, see . * */ -package de.mobilcom.debitel.cloud.android.location; +package com.owncloud.android.location; -import de.mobilcom.debitel.cloud.android.Log_OC; +import com.owncloud.android.Log_OC; import android.app.ActivityManager; import android.app.ActivityManager.RunningServiceInfo; @@ -35,7 +35,7 @@ public class LocationServiceLauncherReciever extends BroadcastReceiver { public void onReceive(Context context, Intent intent) { Intent deviceTrackingIntent = new Intent(); deviceTrackingIntent - .setAction("de.mobilcom.debitel.cloud.android.location.LocationUpdateService"); + .setAction("com.owncloud.android.location.LocationUpdateService"); SharedPreferences preferences = PreferenceManager .getDefaultSharedPreferences(context); boolean trackDevice = preferences.getBoolean("enable_devicetracking", @@ -58,7 +58,7 @@ public class LocationServiceLauncherReciever extends BroadcastReceiver { private void startOrStopDeviceTracking(Context context, boolean trackDevice) { Intent deviceTrackingIntent = new Intent(); deviceTrackingIntent - .setAction("de.mobilcom.debitel.cloud.android.location.LocationUpdateService"); + .setAction("com.owncloud.android.location.LocationUpdateService"); if (!isDeviceTrackingServiceRunning(context) && trackDevice) { Log_OC.d(TAG, "Starting device tracker service"); context.startService(deviceTrackingIntent); diff --git a/src/de/mobilcom/debitel/cloud/android/location/LocationUpdateService.java b/src/com/owncloud/android/location/LocationUpdateService.java similarity index 96% rename from src/de/mobilcom/debitel/cloud/android/location/LocationUpdateService.java rename to src/com/owncloud/android/location/LocationUpdateService.java index dccfe7fe..e1f529b5 100644 --- a/src/de/mobilcom/debitel/cloud/android/location/LocationUpdateService.java +++ b/src/com/owncloud/android/location/LocationUpdateService.java @@ -15,7 +15,10 @@ * along with this program. If not, see . * */ -package de.mobilcom.debitel.cloud.android.location; +package com.owncloud.android.location; + +import com.owncloud.android.Log_OC; +import com.owncloud.android.R; import android.app.IntentService; import android.content.Intent; @@ -29,8 +32,6 @@ import android.os.Bundle; import android.preference.PreferenceManager; import android.widget.Toast; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.R; public class LocationUpdateService extends IntentService implements LocationListener { diff --git a/src/de/mobilcom/debitel/cloud/android/media/MediaControlView.java b/src/com/owncloud/android/media/MediaControlView.java similarity index 99% rename from src/de/mobilcom/debitel/cloud/android/media/MediaControlView.java rename to src/com/owncloud/android/media/MediaControlView.java index 5e24907a..b257bd37 100644 --- a/src/de/mobilcom/debitel/cloud/android/media/MediaControlView.java +++ b/src/com/owncloud/android/media/MediaControlView.java @@ -15,7 +15,7 @@ * along with this program. If not, see . * */ -package de.mobilcom.debitel.cloud.android.media; +package com.owncloud.android.media; import android.content.Context; import android.media.MediaPlayer; @@ -40,7 +40,8 @@ import android.widget.TextView; import java.util.Formatter; import java.util.Locale; -import de.mobilcom.debitel.cloud.android.R; +import com.owncloud.android.R; + /** * View containing controls for a {@link MediaPlayer}. diff --git a/src/de/mobilcom/debitel/cloud/android/media/MediaService.java b/src/com/owncloud/android/media/MediaService.java similarity index 98% rename from src/de/mobilcom/debitel/cloud/android/media/MediaService.java rename to src/com/owncloud/android/media/MediaService.java index a5094cec..eb57222c 100644 --- a/src/de/mobilcom/debitel/cloud/android/media/MediaService.java +++ b/src/com/owncloud/android/media/MediaService.java @@ -15,7 +15,7 @@ * */ -package de.mobilcom.debitel.cloud.android.media; +package com.owncloud.android.media; import android.accounts.Account; import android.app.Notification; @@ -37,11 +37,12 @@ import android.widget.Toast; import java.io.IOException; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.datamodel.OCFile; -import de.mobilcom.debitel.cloud.android.ui.activity.FileActivity; -import de.mobilcom.debitel.cloud.android.ui.activity.FileDisplayActivity; +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; + /** * Service that handles media playback, both audio and video. @@ -56,7 +57,7 @@ public class MediaService extends Service implements OnCompletionListener, OnPre private static final String TAG = MediaService.class.getSimpleName(); - private static final String MY_PACKAGE = MediaService.class.getPackage() != null ? MediaService.class.getPackage().getName() : "de.mobilcom.debitel.cloud.android.media"; + private static final String MY_PACKAGE = MediaService.class.getPackage() != null ? MediaService.class.getPackage().getName() : "com.owncloud.android.media"; /// Intent actions that we are prepared to handle public static final String ACTION_PLAY_FILE = MY_PACKAGE + ".action.PLAY_FILE"; diff --git a/src/de/mobilcom/debitel/cloud/android/media/MediaServiceBinder.java b/src/com/owncloud/android/media/MediaServiceBinder.java similarity index 96% rename from src/de/mobilcom/debitel/cloud/android/media/MediaServiceBinder.java rename to src/com/owncloud/android/media/MediaServiceBinder.java index 935d3e20..4fab8bdf 100644 --- a/src/de/mobilcom/debitel/cloud/android/media/MediaServiceBinder.java +++ b/src/com/owncloud/android/media/MediaServiceBinder.java @@ -15,12 +15,12 @@ * */ -package de.mobilcom.debitel.cloud.android.media; +package com.owncloud.android.media; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.datamodel.OCFile; -import de.mobilcom.debitel.cloud.android.media.MediaService.State; +import com.owncloud.android.Log_OC; +import com.owncloud.android.datamodel.OCFile; +import com.owncloud.android.media.MediaService.State; import android.accounts.Account; import android.content.Intent; diff --git a/src/de/mobilcom/debitel/cloud/android/network/AdvancedSslSocketFactory.java b/src/com/owncloud/android/network/AdvancedSslSocketFactory.java similarity index 98% rename from src/de/mobilcom/debitel/cloud/android/network/AdvancedSslSocketFactory.java rename to src/com/owncloud/android/network/AdvancedSslSocketFactory.java index cf802ceb..6a698713 100644 --- a/src/de/mobilcom/debitel/cloud/android/network/AdvancedSslSocketFactory.java +++ b/src/com/owncloud/android/network/AdvancedSslSocketFactory.java @@ -16,7 +16,7 @@ * */ -package de.mobilcom.debitel.cloud.android.network; +package com.owncloud.android.network; import java.io.IOException; import java.net.InetAddress; @@ -39,7 +39,8 @@ import org.apache.commons.httpclient.params.HttpConnectionParams; import org.apache.commons.httpclient.protocol.ProtocolSocketFactory; import org.apache.http.conn.ssl.X509HostnameVerifier; -import de.mobilcom.debitel.cloud.android.Log_OC; +import com.owncloud.android.Log_OC; + /** * AdvancedSSLProtocolSocketFactory allows to create SSL {@link Socket}s with diff --git a/src/de/mobilcom/debitel/cloud/android/network/AdvancedX509TrustManager.java b/src/com/owncloud/android/network/AdvancedX509TrustManager.java similarity index 98% rename from src/de/mobilcom/debitel/cloud/android/network/AdvancedX509TrustManager.java rename to src/com/owncloud/android/network/AdvancedX509TrustManager.java index 038ca392..81dcdbd7 100644 --- a/src/de/mobilcom/debitel/cloud/android/network/AdvancedX509TrustManager.java +++ b/src/com/owncloud/android/network/AdvancedX509TrustManager.java @@ -15,7 +15,7 @@ * */ -package de.mobilcom.debitel.cloud.android.network; +package com.owncloud.android.network; import java.security.KeyStore; import java.security.KeyStoreException; @@ -31,7 +31,8 @@ import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; import javax.net.ssl.X509TrustManager; -import de.mobilcom.debitel.cloud.android.Log_OC; +import com.owncloud.android.Log_OC; + /** * @author David A. Velasco diff --git a/src/de/mobilcom/debitel/cloud/android/network/BearerAuthScheme.java b/src/com/owncloud/android/network/BearerAuthScheme.java similarity index 98% rename from src/de/mobilcom/debitel/cloud/android/network/BearerAuthScheme.java rename to src/com/owncloud/android/network/BearerAuthScheme.java index 3d4abc08..16791c23 100644 --- a/src/de/mobilcom/debitel/cloud/android/network/BearerAuthScheme.java +++ b/src/com/owncloud/android/network/BearerAuthScheme.java @@ -15,7 +15,7 @@ * */ -package de.mobilcom.debitel.cloud.android.network; +package com.owncloud.android.network; import java.util.Map; @@ -27,7 +27,8 @@ import org.apache.commons.httpclient.auth.AuthenticationException; import org.apache.commons.httpclient.auth.InvalidCredentialsException; import org.apache.commons.httpclient.auth.MalformedChallengeException; -import de.mobilcom.debitel.cloud.android.Log_OC; +import com.owncloud.android.Log_OC; + /** * Bearer authentication scheme as defined in RFC 6750. diff --git a/src/de/mobilcom/debitel/cloud/android/network/BearerCredentials.java b/src/com/owncloud/android/network/BearerCredentials.java similarity index 97% rename from src/de/mobilcom/debitel/cloud/android/network/BearerCredentials.java rename to src/com/owncloud/android/network/BearerCredentials.java index 12e62e9c..50799b02 100644 --- a/src/de/mobilcom/debitel/cloud/android/network/BearerCredentials.java +++ b/src/com/owncloud/android/network/BearerCredentials.java @@ -15,7 +15,7 @@ * */ -package de.mobilcom.debitel.cloud.android.network; +package com.owncloud.android.network; import org.apache.commons.httpclient.Credentials; import org.apache.commons.httpclient.util.LangUtils; diff --git a/src/de/mobilcom/debitel/cloud/android/network/CertificateCombinedException.java b/src/com/owncloud/android/network/CertificateCombinedException.java similarity index 98% rename from src/de/mobilcom/debitel/cloud/android/network/CertificateCombinedException.java rename to src/com/owncloud/android/network/CertificateCombinedException.java index d767ea07..e96d9dc6 100644 --- a/src/de/mobilcom/debitel/cloud/android/network/CertificateCombinedException.java +++ b/src/com/owncloud/android/network/CertificateCombinedException.java @@ -15,7 +15,7 @@ * */ -package de.mobilcom.debitel.cloud.android.network; +package com.owncloud.android.network; import java.security.cert.CertPathValidatorException; import java.security.cert.CertificateException; diff --git a/src/de/mobilcom/debitel/cloud/android/network/OwnCloudClientUtils.java b/src/com/owncloud/android/network/OwnCloudClientUtils.java similarity index 97% rename from src/de/mobilcom/debitel/cloud/android/network/OwnCloudClientUtils.java rename to src/com/owncloud/android/network/OwnCloudClientUtils.java index 767d9bb2..bb299381 100644 --- a/src/de/mobilcom/debitel/cloud/android/network/OwnCloudClientUtils.java +++ b/src/com/owncloud/android/network/OwnCloudClientUtils.java @@ -14,7 +14,7 @@ * along with this program. If not, see . * */ -package de.mobilcom.debitel.cloud.android.network; +package com.owncloud.android.network; import java.io.File; import java.io.FileInputStream; @@ -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 de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.MainApp; -import de.mobilcom.debitel.cloud.android.authentication.AccountAuthenticator; -import de.mobilcom.debitel.cloud.android.authentication.AccountUtils; -import de.mobilcom.debitel.cloud.android.authentication.AccountUtils.AccountNotFoundException; +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 eu.alefzero.webdav.WebdavClient; diff --git a/src/de/mobilcom/debitel/cloud/android/network/ProgressiveDataTransferer.java b/src/com/owncloud/android/network/ProgressiveDataTransferer.java similarity index 95% rename from src/de/mobilcom/debitel/cloud/android/network/ProgressiveDataTransferer.java rename to src/com/owncloud/android/network/ProgressiveDataTransferer.java index f066c8a9..c6fa545b 100644 --- a/src/de/mobilcom/debitel/cloud/android/network/ProgressiveDataTransferer.java +++ b/src/com/owncloud/android/network/ProgressiveDataTransferer.java @@ -15,7 +15,7 @@ * */ -package de.mobilcom.debitel.cloud.android.network; +package com.owncloud.android.network; import java.util.Collection; diff --git a/src/de/mobilcom/debitel/cloud/android/operations/ChunkedUploadFileOperation.java b/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java similarity index 94% rename from src/de/mobilcom/debitel/cloud/android/operations/ChunkedUploadFileOperation.java rename to src/com/owncloud/android/operations/ChunkedUploadFileOperation.java index 3c307246..2649d197 100644 --- a/src/de/mobilcom/debitel/cloud/android/operations/ChunkedUploadFileOperation.java +++ b/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java @@ -16,7 +16,7 @@ * */ -package de.mobilcom.debitel.cloud.android.operations; +package com.owncloud.android.operations; import java.io.File; import java.io.IOException; @@ -27,9 +27,10 @@ import java.util.Random; import org.apache.commons.httpclient.HttpException; import org.apache.commons.httpclient.methods.PutMethod; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.datamodel.OCFile; -import de.mobilcom.debitel.cloud.android.network.ProgressiveDataTransferer; +import com.owncloud.android.Log_OC; +import com.owncloud.android.datamodel.OCFile; +import com.owncloud.android.network.ProgressiveDataTransferer; + import android.accounts.Account; diff --git a/src/de/mobilcom/debitel/cloud/android/operations/CreateFolderOperation.java b/src/com/owncloud/android/operations/CreateFolderOperation.java similarity index 95% rename from src/de/mobilcom/debitel/cloud/android/operations/CreateFolderOperation.java rename to src/com/owncloud/android/operations/CreateFolderOperation.java index f9bc65ce..b3456ee2 100644 --- a/src/de/mobilcom/debitel/cloud/android/operations/CreateFolderOperation.java +++ b/src/com/owncloud/android/operations/CreateFolderOperation.java @@ -15,16 +15,17 @@ * */ -package de.mobilcom.debitel.cloud.android.operations; +package com.owncloud.android.operations; import java.io.File; import org.apache.commons.httpclient.HttpStatus; import org.apache.jackrabbit.webdav.client.methods.MkColMethod; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager; -import de.mobilcom.debitel.cloud.android.datamodel.OCFile; +import com.owncloud.android.Log_OC; +import com.owncloud.android.datamodel.DataStorageManager; +import com.owncloud.android.datamodel.OCFile; + import eu.alefzero.webdav.WebdavClient; import eu.alefzero.webdav.WebdavUtils; diff --git a/src/de/mobilcom/debitel/cloud/android/operations/DownloadFileOperation.java b/src/com/owncloud/android/operations/DownloadFileOperation.java similarity index 95% rename from src/de/mobilcom/debitel/cloud/android/operations/DownloadFileOperation.java rename to src/com/owncloud/android/operations/DownloadFileOperation.java index 7fcb52f9..db986f47 100644 --- a/src/de/mobilcom/debitel/cloud/android/operations/DownloadFileOperation.java +++ b/src/com/owncloud/android/operations/DownloadFileOperation.java @@ -15,7 +15,7 @@ * */ -package de.mobilcom.debitel.cloud.android.operations; +package com.owncloud.android.operations; import java.io.BufferedInputStream; import java.io.File; @@ -32,11 +32,12 @@ import org.apache.commons.httpclient.HttpException; import org.apache.commons.httpclient.methods.GetMethod; import org.apache.http.HttpStatus; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.datamodel.OCFile; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperation; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult; -import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils; +import com.owncloud.android.Log_OC; +import com.owncloud.android.datamodel.OCFile; +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; diff --git a/src/de/mobilcom/debitel/cloud/android/operations/ExistenceCheckOperation.java b/src/com/owncloud/android/operations/ExistenceCheckOperation.java similarity index 97% rename from src/de/mobilcom/debitel/cloud/android/operations/ExistenceCheckOperation.java rename to src/com/owncloud/android/operations/ExistenceCheckOperation.java index b7088b03..24336bd6 100644 --- a/src/de/mobilcom/debitel/cloud/android/operations/ExistenceCheckOperation.java +++ b/src/com/owncloud/android/operations/ExistenceCheckOperation.java @@ -15,12 +15,13 @@ * */ -package de.mobilcom.debitel.cloud.android.operations; +package com.owncloud.android.operations; import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.httpclient.methods.HeadMethod; -import de.mobilcom.debitel.cloud.android.Log_OC; +import com.owncloud.android.Log_OC; + import eu.alefzero.webdav.WebdavClient; import eu.alefzero.webdav.WebdavUtils; diff --git a/src/de/mobilcom/debitel/cloud/android/operations/OAuth2GetAccessToken.java b/src/com/owncloud/android/operations/OAuth2GetAccessToken.java similarity index 96% rename from src/de/mobilcom/debitel/cloud/android/operations/OAuth2GetAccessToken.java rename to src/com/owncloud/android/operations/OAuth2GetAccessToken.java index 632efd83..09a6e1e5 100644 --- a/src/de/mobilcom/debitel/cloud/android/operations/OAuth2GetAccessToken.java +++ b/src/com/owncloud/android/operations/OAuth2GetAccessToken.java @@ -1,4 +1,4 @@ -package de.mobilcom.debitel.cloud.android.operations; +package com.owncloud.android.operations; import java.util.HashMap; import java.util.Map; @@ -8,9 +8,10 @@ import org.apache.commons.httpclient.NameValuePair; import org.json.JSONException; import org.json.JSONObject; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.authentication.OAuth2Constants; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode; +import com.owncloud.android.Log_OC; +import com.owncloud.android.authentication.OAuth2Constants; +import com.owncloud.android.operations.RemoteOperationResult.ResultCode; + import eu.alefzero.webdav.WebdavClient; diff --git a/src/de/mobilcom/debitel/cloud/android/operations/OnRemoteOperationListener.java b/src/com/owncloud/android/operations/OnRemoteOperationListener.java similarity index 94% rename from src/de/mobilcom/debitel/cloud/android/operations/OnRemoteOperationListener.java rename to src/com/owncloud/android/operations/OnRemoteOperationListener.java index 3bd183eb..e6a58e73 100644 --- a/src/de/mobilcom/debitel/cloud/android/operations/OnRemoteOperationListener.java +++ b/src/com/owncloud/android/operations/OnRemoteOperationListener.java @@ -16,7 +16,7 @@ * */ -package de.mobilcom.debitel.cloud.android.operations; +package com.owncloud.android.operations; public interface OnRemoteOperationListener { diff --git a/src/de/mobilcom/debitel/cloud/android/operations/OperationCancelledException.java b/src/com/owncloud/android/operations/OperationCancelledException.java similarity index 94% rename from src/de/mobilcom/debitel/cloud/android/operations/OperationCancelledException.java rename to src/com/owncloud/android/operations/OperationCancelledException.java index 8db7ee85..0b7878ce 100644 --- a/src/de/mobilcom/debitel/cloud/android/operations/OperationCancelledException.java +++ b/src/com/owncloud/android/operations/OperationCancelledException.java @@ -16,7 +16,7 @@ * */ -package de.mobilcom.debitel.cloud.android.operations; +package com.owncloud.android.operations; public class OperationCancelledException extends Exception { diff --git a/src/de/mobilcom/debitel/cloud/android/operations/OwnCloudServerCheckOperation.java b/src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java similarity index 95% rename from src/de/mobilcom/debitel/cloud/android/operations/OwnCloudServerCheckOperation.java rename to src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java index fbf097f8..62342249 100644 --- a/src/de/mobilcom/debitel/cloud/android/operations/OwnCloudServerCheckOperation.java +++ b/src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java @@ -15,16 +15,17 @@ * */ -package de.mobilcom.debitel.cloud.android.operations; +package com.owncloud.android.operations; import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.httpclient.methods.GetMethod; import org.json.JSONException; import org.json.JSONObject; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.authentication.AccountUtils; -import de.mobilcom.debitel.cloud.android.utils.OwnCloudVersion; +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; diff --git a/src/de/mobilcom/debitel/cloud/android/operations/RemoteOperation.java b/src/com/owncloud/android/operations/RemoteOperation.java similarity index 97% rename from src/de/mobilcom/debitel/cloud/android/operations/RemoteOperation.java rename to src/com/owncloud/android/operations/RemoteOperation.java index 19bbfb28..fbb93e61 100644 --- a/src/de/mobilcom/debitel/cloud/android/operations/RemoteOperation.java +++ b/src/com/owncloud/android/operations/RemoteOperation.java @@ -14,17 +14,18 @@ * along with this program. If not, see . * */ -package de.mobilcom.debitel.cloud.android.operations; +package com.owncloud.android.operations; import java.io.IOException; import org.apache.commons.httpclient.Credentials; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.MainApp; -import de.mobilcom.debitel.cloud.android.network.BearerCredentials; -import de.mobilcom.debitel.cloud.android.network.OwnCloudClientUtils; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode; +import com.owncloud.android.Log_OC; +import com.owncloud.android.MainApp; +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; diff --git a/src/de/mobilcom/debitel/cloud/android/operations/RemoteOperationResult.java b/src/com/owncloud/android/operations/RemoteOperationResult.java similarity index 97% rename from src/de/mobilcom/debitel/cloud/android/operations/RemoteOperationResult.java rename to src/com/owncloud/android/operations/RemoteOperationResult.java index c5b7dbab..8d9b3ee2 100644 --- a/src/de/mobilcom/debitel/cloud/android/operations/RemoteOperationResult.java +++ b/src/com/owncloud/android/operations/RemoteOperationResult.java @@ -16,7 +16,7 @@ * */ -package de.mobilcom.debitel.cloud.android.operations; +package com.owncloud.android.operations; import java.io.IOException; import java.io.Serializable; @@ -33,12 +33,13 @@ import org.apache.commons.httpclient.HttpException; import org.apache.commons.httpclient.HttpStatus; import org.apache.jackrabbit.webdav.DavException; +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; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.authentication.AccountUtils.AccountNotFoundException; -import de.mobilcom.debitel.cloud.android.network.CertificateCombinedException; /** * The result of a remote operation required to an ownCloud server. diff --git a/src/de/mobilcom/debitel/cloud/android/operations/RemoveFileOperation.java b/src/com/owncloud/android/operations/RemoveFileOperation.java similarity index 94% rename from src/de/mobilcom/debitel/cloud/android/operations/RemoveFileOperation.java rename to src/com/owncloud/android/operations/RemoveFileOperation.java index 03c4cb88..f8a6c4ab 100644 --- a/src/de/mobilcom/debitel/cloud/android/operations/RemoveFileOperation.java +++ b/src/com/owncloud/android/operations/RemoveFileOperation.java @@ -15,14 +15,15 @@ * */ -package de.mobilcom.debitel.cloud.android.operations; +package com.owncloud.android.operations; import org.apache.commons.httpclient.HttpStatus; import org.apache.jackrabbit.webdav.client.methods.DeleteMethod; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager; -import de.mobilcom.debitel.cloud.android.datamodel.OCFile; +import com.owncloud.android.Log_OC; +import com.owncloud.android.datamodel.DataStorageManager; +import com.owncloud.android.datamodel.OCFile; + import eu.alefzero.webdav.WebdavClient; import eu.alefzero.webdav.WebdavUtils; diff --git a/src/de/mobilcom/debitel/cloud/android/operations/RenameFileOperation.java b/src/com/owncloud/android/operations/RenameFileOperation.java similarity index 96% rename from src/de/mobilcom/debitel/cloud/android/operations/RenameFileOperation.java rename to src/com/owncloud/android/operations/RenameFileOperation.java index 60e1b035..86d27122 100644 --- a/src/de/mobilcom/debitel/cloud/android/operations/RenameFileOperation.java +++ b/src/com/owncloud/android/operations/RenameFileOperation.java @@ -15,21 +15,22 @@ * */ -package de.mobilcom.debitel.cloud.android.operations; +package com.owncloud.android.operations; import java.io.File; import java.io.IOException; import org.apache.jackrabbit.webdav.client.methods.DavMethodBase; + +import com.owncloud.android.Log_OC; +import com.owncloud.android.datamodel.DataStorageManager; +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 de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager; -import de.mobilcom.debitel.cloud.android.datamodel.OCFile; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode; -import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils; import eu.alefzero.webdav.WebdavClient; import eu.alefzero.webdav.WebdavUtils; diff --git a/src/de/mobilcom/debitel/cloud/android/operations/SynchronizeFileOperation.java b/src/com/owncloud/android/operations/SynchronizeFileOperation.java similarity index 95% rename from src/de/mobilcom/debitel/cloud/android/operations/SynchronizeFileOperation.java rename to src/com/owncloud/android/operations/SynchronizeFileOperation.java index bd5637ea..211ba705 100644 --- a/src/de/mobilcom/debitel/cloud/android/operations/SynchronizeFileOperation.java +++ b/src/com/owncloud/android/operations/SynchronizeFileOperation.java @@ -16,23 +16,24 @@ * */ -package de.mobilcom.debitel.cloud.android.operations; +package com.owncloud.android.operations; import org.apache.http.HttpStatus; 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.DataStorageManager; +import com.owncloud.android.datamodel.OCFile; +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 de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager; -import de.mobilcom.debitel.cloud.android.datamodel.OCFile; -import de.mobilcom.debitel.cloud.android.files.services.FileDownloader; -import de.mobilcom.debitel.cloud.android.files.services.FileUploader; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode; import eu.alefzero.webdav.WebdavClient; import eu.alefzero.webdav.WebdavEntry; diff --git a/src/de/mobilcom/debitel/cloud/android/operations/SynchronizeFolderOperation.java b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java similarity index 97% rename from src/de/mobilcom/debitel/cloud/android/operations/SynchronizeFolderOperation.java rename to src/com/owncloud/android/operations/SynchronizeFolderOperation.java index d089f381..3d09b47e 100644 --- a/src/de/mobilcom/debitel/cloud/android/operations/SynchronizeFolderOperation.java +++ b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java @@ -15,7 +15,7 @@ * */ -package de.mobilcom.debitel.cloud.android.operations; +package com.owncloud.android.operations; import java.io.File; import java.io.FileInputStream; @@ -33,14 +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.datamodel.DataStorageManager; +import com.owncloud.android.datamodel.OCFile; +import com.owncloud.android.operations.RemoteOperationResult.ResultCode; +import com.owncloud.android.utils.FileStorageUtils; + import android.accounts.Account; import android.content.Context; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager; -import de.mobilcom.debitel.cloud.android.datamodel.OCFile; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode; -import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils; import eu.alefzero.webdav.WebdavClient; import eu.alefzero.webdav.WebdavEntry; diff --git a/src/de/mobilcom/debitel/cloud/android/operations/UpdateOCVersionOperation.java b/src/com/owncloud/android/operations/UpdateOCVersionOperation.java similarity index 91% rename from src/de/mobilcom/debitel/cloud/android/operations/UpdateOCVersionOperation.java rename to src/com/owncloud/android/operations/UpdateOCVersionOperation.java index fdf7fcab..2e116ac6 100644 --- a/src/de/mobilcom/debitel/cloud/android/operations/UpdateOCVersionOperation.java +++ b/src/com/owncloud/android/operations/UpdateOCVersionOperation.java @@ -15,22 +15,23 @@ * */ -package de.mobilcom.debitel.cloud.android.operations; +package com.owncloud.android.operations; import org.apache.commons.httpclient.HttpStatus; 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.AccountAuthenticator; +import com.owncloud.android.authentication.AccountUtils; +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 de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.authentication.AccountAuthenticator; -import de.mobilcom.debitel.cloud.android.authentication.AccountUtils; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode; -import de.mobilcom.debitel.cloud.android.utils.OwnCloudVersion; import eu.alefzero.webdav.WebdavClient; diff --git a/src/de/mobilcom/debitel/cloud/android/operations/UploadFileOperation.java b/src/com/owncloud/android/operations/UploadFileOperation.java similarity index 96% rename from src/de/mobilcom/debitel/cloud/android/operations/UploadFileOperation.java rename to src/com/owncloud/android/operations/UploadFileOperation.java index 5a5a1e48..936ac01e 100644 --- a/src/de/mobilcom/debitel/cloud/android/operations/UploadFileOperation.java +++ b/src/com/owncloud/android/operations/UploadFileOperation.java @@ -15,7 +15,7 @@ * */ -package de.mobilcom.debitel.cloud.android.operations; +package com.owncloud.android.operations; import java.io.File; import java.io.FileInputStream; @@ -32,16 +32,17 @@ 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.network.ProgressiveDataTransferer; +import com.owncloud.android.operations.RemoteOperation; +import com.owncloud.android.operations.RemoteOperationResult; +import com.owncloud.android.operations.RemoteOperationResult.ResultCode; +import com.owncloud.android.utils.FileStorageUtils; + import android.accounts.Account; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.datamodel.OCFile; -import de.mobilcom.debitel.cloud.android.files.services.FileUploader; -import de.mobilcom.debitel.cloud.android.network.ProgressiveDataTransferer; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperation; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode; -import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils; import eu.alefzero.webdav.FileRequestEntity; import eu.alefzero.webdav.OnDatatransferProgressListener; diff --git a/src/de/mobilcom/debitel/cloud/android/providers/FileContentProvider.java b/src/com/owncloud/android/providers/FileContentProvider.java similarity index 97% rename from src/de/mobilcom/debitel/cloud/android/providers/FileContentProvider.java rename to src/com/owncloud/android/providers/FileContentProvider.java index af31e668..7f6a1a4f 100644 --- a/src/de/mobilcom/debitel/cloud/android/providers/FileContentProvider.java +++ b/src/com/owncloud/android/providers/FileContentProvider.java @@ -16,14 +16,15 @@ * */ -package de.mobilcom.debitel.cloud.android.providers; +package com.owncloud.android.providers; import java.util.HashMap; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.db.ProviderMeta; -import de.mobilcom.debitel.cloud.android.db.ProviderMeta.ProviderTableMeta; +import com.owncloud.android.Log_OC; +import com.owncloud.android.R; +import com.owncloud.android.db.ProviderMeta; +import com.owncloud.android.db.ProviderMeta.ProviderTableMeta; + import android.content.ContentProvider; diff --git a/src/de/mobilcom/debitel/cloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java similarity index 90% rename from src/de/mobilcom/debitel/cloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java rename to src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java index 1d4d4fbb..47730995 100644 --- a/src/de/mobilcom/debitel/cloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java +++ b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java @@ -16,7 +16,7 @@ * */ -package de.mobilcom.debitel.cloud.android.syncadapter; +package com.owncloud.android.syncadapter; import java.io.IOException; import java.util.Date; @@ -27,10 +27,11 @@ import org.apache.http.client.ClientProtocolException; import org.apache.http.conn.ConnectionKeepAliveStrategy; import org.apache.http.protocol.HttpContext; -import de.mobilcom.debitel.cloud.android.authentication.AccountUtils; -import de.mobilcom.debitel.cloud.android.authentication.AccountUtils.AccountNotFoundException; -import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager; -import de.mobilcom.debitel.cloud.android.network.OwnCloudClientUtils; +import com.owncloud.android.authentication.AccountUtils; +import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException; +import com.owncloud.android.datamodel.DataStorageManager; +import com.owncloud.android.network.OwnCloudClientUtils; + import android.accounts.Account; import android.accounts.AccountManager; diff --git a/src/de/mobilcom/debitel/cloud/android/syncadapter/ContactSyncAdapter.java b/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java similarity index 95% rename from src/de/mobilcom/debitel/cloud/android/syncadapter/ContactSyncAdapter.java rename to src/com/owncloud/android/syncadapter/ContactSyncAdapter.java index ff2e84ad..b07c048a 100644 --- a/src/de/mobilcom/debitel/cloud/android/syncadapter/ContactSyncAdapter.java +++ b/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java @@ -16,7 +16,7 @@ * */ -package de.mobilcom.debitel.cloud.android.syncadapter; +package com.owncloud.android.syncadapter; import java.io.FileInputStream; import java.io.IOException; @@ -24,8 +24,9 @@ import java.io.IOException; import org.apache.http.client.methods.HttpPut; import org.apache.http.entity.ByteArrayEntity; -import de.mobilcom.debitel.cloud.android.authentication.AccountAuthenticator; -import de.mobilcom.debitel.cloud.android.authentication.AccountUtils; +import com.owncloud.android.authentication.AccountAuthenticator; +import com.owncloud.android.authentication.AccountUtils; + import android.accounts.Account; import android.accounts.AccountManager; diff --git a/src/de/mobilcom/debitel/cloud/android/syncadapter/ContactSyncService.java b/src/com/owncloud/android/syncadapter/ContactSyncService.java similarity index 96% rename from src/de/mobilcom/debitel/cloud/android/syncadapter/ContactSyncService.java rename to src/com/owncloud/android/syncadapter/ContactSyncService.java index 9d15ca5b..6d7c46c0 100644 --- a/src/de/mobilcom/debitel/cloud/android/syncadapter/ContactSyncService.java +++ b/src/com/owncloud/android/syncadapter/ContactSyncService.java @@ -16,7 +16,7 @@ * */ -package de.mobilcom.debitel.cloud.android.syncadapter; +package com.owncloud.android.syncadapter; import android.app.Service; import android.content.Intent; diff --git a/src/de/mobilcom/debitel/cloud/android/syncadapter/FileSyncAdapter.java b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java similarity index 95% rename from src/de/mobilcom/debitel/cloud/android/syncadapter/FileSyncAdapter.java rename to src/com/owncloud/android/syncadapter/FileSyncAdapter.java index e073971e..8c187cc6 100644 --- a/src/de/mobilcom/debitel/cloud/android/syncadapter/FileSyncAdapter.java +++ b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java @@ -16,7 +16,7 @@ * */ -package de.mobilcom.debitel.cloud.android.syncadapter; +package com.owncloud.android.syncadapter; import java.io.IOException; import java.util.ArrayList; @@ -26,18 +26,19 @@ import java.util.Map; import org.apache.jackrabbit.webdav.DavException; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.MainApp; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.authentication.AuthenticatorActivity; -import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager; -import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager; -import de.mobilcom.debitel.cloud.android.datamodel.OCFile; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult; -import de.mobilcom.debitel.cloud.android.operations.SynchronizeFolderOperation; -import de.mobilcom.debitel.cloud.android.operations.UpdateOCVersionOperation; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode; -import de.mobilcom.debitel.cloud.android.ui.activity.ErrorsWhileCopyingHandlerActivity; +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.DataStorageManager; +import com.owncloud.android.datamodel.FileDataStorageManager; +import com.owncloud.android.datamodel.OCFile; +import com.owncloud.android.operations.RemoteOperationResult; +import com.owncloud.android.operations.SynchronizeFolderOperation; +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; diff --git a/src/de/mobilcom/debitel/cloud/android/syncadapter/FileSyncService.java b/src/com/owncloud/android/syncadapter/FileSyncService.java similarity index 93% rename from src/de/mobilcom/debitel/cloud/android/syncadapter/FileSyncService.java rename to src/com/owncloud/android/syncadapter/FileSyncService.java index de0f4598..d3472658 100644 --- a/src/de/mobilcom/debitel/cloud/android/syncadapter/FileSyncService.java +++ b/src/com/owncloud/android/syncadapter/FileSyncService.java @@ -15,7 +15,7 @@ * along with this program. If not, see . * */ -package de.mobilcom.debitel.cloud.android.syncadapter; +package com.owncloud.android.syncadapter; import android.app.Service; import android.content.Intent; diff --git a/src/de/mobilcom/debitel/cloud/android/ui/ActionItem.java b/src/com/owncloud/android/ui/ActionItem.java similarity index 93% rename from src/de/mobilcom/debitel/cloud/android/ui/ActionItem.java rename to src/com/owncloud/android/ui/ActionItem.java index 6b907678..a65f3ad0 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/ActionItem.java +++ b/src/com/owncloud/android/ui/ActionItem.java @@ -15,7 +15,7 @@ * along with this program. If not, see . * */ -package de.mobilcom.debitel.cloud.android.ui; +package com.owncloud.android.ui; import android.graphics.drawable.Drawable; import android.view.View.OnClickListener; diff --git a/src/de/mobilcom/debitel/cloud/android/ui/CustomButton.java b/src/com/owncloud/android/ui/CustomButton.java similarity index 92% rename from src/de/mobilcom/debitel/cloud/android/ui/CustomButton.java rename to src/com/owncloud/android/ui/CustomButton.java index 09b82157..ab4db65d 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/CustomButton.java +++ b/src/com/owncloud/android/ui/CustomButton.java @@ -1,6 +1,7 @@ -package de.mobilcom.debitel.cloud.android.ui; +package com.owncloud.android.ui; + +import com.owncloud.android.R; -import de.mobilcom.debitel.cloud.android.R; import android.content.Context; import android.util.AttributeSet; import android.widget.Button; diff --git a/src/de/mobilcom/debitel/cloud/android/ui/CustomPopup.java b/src/com/owncloud/android/ui/CustomPopup.java similarity index 95% rename from src/de/mobilcom/debitel/cloud/android/ui/CustomPopup.java rename to src/com/owncloud/android/ui/CustomPopup.java index 244a1935..fccf56d2 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/CustomPopup.java +++ b/src/com/owncloud/android/ui/CustomPopup.java @@ -15,7 +15,7 @@ * along with this program. If not, see . * */ -package de.mobilcom.debitel.cloud.android.ui; +package com.owncloud.android.ui; import android.content.Context; import android.graphics.Rect; diff --git a/src/de/mobilcom/debitel/cloud/android/ui/ExtendedListView.java b/src/com/owncloud/android/ui/ExtendedListView.java similarity index 98% rename from src/de/mobilcom/debitel/cloud/android/ui/ExtendedListView.java rename to src/com/owncloud/android/ui/ExtendedListView.java index 15a797fe..9fe885bf 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/ExtendedListView.java +++ b/src/com/owncloud/android/ui/ExtendedListView.java @@ -16,7 +16,7 @@ * */ -package de.mobilcom.debitel.cloud.android.ui; +package com.owncloud.android.ui; import android.content.Context; import android.graphics.Canvas; diff --git a/src/de/mobilcom/debitel/cloud/android/ui/QuickAction.java b/src/com/owncloud/android/ui/QuickAction.java similarity index 96% rename from src/de/mobilcom/debitel/cloud/android/ui/QuickAction.java rename to src/com/owncloud/android/ui/QuickAction.java index 52408390..86fe3fe3 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/QuickAction.java +++ b/src/com/owncloud/android/ui/QuickAction.java @@ -15,7 +15,7 @@ * along with this program. If not, see . * */ -package de.mobilcom.debitel.cloud.android.ui; +package com.owncloud.android.ui; import android.content.Context; @@ -36,7 +36,8 @@ import android.view.ViewGroup; import java.util.ArrayList; -import de.mobilcom.debitel.cloud.android.R; +import com.owncloud.android.R; + /** * Popup window, shows action list as icon and text like the one in Gallery3D diff --git a/src/de/mobilcom/debitel/cloud/android/ui/activity/AccountSelectActivity.java b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java similarity index 96% rename from src/de/mobilcom/debitel/cloud/android/ui/activity/AccountSelectActivity.java rename to src/com/owncloud/android/ui/activity/AccountSelectActivity.java index 852f8101..80e38f79 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/activity/AccountSelectActivity.java +++ b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java @@ -16,7 +16,7 @@ * */ -package de.mobilcom.debitel.cloud.android.ui.activity; +package com.owncloud.android.ui.activity; import java.util.HashMap; import java.util.LinkedList; @@ -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.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; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.MainApp; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.authentication.AccountAuthenticator; -import de.mobilcom.debitel.cloud.android.authentication.AccountUtils; -import de.mobilcom.debitel.cloud.android.authentication.AuthenticatorActivity; public class AccountSelectActivity extends SherlockListActivity implements AccountManagerCallback { diff --git a/src/de/mobilcom/debitel/cloud/android/ui/activity/ConflictsResolveActivity.java b/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java similarity index 84% rename from src/de/mobilcom/debitel/cloud/android/ui/activity/ConflictsResolveActivity.java rename to src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java index e87febb3..61ac8f5f 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/activity/ConflictsResolveActivity.java +++ b/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java @@ -16,16 +16,16 @@ * */ -package de.mobilcom.debitel.cloud.android.ui.activity; +package com.owncloud.android.ui.activity; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager; -import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager; -import de.mobilcom.debitel.cloud.android.datamodel.OCFile; -import de.mobilcom.debitel.cloud.android.files.services.FileUploader; -import de.mobilcom.debitel.cloud.android.ui.dialog.ConflictsResolveDialog; -import de.mobilcom.debitel.cloud.android.ui.dialog.ConflictsResolveDialog.Decision; -import de.mobilcom.debitel.cloud.android.ui.dialog.ConflictsResolveDialog.OnConflictDecisionMadeListener; +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.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 android.content.Intent; import android.os.Bundle; diff --git a/src/de/mobilcom/debitel/cloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java b/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java similarity index 95% rename from src/de/mobilcom/debitel/cloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java rename to src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java index 33ffc32f..fc9afcde 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java +++ b/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java @@ -15,7 +15,7 @@ * */ -package de.mobilcom.debitel.cloud.android.ui.activity; +package com.owncloud.android.ui.activity; import java.io.File; import java.util.ArrayList; @@ -38,14 +38,14 @@ 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.CustomButton; +import com.owncloud.android.ui.dialog.IndeterminateProgressDialog; +import com.owncloud.android.utils.FileStorageUtils; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager; -import de.mobilcom.debitel.cloud.android.datamodel.OCFile; -import de.mobilcom.debitel.cloud.android.ui.CustomButton; -import de.mobilcom.debitel.cloud.android.ui.dialog.IndeterminateProgressDialog; -import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils; /** diff --git a/src/de/mobilcom/debitel/cloud/android/ui/activity/FailedUploadActivity.java b/src/com/owncloud/android/ui/activity/FailedUploadActivity.java similarity index 89% rename from src/de/mobilcom/debitel/cloud/android/ui/activity/FailedUploadActivity.java rename to src/com/owncloud/android/ui/activity/FailedUploadActivity.java index eeb8b275..76f2ba41 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/activity/FailedUploadActivity.java +++ b/src/com/owncloud/android/ui/activity/FailedUploadActivity.java @@ -15,7 +15,10 @@ * */ -package de.mobilcom.debitel.cloud.android.ui.activity; +package com.owncloud.android.ui.activity; + +import com.owncloud.android.R; +import com.owncloud.android.ui.CustomButton; import android.app.Activity; import android.os.Bundle; @@ -23,8 +26,6 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.TextView; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.ui.CustomButton; /** * This Activity is used to display a detail message for failed uploads diff --git a/src/de/mobilcom/debitel/cloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java similarity index 94% rename from src/de/mobilcom/debitel/cloud/android/ui/activity/FileActivity.java rename to src/com/owncloud/android/ui/activity/FileActivity.java index f85b5fcd..cddf9b66 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/activity/FileActivity.java +++ b/src/com/owncloud/android/ui/activity/FileActivity.java @@ -16,7 +16,7 @@ * */ -package de.mobilcom.debitel.cloud.android.ui.activity; +package com.owncloud.android.ui.activity; import android.accounts.Account; import android.accounts.AccountManager; @@ -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 de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.MainApp; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.authentication.AccountUtils; -import de.mobilcom.debitel.cloud.android.datamodel.OCFile; import eu.alefzero.webdav.WebdavUtils; @@ -45,9 +45,9 @@ import eu.alefzero.webdav.WebdavUtils; */ public abstract class FileActivity extends SherlockFragmentActivity { - public static final String EXTRA_FILE = "de.mobilcom.debitel.cloud.android.ui.activity.FILE"; - public static final String EXTRA_ACCOUNT = "de.mobilcom.debitel.cloud.android.ui.activity.ACCOUNT"; - public static final String EXTRA_WAITING_TO_PREVIEW = "de.mobilcom.debitel.cloud.android.ui.activity.WAITING_TO_PREVIEW"; + public static final String EXTRA_FILE = "com.owncloud.android.ui.activity.FILE"; + public static final String EXTRA_ACCOUNT = "com.owncloud.android.ui.activity.ACCOUNT"; + public static final String EXTRA_WAITING_TO_PREVIEW = "com.owncloud.android.ui.activity.WAITING_TO_PREVIEW"; public static final String TAG = FileActivity.class.getSimpleName(); diff --git a/src/de/mobilcom/debitel/cloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java similarity index 95% rename from src/de/mobilcom/debitel/cloud/android/ui/activity/FileDisplayActivity.java rename to src/com/owncloud/android/ui/activity/FileDisplayActivity.java index c68783b8..b93321ab 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/activity/FileDisplayActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -16,7 +16,7 @@ * */ -package de.mobilcom.debitel.cloud.android.ui.activity; +package com.owncloud.android.ui.activity; import java.io.File; @@ -57,38 +57,38 @@ 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.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.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; +import com.owncloud.android.operations.RemoteOperation; +import com.owncloud.android.operations.RemoteOperationResult; +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.syncadapter.FileSyncService; +import com.owncloud.android.ui.dialog.EditNameDialog; +import com.owncloud.android.ui.dialog.LoadingDialog; +import com.owncloud.android.ui.dialog.SslValidatorDialog; +import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener; +import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener; +import com.owncloud.android.ui.fragment.FileDetailFragment; +import com.owncloud.android.ui.fragment.FileFragment; +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 de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.MainApp; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager; -import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager; -import de.mobilcom.debitel.cloud.android.datamodel.OCFile; -import de.mobilcom.debitel.cloud.android.files.services.FileDownloader; -import de.mobilcom.debitel.cloud.android.files.services.FileObserverService; -import de.mobilcom.debitel.cloud.android.files.services.FileUploader; -import de.mobilcom.debitel.cloud.android.files.services.FileDownloader.FileDownloaderBinder; -import de.mobilcom.debitel.cloud.android.files.services.FileUploader.FileUploaderBinder; -import de.mobilcom.debitel.cloud.android.operations.CreateFolderOperation; -import de.mobilcom.debitel.cloud.android.operations.OnRemoteOperationListener; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperation; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult; -import de.mobilcom.debitel.cloud.android.operations.RemoveFileOperation; -import de.mobilcom.debitel.cloud.android.operations.RenameFileOperation; -import de.mobilcom.debitel.cloud.android.operations.SynchronizeFileOperation; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode; -import de.mobilcom.debitel.cloud.android.syncadapter.FileSyncService; -import de.mobilcom.debitel.cloud.android.ui.dialog.EditNameDialog; -import de.mobilcom.debitel.cloud.android.ui.dialog.LoadingDialog; -import de.mobilcom.debitel.cloud.android.ui.dialog.SslValidatorDialog; -import de.mobilcom.debitel.cloud.android.ui.dialog.EditNameDialog.EditNameDialogListener; -import de.mobilcom.debitel.cloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener; -import de.mobilcom.debitel.cloud.android.ui.fragment.FileDetailFragment; -import de.mobilcom.debitel.cloud.android.ui.fragment.FileFragment; -import de.mobilcom.debitel.cloud.android.ui.fragment.OCFileListFragment; -import de.mobilcom.debitel.cloud.android.ui.preview.PreviewImageActivity; -import de.mobilcom.debitel.cloud.android.ui.preview.PreviewMediaFragment; -import de.mobilcom.debitel.cloud.android.ui.preview.PreviewVideoActivity; /** * Displays, what files the user has available in his ownCloud. @@ -126,7 +126,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa private static final String DIALOG_WAIT_TAG = "DIALOG_WAIT"; - public static final String ACTION_DETAILS = "de.mobilcom.debitel.cloud.android.ui.activity.action.DETAILS"; + public static final String ACTION_DETAILS = "com.owncloud.android.ui.activity.action.DETAILS"; private static final int ACTION_SELECT_CONTENT_FROM_APPS = 1; private static final int ACTION_SELECT_MULTIPLE_FILES = 2; diff --git a/src/de/mobilcom/debitel/cloud/android/ui/activity/GenericExplanationActivity.java b/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java similarity index 97% rename from src/de/mobilcom/debitel/cloud/android/ui/activity/GenericExplanationActivity.java rename to src/com/owncloud/android/ui/activity/GenericExplanationActivity.java index 2921a838..b971c40c 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/activity/GenericExplanationActivity.java +++ b/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java @@ -15,7 +15,7 @@ * */ -package de.mobilcom.debitel.cloud.android.ui.activity; +package com.owncloud.android.ui.activity; import java.util.ArrayList; @@ -31,8 +31,8 @@ import android.widget.ListView; import android.widget.TextView; import com.actionbarsherlock.app.SherlockFragmentActivity; +import com.owncloud.android.R; -import de.mobilcom.debitel.cloud.android.R; /** * Activity showing a text message and, optionally, a couple list of single or paired text strings. diff --git a/src/de/mobilcom/debitel/cloud/android/ui/activity/InstantUploadActivity.java b/src/com/owncloud/android/ui/activity/InstantUploadActivity.java similarity index 96% rename from src/de/mobilcom/debitel/cloud/android/ui/activity/InstantUploadActivity.java rename to src/com/owncloud/android/ui/activity/InstantUploadActivity.java index 23cb6f02..ce7ef798 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/activity/InstantUploadActivity.java +++ b/src/com/owncloud/android/ui/activity/InstantUploadActivity.java @@ -14,11 +14,20 @@ * along with this program. If not, see . * */ -package de.mobilcom.debitel.cloud.android.ui.activity; +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.ui.CustomButton; +import com.owncloud.android.utils.FileStorageUtils; + import android.accounts.Account; import android.app.Activity; import android.content.Intent; @@ -41,14 +50,6 @@ import android.widget.LinearLayout; import android.widget.TextView; import android.widget.Toast; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.authentication.AccountUtils; -import de.mobilcom.debitel.cloud.android.db.DbHandler; -import de.mobilcom.debitel.cloud.android.files.InstantUploadBroadcastReceiver; -import de.mobilcom.debitel.cloud.android.files.services.FileUploader; -import de.mobilcom.debitel.cloud.android.ui.CustomButton; -import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils; /** * This Activity is used to display a list with images they could not be @@ -446,7 +447,7 @@ public class InstantUploadActivity extends Activity { i.putExtra(FileUploader.KEY_LOCAL_FILE, img_path); i.putExtra(FileUploader.KEY_REMOTE_FILE, filename); i.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_SINGLE_FILE); - i.putExtra(de.mobilcom.debitel.cloud.android.files.services.FileUploader.KEY_INSTANT_UPLOAD, true); + i.putExtra(com.owncloud.android.files.services.FileUploader.KEY_INSTANT_UPLOAD, true); final String msg = "try to upload file with name :" + filename; Log_OC.d(LOG_TAG, msg); diff --git a/src/de/mobilcom/debitel/cloud/android/ui/activity/LandingActivity.java b/src/com/owncloud/android/ui/activity/LandingActivity.java similarity index 91% rename from src/de/mobilcom/debitel/cloud/android/ui/activity/LandingActivity.java rename to src/com/owncloud/android/ui/activity/LandingActivity.java index 5d6b69f3..a6ada6ce 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/activity/LandingActivity.java +++ b/src/com/owncloud/android/ui/activity/LandingActivity.java @@ -14,9 +14,12 @@ * along with this program. If not, see . * */ -package de.mobilcom.debitel.cloud.android.ui.activity; +package com.owncloud.android.ui.activity; import com.actionbarsherlock.app.SherlockFragmentActivity; +import com.owncloud.android.MainApp; +import com.owncloud.android.R; +import com.owncloud.android.ui.adapter.LandingScreenAdapter; import android.accounts.Account; import android.accounts.AccountManager; @@ -32,9 +35,6 @@ import android.widget.AdapterView.OnItemClickListener; import android.widget.GridView; import android.widget.Toast; -import de.mobilcom.debitel.cloud.android.MainApp; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.ui.adapter.LandingScreenAdapter; /** * This activity is used as a landing page when the user first opens this app. @@ -64,7 +64,7 @@ public class LandingActivity extends SherlockFragmentActivity implements // Start device tracking service Intent locationServiceIntent = new Intent(); locationServiceIntent - .setAction("de.mobilcom.debitel.cloud.android.location.LocationLauncher"); + .setAction("com.owncloud.android.location.LocationLauncher"); sendBroadcast(locationServiceIntent); } diff --git a/src/de/mobilcom/debitel/cloud/android/ui/activity/LogHistoryActivity.java b/src/com/owncloud/android/ui/activity/LogHistoryActivity.java similarity index 93% rename from src/de/mobilcom/debitel/cloud/android/ui/activity/LogHistoryActivity.java rename to src/com/owncloud/android/ui/activity/LogHistoryActivity.java index 20317bc8..0aa84753 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/activity/LogHistoryActivity.java +++ b/src/com/owncloud/android/ui/activity/LogHistoryActivity.java @@ -15,7 +15,7 @@ * */ -package de.mobilcom.debitel.cloud.android.ui.activity; +package com.owncloud.android.ui.activity; import java.io.File; import java.util.ArrayList; @@ -31,11 +31,11 @@ import android.widget.ListView; import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.app.SherlockPreferenceActivity; import com.actionbarsherlock.view.MenuItem; +import com.owncloud.android.R; +import com.owncloud.android.ui.CustomButton; +import com.owncloud.android.ui.adapter.LogListAdapter; +import com.owncloud.android.utils.FileStorageUtils; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.ui.CustomButton; -import de.mobilcom.debitel.cloud.android.ui.adapter.LogListAdapter; -import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils; diff --git a/src/de/mobilcom/debitel/cloud/android/ui/activity/PinCodeActivity.java b/src/com/owncloud/android/ui/activity/PinCodeActivity.java similarity index 98% rename from src/de/mobilcom/debitel/cloud/android/ui/activity/PinCodeActivity.java rename to src/com/owncloud/android/ui/activity/PinCodeActivity.java index 37e763d1..068461a8 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/activity/PinCodeActivity.java +++ b/src/com/owncloud/android/ui/activity/PinCodeActivity.java @@ -14,14 +14,14 @@ * along with this program. If not, see . * */ -package de.mobilcom.debitel.cloud.android.ui.activity; +package com.owncloud.android.ui.activity; import java.util.Arrays; import com.actionbarsherlock.app.SherlockFragmentActivity; +import com.owncloud.android.R; +import com.owncloud.android.ui.CustomButton; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.ui.CustomButton; import android.app.AlertDialog; import android.content.DialogInterface; @@ -42,8 +42,8 @@ import android.widget.TextView; public class PinCodeActivity extends SherlockFragmentActivity { - public final static String EXTRA_ACTIVITY = "de.mobilcom.debitel.cloud.android.ui.activity.PinCodeActivity.ACTIVITY"; - public final static String EXTRA_NEW_STATE = "de.mobilcom.debitel.cloud.android.ui.activity.PinCodeActivity.NEW_STATE"; + public final static String EXTRA_ACTIVITY = "com.owncloud.android.ui.activity.PinCodeActivity.ACTIVITY"; + public final static String EXTRA_NEW_STATE = "com.owncloud.android.ui.activity.PinCodeActivity.NEW_STATE"; CustomButton bCancel; TextView mPinHdr; diff --git a/src/de/mobilcom/debitel/cloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java similarity index 97% rename from src/de/mobilcom/debitel/cloud/android/ui/activity/Preferences.java rename to src/com/owncloud/android/ui/activity/Preferences.java index 7b34a96d..20c14bc6 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/activity/Preferences.java +++ b/src/com/owncloud/android/ui/activity/Preferences.java @@ -15,7 +15,7 @@ * along with this program. If not, see . * */ -package de.mobilcom.debitel.cloud.android.ui.activity; +package com.owncloud.android.ui.activity; import java.util.Vector; @@ -38,12 +38,12 @@ 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.authentication.AccountUtils; +import com.owncloud.android.db.DbHandler; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.OwnCloudSession; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.authentication.AccountUtils; -import de.mobilcom.debitel.cloud.android.db.DbHandler; /** * An Activity that allows the user to change the application's settings. @@ -349,7 +349,7 @@ public class Preferences extends SherlockPreferenceActivity implements OnPrefere else if (preference.equals(mDeviceTracking)) { Intent locationServiceIntent = new Intent(); locationServiceIntent - .setAction("de.mobilcom.debitel.cloud.android.location.LocationLauncher"); + .setAction("com.owncloud.android.location.LocationLauncher"); locationServiceIntent.putExtra("TRACKING_SETTING", (Boolean) newValue); sendBroadcast(locationServiceIntent); diff --git a/src/de/mobilcom/debitel/cloud/android/ui/activity/PreferencesNewSession.java b/src/com/owncloud/android/ui/activity/PreferencesNewSession.java similarity index 96% rename from src/de/mobilcom/debitel/cloud/android/ui/activity/PreferencesNewSession.java rename to src/com/owncloud/android/ui/activity/PreferencesNewSession.java index d78b1e95..c43b29f2 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/activity/PreferencesNewSession.java +++ b/src/com/owncloud/android/ui/activity/PreferencesNewSession.java @@ -16,7 +16,7 @@ * */ -package de.mobilcom.debitel.cloud.android.ui.activity; +package com.owncloud.android.ui.activity; import android.accounts.AccountAuthenticatorActivity; import android.app.Activity; diff --git a/src/de/mobilcom/debitel/cloud/android/ui/activity/TransferServiceGetter.java b/src/com/owncloud/android/ui/activity/TransferServiceGetter.java similarity index 84% rename from src/de/mobilcom/debitel/cloud/android/ui/activity/TransferServiceGetter.java rename to src/com/owncloud/android/ui/activity/TransferServiceGetter.java index acf17e53..fbc348d9 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/activity/TransferServiceGetter.java +++ b/src/com/owncloud/android/ui/activity/TransferServiceGetter.java @@ -16,10 +16,10 @@ * */ -package de.mobilcom.debitel.cloud.android.ui.activity; +package com.owncloud.android.ui.activity; -import de.mobilcom.debitel.cloud.android.files.services.FileDownloader.FileDownloaderBinder; -import de.mobilcom.debitel.cloud.android.files.services.FileUploader.FileUploaderBinder; +import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder; +import com.owncloud.android.files.services.FileUploader.FileUploaderBinder; public interface TransferServiceGetter { diff --git a/src/de/mobilcom/debitel/cloud/android/ui/activity/UploadFilesActivity.java b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java similarity index 95% rename from src/de/mobilcom/debitel/cloud/android/ui/activity/UploadFilesActivity.java rename to src/com/owncloud/android/ui/activity/UploadFilesActivity.java index 6d0c88d6..ab7bb463 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/activity/UploadFilesActivity.java +++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java @@ -15,7 +15,7 @@ * */ -package de.mobilcom.debitel.cloud.android.ui.activity; +package com.owncloud.android.ui.activity; import java.io.File; @@ -34,15 +34,15 @@ 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.CustomButton; +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 de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.ui.CustomButton; -import de.mobilcom.debitel.cloud.android.ui.dialog.IndeterminateProgressDialog; -import de.mobilcom.debitel.cloud.android.ui.fragment.ConfirmationDialogFragment; -import de.mobilcom.debitel.cloud.android.ui.fragment.LocalFileListFragment; -import de.mobilcom.debitel.cloud.android.ui.fragment.ConfirmationDialogFragment.ConfirmationDialogFragmentListener; -import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils; /** * Displays local files and let the user choose what of them wants to upload diff --git a/src/de/mobilcom/debitel/cloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java similarity index 90% rename from src/de/mobilcom/debitel/cloud/android/ui/adapter/FileListListAdapter.java rename to src/com/owncloud/android/ui/adapter/FileListListAdapter.java index 5ab922c3..a2651fac 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/adapter/FileListListAdapter.java +++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java @@ -15,7 +15,7 @@ * along with this program. If not, see . * */ -package de.mobilcom.debitel.cloud.android.ui.adapter; +package com.owncloud.android.ui.adapter; import android.accounts.Account; import android.content.Context; @@ -28,17 +28,18 @@ import android.widget.ListAdapter; import android.widget.ListView; import android.widget.TextView; -import de.mobilcom.debitel.cloud.android.DisplayUtils; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.authentication.AccountUtils; -import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager; -import de.mobilcom.debitel.cloud.android.datamodel.OCFile; -import de.mobilcom.debitel.cloud.android.files.services.FileDownloader.FileDownloaderBinder; -import de.mobilcom.debitel.cloud.android.files.services.FileUploader.FileUploaderBinder; -import de.mobilcom.debitel.cloud.android.ui.activity.TransferServiceGetter; 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.DataStorageManager; +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; + /** * This Adapter populates a ListView with all files and folders in an ownCloud diff --git a/src/de/mobilcom/debitel/cloud/android/ui/adapter/LandingScreenAdapter.java b/src/com/owncloud/android/ui/adapter/LandingScreenAdapter.java similarity index 89% rename from src/de/mobilcom/debitel/cloud/android/ui/adapter/LandingScreenAdapter.java rename to src/com/owncloud/android/ui/adapter/LandingScreenAdapter.java index 42491f85..cea48941 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/adapter/LandingScreenAdapter.java +++ b/src/com/owncloud/android/ui/adapter/LandingScreenAdapter.java @@ -15,9 +15,14 @@ * along with this program. If not, see . * */ -package de.mobilcom.debitel.cloud.android.ui.adapter; +package com.owncloud.android.ui.adapter; +import com.owncloud.android.R; +import com.owncloud.android.authentication.AccountUtils; +import com.owncloud.android.ui.activity.FileDisplayActivity; +import com.owncloud.android.ui.activity.Preferences; + import android.content.Context; import android.content.Intent; import android.view.LayoutInflater; @@ -26,10 +31,6 @@ import android.view.ViewGroup; import android.widget.BaseAdapter; import android.widget.ImageView; import android.widget.TextView; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.authentication.AccountUtils; -import de.mobilcom.debitel.cloud.android.ui.activity.FileDisplayActivity; -import de.mobilcom.debitel.cloud.android.ui.activity.Preferences; /** * Populates the landing screen icons. diff --git a/src/de/mobilcom/debitel/cloud/android/ui/adapter/LocalFileListAdapter.java b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java similarity index 97% rename from src/de/mobilcom/debitel/cloud/android/ui/adapter/LocalFileListAdapter.java rename to src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java index 9b375774..ff883c56 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/adapter/LocalFileListAdapter.java +++ b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java @@ -15,14 +15,15 @@ * along with this program. If not, see . * */ -package de.mobilcom.debitel.cloud.android.ui.adapter; +package com.owncloud.android.ui.adapter; import java.io.File; import java.util.Arrays; import java.util.Comparator; -import de.mobilcom.debitel.cloud.android.DisplayUtils; -import de.mobilcom.debitel.cloud.android.R; +import com.owncloud.android.DisplayUtils; +import com.owncloud.android.R; + import android.content.Context; import android.view.LayoutInflater; diff --git a/src/de/mobilcom/debitel/cloud/android/ui/adapter/LogListAdapter.java b/src/com/owncloud/android/ui/adapter/LogListAdapter.java similarity index 95% rename from src/de/mobilcom/debitel/cloud/android/ui/adapter/LogListAdapter.java rename to src/com/owncloud/android/ui/adapter/LogListAdapter.java index a0a90829..ae4335ef 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/adapter/LogListAdapter.java +++ b/src/com/owncloud/android/ui/adapter/LogListAdapter.java @@ -1,7 +1,9 @@ -package de.mobilcom.debitel.cloud.android.ui.adapter; +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 de.mobilcom.debitel.cloud.android.R; public class LogListAdapter extends ArrayAdapter { diff --git a/src/de/mobilcom/debitel/cloud/android/ui/dialog/ChangelogDialog.java b/src/com/owncloud/android/ui/dialog/ChangelogDialog.java similarity index 97% rename from src/de/mobilcom/debitel/cloud/android/ui/dialog/ChangelogDialog.java rename to src/com/owncloud/android/ui/dialog/ChangelogDialog.java index 0ba97d99..676bea57 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/dialog/ChangelogDialog.java +++ b/src/com/owncloud/android/ui/dialog/ChangelogDialog.java @@ -15,7 +15,7 @@ * */ -package de.mobilcom.debitel.cloud.android.ui.dialog; +package com.owncloud.android.ui.dialog; import android.app.AlertDialog; import android.app.Dialog; @@ -24,8 +24,8 @@ import android.os.Bundle; import android.webkit.WebView; import com.actionbarsherlock.app.SherlockDialogFragment; +import com.owncloud.android.R; -import de.mobilcom.debitel.cloud.android.R; /** * Dialog to show the contents of res/raw/CHANGELOG.txt diff --git a/src/de/mobilcom/debitel/cloud/android/ui/dialog/ConflictsResolveDialog.java b/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java similarity index 97% rename from src/de/mobilcom/debitel/cloud/android/ui/dialog/ConflictsResolveDialog.java rename to src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java index 7d7bc4ad..1998fcb8 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/dialog/ConflictsResolveDialog.java +++ b/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java @@ -16,7 +16,7 @@ * */ -package de.mobilcom.debitel.cloud.android.ui.dialog; +package com.owncloud.android.ui.dialog; import android.app.AlertDialog; import android.app.Dialog; @@ -27,8 +27,8 @@ import android.support.v4.app.FragmentTransaction; import com.actionbarsherlock.app.SherlockDialogFragment; import com.actionbarsherlock.app.SherlockFragmentActivity; +import com.owncloud.android.R; -import de.mobilcom.debitel.cloud.android.R; /** * Dialog which will be displayed to user upon keep-in-sync file conflict. diff --git a/src/de/mobilcom/debitel/cloud/android/ui/dialog/EditNameDialog.java b/src/com/owncloud/android/ui/dialog/EditNameDialog.java similarity index 98% rename from src/de/mobilcom/debitel/cloud/android/ui/dialog/EditNameDialog.java rename to src/com/owncloud/android/ui/dialog/EditNameDialog.java index e3240464..4d6243af 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/dialog/EditNameDialog.java +++ b/src/com/owncloud/android/ui/dialog/EditNameDialog.java @@ -16,7 +16,7 @@ * */ -package de.mobilcom.debitel.cloud.android.ui.dialog; +package com.owncloud.android.ui.dialog; import android.app.AlertDialog; import android.app.Dialog; @@ -29,8 +29,8 @@ import android.widget.EditText; import android.widget.TextView; import com.actionbarsherlock.app.SherlockDialogFragment; +import com.owncloud.android.R; -import de.mobilcom.debitel.cloud.android.R; /** diff --git a/src/de/mobilcom/debitel/cloud/android/ui/dialog/IndeterminateProgressDialog.java b/src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java similarity index 97% rename from src/de/mobilcom/debitel/cloud/android/ui/dialog/IndeterminateProgressDialog.java rename to src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java index b44c04b9..dbd3d991 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/dialog/IndeterminateProgressDialog.java +++ b/src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java @@ -15,7 +15,7 @@ * */ -package de.mobilcom.debitel.cloud.android.ui.dialog; +package com.owncloud.android.ui.dialog; import android.app.Dialog; import android.app.ProgressDialog; @@ -25,8 +25,8 @@ import android.os.Bundle; import android.view.KeyEvent; import com.actionbarsherlock.app.SherlockDialogFragment; +import com.owncloud.android.R; -import de.mobilcom.debitel.cloud.android.R; public class IndeterminateProgressDialog extends SherlockDialogFragment { diff --git a/src/de/mobilcom/debitel/cloud/android/ui/dialog/LoadingDialog.java b/src/com/owncloud/android/ui/dialog/LoadingDialog.java similarity index 93% rename from src/de/mobilcom/debitel/cloud/android/ui/dialog/LoadingDialog.java rename to src/com/owncloud/android/ui/dialog/LoadingDialog.java index 7394cec3..2203e039 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/dialog/LoadingDialog.java +++ b/src/com/owncloud/android/ui/dialog/LoadingDialog.java @@ -1,6 +1,6 @@ -package de.mobilcom.debitel.cloud.android.ui.dialog; +package com.owncloud.android.ui.dialog; -import de.mobilcom.debitel.cloud.android.R; +import com.owncloud.android.R; import android.app.Dialog; import android.os.Bundle; diff --git a/src/de/mobilcom/debitel/cloud/android/ui/dialog/SamlWebViewDialog.java b/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java similarity index 96% rename from src/de/mobilcom/debitel/cloud/android/ui/dialog/SamlWebViewDialog.java rename to src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java index d897b606..516fce10 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/dialog/SamlWebViewDialog.java +++ b/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java @@ -15,7 +15,7 @@ * */ -package de.mobilcom.debitel.cloud.android.ui.dialog; +package com.owncloud.android.ui.dialog; import android.annotation.SuppressLint; import android.app.Activity; @@ -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 de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.authentication.SsoWebViewClient; -import de.mobilcom.debitel.cloud.android.authentication.SsoWebViewClient.SsoWebViewClientListener; import eu.alefzero.webdav.WebdavClient; diff --git a/src/de/mobilcom/debitel/cloud/android/ui/dialog/SslValidatorDialog.java b/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java similarity index 96% rename from src/de/mobilcom/debitel/cloud/android/ui/dialog/SslValidatorDialog.java rename to src/com/owncloud/android/ui/dialog/SslValidatorDialog.java index f75b9842..82ecd6bc 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/dialog/SslValidatorDialog.java +++ b/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java @@ -15,7 +15,7 @@ * */ -package de.mobilcom.debitel.cloud.android.ui.dialog; +package com.owncloud.android.ui.dialog; import java.io.IOException; import java.security.GeneralSecurityException; @@ -29,6 +29,13 @@ 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 com.owncloud.android.ui.CustomButton; + import android.app.Dialog; import android.content.Context; import android.os.Bundle; @@ -36,12 +43,6 @@ import android.view.View; import android.view.Window; import android.widget.TextView; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.network.CertificateCombinedException; -import de.mobilcom.debitel.cloud.android.network.OwnCloudClientUtils; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult; -import de.mobilcom.debitel.cloud.android.ui.CustomButton; /** * Dialog to request the user about a certificate that could not be validated with the certificates store in the system. diff --git a/src/de/mobilcom/debitel/cloud/android/ui/dialog/SsoWebView.java b/src/com/owncloud/android/ui/dialog/SsoWebView.java similarity index 95% rename from src/de/mobilcom/debitel/cloud/android/ui/dialog/SsoWebView.java rename to src/com/owncloud/android/ui/dialog/SsoWebView.java index 2186bc43..3a71139d 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/dialog/SsoWebView.java +++ b/src/com/owncloud/android/ui/dialog/SsoWebView.java @@ -15,7 +15,7 @@ * */ -package de.mobilcom.debitel.cloud.android.ui.dialog; +package com.owncloud.android.ui.dialog; import android.content.Context; import android.util.AttributeSet; diff --git a/src/de/mobilcom/debitel/cloud/android/ui/fragment/AuthenticatorAccountDetailsFragment.java b/src/com/owncloud/android/ui/fragment/AuthenticatorAccountDetailsFragment.java similarity index 94% rename from src/de/mobilcom/debitel/cloud/android/ui/fragment/AuthenticatorAccountDetailsFragment.java rename to src/com/owncloud/android/ui/fragment/AuthenticatorAccountDetailsFragment.java index d01e6e6e..f0961037 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/fragment/AuthenticatorAccountDetailsFragment.java +++ b/src/com/owncloud/android/ui/fragment/AuthenticatorAccountDetailsFragment.java @@ -16,7 +16,7 @@ * */ -package de.mobilcom.debitel.cloud.android.ui.fragment; +package com.owncloud.android.ui.fragment; import com.actionbarsherlock.app.SherlockFragment; diff --git a/src/de/mobilcom/debitel/cloud/android/ui/fragment/AuthenticatorGetStartedFragment.java b/src/com/owncloud/android/ui/fragment/AuthenticatorGetStartedFragment.java similarity index 94% rename from src/de/mobilcom/debitel/cloud/android/ui/fragment/AuthenticatorGetStartedFragment.java rename to src/com/owncloud/android/ui/fragment/AuthenticatorGetStartedFragment.java index 8f38fd4c..5abf55d8 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/fragment/AuthenticatorGetStartedFragment.java +++ b/src/com/owncloud/android/ui/fragment/AuthenticatorGetStartedFragment.java @@ -16,7 +16,7 @@ * */ -package de.mobilcom.debitel.cloud.android.ui.fragment; +package com.owncloud.android.ui.fragment; import com.actionbarsherlock.app.SherlockFragment; diff --git a/src/de/mobilcom/debitel/cloud/android/ui/fragment/ConfirmationDialogFragment.java b/src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java similarity index 98% rename from src/de/mobilcom/debitel/cloud/android/ui/fragment/ConfirmationDialogFragment.java rename to src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java index 641ba1df..869cb266 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/fragment/ConfirmationDialogFragment.java +++ b/src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java @@ -16,7 +16,7 @@ * */ -package de.mobilcom.debitel.cloud.android.ui.fragment; +package com.owncloud.android.ui.fragment; import android.app.AlertDialog; import android.app.Dialog; @@ -24,8 +24,8 @@ import android.content.DialogInterface; import android.os.Bundle; import com.actionbarsherlock.app.SherlockDialogFragment; +import com.owncloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.Log_OC; public class ConfirmationDialogFragment extends SherlockDialogFragment { diff --git a/src/de/mobilcom/debitel/cloud/android/ui/fragment/ExtendedListFragment.java b/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java similarity index 94% rename from src/de/mobilcom/debitel/cloud/android/ui/fragment/ExtendedListFragment.java rename to src/com/owncloud/android/ui/fragment/ExtendedListFragment.java index b152b255..a57fb095 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/fragment/ExtendedListFragment.java +++ b/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java @@ -16,13 +16,13 @@ * */ -package de.mobilcom.debitel.cloud.android.ui.fragment; +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 de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.ui.ExtendedListView; import android.os.Bundle; import android.view.LayoutInflater; diff --git a/src/de/mobilcom/debitel/cloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java similarity index 95% rename from src/de/mobilcom/debitel/cloud/android/ui/fragment/FileDetailFragment.java rename to src/com/owncloud/android/ui/fragment/FileDetailFragment.java index bb0e4b91..36d7c217 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/fragment/FileDetailFragment.java +++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java @@ -15,7 +15,7 @@ * along with this program. If not, see . * */ -package de.mobilcom.debitel.cloud.android.ui.fragment; +package com.owncloud.android.ui.fragment; import java.io.File; import java.lang.ref.WeakReference; @@ -43,29 +43,29 @@ 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; +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.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; +import com.owncloud.android.ui.dialog.EditNameDialog; +import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener; +import com.owncloud.android.ui.preview.PreviewImageFragment; -import de.mobilcom.debitel.cloud.android.DisplayUtils; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager; -import de.mobilcom.debitel.cloud.android.datamodel.OCFile; -import de.mobilcom.debitel.cloud.android.files.services.FileObserverService; -import de.mobilcom.debitel.cloud.android.files.services.FileUploader; -import de.mobilcom.debitel.cloud.android.files.services.FileDownloader.FileDownloaderBinder; -import de.mobilcom.debitel.cloud.android.files.services.FileUploader.FileUploaderBinder; -import de.mobilcom.debitel.cloud.android.operations.OnRemoteOperationListener; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperation; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult; -import de.mobilcom.debitel.cloud.android.operations.RemoveFileOperation; -import de.mobilcom.debitel.cloud.android.operations.RenameFileOperation; -import de.mobilcom.debitel.cloud.android.operations.SynchronizeFileOperation; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode; -import de.mobilcom.debitel.cloud.android.ui.activity.ConflictsResolveActivity; -import de.mobilcom.debitel.cloud.android.ui.activity.FileActivity; -import de.mobilcom.debitel.cloud.android.ui.activity.FileDisplayActivity; -import de.mobilcom.debitel.cloud.android.ui.dialog.EditNameDialog; -import de.mobilcom.debitel.cloud.android.ui.dialog.EditNameDialog.EditNameDialogListener; -import de.mobilcom.debitel.cloud.android.ui.preview.PreviewImageFragment; import eu.alefzero.webdav.OnDatatransferProgressListener; diff --git a/src/de/mobilcom/debitel/cloud/android/ui/fragment/FileFragment.java b/src/com/owncloud/android/ui/fragment/FileFragment.java similarity index 91% rename from src/de/mobilcom/debitel/cloud/android/ui/fragment/FileFragment.java rename to src/com/owncloud/android/ui/fragment/FileFragment.java index df1a0d5b..b6c65749 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/fragment/FileFragment.java +++ b/src/com/owncloud/android/ui/fragment/FileFragment.java @@ -15,15 +15,15 @@ * */ -package de.mobilcom.debitel.cloud.android.ui.fragment; +package com.owncloud.android.ui.fragment; import android.support.v4.app.Fragment; import com.actionbarsherlock.app.SherlockFragment; +import com.owncloud.android.datamodel.OCFile; +import com.owncloud.android.files.FileHandler; +import com.owncloud.android.ui.activity.TransferServiceGetter; -import de.mobilcom.debitel.cloud.android.datamodel.OCFile; -import de.mobilcom.debitel.cloud.android.files.FileHandler; -import de.mobilcom.debitel.cloud.android.ui.activity.TransferServiceGetter; /** * Common methods for {@link Fragment}s containing {@link OCFile}s diff --git a/src/de/mobilcom/debitel/cloud/android/ui/fragment/LandingPageFragment.java b/src/com/owncloud/android/ui/fragment/LandingPageFragment.java similarity index 85% rename from src/de/mobilcom/debitel/cloud/android/ui/fragment/LandingPageFragment.java rename to src/com/owncloud/android/ui/fragment/LandingPageFragment.java index 45667ea2..63a95fdd 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/fragment/LandingPageFragment.java +++ b/src/com/owncloud/android/ui/fragment/LandingPageFragment.java @@ -15,18 +15,18 @@ * along with this program. If not, see . * */ -package de.mobilcom.debitel.cloud.android.ui.fragment; +package com.owncloud.android.ui.fragment; import com.actionbarsherlock.app.SherlockFragment; +import com.owncloud.android.R; +import com.owncloud.android.ui.activity.LandingActivity; +import com.owncloud.android.ui.adapter.LandingScreenAdapter; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ListView; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.ui.activity.LandingActivity; -import de.mobilcom.debitel.cloud.android.ui.adapter.LandingScreenAdapter; /** * Used on the Landing page to display what Components of the ownCloud there diff --git a/src/de/mobilcom/debitel/cloud/android/ui/fragment/LocalFileListFragment.java b/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java similarity index 97% rename from src/de/mobilcom/debitel/cloud/android/ui/fragment/LocalFileListFragment.java rename to src/com/owncloud/android/ui/fragment/LocalFileListFragment.java index aa1e34a4..40c03a46 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/fragment/LocalFileListFragment.java +++ b/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java @@ -15,10 +15,14 @@ * along with this program. If not, see . * */ -package de.mobilcom.debitel.cloud.android.ui.fragment; +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; @@ -31,9 +35,6 @@ import android.widget.AdapterView; import android.widget.ImageView; import android.widget.ListView; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.ui.adapter.LocalFileListAdapter; /** * A Fragment that lists all files and folders in a given LOCAL path. diff --git a/src/de/mobilcom/debitel/cloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java similarity index 91% rename from src/de/mobilcom/debitel/cloud/android/ui/fragment/OCFileListFragment.java rename to src/com/owncloud/android/ui/fragment/OCFileListFragment.java index 6b05c2b4..2c3f939f 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/fragment/OCFileListFragment.java +++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java @@ -15,33 +15,34 @@ * along with this program. If not, see . * */ -package de.mobilcom.debitel.cloud.android.ui.fragment; +package com.owncloud.android.ui.fragment; import java.io.File; import java.util.ArrayList; import java.util.List; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.authentication.AccountUtils; -import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager; -import de.mobilcom.debitel.cloud.android.datamodel.OCFile; -import de.mobilcom.debitel.cloud.android.files.FileHandler; -import de.mobilcom.debitel.cloud.android.files.services.FileDownloader.FileDownloaderBinder; -import de.mobilcom.debitel.cloud.android.files.services.FileUploader.FileUploaderBinder; -import de.mobilcom.debitel.cloud.android.operations.OnRemoteOperationListener; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperation; -import de.mobilcom.debitel.cloud.android.operations.RemoveFileOperation; -import de.mobilcom.debitel.cloud.android.operations.RenameFileOperation; -import de.mobilcom.debitel.cloud.android.operations.SynchronizeFileOperation; -import de.mobilcom.debitel.cloud.android.ui.activity.FileDisplayActivity; -import de.mobilcom.debitel.cloud.android.ui.activity.TransferServiceGetter; -import de.mobilcom.debitel.cloud.android.ui.adapter.FileListListAdapter; -import de.mobilcom.debitel.cloud.android.ui.dialog.EditNameDialog; -import de.mobilcom.debitel.cloud.android.ui.dialog.EditNameDialog.EditNameDialogListener; -import de.mobilcom.debitel.cloud.android.ui.fragment.ConfirmationDialogFragment.ConfirmationDialogFragmentListener; -import de.mobilcom.debitel.cloud.android.ui.preview.PreviewImageFragment; -import de.mobilcom.debitel.cloud.android.ui.preview.PreviewMediaFragment; +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.OCFile; +import com.owncloud.android.files.FileHandler; +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.RemoveFileOperation; +import com.owncloud.android.operations.RenameFileOperation; +import com.owncloud.android.operations.SynchronizeFileOperation; +import com.owncloud.android.ui.activity.FileDisplayActivity; +import com.owncloud.android.ui.activity.TransferServiceGetter; +import com.owncloud.android.ui.adapter.FileListListAdapter; +import com.owncloud.android.ui.dialog.EditNameDialog; +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 android.accounts.Account; import android.app.Activity; @@ -64,7 +65,7 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName private static final String TAG = OCFileListFragment.class.getSimpleName(); - private static final String MY_PACKAGE = OCFileListFragment.class.getPackage() != null ? OCFileListFragment.class.getPackage().getName() : "de.mobilcom.debitel.cloud.android.ui.fragment"; + private static final String MY_PACKAGE = OCFileListFragment.class.getPackage() != null ? OCFileListFragment.class.getPackage().getName() : "com.owncloud.android.ui.fragment"; private static final String EXTRA_FILE = MY_PACKAGE + ".extra.FILE"; private OCFileListFragment.ContainerActivity mContainerActivity; diff --git a/src/de/mobilcom/debitel/cloud/android/ui/preview/FileDownloadFragment.java b/src/com/owncloud/android/ui/preview/FileDownloadFragment.java similarity index 97% rename from src/de/mobilcom/debitel/cloud/android/ui/preview/FileDownloadFragment.java rename to src/com/owncloud/android/ui/preview/FileDownloadFragment.java index e2eade6f..306df1f7 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/preview/FileDownloadFragment.java +++ b/src/com/owncloud/android/ui/preview/FileDownloadFragment.java @@ -15,10 +15,16 @@ * along with this program. If not, see . * */ -package de.mobilcom.debitel.cloud.android.ui.preview; +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; @@ -32,11 +38,6 @@ import android.widget.ProgressBar; import android.widget.TextView; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.datamodel.OCFile; -import de.mobilcom.debitel.cloud.android.files.services.FileDownloader.FileDownloaderBinder; -import de.mobilcom.debitel.cloud.android.ui.fragment.FileFragment; import eu.alefzero.webdav.OnDatatransferProgressListener; diff --git a/src/de/mobilcom/debitel/cloud/android/ui/preview/PreviewImageActivity.java b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java similarity index 94% rename from src/de/mobilcom/debitel/cloud/android/ui/preview/PreviewImageActivity.java rename to src/com/owncloud/android/ui/preview/PreviewImageActivity.java index 892716d8..8f12ac70 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/preview/PreviewImageActivity.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java @@ -14,7 +14,7 @@ * along with this program. If not, see . * */ -package de.mobilcom.debitel.cloud.android.ui.preview; +package com.owncloud.android.ui.preview; import android.content.BroadcastReceiver; import android.content.ComponentName; @@ -35,21 +35,21 @@ 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.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; +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 de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.authentication.AccountUtils; -import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager; -import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager; -import de.mobilcom.debitel.cloud.android.datamodel.OCFile; -import de.mobilcom.debitel.cloud.android.files.services.FileDownloader; -import de.mobilcom.debitel.cloud.android.files.services.FileUploader; -import de.mobilcom.debitel.cloud.android.files.services.FileDownloader.FileDownloaderBinder; -import de.mobilcom.debitel.cloud.android.files.services.FileUploader.FileUploaderBinder; -import de.mobilcom.debitel.cloud.android.ui.activity.FileActivity; -import de.mobilcom.debitel.cloud.android.ui.activity.FileDisplayActivity; -import de.mobilcom.debitel.cloud.android.ui.dialog.LoadingDialog; -import de.mobilcom.debitel.cloud.android.ui.fragment.FileFragment; /** * Holds a swiping galley where image files contained in an ownCloud directory are shown diff --git a/src/de/mobilcom/debitel/cloud/android/ui/preview/PreviewImageFragment.java b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java similarity index 96% rename from src/de/mobilcom/debitel/cloud/android/ui/preview/PreviewImageFragment.java rename to src/com/owncloud/android/ui/preview/PreviewImageFragment.java index 011803e6..9ef4db4b 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/preview/PreviewImageFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java @@ -14,7 +14,7 @@ * along with this program. If not, see . * */ -package de.mobilcom.debitel.cloud.android.ui.preview; +package com.owncloud.android.ui.preview; import java.io.File; import java.lang.ref.WeakReference; @@ -50,17 +50,17 @@ 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; +import com.owncloud.android.operations.RemoteOperation; +import com.owncloud.android.operations.RemoteOperationResult; +import com.owncloud.android.operations.RemoveFileOperation; +import com.owncloud.android.ui.fragment.ConfirmationDialogFragment; +import com.owncloud.android.ui.fragment.FileFragment; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager; -import de.mobilcom.debitel.cloud.android.datamodel.OCFile; -import de.mobilcom.debitel.cloud.android.operations.OnRemoteOperationListener; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperation; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult; -import de.mobilcom.debitel.cloud.android.operations.RemoveFileOperation; -import de.mobilcom.debitel.cloud.android.ui.fragment.ConfirmationDialogFragment; -import de.mobilcom.debitel.cloud.android.ui.fragment.FileFragment; import eu.alefzero.webdav.WebdavUtils; diff --git a/src/de/mobilcom/debitel/cloud/android/ui/preview/PreviewImagePagerAdapter.java b/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java similarity index 97% rename from src/de/mobilcom/debitel/cloud/android/ui/preview/PreviewImagePagerAdapter.java rename to src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java index 8fcf61b0..d17d35f7 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/preview/PreviewImagePagerAdapter.java +++ b/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java @@ -14,7 +14,7 @@ * along with this program. If not, see . * */ -package de.mobilcom.debitel.cloud.android.ui.preview; +package com.owncloud.android.ui.preview; import java.util.HashMap; import java.util.HashSet; @@ -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 de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager; -import de.mobilcom.debitel.cloud.android.datamodel.OCFile; -import de.mobilcom.debitel.cloud.android.ui.fragment.FileFragment; /** * Adapter class that provides Fragment instances diff --git a/src/de/mobilcom/debitel/cloud/android/ui/preview/PreviewMediaFragment.java b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java similarity index 96% rename from src/de/mobilcom/debitel/cloud/android/ui/preview/PreviewMediaFragment.java rename to src/com/owncloud/android/ui/preview/PreviewMediaFragment.java index 89af08f9..815dbbde 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/preview/PreviewMediaFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java @@ -14,7 +14,7 @@ * along with this program. If not, see . * */ -package de.mobilcom.debitel.cloud.android.ui.preview; +package com.owncloud.android.ui.preview; import java.io.File; import java.util.ArrayList; @@ -52,22 +52,22 @@ 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; +import com.owncloud.android.media.MediaService; +import com.owncloud.android.media.MediaServiceBinder; +import com.owncloud.android.operations.OnRemoteOperationListener; +import com.owncloud.android.operations.RemoteOperation; +import com.owncloud.android.operations.RemoteOperationResult; +import com.owncloud.android.operations.RemoveFileOperation; +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 de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager; -import de.mobilcom.debitel.cloud.android.datamodel.OCFile; -import de.mobilcom.debitel.cloud.android.media.MediaControlView; -import de.mobilcom.debitel.cloud.android.media.MediaService; -import de.mobilcom.debitel.cloud.android.media.MediaServiceBinder; -import de.mobilcom.debitel.cloud.android.operations.OnRemoteOperationListener; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperation; -import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult; -import de.mobilcom.debitel.cloud.android.operations.RemoveFileOperation; -import de.mobilcom.debitel.cloud.android.ui.activity.FileActivity; -import de.mobilcom.debitel.cloud.android.ui.activity.FileDisplayActivity; -import de.mobilcom.debitel.cloud.android.ui.fragment.ConfirmationDialogFragment; -import de.mobilcom.debitel.cloud.android.ui.fragment.FileFragment; import eu.alefzero.webdav.WebdavUtils; /** diff --git a/src/de/mobilcom/debitel/cloud/android/ui/preview/PreviewVideoActivity.java b/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java similarity index 93% rename from src/de/mobilcom/debitel/cloud/android/ui/preview/PreviewVideoActivity.java rename to src/com/owncloud/android/ui/preview/PreviewVideoActivity.java index bedb806f..56972c65 100644 --- a/src/de/mobilcom/debitel/cloud/android/ui/preview/PreviewVideoActivity.java +++ b/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java @@ -15,7 +15,17 @@ * */ -package de.mobilcom.debitel.cloud.android.ui.preview; +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; @@ -30,15 +40,6 @@ import android.os.Bundle; import android.widget.MediaController; import android.widget.VideoView; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.authentication.AccountUtils; -import de.mobilcom.debitel.cloud.android.authentication.AccountUtils.AccountNotFoundException; -import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager; -import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager; -import de.mobilcom.debitel.cloud.android.datamodel.OCFile; -import de.mobilcom.debitel.cloud.android.media.MediaService; -import de.mobilcom.debitel.cloud.android.ui.activity.FileActivity; /** * Activity implementing a basic video player. diff --git a/src/de/mobilcom/debitel/cloud/android/utils/FileStorageUtils.java b/src/com/owncloud/android/utils/FileStorageUtils.java similarity index 93% rename from src/de/mobilcom/debitel/cloud/android/utils/FileStorageUtils.java rename to src/com/owncloud/android/utils/FileStorageUtils.java index 1608a995..0c7e9911 100644 --- a/src/de/mobilcom/debitel/cloud/android/utils/FileStorageUtils.java +++ b/src/com/owncloud/android/utils/FileStorageUtils.java @@ -15,19 +15,20 @@ * */ -package de.mobilcom.debitel.cloud.android.utils; +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 de.mobilcom.debitel.cloud.android.MainApp; -import de.mobilcom.debitel.cloud.android.R; -import de.mobilcom.debitel.cloud.android.datamodel.OCFile; /** * Static methods to help in access to local file system. diff --git a/src/de/mobilcom/debitel/cloud/android/utils/OwnCloudVersion.java b/src/com/owncloud/android/utils/OwnCloudVersion.java similarity index 98% rename from src/de/mobilcom/debitel/cloud/android/utils/OwnCloudVersion.java rename to src/com/owncloud/android/utils/OwnCloudVersion.java index e77f90f5..630e7acd 100644 --- a/src/de/mobilcom/debitel/cloud/android/utils/OwnCloudVersion.java +++ b/src/com/owncloud/android/utils/OwnCloudVersion.java @@ -16,7 +16,7 @@ * */ -package de.mobilcom.debitel.cloud.android.utils; +package com.owncloud.android.utils; public class OwnCloudVersion implements Comparable { public static final OwnCloudVersion owncloud_v1 = new OwnCloudVersion( diff --git a/src/de/mobilcom/debitel/cloud/android/utils/RecursiveFileObserver.java b/src/com/owncloud/android/utils/RecursiveFileObserver.java similarity index 98% rename from src/de/mobilcom/debitel/cloud/android/utils/RecursiveFileObserver.java rename to src/com/owncloud/android/utils/RecursiveFileObserver.java index 84c9bfdb..be44f8f6 100644 --- a/src/de/mobilcom/debitel/cloud/android/utils/RecursiveFileObserver.java +++ b/src/com/owncloud/android/utils/RecursiveFileObserver.java @@ -16,7 +16,7 @@ * */ -package de.mobilcom.debitel.cloud.android.utils; +package com.owncloud.android.utils; import java.io.File; import java.util.ArrayList; diff --git a/src/de/mobilcom/debitel/cloud/android/widgets/ActionEditText.java b/src/com/owncloud/android/widgets/ActionEditText.java similarity index 98% rename from src/de/mobilcom/debitel/cloud/android/widgets/ActionEditText.java rename to src/com/owncloud/android/widgets/ActionEditText.java index 039ca3af..1077d154 100644 --- a/src/de/mobilcom/debitel/cloud/android/widgets/ActionEditText.java +++ b/src/com/owncloud/android/widgets/ActionEditText.java @@ -16,12 +16,13 @@ * */ -package de.mobilcom.debitel.cloud.android.widgets; +package com.owncloud.android.widgets; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import de.mobilcom.debitel.cloud.android.R; +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 86202479..a91b64ea 100644 --- a/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java +++ b/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java @@ -29,8 +29,9 @@ import java.util.Set; import org.apache.commons.httpclient.methods.RequestEntity; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.network.ProgressiveDataTransferer; +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 9754ef67..1d525c43 100644 --- a/src/eu/alefzero/webdav/FileRequestEntity.java +++ b/src/eu/alefzero/webdav/FileRequestEntity.java @@ -31,8 +31,9 @@ import java.util.Set; import org.apache.commons.httpclient.methods.RequestEntity; -import de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.network.ProgressiveDataTransferer; +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 8c54a53d..6cb4b83e 100644 --- a/src/eu/alefzero/webdav/WebdavClient.java +++ b/src/eu/alefzero/webdav/WebdavClient.java @@ -41,11 +41,12 @@ import org.apache.commons.httpclient.params.HttpMethodParams; import org.apache.http.HttpStatus; 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 de.mobilcom.debitel.cloud.android.Log_OC; -import de.mobilcom.debitel.cloud.android.MainApp; -import de.mobilcom.debitel.cloud.android.network.BearerAuthScheme; -import de.mobilcom.debitel.cloud.android.network.BearerCredentials; import android.net.Uri; diff --git a/src/eu/alefzero/webdav/WebdavEntry.java b/src/eu/alefzero/webdav/WebdavEntry.java index 3ed89389..bdf1b35a 100644 --- a/src/eu/alefzero/webdav/WebdavEntry.java +++ b/src/eu/alefzero/webdav/WebdavEntry.java @@ -23,7 +23,8 @@ import org.apache.jackrabbit.webdav.property.DavProperty; import org.apache.jackrabbit.webdav.property.DavPropertyName; import org.apache.jackrabbit.webdav.property.DavPropertySet; -import de.mobilcom.debitel.cloud.android.Log_OC; +import com.owncloud.android.Log_OC; + import android.net.Uri; diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml index f78829df..b6312efd 100644 --- a/tests/AndroidManifest.xml +++ b/tests/AndroidManifest.xml @@ -1,7 +1,7 @@ + android:targetPackage="com.owncloud.android" + android:label="Tests for com.owncloud.android"/> diff --git a/tests/src/de/mobilcom/debitel/cloud/android/test/AccountUtilsTest.java b/tests/src/com/owncloud/android/test/AccountUtilsTest.java similarity index 92% rename from tests/src/de/mobilcom/debitel/cloud/android/test/AccountUtilsTest.java rename to tests/src/com/owncloud/android/test/AccountUtilsTest.java index 976b3b32..0af91839 100644 --- a/tests/src/de/mobilcom/debitel/cloud/android/test/AccountUtilsTest.java +++ b/tests/src/com/owncloud/android/test/AccountUtilsTest.java @@ -16,12 +16,11 @@ * */ -package de.mobilcom.debitel.cloud.android.test; +package com.owncloud.android.test; -import android.test.AndroidTestCase; +import com.owncloud.android.authentication.Accocom.owncloud.androiddroid.utils.OwnCloudVersion; -import de.mobilcom.debitel.cloud.android.authentication.AccountUtils; -import de.mobilcom.debitel.cloud.android.utils.OwnCloudVersion; +importcom.owncloud.android public class AccountUtilsTest extends AndroidTestCase { diff --git a/tests/src/de/mobilcom/debitel/cloud/android/test/FileContentProviderTest.java b/tests/src/com/owncloud/android/test/FileContentProviderTest.java similarity index 81% rename from tests/src/de/mobilcom/debitel/cloud/android/test/FileContentProviderTest.java rename to tests/src/com/owncloud/android/test/FileContentProviderTest.java index 21daef03..f68dc237 100644 --- a/tests/src/de/mobilcom/debitel/cloud/android/test/FileContentProviderTest.java +++ b/tests/src/com/owncloud/android/test/FileContentProviderTest.java @@ -1,7 +1,7 @@ -package de.mobilcom.debitel.cloud.android.test; +package com.owncloud.android.test; -import de.mobilcom.debitel.cloud.android.db.ProviderMeta.ProviderTableMeta; -import de.mobilcom.debitel.cloud.android.providers.FileContentProvider; +import com.owncloud.androideta.ProviderTableMeta; +import com.owncloud.com.owncloud.androidider; import android.annotation.TargetApi; import android.net.Uri; @@ -24,9 +24,7 @@ public class FileContentProviderTest extends ProviderTestCase2