mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-10-23 04:26:01 +03:00
Code Issues Projects Releases Packages Wiki Activity

Update branch with develop branch

Browse source
This commit is contained in:
masensio 2013-06-06 17:22:25 +02:00
commit 6e2949f681
223 changed files with 8512 additions and 6838 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.classpath
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/> <classpathentry kind="src" path="gen"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="output" path="bin/classes"/> <classpathentry kind="output" path="bin/classes"/>
</classpath> </classpath>

355
AndroidManifest.xml
View file

@ -1,174 +1,183 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
ownCloud Android client application ownCloud Android client application
Copyright (C) 2012 Bartek Przybylski Copyright (C) 2012 Bartek Przybylski
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful,
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
along with this program. If not, see <http://www.gnu.org/licenses/>. -->
--> <manifest package="com.owncloud.android"
<manifest package="com.owncloud.android" android:versionCode="104000"
android:versionCode="104000" android:versionName="1.4.0" xmlns:android="http://schemas.android.com/apk/res/android">
android:versionName="1.4.0" xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.GET_ACCOUNTS" /> <uses-permission android:name="android.permission.USE_CREDENTIALS" />
<uses-permission android:name="android.permission.USE_CREDENTIALS" /> <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
<uses-permission android:name="android.permission.MANAGE_ACCOUNTS" /> <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.WRITE_SETTINGS" />
<uses-permission android:name="android.permission.WRITE_SETTINGS" /> <uses-permission android:name="android.permission.READ_SYNC_STATS" />
<uses-permission android:name="android.permission.READ_SYNC_STATS" /> <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
<uses-permission android:name="android.permission.READ_SYNC_SETTINGS" /> <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" /> <uses-permission android:name="android.permission.BROADCAST_STICKY" />
<uses-permission android:name="android.permission.BROADCAST_STICKY" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> <uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-sdk
<uses-sdk android:minSdkVersion="8"
android:minSdkVersion="8" android:targetSdkVersion="13" />
android:targetSdkVersion="13" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" >
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" > </uses-permission>
</uses-permission>
<application
<application android:icon="@drawable/icon"
android:icon="@drawable/icon" android:label="@string/app_name"
android:label="@string/app_name" android:theme="@style/Theme.ownCloud">
android:theme="@style/Theme.ownCloud"> <activity
<activity android:name=".ui.activity.FileDisplayActivity"
android:name=".ui.activity.FileDisplayActivity" android:label="@string/app_name"
android:label="@string/app_name"> android:configChanges="orientation|screenSize">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name=".ui.activity.UploadFilesActivity"> <activity android:name=".ui.activity.UploadFilesActivity">
</activity> </activity>
<activity android:name=".ui.activity.InstantUploadActivity"> <activity android:name=".ui.activity.InstantUploadActivity">
</activity> </activity>
<activity android:name=".ui.activity.FailedUploadActivity" android:theme="@android:style/Theme.Dialog" android:excludeFromRecents="true"/> <activity android:name=".ui.activity.FailedUploadActivity" android:theme="@android:style/Theme.Dialog" android:excludeFromRecents="true"/>
<activity android:name=".Uploader" > <activity android:name=".Uploader" >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.SEND" > <action android:name="android.intent.action.SEND" >
</action> </action>
<category android:name="android.intent.category.DEFAULT" > <category android:name="android.intent.category.DEFAULT" >
</category> </category>
<data android:mimeType="*/*" > <data android:mimeType="*/*" >
</data> </data>
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.SEND_MULTIPLE" > <action android:name="android.intent.action.SEND_MULTIPLE" >
</action> </action>
<category android:name="android.intent.category.DEFAULT" > <category android:name="android.intent.category.DEFAULT" >
</category> </category>
<data android:mimeType="*/*" > <data android:mimeType="*/*" >
</data> </data>
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity
android:name=".ui.activity.Preferences" android:name=".ui.activity.Preferences"
android:theme="@style/Theme.ownCloud" > android:theme="@style/Theme.ownCloud" >
</activity> </activity>
<activity android:name=".ui.activity.PreferencesNewSessionewSession" > <activity android:name=".ui.activity.PreferencesNewSessionewSession" >
</activity> </activity>
<activity android:name="com.owncloud.android.ui.preview.PreviewImageActivity" />
<activity android:name="com.owncloud.android.ui.preview.PreviewVideoActivity"
android:label="@string/app_name"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
</activity>
<service
android:name=".authenticator.AccountAuthenticatorService"
android:exported="true">
<intent-filter android:priority="100">
<action android:name="android.accounts.AccountAuthenticator" />
</intent-filter>
<meta-data
android:name="android.accounts.AccountAuthenticator"
android:resource="@xml/authenticator" />
</service>
<service
android:name=".syncadapter.FileSyncService"
android:exported="true" >
<intent-filter>
<action android:name="android.content.SyncAdapter" />
</intent-filter>
<meta-data
android:name="android.content.SyncAdapter"
android:resource="@xml/syncadapter_files" />
</service>
<provider
android:name=".providers.FileContentProvider"
android:authorities="org.owncloud"
android:enabled="true"
android:exported="false"
android:label="@string/sync_string_files"
android:syncable="true" >
</provider>
<activity
android:name=".ui.activity.AuthenticatorActivity"
android:exported="true"
android:theme="@style/Theme.ownCloud.noActionBar" >
<intent-filter>
<action android:name="com.owncloud.android.workaround.accounts.CREATE" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<service android:name=".files.services.FileDownloader" />
<service android:name=".files.services.FileUploader" />
<service android:name=".media.MediaService" />
<activity android:name=".ui.activity.FileDetailActivity" />
<activity android:name=".ui.activity.PinCodeActivity" />
<activity android:name=".extensions.ExtensionsAvailableActivity"></activity>
<activity android:name=".extensions.ExtensionsListActivity"></activity>
<activity android:name=".ui.activity.AccountSelectActivity" android:uiOptions="none" android:label="@string/prefs_accounts"></activity>
<activity android:name=".ui.activity.ConflictsResolveActivity"/>
<activity android:name=".ui.activity.GenericExplanationActivity"/>
<activity android:name=".ui.activity.ErrorsWhileCopyingHandlerActivity"/>
<service android:name=".files.services.InstantUploadService" /> <activity android:name="com.owncloud.android.ui.preview.PreviewImageActivity" />
<receiver android:name=".files.InstantUploadBroadcastReceiver">
<intent-filter> <activity android:name="com.owncloud.android.ui.preview.PreviewVideoActivity"
<action android:name="com.android.camera.NEW_PICTURE" /> android:label="@string/app_name"
<data android:mimeType="image/*" /> android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
</intent-filter> </activity>
<intent-filter>
<action android:name="android.net.conn.CONNECTIVITY_CHANGE"/> <service
</intent-filter> android:name=".authentication.AccountAuthenticatorService"
</receiver> android:exported="true">
<receiver android:name=".files.BootupBroadcastReceiver"> <intent-filter android:priority="100">
<intent-filter> <action android:name="android.accounts.AccountAuthenticator" />
<action android:name="android.intent.action.BOOT_COMPLETED"/> </intent-filter>
</intent-filter>
</receiver> <meta-data
<service android:name=".files.services.FileObserverService"/> android:name="android.accounts.AccountAuthenticator"
</application> android:resource="@xml/authenticator" />
</service>
</manifest> <service
android:name=".syncadapter.FileSyncService"
android:exported="true" >
<intent-filter>
<action android:name="android.content.SyncAdapter" />
</intent-filter>
<meta-data
android:name="android.content.SyncAdapter"
android:resource="@xml/syncadapter_files" />
</service>
<provider
android:name=".providers.FileContentProvider"
android:authorities="org.owncloud"
android:enabled="true"
android:exported="false"
android:label="@string/sync_string_files"
android:syncable="true" >
</provider>
<activity
android:name=".authentication.AuthenticatorActivity"
android:exported="true"
android:theme="@style/Theme.ownCloud.noActionBar"
android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="@string/oauth2_redirect_scheme" />
</intent-filter>
<intent-filter>
<action android:name="com.owncloud.android.workaround.accounts.CREATE" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<service android:name=".files.services.FileDownloader" />
<service android:name=".files.services.FileUploader" />
<service android:name=".media.MediaService" />
<activity android:name=".ui.activity.FileDetailActivity" android:configChanges="orientation|screenSize"/>
<activity android:name=".ui.activity.PinCodeActivity" />
<activity android:name=".extensions.ExtensionsAvailableActivity"></activity>
<activity android:name=".extensions.ExtensionsListActivity"></activity>
<activity android:name=".ui.activity.AccountSelectActivity" android:uiOptions="none" android:label="@string/prefs_accounts"></activity>
<activity android:name=".ui.activity.ConflictsResolveActivity"/>
<activity android:name=".ui.activity.GenericExplanationActivity"/>
<activity android:name=".ui.activity.ErrorsWhileCopyingHandlerActivity"/>
<activity android:name=".ui.activity.LogHistoryActivity"/>
<receiver android:name=".files.InstantUploadBroadcastReceiver">
<intent-filter>
<action android:name="com.android.camera.NEW_PICTURE" />
<data android:mimeType="image/*" />
</intent-filter>
<intent-filter>
<action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
</intent-filter>
</receiver>
<receiver android:name=".files.BootupBroadcastReceiver">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED"/>
</intent-filter>
</receiver>
<service android:name=".files.services.FileObserverService"/>
</application>
</manifest>

7
LICENSE.txt
View file

@ -294,10 +294,9 @@ the "copyright" line and a pointer to where the full notice is found.
Copyright (C) <year> <name of author> Copyright (C) <year> <name of author>
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation; either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

7
THIRD_PARTY.txt
View file

@ -11,9 +11,8 @@
########### ###########
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License verions 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
@ -45,7 +44,7 @@ The third party software included and used by this project is:
Original license document included at libs/LICENSE.txt Original license document included at libs/LICENSE.txt
See http://jackrabbit.apache.org/ See http://jackrabbit.apache.org/
* Transifex client.JavaMail API, version 1.4.3 * Transifex client.
Copyright (C) Transifex. Copyright (C) Transifex.
Licensed under GNU General Public License. Licensed under GNU General Public License.
Placed at third_party/transifex-client. Placed at third_party/transifex-client.

71
doc/CodeStyleFormatter.xml
View file

@ -1,16 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<profiles version="12"> <profiles version="12">
<profile kind="CodeFormatterProfile" name="Owncloud" version="12"> <profile kind="CodeFormatterProfile" name="OwnCloud-Convention" version="12">
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/> <setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/> <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
@ -23,11 +24,11 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/> <setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="32"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
@ -50,7 +51,7 @@
<setting id="org.eclipse.jdt.core.compiler.source" value="1.7"/> <setting id="org.eclipse.jdt.core.compiler.source" value="1.7"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="false"/> <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false"/> <setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false"/>
@ -72,8 +73,8 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/> <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/> <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
@ -81,14 +82,14 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/> <setting id="org.eclipse.jdt.core.formatter.indentation.size" value="8"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/> <setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="0"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/> <setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/> <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="tab"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
@ -101,7 +102,7 @@
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/> <setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
@ -119,11 +120,11 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="true"/> <setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/> <setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/> <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/> <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
@ -149,21 +150,21 @@
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/> <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="0"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="true"/> <setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/> <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="2"/> <setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
@ -181,15 +182,15 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/> <setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/> <setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="0"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/> <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
@ -204,7 +205,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/> <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/> <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
@ -216,16 +217,16 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/> <setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/> <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="2"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/> <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="0"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="false"/> <setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="0"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/> <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
@ -233,10 +234,10 @@
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/> <setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="0"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
@ -246,16 +247,16 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.7"/> <setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.7"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/> <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="16"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/> <setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/> <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="49"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/> <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
@ -277,7 +278,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/> <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="2"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/> <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>

6
oc_jb_workaround/.classpath
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/> <classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/> <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="output" path="bin/classes"/> <classpathentry kind="output" path="bin/classes"/>
</classpath> </classpath>

2
oc_jb_workaround/project.properties
View file

@ -11,4 +11,4 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target. # Project target.
target=android-16 target=android-17

5
oc_jb_workaround/src/com/owncloud/android/workaround/accounts/AccountAuthenticatorService.java
View file

@ -2,9 +2,8 @@
* Copyright (C) 2013 ownCloud Inc. * Copyright (C) 2013 ownCloud Inc.
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2,
* the Free Software Foundation, either version 2 of the License, or * as published by the Free Software Foundation.
* (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/anim/disappear.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/anim/grow_from_bottom.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/anim/grow_from_bottomleft_to_topright.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/anim/grow_from_bottomright_to_topleft.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/anim/grow_from_top.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/anim/grow_from_topleft_to_bottomright.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/anim/grow_from_topright_to_bottomleft.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/anim/pump_bottom.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/anim/pump_top.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/anim/shrink_from_bottom.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/anim/shrink_from_bottomleft_to_topright.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/anim/shrink_from_bottomright_to_topleft.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/anim/shrink_from_top.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/anim/shrink_from_topleft_to_bottomright.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/anim/shrink_from_topright_to_bottomleft.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

BIN
res/drawable-hdpi-v9/ic_action_download.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 686 B

BIN
res/drawable-hdpi/ic_action_download.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 687 B

0
res/drawable-hdpi/owncloud_logo.png → res/drawable-hdpi/logo.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

BIN
res/drawable-ldpi-v9/ic_action_download.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 457 B

BIN
res/drawable-ldpi/ic_action_download.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 457 B

0
res/drawable-ldpi/owncloud_logo.png → res/drawable-ldpi/logo.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
res/drawable-mdpi-v9/ic_action_download.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 568 B

BIN
res/drawable-mdpi/ic_action_download.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 556 B

0
res/drawable-mdpi/owncloud_logo.png → res/drawable-mdpi/logo.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

5
res/drawable/action_item_btn.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/drawable/btn.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/drawable/btn_round.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/drawable/btn_round_pressed.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/drawable/connection_secure.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/drawable/list_selector.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/drawable/main_header_bg.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/drawable/progress_small.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/drawable/split_action_bg.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/drawable/uploader_list_separator.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

357
res/layout-land/account_setup.xml
View file

@ -1,14 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
ownCloud Android client application ownCloud Android client application
Copyright (C) 2012 Bartek Przybylski Copyright (C) 2012 Bartek Przybylski
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
@ -17,177 +16,173 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:oc="http://schemas.android.com/apk/res/com.owncloud.android" android:layout_width="match_parent"
android:layout_width="fill_parent" android:layout_height="match_parent"
android:layout_height="fill_parent" android:padding="8dip"
android:focusable="true" >
android:gravity="center|fill"
android:orientation="vertical" > <LinearLayout
android:layout_width="match_parent"
<FrameLayout android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_above="@id/buttonOK"
android:layout_height="wrap_content" android:layout_alignParentTop="true"
android:layout_gravity="center" android:orientation="horizontal" >
android:layout_marginLeft="16dip"
android:layout_marginRight="16dip" <ImageView
android:layout_weight="1" > android:id="@+id/imageView1"
android:layout_width="0dp"
<LinearLayout android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_weight="1"
android:layout_height="match_parent" > android:layout_gravity="center"
android:src="@drawable/logo"
<ImageView />
android:id="@+id/imageView1"
android:layout_width="match_parent" <ScrollView
android:layout_height="match_parent" android:layout_width="0dp"
android:layout_margin="7dp" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:src="@drawable/owncloud_logo" /> android:fillViewport="true"
android:orientation="vertical" >
<LinearLayout
android:id="@+id/LinearLayout1" <LinearLayout
android:layout_width="match_parent" android:id="@+id/LinearLayout1"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_gravity="center" android:layout_height="wrap_content"
android:layout_weight="1" android:focusable="true"
android:orientation="vertical" > android:gravity="center"
android:orientation="vertical"
<FrameLayout android:padding="8dp" >
android:layout_width="match_parent"
android:layout_height="wrap_content" <EditText
android:layout_weight="1" > android:id="@+id/hostUrlInput"
android:layout_width="match_parent"
<EditText android:layout_height="wrap_content"
android:id="@+id/host_URL" android:ems="10"
android:layout_width="match_parent" android:hint="@string/auth_host_url"
android:layout_height="wrap_content" android:inputType="textUri"
android:layout_weight="1" android:drawablePadding="5dp"
android:ems="10" >
android:hint="@string/auth_host_url" <requestFocus />
android:inputType="textNoSuggestions"> </EditText>
<requestFocus />
</EditText> <TextView
android:id="@+id/server_status_text"
<ImageView android:layout_width="match_parent"
android:id="@+id/refreshButton" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_marginBottom="10dp"
android:layout_height="wrap_content" android:drawableLeft="@android:drawable/stat_notify_sync"
android:layout_gravity="right|center_vertical" android:drawablePadding="5dp"
android:src="@drawable/ic_action_refresh_black" android:gravity="center_vertical"
android:visibility="invisible" /> android:text="@string/auth_testing_connection" />
</FrameLayout>
<CheckBox
<LinearLayout android:id="@+id/oauth_onOff_check"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="50dp" android:layout_height="wrap_content"
android:layout_weight="1" > android:checked="false"
android:onClick="onCheckClick"
<ImageView android:text="@string/oauth_check_onoff"
android:id="@+id/action_indicator" android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content" android:visibility="gone"
android:layout_height="wrap_content" />
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" <EditText
android:src="@android:drawable/stat_notify_sync" android:id="@+id/oAuthEntryPoint_1"
android:visibility="invisible" /> android:layout_width="match_parent"
android:layout_height="wrap_content"
<TextView android:ems="10"
android:id="@+id/status_text" android:enabled="false"
android:layout_width="wrap_content" android:text="@string/oauth2_url_endpoint_auth"
android:layout_height="wrap_content" android:singleLine="true"
android:text="TextView" android:inputType="textUri"
android:visibility="invisible" /> android:visibility="gone" >
</LinearLayout> <requestFocus />
</EditText>
<TextView
android:id="@+id/textView2" <EditText
android:layout_width="wrap_content" android:id="@+id/oAuthEntryPoint_2"
android:layout_height="0dp" android:layout_width="match_parent"
android:layout_weight="1" android:layout_height="wrap_content"
android:text="@string/auth_login_details" android:ems="10"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:enabled="false"
android:text="@string/oauth2_url_endpoint_access"
<EditText android:singleLine="true"
android:id="@+id/account_username" android:inputType="textUri"
android:layout_width="match_parent" android:visibility="gone" >
android:layout_height="0dp" <requestFocus />
android:layout_weight="1" </EditText>
android:ems="10"
android:hint="@string/auth_username" <EditText
android:inputType="textNoSuggestions" /> android:id="@+id/account_username"
android:layout_width="match_parent"
<FrameLayout android:layout_height="wrap_content"
android:layout_width="match_parent" android:ems="10"
android:layout_height="wrap_content" android:hint="@string/auth_username"
android:layout_weight="1" > android:inputType="textNoSuggestions" />
<EditText <FrameLayout
android:id="@+id/account_password" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" >
android:layout_weight="1" <EditText
android:ems="10" android:id="@+id/account_password"
android:hint="@string/auth_password" android:layout_width="match_parent"
android:inputType="textPassword"/> android:layout_height="wrap_content"
android:ems="10"
<ImageView android:hint="@string/auth_password"
android:id="@+id/viewPassword" android:inputType="textPassword"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content" <ImageView
android:layout_gravity="right|center_vertical" android:id="@+id/viewPasswordButton"
android:src="@android:drawable/ic_menu_view" android:layout_width="wrap_content"
android:visibility="invisible" /> android:layout_height="wrap_content"
</FrameLayout> android:layout_gravity="right|center_vertical"
</LinearLayout> android:src="@android:drawable/ic_menu_view"
</LinearLayout> android:onClick="onViewPasswordClick"
</FrameLayout> android:visibility="invisible" />
</FrameLayout>
<RelativeLayout
android:layout_width="match_parent" <TextView
android:layout_height="wrap_content" android:id="@+id/auth_status_text"
android:layout_alignParentBottom="true" > android:layout_width="match_parent"
android:layout_height="wrap_content"
<LinearLayout android:gravity="center_vertical"
android:id="@+id/buttons_layout" android:text="@string/auth_unauthorized"
android:layout_width="match_parent" android:drawableLeft="@android:drawable/stat_notify_sync"
android:layout_height="wrap_content" android:drawablePadding="5dip"
android:weightSum="1"> />
<Button </LinearLayout>
android:id="@+id/buttonCancel"
android:layout_width="match_parent" </ScrollView>
android:layout_height="wrap_content"
android:layout_weight=".5" </LinearLayout>
android:onClick="onCancelClick"
android:text="@string/common_cancel" /> <Button
android:id="@id/buttonOK"
<Button android:layout_width="match_parent"
android:id="@+id/buttonOK" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_above="@id/account_register"
android:layout_height="wrap_content" android:layout_centerHorizontal="true"
android:layout_weight=".5" android:enabled="false"
android:enabled="false" android:onClick="onOkClick"
android:onClick="onOkClick" android:text="@string/setup_btn_connect"
android:text="@string/setup_btn_connect" />
android:textColor="@android:color/black" />
<Button
</LinearLayout> android:id="@+id/account_register"
android:layout_width="wrap_content"
<Button android:layout_height="wrap_content"
android:id="@+id/account_register" android:layout_centerHorizontal="true"
android:layout_width="wrap_content" android:layout_alignParentBottom="true"
android:layout_height="wrap_content" android:background="@android:color/transparent"
android:layout_below="@id/buttons_layout" android:textColor="#0000FF"
android:layout_centerHorizontal="true" android:onClick="onRegisterClick"
android:onClick="onRegisterClick" android:paddingTop="5dp"
android:paddingTop="10dp" android:paddingBottom="5dp"
android:paddingBottom="10dp" android:text="@string/auth_register"
android:textColor="#0000FF" />
android:background="@android:color/transparent" />
<!-- android:text="@string/app_name @string/auth_register" /--> </RelativeLayout>
</RelativeLayout>
</LinearLayout>

5
res/layout-large-land/files.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/layout-v14/generic_explanation.xml
View file

@ -5,9 +5,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

326
res/layout/account_setup.xml
View file

@ -1,14 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
ownCloud Android client application ownCloud Android client application
Copyright (C) 2012 Bartek Przybylski Copyright (C) 2012 Bartek Przybylski
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
@ -17,175 +16,144 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:focusable="true" android:layout_gravity="center"
android:gravity="center|fill" android:fillViewport="true"
android:orientation="vertical" > android:orientation="vertical" >
<FrameLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:focusable="true"
android:layout_marginLeft="16dip" android:gravity="center"
android:layout_marginRight="16dip" android:orientation="vertical"
android:layout_weight="1" > android:padding="8dp" >
<LinearLayout <ImageView
android:id="@+id/LinearLayout1" android:id="@+id/imageView1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_marginBottom="10dp"
android:layout_weight="1" android:layout_marginTop="10dp"
android:orientation="vertical" > android:src="@drawable/logo" />
<ImageView <EditText
android:id="@+id/imageView1" android:id="@+id/hostUrlInput"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="10dp" android:ems="10"
android:layout_weight="1" android:hint="@string/auth_host_url"
android:src="@drawable/owncloud_logo" /> android:inputType="textUri"
android:drawablePadding="5dp"
<FrameLayout >
android:layout_width="match_parent" <requestFocus />
android:layout_height="wrap_content" </EditText>
android:layout_weight="1" >
<TextView
<EditText android:id="@+id/server_status_text"
android:id="@+id/host_URL" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_marginBottom="10dp"
android:layout_weight="1" android:drawableLeft="@android:drawable/stat_notify_sync"
android:ems="10" android:drawablePadding="5dp"
android:hint="@string/auth_host_url" android:gravity="center_vertical"
android:inputType="textNoSuggestions" > android:text="@string/auth_testing_connection" />
<requestFocus />
</EditText> <CheckBox
android:id="@+id/oauth_onOff_check"
<ImageView android:layout_width="wrap_content"
android:id="@+id/refreshButton" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:checked="false"
android:layout_height="wrap_content" android:onClick="onCheckClick"
android:src="@drawable/ic_action_refresh_black" android:text="@string/oauth_check_onoff"
android:layout_gravity="right|center_vertical" android:textAppearance="?android:attr/textAppearanceSmall"
android:visibility="invisible" /> android:visibility="gone" />
</FrameLayout> <EditText
android:id="@+id/oAuthEntryPoint_1"
<LinearLayout android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="50dp" android:ems="10"
android:layout_weight="1" > android:inputType="textUri"
android:singleLine="true"
<ImageView android:text="@string/oauth2_url_endpoint_auth"
android:id="@+id/action_indicator" android:visibility="gone" >
android:layout_width="wrap_content" </EditText>
android:layout_height="wrap_content"
android:layout_marginLeft="5dp" <EditText
android:layout_marginRight="5dp" android:id="@+id/oAuthEntryPoint_2"
android:src="@android:drawable/stat_notify_sync" android:layout_width="match_parent"
android:visibility="invisible" /> android:layout_height="wrap_content"
android:ems="10"
<TextView android:inputType="textUri"
android:id="@+id/status_text" android:singleLine="true"
android:layout_width="wrap_content" android:text="@string/oauth2_url_endpoint_access"
android:layout_height="wrap_content" android:visibility="gone" />
android:text="TextView"
android:visibility="invisible" /> <EditText
android:id="@+id/account_username"
</LinearLayout> android:layout_width="match_parent"
android:layout_height="wrap_content"
<TextView android:ems="10"
android:id="@+id/textView2" android:hint="@string/auth_username"
android:layout_width="wrap_content" android:inputType="textNoSuggestions" />
android:layout_height="0dp"
android:layout_weight="1" <FrameLayout
android:text="@string/auth_login_details" android:layout_width="match_parent"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:layout_height="wrap_content" >
<EditText <EditText
android:id="@+id/account_username" android:id="@+id/account_password"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="wrap_content"
android:layout_weight="1" android:ems="10"
android:ems="10" android:hint="@string/auth_password"
android:hint="@string/auth_username" android:inputType="textPassword" />
android:inputType="textNoSuggestions" />
<ImageView
<FrameLayout android:id="@+id/viewPasswordButton"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" > android:layout_gravity="right|center_vertical"
android:onClick="onViewPasswordClick"
<EditText android:src="@android:drawable/ic_menu_view"
android:id="@+id/account_password" android:visibility="invisible" />
android:layout_width="match_parent" </FrameLayout>
android:layout_height="wrap_content"
android:layout_weight="1" <TextView
android:ems="10" android:id="@+id/auth_status_text"
android:hint="@string/auth_password" android:layout_width="match_parent"
android:inputType="textPassword"/> android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
<ImageView android:drawableLeft="@android:drawable/stat_notify_sync"
android:id="@+id/viewPassword" android:drawablePadding="5dp"
android:layout_width="wrap_content" android:gravity="center_vertical"
android:layout_height="wrap_content" android:text="@string/auth_unauthorized" />
android:layout_gravity="right|center_vertical"
android:src="@android:drawable/ic_menu_view" <Button
android:visibility="invisible" /> android:id="@+id/buttonOK"
android:layout_width="match_parent"
</FrameLayout> android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
</LinearLayout> android:enabled="false"
android:onClick="onOkClick"
</FrameLayout> android:text="@string/setup_btn_connect"
/>
<RelativeLayout
android:layout_width="match_parent" <Button
android:layout_height="wrap_content"> android:id="@+id/account_register"
android:layout_width="wrap_content"
<LinearLayout android:layout_height="wrap_content"
android:id="@+id/buttons_layout" android:background="@android:color/transparent"
android:layout_width="match_parent" android:textColor="#0000FF"
android:layout_height="wrap_content" android:onClick="onRegisterClick"
android:weightSum="1" > android:paddingBottom="5dp"
android:paddingTop="5dp"
<Button android:text="@string/auth_register"
android:id="@+id/buttonCancel" />
android:layout_width="match_parent" </LinearLayout>
android:layout_height="wrap_content"
android:layout_weight=".5" </ScrollView>
android:onClick="onCancelClick"
android:text="@string/common_cancel" />
<Button
android:id="@+id/buttonOK"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight=".5"
android:enabled="false"
android:onClick="onOkClick"
android:text="@string/setup_btn_connect"
android:textColor="@android:color/black" />
</LinearLayout>
<Button
android:id="@+id/account_register"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/buttons_layout"
android:layout_centerHorizontal="true"
android:onClick="onRegisterClick"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:textColor="#0000FF"
android:background="@android:color/transparent" />
<!-- android:text="@string/app_name @string/auth_register" /-->
</RelativeLayout>
</LinearLayout>

5
res/layout/action_item.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/layout/authenticator_getting_started_fragment.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

7
res/layout/edit_box_dialog.xml
View file

@ -6,10 +6,9 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

5
res/layout/extensions_available_dialog.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

6
res/layout/failed_upload_files.xml
View file

@ -4,10 +4,10 @@
Copyright (C) 2012 Bartek Przybylski Copyright (C) 2012 Bartek Przybylski
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 3 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/layout/file_activity_details.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/layout/file_details_empty.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

64
res/layout/file_details_fragment.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
@ -179,57 +178,32 @@
android:text="@string/downloader_download_in_progress_ticker" android:text="@string/downloader_download_in_progress_ticker"
/> />
<ProgressBar android:id="@+id/fdProgressBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:progressDrawable="@android:drawable/progress_horizontal"
android:indeterminate="false"
android:indeterminateOnly="false"
/>
<LinearLayout <LinearLayout
android:id="@+id/fdProgressBlock"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"
android:orientation="horizontal"
> >
<ProgressBar
android:id="@+id/fdProgressBar"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:progressDrawable="@android:drawable/progress_horizontal"
android:indeterminate="false"
android:indeterminateOnly="false"
/>
<Button <Button
android:id="@+id/fdDownloadBtn" android:id="@+id/fdCancelBtn"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_marginLeft="12dp"
android:text="@string/filedetails_download" /> android:text="@string/common_cancel" />
<Button
android:id="@+id/fdOpenBtn"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/filedetails_open" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:layout_marginTop="12dp"
>
<Button
android:id="@+id/fdRenameBtn"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/common_rename" />
<Button
android:id="@+id/fdRemoveBtn"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/common_remove" />
</LinearLayout> </LinearLayout>

5
res/layout/file_display_action_list_element.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/layout/file_download_fragment.xml
View file

@ -4,9 +4,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 3 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

7
res/layout/file_preview.xml
View file

@ -5,9 +5,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
@ -43,7 +42,7 @@
android:layout_margin="16dp" android:layout_margin="16dp"
android:layout_gravity="center" android:layout_gravity="center"
android:contentDescription="@string/preview_image_description" android:contentDescription="@string/preview_image_description"
android:src="@drawable/owncloud_logo" /> android:src="@drawable/logo" />
<VideoView <VideoView
android:id="@+id/video_preview" android:id="@+id/video_preview"

5
res/layout/files.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/layout/fragment_changelog.xml
View file

@ -5,9 +5,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/layout/generic_explanation.xml
View file

@ -5,9 +5,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/layout/landing_page_fragment.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/layout/landing_page_item.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/layout/list_fragment.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/layout/list_item.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

19
res/layout/log_item.xml Normal file
View file

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal" >
<TextView android:id="@+id/log_item_single"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="center_vertical"
android:layout_alignParentTop="true"
android:layout_alignParentBottom="true"
android:textStyle="bold"
android:textSize="22dp"
android:textColor="#000000"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp" />
</LinearLayout>

34
res/layout/log_send_file.xml Normal file
View file

@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="8dp"
android:paddingRight="8dp">
<ListView android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<TextView android:id="@android:id/empty"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#FF0000"
android:text="No data"/>
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="bottom">
<Button android:id="@+id/deleteLogHistoryButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/prefs_log_delete_history_button"/>
</LinearLayout>
</LinearLayout>

5
res/layout/main.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/layout/media_control.xml
View file

@ -5,9 +5,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/layout/no_account_available.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/layout/pick_account_layout.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/layout/pincodelock.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/layout/popup.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/layout/preview_image_activity.xml
View file

@ -5,9 +5,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/layout/preview_image_fragment.xml
View file

@ -5,9 +5,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/layout/progressbar_layout.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/layout/selected_account_element.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

7
res/layout/ssl_validator_layout.xml
View file

@ -5,10 +5,9 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

5
res/layout/upload_files_layout.xml
View file

@ -5,9 +5,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/layout/uploader_layout.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/layout/uploader_list_item_layout.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/menu/account_picker.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/menu/account_picker_long_click.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

10
res/menu/file_actions_menu.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
@ -21,11 +20,12 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"> <menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/action_open_file_with" android:title="@string/filedetails_open" android:icon="@android:drawable/ic_menu_edit" android:orderInCategory="1" /> <item android:id="@+id/action_open_file_with" android:title="@string/filedetails_open" android:icon="@android:drawable/ic_menu_edit" android:orderInCategory="1" />
<item android:id="@+id/action_download_file" android:title="@string/filedetails_download" android:orderInCategory="1" /> <item android:id="@+id/action_download_file" android:title="@string/filedetails_download" android:icon="@drawable/ic_action_download" android:orderInCategory="1" />
<item android:id="@+id/action_sync_file" android:title="@string/filedetails_sync_file" android:icon="@drawable/ic_action_refresh" android:orderInCategory="1" />
<item android:id="@+id/action_cancel_download" android:title="@string/common_cancel_download" android:icon="@android:drawable/ic_menu_close_clear_cancel" android:orderInCategory="1" /> <item android:id="@+id/action_cancel_download" android:title="@string/common_cancel_download" android:icon="@android:drawable/ic_menu_close_clear_cancel" android:orderInCategory="1" />
<item android:id="@+id/action_cancel_upload" android:title="@string/common_cancel_upload" android:icon="@android:drawable/ic_menu_close_clear_cancel" android:orderInCategory="1" /> <item android:id="@+id/action_cancel_upload" android:title="@string/common_cancel_upload" android:icon="@android:drawable/ic_menu_close_clear_cancel" android:orderInCategory="1" />
<item android:id="@+id/action_rename_file" android:title="@string/common_rename" android:icon="@android:drawable/ic_menu_set_as" android:orderInCategory="1" /> <item android:id="@+id/action_rename_file" android:title="@string/common_rename" android:icon="@android:drawable/ic_menu_set_as" android:orderInCategory="1" />
<item android:id="@+id/action_remove_file" android:title="@string/common_remove" android:icon="@android:drawable/ic_menu_delete" android:orderInCategory="1" /> <item android:id="@+id/action_remove_file" android:title="@string/common_remove" android:icon="@android:drawable/ic_menu_delete" android:orderInCategory="1" />
<item android:id="@+id/action_see_details" android:title="@string/actionbar_see_details" android:icon="@android:drawable/ic_menu_view" android:orderInCategory="1" /> <item android:id="@+id/action_see_details" android:title="@string/actionbar_see_details" android:icon="@android:drawable/ic_menu_info_details" android:orderInCategory="1" />
</menu> </menu>

6
res/menu/main_menu.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
@ -24,7 +23,6 @@
<item android:id="@+id/action_create_dir" android:title="@string/actionbar_mkdir" android:icon="@drawable/ic_action_create_dir" android:orderInCategory="2" /> <item android:id="@+id/action_create_dir" android:title="@string/actionbar_mkdir" android:icon="@drawable/ic_action_create_dir" android:orderInCategory="2" />
<item android:id="@+id/action_upload" android:title="@string/actionbar_upload" android:icon="@drawable/ic_action_upload" android:orderInCategory="2" /> <item android:id="@+id/action_upload" android:title="@string/actionbar_upload" android:icon="@drawable/ic_action_upload" android:orderInCategory="2" />
<item android:id="@+id/action_settings" android:title="@string/actionbar_settings" android:icon="@android:drawable/ic_menu_preferences" android:orderInCategory="2" /> <item android:id="@+id/action_settings" android:title="@string/actionbar_settings" android:icon="@android:drawable/ic_menu_preferences" android:orderInCategory="2" />
<item android:id="@+id/action_about_app" android:title="@string/about_title" android:icon="@android:drawable/ic_menu_info_details" android:orderInCategory="2" />
<!-- <item android:id="@+id/search" android:title="@string/actionbar_search" android:icon="@drawable/ic_action_search"></item>--> <!-- <item android:id="@+id/search" android:title="@string/actionbar_search" android:icon="@drawable/ic_action_search"></item>-->
</menu> </menu>

5
res/menu/session_context_menu.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/raw-de/changelog.html
View file

@ -5,9 +5,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/raw-es/changelog.html
View file

@ -5,9 +5,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/raw/changelog.html
View file

@ -5,9 +5,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/values/bools.xml
View file

@ -5,9 +5,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/values/colors.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

23
res/values/oauth2_configuration.xml Normal file
View file

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Flag to configure OAuth availability in the app.
3 valid values now: on, off, optional
-->
<string name="oauth2_mode">off</string>
<!-- constants that must be respected by the authorization server; if changed, the app must be rebuild -->
<string name="oauth2_redirect_scheme">owncloud</string>
<string name="oauth2_redirect_uri">owncloud://callback</string>
<!-- values that should be provided by ownCloud server -->
<string name="oauth2_url_endpoint_auth">http://oauth2.authorization.server.org/paht/to/endpoint/for/authorization</string>
<string name="oauth2_url_endpoint_access">http://oauth2.authorization.server.org/paht/to/endporint/for/access/token</string>
<string name="oauth2_scope">owncloud</string>
<string name="oauth2_grant_type">authorization_code</string> <!-- the only one supported right now -->
<string name="oauth2_response_type">code</string> <!-- depends on oauth2_grant_type -->
<!-- values that should be pre-agreed between app and authorization server, but can be loaded without rebuilding the app -->
<string name="oauth2_client_id">com.owncloud.android</string> <!-- preferable that client decides this -->
<string name="oauth2_client_secret"></string> <!-- preferable that client decides this -->
</resources>

36
res/values/strings.xml
View file

@ -14,7 +14,8 @@
<string name="main_settings">Settings</string> <string name="main_settings">Settings</string>
<string name="main_tit_accsetup">Setup Account</string> <string name="main_tit_accsetup">Setup Account</string>
<string name="main_wrn_accsetup">There is no account set up on your device. In order to use this App, you need to create one.</string> <string name="main_wrn_accsetup">There is no account set up on your device. In order to use this App, you need to create one.</string>
<string name="about_message">%1$s Android App\n\nversion: %2$s</string> <string name="about_android">%1$s Android App</string>
<string name="about_version">version %1$s</string>
<string name="actionbar_sync">Refresh</string> <string name="actionbar_sync">Refresh</string>
<string name="actionbar_upload">Upload</string> <string name="actionbar_upload">Upload</string>
<string name="actionbar_upload_from_apps">Content from other apps</string> <string name="actionbar_upload_from_apps">Content from other apps</string>
@ -40,7 +41,13 @@
<string name="prefs_pincode_summary">Protect your client</string> <string name="prefs_pincode_summary">Protect your client</string>
<string name="prefs_instant_upload">Enable instant uploads</string> <string name="prefs_instant_upload">Enable instant uploads</string>
<string name="prefs_instant_upload_summary">Instantly upload photos taken by camera</string> <string name="prefs_instant_upload_summary">Instantly upload photos taken by camera</string>
<string name="auth_host_url">URL</string> <string name="prefs_log_title">Enable Logging</string>
<string name="prefs_log_summary">This is used to log problems</string>
<string name="prefs_log_title_history">Logging History</string>
<string name="prefs_log_summary_history">This shows the recorded logs</string>
<string name="prefs_log_delete_history_button">Delete History</string>
<string name="auth_host_url">Server address</string>
<string name="auth_username">Username</string> <string name="auth_username">Username</string>
<string name="auth_password">Password</string> <string name="auth_password">Password</string>
<string name="auth_register">I am new to %1$s</string> <string name="auth_register">I am new to %1$s</string>
@ -111,8 +118,9 @@
<string name="sync_string_contacts">Contacts</string> <string name="sync_string_contacts">Contacts</string>
<string name="sync_fail_ticker">Synchronization failed</string> <string name="sync_fail_ticker">Synchronization failed</string>
<string name="sync_fail_content">Synchronization of %1$s could not be completed</string> <string name="sync_fail_content">Synchronization of %1$s could not be completed</string>
<string name="sync_conflicts_in_favourites_ticker">Conflicts found</string> <string name="sync_fail_content_unauthorized">Invalid credentials for %1$s</string>
<string name="sync_conflicts_in_favourites_content">%1$d kept-in-sync files could not be sync\'ed</string> <string name="sync_conflicts_in_favourites_ticker">Conflicts found</string>
<string name="sync_conflicts_in_favourites_content">%1$d kept-in-sync files could not be sync\'ed</string>
<string name="sync_fail_in_favourites_ticker">Kept-in-sync files failed</string> <string name="sync_fail_in_favourites_ticker">Kept-in-sync files failed</string>
<string name="sync_fail_in_favourites_content">Contents of %1$d files could not be sync\'ed (%2$d conflicts)</string> <string name="sync_fail_in_favourites_content">Contents of %1$d files could not be sync\'ed (%2$d conflicts)</string>
<string name="sync_foreign_files_forgotten_ticker">Some local files were forgotten</string> <string name="sync_foreign_files_forgotten_ticker">Some local files were forgotten</string>
@ -169,14 +177,14 @@
<item>60</item> <item>60</item>
</string-array> </string-array>
<string name="auth_trying_to_login">Trying to login…</string> <string name="auth_trying_to_login">Trying to login...</string>
<string name="auth_no_net_conn_title">No network connection</string> <string name="auth_no_net_conn_title">No network connection</string>
<string name="auth_no_net_conn_message">No network connection has been detected, check your Internet connection and try again.</string> <string name="auth_no_net_conn_message">No network connection has been detected, check your Internet connection and try again.</string>
<string name="auth_connect_anyway">Connect anyway</string> <string name="auth_connect_anyway">Connect anyway</string>
<string name="auth_nossl_plain_ok_title">Secure connection unavailable.</string> <string name="auth_nossl_plain_ok_title">Secure connection unavailable.</string>
<string name="auth_nossl_plain_ok_message">The Application cannot establish a secure connection to the server. A non secure connection is available. You may continue or cancel.</string> <string name="auth_nossl_plain_ok_message">The Application cannot establish a secure connection to the server. A non secure connection is available. You may continue or cancel.</string>
<string name="auth_connection_established">Connection established</string> <string name="auth_connection_established">Connection established</string>
<string name="auth_testing_connection">Testing connection…</string> <string name="auth_testing_connection">Testing connection...</string>
<string name="auth_not_configured_title">Malformed server configuration</string> <string name="auth_not_configured_title">Malformed server configuration</string>
<string name="auth_not_configured_message">It seems that your server instance is not correctly configured. Contact your administrator for more details.</string> <string name="auth_not_configured_message">It seems that your server instance is not correctly configured. Contact your administrator for more details.</string>
<string name="auth_unknown_error_title">Unknown error occurred!</string> <string name="auth_unknown_error_title">Unknown error occurred!</string>
@ -192,10 +200,15 @@
<string name="auth_bad_oc_version_title">Unrecognized server version</string> <string name="auth_bad_oc_version_title">Unrecognized server version</string>
<string name="auth_wrong_connection_title">Couldn\'t establish connection</string> <string name="auth_wrong_connection_title">Couldn\'t establish connection</string>
<string name="auth_secure_connection">Secure connection established</string> <string name="auth_secure_connection">Secure connection established</string>
<string name="auth_login_details">Login details</string> <string name="auth_unauthorized">Invalid credentials</string>
<string name="auth_unauthorized">Invalid login / password</string> <string name="auth_oauth_error">Unsuccessful authorization</string>
<string name="auth_oauth_error_access_denied">Access denied by authorization server</string>
<string name="auth_not_found">Wrong path given</string> <string name="auth_not_found">Wrong path given</string>
<string name="auth_internal">Internal server error, code %1$d</string> <string name="auth_internal">Internal server error, code %1$d</string>
<string name="auth_wtf_reenter_URL">Unexpected state; please, enter the server URL again</string>
<string name="auth_expired_oauth_token_toast">Your authorization expired.\nPlease, authorize again</string>
<string name="auth_expired_basic_auth_toast">Your saved credentials are invalid.\nPlease, enter the current credentials</string>
<string name="crashlog_message">Application terminated unexpectedly. Would you like to submit a crash report?</string> <string name="crashlog_message">Application terminated unexpectedly. Would you like to submit a crash report?</string>
<string name="crashlog_send_report">Send report</string> <string name="crashlog_send_report">Send report</string>
<string name="crashlog_dont_send_report">Don\'t send report</string> <string name="crashlog_dont_send_report">Don\'t send report</string>
@ -222,6 +235,13 @@
<string name="wait_a_moment">Wait a moment</string> <string name="wait_a_moment">Wait a moment</string>
<string name="filedisplay_unexpected_bad_get_content">"Unexpected problem ; please select the file from a different app"</string> <string name="filedisplay_unexpected_bad_get_content">"Unexpected problem ; please select the file from a different app"</string>
<string name="filedisplay_no_file_selected">No file was selected</string> <string name="filedisplay_no_file_selected">No file was selected</string>
<string name="oauth_host_url">oAuth2 URL</string>
<string name="oauth_check_onoff">Login with oAuth2.</string>
<string name="oauth_login_connection">Connecting to oAuth2 server…</string>
<string name="oauth_code_validation_message">Please, open a web browser and go to:\n%1$s.\nValidate this code there:\n%2$s</string>
<string name="oauth_connection_url_unavailable">Connection to this URL not available.</string>
<string name="ssl_validator_title">Warning</string> <string name="ssl_validator_title">Warning</string>
<string name="ssl_validator_header">The identity of the site could not be verified</string> <string name="ssl_validator_header">The identity of the site could not be verified</string>
<string name="ssl_validator_reason_cert_not_trusted">- The server certificate is not trusted</string> <string name="ssl_validator_reason_cert_not_trusted">- The server certificate is not trusted</string>

9
res/values/styles.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
@ -102,6 +101,10 @@
<item name="android:singleLine">true</item> <item name="android:singleLine">true</item>
</style> </style>
<style name="OAuthDialog" parent="@android:style/Theme.Dialog">
<item name="android:windowNoTitle">false</item>
</style>
<color name="setup_text_hint">#777777</color> <color name="setup_text_hint">#777777</color>
<color name="setup_text_typed">#000000</color> <color name="setup_text_typed">#000000</color>

5
res/values/urls.xml
View file

@ -5,9 +5,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/xml/authenticator.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

20
res/xml/preferences.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
@ -32,8 +31,19 @@
<CheckBoxPreference android:key="instant_uploading" <CheckBoxPreference android:key="instant_uploading"
android:title="@string/prefs_instant_upload" android:title="@string/prefs_instant_upload"
android:summary="@string/prefs_instant_upload_summary"/> android:summary="@string/prefs_instant_upload_summary"/>
<CheckBoxPreference android:dependency="instant_uploading" android:disableDependentsState="true" android:title="@string/instant_upload_on_wifi" android:key="instant_upload_on_wifi"/> <CheckBoxPreference android:dependency="instant_uploading"
android:disableDependentsState="true"
android:title="@string/instant_upload_on_wifi"
android:key="instant_upload_on_wifi"/>
<CheckBoxPreference android:key="log_to_file"
android:title="@string/prefs_log_title"
android:summary="@string/prefs_log_summary"/>
<Preference android:key="log_history"
android:title="@string/prefs_log_title_history"
android:summary="@string/prefs_log_summary_history"/>
<Preference android:id="@+id/about_app"
android:title="@string/about_title"
android:key="about_app" />
</PreferenceCategory> </PreferenceCategory>

5
res/xml/preferences_new_session.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

5
res/xml/syncadapter_files.xml
View file

@ -6,9 +6,8 @@
Copyright (C) 2012-2013 ownCloud Inc. Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License version 2,
the Free Software Foundation, either version 2 of the License, or as published by the Free Software Foundation.
(at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of

16
src/com/owncloud/android/AccountUtils.java
View file

@ -3,9 +3,8 @@
* Copyright (C) 2012-2013 ownCloud Inc. * Copyright (C) 2012-2013 ownCloud Inc.
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2,
* the Free Software Foundation, either version 2 of the License, or * as published by the Free Software Foundation.
* (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
@ -19,7 +18,7 @@
package com.owncloud.android; package com.owncloud.android;
import com.owncloud.android.authenticator.AccountAuthenticator; import com.owncloud.android.authentication.AccountAuthenticator;
import com.owncloud.android.utils.OwnCloudVersion; import com.owncloud.android.utils.OwnCloudVersion;
import android.accounts.Account; import android.accounts.Account;
@ -32,6 +31,7 @@ public class AccountUtils {
public static final String WEBDAV_PATH_1_2 = "/webdav/owncloud.php"; public static final String WEBDAV_PATH_1_2 = "/webdav/owncloud.php";
public static final String WEBDAV_PATH_2_0 = "/files/webdav.php"; public static final String WEBDAV_PATH_2_0 = "/files/webdav.php";
public static final String WEBDAV_PATH_4_0 = "/remote.php/webdav"; public static final String WEBDAV_PATH_4_0 = "/remote.php/webdav";
private static final String ODAV_PATH = "/remote.php/odav";
public static final String CARDDAV_PATH_2_0 = "/apps/contacts/carddav.php"; public static final String CARDDAV_PATH_2_0 = "/apps/contacts/carddav.php";
public static final String CARDDAV_PATH_4_0 = "/remote/carddav.php"; public static final String CARDDAV_PATH_4_0 = "/remote/carddav.php";
public static final String STATUS_PATH = "/status.php"; public static final String STATUS_PATH = "/status.php";
@ -113,8 +113,11 @@ public class AccountUtils {
* @param version version of owncloud * @param version version of owncloud
* @return webdav path for given OC version, null if OC version unknown * @return webdav path for given OC version, null if OC version unknown
*/ */
public static String getWebdavPath(OwnCloudVersion version) { public static String getWebdavPath(OwnCloudVersion version, boolean supportsOAuth) {
if (version != null) { if (version != null) {
if (supportsOAuth) {
return ODAV_PATH;
}
if (version.compareTo(OwnCloudVersion.owncloud_v4) >= 0) if (version.compareTo(OwnCloudVersion.owncloud_v4) >= 0)
return WEBDAV_PATH_4_0; return WEBDAV_PATH_4_0;
if (version.compareTo(OwnCloudVersion.owncloud_v3) >= 0 if (version.compareTo(OwnCloudVersion.owncloud_v3) >= 0
@ -137,8 +140,9 @@ public class AccountUtils {
AccountManager ama = AccountManager.get(context); AccountManager ama = AccountManager.get(context);
String baseurl = ama.getUserData(account, AccountAuthenticator.KEY_OC_BASE_URL); String baseurl = ama.getUserData(account, AccountAuthenticator.KEY_OC_BASE_URL);
String strver = ama.getUserData(account, AccountAuthenticator.KEY_OC_VERSION); String strver = ama.getUserData(account, AccountAuthenticator.KEY_OC_VERSION);
boolean supportsOAuth = (ama.getUserData(account, AccountAuthenticator.KEY_SUPPORTS_OAUTH2) != null);
OwnCloudVersion ver = new OwnCloudVersion(strver); OwnCloudVersion ver = new OwnCloudVersion(strver);
String webdavpath = getWebdavPath(ver); String webdavpath = getWebdavPath(ver, supportsOAuth);
if (webdavpath == null) return null; if (webdavpath == null) return null;
return baseurl + webdavpath; return baseurl + webdavpath;

7
src/com/owncloud/android/DisplayUtils.java
View file

@ -3,9 +3,8 @@
* Copyright (C) 2012-2013 ownCloud Inc. * Copyright (C) 2012-2013 ownCloud Inc.
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2,
* the Free Software Foundation, either version 2 of the License, or * as published by the Free Software Foundation.
* (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
@ -25,8 +24,6 @@ import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import android.util.Log;
/** /**
* A helper class for some string operations. * A helper class for some string operations.
* *

Some files were not shown because too many files have changed in this diff Show more