Fix typo

.editorconfig

@@ -1,901 +1,14 @@
-[*]
-charset = utf-8
-end_of_line = lf
-indent_size = 4
-indent_style = space
-insert_final_newline = true
-max_line_length = 160
-tab_width = 4
-ij_continuation_indent_size = 8
-ij_formatter_off_tag = @formatter:off
-ij_formatter_on_tag = @formatter:on
-ij_formatter_tags_enabled = false
-ij_smart_tabs = false
-ij_visual_guides = none
-ij_wrap_on_typing = false
+# For ktlint configuration. Ref: https://ktlint.github.io/
 
-[*.java]
-ij_java_align_consecutive_assignments = false
-ij_java_align_consecutive_variable_declarations = false
-ij_java_align_group_field_declarations = false
-ij_java_align_multiline_annotation_parameters = false
-ij_java_align_multiline_array_initializer_expression = false
-ij_java_align_multiline_assignment = false
-ij_java_align_multiline_binary_operation = false
-ij_java_align_multiline_chained_methods = false
-ij_java_align_multiline_extends_list = false
-ij_java_align_multiline_for = true
-ij_java_align_multiline_method_parentheses = false
-ij_java_align_multiline_parameters = true
-ij_java_align_multiline_parameters_in_calls = false
-ij_java_align_multiline_parenthesized_expression = false
-ij_java_align_multiline_records = true
-ij_java_align_multiline_resources = true
-ij_java_align_multiline_ternary_operation = false
-ij_java_align_multiline_text_blocks = false
-ij_java_align_multiline_throws_list = false
-ij_java_align_subsequent_simple_methods = false
-ij_java_align_throws_keyword = false
-ij_java_annotation_parameter_wrap = off
-ij_java_array_initializer_new_line_after_left_brace = false
-ij_java_array_initializer_right_brace_on_new_line = false
-ij_java_array_initializer_wrap = off
-ij_java_assert_statement_colon_on_next_line = false
-ij_java_assert_statement_wrap = off
-ij_java_assignment_wrap = off
-ij_java_binary_operation_sign_on_next_line = false
-ij_java_binary_operation_wrap = off
-ij_java_blank_lines_after_anonymous_class_header = 0
-ij_java_blank_lines_after_class_header = 0
-ij_java_blank_lines_after_imports = 1
-ij_java_blank_lines_after_package = 1
-ij_java_blank_lines_around_class = 1
-ij_java_blank_lines_around_field = 0
-ij_java_blank_lines_around_field_in_interface = 0
-ij_java_blank_lines_around_initializer = 1
-ij_java_blank_lines_around_method = 1
-ij_java_blank_lines_around_method_in_interface = 1
-ij_java_blank_lines_before_class_end = 0
-ij_java_blank_lines_before_imports = 1
-ij_java_blank_lines_before_method_body = 0
-ij_java_blank_lines_before_package = 0
-ij_java_block_brace_style = end_of_line
-ij_java_block_comment_at_first_column = true
-ij_java_builder_methods = none
-ij_java_call_parameters_new_line_after_left_paren = false
-ij_java_call_parameters_right_paren_on_new_line = false
-ij_java_call_parameters_wrap = off
-ij_java_case_statement_on_separate_line = true
-ij_java_catch_on_new_line = false
-ij_java_class_annotation_wrap = split_into_lines
-ij_java_class_brace_style = end_of_line
-ij_java_class_count_to_use_import_on_demand = 99
-ij_java_class_names_in_javadoc = 1
-ij_java_do_not_indent_top_level_class_members = false
-ij_java_do_not_wrap_after_single_annotation = false
-ij_java_do_while_brace_force = never
-ij_java_doc_add_blank_line_after_description = true
-ij_java_doc_add_blank_line_after_param_comments = false
-ij_java_doc_add_blank_line_after_return = false
-ij_java_doc_add_p_tag_on_empty_lines = true
-ij_java_doc_align_exception_comments = true
-ij_java_doc_align_param_comments = true
-ij_java_doc_do_not_wrap_if_one_line = false
-ij_java_doc_enable_formatting = true
-ij_java_doc_enable_leading_asterisks = true
-ij_java_doc_indent_on_continuation = false
-ij_java_doc_keep_empty_lines = true
-ij_java_doc_keep_empty_parameter_tag = true
-ij_java_doc_keep_empty_return_tag = true
-ij_java_doc_keep_empty_throws_tag = true
-ij_java_doc_keep_invalid_tags = true
-ij_java_doc_param_description_on_new_line = false
-ij_java_doc_preserve_line_breaks = false
-ij_java_doc_use_throws_not_exception_tag = true
-ij_java_else_on_new_line = false
-ij_java_enum_constants_wrap = off
-ij_java_extends_keyword_wrap = off
-ij_java_extends_list_wrap = off
-ij_java_field_annotation_wrap = split_into_lines
-ij_java_finally_on_new_line = false
-ij_java_for_brace_force = never
-ij_java_for_statement_new_line_after_left_paren = false
-ij_java_for_statement_right_paren_on_new_line = false
-ij_java_for_statement_wrap = off
-ij_java_generate_final_locals = false
-ij_java_generate_final_parameters = false
-ij_java_if_brace_force = never
-ij_java_imports_layout = $android.**,$androidx.**,$com.**,$junit.**,$net.**,$org.**,$java.**,$javax.**,$*,|,android.**,|,androidx.**,|,com.**,|,junit.**,|,net.**,|,org.**,|,java.**,|,javax.**,|,*,|
-ij_java_indent_case_from_switch = true
-ij_java_insert_inner_class_imports = false
-ij_java_insert_override_annotation = true
-ij_java_keep_blank_lines_before_right_brace = 2
-ij_java_keep_blank_lines_between_package_declaration_and_header = 2
-ij_java_keep_blank_lines_in_code = 2
-ij_java_keep_blank_lines_in_declarations = 2
-ij_java_keep_builder_methods_indents = false
-ij_java_keep_control_statement_in_one_line = true
-ij_java_keep_first_column_comment = true
-ij_java_keep_indents_on_empty_lines = false
-ij_java_keep_line_breaks = true
-ij_java_keep_multiple_expressions_in_one_line = false
-ij_java_keep_simple_blocks_in_one_line = false
-ij_java_keep_simple_classes_in_one_line = false
-ij_java_keep_simple_lambdas_in_one_line = false
-ij_java_keep_simple_methods_in_one_line = false
-ij_java_label_indent_absolute = false
-ij_java_label_indent_size = 0
-ij_java_lambda_brace_style = end_of_line
-ij_java_layout_static_imports_separately = true
-ij_java_line_comment_add_space = false
-ij_java_line_comment_at_first_column = true
-ij_java_method_annotation_wrap = split_into_lines
-ij_java_method_brace_style = end_of_line
-ij_java_method_call_chain_wrap = off
-ij_java_method_parameters_new_line_after_left_paren = false
-ij_java_method_parameters_right_paren_on_new_line = false
-ij_java_method_parameters_wrap = off
-ij_java_modifier_list_wrap = false
-ij_java_names_count_to_use_import_on_demand = 99
-ij_java_new_line_after_lparen_in_record_header = false
-ij_java_parameter_annotation_wrap = off
-ij_java_parentheses_expression_new_line_after_left_paren = false
-ij_java_parentheses_expression_right_paren_on_new_line = false
-ij_java_place_assignment_sign_on_next_line = false
-ij_java_prefer_longer_names = true
-ij_java_prefer_parameters_wrap = false
-ij_java_record_components_wrap = normal
-ij_java_repeat_synchronized = true
-ij_java_replace_instanceof_and_cast = false
-ij_java_replace_null_check = true
-ij_java_replace_sum_lambda_with_method_ref = true
-ij_java_resource_list_new_line_after_left_paren = false
-ij_java_resource_list_right_paren_on_new_line = false
-ij_java_resource_list_wrap = off
-ij_java_rparen_on_new_line_in_record_header = false
-ij_java_space_after_closing_angle_bracket_in_type_argument = false
-ij_java_space_after_colon = true
-ij_java_space_after_comma = true
-ij_java_space_after_comma_in_type_arguments = true
-ij_java_space_after_for_semicolon = true
-ij_java_space_after_quest = true
-ij_java_space_after_type_cast = true
-ij_java_space_before_annotation_array_initializer_left_brace = false
-ij_java_space_before_annotation_parameter_list = false
-ij_java_space_before_array_initializer_left_brace = false
-ij_java_space_before_catch_keyword = true
-ij_java_space_before_catch_left_brace = true
-ij_java_space_before_catch_parentheses = true
-ij_java_space_before_class_left_brace = true
-ij_java_space_before_colon = true
-ij_java_space_before_colon_in_foreach = true
-ij_java_space_before_comma = false
-ij_java_space_before_do_left_brace = true
-ij_java_space_before_else_keyword = true
-ij_java_space_before_else_left_brace = true
-ij_java_space_before_finally_keyword = true
-ij_java_space_before_finally_left_brace = true
-ij_java_space_before_for_left_brace = true
-ij_java_space_before_for_parentheses = true
-ij_java_space_before_for_semicolon = false
-ij_java_space_before_if_left_brace = true
-ij_java_space_before_if_parentheses = true
-ij_java_space_before_method_call_parentheses = false
-ij_java_space_before_method_left_brace = true
-ij_java_space_before_method_parentheses = false
-ij_java_space_before_opening_angle_bracket_in_type_parameter = false
-ij_java_space_before_quest = true
-ij_java_space_before_switch_left_brace = true
-ij_java_space_before_switch_parentheses = true
-ij_java_space_before_synchronized_left_brace = true
-ij_java_space_before_synchronized_parentheses = true
-ij_java_space_before_try_left_brace = true
-ij_java_space_before_try_parentheses = true
-ij_java_space_before_type_parameter_list = false
-ij_java_space_before_while_keyword = true
-ij_java_space_before_while_left_brace = true
-ij_java_space_before_while_parentheses = true
-ij_java_space_inside_one_line_enum_braces = false
-ij_java_space_within_empty_array_initializer_braces = false
-ij_java_space_within_empty_method_call_parentheses = false
-ij_java_space_within_empty_method_parentheses = false
-ij_java_spaces_around_additive_operators = true
-ij_java_spaces_around_assignment_operators = true
-ij_java_spaces_around_bitwise_operators = true
-ij_java_spaces_around_equality_operators = true
-ij_java_spaces_around_lambda_arrow = true
-ij_java_spaces_around_logical_operators = true
-ij_java_spaces_around_method_ref_dbl_colon = false
-ij_java_spaces_around_multiplicative_operators = true
-ij_java_spaces_around_relational_operators = true
-ij_java_spaces_around_shift_operators = true
-ij_java_spaces_around_type_bounds_in_type_parameters = true
-ij_java_spaces_around_unary_operator = false
-ij_java_spaces_within_angle_brackets = false
-ij_java_spaces_within_annotation_parentheses = false
-ij_java_spaces_within_array_initializer_braces = false
-ij_java_spaces_within_braces = false
-ij_java_spaces_within_brackets = false
-ij_java_spaces_within_cast_parentheses = false
-ij_java_spaces_within_catch_parentheses = false
-ij_java_spaces_within_for_parentheses = false
-ij_java_spaces_within_if_parentheses = false
-ij_java_spaces_within_method_call_parentheses = false
-ij_java_spaces_within_method_parentheses = false
-ij_java_spaces_within_parentheses = false
-ij_java_spaces_within_record_header = false
-ij_java_spaces_within_switch_parentheses = false
-ij_java_spaces_within_synchronized_parentheses = false
-ij_java_spaces_within_try_parentheses = false
-ij_java_spaces_within_while_parentheses = false
-ij_java_special_else_if_treatment = true
-ij_java_subclass_name_suffix = Impl
-ij_java_ternary_operation_signs_on_next_line = false
-ij_java_ternary_operation_wrap = off
-ij_java_test_name_suffix = Test
-ij_java_throws_keyword_wrap = off
-ij_java_throws_list_wrap = off
-ij_java_use_external_annotations = false
-ij_java_use_fq_class_names = false
-ij_java_use_relative_indents = false
-ij_java_use_single_class_imports = true
-ij_java_variable_annotation_wrap = off
-ij_java_visibility = public
-ij_java_while_brace_force = never
-ij_java_while_on_new_line = false
-ij_java_wrap_comments = false
-ij_java_wrap_first_method_in_call_chain = false
-ij_java_wrap_long_lines = false
+[*.{kt,kts}]
+# possible values: number (e.g. 2), "unset" (makes ktlint ignore indentation completely)
+indent_size=unset
+# true (recommended) / false
+insert_final_newline=true
+# possible values: number (e.g. 120) (package name, imports & comments are ignored), "off"
+# it's automatically set to 100 on `ktlint --android ...` (per Android Kotlin Style Guide)
+max_line_length=off
 
-[*.properties]
-ij_properties_align_group_field_declarations = false
-ij_properties_keep_blank_lines = false
-ij_properties_key_value_delimiter = equals
-ij_properties_spaces_around_key_value_delimiter = false
-
-[.editorconfig]
-ij_editorconfig_align_group_field_declarations = false
-ij_editorconfig_space_after_colon = false
-ij_editorconfig_space_after_comma = true
-ij_editorconfig_space_before_colon = false
-ij_editorconfig_space_before_comma = false
-ij_editorconfig_spaces_around_assignment_operators = true
-
-[{*.ant,*.fxml,*.jhm,*.jnlp,*.jrxml,*.rng,*.tld,*.wsdl,*.xml,*.xsd,*.xsl,*.xslt,*.xul}]
-ij_continuation_indent_size = 4
-ij_xml_align_attributes = false
-ij_xml_align_text = false
-ij_xml_attribute_wrap = normal
-ij_xml_block_comment_at_first_column = true
-ij_xml_keep_blank_lines = 2
-ij_xml_keep_indents_on_empty_lines = false
-ij_xml_keep_line_breaks = false
-ij_xml_keep_line_breaks_in_text = true
-ij_xml_keep_whitespaces = false
-ij_xml_keep_whitespaces_around_cdata = preserve
-ij_xml_keep_whitespaces_inside_cdata = false
-ij_xml_line_comment_at_first_column = true
-ij_xml_space_after_tag_name = false
-ij_xml_space_around_equals_in_attribute = false
-ij_xml_space_inside_empty_tag = true
-ij_xml_text_wrap = normal
-ij_xml_use_custom_settings = true
-
-[{*.bash,*.sh,*.zsh}]
-indent_size = 2
-tab_width = 2
-ij_shell_binary_ops_start_line = false
-ij_shell_keep_column_alignment_padding = false
-ij_shell_minify_program = false
-ij_shell_redirect_followed_by_space = false
-ij_shell_switch_cases_indented = false
-ij_shell_use_unix_line_separator = true
-
-[{*.c,*.c++,*.cc,*.cp,*.cpp,*.cu,*.cuh,*.cxx,*.h,*.h++,*.hh,*.hp,*.hpp,*.hxx,*.i,*.icc,*.ii,*.inl,*.ino,*.ipp,*.m,*.mm,*.pch,*.tcc,*.tpp}]
-ij_c_add_brief_tag = false
-ij_c_add_getter_prefix = true
-ij_c_add_setter_prefix = true
-ij_c_align_dictionary_pair_values = false
-ij_c_align_group_field_declarations = false
-ij_c_align_init_list_in_columns = true
-ij_c_align_multiline_array_initializer_expression = true
-ij_c_align_multiline_assignment = true
-ij_c_align_multiline_binary_operation = true
-ij_c_align_multiline_chained_methods = false
-ij_c_align_multiline_for = true
-ij_c_align_multiline_ternary_operation = true
-ij_c_array_initializer_comma_on_next_line = false
-ij_c_array_initializer_new_line_after_left_brace = false
-ij_c_array_initializer_right_brace_on_new_line = false
-ij_c_array_initializer_wrap = normal
-ij_c_assignment_wrap = off
-ij_c_binary_operation_sign_on_next_line = false
-ij_c_binary_operation_wrap = normal
-ij_c_blank_lines_after_class_header = 0
-ij_c_blank_lines_after_imports = 1
-ij_c_blank_lines_around_class = 1
-ij_c_blank_lines_around_field = 0
-ij_c_blank_lines_around_field_in_interface = 0
-ij_c_blank_lines_around_method = 1
-ij_c_blank_lines_around_method_in_interface = 1
-ij_c_blank_lines_around_namespace = 0
-ij_c_blank_lines_around_properties_in_declaration = 0
-ij_c_blank_lines_around_properties_in_interface = 0
-ij_c_blank_lines_before_imports = 1
-ij_c_blank_lines_before_method_body = 0
-ij_c_block_brace_placement = end_of_line
-ij_c_block_brace_style = end_of_line
-ij_c_block_comment_at_first_column = true
-ij_c_catch_on_new_line = false
-ij_c_class_brace_style = end_of_line
-ij_c_class_constructor_init_list_align_multiline = true
-ij_c_class_constructor_init_list_comma_on_next_line = false
-ij_c_class_constructor_init_list_new_line_after_colon = never
-ij_c_class_constructor_init_list_new_line_before_colon = if_long
-ij_c_class_constructor_init_list_wrap = normal
-ij_c_copy_is_deep = false
-ij_c_create_interface_for_categories = true
-ij_c_declare_generated_methods = true
-ij_c_description_include_member_names = true
-ij_c_discharged_short_ternary_operator = false
-ij_c_do_not_add_breaks = false
-ij_c_do_while_brace_force = never
-ij_c_else_on_new_line = false
-ij_c_enum_constants_comma_on_next_line = false
-ij_c_enum_constants_wrap = on_every_item
-ij_c_for_brace_force = never
-ij_c_for_statement_new_line_after_left_paren = false
-ij_c_for_statement_right_paren_on_new_line = false
-ij_c_for_statement_wrap = off
-ij_c_function_brace_placement = end_of_line
-ij_c_function_call_arguments_align_multiline = true
-ij_c_function_call_arguments_align_multiline_pars = false
-ij_c_function_call_arguments_comma_on_next_line = false
-ij_c_function_call_arguments_new_line_after_lpar = false
-ij_c_function_call_arguments_new_line_before_rpar = false
-ij_c_function_call_arguments_wrap = normal
-ij_c_function_non_top_after_return_type_wrap = normal
-ij_c_function_parameters_align_multiline = true
-ij_c_function_parameters_align_multiline_pars = false
-ij_c_function_parameters_comma_on_next_line = false
-ij_c_function_parameters_new_line_after_lpar = false
-ij_c_function_parameters_new_line_before_rpar = false
-ij_c_function_parameters_wrap = normal
-ij_c_function_top_after_return_type_wrap = normal
-ij_c_generate_additional_eq_operators = true
-ij_c_generate_additional_rel_operators = true
-ij_c_generate_class_constructor = true
-ij_c_generate_comparison_operators_use_std_tie = false
-ij_c_generate_instance_variables_for_properties = ask
-ij_c_generate_operators_as_members = true
-ij_c_header_guard_style_pattern = ${PROJECT_NAME}_${FILE_NAME}_${EXT}
-ij_c_if_brace_force = never
-ij_c_in_line_short_ternary_operator = true
-ij_c_indent_block_comment = true
-ij_c_indent_c_struct_members = 4
-ij_c_indent_case_from_switch = true
-ij_c_indent_class_members = 4
-ij_c_indent_directive_as_code = false
-ij_c_indent_implementation_members = 0
-ij_c_indent_inside_code_block = 4
-ij_c_indent_interface_members = 0
-ij_c_indent_interface_members_except_ivars_block = false
-ij_c_indent_namespace_members = 4
-ij_c_indent_preprocessor_directive = 0
-ij_c_indent_visibility_keywords = 0
-ij_c_insert_override = true
-ij_c_insert_virtual_with_override = false
-ij_c_introduce_auto_vars = false
-ij_c_introduce_const_params = false
-ij_c_introduce_const_vars = false
-ij_c_introduce_generate_property = false
-ij_c_introduce_generate_synthesize = true
-ij_c_introduce_globals_to_header = true
-ij_c_introduce_prop_to_private_category = false
-ij_c_introduce_static_consts = true
-ij_c_introduce_use_ns_types = false
-ij_c_ivars_prefix = _
-ij_c_keep_blank_lines_before_end = 2
-ij_c_keep_blank_lines_before_right_brace = 2
-ij_c_keep_blank_lines_in_code = 2
-ij_c_keep_blank_lines_in_declarations = 2
-ij_c_keep_case_expressions_in_one_line = false
-ij_c_keep_control_statement_in_one_line = true
-ij_c_keep_directive_at_first_column = true
-ij_c_keep_first_column_comment = true
-ij_c_keep_line_breaks = true
-ij_c_keep_nested_namespaces_in_one_line = false
-ij_c_keep_simple_blocks_in_one_line = true
-ij_c_keep_simple_methods_in_one_line = true
-ij_c_keep_structures_in_one_line = false
-ij_c_lambda_capture_list_align_multiline = false
-ij_c_lambda_capture_list_align_multiline_bracket = false
-ij_c_lambda_capture_list_comma_on_next_line = false
-ij_c_lambda_capture_list_new_line_after_lbracket = false
-ij_c_lambda_capture_list_new_line_before_rbracket = false
-ij_c_lambda_capture_list_wrap = off
-ij_c_line_comment_add_space = false
-ij_c_line_comment_at_first_column = true
-ij_c_method_brace_placement = end_of_line
-ij_c_method_call_arguments_align_by_colons = true
-ij_c_method_call_arguments_align_multiline = false
-ij_c_method_call_arguments_special_dictionary_pairs_treatment = true
-ij_c_method_call_arguments_wrap = off
-ij_c_method_call_chain_wrap = off
-ij_c_method_parameters_align_by_colons = true
-ij_c_method_parameters_align_multiline = false
-ij_c_method_parameters_wrap = off
-ij_c_namespace_brace_placement = end_of_line
-ij_c_parentheses_expression_new_line_after_left_paren = false
-ij_c_parentheses_expression_right_paren_on_new_line = false
-ij_c_place_assignment_sign_on_next_line = false
-ij_c_property_nonatomic = true
-ij_c_put_ivars_to_implementation = true
-ij_c_refactor_compatibility_aliases_and_classes = true
-ij_c_refactor_properties_and_ivars = true
-ij_c_release_style = ivar
-ij_c_retain_object_parameters_in_constructor = true
-ij_c_semicolon_after_method_signature = false
-ij_c_shift_operation_align_multiline = true
-ij_c_shift_operation_wrap = normal
-ij_c_show_non_virtual_functions = false
-ij_c_space_after_colon = true
-ij_c_space_after_colon_in_selector = false
-ij_c_space_after_comma = true
-ij_c_space_after_cup_in_blocks = false
-ij_c_space_after_dictionary_literal_colon = true
-ij_c_space_after_for_semicolon = true
-ij_c_space_after_init_list_colon = true
-ij_c_space_after_method_parameter_type_parentheses = false
-ij_c_space_after_method_return_type_parentheses = false
-ij_c_space_after_pointer_in_declaration = false
-ij_c_space_after_quest = true
-ij_c_space_after_reference_in_declaration = false
-ij_c_space_after_reference_in_rvalue = false
-ij_c_space_after_structures_rbrace = true
-ij_c_space_after_superclass_colon = true
-ij_c_space_after_type_cast = true
-ij_c_space_after_visibility_sign_in_method_declaration = true
-ij_c_space_before_autorelease_pool_lbrace = true
-ij_c_space_before_catch_keyword = true
-ij_c_space_before_catch_left_brace = true
-ij_c_space_before_catch_parentheses = true
-ij_c_space_before_category_parentheses = true
-ij_c_space_before_chained_send_message = true
-ij_c_space_before_class_left_brace = true
-ij_c_space_before_colon = true
-ij_c_space_before_comma = false
-ij_c_space_before_dictionary_literal_colon = false
-ij_c_space_before_do_left_brace = true
-ij_c_space_before_else_keyword = true
-ij_c_space_before_else_left_brace = true
-ij_c_space_before_for_left_brace = true
-ij_c_space_before_for_parentheses = true
-ij_c_space_before_for_semicolon = false
-ij_c_space_before_if_left_brace = true
-ij_c_space_before_if_parentheses = true
-ij_c_space_before_init_list = false
-ij_c_space_before_init_list_colon = true
-ij_c_space_before_method_call_parentheses = false
-ij_c_space_before_method_left_brace = true
-ij_c_space_before_method_parentheses = false
-ij_c_space_before_namespace_lbrace = true
-ij_c_space_before_pointer_in_declaration = true
-ij_c_space_before_property_attributes_parentheses = false
-ij_c_space_before_protocols_brackets = true
-ij_c_space_before_quest = true
-ij_c_space_before_reference_in_declaration = true
-ij_c_space_before_superclass_colon = true
-ij_c_space_before_switch_left_brace = true
-ij_c_space_before_switch_parentheses = true
-ij_c_space_before_template_call_lt = false
-ij_c_space_before_template_declaration_lt = false
-ij_c_space_before_try_left_brace = true
-ij_c_space_before_while_keyword = true
-ij_c_space_before_while_left_brace = true
-ij_c_space_before_while_parentheses = true
-ij_c_space_between_adjacent_brackets = false
-ij_c_space_between_operator_and_punctuator = false
-ij_c_space_within_empty_array_initializer_braces = false
-ij_c_spaces_around_additive_operators = true
-ij_c_spaces_around_assignment_operators = true
-ij_c_spaces_around_bitwise_operators = true
-ij_c_spaces_around_equality_operators = true
-ij_c_spaces_around_lambda_arrow = true
-ij_c_spaces_around_logical_operators = true
-ij_c_spaces_around_multiplicative_operators = true
-ij_c_spaces_around_pm_operators = false
-ij_c_spaces_around_relational_operators = true
-ij_c_spaces_around_shift_operators = true
-ij_c_spaces_around_unary_operator = false
-ij_c_spaces_within_array_initializer_braces = false
-ij_c_spaces_within_braces = true
-ij_c_spaces_within_brackets = false
-ij_c_spaces_within_cast_parentheses = false
-ij_c_spaces_within_catch_parentheses = false
-ij_c_spaces_within_category_parentheses = false
-ij_c_spaces_within_empty_braces = false
-ij_c_spaces_within_empty_function_call_parentheses = false
-ij_c_spaces_within_empty_function_declaration_parentheses = false
-ij_c_spaces_within_empty_lambda_capture_list_bracket = false
-ij_c_spaces_within_empty_template_call_ltgt = false
-ij_c_spaces_within_empty_template_declaration_ltgt = false
-ij_c_spaces_within_for_parentheses = false
-ij_c_spaces_within_function_call_parentheses = false
-ij_c_spaces_within_function_declaration_parentheses = false
-ij_c_spaces_within_if_parentheses = false
-ij_c_spaces_within_lambda_capture_list_bracket = false
-ij_c_spaces_within_method_parameter_type_parentheses = false
-ij_c_spaces_within_method_return_type_parentheses = false
-ij_c_spaces_within_parentheses = false
-ij_c_spaces_within_property_attributes_parentheses = false
-ij_c_spaces_within_protocols_brackets = false
-ij_c_spaces_within_send_message_brackets = false
-ij_c_spaces_within_switch_parentheses = false
-ij_c_spaces_within_template_call_ltgt = false
-ij_c_spaces_within_template_declaration_ltgt = false
-ij_c_spaces_within_template_double_gt = true
-ij_c_spaces_within_while_parentheses = false
-ij_c_special_else_if_treatment = true
-ij_c_superclass_list_after_colon = never
-ij_c_superclass_list_align_multiline = true
-ij_c_superclass_list_before_colon = if_long
-ij_c_superclass_list_comma_on_next_line = false
-ij_c_superclass_list_wrap = on_every_item
-ij_c_tag_prefix_of_block_comment = at
-ij_c_tag_prefix_of_line_comment = back_slash
-ij_c_template_call_arguments_align_multiline = false
-ij_c_template_call_arguments_align_multiline_pars = false
-ij_c_template_call_arguments_comma_on_next_line = false
-ij_c_template_call_arguments_new_line_after_lt = false
-ij_c_template_call_arguments_new_line_before_gt = false
-ij_c_template_call_arguments_wrap = off
-ij_c_template_declaration_function_body_indent = false
-ij_c_template_declaration_function_wrap = split_into_lines
-ij_c_template_declaration_struct_body_indent = false
-ij_c_template_declaration_struct_wrap = split_into_lines
-ij_c_template_parameters_align_multiline = false
-ij_c_template_parameters_align_multiline_pars = false
-ij_c_template_parameters_comma_on_next_line = false
-ij_c_template_parameters_new_line_after_lt = false
-ij_c_template_parameters_new_line_before_gt = false
-ij_c_template_parameters_wrap = off
-ij_c_ternary_operation_signs_on_next_line = true
-ij_c_ternary_operation_wrap = normal
-ij_c_type_qualifiers_placement = before
-ij_c_use_modern_casts = true
-ij_c_use_setters_in_constructor = true
-ij_c_while_brace_force = never
-ij_c_while_on_new_line = false
-ij_c_wrap_property_declaration = off
-
-[{*.cmake,CMakeLists.txt}]
-ij_cmake_align_multiline_parameters_in_calls = false
-ij_cmake_force_commands_case = 2
-ij_cmake_keep_blank_lines_in_code = 2
-ij_cmake_space_before_for_parentheses = true
-ij_cmake_space_before_if_parentheses = true
-ij_cmake_space_before_method_call_parentheses = false
-ij_cmake_space_before_method_parentheses = false
-ij_cmake_space_before_while_parentheses = true
-ij_cmake_spaces_within_for_parentheses = false
-ij_cmake_spaces_within_if_parentheses = false
-ij_cmake_spaces_within_method_call_parentheses = false
-ij_cmake_spaces_within_method_parentheses = false
-ij_cmake_spaces_within_while_parentheses = false
-
-[{*.gant,*.gradle,*.groovy,*.gy}]
-ij_groovy_align_group_field_declarations = false
-ij_groovy_align_multiline_array_initializer_expression = false
-ij_groovy_align_multiline_assignment = false
-ij_groovy_align_multiline_binary_operation = false
-ij_groovy_align_multiline_chained_methods = false
-ij_groovy_align_multiline_extends_list = false
-ij_groovy_align_multiline_for = true
-ij_groovy_align_multiline_list_or_map = true
-ij_groovy_align_multiline_method_parentheses = false
-ij_groovy_align_multiline_parameters = true
-ij_groovy_align_multiline_parameters_in_calls = false
-ij_groovy_align_multiline_resources = true
-ij_groovy_align_multiline_ternary_operation = false
-ij_groovy_align_multiline_throws_list = false
-ij_groovy_align_named_args_in_map = true
-ij_groovy_align_throws_keyword = false
-ij_groovy_array_initializer_new_line_after_left_brace = false
-ij_groovy_array_initializer_right_brace_on_new_line = false
-ij_groovy_array_initializer_wrap = off
-ij_groovy_assert_statement_wrap = off
-ij_groovy_assignment_wrap = off
-ij_groovy_binary_operation_wrap = off
-ij_groovy_blank_lines_after_class_header = 0
-ij_groovy_blank_lines_after_imports = 1
-ij_groovy_blank_lines_after_package = 1
-ij_groovy_blank_lines_around_class = 1
-ij_groovy_blank_lines_around_field = 0
-ij_groovy_blank_lines_around_field_in_interface = 0
-ij_groovy_blank_lines_around_method = 1
-ij_groovy_blank_lines_around_method_in_interface = 1
-ij_groovy_blank_lines_before_imports = 1
-ij_groovy_blank_lines_before_method_body = 0
-ij_groovy_blank_lines_before_package = 0
-ij_groovy_block_brace_style = end_of_line
-ij_groovy_block_comment_at_first_column = true
-ij_groovy_call_parameters_new_line_after_left_paren = false
-ij_groovy_call_parameters_right_paren_on_new_line = false
-ij_groovy_call_parameters_wrap = off
-ij_groovy_catch_on_new_line = false
-ij_groovy_class_annotation_wrap = split_into_lines
-ij_groovy_class_brace_style = end_of_line
-ij_groovy_class_count_to_use_import_on_demand = 5
-ij_groovy_do_while_brace_force = never
-ij_groovy_else_on_new_line = false
-ij_groovy_enum_constants_wrap = off
-ij_groovy_extends_keyword_wrap = off
-ij_groovy_extends_list_wrap = off
-ij_groovy_field_annotation_wrap = split_into_lines
-ij_groovy_finally_on_new_line = false
-ij_groovy_for_brace_force = never
-ij_groovy_for_statement_new_line_after_left_paren = false
-ij_groovy_for_statement_right_paren_on_new_line = false
-ij_groovy_for_statement_wrap = off
-ij_groovy_if_brace_force = never
-ij_groovy_import_annotation_wrap = 2
-ij_groovy_imports_layout = *,|,javax.**,java.**,|,$*
-ij_groovy_indent_case_from_switch = true
-ij_groovy_indent_label_blocks = true
-ij_groovy_insert_inner_class_imports = false
-ij_groovy_keep_blank_lines_before_right_brace = 2
-ij_groovy_keep_blank_lines_in_code = 2
-ij_groovy_keep_blank_lines_in_declarations = 2
-ij_groovy_keep_control_statement_in_one_line = true
-ij_groovy_keep_first_column_comment = true
-ij_groovy_keep_indents_on_empty_lines = false
-ij_groovy_keep_line_breaks = true
-ij_groovy_keep_multiple_expressions_in_one_line = false
-ij_groovy_keep_simple_blocks_in_one_line = false
-ij_groovy_keep_simple_classes_in_one_line = true
-ij_groovy_keep_simple_lambdas_in_one_line = true
-ij_groovy_keep_simple_methods_in_one_line = true
-ij_groovy_label_indent_absolute = false
-ij_groovy_label_indent_size = 0
-ij_groovy_lambda_brace_style = end_of_line
-ij_groovy_layout_static_imports_separately = true
-ij_groovy_line_comment_add_space = false
-ij_groovy_line_comment_at_first_column = true
-ij_groovy_method_annotation_wrap = split_into_lines
-ij_groovy_method_brace_style = end_of_line
-ij_groovy_method_call_chain_wrap = off
-ij_groovy_method_parameters_new_line_after_left_paren = false
-ij_groovy_method_parameters_right_paren_on_new_line = false
-ij_groovy_method_parameters_wrap = off
-ij_groovy_modifier_list_wrap = false
-ij_groovy_names_count_to_use_import_on_demand = 3
-ij_groovy_parameter_annotation_wrap = off
-ij_groovy_parentheses_expression_new_line_after_left_paren = false
-ij_groovy_parentheses_expression_right_paren_on_new_line = false
-ij_groovy_prefer_parameters_wrap = false
-ij_groovy_resource_list_new_line_after_left_paren = false
-ij_groovy_resource_list_right_paren_on_new_line = false
-ij_groovy_resource_list_wrap = off
-ij_groovy_space_after_assert_separator = true
-ij_groovy_space_after_colon = true
-ij_groovy_space_after_comma = true
-ij_groovy_space_after_comma_in_type_arguments = true
-ij_groovy_space_after_for_semicolon = true
-ij_groovy_space_after_quest = true
-ij_groovy_space_after_type_cast = true
-ij_groovy_space_before_annotation_parameter_list = false
-ij_groovy_space_before_array_initializer_left_brace = false
-ij_groovy_space_before_assert_separator = false
-ij_groovy_space_before_catch_keyword = true
-ij_groovy_space_before_catch_left_brace = true
-ij_groovy_space_before_catch_parentheses = true
-ij_groovy_space_before_class_left_brace = true
-ij_groovy_space_before_closure_left_brace = true
-ij_groovy_space_before_colon = true
-ij_groovy_space_before_comma = false
-ij_groovy_space_before_do_left_brace = true
-ij_groovy_space_before_else_keyword = true
-ij_groovy_space_before_else_left_brace = true
-ij_groovy_space_before_finally_keyword = true
-ij_groovy_space_before_finally_left_brace = true
-ij_groovy_space_before_for_left_brace = true
-ij_groovy_space_before_for_parentheses = true
-ij_groovy_space_before_for_semicolon = false
-ij_groovy_space_before_if_left_brace = true
-ij_groovy_space_before_if_parentheses = true
-ij_groovy_space_before_method_call_parentheses = false
-ij_groovy_space_before_method_left_brace = true
-ij_groovy_space_before_method_parentheses = false
-ij_groovy_space_before_quest = true
-ij_groovy_space_before_switch_left_brace = true
-ij_groovy_space_before_switch_parentheses = true
-ij_groovy_space_before_synchronized_left_brace = true
-ij_groovy_space_before_synchronized_parentheses = true
-ij_groovy_space_before_try_left_brace = true
-ij_groovy_space_before_try_parentheses = true
-ij_groovy_space_before_while_keyword = true
-ij_groovy_space_before_while_left_brace = true
-ij_groovy_space_before_while_parentheses = true
-ij_groovy_space_in_named_argument = true
-ij_groovy_space_in_named_argument_before_colon = false
-ij_groovy_space_within_empty_array_initializer_braces = false
-ij_groovy_space_within_empty_method_call_parentheses = false
-ij_groovy_spaces_around_additive_operators = true
-ij_groovy_spaces_around_assignment_operators = true
-ij_groovy_spaces_around_bitwise_operators = true
-ij_groovy_spaces_around_equality_operators = true
-ij_groovy_spaces_around_lambda_arrow = true
-ij_groovy_spaces_around_logical_operators = true
-ij_groovy_spaces_around_multiplicative_operators = true
-ij_groovy_spaces_around_regex_operators = true
-ij_groovy_spaces_around_relational_operators = true
-ij_groovy_spaces_around_shift_operators = true
-ij_groovy_spaces_within_annotation_parentheses = false
-ij_groovy_spaces_within_array_initializer_braces = false
-ij_groovy_spaces_within_braces = true
-ij_groovy_spaces_within_brackets = false
-ij_groovy_spaces_within_cast_parentheses = false
-ij_groovy_spaces_within_catch_parentheses = false
-ij_groovy_spaces_within_for_parentheses = false
-ij_groovy_spaces_within_gstring_injection_braces = false
-ij_groovy_spaces_within_if_parentheses = false
-ij_groovy_spaces_within_list_or_map = false
-ij_groovy_spaces_within_method_call_parentheses = false
-ij_groovy_spaces_within_method_parentheses = false
-ij_groovy_spaces_within_parentheses = false
-ij_groovy_spaces_within_switch_parentheses = false
-ij_groovy_spaces_within_synchronized_parentheses = false
-ij_groovy_spaces_within_try_parentheses = false
-ij_groovy_spaces_within_tuple_expression = false
-ij_groovy_spaces_within_while_parentheses = false
-ij_groovy_special_else_if_treatment = true
-ij_groovy_ternary_operation_wrap = off
-ij_groovy_throws_keyword_wrap = off
-ij_groovy_throws_list_wrap = off
-ij_groovy_use_flying_geese_braces = false
-ij_groovy_use_fq_class_names = false
-ij_groovy_use_fq_class_names_in_javadoc = true
-ij_groovy_use_relative_indents = false
-ij_groovy_use_single_class_imports = true
-ij_groovy_variable_annotation_wrap = off
-ij_groovy_while_brace_force = never
-ij_groovy_while_on_new_line = false
-ij_groovy_wrap_long_lines = false
-
-[{*.gradle.kts,*.kt,*.kts,*.main.kts}]
-ij_kotlin_align_in_columns_case_branch = false
-ij_kotlin_align_multiline_binary_operation = false
-ij_kotlin_align_multiline_extends_list = false
-ij_kotlin_align_multiline_method_parentheses = false
-ij_kotlin_align_multiline_parameters = true
-ij_kotlin_align_multiline_parameters_in_calls = false
-ij_kotlin_allow_trailing_comma = true
-ij_kotlin_allow_trailing_comma_on_call_site = false
-ij_kotlin_assignment_wrap = off
-ij_kotlin_blank_lines_after_class_header = 0
-ij_kotlin_blank_lines_around_block_when_branches = 0
-ij_kotlin_blank_lines_before_declaration_with_comment_or_annotation_on_separate_line = 1
-ij_kotlin_block_comment_at_first_column = true
-ij_kotlin_call_parameters_new_line_after_left_paren = false
-ij_kotlin_call_parameters_right_paren_on_new_line = false
-ij_kotlin_call_parameters_wrap = off
-ij_kotlin_catch_on_new_line = false
-ij_kotlin_class_annotation_wrap = off
-ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
-ij_kotlin_continuation_indent_for_chained_calls = true
-ij_kotlin_continuation_indent_for_expression_bodies = true
-ij_kotlin_continuation_indent_in_argument_lists = true
-ij_kotlin_continuation_indent_in_elvis = true
-ij_kotlin_continuation_indent_in_if_conditions = true
-ij_kotlin_continuation_indent_in_parameter_lists = true
-ij_kotlin_continuation_indent_in_supertype_lists = true
-ij_kotlin_else_on_new_line = false
-ij_kotlin_enum_constants_wrap = off
-ij_kotlin_extends_list_wrap = off
-ij_kotlin_field_annotation_wrap = normal
-ij_kotlin_finally_on_new_line = false
-ij_kotlin_if_rparen_on_new_line = false
-ij_kotlin_import_nested_classes = false
-ij_kotlin_imports_layout = *,java.**,javax.**,kotlin.**,^
-ij_kotlin_insert_whitespaces_in_simple_one_line_method = true
-ij_kotlin_keep_blank_lines_before_right_brace = 0
-ij_kotlin_keep_blank_lines_in_code = 1
-ij_kotlin_keep_blank_lines_in_declarations = 1
-ij_kotlin_keep_first_column_comment = true
-ij_kotlin_keep_indents_on_empty_lines = false
-ij_kotlin_keep_line_breaks = true
-ij_kotlin_lbrace_on_next_line = false
-ij_kotlin_line_comment_add_space = false
-ij_kotlin_line_comment_at_first_column = true
-ij_kotlin_method_annotation_wrap = split_into_lines
-ij_kotlin_method_call_chain_wrap = off
-ij_kotlin_method_parameters_new_line_after_left_paren = true
-ij_kotlin_method_parameters_right_paren_on_new_line = true
-ij_kotlin_method_parameters_wrap = off
-ij_kotlin_name_count_to_use_star_import = 2147483647
-ij_kotlin_name_count_to_use_star_import_for_members = 2147483647
-ij_kotlin_packages_to_use_import_on_demand = kotlinx.android.synthetic.**
-ij_kotlin_parameter_annotation_wrap = off
-ij_kotlin_space_after_comma = true
-ij_kotlin_space_after_extend_colon = true
-ij_kotlin_space_after_type_colon = true
-ij_kotlin_space_before_catch_parentheses = true
-ij_kotlin_space_before_comma = false
-ij_kotlin_space_before_extend_colon = true
-ij_kotlin_space_before_for_parentheses = true
-ij_kotlin_space_before_if_parentheses = true
-ij_kotlin_space_before_lambda_arrow = true
-ij_kotlin_space_before_type_colon = false
-ij_kotlin_space_before_when_parentheses = true
-ij_kotlin_space_before_while_parentheses = true
-ij_kotlin_spaces_around_additive_operators = true
-ij_kotlin_spaces_around_assignment_operators = true
-ij_kotlin_spaces_around_equality_operators = true
-ij_kotlin_spaces_around_function_type_arrow = true
-ij_kotlin_spaces_around_logical_operators = true
-ij_kotlin_spaces_around_multiplicative_operators = true
-ij_kotlin_spaces_around_range = false
-ij_kotlin_spaces_around_relational_operators = true
-ij_kotlin_spaces_around_unary_operator = false
-ij_kotlin_spaces_around_when_arrow = true
-ij_kotlin_use_custom_formatting_for_modifiers = true
-ij_kotlin_variable_annotation_wrap = off
-ij_kotlin_while_on_new_line = false
-ij_kotlin_wrap_elvis_expressions = 1
-ij_kotlin_wrap_expression_body_functions = 0
-ij_kotlin_wrap_first_method_in_call_chain = false
-
-[{*.har,*.json}]
-indent_size = 2
-ij_json_keep_blank_lines_in_code = 0
-ij_json_keep_indents_on_empty_lines = false
-ij_json_keep_line_breaks = true
-ij_json_space_after_colon = true
-ij_json_space_after_comma = true
-ij_json_space_before_colon = true
-ij_json_space_before_comma = false
-ij_json_spaces_within_braces = false
-ij_json_spaces_within_brackets = false
-ij_json_wrap_long_lines = false
-
-[{*.htm,*.html,*.sht,*.shtm,*.shtml}]
-ij_html_add_new_line_before_tags = body,div,p,form,h1,h2,h3
-ij_html_align_attributes = true
-ij_html_align_text = false
-ij_html_attribute_wrap = normal
-ij_html_block_comment_at_first_column = true
-ij_html_do_not_align_children_of_min_lines = 0
-ij_html_do_not_break_if_inline_tags = title,h1,h2,h3,h4,h5,h6,p
-ij_html_do_not_indent_children_of_tags = html,body,thead,tbody,tfoot
-ij_html_enforce_quotes = false
-ij_html_inline_tags = a,abbr,acronym,b,basefont,bdo,big,br,cite,cite,code,dfn,em,font,i,img,input,kbd,label,q,s,samp,select,small,span,strike,strong,sub,sup,textarea,tt,u,var
-ij_html_keep_blank_lines = 2
-ij_html_keep_indents_on_empty_lines = false
-ij_html_keep_line_breaks = true
-ij_html_keep_line_breaks_in_text = true
-ij_html_keep_whitespaces = false
-ij_html_keep_whitespaces_inside = span,pre,textarea
-ij_html_line_comment_at_first_column = true
-ij_html_new_line_after_last_attribute = never
-ij_html_new_line_before_first_attribute = never
-ij_html_quote_style = double
-ij_html_remove_new_line_before_tags = br
-ij_html_space_after_tag_name = false
-ij_html_space_around_equality_in_attribute = false
-ij_html_space_inside_empty_tag = false
-ij_html_text_wrap = normal
-ij_html_uniform_ident = false
-
-[{*.yaml,*.yml}]
-indent_size = 2
-ij_yaml_align_values_properties = do_not_align
-ij_yaml_autoinsert_sequence_marker = true
-ij_yaml_block_mapping_on_new_line = false
-ij_yaml_indent_sequence_value = true
-ij_yaml_keep_indents_on_empty_lines = false
-ij_yaml_keep_line_breaks = true
-ij_yaml_sequence_on_new_line = false
-ij_yaml_space_before_colon = false
-ij_yaml_spaces_within_braces = true
-ij_yaml_spaces_within_brackets = true
+# From https://github.com/pinterest/ktlint#custom-ktlint-specific-editorconfig-properties
+# default IntelliJ IDEA style, same as alphabetical, but with "java", "javax", "kotlin" and alias imports in the end of the imports list
+ij_kotlin_imports_layout=*,java.**,javax.**,kotlin.**,^

.gitattributes

@@ -1 +0,0 @@
-**/snapshots/**/*.png filter=lfs diff=lfs merge=lfs -text

.github/ISSUE_TEMPLATE/bug.yml

@@ -73,14 +73,3 @@ body:
         - 'No'
     validations:
       required: true
-  - type: dropdown
-    id: pr
-    attributes:
-      label: Are you willing to provide a PR?
-      description:  |
-        Providing a PR can drastically speed up the process of fixing this bug. Don't worry, it's still OK to answer 'No' :).
-      options:
-        - 'Yes'
-        - 'No'
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -5,7 +5,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thank you for taking the time to propose an enhancement to an existing feature. If you would like to propose a new feature or a major cross-platform change, please [start a discussion here](https://github.com/vector-im/element-meta/discussions/new?category=ideas).
+        Thank you for taking the time to propose a new feature or make a suggestion.
   - type: textarea
     id: usecase
     attributes:
@@ -34,14 +34,3 @@ body:
       placeholder: Is there anything else you'd like to add?
     validations:
       required: false
-  - type: dropdown
-    id: pr
-    attributes:
-      label: Are you willing to provide a PR?
-      description:  |
-        Don't worry, it's still OK to answer 'No' :).
-      options:
-        - 'Yes'
-        - 'No'
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/release.yml

@@ -18,27 +18,26 @@ body:
 
         - [ ] Weblate sync, fix lint issue if any (in a dedicated PR)
         - [ ] Check the update of the store descriptions (using Google Translate if necessary) to ensure that the changes are acceptable to be published to the stores.
-        - [ ] While Weblate is locked, and after the PR from Weblate has been merged, handle all the TODOs in the main `strings.xml` file
         - [ ] Run the script `./tools/release/pushPlayStoreMetaData.sh`. You can check in the GooglePlay console the Activity log to check the effect.
-        - [ ] Ensure all [the required PRs](https://github.com/vector-im/element-android/pulls?q=is%3Aopen+is%3Apr+label%3AZ-NextRelease) have been merged
 
         ### Do the release
 
-        - [ ] Make sure `develop` and `main` are up to date and create a release with gitflow: `git checkout main; git pull; git checkout develop; git pull; git flow release start '1.2.3'`
+        - [ ] Create release with gitflow, branch name `release/1.2.3`
         - [ ] Check the crashes from the PlayStore
         - [ ] Check the rageshake with the current dev version: https://github.com/matrix-org/element-android-rageshakes/labels/1.2.3-dev
         - [ ] Run the integration test, and especially `UiAllScreensSanityTest.allScreensTest()`
         - [ ] Create an account on matrix.org and do some smoke tests that the sanity test does not cover like: 1-1 call, 1-1 video call, Jitsi call for instance
-        - [ ] Run towncrier: `towncrier build --version v1.2.3 --draft` (remove `--draft` do write the file CHANGES.md)
+        - [ ] Run towncrier: `towncrier --version v1.2.3 --draft` (remove `--draft` do write the file CHANGES.md)
+        - [ ] Check that the folder `changelog.d` is empty. It can happen that some remaining files stay here
         - [ ] Check the file CHANGES.md consistency. It's possible to reorder items (most important changes first) or change their section if relevant. Also an opportunity to fix some typo, or rewrite things
         - [ ] Add file for fastlane under ./fastlane/metadata/android/en-US/changelogs
         - [ ] (optional) Push the branch and start a draft PR (will not be merged), to check that the CI is happy with all the changes.
-        - [ ] Finish release with gitflow, delete the draft PR (if created): `git flow release finish '1.2.3'`
-        - [ ] Push `main` and the new tag `v1.2.3` to origin: `git push origin main; git push origin 'v1.2.3'`
-        - [ ] Checkout `develop`: `git checkout develop`
+        - [ ] Finish release with gitflow, delete the draft PR (if created)
+        - [ ] Push `main` and the new tag `v1.2.3` to origin
+        - [ ] Checkout `develop`
         - [ ] Increase version (versionPatch + 2) in `./vector/build.gradle`
         - [ ] Change the value of SDK_VERSION in the file `./matrix-sdk-android/build.gradle`
-        - [ ] Commit and push `develop`: `git commit -m 'version++'; git push origin develop`
+        - [ ] Commit and push `develop`
         - [ ] Wait for [Buildkite](https://buildkite.com/matrix-dot-org/element-android/builds?branch=main) to build the `main` branch.
         - [ ] Run the script `~/scripts/releaseElement.sh`. It will download the APKs from Buildkite check them and sign them.
         - [ ] Install the APK on your phone to check that the upgrade went well (no init sync, etc.)
@@ -48,34 +47,24 @@ body:
 
         ### Once tested and validated internally
 
-        - [ ] Create a new open testing release on the GooglePlay console and upload the 4 signed Apks.
+        - [ ] Create a new beta release on the GooglePlay console and upload the 4 signed Apks.
         - [ ] Check that the version codes are correct
         - [ ] Copy the fastlane change to the GooglePlay console in the section en-GB.
-        - [ ] Push the open testing release to 100% of the users
-        - [ ] Notify the F-Droid team [here](https://matrix.to/#/!LAAuJLQXYHjMNWKrCK:matrix.org?via=matrix.org&via=bubu1.eu&via=lant.uk) so that they can schedule the publication on F-Droid
-        - [ ] The application is available to the PlayStore testers (live). Google can take between 1 hour and up to 7 days to approve the release.
-        - [ ] The application is available to the F-Droid users.
+        - [ ] Push to beta release to 100% of the users
+        - [ ] Notify the F-Droid team so that they can schedule the publication on F-Droid
 
-        ### Once open testing is live on PlayStore
+        ### Once Live on PlayStore
 
         - [ ] Ping the Android public room and update its topic
+        - [ ] Add an entry in the internal diary
 
-        ### Once Live on F-Droid
-
-        - [ ] Update the Android public room topic
-
-        ### After at least 2 days (generally next Monday)
+        ### After at least 2 days
 
         - [ ] Check the [rageshakes](https://github.com/matrix-org/element-android-rageshakes/issues)
         - [ ] Check the crash reports on the GooglePlay console
         - [ ] Check the Android Element room for any reported issues on the new version
-        - [ ] If all is OK, promote the open testing release to production. Generally using a 100% roll out, but can be a smaller value depending on the release content.
-        - [ ] The application is available to the PlayStore users (live). Google can take (again!) between 1 hour and up to 7 days to approve the release.
-
-        ### Once production is live on PlayStore
-
-        - [ ] Ping the Android public room and update its topic
-        - [ ] Add an entry in the internal diary
+        - [ ] If all is OK, push to production and notify Markus (Bubu) to release the F-Droid version
+        - [ ] Ping the Android public room and update its topic with the new available version
 
         ### Android SDK2
 
@@ -99,20 +88,12 @@ body:
 
         ##### Release on MavenCentral
 
-        - [ ] Checkout the branch `main`
         - [ ] Run the command `./gradlew publish --no-daemon --no-parallel`. You'll need some non-public element to do so
-        - [ ] Run the command `./gradlew closeAndReleaseRepository`. If it is working well, you can jump directly to the final step of this section.
-
-        If `./gradlew closeAndReleaseRepository` fails (for instance, several repositories are waiting to be handled), you have to close and release the repository manually. Do the following steps:
-
         - [ ] Connect to https://s01.oss.sonatype.org
         - [ ] Click on Staging Repositories and check the the files have been uploaded
         - [ ] Click on close
         - [ ] Wait (check Activity tab until step "Repository closed" is displayed)
         - [ ] Click on release. The staging repository will disappear
-
-        Final step
-
         - [ ] Check that the release is available in https://repo1.maven.org/maven2/org/matrix/android/matrix-android-sdk2/ (it can take a few minutes)
 
         ##### Release on GitHub
@@ -124,7 +105,7 @@ body:
 
         https://github.com/matrix-org/matrix-android-sdk2-sample
 
-        - [ ] Update the dependency to the new version of the SDK2. It can take a few minutes for MavenCentral to make the library available. You can check status on https://repo1.maven.org/maven2/org/matrix/android/matrix-android-sdk2/
+        - [ ] Update the dependency to the new version of the SDK2. It can take some time for MavenCentral to make the librarie available. You can check status on https://repo1.maven.org/maven2/org/matrix/android/matrix-android-sdk2/
         - [ ] Build and run the sample, you may have to fix some API break
         - [ ] Commit and push directly on `main`
     validations:

.github/PULL_REQUEST_TEMPLATE.md

@@ -17,17 +17,7 @@
 
 ## Screenshots / GIFs
 
-<!-- Only if UI have been changed
-You can use a table like this to show screenshots comparison.
-Uncomment this markdown table below and edit the last line `|||`:
-|copy screenshot of before here|copy screenshot of after here|
--->
-
-<!--
-|Before|After|
-|-|-|
-|||
- -->
+<!-- Only if UI have been changed -->
 
 ## Tests
 

.github/dependabot.yml

@@ -10,8 +10,6 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
-    reviewers:
-      - "vector-im/element-android-reviewers"
     ignore:
       - dependency-name: "*github-script*"
   # Updates for Gradle dependencies used in the app
@@ -21,6 +19,6 @@ updates:
       interval: "daily"
     open-pull-requests-limit: 200
     reviewers:
-      - "vector-im/element-android-reviewers"
+      - "bmarty"
     ignore:
       - dependency-name: com.google.zxing:core

.github/workflows/build.yml

@@ -7,8 +7,9 @@ on:
 
 # Enrich gradle.properties for CI/CD
 env:
-  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
-  CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 2 --no-daemon
+  CI_GRADLE_ARG_PROPERTIES: >
+    -Porg.gradle.jvmargs=-Xmx2g
+    -Porg.gradle.parallel=false
 
 jobs:
   debug:
@@ -24,8 +25,8 @@ jobs:
       group: ${{ github.ref == 'refs/heads/develop' && format('integration-tests-develop-{0}-{1}', matrix.target, github.sha) || format('build-debug-{0}-{1}', matrix.target, github.ref)  }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v2
         with:
           path: |
             ~/.gradle/caches
@@ -34,23 +35,22 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Assemble ${{ matrix.target }} debug apk
-        run: ./gradlew assemble${{ matrix.target }}Debug $CI_GRADLE_ARG_PROPERTIES
+        run: ./gradlew assemble${{ matrix.target }}Debug $CI_GRADLE_ARG_PROPERTIES --stacktrace
       - name: Upload ${{ matrix.target }} debug APKs
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: vector-${{ matrix.target }}-debug
           path: |
-            vector-app/build/outputs/apk/*/debug/*.apk
+            vector/build/outputs/apk/*/debug/*.apk
 
   release:
     name: Build unsigned GPlay APKs
     runs-on: ubuntu-latest
-    concurrency:
-      group: ${{ github.ref == 'refs/head/main' && format('build-release-apk-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('build-release-apk-develop-{0}', github.sha) || format('build-debug-{0}', github.ref)  }}
-      cancel-in-progress: ${{ github.ref != 'refs/head/main' }}
+    if: github.ref == 'refs/heads/main'
+    # Only runs on main, no concurrency.
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v2
         with:
           path: |
             ~/.gradle/caches
@@ -59,34 +59,12 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Assemble GPlay unsigned apk
-        run: ./gradlew clean assembleGplayRelease $CI_GRADLE_ARG_PROPERTIES
+        run: ./gradlew clean assembleGplayRelease $CI_GRADLE_ARG_PROPERTIES  --stacktrace
       - name: Upload Gplay unsigned APKs
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: vector-gplay-release-unsigned
           path: |
-            vector-app/build/outputs/apk/*/release/*.apk
+            vector/build/outputs/apk/*/release/*.apk
 
-  exodus:
-    runs-on: ubuntu-latest
-    needs: release
-    steps:
-      - name: Obtain apk from artifact
-        id: download
-        uses: actions/download-artifact@v3
-        with:
-          name: vector-gplay-release-unsigned
-      - name: Show apks in artifact
-        run: ls -R ${{steps.download.outputs.download-path}}
-      - name: Execute exodus-standalone
-        uses: docker://exodusprivacy/exodus-standalone:latest
-        with:
-          args: /github/workspace/gplay/release/vector-gplay-universal-release-unsigned.apk -j -o /github/workspace/exodus.json
-      - name: Upload exodus json report
-        uses: actions/upload-artifact@v3
-        with:
-          name: exodus.json
-          path: |
-            exodus.json
-      - name: Check for trackers
-        run: "jq -e '.trackers == []' exodus.json > /dev/null || { echo '::error static analysis identified user tracking library' ; exit 1; }"
+# TODO: add exodus checks

.github/workflows/danger.yml

@@ -1,20 +0,0 @@
-name: Danger CI
-
-on: [pull_request]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    name: Danger
-    steps:
-      - uses: actions/checkout@v3
-      - run: |
-          npm install --save-dev @babel/plugin-transform-flow-strip-types
-      - name: Danger
-        uses: danger/danger-js@11.1.4
-        with:
-          args: "--dangerfile tools/danger/dangerfile.js"
-        env:
-          DANGER_GITHUB_API_TOKEN: ${{ secrets.DANGER_GITHUB_API_TOKEN }}
-          # Fallback for forks
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/docs.yml

@@ -1,22 +0,0 @@
-name: Documentation
-
-on:
-  push:
-    branches: [ develop ]
-
-jobs:
-  docs:
-    name: Generate and publish Android Matrix SDK documentation
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Build docs
-        run: ./gradlew dokkaHtml
-
-      - name: Deploy docs
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./matrix-sdk-android/build/dokka/html

.github/workflows/gradle-wrapper-validation.yml

@@ -1,8 +1,5 @@
 name: "Validate Gradle Wrapper"
-on:
-  pull_request: { }
-  push:
-    branches: [ main, develop ]
+on: [push, pull_request]
 
 jobs:
   validation:
@@ -10,5 +7,5 @@ jobs:
     runs-on: ubuntu-latest
     # No concurrency required, this is a prerequisite to other actions and should run every time.
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - uses: gradle/wrapper-validation-action@v1

.github/workflows/nightly.yml

@@ -1,25 +1,32 @@
-name: Build and release nightly APK
+name: Nightly Tests
 
 on:
+  push:
+    branches: [ release/* ]
   schedule:
-    # Every nights at 4
-    - cron: "0 4 * * *"
+    # At 20:00 every day UTC
+    - cron: '0 20 * * *'
+  workflow_dispatch:
 
+# Enrich gradle.properties for CI/CD
 env:
-  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
-  CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 2 --no-daemon
-
+  CI_GRADLE_ARG_PROPERTIES: >
+    -Porg.gradle.jvmargs=-Xmx4g
+    -Porg.gradle.parallel=false
+    -PallWarningsAsErrors=false
 jobs:
-  nightly:
-    name: Build and publish nightly Gplay APK to Firebase
-    runs-on: ubuntu-latest
+  # Build Android Tests [Matrix SDK]
+  build-android-test-matrix-sdk:
+    name: Matrix SDK - Build Android Tests
+    runs-on: macos-latest
+    # No concurrency required, runs every time on a schedule.
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v4
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v2
         with:
-          python-version: 3.8
-      - uses: actions/cache@v3
+          distribution: 'adopt'
+          java-version: 11
+      - uses: actions/cache@v2
         with:
           path: |
             ~/.gradle/caches
@@ -27,20 +34,226 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
-      - name: Install towncrier
+      - name: Build Android Tests for matrix-sdk-android
+        run: ./gradlew clean matrix-sdk-android:assembleAndroidTest $CI_GRADLE_ARG_PROPERTIES --stacktrace
+
+  # Build Android Tests [Matrix APP]
+  build-android-test-app:
+    name: App - Build Android Tests
+    runs-on: macos-latest
+    # No concurrency required, runs every time on a schedule.
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: 11
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Build Android Tests for vector
+        run: ./gradlew clean vector:assembleAndroidTest $CI_GRADLE_ARG_PROPERTIES --stacktrace
+
+  # Run Android Tests
+  integration-tests:
+    name: Matrix SDK - Integration Tests
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        api-level: [ 28 ]
+    # No concurrency required, runs every time on a schedule.
+    steps:
+      - uses: actions/checkout@v2
+      - uses: gradle/wrapper-validation-action@v1
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: 11
+      - name: Set up Python 3.8
+        uses: actions/setup-python@v3
+        with:
+          python-version: 3.8
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Start synapse server
         run: |
-          python3 -m pip install towncrier
-      - name: Prepare changelog file
+          pip install matrix-synapse
+          curl https://raw.githubusercontent.com/matrix-org/synapse/develop/demo/start.sh -o start.sh
+          chmod 777 start.sh
+          ./start.sh --no-rate-limit
+      # package: org.matrix.android.sdk.session
+      - name: Run integration tests for  Matrix SDK [org.matrix.android.sdk.session] API[${{ matrix.api-level }}]
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ matrix.api-level }}
+          arch: x86
+          profile: Nexus 5X
+          force-avd-creation: false
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          emulator-build: 7425822
+          script: |
+            adb root
+            adb logcat -c
+            touch emulator-all.log
+            chmod 777 emulator-all.log
+            adb logcat >> emulator-all.log &
+            ./gradlew $CI_GRADLE_ARG_PROPERTIES matrix-sdk-android:connectedDebugAndroidTest
+      - name: Read Results
+        if: always()
+        id: get-comment-body
+        run: python3 ./tools/ci/render_test_output.py all ./matrix-sdk-android/build/outputs/androidTest-results/connected/*.xml
+      - name: Remove adb logcat
+        if: always()
+        run: pkill -9 adb
+      - name: Upload Test Report Log
+        uses: actions/upload-artifact@v2
+        if: always()
+        with:
+          name: integrationtest-error-results
+          path: |
+            emulator-all.log
+
+  ui-tests:
+    name: UI Tests
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        api-level: [ 28 ]
+    # No concurrency required, runs every time on a schedule.
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python 3.8
+        uses: actions/setup-python@v3
+        with:
+          python-version: 3.8
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Start synapse server
         run: |
-          mv towncrier.toml towncrier.toml.bak
-          sed 's/CHANGES\.md/CHANGES_NIGHTLY\.md/' towncrier.toml.bak > towncrier.toml
-          rm towncrier.toml.bak
-          yes n | towncrier build --version nightly
-      - name: Build and upload Gplay Nightly APK
-        run: |
-          ./gradlew assembleGplayNightly appDistributionUploadGplayNightly $CI_GRADLE_ARG_PROPERTIES
+          pip install matrix-synapse
+          curl -sL https://raw.githubusercontent.com/matrix-org/synapse/develop/demo/start.sh \
+            | sed s/127.0.0.1/0.0.0.0/g | sed 's/http:\/\/localhost/http:\/\/10.0.2.2/g' | bash -s -- --no-rate-limit
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: '11'
+      - name: Run sanity tests on API ${{ matrix.api-level }}
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ matrix.api-level }}
+          arch: x86
+          profile: Nexus 5X
+          force-avd-creation: false
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          emulator-build: 7425822  # workaround to emulator bug: https://github.com/ReactiveCircus/android-emulator-runner/issues/160
+          script: |
+            adb root
+            adb logcat -c
+            touch emulator.log
+            chmod 777 emulator.log
+            adb logcat >> emulator.log &
+            ./gradlew $CI_GRADLE_ARG_PROPERTIES -PallWarningsAsErrors=false connectedGplayDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=im.vector.app.ui.UiAllScreensSanityTest || (adb pull storage/emulated/0/Pictures/failure_screenshots && exit 1 )
+      - name: Upload Test Report Log
+        uses: actions/upload-artifact@v2
+        if: always()
+        with:
+          name: uitest-error-results
+          path: |
+            emulator.log
+            failure_screenshots/
+
+  codecov-units:
+    name: Unit tests (with code coverage)
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v2
+        with: 
+          distribution: 'adopt'
+          java-version: '11'
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - run: ./gradlew allCodeCoverageReport $CI_GRADLE_ARG_PROPERTIES
+      - name: Upload Codecov data
+        uses: actions/upload-artifact@v2
+        if: always()
+        with:
+          name: codecov-xml
+          path: |
+            build/reports/jacoco/allCodeCoverageReport/allCodeCoverageReport.xml
+
+  sonarqube:
+    name: Sonaqube scan and coverage report
+    runs-on: macos-latest
+    if: always()
+    needs:
+      - codecov-units
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: '11'
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - uses: actions/download-artifact@v3
+        with:
+          name: codecov-xml # will restore to allCodeCoverageReport.xml by default; we restore to the same location in following tasks
+      - run: mkdir -p build/reports/jacoco/allCodeCoverageReport/
+      - run: mv allCodeCoverageReport.xml build/reports/jacoco/allCodeCoverageReport/
+      - run: ./gradlew sonarqube $CI_GRADLE_ARG_PROPERTIES
         env:
-          ELEMENT_ANDROID_NIGHTLY_KEYID: ${{ secrets.ELEMENT_ANDROID_NIGHTLY_KEYID }}
-          ELEMENT_ANDROID_NIGHTLY_KEYPASSWORD: ${{ secrets.ELEMENT_ANDROID_NIGHTLY_KEYPASSWORD }}
-          ELEMENT_ANDROID_NIGHTLY_STOREPASSWORD: ${{ secrets.ELEMENT_ANDROID_NIGHTLY_STOREPASSWORD }}
-          FIREBASE_TOKEN: ${{ secrets.ELEMENT_ANDROID_NIGHTLY_FIREBASE_TOKEN }}
+          ORG_GRADLE_PROJECT_SONAR_LOGIN: ${{ secrets.SONAR_TOKEN }}
+
+# Notify the channel about scheduled runs, do not notify for manually triggered runs
+  notify:
+    name: Matrix Notification
+    runs-on: ubuntu-latest
+    needs:
+      - integration-tests
+      - ui-tests
+      - codecov-units
+      - build-android-test-matrix-sdk 
+      - build-android-test-app
+      - sonarqube
+    if: always() && github.event_name != 'workflow_dispatch'
+    # No concurrency required, runs every time on a schedule.
+    steps:
+      - uses: michaelkaye/matrix-hookshot-action@v0.3.0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          matrix_access_token: ${{ secrets.ELEMENT_ANDROID_NOTIFICATION_ACCESS_TOKEN }}
+          matrix_room_id: ${{ secrets.ELEMENT_ANDROID_INTERNAL_ROOM_ID }}
+          text_template: "Nightly test run: {{#each job_statuses }}{{#with this }}{{#if completed }}  {{name}} {{conclusion}} at {{completed_at}}, {{/if}}{{/with}}{{/each}}"
+          html_template: "Nightly test run results: {{#each job_statuses }}{{#with this }}{{#if completed }}<br />{{ icon conclusion }}{{name}} <font colour='{{color conclusion}}'>{{conclusion}} at {{completed_at}} <a href=\"{{html_url}}\">[details]</a></font>{{/if}}{{/with}}{{/each}}"

.github/workflows/post-pr.yml

@@ -1,105 +0,0 @@
-name: Integration Tests
-
-# This runs for all closed pull requests against main, including those closed without merge.
-# Further filtering occurs in 'should-i-run'
-
-on:
-  pull_request:
-    types: [closed]
-    branches: [develop]
-
-# Enrich gradle.properties for CI/CD
-env:
-  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
-  CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 2 --no-daemon
-
-jobs:
-
-  # More info on should-i-run:
-  # If this fails to run (the IF doesn't complete) then the needs will not be satisfied for any of the 
-  # other jobs below, so none will run.
-  # except for the notification job at the bottom which will run all the time, unless should-i-run isn't
-  # successful, or all the other jobs have succeeded
-
-  should-i-run:
-    name: Check if PR is suitable for analysis
-    runs-on: ubuntu-latest
-    if: github.event.pull_request.merged # Additionally require PR to have been completely merged.
-    steps:
-      - run: echo "Run those tests!" # no-op success
-        
-  ui-tests:
-    name: UI Tests (Synapse)
-    needs: should-i-run
-    runs-on: buildjet-4vcpu-ubuntu-2204
-    strategy:
-      fail-fast: false
-      matrix:
-        api-level: [ 28 ]
-    # No concurrency required, runs every time on a schedule.
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v4
-        with:
-          python-version: 3.8
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-      - name: Start synapse server
-        uses: michaelkaye/setup-matrix-synapse@v1.0.4
-        with:
-          uploadLogs: true
-          httpPort: 8080
-          disableRateLimiting: true
-          public_baseurl: "http://10.0.2.2:8080/"
-      - uses: actions/setup-java@v3
-        with:
-          distribution: 'adopt'
-          java-version: '11'
-      - name: Run sanity tests on API ${{ matrix.api-level }}
-        uses: reactivecircus/android-emulator-runner@v2
-        with:
-          api-level: ${{ matrix.api-level }}
-          arch: x86
-          profile: Nexus 5X
-          force-avd-creation: false
-          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-          emulator-build: 7425822  # workaround to emulator bug: https://github.com/ReactiveCircus/android-emulator-runner/issues/160
-          script: |
-            adb root
-            adb logcat -c
-            touch emulator.log
-            chmod 777 emulator.log
-            adb logcat >> emulator.log &
-            ./gradlew $CI_GRADLE_ARG_PROPERTIES connectedGplayDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=im.vector.app.ui.UiAllScreensSanityTest || (adb pull storage/emulated/0/Pictures/failure_screenshots && exit 1 )
-      - name: Upload Test Report Log
-        uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: uitest-error-results
-          path: |
-            emulator.log
-            failure_screenshots/
-
-# Notify the channel about delayed failures
-  notify:
-    name: Notify matrix
-    runs-on: ubuntu-latest
-    needs:
-      - should-i-run
-      - ui-tests
-    if: always() && (needs.should-i-run.result == 'success' ) && (needs.ui-tests.result != 'success')
-    # No concurrency required, runs every time on a schedule.
-    steps:
-      - uses: michaelkaye/matrix-hookshot-action@v1.0.0
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          hookshot_url: ${{ secrets.ELEMENT_ANDROID_HOOKSHOT_URL }}
-          text_template: "Post-merge validation of ${{ github.head_ref }} into ${{ github.base_ref }} by ${{ github.event.pull_request.merged_by.login }} failed: {{#each job_statuses }}{{#with this }}{{#if completed }}  {{name}} {{conclusion}} at {{completed_at}}, {{/if}}{{/with}}{{/each}}"
-          html_template: "Post-merge validation of ${{ github.head_ref }} into ${{ github.base_ref }} by ${{ github.event.pull_request.merged_by.login }} failed: {{#each job_statuses }}{{#with this }}{{#if completed }}<br />{{icon conclusion}} {{name}} <font color='{{color conclusion}}'>{{conclusion}} at {{completed_at}} <a href=\"{{html_url}}\">[details]</a></font>{{/if}}{{/with}}{{/each}}"

.github/workflows/quality.yml

@@ -5,90 +5,145 @@ on:
   push:
     branches: [ main, develop ]
 
-# Enrich gradle.properties for CI/CD
-env:
-  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -XX:MaxPermSize=512m -Dkotlin.daemon.jvm.options="-Xmx2g" -Dkotlin.incremental=false
-  CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 2 --no-daemon
-
 jobs:
   check:
     name: Project Check Suite
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - name: Run code quality check suite
         run: ./tools/check/check_code_quality.sh
 
-  # Knit for all the modules (https://github.com/Kotlin/kotlinx-knit)
-  knit:
-    name: Knit
+# ktlint for all the modules
+  ktlint:
+    name: Kotlin Linter
     runs-on: ubuntu-latest
+    # Allow all jobs on main and develop. Just one per PR.
+    concurrency:
+      group: ${{ github.ref == 'refs/heads/main' && format('ktlint-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('ktlint-develop-{0}', github.sha) || format('ktlint-{0}', github.ref) }}
+      cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v3
-      - name: Run knit
+      - uses: actions/checkout@v2
+      - name: Run ktlint
         run: |
-          ./gradlew knitCheck $CI_GRADLE_ARG_PROPERTIES
+          ./gradlew ktlintCheck --continue
+      - name: Upload reports
+        if: always()
+        uses: actions/upload-artifact@v2
+        with:
+          name: ktlinting-report
+          path: |
+            */build/reports/ktlint/ktlint*/ktlint*.txt
+      - name: Handle Results
+        if: always()
+        id: ktlint-results
+        run: |
+          results="$(cat */*/build/reports/ktlint/ktlint*/ktlint*.txt */build/reports/ktlint/ktlint*/ktlint*.txt | sed -r "s/\x1B\[([0-9]{1,3}(;[0-9]{1,2})?)?[mGK]//g")"
+          if [ -z  "$results" ]; then
+            echo "::set-output name=add_comment::false"
+          else
+            body="👎\`Failed${results}\`"
+            body="${body//'%'/'%25'}"
+            body="${body//$'\n'/'%0A'}"
+            body="${body//$'\r'/'%0D'}"
+            body="$( echo $body | sed 's/\/home\/runner\/work\/element-android\/element-android\//\`<br\/>\`/g')"
+            body="$( echo $body | sed 's/\/src\/main\/java\// 🔸 /g')"
+            body="$( echo $body | sed 's/im\/vector\/app\///g')"
+            body="$( echo $body | sed 's/im\/vector\/lib\/attachmentviewer\///g')"
+            body="$( echo $body | sed 's/im\/vector\/lib\/multipicker\///g')"
+            body="$( echo $body | sed 's/im\/vector\/lib\///g')"
+            body="$( echo $body | sed 's/org\/matrix\/android\/sdk\///g')"
+            body="$( echo $body | sed 's/\/src\/androidTest\/java\// 🔸 /g')"
+            echo "::set-output name=add_comment::true"
+            echo "::set-output name=body::$body"
+          fi
+      - name: Find Comment
+        if: always() && github.event_name == 'pull_request'
+        uses: peter-evans/find-comment@v1
+        id: fc
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-author: 'github-actions[bot]'
+          body-includes: Ktlint Results
+      - name: Add comment if needed
+        if: always() && github.event_name == 'pull_request' && steps.ktlint-results.outputs.add_comment == 'true'
+        uses: peter-evans/create-or-update-comment@v1
+        with:
+          comment-id: ${{ steps.fc.outputs.comment-id }}
+          issue-number: ${{ github.event.pull_request.number }}
+          body: |
+            ### Ktlint Results
 
-  # Check the project: ktlint, detekt, lint
-  lint:
+            ${{ steps.ktlint-results.outputs.body }}
+          edit-mode: replace
+      - name: Delete comment if needed
+        if: always() && github.event_name == 'pull_request' && steps.fc.outputs.comment-id != '' && steps.ktlint-results.outputs.add_comment == 'false'
+        uses: actions/github-script@v3
+        with:
+          script: |
+            github.issues.deleteComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              comment_id: ${{ steps.fc.outputs.comment-id }}
+            })
+
+# Lint for main module
+  android-lint:
     name: Android Linter
     runs-on: ubuntu-latest
     # Allow all jobs on main and develop. Just one per PR.
     concurrency:
-      group: ${{ github.ref == 'refs/heads/main' && format('lint-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('lint-develop-{0}', github.sha) || format('lint-{0}', github.ref) }}
+      group: ${{ github.ref == 'refs/heads/main' && format('android-lint-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('android-lint-develop-{0}', github.sha) || format('android-lint-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v3
-      - name: Run ktlint
-        run: |
-          ./gradlew ktlintCheck $CI_GRADLE_ARG_PROPERTIES --continue
-      - name: Run detekt
-        if: always()
-        run: |
-          ./gradlew detekt $CI_GRADLE_ARG_PROPERTIES
-      - name: Run lint
-        # Not always, if ktlint or detekt fail, avoid running the long lint check.
-        run: |
-          ./gradlew vector-app:lintGplayRelease $CI_GRADLE_ARG_PROPERTIES
-          ./gradlew vector-app:lintFdroidRelease $CI_GRADLE_ARG_PROPERTIES
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Lint analysis
+        run: ./gradlew clean :vector:lint --stacktrace
       - name: Upload reports
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
-          name: linting-report
+          name: lint-report
           path: |
-            */build/reports/**/*.*
-      - name: Prepare Danger
-        if: always()
-        run: |
-          npm install --save-dev @babel/core
-          npm install --save-dev @babel/plugin-transform-flow-strip-types
-          yarn add danger-plugin-lint-report --dev
-      - name: Danger lint
-        if: always()
-        uses: danger/danger-js@11.1.4
-        with:
-          args: "--dangerfile tools/danger/dangerfile-lint.js"
-        env:
-          DANGER_GITHUB_API_TOKEN: ${{ secrets.DANGER_GITHUB_API_TOKEN }}
-          # Fallback for forks
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            vector/build/reports/*.*
 
-  # Gradle dependency analysis using https://github.com/autonomousapps/dependency-analysis-android-gradle-plugin
-  dependency-analysis:
-    name: Dependency analysis
+# Lint for Gplay and Fdroid release APK
+  apk-lint:
+    name: Lint APK (${{ matrix.target }})
     runs-on: ubuntu-latest
-    # Allow all jobs on main and develop. Just one per PR.
+    if: github.ref != 'refs/heads/main'
+    strategy:
+      fail-fast: false
+      matrix:
+        target: [ Gplay, Fdroid ]
+    # Allow all jobs on develop. Just one per PR.
     concurrency:
-      group: ${{ github.ref == 'refs/heads/main' && format('dep-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('dep-develop-{0}', github.sha) || format('dep-{0}', github.ref) }}
+      group: ${{ github.ref == 'refs/heads/develop' && format('apk-lint-develop-{0}-{1}', matrix.target, github.sha) || format('apk-lint-{0}-{1}', matrix.target, github.ref) }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v3
-      - name: Dependency analysis
-        run: ./gradlew dependencyCheckAnalyze $CI_GRADLE_ARG_PROPERTIES
-      - name: Upload dependency analysis
-        if: always()
-        uses: actions/upload-artifact@v3
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v2
         with:
-          name: dependency-analysis
-          path: build/reports/dependency-check-report.html
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Lint ${{ matrix.target }} release
+        run: ./gradlew clean lint${{ matrix.target }}Release --stacktrace
+      - name: Upload ${{ matrix.target }} linting report
+        if: always()
+        uses: actions/upload-artifact@v2
+        with:
+          name: release-lint-report-${{ matrix.target }}
+          path: |
+            vector/build/reports/*.*

.github/workflows/sync-from-external-sources.yml

@@ -11,9 +11,9 @@ jobs:
     if: github.repository == 'vector-im/element-android'
     # No concurrency required, runs every time on a schedule.
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - name: Set up Python 3.8
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v3
         with:
           python-version: 3.8
       - name: Install Prerequisite dependencies
@@ -23,7 +23,7 @@ jobs:
       - name: Run Emoji script
         run: ./tools/import_emojis.py
       - name: Create Pull Request for Emojis
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v3
         with:
           commit-message: Sync Emojis
           title: Sync Emojis
@@ -38,9 +38,9 @@ jobs:
     if: github.repository == 'vector-im/element-android'
     # No concurrency required, runs every time on a schedule.
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - name: Set up Python 3.8
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v3
         with:
           python-version: 3.8
       - name: Install Prerequisite dependencies
@@ -49,7 +49,7 @@ jobs:
       - name: Run SAS String script
         run: ./tools/import_sas_strings.py
       - name: Create Pull Request for SAS Strings
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v3
         with:
           commit-message: Sync SAS Strings
           title: Sync SAS Strings
@@ -64,11 +64,11 @@ jobs:
     if: github.repository == 'vector-im/element-android'
     # No concurrency required, runs every time on a schedule.
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - name: Run analytics import script
         run: ./tools/import_analytic_plan.sh
       - name: Create Pull Request for analytics plan
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v3
         with:
           commit-message: Sync analytics plan
           title: Sync analytics plan

.github/workflows/tests.yml

@@ -1,151 +1,43 @@
 name: Test
 
 on:
-  pull_request: { }
+  pull_request: {}
   push:
-    branches: [ main, develop ]
+    branches: [main, develop]
 
 # Enrich gradle.properties for CI/CD
 env:
-  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
-  CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 4 --no-daemon
+  CI_GRADLE_ARG_PROPERTIES: >
+    -Porg.gradle.jvmargs=-Xmx2g
+    -Porg.gradle.parallel=false
 
 jobs:
-  tests:
-    name: Runs all tests
-    runs-on: buildjet-4vcpu-ubuntu-2204
-    strategy:
-      matrix:
-        api-level: [28]
+  unit-tests:
+    name: Run Unit Tests
+    runs-on: ubuntu-latest
     # Allow all jobs on main and develop. Just one per PR.
     concurrency:
       group: ${{ github.ref == 'refs/heads/main' && format('unit-tests-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('unit-tests-develop-{0}', github.sha) || format('unit-tests-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v2
         with:
-          lfs: true
-          fetch-depth: 0
-      - uses: actions/setup-java@v3
-        with:
-          distribution: 'adopt'
-          java-version: '11'
-      - uses: gradle/gradle-build-action@v2
-        with:
-          cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
-          gradle-home-cache-cleanup: ${{ github.ref == 'refs/heads/develop' }}
-
-      - name: Run screenshot tests
-        run: ./gradlew verifyScreenshots $CI_GRADLE_ARG_PROPERTIES
-
-      - name: Archive Screenshot Results on Error
-        if: failure()
-        uses: actions/upload-artifact@v3
-        with:
-          name: screenshot-results
           path: |
-            **/out/failures/
-            **/build/reports/tests/*UnitTest/
-
-      - uses: actions/setup-python@v4
-        with:
-          python-version: 3.8
-      - uses: michaelkaye/setup-matrix-synapse@v1.0.4
-        with:
-          uploadLogs: true
-          httpPort: 8080
-          disableRateLimiting: true
-          public_baseurl: "http://10.0.2.2:8080/"
-
-      - name: Run all the codecoverage tests at once
-        uses: reactivecircus/android-emulator-runner@v2
-        # continue-on-error: true
-        with:
-          api-level: ${{ matrix.api-level }}
-          arch: x86
-          profile: Nexus 5X
-          target: playstore
-          force-avd-creation: false
-          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-          disable-animations: true
-          # emulator-build: 7425822
-          script: |
-            ./gradlew gatherGplayDebugStringTemplates $CI_GRADLE_ARG_PROPERTIES
-            ./gradlew unitTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
-            ./gradlew instrumentationTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
-            ./gradlew generateCoverageReport $CI_GRADLE_ARG_PROPERTIES
-      # NB: continue-on-error marks steps.tests.conclusion = 'success' but leaves steps.tests.outcome = 'failure'
-      ### - name: Run all the codecoverage tests at once (retry if emulator failed)
-      ###   uses: reactivecircus/android-emulator-runner@v2
-      ###   if: always() && steps.tests.outcome == 'failure' # don't run if previous step succeeded.
-      ###   with:
-      ###     api-level: 28
-      ###     arch: x86
-      ###     profile: Nexus 5X
-      ###     force-avd-creation: false
-      ###     emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-      ###     disable-animations: true
-      ###     emulator-build: 7425822
-      ###     script: |
-      ###       ./gradlew gatherGplayDebugStringTemplates $CI_GRADLE_ARG_PROPERTIES
-      ###       ./gradlew unitTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
-      ###       ./gradlew instrumentationTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
-      ###       ./gradlew generateCoverageReport $CI_GRADLE_ARG_PROPERTIES
-
-      - name: Upload Integration Test Report Log
-        uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: integration-test-error-results
-          path: |
-            */build/outputs/androidTest-results/connected/
-            */build/reports/androidTests/connected/
-
-      # we may have failed a previous step and retried, that's OK
-      - name: Publish results to Sonar
-        env:
-          GITHUB_TOKEN: ${{ secrets.SONARQUBE_GITHUB_API_TOKEN }}  # Needed to get PR information, if any
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-          ORG_GRADLE_PROJECT_SONAR_LOGIN: ${{ secrets.SONAR_TOKEN }}
-        if: ${{ always() && env.GITHUB_TOKEN != '' && env.SONAR_TOKEN != '' && env.ORG_GRADLE_PROJECT_SONAR_LOGIN != '' }}
-        run: ./gradlew sonarqube $CI_GRADLE_ARG_PROPERTIES
-
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Run unit tests
+        run: ./gradlew clean test $CI_GRADLE_ARG_PROPERTIES -PallWarningsAsErrors=false --stacktrace
       - name: Format unit test results
         if: always()
         run: python3 ./tools/ci/render_test_output.py unit ./**/build/test-results/**/*.xml
-
-# can't be run on macos due to containers.
-#      - name: Publish Unit Test Results
-#        uses: EnricoMi/publish-unit-test-result-action@v1
-#        if: always() &&
-#          github.event.sender.login != 'dependabot[bot]' &&
-#          ( github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository )
-#        with:
-#          files: ./**/build/test-results/**/*.xml
-
-# Unneeded as part of the test suite above, kept around in case we want to re-enable them.
-#
-#  # Build Android Tests
-#  build-android-tests: 
-#    name: Build Android Tests 
-#    runs-on: ubuntu-latest 
-#    concurrency:
-#      group: ${{ github.ref == 'refs/heads/main' && format('unit-tests-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('unit-tests-develop-{0}', github.sha) || format('build-android-tests-{0}', github.ref) }}
-#      cancel-in-progress: true
-#    steps: 
-#      - uses: actions/checkout@v3 
-#      - uses: actions/setup-java@v3 
-#        with: 
-#          distribution: 'adopt' 
-#          java-version: 11 
-#      - uses: actions/cache@v3 
-#        with: 
-#          path: | 
-#            ~/.gradle/caches 
-#            ~/.gradle/wrapper 
-#          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} 
-#          restore-keys: | 
-#            ${{ runner.os }}-gradle- 
-#      - name: Build Android Tests  
-#        run: ./gradlew clean assembleAndroidTest $CI_GRADLE_ARG_PROPERTIES
-
+      - name: Publish Unit Test Results
+        uses: EnricoMi/publish-unit-test-result-action@v1
+        if: always() &&
+          github.event.sender.login != 'dependabot[bot]' &&
+          ( github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository )
+        with:
+          files: ./**/build/test-results/**/*.xml

.github/workflows/triage-incoming.yml

@@ -10,7 +10,7 @@ jobs:
     # Skip in forks
     if: github.repository == 'vector-im/element-android'
     steps:
-      - uses: alex-page/github-project-automation-plus@1f8873e97e3c8f58161a323b7c568c1f623a1c4d
+      - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
         with:
           project: Issue triage
           column: Incoming

.github/workflows/triage-labelled.yml

@@ -9,15 +9,16 @@ jobs:
     name: Add Z-Labs label for features behind labs flags
     runs-on: ubuntu-latest
     if: >
-      contains(github.event.issue.labels.*.name, 'A-Maths') ||
-      contains(github.event.issue.labels.*.name, 'A-Message-Pinning') ||
-      contains(github.event.issue.labels.*.name, 'A-Polls') ||
-      contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
-      contains(github.event.issue.labels.*.name, 'A-Message-Bubbles') ||
-      contains(github.event.issue.labels.*.name, 'Z-IA') ||
-      contains(github.event.issue.labels.*.name, 'A-Themes-Custom') ||
-      contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') ||
-      contains(github.event.issue.labels.*.name, 'A-Tags')
+        contains(github.event.issue.labels.*.name, 'A-Maths') ||
+        contains(github.event.issue.labels.*.name, 'A-Message-Pinning') ||
+        contains(github.event.issue.labels.*.name, 'A-Threads') ||
+        contains(github.event.issue.labels.*.name, 'A-Polls') ||
+        contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
+        contains(github.event.issue.labels.*.name, 'A-Message-Bubbles') ||
+        contains(github.event.issue.labels.*.name, 'Z-IA') ||
+        contains(github.event.issue.labels.*.name, 'A-Themes-Custom') ||
+        contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') ||
+        contains(github.event.issue.labels.*.name, 'A-Tags')
     steps:
       - uses: actions/github-script@v5
         with:
@@ -29,23 +30,6 @@ jobs:
               labels: ['Z-Labs']
             })
 
-  apply_Help-Wanted_label:
-    name: Add "Help Wanted" label to all "good first issue" and Hacktoberfest
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'good first issue') ||
-      contains(github.event.issue.labels.*.name, 'Hacktoberfest')
-    steps:
-      - uses: actions/github-script@v5
-        with:
-          script: |
-            github.rest.issues.addLabels({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              labels: ['Help Wanted']
-            })
-
   move_needs_info_issues:
     name: X-Needs-Info issues to Need info column on triage board
     runs-on: ubuntu-latest
@@ -59,19 +43,20 @@ jobs:
           column-name: "Need info"
           label-name: "X-Needs-Info"
 
-  add_design_issues_to_project:
-    name: X-Needs-Design to Design project board
+  add_priority_design_issues_to_project:
+    name: P1 X-Needs-Design to Design project board
     runs-on: ubuntu-latest
     # Skip in forks
     if: >
       github.repository == 'vector-im/element-android' &&
       contains(github.event.issue.labels.*.name, 'X-Needs-Design') &&
       (contains(github.event.issue.labels.*.name, 'S-Critical') &&
-       (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
-        contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
-       (contains(github.event.issue.labels.*.name, 'S-Major') &&
-        contains(github.event.issue.labels.*.name, 'O-Frequent')) ||
-       contains(github.event.issue.labels.*.name, 'A11y'))
+        (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+          contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
+        contains(github.event.issue.labels.*.name, 'S-Major') &&
+        contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+        contains(github.event.issue.labels.*.name, 'A11y') &&
+        contains(github.event.issue.labels.*.name, 'O-Frequent'))
     steps:
       - uses: octokit/graphql-action@v2.x
         id: add_to_project
@@ -95,7 +80,7 @@ jobs:
     name: X-Needs-Product to Design project board
     runs-on: ubuntu-latest
     if: >
-      contains(github.event.issue.labels.*.name, 'X-Needs-Product')
+        contains(github.event.issue.labels.*.name, 'X-Needs-Product')
     steps:
       - uses: octokit/graphql-action@v2.x
         id: add_to_project
@@ -121,8 +106,10 @@ jobs:
     # Skip in forks
     if: >
       github.repository == 'vector-im/element-android' &&
-      (contains(github.event.issue.labels.*.name, 'Team: Delight') ||
-       contains(github.event.issue.labels.*.name, 'Z-AppLayout'))
+      (contains(github.event.issue.labels.*.name, 'A-Spaces') ||
+        contains(github.event.issue.labels.*.name, 'A-Space-Settings') ||
+        contains(github.event.issue.labels.*.name, 'A-Subspaces') ||
+        contains(github.event.issue.labels.*.name, 'Z-IA'))
     steps:
       - uses: octokit/graphql-action@v2.x
         with:
@@ -165,6 +152,32 @@ jobs:
         env:
           PROJECT_ID: "PN_kwDOAM0swc2KCw"
           GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+  move_threads_issues:
+    name: A-Threads to Thread board
+    runs-on: ubuntu-latest
+    # Skip in forks
+    if: >
+      github.repository == 'vector-im/element-android' &&
+      contains(github.event.issue.labels.*.name, 'A-Threads')
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+            mutation add_to_project($projectid:ID!,$contentid:ID!) {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PN_kwDOAM0swc0rRA"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
   move_message_bubbles_issues:
     name: A-Message-Bubbles to Message bubbles board
     runs-on: ubuntu-latest
@@ -189,7 +202,7 @@ jobs:
         env:
           PROJECT_ID: "PN_kwDOAM0swc3m-g"
           GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
+ 
   move_ftue_issues:
     name: Z-FTUE to Mobile FTUE board
     runs-on: ubuntu-latest
@@ -239,135 +252,3 @@ jobs:
         env:
           PROJECT_ID: "PN_kwDOAM0swc4AArk0"
           GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  move_element_x_issues:
-    name: ElementX issues to ElementX project board
-    runs-on: ubuntu-latest
-    # Skip in forks
-    if: >
-      github.repository == 'vector-im/element-android' &&
-      (contains(github.event.issue.labels.*.name, 'Z-BBQ-Alpha') ||
-        contains(github.event.issue.labels.*.name, 'Z-BBQ-Beta') ||
-        contains(github.event.issue.labels.*.name, 'Z-BBQ-Release') ||
-        contains(github.event.issue.labels.*.name, 'Z-Banquet-Alpha') ||
-        contains(github.event.issue.labels.*.name, 'Z-Banquet-Beta') ||
-        contains(github.event.issue.labels.*.name, 'Z-Banquet-Release'))
-    steps:
-      - uses: octokit/graphql-action@v2.x
-        with:
-          headers: '{"GraphQL-Features": "projects_next_graphql"}'
-          query: |
-            mutation add_to_project($projectid:ID!,$contentid:ID!) {
-              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
-                projectNextItem {
-                  id
-                }
-              }
-            }
-          projectid: ${{ env.PROJECT_ID }}
-          contentid: ${{ github.event.issue.node_id }}
-        env:
-          PROJECT_ID: "PN_kwDOAM0swc4ABTXY"
-          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  ps_features1:
-    name: Add labelled issues to PS features team 1
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'A-Polls') ||
-      contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
-      (contains(github.event.issue.labels.*.name, 'A-Voice-Messages') &&
-        !contains(github.event.issue.labels.*.name, 'A-Broadcast')) ||
-      (contains(github.event.issue.labels.*.name, 'A-Session-Mgmt') &&
-        contains(github.event.issue.labels.*.name, 'A-User-Settings'))
-    steps:
-      - uses: octokit/graphql-action@v2.x
-        id: add_to_project
-        with:
-          headers: '{"GraphQL-Features": "projects_next_graphql"}'
-          query: |
-              mutation add_to_project($projectid:ID!,$contentid:ID!) {
-                addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                item {
-                  id
-                  }
-                }
-              }
-          projectid: ${{ env.PROJECT_ID }}
-          contentid: ${{ github.event.issue.node_id }}
-        env:
-          PROJECT_ID: "PVT_kwDOAM0swc4AHJKF"
-          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  ps_features2:
-    name: Add labelled issues to PS features team 2
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'A-DM-Start') ||
-      contains(github.event.issue.labels.*.name, 'A-Broadcast')
-    steps:
-      - uses: octokit/graphql-action@v2.x
-        id: add_to_project
-        with:
-          headers: '{"GraphQL-Features": "projects_next_graphql"}'
-          query: |
-              mutation add_to_project($projectid:ID!,$contentid:ID!) {
-                addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                item {
-                  id
-                  }
-                }
-              }
-          projectid: ${{ env.PROJECT_ID }}
-          contentid: ${{ github.event.issue.node_id }}
-        env:
-          PROJECT_ID: "PVT_kwDOAM0swc4AHJKd"
-          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  ps_features3:
-    name: Add labelled issues to PS features team 3
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'A-Rich-Text-Editor')
-    steps:
-      - uses: octokit/graphql-action@v2.x
-        id: add_to_project
-        with:
-          headers: '{"GraphQL-Features": "projects_next_graphql"}'
-          query: |
-              mutation add_to_project($projectid:ID!,$contentid:ID!) {
-                addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                item {
-                  id
-                  }
-                }
-              }
-          projectid: ${{ env.PROJECT_ID }}
-          contentid: ${{ github.event.issue.node_id }}
-        env:
-          PROJECT_ID: "PVT_kwDOAM0swc4AHJKW"
-          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  voip:
-    name: Add labelled issues to VoIP project board
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'Team: VoIP')
-    steps:
-      - uses: octokit/graphql-action@v2.x
-        id: add_to_project
-        with:
-          headers: '{"GraphQL-Features": "projects_next_graphql"}'
-          query: |
-              mutation add_to_project($projectid:ID!,$contentid:ID!) {
-                addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                item {
-                  id
-                  }
-                }
-              }
-          projectid: ${{ env.PROJECT_ID }}
-          contentid: ${{ github.event.issue.node_id }}
-        env:
-          PROJECT_ID: "PVT_kwDOAM0swc4ABMIk"
-          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

.github/workflows/triage-move-review-requests.yml

@@ -7,8 +7,6 @@ jobs:
   add_design_pr_to_project:
     name: Move PRs asking for design review to the design board
     runs-on: ubuntu-latest
-    # Skip in forks
-    if: github.repository == 'vector-im/element-android'
     steps:
       - uses: octokit/graphql-action@v2.x
         id: find_team_members
@@ -60,8 +58,8 @@ jobs:
           headers: '{"GraphQL-Features": "projects_next_graphql"}'
           query: |
             mutation add_to_project($projectid:ID!, $contentid:ID!) {
-              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                item {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
                   id
                 }
               }
@@ -76,8 +74,6 @@ jobs:
   add_product_pr_to_project:
     name: Move PRs asking for product review to the product board
     runs-on: ubuntu-latest
-    # Skip in forks
-    if: github.repository == 'vector-im/element-android'
     steps:
       - uses: octokit/graphql-action@v2.x
         id: find_team_members
@@ -129,8 +125,8 @@ jobs:
           headers: '{"GraphQL-Features": "projects_next_graphql"}'
           query: |
             mutation add_to_project($projectid:ID!, $contentid:ID!) {
-              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                item {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
                   id
                 }
               }

.github/workflows/triage-priority-bugs.yml

@@ -14,7 +14,10 @@ jobs:
         !contains(github.event.issue.labels.*.name, 'A-E2EE-Cross-Signing') &&
         !contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') &&
         !contains(github.event.issue.labels.*.name, 'A-E2EE-Key-Backup') &&
-        !contains(github.event.issue.labels.*.name, 'A-E2EE-SAS-Verification')) &&
+        !contains(github.event.issue.labels.*.name, 'A-E2EE-SAS-Verification') &&
+        !contains(github.event.issue.labels.*.name, 'A-Spaces') &&
+        !contains(github.event.issue.labels.*.name, 'A-Spaces-Settings') &&
+        !contains(github.event.issue.labels.*.name, 'A-Subspaces')) &&
       (contains(github.event.issue.labels.*.name, 'T-Defect') &&
         contains(github.event.issue.labels.*.name, 'S-Critical') &&
         (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
@@ -24,10 +27,10 @@ jobs:
         contains(github.event.issue.labels.*.name, 'A11y') &&
         contains(github.event.issue.labels.*.name, 'O-Frequent'))
     steps:
-      - uses: alex-page/github-project-automation-plus@1f8873e97e3c8f58161a323b7c568c1f623a1c4d
+      - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
         with:
           project: Android App Team
-          column: Important Issues & Topics (P1)
+          column: P1
           repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
   P1_issues_to_crypto_team_workboard:
@@ -50,7 +53,7 @@ jobs:
         contains(github.event.issue.labels.*.name, 'A11y') &&
         contains(github.event.issue.labels.*.name, 'O-Frequent')))
     steps:
-      - uses: alex-page/github-project-automation-plus@1f8873e97e3c8f58161a323b7c568c1f623a1c4d
+      - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
         with:
           project: Crypto Team
           column: Ready

.github/workflows/triage-unlabelled.yml

@@ -28,7 +28,7 @@ jobs:
             echo "ALREADY_IN_BOARD=false" >> $GITHUB_ENV
           fi
       - name: Move issue
-        uses: alex-page/github-project-automation-plus@1f8873e97e3c8f58161a323b7c568c1f623a1c4d
+        uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
         if: ${{ env.ALREADY_IN_BOARD == 'true' }}
         with:
           project: Issue triage

.github/workflows/update-gradle-wrapper.yml

@@ -9,12 +9,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
       - name: Update Gradle Wrapper
         uses: gradle-update/update-gradle-wrapper-action@v1
-        # Skip in forks
-        if: github.repository == 'vector-im/element-android'
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           target-branch: develop

.github/workflows/validate-lfs.yml

@@ -1,15 +0,0 @@
-name: Validate Git LFS
-
-on: [pull_request]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    name: Validate
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          lfs: 'true'
-
-      - run: |
-          ./tools/validate_lfs.sh

.gitignore

@@ -16,10 +16,4 @@
 /fastlane/private
 /fastlane/report.xml
 
-/**/build
-
-# Added by yarn
-/package.json
-/yarn.lock
-/node_modules
-**/out/failures
+/library/build

.idea/dictionaries/bmarty.xml

@@ -11,7 +11,6 @@
       <w>emoji</w>
       <w>emojis</w>
       <w>fdroid</w>
-      <w>ganfra</w>
       <w>gplay</w>
       <w>hmac</w>
       <w>homeserver</w>
@@ -19,7 +18,6 @@
       <w>ktlint</w>
       <w>linkified</w>
       <w>linkify</w>
-      <w>manu</w>
       <w>megolm</w>
       <w>msisdn</w>
       <w>msisdns</w>
@@ -40,7 +38,6 @@
       <w>sygnal</w>
       <w>threepid</w>
       <w>uisi</w>
-      <w>unifiedpush</w>
       <w>unpublish</w>
       <w>unwedging</w>
       <w>vctr</w>

.travis.yml

@@ -0,0 +1,18 @@
+# FTR: Configuration on https://travis-ci.org/github/vector-im/element-android/settings
+#
+# - Build only if .travis.yml is present -> On
+# - Limit concurrent jobs                -> Off
+# - Build pushed branches                -> On (build the branch)
+# - Build pushed pull request            -> On (build the PR after auto-merge)
+#
+# - Auto cancel branch builds            -> On
+# - Auto cancel pull request builds      -> On
+
+sudo: false
+
+notifications:
+  email: false
+
+# Just run a simple script here
+script:
+  - ./tools/travis/check_pr.sh

CONTRIBUTING.md

@@ -1,42 +1,10 @@
-# Contributing to Element Android
-
-<!--- TOC -->
-
-* [Contributing code to Matrix](#contributing-code-to-matrix)
-* [Android Studio settings](#android-studio-settings)
-  * [Template](#template)
-* [Compilation](#compilation)
-* [I want to help translating Element](#i-want-to-help-translating-element)
-* [I want to submit a PR to fix an issue](#i-want-to-submit-a-pr-to-fix-an-issue)
-  * [Kotlin](#kotlin)
-  * [Changelog](#changelog)
-  * [Code quality](#code-quality)
-    * [Internal tool](#internal-tool)
-    * [ktlint](#ktlint)
-    * [lint](#lint)
-  * [Unit tests](#unit-tests)
-  * [Tests](#tests)
-  * [Internationalisation](#internationalisation)
-    * [Adding new string](#adding-new-string)
-      * [Plurals](#plurals)
-    * [Editing existing strings](#editing-existing-strings)
-    * [Removing existing strings](#removing-existing-strings)
-    * [Renaming string ids](#renaming-string-ids)
-    * [Reordering strings](#reordering-strings)
-  * [Accessibility](#accessibility)
-  * [Layout](#layout)
-  * [Authors](#authors)
-* [Thanks](#thanks)
-
-<!--- END -->
-
-## Contributing code to Matrix
+# Contributing code to Matrix
 
 Please read https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.md
 
-Element Android support can be found in this room: [![Element Android Matrix room #element-android:matrix.org](https://img.shields.io/matrix/element-android:matrix.org.svg?label=%23element-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-android:matrix.org).
+Android support can be found in this [![Element Android Matrix room #element-android:matrix.org](https://img.shields.io/matrix/element-android:matrix.org.svg?label=%23element-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-android:matrix.org) room.
 
-The rest of the document contains specific rules for Matrix Android projects
+# Specific rules for Matrix Android projects
 
 ## Android Studio settings
 
@@ -76,8 +44,6 @@ If you want to fix an issue in other languages, or add a missing translation, or
 
 ## I want to submit a PR to fix an issue
 
-Please have a look in the [dedicated documentation](./docs/pull_request.md) about pull request.
-
 Please check if a corresponding issue exists. If yes, please let us know in a comment that you're working on it.
 If an issue does not exist yet, it may be relevant to open a new issue and let us know that you're implementing it.
 
@@ -152,21 +118,15 @@ You should consider adding Unit tests with your PR, and also integration tests (
 
 Translations are handled using an external tool: [Weblate](https://translate.element.io/projects/element-android/)
 
-**As a general rule, please never edit or add or remove translations to the project in a Pull Request**. It can lead to merge conflict if the translations are also modified in Weblate side. Pull Request containing change(s) on the translation files cannot be merged.
+As a general rule, please never edit or add or remove translations to the project in a Pull Request. It can lead to merge conflict if the translations are also modified in Weblate side.
 
 #### Adding new string
 
-When adding new string resources, please only add new entries in the file `values/strings.xml` ([this file](./library/ui-strings/src/main/res/values/strings.xml)). Translations will be added later by the community of translators using Weblate.
+When adding new string resources, please only add new entries in file `value/strings.xml`. Translations will be added later by the community of translators using Weblate.
 
-The file `values/strings.xml` must only contain American English (U. S. English) values, as this is the default language of the Android operating system. So for instance, please use "color" instead of "colour". Element Android will still use the language set on the system by the user, like any other Android applications which provide translations. The system language can be any other English language variants, or any other languages. Note that this is also possible to override the system language using the Element Android in-app language settings.
+New strings can be added anywhere in the file `value/strings.xml`, not necessarily at the end of the file. Generally, it's even better to add the new strings in some dedicated section per feature, and not at the end of the file, to avoid merge conflict between 2 PR adding strings at the end of the same file.
 
-New strings can be added anywhere in the file `values/strings.xml`, not necessarily at the end of the file. Generally, it's even better to add the new strings in some dedicated section per feature, and not at the end of the file, to avoid merge conflict between 2 PR adding strings at the end of the same file.
-
-##### Plurals
-
-Please use `plurals` resources when appropriate, and note that some languages have specific rules for `plurals`, so even if the string will always be at the plural form for English, please always create a `plurals` resource.
-
-Specific plural forms can be found [here](https://unicode-org.github.io/cldr-staging/charts/37/supplemental/language_plural_rules.html).
+Do not hesitate to use plurals when appropriate.
 
 #### Editing existing strings
 
@@ -182,27 +142,8 @@ Instead, please comment the original string with:
 ```xml
 <!-- TODO TO BE REMOVED -->
 ```
-And add `tools:ignore="UnusedResources"` to the string, to let lint ignore that the string is not used.
-
 The string will be removed during the next sync with Weblate.
 
-#### Renaming string ids
-
-This is possible to rename ids of the String resources, but since translation files cannot be edited, add TODO in the main strings.xml file above the strings you want to rename. 
-
-```xml
-<!-- TODO Rename id to put_new_id_here -->
-<string name="current_id">Hello Matrix world!</string>
-```
-
-The string id(s) will be renamed during the next Weblate sync.
-
-#### Reordering strings
-
-To group strings per feature, or for any other reasons, it is possible to reorder string resources, but only in the [main strings.xml file](./library/ui-strings/src/main/res/values/strings.xml). ). We do not mind about ordering in the translation files, and anyway this is forbidden to edit manually the translation files.
-
-It is also possible to add empty lines between string resources, and to add XML comments. Please note that the XML comment just above a String resource will also appear on Weblate and be visible to the translators.
-
 ### Accessibility
 
 Please consider accessibility as an important point. As a minimum requirement, in layout XML files please use attributes such as `android:contentDescription` and `android:importantForAccessibility`, and test with a screen reader if it's working well. You can add new string resources, dedicated to accessibility, in this case, please prefix theirs id with `a11y_`.

Gemfile

@@ -1,4 +1,3 @@
 source "https://rubygems.org"
 
 gem "fastlane"
-gem 'danger'

Gemfile.lock

@@ -1,72 +1,50 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.5)
-      rexml
+    CFPropertyList (3.0.3)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     artifactory (3.0.15)
     atomos (0.1.3)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.619.0)
-    aws-sdk-core (3.132.0)
+    aws-eventstream (1.1.1)
+    aws-partitions (1.479.0)
+    aws-sdk-core (3.117.0)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
+      aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
-      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.58.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+      jmespath (~> 1.0)
+    aws-sdk-kms (1.44.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.114.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-s3 (1.96.1)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.1)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.2.4)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
-    claide (1.1.0)
-    claide-plugins (0.9.2)
-      cork
-      nap
-      open4 (~> 1.3)
+    claide (1.0.3)
     colored (1.2)
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
-    cork (0.3.0)
-      colored2 (~> 3.1)
-    danger (8.6.1)
-      claide (~> 1.0)
-      claide-plugins (>= 0.9.2)
-      colored2 (~> 3.1)
-      cork (~> 0.1)
-      faraday (>= 0.9.0, < 2.0)
-      faraday-http-cache (~> 2.0)
-      git (~> 1.7)
-      kramdown (~> 2.3)
-      kramdown-parser-gfm (~> 1.0)
-      no_proxy_fix
-      octokit (~> 4.7)
-      terminal-table (>= 1, < 4)
     declarative (0.0.20)
-    digest-crc (0.6.4)
+    digest-crc (0.6.3)
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.8.1)
-    emoji_regex (3.2.3)
-    excon (0.92.4)
-    faraday (1.10.1)
+    dotenv (2.7.6)
+    emoji_regex (3.2.2)
+    excon (0.85.0)
+    faraday (1.5.1)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
+      faraday-httpclient (~> 1.0.1)
       faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
       faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
+      multipart-post (>= 1.2, < 3)
       ruby2_keywords (>= 0.0.4)
     faraday-cookie_jar (0.0.7)
       faraday (>= 0.8.0)
@@ -74,22 +52,16 @@ GEM
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
-    faraday-http-cache (2.4.1)
-      faraday (>= 0.8)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
+    faraday_middleware (1.0.0)
       faraday (~> 1.0)
-    fastimage (2.2.6)
-    fastlane (2.209.0)
+    fastimage (2.2.4)
+    fastlane (2.187.0)
       CFPropertyList (>= 2.3, < 4.0.0)
-      addressable (>= 2.8, < 3.0.0)
+      addressable (>= 2.3, < 3.0.0)
       artifactory (~> 3.0)
       aws-sdk-s3 (~> 1.0)
       babosa (>= 1.0.3, < 2.0.0)
@@ -104,7 +76,7 @@ GEM
       faraday_middleware (~> 1.0)
       fastimage (>= 2.1.0, < 3.0.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
-      google-apis-androidpublisher_v3 (~> 0.3)
+      google-apis-androidpublisher_v3 (~> 0.1)
       google-apis-playcustomapp_v1 (~> 0.1)
       google-cloud-storage (~> 1.31)
       highline (~> 2.0)
@@ -113,7 +85,6 @@ GEM
       mini_magick (>= 4.9.4, < 5.0.0)
       multipart-post (~> 2.0.0)
       naturally (~> 2.2)
-      optparse (~> 0.1.1)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
       security (= 0.1.3)
@@ -127,11 +98,9 @@ GEM
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
     gh_inspector (1.1.3)
-    git (1.11.0)
-      rchardet (~> 1.8)
-    google-apis-androidpublisher_v3 (0.25.0)
-      google-apis-core (>= 0.7, < 2.a)
-    google-apis-core (0.7.0)
+    google-apis-androidpublisher_v3 (0.8.0)
+      google-apis-core (>= 0.4, < 2.a)
+    google-apis-core (0.4.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -140,64 +109,52 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-iamcredentials_v1 (0.13.0)
-      google-apis-core (>= 0.7, < 2.a)
-    google-apis-playcustomapp_v1 (0.10.0)
-      google-apis-core (>= 0.7, < 2.a)
-    google-apis-storage_v1 (0.17.0)
-      google-apis-core (>= 0.7, < 2.a)
+    google-apis-iamcredentials_v1 (0.6.0)
+      google-apis-core (>= 0.4, < 2.a)
+    google-apis-playcustomapp_v1 (0.5.0)
+      google-apis-core (>= 0.4, < 2.a)
+    google-apis-storage_v1 (0.6.0)
+      google-apis-core (>= 0.4, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.6.0)
-      faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.2.0)
-    google-cloud-storage (1.38.0)
-      addressable (~> 2.8)
+    google-cloud-env (1.5.0)
+      faraday (>= 0.17.3, < 2.0)
+    google-cloud-errors (1.1.0)
+    google-cloud-storage (1.34.1)
+      addressable (~> 2.5)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.17.0)
+      google-apis-storage_v1 (~> 0.1)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.2.0)
-      faraday (>= 0.17.3, < 3.a)
+    googleauth (0.16.2)
+      faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (>= 0.16, < 2.a)
+      signet (~> 0.14)
     highline (2.0.3)
-    http-cookie (1.0.5)
+    http-cookie (1.0.4)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    jmespath (1.6.1)
-    json (2.6.2)
-    jwt (2.4.1)
-    kramdown (2.4.0)
-      rexml
-    kramdown-parser-gfm (1.1.0)
-      kramdown (~> 2.0)
+    jmespath (1.4.0)
+    json (2.5.1)
+    jwt (2.2.3)
     memoist (0.16.2)
     mini_magick (4.11.0)
-    mini_mime (1.1.2)
+    mini_mime (1.1.0)
     multi_json (1.15.0)
     multipart-post (2.0.0)
     nanaimo (0.3.0)
-    nap (1.1.0)
     naturally (2.2.1)
-    no_proxy_fix (0.1.2)
-    octokit (4.25.1)
-      faraday (>= 1, < 3)
-      sawyer (~> 0.9)
-    open4 (1.3.4)
-    optparse (0.1.1)
-    os (1.1.4)
+    os (1.1.1)
     plist (3.6.0)
-    public_suffix (4.0.7)
+    public_suffix (4.0.6)
     rake (13.0.6)
-    rchardet (1.8.0)
-    representable (3.2.0)
+    representable (3.1.1)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
@@ -206,13 +163,10 @@ GEM
     rouge (2.0.7)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
-    sawyer (0.9.2)
-      addressable (>= 2.3.5)
-      faraday (>= 0.17.3, < 3)
     security (0.1.3)
-    signet (0.17.0)
-      addressable (~> 2.8)
-      faraday (>= 0.17.5, < 3.a)
+    signet (0.15.0)
+      addressable (~> 2.3)
+      faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     simctl (1.6.8)
@@ -221,7 +175,7 @@ GEM
     terminal-notifier (2.0.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    trailblazer-option (0.1.2)
+    trailblazer-option (0.1.1)
     tty-cursor (0.7.1)
     tty-screen (0.8.1)
     tty-spinner (0.9.3)
@@ -229,11 +183,11 @@ GEM
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (1.8.0)
+    unf_ext (0.0.7.7)
+    unicode-display_width (1.7.0)
     webrick (1.7.0)
     word_wrap (1.0.0)
-    xcodeproj (1.22.0)
+    xcodeproj (1.20.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -246,12 +200,9 @@ GEM
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
-  universal-darwin-21
   x86_64-darwin-20
-  x86_64-linux
 
 DEPENDENCIES
-  danger
   fastlane
 
 BUNDLED WITH

README.md

@@ -1,9 +1,9 @@
 [![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop)
 [![Weblate](https://translate.element.io/widgets/element-android/-/svg-badge.svg)](https://translate.element.io/engage/element-android/?utm_source=widget)
 [![Element Android Matrix room #element-android:matrix.org](https://img.shields.io/matrix/element-android:matrix.org.svg?label=%23element-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-android:matrix.org)
-[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=vector-im_element-android&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=vector-im_element-android)
-[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=vector-im_element-android&metric=vulnerabilities)](https://sonarcloud.io/summary/new_code?id=vector-im_element-android)
-[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=vector-im_element-android&metric=bugs)](https://sonarcloud.io/summary/new_code?id=vector-im_element-android)
+[![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=alert_status)](https://sonarcloud.io/dashboard?id=im.vector.app.android)
+[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=im.vector.app.android)
+[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=bugs)](https://sonarcloud.io/dashboard?id=im.vector.app.android)
 
 # Element Android
 
@@ -14,7 +14,7 @@ It is a total rewrite of [Riot-Android](https://github.com/vector-im/riot-androi
 [<img src="resources/img/google-play-badge.png" alt="Get it on Google Play" height="60">](https://play.google.com/store/apps/details?id=im.vector.app)
 [<img src="resources/img/f-droid-badge.png" alt="Get it on F-Droid" height="60">](https://f-droid.org/app/im.vector.app)
 
-Nightly build: [![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop) Nightly test status: [![allScreensTest](https://github.com/vector-im/element-android/actions/workflows/nightly.yml/badge.svg)](https://github.com/vector-im/element-android/actions/workflows/nightly.yml)
+Nightly build: [![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop) Nighly test status: [![allScreensTest](https://github.com/vector-im/element-android/actions/workflows/nightly.yml/badge.svg)](https://github.com/vector-im/element-android/actions/workflows/nightly.yml)
 
 
 # New Android SDK
@@ -44,15 +44,12 @@ If you would like to receive releases more quickly (bearing in mind that they ma
 
 ## Contributing
 
-Please refer to [CONTRIBUTING.md](./CONTRIBUTING.md) if you want to contribute on Matrix Android projects!
+Please refer to [CONTRIBUTING.md](https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md) if you want to contribute on Matrix Android projects!
 
 Come chat with the community in the dedicated Matrix [room](https://matrix.to/#/#element-android:matrix.org).
 
-Also [this documentation](./docs/_developer_onboarding.md) can hopefully help developers to start working on the project.
-
 ## Triaging issues
 
 Issues are triaged by community members and the Android App Team, following the [triage process](https://github.com/vector-im/element-meta/wiki/Triage-process).
 
 We use [issue labels](https://github.com/vector-im/element-meta/wiki/Issue-labelling) to sort all incoming issues.
-

build.gradle

@@ -5,17 +5,10 @@ buildscript {
     apply from: 'dependencies_groups.gradle'
 
     repositories {
-        // Do not use `google()`, it prevents Dependabot from working properly
-        maven {
-            url 'https://maven.google.com'
-        }
+        google()
         maven {
             url "https://plugins.gradle.org/m2/"
         }
-        // Do not use `mavenCentral()`, it prevents Dependabot from working properly
-        maven {
-            url 'https://repo1.maven.org/maven2'
-        }
     }
 
     dependencies {
@@ -24,69 +17,31 @@ buildscript {
         classpath libs.gradle.gradlePlugin
         classpath libs.gradle.kotlinPlugin
         classpath libs.gradle.hiltPlugin
-        classpath 'com.google.firebase:firebase-appdistribution-gradle:3.0.3'
-        classpath 'com.google.gms:google-services:4.3.14'
-        classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.5.0.2730'
+        classpath 'com.google.gms:google-services:4.3.10'
+        classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.3'
         classpath 'com.google.android.gms:oss-licenses-plugin:0.10.5'
-        classpath "com.likethesalad.android:stem-plugin:2.2.3"
-        classpath 'org.owasp:dependency-check-gradle:7.3.0'
-        classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.7.20"
-        classpath "org.jetbrains.kotlinx:kotlinx-knit:0.4.0"
-        classpath 'com.jakewharton:butterknife-gradle-plugin:10.2.3'
-        classpath libs.squareup.paparazziPlugin
+        classpath "com.likethesalad.android:stem-plugin:2.0.0"
+
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
 
+// ktlint Plugin
 plugins {
-    // ktlint Plugin
-    id "org.jlleitschuh.gradle.ktlint" version "11.0.0"
-    // Detekt
-    id "io.gitlab.arturbosch.detekt" version "1.21.0"
-    // Ksp
-    id "com.google.devtools.ksp" version "1.7.21-1.0.8"
-
-    // Dependency Analysis
-    id 'com.autonomousapps.dependency-analysis' version "1.13.1"
-    // Gradle doctor
-    id "com.osacky.doctor" version "0.8.1"
+    id "org.jlleitschuh.gradle.ktlint" version "10.2.1"
 }
 
-// https://github.com/jeremylong/DependencyCheck
-apply plugin: 'org.owasp.dependencycheck'
-
-dependencyCheck {
-    // See https://jeremylong.github.io/DependencyCheck/general/suppression.html
-    suppressionFiles = [
-            "./tools/dependencycheck/suppressions.xml"
-    ]
-}
-
-// Gradle doctor configuration
-apply from: './tools/gradle/doctor.gradle'
-
 allprojects {
     apply plugin: "org.jlleitschuh.gradle.ktlint"
-    apply plugin: "io.gitlab.arturbosch.detekt"
 
     repositories {
-        // Do not use `mavenCentral()`, it prevents Dependabot from working properly
-        maven {
-            url 'https://repo1.maven.org/maven2'
+        mavenCentral {
             content {
                 groups.mavenCentral.regex.each { includeGroupByRegex it }
                 groups.mavenCentral.group.each { includeGroup it }
             }
         }
-        // snapshots repository
-        maven {
-            url "https://oss.sonatype.org/content/repositories/snapshots"
-            content {
-                groups.snapshot.regex.each { includeGroupByRegex it }
-                groups.snapshot.group.each { includeGroup it }
-            }
-        }
         maven {
             url 'https://jitpack.io'
             content {
@@ -96,26 +51,22 @@ allprojects {
         }
         // Jitsi repo
         maven {
-            url "https://github.com/vector-im/jitsi_libre_maven/raw/main/android-sdk-6.2.2"
+            url "https://github.com/vector-im/jitsi_libre_maven/raw/main/android-sdk-3.10.0"
             // Note: to test Jitsi release you can use a local file like this:
-            // url "file:///Users/bmarty/workspaces/jitsi_libre_maven/android-sdk-6.2.2"
+            // url "file:///Users/bmarty/workspaces/jitsi_libre_maven/android-sdk-3.10.0"
             content {
                 groups.jitsi.regex.each { includeGroupByRegex it }
                 groups.jitsi.group.each { includeGroup it }
             }
         }
-        // Do not use `google()`, it prevents Dependabot from working properly
-        maven {
-            url 'https://maven.google.com'
+        google {
             content {
                 groups.google.regex.each { includeGroupByRegex it }
                 groups.google.group.each { includeGroup it }
             }
         }
         //noinspection JcenterRepositoryObsolete
-        // Do not use `jcenter`, it prevents Dependabot from working properly
-        maven {
-            url 'https://jcenter.bintray.com'
+        jcenter {
             content {
                 groups.jcenter.regex.each { includeGroupByRegex it }
                 groups.jcenter.group.each { includeGroup it }
@@ -136,54 +87,18 @@ allprojects {
 
     // See https://github.com/JLLeitschuh/ktlint-gradle#configuration
     ktlint {
-        // See https://github.com/pinterest/ktlint/releases/
-        version = "0.45.1"
         android = true
         ignoreFailures = false
         enableExperimentalRules = true
         // display the corresponding rule
         verbose = true
-        reporters {
-            reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.PLAIN)
-            // To have XML report for Danger
-            reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.CHECKSTYLE)
-        }
-        filter {
-            exclude { element -> element.file.path.contains("$buildDir/generated/") }
-        }
         disabledRules = [
-                // TODO Re-enable these 4 rules after reformatting project
-                "indent",
-                "experimental:argument-list-wrapping",
-                "max-line-length",
-                "parameter-list-wrapping",
-
                 "spacing-between-declarations-with-comments",
                 "no-multi-spaces",
                 "experimental:spacing-between-declarations-with-annotations",
-                "experimental:annotation",
-                // - Missing newline after "("
-                // - Missing newline before ")"
-                "wrapping",
-                // - Unnecessary trailing comma before ")"
-                "experimental:trailing-comma",
-                // - A block comment in between other elements on the same line is disallowed
-                "experimental:comment-wrapping",
-                // - A KDoc comment after any other element on the same line must be separated by a new line
-                "experimental:kdoc-wrapping",
-                // Ignore error "Redundant curly braces", since we use it to fix false positives, for instance in "elementLogs.${i}.txt"
-                "string-template",
+                "experimental:annotation"
         ]
     }
-
-    detekt {
-        // preconfigure defaults
-        buildUponDefaultConfig = true
-        // activate all available (even unstable) rules.
-        allRules = true
-        // point to your custom config defining rules to run, overwriting default behavior
-        config = files("$rootDir/tools/detekt/detekt.yml")
-    }
 }
 
 task clean(type: Delete) {
@@ -196,7 +111,7 @@ def launchTask = getGradle()
         .toString()
         .toLowerCase()
 
-if (launchTask.contains("coverage".toLowerCase())) {
+if (launchTask.contains("codeCoverageReport".toLowerCase())) {
     apply from: 'coverage.gradle'
 }
 
@@ -208,8 +123,8 @@ apply plugin: 'org.sonarqube'
 
 sonarqube {
     properties {
-        property "sonar.projectName", "element-android"
-        property "sonar.projectKey", "vector-im_element-android"
+        property "sonar.projectName", "Element-Android"
+        property "sonar.projectKey", "im.vector.app.android"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.projectVersion", project(":vector").android.defaultConfig.versionName
         property "sonar.sourceEncoding", "UTF-8"
@@ -219,7 +134,7 @@ sonarqube {
         property "sonar.links.issue", "https://github.com/vector-im/element-android/issues"
         property "sonar.organization", "new_vector_ltd_organization"
         property "sonar.java.coveragePlugin", "jacoco"
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/generateCoverageReport/generateCoverageReport.xml"
+        property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/allCodeCoverageReport/allCodeCoverageReport.xml"
         property "sonar.login", project.hasProperty("SONAR_LOGIN") ? SONAR_LOGIN : "invalid"
     }
 }
@@ -235,7 +150,7 @@ project(":vector") {
     }
 }
 
-project(":library:external:diff-match-patch") {
+project(":library:diff-match-patch") {
     sonarqube {
         skipProject = true
     }
@@ -250,117 +165,3 @@ project(":library:external:diff-match-patch") {
 //        }
 //    }
 //}
-
-dependencyAnalysis {
-    dependencies {
-        bundle("kotlin-stdlib") {
-            includeGroup("org.jetbrains.kotlin")
-        }
-        bundle("react") {
-            includeGroup("com.facebook.react")
-        }
-    }
-    issues {
-        all {
-            ignoreKtx(true)
-            onUsedTransitiveDependencies {
-                // Transitively used dependencies that should be declared directly
-                severity("ignore")
-            }
-            onUnusedDependencies {
-                severity("fail")
-            }
-            onUnusedAnnotationProcessors {
-                severity("fail")
-                exclude("com.airbnb.android:epoxy-processor", "com.google.dagger:hilt-compiler") // False positives
-            }
-        }
-        project(":library:jsonviewer") {
-            onUnusedDependencies {
-                exclude("org.json:json") // Used in unit tests, overwrites the one bundled into Android
-            }
-        }
-        project(":library:ui-styles")
-        project(":matrix-sdk-android") {
-            onUnusedDependencies {
-                exclude("io.reactivex.rxjava2:rxkotlin") // Transitively required for mocking realm as monarchy doesn't expose Rx
-            }
-        }
-        project(":matrix-sdk-android-flow") {
-            onUnusedDependencies {
-                exclude("androidx.paging:paging-runtime-ktx") // False positive
-            }
-        }
-        project(":vector") {
-            onUnusedDependencies {
-                // False positives
-                exclude(
-                        "androidx.fragment:fragment-testing",
-                        "com.facebook.soloader:soloader",
-                        "com.vanniktech:emoji-google",
-                        "com.vanniktech:emoji-material",
-                        "org.maplibre.gl:android-plugin-annotation-v9",
-                        "org.maplibre.gl:android-sdk",
-                )
-            }
-        }
-    }
-}
-
-tasks.register("recordScreenshots", GradleBuild) {
-    startParameter.projectProperties.screenshot = ""
-    tasks = [':vector:recordPaparazziDebug']
-}
-
-tasks.register("verifyScreenshots", GradleBuild) {
-    startParameter.projectProperties.screenshot = ""
-    tasks = [':vector:verifyPaparazziDebug']
-}
-
-ext.initScreenshotTests = { project ->
-    def hasScreenshots = project.hasProperty("screenshot")
-    if (hasScreenshots) {
-        project.apply plugin: 'app.cash.paparazzi'
-    }
-    project.dependencies { testCompileOnly libs.squareup.paparazzi }
-    project.android.testOptions.unitTests.all {
-        def screenshotTestCapture = "**/*ScreenshotTest*"
-        if (hasScreenshots) {
-            include screenshotTestCapture
-        } else {
-            exclude screenshotTestCapture
-        }
-    }
-}
-
-// Workaround to have KSP generated Kotlin code available in the IDE (for code completion)
-// Ref: https://github.com/airbnb/epoxy/releases/tag/5.0.0beta02
-subprojects { project ->
-    afterEvaluate {
-        if (project.hasProperty("android")) {
-            android {
-                if (it instanceof com.android.build.gradle.LibraryExtension) {
-                    libraryVariants.all { variant ->
-                        def outputFolder = new File("build/generated/ksp/${variant.name}/kotlin")
-                        if (outputFolder.exists()) {
-                            variant.addJavaSourceFoldersToModel(outputFolder)
-                            android.sourceSets.getAt(variant.name).java {
-                                srcDir(outputFolder)
-                            }
-                        }
-                    }
-                } else if (it instanceof com.android.build.gradle.AppExtension) {
-                    applicationVariants.all { variant ->
-                        def outputFolder = new File("build/generated/ksp/${variant.name}/kotlin")
-                        if (outputFolder.exists()) {
-                            variant.addJavaSourceFoldersToModel(outputFolder)
-                            android.sourceSets.getAt(variant.name).java {
-                                srcDir(outputFolder)
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

changelog.d/3296.bugfix

@@ -0,0 +1 @@
+Typing notifications moved from the header to the bottom of the timeline.

changelog.d/4319.bugfix

@@ -0,0 +1 @@
+Open direct message screen when clicking on DM button in the space members list

changelog.d/4498.misc

@@ -0,0 +1 @@
+Override task affinity to prevent unknown activities running in our app tasks.

changelog.d/4642.bugfix

@@ -0,0 +1 @@
+Update the top bar in a room: remove topic and typing information

changelog.d/5005.feature

@@ -0,0 +1 @@
+Add possibility to save media from Gallery + reorder choices in message context menu

changelog.d/5158.wip

@@ -0,0 +1 @@
+Starts the FTUE account personalisation flow by adding an account created screen behind a feature flag

changelog.d/5269.misc

@@ -0,0 +1 @@
+Tentatively fixing the UI sanity test being unable to click on the space menu items

changelog.d/5303.misc

@@ -0,0 +1 @@
+Improve Bubble layouts rendering.

changelog.d/5309.misc

@@ -0,0 +1 @@
+Moves attachment-viewer, diff-match-patch, and multipicker modules to subfolders under library

changelog.d/5312.misc

@@ -0,0 +1 @@
+Log the `since` token used and `next_batch` token returned when doing an incremental sync.

changelog.d/5313.misc

@@ -0,0 +1 @@
+Update reaction button layout.

changelog.d/5314.misc

@@ -0,0 +1 @@
+Notify element-android channel each time a nightly build completes.

changelog.d/5318.misc

@@ -0,0 +1 @@
+Log the `since` token used and `next_batch` token returned when doing an incremental sync.

changelog.d/5325.feature

@@ -0,0 +1 @@
+Adds forceLoginFallback feature flag and usages to FTUE login and registration

changelog.d/5326.misc

@@ -0,0 +1 @@
+[Export e2ee keys] use appName instead of element

changelog.d/5330.misc

@@ -0,0 +1 @@
+Continue improving realm usage.

changelog.d/5330.sdk

@@ -0,0 +1 @@
+Change name of getTimeLineEvent and getTimeLineEventLive methods to getTimelineEvent and getTimelineEventLive.

changelog.d/5348.misc

@@ -0,0 +1 @@
+Upgrade the plugin which generate strings with template from 1.2.2 to 2.0.0

changelog.d/5352.misc

@@ -0,0 +1 @@
+Remove about 700 unused strings and their translations

changelog.d/5361.misc

@@ -0,0 +1 @@
+Creates dedicated VectorOverrides for forcing behaviour for local testing/development

changelog.d/5379.misc

@@ -0,0 +1 @@
+Cleanup unused threads build configurations

changelog.d/5392.misc

@@ -0,0 +1 @@
+Upgrades material dependency version from 1.4.0 to 1.5.0

changelog.d/5394.bugfix

@@ -0,0 +1 @@
+Fix incorrect media cache size in settings

changelog.d/5402.bugfix

@@ -0,0 +1 @@
+[Create room] Setting an avatar when creating a room had no effect

changelog.d/5418.feature

@@ -0,0 +1 @@
+Improves settings error dialog messaging when changing avatar or display name fails

changelog.d/7602.sdk

@@ -1 +0,0 @@
-Add sentry tracking around send message task.

coverage.gradle

@@ -1,37 +1,9 @@
-def excludes = [
-// dependency injection graph
-'**/*Module.*',
-'**/*Module*.*',
-
-// Framework entry points
-'**/*Activity*',
-'**/*Fragment*',
-'**/*Application*',
-'**/*AndroidService*',
-
-// We would like to exclude android widgets as well but our naming is inconsistent
-
-// Proof of concept
-'**/*Login2*',
-
-// Generated
-'**/*JsonAdapter*',
-'**/*Item.*',
-'**/*$Holder.*',
-'**/*ViewHolder.*',
-'**/*View.*',
-'**/*BottomSheet.*'
-]
+def excludes = [ ]
 
 def initializeReport(report, projects, classExcludes) {
     projects.each { project -> project.apply plugin: 'jacoco' }
+    report.executionData { fileTree(rootProject.rootDir.absolutePath).include("**/build/jacoco/*.exec") }
 
-    report.executionData {
-        fileTree(rootProject.rootDir.absolutePath).include(
-                "**/build/**/*.exec",
-                "**/build/outputs/code_coverage/**/coverage.ec",
-        )
-    }
     report.reports {
         xml.enabled true
         html.enabled true
@@ -45,7 +17,7 @@ def initializeReport(report, projects, classExcludes) {
         projects.each { project ->
             switch (project) {
                 case { project.plugins.hasPlugin("com.android.application") }:
-                    androidClassDirs.add("${project.buildDir}/tmp/kotlin-classes/gplayDebug")
+                    androidClassDirs.add("${project.buildDir}/tmp/kotlin-classes/debug")
                     androidSourceDirs.add("${project.projectDir}/src/main/kotlin")
                     androidSourceDirs.add("${project.projectDir}/src/main/java")
                     break
@@ -71,21 +43,13 @@ def collectProjects(predicate) {
     return subprojects.findAll { it.buildFile.isFile() && predicate(it) }
 }
 
-task generateCoverageReport(type: JacocoReport) {
+task allCodeCoverageReport(type: JacocoReport) {
     outputs.upToDateWhen { false }
     rootProject.apply plugin: 'jacoco'
-    def projects = collectProjects { ['vector-app', 'vector', 'matrix-sdk-android'].contains(it.name) }
+    // to limit projects in a specific report, add
+    // def excludedProjects = [ ... ]
+    // def projects = collectProjects { !excludedProjects.contains(it.name) }
+    def projects = collectProjects { true }
+    dependsOn { projects*.test }
     initializeReport(it, projects, excludes)
 }
-
-task unitTestsWithCoverage(type: GradleBuild) {
-    // the 7.1.3 android gradle plugin has a bug where enableTestCoverage generates invalid coverage
-    startParameter.projectProperties.coverage = [enableTestCoverage: false]
-    tasks = ['testDebugUnitTest']
-}
-
-task instrumentationTestsWithCoverage(type: GradleBuild) {
-    startParameter.projectProperties.coverage = [enableTestCoverage: true]
-    startParameter.projectProperties['android.testInstrumentationRunnerArguments.notPackage'] = 'im.vector.app.ui'
-    tasks = [':vector-app:connectedGplayDebugAndroidTest', ':vector:connectedDebugAndroidTest', 'matrix-sdk-android:connectedDebugAndroidTest']
-}

dependencies.gradle

@@ -1,45 +1,43 @@
 ext.versions = [
+
         'minSdk'            : 21,
-        'compileSdk'        : 33,
-        'targetSdk'         : 33,
+        'compileSdk'        : 31,
+        'targetSdk'         : 31,
         'sourceCompat'      : JavaVersion.VERSION_11,
         'targetCompat'      : JavaVersion.VERSION_11,
 ]
 
-def gradle = "7.3.1"
+def gradle = "7.0.4"
 // Ref: https://kotlinlang.org/releases.html
-def kotlin = "1.7.21"
-def kotlinCoroutines = "1.6.4"
-def dagger = "2.44"
-def appDistribution = "16.0.0-beta05"
+def kotlin = "1.5.31"
+def kotlinCoroutines = "1.5.2"
+def dagger = "2.40.5"
 def retrofit = "2.9.0"
+def arrow = "0.8.2"
 def markwon = "4.6.2"
-def moshi = "1.14.0"
-def lifecycle = "2.5.1"
+def moshi = "1.12.0"
+def lifecycle = "2.4.0"
 def flowBinding = "1.2.0"
-def flipper = "0.174.0"
-def epoxy = "5.0.0"
-def mavericks = "3.0.1"
-def glide = "4.14.2"
+def epoxy = "4.6.2"
+def mavericks = "2.5.0"
+def glide = "4.12.0"
 def bigImageViewer = "1.8.1"
-def jjwt = "0.11.5"
-// Temporary version to unblock #6929. Once 0.16.0 is released we should use it, and revert
-// the whole commit which set version 0.16.0-SNAPSHOT
-def vanniktechEmoji = "0.16.0-SNAPSHOT"
-def sentry = "6.7.0"
-def fragment = "1.5.4"
+def jjwt = "0.11.2"
+def vanniktechEmoji = "0.8.0"
+
 // Testing
-def mockk = "1.12.3" // We need to use 1.12.3 to have mocking in androidTest until a new version is released: https://github.com/mockk/mockk/issues/819
+def mockk = "1.12.1"
 def espresso = "3.4.0"
 def androidxTest = "1.4.0"
-def androidxOrchestrator = "1.4.2"
-def paparazzi = "1.1.0"
+def androidxOrchestrator = "1.4.1"
+
 
 ext.libs = [
         gradle      : [
                 'gradlePlugin'            : "com.android.tools.build:gradle:$gradle",
                 'kotlinPlugin'            : "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin",
                 'hiltPlugin'              : "com.google.dagger:hilt-android-gradle-plugin:$dagger"
+
         ],
         jetbrains   : [
                 'coroutinesCore'          : "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutines",
@@ -47,23 +45,19 @@ ext.libs = [
                 'coroutinesTest'          : "org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinCoroutines"
         ],
         androidx    : [
-                'activity'                : "androidx.activity:activity-ktx:1.6.1",
-                'appCompat'               : "androidx.appcompat:appcompat:1.5.1",
-                'biometric'               : "androidx.biometric:biometric:1.1.0",
-                'core'                    : "androidx.core:core-ktx:1.9.0",
+                'appCompat'               : "androidx.appcompat:appcompat:1.4.0",
+                'core'                    : "androidx.core:core-ktx:1.7.0",
                 'recyclerview'            : "androidx.recyclerview:recyclerview:1.2.1",
-                'exifinterface'           : "androidx.exifinterface:exifinterface:1.3.5",
-                'fragmentKtx'             : "androidx.fragment:fragment-ktx:$fragment",
-                'fragmentTesting'         : "androidx.fragment:fragment-testing:$fragment",
-                'constraintLayout'        : "androidx.constraintlayout:constraintlayout:2.1.4",
+                'exifinterface'           : "androidx.exifinterface:exifinterface:1.3.3",
+                'fragmentKtx'             : "androidx.fragment:fragment-ktx:1.4.0",
+                'constraintLayout'        : "androidx.constraintlayout:constraintlayout:2.1.2",
                 'work'                    : "androidx.work:work-runtime-ktx:2.7.1",
                 'autoFill'                : "androidx.autofill:autofill:1.1.0",
-                'preferenceKtx'           : "androidx.preference:preference-ktx:1.2.0",
+                'preferenceKtx'           : "androidx.preference:preference-ktx:1.1.1",
                 'junit'                   : "androidx.test.ext:junit:1.1.3",
                 'lifecycleCommon'         : "androidx.lifecycle:lifecycle-common:$lifecycle",
                 'lifecycleLivedata'       : "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle",
                 'lifecycleProcess'        : "androidx.lifecycle:lifecycle-process:$lifecycle",
-                'lifecycleRuntimeKtx'     : "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle",
                 'datastore'               : "androidx.datastore:datastore:1.0.0",
                 'datastorepreferences'    : "androidx.datastore:datastore-preferences:1.0.0",
                 'pagingRuntimeKtx'        : "androidx.paging:paging-runtime-ktx:2.1.2",
@@ -74,49 +68,33 @@ ext.libs = [
                 'testRules'               : "androidx.test:rules:$androidxTest",
                 'espressoCore'            : "androidx.test.espresso:espresso-core:$espresso",
                 'espressoContrib'         : "androidx.test.espresso:espresso-contrib:$espresso",
-                'espressoIntents'         : "androidx.test.espresso:espresso-intents:$espresso",
-                'viewpager2'              : "androidx.viewpager2:viewpager2:1.0.0",
-                'transition'              : "androidx.transition:transition:1.2.0",
+                'espressoIntents'         : "androidx.test.espresso:espresso-intents:$espresso"
         ],
         google      : [
-                'material'                : "com.google.android.material:material:1.7.0",
-                'appdistributionApi'      : "com.google.firebase:firebase-appdistribution-api-ktx:$appDistribution",
-                'appdistribution'         : "com.google.firebase:firebase-appdistribution:$appDistribution",
-                // Phone number https://github.com/google/libphonenumber
-                'phonenumber'             : "com.googlecode.libphonenumber:libphonenumber:8.13.0"
+                'material'                : "com.google.android.material:material:1.5.0"
         ],
         dagger      : [
                 'dagger'                  : "com.google.dagger:dagger:$dagger",
                 'daggerCompiler'          : "com.google.dagger:dagger-compiler:$dagger",
                 'hilt'                    : "com.google.dagger:hilt-android:$dagger",
-                'hiltAndroidTesting'      : "com.google.dagger:hilt-android-testing:$dagger",
                 'hiltCompiler'            : "com.google.dagger:hilt-compiler:$dagger"
         ],
-        flipper     : [
-                'flipper'                 : "com.facebook.flipper:flipper:$flipper",
-                'flipperNetworkPlugin'    : "com.facebook.flipper:flipper-network-plugin:$flipper",
-        ],
-        element     : [
-                'opusencoder'             : "io.element.android:opusencoder:1.1.0",
-                'wysiwyg'                 : "io.element.android:wysiwyg:0.4.0"
-        ],
         squareup    : [
-                'moshi'                  : "com.squareup.moshi:moshi:$moshi",
-                'moshiKt'                : "com.squareup.moshi:moshi-kotlin:$moshi",
+                'moshi'                  : "com.squareup.moshi:moshi-adapters:$moshi",
                 'moshiKotlin'            : "com.squareup.moshi:moshi-kotlin-codegen:$moshi",
-                'moshiAdapters'          : "com.squareup.moshi:moshi-adapters:$moshi",
-                'paparazzi'              : "app.cash.paparazzi:paparazzi:$paparazzi",
-                'paparazziPlugin'        : "app.cash.paparazzi:paparazzi-gradle-plugin:$paparazzi",
                 'retrofit'               : "com.squareup.retrofit2:retrofit:$retrofit",
                 'retrofitMoshi'          : "com.squareup.retrofit2:converter-moshi:$retrofit"
         ],
         rx          : [
                 'rxKotlin'               : "io.reactivex.rxjava2:rxkotlin:2.4.0"
         ],
+        arrow       : [
+                'core'                   : "io.arrow-kt:arrow-core:$arrow",
+                'instances'              : "io.arrow-kt:arrow-instances-core:$arrow"
+        ],
         markwon     : [
                 'core'                   : "io.noties.markwon:core:$markwon",
                 'extLatex'               : "io.noties.markwon:ext-latex:$markwon",
-                'imageGlide'             : "io.noties.markwon:image-glide:$markwon",
                 'inlineParser'           : "io.noties.markwon:inline-parser:$markwon",
                 'html'                   : "io.noties.markwon:html:$markwon"
         ],
@@ -128,10 +106,6 @@ ext.libs = [
                 'mavericks'              : "com.airbnb.android:mavericks:$mavericks",
                 'mavericksTesting'       : "com.airbnb.android:mavericks-testing:$mavericks"
         ],
-        maplibre    : [
-                'androidSdk'             : "org.maplibre.gl:android-sdk:9.5.2",
-                'pluginAnnotation'       : "org.maplibre.gl:android-plugin-annotation-v9:1.0.0"
-        ],
         mockk      : [
                 'mockk'                   : "io.mockk:mockk:$mockk",
                 'mockkAndroid'            : "io.mockk:mockk-android:$mockk"
@@ -160,16 +134,11 @@ ext.libs = [
                 'emojiGoogle'            : "com.vanniktech:emoji-google:$vanniktechEmoji"
         ],
         apache      : [
-                'commonsImaging'         : "org.apache.commons:commons-imaging:1.0-alpha3"
-        ],
-        sentry: [
-                'sentryAndroid'         : "io.sentry:sentry-android:$sentry"
+                'commonsImaging'         : "org.apache.sanselan:sanselan:0.97-incubator"
         ],
         tests       : [
-                'kluent'                 : "org.amshove.kluent:kluent-android:1.72",
+                'kluent'                 : "org.amshove.kluent:kluent-android:1.68",
                 'timberJunitRule'        : "net.lachlanmckee:timber-junit-rule:1.0.1",
-                'junit'                  : "junit:junit:4.13.2",
+                'junit'                  : "junit:junit:4.13.2"
         ]
-]
-
-
+]

dependencies_groups.gradle

@@ -7,9 +7,7 @@ ext.groups = [
                         'com.github.chrisbanes',
                         'com.github.hyuwah',
                         'com.github.jetradarmobile',
-                        'com.github.MatrixFrog',
                         'com.github.tapadoo',
-                        'com.github.UnifiedPush',
                         'com.github.vector-im',
                         'com.github.yalantis',
                         'com.github.Zhuinden',
@@ -32,25 +30,15 @@ ext.groups = [
                 ],
                 group: [
                         'com.android',
-                        'com.android.ndk.thirdparty',
                         'com.android.tools',
                         'com.google.firebase',
                         'com.google.testing.platform',
                 ]
         ],
-        snapshot: [
-                regex: [
-                ],
-                group: [
-                        'com.vanniktech',
-                ]
-        ],
         mavenCentral: [
                 regex: [
                 ],
                 group: [
-                        'app.cash.paparazzi',
-                        'ch.qos.logback',
                         'com.adevinta.android',
                         'com.airbnb.android',
                         'com.almworks.sqlite4java',
@@ -60,31 +48,24 @@ ext.groups = [
                         'com.beust',
                         'com.davemorrissey.labs',
                         'com.dropbox.core',
-                        'com.soywiz.korlibs.korte',
-                        'com.facebook.fbjni',
-                        'com.facebook.flipper',
                         'com.facebook.fresco',
                         'com.facebook.infer.annotation',
                         'com.facebook.soloader',
                         'com.facebook.stetho',
-                        'com.facebook.yoga',
                         'com.fasterxml',
                         'com.fasterxml.jackson',
                         'com.fasterxml.jackson.core',
-                        'com.fasterxml.jackson.dataformat',
-                        'com.fasterxml.jackson.module',
-                        'com.fasterxml.woodstox',
                         'com.gabrielittner.threetenbp',
                         'com.getkeepsafe.relinker',
                         'com.github.bumptech.glide',
+                        'com.github.filippudak',
+                        'com.github.filippudak.progresspieview',
                         'com.github.javaparser',
                         'com.github.piasy',
                         'com.github.shyiko.klob',
-                        'com.github.rubensousa',
                         'com.google',
                         'com.google.android',
                         'com.google.api.grpc',
-                        'com.google.auto',
                         'com.google.auto.service',
                         'com.google.auto.value',
                         'com.google.code.findbugs',
@@ -102,10 +83,8 @@ ext.groups = [
                         'com.googlecode.json-simple',
                         'com.googlecode.libphonenumber',
                         'com.ibm.icu',
-                        'com.intellij',
                         'com.jakewharton.android.repackaged',
                         'com.jakewharton.timber',
-                        'com.kgurgul.flipper',
                         'com.linkedin.dexmaker',
                         'com.mapbox.mapboxsdk',
                         'com.nulab-inc',
@@ -115,9 +94,7 @@ ext.groups = [
                         'com.pinterest.ktlint',
                         'com.posthog.android',
                         'com.squareup',
-                        'com.squareup.curtains',
                         'com.squareup.duktape',
-                        'com.squareup.leakcanary',
                         'com.squareup.moshi',
                         'com.squareup.okhttp3',
                         'com.squareup.okio',
@@ -128,18 +105,15 @@ ext.groups = [
                         'com.sun.xml.bind.mvn',
                         'com.sun.xml.fastinfoset',
                         'com.thoughtworks.qdox',
-                        // 'com.vanniktech',
+                        'com.vanniktech',
                         'commons-cli',
                         'commons-codec',
                         'commons-io',
                         'commons-logging',
                         'info.picocli',
-                        'io.element.android',
-                        'io.github.davidburstrom.contester',
+                        'io.arrow-kt',
                         'io.github.detekt.sarif4k',
-                        'io.github.microutils',
                         'io.github.reactivecircus.flowbinding',
-                        'io.gitlab.arturbosch.detekt',
                         'io.grpc',
                         'io.jsonwebtoken',
                         'io.kindedj',
@@ -147,21 +121,17 @@ ext.groups = [
                         'io.netty',
                         'io.noties.markwon',
                         'io.opencensus',
-                        'io.perfmark',
                         'io.reactivex.rxjava2',
                         'io.realm',
-                        'io.sentry',
                         'it.unimi.dsi',
                         'jakarta.activation',
                         'jakarta.xml.bind',
-                        'javax.activation',
                         'javax.annotation',
                         'javax.inject',
-                        'javax.xml.bind',
                         'jline',
                         'jp.wasabeef',
                         'junit',
-                        'kxml2',
+                        'me.leolin',
                         'me.saket',
                         'net.bytebuddy',
                         'net.java',
@@ -176,27 +146,21 @@ ext.groups = [
                         'org.apache.ant',
                         'org.apache.commons',
                         'org.apache.httpcomponents',
+                        'org.apache.sanselan',
                         'org.bouncycastle',
-                        'org.ccil.cowan.tagsoup',
                         'org.checkerframework',
                         'org.codehaus',
                         'org.codehaus.groovy',
                         'org.codehaus.mojo',
-                        'org.codehaus.woodstox',
                         'org.eclipse.ee4j',
                         'org.ec4j.core',
-                        'org.freemarker',
                         'org.glassfish.jaxb',
                         'org.hamcrest',
                         'org.jacoco',
-                        'org.java-websocket',
-                        'org.jcodec',
                         'org.jetbrains',
-                        'org.jetbrains.dokka',
                         'org.jetbrains.intellij.deps',
                         'org.jetbrains.kotlin',
                         'org.jetbrains.kotlinx',
-                        'org.jetbrains.trove4j',
                         'org.json',
                         'org.jsoup',
                         'org.junit',
@@ -213,12 +177,12 @@ ext.groups = [
                         'org.ow2.asm',
                         'org.ow2.asm',
                         'org.reactivestreams',
+                        'org.robolectric',
                         'org.slf4j',
                         'org.sonatype.oss',
                         'org.testng',
                         'org.threeten',
                         'org.webjars',
-                        'org.yaml',
                         'ru.noties',
                         'xerces',
                         'xml-apis',
@@ -239,3 +203,4 @@ ext.groups = [
                 ]
         ]
 ]
+

docs/_developer_onboarding.md

@@ -1,259 +0,0 @@
-# Developer on boarding
-
-<!--- TOC -->
-
-* [Introduction](#introduction)
-  * [Quick introduction to Matrix](#quick-introduction-to-matrix)
-    * [Matrix data](#matrix-data)
-      * [Room](#room)
-      * [Event](#event)
-    * [Sync](#sync)
-      * [Glossary about syncs](#glossary-about-syncs)
-  * [The Android project](#the-android-project)
-  * [Matrix SDK](#matrix-sdk)
-  * [Application](#application)
-    * [MvRx](#mvrx)
-      * [Behavior](#behavior)
-    * [Epoxy](#epoxy)
-    * [Other frameworks](#other-frameworks)
-  * [Push](#push)
-  * [Dependencies management](#dependencies-management)
-  * [Test](#test)
-  * [Other points](#other-points)
-    * [Logging](#logging)
-    * [Rageshake](#rageshake)
-  * [Tips](#tips)
-* [Happy coding!](#happy-coding)
-
-<!--- END -->
-
-## Introduction
-
-This doc is a quick introduction about the project and its architecture.
-
-It's aim is to help new developers to understand the overall project and where to start developing.
-
-Other useful documentation:
-- all the docs in this folder!
-- the [contributing doc](../CONTRIBUTING.md), that you should also read carefully.
-
-### Quick introduction to Matrix
-
-Matrix website: [matrix.org](https://matrix.org), [discover page](https://matrix.org/discover).
-*Note*: Matrix.org is also hosting a homeserver ([.well-known file](https://matrix.org/.well-known/matrix/client)).
-The reference homeserver (this is how Matrix servers are called) implementation is [Synapse](https://github.com/matrix-org/synapse/). But other implementations exist. The Matrix specification is here to ensure that any Matrix client, such as Element Android and its SDK can talk to any Matrix server.
-
-Have a quick look to the client-server API documentation: [Client-server documentation](https://spec.matrix.org/v1.3/client-server-api/). Other network API exist, the list is here: (https://spec.matrix.org/latest/)
-
-Matrix is an open source protocol. Change are possible and are tracked using [this GitHub repository](https://github.com/matrix-org/matrix-doc/). Changes to the protocol are called MSC: Matrix Spec Change. These are PullRequest to this project.
-
-Matrix object are Json data. Unstable prefixes must be used for Json keys when the MSC is not merged (i.e. accepted). 
-
-#### Matrix data
-
-There are many object and data in the Matrix worlds. Let's focus on the most important and used, `Room` and `Event`
-
-##### Room
-
-`Room` is a place which contains ordered `Event`s. They are identified with their `room_id`. Nearly all the data are stored in rooms, and shared using homeserver to all the Room Member.
-
-*Note*: Spaces are also Rooms with a different `type`.
-
-##### Event
-
-`Events` are items of a Room, where data is embedded.
-
-There are 2 types of Room Event:
-
-- Regular Events: contain useful content for the user (message, image, etc.), but are not necessarily displayed as this in the timeline (reaction, message edition, call signaling).
-- State Events: contain the state of the Room (name, topic, etc.). They have a non null value for the key `state_key`.
-
-Also all the Room Member details are in State Events: one State Event per member. In this case, the `state_key` is the matrixId (= userId).
-
-Important Fields of an Event:
-- `event_id`: unique across the Matrix universe;
-- `room_id`: the room the Event belongs to;
-- `type`: describe what the Event contain, especially in the `content` section, and how the SDK should handle this Event;
-- `content`: dynamic Event data; depends on the `type`.
-
-So we have a triple `event_id`, `type`, `state_key` which uniquely defines an Event.
-
-#### Sync
-
-The `Sync` is a way for the Matrix client to be up to date regarding the user data hosted by the server. All the Events are coming through the sync response. More details can be found here: [spec.matrix.org/v1.3/client-server-api/#syncing](https://spec.matrix.org/v1.3/client-server-api/#syncing)
-When the application is in foreground, this is a looping request. We are using Https requests, which offer the advantage to be compatible with any homeserver. A sync token is used as request parameter, to let the server know what the client knows.
-The `SyncThread` is responsible to manage the sync request loop.
-
-When the application is in background, a Push will trigger a sync request.
-
-##### Glossary about syncs
-
-- **initial sync**: a sync request without a token. This is the first request a client perform after login or after a clear cache. The server will include in the response all your rooms with the full state (all the room membership Event will not be present), with the latest messages for each room. We are in the process to replace this by version 3: sliding sync. All data are inserted to the Database (currently [Realm](https://www.mongodb.com/docs/realm/sdk/java/)).
-- **incremental sync**: sync request with a token.
-- **gappy sync**: sync request where all the new Events are not returned for one or several Rooms. Also called `limited sync`. It can be limited per Room. To get all the missing Events, a Room pagination API has to be called.
-- **sync token**: `next_batch` value in the previous sync response. Will be provided as the `since` parameter for the next sync request.
-
-### The Android project
-
-The project should compile out of the box.
-
-The project is split into several modules. The main ones are:
-For the app
-- `vector-app`: application entry point;
-- `vector`: legacy application, but now a library. In the process of being split into several modules;
-- `vector-config`: this is where all the configuration of the application should occurs. Should because we are in the process of migrating all the configuration here;
-- `library/ui-strings`: this is where all the string resources are stored. Please refer to [contributing doc](../CONTRIBUTING.md) to know how to make change on this module;
-- `library/ui-styles`: this is where the Android styles are defined.
-
-For the SDK
-- `matrix-sdk-android`: the main SDK module. The sources are in this project, but are also exported to [its own project](https://github.com/matrix-org/matrix-android-sdk2). All the PRs and issues related to the SDK take place in the Element Android project;
-- `matrix-sdk-android-flow`: contains some wrapper to expose `Flow` to the application.
-
-### Matrix SDK
-
-SDK exposes `Services` to the client application. `Services` are public interface, and are defined in this parent package: `org.matrix.android.sdk.api`. Default implementation are internal to the SDK, in this parent package: `org.matrix.android.sdk.internal`. Note that you also have to declare the classes as `internal` when adding classes to the `org.matrix.android.sdk.internal` package.
-
-Interface allows us to replace the implementation for testing purpose.
-
-A generated documentation of the SDK is available [here](https://matrix-org.github.io/matrix-android-sdk2/). Updated after each release. Please ensure that the documentation (KDoc) of all the SDK Services is up to date, and is clear for a SDK user.
-The SDK generated documentation also contains information about the entry points of the SDK.
-
-[Dagger](https://dagger.dev/) is used to inject all the dependencies to the SDK classes.
-
-SDK is exposing data as `LiveData`, but we are progressively migrating to `Flow`. Database is the source of truth.
-
-Example:
-- Client send an Event using the `SendService`;
-- At the end a `SendEvent` task is used;
-- Retrofit API is used to send data to the server;
-- Goes to the server, which returns only the `event_id`;
-- The `Event` is coming back from the `sync` response with eventually extra added data.
-
-### Application
-
-This is the UI part of the project.
-
-There are two variants of the application: `Gplay` and `Fdroid`.
-
-The main difference is about using Firebase on `Gplay` variant, to have Push from Google Services. `FDroid` variant cannot contain closed source dependency.
-
-`Fdroid` is using background polling to lack the missing of Pushed. Now a solution using UnifiedPush has ben added to the project. See refer to [the dedicated documentation](./unifiedpush.md) for more details.
-
-#### MvRx
-
-[Maverick](https://airbnb.io/mavericks/#/README) (or MvRx) is an Android MVI framework that helps to develop Reactive application on Android.
-
-- Activity: holder for Fragment. See the parent [VectorBaseActivity](../vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt);
-- Fragment: manage screen of the application. See the parent [VectorBaseFragment](../vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt);
-- BottomSheet: see the parent [VectorBaseBottomSheetDialogFragment](../vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt);
-- ViewModel: this is where the logic is placed. All our ViewModel has a `handle()` which takes action as parameter. See the parent [VectorViewModel](../vector/src/main/java/im/vector/app/core/platform/VectorViewModel.kt);
-- VectorSharedActionViewModel: Specific ViewModel that can be used to communicate between Fragment(s) and the host Activity. See the parent [VectorSharedActionViewModel](../vector/src/main/java/im/vector/app/core/platform/VectorSharedActionViewModel.kt);
-- ViewState: this are `data class`, and this represent the state of the View. Has to be copied and set to be updated. Fragment will update the UI regarding the current state (`invalidate()` method). `Async` class from MvRx can be used in the ViewState, especially for asynchronous data loading. Nullability can also be used for optional data. ViewStates have to implement `MavericksState`;
-- ViewEvents: useful when the ViewModel asks the View to trigger a specific action: navigation, show dialog, etc. See the parent [VectorViewEvents](../vector/src/main/java/im/vector/app/core/platform/VectorViewEvents.kt);
-- ViewAction (`VectorViewModelAction`): useful when the UI (generally the Fragment) asks the ViewModel to do something. See the parent [VectorViewModelAction](../vector/src/main/java/im/vector/app/core/platform/VectorViewModelAction.kt);
-- Controller: see the `Epoxy` section just below.
-
-##### Behavior
-
-Fragment asks the ViewModel to perform an action (coming from the user, but not necessarily. ViewModel can then talk to the SDK, updates the state once or several times. Fragment update the UI regarding the new state.
-
-When ViewModel is instantiated, it can subscribe using the SDK Services to get live state of the data.
-
-`invalidate()` has to be used by default, but it's possible to listen to specific member(s) of the `ViewState` using `onEach`. TODO Add an example.
-`awaitState()` method
-
-#### Epoxy
-
-[Epoxy](https://github.com/airbnb/epoxy) is an Android library for building complex screens in a RecyclerView. Please read [the introduction](https://github.com/airbnb/epoxy#epoxy).
-
-- Controller declares items of the RecyclerView. Controller is injected in the Fragment. Controller extends `EpoxyController`, or one of its subclass, especially `TypedEpoxyController`;
-- Fragment gives the state to the controller using `setData`;
-- `buildModels` will be called by the framework;
-- Controller will create ordered Items.
-
-Epoxy does the diffing, and handle many other thing for us, like handling item type, etc.
-
-See for instance the controller [AccountDataEpoxyController](../vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataEpoxyController.kt)) for a simple example.
-
-Warning: do not use twice the same item `id` or it will crash.
-
-#### Other frameworks
-
-- Dependency injection is managed by [Dagger](https://dagger.dev/) (SDK) and [Hilt](https://developer.android.com/training/dependency-injection/hilt-android) (App);
-- [Retrofit](https://square.github.io/retrofit/) and [OkHttp3](https://square.github.io/okhttp/): network requests;
-- [Moshi](https://github.com/square/moshi) is used to parse and serialize Json object; 
-
-### Push
-
-Please see the dedicated documentation for more details.
-
-This is the classical scenario:
-
-- App receives a Push. Note: Push is ignored if app is in foreground;
-- App asks the SDK to load Event data (fastlane mode). We have a change to get the data faster and display the notification faster;
-- App asks the SDK to perform a sync request.
-
-### Dependencies management
-
-All the dependencies are declared in `build.gradle` files. But some versions are declared in [this dedicated file](../dependencies.gradle).
-
-When adding a new dependency, you will have to update the file [dependencies_groups.gradle](../dependencies_groups.gradle) to allow the dependency to be downloaded from the artifact repository. Sometimes sub-dependencies need to be added too, until the project can compile.
-
-[Dependabot](https://github.com/dependabot) is set up on the project. This tool will automatically create Pull Request to upgrade our dependencies one by one.
-dependencies_group, gradle files, Dependabot, etc.
-
-### Test
-
-Please refer to [this dedicated document](./ui-tests.md).
-
-TODO add link to the dedicated screenshot test documentation
-
-### Other points
-
-#### Logging
-
-**Important warning: ** NEVER log private user data, or use the flag `LOG_PRIVATE_DATA`. Be very careful when logging `data class`, all the content will be output!
-
-[Timber](https://github.com/JakeWharton/timber) is used to log data to logcat. We do not use directly the `Log` class. If possible please use a tag, as per
-
-````kotlin
-Timber.tag(loggerTag.value).d("my log")
-````
-
-because automatic tag (= class name) will not be available on the release version.
-
-Also generally it is recommended to provide the `Throwable` to the Timber log functions.
-
-Last point, not that `Timber.v` function may have no effect on some devices. Prefer using `Timber.d` and up.
-
-#### Rageshake
-
-Rageshake is a feature to send bug report directly from the application. Just shake your phone and you will be prompted to send a bug report.
-
-Bug report can contain:
-- a screenshot of the current application state
-- the application logs from up to 15 application starts
-- the logcat logs
-- the key share history (crypto data)
-
-The data will be sent to an internal server, which is not publicly accessible. A GitHub issue will also be created to a private GitHub repository.
-
-Rageshake can be very useful to get logs from a release version of the application.
-
-### Tips
-
-- Element Android has a `developer mode` in the `Settings/Advanced settings`. Other useful options are available here;
-- Show hidden Events can also help to debug feature. When developer mode is enabled, it is possible to view the source (= the Json content) of any Events;
-- Type `/devtools` in a Room composer to access a developer menu. There are some other entry points. Developer mode has to be enabled;
-- Hidden debug menu: when developer mode is enabled and on debug build, there are some extra screens that can be accessible using the green wheel. In those screens, it will be possible to toggle some feature flags;
-- Using logcat, filtering with `onResume` can help you to understand what screen are currently displayed on your device. Searching for string displayed on the screen can also help to find the running code in the codebase.
-- When this is possible, prefer using `sealed interface` instead of `sealed class`;
-- When writing temporary code, using the string "DO NOT COMMIT" in a comment can help to avoid committing things by mistake. If committed and pushed, the CI will detect this String and will warn the user about it.
-
-## Happy coding!
-
-The team is here to support you, feel free to ask anything to other developers.
-
-Also please feel to update this documentation, if incomplete/wrong/obsolete/etc.
-
-**Thanks!**

docs/add_threePids.md

@@ -1,34 +1,5 @@
 # Adding and removing ThreePids to an account
 
-<!--- TOC -->
-
-* [Add email](#add-email)
-  * [User enter the email](#user-enter-the-email)
-    * [The email is already added to an account](#the-email-is-already-added-to-an-account)
-    * [The email is free](#the-email-is-free)
-* [User receives an e-mail](#user-receives-an-e-mail)
-  * [User clicks on the link](#user-clicks-on-the-link)
-  * [User returns on Element](#user-returns-on-element)
-  * [User enters his password](#user-enters-his-password)
-    * [The link has not been clicked](#the-link-has-not-been-clicked)
-    * [Wrong password](#wrong-password)
-    * [The link has been clicked and the account password is correct](#the-link-has-been-clicked-and-the-account-password-is-correct)
-* [Remove email](#remove-email)
-  * [User want to remove an email from his account](#user-want-to-remove-an-email-from-his-account)
-    * [Email was not bound to an identity server](#email-was-not-bound-to-an-identity-server)
-    * [Email was bound to an identity server](#email-was-bound-to-an-identity-server)
-* [Add phone number](#add-phone-number)
-    * [The phone number is already added to an account](#the-phone-number-is-already-added-to-an-account)
-    * [The phone number is free](#the-phone-number-is-free)
-* [User receive a text message](#user-receive-a-text-message)
-  * [User enter the code to the app](#user-enter-the-code-to-the-app)
-    * [Wrong code](#wrong-code)
-    * [Correct code](#correct-code)
-* [Remove phone number](#remove-phone-number)
-  * [User wants to remove a phone number from his account](#user-wants-to-remove-a-phone-number-from-his-account)
-
-<!--- END -->
-
 ## Add email
 
 ### User enter the email
@@ -66,9 +37,9 @@ Wording: "We've sent you an email to verify your address. Please follow the inst
 }
 ```
 
-## User receives an e-mail
+## User receive an e-mail
 
-> `homeserver.org` Validate your email
+> [homeserver.org] Validate your email
 >
 > A request to add an email address to your Matrix account has been received. If this was you, please click the link below to confirm adding this email:
   https://homeserver.org/_matrix/client/unstable/add_threepid/email/submit_token?token=WUnEhQAmJrXupdEbXgdWvnVIKaGYZFsU&client_secret=TixzvOnw7nLEUdiQEmkHzkXKrY4HhiGh&sid=bxyDHuJKsdkjMlTJ

docs/analytics.md

@@ -1,13 +1,5 @@
 # Analytics in Element
 
-<!--- TOC -->
-
-* [Solution](#solution)
-* [How to add a new Event](#how-to-add-a-new-event)
-* [Forks of Element](#forks-of-element)
-
-<!--- END -->
-
 ## Solution
 
 Element is using PostHog to send analytics event.

docs/color_migration_guide.md

@@ -1,14 +1,5 @@
 # Color migration
 
-<!--- TOC -->
-
-  * [Changes](#changes)
-  * [Main change for developers](#main-change-for-developers)
-  * [Remaining work](#remaining-work)
-  * [Migration guide](#migration-guide)
-
-<!--- END -->
-
 ### Changes
 
 - use colors defined in https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=557%3A0

docs/danger.md

@@ -1,106 +0,0 @@
-## Danger
-
-<!--- TOC -->
-
-* [What does danger checks](#what-does-danger-checks)
-  * [PR check](#pr-check)
-  * [Quality check](#quality-check)
-* [Setup](#setup)
-* [Run danger locally](#run-danger-locally)
-* [Danger user](#danger-user)
-* [Useful links](#useful-links)
-
-<!--- END -->
-
-## What does danger checks
-
-### PR check
-
-See the [dangerfile](../tools/danger/dangerfile.js). If you add rules in the dangerfile, please update the list below!
-
-Here are the checks that Danger does so far:
-
-- PR description is not empty
-- Big PR got a warning to recommend to split
-- PR contains a file for towncrier and extension is checked
-- PR does not modify frozen classes
-- PR contains a Sign-Off, with exception for Element employee contributors
-- PR with change on layout should include screenshot in the description
-- PR which adds png file warn about the usage of vector drawables
-- non draft PR should have a reviewer
-- files containing translations are not modified by developers
-
-### Quality check
-
-After all the checks that generate checkstyle XML report, such as Ktlint, lint, or Detekt, Danger is run with this [dangerfile](../tools/danger/dangerfile-lint.js), in order to post comments to the PR with the detected error and warnings.
-
-To run locally, you will have to install the plugin `danger-plugin-lint-report` using:
-
-```shell
-yarn add danger-plugin-lint-report --dev
-```
-
-## Setup
-
-This operation should not be necessary, since Danger is already setup for the project.
-
-To setup danger to the project, run:
-
-```shell
-bundle exec danger init
-```
-
-## Run danger locally
-
-When modifying the [dangerfile](../tools/danger/dangerfile.js), you can check it by running Danger locally.
-
-To run danger locally, install it and run:
-
-```shell
-bundle exec danger pr <PR_URL> --dangerfile=./tools/danger/dangerfile.js
-```
-
-For instance:
-
-```shell
-bundle exec danger pr https://github.com/vector-im/element-android/pull/6637 --dangerfile=./tools/danger/dangerfile.js
-```
-
-We may need to create a GitHub token to have less API rate limiting, and then set the env var:
-
-```shell
-export DANGER_GITHUB_API_TOKEN='YOUR_TOKEN'
-```
-
-Swift and Kotlin (just in case)
-
-```shell
-bundle exec danger-swift pr <PR_URL> --dangerfile=./tools/danger/dangerfile.js
-bundle exec danger-kotlin pr <PR_URL> --dangerfile=./tools/danger/dangerfile.js
-```
-
-## Danger user
-
-To let Danger check all the PRs, including PRs form forks, a GitHub account have been created:
-- login: ElementBot
-- password: Stored on Passbolt
-- GitHub token: A token with limited access has been created and added to the repository https://github.com/vector-im/element-android as secret DANGER_GITHUB_API_TOKEN. This token is not saved anywhere else. In case of problem, just delete it and create a new one, then update the secret.
-
-PRs from forks do not always have access to the secret `secrets.DANGER_GITHUB_API_TOKEN`, so `secrets.GITHUB_TOKEN` is also provided to the job environment. If `secrets.DANGER_GITHUB_API_TOKEN` is available, it will be used, so user `ElementBot` will comment the PR. Else `secrets.GITHUB_TOKEN` will be used, and bot `github-actions` will comment the PR.
-
-## Useful links
-
-- https://danger.systems/
-- https://danger.systems/js/
-- https://danger.systems/js/guides/getting_started.html
-- https://danger.systems/js/reference.html
-- https://github.com/danger/awesome-danger
-
-Some danger files to get inspired from
-
-- https://github.com/artsy/emission/blob/master/dangerfile.ts
-- https://github.com/facebook/react-native/blob/master/bots/dangerfile.js
-- https://github.com/apollographql/apollo-client/blob/master/config/dangerfile.ts
-- https://github.com/styleguidist/react-styleguidist/blob/master/dangerfile.js
-- https://github.com/storybooks/storybook/blob/master/dangerfile.js
-- https://github.com/ReactiveX/rxjs/blob/master/dangerfile.js

docs/design.md

@@ -1,31 +1,5 @@
 # Element Android design
 
-<!--- TOC -->
-
-* [Introduction](#introduction)
-* [How to import from Figma to the Element Android project](#how-to-import-from-figma-to-the-element-android-project)
-  * [Colors](#colors)
-  * [Text](#text)
-  * [Dimension, position and margin](#dimension-position-and-margin)
-  * [Icons](#icons)
-    * [Export drawable from Figma](#export-drawable-from-figma)
-    * [Import in Android Studio](#import-in-android-studio)
-  * [Images](#images)
-* [Figma links](#figma-links)
-  * [Coumpound](#coumpound)
-  * [Login](#login)
-    * [Login v2](#login-v2)
-  * [Room list](#room-list)
-  * [Timeline](#timeline)
-  * [Voice message](#voice-message)
-  * [Room settings](#room-settings)
-  * [VoIP](#voip)
-  * [Presence](#presence)
-  * [Spaces](#spaces)
-  * [List to be continued...](#list-to-be-continued)
-
-<!--- END -->
-
 ## Introduction
 
 Design at element.io is done using Figma - https://www.figma.com

docs/flipper.md

@@ -1,58 +0,0 @@
-# Flipper
-
-<!--- TOC -->
-
-* [Introduction](#introduction)
-* [Setup](#setup)
-  * [Troubleshoot](#troubleshoot)
-    * [No device found issue](#no-device-found-issue)
-    * [Diagnostic Activity](#diagnostic-activity)
-    * [Other](#other)
-* [Links](#links)
-
-<!--- END -->
-
-## Introduction
-
-[Flipper](https://fbflipper.com) is a powerful tool from Meta, which allow to inspect the running application details and states from your computer.
-
-Flipper is configured in the Element Android project to let the developers be able to:
-- inspect all the Realm databases content;
-- do layout inspection;
-- see the crash logs;
-- see the logcat;
-- see all the network requests;
-- see all the SharedPreferences;
-- take screenshots and record videos of the device;
-- and more!
-
-## Setup
-
-- Install Flipper on your computer. Follow instructions here: https://fbflipper.com/docs/getting-started/index/
-- Run the debug version of Element on an emulator or on a real device.
-
-### Troubleshoot
-
-#### No device found issue
-
-The configuration of the Flipper application has to be updated. The issue has been asked and answered here: https://stackoverflow.com/questions/71744103/android-emulator-unable-to-connect-to-flipper/72608113#72608113
-
-#### Diagnostic Activity
-
-Flipper comes with a Diagnostic Activity that you can start from command line using:
-
-```shell
-adb shell am start -n im.vector.app.debug/com.facebook.flipper.android.diagnostics.FlipperDiagnosticActivity
-```
-
-It provides some log which can help to figure out what's going on client side.
-
-#### Other
-
-https://fbflipper.com/docs/getting-started/troubleshooting/android/ may help.
-
-## Links
-
-- Official Flipper website: https://fbflipper.com
-- Realm Plugin for Flipper: https://github.com/kamgurgul/Flipper-Realm
-- Dedicated Matrix room: https://matrix.to/#/#unifiedpush:matrix.org

docs/hilt_migration.md

@@ -7,8 +7,8 @@ Hilt is built on top of Dagger 2 and simplify usage by removing needs to create
 When you create a new feature, you should have the following:
 
 Annotate your Activity with @AndroidEntryPoint
-Annotate your Fragment with @AndroidEntryPoint
 If you have a BottomSheetFragment => Annotate it with @AndroidEntryPoint
+Otherwise => Add your Fragment to the FragmentModule
 Add your ViewModel.Factory to the MavericksViewModelModule
 Makes sure your ViewModel as the following code:
 

docs/identity_server.md

@@ -1,19 +1,5 @@
 # Identity server
 
-<!--- TOC -->
-
-* [Introduction](#introduction)
-* [Implementation](#implementation)
-* [Related MSCs](#related-mscs)
-* [Steps and requirements](#steps-and-requirements)
-* [Screens](#screens)
-  * [Settings](#settings)
-  * [Discovery screen](#discovery-screen)
-  * [Set identity server screen](#set-identity-server-screen)
-* [Ref:](#ref:)
-
-<!--- END -->
-
 Issue: #607
 PR: #1354
 

docs/integration_tests.md

@@ -1,18 +1,5 @@
 # Integration tests
 
-<!--- TOC -->
-
-* [Pre requirements](#pre-requirements)
-* [Install and run Synapse](#install-and-run-synapse)
-* [Run the test](#run-the-test)
-* [Stop Synapse](#stop-synapse)
-* [Troubleshoot](#troubleshoot)
-  * [Android Emulator does cannot reach the homeserver](#android-emulator-does-cannot-reach-the-homeserver)
-  * [Tests partially run but some fail with "Unable to contact localhost:8080"](#tests-partially-run-but-some-fail-with-"unable-to-contact-localhost:8080")
-  * [virtualenv command fails](#virtualenv-command-fails)
-
-<!--- END -->
-
 Integration tests are useful to ensure that the code works well for any use cases.
 
 They can also be used as sample on how to use the Matrix SDK.
@@ -56,17 +43,14 @@ virtualenv -p python3 env
 source env/bin/activate
 pip install -e .
 demo/start.sh --no-rate-limit
-
 ```
 
-Alternatively, to install the latest Synapse release package (and not a cloned branch) you can run the following instead of `git clone` and `pip install -e .`:
+Alternatively, to install the latest Synapse release package (and not a cloned branch) you can run the following instead of `pip install -e .`:
 
 ```bash
 pip install matrix-synapse
 ```
 
-On your first run, you will want to stop the demo and edit the config to correct the `public_baseurl` to http://10.0.2.2:8080 and restart the server.
-
 You should now have 3 running federated Synapse instances 🎉, at http://127.0.0.1:8080/, http://127.0.0.1:8081/ and  http://127.0.0.1:8082/, which should display a "It Works! Synapse is running" message.
 
 ## Run the test
@@ -103,18 +87,6 @@ You'll need python3 to be able to run synapse
 
 Try on the Emulator browser to open "http://10.0.2.2:8080". You should see the "Synapse is running" message.
 
-### Tests partially run but some fail with "Unable to contact localhost:8080"
-
-This is because the `public_baseurl` of synapse is not consistent with the endpoint that the tests are connecting to.
-
-Ensure you have the following configuration in `demo/etc/8080.config`.
-
-```
-public_baseurl: http://10.0.2.2:8080/
-```
-
-After changing this you will need to restart synapse using `demo/stop.sh` and `demo/start.sh` to load the new configuration.
-
 ### virtualenv command fails
 
 You can try using

docs/jitsi.md

@@ -1,40 +1,26 @@
 # Jitsi in Element Android
 
-<!--- TOC -->
-
-* [Native Jitsi SDK](#native-jitsi-sdk)
-  * [How to build the Jitsi Meet SDK](#how-to-build-the-jitsi-meet-sdk)
-    * [Jitsi version](#jitsi-version)
-    * [Run the build script](#run-the-build-script)
-    * [Link with the new generated library](#link-with-the-new-generated-library)
-    * [Sanity tests](#sanity-tests)
-    * [Export the build library](#export-the-build-library)
-
-<!--- END -->
-
 Native Jitsi support has been added to Element Android by the PR [#1914](https://github.com/vector-im/element-android/pull/1914). The description of the PR contains some documentation about the behaviour in each possible room configuration.
 
 Also, ensure to have a look on [the documentation from Element Web](https://github.com/vector-im/element-web/blob/develop/docs/jitsi.md)
 
 The official documentation about how to integrate the Jitsi SDK in an Android app is available here: https://jitsi.github.io/handbook/docs/dev-guide/dev-guide-android-sdk.
 
-## Native Jitsi SDK
+# Native Jitsi SDK
 
 The Jitsi SDK is built by ourselves with the flag LIBRE_BUILD, to be able to be integrated on the F-Droid version of Element Android.
 
 The generated maven repository is then host in the project https://github.com/vector-im/jitsi_libre_maven
 
-### How to build the Jitsi Meet SDK
+## How to build the Jitsi Meet SDK
 
-#### Jitsi version
+### Jitsi version
 
 Update the script `./tools/jitsi/build_jisti_libs.sh` with the tag of the project `https://github.com/jitsi/jitsi-meet`.
 
-Latest tag can be found from this page: https://github.com/jitsi/jitsi-meet-release-notes/blob/master/CHANGELOG-MOBILE-SDKS.md
-
 Currently we are building the version with the tag `android-sdk-3.10.0`.
 
-#### Run the build script
+### Run the build script
 
 At the root of the Element Android, run the following script:
 
@@ -44,7 +30,7 @@ At the root of the Element Android, run the following script:
 
 It will build the Jitsi Meet Android library and put every generated files in the folder `/tmp/jitsi`
 
-#### Link with the new generated library
+### Link with the new generated library
 
 - Update the file `./build.gradle` to use the previously created local Maven repository. Currently we have this line:
 
@@ -69,7 +55,7 @@ implementation('com.facebook.react:react-native-webrtc:1.92.1-jitsi-9093212@aar'
 - Perform a gradle sync and build the project
 - Perform test
 
-#### Sanity tests
+### Sanity tests
 
 In order to validate that the upgrade of the Jitsi and WebRTC dependency does not break anything, the following sanity tests have to be performed, using two devices:
 - Make 1-1 audio call (so using WebRTC)
@@ -77,7 +63,7 @@ In order to validate that the upgrade of the Jitsi and WebRTC dependency does no
 - Create and join a conference call with audio only (so using Jitsi library). Leave the conference. Join it again.
 - Create and join a conference call with audio and video (so using Jitsi library) Leave the conference. Join it again.
 
-#### Export the build library
+### Export the build library
 
 If all the tests are passed, you can export the generated Jitsi library to our Maven repository.
 
@@ -93,4 +79,4 @@ url "https://github.com/vector-im/jitsi_libre_maven/raw/master/android-sdk-3.10.
 
 - Build the project and perform the sanity tests again.
 
-- Create a PR for project Element Android and add a changelog file `<PR_NUMBER>.misc` to notify about the library upgrade.
+- Update the file `/CHANGES.md` to notify about the library upgrade, and create a regular PR for project Element Android.

docs/nightly_build.md

@@ -1,54 +0,0 @@
-# Nightly builds
-
-<!--- TOC -->
-
-* [Configuration](#configuration)
-* [How to register to get nightly build](#how-to-register-to-get-nightly-build)
-* [Build nightly manually](#build-nightly-manually)
-
-<!--- END -->
-
-## Configuration
-
-The nightly build will contain what's on develop, in release mode, for Gplay variant. It is signed using a dedicated signature, and has a dedicated appId (`im.vector.app.nightly`), so it can be installed along with the production version of Element Android. The only other difference compared to Element Android is a different app icon background. We do not want to change the app name since it will also affect some strings in the app, and we do want to do that.
-
-Nightly builds are built and released to Firebase every days, and automatically.
-
-This is recommended to exclusively use this app, with your main account, instead of Element Android, and fallback to Element Android just in case of regression, to discover as soon as possible any regression, and report it to the team. To avoid double notification, you may want to disable the notification from the Element Android production version. Just open Element Android, navigate to `Settings/Notifications` and uncheck `Enable notifications for this session`.
-
-*Note:* Due to a limitation of Firebase, the nightly build is the universal build, which means that the size of the APK is a bit bigger, but this should not have any other side effect.
-
-## How to register to get nightly build
-
-Provide your email to the Android team, who will add it to the list "External testers" on Firebase. You will then receive an invite on the provided email.
-
-Follow the instructions on the email to install the latest nightly build. This is not clear yet if new nightly build will be automatically installed or not.
-
-## Build nightly manually
-
-Nightly build can be built manually from your computer. You will need to retrieved some secrets from Passbolt and add them to your file `~/.gradle/gradle.properties`:
-
-```
-signing.element.nightly.storePassword=VALUE_FROM_PASSBOLT
-signing.element.nightly.keyId=VALUE_FROM_PASSBOLT
-signing.element.nightly.keyPassword=VALUE_FROM_PASSBOLT
-```
-
-You will also need to add the environment variable `FIREBASE_TOKEN`:
-
-```sh
-export FIREBASE_TOKEN=VALUE_FROM_PASSBOLT
-```
-
-Then you can run the following commands (which are also used in the file for [the GitHub action](../.github/workflows/nightly.yml)):
-
-```sh
-git checkout develop
-mv towncrier.toml towncrier.toml.bak
-sed 's/CHANGES\.md/CHANGES_NIGHTLY\.md/' towncrier.toml.bak > towncrier.toml
-rm towncrier.toml.bak
-yes n | towncrier build --version nightly
-./gradlew assembleGplayNightly appDistributionUploadGplayNightly $CI_GRADLE_ARG_PROPERTIES
-```
-
-Then you can reset the change on the codebase.

docs/notifications.md

@@ -1,42 +1,37 @@
 This document aims to describe how Element android displays notifications to the end user. It also clarifies notifications and background settings in the app.
 
 # Table of Contents
-
-<!--- TOC -->
-
-* [Prerequisites Knowledge](#prerequisites-knowledge)
-  * [How does a matrix client get a message from a homeserver?](#how-does-a-matrix-client-get-a-message-from-a-homeserver?)
-  * [How does a mobile app receives push notification](#how-does-a-mobile-app-receives-push-notification)
-  * [Push VS Notification](#push-vs-notification)
-  * [Push in the matrix federated world](#push-in-the-matrix-federated-world)
-  * [How does the homeserver know when to notify a client?](#how-does-the-homeserver-know-when-to-notify-a-client?)
-  * [Push vs privacy, and mitigation](#push-vs-privacy-and-mitigation)
-  * [Background processing limitations](#background-processing-limitations)
-* [Element Notification implementations](#element-notification-implementations)
-  * [Requirements](#requirements)
-  * [Foreground sync mode (Gplay and F-Droid)](#foreground-sync-mode-gplay-and-f-droid)
-  * [Push (FCM) received in background](#push-fcm-received-in-background)
-  * [FCM Fallback mode](#fcm-fallback-mode)
-  * [F-Droid background Mode](#f-droid-background-mode)
-* [Application Settings](#application-settings)
-
-<!--- END -->
+1. [Prerequisites Knowledge](#prerequisites-knowledge)
+    * [How does a matrix client get a message from a homeserver?](#how-does-a-matrix-client-get-a-message-from-a-homeserver)
+    * [How does a mobile app receives push notification?](#how-does-a-mobile-app-receives-push-notification)
+    * [Push VS Notification](#push-vs-notification)
+    * [Push in the matrix federated world](#push-in-the-matrix-federated-world)
+    * [How does the homeserver know when to notify a client?](#how-does-the-homeserver-know-when-to-notify-a-client)
+    * [Push vs privacy, and mitigation](#push-vs-privacy-and-mitigation)
+    * [Background processing limitations](#background-processing-limitations)
+2. [Element Notification implementations](#element-notification-implementations)
+    * [Requirements](#requirements) 
+    * [Foreground sync mode (Gplay & F-Droid)](#foreground-sync-mode-gplay-f-droid)
+    * [Push (FCM) received in background](#push-fcm-received-in-background)
+    * [FCM Fallback mode](#fcm-fallback-mode)
+    * [F-Droid background Mode](#f-droid-background-mode)
+3. [Application Settings](#application-settings)
 
 
 First let's start with some prerequisite knowledge
 
-## Prerequisites Knowledge
+# Prerequisites Knowledge
 
-### How does a matrix client get a message from a homeserver?
+## How does a matrix client get a message from a homeserver?
 
 In order to get messages from a homeserver, a matrix client need to perform a ``sync`` operation.
 
 `To read events, the intended flow of operation is for clients to first call the /sync API without a since parameter. This returns the most recent message events for each room, as well as the state of the room at the start of the returned timeline. `
 
-The client need to call the `sync` API periodically in order to get incremental updates of the server state (new messages).
+The client need to call the `sync`API periodically in order to get incremental updates of the server state (new messages).
 This mechanism is known as **HTTP long Polling**.
 
-Using the **HTTP Long Polling** mechanism a client polls a server requesting new information.
+Using the **HTTP Long Polling** mechanism  a client polls a server requesting new information.
 The server *holds the request open until new data is available*.
 Once available, the server responds and sends the new information.
 When the client receives the new information, it immediately sends another request, and the operation is repeated.
@@ -57,7 +52,7 @@ By default, this is 0, so the server will return immediately even if the respons
 
 When the Element Android app is open (i.e in foreground state), the default timeout is 30 seconds, and delay is 0.
 
-### How does a mobile app receives push notification
+## How does a mobile app receives push notification
 
 Push notification is used as a way to wake up a mobile application when some important information is available and should be processed.
 
@@ -71,22 +66,22 @@ FCM will only work on android devices that have Google plays services installed
 (In simple terms, Google Play Services is a background service that runs on Android, which in turn helps in integrating Google’s advanced functionalities to other applications)
 
 De-Googlified devices need to rely on something else in order to stay up to date with a server.
-There some cases when devices with google services cannot use FCM (network infrastructure limitations -firewalls-,
- privacy and or independence requirement, source code licence)
+There some cases when devices with google services cannot use FCM (network infrastructure limitations -firewalls- ,
+ privacy and or independency requirement, source code licence)
 
-### Push VS Notification
+## Push VS Notification
 
 This need some disambiguation, because it is the source of common confusion:
 
 
-*The fact that you see a notification on your screen does not mean that you have successfully configured your PUSH platform.*
+*The fact that you see a notification on your screen does not mean that you have successfully configured your PUSH plateform.*
 
   Technically there is a difference between a push and a notification. A notification is what you see on screen and/or in the notification Menu/Drawer (in the top bar of the phone).
 
   Notifications are not always triggered by a push (One can display a notification locally triggered by an alarm)
 
 
-### Push in the matrix federated world
+## Push in the matrix federated world
 
 In order to send a push to a mobile, App developers need to have a server that will use the FCM APIs, and these APIs requires authentication!
 This server is called a **Push Gateway** in the matrix world
@@ -123,11 +118,11 @@ Client/Server API  +              |                    |  |      |            |
 ```
 
 Recommended reading:
-* https://thomask.sdf.org/blog/2016/12/11/riots-magical-push-notifications-in-ios.html
+ * https://thomask.sdf.org/blog/2016/12/11/riots-magical-push-notifications-in-ios.html
 * https://matrix.org/docs/spec/client_server/r0.4.0.html#id128
 
 
-### How does the homeserver know when to notify a client?
+## How does the homeserver know when to notify a client?
 
 This is defined by [**push rules**](https://matrix.org/docs/spec/client_server/r0.4.0.html#push-rules-).
 
@@ -145,14 +140,14 @@ Of course, content patterns matching cannot be used for encrypted messages serve
 
 That is why clients are able to **process the push rules client side** to decide what kind of notification should be presented for a given event.
 
-### Push vs privacy, and mitigation
+## Push vs privacy, and mitigation
 
 As seen previously, App developers don't directly send a push to the end user's device, they use a Push Provider as intermediary. So technically this intermediary is able to read the content of what is sent.
 
 App developers usually mitigate this by sending a `silent notification`, that is a notification with no identifiable data, or with an encrypted payload. When the push is received the app can then synchronise to it's server in order to generate a local notification.
 
 
-### Background processing limitations
+## Background processing limitations
 
 A mobile applications process live in a managed word, meaning that its process can be limited (e.g no network access), stopped or killed at almost anytime by the Operating System.
 
@@ -172,15 +167,15 @@ The documentation on this subject is vague, and as per our experiments not alway
 
 It is getting more and more complex to have reliable notifications when FCM is not used.
 
-## Element Notification implementations
+# Element Notification implementations
 
-### Requirements
+## Requirements
 
 Element Android must work with and without FCM.
 * The Element android app published on F-Droid do not rely on FCM (all related dependencies are not present)
 * The Element android app published on google play rely on FCM, with a fallback mode when FCM registration has failed (e.g outdated or missing Google Play Services)
 
-### Foreground sync mode (Gplay and F-Droid)
+## Foreground sync mode (Gplay & F-Droid)
 
 When in foreground, Element performs sync continuously with a timeout value set to 10 seconds (see HttpPooling).
 
@@ -188,9 +183,9 @@ As this mode does not need to live beyond the scope of the application, and as p
 
 This mode is turned on when the app enters foreground, and off when enters background.
 
-In background, and depending on whether push is available or not, Element will use different methods to perform the syncs (Workers / Alarms / Service)
+In background, and depending on wether push is available or not, Element will use different methods to perform the syncs (Workers / Alarms / Service)
 
-### Push (FCM) received in background 
+## Push (FCM) received in background 
 
 In order to enable Push, Element must first get a push token from the firebase SDK, then register a pusher with this token on the homeserver.
 
@@ -230,10 +225,10 @@ Upon reception of the FCM push, Element will perform a sync call to the homeserv
 
 Element implements several strategies in these cases (TODO document)
 
-### FCM Fallback mode
+## FCM Fallback mode
 
 It is possible that Element is not able to get a FCM push token.
-Common errors (among several others) that can cause that:
+Common errors (amoung several others) that can cause that:
 * Google Play Services is outdated
 * Google Play Service fails in someways with FCM servers (infamous `SERVICE_NOT_AVAILABLE`)
 
@@ -251,7 +246,7 @@ Usually in this mode, what happen is when you take back your phone in your hand,
 
 The fallback mode is supposed to be a temporary state waiting for the user to fix issues for FCM, or for App Developers that has done a fork to correctly configure their FCM settings.
 
-### F-Droid background Mode
+## F-Droid background Mode
 
 The F-Droid Element flavor has no dependencies to FCM, therefore cannot relies on Push.
 
@@ -261,7 +256,7 @@ Only solution left is to use `AlarmManager`, that offers new API to allow launch
 
 Notice that these alarms, due to their potential impact on battery life, can still be restricted by the system. Documentation says that they will not be triggered more than every minutes under normal system operation, and when in low power mode about every 15 mn.
 
-These restrictions can be relaxed by requiring the app to be white listed from battery optimization.
+These restrictions can be relaxed by requirering the app to be white listed from battery optimization.
 
 F-Droid version will schedule alarms that will then trigger a Broadcast Receiver, that in turn will launch a Service (in the classic android way), and the reschedule an alarm for next time.
 
@@ -271,7 +266,9 @@ That is why on Element F-Droid, the broadcast receiver will acquire a temporary
 
 Note that foreground services require to put a notification informing the user that the app is doing something even if not launched).
 
-## Application Settings
+
+
+# Application Settings
 
 **Notifications > Enable notifications for this account**
 

docs/pull_request.md

@@ -1,290 +0,0 @@
-# Pull requests
-
-<!--- TOC -->
-
-* [Introduction](#introduction)
-* [Who should read this document?](#who-should-read-this-document?)
-* [Submitting PR](#submitting-pr)
-  * [Who can submit pull requests?](#who-can-submit-pull-requests?)
-    * [Humans](#humans)
-      * [Draft PR?](#draft-pr?)
-      * [Base branch](#base-branch)
-      * [PR Review Assignment](#pr-review-assignment)
-      * [PR review time](#pr-review-time)
-      * [Re-request PR review](#re-request-pr-review)
-      * [When create split PR?](#when-create-split-pr?)
-      * [Avoid fixing other unrelated issue in a big PR](#avoid-fixing-other-unrelated-issue-in-a-big-pr)
-    * [Bots](#bots)
-      * [Dependabot](#dependabot)
-      * [Gradle wrapper](#gradle-wrapper)
-      * [Sync analytics plan](#sync-analytics-plan)
-* [Reviewing PR](#reviewing-pr)
-  * [Who can review pull requests?](#who-can-review-pull-requests?)
-  * [What to have in mind when reviewing a PR](#what-to-have-in-mind-when-reviewing-a-pr)
-  * [Rules](#rules)
-    * [Check the form](#check-the-form)
-      * [PR title](#pr-title)
-      * [PR description](#pr-description)
-      * [File change](#file-change)
-      * [Check the commit](#check-the-commit)
-      * [Check the substance](#check-the-substance)
-      * [Make a dedicated meeting to review the PR](#make-a-dedicated-meeting-to-review-the-pr)
-  * [What happen to the issue(s)?](#what-happen-to-the-issues?)
-  * [Merge conflict](#merge-conflict)
-  * [When and who can merge PR](#when-and-who-can-merge-pr)
-    * [Merge type](#merge-type)
-  * [Resolve conversation](#resolve-conversation)
-* [Responsibility](#responsibility)
-
-<!--- END -->
-
-## Introduction
-
-This document gives some clue about how to efficiently manage Pull Requests (PR). This document is a first draft and may be improved later.
-
-## Who should read this document?
-
-Every pull request reviewers, but also probably every ones who submit PRs.
-
-## Submitting PR
-
-### Who can submit pull requests?
-
-Basically every one who wants to contribute to the project! But there are some rules to follow.
-
-#### Humans
-
-People with write access to the project can directly clone the project, push their branches and create PR.
-
-External contributors must first fork the project and create PR to the mainline from there.
-
-##### Draft PR?
-
-Draft PR can be created when the submitter does not expect the PR to be reviewed and merged yet. It can be useful to publicly show the work, or to do a self-review first.
-
-Draft PR can also be created when it depends on other un-merged PR.
-
-In any case, it is better to explicitly declare in the description why the PR is a draft PR.
-
-Also, draft PR should not stay indefinitely in this state. It may be removed if it is the case and the submitter does not update it after a few days.
-
-##### Base branch
-
-The `develop` branch is generally the base branch for every PRs.
-
-Exceptions can occur:
-
-- if a feature implementation is split into multiple PRs. We can have a chain of PRs in this case. PR can be merged one by one on develop, and GitHub change the target branch to `develop` for the next PR automatically.
-- we want to merge a PR from the community, but there is still work to do, and the PR is not updated by the submitter. First, we can kindly ask the submitter if they will update their PR, by commenting it. If there is no answer after a few days (including a week-end), we can create a new branch, push it, and change the target branch of the PR to this new branch. The PR can then be merged, and we can add more commits to fix the issues. After that a new PR can be created with `develop` as a target branch.
-
-**Important notice 1:** Releases are created from the `develop` branch. So `develop` branch should always contain a "releasable" source code. So when a feature is being implemented with several PRs, it has to be disabled by default (using a feature flag for instance), until the feature is fully implemented. A last PR to enable the feature can then be created.
-
-**Important notice 2:** Database migration: some developers and some people from the community are using the nightly build from `develop`. Multiple database migrations should be properly handled for them. This is OK to have multiple migrations between 2 releases, this is not OK to add steps to the pending database migration on `develop`. So for instance `develop` users will migrate from version 11 to version 12, then 13, then 14, and `main` users will do all those steps after they get the app upgrade.
-
-##### PR Review Assignment
-
-We use automatic assignment for PR reviews. **A PR is automatically routed by GitHub to one team member** using the round robin algorithm. Additional reviewers can be used for complex changes or when the first reviewer is not confident enough on the changes.
-The process is the following:
-
-- The PR creator selects the [element-android-reviewers](https://github.com/orgs/vector-im/teams/element-android-reviewers) team as a reviewer.
-- GitHub automatically assign the reviewer. If the reviewer is not available (holiday, etc.), remove them and set again the team, GitHub will select another reviewer.
-- Alternatively, the PR creator can directly assign specific people if they have another Android developer in their team or they think a specific reviewer should take a look at their PR.
-- Reviewers get a notification to make the review: they review the code following the good practice (see the rest of this document).
-- After making their own review, if they feel not confident enough, they can ask another person for a full review, or they can tag someone within a PR comment to check specific lines.
-
-For PRs coming from the community, the issue wrangler can assign either the team [element-android-reviewers](https://github.com/orgs/vector-im/teams/element-android-reviewers) or any member directly.
-
-##### PR review time
-
-As a PR submitter, you deserve a quick review. As a reviewer, you should do your best to unblock others.
-
-Some tips to achieve it:
-
-- Set up your GH notifications correctly
-- Check your pulls page: [https://github.com/pulls](https://github.com/pulls)
-- Check your pending assigned PRs before starting or resuming your day to day tasks
-- If you are busy with high priority tasks, inform the author. They will find another developer
-
-It is hard to define a deadline for a review. It depends on the PR size and the complexity. Let's start with a goal of 24h (working day!) for a PR smaller than 500 lines. If bigger, the submitter and the reviewer should discuss.
-
-After this time, the submitter can ping the reviewer to get a status of the review.
-
-##### Re-request PR review
-
-Once all the remarks have been handled, it's possible to re-request a review from the (same) reviewer to let them know that the PR has been updated the PR is ready to be reviewed again. Use the double arrow next to the reviewer name to do that.
-
-##### When create split PR?
-
-To implement big new feature, it may be efficient to split the work into several smaller and scoped PRs. They will be easier to review, and they can be merged on `develop` faster.
-
-Big PR can take time, and there is a risk of future merge conflict.
-
-Feature flag can be used to avoid half implemented feature to be available in the application.
-
-That said, splitting into several PRs should not have the side effect to have more review to do, for instance if some code is added, then finally removed.
-
-##### Avoid fixing other unrelated issue in a big PR
-
-Each PR should focus on a single task. If other issues may be fixed when working in the area of it, it's preferable to open a dedicated PR.
-
-It will have the advantage to be reviewed and merged faster, and not interfere with the main PR.
-
-It's also applicable for code rework (such as renaming for instance), or code formatting. Sometimes, it is more efficient to extract that work to a dedicated PR, and rebase your branch once this "rework" PR has been merged.
-
-#### Bots
-
-Some bots can create PR, but they still have to be reviewed by the team
-
-##### Dependabot
-
-Dependabot is a tool which maintain all our external dependencies up to date. A dedicated PR is created for each new available release for one of our external dependency.Dependabot
-
-To review such PR, you have to
- - **IMPORTANT** check the diff files (as always).
- - Check the release note. Some existing bugs in Element project may be fixed by the upgrade
- - Make sure that the CI is happy
- - If the code does not compile (API break for instance), you have to checkout the branch and push new commits
- - Do some smoke test, depending of the library which has been upgraded
-
-For some reason dependabot sometimes does not upgrade some dependencies. In this case, and when detected, the upgrade has to be done manually.
-
-##### Gradle wrapper
-
-`Update Gradle Wrapper` is a tool which can create PR to upgrade our gradle.properties file.
-Review such PR is the same recipe than for PR from Dependabot
-
-##### Sync analytics plan
-
-This tools imports any update in the analytics plan. See instruction in the PR itself to handle it.
-More info can be found in the file [analytics.md](./analytics.md)
-
-## Reviewing PR
-
-### Who can review pull requests?
-
-As an open source project, every one can review each others PR. Of course an approval from internal developer is mandatory for a PR to be merged.
-But comment in PR from the community are always appreciated!
-
-### What to have in mind when reviewing a PR
-
-1. User experience: is the UX and UI correct? You will probably be the second person to test the new thing, the first one is the developer.
-2. Developer experience: does the code look nice and decoupled? No big functions, new classes added to the right module, etc.
-3. Code maintenance. A bit similar to point 2. Tricky code must be documented for instance
-4. Fork consideration. Will configuration of forks be easy? Some documentation may help in some cases.
-5. We are building long term products. "Quick and dirty" code must be avoided.
-6. The PR includes new tests for the added code, updated test for the existing code
-7. All PRs from external contributors **MUST** include a sign-off. It's in the checklist, and sometimes it's checked by the submitter, but there is actually no sign-off. In this case, ask nicely for a sign-off and request changes (do not approve the PR, even if everything else is fine).
-
-### Rules
-
-#### Check the form
-
-##### PR title
-
-PR title should describe in one line what's brought by the PR. Reviewer can edit the title if it's not clear enough, or to add suffix like `[BLOCKED]` or similar. Fixing typo is also a good practice, since GitHub search is quite not efficient, so the words must be spelled without any issue. Adding suffix will help when viewing the PR list.
-
-It's free form, but prefix tags could also be used to help understand what's in the PR.
-
-Examples of prefixes:
-- `[Refacto]`
-- `[Feature]`
-- `[Bugfix]`
-- etc.
-
-Also, it's still possible to add labels to the PRs, such as `A-` or `T-` labels, even if this is not a strong requirement. We prefer to spend time to add labels on issues.
-
-##### PR description
-
-PR description should follow the PR template, and at least provide some context about the code change.
-
-##### File change
-
-1. Code should follow the guidelines
-2. Code should be formatted correctly
-3. XML attribute must be sorted
-4. New code is added at the correct location
-5. New classes are added to the correct location
-6. Naming is correct. Naming is really important, it's considered part of the documentation
-7. Architecture is followed. For instance, the logic is in the ViewModel and not in the Fragment
-8. There is at least one file for the changelog. Exception if the PR fixes something which has not been released yet. Changelog content should target their audience: `.sdk` extension are mainly targeted for developers, other extensions are targeted for users and forks maintainers. It should generally describe visual change rather than give technical details. More details can be found [here](../CONTRIBUTING.md#changelog).
-9. PR includes tests. allScreensTest when applicable, and unit tests
-10. Avoid over complicating things. Keep it simple (KISS)!
-11. PR contains only the expected change. Sometimes, the diff is showing changes that are already on `develop`. This is not good, submitter has to fix that up.
-
-##### Check the commit
-
-Commit message must be short, one line and valuable. "WIP" is not a good commit message. Commit message can contain issue number, starting with `#`. GitHub will add some link between the issue and such commit, which can be useful. It's possible to change a commit message at any time (may require a force push).
-
-Commit messages can contain extra lines with more details, links, etc. But keep in mind that those lines are quite less visible than the first line.
-
-Also commit history should be nice. Having commits like "Adding temporary code" then later "Removing temporary code" is not good. The branch has to be rebased and those commit have to be dropped.
-
-PR merger could decide to squash and merge if commit history is not good.
-
-Commit like "Code review fixes" is good when reviewing the PR, since new changes can be reviewed easily, but is less valuable when looking at git history. To avoid this, PR submitter should always push new commits after a review (no commit amend with force push), and when the PR is approved decide to interactive rebase the PR to improve the git history and reduce noise.
-
-##### Check the substance
-
-1. Test the changes!
-2. Test the nominal case and the edge cases
-3. Run the sanity test for critical PR
-
-##### Make a dedicated meeting to review the PR
-
-Sometimes a big PR can be hard to review. Setting up a call with the PR submitter can speed up the communication, rather than putting comments and questions in GitHub comments. It has the inconvenience of making the discussion non-public, consider including a summary of the main points of the "offline" conversation in the PR.
-
-### What happen to the issue(s)?
-
-The issue(s) should be referenced in the PR description using keywords like `Closes` of `Fixes` followed by the issue number.
-
-Example:
-> Closes #1
-
-Note that you have to repeat the keyword in case of a list of issue
-
-> Closes #1, Closes #2, etc.
-
-When PR will be merged, such referenced issue will be automatically closed.
-It is up to the person who has merged the PR to go to the (closed) issue(s) and to add a comment to inform in which version the issue fix will be available. Use the current version of `develop` branch.
-
-> Closed in Element Android v1.x.y
-
-### Merge conflict
-
-It's up to the submitter to handle merge conflict. Sometimes, they can be fixed directly from GitHub, sometimes this is not possible. The branch can be rebased on `develop`, or the `develop` branch can be merged on the branch, it's up to the submitter to decide what is best.
-Keep in mind that Github Actions are not run in case of conflict.
-
-### When and who can merge PR
-
-PR can be merged by the submitter, if and only if at least one approval from another developer is done. Approval from all people added as reviewer is also a good thing to have. Approval from design team may be mandatory, but is not sufficient to merge a PR.
-
-PR can also be merged by the reviewer, to reduce the time the PR is open. But only if the PR is not in draft and the change are quite small, or behind a feature flag.
-
-Dangerous PR should not be merged just before a release. Dangerous PR are PR that could break the app. Update of Realm library, rework in the chunk of Events management in the SDK, etc.
-
-We prefer to merge such PR after a release so that it can be tested during several days by the team before behind included in a release candidate.
-
-PR from bots will always be merged by the reviewer, right after approving the changes, or in case of critical changes, right after a release.
-
-#### Merge type
-
-Generally we use "Create a merge commit", which has the advantage to keep the branch visible.
-
-If git history is noisy (code added, then removed, etc.), it's possible to use "Squash and merge". But the branch will not be visible anymore, a commit will be added on top of develop. Git commit message can (and probably must) be edited from the GitHub web app. It's better if the submitter do the work to cleanup the git history by using a git interactive rebase of their branch.
-
-### Resolve conversation
-
-Generally we do not close conversation added during PR review and update by clicking on "Resolve conversation"
-If the submitter or the reviewer do so, it will more difficult for further readers to see again the content. They will have to open the conversation to see it again. it's a waste of time.
-
-When remarks are handled, a small comment like "done" is enough, commit hash can also be added to the conversation.
-
-Exception: for big PRs with lots of conversations, using "Resolve conversation" may help to see the remaining remarks.
-
-Also "Resolve conversation" should probably be hit by the creator of the conversation.
-
-## Responsibility
-
-PR submitter is responsible of the incoming change. PR reviewers who approved the PR take a part of responsibility on the code which will land to develop, and then be used by our users, and the user of our forks.
-
-That said, bug may still be merged on `develop`, this is still acceptable of course. In this case, please make sure an issue is created and correctly labelled. Ideally, such issues should be fixed before the next release candidate, i.e. with a higher priority. But as we release the application every 10 working days, it can be hard to fix every bugs. That's why PR should be fully tested and reviewed before being merge and we should never comment code review remark with "will be handled later", or similar comments.

docs/screenshot_testing.md

@@ -1,72 +0,0 @@
-# Screenshot testing
-
-<!--- TOC -->
-
-* [Overview](#overview)
-* [Setup](#setup)
-* [Recording](#recording)
-* [Verifying](#verifying)
-* [Contributing](#contributing)
-* [Example](#example)
-
-<!--- END -->
-
-## Overview
-
-- Screenshot tests are tests which record the content of a rendered screen and verify subsequent runs to check if the screen renders differently.
-- Element uses [Paparazzi](https://github.com/cashapp/paparazzi) to render, record and verify android layouts. 
-- The screenshot verification occurs on every pull request as part of the `tests.yml` workflow.
-
-## Setup
-
-- Install Git LFS through your package manager of choice (`brew install git-lfs` | `yay -S git-lfs`).
-- Install the Git LFS hooks into the project.
-
-```bash
-# with element-android as the current working directory
-git lfs install --local
-```
-
-- If installed correctly, `git push` and `git pull` will now include LFS content.
-
-## Recording
-
-- `./gradlew recordScreenshots`
-- Paparazzi will generate images in `${module}/src/test/snapshots`, which will need to be committed to the repository using Git LFS.
-
-## Verifying
-
-- `./gradlew verifyScreenshots`
-- In the case of failure, Paparazzi will generate images in `${module}/out/failure`. The images will show the expected and actual screenshots along with a delta of the two images.
-
-## Contributing
-
-- When creating a test, the file (and class) name names must include `ScreenshotTest`, eg `ItemScreenshotTest`.
-- After creating the new test, record and commit the newly rendered screens.
-- `./tools/validate_lfs` can be ran to ensure everything is working correctly with Git LFS, the CI also runs this check.
-
-## Example
-
-```kotlin
-class PaparazziExampleScreenshotTest {
-
-    @get:Rule
-    val paparazzi = Paparazzi(
-            deviceConfig = PIXEL_3,
-            theme = "Theme.Vector.Light",
-    )
-
-    @Test
-    fun `example paparazzi test`() {
-        // Inflate the layout
-        val view = paparazzi.inflate<ConstraintLayout>(R.layout.item_radio)
-
-        // Bind data to the view
-        view.findViewById<TextView>(R.id.actionTitle).text = paparazzi.resources.getString(R.string.room_settings_all_messages)
-        view.findViewById<ImageView>(R.id.radioIcon).setImageResource(R.drawable.ic_radio_on)
-
-        // Record the bound view
-        paparazzi.snapshot(view)
-    }
-}
-```

docs/signin.md

@@ -2,27 +2,6 @@
 
 This document describes the flow of signin to a homeserver, and also the flow when user want to reset his password. Examples come from the `matrix.org` homeserver.
 
-<!--- TOC -->
-
-* [Sign in flows](#sign-in-flows)
-  * [Get the flow](#get-the-flow)
-  * [Login with username](#login-with-username)
-    * [Incorrect password](#incorrect-password)
-    * [Correct password:](#correct-password:)
-  * [Login with email](#login-with-email)
-    * [Unknown email](#unknown-email)
-    * [Known email, wrong password](#known-email-wrong-password)
-      * [Known email, correct password](#known-email-correct-password)
-  * [Login with Msisdn](#login-with-msisdn)
-  * [Login with SSO](#login-with-sso)
-* [Reset password](#reset-password)
-  * [Send email](#send-email)
-    * [When the email is not known](#when-the-email-is-not-known)
-    * [When the email is known](#when-the-email-is-known)
-  * [User clicks on the link](#user-clicks-on-the-link)
-
-<!--- END -->
-
 ## Sign in flows
 
 ### Get the flow
@@ -343,4 +322,4 @@ curl -X POST --data $'{"auth":{"type":"m.login.email.identity","threepid_creds":
 {}
 ```
 
-The password has been changed, and all the existing token are invalidated. User can now login with the new password.
+The password has been changed, and all the existing token are invalidated. User can now login with the new password.

docs/signup.md

@@ -4,20 +4,6 @@ This document describes the flow of registration to a homeserver. Examples come
 
 *Ref*: https://matrix.org/docs/spec/client_server/latest#account-registration-and-management
 
-<!--- TOC -->
-
-* [Sign up flows](#sign-up-flows)
-  * [First step](#first-step)
-  * [Step 1: entering user name and password](#step-1:-entering-user-name-and-password)
-    * [If username already exists](#if-username-already-exists)
-  * [Step 2: entering email](#step-2:-entering-email)
-  * [Step 2 bis: user enters an email](#step-2-bis:-user-enters-an-email)
-  * [Step 3: Accepting T&C](#step-3:-accepting-t&c)
-  * [Step 4: Captcha](#step-4:-captcha)
-  * [Step 5: MSISDN](#step-5:-msisdn)
-
-<!--- END -->
-
 ## Sign up flows
 
 ### First step

docs/ui-tests.md

@@ -10,20 +10,6 @@ Currently the test are covering a small set of application flows:
 	- Self verification via emoji
 	- Self verification via passphrase
 
-<!--- TOC -->
-
-* [Prerequisites:](#prerequisites:)
-* [Run the tests](#run-the-tests)
-  * [From the source code](#from-the-source-code)
-  * [From command line](#from-command-line)
-* [Recipes](#recipes)
-  * [Wait for initial sync](#wait-for-initial-sync)
-  * [Accessing current activity](#accessing-current-activity)
-  * [Interact with other session](#interact-with-other-session)
-  * [Contributing to the UiAllScreensSanityTest](#contributing-to-the-uiallscreenssanitytest)
-
-<!--- END -->
-
 ## Prerequisites:
 
 Out of the box, the tests use one of the homeservers (located at http://localhost:8080) of the "Demo Federation of Homeservers" (https://github.com/matrix-org/synapse#running-a-demo-federation-of-synapses).
@@ -190,4 +176,4 @@ class SettingsAdvancedRobot {
         clickOn(R.string.settings_developer_mode_summary)
     }
 }
-```
+```

docs/unifiedpush.md

@@ -1,58 +0,0 @@
-# UnifiedPush
-
-<!--- TOC -->
-
-* [Introduction](#introduction)
-* [Configuration in Element-Android and their forks](#configuration-in-element-android-and-their-forks)
-  * [Enabling and disabling the feature](#enabling-and-disabling-the-feature)
-    * [Override the configuration at runtime](#override-the-configuration-at-runtime)
-    * [Enabling the feature](#enabling-the-feature)
-    * [Disabling the feature](#disabling-the-feature)
-  * [Useful links](#useful-links)
-
-<!--- END -->
-
-## Introduction
-
-The recently started UnifiedPush project is an Android protocol and library for apps to be able to receive distributor-agnostic push notifications.
-
-The *F-Droid* and *Gplay* flavors of Element Android support UnifiedPush, so the user can use any distributor installed on their devices. This would make it possible to have push notifications without depending on Google services or libraries. Currently, the main distributors are [ntfy](https://ntfy.sh) which does not require any setup (like manual registration) to use the public server and [NextPush](https://github.com/UP-NextPush/android), available as a nextcloud application.
-
-The *Gplay* variant uses a UnifiedPush library which basically embed a FCM distributor built into the application (so a user doesn't need to do anything other than install the app to get FCM notifications). This variant uses Google Services to receive notifications if the user has not installed any distributor. A [FCM Rewrite Proxy](https://unifiedpush.org/developers/embedded_fcm/#fcm-rewrite-proxy) is not required for Element Android's implementation of the FCM distributor - it will work with an existing Matrix push provider, such as [Sygnal](https://github.com/matrix-org/sygnal).
-
-The *F-Droid* variant does not use this library to avoid any proprietary blob. It will use a polling service if the user has not installed any distributor.
-
-In all cases, if there are other distributors available, the user will have to opt-in to one of them in the preferences.
-
-## Configuration in Element-Android and their forks
-
-### Enabling and disabling the feature
-
-Allowing the user to use an alternative distributor can be changed in [Config](../vector-config/src/main/java/im/vector/app/config/Config.kt). The flag is named `ALLOW_EXTERNAL_UNIFIED_PUSH_DISTRIBUTORS`. Default value is `true`.
-
-#### Override the configuration at runtime
-
-On debug version, it is possible to override this configuration at runtime, using the `Feature` screen. The Feature is named `Allow external UnifiedPush distributors`.
-
-#### Enabling the feature
-
-This is the default behavior of Element Android.
-
-If `ALLOW_EXTERNAL_UNIFIED_PUSH_DISTRIBUTORS` is set to true, it allows any available external UnifiedPush distributor to be chosen by the user.
-- For Gplay variant it means that FCM will be used by default, but user can choose another UnifiedPush distributor;
-- For F-Droid variant, it means that background polling will be used by default, but user can choose another UnifiedPush distributor.
-- On the UI, the setting to choose an alternative distributor will be visible to the user, and some tests in the notification troubleshoot screen will shown.
-- For F-Droid, if the user has chosen a distributor, the settings to configure the background polling will be hidden.
-
-#### Disabling the feature
-
-If `ALLOW_EXTERNAL_UNIFIED_PUSH_DISTRIBUTORS` is set to false, it prevents the usage of external UnifiedPush distributors.
-- For Gplay variant it means that only FCM will be used;
-- For F-Droid variant, it means that only background polling will be used.
-- On the UI, the setting to choose an alternative distributor will be hidden to the user, and some tests in the notification troubleshoot screen will be hidden.
-
-### Useful links
-
-- UnifiedPush official website: [https://unifiedpush.org/](https://unifiedpush.org/)
-- List of available distributors can be retrieved here: [https://unifiedpush.org/users/distributors/](https://unifiedpush.org/users/distributors/)
-- UnifiedPush project discussion can occurs here: [#unifiedpush:matrix.org](https://matrix.to/#/#unifiedpush:matrix.org)

docs/unit_testing.md

@@ -1,351 +0,0 @@
-# Table of Contents
-
-<!--- TOC -->  
-
-* [Overview](#overview)
-  * [Best Practices](#best-practices)
-* [Project Conventions](#project-conventions)
-    * [Setup](#setup)
-    * [Naming](#naming)
-    * [Format](#format)
-    * [Assertions](#assertions)
-    * [Constants](#constants)
-    * [Mocking](#mocking)
-    * [Fakes](#fakes)
-    * [Fixtures](#fixtures)
-  * [Examples](#examples)
-      * [Extensions used to streamline the test setup](#extensions-used-to-streamline-the-test-setup)
-      * [Fakes and Fixtures](#fakes-and-fixtures)
-
-<!--- END -->  
-
-## Overview
-
-Unit tests are a mechanism to validate our code executes the way we expect. They help to inform the design of our systems by requiring testability and
-understanding, they describe the inner workings without relying on inline comments and protect from unexpected regressions.
-
-However, unit tests are not a magical solution to solve all our problems and come at a cost. Unreliable and hard to maintain tests often end up ignored, deleted
-or worse, provide a false sense of security.
-
-### Best Practices
-
-Tests can be written in many ways, the main rule is to keep them simple and maintainable. Some ways to help achieve this are...
-
-- Break out logic into single units (following the Single Responsibility Principle) to reduce test complexity.
-- Favour pure functions, avoiding mutable state.
-- Prefer dependency injection to static calls to allow for simpler test setup.
-- Write concise tests with a single function under test, clearly showing the inputs and expected output.
-- Create separate test cases instead of changing parameters and grouping multiple assertions within a single test to help trace back failure causes (with the
-  exception of parameterised tests).
-- Assert against entire models instead of subsets of properties to capture any possible changes within the test scope.
-- Avoid invoking logic from production instances other than the class under test to guard from unrelated changes.
-- Always inject `Dispatchers` and `Clock` instances and provide fake implementations for tests to avoid non deterministic results.
-
-## Project Conventions
-
-#### Setup
-
-- Test file and class name should be the class under test with the Test suffix, created in a `test` sourceset, with the same package name as the class under
-  test.
-- Dependencies of the class are instantiated inline, junit will recreate the test class for each test run.
-- A line break between the dependencies and class under test helps clarify the instance being tested.
-
-```kotlin
-
-class MyClassTest {
-
-    private val fakeUppercaser = FakeUppercaser()
-
-    // line break between the class under test and its dependencies
-    private val myClass = MyClass(fakeUppercaser.instance)
-}
-
-```  
-
-#### Naming
-
-- Test names use the `Gherkin` format, `given, when, then` mapping to the input, logic under test and expected result.
-    - `given` - Uniqueness about the environment or dependencies in which the test case is running. _"given device is android 12 and supports dark mode"_
-    - `when` - The action/function under test. _"when reading dark mode status"_
-    - `then` - The expected result from the combination of _given_ and _when_. _"then returns dark mode enabled"_
-- Test names are written using kotlin back ticks to enable sentences _ish_.
-
-```kotlin
-@Test
-fun `given a lowercase label, when uppercasing, then returns label uppercased`
-```
-
-When the input is given directly to the _when_, this can also be represented as...
-
-```kotlin
-@Test
-fun `when uppercasing a lowercase label, then returns label uppercased`
-```
-
-Multiple given or returns statements can be used in the name although it could be a sign that the logic being tested does too much.
-
----
-
-#### Format
-
-- Test bodies are broken into sections through the use of blank lines where the sections correspond to the test name.
-- Sections can span multiple lines.
-
-```kotlin 
-// comments are for illustrative purposes
-/* given */ val lowercaseLabel = "hello world" 
-
-/* when */ val result = textUppercaser.uppercase(lowercaseLabel)
-
-/* then */ result shouldBeEqualTo "HELLO WORLD"
-```
-
-- Functions extracted from test bodies are placed beneath all the unit tests.
-
----
-
-#### Assertions
-
-- Assertions against test results are made using [Kluent's](https://github.com/MarkusAmshove/Kluent) _fluent_ api.
-- Typically `shouldBeEqualTo`is the main assertion to use for asserting function return values as by project convention we assert against entire objects or
-  lists.
-
-```kotlin
-val result = listOf("hello", "world")
-
-// Fail
-result shouldBeEqualTo listOf("hello")
-```
-
-```kotlin
-data class Person(val age: Int, val name: String)
-
-val result = Person(age = 100, name = "Gandalf")
-
-// Avoid
-result.age shouldBeEqualTo 100
-
-// Prefer
-result shouldBeEqualTo Person(age = 100, "Gandalf")
-```
-
-- Exception throwing can be asserted against using `assertFailsWith<T : Throwable>`.
-- When asserting reusable exceptions, include the message to distinguish between them.
-
-```kotlin
-assertFailsWith<ConcreteException>(message = "Details about error") {
-    // when section of the test
-    codeUnderTest()
-}
-```
-
----
-
-#### Constants
-
-- Reusable values are extracted to file level immutable properties or constants.
-- These can be parameters or expected results.
-- The naming convention is to prefix with `A` or `AN` for better matching with the test name.
-
-```kotlin
-private const val A_LOWERCASE_LABEL = "hello"
-
-class MyTest {
-    @Test
-    fun `when uppercasing a lowercase label, then returns label uppercased`() {
-        val result = TextUppercaser().uppercase(A_LOWERCASE_LABEL)
-        ...
-    }
-}
-```
-
----
-
-#### Mocking
-
-- In order to provide different behaviour for dependencies within tests our main method is through mocking, using [Mockk](https://mockk.io/).
-- We avoid using relaxed mocks in favour of explicitly declaring mock behaviour through the _Fake_ convention. There are exceptions when mocking framework
-  classes which would require a lot of boilerplate.
-- Using `Spy` is discouraged as it inherently requires real instances, which we are avoiding in our tests. There are exceptions such as `VectorFeatures` which
-  acts like a `Fixture` in release builds.
-
----
-
-#### Fakes
-
-- Fakes are reusable instances of classes purely for testing purposes. They provide functions to replace the functions of the interface/class they're faking
-  with test specific values.
-- When faking an interface, the _Fake_ can be written using delegation or by stubbing
-- All Fakes currently reside in the same package `${package}.test.fakes`
-
-```kotlin
-// Delegating to a mock
-class FakeClock : Clock by mockk() {
-    fun givenEpoch(epoch: Long) {
-        every { epochMillis() } returns epoch
-    }
-}
-
-// Stubbing the interface
-class FakeClock(private val epoch: Long) : Clock {
-    override fun epochMillis() = epoch
-}
-```  
-
-It's currently more common for fakes to fake class behaviour, we achieve this by wrapping and exposing a mock instance.
-
-```kotlin
-class FakeCursor {
-    val instance = mockk<Cursor>()
-    fun givenEmpty() {
-        every { instance.count } returns 0
-        every { instance.moveToFirst() } returns false
-    }
-}
-
-val fakeCursor = FakeCursor().apply { givenEmpty() }
-```
-
-#### Fixtures
-
-- Fixtures are a reusable wrappers around data models. They provide default values to make creating instances as easy as possible, with the option to override
-  specific parameters when needed.
-- Are namespaced within an `object`.
-- Reduces the _find usages_ noise when searching for usages of the origin class construction.
-- All Fixtures currently reside in the same package `${package}.test.fixtures`.
-
-```kotlin
-object ContentAttachmentDataFixture {
-    fun aContentAttachmentData(
-            type: ContentAttachmentData.Type.TEXT,
-            mimeType: String? = null
-    ) = ContentAttachmentData(type, mimeType)
-}
-```
-
-- Fixtures can also be used to manage specific combinations of parameters
-
-```kotlin
-fun aContentAttachmentAudioData() = aContentAttachmentData(
-        type = ContentAttachmentData.Type.AUDIO,
-        mimeType = "audio/mp3",
-)
-```
-
---- 
-
-### Examples
-
-##### Extensions used to streamline the test setup
-
-```kotlin
-class CircularCacheTest {
-
-    @Test
-    fun `when putting more than cache size then cache is limited to cache size`() {
-        val (cache, internalData) = createIntCache(cacheSize = 3)
-
-        cache.putInOrder(1, 1, 1, 1, 1, 1)
-
-        internalData shouldBeEqualTo arrayOf(1, 1, 1)
-    }
-}
-
-private fun createIntCache(cacheSize: Int): Pair<CircularCache<Int>, Array<Int?>> {
-    var internalData: Array<Int?>? = null
-    val factory: (Int) -> Array<Int?> = {
-        Array<Int?>(it) { null }.also { array -> internalData = array }
-    }
-    return CircularCache(cacheSize, factory) to internalData!!
-}
-
-private fun CircularCache<Int>.putInOrder(vararg values: Int) {
-    values.forEach { put(it) }
-}
-```
-
-##### Fakes and Fixtures
-
-```kotlin
-class LateInitUserPropertiesFactoryTest {
-
-    private val fakeActiveSessionDataSource = FakeActiveSessionDataSource()
-    private val fakeVectorStore = FakeVectorStore()
-    private val fakeContext = FakeContext()
-    private val fakeSession = FakeSession().also {
-        it.givenVectorStore(fakeVectorStore.instance)
-    }
-
-    private val lateInitUserProperties = LateInitUserPropertiesFactory(
-            fakeActiveSessionDataSource.instance,
-            fakeContext.instance
-    )
-
-    @Test
-    fun `given no active session, when creating properties, then returns null`() {
-        val result = lateInitUserProperties.createUserProperties()
-
-        result shouldBeEqualTo null
-    }
-
-    @Test
-    fun `given a teams use case set on an active session, when creating properties, then includes the remapped WorkMessaging selection`() {
-        fakeVectorStore.givenUseCase(FtueUseCase.TEAMS)
-        fakeActiveSessionDataSource.setActiveSession(fakeSession)
-
-        val result = lateInitUserProperties.createUserProperties()
-
-        result shouldBeEqualTo UserProperties(
-                ftueUseCaseSelection = UserProperties.FtueUseCaseSelection.WorkMessaging
-        )
-    }
-}
-  ```
-
-##### ViewModel
-
-- `ViewModels` tend to be one of the most complex areas to unit test due to their position as a coordinator of data flows and bridge between domains.
-- As the project uses a slightly tweaked`MvRx`, our API for the `ViewModel` is simplified down to `input - ViewModel.handle(Action)`
-  and `output Flows - ViewModel.viewEvents & ViewModel.stateFlow`. A `ViewModel` test asserter has been created to further simplify the process.
-
-```kotlin
-class ViewModelTest {
-
-    private var initialState = ViewState.Empty
-
-    @get:Rule
-    val mavericksTestRule = MavericksTestRule(testDispatcher = UnconfinedTestDispatcher())
-
-    @Test
-    fun `when handling MyAction, then emits Loading and Content states`() {
-        val viewModel = ViewModel<State>(initialState)
-        val test = viewModel.test() // must be invoked before interacting with the VM 
-
-        viewModel.handle(MyAction)
-
-        test
-                .assertViewStates(initialState, State.Loading, State.Content())
-                .assertNoEvents()
-                .finish()
-    }
-}
-```
-
-- `ViewModels` often emit multiple states which are copies of the previous state, the `test` extension `assertStatesChanges` allows only the difference to be
-  supplied.
-
-```kotlin
-data class ViewState(val name: String? = null, val age: Int? = null)
-val initialState = ViewState()
-val viewModel = ViewModel<State>(initialState)
-val test = viewModel.test()
-
-viewModel.handle(ChangeNameAction("Gandalf"))
-
-test
-        .assertStatesChanges(
-                initialState,
-                { copy(name = "Gandalf") },
-        )
-        .finish()
-```

fastlane/metadata/android/ar/short_description.txt

@@ -1 +1 @@
-برنامج المراسلة الجماعية - الرسائل المشفرة والدردشة الجماعية ومكالمات الفيديو
+مُحادثة آمنة لا مركزية و VoIP. حافظ على بياناتك آمنة من الأطراف الثالثة.

fastlane/metadata/android/ar/title.txt

@@ -1 +1 @@
-إيليمنت - تطبيق محادثات أمن
+‏Element (‏Riot.im سابقًا)

fastlane/metadata/android/az/short_description.txt

@@ -1 +0,0 @@
-Qrup mesajlaşma - şifrəli mesajlaşma, qrup söhbəti və video zənglər

fastlane/metadata/android/az/title.txt

@@ -1 +0,0 @@
-Element - Təhlükəsiz Mesajlaşma

fastlane/metadata/android/cs-CZ/changelogs/40104040.txt

@@ -1,2 +0,0 @@
-Hlavní změny v této verzi: vylepšení indikátoru psaní. Opravy různých chyb a vylepšení stability.
-Úplný seznam změn: https://github.com/vector-im/element-android/releases/tag/v1.4.4

fastlane/metadata/android/cs-CZ/changelogs/40104060.txt

@@ -1,2 +0,0 @@
-Hlavní změny v této verzi: Časová osa vláken je nyní živá a rychlejší. Opravy různých chyb a vylepšení stability.
-Úplný seznam změn: https://github.com/vector-im/element-android/releases/tag/v1.4.6

fastlane/metadata/android/cs-CZ/changelogs/40104070.txt

@@ -1,2 +0,0 @@
-Hlavní změny v této verzi: Opravy různých chyb a vylepšení stability.
-Úplný seznam změn: https://github.com/vector-im/element-android/releases/tag/v1.4.7

fastlane/metadata/android/cs-CZ/changelogs/40104080.txt

@@ -1,2 +0,0 @@
-Hlavní změny v této verzi: Časová osa vlákna je nyní živá a rychlejší. Opravy různých chyb a vylepšení stability.
-Úplný seznam změn: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/cs-CZ/changelogs/40104100.txt

@@ -1,2 +0,0 @@
-Hlavní změny v této verzi: Posun přehrávání v hlasových zprávách. Opravy různých chyb a vylepšení stability.
-Úplný seznam změn: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/cs-CZ/changelogs/40104110.txt

@@ -1,2 +0,0 @@
-Hlavní změny v této verzi: Opravy různých chyb a vylepšení stability.
-Úplný seznam změn: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/cs-CZ/changelogs/40104120.txt

@@ -1,2 +0,0 @@
-Hlavní změny v této verzi: Umožňuje uživatelům zobrazovat se offline a přidává zvukový přehrávač pro zvukové přílohy
-Úplný seznam změn: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/cs-CZ/changelogs/40104130.txt

@@ -1,2 +0,0 @@
-Hlavní změny v této verzi: Umožňuje uživatelům zobrazovat se offline a přidává zvukový přehrávač pro zvukové přílohy
-Úplný seznam změn: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/cs-CZ/changelogs/40104140.txt

@@ -1,2 +0,0 @@
-Hlavní změny v této verzi: Zlepšení správy ignorovaných uživatelů. Opravy různých chyb a vylepšení stability.
-Úplný seznam změn: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/cs-CZ/changelogs/40104160.txt

@@ -1,2 +0,0 @@
-Hlavní změny v této verzi: Vylepšena správa šifrovaných zpráv. Opravy různých chyb a vylepšení stability.
-Úplný seznam změn: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/cs-CZ/changelogs/40104180.txt

@@ -1,2 +0,0 @@
-Hlavní změny v této verzi: Opravy různých chyb a vylepšení stability.
-Úplný seznam změn: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/cs-CZ/changelogs/40104190.txt

@@ -1,2 +0,0 @@
-Hlavní změny v této verzi: Opravy různých chyb a vylepšení stability.
-Úplný seznam změn: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/cs-CZ/changelogs/40104200.txt

@@ -1,2 +0,0 @@
-Hlavní změny v této verzi: Opravy různých chyb a vylepšení stability.
-Úplný seznam změn: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/cs-CZ/changelogs/40104220.txt

@@ -1,2 +0,0 @@
-Hlavní změny v této verzi: Opravy různých chyb a vylepšení stability.
-Úplný seznam změn: https://github.com/vector-im/element-android/releases

fastlane/metadata/android/cs-CZ/changelogs/40104230.txt

@@ -1,2 +0,0 @@
-Hlavní změny v této verzi: Opravy různých chyb a vylepšení stability.
-Úplný seznam změn: https://github.com/vector-im/element-android/releases