From 4832b8abda00fb6dd07c137f6c3bbba92ef18961 Mon Sep 17 00:00:00 2001 From: Fiouz Date: Tue, 7 Jun 2011 20:03:41 +0200 Subject: [PATCH 01/14] Eclipse settings: UTF-8 encoding --- .settings/org.eclipse.core.resources.prefs | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .settings/org.eclipse.core.resources.prefs diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..7d91642f3 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Sat Apr 30 16:23:39 CEST 2011 +eclipse.preferences.version=1 +encoding/=UTF-8 From f38e70adf638b319af6754a6f8f7849c8d283070 Mon Sep 17 00:00:00 2001 From: Fiouz Date: Tue, 7 Jun 2011 20:14:18 +0200 Subject: [PATCH 02/14] Eclipse code style settings Includes: - compiler warnings (more warnings than the default Java settings) - variable prefixes - formatter rules Compiler warnings is stricter regarding bad practices (even for things like auto-boxing). Chances are that those formatter settings match almost no existing files as I just adjusted my settings to match Android coding standard. --- .settings/org.eclipse.jdt.core.prefs | 358 +++++++++++++++++++++++++++ 1 file changed, 358 insertions(+) create mode 100644 .settings/org.eclipse.jdt.core.prefs diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..04d056364 --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,358 @@ +#Tue Jun 07 20:07:23 CEST 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.codeComplete.argumentPrefixes= +org.eclipse.jdt.core.codeComplete.argumentSuffixes= +org.eclipse.jdt.core.codeComplete.fieldPrefixes=m +org.eclipse.jdt.core.codeComplete.fieldSuffixes= +org.eclipse.jdt.core.codeComplete.localPrefixes= +org.eclipse.jdt.core.codeComplete.localSuffixes= +org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=s +org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= +org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= +org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= +org.eclipse.jdt.core.compiler.doc.comment.support=enabled +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.autoboxing=warning +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning +org.eclipse.jdt.core.compiler.problem.deadCode=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=warning +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning +org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning +org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private +org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning +org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public +org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag +org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning +org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning +org.eclipse.jdt.core.compiler.problem.unusedParameter=warning +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=52 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=18 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=18 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=1 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.comment.line_length=100 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=true +org.eclipse.jdt.core.formatter.join_wrapped_lines=true +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=true +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=100 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_on_off_tags=false +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true From a333d7703be217b15e4ddf7c17f091f2087dbd9c Mon Sep 17 00:00:00 2001 From: Fiouz Date: Tue, 7 Jun 2011 20:18:11 +0200 Subject: [PATCH 03/14] Eclipse cleanup + import settings Import ordering set to match Android code style (android, com, junit, net, org, java, javax), but I doubt any file in the project obeys to this... http://source.android.com/source/code-style.html#order-import-statements --- .settings/org.eclipse.jdt.ui.prefs | 65 ++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 .settings/org.eclipse.jdt.ui.prefs diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 000000000..5cfbf32fa --- /dev/null +++ b/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,65 @@ +#Tue Jun 07 19:46:27 CEST 2011 +cleanup.add_default_serial_version_id=true +cleanup.add_generated_serial_version_id=false +cleanup.add_missing_annotations=true +cleanup.add_missing_deprecated_annotations=true +cleanup.add_missing_methods=false +cleanup.add_missing_nls_tags=false +cleanup.add_missing_override_annotations=true +cleanup.add_missing_override_annotations_interface_methods=true +cleanup.add_serial_version_id=false +cleanup.always_use_blocks=true +cleanup.always_use_parentheses_in_expressions=true +cleanup.always_use_this_for_non_static_field_access=false +cleanup.always_use_this_for_non_static_method_access=false +cleanup.convert_to_enhanced_for_loop=true +cleanup.correct_indentation=false +cleanup.format_source_code=false +cleanup.format_source_code_changes_only=false +cleanup.make_local_variable_final=true +cleanup.make_parameters_final=true +cleanup.make_private_fields_final=false +cleanup.make_type_abstract_if_missing_method=false +cleanup.make_variable_declarations_final=true +cleanup.never_use_blocks=false +cleanup.never_use_parentheses_in_expressions=false +cleanup.organize_imports=true +cleanup.qualify_static_field_accesses_with_declaring_class=false +cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +cleanup.qualify_static_member_accesses_with_declaring_class=true +cleanup.qualify_static_method_accesses_with_declaring_class=true +cleanup.remove_private_constructors=true +cleanup.remove_trailing_whitespaces=true +cleanup.remove_trailing_whitespaces_all=true +cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_casts=true +cleanup.remove_unnecessary_nls_tags=true +cleanup.remove_unused_imports=true +cleanup.remove_unused_local_variables=true +cleanup.remove_unused_private_fields=true +cleanup.remove_unused_private_members=false +cleanup.remove_unused_private_methods=true +cleanup.remove_unused_private_types=true +cleanup.sort_members=false +cleanup.sort_members_all=false +cleanup.use_blocks=true +cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_parentheses_in_expressions=false +cleanup.use_this_for_non_static_field_access=true +cleanup.use_this_for_non_static_field_access_only_if_necessary=true +cleanup.use_this_for_non_static_method_access=true +cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup_profile=_K-9 Mail +cleanup_settings_version=2 +eclipse.preferences.version=1 +formatter_profile=_K-9 Mail +formatter_settings_version=11 +org.eclipse.jdt.ui.exception.name=e +org.eclipse.jdt.ui.gettersetter.use.is=true +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=android;com;junit;net;org;java;javax; +org.eclipse.jdt.ui.keywordthis=false +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.overrideannotation=true +org.eclipse.jdt.ui.staticondemandthreshold=99 From 7aae044705ae5cf4674f7105ed32a2e563ca3ca2 Mon Sep 17 00:00:00 2001 From: Fiouz Date: Wed, 8 Jun 2011 08:41:47 +0200 Subject: [PATCH 04/14] Try not to always return to MessageList Switched MessageList from singleTask to singleInstance launchMode http://stackoverflow.com/questions/2417468/android-bug-in-launchmode-singletask-activity-stack-not-preserved This makes launched activities to initiate a new task, they have to handle the BACK key if user has the option enabled. On the other hand, K-9 still keeps a single instance of MessageList (as opposed to using the default launch mode which would allow multiple instances - potential increased memory usage). See Issue 2467 --- AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index faf568c95..adcf82dca 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -193,7 +193,7 @@ From 5ee63c47fe2a8abcd27dd65099bbb03573311f0a Mon Sep 17 00:00:00 2001 From: Fiouz Date: Wed, 8 Jun 2011 08:42:40 +0200 Subject: [PATCH 05/14] Implemented BACK handling for MessageView Implemented because MessageList is now in singleInstance launchMode so the default behavior may not match user options. --- src/com/fsck/k9/activity/MessageView.java | 47 +++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java index b05ad495c..4da2df432 100644 --- a/src/com/fsck/k9/activity/MessageView.java +++ b/src/com/fsck/k9/activity/MessageView.java @@ -27,6 +27,8 @@ import com.fsck.k9.view.SingleMessageView; import com.fsck.k9.view.AttachmentView.AttachmentFileDownloadCallback; import java.io.File; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; import java.util.*; public class MessageView extends K9Activity implements OnClickListener { @@ -39,6 +41,27 @@ public class MessageView extends K9Activity implements OnClickListener { private static final int ACTIVITY_CHOOSE_FOLDER_COPY = 2; private static final int ACTIVITY_CHOOSE_DIRECTORY = 3; + /** + * Whether parent class have the onBackPressed() method (with no argument) + */ + private static final boolean HAS_SUPER_ON_BACK_METHOD; + static { + boolean hasOnBackMethod; + try { + final Class superClass = MessageView.class.getSuperclass(); + final Method method = superClass.getMethod("onBackPressed", new Class[] {}); + hasOnBackMethod = (method.getModifiers() & Modifier.PUBLIC) == Modifier.PUBLIC; + } catch (final SecurityException e) { + if (K9.DEBUG) { + Log.v(K9.LOG_TAG, "Security exception while checking for 'onBackPressed' method", e); + } + hasOnBackMethod = false; + } catch (final NoSuchMethodException e) { + hasOnBackMethod = false; + } + HAS_SUPER_ON_BACK_METHOD = hasOnBackMethod; + } + private SingleMessageView mMessageView; private PgpData mPgpData; @@ -127,6 +150,15 @@ public class MessageView extends K9Activity implements OnClickListener { @Override public boolean onKeyDown(final int keyCode, final KeyEvent event) { + if ( + // XXX TODO - when we go to android 2.0, uncomment this + // android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.ECLAIR && + keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount() == 0) { + // Take care of calling this method on earlier versions of + // the platform where it doesn't exist. + onBackPressed(); + return true; + } switch (keyCode) { case KeyEvent.KEYCODE_VOLUME_UP: { if (K9.useVolumeKeysForNavigationEnabled()) { @@ -229,6 +261,21 @@ public class MessageView extends K9Activity implements OnClickListener { return super.onKeyUp(keyCode, event); } + @Override + public void onBackPressed() { + // This will be called either automatically for you on 2.0 + // or later, or by the code above on earlier versions of the + // platform. + if (K9.manageBack()) { + MessageList.actionHandleFolder(this, mAccount, mMessageReference.folderName); + finish(); + } else if (HAS_SUPER_ON_BACK_METHOD) { + super.onBackPressed(); + } else { + finish(); + } + } + class MessageViewHandler extends Handler { public void progress(final boolean progress) { From 632d7d83054868f504d4da803e20bb8e6204e285 Mon Sep 17 00:00:00 2001 From: Jan Berkel Date: Wed, 8 Jun 2011 12:58:37 +0200 Subject: [PATCH 06/14] Point app_revision_url to updated URL and remove duplicates --- res/values-ca/strings.xml | 2 -- res/values-cs/strings.xml | 2 -- res/values-de/strings.xml | 2 -- res/values-es/strings.xml | 2 -- res/values-fi/strings.xml | 2 -- res/values-fr/strings.xml | 2 -- res/values-gl/strings.xml | 2 -- res/values-it/strings.xml | 2 -- res/values-ja/strings.xml | 2 -- res/values-ko/strings.xml | 2 -- res/values-nl/strings.xml | 2 -- res/values-pl/strings.xml | 2 -- res/values-pt-rBR/strings.xml | 2 -- res/values-ru/strings.xml | 2 -- res/values-sv/strings.xml | 2 -- res/values-zh-rCN/strings.xml | 2 -- res/values/constants.xml | 5 +++++ res/values/strings.xml | 2 -- 18 files changed, 5 insertions(+), 34 deletions(-) create mode 100644 res/values/constants.xml diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 4c8e01188..8e82be108 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -6,9 +6,7 @@ Copyright 2008-%s The K-9 Dog Walkers. Porcions de Copyright 2006-%s Projecte de codi obert d\'Android. Llicenciat sota Llicència Apache, Versió 2.0. Autors: %s - http://code.google.com/p/k9mail/wiki/ReleaseNotes Informació de la revisió: %s - http://code.google.com/p/k9mail/ Fem servir les següents biblioteques de tercers: %s Icones Emoji: %s diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index feeb968e2..961add437 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -11,9 +11,7 @@ Autoři: %s - http://code.google.com/p/k9mail/wiki/ReleaseNotes Informace o revizi: %s - http://code.google.com/p/k9mail/ diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 16f6b4c40..814fd6ea8 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -6,9 +6,7 @@ Lizensiert unter der Apache License, Version 2.0. Autoren: %s - http://code.google.com/p/k9mail/wiki/ReleaseNotes Versionsinformationen: %s - http://code.google.com/p/k9mail/ Wir benutzen die folgenden externen Bibliotheken: %s Emoji Bilder: %s diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 267874dc2..7e09b360d 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -6,9 +6,7 @@ Copyright 2008-%s The K-9 Dog Walkers. Partes Copyright 2006-%s the Android Open Source Project. Liceciado bajo Licencia Apache, Versión 2.0. Autores: %s - http://code.google.com/p/k9mail/wiki/ReleaseNotes Información de la revisión %s - http://code.google.com/p/k9mail/ Estamos usando las siguientes librerías de terceros: %s Iconos de Emoji: %s diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 1417f417b..cb1ca8cfc 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -6,9 +6,7 @@ Tekijänoikeudet 2008-%s The K-9 Dog Walkers. Portions tekijänoikeudet -%s Androidin avoimen lähdekoodin hanke. Lisensoitu Apache-lisenssillä, versio 2.0. Tekijät: %s - http://code.google.com/p/k9mail/wiki/ReleaseNotes Versiotiedot: %s - http://code.google.com/p/k9mail/ Me käytämme seuraavia kolmannen osapuolen kirjastoja: %s Emoji-kuvakkeet: %s diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index bb489d307..42beab360 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -29,9 +29,7 @@ Google, Les K-9 Dog Walkers. Auteurs\u00A0: %s - http://code.google.com/p/k9mail/wiki/ReleaseNotes Information de révision\u00A0: %s - http://code.google.com/p/k9mail/ Tierces librairies utilisées\u00A0: %s Icônes Emoji\u00A0: %s diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index 111a5ab19..e42df085f 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -6,9 +6,7 @@ Copyright 2008-%s The K-9 Dog Walkers. Porcións Copyright 2006-%s the Android Open Source Project. Licienciado baixo a Licencia Apache, Version 2.0. Autores: %s - http://code.google.com/p/k9mail/wiki/ReleaseNotes Información da revisión: %s - http://code.google.com/p/k9mail/ Usamos as seguintes librerías de terceiros: %s Iconos Emoji: %s diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index f6ed42781..07a148979 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -6,9 +6,7 @@ Copyright 2008-%s The K-9 Dog Walkers. Portions Copyright 2006-%s the Android Open Source Project. Rilasciato sotto Licenza Apache, Versione 2.0. Autori: %s - http://code.google.com/p/k9mail/wiki/ReleaseNotes Informazioni: %s - http://code.google.com/p/k9mail/ Ci avvaliamo delle seguenti librerie di terze parti: %s Icone emoji: %s diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index b660fcc9b..68cbe1140 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -6,9 +6,7 @@ Copyright 2008-%s The K-9 Dog Walkers. Portions Copyright 2006-%s the Android Open Source Project. Licensed under the Apache License, Version 2.0. Authors: %s - http://code.google.com/p/k9mail/wiki/ReleaseNotes Revision Information: %s - http://code.google.com/p/k9mail/ 以下のライブラリを利用しています: %s 絵文字アイコン: %s diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index fd4456bcf..029d76e80 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -3,9 +3,7 @@ K-9 메일 K-9 메일 베타 Authors: %s - http://code.google.com/p/k9mail/wiki/ReleaseNotes 수정 정보: %s - http://code.google.com/p/k9mail/ K-9 메일은 아래의 서드파티 라이브러리를 이용합니다 : %s Emoji 아이콘: %s diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 2a0b8c70b..f78e63041 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -6,9 +6,7 @@ Copyright 2008-%s The K-9 Dog Walkers. Portions Copyright 2006-%s the Android Open Source Project. Licensed under the Apache License, Version 2.0. Auteurs: %s - http://code.google.com/p/k9mail/wiki/ReleaseNotes Revisie Informatie: %s - http://code.google.com/p/k9mail/ De volgende externe bibliotheken worden gebruikt: %s Emoji icons: %s diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 6cd8251f9..5bdaf2a61 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -19,9 +19,7 @@ Autorzy: %s - http://code.google.com/p/k9mail/wiki/ReleaseNotes Historia zmian: %s - http://code.google.com/p/k9mail/ diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index f14f57657..45cafdf37 100644 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -6,9 +6,7 @@ Autores: %s - http://code.google.com/p/k9mail/wiki/ReleaseNotes Revisões e informações: %s - http://code.google.com/p/k9mail/ diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index ced8e0123..f9b767aa3 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -6,9 +6,7 @@ Авторы: %s - http://code.google.com/p/k9mail/wiki/ReleaseNotes Информация об изменениях: %s - http://code.google.com/p/k9mail/ diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index afbcbd5d4..f6be5f699 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -6,9 +6,7 @@ Copyright 2008-%s The K-9 Dog Walkers. Vissa delar Copyright 2006-%s the Android Open Source Project. Licensierat under Apache-licensen, version 2.0. Upphovsmän: %s - http://code.google.com/p/k9mail/wiki/ReleaseNotes Revisionsinformation: %s - http://code.google.com/p/k9mail/ Vi använder följande tredjepartsbibliotek: %s Emoji-ikoner: %s diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 645aa8ff7..07d0ab42d 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -6,9 +6,7 @@ 作者: %s - http://code.google.com/p/k9mail/wiki/ReleaseNotes 更新日志: %s - http://code.google.com/p/k9mail/ diff --git a/res/values/constants.xml b/res/values/constants.xml new file mode 100644 index 000000000..77d07dc2b --- /dev/null +++ b/res/values/constants.xml @@ -0,0 +1,5 @@ + + + https://github.com/k9mail/k-9/wiki/ReleaseNotes + http://code.google.com/p/k9mail/ + diff --git a/res/values/strings.xml b/res/values/strings.xml index 7c87d66bb..95c2d4c35 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -6,9 +6,7 @@ Copyright 2008-%s The K-9 Dog Walkers. Portions Copyright 2006-%s the Android Open Source Project. Licensed under the Apache License, Version 2.0. Authors: %s - http://code.google.com/p/k9mail/wiki/ReleaseNotes Revision Information: %s - http://code.google.com/p/k9mail/ We\'re using the following third-party libraries: %s Emoji icons: %s From c416f02d523a9b891374b87631eb2297905758ea Mon Sep 17 00:00:00 2001 From: Fiouz Date: Wed, 8 Jun 2011 22:53:23 +0200 Subject: [PATCH 07/14] Improve BACK button handling for MessageView Remove memory leak from referencing MessageView context from the Intent that is created to go back to MessageList. MessageView is no longer hardcoded to go back to MessageList, it instead uses an Intent given at creation to get back to the originating Activity. Try our best to restore the MessageList in its previous state when "Manage BACK button" option is enabled: Since MessageList lives in its own task, we look for the previous active task and check whether its top activity matches it. If it does, we just finish MessageView and Android will automatically restore the previous task. If it doesn't, we launch the originating Intent (and MessageList state will be lost). If option is off, we get the regular Android behavior: got back to the previous screen, whenever it's the MessageList or another application if the user long-pressed HOME. The consequence of this is the need for a new permission in order to check the previous active task: android.permission.GET_TASKS --- AndroidManifest.xml | 4 ++ src/com/fsck/k9/activity/MessageList.java | 2 +- src/com/fsck/k9/activity/MessageView.java | 50 ++++++++++++++++++++--- 3 files changed, 50 insertions(+), 6 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index adcf82dca..42b93cc38 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -26,6 +26,10 @@ + + + + runningTasks = activityManager.getRunningTasks(2); + final RunningTaskInfo previousTask = runningTasks.get(1); + final String originatingActivity = mCreatorIntent.getComponent().getClassName(); + if (originatingActivity.equals(previousTask.topActivity.getClassName())) { + // we can safely just finish ourself since the most recent task matches our creator + // this enable us not to worry about restoring the state of our creator + } else { + // the previous task top activity doesn't match our creator (previous task is from + // another app and user used long-pressed-HOME to display MessageView) + // launching our creator + startActivity(mCreatorIntent); + } finish(); } else if (HAS_SUPER_ON_BACK_METHOD) { super.onBackPressed(); @@ -328,20 +350,35 @@ public class MessageView extends K9Activity implements OnClickListener { } - public static void actionView(Context context, MessageReference messRef, ArrayList messReferences) { - actionView(context, messRef, messReferences, null); + public static void actionView(Context context, MessageReference messRef, ArrayList messReferences, final Intent originatingIntent) { + actionView(context, messRef, messReferences, null, originatingIntent); } - public static void actionView(Context context, MessageReference messRef, ArrayList messReferences, Bundle extras) { + /** + * @param context + * @param messRef + * @param messReferences + * @param extras + * @param originatingIntent + * The intent that allow us to get back to the calling screen, for when the 'Manage + * BACK' option is enabled. Never {@code null}. + */ + public static void actionView(Context context, MessageReference messRef, ArrayList messReferences, Bundle extras, final Intent originatingIntent) { Intent i = new Intent(context, MessageView.class); i.putExtra(EXTRA_MESSAGE_REFERENCE, messRef); i.putParcelableArrayListExtra(EXTRA_MESSAGE_REFERENCES, messReferences); + i.putExtra(EXTRA_ORIGINATING_INTENT, originatingIntent); if (extras != null) { i.putExtras(extras); } context.startActivity(i); } + @Override + protected void onNewIntent(final Intent intent) { + mCreatorIntent = intent.getParcelableExtra(EXTRA_ORIGINATING_INTENT); + } + @Override public void onCreate(Bundle icicle) { super.onCreate(icicle, false); @@ -381,7 +418,10 @@ public class MessageView extends K9Activity implements OnClickListener { mMessageView.initialize(this); setTitle(""); - Intent intent = getIntent(); + final Intent intent = getIntent(); + + mCreatorIntent = getIntent().getParcelableExtra(EXTRA_ORIGINATING_INTENT); + Uri uri = intent.getData(); if (icicle != null) { mMessageReference = icicle.getParcelable(EXTRA_MESSAGE_REFERENCE); From 379a8dfa9ec462b7f9046d1b23af4363d0ab2652 Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Thu, 9 Jun 2011 21:54:22 -0400 Subject: [PATCH 08/14] It turns out that 79a96952f2b8c95c059afee3e564721a09ed98c1 has caused a lot of messages to be unreadable in K-9 3.8. (see mailing list threads) --- src/com/fsck/k9/activity/MessageCompose.java | 4 +--- src/com/fsck/k9/mail/store/LocalStore.java | 12 ++++-------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java index 17a5addf7..3d51fed74 100644 --- a/src/com/fsck/k9/activity/MessageCompose.java +++ b/src/com/fsck/k9/activity/MessageCompose.java @@ -1139,9 +1139,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc */ bp.addHeader(MimeHeader.HEADER_CONTENT_DISPOSITION, String.format( "attachment;\n filename=\"%s\";\n size=%d", - EncoderUtil.encodeIfNecessary(attachment.name, - EncoderUtil.Usage.WORD_ENTITY, 7), - attachment.size)); + attachment.name, attachment.size)); mp.addBodyPart(bp); } diff --git a/src/com/fsck/k9/mail/store/LocalStore.java b/src/com/fsck/k9/mail/store/LocalStore.java index fba282164..7a62bfffe 100644 --- a/src/com/fsck/k9/mail/store/LocalStore.java +++ b/src/com/fsck/k9/mail/store/LocalStore.java @@ -18,7 +18,6 @@ import java.util.regex.Pattern; import com.fsck.k9.helper.HtmlConverter; import org.apache.commons.io.IOUtils; -import org.apache.james.mime4j.codec.EncoderUtil; import android.app.Application; import android.content.ContentValues; @@ -1670,17 +1669,14 @@ public class LocalStore extends Store implements Serializable { MimeBodyPart bp = new LocalAttachmentBodyPart(body, id); bp.setHeader(MimeHeader.HEADER_CONTENT_TRANSFER_ENCODING, "base64"); if (name != null) { - String encoded_name = EncoderUtil.encodeIfNecessary(name, - EncoderUtil.Usage.WORD_ENTITY, 7); - bp.setHeader(MimeHeader.HEADER_CONTENT_TYPE, String.format("%s;\n name=\"%s\"", type, - encoded_name)); + name)); bp.setHeader(MimeHeader.HEADER_CONTENT_DISPOSITION, String.format("%s;\n filename=\"%s\";\n size=%d", contentDisposition, - encoded_name, // TODO: Should use encoded word defined in RFC 2231. + name, // TODO: Should use encoded word defined in RFC 2231. size)); } @@ -2383,7 +2379,7 @@ public class LocalStore extends Store implements Serializable { Utility.combine(attachment.getHeader( MimeHeader.HEADER_ANDROID_ATTACHMENT_STORE_DATA), ','); - String name = MimeUtility.unfoldAndDecode(MimeUtility.getHeaderParameter(attachment.getContentType(), "name")); + String name = MimeUtility.getHeaderParameter(attachment.getContentType(), "name"); String contentId = MimeUtility.getHeaderParameter(attachment.getContentId(), null); String contentDisposition = MimeUtility.unfoldAndDecode(attachment.getDisposition()); @@ -2398,7 +2394,7 @@ public class LocalStore extends Store implements Serializable { } if (name == null && contentDisposition != null) { - name = MimeUtility.unfoldAndDecode(MimeUtility.getHeaderParameter(contentDisposition, "filename")); + name = MimeUtility.getHeaderParameter(contentDisposition, "filename"); } if (attachmentId == -1) { ContentValues cv = new ContentValues(); From 27e996b5f7da60955eed030ac3e66a2d8f6a31c8 Mon Sep 17 00:00:00 2001 From: Fiouz Date: Fri, 10 Jun 2011 20:20:33 +0200 Subject: [PATCH 09/14] Don't force Eclipse settings on users Ant target to setup the Eclipse .settings directory with predefined settings --- .gitignore | 1 + build.xml | 9 ++++++++- .../eclipse-settings}/org.eclipse.core.resources.prefs | 0 .../eclipse-settings}/org.eclipse.jdt.core.prefs | 0 .../eclipse-settings}/org.eclipse.jdt.ui.prefs | 0 5 files changed, 9 insertions(+), 1 deletion(-) rename {.settings => tools/eclipse-settings}/org.eclipse.core.resources.prefs (100%) rename {.settings => tools/eclipse-settings}/org.eclipse.jdt.core.prefs (100%) rename {.settings => tools/eclipse-settings}/org.eclipse.jdt.ui.prefs (100%) diff --git a/.gitignore b/.gitignore index c0bb8dd49..77dd00405 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ local.properties bin gen +.settings diff --git a/build.xml b/build.xml index 327b46f4d..33344aaf4 100644 --- a/build.xml +++ b/build.xml @@ -102,7 +102,7 @@ Creating library ${rclib} for remote control applications - + @@ -159,6 +159,7 @@ bump-version: ant -Dversion-name=3.123 Bumps the project version to 3.123,tags and commits it astyle: Make K-9's source look like it's supposed to + eclipse: Apply template Eclipse settings @@ -182,4 +183,10 @@ --> + + + + + + diff --git a/.settings/org.eclipse.core.resources.prefs b/tools/eclipse-settings/org.eclipse.core.resources.prefs similarity index 100% rename from .settings/org.eclipse.core.resources.prefs rename to tools/eclipse-settings/org.eclipse.core.resources.prefs diff --git a/.settings/org.eclipse.jdt.core.prefs b/tools/eclipse-settings/org.eclipse.jdt.core.prefs similarity index 100% rename from .settings/org.eclipse.jdt.core.prefs rename to tools/eclipse-settings/org.eclipse.jdt.core.prefs diff --git a/.settings/org.eclipse.jdt.ui.prefs b/tools/eclipse-settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from .settings/org.eclipse.jdt.ui.prefs rename to tools/eclipse-settings/org.eclipse.jdt.ui.prefs From b02a61c4065225b2ab5149d13464afaf46c24c4a Mon Sep 17 00:00:00 2001 From: Fiouz Date: Fri, 10 Jun 2011 22:44:48 +0200 Subject: [PATCH 10/14] Don't keep the folder choice activity in navigation history This let the user go back to the 'main' activity he was in before attempting a folder choice (instead of the folder choice activity itself which could be confusing) when using long-press HOME from another application --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 42b93cc38..2380ef9b7 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -136,6 +136,7 @@ android:theme="@style/Theme.K9Dialog" android:label="@string/choose_folder_title" android:configChanges="locale" + android:noHistory="true" > Date: Fri, 10 Jun 2011 23:34:21 +0200 Subject: [PATCH 11/14] Exclude global preferences from multitasking Make global preferences activity live in its own task and exclude it from recent-navigation using long-press HOME --- AndroidManifest.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2380ef9b7..dc11c890c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -81,6 +81,9 @@ android:name="com.fsck.k9.activity.setup.Prefs" android:label="@string/prefs_title" android:configChanges="locale" + android:taskAffinity="com.fsck.k9.activity.setup.Prefs" + android:launchMode="singleTask" + android:excludeFromRecents="true" > Date: Sat, 11 Jun 2011 07:10:22 +0200 Subject: [PATCH 12/14] Adjust translations for the spam confirmation pluralization Make dialog_confirm_spam_message a plurals string key only to match 72870174cea1321dc2658c796fae52805319b9bd. The actual pluralization still has to be done. --- res/values-ca/strings.xml | 16 +++++++++++++++- res/values-cs/strings.xml | 15 ++++++++++++++- res/values-de/strings.xml | 16 +++++++++++++++- res/values-es/strings.xml | 15 ++++++++++++++- res/values-fi/strings.xml | 15 ++++++++++++++- res/values-fr-rCA/strings.xml | 2 +- res/values-fr/strings.xml | 13 ++++++++++++- res/values-gl/strings.xml | 16 +++++++++++++++- res/values-it/strings.xml | 15 ++++++++++++++- res/values-ja/strings.xml | 16 +++++++++++++++- res/values-ko/strings.xml | 16 +++++++++++++++- res/values-nl/strings.xml | 16 +++++++++++++++- res/values-pl/strings.xml | 16 +++++++++++++++- res/values-pt-rBR/strings.xml | 15 ++++++++++++++- res/values-ru/strings.xml | 15 ++++++++++++++- res/values-sv/strings.xml | 15 ++++++++++++++- res/values-zh-rCN/strings.xml | 15 ++++++++++++++- res/values/strings.xml | 13 ++++++++++++- 18 files changed, 242 insertions(+), 18 deletions(-) diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 8e82be108..1eecccdeb 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -1024,7 +1024,21 @@ Benvingut a la configuració del K-9. El K-9 és un client de codi obert per An No esborris Confirma moure\'l carpeta brossa - Realment vols moure aquest missatge a la carpeta brossa? + + Realment vols moure aquest missatge a la carpeta brossa? + Realment vols moure aquest missatge a la carpeta brossa? + + Sí No diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 961add437..4f517ce88 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -1031,7 +1031,20 @@ Vítejte v nastavení pošty K-9 Mail. K-9 je open source poštovní klient pro Nemazat - + diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 814fd6ea8..917086238 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -1021,7 +1021,21 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü Nicht löschen Als Spam markieren - Wollen Sie diese Nachricht in den Spam-Ordner verschieben? + + Wollen Sie diese Nachricht in den Spam-Ordner verschieben? + Wollen Sie diese Nachricht in den Spam-Ordner verschieben? + + Ja Nein diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 7e09b360d..f0f47667c 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -1021,7 +1021,20 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa No borrar - + diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index cb1ca8cfc..3528256d7 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -1018,7 +1018,20 @@ Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiak Älä poista - + diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index a51c1e4f9..47c27ac8a 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -45,6 +45,6 @@ Affiche le nom des correspondants plutôt que leurs adresses courriel Voulez-vous déplacer ce message vers le dossiers à pourriels\u00A0? - Voulez-vous déplacer %1$d messages vers le dossiers à pourriels\u00A0? + Voulez-vous déplacer %1$d messages vers le dossiers à pourriels\u00A0? diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 42beab360..3a2a057f2 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -918,7 +918,18 @@ Confirmer le déplacement Voulez-vous déplacer ce message vers le dossiers à spams\u00A0? - Voulez-vous déplacer %1$d messages vers le dossiers à spams\u00A0? + Voulez-vous déplacer %1$d messages vers le dossiers à spams\u00A0? + Déplacer Ne pas déplacer diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index e42df085f..82da970d7 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -1021,7 +1021,21 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An Non borrar Confirmar antes de mover á carpeta spam - Queres mover esta mensaxe á carpeta spam? + + Queres mover esta mensaxe á carpeta spam? + Queres mover esta mensaxe á carpeta spam? + + Si Non diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 07a148979..e9b9122aa 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -1025,7 +1025,20 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope Non eliminare - + diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 68cbe1140..12dfd89d7 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -1017,7 +1017,21 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール 削除しない 迷惑メールフォルダへの移動の確認 - 本当にこのメッセージを迷惑メールフォルダに移動しますか？ + + 本当にこのメッセージを迷惑メールフォルダに移動しますか？ + 本当にこのメッセージを迷惑メールフォルダに移動しますか？ + + はい いいえ diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 029d76e80..68a93adb9 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -1021,7 +1021,21 @@ K-9 메일 설치를 환영합니다. K-9은 안드로이드용 오픈소스 삭제하지 않음 스팸폴더로 이동 확인 - 정말 이 메시지를 스팸폴더로 옮기시겠습니까? + + 정말 이 메시지를 스팸폴더로 옮기시겠습니까? + 정말 이 메시지를 스팸폴더로 옮기시겠습니까? + + 예 아니오 diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index f78e63041..716324d38 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -1021,7 +1021,21 @@ Welkom bij K-9 Mail setup. K-9 is een open source mail cliënt voor Android, ge Niet verwijderen Bevestig verplaatsing naar spam map - Wil je dit bericht echt verplaatsen naar de spam map? + + Wil je dit bericht echt verplaatsen naar de spam map? + Wil je dit bericht echt verplaatsen naar de spam map? + + Ja Nee diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 5bdaf2a61..fa847c92b 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -1033,7 +1033,21 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej Nie usuwaj Potwierdź przeniesienie do spamu - Na pewno przenieśc do spamu? + + Na pewno przenieśc do spamu? + Na pewno przenieśc do spamu? + + Tak Nie diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index 45cafdf37..283b63674 100644 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -1018,7 +1018,20 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código Não excluir - + diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index f9b767aa3..8608c981d 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -1015,7 +1015,20 @@ - + diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index f6be5f699..a9b11cf75 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -1024,7 +1024,20 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen Radera inte - + diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 07d0ab42d..4973a8c47 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -1005,7 +1005,20 @@ 不要删除 - + diff --git a/res/values/strings.xml b/res/values/strings.xml index 95c2d4c35..710bf894a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1035,7 +1035,18 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin Confirm move to spam folder Do you really want to move this message to the spam folder? - Do you really want to move %1$d messages to the spam folder? + Do you really want to move %1$d messages to the spam folder? + Yes No From c9c22bd5007296a33ae6984188ee1cfba1b039e0 Mon Sep 17 00:00:00 2001 From: Fiouz Date: Sat, 11 Jun 2011 23:44:36 +0200 Subject: [PATCH 13/14] Improve French translation wording --- res/values-fr-rCA/strings.xml | 2 +- res/values-fr/strings.xml | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index 47c27ac8a..16d59b1a2 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -42,7 +42,7 @@ Déplacer vers Pourriels Maximum de dossiers poussés à vérifier Aucune adresse courriel trouvée - Affiche le nom des correspondants plutôt que leurs adresses courriel + Afficher le nom des correspondants plutôt que leurs adresses courriel Voulez-vous déplacer ce message vers le dossiers à pourriels\u00A0? Voulez-vous déplacer %1$d messages vers le dossiers à pourriels\u00A0? diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 3a2a057f2..5c02c872d 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -302,10 +302,10 @@ Fournit plus d\'espace dans les éléments des listes Lignes dʼaperçu Afficher le nom des correspondants - Affiche le nom des correspondants plutôt que leurs adresses e-mail + Afficher le nom des correspondants plutôt que leurs adresses e-mail - Afficher les noms des contacts connus - Utiliser les noms du carnet d\'adresses + Utiliser les noms du carnet d\'adresses + Utiliser en priorité les noms du carnet d\'adresses Couleur des contacts connus Ne pas mettre en évidence les contacts connus Mettre en évidence (couleur) les contacts connus @@ -313,7 +313,7 @@ Polices à taille fixe Utiliser une police à taille fixe pour les messages en texte brut Retour à la liste après suppression - Retourne à la liste de messages après la suppression d\'un message + Retourner à la liste de messages après la suppression d\'un message Confirmer les actions Demander une confirmation pour chacune des actions sélectionnées @@ -496,7 +496,7 @@ Ouvrir message non lu via notification Recherche des messages non lus après un accès à partir des notifications Afficher le nombre de messages non lus - Affiche le nombre de messages non lus dans la barre de notification + Afficher le nombre de messages non lus dans la barre de notification Défiler les boutons de navigation Jamais @@ -515,10 +515,10 @@ Composition de messages Citer le message original - Le contenu du message d\'origine sera inclu dans votre réponse + Inclure le message d\'origine dans la réponse Réponse après la citation - Lors d\'une réponse, le texte d\'origine précèdera votre réponse + Faire précéder la réponse par le texte d\'origine Format du message HTML (formattage et images conservés) @@ -814,7 +814,7 @@ Accepter le contrôle par gestuelle Agencement compact - Modifie l\'agencement pour afficher plus d\'éléments par page + Modifier l\'agencement pour afficher plus d\'éléments par page Navigation à l\'aide du volume Passer d\'un élément à l\'autre grâce aux touches de volume @@ -831,7 +831,7 @@ Désactiver pour un affichage plus rapide Cacher les comptes spéciaux - Cache «\u00A0Boîte de messagerie unifiée\u00A0» et «\u00A0Tous les messages\u00A0» + Cacher «\u00A0Boîte de messagerie unifiée\u00A0» et «\u00A0Tous les messages\u00A0» %s %s - Avec étoile @@ -899,7 +899,7 @@ Vérifier «\u00A0inconnu\u00A0» id\u00A0: %s - K-9 n\'a pas la permission d\'accéder à AGP, veuillez réinstaller K-9 pour corriger cela. + K-9 Mail n\'a pas la permission d\'accéder à AGP, veuillez réinstaller K-9 Mail pour corriger cela. Les messages PGP/MIME ne sont pas encore supportés Attention\u00A0: La signature et le chiffrement des pièces jointes ne sont pas encore supportés. Envoi annulé. From a558466c36f6e2921fb2dd989d23f1efd5fed55f Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Mon, 13 Jun 2011 19:49:06 -0400 Subject: [PATCH 14/14] ant astyle --- .../fsck/k9/activity/ConfirmationDialog.java | 2 +- src/com/fsck/k9/activity/MessageList.java | 34 +++++++++---------- src/com/fsck/k9/activity/MessageView.java | 8 ++--- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/com/fsck/k9/activity/ConfirmationDialog.java b/src/com/fsck/k9/activity/ConfirmationDialog.java index 6b22b7746..246ab2f5d 100644 --- a/src/com/fsck/k9/activity/ConfirmationDialog.java +++ b/src/com/fsck/k9/activity/ConfirmationDialog.java @@ -23,7 +23,7 @@ public class ConfirmationDialog { final String message, final int confirmButton, final int cancelButton, final Runnable action) { return create(activity, dialogId, title, message, confirmButton, cancelButton, - action, null); + action, null); } /** diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java index a4addaeec..f9cf52721 100644 --- a/src/com/fsck/k9/activity/MessageList.java +++ b/src/com/fsck/k9/activity/MessageList.java @@ -846,10 +846,10 @@ public class MessageList } /* (non-Javadoc) - * + * * Method overriden for proper typing within this class (the return type is * more specific than the super implementation) - * + * * @see android.app.Activity#onRetainNonConfigurationInstance() */ @Override @@ -862,10 +862,10 @@ public class MessageList /* * (non-Javadoc) - * + * * Method overriden for proper typing within this class (the return type is * more specific than the super implementation) - * + * * @see android.app.Activity#getLastNonConfigurationInstance() */ @Override @@ -1325,7 +1325,7 @@ public class MessageList final int selectionSize = mActiveMessages.size(); final String message; message = getResources().getQuantityString(R.plurals.dialog_confirm_spam_message, selectionSize, - Integer.valueOf(selectionSize)); + Integer.valueOf(selectionSize)); ((AlertDialog) dialog).setMessage(message); } break; @@ -2600,7 +2600,7 @@ public class MessageList /** * Display the message move activity. - * + * * @param holders * Never {@code null}. */ @@ -2615,7 +2615,7 @@ public class MessageList /** * Display the message copy activity. - * + * * @param holders * Never {@code null}. */ @@ -2702,12 +2702,12 @@ public class MessageList /** * Display an Toast message if any message isn't synchronized - * + * * @param holders * Never null. * @param operation * Never {@code null}. - * + * * @return true if operation is possible */ private boolean checkCopyOrMovePossible(final List holders, final FolderOperation operation) { @@ -2728,7 +2728,7 @@ public class MessageList // message check if ((operation == FolderOperation.MOVE && !mController.isMoveCapable(message)) || (operation == FolderOperation.COPY && !mController.isCopyCapable(message))) { final Toast toast = Toast.makeText(this, R.string.move_copy_cannot_copy_unsynced_message, - Toast.LENGTH_LONG); + Toast.LENGTH_LONG); toast.show(); return false; } @@ -2738,7 +2738,7 @@ public class MessageList /** * Helper method to get a List of message ready to be processed. This implementation will return a list containing the sole argument. - * + * * @param holder Never {@code null}. * @return Never {@code null}. */ @@ -2749,7 +2749,7 @@ public class MessageList /** * Helper method to get a List of message ready to be processed. This implementation will iterate over messages and choose the checked ones. - * + * * @return Never {@code null}. */ private List getSelectionFromCheckboxes() { @@ -2788,7 +2788,7 @@ public class MessageList * The underlying implementation for {@link #copy(List, String)} and * {@link #move(List, String)}. This method was added mainly because those 2 * methods share common behavior. - * + * * @param holders * Never {@code null}. * @param destination @@ -2818,13 +2818,13 @@ public class MessageList return; } } else if (!account.equals(message.getFolder().getAccount()) - || !folderName.equals(message.getFolder().getName())) { + || !folderName.equals(message.getFolder().getName())) { // make sure all messages come from the same account/folder? return; } if ((operation == FolderOperation.MOVE && !mController.isMoveCapable(message)) || (operation == FolderOperation.COPY && !mController.isCopyCapable(message))) { final Toast toast = Toast.makeText(this, R.string.move_copy_cannot_copy_unsynced_message, - Toast.LENGTH_LONG); + Toast.LENGTH_LONG); toast.show(); // XXX return meaningful error value? @@ -2837,11 +2837,11 @@ public class MessageList if (operation == FolderOperation.MOVE) { mController.moveMessages(account, folderName, messages.toArray(new Message[messages.size()]), destination, - null); + null); mHandler.removeMessages(holders); } else { mController.copyMessages(account, folderName, messages.toArray(new Message[messages.size()]), destination, - null); + null); } } diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java index 225caaab3..937e4e035 100644 --- a/src/com/fsck/k9/activity/MessageView.java +++ b/src/com/fsck/k9/activity/MessageView.java @@ -51,7 +51,7 @@ public class MessageView extends K9Activity implements OnClickListener { static { boolean hasOnBackMethod; try { - final Class superClass = MessageView.class.getSuperclass(); + final Class superClass = MessageView.class.getSuperclass(); final Method method = superClass.getMethod("onBackPressed", new Class[] {}); hasOnBackMethod = (method.getModifiers() & Modifier.PUBLIC) == Modifier.PUBLIC; } catch (final SecurityException e) { @@ -160,9 +160,9 @@ public class MessageView extends K9Activity implements OnClickListener { @Override public boolean onKeyDown(final int keyCode, final KeyEvent event) { if ( - // XXX TODO - when we go to android 2.0, uncomment this - // android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.ECLAIR && - keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount() == 0) { + // XXX TODO - when we go to android 2.0, uncomment this + // android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.ECLAIR && + keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount() == 0) { // Take care of calling this method on earlier versions of // the platform where it doesn't exist. onBackPressed();