From bdc0332c23b326d21193f71ff7db2cf587de0c43 Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Wed, 17 Apr 2013 12:26:13 +0200 Subject: [PATCH] Copyright note fixes --- AndroidManifest.xml | 5 ++--- LICENSE.txt | 7 +++---- THIRD_PARTY.txt | 5 ++--- .../workaround/accounts/AccountAuthenticatorService.java | 5 ++--- res/anim/disappear.xml | 5 ++--- res/anim/grow_from_bottom.xml | 5 ++--- res/anim/grow_from_bottomleft_to_topright.xml | 5 ++--- res/anim/grow_from_bottomright_to_topleft.xml | 5 ++--- res/anim/grow_from_top.xml | 5 ++--- res/anim/grow_from_topleft_to_bottomright.xml | 5 ++--- res/anim/grow_from_topright_to_bottomleft.xml | 5 ++--- res/anim/pump_bottom.xml | 5 ++--- res/anim/pump_top.xml | 5 ++--- res/anim/shrink_from_bottom.xml | 5 ++--- res/anim/shrink_from_bottomleft_to_topright.xml | 5 ++--- res/anim/shrink_from_bottomright_to_topleft.xml | 5 ++--- res/anim/shrink_from_top.xml | 5 ++--- res/anim/shrink_from_topleft_to_bottomright.xml | 5 ++--- res/anim/shrink_from_topright_to_bottomleft.xml | 5 ++--- res/drawable/action_item_btn.xml | 5 ++--- res/drawable/btn.xml | 5 ++--- res/drawable/btn_round.xml | 5 ++--- res/drawable/btn_round_pressed.xml | 5 ++--- res/drawable/connection_secure.xml | 5 ++--- res/drawable/list_selector.xml | 5 ++--- res/drawable/main_header_bg.xml | 5 ++--- res/drawable/progress_small.xml | 5 ++--- res/drawable/split_action_bg.xml | 5 ++--- res/drawable/uploader_list_separator.xml | 5 ++--- res/layout-land/account_setup.xml | 5 ++--- res/layout-large-land/files.xml | 5 ++--- res/layout-v14/generic_explanation.xml | 5 ++--- res/layout/account_setup.xml | 5 ++--- res/layout/action_item.xml | 5 ++--- res/layout/authenticator_getting_started_fragment.xml | 5 ++--- res/layout/edit_box_dialog.xml | 7 +++---- res/layout/extensions_available_dialog.xml | 5 ++--- res/layout/failed_upload_files.xml | 6 +++--- res/layout/file_activity_details.xml | 5 ++--- res/layout/file_details_empty.xml | 5 ++--- res/layout/file_details_fragment.xml | 5 ++--- res/layout/file_display_action_list_element.xml | 5 ++--- res/layout/file_download_fragment.xml | 5 ++--- res/layout/file_preview.xml | 5 ++--- res/layout/files.xml | 5 ++--- res/layout/fragment_changelog.xml | 5 ++--- res/layout/generic_explanation.xml | 5 ++--- res/layout/landing_page_fragment.xml | 5 ++--- res/layout/landing_page_item.xml | 5 ++--- res/layout/list_fragment.xml | 5 ++--- res/layout/list_item.xml | 5 ++--- res/layout/main.xml | 5 ++--- res/layout/media_control.xml | 5 ++--- res/layout/no_account_available.xml | 5 ++--- res/layout/pick_account_layout.xml | 5 ++--- res/layout/pincodelock.xml | 5 ++--- res/layout/popup.xml | 5 ++--- res/layout/preview_image_activity.xml | 5 ++--- res/layout/preview_image_fragment.xml | 5 ++--- res/layout/progressbar_layout.xml | 5 ++--- res/layout/selected_account_element.xml | 5 ++--- res/layout/ssl_validator_layout.xml | 7 +++---- res/layout/upload_files_layout.xml | 5 ++--- res/layout/uploader_layout.xml | 5 ++--- res/layout/uploader_list_item_layout.xml | 5 ++--- res/menu/account_picker.xml | 5 ++--- res/menu/account_picker_long_click.xml | 5 ++--- res/menu/file_actions_menu.xml | 5 ++--- res/menu/main_menu.xml | 5 ++--- res/menu/session_context_menu.xml | 5 ++--- res/raw-de/changelog.html | 5 ++--- res/raw-es/changelog.html | 5 ++--- res/raw/changelog.html | 5 ++--- res/values/bools.xml | 5 ++--- res/values/colors.xml | 5 ++--- res/values/styles.xml | 5 ++--- res/values/urls.xml | 5 ++--- res/xml/authenticator.xml | 5 ++--- res/xml/preferences.xml | 5 ++--- res/xml/preferences_new_session.xml | 5 ++--- res/xml/syncadapter_files.xml | 5 ++--- src/com/owncloud/android/AccountUtils.java | 5 ++--- src/com/owncloud/android/DisplayUtils.java | 5 ++--- src/com/owncloud/android/OwnCloudSession.java | 5 ++--- src/com/owncloud/android/Uploader.java | 5 ++--- .../android/authenticator/AccountAuthenticator.java | 5 ++--- .../authenticator/AccountAuthenticatorService.java | 5 ++--- .../android/authenticator/AuthenticationRunnable.java | 5 ++--- .../authenticator/OnAuthenticationResultListener.java | 5 ++--- .../android/authenticator/OnConnectCheckListener.java | 5 ++--- .../owncloud/android/datamodel/DataStorageManager.java | 5 ++--- .../android/datamodel/FileDataStorageManager.java | 5 ++--- src/com/owncloud/android/datamodel/OCFile.java | 5 ++--- src/com/owncloud/android/db/DbHandler.java | 6 +++--- src/com/owncloud/android/db/ProviderMeta.java | 5 ++--- .../android/extensions/ExtensionsAvailableActivity.java | 5 ++--- .../android/extensions/ExtensionsAvailableDialog.java | 5 ++--- .../android/extensions/ExtensionsListActivity.java | 5 ++--- .../owncloud/android/files/BootupBroadcastReceiver.java | 5 ++--- .../android/files/InstantUploadBroadcastReceiver.java | 5 ++--- src/com/owncloud/android/files/OwnCloudFileObserver.java | 5 ++--- .../android/files/managers/OCNotificationManager.java | 5 ++--- .../owncloud/android/files/services/FileDownloader.java | 5 ++--- .../android/files/services/FileObserverService.java | 7 +++---- .../owncloud/android/files/services/FileOperation.java | 5 ++--- .../owncloud/android/files/services/FileUploader.java | 9 ++++----- .../android/files/services/InstantUploadService.java | 5 ++--- .../files/services/OnUploadCompletedListener.java | 5 ++--- .../location/LocationServiceLauncherReciever.java | 5 ++--- .../owncloud/android/location/LocationUpdateService.java | 5 ++--- src/com/owncloud/android/media/MediaControlView.java | 5 ++--- src/com/owncloud/android/media/MediaService.java | 9 ++++----- src/com/owncloud/android/media/MediaServiceBinder.java | 7 +++---- .../android/network/AdvancedSslSocketFactory.java | 5 ++--- .../android/network/AdvancedX509TrustManager.java | 5 ++--- .../android/network/CertificateCombinedException.java | 5 ++--- .../owncloud/android/network/OwnCloudClientUtils.java | 5 ++--- .../android/network/ProgressiveDataTransferer.java | 5 ++--- .../android/operations/ChunkedUploadFileOperation.java | 5 ++--- .../android/operations/ConnectionCheckOperation.java | 5 ++--- .../android/operations/DownloadFileOperation.java | 5 ++--- .../android/operations/OnRemoteOperationListener.java | 5 ++--- .../android/operations/OperationCancelledException.java | 5 ++--- src/com/owncloud/android/operations/RemoteOperation.java | 5 ++--- .../android/operations/RemoteOperationResult.java | 5 ++--- .../owncloud/android/operations/RemoveFileOperation.java | 5 ++--- .../owncloud/android/operations/RenameFileOperation.java | 7 +++---- .../android/operations/SynchronizeFileOperation.java | 7 +++---- .../android/operations/SynchronizeFolderOperation.java | 5 ++--- .../android/operations/UpdateOCVersionOperation.java | 5 ++--- .../owncloud/android/operations/UploadFileOperation.java | 5 ++--- .../owncloud/android/providers/FileContentProvider.java | 5 ++--- .../android/syncadapter/AbstractOwnCloudSyncAdapter.java | 5 ++--- .../owncloud/android/syncadapter/ContactSyncAdapter.java | 5 ++--- .../owncloud/android/syncadapter/ContactSyncService.java | 5 ++--- .../owncloud/android/syncadapter/FileSyncAdapter.java | 7 +++---- .../owncloud/android/syncadapter/FileSyncService.java | 5 ++--- src/com/owncloud/android/ui/ActionItem.java | 5 ++--- src/com/owncloud/android/ui/CustomPopup.java | 5 ++--- src/com/owncloud/android/ui/ExtendedListView.java | 5 ++--- src/com/owncloud/android/ui/FragmentListView.java | 5 ++--- src/com/owncloud/android/ui/QuickAction.java | 5 ++--- .../android/ui/activity/AccountSelectActivity.java | 5 ++--- .../android/ui/activity/AuthenticatorActivity.java | 5 ++--- .../android/ui/activity/ConflictsResolveActivity.java | 5 ++--- .../ui/activity/ErrorsWhileCopyingHandlerActivity.java | 7 +++---- .../android/ui/activity/FailedUploadActivity.java | 2 +- .../owncloud/android/ui/activity/FileDetailActivity.java | 5 ++--- .../android/ui/activity/FileDisplayActivity.java | 7 +++---- .../android/ui/activity/GenericExplanationActivity.java | 5 ++--- .../android/ui/activity/InstantUploadActivity.java | 5 ++--- .../owncloud/android/ui/activity/LandingActivity.java | 5 ++--- .../owncloud/android/ui/activity/LogHistoryActivity.java | 5 ++--- .../owncloud/android/ui/activity/PinCodeActivity.java | 5 ++--- src/com/owncloud/android/ui/activity/Preferences.java | 5 ++--- .../android/ui/activity/PreferencesNewSession.java | 5 ++--- .../android/ui/activity/TransferServiceGetter.java | 5 ++--- .../android/ui/activity/UploadFilesActivity.java | 5 ++--- .../android/ui/adapter/FileListActionListAdapter.java | 5 ++--- .../owncloud/android/ui/adapter/FileListListAdapter.java | 5 ++--- .../android/ui/adapter/LandingScreenAdapter.java | 5 ++--- .../android/ui/adapter/LocalFileListAdapter.java | 5 ++--- src/com/owncloud/android/ui/dialog/ChangelogDialog.java | 5 ++--- .../android/ui/dialog/ConflictsResolveDialog.java | 5 ++--- src/com/owncloud/android/ui/dialog/EditNameDialog.java | 5 ++--- .../android/ui/dialog/IndeterminateProgressDialog.java | 5 ++--- .../owncloud/android/ui/dialog/SslValidatorDialog.java | 7 +++---- .../ui/fragment/AuthenticatorAccountDetailsFragment.java | 5 ++--- .../ui/fragment/AuthenticatorGetStartedFragment.java | 5 ++--- .../android/ui/fragment/ConfirmationDialogFragment.java | 5 ++--- .../owncloud/android/ui/fragment/FileDetailFragment.java | 5 ++--- src/com/owncloud/android/ui/fragment/FileFragment.java | 5 ++--- .../android/ui/fragment/LandingPageFragment.java | 5 ++--- .../android/ui/fragment/LocalFileListFragment.java | 7 +++---- .../owncloud/android/ui/fragment/OCFileListFragment.java | 7 +++---- .../android/ui/preview/FileDownloadFragment.java | 3 +-- .../android/ui/preview/PreviewImageActivity.java | 7 +++---- .../android/ui/preview/PreviewImageFragment.java | 5 ++--- .../android/ui/preview/PreviewImagePagerAdapter.java | 5 ++--- .../android/ui/preview/PreviewMediaFragment.java | 5 ++--- .../android/ui/preview/PreviewVideoActivity.java | 5 ++--- src/com/owncloud/android/utils/FileStorageUtils.java | 5 ++--- src/com/owncloud/android/utils/OwnCloudVersion.java | 5 ++--- .../owncloud/android/utils/RecursiveFileObserver.java | 5 ++--- src/com/owncloud/android/widgets/ActionEditText.java | 5 ++--- .../webdav/ChunkFromFileChannelRequestEntity.java | 5 ++--- src/eu/alefzero/webdav/FileRequestEntity.java | 5 ++--- .../alefzero/webdav/OnDatatransferProgressListener.java | 5 ++--- src/eu/alefzero/webdav/WebdavClient.java | 5 ++--- src/eu/alefzero/webdav/WebdavEntry.java | 7 +++---- src/eu/alefzero/webdav/WebdavUtils.java | 5 ++--- .../src/com/owncloud/android/test/AccountUtilsTest.java | 5 ++--- third_party/transifex-client/LICENSE | 3 +-- 193 files changed, 404 insertions(+), 594 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4570ea1469..8f5285412c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/LICENSE.txt b/LICENSE.txt index d159169d10..4fc8809877 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -294,10 +294,9 @@ the "copyright" line and a pointer to where the full notice is found. Copyright (C) This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the diff --git a/THIRD_PARTY.txt b/THIRD_PARTY.txt index 1d51b72a01..1cfdddc87a 100644 --- a/THIRD_PARTY.txt +++ b/THIRD_PARTY.txt @@ -11,9 +11,8 @@ ########### This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. +it under the terms of the GNU General Public License verions 2, +as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/oc_jb_workaround/src/com/owncloud/android/workaround/accounts/AccountAuthenticatorService.java b/oc_jb_workaround/src/com/owncloud/android/workaround/accounts/AccountAuthenticatorService.java index 102f2be6d7..9b2922e38a 100644 --- a/oc_jb_workaround/src/com/owncloud/android/workaround/accounts/AccountAuthenticatorService.java +++ b/oc_jb_workaround/src/com/owncloud/android/workaround/accounts/AccountAuthenticatorService.java @@ -2,9 +2,8 @@ * Copyright (C) 2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/anim/disappear.xml b/res/anim/disappear.xml index 1c98f627a6..8bb865d936 100644 --- a/res/anim/disappear.xml +++ b/res/anim/disappear.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/anim/grow_from_bottom.xml b/res/anim/grow_from_bottom.xml index f02d868075..78bd62b3c7 100644 --- a/res/anim/grow_from_bottom.xml +++ b/res/anim/grow_from_bottom.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/anim/grow_from_bottomleft_to_topright.xml b/res/anim/grow_from_bottomleft_to_topright.xml index 963cfe5c37..32b251b49c 100644 --- a/res/anim/grow_from_bottomleft_to_topright.xml +++ b/res/anim/grow_from_bottomleft_to_topright.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/anim/grow_from_bottomright_to_topleft.xml b/res/anim/grow_from_bottomright_to_topleft.xml index d753634271..f92b219a01 100644 --- a/res/anim/grow_from_bottomright_to_topleft.xml +++ b/res/anim/grow_from_bottomright_to_topleft.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/anim/grow_from_top.xml b/res/anim/grow_from_top.xml index 2dfe4dbb25..851f8477aa 100644 --- a/res/anim/grow_from_top.xml +++ b/res/anim/grow_from_top.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/anim/grow_from_topleft_to_bottomright.xml b/res/anim/grow_from_topleft_to_bottomright.xml index 8cef01b979..951ca014fb 100644 --- a/res/anim/grow_from_topleft_to_bottomright.xml +++ b/res/anim/grow_from_topleft_to_bottomright.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/anim/grow_from_topright_to_bottomleft.xml b/res/anim/grow_from_topright_to_bottomleft.xml index 902f41efa3..972a5b7aba 100644 --- a/res/anim/grow_from_topright_to_bottomleft.xml +++ b/res/anim/grow_from_topright_to_bottomleft.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/anim/pump_bottom.xml b/res/anim/pump_bottom.xml index 0582789933..6016e0009d 100644 --- a/res/anim/pump_bottom.xml +++ b/res/anim/pump_bottom.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/anim/pump_top.xml b/res/anim/pump_top.xml index 6766ea7561..fa0b6c9c53 100644 --- a/res/anim/pump_top.xml +++ b/res/anim/pump_top.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/anim/shrink_from_bottom.xml b/res/anim/shrink_from_bottom.xml index 517d36c8ba..c330980aa4 100644 --- a/res/anim/shrink_from_bottom.xml +++ b/res/anim/shrink_from_bottom.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/anim/shrink_from_bottomleft_to_topright.xml b/res/anim/shrink_from_bottomleft_to_topright.xml index c91455e9cb..086eab3cb2 100644 --- a/res/anim/shrink_from_bottomleft_to_topright.xml +++ b/res/anim/shrink_from_bottomleft_to_topright.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/anim/shrink_from_bottomright_to_topleft.xml b/res/anim/shrink_from_bottomright_to_topleft.xml index 7ad975bc85..c96ea9a498 100644 --- a/res/anim/shrink_from_bottomright_to_topleft.xml +++ b/res/anim/shrink_from_bottomright_to_topleft.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/anim/shrink_from_top.xml b/res/anim/shrink_from_top.xml index 2c6fed06d6..4438ebfa7b 100644 --- a/res/anim/shrink_from_top.xml +++ b/res/anim/shrink_from_top.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/anim/shrink_from_topleft_to_bottomright.xml b/res/anim/shrink_from_topleft_to_bottomright.xml index 98cc67b578..680e848706 100644 --- a/res/anim/shrink_from_topleft_to_bottomright.xml +++ b/res/anim/shrink_from_topleft_to_bottomright.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/anim/shrink_from_topright_to_bottomleft.xml b/res/anim/shrink_from_topright_to_bottomleft.xml index cb1d292844..773b51da07 100644 --- a/res/anim/shrink_from_topright_to_bottomleft.xml +++ b/res/anim/shrink_from_topright_to_bottomleft.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/drawable/action_item_btn.xml b/res/drawable/action_item_btn.xml index 47f73b2273..dd27833955 100644 --- a/res/drawable/action_item_btn.xml +++ b/res/drawable/action_item_btn.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/drawable/btn.xml b/res/drawable/btn.xml index b58eda8745..0b0a399912 100644 --- a/res/drawable/btn.xml +++ b/res/drawable/btn.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/drawable/btn_round.xml b/res/drawable/btn_round.xml index a2c92aa8af..1a47be54a6 100644 --- a/res/drawable/btn_round.xml +++ b/res/drawable/btn_round.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/drawable/btn_round_pressed.xml b/res/drawable/btn_round_pressed.xml index e567a6bd93..bc138c7a04 100644 --- a/res/drawable/btn_round_pressed.xml +++ b/res/drawable/btn_round_pressed.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/drawable/connection_secure.xml b/res/drawable/connection_secure.xml index 7b2944f3b2..3e252d32ec 100644 --- a/res/drawable/connection_secure.xml +++ b/res/drawable/connection_secure.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/drawable/list_selector.xml b/res/drawable/list_selector.xml index 4af9f6b095..d5881ab891 100644 --- a/res/drawable/list_selector.xml +++ b/res/drawable/list_selector.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/drawable/main_header_bg.xml b/res/drawable/main_header_bg.xml index 166b666d4d..855ba2c1d8 100644 --- a/res/drawable/main_header_bg.xml +++ b/res/drawable/main_header_bg.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/drawable/progress_small.xml b/res/drawable/progress_small.xml index 55eb2dd376..1233647070 100644 --- a/res/drawable/progress_small.xml +++ b/res/drawable/progress_small.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/drawable/split_action_bg.xml b/res/drawable/split_action_bg.xml index c0b4731bf3..99219b647d 100644 --- a/res/drawable/split_action_bg.xml +++ b/res/drawable/split_action_bg.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/drawable/uploader_list_separator.xml b/res/drawable/uploader_list_separator.xml index f1c174fdd6..1e53367d27 100644 --- a/res/drawable/uploader_list_separator.xml +++ b/res/drawable/uploader_list_separator.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml index c45405faf2..bdff0bfb53 100644 --- a/res/layout-land/account_setup.xml +++ b/res/layout-land/account_setup.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout-large-land/files.xml b/res/layout-large-land/files.xml index 90c5c5430f..d874bf544a 100644 --- a/res/layout-large-land/files.xml +++ b/res/layout-large-land/files.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout-v14/generic_explanation.xml b/res/layout-v14/generic_explanation.xml index ccc62d19d9..4bd3cddb8f 100644 --- a/res/layout-v14/generic_explanation.xml +++ b/res/layout-v14/generic_explanation.xml @@ -5,9 +5,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml index cbb44112eb..ded27e2332 100644 --- a/res/layout/account_setup.xml +++ b/res/layout/account_setup.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout/action_item.xml b/res/layout/action_item.xml index 22847defff..09519581b3 100644 --- a/res/layout/action_item.xml +++ b/res/layout/action_item.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout/authenticator_getting_started_fragment.xml b/res/layout/authenticator_getting_started_fragment.xml index 3a97615ff8..5aad77825a 100644 --- a/res/layout/authenticator_getting_started_fragment.xml +++ b/res/layout/authenticator_getting_started_fragment.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout/edit_box_dialog.xml b/res/layout/edit_box_dialog.xml index 7dd0b3e55b..500945b1f7 100644 --- a/res/layout/edit_box_dialog.xml +++ b/res/layout/edit_box_dialog.xml @@ -6,10 +6,9 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. - + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the diff --git a/res/layout/extensions_available_dialog.xml b/res/layout/extensions_available_dialog.xml index 65dd2b3c28..e5c3d105b1 100644 --- a/res/layout/extensions_available_dialog.xml +++ b/res/layout/extensions_available_dialog.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout/failed_upload_files.xml b/res/layout/failed_upload_files.xml index b307ff81ba..0f459a0b9c 100644 --- a/res/layout/failed_upload_files.xml +++ b/res/layout/failed_upload_files.xml @@ -4,10 +4,10 @@ Copyright (C) 2012 Bartek Przybylski Copyright (C) 2012-2013 ownCloud Inc. + This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout/file_activity_details.xml b/res/layout/file_activity_details.xml index e4f576c291..435a248bed 100644 --- a/res/layout/file_activity_details.xml +++ b/res/layout/file_activity_details.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout/file_details_empty.xml b/res/layout/file_details_empty.xml index f264cef65c..3a205bd251 100644 --- a/res/layout/file_details_empty.xml +++ b/res/layout/file_details_empty.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout/file_details_fragment.xml b/res/layout/file_details_fragment.xml index c2b8af313d..aa77c6574e 100644 --- a/res/layout/file_details_fragment.xml +++ b/res/layout/file_details_fragment.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout/file_display_action_list_element.xml b/res/layout/file_display_action_list_element.xml index 0d6d06e43b..c3dc2e1803 100644 --- a/res/layout/file_display_action_list_element.xml +++ b/res/layout/file_display_action_list_element.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout/file_download_fragment.xml b/res/layout/file_download_fragment.xml index aea16d07ed..9c91c373ba 100644 --- a/res/layout/file_download_fragment.xml +++ b/res/layout/file_download_fragment.xml @@ -4,9 +4,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout/file_preview.xml b/res/layout/file_preview.xml index 82163cd27e..22528a789e 100644 --- a/res/layout/file_preview.xml +++ b/res/layout/file_preview.xml @@ -5,9 +5,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout/files.xml b/res/layout/files.xml index 5633a57cc4..0e4fd8b34e 100644 --- a/res/layout/files.xml +++ b/res/layout/files.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout/fragment_changelog.xml b/res/layout/fragment_changelog.xml index ac718e812f..e218236550 100644 --- a/res/layout/fragment_changelog.xml +++ b/res/layout/fragment_changelog.xml @@ -5,9 +5,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout/generic_explanation.xml b/res/layout/generic_explanation.xml index 54c5b1d422..be98f3b89f 100644 --- a/res/layout/generic_explanation.xml +++ b/res/layout/generic_explanation.xml @@ -5,9 +5,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout/landing_page_fragment.xml b/res/layout/landing_page_fragment.xml index 46e9a33723..2f25047543 100644 --- a/res/layout/landing_page_fragment.xml +++ b/res/layout/landing_page_fragment.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout/landing_page_item.xml b/res/layout/landing_page_item.xml index 80b049cb07..8ac118f46f 100644 --- a/res/layout/landing_page_item.xml +++ b/res/layout/landing_page_item.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout/list_fragment.xml b/res/layout/list_fragment.xml index 20b317ba3f..01b05df74f 100644 --- a/res/layout/list_fragment.xml +++ b/res/layout/list_fragment.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout/list_item.xml b/res/layout/list_item.xml index 4333d4d54d..ea73832832 100644 --- a/res/layout/list_item.xml +++ b/res/layout/list_item.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout/main.xml b/res/layout/main.xml index 568d485020..a55cf59b9d 100644 --- a/res/layout/main.xml +++ b/res/layout/main.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout/media_control.xml b/res/layout/media_control.xml index 070ae8c7df..489c99736e 100644 --- a/res/layout/media_control.xml +++ b/res/layout/media_control.xml @@ -5,9 +5,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout/no_account_available.xml b/res/layout/no_account_available.xml index ef068ef7da..0c9cf13825 100644 --- a/res/layout/no_account_available.xml +++ b/res/layout/no_account_available.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout/pick_account_layout.xml b/res/layout/pick_account_layout.xml index 23a8c79bda..665f6c65a6 100644 --- a/res/layout/pick_account_layout.xml +++ b/res/layout/pick_account_layout.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout/pincodelock.xml b/res/layout/pincodelock.xml index 0b94645092..b1b6ce828c 100644 --- a/res/layout/pincodelock.xml +++ b/res/layout/pincodelock.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout/popup.xml b/res/layout/popup.xml index 2d97d288e9..ad0676b1c5 100644 --- a/res/layout/popup.xml +++ b/res/layout/popup.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout/preview_image_activity.xml b/res/layout/preview_image_activity.xml index 23af485741..9f8b119604 100644 --- a/res/layout/preview_image_activity.xml +++ b/res/layout/preview_image_activity.xml @@ -5,9 +5,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout/preview_image_fragment.xml b/res/layout/preview_image_fragment.xml index 1cd8e040ba..3deb2fd4ce 100644 --- a/res/layout/preview_image_fragment.xml +++ b/res/layout/preview_image_fragment.xml @@ -5,9 +5,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout/progressbar_layout.xml b/res/layout/progressbar_layout.xml index e2e4834e76..e5a5afed81 100644 --- a/res/layout/progressbar_layout.xml +++ b/res/layout/progressbar_layout.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout/selected_account_element.xml b/res/layout/selected_account_element.xml index d400048400..bba1a6282a 100644 --- a/res/layout/selected_account_element.xml +++ b/res/layout/selected_account_element.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout/ssl_validator_layout.xml b/res/layout/ssl_validator_layout.xml index 3cb35575b8..9da017bb03 100644 --- a/res/layout/ssl_validator_layout.xml +++ b/res/layout/ssl_validator_layout.xml @@ -5,10 +5,9 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. - + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the diff --git a/res/layout/upload_files_layout.xml b/res/layout/upload_files_layout.xml index 9c1613ac69..7e4bdd538d 100644 --- a/res/layout/upload_files_layout.xml +++ b/res/layout/upload_files_layout.xml @@ -5,9 +5,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout/uploader_layout.xml b/res/layout/uploader_layout.xml index da5e74b493..5b3149912c 100644 --- a/res/layout/uploader_layout.xml +++ b/res/layout/uploader_layout.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/layout/uploader_list_item_layout.xml b/res/layout/uploader_list_item_layout.xml index 5ce2dcac8f..1cb93619e1 100644 --- a/res/layout/uploader_list_item_layout.xml +++ b/res/layout/uploader_list_item_layout.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/menu/account_picker.xml b/res/menu/account_picker.xml index 90b87e6850..8532600c70 100644 --- a/res/menu/account_picker.xml +++ b/res/menu/account_picker.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/menu/account_picker_long_click.xml b/res/menu/account_picker_long_click.xml index a26b96df09..a6ef11e2cc 100644 --- a/res/menu/account_picker_long_click.xml +++ b/res/menu/account_picker_long_click.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/menu/file_actions_menu.xml b/res/menu/file_actions_menu.xml index bce33ebced..e9c868859a 100644 --- a/res/menu/file_actions_menu.xml +++ b/res/menu/file_actions_menu.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml index a446469992..538dde76c1 100644 --- a/res/menu/main_menu.xml +++ b/res/menu/main_menu.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/menu/session_context_menu.xml b/res/menu/session_context_menu.xml index 303a76307f..e488902b10 100644 --- a/res/menu/session_context_menu.xml +++ b/res/menu/session_context_menu.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/raw-de/changelog.html b/res/raw-de/changelog.html index c5ceda90f5..a54a664391 100644 --- a/res/raw-de/changelog.html +++ b/res/raw-de/changelog.html @@ -5,9 +5,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/raw-es/changelog.html b/res/raw-es/changelog.html index dec13539cc..9321d52018 100644 --- a/res/raw-es/changelog.html +++ b/res/raw-es/changelog.html @@ -5,9 +5,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/raw/changelog.html b/res/raw/changelog.html index d982d00d22..754cf6f20f 100644 --- a/res/raw/changelog.html +++ b/res/raw/changelog.html @@ -5,9 +5,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/values/bools.xml b/res/values/bools.xml index b23e4967ad..cecc5717f2 100644 --- a/res/values/bools.xml +++ b/res/values/bools.xml @@ -5,9 +5,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/values/colors.xml b/res/values/colors.xml index 3300a20374..2be262f723 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/values/styles.xml b/res/values/styles.xml index 47d1ec3bbf..a02128fcb1 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/values/urls.xml b/res/values/urls.xml index 6ce6c6d6c6..98d2ddd24d 100644 --- a/res/values/urls.xml +++ b/res/values/urls.xml @@ -5,9 +5,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/xml/authenticator.xml b/res/xml/authenticator.xml index 67d02c0482..267042342c 100644 --- a/res/xml/authenticator.xml +++ b/res/xml/authenticator.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index ced90dd597..78b89bb62e 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/xml/preferences_new_session.xml b/res/xml/preferences_new_session.xml index abb6e31688..8327bf094c 100644 --- a/res/xml/preferences_new_session.xml +++ b/res/xml/preferences_new_session.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/res/xml/syncadapter_files.xml b/res/xml/syncadapter_files.xml index 7512477c06..03fedbf88b 100644 --- a/res/xml/syncadapter_files.xml +++ b/res/xml/syncadapter_files.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/AccountUtils.java b/src/com/owncloud/android/AccountUtils.java index dd1893a54c..f064ce2dca 100644 --- a/src/com/owncloud/android/AccountUtils.java +++ b/src/com/owncloud/android/AccountUtils.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/DisplayUtils.java b/src/com/owncloud/android/DisplayUtils.java index 70a967273e..70d53283b0 100644 --- a/src/com/owncloud/android/DisplayUtils.java +++ b/src/com/owncloud/android/DisplayUtils.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/OwnCloudSession.java b/src/com/owncloud/android/OwnCloudSession.java index 142daffbe3..d7bb609439 100644 --- a/src/com/owncloud/android/OwnCloudSession.java +++ b/src/com/owncloud/android/OwnCloudSession.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/Uploader.java b/src/com/owncloud/android/Uploader.java index 438308904d..7c402c9fc1 100644 --- a/src/com/owncloud/android/Uploader.java +++ b/src/com/owncloud/android/Uploader.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/authenticator/AccountAuthenticator.java b/src/com/owncloud/android/authenticator/AccountAuthenticator.java index d0e99f5d1b..2cbc9d3115 100644 --- a/src/com/owncloud/android/authenticator/AccountAuthenticator.java +++ b/src/com/owncloud/android/authenticator/AccountAuthenticator.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/authenticator/AccountAuthenticatorService.java b/src/com/owncloud/android/authenticator/AccountAuthenticatorService.java index e3972b65d8..220f7f407f 100644 --- a/src/com/owncloud/android/authenticator/AccountAuthenticatorService.java +++ b/src/com/owncloud/android/authenticator/AccountAuthenticatorService.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/authenticator/AuthenticationRunnable.java b/src/com/owncloud/android/authenticator/AuthenticationRunnable.java index 948cf3365f..2df442755c 100644 --- a/src/com/owncloud/android/authenticator/AuthenticationRunnable.java +++ b/src/com/owncloud/android/authenticator/AuthenticationRunnable.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/authenticator/OnAuthenticationResultListener.java b/src/com/owncloud/android/authenticator/OnAuthenticationResultListener.java index 482c353a1c..66dc018a8f 100644 --- a/src/com/owncloud/android/authenticator/OnAuthenticationResultListener.java +++ b/src/com/owncloud/android/authenticator/OnAuthenticationResultListener.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/authenticator/OnConnectCheckListener.java b/src/com/owncloud/android/authenticator/OnConnectCheckListener.java index 82dce2ffdd..1aa3dc5790 100644 --- a/src/com/owncloud/android/authenticator/OnConnectCheckListener.java +++ b/src/com/owncloud/android/authenticator/OnConnectCheckListener.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/datamodel/DataStorageManager.java b/src/com/owncloud/android/datamodel/DataStorageManager.java index 14b69c75a8..31515a1a9d 100644 --- a/src/com/owncloud/android/datamodel/DataStorageManager.java +++ b/src/com/owncloud/android/datamodel/DataStorageManager.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/datamodel/FileDataStorageManager.java b/src/com/owncloud/android/datamodel/FileDataStorageManager.java index f38302a9b8..434bc47231 100644 --- a/src/com/owncloud/android/datamodel/FileDataStorageManager.java +++ b/src/com/owncloud/android/datamodel/FileDataStorageManager.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/datamodel/OCFile.java b/src/com/owncloud/android/datamodel/OCFile.java index da105d9379..6b8e178578 100644 --- a/src/com/owncloud/android/datamodel/OCFile.java +++ b/src/com/owncloud/android/datamodel/OCFile.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/db/DbHandler.java b/src/com/owncloud/android/db/DbHandler.java index 788fec9fab..e3cfe4fb43 100644 --- a/src/com/owncloud/android/db/DbHandler.java +++ b/src/com/owncloud/android/db/DbHandler.java @@ -1,10 +1,10 @@ /* ownCloud Android client application * Copyright (C) 2011-2012 Bartek Przybylski + * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/db/ProviderMeta.java b/src/com/owncloud/android/db/ProviderMeta.java index 279f2ba80c..b8058b897e 100644 --- a/src/com/owncloud/android/db/ProviderMeta.java +++ b/src/com/owncloud/android/db/ProviderMeta.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/extensions/ExtensionsAvailableActivity.java b/src/com/owncloud/android/extensions/ExtensionsAvailableActivity.java index d57fc7f896..7b39931ce9 100644 --- a/src/com/owncloud/android/extensions/ExtensionsAvailableActivity.java +++ b/src/com/owncloud/android/extensions/ExtensionsAvailableActivity.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/extensions/ExtensionsAvailableDialog.java b/src/com/owncloud/android/extensions/ExtensionsAvailableDialog.java index 6b800fd28c..ebe94501b1 100644 --- a/src/com/owncloud/android/extensions/ExtensionsAvailableDialog.java +++ b/src/com/owncloud/android/extensions/ExtensionsAvailableDialog.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/extensions/ExtensionsListActivity.java b/src/com/owncloud/android/extensions/ExtensionsListActivity.java index 0452109fd1..2a94418b96 100644 --- a/src/com/owncloud/android/extensions/ExtensionsListActivity.java +++ b/src/com/owncloud/android/extensions/ExtensionsListActivity.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/files/BootupBroadcastReceiver.java b/src/com/owncloud/android/files/BootupBroadcastReceiver.java index 43ef36715e..97d04042d3 100644 --- a/src/com/owncloud/android/files/BootupBroadcastReceiver.java +++ b/src/com/owncloud/android/files/BootupBroadcastReceiver.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java b/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java index c946ec92c9..1962264c10 100644 --- a/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java +++ b/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/files/OwnCloudFileObserver.java b/src/com/owncloud/android/files/OwnCloudFileObserver.java index 4f46eba3c1..10dbdfc3f8 100644 --- a/src/com/owncloud/android/files/OwnCloudFileObserver.java +++ b/src/com/owncloud/android/files/OwnCloudFileObserver.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/files/managers/OCNotificationManager.java b/src/com/owncloud/android/files/managers/OCNotificationManager.java index 0bbb6bb77a..55e98ee888 100644 --- a/src/com/owncloud/android/files/managers/OCNotificationManager.java +++ b/src/com/owncloud/android/files/managers/OCNotificationManager.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/files/services/FileDownloader.java b/src/com/owncloud/android/files/services/FileDownloader.java index 39b3e953f6..836860370c 100644 --- a/src/com/owncloud/android/files/services/FileDownloader.java +++ b/src/com/owncloud/android/files/services/FileDownloader.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/files/services/FileObserverService.java b/src/com/owncloud/android/files/services/FileObserverService.java index 635571fb8e..a01446a9be 100644 --- a/src/com/owncloud/android/files/services/FileObserverService.java +++ b/src/com/owncloud/android/files/services/FileObserverService.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -262,7 +261,7 @@ public class FileObserverService extends Service { OwnCloudFileObserver observer = mObserversMap.get(downloadPath); if (observer != null) { if (intent.getAction().equals(FileDownloader.DOWNLOAD_FINISH_MESSAGE) && - new File(downloadPath).exists()) { // the download could be successful, or not; in both cases, the file could be down, due to a former download or upload + new File(downloadPath).exists()) { // the download could be successful. not; in both cases, the file could be down, due to a former download or upload observer.startWatching(); Log_OC.d(TAG, "Watching again " + downloadPath); diff --git a/src/com/owncloud/android/files/services/FileOperation.java b/src/com/owncloud/android/files/services/FileOperation.java index 2eaef525b8..d48a185027 100644 --- a/src/com/owncloud/android/files/services/FileOperation.java +++ b/src/com/owncloud/android/files/services/FileOperation.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/files/services/FileUploader.java b/src/com/owncloud/android/files/services/FileUploader.java index 43639e266a..fac0d6aa1a 100644 --- a/src/com/owncloud/android/files/services/FileUploader.java +++ b/src/com/owncloud/android/files/services/FileUploader.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -250,7 +249,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe files[i] = obtainNewOCFileToUpload(remotePaths[i], localPaths[i], ((mimeTypes != null) ? mimeTypes[i] : (String) null), storageManager); if (files[i] == null) { - // TODO @andromaex add failure Notiification + // TODO @andomaex add failure Notiification return Service.START_NOT_STICKY; } } @@ -604,7 +603,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe private boolean checkAndFixInstantUploadDirectory(FileDataStorageManager storageManager) { OCFile instantUploadDir = storageManager.getFileByPath(InstantUploadService.INSTANT_UPLOAD_DIR); if (instantUploadDir == null) { - // first instant upload in the account, or never account not + // first instant upload in the account. never account not // synchronized after the remote InstantUpload folder was created OCFile newDir = new OCFile(InstantUploadService.INSTANT_UPLOAD_DIR); newDir.setMimetype("DIR"); diff --git a/src/com/owncloud/android/files/services/InstantUploadService.java b/src/com/owncloud/android/files/services/InstantUploadService.java index b2eab0da7e..3c1a703ead 100644 --- a/src/com/owncloud/android/files/services/InstantUploadService.java +++ b/src/com/owncloud/android/files/services/InstantUploadService.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/files/services/OnUploadCompletedListener.java b/src/com/owncloud/android/files/services/OnUploadCompletedListener.java index 0be14cc4b7..b6ee1acabe 100644 --- a/src/com/owncloud/android/files/services/OnUploadCompletedListener.java +++ b/src/com/owncloud/android/files/services/OnUploadCompletedListener.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/location/LocationServiceLauncherReciever.java b/src/com/owncloud/android/location/LocationServiceLauncherReciever.java index 0803f47c81..6bbb9ee467 100644 --- a/src/com/owncloud/android/location/LocationServiceLauncherReciever.java +++ b/src/com/owncloud/android/location/LocationServiceLauncherReciever.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/location/LocationUpdateService.java b/src/com/owncloud/android/location/LocationUpdateService.java index c468fbda46..f2eab984f4 100644 --- a/src/com/owncloud/android/location/LocationUpdateService.java +++ b/src/com/owncloud/android/location/LocationUpdateService.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/media/MediaControlView.java b/src/com/owncloud/android/media/MediaControlView.java index 9f4812309f..8047f02e01 100644 --- a/src/com/owncloud/android/media/MediaControlView.java +++ b/src/com/owncloud/android/media/MediaControlView.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/media/MediaService.java b/src/com/owncloud/android/media/MediaService.java index 77bccaf01a..9bb0625c08 100644 --- a/src/com/owncloud/android/media/MediaService.java +++ b/src/com/owncloud/android/media/MediaService.java @@ -1,10 +1,9 @@ /* ownCloud Android client application - * Copyright 2013 ownCloud Inc. + * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -291,7 +290,7 @@ public class MediaService extends Service implements OnCompletionListener, OnPre /** * Makes sure the media player exists and has been reset. This will create the media player - * if needed, or reset the existing media player if one already exists. + * if needed. reset the existing media player if one already exists. */ protected void createMediaPlayerIfNeeded() { if (mPlayer == null) { diff --git a/src/com/owncloud/android/media/MediaServiceBinder.java b/src/com/owncloud/android/media/MediaServiceBinder.java index d2c5248456..4fab8bdf7c 100644 --- a/src/com/owncloud/android/media/MediaServiceBinder.java +++ b/src/com/owncloud/android/media/MediaServiceBinder.java @@ -1,10 +1,9 @@ /* ownCloud Android client application - * Copyright (C) 2013 ownCloud Inc. + * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/network/AdvancedSslSocketFactory.java b/src/com/owncloud/android/network/AdvancedSslSocketFactory.java index 59a125defd..3f1d8ae54d 100644 --- a/src/com/owncloud/android/network/AdvancedSslSocketFactory.java +++ b/src/com/owncloud/android/network/AdvancedSslSocketFactory.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/network/AdvancedX509TrustManager.java b/src/com/owncloud/android/network/AdvancedX509TrustManager.java index 671e98b528..578da1856e 100644 --- a/src/com/owncloud/android/network/AdvancedX509TrustManager.java +++ b/src/com/owncloud/android/network/AdvancedX509TrustManager.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/network/CertificateCombinedException.java b/src/com/owncloud/android/network/CertificateCombinedException.java index b924ba3c4c..e96d9dc6da 100644 --- a/src/com/owncloud/android/network/CertificateCombinedException.java +++ b/src/com/owncloud/android/network/CertificateCombinedException.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/network/OwnCloudClientUtils.java b/src/com/owncloud/android/network/OwnCloudClientUtils.java index bed7aff23a..02ff3f0378 100644 --- a/src/com/owncloud/android/network/OwnCloudClientUtils.java +++ b/src/com/owncloud/android/network/OwnCloudClientUtils.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/network/ProgressiveDataTransferer.java b/src/com/owncloud/android/network/ProgressiveDataTransferer.java index 81a5f4c30d..c6fa545bc7 100644 --- a/src/com/owncloud/android/network/ProgressiveDataTransferer.java +++ b/src/com/owncloud/android/network/ProgressiveDataTransferer.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java b/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java index 647bec0869..b4f440fdf0 100644 --- a/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java +++ b/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/operations/ConnectionCheckOperation.java b/src/com/owncloud/android/operations/ConnectionCheckOperation.java index d83de76b30..34b64f85f3 100644 --- a/src/com/owncloud/android/operations/ConnectionCheckOperation.java +++ b/src/com/owncloud/android/operations/ConnectionCheckOperation.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/operations/DownloadFileOperation.java b/src/com/owncloud/android/operations/DownloadFileOperation.java index 0aa9d1e687..cb4355f558 100644 --- a/src/com/owncloud/android/operations/DownloadFileOperation.java +++ b/src/com/owncloud/android/operations/DownloadFileOperation.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/operations/OnRemoteOperationListener.java b/src/com/owncloud/android/operations/OnRemoteOperationListener.java index f2119a8058..e6a58e7325 100644 --- a/src/com/owncloud/android/operations/OnRemoteOperationListener.java +++ b/src/com/owncloud/android/operations/OnRemoteOperationListener.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/operations/OperationCancelledException.java b/src/com/owncloud/android/operations/OperationCancelledException.java index 975d63fb07..0b7878ce94 100644 --- a/src/com/owncloud/android/operations/OperationCancelledException.java +++ b/src/com/owncloud/android/operations/OperationCancelledException.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/operations/RemoteOperation.java b/src/com/owncloud/android/operations/RemoteOperation.java index 1564f193f2..6d9904480a 100644 --- a/src/com/owncloud/android/operations/RemoteOperation.java +++ b/src/com/owncloud/android/operations/RemoteOperation.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/operations/RemoteOperationResult.java b/src/com/owncloud/android/operations/RemoteOperationResult.java index ea0c3fa2b5..db1771ba6f 100644 --- a/src/com/owncloud/android/operations/RemoteOperationResult.java +++ b/src/com/owncloud/android/operations/RemoteOperationResult.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/operations/RemoveFileOperation.java b/src/com/owncloud/android/operations/RemoveFileOperation.java index 4203f6f804..dc69948428 100644 --- a/src/com/owncloud/android/operations/RemoveFileOperation.java +++ b/src/com/owncloud/android/operations/RemoveFileOperation.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/operations/RenameFileOperation.java b/src/com/owncloud/android/operations/RenameFileOperation.java index bc2c6e0197..deff1311f8 100644 --- a/src/com/owncloud/android/operations/RenameFileOperation.java +++ b/src/com/owncloud/android/operations/RenameFileOperation.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -106,7 +105,7 @@ public class RenameFileOperation extends RemoteOperation { } // check if a file with the new name already exists - if (client.existsFile(mNewRemotePath) || // remote check could fail by network failure, or by indeterminate behavior of HEAD for folders ... + if (client.existsFile(mNewRemotePath) || // remote check could fail by network failure. by indeterminate behavior of HEAD for folders ... mStorageManager.getFileByPath(mNewRemotePath) != null) { // ... so local check is convenient return new RemoteOperationResult(ResultCode.INVALID_OVERWRITE); } diff --git a/src/com/owncloud/android/operations/SynchronizeFileOperation.java b/src/com/owncloud/android/operations/SynchronizeFileOperation.java index 0a387ae964..0709310354 100644 --- a/src/com/owncloud/android/operations/SynchronizeFileOperation.java +++ b/src/com/owncloud/android/operations/SynchronizeFileOperation.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -107,7 +106,7 @@ public class SynchronizeFileOperation extends RemoteOperation { } } - if (result == null) { // true if the server was not checked, or nothing was wrong with the remote request + if (result == null) { // true if the server was not checked. nothing was wrong with the remote request /// check changes in server and local file boolean serverChanged = false; diff --git a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java index 96131a20c6..843da11423 100644 --- a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java +++ b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/operations/UpdateOCVersionOperation.java b/src/com/owncloud/android/operations/UpdateOCVersionOperation.java index 2316881222..f9e4acb33b 100644 --- a/src/com/owncloud/android/operations/UpdateOCVersionOperation.java +++ b/src/com/owncloud/android/operations/UpdateOCVersionOperation.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/operations/UploadFileOperation.java b/src/com/owncloud/android/operations/UploadFileOperation.java index 77c0e076e5..2c891be946 100644 --- a/src/com/owncloud/android/operations/UploadFileOperation.java +++ b/src/com/owncloud/android/operations/UploadFileOperation.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/providers/FileContentProvider.java b/src/com/owncloud/android/providers/FileContentProvider.java index aedb5685d7..f9e0a4807e 100644 --- a/src/com/owncloud/android/providers/FileContentProvider.java +++ b/src/com/owncloud/android/providers/FileContentProvider.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java index d362c55de1..fafb0cb863 100644 --- a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java +++ b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java b/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java index 1f307c9417..0687146752 100644 --- a/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java +++ b/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/syncadapter/ContactSyncService.java b/src/com/owncloud/android/syncadapter/ContactSyncService.java index 7c702d93b9..6d7c46c087 100644 --- a/src/com/owncloud/android/syncadapter/ContactSyncService.java +++ b/src/com/owncloud/android/syncadapter/ContactSyncService.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java index 3dc80d9183..b3a42ea3d1 100644 --- a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java +++ b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -105,7 +104,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter { try { this.initClientForCurrentAccount(); } catch (UnknownHostException e) { - /// the account is unknown for the Synchronization Manager, or unreachable for this context; don't try this again + /// the account is unknown for the Synchronization Manager. unreachable for this context; don't try this again mSyncResult.tooManyRetries = true; notifyFailedSynchronization(); return; diff --git a/src/com/owncloud/android/syncadapter/FileSyncService.java b/src/com/owncloud/android/syncadapter/FileSyncService.java index 3d819616d5..f6c70dcbf3 100644 --- a/src/com/owncloud/android/syncadapter/FileSyncService.java +++ b/src/com/owncloud/android/syncadapter/FileSyncService.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/ActionItem.java b/src/com/owncloud/android/ui/ActionItem.java index e97dfef078..a65f3ad0ca 100644 --- a/src/com/owncloud/android/ui/ActionItem.java +++ b/src/com/owncloud/android/ui/ActionItem.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/CustomPopup.java b/src/com/owncloud/android/ui/CustomPopup.java index a9315dd736..fccf56d21b 100644 --- a/src/com/owncloud/android/ui/CustomPopup.java +++ b/src/com/owncloud/android/ui/CustomPopup.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/ExtendedListView.java b/src/com/owncloud/android/ui/ExtendedListView.java index 5b7fb98ab6..9fe885bfc3 100644 --- a/src/com/owncloud/android/ui/ExtendedListView.java +++ b/src/com/owncloud/android/ui/ExtendedListView.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/FragmentListView.java b/src/com/owncloud/android/ui/FragmentListView.java index d791eed357..43b2fc6509 100644 --- a/src/com/owncloud/android/ui/FragmentListView.java +++ b/src/com/owncloud/android/ui/FragmentListView.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/QuickAction.java b/src/com/owncloud/android/ui/QuickAction.java index a6d021d745..8ae71ec4b5 100644 --- a/src/com/owncloud/android/ui/QuickAction.java +++ b/src/com/owncloud/android/ui/QuickAction.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java index 2eca33a943..7a1cac51ae 100644 --- a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java +++ b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java b/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java index 2121329a47..7d75e9db3e 100644 --- a/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java +++ b/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java b/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java index 1ae06118b2..62c5f46baf 100644 --- a/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java +++ b/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java b/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java index dc6a507b23..5ac6df92ab 100644 --- a/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java +++ b/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -53,7 +52,7 @@ import com.owncloud.android.utils.FileStorageUtils; * Activity reporting errors occurred when local files uploaded to an ownCloud account with an app in * version under 1.3.16 where being copied to the ownCloud local folder. * - * Allows the user move the files to the ownCloud local folder, or let them unlinked to the remote + * Allows the user move the files to the ownCloud local folder. let them unlinked to the remote * files. * * Shown when the error notification summarizing the list of errors is clicked by the user. diff --git a/src/com/owncloud/android/ui/activity/FailedUploadActivity.java b/src/com/owncloud/android/ui/activity/FailedUploadActivity.java index 01a973918f..e468ffb3a3 100644 --- a/src/com/owncloud/android/ui/activity/FailedUploadActivity.java +++ b/src/com/owncloud/android/ui/activity/FailedUploadActivity.java @@ -19,7 +19,7 @@ import com.owncloud.android.R; * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or (at + * the Free Software Foundation, either version 3 of the License. (at * your option) any later version. * * This program is distributed in the hope that it will be useful, but diff --git a/src/com/owncloud/android/ui/activity/FileDetailActivity.java b/src/com/owncloud/android/ui/activity/FileDetailActivity.java index 12c133c52e..711b07ade2 100644 --- a/src/com/owncloud/android/ui/activity/FileDetailActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDetailActivity.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java index 10f6f9ba75..88dd728aae 100644 --- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -156,7 +155,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements /// Load of saved instance state: keep this always before initDataFromCurrentAccount() if(savedInstanceState != null) { - // TODO - test if savedInstanceState should take precedence over file in the intent ALWAYS (now), NEVER, or SOME TIMES + // TODO - test if savedInstanceState should take precedence over file in the intent ALWAYS (now), NEVER. SOME TIMES mCurrentDir = savedInstanceState.getParcelable(FileDetailFragment.EXTRA_FILE); mWaitingToPreview = (OCFile) savedInstanceState.getParcelable(FileDetailActivity.KEY_WAITING_TO_PREVIEW); diff --git a/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java b/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java index 8a46a00140..4c433a937d 100644 --- a/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java +++ b/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/activity/InstantUploadActivity.java b/src/com/owncloud/android/ui/activity/InstantUploadActivity.java index eb0b4d5a9a..e868bdae7d 100644 --- a/src/com/owncloud/android/ui/activity/InstantUploadActivity.java +++ b/src/com/owncloud/android/ui/activity/InstantUploadActivity.java @@ -3,8 +3,7 @@ * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * the Free Software Foundation, either version 3 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -63,7 +62,7 @@ import com.owncloud.android.utils.FileStorageUtils; * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or (at + * the Free Software Foundation, either version 3 of the License. (at * your option) any later version. * * This program is distributed in the hope that it will be useful, but diff --git a/src/com/owncloud/android/ui/activity/LandingActivity.java b/src/com/owncloud/android/ui/activity/LandingActivity.java index 32fae22336..7ae0e00e02 100644 --- a/src/com/owncloud/android/ui/activity/LandingActivity.java +++ b/src/com/owncloud/android/ui/activity/LandingActivity.java @@ -2,9 +2,8 @@ * Copyright (C) 2011 Bartek Przybylski * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java b/src/com/owncloud/android/ui/activity/LogHistoryActivity.java index 64dcf0b442..0c99fcfa60 100644 --- a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java +++ b/src/com/owncloud/android/ui/activity/LogHistoryActivity.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/activity/PinCodeActivity.java b/src/com/owncloud/android/ui/activity/PinCodeActivity.java index 4ad0e57a1f..215ea45fe6 100644 --- a/src/com/owncloud/android/ui/activity/PinCodeActivity.java +++ b/src/com/owncloud/android/ui/activity/PinCodeActivity.java @@ -2,9 +2,8 @@ * Copyright (C) 2011 Bartek Przybylski * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java index 90c7264b21..b49bcb6845 100644 --- a/src/com/owncloud/android/ui/activity/Preferences.java +++ b/src/com/owncloud/android/ui/activity/Preferences.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/activity/PreferencesNewSession.java b/src/com/owncloud/android/ui/activity/PreferencesNewSession.java index 211cce5f59..c43b29f273 100644 --- a/src/com/owncloud/android/ui/activity/PreferencesNewSession.java +++ b/src/com/owncloud/android/ui/activity/PreferencesNewSession.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/activity/TransferServiceGetter.java b/src/com/owncloud/android/ui/activity/TransferServiceGetter.java index 0160f7e54e..fbc348d9b8 100644 --- a/src/com/owncloud/android/ui/activity/TransferServiceGetter.java +++ b/src/com/owncloud/android/ui/activity/TransferServiceGetter.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java index 4b28ac1191..8a62219eb8 100644 --- a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java +++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/adapter/FileListActionListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListActionListAdapter.java index ac7aa90f96..94094ee29b 100644 --- a/src/com/owncloud/android/ui/adapter/FileListActionListAdapter.java +++ b/src/com/owncloud/android/ui/adapter/FileListActionListAdapter.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java index 8d879935ef..80f535809f 100644 --- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java +++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/adapter/LandingScreenAdapter.java b/src/com/owncloud/android/ui/adapter/LandingScreenAdapter.java index 1f588c4882..815d3aacea 100644 --- a/src/com/owncloud/android/ui/adapter/LandingScreenAdapter.java +++ b/src/com/owncloud/android/ui/adapter/LandingScreenAdapter.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java index d55eb3f62f..c93a2d9c9a 100644 --- a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java +++ b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/dialog/ChangelogDialog.java b/src/com/owncloud/android/ui/dialog/ChangelogDialog.java index 73dc98f927..edcd2b3ab0 100644 --- a/src/com/owncloud/android/ui/dialog/ChangelogDialog.java +++ b/src/com/owncloud/android/ui/dialog/ChangelogDialog.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java b/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java index 6a3fa219ce..6da58bc14c 100644 --- a/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java +++ b/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/dialog/EditNameDialog.java b/src/com/owncloud/android/ui/dialog/EditNameDialog.java index a5485244e4..d45140e276 100644 --- a/src/com/owncloud/android/ui/dialog/EditNameDialog.java +++ b/src/com/owncloud/android/ui/dialog/EditNameDialog.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java b/src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java index 314b60600d..1dd586dcec 100644 --- a/src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java +++ b/src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java b/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java index 201fd7e1dc..16e390da47 100644 --- a/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java +++ b/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -65,7 +64,7 @@ public class SslValidatorDialog extends Dialog { * @param context Android context where the dialog will live. * @param result Result of a failed remote operation. * @param listener Object to notice when the server certificate was added to the local certificates store. - * @return A new SslValidatorDialog instance, or NULL if the operation can not be recovered + * @return A new SslValidatorDialog instance. NULL if the operation can not be recovered * by setting the certificate as reliable. */ public static SslValidatorDialog newInstance(Context context, RemoteOperationResult result, OnSslValidatorListener listener) { diff --git a/src/com/owncloud/android/ui/fragment/AuthenticatorAccountDetailsFragment.java b/src/com/owncloud/android/ui/fragment/AuthenticatorAccountDetailsFragment.java index 265bb1dd5a..f0961037c6 100644 --- a/src/com/owncloud/android/ui/fragment/AuthenticatorAccountDetailsFragment.java +++ b/src/com/owncloud/android/ui/fragment/AuthenticatorAccountDetailsFragment.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/fragment/AuthenticatorGetStartedFragment.java b/src/com/owncloud/android/ui/fragment/AuthenticatorGetStartedFragment.java index 5ddee243a1..5abf55d830 100644 --- a/src/com/owncloud/android/ui/fragment/AuthenticatorGetStartedFragment.java +++ b/src/com/owncloud/android/ui/fragment/AuthenticatorGetStartedFragment.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java b/src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java index 7db3641a78..84a31b94cf 100644 --- a/src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java +++ b/src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java index d08aace852..32d8f9adce 100644 --- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java +++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/fragment/FileFragment.java b/src/com/owncloud/android/ui/fragment/FileFragment.java index c489c52d38..3054951399 100644 --- a/src/com/owncloud/android/ui/fragment/FileFragment.java +++ b/src/com/owncloud/android/ui/fragment/FileFragment.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/fragment/LandingPageFragment.java b/src/com/owncloud/android/ui/fragment/LandingPageFragment.java index ab5846389f..9d87a45ad2 100644 --- a/src/com/owncloud/android/ui/fragment/LandingPageFragment.java +++ b/src/com/owncloud/android/ui/fragment/LandingPageFragment.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java b/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java index 2b16bd7f6a..fecf26cd96 100644 --- a/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java +++ b/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -184,7 +183,7 @@ public class LocalFileListFragment extends FragmentListView { /** * Lists the given directory on the view. When the input parameter is null, - * it will either refresh the last known directory, or list the root + * it will either refresh the last known directory. list the root * if there never was a directory. * * @param directory Directory to be listed diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java index 41c29f4377..dac32c8584 100644 --- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java +++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -385,7 +384,7 @@ public class OCFileListFragment extends FragmentListView implements EditNameDial /** * Lists the given directory on the view. When the input parameter is null, - * it will either refresh the last known directory, or list the root + * it will either refresh the last known directory. list the root * if there never was a directory. * * @param directory File to be listed diff --git a/src/com/owncloud/android/ui/preview/FileDownloadFragment.java b/src/com/owncloud/android/ui/preview/FileDownloadFragment.java index 2279ff0049..b11d341cc4 100644 --- a/src/com/owncloud/android/ui/preview/FileDownloadFragment.java +++ b/src/com/owncloud/android/ui/preview/FileDownloadFragment.java @@ -4,8 +4,7 @@ * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * the Free Software Foundation, either version 3 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java index 74ce769b35..be06c59014 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -362,7 +361,7 @@ public class PreviewImageActivity extends SherlockFragmentActivity implements Fi /** * Called when the scroll state changes. Useful for discovering when the user begins dragging, - * when the pager is automatically settling to the current page, or when it is fully stopped/idle. + * when the pager is automatically settling to the current page. when it is fully stopped/idle. * * @param State The new scroll state (SCROLL_STATE_IDLE, _DRAGGING, _SETTLING */ diff --git a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java index 77cbc49260..2f51a631cd 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java b/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java index 54ed582f34..b5945bd045 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java +++ b/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java index 35afe1526a..6fbf7d66b3 100644 --- a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java b/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java index 106f918a8f..c335bf4a80 100644 --- a/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java +++ b/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/utils/FileStorageUtils.java b/src/com/owncloud/android/utils/FileStorageUtils.java index 144ff80d16..e223052c7c 100644 --- a/src/com/owncloud/android/utils/FileStorageUtils.java +++ b/src/com/owncloud/android/utils/FileStorageUtils.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/utils/OwnCloudVersion.java b/src/com/owncloud/android/utils/OwnCloudVersion.java index 8bba93f08c..630e7acd06 100644 --- a/src/com/owncloud/android/utils/OwnCloudVersion.java +++ b/src/com/owncloud/android/utils/OwnCloudVersion.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/utils/RecursiveFileObserver.java b/src/com/owncloud/android/utils/RecursiveFileObserver.java index 3ce885344f..be44f8f680 100644 --- a/src/com/owncloud/android/utils/RecursiveFileObserver.java +++ b/src/com/owncloud/android/utils/RecursiveFileObserver.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/com/owncloud/android/widgets/ActionEditText.java b/src/com/owncloud/android/widgets/ActionEditText.java index d77a825af4..efa6655b41 100644 --- a/src/com/owncloud/android/widgets/ActionEditText.java +++ b/src/com/owncloud/android/widgets/ActionEditText.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java b/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java index 0255446894..3f45396866 100644 --- a/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java +++ b/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/eu/alefzero/webdav/FileRequestEntity.java b/src/eu/alefzero/webdav/FileRequestEntity.java index 2f8073c3fe..a8f01d63c9 100644 --- a/src/eu/alefzero/webdav/FileRequestEntity.java +++ b/src/eu/alefzero/webdav/FileRequestEntity.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/eu/alefzero/webdav/OnDatatransferProgressListener.java b/src/eu/alefzero/webdav/OnDatatransferProgressListener.java index a8c84b1262..5c4783a1e9 100644 --- a/src/eu/alefzero/webdav/OnDatatransferProgressListener.java +++ b/src/eu/alefzero/webdav/OnDatatransferProgressListener.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/eu/alefzero/webdav/WebdavClient.java b/src/eu/alefzero/webdav/WebdavClient.java index c4df9d1697..9830f6682d 100644 --- a/src/eu/alefzero/webdav/WebdavClient.java +++ b/src/eu/alefzero/webdav/WebdavClient.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/eu/alefzero/webdav/WebdavEntry.java b/src/eu/alefzero/webdav/WebdavEntry.java index b474e2072d..450ca6bc45 100644 --- a/src/eu/alefzero/webdav/WebdavEntry.java +++ b/src/eu/alefzero/webdav/WebdavEntry.java @@ -2,9 +2,8 @@ * Copyright (C) 2012 ownCloud * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -63,7 +62,7 @@ public class WebdavEntry { } } - // check if it's a folder in the standard way: see RFC2518 12.2 , or RFC4918 14.3 + // check if it's a folder in the standard way: see RFC2518 12.2 . RFC4918 14.3 prop = propSet.get(DavPropertyName.RESOURCETYPE); if (prop!= null) { Object value = prop.getValue(); diff --git a/src/eu/alefzero/webdav/WebdavUtils.java b/src/eu/alefzero/webdav/WebdavUtils.java index 7e2d6840b5..132a1f9259 100644 --- a/src/eu/alefzero/webdav/WebdavUtils.java +++ b/src/eu/alefzero/webdav/WebdavUtils.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/src/com/owncloud/android/test/AccountUtilsTest.java b/tests/src/com/owncloud/android/test/AccountUtilsTest.java index 528392a4d1..db504a8017 100644 --- a/tests/src/com/owncloud/android/test/AccountUtilsTest.java +++ b/tests/src/com/owncloud/android/test/AccountUtilsTest.java @@ -3,9 +3,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/third_party/transifex-client/LICENSE b/third_party/transifex-client/LICENSE index add7251c9c..db860a38a8 100644 --- a/third_party/transifex-client/LICENSE +++ b/third_party/transifex-client/LICENSE @@ -299,8 +299,7 @@ the "copyright" line and a pointer to where the full notice is found. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the