From: David A. Velasco Date: Fri, 3 May 2013 12:25:02 +0000 (+0200) Subject: Merge branch 'develop' into fixForCrashedSharedContents X-Git-Tag: oc-android-1.4.3~28^2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/65f403bf994bd84d64eea16072b7bec479c0d525?hp=e0ce2d4d5c6eea8bf7801e8f1e3960943bc54017 Merge branch 'develop' into fixForCrashedSharedContents Conflicts: src/com/owncloud/android/Uploader.java --- diff --git a/AndroidManifest.xml b/AndroidManifest.xml index e5e4a059..ba32f6cf 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,166 +1,173 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + @@ -169,6 +176,7 @@ + - + diff --git a/LICENSE.txt b/LICENSE.txt index d159169d..4fc88098 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 1d51b72a..1cfdddc8 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 102f2be6..9b2922e3 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 1c98f627..8bb865d9 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 f02d8680..78bd62b3 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 963cfe5c..32b251b4 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 d7536342..f92b219a 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 2dfe4dbb..851f8477 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 8cef01b9..951ca014 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 902f41ef..972a5b7a 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 05827899..6016e000 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 6766ea75..fa0b6c9c 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 517d36c8..c330980a 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 c91455e9..086eab3c 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 7ad975bc..c96ea9a4 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 2c6fed06..4438ebfa 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 98cc67b5..680e8487 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 cb1d2928..773b51da 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 47f73b22..dd278339 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 b58eda87..0b0a3999 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 a2c92aa8..1a47be54 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 e567a6bd..bc138c7a 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 7b2944f3..3e252d32 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 4af9f6b0..d5881ab8 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 166b666d..855ba2c1 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 55eb2dd3..12336470 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 c0b4731b..99219b64 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 f1c174fd..1e53367d 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 c45405fa..ce78ace5 100644 --- a/res/layout-land/account_setup.xml +++ b/res/layout-land/account_setup.xml @@ -1,14 +1,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -