diff --git a/.editorconfig b/.editorconfig
index 140cc085c5..4640e50d15 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,901 +1,901 @@
-[*]
-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
-
-[*.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
-
-[*.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 = true
-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 = false
-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 = false
-ij_kotlin_method_parameters_right_paren_on_new_line = false
-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
+[*]
+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
+
+[*.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
+
+[*.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 = true
+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 = false
+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
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index a7daaac14b..1ab5d835b2 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -73,3 +73,14 @@ 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
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yml b/.github/ISSUE_TEMPLATE/enhancement.yml
index 71adce718e..2dd968951f 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yml
@@ -34,3 +34,14 @@ 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
diff --git a/.github/ISSUE_TEMPLATE/release.yml b/.github/ISSUE_TEMPLATE/release.yml
index 7cb47fa952..f012900752 100644
--- a/.github/ISSUE_TEMPLATE/release.yml
+++ b/.github/ISSUE_TEMPLATE/release.yml
@@ -49,24 +49,34 @@ body:
 
         ### Once tested and validated internally
 
-        - [ ] Create a new beta release on the GooglePlay console and upload the 4 signed Apks.
+        - [ ] Create a new open testing 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 to beta release to 100% of the users
-        - [ ] Notify the F-Droid team so that they can schedule the publication on F-Droid
+        - [ ] 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.
 
-        ### Once Live on PlayStore
+        ### Once open testing is live on PlayStore
 
         - [ ] Ping the Android public room and update its topic
-        - [ ] Add an entry in the internal diary
 
-        ### After at least 2 days
+        ### Once Live on F-Droid
+
+        - [ ] Update the Android public room topic
+
+        ### After at least 2 days (generally next Monday)
 
         - [ ] 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, 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
+        - [ ] 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
 
         ### Android SDK2
 
diff --git a/.github/workflows/post-pr.yml b/.github/workflows/post-pr.yml
index 8fe51eb8d5..49669e4201 100644
--- a/.github/workflows/post-pr.yml
+++ b/.github/workflows/post-pr.yml
@@ -29,200 +29,6 @@ jobs:
     steps:
       - run: echo "Run those tests!" # no-op success
         
-  # Run Android Tests
-  integration-tests:
-    name: Matrix SDK - Running Integration Tests
-    needs: should-i-run
-    runs-on: macos-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        api-level: [ 28 ]
-    steps:
-      - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1
-      - uses: actions/setup-java@v3
-        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@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.3
-        with:
-          uploadLogs: true
-          httpPort: 8080
-          disableRateLimiting: true
-          public_baseurl: "http://10.0.2.2:8080/"
-      # 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-session.log
-            chmod 777 emulator-session.log
-            adb logcat >> emulator-session.log &
-            ./gradlew $CI_GRADLE_ARG_PROPERTIES -Pandroid.testInstrumentationRunnerArguments.package='org.matrix.android.sdk.session' matrix-sdk-android:connectedDebugAndroidTest
-      - name: Read Results [org.matrix.android.sdk.session]
-        if: always()
-        id: get-comment-body-session
-        run: python3 ./tools/ci/render_test_output.py session ./matrix-sdk-android/build/outputs/androidTest-results/connected/*.xml
-      - name: Remove adb logcat
-        if: always()
-        run: pkill -9 adb
-      - name: Run integration tests for  Matrix SDK [org.matrix.android.sdk.account] API[${{ matrix.api-level }}]
-        if: always()
-        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-account.log
-            chmod 777 emulator-account.log
-            adb logcat >> emulator-account.log &
-            ./gradlew $CI_GRADLE_ARG_PROPERTIES  -Pandroid.testInstrumentationRunnerArguments.package='org.matrix.android.sdk.account' matrix-sdk-android:connectedDebugAndroidTest
-      - name: Read Results [org.matrix.android.sdk.account]
-        if: always()
-        id: get-comment-body-account
-        run: python3 ./tools/ci/render_test_output.py account ./matrix-sdk-android/build/outputs/androidTest-results/connected/*.xml
-      - name: Remove adb logcat
-        if: always()
-        run: pkill -9 adb
-      # package: org.matrix.android.sdk.internal
-      - name: Run integration tests for Matrix SDK [org.matrix.android.sdk.internal] API[${{ matrix.api-level }}]
-        if: always()
-        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-internal.log
-            chmod 777 emulator-internal.log
-            adb logcat >> emulator-internal.log &
-            ./gradlew $CI_GRADLE_ARG_PROPERTIES  -Pandroid.testInstrumentationRunnerArguments.package='org.matrix.android.sdk.internal' matrix-sdk-android:connectedDebugAndroidTest
-      - name: Read Results [org.matrix.android.sdk.internal]
-        if: always()
-        id: get-comment-body-internal
-        run: python3 ./tools/ci/render_test_output.py internal ./matrix-sdk-android/build/outputs/androidTest-results/connected/*.xml
-      - name: Remove adb logcat
-        if: always()
-        run: pkill -9 adb
-      # package: org.matrix.android.sdk.ordering
-      - name: Run integration tests for Matrix SDK [org.matrix.android.sdk.ordering] API[${{ matrix.api-level }}]
-        if: always()
-        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-ordering.log
-            chmod 777 emulator-ordering.log
-            adb logcat >> emulator-ordering.log &
-            ./gradlew $CI_GRADLE_ARG_PROPERTIES  -Pandroid.testInstrumentationRunnerArguments.package='org.matrix.android.sdk.ordering' matrix-sdk-android:connectedDebugAndroidTest
-      - name: Read Results [org.matrix.android.sdk.ordering]
-        if: always()
-        id: get-comment-body-ordering
-        run: python3 ./tools/ci/render_test_output.py ordering ./matrix-sdk-android/build/outputs/androidTest-results/connected/*.xml
-      - name: Remove adb logcat
-        if: always()
-        run: pkill -9 adb
-      # package: class PermalinkParserTest
-      - name: Run integration tests for Matrix SDK class [org.matrix.android.sdk.PermalinkParserTest] API[${{ matrix.api-level }}]
-        if: always()
-        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-permalink.log
-            chmod 777 emulator-permalink.log
-            adb logcat >> emulator-permalink.log &
-            ./gradlew $CI_GRADLE_ARG_PROPERTIES  -Pandroid.testInstrumentationRunnerArguments.class='org.matrix.android.sdk.PermalinkParserTest' matrix-sdk-android:connectedDebugAndroidTest
-      - name: Read Results [org.matrix.android.sdk.PermalinkParserTest]
-        if: always()
-        id: get-comment-body-permalink
-        run: python3 ./tools/ci/render_test_output.py permalink ./matrix-sdk-android/build/outputs/androidTest-results/connected/*.xml
-      - name: Remove adb logcat
-        if: always()
-        run: pkill -9 adb
-      # package: class PermalinkParserTest
-      - name: Find Comment
-        if: always() && github.event_name == 'pull_request'
-        uses: peter-evans/find-comment@v2
-        id: fc
-        with:
-          issue-number: ${{ github.event.pull_request.number }}
-          comment-author: 'github-actions[bot]'
-          body-includes: Integration Tests Results
-      - name: Publish results to PR
-        if: always() && github.event_name == 'pull_request'
-        uses: peter-evans/create-or-update-comment@v2
-        with:
-          comment-id: ${{ steps.fc.outputs.comment-id }}
-          issue-number: ${{ github.event.pull_request.number }}
-          body: |
-            ### Matrix SDK
-            ## Integration Tests Results:
-            - `[org.matrix.android.sdk.session]`<br>${{ steps.get-comment-body-session.outputs.session }}
-            - `[org.matrix.android.sdk.account]`<br>${{ steps.get-comment-body-account.outputs.account }}
-            - `[org.matrix.android.sdk.internal]`<br>${{ steps.get-comment-body-internal.outputs.internal }}
-            - `[org.matrix.android.sdk.ordering]`<br>${{ steps.get-comment-body-ordering.outputs.ordering }}
-            - `[org.matrix.android.sdk.PermalinkParserTest]`<br>${{ steps.get-comment-body-permalink.outputs.permalink }}
-          edit-mode: replace
-      - name: Upload Test Report Log
-        uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: integrationtest-error-results
-          path: |
-            emulator-permalink.log
-            emulator-internal.log
-            emulator-ordering.log
-            emulator-account.log
-            emulator-session.log
-
   ui-tests:
     name: UI Tests (Synapse)
     needs: should-i-run
@@ -282,42 +88,13 @@ jobs:
             emulator.log
             failure_screenshots/
 
-  codecov-units:
-    name: Unit tests with code coverage
-    needs: should-i-run
-    runs-on: ubuntu-latest
-    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-
-      - run: ./gradlew allCodeCoverageReport $CI_GRADLE_ARG_PROPERTIES
-      - name: Upload Codecov data
-        uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: codecov-xml
-          path: |
-            build/reports/jacoco/allCodeCoverageReport/allCodeCoverageReport.xml
-
 # Notify the channel about delayed failures
   notify:
     name: Notify matrix
     runs-on: ubuntu-latest
     needs:
       - should-i-run
-      - integration-tests
       - ui-tests
-      - codecov-units
     if: always() && (needs.should-i-run.result == 'success' ) && ((needs.codecov-units.result != 'success' ) || (needs.ui-tests.result != 'success') || (needs.integration-tests.result != 'success'))
     # No concurrency required, runs every time on a schedule.
     steps:
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
index a97d532644..014139d0ba 100644
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@@ -5,6 +5,11 @@ on:
   push:
     branches: [ main, develop ]
 
+# Enrich gradle.properties for CI/CD
+env:
+  CI_GRADLE_ARG_PROPERTIES: >
+    -Porg.gradle.jvmargs=-Xmx4g
+
 jobs:
   check:
     name: Project Check Suite
@@ -97,6 +102,25 @@ jobs:
               comment_id: ${{ steps.fc.outputs.comment-id }}
             })
 
+# Gradle dependency analysis using https://github.com/autonomousapps/dependency-analysis-android-gradle-plugin
+  dependency-analysis:
+    name: Dependency analysis
+    runs-on: ubuntu-latest
+    # Allow all jobs on main and 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) }}
+      cancel-in-progress: true
+    steps:
+      - uses: actions/checkout@v3
+      - name: Dependency analysis
+        run: ./gradlew buildHealth $CI_GRADLE_ARG_PROPERTIES
+      - name: Upload dependency analysis
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: dependency-analysis
+          path: build/reports/dependency-analysis/build-health-report.txt
+
 # Lint for main module
   android-lint:
     name: Android Linter
diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
deleted file mode 100644
index 6809751d91..0000000000
--- a/.github/workflows/sonarqube.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-name: Sonarqube nightly
-
-on:
-  schedule:
-    - cron: '0 20 * * *'
-
-# Enrich gradle.properties for CI/CD
-env:
-  CI_GRADLE_ARG_PROPERTIES: >
-    -Porg.gradle.jvmargs=-Xmx4g
-    -Porg.gradle.parallel=false
-jobs:
-  codecov-units:
-    name: Unit tests with code coverage
-    runs-on: ubuntu-latest
-    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-
-      - run: ./gradlew allCodeCoverageReport $CI_GRADLE_ARG_PROPERTIES
-      - name: Upload Codecov data
-        uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: codecov-xml
-          path: |
-            build/reports/jacoco/allCodeCoverageReport/allCodeCoverageReport.xml
-
-  sonarqube:
-    name: Sonarqube upload
-    runs-on: ubuntu-latest
-    needs:
-      - codecov-units
-    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-
-      - 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:
-          ORG_GRADLE_PROJECT_SONAR_LOGIN: ${{ secrets.SONAR_TOKEN }}
-
-# Notify the channel about sonarqube failures
-  notify:
-    name: Notify matrix
-    runs-on: ubuntu-latest
-    needs:
-      - sonarqube
-      - codecov-units
-    if: always() && (needs.sonarqube.result != 'success' || needs.codecov-units.result != 'success') 
-    steps:
-      - uses: michaelkaye/matrix-hookshot-action@v1.0.0
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          hookshot_url: ${{ secrets.ELEMENT_ANDROID_HOOKSHOT_URL }}
-          text_template: "Sonarqube run (on ${{ github.ref }}): {{#each job_statuses }}{{#with this }}{{#if completed }}  {{name}} {{conclusion}} at {{completed_at}}, {{/if}}{{/with}}{{/each}}"
-          html_template: "Sonarqube run (on ${{ github.ref }}): {{#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}}"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 3e8de8979c..5959fe9bb3 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -12,73 +12,98 @@ env:
     -Porg.gradle.parallel=false
 
 jobs:
-  # 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 --stacktrace 
- 
-  unit-tests:
-    name: Run Unit Tests
-    runs-on: ubuntu-latest
+  tests:
+    name: Runs all tests
+    runs-on: macos-latest # for the emulator
     # 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/cache@v3
         with:
-          path: |
-            ~/.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 --stacktrace
+          fetch-depth: 0
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'adopt'
+          java-version: '11'
+      - uses: gradle/gradle-build-action@v2
+      - uses: actions/setup-python@v3
+        with:
+          python-version: 3.8
+      - uses: michaelkaye/setup-matrix-synapse@v1.0.3
+        with:
+          uploadLogs: true
+          httpPort: 8080
+          disableRateLimiting: true
+          public_baseurl: "http://10.0.2.2:8080/"
+      - name: Run all the codecoverage tests at once
+        id: tests
+        uses: reactivecircus/android-emulator-runner@v2
+        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 theCodeCoverageReport --stacktrace $CI_GRADLE_ARG_PROPERTIES
+      - 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 theCodeCoverageReport --stacktrace $CI_GRADLE_ARG_PROPERTIES
+      - run: ./gradlew sonarqube $CI_GRADLE_ARG_PROPERTIES
+        if: always() # we may have failed a previous step and retried, that's OK
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          ORG_GRADLE_PROJECT_SONAR_LOGIN: ${{ secrets.SONAR_TOKEN }}
+
       - name: Format unit test results
         if: always()
         run: python3 ./tools/ci/render_test_output.py unit ./**/build/test-results/**/*.xml
-      - 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
 
-# Notify the channel about runs against develop or main that have failures, as PRs should have caught these first.
-  notify:
-    runs-on: ubuntu-latest
-    needs:
-      - unit-tests
-      - build-android-tests
-    if: ${{ (github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/main' ) && failure() }}
-    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: "Build is broken for ${{ github.ref }}: {{#each job_statuses }}{{#with this }}{{#if completed }}{{name}} {{conclusion}} at {{completed_at}}, {{/if}}{{/with}}{{/each}}"
-          html_template: "Build is broken for ${{ github.ref }}: {{#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}}"
+# 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 --stacktrace 
 
diff --git a/.github/workflows/triage-labelled.yml b/.github/workflows/triage-labelled.yml
index 82d5931ce7..c49b33d582 100644
--- a/.github/workflows/triage-labelled.yml
+++ b/.github/workflows/triage-labelled.yml
@@ -9,15 +9,15 @@ 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-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:
@@ -79,7 +79,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
@@ -105,10 +105,7 @@ jobs:
     # Skip in forks
     if: >
       github.repository == 'vector-im/element-android' &&
-      (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'))
+      (contains(github.event.issue.labels.*.name, 'Team: Delight'))
     steps:
       - uses: octokit/graphql-action@v2.x
         with:
@@ -201,7 +198,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
diff --git a/.github/workflows/triage-priority-bugs.yml b/.github/workflows/triage-priority-bugs.yml
index 70c337e748..43e11edca5 100644
--- a/.github/workflows/triage-priority-bugs.yml
+++ b/.github/workflows/triage-priority-bugs.yml
@@ -15,9 +15,6 @@ jobs:
         !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-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') ||
diff --git a/CHANGES.md b/CHANGES.md
index 4ff45e9c62..166453dfad 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,75 @@
+Changes in Element 1.4.19 (2022-06-07)
+======================================
+
+Bugfixes 🐛
+----------
+ - Fix | performance regression on roomlist + proper display of space parents in explore rooms. ([#6233](https://github.com/vector-im/element-android/issues/6233))
+
+
+Changes in Element v1.4.18 (2022-05-31)
+=======================================
+
+Features ✨
+----------
+ - Space explore screen changes: removed space card, added rooms filtering ([#5658](https://github.com/vector-im/element-android/issues/5658))
+ - Adds space or user id as a subtitle under rooms in search ([#5860](https://github.com/vector-im/element-android/issues/5860))
+ - Adds up navigation in spaces ([#6073](https://github.com/vector-im/element-android/issues/6073))
+ - Labs flag for enabling live location sharing ([#6098](https://github.com/vector-im/element-android/issues/6098))
+ - Added support for mandatory backup or passphrase from .well-known configuration. ([#6133](https://github.com/vector-im/element-android/issues/6133))
+ - Security - Asking for user confirmation when tapping URLs which contain unicode directional overrides ([#6163](https://github.com/vector-im/element-android/issues/6163))
+ - Add settings switch to allow autoplaying animated images ([#6166](https://github.com/vector-im/element-android/issues/6166))
+ - Live Location Sharing - User List Bottom Sheet ([#6170](https://github.com/vector-im/element-android/issues/6170))
+
+Bugfixes 🐛
+----------
+ - Fix some notifications not clearing when read ([#4862](https://github.com/vector-im/element-android/issues/4862))
+ - Do not switch away from home space on notification when "Show all Rooms in Home" is selected. ([#5827](https://github.com/vector-im/element-android/issues/5827))
+ - Use fixed text size in read receipt counter ([#5856](https://github.com/vector-im/element-android/issues/5856))
+ - Revert: Use member name instead of room name in DM creation item ([#6032](https://github.com/vector-im/element-android/issues/6032))
+ - Poll refactoring with unit tests ([#6074](https://github.com/vector-im/element-android/issues/6074))
+ - Correct .well-known/matrix/client handling for server_names which include ports. ([#6095](https://github.com/vector-im/element-android/issues/6095))
+ - Glide - Use current drawable while loading new static map image ([#6103](https://github.com/vector-im/element-android/issues/6103))
+ - Fix sending multiple invites to a room reaching only one or two people ([#6109](https://github.com/vector-im/element-android/issues/6109))
+ - Prevent widget web view from reloading on screen / orientation change ([#6140](https://github.com/vector-im/element-android/issues/6140))
+ - Fix decrypting redacted event from sending errors ([#6148](https://github.com/vector-im/element-android/issues/6148))
+ - Make widget web view request system permissions for camera and microphone (PSF-1061) ([#6149](https://github.com/vector-im/element-android/issues/6149))
+
+In development 🚧
+----------------
+ - Adds email input and verification screens to the new FTUE onboarding flow ([#5278](https://github.com/vector-im/element-android/issues/5278))
+ - FTUE - Adds the redesigned Sign In screen ([#5283](https://github.com/vector-im/element-android/issues/5283))
+ - [Live location sharing] Update message in timeline during the live ([#5689](https://github.com/vector-im/element-android/issues/5689))
+ - FTUE - Overrides sign up flow ordering for matrix.org only ([#5783](https://github.com/vector-im/element-android/issues/5783))
+ - Live location sharing: navigation from timeline to map screen
+  Live location sharing: show user pins on map screen ([#6012](https://github.com/vector-im/element-android/issues/6012))
+ - FTUE - Adds homeserver login/register deeplink support ([#6023](https://github.com/vector-im/element-android/issues/6023))
+ - [Live location sharing] Update entity in DB when a live is timed out ([#6123](https://github.com/vector-im/element-android/issues/6123))
+
+SDK API changes ⚠️
+------------------
+- Notifies other devices when a verification request sent from an Android device is accepted.` ([#5724](https://github.com/vector-im/element-android/issues/5724))
+- Some `val` have been changed to `fun` to increase their visibility in the generated documentation. Just add `()` if you were using them.
+- `KeysBackupService.state` has been replaced by `KeysBackupService.getState()`
+- `KeysBackupService.isStucked` has been replaced by `KeysBackupService.isStuck()`
+- SDK documentation improved ([#5952](https://github.com/vector-im/element-android/issues/5952))
+- Improve replay attacks and reduce duplicate message index errors ([#6077](https://github.com/vector-im/element-android/issues/6077))
+- Remove `RoomSummaryQueryParams.roomId`. If you need to observe a single room, use the new API `RoomService.getRoomSummaryLive(roomId: String)`
+- `ActiveSpaceFilter` has been renamed to `SpaceFilter`
+- `RoomCategoryFilter.ALL` has been removed, just pass `null` to not filter on Room category. ([#6143](https://github.com/vector-im/element-android/issues/6143))
+
+Other changes
+-------------
+ - leaving space experience changed to be aligned with iOS ([#5728](https://github.com/vector-im/element-android/issues/5728))
+ - @Ignore a number of tests that are currently failing in CI. ([#6025](https://github.com/vector-im/element-android/issues/6025))
+ - Remove ShortcutBadger lib and usage (it was dead code) ([#6041](https://github.com/vector-im/element-android/issues/6041))
+ - Test: Ensure calling 'fail()' is not caught by the catch block ([#6089](https://github.com/vector-im/element-android/issues/6089))
+ - Excludes transitive optional non FOSS google location dependency from fdroid builds ([#6100](https://github.com/vector-im/element-android/issues/6100))
+ - Fixed grammar errors in /vector/src/main/res/values/strings.xml ([#6132](https://github.com/vector-im/element-android/issues/6132))
+ - Downgrade gradle from 7.2.0 to 7.1.3 ([#6141](https://github.com/vector-im/element-android/issues/6141))
+ - Add Lao language to the in-app settings. ([#6196](https://github.com/vector-im/element-android/issues/6196))
+ - Remove the background location permission request ([#6198](https://github.com/vector-im/element-android/issues/6198))
+
+
 Changes in Element v1.4.16 (2022-05-17)
 =======================================
 
diff --git a/README.md b/README.md
index 54dfb7b288..7acb5aa638 100644
--- a/README.md
+++ b/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](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)
+[![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)
 
 # Element Android
 
diff --git a/build.gradle b/build.gradle
index 25ff8b91c0..22d6f5f5ef 100644
--- a/build.gradle
+++ b/build.gradle
@@ -41,6 +41,9 @@ plugins {
     id "org.jlleitschuh.gradle.ktlint" version "10.3.0"
     // Detekt
     id "io.gitlab.arturbosch.detekt" version "1.20.0"
+
+    // Dependency Analysis
+    id 'com.autonomousapps.dependency-analysis' version "1.5.0"
 }
 
 // https://github.com/jeremylong/DependencyCheck
@@ -177,8 +180,8 @@ apply plugin: 'org.sonarqube'
 
 sonarqube {
     properties {
-        property "sonar.projectName", "Element-Android"
-        property "sonar.projectKey", "im.vector.app.android"
+        property "sonar.projectName", "element-android"
+        property "sonar.projectKey", "vector-im_element-android"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.projectVersion", project(":vector").android.defaultConfig.versionName
         property "sonar.sourceEncoding", "UTF-8"
@@ -188,7 +191,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/allCodeCoverageReport/allCodeCoverageReport.xml"
+        property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/theCodeCoverageReport/theCodeCoverageReport.xml"
         property "sonar.login", project.hasProperty("SONAR_LOGIN") ? SONAR_LOGIN : "invalid"
     }
 }
@@ -219,3 +222,61 @@ project(":library: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") {
+            onUnusedDependencies {
+                exclude("com.github.vector-im:PFLockScreen-Android") // False positive
+            }
+        }
+        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(
+                        "com.vanniktech:emoji-google",
+                        "com.vanniktech:emoji-material",
+                        "org.maplibre.gl:android-plugin-annotation-v9",
+                        "org.maplibre.gl:android-sdk",
+                )
+            }
+        }
+    }
+}
diff --git a/changelog.d/5278.wip b/changelog.d/5278.wip
deleted file mode 100644
index c6014dc9ac..0000000000
--- a/changelog.d/5278.wip
+++ /dev/null
@@ -1 +0,0 @@
-Adds email input and verification screens to the new FTUE onboarding flow
diff --git a/changelog.d/5285.wip b/changelog.d/5285.wip
new file mode 100644
index 0000000000..1dd68597be
--- /dev/null
+++ b/changelog.d/5285.wip
@@ -0,0 +1 @@
+FTUE - Adds Sign Up tracking 
diff --git a/changelog.d/5528.bugfix b/changelog.d/5528.bugfix
new file mode 100644
index 0000000000..b0dc759ab0
--- /dev/null
+++ b/changelog.d/5528.bugfix
@@ -0,0 +1 @@
+Fix cases of missing, swapped, or duplicated messages
diff --git a/changelog.d/5658.feature b/changelog.d/5658.feature
deleted file mode 100644
index ba41a03207..0000000000
--- a/changelog.d/5658.feature
+++ /dev/null
@@ -1 +0,0 @@
-Space explore screen changes: removed space card, added rooms filtering
diff --git a/changelog.d/5689.wip b/changelog.d/5689.wip
deleted file mode 100644
index ccea1ec541..0000000000
--- a/changelog.d/5689.wip
+++ /dev/null
@@ -1 +0,0 @@
-[Live location sharing] Update message in timeline during the live
diff --git a/changelog.d/5724.sdk b/changelog.d/5724.sdk
deleted file mode 100644
index 5a0a37fe31..0000000000
--- a/changelog.d/5724.sdk
+++ /dev/null
@@ -1 +0,0 @@
-- Notifies other devices when a verification request sent from an Android device is accepted.`
diff --git a/changelog.d/5728.misc b/changelog.d/5728.misc
deleted file mode 100644
index 6e463fa76f..0000000000
--- a/changelog.d/5728.misc
+++ /dev/null
@@ -1 +0,0 @@
-leaving space experience changed to be aligned with iOS
diff --git a/changelog.d/5970.feature b/changelog.d/5970.feature
new file mode 100644
index 0000000000..b65decdd2d
--- /dev/null
+++ b/changelog.d/5970.feature
@@ -0,0 +1 @@
+Make read receipt avatar list more compact
diff --git a/changelog.d/6017.misc b/changelog.d/6017.misc
new file mode 100644
index 0000000000..2597f2d796
--- /dev/null
+++ b/changelog.d/6017.misc
@@ -0,0 +1 @@
+Adds support for parsing homeserver versions without a patch number
diff --git a/changelog.d/6025.misc b/changelog.d/6025.misc
deleted file mode 100644
index 2900796792..0000000000
--- a/changelog.d/6025.misc
+++ /dev/null
@@ -1 +0,0 @@
-@Ignore a number of tests that are currently failing in CI.
diff --git a/changelog.d/6029.sdk b/changelog.d/6029.sdk
new file mode 100644
index 0000000000..b39d1a6359
--- /dev/null
+++ b/changelog.d/6029.sdk
@@ -0,0 +1,5 @@
+Some methods from `Session` have been moved to a new `SyncService`, that you can retrieve from a `Session`.
+- `SyncStatusService` method has been moved to the new `SyncService`
+- `InitSyncStep` have been moved and renamed to `InitialSyncStep`
+- `SyncStatusService.Status` has been renamed to `SyncRequestState`
+- The existing `SyncService` has been renamed to `SyncAndroidService` because of name clash with the new SDK Service
diff --git a/changelog.d/6032.bugfix b/changelog.d/6032.bugfix
deleted file mode 100644
index c20d7ddd08..0000000000
--- a/changelog.d/6032.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Revert: Use member name instead of room name in DM creation item
diff --git a/changelog.d/6041.misc b/changelog.d/6041.misc
deleted file mode 100644
index 50378ea3fd..0000000000
--- a/changelog.d/6041.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove ShortcutBadger lib and usage (it was dead code)
diff --git a/changelog.d/6074.bugfix b/changelog.d/6074.bugfix
deleted file mode 100644
index 692dce28d7..0000000000
--- a/changelog.d/6074.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Poll refactoring with unit tests
diff --git a/changelog.d/6089.misc b/changelog.d/6089.misc
deleted file mode 100644
index 19b951c1a3..0000000000
--- a/changelog.d/6089.misc
+++ /dev/null
@@ -1 +0,0 @@
-Test: Ensure calling 'fail()' is not caught by the catch block
diff --git a/changelog.d/6093.sdk b/changelog.d/6093.sdk
new file mode 100644
index 0000000000..8ac5e41b61
--- /dev/null
+++ b/changelog.d/6093.sdk
@@ -0,0 +1 @@
+Allowing AuthenticationService.getLoginFlow to fail without resetting state from previously successful calls
diff --git a/changelog.d/6095.bugfix b/changelog.d/6095.bugfix
deleted file mode 100644
index 11110bfa08..0000000000
--- a/changelog.d/6095.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Correct .well-known/matrix/client handling for server_names which include ports.
diff --git a/changelog.d/6098.feature b/changelog.d/6098.feature
deleted file mode 100644
index 659da42094..0000000000
--- a/changelog.d/6098.feature
+++ /dev/null
@@ -1 +0,0 @@
-Labs flag for enabling live location sharing
diff --git a/changelog.d/6103.bugfix b/changelog.d/6103.bugfix
deleted file mode 100644
index 12e6836460..0000000000
--- a/changelog.d/6103.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Glide - Use current drawable while loading new static map image
diff --git a/changelog.d/6109.bugfix b/changelog.d/6109.bugfix
deleted file mode 100644
index 43b1d610c7..0000000000
--- a/changelog.d/6109.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix sending multiple invites to a room reaching only one or two people
diff --git a/changelog.d/6146.feature b/changelog.d/6146.feature
new file mode 100644
index 0000000000..9d1e117ddb
--- /dev/null
+++ b/changelog.d/6146.feature
@@ -0,0 +1 @@
+Allow .well-known configuration to override key sharing mode
diff --git a/changelog.d/6169.sdk b/changelog.d/6169.sdk
new file mode 100644
index 0000000000..dfee158c3f
--- /dev/null
+++ b/changelog.d/6169.sdk
@@ -0,0 +1 @@
+Allows new passwords to be passed at the point of confirmation when resetting a password
diff --git a/changelog.d/6209.bugfix b/changelog.d/6209.bugfix
new file mode 100644
index 0000000000..3eac2c9df6
--- /dev/null
+++ b/changelog.d/6209.bugfix
@@ -0,0 +1 @@
+Fix wrong status of live location sharing in timeline
diff --git a/changelog.d/6222.bugfix b/changelog.d/6222.bugfix
new file mode 100644
index 0000000000..ef430ee024
--- /dev/null
+++ b/changelog.d/6222.bugfix
@@ -0,0 +1 @@
+Fix StackOverflowError while recording voice message
diff --git a/changelog.d/6232.bugfix b/changelog.d/6232.bugfix
new file mode 100644
index 0000000000..df04655701
--- /dev/null
+++ b/changelog.d/6232.bugfix
@@ -0,0 +1 @@
+Text cropped: "Secure backup"
diff --git a/changelog.d/6244.feature b/changelog.d/6244.feature
new file mode 100644
index 0000000000..9b02187112
--- /dev/null
+++ b/changelog.d/6244.feature
@@ -0,0 +1 @@
+Re-organize location settings flags
diff --git a/coverage.gradle b/coverage.gradle
index b62ce0b4a0..fb2352f47f 100644
--- a/coverage.gradle
+++ b/coverage.gradle
@@ -2,7 +2,10 @@ 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/outputs/unit_test_code_coverage/**/*.exec",
+        "**/build/outputs/code_coverage/**/coverage.ec"
+    ) }
 
     report.reports {
         xml.enabled true
@@ -18,11 +21,13 @@ def initializeReport(report, projects, classExcludes) {
             switch (project) {
                 case { project.plugins.hasPlugin("com.android.application") }:
                     androidClassDirs.add("${project.buildDir}/tmp/kotlin-classes/gplayDebug")
+                    androidSourceDirs.add("${project.buildDir}/generated/source/kapt/gplayDebug")
                     androidSourceDirs.add("${project.projectDir}/src/main/kotlin")
                     androidSourceDirs.add("${project.projectDir}/src/main/java")
                     break
                 case { project.plugins.hasPlugin("com.android.library") }:
                     androidClassDirs.add("${project.buildDir}/tmp/kotlin-classes/debug")
+                    androidSourceDirs.add("${project.buildDir}/generated/source/kapt/debug")
                     androidSourceDirs.add("${project.projectDir}/src/main/kotlin")
                     androidSourceDirs.add("${project.projectDir}/src/main/java")
                     break
@@ -43,13 +48,17 @@ def collectProjects(predicate) {
     return subprojects.findAll { it.buildFile.isFile() && predicate(it) }
 }
 
-task allCodeCoverageReport(type: JacocoReport) {
+task theCodeCoverageReport(type: JacocoReport) {
     outputs.upToDateWhen { false }
     rootProject.apply plugin: 'jacoco'
-    // to limit projects in a specific report, add
-    // def excludedProjects = [ ... ]
-    // def projects = collectProjects { !excludedProjects.contains(it.name) }
-    def projects = collectProjects { true }
-    dependsOn { projects*.test }
+    tasks.withType(Test) {
+        jacoco.includeNoLocationClasses = true
+    }
+    def projects = collectProjects { ['vector','matrix-sdk-android'].contains(it.name) }
+    dependsOn {
+        [':matrix-sdk-android:testDebugUnitTest'] +
+        [':vector:testGplayDebugUnitTest'] +
+        [':matrix-sdk-android:connectedDebugAndroidTest']
+    }
     initializeReport(it, projects, excludes)
 }
diff --git a/dependencies.gradle b/dependencies.gradle
index 10f9539e5a..451ad4449b 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -7,10 +7,13 @@ ext.versions = [
         'targetCompat'      : JavaVersion.VERSION_11,
 ]
 
-def gradle = "7.2.0"
+
+// Pinned to 7.1.3 because of https://github.com/vector-im/element-android/issues/6142
+// Please test carefully before upgrading again.
+def gradle = "7.1.3"
 // Ref: https://kotlinlang.org/releases.html
 def kotlin = "1.6.21"
-def kotlinCoroutines = "1.6.1"
+def kotlinCoroutines = "1.6.2"
 def dagger = "2.42"
 def retrofit = "2.9.0"
 def arrow = "0.8.2"
@@ -23,7 +26,7 @@ def mavericks = "2.6.1"
 def glide = "4.13.2"
 def bigImageViewer = "1.8.1"
 def jjwt = "0.11.5"
-def vanniktechEmoji = "0.9.0"
+def vanniktechEmoji = "0.15.0"
 
 // Testing
 def mockk = "1.12.4"
@@ -45,12 +48,13 @@ ext.libs = [
                 'coroutinesTest'          : "org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinCoroutines"
         ],
         androidx    : [
-                'appCompat'               : "androidx.appcompat:appcompat:1.4.1",
-                'core'                    : "androidx.core:core-ktx:1.7.0",
+                'activity'                : "androidx.activity:activity:1.4.0",
+                'appCompat'               : "androidx.appcompat:appcompat:1.4.2",
+                'core'                    : "androidx.core:core-ktx:1.8.0",
                 'recyclerview'            : "androidx.recyclerview:recyclerview:1.2.1",
                 'exifinterface'           : "androidx.exifinterface:exifinterface:1.3.3",
                 'fragmentKtx'             : "androidx.fragment:fragment-ktx:1.4.1",
-                'constraintLayout'        : "androidx.constraintlayout:constraintlayout:2.1.3",
+                'constraintLayout'        : "androidx.constraintlayout:constraintlayout:2.1.4",
                 'work'                    : "androidx.work:work-runtime-ktx:2.7.1",
                 'autoFill'                : "androidx.autofill:autofill:1.1.0",
                 'preferenceKtx'           : "androidx.preference:preference-ktx:1.2.0",
@@ -69,10 +73,12 @@ 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"
+                'espressoIntents'         : "androidx.test.espresso:espresso-intents:$espresso",
+                'viewpager2'              : "androidx.viewpager2:viewpager2:1.0.0",
+                'transition'              : "androidx.transition:transition:1.2.0",
         ],
         google      : [
-                'material'                : "com.google.android.material:material:1.6.0"
+                'material'                : "com.google.android.material:material:1.6.1"
         ],
         dagger      : [
                 'dagger'                  : "com.google.dagger:dagger:$dagger",
@@ -81,7 +87,7 @@ ext.libs = [
                 'hiltCompiler'            : "com.google.dagger:hilt-compiler:$dagger"
         ],
         squareup    : [
-                'moshi'                  : "com.squareup.moshi:moshi-adapters:$moshi",
+                'moshi'                  : "com.squareup.moshi:moshi:$moshi",
                 'moshiKotlin'            : "com.squareup.moshi:moshi-kotlin-codegen:$moshi",
                 'retrofit'               : "com.squareup.retrofit2:retrofit:$retrofit",
                 'retrofitMoshi'          : "com.squareup.retrofit2:converter-moshi:$retrofit"
@@ -107,6 +113,10 @@ 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"
diff --git a/docs/add_threePids.md b/docs/add_threePids.md
index 6fb0aff426..8d02702ca6 100644
--- a/docs/add_threePids.md
+++ b/docs/add_threePids.md
@@ -1,5 +1,34 @@
 # 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
diff --git a/docs/analytics.md b/docs/analytics.md
index 135ace81b0..9b2c176912 100644
--- a/docs/analytics.md
+++ b/docs/analytics.md
@@ -1,5 +1,13 @@
 # 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.
diff --git a/docs/color_migration_guide.md b/docs/color_migration_guide.md
index 31a531d124..f83a88e2b2 100644
--- a/docs/color_migration_guide.md
+++ b/docs/color_migration_guide.md
@@ -1,5 +1,14 @@
 # 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
diff --git a/docs/design.md b/docs/design.md
index a79f19cf3e..f390725560 100644
--- a/docs/design.md
+++ b/docs/design.md
@@ -1,5 +1,31 @@
 # 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
diff --git a/docs/identity_server.md b/docs/identity_server.md
index e765ae3949..a1ee86cb19 100644
--- a/docs/identity_server.md
+++ b/docs/identity_server.md
@@ -1,5 +1,19 @@
 # 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
 
diff --git a/docs/integration_tests.md b/docs/integration_tests.md
index e79f966d1f..b5a830e7ff 100644
--- a/docs/integration_tests.md
+++ b/docs/integration_tests.md
@@ -1,5 +1,18 @@
 # 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.
diff --git a/docs/jitsi.md b/docs/jitsi.md
index 1b4e0a37b4..4dd06effdb 100644
--- a/docs/jitsi.md
+++ b/docs/jitsi.md
@@ -1,20 +1,32 @@
 # 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`.
 
@@ -22,7 +34,7 @@ Latest tag can be found from this page: https://github.com/jitsi/jitsi-meet-rele
 
 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:
 
@@ -32,7 +44,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:
 
@@ -57,7 +69,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)
@@ -65,7 +77,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.
 
@@ -81,4 +93,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.
 
-- Update the file `/CHANGES.md` to notify about the library upgrade, and create a regular PR for project Element Android.
\ No newline at end of file
+- Update the file `/CHANGES.md` to notify about the library upgrade, and create a regular PR for project Element Android.
diff --git a/docs/notifications.md b/docs/notifications.md
index b44984785a..612b8785b8 100644
--- a/docs/notifications.md
+++ b/docs/notifications.md
@@ -1,37 +1,42 @@
 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
-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)
+
+<!--- 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 -->
 
 
 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.
@@ -52,7 +57,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.
 
@@ -66,22 +71,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 independency requirement, source code licence)
+There some cases when devices with google services cannot use FCM (network infrastructure limitations -firewalls-,
+ privacy and or independence 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 plateform.*
+*The fact that you see a notification on your screen does not mean that you have successfully configured your PUSH platform.*
 
   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
@@ -118,11 +123,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-).
 
@@ -140,14 +145,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.
 
@@ -167,15 +172,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 & F-Droid)
+### Foreground sync mode (Gplay and F-Droid)
 
 When in foreground, Element performs sync continuously with a timeout value set to 10 seconds (see HttpPooling).
 
@@ -183,9 +188,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 wether push is available or not, Element will use different methods to perform the syncs (Workers / Alarms / Service)
+In background, and depending on whether 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.
 
@@ -225,10 +230,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 (amoung several others) that can cause that:
+Common errors (among several others) that can cause that:
 * Google Play Services is outdated
 * Google Play Service fails in someways with FCM servers (infamous `SERVICE_NOT_AVAILABLE`)
 
@@ -246,7 +251,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.
 
@@ -256,7 +261,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 requirering the app to be white listed from battery optimization.
+These restrictions can be relaxed by requiring 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.
 
@@ -266,9 +271,7 @@ 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**
 
diff --git a/docs/pull_request.md b/docs/pull_request.md
index 94f8f3b6d8..d2d2bb7a3b 100644
--- a/docs/pull_request.md
+++ b/docs/pull_request.md
@@ -1,5 +1,43 @@
 # 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.
diff --git a/docs/signin.md b/docs/signin.md
index 0a234d2a20..65e305389f 100644
--- a/docs/signin.md
+++ b/docs/signin.md
@@ -2,6 +2,27 @@
 
 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
@@ -322,4 +343,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.
\ No newline at end of file
+The password has been changed, and all the existing token are invalidated. User can now login with the new password.
diff --git a/docs/signup.md b/docs/signup.md
index 97cd20a423..0b01338965 100644
--- a/docs/signup.md
+++ b/docs/signup.md
@@ -4,6 +4,20 @@ 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
diff --git a/docs/ui-tests.md b/docs/ui-tests.md
index 667a6ed7fb..d0b9db6818 100644
--- a/docs/ui-tests.md
+++ b/docs/ui-tests.md
@@ -10,6 +10,20 @@ 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).
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40104140.txt b/fastlane/metadata/android/cs-CZ/changelogs/40104140.txt
new file mode 100644
index 0000000000..d369efa9f2
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40104140.txt
@@ -0,0 +1,2 @@
+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
diff --git a/fastlane/metadata/android/en-US/changelogs/40104180.txt b/fastlane/metadata/android/en-US/changelogs/40104180.txt
new file mode 100644
index 0000000000..61db61727a
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40104180.txt
@@ -0,0 +1,2 @@
+Main changes in this version: Various bug fixes and stability improvements.
+Full changelog: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/en-US/changelogs/40104190.txt b/fastlane/metadata/android/en-US/changelogs/40104190.txt
new file mode 100644
index 0000000000..61db61727a
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40104190.txt
@@ -0,0 +1,2 @@
+Main changes in this version: Various bug fixes and stability improvements.
+Full changelog: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/es-ES/changelogs/40104140.txt b/fastlane/metadata/android/es-ES/changelogs/40104140.txt
new file mode 100644
index 0000000000..595cd6b3d4
--- /dev/null
+++ b/fastlane/metadata/android/es-ES/changelogs/40104140.txt
@@ -0,0 +1,2 @@
+Cambios principales en esta versión: Mejoras en la administración de usuarios ignorados. Varias correciones de bugs y mejoras en la estabilidad.
+Registro de cambios: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/et/changelogs/40104140.txt b/fastlane/metadata/android/et/changelogs/40104140.txt
new file mode 100644
index 0000000000..9000616f38
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40104140.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: eiratud kasutajate parem haldus ning erinevate vigade parandused ja stabiilsust edendavad kohendused.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fa/changelogs/40104140.txt b/fastlane/metadata/android/fa/changelogs/40104140.txt
new file mode 100644
index 0000000000..cf5d7bc6ac
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40104140.txt
@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: مدیریت بهبودیافتهٔ کاربران چشم‌پوشیده. رفع اشکال‌های مختلف و بهبودهای پایداری.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40104100.txt b/fastlane/metadata/android/fr-FR/changelogs/40104100.txt
new file mode 100644
index 0000000000..f2453c5539
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40104100.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Défilement dans les messages vocaux. Plusieurs corrections de bogues et d’améliorations de stabilité.
+Intégralité des changements : https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40104110.txt b/fastlane/metadata/android/fr-FR/changelogs/40104110.txt
new file mode 100644
index 0000000000..fe61fd021c
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40104110.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Plusieurs corrections de bogues et d’améliorations de stabilité.
+Intégralité des changements : https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40104120.txt b/fastlane/metadata/android/fr-FR/changelogs/40104120.txt
new file mode 100644
index 0000000000..accd82fe72
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40104120.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Les utilisateurs peuvent apparaître hors-ligne. Ajout d’un lecteur pour les pièces jointes audio
+Intégralité des changements : https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40104130.txt b/fastlane/metadata/android/fr-FR/changelogs/40104130.txt
new file mode 100644
index 0000000000..accd82fe72
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40104130.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Les utilisateurs peuvent apparaître hors-ligne. Ajout d’un lecteur pour les pièces jointes audio
+Intégralité des changements : https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40104140.txt b/fastlane/metadata/android/fr-FR/changelogs/40104140.txt
new file mode 100644
index 0000000000..087d5bc1c8
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40104140.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Amélioration de la gestion des utilisateurs ignorés. Plusieurs corrections de bogues et d’améliorations de stabilité.
+Intégralité des changements : https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/id/changelogs/40104140.txt b/fastlane/metadata/android/id/changelogs/40104140.txt
new file mode 100644
index 0000000000..174e8dcded
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/40104140.txt
@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: Tingkatkan pengelolaan pengguna yang diabaikan. Beberapa perbaikan kutu dan stabilitas.
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/it-IT/changelogs/40104140.txt b/fastlane/metadata/android/it-IT/changelogs/40104140.txt
new file mode 100644
index 0000000000..ae367e72d0
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/40104140.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: migliorata la gestione degli utenti ignorati. Varie correzioni e miglioramenti della stabilità.
+Cronologia completa: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/lo-LA/changelogs/40104140.txt b/fastlane/metadata/android/lo-LA/changelogs/40104140.txt
new file mode 100644
index 0000000000..e8c8d84031
--- /dev/null
+++ b/fastlane/metadata/android/lo-LA/changelogs/40104140.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ປັບປຸງການບໍລິຫານການລະເວັ້ນຜູ້ໃຊ້. ປັບປຸງບັກ ແລະຄວາມສະຖຽນ.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40101120.txt b/fastlane/metadata/android/pl-PL/changelogs/40101120.txt
new file mode 100644
index 0000000000..6a62f1c6a9
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40101120.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: aktualizacja motywu i stylu oraz naprawa awarii po rozmowie wideo
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.1.12
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40101130.txt b/fastlane/metadata/android/pl-PL/changelogs/40101130.txt
new file mode 100644
index 0000000000..ec8d488eb8
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40101130.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: głównie aktualizacja stabilności i poprawki błędów.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.1.13
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40101140.txt b/fastlane/metadata/android/pl-PL/changelogs/40101140.txt
new file mode 100644
index 0000000000..c4c102da4a
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40101140.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: naprawienie problemu z zaszyfrowanymi wiadomościami.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.1.14
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40101150.txt b/fastlane/metadata/android/pl-PL/changelogs/40101150.txt
new file mode 100644
index 0000000000..2eb1a3f018
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40101150.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: implementacja wiadomości głosowych w ustawieniach laboratorium.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.1.15
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40101160.txt b/fastlane/metadata/android/pl-PL/changelogs/40101160.txt
new file mode 100644
index 0000000000..682da8be76
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40101160.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Naprawiono błąd podczas wysyłania zaszyfrowanej wiadomości, jeśli ktoś w pokoju się wyloguje.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.1.16
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40102000.txt b/fastlane/metadata/android/pl-PL/changelogs/40102000.txt
new file mode 100644
index 0000000000..cdae0a4ba7
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40102000.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Wiadomość głosowa jest domyślnie włączona.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.2.0
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40102010.txt b/fastlane/metadata/android/pl-PL/changelogs/40102010.txt
new file mode 100644
index 0000000000..0a825e8672
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40102010.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Wiele ulepszeń w VoIP i Przestrzeniach (nadal w wersji beta).
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.2.1
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40103000.txt b/fastlane/metadata/android/pl-PL/changelogs/40103000.txt
new file mode 100644
index 0000000000..8b408ced72
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40103000.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Organizuj swoje pokoje za pomocą Przestrzeni!
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.3.0
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40103010.txt b/fastlane/metadata/android/pl-PL/changelogs/40103010.txt
new file mode 100644
index 0000000000..0a49e7fa68
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40103010.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Organizuj swoje pokoje za pomocą Przestrzeni! Wersja 1.3.1 naprawia awarię, która może wystąpić w wersji 1.3.0.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.3.1
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40103020.txt b/fastlane/metadata/android/pl-PL/changelogs/40103020.txt
new file mode 100644
index 0000000000..3e37f64b76
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40103020.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Dodano obsługę Android Auto. Wiele poprawek błędów!
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.3.2
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40103030.txt b/fastlane/metadata/android/pl-PL/changelogs/40103030.txt
new file mode 100644
index 0000000000..8f80d95b5a
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40103030.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Uwidocznij politykę(-i) serwera tożsamości w ustawieniach. Tymczasowo usunięto obsługę Androida Auto.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.3.3
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40103040.txt b/fastlane/metadata/android/pl-PL/changelogs/40103040.txt
new file mode 100644
index 0000000000..13458a7b2d
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40103040.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Dodanie obsługi obecności, dla pokoju wiadomości bezpośrednich (uwaga: obecność jest wyłączona na matrix.org). Dodano ponownie obsługę Androida Auto.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.3.4
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40104140.txt b/fastlane/metadata/android/pl-PL/changelogs/40104140.txt
new file mode 100644
index 0000000000..84ab57a2ac
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40104140.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Poprawa zarządzania ignorowanymi użytkownikami. Różne poprawki błędów i ulepszenia stabilności.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40104140.txt b/fastlane/metadata/android/pt-BR/changelogs/40104140.txt
new file mode 100644
index 0000000000..ed1a53c910
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/40104140.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Melhorar gerenciamento de usuárias(os) ignoradas(os). Vários consertos de bugs e melhorias de estabilidade.
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sk/changelogs/40104140.txt b/fastlane/metadata/android/sk/changelogs/40104140.txt
new file mode 100644
index 0000000000..e1c85961a4
--- /dev/null
+++ b/fastlane/metadata/android/sk/changelogs/40104140.txt
@@ -0,0 +1,2 @@
+Hlavné zmeny v tejto verzii: Zlepšenie správy ignorovaných používateľov. Rôzne opravy chýb a vylepšenia stability.
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sv-SE/changelogs/40104140.txt b/fastlane/metadata/android/sv-SE/changelogs/40104140.txt
new file mode 100644
index 0000000000..9b58878dfb
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/40104140.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: Förbättra hantering av ignorerade användare. Diverse buggfixar och stabilitetsförbättringar.
+Full ändringslogg: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/ta-IN/changelogs/40104140.txt b/fastlane/metadata/android/ta-IN/changelogs/40104140.txt
new file mode 100644
index 0000000000..f3196b57b6
--- /dev/null
+++ b/fastlane/metadata/android/ta-IN/changelogs/40104140.txt
@@ -0,0 +1,2 @@
+இந்த பதிப்பில் உள்ள முதன்மை மாற்றங்கள்: தவிர்க்கப்பட்ட பயனர்களின் மேலாண்மை மேம்படுத்தப்பட்டுள்ளது. வெவ்வேறு வழுக்களைச் சரிசெய்தல் மற்றும் நிலைப்புத்தன்மையை மேம்படுத்தல். 
+முழு மாற்ற அறிக்கை: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/ta-IN/full_description.txt b/fastlane/metadata/android/ta-IN/full_description.txt
new file mode 100644
index 0000000000..9aa693bda2
--- /dev/null
+++ b/fastlane/metadata/android/ta-IN/full_description.txt
@@ -0,0 +1,42 @@
+Element is both a secure messenger and a productivity team collaboration app that is ideal for group chats while remote working. This chat app uses end-to-end encryption to provide powerful video conferencing, file sharing and voice calls.
+
+<b>Element இன் தனிச்சிறப்புகளுள் சில:</b>
+- மேம்பட்ட இயங்கலை தொடர்பு கருவிகள்
+- தொலைநிலையில் உள்ள ஊழியர்களுக்கும், பாதுகாப்பான நிறும கருத்து பரிமாற்றங்களை அனுமதிப்பதற்காக, முழுவதுமாக மறைகுறியாக்கப்பட்ட செய்திகள்
+- MATRIX திறந்த மூல கட்டமைப்பை அடிப்படையாக கொண்டு செயல்படும் அதிகாரப்பரவலாக்கப்பட்ட அரட்டை
+- செயல்திட்டங்களை மேலாண்மை செய்யும் போது, மறைகுறியாக்கப்பட்ட தரவுடன் கூடிய பாதுகாப்பான கோப்பு பகிரல்
+- IP மூலம் குரல் (VoIP) மற்றும் திரை பகிரல் உடன் கூடிய குரல் அரட்டைகள்
+- உங்கள் மனம் கவர்ந்த இயங்கலை உடனிணைவு கருவிகள், செயல்திட்ட மேலாண்மை கருவிகள், VoIP சேவைகள் மற்றும் இதர குழு தூதுரை செயலிகள் உடன் கூடிய எளிமையான ஒருமைப்பாடு
+
+Element is completely different from other messaging and collaboration apps. It operates on Matrix, an open network for secure messaging and decentralized communication. It allows self-hosting to give users maximum ownership and control of their data and messages.
+
+<b>தனியுரிமை மற்றும் மறைகுறியாக்கப்பட்ட செய்தி அனுப்பல்</b>
+தேவையில்லாத விளம்பரங்கள், தரவு சுரண்டல் மற்றும் தகவல் கட்டுப்பாடு போன்றவற்றில் இருந்து Element உங்களை பாதுகாக்கிறது. மேலும், இது முனைக்கு-முனை மறைகுறியாக்கம் மற்றும் குறுக்கு-ஒப்பமிடப்பட்ட சாதன சரிபார்ப்பு ஆகியவற்றின் மூலம் உங்கள் எல்லா தரவுகள், ஒன்றுக்கொன்றான காணொளி மற்றும் குரல் அழைப்புகளை பாதுகாக்கிறது.
+
+Element gives you control over your privacy while allowing you to communicate securely with யாரோனும் ஒருவருடன் on the Matrix network, or other business collaboration tools by integrating with apps such as Slack.
+
+<b>Element can be self-hosted</b>
+To allow more control of your sensitive data and conversations, Element can be self-hosted or you can choose any Matrix-based host - the standard for open source, decentralized communication. Element gives you privacy, security compliance and integration flexibility.
+
+<b>உங்கள் தரவைச் சொந்தமாக்கிக் கொள்ளுங்கள்</b>
+தரவுகள் மற்றும் செய்திகளை எங்கு சேமித்து வைக்க வேண்டும் என்பதை நீங்கள் முடிவு செய்கிறீர்கள். இதன்மூலம், தரவு சுரண்டல் மற்றும் மூன்றாம் தரப்பினர் அனுகல் ஆகிய இடர்களை தவிர்க்கலாம்.
+
+Element வெவ்வேறு வகையில் கட்டுப்பாட்டை உங்களிடம் அளிக்கிறது:
+1. Get a free account on the matrix.org public server hosted by the Matrix developers, or choose from thousands of public servers hosted by volunteers
+2. Self-host your account by running a server on your own IT infrastructure
+3. Sign up for an account on a custom server by simply subscribing to the Element Matrix Services hosting platform
+
+<b>திறந்த செய்தி அனுப்பல் மற்றும் ஒருமைப்பாடு</b>
+You can chat with anyone on the Matrix network, whether they’re using Element, another Matrix app or even if they are using a different messaging app.
+
+<b>மிகவும் பாதுகாப்பானது</b>
+உண்மையான முனைக்கு-முனை மறைகுறியாக்கம் (உரையாடலில் உள்ளவர்கள் மட்டுமே மறைகுறியாக்கத்தை நீக்கி செய்தியை காண இயலும்) மற்றும் குறுக்கு-ஒப்பமிடப்பட்ட சாதன சரிபார்ப்பு.
+
+<b>முழுமையான தொடர்பு மற்றும் ஒருமைப்பாடு</b>
+செய்தி அனுப்பல், காணொளி மற்றும் குரல் அழைப்புகளை, கோப்பு பகிரல், திரை பகிரல் மற்றும் ஒருமைப்பாடுகள், இயலிகள் மற்றும் நிரல் பலகைகளின் மொத்த கொத்து. அறைகள், குழுக்களை உருவாக்கி, அவர்களுடன் உரையாடி, வேலையை எளிமையாக்கவும்.
+
+<b>எங்கு விட்டு சென்றீர்களோ அதிலிருந்த துவங்கவும்</b>
+Stay in touch wherever you are with fully synchronised message history across all your devices and on the web at https://app.element.io
+
+<b>திறந்த மூலம்</b>
+Element Android ஒரு திறந்த மூல செயல் திட்டமாகும். இது GitHub இல் தொகுத்து வழங்கப்பட்டுள்ளது. வழுக்கள் ஏதேனும் கண்டறிந்தால் மற்றும்/அல்லது இதன் வளர்ச்சிக்கு பங்களிக்க விரும்பினால், https://github.com/vector-im/element-android என்னும் தளத்திற்கு வருகை தரவும்.
diff --git a/fastlane/metadata/android/ta-IN/short_description.txt b/fastlane/metadata/android/ta-IN/short_description.txt
new file mode 100644
index 0000000000..9c7afb2a37
--- /dev/null
+++ b/fastlane/metadata/android/ta-IN/short_description.txt
@@ -0,0 +1 @@
+மறைகுறியாக்கப்பட்ட செய்தி அனுப்பல், குழு அரட்டை மற்றும் காணொளி அழைப்புகள்
diff --git a/fastlane/metadata/android/ta-IN/title.txt b/fastlane/metadata/android/ta-IN/title.txt
new file mode 100644
index 0000000000..ecb9a01c06
--- /dev/null
+++ b/fastlane/metadata/android/ta-IN/title.txt
@@ -0,0 +1 @@
+Element - பாதுகாப்பான தூதுரை சேவை
diff --git a/fastlane/metadata/android/uk/changelogs/40104140.txt b/fastlane/metadata/android/uk/changelogs/40104140.txt
new file mode 100644
index 0000000000..293ad117e4
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40104140.txt
@@ -0,0 +1,2 @@
+Основні зміни у цій версії: Удосконалено керування нехтуваними користувачами. Різні виправлення помилок та поліпшення стабільності.
+Вичерпний журнал змін: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/zh-TW/changelogs/40104140.txt b/fastlane/metadata/android/zh-TW/changelogs/40104140.txt
new file mode 100644
index 0000000000..ff830dab7c
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/40104140.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：改善被忽略使用者的管理。多個臭蟲修復與穩定性改善。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases
diff --git a/library/attachment-viewer/build.gradle b/library/attachment-viewer/build.gradle
index 048710f62c..8bbafd3387 100644
--- a/library/attachment-viewer/build.gradle
+++ b/library/attachment-viewer/build.gradle
@@ -55,5 +55,6 @@ dependencies {
     implementation libs.androidx.appCompat
     implementation libs.androidx.recyclerview
 
-    implementation libs.google.material
-}
\ No newline at end of file
+    api libs.androidx.viewpager2
+    implementation libs.androidx.transition
+}
diff --git a/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeToDismissHandler.kt b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeToDismissHandler.kt
index ca2c28b498..85d7c13398 100644
--- a/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeToDismissHandler.kt
+++ b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeToDismissHandler.kt
@@ -44,7 +44,7 @@ class SwipeToDismissHandler(
     @SuppressLint("ClickableViewAccessibility")
     override fun onTouch(v: View, event: MotionEvent): Boolean {
         when (event.action) {
-            MotionEvent.ACTION_DOWN                          -> {
+            MotionEvent.ACTION_DOWN -> {
                 if (swipeView.hitRect.contains(event.x.toInt(), event.y.toInt())) {
                     isTracking = true
                 }
@@ -58,7 +58,7 @@ class SwipeToDismissHandler(
                 }
                 return true
             }
-            MotionEvent.ACTION_MOVE                          -> {
+            MotionEvent.ACTION_MOVE -> {
                 if (isTracking) {
                     val translationY = event.y - startY
                     swipeView.translationY = translationY
@@ -66,7 +66,7 @@ class SwipeToDismissHandler(
                 }
                 return true
             }
-            else                                             -> {
+            else -> {
                 return false
             }
         }
diff --git a/library/core-utils/build.gradle b/library/core-utils/build.gradle
index d3afd8d29b..0f7789a2a8 100644
--- a/library/core-utils/build.gradle
+++ b/library/core-utils/build.gradle
@@ -50,6 +50,5 @@ android {
 }
 
 dependencies {
-    implementation libs.androidx.appCompat
     implementation libs.jetbrains.coroutinesAndroid
 }
diff --git a/library/jsonviewer/build.gradle b/library/jsonviewer/build.gradle
index 2110747feb..e1a3b0c9ee 100644
--- a/library/jsonviewer/build.gradle
+++ b/library/jsonviewer/build.gradle
@@ -52,6 +52,7 @@ dependencies {
 
     implementation libs.androidx.appCompat
     implementation libs.androidx.core
+    implementation libs.androidx.recyclerview
 
     implementation libs.airbnb.epoxy
     kapt libs.airbnb.epoxyProcessor
@@ -60,7 +61,6 @@ dependencies {
     // Span utils
     implementation 'me.gujun.android:span:1.7'
 
-    implementation libs.google.material
 
     implementation libs.jetbrains.coroutinesCore
     implementation libs.jetbrains.coroutinesAndroid
diff --git a/library/multipicker/build.gradle b/library/multipicker/build.gradle
index bb98a2f852..2de99d5c20 100644
--- a/library/multipicker/build.gradle
+++ b/library/multipicker/build.gradle
@@ -38,9 +38,9 @@ android {
 }
 
 dependencies {
-    implementation libs.androidx.appCompat
-    implementation libs.androidx.fragmentKtx
+    api libs.androidx.activity
     implementation libs.androidx.exifinterface
+    implementation libs.androidx.core
 
     // Log
     implementation libs.jakewharton.timber
diff --git a/library/ui-styles/build.gradle b/library/ui-styles/build.gradle
index 0ac513b252..31cfdd24c7 100644
--- a/library/ui-styles/build.gradle
+++ b/library/ui-styles/build.gradle
@@ -60,4 +60,4 @@ dependencies {
     implementation 'com.github.vector-im:PFLockScreen-Android:1.0.0-beta12'
     // dialpad dimen
     implementation 'im.dlg:android-dialer:1.2.5'
-}
\ No newline at end of file
+}
diff --git a/library/ui-styles/src/main/res/drawable/bg_pin_key.xml b/library/ui-styles/src/main/res/drawable/bg_pin_key.xml
index d4a54577be..5bf293aab0 100644
--- a/library/ui-styles/src/main/res/drawable/bg_pin_key.xml
+++ b/library/ui-styles/src/main/res/drawable/bg_pin_key.xml
@@ -10,4 +10,4 @@
                 android:height="70dp" />
         </shape>
     </item>
-</ripple>
\ No newline at end of file
+</ripple>
diff --git a/library/ui-styles/src/main/res/drawable/pin_code_dot_empty.xml b/library/ui-styles/src/main/res/drawable/pin_code_dot_empty.xml
index 1827a7682b..879cac15ca 100644
--- a/library/ui-styles/src/main/res/drawable/pin_code_dot_empty.xml
+++ b/library/ui-styles/src/main/res/drawable/pin_code_dot_empty.xml
@@ -10,4 +10,4 @@
     <size
         android:width="24dp"
         android:height="24dp"/>
-</shape>
\ No newline at end of file
+</shape>
diff --git a/library/ui-styles/src/main/res/drawable/pin_code_dot_fill.xml b/library/ui-styles/src/main/res/drawable/pin_code_dot_fill.xml
index 799ea30174..83bdac5126 100644
--- a/library/ui-styles/src/main/res/drawable/pin_code_dot_fill.xml
+++ b/library/ui-styles/src/main/res/drawable/pin_code_dot_fill.xml
@@ -9,4 +9,4 @@
     <size
         android:width="24dp"
         android:height="24dp"/>
-</shape>
\ No newline at end of file
+</shape>
diff --git a/library/ui-styles/src/main/res/drawable/pin_code_dots.xml b/library/ui-styles/src/main/res/drawable/pin_code_dots.xml
index 29e445e511..c4b1073f85 100644
--- a/library/ui-styles/src/main/res/drawable/pin_code_dots.xml
+++ b/library/ui-styles/src/main/res/drawable/pin_code_dots.xml
@@ -6,4 +6,4 @@
         android:drawable="@drawable/pin_code_dot_fill"/>
     <item
         android:drawable="@drawable/pin_code_dot_empty"/>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/library/ui-styles/src/main/res/values/styles_location.xml b/library/ui-styles/src/main/res/values/styles_location.xml
index 7571265241..9d9fc862f6 100644
--- a/library/ui-styles/src/main/res/values/styles_location.xml
+++ b/library/ui-styles/src/main/res/values/styles_location.xml
@@ -18,4 +18,26 @@
         <item name="android:gravity">center</item>
     </style>
 
+    <style name="TextAppearance.Vector.Body.BottomSheetDisplayName">
+        <item name="android:textSize">16sp</item>
+    </style>
+
+    <style name="TextAppearance.Vector.Body.BottomSheetRemainingTime">
+        <item name="android:textSize">12sp</item>
+    </style>
+
+    <style name="TextAppearance.Vector.Body.BottomSheetLastUpdatedAt">
+        <item name="android:textSize">12sp</item>
+        <item name="android:textColor">?vctr_content_tertiary</item>
+    </style>
+
+    <style name="Widget.Vector.Button.Text.BottomSheetStopSharing">
+        <item name="android:foreground">?selectableItemBackground</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:textAppearance">@style/TextAppearance.Vector.Body.Medium</item>
+        <item name="android:textColor">?colorError</item>
+        <item name="android:padding">0dp</item>
+        <item name="android:gravity">center</item>
+    </style>
+
 </resources>
diff --git a/library/ui-styles/src/main/res/values/styles_pin_code.xml b/library/ui-styles/src/main/res/values/styles_pin_code.xml
index 2b6c113359..cb22863694 100644
--- a/library/ui-styles/src/main/res/values/styles_pin_code.xml
+++ b/library/ui-styles/src/main/res/values/styles_pin_code.xml
@@ -41,4 +41,4 @@
         <item name="android:textColor">?vctr_content_primary</item>
     </style>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/library/ui-styles/src/main/res/values/styles_timeline.xml b/library/ui-styles/src/main/res/values/styles_timeline.xml
index c86eeb8efb..20c375c2d6 100644
--- a/library/ui-styles/src/main/res/values/styles_timeline.xml
+++ b/library/ui-styles/src/main/res/values/styles_timeline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <style name="TimelineContentStubBaseParams">
         <item name="android:layout_width">match_parent</item>
@@ -33,5 +33,8 @@
         <item name="android:gravity">center</item>
     </style>
 
+    <style name="TimelineFixedSizeCaptionStyle" parent="@style/Widget.Vector.TextView.Caption">
+        <item name="android:textSize" tools:ignore="SpUsage">12dp</item>
+    </style>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/matrix-sdk-android-flow/build.gradle b/matrix-sdk-android-flow/build.gradle
index ea43ce20c8..fb69af2d82 100644
--- a/matrix-sdk-android-flow/build.gradle
+++ b/matrix-sdk-android-flow/build.gradle
@@ -31,9 +31,7 @@ android {
 }
 
 dependencies {
-
     implementation project(":matrix-sdk-android")
-    implementation libs.androidx.appCompat
 
     implementation libs.jetbrains.coroutinesCore
     implementation libs.jetbrains.coroutinesAndroid
@@ -41,7 +39,4 @@ dependencies {
 
     // Paging
     implementation libs.androidx.pagingRuntimeKtx
-
-    // Logging
-    implementation libs.jakewharton.timber
 }
diff --git a/matrix-sdk-android-flow/src/main/java/org/matrix/android/sdk/flow/FlowSession.kt b/matrix-sdk-android-flow/src/main/java/org/matrix/android/sdk/flow/FlowSession.kt
index 9f260858f6..1086928dc6 100644
--- a/matrix-sdk-android-flow/src/main/java/org/matrix/android/sdk/flow/FlowSession.kt
+++ b/matrix-sdk-android-flow/src/main/java/org/matrix/android/sdk/flow/FlowSession.kt
@@ -45,6 +45,13 @@ import org.matrix.android.sdk.api.util.toOptional
 
 class FlowSession(private val session: Session) {
 
+    fun liveRoomSummary(roomId: String): Flow<Optional<RoomSummary>> {
+        return session.roomService().getRoomSummaryLive(roomId).asFlow()
+                .startWith(session.coroutineDispatchers.io) {
+                    session.roomService().getRoomSummary(roomId).toOptional()
+                }
+    }
+
     fun liveRoomSummaries(queryParams: RoomSummaryQueryParams, sortOrder: RoomSortOrder = RoomSortOrder.NONE): Flow<List<RoomSummary>> {
         return session.roomService().getRoomSummariesLive(queryParams, sortOrder).asFlow()
                 .startWith(session.coroutineDispatchers.io) {
@@ -81,7 +88,7 @@ class FlowSession(private val session: Session) {
     }
 
     fun liveSyncState(): Flow<SyncState> {
-        return session.getSyncStateLive().asFlow()
+        return session.syncService().getSyncStateLive().asFlow()
     }
 
     fun livePushers(): Flow<List<Pusher>> {
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 33798d1357..ec376effbe 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -56,7 +56,7 @@ android {
         // that the app's state is completely cleared between tests.
         testInstrumentationRunnerArguments clearPackageData: 'true'
 
-        buildConfigField "String", "SDK_VERSION", "\"1.4.18\""
+        buildConfigField "String", "SDK_VERSION", "\"1.4.20\""
 
         buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\""
         buildConfigField "String", "GIT_SDK_REVISION_UNIX_DATE", "\"${gitRevisionUnixDate()}\""
@@ -74,6 +74,7 @@ android {
 
     buildTypes {
         debug {
+            testCoverageEnabled true
             // Set to true to log privacy or sensible data, such as token
             buildConfigField "boolean", "LOG_PRIVATE_DATA", project.property("vector.debugPrivateData")
             // Set to BODY instead of NONE to enable logging
@@ -136,7 +137,6 @@ dependencies {
     implementation libs.jetbrains.coroutinesCore
     implementation libs.jetbrains.coroutinesAndroid
 
-    implementation libs.androidx.appCompat
     implementation libs.androidx.core
 
     // Lifecycle
@@ -155,12 +155,11 @@ dependencies {
     implementation(platform("com.squareup.okhttp3:okhttp-bom:4.9.3"))
     implementation 'com.squareup.okhttp3:okhttp'
     implementation 'com.squareup.okhttp3:logging-interceptor'
-    implementation 'com.squareup.okhttp3:okhttp-urlconnection'
 
     implementation libs.squareup.moshi
     kapt libs.squareup.moshiKotlin
 
-    implementation libs.markwon.core
+    api "com.atlassian.commonmark:commonmark:0.13.0"
 
     // Image
     implementation libs.androidx.exifinterface
@@ -176,12 +175,8 @@ dependencies {
     // Work
     implementation libs.androidx.work
 
-    // FP
-    implementation libs.arrow.core
-    implementation libs.arrow.instances
-
     // olm lib is now hosted in MavenCentral
-    implementation 'org.matrix.android:olm-sdk:3.2.11'
+    implementation 'org.matrix.android:olm-sdk:3.2.12'
 
     // DI
     implementation libs.dagger.dagger
@@ -198,11 +193,9 @@ dependencies {
     implementation libs.apache.commonsImaging
 
     // Phone number https://github.com/google/libphonenumber
-    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.48'
+    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.49'
 
     testImplementation libs.tests.junit
-    testImplementation 'org.robolectric:robolectric:4.7.3'
-    //testImplementation 'org.robolectric:shadows-support-v4:3.0'
     // Note: version sticks to 1.9.2 due to https://github.com/mockk/mockk/issues/281
     testImplementation libs.mockk.mockk
     testImplementation libs.tests.kluent
diff --git a/matrix-sdk-android/docs/packages.md b/matrix-sdk-android/docs/packages.md
index ae7bee1b4e..19f7c15a7a 100644
--- a/matrix-sdk-android/docs/packages.md
+++ b/matrix-sdk-android/docs/packages.md
@@ -1,3 +1,7 @@
+# Package org.matrix.android.sdk.userstories
+
+This package contains some user stories (**Us** prefix) of the SDK usage. You will find example of what it is possible to do with the SDK and the API which can be used to do it.
+
 # Package org.matrix.android.sdk.api
 
 This is the root package of the API exposed by this SDK.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/InstrumentedTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/InstrumentedTest.kt
index a763766821..f08f0a28ed 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/InstrumentedTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/InstrumentedTest.kt
@@ -19,10 +19,14 @@ package org.matrix.android.sdk
 import android.content.Context
 import androidx.test.core.app.ApplicationProvider
 import org.junit.Rule
+import org.matrix.android.sdk.common.RetryTestRule
 import org.matrix.android.sdk.test.shared.createTimberTestRule
 
 interface InstrumentedTest {
 
+    @Rule
+    fun retryTestRule() = RetryTestRule(3)
+
     @Rule
     fun timberTestRule() = createTimberTestRule()
 
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/AccountCreationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/AccountCreationTest.kt
index 486bc02769..7e4fc4768f 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/AccountCreationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/AccountCreationTest.kt
@@ -24,8 +24,8 @@ import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 import org.junit.runners.MethodSorters
 import org.matrix.android.sdk.InstrumentedTest
-import org.matrix.android.sdk.common.CommonTestHelper
-import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest
+import org.matrix.android.sdk.common.CommonTestHelper.Companion.runSessionTest
 import org.matrix.android.sdk.common.SessionTestParams
 import org.matrix.android.sdk.common.TestConstants
 
@@ -34,32 +34,22 @@ import org.matrix.android.sdk.common.TestConstants
 @LargeTest
 class AccountCreationTest : InstrumentedTest {
 
-    private val commonTestHelper = CommonTestHelper(context())
-    private val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
-
     @Test
-    fun createAccountTest() {
-        val session = commonTestHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(withInitialSync = true))
-
-        commonTestHelper.signOutAndClose(session)
+    fun createAccountTest() = runSessionTest(context()) { commonTestHelper ->
+        commonTestHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(withInitialSync = true))
     }
 
     @Test
     @Ignore("This test will be ignored until it is fixed")
-    fun createAccountAndLoginAgainTest() {
+    fun createAccountAndLoginAgainTest() = runSessionTest(context()) { commonTestHelper ->
         val session = commonTestHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(withInitialSync = true))
 
         // Log again to the same account
-        val session2 = commonTestHelper.logIntoAccount(session.myUserId, SessionTestParams(withInitialSync = true))
-
-        commonTestHelper.signOutAndClose(session)
-        commonTestHelper.signOutAndClose(session2)
+        commonTestHelper.logIntoAccount(session.myUserId, SessionTestParams(withInitialSync = true))
     }
 
     @Test
-    fun simpleE2eTest() {
-        val res = cryptoTestHelper.doE2ETestWithAliceInARoom()
-
-        res.cleanUp(commonTestHelper)
+    fun simpleE2eTest() = runCryptoTest(context()) { cryptoTestHelper, _ ->
+        cryptoTestHelper.doE2ETestWithAliceInARoom()
     }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/ChangePasswordTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/ChangePasswordTest.kt
index 6d740c5a34..260e8dbe05 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/ChangePasswordTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/ChangePasswordTest.kt
@@ -25,7 +25,7 @@ import org.junit.runners.JUnit4
 import org.junit.runners.MethodSorters
 import org.matrix.android.sdk.InstrumentedTest
 import org.matrix.android.sdk.api.failure.isInvalidPassword
-import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.CommonTestHelper.Companion.runSessionTest
 import org.matrix.android.sdk.common.SessionTestParams
 import org.matrix.android.sdk.common.TestConstants
 
@@ -34,14 +34,12 @@ import org.matrix.android.sdk.common.TestConstants
 @Ignore("This test will be ignored until it is fixed")
 class ChangePasswordTest : InstrumentedTest {
 
-    private val commonTestHelper = CommonTestHelper(context())
-
     companion object {
         private const val NEW_PASSWORD = "this is a new password"
     }
 
     @Test
-    fun changePasswordTest() {
+    fun changePasswordTest() = runSessionTest(context()) { commonTestHelper ->
         val session = commonTestHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(withInitialSync = false))
 
         // Change password
@@ -54,9 +52,6 @@ class ChangePasswordTest : InstrumentedTest {
         throwable.isInvalidPassword().shouldBeTrue()
 
         // Try to login with the new password, should work
-        val session2 = commonTestHelper.logIntoAccount(session.myUserId, NEW_PASSWORD, SessionTestParams(withInitialSync = false))
-
-        commonTestHelper.signOutAndClose(session)
-        commonTestHelper.signOutAndClose(session2)
+        commonTestHelper.logIntoAccount(session.myUserId, NEW_PASSWORD, SessionTestParams(withInitialSync = false))
     }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt
index d2dfe4d945..0b21f85742 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt
@@ -29,7 +29,7 @@ import org.matrix.android.sdk.api.auth.UserPasswordAuth
 import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.failure.MatrixError
-import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.CommonTestHelper.Companion.runSessionTest
 import org.matrix.android.sdk.common.SessionTestParams
 import org.matrix.android.sdk.common.TestConstants
 import kotlin.coroutines.Continuation
@@ -39,10 +39,8 @@ import kotlin.coroutines.resume
 @FixMethodOrder(MethodSorters.JVM)
 class DeactivateAccountTest : InstrumentedTest {
 
-    private val commonTestHelper = CommonTestHelper(context())
-
     @Test
-    fun deactivateAccountTest() {
+    fun deactivateAccountTest() = runSessionTest(context(), false /* session will be deactivated */) { commonTestHelper ->
         val session = commonTestHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(withInitialSync = true))
 
         // Deactivate the account
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/network/ApiInterceptorTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/network/ApiInterceptorTest.kt
index 9371154aaf..8dbff82015 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/network/ApiInterceptorTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/network/ApiInterceptorTest.kt
@@ -23,7 +23,7 @@ import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 import org.junit.runners.MethodSorters
 import org.matrix.android.sdk.InstrumentedTest
-import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.CommonTestHelper.Companion.runSessionTest
 import org.matrix.android.sdk.common.SessionTestParams
 import org.matrix.android.sdk.common.TestConstants
 import timber.log.Timber
@@ -32,10 +32,8 @@ import timber.log.Timber
 @FixMethodOrder(MethodSorters.JVM)
 class ApiInterceptorTest : InstrumentedTest {
 
-    private val commonTestHelper = CommonTestHelper(context())
-
     @Test
-    fun apiInterceptorTest() {
+    fun apiInterceptorTest() = runSessionTest(context()) { commonTestHelper ->
         val responses = mutableListOf<String>()
 
         val listener = object : ApiInterceptorListener {
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
index 96ea99d92f..7dafe33935 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
@@ -54,12 +54,39 @@ import java.util.concurrent.TimeUnit
  * This class exposes methods to be used in common cases
  * Registration, login, Sync, Sending messages...
  */
-class CommonTestHelper(context: Context) {
+class CommonTestHelper private constructor(context: Context) {
+
+    companion object {
+        internal fun runSessionTest(context: Context, autoSignoutOnClose: Boolean = true, block: (CommonTestHelper) -> Unit) {
+            val testHelper = CommonTestHelper(context)
+            return try {
+                block(testHelper)
+            } finally {
+                if (autoSignoutOnClose) {
+                    testHelper.cleanUpOpenedSessions()
+                }
+            }
+        }
+
+        internal fun runCryptoTest(context: Context, autoSignoutOnClose: Boolean = true, block: (CryptoTestHelper, CommonTestHelper) -> Unit) {
+            val testHelper = CommonTestHelper(context)
+            val cryptoTestHelper = CryptoTestHelper(testHelper)
+            return try {
+                block(cryptoTestHelper, testHelper)
+            } finally {
+                if (autoSignoutOnClose) {
+                    testHelper.cleanUpOpenedSessions()
+                }
+            }
+        }
+    }
 
     internal val matrix: TestMatrix
     private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
     private var accountNumber = 0
 
+    private val trackedSessions = mutableListOf<Session>()
+
     fun getTestInterceptor(session: Session): MockOkHttpInterceptor? = TestModule.interceptorForSession(session.sessionId) as? MockOkHttpInterceptor
 
     init {
@@ -84,6 +111,15 @@ class CommonTestHelper(context: Context) {
         return logIntoAccount(userId, TestConstants.PASSWORD, testParams)
     }
 
+    fun cleanUpOpenedSessions() {
+        trackedSessions.forEach {
+            runBlockingTest {
+                it.signOutService().signOut(true)
+            }
+        }
+        trackedSessions.clear()
+    }
+
     /**
      * Create a homeserver configuration, with Http connection allowed for test
      */
@@ -101,11 +137,11 @@ class CommonTestHelper(context: Context) {
     fun syncSession(session: Session, timeout: Long = TestConstants.timeOutMillis * 10) {
         val lock = CountDownLatch(1)
         coroutineScope.launch {
-            session.startSync(true)
-            val syncLiveData = session.getSyncStateLive()
+            session.syncService().startSync(true)
+            val syncLiveData = session.syncService().getSyncStateLive()
             val syncObserver = object : Observer<SyncState> {
                 override fun onChanged(t: SyncState?) {
-                    if (session.hasAlreadySynced()) {
+                    if (session.syncService().hasAlreadySynced()) {
                         lock.countDown()
                         syncLiveData.removeObserver(this)
                     }
@@ -124,10 +160,10 @@ class CommonTestHelper(context: Context) {
     fun clearCacheAndSync(session: Session, timeout: Long = TestConstants.timeOutMillis) {
         waitWithLatch(timeout) { latch ->
             session.clearCache()
-            val syncLiveData = session.getSyncStateLive()
+            val syncLiveData = session.syncService().getSyncStateLive()
             val syncObserver = object : Observer<SyncState> {
                 override fun onChanged(t: SyncState?) {
-                    if (session.hasAlreadySynced()) {
+                    if (session.syncService().hasAlreadySynced()) {
                         Timber.v("Clear cache and synced")
                         syncLiveData.removeObserver(this)
                         latch.countDown()
@@ -135,7 +171,7 @@ class CommonTestHelper(context: Context) {
                 }
             }
             syncLiveData.observeForever(syncObserver)
-            session.startSync(true)
+            session.syncService().startSync(true)
         }
     }
 
@@ -216,7 +252,8 @@ class CommonTestHelper(context: Context) {
             message: String,
             numberOfMessages: Int,
             rootThreadEventId: String,
-            timeout: Long = TestConstants.timeOutMillis): List<TimelineEvent> {
+            timeout: Long = TestConstants.timeOutMillis
+    ): List<TimelineEvent> {
         val timeline = room.timelineService().createTimeline(null, TimelineSettings(10))
         timeline.start()
         val sentEvents = sendTextMessagesBatched(timeline, room, message, numberOfMessages, timeout, rootThreadEventId)
@@ -236,16 +273,20 @@ class CommonTestHelper(context: Context) {
      * @param testParams test params about the session
      * @return the session associated with the newly created account
      */
-    private fun createAccount(userNamePrefix: String,
-                              password: String,
-                              testParams: SessionTestParams): Session {
+    private fun createAccount(
+            userNamePrefix: String,
+            password: String,
+            testParams: SessionTestParams
+    ): Session {
         val session = createAccountAndSync(
                 userNamePrefix + "_" + accountNumber++ + "_" + UUID.randomUUID(),
                 password,
                 testParams
         )
         assertNotNull(session)
-        return session
+        return session.also {
+            trackedSessions.add(session)
+        }
     }
 
     /**
@@ -256,12 +297,16 @@ class CommonTestHelper(context: Context) {
      * @param testParams test params about the session
      * @return the session associated with the existing account
      */
-    fun logIntoAccount(userId: String,
-                       password: String,
-                       testParams: SessionTestParams): Session {
+    fun logIntoAccount(
+            userId: String,
+            password: String,
+            testParams: SessionTestParams
+    ): Session {
         val session = logAccountAndSync(userId, password, testParams)
         assertNotNull(session)
-        return session
+        return session.also {
+            trackedSessions.add(session)
+        }
     }
 
     /**
@@ -271,9 +316,11 @@ class CommonTestHelper(context: Context) {
      * @param password the password
      * @param sessionTestParams parameters for the test
      */
-    private fun createAccountAndSync(userName: String,
-                                     password: String,
-                                     sessionTestParams: SessionTestParams): Session {
+    private fun createAccountAndSync(
+            userName: String,
+            password: String,
+            sessionTestParams: SessionTestParams
+    ): Session {
         val hs = createHomeServerConfig()
 
         runBlockingTest {
@@ -309,9 +356,11 @@ class CommonTestHelper(context: Context) {
      * @param password the password
      * @param sessionTestParams session test params
      */
-    private fun logAccountAndSync(userName: String,
-                                  password: String,
-                                  sessionTestParams: SessionTestParams): Session {
+    private fun logAccountAndSync(
+            userName: String,
+            password: String,
+            sessionTestParams: SessionTestParams
+    ): Session {
         val hs = createHomeServerConfig()
 
         runBlockingTest {
@@ -337,8 +386,10 @@ class CommonTestHelper(context: Context) {
      * @param userName the account username
      * @param password the password
      */
-    fun logAccountWithError(userName: String,
-                            password: String): Throwable {
+    fun logAccountWithError(
+            userName: String,
+            password: String
+    ): Throwable {
         val hs = createHomeServerConfig()
 
         runBlockingTest {
@@ -379,8 +430,8 @@ class CommonTestHelper(context: Context) {
      */
     fun await(latch: CountDownLatch, timeout: Long? = TestConstants.timeOutMillis) {
         assertTrue(
-            "Timed out after " + timeout + "ms waiting for something to happen. See stacktrace for cause.",
-	    latch.await(timeout ?: TestConstants.timeOutMillis, TimeUnit.MILLISECONDS)
+                "Timed out after " + timeout + "ms waiting for something to happen. See stacktrace for cause.",
+                latch.await(timeout ?: TestConstants.timeOutMillis, TimeUnit.MILLISECONDS)
         )
     }
 
@@ -436,6 +487,7 @@ class CommonTestHelper(context: Context) {
     fun Iterable<Session>.signOutAndClose() = forEach { signOutAndClose(it) }
 
     fun signOutAndClose(session: Session) {
+        trackedSessions.remove(session)
         runBlockingTest(timeout = 60_000) {
             session.signOutService().signOut(true)
         }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestData.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestData.kt
index b6bedbd719..41d0d3a7e8 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestData.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestData.kt
@@ -18,8 +18,10 @@ package org.matrix.android.sdk.common
 
 import org.matrix.android.sdk.api.session.Session
 
-data class CryptoTestData(val roomId: String,
-                          val sessions: List<Session>) {
+data class CryptoTestData(
+        val roomId: String,
+        val sessions: List<Session>
+) {
 
     val firstSession: Session
         get() = sessions.first()
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
index 348841313b..5fd86d4fdb 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
@@ -58,7 +58,7 @@ import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.api.session.securestorage.EmptyKeySigner
-import org.matrix.android.sdk.api.session.securestorage.SharedSecretStorageService
+import org.matrix.android.sdk.api.session.securestorage.KeyRef
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.api.util.awaitCallback
 import org.matrix.android.sdk.api.util.toBase64NoPadding
@@ -66,7 +66,7 @@ import java.util.UUID
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
 
-class CryptoTestHelper(private val testHelper: CommonTestHelper) {
+class CryptoTestHelper(val testHelper: CommonTestHelper) {
 
     private val messagesFromAlice: List<String> = listOf("0 - Hello I'm Alice!", "4 - Go!")
     private val messagesFromBob: List<String> = listOf("1 - Hello I'm Bob!", "2 - Isn't life grand?", "3 - Let's go to the opera.")
@@ -361,19 +361,19 @@ class CryptoTestHelper(private val testHelper: CommonTestHelper) {
             ssssService.storeSecret(
                     MASTER_KEY_SSSS_NAME,
                     session.cryptoService().crossSigningService().getCrossSigningPrivateKeys()!!.master!!,
-                    listOf(SharedSecretStorageService.KeyRef(keyInfo.keyId, keyInfo.keySpec))
+                    listOf(KeyRef(keyInfo.keyId, keyInfo.keySpec))
             )
 
             ssssService.storeSecret(
                     SELF_SIGNING_KEY_SSSS_NAME,
                     session.cryptoService().crossSigningService().getCrossSigningPrivateKeys()!!.selfSigned!!,
-                    listOf(SharedSecretStorageService.KeyRef(keyInfo.keyId, keyInfo.keySpec))
+                    listOf(KeyRef(keyInfo.keyId, keyInfo.keySpec))
             )
 
             ssssService.storeSecret(
                     USER_SIGNING_KEY_SSSS_NAME,
                     session.cryptoService().crossSigningService().getCrossSigningPrivateKeys()!!.user!!,
-                    listOf(SharedSecretStorageService.KeyRef(keyInfo.keyId, keyInfo.keySpec))
+                    listOf(KeyRef(keyInfo.keyId, keyInfo.keySpec))
             )
 
             // set up megolm backup
@@ -390,7 +390,7 @@ class CryptoTestHelper(private val testHelper: CommonTestHelper) {
                 ssssService.storeSecret(
                         KEYBACKUP_SECRET_SSSS_NAME,
                         secret,
-                        listOf(SharedSecretStorageService.KeyRef(keyInfo.keyId, keyInfo.keySpec))
+                        listOf(KeyRef(keyInfo.keyId, keyInfo.keySpec))
                 )
             }
         }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/MockOkHttpInterceptor.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/MockOkHttpInterceptor.kt
index b6d833a77c..6dfee2f18f 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/MockOkHttpInterceptor.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/MockOkHttpInterceptor.kt
@@ -73,9 +73,11 @@ class MockOkHttpInterceptor : TestInterceptor {
     /**
      * Simple rule that reply with the given body for any request that matches the match param
      */
-    class SimpleRule(match: String,
-                     private val code: Int = HttpsURLConnection.HTTP_OK,
-                     private val body: String = "{}") : Rule(match) {
+    class SimpleRule(
+            match: String,
+            private val code: Int = HttpsURLConnection.HTTP_OK,
+            private val body: String = "{}"
+    ) : Rule(match) {
 
         override fun process(originalRequest: Request): Response? {
             return Response.Builder()
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/RetryTestRule.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/RetryTestRule.kt
index b16ab98e6c..39f49a9ccc 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/RetryTestRule.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/RetryTestRule.kt
@@ -40,6 +40,9 @@ class RetryTestRule(val retryCount: Int = 3) : TestRule {
                 for (i in 0 until retryCount) {
                     try {
                         base.evaluate()
+                        if (i > 0) {
+                            println("Retried test $i times")
+                        }
                         return
                     } catch (t: Throwable) {
                         caughtThrowable = t
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixCallback.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixCallback.kt
index 9f6d6eb136..a007d684e3 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixCallback.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixCallback.kt
@@ -27,8 +27,10 @@ import java.util.concurrent.CountDownLatch
  * @param onlySuccessful true to fail if an error occurs. This is the default behavior
  * @param <T>
  */
-open class TestMatrixCallback<T>(private val countDownLatch: CountDownLatch,
-                                 private val onlySuccessful: Boolean = true) : MatrixCallback<T> {
+open class TestMatrixCallback<T>(
+        private val countDownLatch: CountDownLatch,
+        private val onlySuccessful: Boolean = true
+) : MatrixCallback<T> {
 
     @CallSuper
     override fun onSuccess(data: T) {
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixComponent.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixComponent.kt
index 525e168cf1..daf6b73313 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixComponent.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixComponent.kt
@@ -47,7 +47,9 @@ internal interface TestMatrixComponent : MatrixComponent {
 
     @Component.Factory
     interface Factory {
-        fun create(@BindsInstance context: Context,
-                   @BindsInstance matrixConfiguration: MatrixConfiguration): TestMatrixComponent
+        fun create(
+                @BindsInstance context: Context,
+                @BindsInstance matrixConfiguration: MatrixConfiguration
+        ): TestMatrixComponent
     }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/AttachmentEncryptionTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/AttachmentEncryptionTest.kt
index f5f585a1e0..17c7c28d81 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/AttachmentEncryptionTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/AttachmentEncryptionTest.kt
@@ -22,6 +22,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotEquals
 import org.junit.FixMethodOrder
+import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
@@ -40,6 +41,7 @@ import java.util.UUID
 @Suppress("SpellCheckingInspection")
 @RunWith(AndroidJUnit4::class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@Ignore
 class AttachmentEncryptionTest {
 
     private fun checkDecryption(input: String, encryptedFileInfo: EncryptedFileInfo): String {
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt
index cd6c146f03..dbc6929e34 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt
@@ -22,6 +22,7 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotEquals
 import org.junit.Assert.assertNull
 import org.junit.Before
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -37,6 +38,7 @@ import org.matrix.olm.OlmSession
 private const val DUMMY_DEVICE_KEY = "DeviceKey"
 
 @RunWith(AndroidJUnit4::class)
+@Ignore
 class CryptoStoreTest : InstrumentedTest {
 
     @get:Rule val rule = RetryTestRule(3)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/DecryptRedactedEventTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/DecryptRedactedEventTest.kt
new file mode 100644
index 0000000000..a48b45a1f5
--- /dev/null
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/DecryptRedactedEventTest.kt
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.crypto
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Assert
+import org.junit.FixMethodOrder
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.MethodSorters
+import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.room.getTimelineEvent
+import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest
+
+@RunWith(AndroidJUnit4::class)
+@FixMethodOrder(MethodSorters.JVM)
+class DecryptRedactedEventTest : InstrumentedTest {
+
+    @Test
+    fun doNotFailToDecryptRedactedEvent() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
+        val testData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(true)
+        val e2eRoomID = testData.roomId
+        val aliceSession = testData.firstSession
+        val bobSession = testData.secondSession!!
+
+        val roomALicePOV = aliceSession.getRoom(e2eRoomID)!!
+        val timelineEvent = testHelper.sendTextMessage(roomALicePOV, "Hello", 1).first()
+        val redactionReason = "Wrong Room"
+        roomALicePOV.sendService().redactEvent(timelineEvent.root, redactionReason)
+
+        // get the event from bob
+        testHelper.waitWithLatch {
+            testHelper.retryPeriodicallyWithLatch(it) {
+                bobSession.getRoom(e2eRoomID)?.getTimelineEvent(timelineEvent.eventId)?.root?.isRedacted() == true
+            }
+        }
+
+        val eventBobPov = bobSession.getRoom(e2eRoomID)?.getTimelineEvent(timelineEvent.eventId)!!
+
+        testHelper.runBlockingTest {
+            try {
+                val result = bobSession.cryptoService().decryptEvent(eventBobPov.root, "")
+                Assert.assertEquals(
+                        "Unexpected redacted reason",
+                        redactionReason,
+                        result.clearEvent.toModel<Event>()?.unsignedData?.redactedEvent?.content?.get("reason")
+                )
+                Assert.assertEquals(
+                        "Unexpected Redacted event id",
+                        timelineEvent.eventId,
+                        result.clearEvent.toModel<Event>()?.unsignedData?.redactedEvent?.redacts
+                )
+            } catch (failure: Throwable) {
+                Assert.fail("Should not throw when decrypting a redacted event")
+            }
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
index 552936971f..010383dab8 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
@@ -23,6 +23,7 @@ import org.amshove.kluent.fail
 import org.amshove.kluent.internal.assertEquals
 import org.junit.Assert
 import org.junit.FixMethodOrder
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -57,7 +58,8 @@ import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
 import org.matrix.android.sdk.common.CommonTestHelper
-import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest
+import org.matrix.android.sdk.common.CommonTestHelper.Companion.runSessionTest
 import org.matrix.android.sdk.common.RetryTestRule
 import org.matrix.android.sdk.common.SessionTestParams
 import org.matrix.android.sdk.common.TestConstants
@@ -68,6 +70,7 @@ import java.util.concurrent.CountDownLatch
 @RunWith(JUnit4::class)
 @FixMethodOrder(MethodSorters.JVM)
 @LargeTest
+@Ignore("This test fails with an unhandled exception thrown from a coroutine which terminates the entire test run.")
 class E2eeSanityTests : InstrumentedTest {
 
     @get:Rule val rule = RetryTestRule(3)
@@ -82,9 +85,7 @@ class E2eeSanityTests : InstrumentedTest {
      * Alice sends a new message, then check that the new one can be decrypted
      */
     @Test
-    fun testSendingE2EEMessages() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun testSendingE2EEMessages() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
 
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(true)
         val aliceSession = cryptoTestData.firstSession
@@ -198,21 +199,12 @@ class E2eeSanityTests : InstrumentedTest {
                 }
             }
         }
-
-        otherAccounts.forEach {
-            testHelper.signOutAndClose(it)
-        }
-        newAccount.forEach { testHelper.signOutAndClose(it) }
-
-        cryptoTestData.cleanUp(testHelper)
     }
 
     @Test
-    fun testKeyGossipingIsEnabledByDefault() {
-        val testHelper = CommonTestHelper(context())
+    fun testKeyGossipingIsEnabledByDefault() = runSessionTest(context()) { testHelper ->
         val session = testHelper.createAccount("alice", SessionTestParams(true))
         Assert.assertTrue("Key gossiping should be enabled by default", session.cryptoService().isKeyGossipingEnabled())
-        testHelper.signOutAndClose(session)
     }
 
     /**
@@ -230,9 +222,7 @@ class E2eeSanityTests : InstrumentedTest {
      * 9. Check that new session can decrypt
      */
     @Test
-    fun testBasicBackupImport() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun testBasicBackupImport() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
 
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(true)
         val aliceSession = cryptoTestData.firstSession
@@ -344,8 +334,6 @@ class E2eeSanityTests : InstrumentedTest {
 
         // ensure bob can now decrypt
         cryptoTestHelper.ensureCanDecrypt(sentEventIds, newBobSession, e2eRoomID, messagesText)
-
-        testHelper.signOutAndClose(newBobSession)
     }
 
     /**
@@ -353,9 +341,7 @@ class E2eeSanityTests : InstrumentedTest {
      * get them from an older one.
      */
     @Test
-    fun testSimpleGossip() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun testSimpleGossip() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
 
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(true)
         val aliceSession = cryptoTestData.firstSession
@@ -449,18 +435,13 @@ class E2eeSanityTests : InstrumentedTest {
         }
 
         cryptoTestHelper.ensureCanDecrypt(sentEventIds, newBobSession, e2eRoomID, messagesText)
-
-        cryptoTestData.cleanUp(testHelper)
-        testHelper.signOutAndClose(newBobSession)
     }
 
     /**
      * Test that if a better key is forwarded (lower index, it is then used)
      */
     @Test
-    fun testForwardBetterKey() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun testForwardBetterKey() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
 
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(true)
         val aliceSession = cryptoTestData.firstSession
@@ -576,10 +557,6 @@ class E2eeSanityTests : InstrumentedTest {
                 canDecryptFirst && canDecryptSecond
             }
         }
-
-        testHelper.signOutAndClose(aliceSession)
-        testHelper.signOutAndClose(bobSessionWithBetterKey)
-        testHelper.signOutAndClose(newBobSession)
     }
 
     private fun sendMessageInRoom(testHelper: CommonTestHelper, aliceRoomPOV: Room, text: String): String? {
@@ -610,9 +587,7 @@ class E2eeSanityTests : InstrumentedTest {
      * Test that if a better key is forwared (lower index, it is then used)
      */
     @Test
-    fun testSelfInteractiveVerificationAndGossip() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun testASelfInteractiveVerificationAndGossip() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
 
         val aliceSession = testHelper.createAccount("alice", SessionTestParams(true))
         cryptoTestHelper.bootstrapSecurity(aliceSession)
@@ -751,9 +726,6 @@ class E2eeSanityTests : InstrumentedTest {
                 aliceSession.cryptoService().keysBackupService().getKeyBackupRecoveryKeyInfo()!!.version,
                 aliceNewSession.cryptoService().keysBackupService().getKeyBackupRecoveryKeyInfo()!!.version
         )
-
-        testHelper.signOutAndClose(aliceSession)
-        testHelper.signOutAndClose(aliceNewSession)
     }
 
     private fun ensureMembersHaveJoined(testHelper: CommonTestHelper, aliceSession: Session, otherAccounts: List<Session>, e2eRoomID: String) {
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ExportEncryptionTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ExportEncryptionTest.kt
index c2d8f4fb35..bddb31fc92 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ExportEncryptionTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ExportEncryptionTest.kt
@@ -21,6 +21,7 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Assert.fail
 import org.junit.FixMethodOrder
+import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
@@ -30,6 +31,7 @@ import org.junit.runners.MethodSorters
  */
 @RunWith(AndroidJUnit4::class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@Ignore
 class ExportEncryptionTest {
 
     @Test
@@ -83,7 +85,8 @@ class ExportEncryptionTest {
     @Test
     fun checkExportDecrypt1() {
         val password = "password"
-        val input = "-----BEGIN MEGOLM SESSION DATA-----\nAXNhbHRzYWx0c2FsdHNhbHSIiIiIiIiIiIiIiIiIiIiIAAAACmIRUW2OjZ3L2l6j9h0lHlV3M2dx\n" + "cissyYBxjsfsAndErh065A8=\n-----END MEGOLM SESSION DATA-----"
+        val input = "-----BEGIN MEGOLM SESSION DATA-----\nAXNhbHRzYWx0c2FsdHNhbHSIiIiIiIiIiIiIiIiIiIiIAAAACmIRUW2OjZ3L2l6j9h0lHlV3M2dx\n" +
+                "cissyYBxjsfsAndErh065A8=\n-----END MEGOLM SESSION DATA-----"
         val expectedString = "plain"
 
         var decodedString: String? = null
@@ -103,7 +106,8 @@ class ExportEncryptionTest {
     @Test
     fun checkExportDecrypt2() {
         val password = "betterpassword"
-        val input = "-----BEGIN MEGOLM SESSION DATA-----\nAW1vcmVzYWx0bW9yZXNhbHT//////////wAAAAAAAAAAAAAD6KyBpe1Niv5M5NPm4ZATsJo5nghk\n" + "KYu63a0YQ5DRhUWEKk7CcMkrKnAUiZny\n-----END MEGOLM SESSION DATA-----"
+        val input = "-----BEGIN MEGOLM SESSION DATA-----\nAW1vcmVzYWx0bW9yZXNhbHT//////////wAAAAAAAAAAAAAD6KyBpe1Niv5M5NPm4ZATsJo5nghk\n" +
+                "KYu63a0YQ5DRhUWEKk7CcMkrKnAUiZny\n-----END MEGOLM SESSION DATA-----"
         val expectedString = "Hello, World"
 
         var decodedString: String? = null
@@ -123,7 +127,8 @@ class ExportEncryptionTest {
     @Test
     fun checkExportDecrypt3() {
         val password = "SWORDFISH"
-        val input = "-----BEGIN MEGOLM SESSION DATA-----\nAXllc3NhbHR5Z29vZG5lc3P//////////wAAAAAAAAAAAAAD6OIW+Je7gwvjd4kYrb+49gKCfExw\n" + "MgJBMD4mrhLkmgAngwR1pHjbWXaoGybtiAYr0moQ93GrBQsCzPbvl82rZhaXO3iH5uHo/RCEpOqp\nPgg29363BGR+/Ripq/VCLKGNbw==\n-----END MEGOLM SESSION DATA-----"
+        val input = "-----BEGIN MEGOLM SESSION DATA-----\nAXllc3NhbHR5Z29vZG5lc3P//////////wAAAAAAAAAAAAAD6OIW+Je7gwvjd4kYrb+49gKCfExw\n" +
+                "MgJBMD4mrhLkmgAngwR1pHjbWXaoGybtiAYr0moQ93GrBQsCzPbvl82rZhaXO3iH5uHo/RCEpOqp\nPgg29363BGR+/Ripq/VCLKGNbw==\n-----END MEGOLM SESSION DATA-----"
         val expectedString = "alphanumericallyalphanumericallyalphanumericallyalphanumerically"
 
         var decodedString: String? = null
@@ -202,7 +207,8 @@ class ExportEncryptionTest {
 
     @Test
     fun checkExportEncrypt4() {
-        val password = "passwordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpassword" + "passwordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpassword"
+        val password = "passwordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpassword" +
+                "passwordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpasswordpassword"
         val expectedString = "alphanumericallyalphanumericallyalphanumericallyalphanumerically"
         var decodedString: String? = null
 
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt
index 93aa78a305..e37ae5be86 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt
@@ -30,18 +30,14 @@ import org.matrix.android.sdk.api.session.events.model.content.EncryptedEventCon
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.getTimelineEvent
-import org.matrix.android.sdk.common.CommonTestHelper
-import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest
 
 @RunWith(AndroidJUnit4::class)
 @FixMethodOrder(MethodSorters.JVM)
 class PreShareKeysTest : InstrumentedTest {
 
-    private val testHelper = CommonTestHelper(context())
-    private val cryptoTestHelper = CryptoTestHelper(testHelper)
-
     @Test
-    fun ensure_outbound_session_happy_path() {
+    fun ensure_outbound_session_happy_path() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         val testData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(true)
         val e2eRoomID = testData.roomId
         val aliceSession = testData.firstSession
@@ -94,7 +90,5 @@ class PreShareKeysTest : InstrumentedTest {
                 bobSession.getRoom(e2eRoomID)?.getTimelineEvent(sentEvent.eventId)?.root?.getClearType() == EventType.MESSAGE
             }
         }
-
-        testData.cleanUp(testHelper)
     }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt
index 0f3a4b4181..e8a474a54a 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt
@@ -21,6 +21,7 @@ import org.amshove.kluent.shouldBe
 import org.junit.Assert
 import org.junit.Before
 import org.junit.FixMethodOrder
+import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
@@ -38,8 +39,7 @@ import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
-import org.matrix.android.sdk.common.CommonTestHelper
-import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest
 import org.matrix.android.sdk.common.TestConstants
 import org.matrix.android.sdk.internal.crypto.model.OlmSessionWrapper
 import org.matrix.android.sdk.internal.crypto.store.db.deserializeFromRealm
@@ -60,11 +60,10 @@ import kotlin.coroutines.resume
  */
 @RunWith(AndroidJUnit4::class)
 @FixMethodOrder(MethodSorters.JVM)
+@Ignore
 class UnwedgingTest : InstrumentedTest {
 
     private lateinit var messagesReceivedByBob: List<TimelineEvent>
-    private val testHelper = CommonTestHelper(context())
-    private val cryptoTestHelper = CryptoTestHelper(testHelper)
 
     @Before
     fun init() {
@@ -85,7 +84,7 @@ class UnwedgingTest : InstrumentedTest {
      * -> This is automatically fixed after SDKs restarted the olm session
      */
     @Test
-    fun testUnwedging() {
+    fun testUnwedging() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom()
 
         val aliceSession = cryptoTestData.firstSession
@@ -240,8 +239,6 @@ class UnwedgingTest : InstrumentedTest {
         }
 
         bobTimeline.dispose()
-
-        cryptoTestData.cleanUp(testHelper)
     }
 
     private fun createEventListener(latch: CountDownLatch, expectedNumberOfMessages: Int): Timeline.Listener {
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
index abcf1714b8..8cb38ddc87 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
@@ -25,6 +25,7 @@ import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
 import org.junit.Assert.fail
 import org.junit.FixMethodOrder
+import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
@@ -37,8 +38,8 @@ import org.matrix.android.sdk.api.session.crypto.crosssigning.isCrossSignedVerif
 import org.matrix.android.sdk.api.session.crypto.crosssigning.isVerified
 import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
 import org.matrix.android.sdk.api.session.crypto.model.MXUsersDevicesMap
-import org.matrix.android.sdk.common.CommonTestHelper
-import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest
+import org.matrix.android.sdk.common.CommonTestHelper.Companion.runSessionTest
 import org.matrix.android.sdk.common.SessionTestParams
 import org.matrix.android.sdk.common.TestConstants
 import kotlin.coroutines.Continuation
@@ -47,13 +48,11 @@ import kotlin.coroutines.resume
 @RunWith(AndroidJUnit4::class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @LargeTest
+@Ignore
 class XSigningTest : InstrumentedTest {
 
-    private val testHelper = CommonTestHelper(context())
-    private val cryptoTestHelper = CryptoTestHelper(testHelper)
-
     @Test
-    fun test_InitializeAndStoreKeys() {
+    fun test_InitializeAndStoreKeys() = runSessionTest(context()) { testHelper ->
         val aliceSession = testHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(true))
 
         testHelper.doSync<Unit> {
@@ -87,7 +86,7 @@ class XSigningTest : InstrumentedTest {
     }
 
     @Test
-    fun test_CrossSigningCheckBobSeesTheKeys() {
+    fun test_CrossSigningCheckBobSeesTheKeys() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom()
 
         val aliceSession = cryptoTestData.firstSession
@@ -137,12 +136,10 @@ class XSigningTest : InstrumentedTest {
         )
 
         assertFalse("Bob keys from alice pov should not be trusted", bobKeysFromAlicePOV.isTrusted())
-
-        cryptoTestData.cleanUp(testHelper)
     }
 
     @Test
-    fun test_CrossSigningTestAliceTrustBobNewDevice() {
+    fun test_CrossSigningTestAliceTrustBobNewDevice() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom()
 
         val aliceSession = cryptoTestData.firstSession
@@ -216,9 +213,5 @@ class XSigningTest : InstrumentedTest {
 
         val result = aliceSession.cryptoService().crossSigningService().checkDeviceTrust(bobUserId, bobSecondDeviceId, null)
         assertTrue("Bob second device should be trusted from alice POV", result.isCrossSignedVerified())
-
-        testHelper.signOutAndClose(aliceSession)
-        testHelper.signOutAndClose(bobSession)
-        testHelper.signOutAndClose(bobSession2)
     }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt
index 85b6c21df3..5f26fda946 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt
@@ -35,6 +35,7 @@ import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
 import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest
 import org.matrix.android.sdk.common.CryptoTestHelper
 import java.util.concurrent.CountDownLatch
 
@@ -42,35 +43,36 @@ import java.util.concurrent.CountDownLatch
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 class EncryptionTest : InstrumentedTest {
 
-    private val testHelper = CommonTestHelper(context())
-    private val cryptoTestHelper = CryptoTestHelper(testHelper)
-
     @Test
     fun test_EncryptionEvent() {
-        performTest(roomShouldBeEncrypted = false) { room ->
-            // Send an encryption Event as an Event (and not as a state event)
-            room.sendService().sendEvent(
-                    eventType = EventType.STATE_ROOM_ENCRYPTION,
-                    content = EncryptionEventContent(algorithm = MXCRYPTO_ALGORITHM_MEGOLM).toContent()
-            )
-        }
-    }
-
-    @Test
-    fun test_EncryptionStateEvent() {
-        performTest(roomShouldBeEncrypted = true) { room ->
-            runBlocking {
-                // Send an encryption Event as a State Event
-                room.stateService().sendStateEvent(
+        runCryptoTest(context()) { cryptoTestHelper, testHelper ->
+            performTest(cryptoTestHelper, testHelper, roomShouldBeEncrypted = false) { room ->
+                // Send an encryption Event as an Event (and not as a state event)
+                room.sendService().sendEvent(
                         eventType = EventType.STATE_ROOM_ENCRYPTION,
-                        stateKey = "",
-                        body = EncryptionEventContent(algorithm = MXCRYPTO_ALGORITHM_MEGOLM).toContent()
+                        content = EncryptionEventContent(algorithm = MXCRYPTO_ALGORITHM_MEGOLM).toContent()
                 )
             }
         }
     }
 
-    private fun performTest(roomShouldBeEncrypted: Boolean, action: (Room) -> Unit) {
+    @Test
+    fun test_EncryptionStateEvent() {
+        runCryptoTest(context()) { cryptoTestHelper, testHelper ->
+            performTest(cryptoTestHelper, testHelper, roomShouldBeEncrypted = true) { room ->
+                runBlocking {
+                    // Send an encryption Event as a State Event
+                    room.stateService().sendStateEvent(
+                            eventType = EventType.STATE_ROOM_ENCRYPTION,
+                            stateKey = "",
+                            body = EncryptionEventContent(algorithm = MXCRYPTO_ALGORITHM_MEGOLM).toContent()
+                    )
+                }
+            }
+        }
+    }
+
+    private fun performTest(cryptoTestHelper: CryptoTestHelper, testHelper: CommonTestHelper, roomShouldBeEncrypted: Boolean, action: (Room) -> Unit) {
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceInARoom(encryptedRoom = false)
 
         val aliceSession = cryptoTestData.firstSession
@@ -109,6 +111,5 @@ class EncryptionTest : InstrumentedTest {
             room.roomCryptoService().isEncrypted() shouldBe roomShouldBeEncrypted
             it.countDown()
         }
-        cryptoTestData.cleanUp(testHelper)
     }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
index 895f95aeac..7bb53e139c 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
@@ -25,6 +25,7 @@ import org.amshove.kluent.internal.assertEquals
 import org.junit.Assert
 import org.junit.Assert.assertNull
 import org.junit.FixMethodOrder
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -41,8 +42,7 @@ import org.matrix.android.sdk.api.session.room.getTimelineEvent
 import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
-import org.matrix.android.sdk.common.CommonTestHelper
-import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest
 import org.matrix.android.sdk.common.RetryTestRule
 import org.matrix.android.sdk.common.SessionTestParams
 import org.matrix.android.sdk.common.TestConstants
@@ -51,14 +51,13 @@ import org.matrix.android.sdk.mustFail
 @RunWith(AndroidJUnit4::class)
 @FixMethodOrder(MethodSorters.JVM)
 @LargeTest
+@Ignore
 class KeyShareTests : InstrumentedTest {
 
     @get:Rule val rule = RetryTestRule(3)
 
     @Test
-    fun test_DoNotSelfShareIfNotTrusted() {
-        val commonTestHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
+    fun test_DoNotSelfShareIfNotTrusted() = runCryptoTest(context()) { cryptoTestHelper, commonTestHelper ->
 
         val aliceSession = commonTestHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(true))
         Log.v("TEST", "=======> AliceSession 1 is ${aliceSession.sessionParams.deviceId}")
@@ -194,9 +193,7 @@ class KeyShareTests : InstrumentedTest {
      * if the key was originally shared with him
      */
     @Test
-    fun test_reShareIfWasIntendedToBeShared() {
-        val commonTestHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
+    fun test_reShareIfWasIntendedToBeShared() = runCryptoTest(context()) { cryptoTestHelper, commonTestHelper ->
 
         val testData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(true)
         val aliceSession = testData.firstSession
@@ -227,9 +224,7 @@ class KeyShareTests : InstrumentedTest {
      * if the key was originally shared with him
      */
     @Test
-    fun test_reShareToUnverifiedIfWasIntendedToBeShared() {
-        val commonTestHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
+    fun test_reShareToUnverifiedIfWasIntendedToBeShared() = runCryptoTest(context()) { cryptoTestHelper, commonTestHelper ->
 
         val testData = cryptoTestHelper.doE2ETestWithAliceInARoom(true)
         val aliceSession = testData.firstSession
@@ -266,9 +261,7 @@ class KeyShareTests : InstrumentedTest {
      * Tests that keys reshared with own verified session are done from the earliest known index
      */
     @Test
-    fun test_reShareFromTheEarliestKnownIndexWithOwnVerifiedSession() {
-        val commonTestHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
+    fun test_reShareFromTheEarliestKnownIndexWithOwnVerifiedSession() = runCryptoTest(context()) { cryptoTestHelper, commonTestHelper ->
 
         val testData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(true)
         val aliceSession = testData.firstSession
@@ -388,10 +381,7 @@ class KeyShareTests : InstrumentedTest {
      * Tests that we don't cancel a request to early on first forward if the index is not good enough
      */
     @Test
-    fun test_dontCancelToEarly() {
-        val commonTestHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
-
+    fun test_dontCancelToEarly() = runCryptoTest(context()) { cryptoTestHelper, commonTestHelper ->
         val testData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(true)
         val aliceSession = testData.firstSession
         val bobSession = testData.secondSession!!
@@ -434,7 +424,7 @@ class KeyShareTests : InstrumentedTest {
 
         // /!\ Stop initial alice session syncing so that it can't reply
         aliceSession.cryptoService().enableKeyGossiping(false)
-        aliceSession.stopSync()
+        aliceSession.syncService().stopSync()
 
         // Let's now try to request
         aliceNewSession.cryptoService().reRequestRoomKeyForEvent(sentEvents.first().root)
@@ -442,7 +432,7 @@ class KeyShareTests : InstrumentedTest {
         // Should get a reply from bob and not from alice
         commonTestHelper.waitWithLatch { latch ->
             commonTestHelper.retryPeriodicallyWithLatch(latch) {
-              //  Log.d("#TEST", "outgoing key requests :${aliceNewSession.cryptoService().getOutgoingRoomKeyRequests().joinToString { it.sessionId ?: "?" }}")
+                //  Log.d("#TEST", "outgoing key requests :${aliceNewSession.cryptoService().getOutgoingRoomKeyRequests().joinToString { it.sessionId ?: "?" }}")
                 val outgoing = aliceNewSession.cryptoService().getOutgoingRoomKeyRequests().firstOrNull { it.sessionId == sentEventMegolmSession }
                 val bobReply = outgoing?.results?.firstOrNull { it.userId == bobSession.myUserId }
                 val result = bobReply?.result
@@ -457,7 +447,7 @@ class KeyShareTests : InstrumentedTest {
 
         // let's wake up alice
         aliceSession.cryptoService().enableKeyGossiping(true)
-        aliceSession.startSync(true)
+        aliceSession.syncService().startSync(true)
 
         // We should now get a reply from first session
         commonTestHelper.waitWithLatch { latch ->
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
index 13133b726c..ae420a09b3 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
@@ -21,6 +21,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
 import org.junit.Assert
 import org.junit.FixMethodOrder
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -36,8 +37,7 @@ import org.matrix.android.sdk.api.session.events.model.content.WithHeldCode
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.getTimelineEvent
-import org.matrix.android.sdk.common.CommonTestHelper
-import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest
 import org.matrix.android.sdk.common.MockOkHttpInterceptor
 import org.matrix.android.sdk.common.RetryTestRule
 import org.matrix.android.sdk.common.SessionTestParams
@@ -47,14 +47,13 @@ import org.matrix.android.sdk.mustFail
 @RunWith(AndroidJUnit4::class)
 @FixMethodOrder(MethodSorters.JVM)
 @LargeTest
+@Ignore
 class WithHeldTests : InstrumentedTest {
 
     @get:Rule val rule = RetryTestRule(3)
 
     @Test
-    fun test_WithHeldUnverifiedReason() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun test_WithHeldUnverifiedReason() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
 
         // =============================
         // ARRANGE
@@ -153,16 +152,10 @@ class WithHeldTests : InstrumentedTest {
                 bobUnverifiedSession.cryptoService().decryptEvent(eventBobPOV.root, "")
             }
         }
-
-        testHelper.signOutAndClose(aliceSession)
-        testHelper.signOutAndClose(bobSession)
-        testHelper.signOutAndClose(bobUnverifiedSession)
     }
 
     @Test
-    fun test_WithHeldNoOlm() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun test_WithHeldNoOlm() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
 
         val testData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom()
         val aliceSession = testData.firstSession
@@ -239,14 +232,10 @@ class WithHeldTests : InstrumentedTest {
         Assert.assertEquals("Alice should have marked bob's device for this session", 1, chainIndex2)
 
         aliceInterceptor.clearRules()
-        testData.cleanUp(testHelper)
-        testHelper.signOutAndClose(bobSecondSession)
     }
 
     @Test
-    fun test_WithHeldKeyRequest() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun test_WithHeldKeyRequest() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
 
         val testData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom()
         val aliceSession = testData.firstSession
@@ -293,8 +282,5 @@ class WithHeldTests : InstrumentedTest {
                 wc?.code == WithHeldCode.UNAUTHORISED
             }
         }
-
-        testHelper.signOutAndClose(aliceSession)
-        testHelper.signOutAndClose(bobSecondSession)
     }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt
index 9136272b1e..fb498e0de5 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt
@@ -24,6 +24,8 @@ import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
 import org.junit.FixMethodOrder
+import org.junit.Ignore
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
@@ -43,8 +45,9 @@ import org.matrix.android.sdk.api.session.crypto.keysbackup.MegolmBackupCreation
 import org.matrix.android.sdk.api.session.crypto.keysbackup.toKeysVersionResult
 import org.matrix.android.sdk.api.session.crypto.model.ImportRoomKeysResult
 import org.matrix.android.sdk.api.session.getRoom
-import org.matrix.android.sdk.common.CommonTestHelper
-import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest
+import org.matrix.android.sdk.common.CommonTestHelper.Companion.runSessionTest
+import org.matrix.android.sdk.common.RetryTestRule
 import org.matrix.android.sdk.common.TestConstants
 import org.matrix.android.sdk.common.TestMatrixCallback
 import java.util.Collections
@@ -53,17 +56,18 @@ import java.util.concurrent.CountDownLatch
 @RunWith(AndroidJUnit4::class)
 @FixMethodOrder(MethodSorters.JVM)
 @LargeTest
+@Ignore
 class KeysBackupTest : InstrumentedTest {
 
+    @get:Rule val rule = RetryTestRule(3)
+
     /**
      * - From doE2ETestWithAliceAndBobInARoomWithEncryptedMessages, we should have no backed up keys
      * - Check backup keys after having marked one as backed up
      * - Reset keys backup markers
      */
     @Test
-    fun roomKeysTest_testBackupStore_ok() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun roomKeysTest_testBackupStore_ok() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
 
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoomWithEncryptedMessages()
 
@@ -102,8 +106,7 @@ class KeysBackupTest : InstrumentedTest {
      * Check that prepareKeysBackupVersionWithPassword returns valid data
      */
     @Test
-    fun prepareKeysBackupVersionTest() {
-        val testHelper = CommonTestHelper(context())
+    fun prepareKeysBackupVersionTest() = runSessionTest(context()) { testHelper ->
 
         val bobSession = testHelper.createAccount(TestConstants.USER_BOB, KeysBackupTestConstants.defaultSessionParams)
 
@@ -113,7 +116,7 @@ class KeysBackupTest : InstrumentedTest {
 
         val stateObserver = StateObserver(keysBackup)
 
-        assertFalse(keysBackup.isEnabled)
+        assertFalse(keysBackup.isEnabled())
 
         val megolmBackupCreationInfo = testHelper.doSync<MegolmBackupCreationInfo> {
             keysBackup.prepareKeysBackupVersion(null, null, it)
@@ -125,16 +128,13 @@ class KeysBackupTest : InstrumentedTest {
         assertNotNull(megolmBackupCreationInfo.recoveryKey)
 
         stateObserver.stopAndCheckStates(null)
-        testHelper.signOutAndClose(bobSession)
     }
 
     /**
      * Test creating a keys backup version and check that createKeysBackupVersion() returns valid data
      */
     @Test
-    fun createKeysBackupVersionTest() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun createKeysBackupVersionTest() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
 
         val bobSession = testHelper.createAccount(TestConstants.USER_BOB, KeysBackupTestConstants.defaultSessionParams)
         cryptoTestHelper.initializeCrossSigning(bobSession)
@@ -143,13 +143,13 @@ class KeysBackupTest : InstrumentedTest {
 
         val stateObserver = StateObserver(keysBackup)
 
-        assertFalse(keysBackup.isEnabled)
+        assertFalse(keysBackup.isEnabled())
 
         val megolmBackupCreationInfo = testHelper.doSync<MegolmBackupCreationInfo> {
             keysBackup.prepareKeysBackupVersion(null, null, it)
         }
 
-        assertFalse(keysBackup.isEnabled)
+        assertFalse(keysBackup.isEnabled())
 
         // Create the version
         val version = testHelper.doSync<KeysVersion> {
@@ -157,7 +157,7 @@ class KeysBackupTest : InstrumentedTest {
         }
 
         // Backup must be enable now
-        assertTrue(keysBackup.isEnabled)
+        assertTrue(keysBackup.isEnabled())
 
         // Check that it's signed with MSK
         val versionResult = testHelper.doSync<KeysVersionResult?> {
@@ -193,7 +193,6 @@ class KeysBackupTest : InstrumentedTest {
                 }
 
         stateObserver.stopAndCheckStates(null)
-        testHelper.signOutAndClose(bobSession)
     }
 
     /**
@@ -201,9 +200,7 @@ class KeysBackupTest : InstrumentedTest {
      * - Check the backup completes
      */
     @Test
-    fun backupAfterCreateKeysBackupVersionTest() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun backupAfterCreateKeysBackupVersionTest() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         val keysBackupTestHelper = KeysBackupTestHelper(testHelper, cryptoTestHelper)
 
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoomWithEncryptedMessages()
@@ -238,16 +235,13 @@ class KeysBackupTest : InstrumentedTest {
                         KeysBackupState.ReadyToBackUp
                 )
         )
-        cryptoTestData.cleanUp(testHelper)
     }
 
     /**
      * Check that backupAllGroupSessions() returns valid data
      */
     @Test
-    fun backupAllGroupSessionsTest() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun backupAllGroupSessionsTest() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         val keysBackupTestHelper = KeysBackupTestHelper(testHelper, cryptoTestHelper)
 
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoomWithEncryptedMessages()
@@ -281,7 +275,6 @@ class KeysBackupTest : InstrumentedTest {
         assertEquals("All keys must have been marked as backed up", nbOfKeys, backedUpKeys)
 
         stateObserver.stopAndCheckStates(null)
-        cryptoTestData.cleanUp(testHelper)
     }
 
     /**
@@ -293,9 +286,7 @@ class KeysBackupTest : InstrumentedTest {
      * - Compare the decrypted megolm key with the original one
      */
     @Test
-    fun testEncryptAndDecryptKeysBackupData() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun testEncryptAndDecryptKeysBackupData() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         val keysBackupTestHelper = KeysBackupTestHelper(testHelper, cryptoTestHelper)
 
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoomWithEncryptedMessages()
@@ -330,7 +321,6 @@ class KeysBackupTest : InstrumentedTest {
         keysBackupTestHelper.assertKeysEquals(session.exportKeys(), sessionData)
 
         stateObserver.stopAndCheckStates(null)
-        cryptoTestData.cleanUp(testHelper)
     }
 
     /**
@@ -340,9 +330,7 @@ class KeysBackupTest : InstrumentedTest {
      * - Restore must be successful
      */
     @Test
-    fun restoreKeysBackupTest() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun restoreKeysBackupTest() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         val keysBackupTestHelper = KeysBackupTestHelper(testHelper, cryptoTestHelper)
 
         val testData = keysBackupTestHelper.createKeysBackupScenarioWithPassword(null)
@@ -428,9 +416,7 @@ class KeysBackupTest : InstrumentedTest {
      * - It must be trusted and must have with 2 signatures now
      */
     @Test
-    fun trustKeyBackupVersionTest() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun trustKeyBackupVersionTest() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         val keysBackupTestHelper = KeysBackupTestHelper(testHelper, cryptoTestHelper)
 
         // - Do an e2e backup to the homeserver with a recovery key
@@ -441,8 +427,8 @@ class KeysBackupTest : InstrumentedTest {
 
         // - The new device must see the previous backup as not trusted
         assertNotNull(testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion)
-        assertFalse(testData.aliceSession2.cryptoService().keysBackupService().isEnabled)
-        assertEquals(KeysBackupState.NotTrusted, testData.aliceSession2.cryptoService().keysBackupService().state)
+        assertFalse(testData.aliceSession2.cryptoService().keysBackupService().isEnabled())
+        assertEquals(KeysBackupState.NotTrusted, testData.aliceSession2.cryptoService().keysBackupService().getState())
 
         // - Trust the backup from the new device
         testHelper.doSync<Unit> {
@@ -458,7 +444,7 @@ class KeysBackupTest : InstrumentedTest {
 
         // - Backup must be enabled on the new device, on the same version
         assertEquals(testData.prepareKeysBackupDataResult.version, testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion?.version)
-        assertTrue(testData.aliceSession2.cryptoService().keysBackupService().isEnabled)
+        assertTrue(testData.aliceSession2.cryptoService().keysBackupService().isEnabled())
 
         // - Retrieve the last version from the server
         val keysVersionResult = testHelper.doSync<KeysBackupLastVersionResult> {
@@ -477,7 +463,6 @@ class KeysBackupTest : InstrumentedTest {
         assertEquals(2, keysBackupVersionTrust.signatures.size)
 
         stateObserver.stopAndCheckStates(null)
-        testData.cleanUp(testHelper)
     }
 
     /**
@@ -491,9 +476,7 @@ class KeysBackupTest : InstrumentedTest {
      * - It must be trusted and must have with 2 signatures now
      */
     @Test
-    fun trustKeyBackupVersionWithRecoveryKeyTest() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun trustKeyBackupVersionWithRecoveryKeyTest() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         val keysBackupTestHelper = KeysBackupTestHelper(testHelper, cryptoTestHelper)
 
         // - Do an e2e backup to the homeserver with a recovery key
@@ -504,8 +487,8 @@ class KeysBackupTest : InstrumentedTest {
 
         // - The new device must see the previous backup as not trusted
         assertNotNull(testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion)
-        assertFalse(testData.aliceSession2.cryptoService().keysBackupService().isEnabled)
-        assertEquals(KeysBackupState.NotTrusted, testData.aliceSession2.cryptoService().keysBackupService().state)
+        assertFalse(testData.aliceSession2.cryptoService().keysBackupService().isEnabled())
+        assertEquals(KeysBackupState.NotTrusted, testData.aliceSession2.cryptoService().keysBackupService().getState())
 
         // - Trust the backup from the new device with the recovery key
         testHelper.doSync<Unit> {
@@ -521,7 +504,7 @@ class KeysBackupTest : InstrumentedTest {
 
         // - Backup must be enabled on the new device, on the same version
         assertEquals(testData.prepareKeysBackupDataResult.version, testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion?.version)
-        assertTrue(testData.aliceSession2.cryptoService().keysBackupService().isEnabled)
+        assertTrue(testData.aliceSession2.cryptoService().keysBackupService().isEnabled())
 
         // - Retrieve the last version from the server
         val keysVersionResult = testHelper.doSync<KeysBackupLastVersionResult> {
@@ -540,7 +523,6 @@ class KeysBackupTest : InstrumentedTest {
         assertEquals(2, keysBackupVersionTrust.signatures.size)
 
         stateObserver.stopAndCheckStates(null)
-        testData.cleanUp(testHelper)
     }
 
     /**
@@ -552,9 +534,7 @@ class KeysBackupTest : InstrumentedTest {
      * - The backup must still be untrusted and disabled
      */
     @Test
-    fun trustKeyBackupVersionWithWrongRecoveryKeyTest() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun trustKeyBackupVersionWithWrongRecoveryKeyTest() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         val keysBackupTestHelper = KeysBackupTestHelper(testHelper, cryptoTestHelper)
 
         // - Do an e2e backup to the homeserver with a recovery key
@@ -565,8 +545,8 @@ class KeysBackupTest : InstrumentedTest {
 
         // - The new device must see the previous backup as not trusted
         assertNotNull(testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion)
-        assertFalse(testData.aliceSession2.cryptoService().keysBackupService().isEnabled)
-        assertEquals(KeysBackupState.NotTrusted, testData.aliceSession2.cryptoService().keysBackupService().state)
+        assertFalse(testData.aliceSession2.cryptoService().keysBackupService().isEnabled())
+        assertEquals(KeysBackupState.NotTrusted, testData.aliceSession2.cryptoService().keysBackupService().getState())
 
         // - Try to trust the backup from the new device with a wrong recovery key
         val latch = CountDownLatch(1)
@@ -579,11 +559,10 @@ class KeysBackupTest : InstrumentedTest {
 
         // - The new device must still see the previous backup as not trusted
         assertNotNull(testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion)
-        assertFalse(testData.aliceSession2.cryptoService().keysBackupService().isEnabled)
-        assertEquals(KeysBackupState.NotTrusted, testData.aliceSession2.cryptoService().keysBackupService().state)
+        assertFalse(testData.aliceSession2.cryptoService().keysBackupService().isEnabled())
+        assertEquals(KeysBackupState.NotTrusted, testData.aliceSession2.cryptoService().keysBackupService().getState())
 
         stateObserver.stopAndCheckStates(null)
-        testData.cleanUp(testHelper)
     }
 
     /**
@@ -597,9 +576,7 @@ class KeysBackupTest : InstrumentedTest {
      * - It must be trusted and must have with 2 signatures now
      */
     @Test
-    fun trustKeyBackupVersionWithPasswordTest() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun trustKeyBackupVersionWithPasswordTest() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         val keysBackupTestHelper = KeysBackupTestHelper(testHelper, cryptoTestHelper)
 
         val password = "Password"
@@ -612,8 +589,8 @@ class KeysBackupTest : InstrumentedTest {
 
         // - The new device must see the previous backup as not trusted
         assertNotNull(testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion)
-        assertFalse(testData.aliceSession2.cryptoService().keysBackupService().isEnabled)
-        assertEquals(KeysBackupState.NotTrusted, testData.aliceSession2.cryptoService().keysBackupService().state)
+        assertFalse(testData.aliceSession2.cryptoService().keysBackupService().isEnabled())
+        assertEquals(KeysBackupState.NotTrusted, testData.aliceSession2.cryptoService().keysBackupService().getState())
 
         // - Trust the backup from the new device with the password
         testHelper.doSync<Unit> {
@@ -629,7 +606,7 @@ class KeysBackupTest : InstrumentedTest {
 
         // - Backup must be enabled on the new device, on the same version
         assertEquals(testData.prepareKeysBackupDataResult.version, testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion?.version)
-        assertTrue(testData.aliceSession2.cryptoService().keysBackupService().isEnabled)
+        assertTrue(testData.aliceSession2.cryptoService().keysBackupService().isEnabled())
 
         // - Retrieve the last version from the server
         val keysVersionResult = testHelper.doSync<KeysBackupLastVersionResult> {
@@ -648,7 +625,6 @@ class KeysBackupTest : InstrumentedTest {
         assertEquals(2, keysBackupVersionTrust.signatures.size)
 
         stateObserver.stopAndCheckStates(null)
-        testData.cleanUp(testHelper)
     }
 
     /**
@@ -660,9 +636,7 @@ class KeysBackupTest : InstrumentedTest {
      * - The backup must still be untrusted and disabled
      */
     @Test
-    fun trustKeyBackupVersionWithWrongPasswordTest() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun trustKeyBackupVersionWithWrongPasswordTest() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         val keysBackupTestHelper = KeysBackupTestHelper(testHelper, cryptoTestHelper)
 
         val password = "Password"
@@ -676,8 +650,8 @@ class KeysBackupTest : InstrumentedTest {
 
         // - The new device must see the previous backup as not trusted
         assertNotNull(testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion)
-        assertFalse(testData.aliceSession2.cryptoService().keysBackupService().isEnabled)
-        assertEquals(KeysBackupState.NotTrusted, testData.aliceSession2.cryptoService().keysBackupService().state)
+        assertFalse(testData.aliceSession2.cryptoService().keysBackupService().isEnabled())
+        assertEquals(KeysBackupState.NotTrusted, testData.aliceSession2.cryptoService().keysBackupService().getState())
 
         // - Try to trust the backup from the new device with a wrong password
         val latch = CountDownLatch(1)
@@ -690,11 +664,10 @@ class KeysBackupTest : InstrumentedTest {
 
         // - The new device must still see the previous backup as not trusted
         assertNotNull(testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion)
-        assertFalse(testData.aliceSession2.cryptoService().keysBackupService().isEnabled)
-        assertEquals(KeysBackupState.NotTrusted, testData.aliceSession2.cryptoService().keysBackupService().state)
+        assertFalse(testData.aliceSession2.cryptoService().keysBackupService().isEnabled())
+        assertEquals(KeysBackupState.NotTrusted, testData.aliceSession2.cryptoService().keysBackupService().getState())
 
         stateObserver.stopAndCheckStates(null)
-        testData.cleanUp(testHelper)
     }
 
     /**
@@ -704,9 +677,7 @@ class KeysBackupTest : InstrumentedTest {
      * - It must fail
      */
     @Test
-    fun restoreKeysBackupWithAWrongRecoveryKeyTest() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun restoreKeysBackupWithAWrongRecoveryKeyTest() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         val keysBackupTestHelper = KeysBackupTestHelper(testHelper, cryptoTestHelper)
 
         val testData = keysBackupTestHelper.createKeysBackupScenarioWithPassword(null)
@@ -730,8 +701,6 @@ class KeysBackupTest : InstrumentedTest {
 
         // onSuccess may not have been called
         assertNull(importRoomKeysResult)
-
-        testData.cleanUp(testHelper)
     }
 
     /**
@@ -741,9 +710,7 @@ class KeysBackupTest : InstrumentedTest {
      * - Restore must be successful
      */
     @Test
-    fun testBackupWithPassword() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun testBackupWithPassword() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         val keysBackupTestHelper = KeysBackupTestHelper(testHelper, cryptoTestHelper)
 
         val password = "password"
@@ -790,8 +757,6 @@ class KeysBackupTest : InstrumentedTest {
         assertEquals(100, (steps[104] as StepProgressListener.Step.ImportingKey).progress)
 
         keysBackupTestHelper.checkRestoreSuccess(testData, importRoomKeysResult.totalNumberOfKeys, importRoomKeysResult.successfullyNumberOfImportedKeys)
-
-        testData.cleanUp(testHelper)
     }
 
     /**
@@ -801,9 +766,7 @@ class KeysBackupTest : InstrumentedTest {
      * - It must fail
      */
     @Test
-    fun restoreKeysBackupWithAWrongPasswordTest() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun restoreKeysBackupWithAWrongPasswordTest() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         val keysBackupTestHelper = KeysBackupTestHelper(testHelper, cryptoTestHelper)
 
         val password = "password"
@@ -830,8 +793,6 @@ class KeysBackupTest : InstrumentedTest {
 
         // onSuccess may not have been called
         assertNull(importRoomKeysResult)
-
-        testData.cleanUp(testHelper)
     }
 
     /**
@@ -841,9 +802,7 @@ class KeysBackupTest : InstrumentedTest {
      * - Restore must be successful
      */
     @Test
-    fun testUseRecoveryKeyToRestoreAPasswordBasedKeysBackup() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun testUseRecoveryKeyToRestoreAPasswordBasedKeysBackup() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         val keysBackupTestHelper = KeysBackupTestHelper(testHelper, cryptoTestHelper)
 
         val password = "password"
@@ -863,8 +822,6 @@ class KeysBackupTest : InstrumentedTest {
         }
 
         keysBackupTestHelper.checkRestoreSuccess(testData, importRoomKeysResult.totalNumberOfKeys, importRoomKeysResult.successfullyNumberOfImportedKeys)
-
-        testData.cleanUp(testHelper)
     }
 
     /**
@@ -874,9 +831,7 @@ class KeysBackupTest : InstrumentedTest {
      * - It must fail
      */
     @Test
-    fun testUsePasswordToRestoreARecoveryKeyBasedKeysBackup() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun testUsePasswordToRestoreARecoveryKeyBasedKeysBackup() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         val keysBackupTestHelper = KeysBackupTestHelper(testHelper, cryptoTestHelper)
 
         val testData = keysBackupTestHelper.createKeysBackupScenarioWithPassword(null)
@@ -900,8 +855,6 @@ class KeysBackupTest : InstrumentedTest {
 
         // onSuccess may not have been called
         assertNull(importRoomKeysResult)
-
-        testData.cleanUp(testHelper)
     }
 
     /**
@@ -909,9 +862,7 @@ class KeysBackupTest : InstrumentedTest {
      * - Check the returned KeysVersionResult is trusted
      */
     @Test
-    fun testIsKeysBackupTrusted() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun testIsKeysBackupTrusted() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         val keysBackupTestHelper = KeysBackupTestHelper(testHelper, cryptoTestHelper)
 
         // - Create a backup version
@@ -945,7 +896,6 @@ class KeysBackupTest : InstrumentedTest {
         assertEquals(signature.device!!.deviceId, cryptoTestData.firstSession.sessionParams.deviceId)
 
         stateObserver.stopAndCheckStates(null)
-        cryptoTestData.cleanUp(testHelper)
     }
 
     /**
@@ -957,9 +907,7 @@ class KeysBackupTest : InstrumentedTest {
      * -> That must fail and her backup state must be WrongBackUpVersion
      */
     @Test
-    fun testBackupWhenAnotherBackupWasCreated() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun testBackupWhenAnotherBackupWasCreated() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         val keysBackupTestHelper = KeysBackupTestHelper(testHelper, cryptoTestHelper)
 
         // - Create a backup version
@@ -969,7 +917,7 @@ class KeysBackupTest : InstrumentedTest {
 
         val stateObserver = StateObserver(keysBackup)
 
-        assertFalse(keysBackup.isEnabled)
+        assertFalse(keysBackup.isEnabled())
 
         // Wait for keys backup to be finished
         val latch0 = CountDownLatch(1)
@@ -993,7 +941,7 @@ class KeysBackupTest : InstrumentedTest {
         // - Make alice back up her keys to her homeserver
         keysBackupTestHelper.prepareAndCreateKeysBackupData(keysBackup)
 
-        assertTrue(keysBackup.isEnabled)
+        assertTrue(keysBackup.isEnabled())
 
         testHelper.await(latch0)
 
@@ -1012,11 +960,10 @@ class KeysBackupTest : InstrumentedTest {
         testHelper.await(latch2)
 
         // -> That must fail and her backup state must be WrongBackUpVersion
-        assertEquals(KeysBackupState.WrongBackUpVersion, keysBackup.state)
-        assertFalse(keysBackup.isEnabled)
+        assertEquals(KeysBackupState.WrongBackUpVersion, keysBackup.getState())
+        assertFalse(keysBackup.isEnabled())
 
         stateObserver.stopAndCheckStates(null)
-        cryptoTestData.cleanUp(testHelper)
     }
 
     /**
@@ -1032,9 +979,7 @@ class KeysBackupTest : InstrumentedTest {
      * -> It must success
      */
     @Test
-    fun testBackupAfterVerifyingADevice() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun testBackupAfterVerifyingADevice() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         val keysBackupTestHelper = KeysBackupTestHelper(testHelper, cryptoTestHelper)
 
         // - Create a backup version
@@ -1069,7 +1014,7 @@ class KeysBackupTest : InstrumentedTest {
         // - Try to backup all in aliceSession2, it must fail
         val keysBackup2 = aliceSession2.cryptoService().keysBackupService()
 
-        assertFalse("Backup should not be enabled", keysBackup2.isEnabled)
+        assertFalse("Backup should not be enabled", keysBackup2.isEnabled())
 
         val stateObserver2 = StateObserver(keysBackup2)
 
@@ -1088,8 +1033,8 @@ class KeysBackupTest : InstrumentedTest {
         assertFalse(isSuccessful)
 
         // Backup state must be NotTrusted
-        assertEquals("Backup state must be NotTrusted", KeysBackupState.NotTrusted, keysBackup2.state)
-        assertFalse("Backup should not be enabled", keysBackup2.isEnabled)
+        assertEquals("Backup state must be NotTrusted", KeysBackupState.NotTrusted, keysBackup2.getState())
+        assertFalse("Backup should not be enabled", keysBackup2.isEnabled())
 
         // - Validate the old device from the new one
         aliceSession2.cryptoService().setDeviceVerification(
@@ -1103,7 +1048,7 @@ class KeysBackupTest : InstrumentedTest {
         keysBackup2.addListener(object : KeysBackupStateListener {
             override fun onStateChange(newState: KeysBackupState) {
                 // Check the backup completes
-                if (keysBackup2.state == KeysBackupState.ReadyToBackUp) {
+                if (keysBackup2.getState() == KeysBackupState.ReadyToBackUp) {
                     // Remove itself from the list of listeners
                     keysBackup2.removeListener(this)
 
@@ -1121,12 +1066,10 @@ class KeysBackupTest : InstrumentedTest {
         }
 
         // -> It must success
-        assertTrue(aliceSession2.cryptoService().keysBackupService().isEnabled)
+        assertTrue(aliceSession2.cryptoService().keysBackupService().isEnabled())
 
         stateObserver.stopAndCheckStates(null)
         stateObserver2.stopAndCheckStates(null)
-        testHelper.signOutAndClose(aliceSession2)
-        cryptoTestData.cleanUp(testHelper)
     }
 
     /**
@@ -1134,9 +1077,7 @@ class KeysBackupTest : InstrumentedTest {
      * - Delete the backup
      */
     @Test
-    fun deleteKeysBackupTest() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun deleteKeysBackupTest() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         val keysBackupTestHelper = KeysBackupTestHelper(testHelper, cryptoTestHelper)
 
         // - Create a backup version
@@ -1146,19 +1087,18 @@ class KeysBackupTest : InstrumentedTest {
 
         val stateObserver = StateObserver(keysBackup)
 
-        assertFalse(keysBackup.isEnabled)
+        assertFalse(keysBackup.isEnabled())
 
         val keyBackupCreationInfo = keysBackupTestHelper.prepareAndCreateKeysBackupData(keysBackup)
 
-        assertTrue(keysBackup.isEnabled)
+        assertTrue(keysBackup.isEnabled())
 
         // Delete the backup
         testHelper.doSync<Unit> { keysBackup.deleteBackup(keyBackupCreationInfo.version, it) }
 
         // Backup is now disabled
-        assertFalse(keysBackup.isEnabled)
+        assertFalse(keysBackup.isEnabled())
 
         stateObserver.stopAndCheckStates(null)
-        cryptoTestData.cleanUp(testHelper)
     }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt
index 2220536e28..38f94c5103 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt
@@ -33,7 +33,8 @@ import java.util.concurrent.CountDownLatch
 
 internal class KeysBackupTestHelper(
         private val testHelper: CommonTestHelper,
-        private val cryptoTestHelper: CryptoTestHelper) {
+        private val cryptoTestHelper: CryptoTestHelper
+) {
 
     fun waitForKeybackUpBatching() {
         Thread.sleep(400)
@@ -96,8 +97,10 @@ internal class KeysBackupTestHelper(
         )
     }
 
-    fun prepareAndCreateKeysBackupData(keysBackup: KeysBackupService,
-                                       password: String? = null): PrepareKeysBackupDataResult {
+    fun prepareAndCreateKeysBackupData(
+            keysBackup: KeysBackupService,
+            password: String? = null
+    ): PrepareKeysBackupDataResult {
         val stateObserver = StateObserver(keysBackup)
 
         val megolmBackupCreationInfo = testHelper.doSync<MegolmBackupCreationInfo> {
@@ -106,7 +109,7 @@ internal class KeysBackupTestHelper(
 
         Assert.assertNotNull(megolmBackupCreationInfo)
 
-        Assert.assertFalse("Key backup should not be enabled before creation", keysBackup.isEnabled)
+        Assert.assertFalse("Key backup should not be enabled before creation", keysBackup.isEnabled())
 
         // Create the version
         val keysVersion = testHelper.doSync<KeysVersion> {
@@ -116,7 +119,7 @@ internal class KeysBackupTestHelper(
         Assert.assertNotNull("Key backup version should not be null", keysVersion.version)
 
         // Backup must be enable now
-        Assert.assertTrue(keysBackup.isEnabled)
+        Assert.assertTrue(keysBackup.isEnabled())
 
         stateObserver.stopAndCheckStates(null)
         return PrepareKeysBackupDataResult(megolmBackupCreationInfo, keysVersion.version)
@@ -128,7 +131,7 @@ internal class KeysBackupTestHelper(
      */
     fun waitForKeysBackupToBeInState(session: Session, state: KeysBackupState) {
         // If already in the wanted state, return
-        if (session.cryptoService().keysBackupService().state == state) {
+        if (session.cryptoService().keysBackupService().getState() == state) {
             return
         }
 
@@ -169,9 +172,11 @@ internal class KeysBackupTestHelper(
      * - The new device must have the same count of megolm keys
      * - Alice must have the same keys on both devices
      */
-    fun checkRestoreSuccess(testData: KeysBackupScenarioData,
-                            total: Int,
-                            imported: Int) {
+    fun checkRestoreSuccess(
+            testData: KeysBackupScenarioData,
+            total: Int,
+            imported: Int
+    ) {
         // - Imported keys number must be correct
         Assert.assertEquals(testData.aliceKeys.size, total)
         Assert.assertEquals(total, imported)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/PrepareKeysBackupDataResult.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/PrepareKeysBackupDataResult.kt
index 31bd3c9cce..9ee10eddcf 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/PrepareKeysBackupDataResult.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/PrepareKeysBackupDataResult.kt
@@ -18,5 +18,7 @@ package org.matrix.android.sdk.internal.crypto.keysbackup
 
 import org.matrix.android.sdk.api.session.crypto.keysbackup.MegolmBackupCreationInfo
 
-data class PrepareKeysBackupDataResult(val megolmBackupCreationInfo: MegolmBackupCreationInfo,
-                                       val version: String)
+data class PrepareKeysBackupDataResult(
+        val megolmBackupCreationInfo: MegolmBackupCreationInfo,
+        val version: String
+)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/StateObserver.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/StateObserver.kt
index 80e54d82ec..6c97774547 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/StateObserver.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/StateObserver.kt
@@ -27,9 +27,11 @@ import java.util.concurrent.CountDownLatch
  * This class observe the state change of a KeysBackup object and provide a method to check the several state change
  * It checks all state transitions and detected forbidden transition
  */
-internal class StateObserver(private val keysBackup: KeysBackupService,
-                             private val latch: CountDownLatch? = null,
-                             private val expectedStateChange: Int = -1) : KeysBackupStateListener {
+internal class StateObserver(
+        private val keysBackup: KeysBackupService,
+        private val latch: CountDownLatch? = null,
+        private val expectedStateChange: Int = -1
+) : KeysBackupStateListener {
 
     private val allowedStateTransitions = listOf(
             KeysBackupState.BackingUp to KeysBackupState.ReadyToBackUp,
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/replayattack/ReplayAttackTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/replayattack/ReplayAttackTest.kt
new file mode 100644
index 0000000000..53cf802b91
--- /dev/null
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/replayattack/ReplayAttackTest.kt
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.crypto.replayattack
+
+import androidx.test.filters.LargeTest
+import org.amshove.kluent.internal.assertFailsWith
+import org.junit.Assert
+import org.junit.Assert.assertEquals
+import org.junit.Assert.fail
+import org.junit.FixMethodOrder
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+import org.junit.runners.MethodSorters
+import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.api.session.crypto.MXCryptoError
+import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest
+
+@RunWith(JUnit4::class)
+@FixMethodOrder(MethodSorters.JVM)
+@LargeTest
+class ReplayAttackTest : InstrumentedTest {
+
+    @Test
+    fun replayAttackAlreadyDecryptedEventTest() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
+        val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(true)
+
+        val e2eRoomID = cryptoTestData.roomId
+
+        // Alice
+        val aliceSession = cryptoTestData.firstSession
+        val aliceRoomPOV = aliceSession.roomService().getRoom(e2eRoomID)!!
+
+        // Bob
+        val bobSession = cryptoTestData.secondSession
+        val bobRoomPOV = bobSession!!.roomService().getRoom(e2eRoomID)!!
+        assertEquals(bobRoomPOV.roomSummary()?.joinedMembersCount, 2)
+
+        // Alice will send a message
+        val sentEvents = testHelper.sendTextMessage(aliceRoomPOV, "Hello I will be decrypted twice", 1)
+        assertEquals(1, sentEvents.size)
+
+        val fakeEventId = sentEvents[0].eventId + "_fake"
+        val fakeEventWithTheSameIndex =
+                sentEvents[0].copy(eventId = fakeEventId, root = sentEvents[0].root.copy(eventId = fakeEventId))
+
+        testHelper.runBlockingTest {
+            // Lets assume we are from the main timelineId
+            val timelineId = "timelineId"
+            // Lets decrypt the original event
+            aliceSession.cryptoService().decryptEvent(sentEvents[0].root, timelineId)
+            // Lets decrypt the fake event that will have the same message index
+            val exception = assertFailsWith<MXCryptoError.Base> {
+                // An exception should be thrown while the same index would have been used for the previous decryption
+                aliceSession.cryptoService().decryptEvent(fakeEventWithTheSameIndex.root, timelineId)
+            }
+            assertEquals(MXCryptoError.ErrorType.DUPLICATED_MESSAGE_INDEX, exception.errorType)
+        }
+        cryptoTestData.cleanUp(testHelper)
+    }
+
+    @Test
+    fun replayAttackSameEventTest() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
+        val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(true)
+
+        val e2eRoomID = cryptoTestData.roomId
+
+        // Alice
+        val aliceSession = cryptoTestData.firstSession
+        val aliceRoomPOV = aliceSession.roomService().getRoom(e2eRoomID)!!
+
+        // Bob
+        val bobSession = cryptoTestData.secondSession
+        val bobRoomPOV = bobSession!!.roomService().getRoom(e2eRoomID)!!
+        assertEquals(bobRoomPOV.roomSummary()?.joinedMembersCount, 2)
+
+        // Alice will send a message
+        val sentEvents = testHelper.sendTextMessage(aliceRoomPOV, "Hello I will be decrypted twice", 1)
+        Assert.assertTrue("Message should be sent", sentEvents.size == 1)
+        assertEquals(sentEvents.size, 1)
+
+        testHelper.runBlockingTest {
+            // Lets assume we are from the main timelineId
+            val timelineId = "timelineId"
+            // Lets decrypt the original event
+            aliceSession.cryptoService().decryptEvent(sentEvents[0].root, timelineId)
+            try {
+                // Lets try to decrypt the same event
+                aliceSession.cryptoService().decryptEvent(sentEvents[0].root, timelineId)
+            } catch (ex: Throwable) {
+                fail("Shouldn't throw a decryption error for same event")
+            }
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
index c758050fc9..c8be6aae74 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
@@ -31,15 +31,16 @@ import org.matrix.android.sdk.api.crypto.SSSS_ALGORITHM_AES_HMAC_SHA2
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.accountdata.UserAccountDataEvent
 import org.matrix.android.sdk.api.session.securestorage.EncryptedSecretContent
+import org.matrix.android.sdk.api.session.securestorage.KeyRef
 import org.matrix.android.sdk.api.session.securestorage.KeySigner
 import org.matrix.android.sdk.api.session.securestorage.RawBytesKeySpec
 import org.matrix.android.sdk.api.session.securestorage.SecretStorageKeyContent
 import org.matrix.android.sdk.api.session.securestorage.SharedSecretStorageError
-import org.matrix.android.sdk.api.session.securestorage.SharedSecretStorageService
 import org.matrix.android.sdk.api.session.securestorage.SsssKeyCreationInfo
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.api.util.toBase64NoPadding
 import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.CommonTestHelper.Companion.runSessionTest
 import org.matrix.android.sdk.common.SessionTestParams
 import org.matrix.android.sdk.common.TestConstants
 import org.matrix.android.sdk.internal.crypto.secrets.DefaultSharedSecretStorageService
@@ -55,8 +56,7 @@ class QuadSTests : InstrumentedTest {
     }
 
     @Test
-    fun test_Generate4SKey() {
-        val testHelper = CommonTestHelper(context())
+    fun test_Generate4SKey() = runSessionTest(context()) { testHelper ->
 
         val aliceSession = testHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(true))
 
@@ -108,12 +108,11 @@ class QuadSTests : InstrumentedTest {
     }
 
     @Test
-    fun test_StoreSecret() {
-        val testHelper = CommonTestHelper(context())
+    fun test_StoreSecret() = runSessionTest(context()) { testHelper ->
 
         val aliceSession = testHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(true))
         val keyId = "My.Key"
-        val info = generatedSecret(aliceSession, keyId, true)
+        val info = generatedSecret(testHelper, aliceSession, keyId, true)
 
         val keySpec = RawBytesKeySpec.fromRecoveryKey(info.recoveryKey)
 
@@ -123,11 +122,11 @@ class QuadSTests : InstrumentedTest {
             aliceSession.sharedSecretStorageService().storeSecret(
                     "secret.of.life",
                     clearSecret,
-                    listOf(SharedSecretStorageService.KeyRef(null, keySpec)) // default key
+                    listOf(KeyRef(null, keySpec)) // default key
             )
         }
 
-        val secretAccountData = assertAccountData(aliceSession, "secret.of.life")
+        val secretAccountData = assertAccountData(testHelper, aliceSession, "secret.of.life")
 
         val encryptedContent = secretAccountData.content["encrypted"] as? Map<*, *>
         assertNotNull("Element should be encrypted", encryptedContent)
@@ -149,12 +148,10 @@ class QuadSTests : InstrumentedTest {
         }
 
         assertEquals("Secret mismatch", clearSecret, decryptedSecret)
-        testHelper.signOutAndClose(aliceSession)
     }
 
     @Test
-    fun test_SetDefaultLocalEcho() {
-        val testHelper = CommonTestHelper(context())
+    fun test_SetDefaultLocalEcho() = runSessionTest(context()) { testHelper ->
 
         val aliceSession = testHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(true))
 
@@ -170,19 +167,16 @@ class QuadSTests : InstrumentedTest {
         testHelper.runBlockingTest {
             quadS.setDefaultKey(TEST_KEY_ID)
         }
-
-        testHelper.signOutAndClose(aliceSession)
     }
 
     @Test
-    fun test_StoreSecretWithMultipleKey() {
-        val testHelper = CommonTestHelper(context())
+    fun test_StoreSecretWithMultipleKey() = runSessionTest(context()) { testHelper ->
 
         val aliceSession = testHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(true))
         val keyId1 = "Key.1"
-        val key1Info = generatedSecret(aliceSession, keyId1, true)
+        val key1Info = generatedSecret(testHelper, aliceSession, keyId1, true)
         val keyId2 = "Key2"
-        val key2Info = generatedSecret(aliceSession, keyId2, true)
+        val key2Info = generatedSecret(testHelper, aliceSession, keyId2, true)
 
         val mySecretText = "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
 
@@ -191,8 +185,8 @@ class QuadSTests : InstrumentedTest {
                     "my.secret",
                     mySecretText.toByteArray().toBase64NoPadding(),
                     listOf(
-                            SharedSecretStorageService.KeyRef(keyId1, RawBytesKeySpec.fromRecoveryKey(key1Info.recoveryKey)),
-                            SharedSecretStorageService.KeyRef(keyId2, RawBytesKeySpec.fromRecoveryKey(key2Info.recoveryKey))
+                            KeyRef(keyId1, RawBytesKeySpec.fromRecoveryKey(key1Info.recoveryKey)),
+                            KeyRef(keyId2, RawBytesKeySpec.fromRecoveryKey(key2Info.recoveryKey))
                     )
             )
         }
@@ -221,19 +215,16 @@ class QuadSTests : InstrumentedTest {
                     RawBytesKeySpec.fromRecoveryKey(key2Info.recoveryKey)!!
             )
         }
-
-        testHelper.signOutAndClose(aliceSession)
     }
 
     @Test
     @Ignore("Test is working locally, not in GitHub actions")
-    fun test_GetSecretWithBadPassphrase() {
-        val testHelper = CommonTestHelper(context())
+    fun test_GetSecretWithBadPassphrase() = runSessionTest(context()) { testHelper ->
 
         val aliceSession = testHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(true))
         val keyId1 = "Key.1"
         val passphrase = "The good pass phrase"
-        val key1Info = generatedSecretFromPassphrase(aliceSession, passphrase, keyId1, true)
+        val key1Info = generatedSecretFromPassphrase(testHelper, aliceSession, passphrase, keyId1, true)
 
         val mySecretText = "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
 
@@ -241,7 +232,7 @@ class QuadSTests : InstrumentedTest {
             aliceSession.sharedSecretStorageService().storeSecret(
                     "my.secret",
                     mySecretText.toByteArray().toBase64NoPadding(),
-                    listOf(SharedSecretStorageService.KeyRef(keyId1, RawBytesKeySpec.fromRecoveryKey(key1Info.recoveryKey)))
+                    listOf(KeyRef(keyId1, RawBytesKeySpec.fromRecoveryKey(key1Info.recoveryKey)))
             )
         }
 
@@ -275,13 +266,9 @@ class QuadSTests : InstrumentedTest {
                     )
             )
         }
-
-        testHelper.signOutAndClose(aliceSession)
     }
 
-    private fun assertAccountData(session: Session, type: String): UserAccountDataEvent {
-        val testHelper = CommonTestHelper(context())
-
+    private fun assertAccountData(testHelper: CommonTestHelper, session: Session, type: String): UserAccountDataEvent {
         var accountData: UserAccountDataEvent? = null
         testHelper.waitWithLatch {
             val liveAccountData = session.accountDataService().getLiveUserAccountDataEvent(type)
@@ -297,29 +284,27 @@ class QuadSTests : InstrumentedTest {
         return accountData!!
     }
 
-    private fun generatedSecret(session: Session, keyId: String, asDefault: Boolean = true): SsssKeyCreationInfo {
+    private fun generatedSecret(testHelper: CommonTestHelper, session: Session, keyId: String, asDefault: Boolean = true): SsssKeyCreationInfo {
         val quadS = session.sharedSecretStorageService()
-        val testHelper = CommonTestHelper(context())
 
         val creationInfo = testHelper.runBlockingTest {
             quadS.generateKey(keyId, null, keyId, emptyKeySigner)
         }
 
-        assertAccountData(session, "${DefaultSharedSecretStorageService.KEY_ID_BASE}.$keyId")
+        assertAccountData(testHelper, session, "${DefaultSharedSecretStorageService.KEY_ID_BASE}.$keyId")
 
         if (asDefault) {
             testHelper.runBlockingTest {
                 quadS.setDefaultKey(keyId)
             }
-            assertAccountData(session, DefaultSharedSecretStorageService.DEFAULT_KEY_ID)
+            assertAccountData(testHelper, session, DefaultSharedSecretStorageService.DEFAULT_KEY_ID)
         }
 
         return creationInfo
     }
 
-    private fun generatedSecretFromPassphrase(session: Session, passphrase: String, keyId: String, asDefault: Boolean = true): SsssKeyCreationInfo {
+    private fun generatedSecretFromPassphrase(testHelper: CommonTestHelper, session: Session, passphrase: String, keyId: String, asDefault: Boolean = true): SsssKeyCreationInfo {
         val quadS = session.sharedSecretStorageService()
-        val testHelper = CommonTestHelper(context())
 
         val creationInfo = testHelper.runBlockingTest {
             quadS.generateKeyWithPassphrase(
@@ -331,12 +316,12 @@ class QuadSTests : InstrumentedTest {
             )
         }
 
-        assertAccountData(session, "${DefaultSharedSecretStorageService.KEY_ID_BASE}.$keyId")
+        assertAccountData(testHelper, session, "${DefaultSharedSecretStorageService.KEY_ID_BASE}.$keyId")
         if (asDefault) {
             testHelper.runBlockingTest {
                 quadS.setDefaultKey(keyId)
             }
-            assertAccountData(session, DefaultSharedSecretStorageService.DEFAULT_KEY_ID)
+            assertAccountData(testHelper, session, DefaultSharedSecretStorageService.DEFAULT_KEY_ID)
         }
 
         return creationInfo
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt
index 2892cf8464..d524774a35 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt
@@ -44,8 +44,7 @@ import org.matrix.android.sdk.api.session.crypto.verification.VerificationTransa
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.toModel
-import org.matrix.android.sdk.common.CommonTestHelper
-import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest
 import org.matrix.android.sdk.internal.crypto.model.rest.KeyVerificationCancel
 import org.matrix.android.sdk.internal.crypto.model.rest.KeyVerificationStart
 import org.matrix.android.sdk.internal.crypto.model.rest.toValue
@@ -53,12 +52,11 @@ import java.util.concurrent.CountDownLatch
 
 @RunWith(AndroidJUnit4::class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@Ignore
 class SASTest : InstrumentedTest {
 
     @Test
-    fun test_aliceStartThenAliceCancel() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun test_aliceStartThenAliceCancel() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom()
 
         val aliceSession = cryptoTestData.firstSession
@@ -135,15 +133,11 @@ class SASTest : InstrumentedTest {
 
         assertNull(bobVerificationService.getExistingTransaction(aliceSession.myUserId, txID))
         assertNull(aliceVerificationService.getExistingTransaction(bobSession.myUserId, txID))
-
-        cryptoTestData.cleanUp(testHelper)
     }
 
     @Test
     @Ignore("This test will be ignored until it is fixed")
-    fun test_key_agreement_protocols_must_include_curve25519() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun test_key_agreement_protocols_must_include_curve25519() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         fail("Not passing for the moment")
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom()
 
@@ -195,15 +189,11 @@ class SASTest : InstrumentedTest {
         testHelper.await(cancelLatch)
 
         assertEquals("Request should be cancelled with m.unknown_method", CancelCode.UnknownMethod, cancelReason)
-
-        cryptoTestData.cleanUp(testHelper)
     }
 
     @Test
     @Ignore("This test will be ignored until it is fixed")
-    fun test_key_agreement_macs_Must_include_hmac_sha256() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun test_key_agreement_macs_Must_include_hmac_sha256() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         fail("Not passing for the moment")
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom()
 
@@ -236,15 +226,11 @@ class SASTest : InstrumentedTest {
 
         val cancelReq = canceledToDeviceEvent!!.content.toModel<KeyVerificationCancel>()!!
         assertEquals("Request should be cancelled with m.unknown_method", CancelCode.UnknownMethod.value, cancelReq.code)
-
-        cryptoTestData.cleanUp(testHelper)
     }
 
     @Test
     @Ignore("This test will be ignored until it is fixed")
-    fun test_key_agreement_short_code_include_decimal() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun test_key_agreement_short_code_include_decimal() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         fail("Not passing for the moment")
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom()
 
@@ -277,18 +263,18 @@ class SASTest : InstrumentedTest {
 
         val cancelReq = canceledToDeviceEvent!!.content.toModel<KeyVerificationCancel>()!!
         assertEquals("Request should be cancelled with m.unknown_method", CancelCode.UnknownMethod.value, cancelReq.code)
-
-        cryptoTestData.cleanUp(testHelper)
     }
 
-    private fun fakeBobStart(bobSession: Session,
-                             aliceUserID: String?,
-                             aliceDevice: String?,
-                             tid: String,
-                             protocols: List<String> = SASDefaultVerificationTransaction.KNOWN_AGREEMENT_PROTOCOLS,
-                             hashes: List<String> = SASDefaultVerificationTransaction.KNOWN_HASHES,
-                             mac: List<String> = SASDefaultVerificationTransaction.KNOWN_MACS,
-                             codes: List<String> = SASDefaultVerificationTransaction.KNOWN_SHORT_CODES) {
+    private fun fakeBobStart(
+            bobSession: Session,
+            aliceUserID: String?,
+            aliceDevice: String?,
+            tid: String,
+            protocols: List<String> = SASDefaultVerificationTransaction.KNOWN_AGREEMENT_PROTOCOLS,
+            hashes: List<String> = SASDefaultVerificationTransaction.KNOWN_HASHES,
+            mac: List<String> = SASDefaultVerificationTransaction.KNOWN_MACS,
+            codes: List<String> = SASDefaultVerificationTransaction.KNOWN_SHORT_CODES
+    ) {
         val startMessage = KeyVerificationStart(
                 fromDevice = bobSession.cryptoService().getMyDevice().deviceId,
                 method = VerificationMethod.SAS.toValue(),
@@ -314,9 +300,7 @@ class SASTest : InstrumentedTest {
     // any two devices may only have at most one key verification in flight at a time.
     // If a device has two verifications in progress with the same device, then it should cancel both verifications.
     @Test
-    fun test_aliceStartTwoRequests() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun test_aliceStartTwoRequests() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom()
 
         val aliceSession = cryptoTestData.firstSession
@@ -357,9 +341,7 @@ class SASTest : InstrumentedTest {
      */
     @Test
     @Ignore("This test will be ignored until it is fixed")
-    fun test_aliceAndBobAgreement() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun test_aliceAndBobAgreement() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom()
 
         val aliceSession = cryptoTestData.firstSession
@@ -413,14 +395,10 @@ class SASTest : InstrumentedTest {
         accepted!!.shortAuthenticationStrings.forEach {
             assertTrue("all agreed Short Code should be known by alice", startReq!!.shortAuthenticationStrings.contains(it))
         }
-
-        cryptoTestData.cleanUp(testHelper)
     }
 
     @Test
-    fun test_aliceAndBobSASCode() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun test_aliceAndBobSASCode() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom()
 
         val aliceSession = cryptoTestData.firstSession
@@ -473,14 +451,10 @@ class SASTest : InstrumentedTest {
                 "Should have same SAS", aliceTx.getShortCodeRepresentation(SasMode.DECIMAL),
                 bobTx.getShortCodeRepresentation(SasMode.DECIMAL)
         )
-
-        cryptoTestData.cleanUp(testHelper)
     }
 
     @Test
-    fun test_happyPath() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun test_happyPath() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom()
 
         val aliceSession = cryptoTestData.firstSession
@@ -553,13 +527,10 @@ class SASTest : InstrumentedTest {
 
         assertTrue("alice device should be verified from bob point of view", aliceDeviceInfoFromBobPOV!!.isVerified)
         assertTrue("bob device should be verified from alice point of view", bobDeviceInfoFromAlicePOV!!.isVerified)
-        cryptoTestData.cleanUp(testHelper)
     }
 
     @Test
-    fun test_ConcurrentStart() {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    fun test_ConcurrentStart() = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom()
 
         val aliceSession = cryptoTestData.firstSession
@@ -646,7 +617,5 @@ class SASTest : InstrumentedTest {
                 bobPovTx?.state == VerificationTxState.ShortCodeReady
             }
         }
-
-        cryptoTestData.cleanUp(testHelper)
     }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
index ceebc3cd01..3f22906965 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
@@ -19,6 +19,7 @@ package org.matrix.android.sdk.internal.crypto.verification.qrcode
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.amshove.kluent.shouldBe
 import org.junit.FixMethodOrder
+import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
@@ -31,8 +32,8 @@ import org.matrix.android.sdk.api.session.crypto.verification.CancelCode
 import org.matrix.android.sdk.api.session.crypto.verification.PendingVerificationRequest
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationMethod
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationService
-import org.matrix.android.sdk.common.CommonTestHelper
-import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest
+import org.matrix.android.sdk.common.CommonTestHelper.Companion.runSessionTest
 import org.matrix.android.sdk.common.SessionTestParams
 import org.matrix.android.sdk.common.TestConstants
 import java.util.concurrent.CountDownLatch
@@ -41,6 +42,7 @@ import kotlin.coroutines.resume
 
 @RunWith(AndroidJUnit4::class)
 @FixMethodOrder(MethodSorters.JVM)
+@Ignore
 class VerificationTest : InstrumentedTest {
 
     data class ExpectedResult(
@@ -151,12 +153,12 @@ class VerificationTest : InstrumentedTest {
 
     // TODO Add tests without SAS
 
-    private fun doTest(aliceSupportedMethods: List<VerificationMethod>,
-                       bobSupportedMethods: List<VerificationMethod>,
-                       expectedResultForAlice: ExpectedResult,
-                       expectedResultForBob: ExpectedResult) {
-        val testHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(testHelper)
+    private fun doTest(
+            aliceSupportedMethods: List<VerificationMethod>,
+            bobSupportedMethods: List<VerificationMethod>,
+            expectedResultForAlice: ExpectedResult,
+            expectedResultForBob: ExpectedResult
+    ) = runCryptoTest(context()) { cryptoTestHelper, testHelper ->
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom()
 
         val aliceSession = cryptoTestData.firstSession
@@ -251,14 +253,11 @@ class VerificationTest : InstrumentedTest {
             pr.otherCanShowQrCode() shouldBe expectedResultForBob.otherCanShowQrCode
             pr.otherCanScanQrCode() shouldBe expectedResultForBob.otherCanScanQrCode
         }
-
-        cryptoTestData.cleanUp(testHelper)
     }
 
     @Test
-    fun test_selfVerificationAcceptedCancelsItForOtherSessions() {
+    fun test_selfVerificationAcceptedCancelsItForOtherSessions() = runSessionTest(context()) { testHelper ->
         val defaultSessionParams = SessionTestParams(true)
-        val testHelper = CommonTestHelper(context())
 
         val aliceSessionToVerify = testHelper.createAccount(TestConstants.USER_ALICE, defaultSessionParams)
         val aliceSessionThatVerifies = testHelper.logIntoAccount(aliceSessionToVerify.myUserId, TestConstants.PASSWORD, defaultSessionParams)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
index acb23bf723..0560cfec95 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
@@ -289,9 +289,11 @@ class MarkdownParserTest : InstrumentedTest {
         markdownParser.parse(text).expect(text, null)
     }
 
-    private fun testType(name: String,
-                         markdownPattern: String,
-                         htmlExpectedTag: String) {
+    private fun testType(
+            name: String,
+            markdownPattern: String,
+            htmlExpectedTag: String
+    ) {
         // Test simple case
         "$markdownPattern$name$markdownPattern"
                 .let {
@@ -376,10 +378,12 @@ class MarkdownParserTest : InstrumentedTest {
                 }
     }
 
-    private fun testTypeNewLines(name: String,
-                                 markdownPattern: String,
-                                 htmlExpectedTag: String,
-                                 softBreak: String = "<br />") {
+    private fun testTypeNewLines(
+            name: String,
+            markdownPattern: String,
+            htmlExpectedTag: String,
+            softBreak: String = "<br />"
+    ) {
         // With new line inside the block
         "$markdownPattern$name\n$name$markdownPattern"
                 .let {
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/threads/ThreadMessagingTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/threads/ThreadMessagingTest.kt
index a2984dd27e..45bd38870d 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/threads/ThreadMessagingTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/threads/ThreadMessagingTest.kt
@@ -34,8 +34,7 @@ import org.matrix.android.sdk.api.session.events.model.isThread
 import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
-import org.matrix.android.sdk.common.CommonTestHelper
-import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest
 import java.util.concurrent.CountDownLatch
 
 @RunWith(JUnit4::class)
@@ -44,9 +43,7 @@ import java.util.concurrent.CountDownLatch
 class ThreadMessagingTest : InstrumentedTest {
 
     @Test
-    fun reply_in_thread_should_create_a_thread() {
-        val commonTestHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
+    fun reply_in_thread_should_create_a_thread() = runCryptoTest(context()) { cryptoTestHelper, commonTestHelper ->
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceInARoom(false)
 
         val aliceSession = cryptoTestData.firstSession
@@ -86,7 +83,7 @@ class ThreadMessagingTest : InstrumentedTest {
         val timeline = aliceRoom.timelineService().createTimeline(null, TimelineSettings(30))
         timeline.start()
 
-        aliceSession.startSync(true)
+        aliceSession.syncService().startSync(true)
         run {
             val lock = CountDownLatch(1)
             val eventsListener = commonTestHelper.createEventListener(lock) { snapshot ->
@@ -100,13 +97,11 @@ class ThreadMessagingTest : InstrumentedTest {
             timeline.addListener(eventsListener)
             commonTestHelper.await(lock, 600_000)
         }
-        aliceSession.stopSync()
+        aliceSession.syncService().stopSync()
     }
 
     @Test
-    fun reply_in_thread_should_create_a_thread_from_other_user() {
-        val commonTestHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
+    fun reply_in_thread_should_create_a_thread_from_other_user() = runCryptoTest(context()) { cryptoTestHelper, commonTestHelper ->
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(false)
 
         val aliceSession = cryptoTestData.firstSession
@@ -149,7 +144,7 @@ class ThreadMessagingTest : InstrumentedTest {
         val timeline = aliceRoom.timelineService().createTimeline(null, TimelineSettings(30))
         timeline.start()
 
-        aliceSession.startSync(true)
+        aliceSession.syncService().startSync(true)
         run {
             val lock = CountDownLatch(1)
             val eventsListener = commonTestHelper.createEventListener(lock) { snapshot ->
@@ -161,9 +156,9 @@ class ThreadMessagingTest : InstrumentedTest {
             timeline.addListener(eventsListener)
             commonTestHelper.await(lock, 600_000)
         }
-        aliceSession.stopSync()
+        aliceSession.syncService().stopSync()
 
-        bobSession.startSync(true)
+        bobSession.syncService().startSync(true)
         run {
             val lock = CountDownLatch(1)
             val eventsListener = commonTestHelper.createEventListener(lock) { snapshot ->
@@ -175,13 +170,11 @@ class ThreadMessagingTest : InstrumentedTest {
             timeline.addListener(eventsListener)
             commonTestHelper.await(lock, 600_000)
         }
-        bobSession.stopSync()
+        bobSession.syncService().stopSync()
     }
 
     @Test
-    fun reply_in_thread_to_timeline_message_multiple_times() {
-        val commonTestHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
+    fun reply_in_thread_to_timeline_message_multiple_times() = runCryptoTest(context()) { cryptoTestHelper, commonTestHelper ->
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceInARoom(false)
 
         val aliceSession = cryptoTestData.firstSession
@@ -224,7 +217,7 @@ class ThreadMessagingTest : InstrumentedTest {
         val timeline = aliceRoom.timelineService().createTimeline(null, TimelineSettings(30))
         timeline.start()
 
-        aliceSession.startSync(true)
+        aliceSession.syncService().startSync(true)
         run {
             val lock = CountDownLatch(1)
             val eventsListener = commonTestHelper.createEventListener(lock) { snapshot ->
@@ -240,13 +233,11 @@ class ThreadMessagingTest : InstrumentedTest {
             timeline.addListener(eventsListener)
             commonTestHelper.await(lock, 600_000)
         }
-        aliceSession.stopSync()
+        aliceSession.syncService().stopSync()
     }
 
     @Test
-    fun thread_summary_advanced_validation_after_multiple_messages_in_multiple_threads() {
-        val commonTestHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
+    fun thread_summary_advanced_validation_after_multiple_messages_in_multiple_threads() = runCryptoTest(context()) { cryptoTestHelper, commonTestHelper ->
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(false)
 
         val aliceSession = cryptoTestData.firstSession
@@ -323,7 +314,7 @@ class ThreadMessagingTest : InstrumentedTest {
         val timeline = aliceRoom.timelineService().createTimeline(null, TimelineSettings(30))
         timeline.start()
 
-        aliceSession.startSync(true)
+        aliceSession.syncService().startSync(true)
         run {
             val lock = CountDownLatch(1)
             val eventsListener = commonTestHelper.createEventListener(lock) { snapshot ->
@@ -347,6 +338,6 @@ class ThreadMessagingTest : InstrumentedTest {
             timeline.addListener(eventsListener)
             commonTestHelper.await(lock, 600_000)
         }
-        aliceSession.stopSync()
+        aliceSession.syncService().stopSync()
     }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/ChunkEntityTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/ChunkEntityTest.kt
index 94b2ba55a3..986d58741c 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/ChunkEntityTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/ChunkEntityTest.kt
@@ -154,9 +154,11 @@ internal class ChunkEntityTest : InstrumentedTest {
         }
     }
 
-    private fun ChunkEntity.addAll(roomId: String,
-                                   events: List<Event>,
-                                   direction: PaginationDirection) {
+    private fun ChunkEntity.addAll(
+            roomId: String,
+            events: List<Event>,
+            direction: PaginationDirection
+    ) {
         events.forEach { event ->
             val fakeEvent = event.toEntity(roomId, SendState.SYNCED, clock.epochMillis()).let {
                 realm.copyToRealm(it)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakeTokenChunkEvent.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakeTokenChunkEvent.kt
index 657f622c5b..2e9478ba7e 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakeTokenChunkEvent.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakeTokenChunkEvent.kt
@@ -19,8 +19,9 @@ package org.matrix.android.sdk.session.room.timeline
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.internal.session.room.timeline.TokenChunkEvent
 
-internal data class FakeTokenChunkEvent(override val start: String?,
-                                        override val end: String?,
-                                        override val events: List<Event> = emptyList(),
-                                        override val stateEvents: List<Event> = emptyList()
+internal data class FakeTokenChunkEvent(
+        override val start: String?,
+        override val end: String?,
+        override val events: List<Event> = emptyList(),
+        override val stateEvents: List<Event> = emptyList()
 ) : TokenChunkEvent
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/PollAggregationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/PollAggregationTest.kt
index 61ab6d4b40..5252e50e15 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/PollAggregationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/PollAggregationTest.kt
@@ -38,8 +38,7 @@ import org.matrix.android.sdk.api.session.room.model.message.PollType
 import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
-import org.matrix.android.sdk.common.CommonTestHelper
-import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest
 import java.util.concurrent.CountDownLatch
 
 @RunWith(JUnit4::class)
@@ -47,9 +46,7 @@ import java.util.concurrent.CountDownLatch
 class PollAggregationTest : InstrumentedTest {
 
     @Test
-    fun testAllPollUseCases() {
-        val commonTestHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
+    fun testAllPollUseCases() = runCryptoTest(context()) { cryptoTestHelper, commonTestHelper ->
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(false)
 
         val aliceSession = cryptoTestData.firstSession
@@ -60,7 +57,7 @@ class PollAggregationTest : InstrumentedTest {
         // Bob creates a poll
         roomFromBobPOV.sendService().sendPoll(PollType.DISCLOSED, pollQuestion, pollOptions)
 
-        aliceSession.startSync(true)
+        aliceSession.syncService().startSync(true)
         val aliceTimeline = roomFromAlicePOV.timelineService().createTimeline(null, TimelineSettings(30))
         aliceTimeline.start()
 
@@ -136,9 +133,8 @@ class PollAggregationTest : InstrumentedTest {
 
         aliceTimeline.removeAllListeners()
 
-        aliceSession.stopSync()
+        aliceSession.syncService().stopSync()
         aliceTimeline.dispose()
-        cryptoTestData.cleanUp(commonTestHelper)
     }
 
     private fun testInitialPollConditions(pollContent: MessagePollContent, pollSummary: PollResponseAggregatedSummary?) {
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/RoomDataHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/RoomDataHelper.kt
index 8a4429db45..53585ae82a 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/RoomDataHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/RoomDataHelper.kt
@@ -41,11 +41,12 @@ object RoomDataHelper {
         }
     }
 
-    private fun createFakeEvent(type: String,
-                                content: Content? = null,
-                                prevContent: Content? = null,
-                                sender: String = FAKE_TEST_SENDER,
-                                stateKey: String? = null
+    private fun createFakeEvent(
+            type: String,
+            content: Content? = null,
+            prevContent: Content? = null,
+            sender: String = FAKE_TEST_SENDER,
+            stateKey: String? = null
     ): Event {
         return Event(
                 type = type,
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt
index e407c1b42d..3dd3f5fa2a 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt
@@ -34,8 +34,7 @@ import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
-import org.matrix.android.sdk.common.CommonTestHelper
-import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest
 import org.matrix.android.sdk.common.checkSendOrder
 import timber.log.Timber
 import java.util.concurrent.CountDownLatch
@@ -53,9 +52,7 @@ class TimelineForwardPaginationTest : InstrumentedTest {
      * This test ensure that if we click to permalink, we will be able to go back to the live
      */
     @Test
-    fun forwardPaginationTest() {
-        val commonTestHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
+    fun forwardPaginationTest() = runCryptoTest(context()) { cryptoTestHelper, commonTestHelper ->
         val numberOfMessagesToSend = 90
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceInARoom(false)
 
@@ -177,7 +174,5 @@ class TimelineForwardPaginationTest : InstrumentedTest {
         }
 
         aliceTimeline.dispose()
-
-        cryptoTestData.cleanUp(commonTestHelper)
     }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelinePreviousLastForwardTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelinePreviousLastForwardTest.kt
index 1a36adec44..03ab6e6767 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelinePreviousLastForwardTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelinePreviousLastForwardTest.kt
@@ -33,7 +33,6 @@ import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
 import org.matrix.android.sdk.common.CommonTestHelper
-import org.matrix.android.sdk.common.CryptoTestHelper
 import org.matrix.android.sdk.common.checkSendOrder
 import timber.log.Timber
 import java.util.concurrent.CountDownLatch
@@ -48,9 +47,7 @@ class TimelinePreviousLastForwardTest : InstrumentedTest {
      */
 
     @Test
-    fun previousLastForwardTest() {
-        val commonTestHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
+    fun previousLastForwardTest() = CommonTestHelper.runCryptoTest(context()) { cryptoTestHelper, commonTestHelper ->
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(false)
 
         val aliceSession = cryptoTestData.firstSession
@@ -91,7 +88,7 @@ class TimelinePreviousLastForwardTest : InstrumentedTest {
         }
 
         // Bob stop to sync
-        bobSession.stopSync()
+        bobSession.syncService().stopSync()
 
         val firstMessage = "First messages from Alice"
         // Alice sends 30 messages
@@ -104,7 +101,7 @@ class TimelinePreviousLastForwardTest : InstrumentedTest {
                 .eventId
 
         // Bob start to sync
-        bobSession.startSync(true)
+        bobSession.syncService().startSync(true)
 
         run {
             val lock = CountDownLatch(1)
@@ -128,7 +125,7 @@ class TimelinePreviousLastForwardTest : InstrumentedTest {
         }
 
         // Bob stop to sync
-        bobSession.stopSync()
+        bobSession.syncService().stopSync()
 
         val secondMessage = "Second messages from Alice"
         // Alice sends again 30 messages
@@ -139,7 +136,7 @@ class TimelinePreviousLastForwardTest : InstrumentedTest {
         )
 
         // Bob start to sync
-        bobSession.startSync(true)
+        bobSession.syncService().startSync(true)
 
         run {
             val lock = CountDownLatch(1)
@@ -242,7 +239,5 @@ class TimelinePreviousLastForwardTest : InstrumentedTest {
         }
 
         bobTimeline.dispose()
-
-        cryptoTestData.cleanUp(commonTestHelper)
     }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineSimpleBackPaginationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineSimpleBackPaginationTest.kt
index 42f710d7cf..59b3b14532 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineSimpleBackPaginationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineSimpleBackPaginationTest.kt
@@ -20,6 +20,7 @@ import androidx.test.filters.LargeTest
 import kotlinx.coroutines.runBlocking
 import org.amshove.kluent.internal.assertEquals
 import org.junit.FixMethodOrder
+import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
@@ -32,19 +33,17 @@ import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.model.message.MessageTextContent
 import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
-import org.matrix.android.sdk.common.CommonTestHelper
-import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest
 import org.matrix.android.sdk.common.TestConstants
 
 @RunWith(JUnit4::class)
 @FixMethodOrder(MethodSorters.JVM)
 @LargeTest
+@Ignore
 class TimelineSimpleBackPaginationTest : InstrumentedTest {
 
     @Test
-    fun timeline_backPaginate_shouldReachEndOfTimeline() {
-        val commonTestHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
+    fun timeline_backPaginate_shouldReachEndOfTimeline() = runCryptoTest(context()) { cryptoTestHelper, commonTestHelper ->
         val numberOfMessagesToSent = 200
 
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(false)
@@ -102,6 +101,5 @@ class TimelineSimpleBackPaginationTest : InstrumentedTest {
         assertEquals(numberOfMessagesToSent, onlySentEvents.size)
 
         bobTimeline.dispose()
-        cryptoTestData.cleanUp(commonTestHelper)
     }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineWithManyMembersTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineWithManyMembersTest.kt
index 02430dda74..27ea0e1c3c 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineWithManyMembersTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineWithManyMembersTest.kt
@@ -30,8 +30,7 @@ import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
-import org.matrix.android.sdk.common.CommonTestHelper
-import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest
 import java.util.concurrent.CountDownLatch
 
 /** !! Not working with the new timeline
@@ -47,15 +46,12 @@ class TimelineWithManyMembersTest : InstrumentedTest {
         private const val NUMBER_OF_MEMBERS = 6
     }
 
-    private val commonTestHelper = CommonTestHelper(context())
-    private val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
-
     /**
      * Ensures when someone sends a message to a crowded room, everyone can decrypt the message.
      */
 
     @Test
-    fun everyone_should_decrypt_message_in_a_crowded_room() {
+    fun everyone_should_decrypt_message_in_a_crowded_room() = runCryptoTest(context()) { cryptoTestHelper, commonTestHelper ->
         val cryptoTestData = cryptoTestHelper.doE2ETestWithManyMembers(NUMBER_OF_MEMBERS)
 
         val sessionForFirstMember = cryptoTestData.firstSession
@@ -75,7 +71,7 @@ class TimelineWithManyMembersTest : InstrumentedTest {
             val timelineForCurrentMember = roomForCurrentMember.timelineService().createTimeline(null, TimelineSettings(30))
             timelineForCurrentMember.start()
 
-            session.startSync(true)
+            session.syncService().startSync(true)
 
             run {
                 val lock = CountDownLatch(1)
@@ -96,7 +92,7 @@ class TimelineWithManyMembersTest : InstrumentedTest {
                 timelineForCurrentMember.addListener(eventsListener)
                 commonTestHelper.await(lock, 600_000)
             }
-            session.stopSync()
+            session.syncService().stopSync()
         }
     }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
index e17b7efbd6..7c97426c39 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
@@ -26,9 +26,8 @@ import org.matrix.android.sdk.InstrumentedTest
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.search.SearchResult
-import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest
 import org.matrix.android.sdk.common.CryptoTestData
-import org.matrix.android.sdk.common.CryptoTestHelper
 
 @RunWith(JUnit4::class)
 @FixMethodOrder(MethodSorters.JVM)
@@ -74,9 +73,7 @@ class SearchMessagesTest : InstrumentedTest {
         }
     }
 
-    private fun doTest(block: suspend (CryptoTestData) -> SearchResult) {
-        val commonTestHelper = CommonTestHelper(context())
-        val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
+    private fun doTest(block: suspend (CryptoTestData) -> SearchResult) = runCryptoTest(context()) { cryptoTestHelper, commonTestHelper ->
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceInARoom(false)
         val aliceSession = cryptoTestData.firstSession
         val aliceRoomId = cryptoTestData.roomId
@@ -99,7 +96,5 @@ class SearchMessagesTest : InstrumentedTest {
                             (it.event.content?.get("body") as? String)?.startsWith(MESSAGE).orFalse()
                         }.orFalse()
         )
-
-        cryptoTestData.cleanUp(commonTestHelper)
     }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
index b9760c1bfc..0cc0ef57c4 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
@@ -22,6 +22,7 @@ import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 import org.junit.FixMethodOrder
+import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
@@ -40,7 +41,7 @@ import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomPreset
 import org.matrix.android.sdk.api.session.room.model.create.RoomCreateContent
 import org.matrix.android.sdk.api.session.space.JoinSpaceResult
-import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.CommonTestHelper.Companion.runSessionTest
 import org.matrix.android.sdk.common.SessionTestParams
 
 @RunWith(JUnit4::class)
@@ -49,8 +50,7 @@ import org.matrix.android.sdk.common.SessionTestParams
 class SpaceCreationTest : InstrumentedTest {
 
     @Test
-    fun createSimplePublicSpace() {
-        val commonTestHelper = CommonTestHelper(context())
+    fun createSimplePublicSpace() = runSessionTest(context()) { commonTestHelper ->
         val session = commonTestHelper.createAccount("Hubble", SessionTestParams(true))
         val roomName = "My Space"
         val topic = "A public space for test"
@@ -96,13 +96,11 @@ class SpaceCreationTest : InstrumentedTest {
                 ?.toModel<RoomHistoryVisibilityContent>()?.historyVisibility
 
         assertEquals("Public space room should be world readable", RoomHistoryVisibility.WORLD_READABLE, historyVisibility)
-
-        commonTestHelper.signOutAndClose(session)
     }
 
     @Test
-    fun testJoinSimplePublicSpace() {
-        val commonTestHelper = CommonTestHelper(context())
+    @Ignore
+    fun testJoinSimplePublicSpace() = runSessionTest(context()) { commonTestHelper ->
 
         val aliceSession = commonTestHelper.createAccount("alice", SessionTestParams(true))
         val bobSession = commonTestHelper.createAccount("bob", SessionTestParams(true))
@@ -134,8 +132,7 @@ class SpaceCreationTest : InstrumentedTest {
     }
 
     @Test
-    fun testSimplePublicSpaceWithChildren() {
-        val commonTestHelper = CommonTestHelper(context())
+    fun testSimplePublicSpaceWithChildren() = runSessionTest(context()) { commonTestHelper ->
         val aliceSession = commonTestHelper.createAccount("alice", SessionTestParams(true))
         val bobSession = commonTestHelper.createAccount("bob", SessionTestParams(true))
 
@@ -204,8 +201,5 @@ class SpaceCreationTest : InstrumentedTest {
 //        ).size
 //
 //        assertEquals("Unexpected number of joined children", 1, childCount)
-
-        commonTestHelper.signOutAndClose(aliceSession)
-        commonTestHelper.signOutAndClose(bobSession)
     }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
index 6a17cb74ad..5396251438 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
@@ -29,8 +29,8 @@ import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 import org.junit.runners.MethodSorters
 import org.matrix.android.sdk.InstrumentedTest
-import org.matrix.android.sdk.api.query.ActiveSpaceFilter
 import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.query.SpaceFilter
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toContent
@@ -48,6 +48,7 @@ import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
 import org.matrix.android.sdk.api.session.room.powerlevels.Role
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.CommonTestHelper.Companion.runSessionTest
 import org.matrix.android.sdk.common.SessionTestParams
 
 @RunWith(JUnit4::class)
@@ -55,8 +56,7 @@ import org.matrix.android.sdk.common.SessionTestParams
 class SpaceHierarchyTest : InstrumentedTest {
 
     @Test
-    fun createCanonicalChildRelation() {
-        val commonTestHelper = CommonTestHelper(context())
+    fun createCanonicalChildRelation() = runSessionTest(context()) { commonTestHelper ->
 
         val session = commonTestHelper.createAccount("John", SessionTestParams(true))
         val spaceName = "My Space"
@@ -173,8 +173,7 @@ class SpaceHierarchyTest : InstrumentedTest {
 //    }
 
     @Test
-    fun testFilteringBySpace() {
-        val commonTestHelper = CommonTestHelper(context())
+    fun testFilteringBySpace() = CommonTestHelper.runSessionTest(context()) { commonTestHelper ->
         val session = commonTestHelper.createAccount("John", SessionTestParams(true))
 
         val spaceAInfo = createPublicSpace(
@@ -185,12 +184,12 @@ class SpaceHierarchyTest : InstrumentedTest {
         )
 
         /* val spaceBInfo = */ createPublicSpace(
-                session, "SpaceB", listOf(
-                Triple("B1", true /*auto-join*/, true/*canonical*/),
-                Triple("B2", true, true),
-                Triple("B3", true, true)
-        )
-        )
+            session, "SpaceB", listOf(
+            Triple("B1", true /*auto-join*/, true/*canonical*/),
+            Triple("B2", true, true),
+            Triple("B3", true, true)
+    )
+    )
 
         val spaceCInfo = createPublicSpace(
                 session, "SpaceC", listOf(
@@ -249,15 +248,14 @@ class SpaceHierarchyTest : InstrumentedTest {
 
         Thread.sleep(6_000)
         val orphansUpdate = session.roomService().getRoomSummaries(roomSummaryQueryParams {
-            activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null)
+            spaceFilter = SpaceFilter.OrphanRooms
         })
         assertEquals("Unexpected number of orphan rooms ${orphansUpdate.map { it.name }}", 2, orphansUpdate.size)
     }
 
     @Test
     @Ignore("This test will be ignored until it is fixed")
-    fun testBreakCycle() {
-        val commonTestHelper = CommonTestHelper(context())
+    fun testBreakCycle() = CommonTestHelper.runSessionTest(context()) { commonTestHelper ->
         val session = commonTestHelper.createAccount("John", SessionTestParams(true))
 
         val spaceAInfo = createPublicSpace(
@@ -302,8 +300,7 @@ class SpaceHierarchyTest : InstrumentedTest {
     }
 
     @Test
-    fun testLiveFlatChildren() {
-        val commonTestHelper = CommonTestHelper(context())
+    fun testLiveFlatChildren() = CommonTestHelper.runSessionTest(context()) { commonTestHelper ->
         val session = commonTestHelper.createAccount("John", SessionTestParams(true))
 
         val spaceAInfo = createPublicSpace(
@@ -390,84 +387,87 @@ class SpaceHierarchyTest : InstrumentedTest {
             val roomIds: List<String>
     )
 
-    private fun createPublicSpace(session: Session,
-                                  spaceName: String,
-                                  childInfo: List<Triple<String, Boolean, Boolean?>>
+    private fun createPublicSpace(
+            session: Session,
+            spaceName: String,
+            childInfo: List<Triple<String, Boolean, Boolean?>>
             /** Name, auto-join, canonical*/
     ): TestSpaceCreationResult {
-        val commonTestHelper = CommonTestHelper(context())
         var spaceId = ""
         var roomIds: List<String> = emptyList()
-        commonTestHelper.waitWithLatch { latch ->
-            spaceId = session.spaceService().createSpace(spaceName, "Test Topic", null, true)
-            val syncedSpace = session.spaceService().getSpace(spaceId)
-            val viaServers = listOf(session.sessionParams.homeServerHost ?: "")
+        runSessionTest(context()) { commonTestHelper ->
+            commonTestHelper.waitWithLatch { latch ->
+                spaceId = session.spaceService().createSpace(spaceName, "Test Topic", null, true)
+                val syncedSpace = session.spaceService().getSpace(spaceId)
+                val viaServers = listOf(session.sessionParams.homeServerHost ?: "")
 
-            roomIds = childInfo.map { entry ->
-                session.roomService().createRoom(CreateRoomParams().apply { name = entry.first })
-            }
-            roomIds.forEachIndexed { index, roomId ->
-                syncedSpace!!.addChildren(roomId, viaServers, null, childInfo[index].second)
-                val canonical = childInfo[index].third
-                if (canonical != null) {
-                    session.spaceService().setSpaceParent(roomId, spaceId, canonical, viaServers)
+                roomIds = childInfo.map { entry ->
+                    session.roomService().createRoom(CreateRoomParams().apply { name = entry.first })
                 }
+                roomIds.forEachIndexed { index, roomId ->
+                    syncedSpace!!.addChildren(roomId, viaServers, null, childInfo[index].second)
+                    val canonical = childInfo[index].third
+                    if (canonical != null) {
+                        session.spaceService().setSpaceParent(roomId, spaceId, canonical, viaServers)
+                    }
+                }
+                latch.countDown()
             }
-            latch.countDown()
         }
         return TestSpaceCreationResult(spaceId, roomIds)
     }
 
-    private fun createPrivateSpace(session: Session,
-                                   spaceName: String,
-                                   childInfo: List<Triple<String, Boolean, Boolean?>>
+    private fun createPrivateSpace(
+            session: Session,
+            spaceName: String,
+            childInfo: List<Triple<String, Boolean, Boolean?>>
             /** Name, auto-join, canonical*/
     ): TestSpaceCreationResult {
-        val commonTestHelper = CommonTestHelper(context())
         var spaceId = ""
         var roomIds: List<String> = emptyList()
-        commonTestHelper.waitWithLatch { latch ->
-            spaceId = session.spaceService().createSpace(spaceName, "My Private Space", null, false)
-            val syncedSpace = session.spaceService().getSpace(spaceId)
-            val viaServers = listOf(session.sessionParams.homeServerHost ?: "")
-            roomIds =
-                    childInfo.map { entry ->
-                        val homeServerCapabilities = session
-                                .homeServerCapabilitiesService()
-                                .getHomeServerCapabilities()
-                        session.roomService().createRoom(CreateRoomParams().apply {
-                            name = entry.first
-                            this.featurePreset = RestrictedRoomPreset(
-                                    homeServerCapabilities,
-                                    listOf(
-                                            RoomJoinRulesAllowEntry.restrictedToRoom(spaceId)
-                                    )
-                            )
-                        })
+        runSessionTest(context()) { commonTestHelper ->
+            commonTestHelper.waitWithLatch { latch ->
+                spaceId = session.spaceService().createSpace(spaceName, "My Private Space", null, false)
+                val syncedSpace = session.spaceService().getSpace(spaceId)
+                val viaServers = listOf(session.sessionParams.homeServerHost ?: "")
+                roomIds =
+                        childInfo.map { entry ->
+                            val homeServerCapabilities = session
+                                    .homeServerCapabilitiesService()
+                                    .getHomeServerCapabilities()
+                            session.roomService().createRoom(CreateRoomParams().apply {
+                                name = entry.first
+                                this.featurePreset = RestrictedRoomPreset(
+                                        homeServerCapabilities,
+                                        listOf(
+                                                RoomJoinRulesAllowEntry.restrictedToRoom(spaceId)
+                                        )
+                                )
+                            })
+                        }
+                roomIds.forEachIndexed { index, roomId ->
+                    syncedSpace!!.addChildren(roomId, viaServers, null, childInfo[index].second)
+                    val canonical = childInfo[index].third
+                    if (canonical != null) {
+                        session.spaceService().setSpaceParent(roomId, spaceId, canonical, viaServers)
                     }
-            roomIds.forEachIndexed { index, roomId ->
-                syncedSpace!!.addChildren(roomId, viaServers, null, childInfo[index].second)
-                val canonical = childInfo[index].third
-                if (canonical != null) {
-                    session.spaceService().setSpaceParent(roomId, spaceId, canonical, viaServers)
                 }
+                latch.countDown()
             }
-            latch.countDown()
         }
         return TestSpaceCreationResult(spaceId, roomIds)
     }
 
     @Test
-    fun testRootSpaces() {
-        val commonTestHelper = CommonTestHelper(context())
+    fun testRootSpaces() = runSessionTest(context()) { commonTestHelper ->
         val session = commonTestHelper.createAccount("John", SessionTestParams(true))
 
         /* val spaceAInfo = */ createPublicSpace(
-                session, "SpaceA", listOf(
-                Triple("A1", true /*auto-join*/, true/*canonical*/),
-                Triple("A2", true, true)
-        )
-        )
+            session, "SpaceA", listOf(
+            Triple("A1", true /*auto-join*/, true/*canonical*/),
+            Triple("A2", true, true)
+    )
+    )
 
         val spaceBInfo = createPublicSpace(
                 session, "SpaceB", listOf(
@@ -506,13 +506,10 @@ class SpaceHierarchyTest : InstrumentedTest {
         }
 
         assertEquals("Unexpected number of root spaces ${rootSpaces.map { it.name }}", 2, rootSpaces.size)
-
-        commonTestHelper.signOutAndClose(session)
     }
 
     @Test
-    fun testParentRelation() {
-        val commonTestHelper = CommonTestHelper(context())
+    fun testParentRelation() = runSessionTest(context()) { commonTestHelper ->
         val aliceSession = commonTestHelper.createAccount("Alice", SessionTestParams(true))
         val bobSession = commonTestHelper.createAccount("Bib", SessionTestParams(true))
 
@@ -604,8 +601,5 @@ class SpaceHierarchyTest : InstrumentedTest {
                 bobSession.getRoomSummary(bobRoomId)?.flattenParentIds?.contains(spaceAInfo.spaceId) == true
             }
         }
-
-        commonTestHelper.signOutAndClose(aliceSession)
-        commonTestHelper.signOutAndClose(bobSession)
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/RoomDisplayNameFallbackProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/RoomDisplayNameFallbackProvider.kt
index a34dbcc196..3c376b55ee 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/RoomDisplayNameFallbackProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/RoomDisplayNameFallbackProvider.kt
@@ -16,6 +16,14 @@
 
 package org.matrix.android.sdk.api
 
+/**
+ * This interface exists to let the implementation provide localized room display name fallback.
+ * The methods can be called when the room has no name, i.e. its `m.room.name` state event does not exist or
+ * the name in it is an empty String.
+ * It allows the SDK to store the room name fallback into the local storage and so let the client do
+ * queries on the room name.
+ * *Limitation*: if the locale of the device changes, the methods will not be called again.
+ */
 interface RoomDisplayNameFallbackProvider {
     fun getNameForRoomInvite(): String
     fun getNameForEmptyRoom(isDirect: Boolean, leftMemberNames: List<String>): String
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
index 5a19df90c4..5ae70e1978 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
@@ -28,9 +28,11 @@ import org.matrix.android.sdk.api.session.Session
  * This interface defines methods to authenticate or to create an account to a matrix server.
  */
 interface AuthenticationService {
+
     /**
      * Request the supported login flows for this homeserver.
-     * This is the first method to call to be able to get a wizard to login or to create an account
+     * This is the first method to call to be able to get a wizard to login or to create an account.
+     * @param homeServerConnectionConfig contains the homeserver URL to login to, a wellKnown lookup will be attempted.
      */
     suspend fun getLoginFlow(homeServerConnectionConfig: HomeServerConnectionConfig): LoginFlowResult
 
@@ -66,7 +68,7 @@ interface AuthenticationService {
     /**
      * True when login and password has been sent with success to the homeserver.
      */
-    val isRegistrationStarted: Boolean
+    fun isRegistrationStarted(): Boolean
 
     /**
      * Cancel pending login or pending registration.
@@ -93,14 +95,18 @@ interface AuthenticationService {
     /**
      * Create a session after a SSO successful login.
      */
-    suspend fun createSessionFromSso(homeServerConnectionConfig: HomeServerConnectionConfig,
-                                     credentials: Credentials): Session
+    suspend fun createSessionFromSso(
+            homeServerConnectionConfig: HomeServerConnectionConfig,
+            credentials: Credentials
+    ): Session
 
     /**
      * Perform a wellknown request, using the domain from the matrixId.
      */
-    suspend fun getWellKnownData(matrixId: String,
-                                 homeServerConnectionConfig: HomeServerConnectionConfig?): WellknownResult
+    suspend fun getWellKnownData(
+            matrixId: String,
+            homeServerConnectionConfig: HomeServerConnectionConfig?
+    ): WellknownResult
 
     /**
      * Authenticate with a matrixId and a password.
@@ -111,9 +117,11 @@ interface AuthenticationService {
      * @param initialDeviceName the initial device name
      * @param deviceId the device id, optional. If not provided or null, the server will generate one.
      */
-    suspend fun directAuthentication(homeServerConnectionConfig: HomeServerConnectionConfig,
-                                     matrixId: String,
-                                     password: String,
-                                     initialDeviceName: String,
-                                     deviceId: String? = null): Session
+    suspend fun directAuthentication(
+            homeServerConnectionConfig: HomeServerConnectionConfig,
+            matrixId: String,
+            password: String,
+            initialDeviceName: String,
+            deviceId: String? = null
+    ): Session
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/converter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/converter.kt
index 80630bc4e7..c840a7453d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/converter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/converter.kt
@@ -41,8 +41,10 @@ import org.matrix.android.sdk.api.auth.registration.TermPolicies
  * @param userLanguage the user language
  * @param defaultLanguage the default language to use if the user language is not found for a policy in registrationFlowResponse
  */
-fun TermPolicies.toLocalizedLoginTerms(userLanguage: String,
-                                       defaultLanguage: String = "en"): List<LocalizedFlowDataLoginTerms> {
+fun TermPolicies.toLocalizedLoginTerms(
+        userLanguage: String,
+        defaultLanguage: String = "en"
+): List<LocalizedFlowDataLoginTerms> {
     val result = ArrayList<LocalizedFlowDataLoginTerms>()
 
     val policies = get("policies")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/login/LoginWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/login/LoginWizard.kt
index 3232025de3..5b8d2328c7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/login/LoginWizard.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/login/LoginWizard.kt
@@ -39,10 +39,12 @@ interface LoginWizard {
      * @param deviceId the device id, optional. If not provided or null, the server will generate one.
      * @return a [Session] if the login is successful
      */
-    suspend fun login(login: String,
-                      password: String,
-                      initialDeviceName: String,
-                      deviceId: String? = null): Session
+    suspend fun login(
+            login: String,
+            password: String,
+            initialDeviceName: String,
+            deviceId: String? = null
+    ): Session
 
     /**
      * Exchange a login token to an access token.
@@ -63,14 +65,14 @@ interface LoginWizard {
      * [resetPasswordMailConfirmed] is successfully called.
      *
      * @param email an email previously associated to the account the user wants the password to be reset.
-     * @param newPassword the desired new password
      */
-    suspend fun resetPassword(email: String,
-                              newPassword: String)
+    suspend fun resetPassword(email: String)
 
     /**
      * Confirm the new password, once the user has checked their email
      * When this method succeed, tha account password will be effectively modified.
+     *
+     * @param newPassword the desired new password
      */
-    suspend fun resetPasswordMailConfirmed()
+    suspend fun resetPasswordMailConfirmed(newPassword: String)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationResult.kt
index 439b4beb41..9e6b2b3ad9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationResult.kt
@@ -18,13 +18,31 @@ package org.matrix.android.sdk.api.auth.registration
 
 import org.matrix.android.sdk.api.session.Session
 
-// Either a session or an object containing data about registration stages
+/**
+ * Either a session or an object containing data about registration stages.
+ */
 sealed class RegistrationResult {
+    /**
+     * The registration is successful, the [Session] is provided.
+     */
     data class Success(val session: Session) : RegistrationResult()
+
+    /**
+     * The registration still miss some steps. See [FlowResult] to know the details.
+     */
     data class FlowResponse(val flowResult: FlowResult) : RegistrationResult()
 }
 
+/**
+ * Information about the missing and completed [Stage].
+ */
 data class FlowResult(
+        /**
+         * List of missing stages.
+         */
         val missingStages: List<Stage>,
+        /**
+         * List of completed stages.
+         */
         val completedStages: List<Stage>
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt
index 0cda64499f..995fd27ace 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt
@@ -54,9 +54,11 @@ interface RegistrationWizard {
      * @param password the desired password
      * @param initialDeviceDisplayName the device display name
      */
-    suspend fun createAccount(userName: String?,
-                              password: String?,
-                              initialDeviceDisplayName: String?): RegistrationResult
+    suspend fun createAccount(
+            userName: String?,
+            password: String?,
+            initialDeviceDisplayName: String?
+    ): RegistrationResult
 
     /**
      * Perform the "m.login.recaptcha" stage.
@@ -109,14 +111,14 @@ interface RegistrationWizard {
     suspend fun checkIfEmailHasBeenValidated(delayMillis: Long): RegistrationResult
 
     /**
-     * This is the current ThreePid, waiting for validation. The SDK will store it in database, so it can be
+     * Returns the current ThreePid, waiting for validation. The SDK will store it in database, so it can be
      * restored even if the app has been killed during the registration
      */
-    val currentThreePid: String?
+    fun getCurrentThreePid(): String?
 
     /**
-     * True when login and password have been sent with success to the homeserver, i.e. [createAccount] has been
+     * Return true when login and password have been sent with success to the homeserver, i.e. [createAccount] has been
      * called successfully.
      */
-    val isRegistrationStarted: Boolean
+    fun isRegistrationStarted(): Boolean
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/Stage.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/Stage.kt
index c21b667cf7..281b0c2808 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/Stage.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/Stage.kt
@@ -16,25 +16,40 @@
 
 package org.matrix.android.sdk.api.auth.registration
 
+/**
+ * Registration stages.
+ */
 sealed class Stage(open val mandatory: Boolean) {
 
-    // m.login.recaptcha
+    /**
+     * m.login.recaptcha stage.
+     */
     data class ReCaptcha(override val mandatory: Boolean, val publicKey: String) : Stage(mandatory)
 
-    // m.login.email.identity
+    /**
+     * m.login.email.identity stage.
+     */
     data class Email(override val mandatory: Boolean) : Stage(mandatory)
 
-    // m.login.msisdn
+    /**
+     * m.login.msisdn stage.
+     */
     data class Msisdn(override val mandatory: Boolean) : Stage(mandatory)
 
-    // m.login.dummy, can be mandatory if there is no other stages. In this case the account cannot be created by just sending a username
-    // and a password, the dummy stage has to be done
+    /**
+     * m.login.dummy, can be mandatory if there is no other stages. In this case the account cannot be created by just sending a username
+     * and a password, the dummy stage has to be done.
+     */
     data class Dummy(override val mandatory: Boolean) : Stage(mandatory)
 
-    // Undocumented yet: m.login.terms
+    /**
+     * Undocumented yet: m.login.terms stage.
+     */
     data class Terms(override val mandatory: Boolean, val policies: TermPolicies) : Stage(mandatory)
 
-    // For unknown stages
+    /**
+     * For unknown stages.
+     */
     data class Other(override val mandatory: Boolean, val type: String, val params: Map<*, *>?) : Stage(mandatory)
 }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/wellknown/WellknownResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/wellknown/WellknownResult.kt
index 56257db79c..ea5570db1c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/wellknown/WellknownResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/wellknown/WellknownResult.kt
@@ -26,9 +26,11 @@ sealed class WellknownResult {
      * Retrieve the specific piece of information from the user in a way which fits within the existing client user experience,
      * if the client is inclined to do so. Failure can take place instead if no good user experience for this is possible at this point.
      */
-    data class Prompt(val homeServerUrl: String,
-                      val identityServerUrl: String?,
-                      val wellKnown: WellKnown) : WellknownResult()
+    data class Prompt(
+            val homeServerUrl: String,
+            val identityServerUrl: String?,
+            val wellKnown: WellKnown
+    ) : WellknownResult()
 
     /**
      * Stop the current auto-discovery mechanism. If no more auto-discovery mechanisms are available,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/cache/CacheStrategy.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/cache/CacheStrategy.kt
index 2880d851d6..ddf76d6e42 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/cache/CacheStrategy.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/cache/CacheStrategy.kt
@@ -17,13 +17,19 @@
 package org.matrix.android.sdk.api.cache
 
 sealed class CacheStrategy {
-    // Data is always fetched from the server
+    /**
+     * Data is always fetched from the server.
+     */
     object NoCache : CacheStrategy()
 
-    // Once data is retrieved, it is stored for the provided amount of time.
-    // In case of error, and if strict is set to false, the cache can be returned if available
+    /**
+     * Once data is retrieved, it is stored for the provided amount of time.
+     * In case of error, and if strict is set to false, the cache can be returned if available
+     */
     data class TtlCache(val validityDurationInMillis: Long, val strict: Boolean) : CacheStrategy()
 
-    // Once retrieved, the data is stored in cache and will be always get from the cache
+    /**
+     * Once retrieved, the data is stored in cache and will be always get from the cache.
+     */
     object InfiniteCache : CacheStrategy()
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Strings.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Strings.kt
index 5e1350e327..2a8848e80a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Strings.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Strings.kt
@@ -27,3 +27,8 @@ fun CharSequence.ensurePrefix(prefix: CharSequence): CharSequence {
  * Append a new line and then the provided string.
  */
 fun StringBuilder.appendNl(str: String) = append("\n").append(str)
+
+/**
+ * Returns null if the string is empty.
+ */
+fun String.ensureNotEmpty() = ifEmpty { null }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Failure.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Failure.kt
index be139fd82b..7d4f553bed 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Failure.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Failure.kt
@@ -37,7 +37,9 @@ sealed class Failure(cause: Throwable? = null) : Throwable(cause = cause) {
     data class ServerError(val error: MatrixError, val httpCode: Int) : Failure(RuntimeException(error.toString()))
     object SuccessError : Failure(RuntimeException(RuntimeException("SuccessResult is false")))
 
-    // When server send an error, but it cannot be interpreted as a MatrixError
+    /**
+     * When server send an error, but it cannot be interpreted as a MatrixError.
+     */
     data class OtherServerError(val errorBody: String, val httpCode: Int) : Failure(RuntimeException("HTTP $httpCode: $errorBody"))
 
     data class RegistrationFlowError(val registrationFlowResponse: RegistrationFlowResponse) : Failure(RuntimeException(registrationFlowResponse.toString()))
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/QueryStringValue.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/QueryStringValue.kt
index 368ff98661..f08c86885d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/QueryStringValue.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/QueryStringValue.kt
@@ -20,20 +20,52 @@ package org.matrix.android.sdk.api.query
  * Basic query language. All these cases are mutually exclusive.
  */
 sealed interface QueryStringValue {
+    /**
+     * No condition, i.e. there will be no test on the tested field.
+     */
+    object NoCondition : QueryStringValue
+
+    /**
+     * The tested field has to be null.
+     */
+    object IsNull : QueryStringValue
+
+    /**
+     * The tested field has to be not null.
+     */
+    object IsNotNull : QueryStringValue
+
+    /**
+     * The tested field has to be empty.
+     */
+    object IsEmpty : QueryStringValue
+
+    /**
+     * The tested field has to not empty.
+     */
+    object IsNotEmpty : QueryStringValue
+
+    /**
+     * Interface to check String content.
+     */
     sealed interface ContentQueryStringValue : QueryStringValue {
         val string: String
         val case: Case
     }
 
-    object NoCondition : QueryStringValue
-    object IsNull : QueryStringValue
-    object IsNotNull : QueryStringValue
-    object IsEmpty : QueryStringValue
-    object IsNotEmpty : QueryStringValue
-
+    /**
+     * The tested field must match the [string].
+     */
     data class Equals(override val string: String, override val case: Case = Case.SENSITIVE) : ContentQueryStringValue
+
+    /**
+     * The tested field must contain the [string].
+     */
     data class Contains(override val string: String, override val case: Case = Case.SENSITIVE) : ContentQueryStringValue
 
+    /**
+     * Case enum for [ContentQueryStringValue].
+     */
     enum class Case {
         /**
          * Match query sensitive to case.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/RoomCategoryFilter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/RoomCategoryFilter.kt
index c8ccc4c8a3..c2117adbd3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/RoomCategoryFilter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/RoomCategoryFilter.kt
@@ -16,9 +16,23 @@
 
 package org.matrix.android.sdk.api.query
 
+/**
+ * To filter by Room category.
+ * @see [org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams]
+ */
 enum class RoomCategoryFilter {
+    /**
+     * Get only the DM, i.e. the rooms referenced in `m.direct` account data.
+     */
     ONLY_DM,
+
+    /**
+     * Get only the Room, not the DM, i.e. the rooms not referenced in `m.direct` account data.
+     */
     ONLY_ROOMS,
+
+    /**
+     * Get the room with non-0 notifications.
+     */
     ONLY_WITH_NOTIFICATIONS,
-    ALL
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/RoomTagQueryFilter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/RoomTagQueryFilter.kt
index 613916bc18..73947f8f7a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/RoomTagQueryFilter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/RoomTagQueryFilter.kt
@@ -16,8 +16,22 @@
 
 package org.matrix.android.sdk.api.query
 
+/**
+ * Filter room by their tag.
+ * @see [org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams]
+ * @see [org.matrix.android.sdk.api.session.room.model.tag.RoomTag]
+ */
 data class RoomTagQueryFilter(
+        /**
+         * Set to true to get the rooms which have the tag "m.favourite".
+         */
         val isFavorite: Boolean?,
+        /**
+         * Set to true to get the rooms which have the tag "m.lowpriority".
+         */
         val isLowPriority: Boolean?,
-        val isServerNotice: Boolean?
+        /**
+         * Set to true to get the rooms which have the tag "m.server_notice".
+         */
+        val isServerNotice: Boolean?,
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/SpaceFilter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/SpaceFilter.kt
new file mode 100644
index 0000000000..6383412ffb
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/SpaceFilter.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.query
+
+/**
+ * Filter to be used to do room queries regarding the space hierarchy.
+ * @see [org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams]
+ */
+sealed interface SpaceFilter {
+    /**
+     * Used to get all the rooms that are not in any space.
+     */
+    object OrphanRooms : SpaceFilter
+
+    /**
+     * Used to get all the rooms that have the provided space in their parent hierarchy.
+     */
+    data class ActiveSpace(val spaceId: String) : SpaceFilter
+
+    /**
+     * Used to get all the rooms that do not have the provided space in their parent hierarchy.
+     */
+    data class ExcludeSpace(val spaceId: String) : SpaceFilter
+}
+
+/**
+ * Return a [SpaceFilter.ActiveSpace] if the String is not null, or [SpaceFilter.OrphanRooms].
+ */
+fun String?.toActiveSpaceOrOrphanRooms(): SpaceFilter = this?.let { SpaceFilter.ActiveSpace(it) } ?: SpaceFilter.OrphanRooms
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
index 2f1ae8cd87..b3a629094c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
@@ -17,8 +17,6 @@
 package org.matrix.android.sdk.api.session
 
 import androidx.annotation.MainThread
-import androidx.lifecycle.LiveData
-import kotlinx.coroutines.flow.SharedFlow
 import okhttp3.OkHttpClient
 import org.matrix.android.sdk.api.MatrixCoroutineDispatchers
 import org.matrix.android.sdk.api.auth.data.SessionParams
@@ -37,7 +35,6 @@ import org.matrix.android.sdk.api.session.file.FileService
 import org.matrix.android.sdk.api.session.group.GroupService
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilitiesService
 import org.matrix.android.sdk.api.session.identity.IdentityService
-import org.matrix.android.sdk.api.session.initsync.SyncStatusService
 import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerService
 import org.matrix.android.sdk.api.session.media.MediaService
 import org.matrix.android.sdk.api.session.openid.OpenIdService
@@ -55,8 +52,7 @@ import org.matrix.android.sdk.api.session.signout.SignOutService
 import org.matrix.android.sdk.api.session.space.SpaceService
 import org.matrix.android.sdk.api.session.statistics.StatisticsListener
 import org.matrix.android.sdk.api.session.sync.FilterService
-import org.matrix.android.sdk.api.session.sync.SyncState
-import org.matrix.android.sdk.api.session.sync.model.SyncResponse
+import org.matrix.android.sdk.api.session.sync.SyncService
 import org.matrix.android.sdk.api.session.terms.TermsService
 import org.matrix.android.sdk.api.session.thirdparty.ThirdPartyService
 import org.matrix.android.sdk.api.session.typing.TypingUsersTracker
@@ -98,59 +94,11 @@ interface Session {
     @MainThread
     fun open()
 
-    /**
-     * Requires a one time background sync.
-     */
-    fun requireBackgroundSync()
-
-    /**
-     * Launches infinite self rescheduling background syncs via the WorkManager.
-     *
-     * While dozing, syncs will only occur during maintenance windows.
-     * For reliability it's recommended to also start a long running foreground service
-     * along with disabling battery optimizations.
-     */
-    fun startAutomaticBackgroundSync(timeOutInSeconds: Long, repeatDelayInSeconds: Long)
-
-    fun stopAnyBackgroundSync()
-
-    /**
-     * This method start the sync thread.
-     */
-    fun startSync(fromForeground: Boolean)
-
-    /**
-     * This method stop the sync thread.
-     */
-    fun stopSync()
-
     /**
      * Clear cache of the session.
      */
     suspend fun clearCache()
 
-    /**
-     * This method allows to listen the sync state.
-     * @return a [LiveData] of [SyncState].
-     */
-    fun getSyncStateLive(): LiveData<SyncState>
-
-    /**
-     * This method returns the current sync state.
-     * @return the current [SyncState].
-     */
-    fun getSyncState(): SyncState
-
-    /**
-     * This method returns a flow of SyncResponse. New value will be pushed through the sync thread.
-     */
-    fun syncFlow(): SharedFlow<SyncResponse>
-
-    /**
-     * This methods return true if an initial sync has been processed.
-     */
-    fun hasAlreadySynced(): Boolean
-
     /**
      * This method allow to close a session. It does stop some services.
      */
@@ -247,9 +195,9 @@ interface Session {
     fun termsService(): TermsService
 
     /**
-     * Returns the SyncStatusService associated with the session.
+     * Returns the SyncService associated with the session.
      */
-    fun syncStatusService(): SyncStatusService
+    fun syncService(): SyncService
 
     /**
      * Returns the SecureStorageService associated with the session.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/account/AccountService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/account/AccountService.kt
index 1f28dbd8af..e3d52adfc5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/account/AccountService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/account/AccountService.kt
@@ -27,8 +27,10 @@ interface AccountService {
      * @param password Current password.
      * @param newPassword New password
      */
-    suspend fun changePassword(password: String,
-                               newPassword: String)
+    suspend fun changePassword(
+            password: String,
+            newPassword: String
+    )
 
     /**
      * Deactivate the account.
@@ -46,6 +48,8 @@ interface AccountService {
      * an incomplete view of conversations
      * @param userInteractiveAuthInterceptor see [UserInteractiveAuthInterceptor]
      */
-    suspend fun deactivateAccount(eraseAllData: Boolean,
-                                  userInteractiveAuthInterceptor: UserInteractiveAuthInterceptor)
+    suspend fun deactivateAccount(
+            eraseAllData: Boolean,
+            userInteractiveAuthInterceptor: UserInteractiveAuthInterceptor
+    )
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/MxCall.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/MxCall.kt
index e13f7310e0..c87ac3c821 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/MxCall.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/MxCall.kt
@@ -91,10 +91,12 @@ interface MxCall : MxCallDetail {
      * Send a m.call.replaces event to initiate call transfer.
      * See [org.matrix.android.sdk.api.session.room.model.call.CallReplacesContent] for documentation about the parameters
      */
-    suspend fun transfer(targetUserId: String,
-                         targetRoomId: String?,
-                         createCallId: String?,
-                         awaitCallId: String?)
+    suspend fun transfer(
+            targetUserId: String,
+            targetRoomId: String?,
+            createCallId: String?,
+            awaitCallId: String?
+    )
 
     fun addListener(listener: StateListener)
     fun removeListener(listener: StateListener)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt
index 35f3ab3162..9cc87b6f71 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt
@@ -88,9 +88,11 @@ interface CryptoService {
 
     fun getDeviceTrackingStatus(userId: String): Int
 
-    suspend fun importRoomKeys(roomKeysAsArray: ByteArray,
-                               password: String,
-                               progressListener: ProgressListener?): ImportRoomKeysResult
+    suspend fun importRoomKeys(
+            roomKeysAsArray: ByteArray,
+            password: String,
+            progressListener: ProgressListener?
+    ): ImportRoomKeysResult
 
     suspend fun exportRoomKeys(password: String): ByteArray
 
@@ -119,10 +121,12 @@ interface CryptoService {
     fun isRoomEncrypted(roomId: String): Boolean
 
     // TODO This could be removed from this interface
-    fun encryptEventContent(eventContent: Content,
-                            eventType: String,
-                            roomId: String,
-                            callback: MatrixCallback<MXEncryptEventContentResult>)
+    fun encryptEventContent(
+            eventContent: Content,
+            eventType: String,
+            roomId: String,
+            callback: MatrixCallback<MXEncryptEventContentResult>
+    )
 
     fun discardOutboundSession(roomId: String)
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/MXCryptoError.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/MXCryptoError.kt
index 0b5bbe3bbd..94ee7ba403 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/MXCryptoError.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/MXCryptoError.kt
@@ -25,12 +25,14 @@ import org.matrix.olm.OlmException
  */
 sealed class MXCryptoError : Throwable() {
 
-    data class Base(val errorType: ErrorType,
-                    val technicalMessage: String,
-                    /**
-                     * Describe the error with more details.
-                     */
-                    val detailedErrorDescription: String? = null) : MXCryptoError()
+    data class Base(
+            val errorType: ErrorType,
+            val technicalMessage: String,
+            /**
+             * Describe the error with more details.
+             */
+            val detailedErrorDescription: String? = null
+    ) : MXCryptoError()
 
     data class OlmError(val olmException: OlmException) : MXCryptoError()
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/OutgoingKeyRequest.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/OutgoingKeyRequest.kt
index 855f17a34f..7202be7a21 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/OutgoingKeyRequest.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/OutgoingKeyRequest.kt
@@ -26,7 +26,7 @@ data class RequestReply(
 )
 
 sealed class RequestResult {
-    data class  Success(val chainIndex: Int) : RequestResult()
+    data class Success(val chainIndex: Int) : RequestResult()
     data class Failure(val code: WithHeldCode) : RequestResult()
 }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CrossSigningService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CrossSigningService.kt
index 5439389096..69f314f76f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CrossSigningService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CrossSigningService.kt
@@ -37,14 +37,18 @@ interface CrossSigningService {
      * Initialize cross signing for this user.
      * Users needs to enter credentials
      */
-    fun initializeCrossSigning(uiaInterceptor: UserInteractiveAuthInterceptor?,
-                               callback: MatrixCallback<Unit>)
+    fun initializeCrossSigning(
+            uiaInterceptor: UserInteractiveAuthInterceptor?,
+            callback: MatrixCallback<Unit>
+    )
 
     fun isCrossSigningInitialized(): Boolean = getMyCrossSigningKeys() != null
 
-    fun checkTrustFromPrivateKeys(masterKeyPrivateKey: String?,
-                                  uskKeyPrivateKey: String?,
-                                  sskPrivateKey: String?): UserTrustResult
+    fun checkTrustFromPrivateKeys(
+            masterKeyPrivateKey: String?,
+            uskKeyPrivateKey: String?,
+            sskPrivateKey: String?
+    ): UserTrustResult
 
     fun getUserCrossSigningKeys(otherUserId: String): MXCrossSigningInfo?
 
@@ -60,20 +64,26 @@ interface CrossSigningService {
 
     fun allPrivateKeysKnown(): Boolean
 
-    fun trustUser(otherUserId: String,
-                  callback: MatrixCallback<Unit>)
+    fun trustUser(
+            otherUserId: String,
+            callback: MatrixCallback<Unit>
+    )
 
     fun markMyMasterKeyAsTrusted()
 
     /**
      * Sign one of your devices and upload the signature.
      */
-    fun trustDevice(deviceId: String,
-                    callback: MatrixCallback<Unit>)
+    fun trustDevice(
+            deviceId: String,
+            callback: MatrixCallback<Unit>
+    )
 
-    fun checkDeviceTrust(otherUserId: String,
-                         otherDeviceId: String,
-                         locallyTrusted: Boolean?): DeviceTrustResult
+    fun checkDeviceTrust(
+            otherUserId: String,
+            otherDeviceId: String,
+            locallyTrusted: Boolean?
+    ): DeviceTrustResult
 
     // FIXME Those method do not have to be in the service
     fun onSecretMSKGossip(mskPrivateKey: String)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupService.kt
index 9029c7f8a3..8745003f9f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupService.kt
@@ -36,8 +36,10 @@ interface KeysBackupService {
      * @param keysBackupCreationInfo the info object from [prepareKeysBackupVersion].
      * @param callback Asynchronous callback
      */
-    fun createKeysBackupVersion(keysBackupCreationInfo: MegolmBackupCreationInfo,
-                                callback: MatrixCallback<KeysVersion>)
+    fun createKeysBackupVersion(
+            keysBackupCreationInfo: MegolmBackupCreationInfo,
+            callback: MatrixCallback<KeysVersion>
+    )
 
     /**
      * Facility method to get the total number of locally stored keys.
@@ -55,8 +57,10 @@ interface KeysBackupService {
      * @param progressListener the callback to follow the progress
      * @param callback the main callback
      */
-    fun backupAllGroupSessions(progressListener: ProgressListener?,
-                               callback: MatrixCallback<Unit>?)
+    fun backupAllGroupSessions(
+            progressListener: ProgressListener?,
+            callback: MatrixCallback<Unit>?
+    )
 
     /**
      * Check trust on a key backup version.
@@ -64,8 +68,10 @@ interface KeysBackupService {
      * @param keysBackupVersion the backup version to check.
      * @param callback block called when the operations completes.
      */
-    fun getKeysBackupTrust(keysBackupVersion: KeysVersionResult,
-                           callback: MatrixCallback<KeysBackupVersionTrust>)
+    fun getKeysBackupTrust(
+            keysBackupVersion: KeysVersionResult,
+            callback: MatrixCallback<KeysBackupVersionTrust>
+    )
 
     /**
      * Return the current progress of the backup.
@@ -79,8 +85,10 @@ interface KeysBackupService {
      * @param version the backup version
      * @param callback
      */
-    fun getVersion(version: String,
-                   callback: MatrixCallback<KeysVersionResult?>)
+    fun getVersion(
+            version: String,
+            callback: MatrixCallback<KeysVersionResult?>
+    )
 
     /**
      * This method fetches the last backup version on the server, then compare to the currently backup version use.
@@ -114,9 +122,11 @@ interface KeysBackupService {
      * @param progressListener a progress listener, as generating private key from password may take a while
      * @param callback Asynchronous callback
      */
-    fun prepareKeysBackupVersion(password: String?,
-                                 progressListener: ProgressListener?,
-                                 callback: MatrixCallback<MegolmBackupCreationInfo>)
+    fun prepareKeysBackupVersion(
+            password: String?,
+            progressListener: ProgressListener?,
+            callback: MatrixCallback<MegolmBackupCreationInfo>
+    )
 
     /**
      * Delete a keys backup version. It will delete all backed up keys on the server, and the backup itself.
@@ -125,8 +135,10 @@ interface KeysBackupService {
      * @param version the backup version to delete.
      * @param callback Asynchronous callback
      */
-    fun deleteBackup(version: String,
-                     callback: MatrixCallback<Unit>?)
+    fun deleteBackup(
+            version: String,
+            callback: MatrixCallback<Unit>?
+    )
 
     /**
      * Ask if the backup on the server contains keys that we may do not have locally.
@@ -142,9 +154,11 @@ interface KeysBackupService {
      * @param trust the trust to set to the keys backup.
      * @param callback block called when the operations completes.
      */
-    fun trustKeysBackupVersion(keysBackupVersion: KeysVersionResult,
-                               trust: Boolean,
-                               callback: MatrixCallback<Unit>)
+    fun trustKeysBackupVersion(
+            keysBackupVersion: KeysVersionResult,
+            trust: Boolean,
+            callback: MatrixCallback<Unit>
+    )
 
     /**
      * Set trust on a keys backup version.
@@ -153,9 +167,11 @@ interface KeysBackupService {
      * @param recoveryKey the recovery key to challenge with the key backup public key.
      * @param callback block called when the operations completes.
      */
-    fun trustKeysBackupVersionWithRecoveryKey(keysBackupVersion: KeysVersionResult,
-                                              recoveryKey: String,
-                                              callback: MatrixCallback<Unit>)
+    fun trustKeysBackupVersionWithRecoveryKey(
+            keysBackupVersion: KeysVersionResult,
+            recoveryKey: String,
+            callback: MatrixCallback<Unit>
+    )
 
     /**
      * Set trust on a keys backup version.
@@ -164,11 +180,11 @@ interface KeysBackupService {
      * @param password the pass phrase to challenge with the keyBackupVersion public key.
      * @param callback block called when the operations completes.
      */
-    fun trustKeysBackupVersionWithPassphrase(keysBackupVersion: KeysVersionResult,
-                                             password: String,
-                                             callback: MatrixCallback<Unit>)
-
-    fun onSecretKeyGossip(secret: String)
+    fun trustKeysBackupVersionWithPassphrase(
+            keysBackupVersion: KeysVersionResult,
+            password: String,
+            callback: MatrixCallback<Unit>
+    )
 
     /**
      * Restore a backup with a recovery key from a given backup version stored on the homeserver.
@@ -180,11 +196,14 @@ interface KeysBackupService {
      * @param stepProgressListener the step progress listener
      * @param callback Callback. It provides the number of found keys and the number of successfully imported keys.
      */
-    fun restoreKeysWithRecoveryKey(keysVersionResult: KeysVersionResult,
-                                   recoveryKey: String, roomId: String?,
-                                   sessionId: String?,
-                                   stepProgressListener: StepProgressListener?,
-                                   callback: MatrixCallback<ImportRoomKeysResult>)
+    fun restoreKeysWithRecoveryKey(
+            keysVersionResult: KeysVersionResult,
+            recoveryKey: String,
+            roomId: String?,
+            sessionId: String?,
+            stepProgressListener: StepProgressListener?,
+            callback: MatrixCallback<ImportRoomKeysResult>
+    )
 
     /**
      * Restore a backup with a password from a given backup version stored on the homeserver.
@@ -196,18 +215,23 @@ interface KeysBackupService {
      * @param stepProgressListener the step progress listener
      * @param callback Callback. It provides the number of found keys and the number of successfully imported keys.
      */
-    fun restoreKeyBackupWithPassword(keysBackupVersion: KeysVersionResult,
-                                     password: String,
-                                     roomId: String?,
-                                     sessionId: String?,
-                                     stepProgressListener: StepProgressListener?,
-                                     callback: MatrixCallback<ImportRoomKeysResult>)
+    fun restoreKeyBackupWithPassword(
+            keysBackupVersion: KeysVersionResult,
+            password: String,
+            roomId: String?,
+            sessionId: String?,
+            stepProgressListener: StepProgressListener?,
+            callback: MatrixCallback<ImportRoomKeysResult>
+    )
 
     val keysBackupVersion: KeysVersionResult?
+
     val currentBackupVersion: String?
-    val isEnabled: Boolean
-    val isStucked: Boolean
-    val state: KeysBackupState
+        get() = keysBackupVersion?.version
+
+    fun isEnabled(): Boolean
+    fun isStuck(): Boolean
+    fun getState(): KeysBackupState
 
     // For gossiping
     fun saveBackupRecoveryKey(recoveryKey: String?, version: String?)
@@ -215,8 +239,10 @@ interface KeysBackupService {
 
     fun isValidRecoveryKeyForCurrentVersion(recoveryKey: String, callback: MatrixCallback<Boolean>)
 
-    fun computePrivateKey(passphrase: String,
-                          privateKeySalt: String,
-                          privateKeyIterations: Int,
-                          progressListener: ProgressListener): ByteArray
+    fun computePrivateKey(
+            passphrase: String,
+            privateKeySalt: String,
+            privateKeyIterations: Int,
+            progressListener: ProgressListener
+    ): ByteArray
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupState.kt
index a4cc133398..a867d573de 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupState.kt
@@ -51,33 +51,51 @@ package org.matrix.android.sdk.api.session.crypto.keysbackup
  * </pre>
  */
 enum class KeysBackupState {
-    // Need to check the current backup version on the homeserver
+    /**
+     * Need to check the current backup version on the homeserver.
+     */
     Unknown,
 
-    // Checking if backup is enabled on homeserver
+    /**
+     * Checking if backup is enabled on homeserver.
+     */
     CheckingBackUpOnHomeserver,
 
-    // Backup has been stopped because a new backup version has been detected on the homeserver
+    /**
+     * Backup has been stopped because a new backup version has been detected on the homeserver.
+     */
     WrongBackUpVersion,
 
-    // Backup from this device is not enabled
+    /**
+     * Backup from this device is not enabled.
+     */
     Disabled,
 
-    // There is a backup available on the homeserver but it is not trusted.
-    // It is not trusted because the signature is invalid or the device that created it is not verified
-    // Use [KeysBackup.getKeysBackupTrust()] to get trust details.
-    // Consequently, the backup from this device is not enabled.
+    /**
+     * There is a backup available on the homeserver but it is not trusted.
+     * It is not trusted because the signature is invalid or the device that created it is not verified.
+     * Use [KeysBackup.getKeysBackupTrust()] to get trust details.
+     * Consequently, the backup from this device is not enabled.
+     */
     NotTrusted,
 
-    // Backup is being enabled: the backup version is being created on the homeserver
+    /**
+     * Backup is being enabled: the backup version is being created on the homeserver.
+     */
     Enabling,
 
-    // Backup is enabled and ready to send backup to the homeserver
+    /**
+     * Backup is enabled and ready to send backup to the homeserver.
+     */
     ReadyToBackUp,
 
-    // e2e keys are going to be sent to the homeserver
+    /**
+     * e2e keys are going to be sent to the homeserver.
+     */
     WillBackUp,
 
-    // e2e keys are being sent to the homeserver
+    /**
+     * e2e keys are being sent to the homeserver.
+     */
     BackingUp
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupVersionTrustSignature.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupVersionTrustSignature.kt
index 7127c8d3f4..afbf45ac70 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupVersionTrustSignature.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupVersionTrustSignature.kt
@@ -40,7 +40,8 @@ sealed class KeysBackupVersionTrustSignature {
             /**
              * Flag to indicate the signature from this device is valid.
              */
-            val valid: Boolean) : KeysBackupVersionTrustSignature()
+            val valid: Boolean
+    ) : KeysBackupVersionTrustSignature()
 
     data class UserSignature(
             val keyId: String?,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/RoomEncryptionTrustLevel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/RoomEncryptionTrustLevel.kt
index 68c7496d58..78724819a3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/RoomEncryptionTrustLevel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/RoomEncryptionTrustLevel.kt
@@ -20,15 +20,23 @@ package org.matrix.android.sdk.api.session.crypto.model
  * RoomEncryptionTrustLevel represents the trust level in an encrypted room.
  */
 enum class RoomEncryptionTrustLevel {
-    // No one in the room has been verified -> Black shield
+    /**
+     * No one in the room has been verified -> Black shield.
+     */
     Default,
 
-    // There are one or more device un-verified -> the app should display a red shield
+    /**
+     * There are one or more device un-verified -> the app should display a red shield.
+     */
     Warning,
 
-    // All devices in the room are verified -> the app should display a green shield
+    /**
+     * All devices in the room are verified -> the app should display a green shield.
+     */
     Trusted,
 
-    // e2e is active but with an unsupported algorithm
+    /**
+     * e2e is active but with an unsupported algorithm.
+     */
     E2EWithUnsupportedAlgorithm
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/EmojiRepresentation.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/EmojiRepresentation.kt
index 2c1bf9ff4d..5402471e46 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/EmojiRepresentation.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/EmojiRepresentation.kt
@@ -19,7 +19,8 @@ package org.matrix.android.sdk.api.session.crypto.verification
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 
-data class EmojiRepresentation(val emoji: String,
-                               @StringRes val nameResId: Int,
-                               @DrawableRes val drawableRes: Int? = null
+data class EmojiRepresentation(
+        val emoji: String,
+        @StringRes val nameResId: Int,
+        @DrawableRes val drawableRes: Int? = null
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationMethod.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationMethod.kt
index f2de2c4b47..0ab47a2ecd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationMethod.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationMethod.kt
@@ -20,12 +20,18 @@ package org.matrix.android.sdk.api.session.crypto.verification
  * Verification methods.
  */
 enum class VerificationMethod {
-    // Use it when your application supports the SAS verification method
+    /**
+     * Use it when your application supports the SAS verification method.
+     */
     SAS,
 
-    // Use it if your application is able to display QR codes
+    /**
+     * Use it if your application is able to display QR codes.
+     */
     QR_CODE_SHOW,
 
-    // Use it if your application is able to scan QR codes
+    /**
+     * Use it if your application is able to scan QR codes.
+     */
     QR_CODE_SCAN
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt
index 321ec73094..ee93f14992 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt
@@ -46,54 +46,68 @@ interface VerificationService {
 
     fun getExistingVerificationRequestInRoom(roomId: String, tid: String?): PendingVerificationRequest?
 
-    fun beginKeyVerification(method: VerificationMethod,
-                             otherUserId: String,
-                             otherDeviceId: String,
-                             transactionId: String?): String?
+    fun beginKeyVerification(
+            method: VerificationMethod,
+            otherUserId: String,
+            otherDeviceId: String,
+            transactionId: String?
+    ): String?
 
     /**
      * Request key verification with another user via room events (instead of the to-device API).
      */
-    fun requestKeyVerificationInDMs(methods: List<VerificationMethod>,
-                                    otherUserId: String,
-                                    roomId: String,
-                                    localId: String? = LocalEcho.createLocalEchoId()): PendingVerificationRequest
+    fun requestKeyVerificationInDMs(
+            methods: List<VerificationMethod>,
+            otherUserId: String,
+            roomId: String,
+            localId: String? = LocalEcho.createLocalEchoId()
+    ): PendingVerificationRequest
 
     fun cancelVerificationRequest(request: PendingVerificationRequest)
 
     /**
      * Request a key verification from another user using toDevice events.
      */
-    fun requestKeyVerification(methods: List<VerificationMethod>,
-                               otherUserId: String,
-                               otherDevices: List<String>?): PendingVerificationRequest
+    fun requestKeyVerification(
+            methods: List<VerificationMethod>,
+            otherUserId: String,
+            otherDevices: List<String>?
+    ): PendingVerificationRequest
 
-    fun declineVerificationRequestInDMs(otherUserId: String,
-                                        transactionId: String,
-                                        roomId: String)
+    fun declineVerificationRequestInDMs(
+            otherUserId: String,
+            transactionId: String,
+            roomId: String
+    )
 
     // Only SAS method is supported for the moment
     // TODO Parameter otherDeviceId should be removed in this case
-    fun beginKeyVerificationInDMs(method: VerificationMethod,
-                                  transactionId: String,
-                                  roomId: String,
-                                  otherUserId: String,
-                                  otherDeviceId: String): String
+    fun beginKeyVerificationInDMs(
+            method: VerificationMethod,
+            transactionId: String,
+            roomId: String,
+            otherUserId: String,
+            otherDeviceId: String
+    ): String
 
     /**
      * Returns false if the request is unknown.
      */
-    fun readyPendingVerificationInDMs(methods: List<VerificationMethod>,
-                                      otherUserId: String,
-                                      roomId: String,
-                                      transactionId: String): Boolean
+    fun readyPendingVerificationInDMs(
+            methods: List<VerificationMethod>,
+            otherUserId: String,
+            roomId: String,
+            transactionId: String
+    ): Boolean
 
     /**
      * Returns false if the request is unknown.
      */
-    fun readyPendingVerification(methods: List<VerificationMethod>,
-                                 otherUserId: String,
-                                 transactionId: String): Boolean
+    fun readyPendingVerification(
+            methods: List<VerificationMethod>,
+            otherUserId: String,
+            transactionId: String
+    ): Boolean
 
     interface Listener {
         /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationTxState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationTxState.kt
index 39de2cc712..30e4c66937 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationTxState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationTxState.kt
@@ -17,10 +17,14 @@
 package org.matrix.android.sdk.api.session.crypto.verification
 
 sealed class VerificationTxState {
-    // Uninitialized state
+    /**
+     * Uninitialized state.
+     */
     object None : VerificationTxState()
 
-    // Specific for SAS
+    /**
+     * Specific for SAS.
+     */
     abstract class VerificationSasTxState : VerificationTxState()
 
     object SendingStart : VerificationSasTxState()
@@ -38,18 +42,26 @@ sealed class VerificationTxState {
     object MacSent : VerificationSasTxState()
     object Verifying : VerificationSasTxState()
 
-    // Specific for QR code
+    /**
+     * Specific for QR code.
+     */
     abstract class VerificationQrTxState : VerificationTxState()
 
-    // Will be used to ask the user if the other user has correctly scanned
+    /**
+     * Will be used to ask the user if the other user has correctly scanned.
+     */
     object QrScannedByOther : VerificationQrTxState()
     object WaitingOtherReciprocateConfirm : VerificationQrTxState()
 
-    // Terminal states
+    /**
+     * Terminal states.
+     */
     abstract class TerminalTxState : VerificationTxState()
 
     object Verified : TerminalTxState()
 
-    // Cancelled by me or by other
+    /**
+     * Cancelled by me or by other.
+     */
     data class Cancelled(val cancelCode: CancelCode, val byMe: Boolean) : TerminalTxState()
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/EventService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/EventService.kt
index 297f277497..7f275bf952 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/EventService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/EventService.kt
@@ -24,6 +24,8 @@ interface EventService {
      * Ask the homeserver for an event content. The SDK will try to decrypt it if it is possible
      * The result will not be stored into cache
      */
-    suspend fun getEvent(roomId: String,
-                         eventId: String): Event
+    suspend fun getEvent(
+            roomId: String,
+            eventId: String
+    ): Event
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt
index a7c81136e3..ca6c889cb8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt
@@ -44,10 +44,12 @@ interface FileService {
      * Download a file if necessary and ensure that if the file is encrypted, the file is decrypted.
      * Result will be a decrypted file, stored in the cache folder. url parameter will be used to create unique filename to avoid name collision.
      */
-    suspend fun downloadFile(fileName: String,
-                             mimeType: String?,
-                             url: String?,
-                             elementToDecrypt: ElementToDecrypt?): File
+    suspend fun downloadFile(
+            fileName: String,
+            mimeType: String?,
+            url: String?,
+            elementToDecrypt: ElementToDecrypt?
+    ): File
 
     suspend fun downloadFile(messageContent: MessageWithAttachmentContent): File =
             downloadFile(
@@ -57,10 +59,11 @@ interface FileService {
                     elementToDecrypt = messageContent.encryptedFileInfo?.toElementToDecrypt()
             )
 
-    fun isFileInCache(mxcUrl: String?,
-                      fileName: String,
-                      mimeType: String?,
-                      elementToDecrypt: ElementToDecrypt?
+    fun isFileInCache(
+            mxcUrl: String?,
+            fileName: String,
+            mimeType: String?,
+            elementToDecrypt: ElementToDecrypt?
     ): Boolean
 
     fun isFileInCache(messageContent: MessageWithAttachmentContent) =
@@ -75,10 +78,12 @@ interface FileService {
      * Use this URI and pass it to intent using flag Intent.FLAG_GRANT_READ_URI_PERMISSION
      * (if not other app won't be able to access it).
      */
-    fun getTemporarySharableURI(mxcUrl: String?,
-                                fileName: String,
-                                mimeType: String?,
-                                elementToDecrypt: ElementToDecrypt?): Uri?
+    fun getTemporarySharableURI(
+            mxcUrl: String?,
+            fileName: String,
+            mimeType: String?,
+            elementToDecrypt: ElementToDecrypt?
+    ): Uri?
 
     fun getTemporarySharableURI(messageContent: MessageWithAttachmentContent): Uri? =
             getTemporarySharableURI(
@@ -92,10 +97,12 @@ interface FileService {
      * Get information on the given file.
      * Mimetype should be the same one as passed to downloadFile (limitation for now)
      */
-    fun fileState(mxcUrl: String?,
-                  fileName: String,
-                  mimeType: String?,
-                  elementToDecrypt: ElementToDecrypt?): FileState
+    fun fileState(
+            mxcUrl: String?,
+            fileName: String,
+            mimeType: String?,
+            elementToDecrypt: ElementToDecrypt?
+    ): FileState
 
     fun fileState(messageContent: MessageWithAttachmentContent): FileState =
             fileState(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/initsync/SyncStatusService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/initsync/SyncStatusService.kt
deleted file mode 100644
index 7006e11751..0000000000
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/initsync/SyncStatusService.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.matrix.android.sdk.api.session.initsync
-
-import androidx.lifecycle.LiveData
-
-interface SyncStatusService {
-
-    fun getSyncStatusLive(): LiveData<Status>
-
-    sealed class Status {
-        /**
-         * For initial sync.
-         */
-        abstract class InitialSyncStatus : Status()
-
-        object Idle : InitialSyncStatus()
-        data class InitialSyncProgressing(
-                val initSyncStep: InitSyncStep,
-                val percentProgress: Int = 0
-        ) : InitialSyncStatus()
-
-        /**
-         * For incremental sync.
-         */
-        abstract class IncrementalSyncStatus : Status()
-
-        object IncrementalSyncIdle : IncrementalSyncStatus()
-        data class IncrementalSyncParsing(
-                val rooms: Int,
-                val toDevice: Int
-        ) : IncrementalSyncStatus()
-
-        object IncrementalSyncError : IncrementalSyncStatus()
-        object IncrementalSyncDone : IncrementalSyncStatus()
-    }
-}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/MatrixPermalinkSpan.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/MatrixPermalinkSpan.kt
index 48b30dfa21..9c71c081be 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/MatrixPermalinkSpan.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/MatrixPermalinkSpan.kt
@@ -25,8 +25,10 @@ import org.matrix.android.sdk.api.session.permalinks.MatrixPermalinkSpan.Callbac
  * @property url the permalink url tied to the span
  * @property callback the callback to use.
  */
-class MatrixPermalinkSpan(private val url: String,
-                          private val callback: Callback? = null) : ClickableSpan() {
+class MatrixPermalinkSpan(
+        private val url: String,
+        private val callback: Callback? = null
+) : ClickableSpan() {
 
     interface Callback {
         fun onUrlClicked(url: String)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
index 095f2ef7c2..4c00c76459 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
@@ -107,8 +107,10 @@ interface ProfileService {
     /**
      * Finalize adding a 3Pids. Call this method once the user has validated that he owns the ThreePid.
      */
-    suspend fun finalizeAddingThreePid(threePid: ThreePid,
-                                       userInteractiveAuthInterceptor: UserInteractiveAuthInterceptor)
+    suspend fun finalizeAddingThreePid(
+            threePid: ThreePid,
+            userInteractiveAuthInterceptor: UserInteractiveAuthInterceptor
+    )
 
     /**
      * Cancel adding a threepid. It will remove locally stored data about this ThreePid.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/HttpPusher.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/HttpPusher.kt
new file mode 100644
index 0000000000..1ae23e2b70
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/HttpPusher.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.pushers
+
+data class HttpPusher(
+        /**
+         * This is a unique identifier for this pusher. The value you should use for
+         * this is the routing or destination address information for the notification,
+         * for example, the APNS token for APNS or the Registration ID for GCM. If your
+         * notification client has no such concept, use any unique identifier. Max length, 512 chars.
+         */
+        val pushkey: String,
+
+        /**
+         * The application id
+         * This is a reverse-DNS style identifier for the application. It is recommended
+         * that this end with the platform, such that different platform versions get
+         * different app identifiers. Max length, 64 chars.
+         */
+        val appId: String,
+
+        /**
+         * This string determines which set of device specific rules this pusher executes.
+         */
+        val profileTag: String,
+
+        /**
+         * The preferred language for receiving notifications (e.g. "en" or "en-US").
+         */
+        val lang: String,
+
+        /**
+         * A human readable string that will allow the user to identify what application owns this pusher.
+         */
+        val appDisplayName: String,
+
+        /**
+         * A human readable string that will allow the user to identify what device owns this pusher.
+         */
+        val deviceDisplayName: String,
+
+        /**
+         * The URL to use to send notifications to. MUST be an HTTPS URL with a path of /_matrix/push/v1/notify.
+         */
+        val url: String,
+
+        /**
+         * If true, the homeserver should add another pusher with the given pushkey and App ID in addition
+         * to any others with different user IDs. Otherwise, the homeserver must remove any other pushers
+         * with the same App ID and pushkey for different users.
+         */
+        val append: Boolean,
+
+        /**
+         * true to limit the push content to only id and not message content
+         * Ref: https://matrix.org/docs/spec/push_gateway/r0.1.1#homeserver-behaviour
+         */
+        val withEventIdOnly: Boolean
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
index 5cb7857021..d7958ea3cd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
@@ -58,12 +58,14 @@ interface PushersService {
      *                          email pushers since we don't want to stop other accounts notifying to the same email address.
      * @throws [InvalidParameterException] if a parameter is not correct
      */
-    suspend fun addEmailPusher(email: String,
-                               lang: String,
-                               emailBranding: String,
-                               appDisplayName: String,
-                               deviceDisplayName: String,
-                               append: Boolean = true)
+    suspend fun addEmailPusher(
+            email: String,
+            lang: String,
+            emailBranding: String,
+            appDisplayName: String,
+            deviceDisplayName: String,
+            append: Boolean = true
+    )
 
     /**
      * Directly ask the push gateway to send a push to this device.
@@ -75,10 +77,12 @@ interface PushersService {
      * @param pushkey the FCM token
      * @param eventId the eventId which will be sent in the Push message. Use a fake eventId.
      */
-    suspend fun testPush(url: String,
-                         appId: String,
-                         pushkey: String,
-                         eventId: String)
+    suspend fun testPush(
+            url: String,
+            appId: String,
+            pushkey: String,
+            eventId: String
+    )
 
     /**
      * Remove a registered pusher.
@@ -107,61 +111,4 @@ interface PushersService {
      * Get the current pushers.
      */
     fun getPushers(): List<Pusher>
-
-    data class HttpPusher(
-
-            /**
-             * This is a unique identifier for this pusher. The value you should use for
-             * this is the routing or destination address information for the notification,
-             * for example, the APNS token for APNS or the Registration ID for GCM. If your
-             * notification client has no such concept, use any unique identifier. Max length, 512 chars.
-             */
-            val pushkey: String,
-
-            /**
-             * The application id
-             * This is a reverse-DNS style identifier for the application. It is recommended
-             * that this end with the platform, such that different platform versions get
-             * different app identifiers. Max length, 64 chars.
-             */
-            val appId: String,
-
-            /**
-             * This string determines which set of device specific rules this pusher executes.
-             */
-            val profileTag: String,
-
-            /**
-             * The preferred language for receiving notifications (e.g. "en" or "en-US").
-             */
-            val lang: String,
-
-            /**
-             * A human readable string that will allow the user to identify what application owns this pusher.
-             */
-            val appDisplayName: String,
-
-            /**
-             * A human readable string that will allow the user to identify what device owns this pusher.
-             */
-            val deviceDisplayName: String,
-
-            /**
-             * The URL to use to send notifications to. MUST be an HTTPS URL with a path of /_matrix/push/v1/notify.
-             */
-            val url: String,
-
-            /**
-             * If true, the homeserver should add another pusher with the given pushkey and App ID in addition
-             * to any others with different user IDs. Otherwise, the homeserver must remove any other pushers
-             * with the same App ID and pushkey for different users.
-             */
-            val append: Boolean,
-
-            /**
-             * true to limit the push content to only id and not message content
-             * Ref: https://matrix.org/docs/spec/push_gateway/r0.1.1#homeserver-behaviour
-             */
-            val withEventIdOnly: Boolean
-    )
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/ConditionResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/ConditionResolver.kt
index f8a930f987..d64ee5f777 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/ConditionResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/ConditionResolver.kt
@@ -22,15 +22,23 @@ import org.matrix.android.sdk.api.session.events.model.Event
  * This class as all required context needed to evaluate rules
  */
 interface ConditionResolver {
-    fun resolveEventMatchCondition(event: Event,
-                                   condition: EventMatchCondition): Boolean
+    fun resolveEventMatchCondition(
+            event: Event,
+            condition: EventMatchCondition
+    ): Boolean
 
-    fun resolveRoomMemberCountCondition(event: Event,
-                                        condition: RoomMemberCountCondition): Boolean
+    fun resolveRoomMemberCountCondition(
+            event: Event,
+            condition: RoomMemberCountCondition
+    ): Boolean
 
-    fun resolveSenderNotificationPermissionCondition(event: Event,
-                                                     condition: SenderNotificationPermissionCondition): Boolean
+    fun resolveSenderNotificationPermissionCondition(
+            event: Event,
+            condition: SenderNotificationPermissionCondition
+    ): Boolean
 
-    fun resolveContainsDisplayNameCondition(event: Event,
-                                            condition: ContainsDisplayNameCondition): Boolean
+    fun resolveContainsDisplayNameCondition(
+            event: Event,
+            condition: ContainsDisplayNameCondition
+    ): Boolean
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/PushRuleService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/PushRuleService.kt
index 7ffbc89559..8f9c25fd30 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/PushRuleService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/PushRuleService.kt
@@ -51,8 +51,10 @@ interface PushRuleService {
 
 //    fun fulfilledBingRule(event: Event, rules: List<PushRule>): PushRule?
 
-    fun resolveSenderNotificationPermissionCondition(event: Event,
-                                                     condition: SenderNotificationPermissionCondition): Boolean
+    fun resolveSenderNotificationPermissionCondition(
+            event: Event,
+            condition: SenderNotificationPermissionCondition
+    ): Boolean
 
     interface PushRuleListener {
         fun onEvents(pushEvents: PushEvents)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
index 3a18cf1497..5d2769ac3c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
@@ -22,6 +22,7 @@ import org.matrix.android.sdk.api.session.room.accountdata.RoomAccountDataServic
 import org.matrix.android.sdk.api.session.room.alias.AliasService
 import org.matrix.android.sdk.api.session.room.call.RoomCallService
 import org.matrix.android.sdk.api.session.room.crypto.RoomCryptoService
+import org.matrix.android.sdk.api.session.room.location.LocationSharingService
 import org.matrix.android.sdk.api.session.room.members.MembershipService
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.relation.RelationService
@@ -163,4 +164,9 @@ interface Room {
      * Get the RoomVersionService associated to this Room.
      */
     fun roomVersionService(): RoomVersionService
+
+    /**
+     * Get the LocationSharingService associated to this Room.
+     */
+    fun locationSharingService(): LocationSharingService
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomDirectoryService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomDirectoryService.kt
index cb70603e66..77092c4811 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomDirectoryService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomDirectoryService.kt
@@ -28,8 +28,10 @@ interface RoomDirectoryService {
     /**
      * Get rooms from directory.
      */
-    suspend fun getPublicRooms(server: String?,
-                               publicRoomsParams: PublicRoomsParams): PublicRoomsResponse
+    suspend fun getPublicRooms(
+            server: String?,
+            publicRoomsParams: PublicRoomsParams
+    ): PublicRoomsResponse
 
     /**
      * Get the visibility of a room in the directory.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
index 6d5551ddf0..5dfb8961e3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
@@ -60,9 +60,11 @@ interface RoomService {
      * @param reason optional reason for joining the room
      * @param viaServers the servers to attempt to join the room through. One of the servers must be participating in the room.
      */
-    suspend fun joinRoom(roomIdOrAlias: String,
-                         reason: String? = null,
-                         viaServers: List<String> = emptyList())
+    suspend fun joinRoom(
+            roomIdOrAlias: String,
+            reason: String? = null,
+            viaServers: List<String> = emptyList()
+    )
 
     /**
      * @param roomId the roomId of the room to join
@@ -97,19 +99,29 @@ interface RoomService {
      */
     fun getRoomSummary(roomIdOrAlias: String): RoomSummary?
 
+    /**
+     * A live [RoomSummary] associated with the room with id [roomId].
+     * You can observe this summary to get dynamic data from this room, even if the room is not joined yet
+     */
+    fun getRoomSummaryLive(roomId: String): LiveData<Optional<RoomSummary>>
+
     /**
      * Get a snapshot list of room summaries.
      * @return the immutable list of [RoomSummary]
      */
-    fun getRoomSummaries(queryParams: RoomSummaryQueryParams,
-                         sortOrder: RoomSortOrder = RoomSortOrder.NONE): List<RoomSummary>
+    fun getRoomSummaries(
+            queryParams: RoomSummaryQueryParams,
+            sortOrder: RoomSortOrder = RoomSortOrder.NONE
+    ): List<RoomSummary>
 
     /**
      * Get a live list of room summaries. This list is refreshed as soon as the data changes.
      * @return the [LiveData] of List[RoomSummary]
      */
-    fun getRoomSummariesLive(queryParams: RoomSummaryQueryParams,
-                             sortOrder: RoomSortOrder = RoomSortOrder.ACTIVITY): LiveData<List<RoomSummary>>
+    fun getRoomSummariesLive(
+            queryParams: RoomSummaryQueryParams,
+            sortOrder: RoomSortOrder = RoomSortOrder.ACTIVITY
+    ): LiveData<List<RoomSummary>>
 
     /**
      * Get a snapshot list of Breadcrumbs.
@@ -139,8 +151,10 @@ interface RoomService {
     /**
      * Resolve a room alias to a room ID.
      */
-    suspend fun getRoomIdByAlias(roomAlias: String,
-                                 searchOnServer: Boolean): Optional<RoomAliasDescription>
+    suspend fun getRoomIdByAlias(
+            roomAlias: String,
+            searchOnServer: Boolean
+    ): Optional<RoomAliasDescription>
 
     /**
      * Delete a room alias.
@@ -205,16 +219,27 @@ interface RoomService {
     /**
      * TODO Doc.
      */
-    fun getPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams,
-                                  pagedListConfig: PagedList.Config = defaultPagedListConfig,
-                                  sortOrder: RoomSortOrder = RoomSortOrder.ACTIVITY): LiveData<PagedList<RoomSummary>>
+    fun getPagedRoomSummariesLive(
+            queryParams: RoomSummaryQueryParams,
+            pagedListConfig: PagedList.Config = defaultPagedListConfig,
+            sortOrder: RoomSortOrder = RoomSortOrder.ACTIVITY
+    ): LiveData<PagedList<RoomSummary>>
 
     /**
-     * TODO Doc.
+     * Get's a live paged list from a filter that can be dynamically updated.
+     *
+     * @param queryParams The filter to use
+     * @param pagedListConfig The paged list configuration (page size, initial load, prefetch distance...)
+     * @param sortOrder defines how to sort the results
+     * @param getFlattenParents When true, the list of known parents and grand parents summaries will be resolved.
+     * This can have significant impact on performance, better be used only on manageable list (filtered by displayName, ..).
      */
-    fun getFilteredPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams,
-                                          pagedListConfig: PagedList.Config = defaultPagedListConfig,
-                                          sortOrder: RoomSortOrder = RoomSortOrder.ACTIVITY): UpdatableLivePageResult
+    fun getFilteredPagedRoomSummariesLive(
+            queryParams: RoomSummaryQueryParams,
+            pagedListConfig: PagedList.Config = defaultPagedListConfig,
+            sortOrder: RoomSortOrder = RoomSortOrder.ACTIVITY,
+            getFlattenParents: Boolean = false,
+    ): UpdatableLivePageResult
 
     /**
      * Return a LiveData on the number of rooms.
@@ -240,8 +265,10 @@ interface RoomService {
     /**
      * Returns all the children of this space, as LiveData.
      */
-    fun getFlattenRoomSummaryChildrenOfLive(spaceId: String?,
-                                            memberships: List<Membership> = Membership.activeMemberships()): LiveData<List<RoomSummary>>
+    fun getFlattenRoomSummaryChildrenOfLive(
+            spaceId: String?,
+            memberships: List<Membership> = Membership.activeMemberships()
+    ): LiveData<List<RoomSummary>>
 
     /**
      * Refreshes the RoomSummary LatestPreviewContent for the given @param roomId.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSortOrder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSortOrder.kt
index e721abd6a0..9368ad6bf4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSortOrder.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSortOrder.kt
@@ -16,9 +16,28 @@
 
 package org.matrix.android.sdk.api.session.room
 
+/**
+ * Enum to sort room list.
+ */
 enum class RoomSortOrder {
+    /**
+     * Sort room list by room ascending name.
+     */
     NAME,
+
+    /**
+     * Sort room list by room descending last activity.
+     */
     ACTIVITY,
+
+    /**
+     * Sort room list by room priority and last activity: favorite room first, low priority room last,
+     * then descending last activity.
+     */
     PRIORITY_AND_ACTIVITY,
+
+    /**
+     * Do not sort room list. Useful if the order does not matter. Order can be indeterminate.
+     */
     NONE
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
index 5c74dcced1..3d943473e4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
@@ -16,60 +16,99 @@
 
 package org.matrix.android.sdk.api.session.room
 
-import org.matrix.android.sdk.api.query.ActiveSpaceFilter
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.query.RoomCategoryFilter
 import org.matrix.android.sdk.api.query.RoomTagQueryFilter
+import org.matrix.android.sdk.api.query.SpaceFilter
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.space.SpaceSummaryQueryParams
 
+/**
+ * Create a [RoomSummaryQueryParams] object, calling [init] with a [RoomSummaryQueryParams.Builder].
+ */
 fun roomSummaryQueryParams(init: (RoomSummaryQueryParams.Builder.() -> Unit) = {}): RoomSummaryQueryParams {
-    return RoomSummaryQueryParams.Builder().apply(init).build()
-}
-
-fun spaceSummaryQueryParams(init: (RoomSummaryQueryParams.Builder.() -> Unit) = {}): SpaceSummaryQueryParams {
     return RoomSummaryQueryParams.Builder()
             .apply(init)
-            .apply {
-                includeType = listOf(RoomType.SPACE)
-                excludeType = null
-                roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
-            }
             .build()
 }
 
 /**
- * This class can be used to filter room summaries to use with:
- * [org.matrix.android.sdk.api.session.room.Room] and [org.matrix.android.sdk.api.session.room.RoomService].
+ * Create a [SpaceSummaryQueryParams] object (which is a [RoomSummaryQueryParams]), calling [init] with a [RoomSummaryQueryParams.Builder].
+ * This is specific for spaces, other filters will be applied after invoking [init]
+ */
+fun spaceSummaryQueryParams(init: (RoomSummaryQueryParams.Builder.() -> Unit) = {}): SpaceSummaryQueryParams {
+    return roomSummaryQueryParams {
+        init()
+        includeType = listOf(RoomType.SPACE)
+        excludeType = null
+        roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
+    }
+}
+
+/**
+ * This class can be used to filter room summaries to use with [RoomService].
+ * It provides a [Builder].
+ * [roomSummaryQueryParams] and [spaceSummaryQueryParams] can also be used to build an instance of this class.
  */
 data class RoomSummaryQueryParams(
-        val roomId: QueryStringValue,
+        /**
+         * Query for the displayName of the room. The display name can be the value of the state event,
+         * or a value returned by [org.matrix.android.sdk.api.RoomDisplayNameFallbackProvider].
+         */
         val displayName: QueryStringValue,
+        /**
+         * Query for the canonical alias of the room.
+         */
         val canonicalAlias: QueryStringValue,
+        /**
+         * Used to filter room by membership.
+         */
         val memberships: List<Membership>,
+        /**
+         * Used to filter room by room category.
+         */
         val roomCategoryFilter: RoomCategoryFilter?,
+        /**
+         * Used to filter room by room tag.
+         */
         val roomTagQueryFilter: RoomTagQueryFilter?,
+        /**
+         * Used to filter room by room type.
+         * @see [includeType]
+         */
         val excludeType: List<String?>?,
+        /**
+         * Used to filter room by room type.
+         * @see [excludeType]
+         */
         val includeType: List<String?>?,
-        val activeSpaceFilter: ActiveSpaceFilter?,
+        /**
+         * Used to filter room using the current space.
+         */
+        val spaceFilter: SpaceFilter?,
+        /**
+         * Used to filter room using the current group.
+         */
         val activeGroupId: String? = null
 ) {
 
+    /**
+     * Builder for [RoomSummaryQueryParams].
+     * [roomSummaryQueryParams] and [spaceSummaryQueryParams] can also be used to build an instance of [RoomSummaryQueryParams].
+     */
     class Builder {
-        var roomId: QueryStringValue = QueryStringValue.IsNotEmpty
-        var displayName: QueryStringValue = QueryStringValue.IsNotEmpty
+        var displayName: QueryStringValue = QueryStringValue.NoCondition
         var canonicalAlias: QueryStringValue = QueryStringValue.NoCondition
         var memberships: List<Membership> = Membership.all()
-        var roomCategoryFilter: RoomCategoryFilter? = RoomCategoryFilter.ALL
+        var roomCategoryFilter: RoomCategoryFilter? = null
         var roomTagQueryFilter: RoomTagQueryFilter? = null
         var excludeType: List<String?>? = listOf(RoomType.SPACE)
         var includeType: List<String?>? = null
-        var activeSpaceFilter: ActiveSpaceFilter = ActiveSpaceFilter.None
+        var spaceFilter: SpaceFilter? = null
         var activeGroupId: String? = null
 
         fun build() = RoomSummaryQueryParams(
-                roomId = roomId,
                 displayName = displayName,
                 canonicalAlias = canonicalAlias,
                 memberships = memberships,
@@ -77,7 +116,7 @@ data class RoomSummaryQueryParams(
                 roomTagQueryFilter = roomTagQueryFilter,
                 excludeType = excludeType,
                 includeType = includeType,
-                activeSpaceFilter = activeSpaceFilter,
+                spaceFilter = spaceFilter,
                 activeGroupId = activeGroupId
         )
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/location/LocationSharingService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/location/LocationSharingService.kt
new file mode 100644
index 0000000000..dd48d51f45
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/location/LocationSharingService.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.room.location
+
+import androidx.lifecycle.LiveData
+import org.matrix.android.sdk.api.session.room.model.livelocation.LiveLocationShareAggregatedSummary
+
+/**
+ * Manage all location sharing related features.
+ */
+interface LocationSharingService {
+    fun getRunningLiveLocationShareSummaries(): LiveData<List<LiveLocationShareAggregatedSummary>>
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
index 71c1d8303e..1ab23b7a11 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
@@ -28,65 +28,200 @@ import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
  * It can be retrieved by [org.matrix.android.sdk.api.session.room.Room] and [org.matrix.android.sdk.api.session.room.RoomService]
  */
 data class RoomSummary(
+        /**
+         * The roomId of the room.
+         */
         val roomId: String,
-        // Computed display name
+        /**
+         * Computed display name. The value of the state event `m.room.name` if not empty, else can be the value returned
+         * by [org.matrix.android.sdk.api.RoomDisplayNameFallbackProvider].
+         */
         val displayName: String = "",
+        /**
+         * The value of the live state event `m.room.name`.
+         */
         val name: String = "",
+        /**
+         * The value of the live state event `m.room.topic`.
+         */
         val topic: String = "",
+        /**
+         * The value of the live state event `m.room.avatar`.
+         */
         val avatarUrl: String = "",
+        /**
+         * The value of the live state event `m.room.canonical_alias`.
+         */
         val canonicalAlias: String? = null,
+        /**
+         * The list of all the aliases of this room. Content of the live state event `m.room.aliases`.
+         */
         val aliases: List<String> = emptyList(),
+        /**
+         * The value of the live state event `m.room.join_rules`.
+         */
         val joinRules: RoomJoinRules? = null,
+        /**
+         * True is this room is referenced in the account data `m.direct`.
+         */
         val isDirect: Boolean = false,
+        /**
+         * If [isDirect] is true, this is the id of the first other member of this room.
+         */
         val directUserId: String? = null,
+        /**
+         * If [isDirect] is true, this it the presence of the first other member of this room.
+         */
         val directUserPresence: UserPresence? = null,
+        /**
+         * Number of members who have joined this room.
+         */
         val joinedMembersCount: Int? = 0,
+        /**
+         * Number of members who are invited to this room.
+         */
         val invitedMembersCount: Int? = 0,
+        /**
+         * Latest [TimelineEvent] which can be displayed in this room. Can be used in the room list.
+         */
         val latestPreviewableEvent: TimelineEvent? = null,
+        /**
+         * List of other member ids of this room.
+         */
         val otherMemberIds: List<String> = emptyList(),
+        /**
+         * Number of unread message in this room.
+         */
         val notificationCount: Int = 0,
+        /**
+         * Number of unread and highlighted message in this room.
+         */
         val highlightCount: Int = 0,
+        /**
+         * True if this room has unread messages.
+         */
         val hasUnreadMessages: Boolean = false,
+        /**
+         * List of tags in this room.
+         */
         val tags: List<RoomTag> = emptyList(),
+        /**
+         * Current user membership in this room.
+         */
         val membership: Membership = Membership.NONE,
+        /**
+         * Versioning state of this room.
+         */
         val versioningState: VersioningState = VersioningState.NONE,
+        /**
+         * Value of `m.fully_read` for this room.
+         */
         val readMarkerId: String? = null,
+        /**
+         * Message saved as draft for this room.
+         */
         val userDrafts: List<UserDraft> = emptyList(),
+        /**
+         * True if this room is encrypted.
+         */
         val isEncrypted: Boolean,
+        /**
+         * Timestamp of the `m.room.encryption` state event.
+         */
         val encryptionEventTs: Long?,
+        /**
+         * List of users who are currently typing on this room.
+         */
         val typingUsers: List<SenderInfo>,
+        /**
+         * UserId of the user who has invited the current user to this room.
+         */
         val inviterId: String? = null,
+        /**
+         * Breadcrumb index, util to sort rooms by last seen.
+         */
         val breadcrumbsIndex: Int = NOT_IN_BREADCRUMBS,
+        /**
+         * The room encryption trust level.
+         * @see [RoomEncryptionTrustLevel]
+         */
         val roomEncryptionTrustLevel: RoomEncryptionTrustLevel? = null,
+        /**
+         * True if a message has not been sent in this room.
+         */
         val hasFailedSending: Boolean = false,
+        /**
+         * The type of the room. Null for regular room.
+         * @see [RoomType]
+         */
         val roomType: String? = null,
+        /**
+         * List of parent spaces.
+         */
         val spaceParents: List<SpaceParentInfo>? = null,
+        /**
+         * List of children space.
+         */
         val spaceChildren: List<SpaceChildInfo>? = null,
+        /**
+         * List of all the space parents. Will be empty by default, you have to explicitly request it.
+         */
+        val flattenParents: List<RoomSummary> = emptyList(),
+        /**
+         * List of all the space parent Ids.
+         */
         val flattenParentIds: List<String> = emptyList(),
-        val roomEncryptionAlgorithm: RoomEncryptionAlgorithm? = null
+        /**
+         * Information about the encryption algorithm, if this room is encrypted.
+         */
+        val roomEncryptionAlgorithm: RoomEncryptionAlgorithm? = null,
 ) {
-
+    /**
+     * True if [versioningState] is not [VersioningState.NONE].
+     */
     val isVersioned: Boolean
         get() = versioningState != VersioningState.NONE
 
+    /**
+     * True if [notificationCount] is not `0`.
+     */
     val hasNewMessages: Boolean
         get() = notificationCount != 0
 
+    /**
+     * True if the room has the tag `m.lowpriority`.
+     */
     val isLowPriority: Boolean
         get() = hasTag(RoomTag.ROOM_TAG_LOW_PRIORITY)
 
+    /**
+     * True if the room has the tag `m.favourite`.
+     */
     val isFavorite: Boolean
         get() = hasTag(RoomTag.ROOM_TAG_FAVOURITE)
 
+    /**
+     * True if [joinRules] is [RoomJoinRules.PUBLIC].
+     */
     val isPublic: Boolean
         get() = joinRules == RoomJoinRules.PUBLIC
 
+    /**
+     * Test if the room has the provided [tag].
+     */
     fun hasTag(tag: String) = tags.any { it.name == tag }
 
+    /**
+     * True if a 1-1 call can be started, i.e. the room has exactly 2 joined members.
+     */
     val canStartCall: Boolean
         get() = joinedMembersCount == 2
 
     companion object {
+        /**
+         * Constant to indicated that the room is not on the breadcrumbs.
+         * Used by [breadcrumbsIndex].
+         */
         const val NOT_IN_BREADCRUMBS = -1
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/VersioningState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/VersioningState.kt
index b4e7b10d44..2e1668ebbb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/VersioningState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/VersioningState.kt
@@ -16,8 +16,22 @@
 
 package org.matrix.android.sdk.api.session.room.model
 
+/**
+ * Enum for the versioning state of a room.
+ */
 enum class VersioningState {
+    /**
+     * The room is not versioned.
+     */
     NONE,
+
+    /**
+     * The room has been upgraded, but the new room is not joined yet.
+     */
     UPGRADED_ROOM_NOT_JOINED,
-    UPGRADED_ROOM_JOINED
+
+    /**
+     * The room has been upgraded, and the new room has been joined.
+     */
+    UPGRADED_ROOM_JOINED,
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/livelocation/LiveLocationShareAggregatedSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/livelocation/LiveLocationShareAggregatedSummary.kt
index 0b28d62f56..5ad1a48217 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/livelocation/LiveLocationShareAggregatedSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/livelocation/LiveLocationShareAggregatedSummary.kt
@@ -22,6 +22,10 @@ import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconLocati
  * Aggregation info concerning a live location share.
  */
 data class LiveLocationShareAggregatedSummary(
+        val userId: String?,
+        /**
+         * Indicate whether the live is currently running.
+         */
         val isActive: Boolean?,
         val endOfLiveTimestampMillis: Long?,
         val lastLocationDataContent: MessageBeaconLocationDataContent?,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationAcceptContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationAcceptContent.kt
index 27619cf0a9..33f61648dc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationAcceptContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationAcceptContent.kt
@@ -40,12 +40,14 @@ internal data class MessageVerificationAcceptContent(
 
     companion object : VerificationInfoAcceptFactory {
 
-        override fun create(tid: String,
-                            keyAgreementProtocol: String,
-                            hash: String,
-                            commitment: String,
-                            messageAuthenticationCode: String,
-                            shortAuthenticationStrings: List<String>): VerificationInfoAccept {
+        override fun create(
+                tid: String,
+                keyAgreementProtocol: String,
+                hash: String,
+                commitment: String,
+                messageAuthenticationCode: String,
+                shortAuthenticationStrings: List<String>
+        ): VerificationInfoAccept {
             return MessageVerificationAcceptContent(
                     hash,
                     keyAgreementProtocol,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
index 02c597ee63..d34ea3c7d3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
@@ -58,16 +58,20 @@ interface RelationService {
      * @param targetEventId the id of the event being reacted
      * @param reaction the reaction (preferably emoji)
      */
-    fun sendReaction(targetEventId: String,
-                     reaction: String): Cancelable
+    fun sendReaction(
+            targetEventId: String,
+            reaction: String
+    ): Cancelable
 
     /**
      * Undo a reaction (emoji) to the targetedEvent.
      * @param targetEventId the id of the event being reacted
      * @param reaction the reaction (preferably emoji)
      */
-    suspend fun undoReaction(targetEventId: String,
-                             reaction: String): Cancelable
+    suspend fun undoReaction(
+            targetEventId: String,
+            reaction: String
+    ): Cancelable
 
     /**
      * Edit a poll.
@@ -76,10 +80,12 @@ interface RelationService {
      * @param question The edited question
      * @param options The edited options
      */
-    fun editPoll(targetEvent: TimelineEvent,
-                 pollType: PollType,
-                 question: String,
-                 options: List<String>): Cancelable
+    fun editPoll(
+            targetEvent: TimelineEvent,
+            pollType: PollType,
+            question: String,
+            options: List<String>
+    ): Cancelable
 
     /**
      * Edit a text message body. Limited to "m.text" contentType.
@@ -89,11 +95,13 @@ interface RelationService {
      * @param newBodyAutoMarkdown true to parse markdown on the new body
      * @param compatibilityBodyText The text that will appear on clients that don't support yet edition
      */
-    fun editTextMessage(targetEvent: TimelineEvent,
-                        msgType: String,
-                        newBodyText: CharSequence,
-                        newBodyAutoMarkdown: Boolean,
-                        compatibilityBodyText: String = "* $newBodyText"): Cancelable
+    fun editTextMessage(
+            targetEvent: TimelineEvent,
+            msgType: String,
+            newBodyText: CharSequence,
+            newBodyAutoMarkdown: Boolean,
+            compatibilityBodyText: String = "* $newBodyText"
+    ): Cancelable
 
     /**
      * Edit a reply. This is a special case because replies contains fallback text as a prefix.
@@ -103,10 +111,12 @@ interface RelationService {
      * @param newBodyText The edited body (stripped from in reply to content)
      * @param compatibilityBodyText The text that will appear on clients that don't support yet edition
      */
-    fun editReply(replyToEdit: TimelineEvent,
-                  originalTimelineEvent: TimelineEvent,
-                  newBodyText: String,
-                  compatibilityBodyText: String = "* $newBodyText"): Cancelable
+    fun editReply(
+            replyToEdit: TimelineEvent,
+            originalTimelineEvent: TimelineEvent,
+            newBodyText: String,
+            compatibilityBodyText: String = "* $newBodyText"
+    ): Cancelable
 
     /**
      * Get the edit history of the given event.
@@ -127,11 +137,12 @@ interface RelationService {
      * @param showInThread If true, relation will be added to the reply in order to be visible from within threads
      * @param rootThreadEventId If show in thread is true then we need the rootThreadEventId to generate the relation
      */
-    fun replyToMessage(eventReplied: TimelineEvent,
-                       replyText: CharSequence,
-                       autoMarkdown: Boolean = false,
-                       showInThread: Boolean = false,
-                       rootThreadEventId: String? = null
+    fun replyToMessage(
+            eventReplied: TimelineEvent,
+            replyText: CharSequence,
+            autoMarkdown: Boolean = false,
+            showInThread: Boolean = false,
+            rootThreadEventId: String? = null
     ): Cancelable?
 
     /**
@@ -159,10 +170,12 @@ interface RelationService {
      * @param formattedText The formatted body using MessageType#FORMAT_MATRIX_HTML
      * @param eventReplied the event referenced by the reply within a thread
      */
-    fun replyInThread(rootThreadEventId: String,
-                      replyInThreadText: CharSequence,
-                      msgType: String = MessageType.MSGTYPE_TEXT,
-                      autoMarkdown: Boolean = false,
-                      formattedText: String? = null,
-                      eventReplied: TimelineEvent? = null): Cancelable?
+    fun replyInThread(
+            rootThreadEventId: String,
+            replyInThreadText: CharSequence,
+            msgType: String = MessageType.MSGTYPE_TEXT,
+            autoMarkdown: Boolean = false,
+            formattedText: String? = null,
+            eventReplied: TimelineEvent? = null
+    ): Cancelable?
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt
index c2e3ded2fa..661c3be5bd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt
@@ -76,10 +76,12 @@ interface SendService {
      * @param rootThreadEventId when this param is not null, the Media will be sent in this specific thread
      * @return a [Cancelable]
      */
-    fun sendMedia(attachment: ContentAttachmentData,
-                  compressBeforeSending: Boolean,
-                  roomIds: Set<String>,
-                  rootThreadEventId: String? = null): Cancelable
+    fun sendMedia(
+            attachment: ContentAttachmentData,
+            compressBeforeSending: Boolean,
+            roomIds: Set<String>,
+            rootThreadEventId: String? = null
+    ): Cancelable
 
     /**
      * Method to send a list of media asynchronously.
@@ -90,10 +92,12 @@ interface SendService {
      * @param rootThreadEventId when this param is not null, all the Media will be sent in this specific thread
      * @return a [Cancelable]
      */
-    fun sendMedias(attachments: List<ContentAttachmentData>,
-                   compressBeforeSending: Boolean,
-                   roomIds: Set<String>,
-                   rootThreadEventId: String? = null): Cancelable
+    fun sendMedias(
+            attachments: List<ContentAttachmentData>,
+            compressBeforeSending: Boolean,
+            roomIds: Set<String>,
+            rootThreadEventId: String? = null
+    ): Cancelable
 
     /**
      * Send a poll to the room.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendState.kt
index 7c806bf35b..d058ff2840 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendState.kt
@@ -17,27 +17,44 @@
 package org.matrix.android.sdk.api.session.room.send
 
 enum class SendState {
+    /**
+     * The state is unknown.
+     */
     UNKNOWN,
 
-    // the event has not been sent
+    /**
+     * The event has not been sent.
+     */
     UNSENT,
 
-    // the event is encrypting
+    /**
+     * The event is encrypting.
+     */
     ENCRYPTING,
 
-    // the event is currently sending
+    /**
+     * The event is currently sending.
+     */
     SENDING,
 
-    // the event has been sent
+    /**
+     * The event has been sent.
+     */
     SENT,
 
-    // the event has been received from server
+    /**
+     * The event has been received from server.
+     */
     SYNCED,
 
-    // The event failed to be sent
+    /**
+     * The event failed to be sent.
+     */
     UNDELIVERED,
 
-    // the event failed to be sent because some unknown devices have been found while encrypting it
+    /**
+     * The event failed to be sent because some unknown devices have been found while encrypting it.
+     */
     FAILED_UNKNOWN_DEVICES;
 
     internal companion object {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/threads/model/ThreadEditions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/threads/model/ThreadEditions.kt
index c8353cf0de..dc9cc886e9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/threads/model/ThreadEditions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/threads/model/ThreadEditions.kt
@@ -16,5 +16,7 @@
 
 package org.matrix.android.sdk.api.session.room.threads.model
 
-data class ThreadEditions(var rootThreadEdition: String? = null,
-                          var latestThreadEdition: String? = null)
+data class ThreadEditions(
+        var rootThreadEdition: String? = null,
+        var latestThreadEdition: String? = null
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/threads/model/ThreadSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/threads/model/ThreadSummary.kt
index 1ef972e889..0b1aea1966 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/threads/model/ThreadSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/threads/model/ThreadSummary.kt
@@ -22,12 +22,14 @@ import org.matrix.android.sdk.api.session.room.sender.SenderInfo
 /**
  * The main thread Summary model, mainly used to display the thread list.
  */
-data class ThreadSummary(val roomId: String,
-                         val rootEvent: Event?,
-                         val latestEvent: Event?,
-                         val rootEventId: String,
-                         val rootThreadSenderInfo: SenderInfo,
-                         val latestThreadSenderInfo: SenderInfo,
-                         val isUserParticipating: Boolean,
-                         val numberOfThreads: Int,
-                         val threadEditions: ThreadEditions = ThreadEditions())
+data class ThreadSummary(
+        val roomId: String,
+        val rootEvent: Event?,
+        val latestEvent: Event?,
+        val rootEventId: String,
+        val rootThreadSenderInfo: SenderInfo,
+        val latestThreadSenderInfo: SenderInfo,
+        val isUserParticipating: Boolean,
+        val numberOfThreads: Int,
+        val threadEditions: ThreadEditions = ThreadEditions()
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt
index bc1c9e5769..ffb8b1ca4d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt
@@ -33,12 +33,14 @@ interface SearchService {
      * @param afterLimit how many events after the result are returned.
      * @param includeProfile requests that the server returns the historic profile information for the users that sent the events that were returned.
      */
-    suspend fun search(searchTerm: String,
-                       roomId: String,
-                       nextBatch: String?,
-                       orderByRecent: Boolean,
-                       limit: Int,
-                       beforeLimit: Int,
-                       afterLimit: Int,
-                       includeProfile: Boolean): SearchResult
+    suspend fun search(
+            searchTerm: String,
+            roomId: String,
+            nextBatch: String?,
+            orderByRecent: Boolean,
+            limit: Int,
+            beforeLimit: Int,
+            afterLimit: Int,
+            includeProfile: Boolean
+    ): SearchResult
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/KeyRef.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/KeyRef.kt
new file mode 100644
index 0000000000..5a1bf67fdd
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/KeyRef.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.securestorage
+
+data class KeyRef(
+        val keyId: String?,
+        val keySpec: SsssKeySpec?
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageService.kt
index e3a9860523..bdbbd3ea84 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageService.kt
@@ -44,10 +44,12 @@ interface SharedSecretStorageService {
      *
      * @return key creation info
      */
-    suspend fun generateKey(keyId: String,
-                            key: SsssKeySpec?,
-                            keyName: String,
-                            keySigner: KeySigner?): SsssKeyCreationInfo
+    suspend fun generateKey(
+            keyId: String,
+            key: SsssKeySpec?,
+            keyName: String,
+            keySigner: KeySigner?
+    ): SsssKeyCreationInfo
 
     /**
      * Generates a SSSS key using the given passphrase.
@@ -61,11 +63,13 @@ interface SharedSecretStorageService {
      *
      * @return key creation info
      */
-    suspend fun generateKeyWithPassphrase(keyId: String,
-                                          keyName: String,
-                                          passphrase: String,
-                                          keySigner: KeySigner,
-                                          progressListener: ProgressListener?): SsssKeyCreationInfo
+    suspend fun generateKeyWithPassphrase(
+            keyId: String,
+            keyName: String,
+            passphrase: String,
+            keySigner: KeySigner,
+            progressListener: ProgressListener?
+    ): SsssKeyCreationInfo
 
     fun getKey(keyId: String): KeyInfoResult
 
@@ -132,9 +136,4 @@ interface SharedSecretStorageService {
     fun checkShouldBeAbleToAccessSecrets(secretNames: List<String>, keyId: String?): IntegrityResult
 
     suspend fun requestSecret(name: String, myOtherDeviceId: String)
-
-    data class KeyRef(
-            val keyId: String?,
-            val keySpec: SsssKeySpec?
-    )
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
index c990388628..61c03e08fc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
@@ -31,11 +31,13 @@ interface Space {
      */
     fun spaceSummary(): RoomSummary?
 
-    suspend fun addChildren(roomId: String,
-                            viaServers: List<String>?,
-                            order: String?,
+    suspend fun addChildren(
+            roomId: String,
+            viaServers: List<String>?,
+            order: String?,
 //                            autoJoin: Boolean = false,
-                            suggested: Boolean? = false)
+            suggested: Boolean? = false
+    )
 
     fun getChildInfo(roomId: String): SpaceChildContent?
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
index 38e55664d2..c7a6405014 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
@@ -37,11 +37,13 @@ interface SpaceService {
     /**
      * Just a shortcut for space creation for ease of use.
      */
-    suspend fun createSpace(name: String,
-                            topic: String?,
-                            avatarUri: Uri?,
-                            isPublic: Boolean,
-                            roomAliasLocalPart: String? = null): String
+    suspend fun createSpace(
+            name: String,
+            topic: String?,
+            avatarUri: Uri?,
+            isPublic: Boolean,
+            roomAliasLocalPart: String? = null
+    ): String
 
     /**
      * Get a space from a spaceId.
@@ -68,25 +70,33 @@ interface SpaceService {
      * then the parameters given for suggested_only and max_depth must be the same.
      * @param knownStateList when paginating, pass back the m.space.child state events
      */
-    suspend fun querySpaceChildren(spaceId: String,
-                                   suggestedOnly: Boolean? = null,
-                                   limit: Int? = null,
-                                   from: String? = null,
-                                   knownStateList: List<Event>? = null): SpaceHierarchyData
+    suspend fun querySpaceChildren(
+            spaceId: String,
+            suggestedOnly: Boolean? = null,
+            limit: Int? = null,
+            from: String? = null,
+            knownStateList: List<Event>? = null
+    ): SpaceHierarchyData
 
     /**
      * Get a live list of space summaries. This list is refreshed as soon as the data changes.
      * @return the [LiveData] of List[SpaceSummary]
      */
-    fun getSpaceSummariesLive(queryParams: SpaceSummaryQueryParams,
-                              sortOrder: RoomSortOrder = RoomSortOrder.NONE): LiveData<List<RoomSummary>>
+    fun getSpaceSummariesLive(
+            queryParams: SpaceSummaryQueryParams,
+            sortOrder: RoomSortOrder = RoomSortOrder.NONE
+    ): LiveData<List<RoomSummary>>
 
-    fun getSpaceSummaries(spaceSummaryQueryParams: SpaceSummaryQueryParams,
-                          sortOrder: RoomSortOrder = RoomSortOrder.NONE): List<RoomSummary>
+    fun getSpaceSummaries(
+            spaceSummaryQueryParams: SpaceSummaryQueryParams,
+            sortOrder: RoomSortOrder = RoomSortOrder.NONE
+    ): List<RoomSummary>
 
-    suspend fun joinSpace(spaceIdOrAlias: String,
-                          reason: String? = null,
-                          viaServers: List<String> = emptyList()): JoinSpaceResult
+    suspend fun joinSpace(
+            spaceIdOrAlias: String,
+            reason: String? = null,
+            viaServers: List<String> = emptyList()
+    ): JoinSpaceResult
 
     suspend fun rejectInvite(spaceId: String, reason: String?)
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/statistics/StatisticEvent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/statistics/StatisticEvent.kt
index 76755517ce..d9c7772393 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/statistics/StatisticEvent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/statistics/StatisticEvent.kt
@@ -23,15 +23,19 @@ sealed interface StatisticEvent {
     /**
      * Initial sync request, response downloading, and treatment (parsing and storage) of response.
      */
-    data class InitialSyncRequest(val requestDurationMs: Int,
-                                  val downloadDurationMs: Int,
-                                  val treatmentDurationMs: Int,
-                                  val nbOfJoinedRooms: Int) : StatisticEvent
+    data class InitialSyncRequest(
+            val requestDurationMs: Int,
+            val downloadDurationMs: Int,
+            val treatmentDurationMs: Int,
+            val nbOfJoinedRooms: Int
+    ) : StatisticEvent
 
     /**
      * Incremental sync event.
      */
-    data class SyncTreatment(val durationMs: Int,
-                             val afterPause: Boolean,
-                             val nbOfJoinedRooms: Int) : StatisticEvent
+    data class SyncTreatment(
+            val durationMs: Int,
+            val afterPause: Boolean,
+            val nbOfJoinedRooms: Int
+    ) : StatisticEvent
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/initsync/InitSyncStep.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/InitialSyncStep.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/initsync/InitSyncStep.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/InitialSyncStep.kt
index 901c1b2ffb..407585b003 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/initsync/InitSyncStep.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/InitialSyncStep.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.api.session.initsync
+package org.matrix.android.sdk.api.session.sync
 
-enum class InitSyncStep {
+enum class InitialSyncStep {
     ServerComputing,
     Downloading,
     ImportingAccount,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/SyncRequestState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/SyncRequestState.kt
new file mode 100644
index 0000000000..4e932d49de
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/SyncRequestState.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.sync
+
+sealed interface SyncRequestState {
+    /**
+     * For initial sync.
+     */
+    interface InitialSyncRequestState : SyncRequestState
+
+    object Idle : InitialSyncRequestState
+    data class InitialSyncProgressing(
+            val initialSyncStep: InitialSyncStep,
+            val percentProgress: Int = 0
+    ) : InitialSyncRequestState
+
+    /**
+     * For incremental sync.
+     */
+    interface IncrementalSyncRequestState : SyncRequestState
+
+    object IncrementalSyncIdle : IncrementalSyncRequestState
+    data class IncrementalSyncParsing(
+            val rooms: Int,
+            val toDevice: Int
+    ) : IncrementalSyncRequestState
+
+    object IncrementalSyncError : IncrementalSyncRequestState
+    object IncrementalSyncDone : IncrementalSyncRequestState
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/SyncService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/SyncService.kt
new file mode 100644
index 0000000000..5b2bf651af
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/SyncService.kt
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.sync
+
+import androidx.lifecycle.LiveData
+import kotlinx.coroutines.flow.SharedFlow
+import org.matrix.android.sdk.api.session.sync.model.SyncResponse
+
+interface SyncService {
+    /**
+     * This method start the sync thread.
+     */
+    fun startSync(fromForeground: Boolean)
+
+    /**
+     * This method stop the sync thread.
+     */
+    fun stopSync()
+
+    /**
+     * Requires a one time background sync.
+     */
+    fun requireBackgroundSync()
+
+    /**
+     * Launches infinite self rescheduling background syncs via the WorkManager.
+     *
+     * While dozing, syncs will only occur during maintenance windows.
+     * For reliability it's recommended to also start a long running foreground service
+     * along with disabling battery optimizations.
+     */
+    fun startAutomaticBackgroundSync(timeOutInSeconds: Long, repeatDelayInSeconds: Long)
+
+    fun stopAnyBackgroundSync()
+
+    /**
+     * This method returns the current sync state.
+     * @return the current [SyncState].
+     */
+    fun getSyncState(): SyncState
+
+    /**
+     * This method allows to listen the sync state.
+     * @return a [LiveData] of [SyncState].
+     */
+    fun getSyncStateLive(): LiveData<SyncState>
+
+    /**
+     * Get the [SyncRequestState] as a LiveData.
+     */
+    fun getSyncRequestStateLive(): LiveData<SyncRequestState>
+
+    /**
+     * This method returns a flow of SyncResponse. New value will be pushed through the sync thread.
+     */
+    fun syncFlow(): SharedFlow<SyncResponse>
+
+    /**
+     * This methods return true if an initial sync has been processed.
+     */
+    fun hasAlreadySynced(): Boolean
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/job/SyncService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/job/SyncAndroidService.kt
similarity index 97%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/job/SyncService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/job/SyncAndroidService.kt
index ac81be2174..50da34b319 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/job/SyncService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/job/SyncAndroidService.kt
@@ -46,7 +46,7 @@ import java.util.concurrent.atomic.AtomicBoolean
  * in order to be able to perform a sync even if the app is not running.
  * The <receiver> and <service> must be declared in the Manifest or the app using the SDK
  */
-abstract class SyncService : Service() {
+abstract class SyncAndroidService : Service() {
 
     private var sessionId: String? = null
     private var mIsSelfDestroyed: Boolean = false
@@ -158,9 +158,9 @@ abstract class SyncService : Service() {
             // never do that in foreground, let the syncThread work
             syncTask.execute(params)
             // Start sync if we were doing an initial sync and the syncThread is not launched yet
-            if (isInitialSync && session.getSyncState() == SyncState.Idle) {
+            if (isInitialSync && session.syncService().getSyncState() == SyncState.Idle) {
                 val isForeground = !backgroundDetectionObserver.isInBackground
-                session.startSync(isForeground)
+                session.syncService().startSync(isForeground)
             }
             stopMe()
         } catch (throwable: Throwable) {
@@ -210,7 +210,7 @@ abstract class SyncService : Service() {
             session = sessionComponent.session()
             sessionId = safeSessionId
             syncTask = sessionComponent.syncTask()
-            isInitialSync = !session.hasAlreadySynced()
+            isInitialSync = !session.syncService().hasAlreadySynced()
             networkConnectivityChecker = sessionComponent.networkConnectivityChecker()
             taskExecutor = sessionComponent.taskExecutor()
             coroutineDispatchers = sessionComponent.coroutineDispatchers()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSyncUnreadNotifications.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSyncUnreadNotifications.kt
index 6618bceacd..09273f56e6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSyncUnreadNotifications.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSyncUnreadNotifications.kt
@@ -38,4 +38,5 @@ data class RoomSyncUnreadNotifications(
         /**
          * The number of highlighted unread messages (subset of notifications).
          */
-        @Json(name = "highlight_count") val highlightCount: Int? = null)
+        @Json(name = "highlight_count") val highlightCount: Int? = null
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/TermsResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/TermsResponse.kt
index 9a30b4d764..ae728326cc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/TermsResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/TermsResponse.kt
@@ -30,8 +30,10 @@ data class TermsResponse(
         val policies: JsonDict? = null
 ) {
 
-    fun getLocalizedTerms(userLanguage: String,
-                          defaultLanguage: String = "en"): List<LocalizedFlowDataLoginTerms> {
+    fun getLocalizedTerms(
+            userLanguage: String,
+            defaultLanguage: String = "en"
+    ): List<LocalizedFlowDataLoginTerms> {
         return policies?.map {
             val tos = policies[it.key] as? Map<*, *> ?: return@map null
             ((tos[userLanguage] ?: tos[defaultLanguage]) as? Map<*, *>)?.let { termsMap ->
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/TermsService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/TermsService.kt
index 6c357b2224..1ddce763d1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/TermsService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/TermsService.kt
@@ -24,10 +24,12 @@ interface TermsService {
 
     suspend fun getTerms(serviceType: ServiceType, baseUrl: String): GetTermsResponse
 
-    suspend fun agreeToTerms(serviceType: ServiceType,
-                             baseUrl: String,
-                             agreedUrls: List<String>,
-                             token: String?)
+    suspend fun agreeToTerms(
+            serviceType: ServiceType,
+            baseUrl: String,
+            agreedUrls: List<String>,
+            token: String?
+    )
 
     /**
      * Get the homeserver terms, from the register API.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/threads/ThreadNotificationState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/threads/ThreadNotificationState.kt
index c110802d23..6825f8c279 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/threads/ThreadNotificationState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/threads/ThreadNotificationState.kt
@@ -20,14 +20,19 @@ package org.matrix.android.sdk.api.session.threads
  * This class defines the state of a thread notification.
  */
 enum class ThreadNotificationState {
-
-    // There are no new message
+    /**
+     * There are no new message.
+     */
     NO_NEW_MESSAGE,
 
-    // There is at least one new message
+    /**
+     * There is at least one new message.
+     */
     NEW_MESSAGE,
 
-    // The is at least one new message that should be highlighted
-    // ex. "Hello @aris.kotsomitopoulos"
+    /**
+     * The is at least one new message that should be highlighted.
+     * ex. "Hello @aris.kotsomitopoulos"
+     */
     NEW_HIGHLIGHTED_MESSAGE;
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt
index 8a29d00380..ec775d640e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt
@@ -33,9 +33,11 @@ sealed class MatrixItem(
         open val displayName: String?,
         open val avatarUrl: String?
 ) {
-    data class UserItem(override val id: String,
-                        override val displayName: String? = null,
-                        override val avatarUrl: String? = null) :
+    data class UserItem(
+            override val id: String,
+            override val displayName: String? = null,
+            override val avatarUrl: String? = null
+    ) :
             MatrixItem(id, displayName?.removeSuffix(IRC_PATTERN), avatarUrl) {
 
         init {
@@ -45,10 +47,12 @@ sealed class MatrixItem(
         override fun updateAvatar(newAvatar: String?) = copy(avatarUrl = newAvatar)
     }
 
-    data class EveryoneInRoomItem(override val id: String,
-                                  override val displayName: String = NOTIFY_EVERYONE,
-                                  override val avatarUrl: String? = null,
-                                  val roomDisplayName: String? = null) :
+    data class EveryoneInRoomItem(
+            override val id: String,
+            override val displayName: String = NOTIFY_EVERYONE,
+            override val avatarUrl: String? = null,
+            val roomDisplayName: String? = null
+    ) :
             MatrixItem(id, displayName, avatarUrl) {
         init {
             if (BuildConfig.DEBUG) checkId()
@@ -57,9 +61,11 @@ sealed class MatrixItem(
         override fun updateAvatar(newAvatar: String?) = copy(avatarUrl = newAvatar)
     }
 
-    data class EventItem(override val id: String,
-                         override val displayName: String? = null,
-                         override val avatarUrl: String? = null) :
+    data class EventItem(
+            override val id: String,
+            override val displayName: String? = null,
+            override val avatarUrl: String? = null
+    ) :
             MatrixItem(id, displayName, avatarUrl) {
         init {
             if (BuildConfig.DEBUG) checkId()
@@ -68,9 +74,11 @@ sealed class MatrixItem(
         override fun updateAvatar(newAvatar: String?) = copy(avatarUrl = newAvatar)
     }
 
-    data class RoomItem(override val id: String,
-                        override val displayName: String? = null,
-                        override val avatarUrl: String? = null) :
+    data class RoomItem(
+            override val id: String,
+            override val displayName: String? = null,
+            override val avatarUrl: String? = null
+    ) :
             MatrixItem(id, displayName, avatarUrl) {
         init {
             if (BuildConfig.DEBUG) checkId()
@@ -79,9 +87,11 @@ sealed class MatrixItem(
         override fun updateAvatar(newAvatar: String?) = copy(avatarUrl = newAvatar)
     }
 
-    data class SpaceItem(override val id: String,
-                         override val displayName: String? = null,
-                         override val avatarUrl: String? = null) :
+    data class SpaceItem(
+            override val id: String,
+            override val displayName: String? = null,
+            override val avatarUrl: String? = null
+    ) :
             MatrixItem(id, displayName, avatarUrl) {
         init {
             if (BuildConfig.DEBUG) checkId()
@@ -90,9 +100,11 @@ sealed class MatrixItem(
         override fun updateAvatar(newAvatar: String?) = copy(avatarUrl = newAvatar)
     }
 
-    data class RoomAliasItem(override val id: String,
-                             override val displayName: String? = null,
-                             override val avatarUrl: String? = null) :
+    data class RoomAliasItem(
+            override val id: String,
+            override val displayName: String? = null,
+            override val avatarUrl: String? = null
+    ) :
             MatrixItem(id, displayName, avatarUrl) {
         init {
             if (BuildConfig.DEBUG) checkId()
@@ -101,9 +113,11 @@ sealed class MatrixItem(
         override fun updateAvatar(newAvatar: String?) = copy(avatarUrl = newAvatar)
     }
 
-    data class GroupItem(override val id: String,
-                         override val displayName: String? = null,
-                         override val avatarUrl: String? = null) :
+    data class GroupItem(
+            override val id: String,
+            override val displayName: String? = null,
+            override val avatarUrl: String? = null
+    ) :
             MatrixItem(id, displayName, avatarUrl) {
         init {
             if (BuildConfig.DEBUG) checkId()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/SessionManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/SessionManager.kt
index 934d61de45..bd2dac9e3c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/SessionManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/SessionManager.kt
@@ -27,8 +27,10 @@ import org.matrix.android.sdk.internal.session.SessionComponent
 import javax.inject.Inject
 
 @MatrixScope
-internal class SessionManager @Inject constructor(private val matrixComponent: MatrixComponent,
-                                                  private val sessionParamsStore: SessionParamsStore) {
+internal class SessionManager @Inject constructor(
+        private val matrixComponent: MatrixComponent,
+        private val sessionParamsStore: SessionParamsStore
+) {
 
     // SessionId -> SessionComponent
     private val sessionComponents = HashMap<String, SessionComponent>()
@@ -53,7 +55,7 @@ internal class SessionManager @Inject constructor(private val matrixComponent: M
 
     fun stopSession(sessionId: String) {
         val sessionComponent = sessionComponents[sessionId] ?: throw RuntimeException("You don't have a session for id $sessionId")
-        sessionComponent.session().stopSync()
+        sessionComponent.session().syncService().stopSync()
     }
 
     fun getOrCreateSessionComponent(sessionParams: SessionParams): SessionComponent {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt
index 46fa63334c..ea4502824e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt
@@ -98,15 +98,19 @@ internal interface AuthAPI {
      * https://github.com/matrix-org/matrix-doc/pull/2290
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "register/{threePid}/requestToken")
-    suspend fun add3Pid(@Path("threePid") threePid: String,
-                        @Body params: AddThreePidRegistrationParams): AddThreePidRegistrationResponse
+    suspend fun add3Pid(
+            @Path("threePid") threePid: String,
+            @Body params: AddThreePidRegistrationParams
+    ): AddThreePidRegistrationResponse
 
     /**
      * Validate 3pid.
      */
     @POST
-    suspend fun validate3Pid(@Url url: String,
-                             @Body params: ValidationCodeBody): SuccessResult
+    suspend fun validate3Pid(
+            @Url url: String,
+            @Body params: ValidationCodeBody
+    ): SuccessResult
 
     /**
      * Get the supported login flow.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthModule.kt
index 298e116199..ddb70be906 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthModule.kt
@@ -46,9 +46,11 @@ internal abstract class AuthModule {
         @JvmStatic
         @Provides
         @AuthDatabase
-        fun providesRealmConfiguration(context: Context,
-                                       realmKeysUtils: RealmKeysUtils,
-                                       authRealmMigration: AuthRealmMigration): RealmConfiguration {
+        fun providesRealmConfiguration(
+                context: Context,
+                realmKeysUtils: RealmKeysUtils,
+                authRealmMigration: AuthRealmMigration
+        ): RealmConfiguration {
             val old = File(context.filesDir, "matrix-sdk-auth")
             if (old.exists()) {
                 old.renameTo(File(context.filesDir, "matrix-sdk-auth.realm"))
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
index 02dfce04b5..c64f451a2c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
@@ -130,16 +130,7 @@ internal class DefaultAuthenticationService @Inject constructor(
                 ?.trim { it == '/' }
     }
 
-    /**
-     * This is the entry point of the authentication service.
-     * homeServerConnectionConfig contains a homeserver URL probably entered by the user, which can be a
-     * valid homeserver API url, the url of Element Web, or anything else.
-     */
     override suspend fun getLoginFlow(homeServerConnectionConfig: HomeServerConnectionConfig): LoginFlowResult {
-        pendingSessionData = null
-
-        pendingSessionStore.delete()
-
         val result = runCatching {
             getLoginFlowInternal(homeServerConnectionConfig)
         }
@@ -323,8 +314,7 @@ internal class DefaultAuthenticationService @Inject constructor(
                 }
     }
 
-    override val isRegistrationStarted: Boolean
-        get() = currentRegistrationWizard?.isRegistrationStarted == true
+    override fun isRegistrationStarted() = currentRegistrationWizard?.isRegistrationStarted() == true
 
     override fun getLoginWizard(): LoginWizard {
         return currentLoginWizard
@@ -368,13 +358,17 @@ internal class DefaultAuthenticationService @Inject constructor(
         pendingSessionStore.delete()
     }
 
-    override suspend fun createSessionFromSso(homeServerConnectionConfig: HomeServerConnectionConfig,
-                                              credentials: Credentials): Session {
+    override suspend fun createSessionFromSso(
+            homeServerConnectionConfig: HomeServerConnectionConfig,
+            credentials: Credentials
+    ): Session {
         return sessionCreator.createSession(credentials, homeServerConnectionConfig)
     }
 
-    override suspend fun getWellKnownData(matrixId: String,
-                                          homeServerConnectionConfig: HomeServerConnectionConfig?): WellknownResult {
+    override suspend fun getWellKnownData(
+            matrixId: String,
+            homeServerConnectionConfig: HomeServerConnectionConfig?
+    ): WellknownResult {
         if (!MatrixPatterns.isUserId(matrixId)) {
             throw MatrixIdFailure.InvalidMatrixId
         }
@@ -392,11 +386,13 @@ internal class DefaultAuthenticationService @Inject constructor(
             .withHomeServerUri("https://dummy.org")
             .build()
 
-    override suspend fun directAuthentication(homeServerConnectionConfig: HomeServerConnectionConfig,
-                                              matrixId: String,
-                                              password: String,
-                                              initialDeviceName: String,
-                                              deviceId: String?): Session {
+    override suspend fun directAuthentication(
+            homeServerConnectionConfig: HomeServerConnectionConfig,
+            matrixId: String,
+            password: String,
+            initialDeviceName: String,
+            deviceId: String?
+    ): Session {
         return directLoginTask.execute(
                 DirectLoginTask.Params(
                         homeServerConnectionConfig = homeServerConnectionConfig,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/PasswordLoginParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/PasswordLoginParams.kt
index 5be480f633..5f0a2298cb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/PasswordLoginParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/PasswordLoginParams.kt
@@ -31,7 +31,8 @@ internal data class PasswordLoginParams(
         @Json(name = "password") val password: String,
         @Json(name = "type") override val type: String,
         @Json(name = "initial_device_display_name") val deviceDisplayName: String?,
-        @Json(name = "device_id") val deviceId: String?) : LoginParams {
+        @Json(name = "device_id") val deviceId: String?
+) : LoginParams {
 
     companion object {
         private const val IDENTIFIER_KEY_TYPE = "type"
@@ -47,10 +48,12 @@ internal data class PasswordLoginParams(
         private const val IDENTIFIER_KEY_COUNTRY = "country"
         private const val IDENTIFIER_KEY_PHONE = "phone"
 
-        fun userIdentifier(user: String,
-                           password: String,
-                           deviceDisplayName: String?,
-                           deviceId: String?): PasswordLoginParams {
+        fun userIdentifier(
+                user: String,
+                password: String,
+                deviceDisplayName: String?,
+                deviceId: String?
+        ): PasswordLoginParams {
             return PasswordLoginParams(
                     identifier = mapOf(
                             IDENTIFIER_KEY_TYPE to IDENTIFIER_KEY_TYPE_USER,
@@ -63,11 +66,13 @@ internal data class PasswordLoginParams(
             )
         }
 
-        fun thirdPartyIdentifier(medium: String,
-                                 address: String,
-                                 password: String,
-                                 deviceDisplayName: String?,
-                                 deviceId: String?): PasswordLoginParams {
+        fun thirdPartyIdentifier(
+                medium: String,
+                address: String,
+                password: String,
+                deviceDisplayName: String?,
+                deviceId: String?
+        ): PasswordLoginParams {
             return PasswordLoginParams(
                     identifier = mapOf(
                             IDENTIFIER_KEY_TYPE to IDENTIFIER_KEY_TYPE_THIRD_PARTY,
@@ -81,11 +86,13 @@ internal data class PasswordLoginParams(
             )
         }
 
-        fun phoneIdentifier(country: String,
-                            phone: String,
-                            password: String,
-                            deviceDisplayName: String?,
-                            deviceId: String?): PasswordLoginParams {
+        fun phoneIdentifier(
+                country: String,
+                phone: String,
+                password: String,
+                deviceDisplayName: String?,
+                deviceId: String?
+        ): PasswordLoginParams {
             return PasswordLoginParams(
                     identifier = mapOf(
                             IDENTIFIER_KEY_TYPE to IDENTIFIER_KEY_TYPE_PHONE,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/RealmPendingSessionStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/RealmPendingSessionStore.kt
index 13f26e321d..aae8ff8419 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/RealmPendingSessionStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/RealmPendingSessionStore.kt
@@ -23,9 +23,10 @@ import org.matrix.android.sdk.internal.database.awaitTransaction
 import org.matrix.android.sdk.internal.di.AuthDatabase
 import javax.inject.Inject
 
-internal class RealmPendingSessionStore @Inject constructor(private val mapper: PendingSessionMapper,
-                                                            @AuthDatabase
-                                                            private val realmConfiguration: RealmConfiguration
+internal class RealmPendingSessionStore @Inject constructor(
+        private val mapper: PendingSessionMapper,
+        @AuthDatabase
+        private val realmConfiguration: RealmConfiguration
 ) : PendingSessionStore {
 
     override suspend fun savePendingSessionData(pendingSessionData: PendingSessionData) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/RealmSessionParamsStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/RealmSessionParamsStore.kt
index 235ef6b709..4c3e3ca824 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/RealmSessionParamsStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/RealmSessionParamsStore.kt
@@ -28,9 +28,10 @@ import org.matrix.android.sdk.internal.di.AuthDatabase
 import timber.log.Timber
 import javax.inject.Inject
 
-internal class RealmSessionParamsStore @Inject constructor(private val mapper: SessionParamsMapper,
-                                                           @AuthDatabase
-                                                           private val realmConfiguration: RealmConfiguration
+internal class RealmSessionParamsStore @Inject constructor(
+        private val mapper: SessionParamsMapper,
+        @AuthDatabase
+        private val realmConfiguration: RealmConfiguration
 ) : SessionParamsStore {
 
     override fun getLast(): SessionParams? {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DefaultLoginWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DefaultLoginWizard.kt
index 0583951138..20b056f1c7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DefaultLoginWizard.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DefaultLoginWizard.kt
@@ -52,10 +52,12 @@ internal class DefaultLoginWizard(
         return getProfileTask.execute(GetProfileTask.Params(matrixId))
     }
 
-    override suspend fun login(login: String,
-                               password: String,
-                               initialDeviceName: String,
-                               deviceId: String?): Session {
+    override suspend fun login(
+            login: String,
+            password: String,
+            initialDeviceName: String,
+            deviceId: String?
+    ): Session {
         val loginParams = if (Patterns.EMAIL_ADDRESS.matcher(login).matches()) {
             PasswordLoginParams.thirdPartyIdentifier(
                     medium = ThreePidMedium.EMAIL,
@@ -101,7 +103,7 @@ internal class DefaultLoginWizard(
         return sessionCreator.createSession(credentials, pendingSessionData.homeServerConnectionConfig)
     }
 
-    override suspend fun resetPassword(email: String, newPassword: String) {
+    override suspend fun resetPassword(email: String) {
         val param = RegisterAddThreePidTask.Params(
                 RegisterThreePid.Email(email),
                 pendingSessionData.clientSecret,
@@ -115,18 +117,16 @@ internal class DefaultLoginWizard(
             authAPI.resetPassword(AddThreePidRegistrationParams.from(param))
         }
 
-        pendingSessionData = pendingSessionData.copy(resetPasswordData = ResetPasswordData(newPassword, result))
+        pendingSessionData = pendingSessionData.copy(resetPasswordData = ResetPasswordData(result))
                 .also { pendingSessionStore.savePendingSessionData(it) }
     }
 
-    override suspend fun resetPasswordMailConfirmed() {
-        val safeResetPasswordData = pendingSessionData.resetPasswordData
-                ?: throw IllegalStateException("developer error, no reset password in progress")
-
+    override suspend fun resetPasswordMailConfirmed(newPassword: String) {
+        val resetPasswordData = pendingSessionData.resetPasswordData ?: throw IllegalStateException("Developer error - Must call resetPassword first")
         val param = ResetPasswordMailConfirmed.create(
                 pendingSessionData.clientSecret,
-                safeResetPasswordData.addThreePidRegistrationResponse.sid,
-                safeResetPasswordData.newPassword
+                resetPasswordData.addThreePidRegistrationResponse.sid,
+                newPassword
         )
 
         executeRequest(null) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/ResetPasswordData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/ResetPasswordData.kt
index a65ec38d6d..87a7b346dc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/ResetPasswordData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/ResetPasswordData.kt
@@ -24,6 +24,5 @@ import org.matrix.android.sdk.internal.auth.registration.AddThreePidRegistration
  */
 @JsonClass(generateAdapter = true)
 internal data class ResetPasswordData(
-        val newPassword: String,
         val addThreePidRegistrationResponse: AddThreePidRegistrationResponse
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
index 8f00f3440c..b45c4e87f0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
@@ -49,29 +49,29 @@ internal class DefaultRegistrationWizard(
     private val validateCodeTask: ValidateCodeTask = DefaultValidateCodeTask(authAPI)
     private val registerCustomTask: RegisterCustomTask = DefaultRegisterCustomTask(authAPI)
 
-    override val currentThreePid: String?
-        get() {
-            return when (val threePid = pendingSessionData.currentThreePidData?.threePid) {
-                is RegisterThreePid.Email  -> threePid.email
-                is RegisterThreePid.Msisdn -> {
-                    // Take formatted msisdn if provided by the server
-                    pendingSessionData.currentThreePidData?.addThreePidRegistrationResponse?.formattedMsisdn?.takeIf { it.isNotBlank() } ?: threePid.msisdn
-                }
-                null                       -> null
+    override fun getCurrentThreePid(): String? {
+        return when (val threePid = pendingSessionData.currentThreePidData?.threePid) {
+            is RegisterThreePid.Email  -> threePid.email
+            is RegisterThreePid.Msisdn -> {
+                // Take formatted msisdn if provided by the server
+                pendingSessionData.currentThreePidData?.addThreePidRegistrationResponse?.formattedMsisdn?.takeIf { it.isNotBlank() } ?: threePid.msisdn
             }
+            null                       -> null
         }
+    }
 
-    override val isRegistrationStarted: Boolean
-        get() = pendingSessionData.isRegistrationStarted
+    override fun isRegistrationStarted() = pendingSessionData.isRegistrationStarted
 
     override suspend fun getRegistrationFlow(): RegistrationResult {
         val params = RegistrationParams()
         return performRegistrationRequest(params)
     }
 
-    override suspend fun createAccount(userName: String?,
-                                       password: String?,
-                                       initialDeviceDisplayName: String?): RegistrationResult {
+    override suspend fun createAccount(
+            userName: String?,
+            password: String?,
+            initialDeviceDisplayName: String?
+    ): RegistrationResult {
         val params = RegistrationParams(
                 username = userName,
                 password = password,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ThreePidData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ThreePidData.kt
index c8f71af306..70615809d8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ThreePidData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ThreePidData.kt
@@ -40,9 +40,11 @@ internal data class ThreePidData(
         }
 
     companion object {
-        fun from(threePid: RegisterThreePid,
-                 addThreePidRegistrationResponse: AddThreePidRegistrationResponse,
-                 registrationParams: RegistrationParams): ThreePidData {
+        fun from(
+                threePid: RegisterThreePid,
+                addThreePidRegistrationResponse: AddThreePidRegistrationResponse,
+                registrationParams: RegistrationParams
+        ): ThreePidData {
             return when (threePid) {
                 is RegisterThreePid.Email  ->
                     ThreePidData(threePid.email, "", "", addThreePidRegistrationResponse, registrationParams)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/UIAExt.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/UIAExt.kt
index 9b135c347d..8118f9faff 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/UIAExt.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/UIAExt.kt
@@ -35,9 +35,11 @@ import kotlin.coroutines.suspendCoroutine
  * @return UiaResult if UIA handled, failed or cancelled
  *
  */
-internal suspend fun handleUIA(failure: Throwable,
-                               interceptor: UserInteractiveAuthInterceptor,
-                               retryBlock: suspend (UIABaseAuth) -> Unit): UiaResult {
+internal suspend fun handleUIA(
+        failure: Throwable,
+        interceptor: UserInteractiveAuthInterceptor,
+        retryBlock: suspend (UIABaseAuth) -> Unit
+): UiaResult {
     Timber.d("## UIA: check error ${failure.message}")
     val flowResponse = failure.toRegistrationFlowResponse()
             ?: return UiaResult.FAILURE.also {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/HomeServerVersion.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/HomeServerVersion.kt
index 815f8de2de..239adfdbbd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/HomeServerVersion.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/HomeServerVersion.kt
@@ -16,6 +16,8 @@
 
 package org.matrix.android.sdk.internal.auth.version
 
+import org.matrix.android.sdk.api.extensions.ensureNotEmpty
+
 /**
  * Values will take the form "rX.Y.Z".
  * Ref: https://matrix.org/docs/spec/client_server/latest#get-matrix-client-versions
@@ -38,14 +40,14 @@ internal data class HomeServerVersion(
     }
 
     companion object {
-        internal val pattern = Regex("""[r|v](\d+)\.(\d+)\.(\d+)""")
+        internal val pattern = Regex("""[r|v](\d+)\.(\d+)(?:\.(\d+))?""")
 
         internal fun parse(value: String): HomeServerVersion? {
             val result = pattern.matchEntire(value) ?: return null
             return HomeServerVersion(
                     major = result.groupValues[1].toInt(),
                     minor = result.groupValues[2].toInt(),
-                    patch = result.groupValues[3].toInt()
+                    patch = result.groupValues.getOrNull(index = 3)?.ensureNotEmpty()?.toInt() ?: 0
             )
         }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoModule.kt
index 2265526484..c69a859016 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoModule.kt
@@ -110,10 +110,12 @@ internal abstract class CryptoModule {
         @Provides
         @CryptoDatabase
         @SessionScope
-        fun providesRealmConfiguration(@SessionFilesDirectory directory: File,
-                                       @UserMd5 userMd5: String,
-                                       realmKeysUtils: RealmKeysUtils,
-                                       realmCryptoStoreMigration: RealmCryptoStoreMigration): RealmConfiguration {
+        fun providesRealmConfiguration(
+                @SessionFilesDirectory directory: File,
+                @UserMd5 userMd5: String,
+                realmKeysUtils: RealmKeysUtils,
+                realmCryptoStoreMigration: RealmCryptoStoreMigration
+        ): RealmConfiguration {
             return RealmConfiguration.Builder()
                     .directory(directory)
                     .apply {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
index 824478f1d3..a5afe3f81d 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
@@ -592,10 +592,12 @@ internal class DefaultCryptoService @Inject constructor(
      * @param membersId list of members to start tracking their devices
      * @return true if the operation succeeds.
      */
-    private suspend fun setEncryptionInRoom(roomId: String,
-                                            algorithm: String?,
-                                            inhibitDeviceQuery: Boolean,
-                                            membersId: List<String>): Boolean {
+    private suspend fun setEncryptionInRoom(
+            roomId: String,
+            algorithm: String?,
+            inhibitDeviceQuery: Boolean,
+            membersId: List<String>
+    ): Boolean {
         // If we already have encryption in this room, we should ignore this event
         // (for now at least. Maybe we should alert the user somehow?)
         val existingAlgorithm = cryptoStore.getRoomAlgorithm(roomId)
@@ -691,10 +693,12 @@ internal class DefaultCryptoService @Inject constructor(
      * @param roomId the room identifier the event will be sent.
      * @param callback the asynchronous callback
      */
-    override fun encryptEventContent(eventContent: Content,
-                                     eventType: String,
-                                     roomId: String,
-                                     callback: MatrixCallback<MXEncryptEventContentResult>) {
+    override fun encryptEventContent(
+            eventContent: Content,
+            eventType: String,
+            roomId: String,
+            callback: MatrixCallback<MXEncryptEventContentResult>
+    ) {
         // moved to crypto scope to have uptodate values
         cryptoCoroutineScope.launch(coroutineDispatchers.crypto) {
             val userIds = getRoomUserIds(roomId)
@@ -879,8 +883,10 @@ internal class DefaultCryptoService @Inject constructor(
     /**
      * Returns true if handled by SDK, otherwise should be sent to application layer.
      */
-    private fun handleSDKLevelGossip(secretName: String?,
-                                     secretValue: String): Boolean {
+    private fun handleSDKLevelGossip(
+            secretName: String?,
+            secretValue: String
+    ): Boolean {
         return when (secretName) {
             MASTER_KEY_SSSS_NAME       -> {
                 crossSigningService.onSecretMSKGossip(secretValue)
@@ -1022,9 +1028,11 @@ internal class DefaultCryptoService @Inject constructor(
      * @param progressListener the progress listener
      * @return the result ImportRoomKeysResult
      */
-    override suspend fun importRoomKeys(roomKeysAsArray: ByteArray,
-                                        password: String,
-                                        progressListener: ProgressListener?): ImportRoomKeysResult {
+    override suspend fun importRoomKeys(
+            roomKeysAsArray: ByteArray,
+            password: String,
+            progressListener: ProgressListener?
+    ): ImportRoomKeysResult {
         return withContext(coroutineDispatchers.crypto) {
             Timber.tag(loggerTag.value).v("importRoomKeys starts")
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/EventDecryptor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/EventDecryptor.kt
index cb61bbe1de..c1d04eb22b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/EventDecryptor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/EventDecryptor.kt
@@ -29,6 +29,7 @@ import org.matrix.android.sdk.api.session.crypto.model.MXUsersDevicesMap
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.content.OlmEventContent
+import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.internal.crypto.actions.EnsureOlmSessionsForDevicesAction
 import org.matrix.android.sdk.internal.crypto.actions.MessageEncrypter
@@ -42,7 +43,7 @@ import javax.inject.Inject
 
 private const val SEND_TO_DEVICE_RETRY_COUNT = 3
 
-private val loggerTag = LoggerTag("CryptoSyncHandler", LoggerTag.CRYPTO)
+private val loggerTag = LoggerTag("EventDecryptor", LoggerTag.CRYPTO)
 
 @SessionScope
 internal class EventDecryptor @Inject constructor(
@@ -110,6 +111,16 @@ internal class EventDecryptor @Inject constructor(
         if (eventContent == null) {
             Timber.tag(loggerTag.value).e("decryptEvent : empty event content")
             throw MXCryptoError.Base(MXCryptoError.ErrorType.BAD_ENCRYPTED_MESSAGE, MXCryptoError.BAD_ENCRYPTED_MESSAGE_REASON)
+        } else if (event.isRedacted()) {
+            // we shouldn't attempt to decrypt a redacted event because the content is cleared and decryption will fail because of null algorithm
+            return MXEventDecryptionResult(
+                    clearEvent = mapOf(
+                            "room_id" to event.roomId.orEmpty(),
+                            "type" to EventType.MESSAGE,
+                            "content" to emptyMap<String, Any>(),
+                            "unsigned" to event.unsignedData.toContent()
+                    )
+            )
         } else {
             val algorithm = eventContent["algorithm"]?.toString()
             val alg = roomDecryptorProvider.getOrCreateRoomDecryptor(event.roomId, algorithm)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/InboundGroupSessionStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/InboundGroupSessionStore.kt
index 28ddf291b2..e4d322cadd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/InboundGroupSessionStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/InboundGroupSessionStore.kt
@@ -44,7 +44,8 @@ private val loggerTag = LoggerTag("InboundGroupSessionStore", LoggerTag.CRYPTO)
 internal class InboundGroupSessionStore @Inject constructor(
         private val store: IMXCryptoStore,
         private val cryptoCoroutineScope: CoroutineScope,
-        private val coroutineDispatchers: MatrixCoroutineDispatchers) {
+        private val coroutineDispatchers: MatrixCoroutineDispatchers
+) {
 
     private data class CacheKey(
             val sessionId: String,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingKeyRequestManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingKeyRequestManager.kt
index 13f2fb861a..f8baab7c06 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingKeyRequestManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingKeyRequestManager.kt
@@ -369,9 +369,11 @@ internal class IncomingKeyRequestManager @Inject constructor(
         shareMegolmKey(validReq, requestingDevice, null)
     }
 
-    private suspend fun shareMegolmKey(validRequest: ValidMegolmRequestBody,
-                                       requestingDevice: CryptoDeviceInfo,
-                                       chainIndex: Long?): Boolean {
+    private suspend fun shareMegolmKey(
+            validRequest: ValidMegolmRequestBody,
+            requestingDevice: CryptoDeviceInfo,
+            chainIndex: Long?
+    ): Boolean {
         Timber.tag(loggerTag.value)
                 .d("try to re-share Megolm Key at index $chainIndex for ${validRequest.shortDbgString()}")
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
index 6c18f29307..24b6fd166f 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
@@ -96,8 +96,9 @@ internal class MXOlmDevice @Inject constructor(
     // So, store these message indexes per timeline id.
     //
     // The first level keys are timeline ids.
-    // The second level keys are strings of form "<senderKey>|<session_id>|<message_index>"
-    private val inboundGroupSessionMessageIndexes: MutableMap<String, MutableSet<String>> = HashMap()
+    // The second level values is a Map that represents:
+    // "<senderKey>|<session_id>|<roomId>|<message_index>" --> eventId
+    private val inboundGroupSessionMessageIndexes: MutableMap<String, MutableMap<String, String>> = HashMap()
 
     init {
         // Retrieve the account from the store
@@ -599,13 +600,15 @@ internal class MXOlmDevice @Inject constructor(
      * @param exportFormat true if the megolm keys are in export format
      * @return true if the operation succeeds.
      */
-    fun addInboundGroupSession(sessionId: String,
-                               sessionKey: String,
-                               roomId: String,
-                               senderKey: String,
-                               forwardingCurve25519KeyChain: List<String>,
-                               keysClaimed: Map<String, String>,
-                               exportFormat: Boolean): AddSessionResult {
+    fun addInboundGroupSession(
+            sessionId: String,
+            sessionKey: String,
+            roomId: String,
+            senderKey: String,
+            forwardingCurve25519KeyChain: List<String>,
+            keysClaimed: Map<String, String>,
+            exportFormat: Boolean
+    ): AddSessionResult {
         val candidateSession = OlmInboundGroupSessionWrapper2(sessionKey, exportFormat)
         val existingSessionHolder = tryOrNull { getInboundGroupSession(sessionId, senderKey, roomId) }
         val existingSession = existingSessionHolder?.wrapper
@@ -755,67 +758,74 @@ internal class MXOlmDevice @Inject constructor(
      * @param body the base64-encoded body of the encrypted message.
      * @param roomId the room in which the message was received.
      * @param timeline the id of the timeline where the event is decrypted. It is used to prevent replay attack.
+     * @param eventId the eventId of the message that will be decrypted
      * @param sessionId the session identifier.
      * @param senderKey the base64-encoded curve25519 key of the sender.
-     * @return the decrypting result. Nil if the sessionId is unknown.
+     * @return the decrypting result. Null if the sessionId is unknown.
      */
     @Throws(MXCryptoError::class)
-    suspend fun decryptGroupMessage(body: String,
-                                    roomId: String,
-                                    timeline: String?,
-                                    sessionId: String,
-                                    senderKey: String): OlmDecryptionResult {
+    suspend fun decryptGroupMessage(
+            body: String,
+            roomId: String,
+            timeline: String?,
+            eventId: String,
+            sessionId: String,
+            senderKey: String
+    ): OlmDecryptionResult {
         val sessionHolder = getInboundGroupSession(sessionId, senderKey, roomId)
         val wrapper = sessionHolder.wrapper
         val inboundGroupSession = wrapper.olmInboundGroupSession
                 ?: throw MXCryptoError.Base(MXCryptoError.ErrorType.UNABLE_TO_DECRYPT, "Session is null")
-        // Check that the room id matches the original one for the session. This stops
-        // the HS pretending a message was targeting a different room.
-        if (roomId == wrapper.roomId) {
-            val decryptResult = try {
-                sessionHolder.mutex.withLock {
-                    inboundGroupSession.decryptMessage(body)
-                }
-            } catch (e: OlmException) {
-                Timber.tag(loggerTag.value).e(e, "## decryptGroupMessage () : decryptMessage failed")
-                throw MXCryptoError.OlmError(e)
-            }
-
-            if (timeline?.isNotBlank() == true) {
-                val timelineSet = inboundGroupSessionMessageIndexes.getOrPut(timeline) { mutableSetOf() }
-
-                val messageIndexKey = senderKey + "|" + sessionId + "|" + decryptResult.mIndex
-
-                if (timelineSet.contains(messageIndexKey)) {
-                    val reason = String.format(MXCryptoError.DUPLICATE_MESSAGE_INDEX_REASON, decryptResult.mIndex)
-                    Timber.tag(loggerTag.value).e("## decryptGroupMessage() timelineId=$timeline: $reason")
-                    throw MXCryptoError.Base(MXCryptoError.ErrorType.DUPLICATED_MESSAGE_INDEX, reason)
-                }
-
-                timelineSet.add(messageIndexKey)
-            }
-
-            inboundGroupSessionStore.storeInBoundGroupSession(sessionHolder, sessionId, senderKey)
-            val payload = try {
-                val adapter = MoshiProvider.providesMoshi().adapter<JsonDict>(JSON_DICT_PARAMETERIZED_TYPE)
-                val payloadString = convertFromUTF8(decryptResult.mDecryptedMessage)
-                adapter.fromJson(payloadString)
-            } catch (e: Exception) {
-                Timber.tag(loggerTag.value).e("## decryptGroupMessage() : fails to parse the payload")
-                throw MXCryptoError.Base(MXCryptoError.ErrorType.BAD_DECRYPTED_FORMAT, MXCryptoError.BAD_DECRYPTED_FORMAT_TEXT_REASON)
-            }
-
-            return OlmDecryptionResult(
-                    payload,
-                    wrapper.keysClaimed,
-                    senderKey,
-                    wrapper.forwardingCurve25519KeyChain
-            )
-        } else {
+        if (roomId != wrapper.roomId) {
+            // Check that the room id matches the original one for the session. This stops
+            // the HS pretending a message was targeting a different room.
             val reason = String.format(MXCryptoError.INBOUND_SESSION_MISMATCH_ROOM_ID_REASON, roomId, wrapper.roomId)
             Timber.tag(loggerTag.value).e("## decryptGroupMessage() : $reason")
             throw MXCryptoError.Base(MXCryptoError.ErrorType.INBOUND_SESSION_MISMATCH_ROOM_ID, reason)
         }
+        val decryptResult = try {
+            sessionHolder.mutex.withLock {
+                inboundGroupSession.decryptMessage(body)
+            }
+        } catch (e: OlmException) {
+            Timber.tag(loggerTag.value).e(e, "## decryptGroupMessage () : decryptMessage failed")
+            throw MXCryptoError.OlmError(e)
+        }
+
+        val messageIndexKey = senderKey + "|" + sessionId + "|" + roomId + "|" + decryptResult.mIndex
+        Timber.tag(loggerTag.value).v("##########################################################")
+        Timber.tag(loggerTag.value).v("## decryptGroupMessage() timeline: $timeline")
+        Timber.tag(loggerTag.value).v("## decryptGroupMessage() senderKey: $senderKey")
+        Timber.tag(loggerTag.value).v("## decryptGroupMessage() sessionId: $sessionId")
+        Timber.tag(loggerTag.value).v("## decryptGroupMessage() roomId: $roomId")
+        Timber.tag(loggerTag.value).v("## decryptGroupMessage() eventId: $eventId")
+        Timber.tag(loggerTag.value).v("## decryptGroupMessage() mIndex: ${decryptResult.mIndex}")
+
+        if (timeline?.isNotBlank() == true) {
+            val replayAttackMap = inboundGroupSessionMessageIndexes.getOrPut(timeline) { mutableMapOf() }
+            if (replayAttackMap.contains(messageIndexKey) && replayAttackMap[messageIndexKey] != eventId) {
+                val reason = String.format(MXCryptoError.DUPLICATE_MESSAGE_INDEX_REASON, decryptResult.mIndex)
+                Timber.tag(loggerTag.value).e("## decryptGroupMessage() timelineId=$timeline: $reason")
+                throw MXCryptoError.Base(MXCryptoError.ErrorType.DUPLICATED_MESSAGE_INDEX, reason)
+            }
+            replayAttackMap[messageIndexKey] = eventId
+        }
+        inboundGroupSessionStore.storeInBoundGroupSession(sessionHolder, sessionId, senderKey)
+        val payload = try {
+            val adapter = MoshiProvider.providesMoshi().adapter<JsonDict>(JSON_DICT_PARAMETERIZED_TYPE)
+            val payloadString = convertFromUTF8(decryptResult.mDecryptedMessage)
+            adapter.fromJson(payloadString)
+        } catch (e: Exception) {
+            Timber.tag(loggerTag.value).e("## decryptGroupMessage() : fails to parse the payload")
+            throw MXCryptoError.Base(MXCryptoError.ErrorType.BAD_DECRYPTED_FORMAT, MXCryptoError.BAD_DECRYPTED_FORMAT_TEXT_REASON)
+        }
+
+        return OlmDecryptionResult(
+                payload,
+                wrapper.keysClaimed,
+                senderKey,
+                wrapper.forwardingCurve25519KeyChain
+        )
     }
 
     /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/ObjectSigner.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/ObjectSigner.kt
index ab562d954a..3f4b633ea0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/ObjectSigner.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/ObjectSigner.kt
@@ -19,8 +19,10 @@ package org.matrix.android.sdk.internal.crypto
 import org.matrix.android.sdk.api.auth.data.Credentials
 import javax.inject.Inject
 
-internal class ObjectSigner @Inject constructor(private val credentials: Credentials,
-                                                private val olmDevice: MXOlmDevice) {
+internal class ObjectSigner @Inject constructor(
+        private val credentials: Credentials,
+        private val olmDevice: MXOlmDevice
+) {
 
     /**
      * Sign Object.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingKeyRequestManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingKeyRequestManager.kt
index d7652d0771..6e2ff5c22b 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingKeyRequestManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingKeyRequestManager.kt
@@ -71,7 +71,8 @@ internal class OutgoingKeyRequestManager @Inject constructor(
         private val inboundGroupSessionStore: InboundGroupSessionStore,
         private val sendToDeviceTask: SendToDeviceTask,
         private val deviceListManager: DeviceListManager,
-        private val perSessionBackupQueryRateLimiter: PerSessionBackupQueryRateLimiter) {
+        private val perSessionBackupQueryRateLimiter: PerSessionBackupQueryRateLimiter
+) {
 
     private val dispatcher = Executors.newSingleThreadExecutor().asCoroutineDispatcher()
     private val outgoingRequestScope = CoroutineScope(SupervisorJob() + dispatcher)
@@ -180,13 +181,15 @@ internal class OutgoingKeyRequestManager @Inject constructor(
         }
     }
 
-    fun onRoomKeyForwarded(sessionId: String,
-                           algorithm: String,
-                           roomId: String,
-                           senderKey: String,
-                           fromDevice: String?,
-                           fromIndex: Int,
-                           event: Event) {
+    fun onRoomKeyForwarded(
+            sessionId: String,
+            algorithm: String,
+            roomId: String,
+            senderKey: String,
+            fromDevice: String?,
+            fromIndex: Int,
+            event: Event
+    ) {
         Timber.tag(loggerTag.value).d("Key forwarded for $sessionId from ${event.senderId}|$fromDevice at index $fromIndex")
         outgoingRequestScope.launch {
             sequencer.post {
@@ -208,12 +211,14 @@ internal class OutgoingKeyRequestManager @Inject constructor(
         }
     }
 
-    fun onRoomKeyWithHeld(sessionId: String,
-                          algorithm: String,
-                          roomId: String,
-                          senderKey: String,
-                          fromDevice: String?,
-                          event: Event) {
+    fun onRoomKeyWithHeld(
+            sessionId: String,
+            algorithm: String,
+            roomId: String,
+            senderKey: String,
+            fromDevice: String?,
+            event: Event
+    ) {
         outgoingRequestScope.launch {
             sequencer.post {
                 Timber.tag(loggerTag.value).d("Withheld received for $sessionId from ${event.senderId}|$fromDevice")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt
index c728f1b682..c263192fee 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt
@@ -39,7 +39,8 @@ private val loggerTag = LoggerTag("EnsureOlmSessionsForDevicesAction", LoggerTag
 internal class EnsureOlmSessionsForDevicesAction @Inject constructor(
         private val olmDevice: MXOlmDevice,
         private val coroutineDispatchers: MatrixCoroutineDispatchers,
-        private val oneTimeKeysForUsersDeviceTask: ClaimOneTimeKeysForUsersDeviceTask) {
+        private val oneTimeKeysForUsersDeviceTask: ClaimOneTimeKeysForUsersDeviceTask
+) {
 
     private val ensureMutex = Mutex()
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForUsersAction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForUsersAction.kt
index 4c5720daf2..da09524668 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForUsersAction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForUsersAction.kt
@@ -23,9 +23,11 @@ import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 import timber.log.Timber
 import javax.inject.Inject
 
-internal class EnsureOlmSessionsForUsersAction @Inject constructor(private val olmDevice: MXOlmDevice,
-                                                                   private val cryptoStore: IMXCryptoStore,
-                                                                   private val ensureOlmSessionsForDevicesAction: EnsureOlmSessionsForDevicesAction) {
+internal class EnsureOlmSessionsForUsersAction @Inject constructor(
+        private val olmDevice: MXOlmDevice,
+        private val cryptoStore: IMXCryptoStore,
+        private val ensureOlmSessionsForDevicesAction: EnsureOlmSessionsForDevicesAction
+) {
 
     /**
      * Try to make sure we have established olm sessions for the given users.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MegolmSessionDataImporter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MegolmSessionDataImporter.kt
index 67d73c21ed..f6ab96aee6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MegolmSessionDataImporter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MegolmSessionDataImporter.kt
@@ -33,11 +33,12 @@ import javax.inject.Inject
 
 private val loggerTag = LoggerTag("MegolmSessionDataImporter", LoggerTag.CRYPTO)
 
-internal class MegolmSessionDataImporter @Inject constructor(private val olmDevice: MXOlmDevice,
-                                                             private val roomDecryptorProvider: RoomDecryptorProvider,
-                                                             private val outgoingKeyRequestManager: OutgoingKeyRequestManager,
-                                                             private val cryptoStore: IMXCryptoStore,
-                                                             private val clock: Clock,
+internal class MegolmSessionDataImporter @Inject constructor(
+        private val olmDevice: MXOlmDevice,
+        private val roomDecryptorProvider: RoomDecryptorProvider,
+        private val outgoingKeyRequestManager: OutgoingKeyRequestManager,
+        private val cryptoStore: IMXCryptoStore,
+        private val clock: Clock,
 ) {
 
     /**
@@ -50,9 +51,11 @@ internal class MegolmSessionDataImporter @Inject constructor(private val olmDevi
      * @return import room keys result
      */
     @WorkerThread
-    fun handle(megolmSessionsData: List<MegolmSessionData>,
-               fromBackup: Boolean,
-               progressListener: ProgressListener?): ImportRoomKeysResult {
+    fun handle(
+            megolmSessionsData: List<MegolmSessionData>,
+            fromBackup: Boolean,
+            progressListener: ProgressListener?
+    ): ImportRoomKeysResult {
         val t0 = clock.epochMillis()
 
         val totalNumbersOfKeys = megolmSessionsData.size
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MessageEncrypter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MessageEncrypter.kt
index 919e38c391..eff2132820 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MessageEncrypter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MessageEncrypter.kt
@@ -36,7 +36,8 @@ internal class MessageEncrypter @Inject constructor(
         private val userId: String,
         @DeviceId
         private val deviceId: String?,
-        private val olmDevice: MXOlmDevice) {
+        private val olmDevice: MXOlmDevice
+) {
     /**
      * Encrypt an event payload for a list of devices.
      * This method must be called from the getCryptoHandler() thread.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/SetDeviceVerificationAction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/SetDeviceVerificationAction.kt
index 60181138fb..6028b1a5a2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/SetDeviceVerificationAction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/SetDeviceVerificationAction.kt
@@ -26,7 +26,8 @@ import javax.inject.Inject
 internal class SetDeviceVerificationAction @Inject constructor(
         private val cryptoStore: IMXCryptoStore,
         @UserId private val userId: String,
-        private val defaultKeysBackupService: DefaultKeysBackupService) {
+        private val defaultKeysBackupService: DefaultKeysBackupService
+) {
 
     fun handle(trustLevel: DeviceTrustLevel, userId: String, deviceId: String) {
         val device = cryptoStore.getUserDevice(userId, deviceId)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXGroupEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXGroupEncryption.kt
index 8cf01f1972..9ec78f37cf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXGroupEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXGroupEncryption.kt
@@ -45,8 +45,10 @@ internal interface IMXGroupEncryption {
      *
      * @return true in case of success
      */
-    suspend fun reshareKey(groupSessionId: String,
-                           userId: String,
-                           deviceId: String,
-                           senderKey: String): Boolean
+    suspend fun reshareKey(
+            groupSessionId: String,
+            userId: String,
+            deviceId: String,
+            senderKey: String
+    ): Boolean
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
index d15b18ec79..141d6f74cd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
@@ -78,6 +78,7 @@ internal class MXMegolmDecryption(
                     encryptedEventContent.ciphertext,
                     event.roomId,
                     timeline,
+                    eventId = event.eventId.orEmpty(),
                     encryptedEventContent.sessionId,
                     encryptedEventContent.senderKey
             )
@@ -148,7 +149,8 @@ internal class MXMegolmDecryption(
                                         throw MXCryptoError.Base(
                                                 MXCryptoError.ErrorType.KEYS_WITHHELD,
                                                 withHeldInfo.code?.value ?: "",
-                                                withHeldInfo.reason)
+                                                withHeldInfo.reason
+                                        )
                                     }
 
                                     if (requestKeysOnFail) {
@@ -248,9 +250,9 @@ internal class MXMegolmDecryption(
         )
 
         when (addSessionResult) {
-            is MXOlmDevice.AddSessionResult.Imported               -> addSessionResult.ratchetIndex
+            is MXOlmDevice.AddSessionResult.Imported -> addSessionResult.ratchetIndex
             is MXOlmDevice.AddSessionResult.NotImportedHigherIndex -> addSessionResult.newIndex
-            else                                                   -> null
+            else -> null
         }?.let { index ->
             if (event.getClearType() == EventType.FORWARDED_ROOM_KEY) {
                 val fromDevice = (event.content?.get("sender_key") as? String)?.let { senderDeviceIdentityKey ->
@@ -267,7 +269,8 @@ internal class MXMegolmDecryption(
                         senderKey = senderKey,
                         fromIndex = index,
                         fromDevice = fromDevice,
-                        event = event)
+                        event = event
+                )
 
                 cryptoStore.saveIncomingForwardKeyAuditTrail(
                         roomId = roomKeyContent.roomId,
@@ -276,7 +279,8 @@ internal class MXMegolmDecryption(
                         algorithm = roomKeyContent.algorithm ?: "",
                         userId = event.senderId ?: "",
                         deviceId = fromDevice ?: "",
-                        chainIndex = index.toLong())
+                        chainIndex = index.toLong()
+                )
 
                 // The index is used to decide if we cancel sent request or if we wait for a better key
                 outgoingKeyRequestManager.postCancelRequestForSessionIfNeeded(roomKeyContent.sessionId, roomKeyContent.roomId, senderKey, index)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt
index 096773a959..81a6fb28c0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt
@@ -35,6 +35,7 @@ internal class MXMegolmDecryptionFactory @Inject constructor(
                 olmDevice,
                 outgoingKeyRequestManager,
                 cryptoStore,
-                eventsManager)
+                eventsManager
+        )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
index 8b4e9df607..7bfbae6edf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
@@ -84,9 +84,11 @@ internal class MXMegolmEncryption(
     private var sessionRotationPeriodMsgs: Int = 100
     private var sessionRotationPeriodMs: Int = 7 * 24 * 3600 * 1000
 
-    override suspend fun encryptEventContent(eventContent: Content,
-                                             eventType: String,
-                                             userIds: List<String>): Content {
+    override suspend fun encryptEventContent(
+            eventContent: Content,
+            eventType: String,
+            userIds: List<String>
+    ): Content {
         val ts = clock.epochMillis()
         Timber.tag(loggerTag.value).v("encryptEventContent : getDevicesInRoom")
         val devices = getDevicesInRoom(userIds)
@@ -201,8 +203,10 @@ internal class MXMegolmEncryption(
      * @param session the session info
      * @param devicesByUsers the devices map
      */
-    private suspend fun shareKey(session: MXOutboundSessionInfo,
-                                 devicesByUsers: Map<String, List<CryptoDeviceInfo>>) {
+    private suspend fun shareKey(
+            session: MXOutboundSessionInfo,
+            devicesByUsers: Map<String, List<CryptoDeviceInfo>>
+    ) {
         // nothing to send, the task is done
         if (devicesByUsers.isEmpty()) {
             Timber.tag(loggerTag.value).v("shareKey() : nothing more to do")
@@ -230,8 +234,10 @@ internal class MXMegolmEncryption(
      * @param session the session info
      * @param devicesByUser the devices map
      */
-    private suspend fun shareUserDevicesKey(session: MXOutboundSessionInfo,
-                                            devicesByUser: Map<String, List<CryptoDeviceInfo>>) {
+    private suspend fun shareUserDevicesKey(
+            session: MXOutboundSessionInfo,
+            devicesByUser: Map<String, List<CryptoDeviceInfo>>
+    ) {
         val sessionKey = olmDevice.getSessionKey(session.sessionId)
         val chainIndex = olmDevice.getMessageIndex(session.sessionId)
 
@@ -321,10 +327,12 @@ internal class MXMegolmEncryption(
         }
     }
 
-    private suspend fun notifyKeyWithHeld(targets: List<UserDevice>,
-                                          sessionId: String,
-                                          senderKey: String?,
-                                          code: WithHeldCode) {
+    private suspend fun notifyKeyWithHeld(
+            targets: List<UserDevice>,
+            sessionId: String,
+            senderKey: String?,
+            code: WithHeldCode
+    ) {
         Timber.tag(loggerTag.value).d(
                 "notifyKeyWithHeld() :sending withheld for session:$sessionId and code $code to" +
                         " ${targets.joinToString { "${it.userId}|${it.deviceId}" }}"
@@ -435,10 +443,12 @@ internal class MXMegolmEncryption(
         }
     }
 
-    override suspend fun reshareKey(groupSessionId: String,
-                                    userId: String,
-                                    deviceId: String,
-                                    senderKey: String): Boolean {
+    override suspend fun reshareKey(
+            groupSessionId: String,
+            userId: String,
+            deviceId: String,
+            senderKey: String
+    ): Boolean {
         Timber.tag(loggerTag.value).i("process reshareKey for $groupSessionId to $userId:$deviceId")
         val deviceInfo = cryptoStore.getUserDevice(userId, deviceId) ?: return false
                 .also { Timber.tag(loggerTag.value).w("reshareKey: Device not found") }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/SharedWithHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/SharedWithHelper.kt
index 61ad345c62..30fd403ce8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/SharedWithHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/SharedWithHelper.kt
@@ -23,7 +23,8 @@ import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 internal class SharedWithHelper(
         private val roomId: String,
         private val sessionId: String,
-        private val cryptoStore: IMXCryptoStore) {
+        private val cryptoStore: IMXCryptoStore
+) {
 
     fun sharedWithDevices(): MXUsersDevicesMap<Int> {
         return cryptoStore.getSharedWithInfo(roomId, sessionId)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt
index 23c8f0e905..17a44b19ff 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt
@@ -38,7 +38,8 @@ internal class MXOlmDecryption(
         // The olm device interface
         private val olmDevice: MXOlmDevice,
         // the matrix userId
-        private val userId: String) :
+        private val userId: String
+) :
         IMXDecrypting {
 
     @Throws(MXCryptoError::class)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryptionFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryptionFactory.kt
index d5c5e85e41..a50ac8ca8a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryptionFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryptionFactory.kt
@@ -20,8 +20,10 @@ import org.matrix.android.sdk.internal.crypto.MXOlmDevice
 import org.matrix.android.sdk.internal.di.UserId
 import javax.inject.Inject
 
-internal class MXOlmDecryptionFactory @Inject constructor(private val olmDevice: MXOlmDevice,
-                                                          @UserId private val userId: String) {
+internal class MXOlmDecryptionFactory @Inject constructor(
+        private val olmDevice: MXOlmDevice,
+        @UserId private val userId: String
+) {
 
     fun create(): MXOlmDecryption {
         return MXOlmDecryption(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt
index bde1d65093..fb70e23b03 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt
@@ -32,7 +32,8 @@ internal class MXOlmEncryption(
         private val cryptoStore: IMXCryptoStore,
         private val messageEncrypter: MessageEncrypter,
         private val deviceListManager: DeviceListManager,
-        private val ensureOlmSessionsForUsersAction: EnsureOlmSessionsForUsersAction) :
+        private val ensureOlmSessionsForUsersAction: EnsureOlmSessionsForUsersAction
+) :
         IMXEncrypting {
 
     override suspend fun encryptEventContent(eventContent: Content, eventType: String, userIds: List<String>): Content {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryptionFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryptionFactory.kt
index 44e55900e4..012886203e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryptionFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryptionFactory.kt
@@ -24,12 +24,14 @@ import org.matrix.android.sdk.internal.crypto.actions.MessageEncrypter
 import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 import javax.inject.Inject
 
-internal class MXOlmEncryptionFactory @Inject constructor(private val olmDevice: MXOlmDevice,
-                                                          private val cryptoStore: IMXCryptoStore,
-                                                          private val messageEncrypter: MessageEncrypter,
-                                                          private val deviceListManager: DeviceListManager,
-                                                          private val coroutineDispatchers: MatrixCoroutineDispatchers,
-                                                          private val ensureOlmSessionsForUsersAction: EnsureOlmSessionsForUsersAction) {
+internal class MXOlmEncryptionFactory @Inject constructor(
+        private val olmDevice: MXOlmDevice,
+        private val cryptoStore: IMXCryptoStore,
+        private val messageEncrypter: MessageEncrypter,
+        private val deviceListManager: DeviceListManager,
+        private val coroutineDispatchers: MatrixCoroutineDispatchers,
+        private val ensureOlmSessionsForUsersAction: EnsureOlmSessionsForUsersAction
+) {
 
     fun create(roomId: String): MXOlmEncryption {
         return MXOlmEncryption(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/api/CryptoApi.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/api/CryptoApi.kt
index f5ead35933..d5a8bdfd7c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/api/CryptoApi.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/api/CryptoApi.kt
@@ -117,9 +117,11 @@ internal interface CryptoApi {
      * @param body the body
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "sendToDevice/{eventType}/{txnId}")
-    suspend fun sendToDevice(@Path("eventType") eventType: String,
-                             @Path("txnId") transactionId: String,
-                             @Body body: SendToDeviceBody)
+    suspend fun sendToDevice(
+            @Path("eventType") eventType: String,
+            @Path("txnId") transactionId: String,
+            @Body body: SendToDeviceBody
+    )
 
     /**
      * Delete a device.
@@ -129,8 +131,10 @@ internal interface CryptoApi {
      * @param params the deletion parameters
      */
     @HTTP(path = NetworkConstants.URI_API_PREFIX_PATH_R0 + "devices/{device_id}", method = "DELETE", hasBody = true)
-    suspend fun deleteDevice(@Path("device_id") deviceId: String,
-                             @Body params: DeleteDeviceParams)
+    suspend fun deleteDevice(
+            @Path("device_id") deviceId: String,
+            @Body params: DeleteDeviceParams
+    )
 
     /**
      * Update the device information.
@@ -140,8 +144,10 @@ internal interface CryptoApi {
      * @param params the params
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "devices/{device_id}")
-    suspend fun updateDeviceInfo(@Path("device_id") deviceId: String,
-                                 @Body params: UpdateDeviceInfoBody)
+    suspend fun updateDeviceInfo(
+            @Path("device_id") deviceId: String,
+            @Body params: UpdateDeviceInfoBody
+    )
 
     /**
      * Get the update devices list from two sync token.
@@ -151,6 +157,8 @@ internal interface CryptoApi {
      * @param newToken the up-to token.
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "keys/changes")
-    suspend fun getKeyChanges(@Query("from") oldToken: String,
-                              @Query("to") newToken: String): KeyChangesResponse
+    suspend fun getKeyChanges(
+            @Query("from") oldToken: String,
+            @Query("to") newToken: String
+    ): KeyChangesResponse
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/MXEncryptedAttachments.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/MXEncryptedAttachments.kt
index 7ff08cd127..37c8e755ff 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/MXEncryptedAttachments.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/MXEncryptedAttachments.kt
@@ -41,10 +41,12 @@ internal object MXEncryptedAttachments {
     private const val SECRET_KEY_SPEC_ALGORITHM = "AES"
     private const val MESSAGE_DIGEST_ALGORITHM = "SHA-256"
 
-    fun encrypt(clearStream: InputStream,
-                outputFile: File,
-                clock: Clock,
-                progress: ((current: Int, total: Int) -> Unit)): EncryptedFileInfo {
+    fun encrypt(
+            clearStream: InputStream,
+            outputFile: File,
+            clock: Clock,
+            progress: ((current: Int, total: Int) -> Unit)
+    ): EncryptedFileInfo {
         val t0 = clock.epochMillis()
         val secureRandom = SecureRandom()
         val initVectorBytes = ByteArray(16) { 0.toByte() }
@@ -236,10 +238,11 @@ internal object MXEncryptedAttachments {
      * @param clock a clock to retrieve current time
      * @return true in case of success, false in case of error
      */
-    fun decryptAttachment(attachmentStream: InputStream?,
-                          elementToDecrypt: ElementToDecrypt?,
-                          outputStream: OutputStream,
-                          clock: Clock
+    fun decryptAttachment(
+            attachmentStream: InputStream?,
+            elementToDecrypt: ElementToDecrypt?,
+            outputStream: OutputStream,
+            clock: Clock
     ): Boolean {
         // sanity checks
         if (null == attachmentStream || elementToDecrypt == null) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt
index 6c198abc2e..e466def1a1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt
@@ -261,9 +261,10 @@ internal class DefaultCrossSigningService @Inject constructor(
                 }
     }
 
-    override fun checkTrustFromPrivateKeys(masterKeyPrivateKey: String?,
-                                           uskKeyPrivateKey: String?,
-                                           sskPrivateKey: String?
+    override fun checkTrustFromPrivateKeys(
+            masterKeyPrivateKey: String?,
+            uskKeyPrivateKey: String?,
+            sskPrivateKey: String?
     ): UserTrustResult {
         val mxCrossSigningInfo = getMyCrossSigningKeys() ?: return UserTrustResult.CrossSigningNotConfigured(userId)
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt
index 74f0f5745d..6e317f049b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt
@@ -276,10 +276,12 @@ internal class UpdateTrustWorker(context: Context, params: WorkerParameters, ses
                 }
     }
 
-    private fun computeRoomShield(myCrossSigningInfo: MXCrossSigningInfo?,
-                                  cryptoRealm: Realm,
-                                  activeMemberUserIds: List<String>,
-                                  roomSummaryEntity: RoomSummaryEntity): RoomEncryptionTrustLevel {
+    private fun computeRoomShield(
+            myCrossSigningInfo: MXCrossSigningInfo?,
+            cryptoRealm: Realm,
+            activeMemberUserIds: List<String>,
+            roomSummaryEntity: RoomSummaryEntity
+    ): RoomEncryptionTrustLevel {
         Timber.v("## CrossSigning - computeRoomShield ${roomSummaryEntity.roomId} -> ${activeMemberUserIds.logLimit()}")
         // The set of “all users” depends on the type of room:
         // For regular / topic rooms which have more than 2 members (including yourself) are considered when decorating a room
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
index 813adf7459..8ecb1d72c6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
@@ -137,17 +137,11 @@ internal class DefaultKeysBackupService @Inject constructor(
 
     private var keysBackupStateListener: KeysBackupStateListener? = null
 
-    override val isEnabled: Boolean
-        get() = keysBackupStateManager.isEnabled
+    override fun isEnabled(): Boolean = keysBackupStateManager.isEnabled
 
-    override val isStucked: Boolean
-        get() = keysBackupStateManager.isStucked
+    override fun isStuck(): Boolean = keysBackupStateManager.isStuck
 
-    override val state: KeysBackupState
-        get() = keysBackupStateManager.state
-
-    override val currentBackupVersion: String?
-        get() = keysBackupVersion?.version
+    override fun getState(): KeysBackupState = keysBackupStateManager.state
 
     override fun addListener(listener: KeysBackupStateListener) {
         keysBackupStateManager.addListener(listener)
@@ -157,9 +151,11 @@ internal class DefaultKeysBackupService @Inject constructor(
         keysBackupStateManager.removeListener(listener)
     }
 
-    override fun prepareKeysBackupVersion(password: String?,
-                                          progressListener: ProgressListener?,
-                                          callback: MatrixCallback<MegolmBackupCreationInfo>) {
+    override fun prepareKeysBackupVersion(
+            password: String?,
+            progressListener: ProgressListener?,
+            callback: MatrixCallback<MegolmBackupCreationInfo>
+    ) {
         cryptoCoroutineScope.launch(coroutineDispatchers.io) {
             try {
                 val olmPkDecryption = OlmPkDecryption()
@@ -233,8 +229,10 @@ internal class DefaultKeysBackupService @Inject constructor(
         }
     }
 
-    override fun createKeysBackupVersion(keysBackupCreationInfo: MegolmBackupCreationInfo,
-                                         callback: MatrixCallback<KeysVersion>) {
+    override fun createKeysBackupVersion(
+            keysBackupCreationInfo: MegolmBackupCreationInfo,
+            callback: MatrixCallback<KeysVersion>
+    ) {
         @Suppress("UNCHECKED_CAST")
         val createKeysBackupVersionBody = CreateKeysBackupVersionBody(
                 algorithm = keysBackupCreationInfo.algorithm,
@@ -291,7 +289,7 @@ internal class DefaultKeysBackupService @Inject constructor(
                         this.callback = object : MatrixCallback<Unit> {
                             private fun eventuallyRestartBackup() {
                                 // Do not stay in KeysBackupState.Unknown but check what is available on the homeserver
-                                if (state == KeysBackupState.Unknown) {
+                                if (getState() == KeysBackupState.Unknown) {
                                     checkAndStartKeysBackup()
                                 }
                             }
@@ -345,9 +343,11 @@ internal class DefaultKeysBackupService @Inject constructor(
         return cryptoStore.inboundGroupSessionsCount(true)
     }
 
-    override fun backupAllGroupSessions(progressListener: ProgressListener?,
-                                        callback: MatrixCallback<Unit>?) {
-        if (!isEnabled || backupOlmPkEncryption == null || keysBackupVersion == null) {
+    override fun backupAllGroupSessions(
+            progressListener: ProgressListener?,
+            callback: MatrixCallback<Unit>?
+    ) {
+        if (!isEnabled() || backupOlmPkEncryption == null || keysBackupVersion == null) {
             callback?.onFailure(Throwable("Backup not enabled"))
             return
         }
@@ -383,7 +383,7 @@ internal class DefaultKeysBackupService @Inject constructor(
                                 }
 
                                 // If backup is finished, notify the main listener
-                                if (state === KeysBackupState.ReadyToBackUp) {
+                                if (getState() === KeysBackupState.ReadyToBackUp) {
                                     backupAllGroupSessionsCallback?.onSuccess(Unit)
                                     resetBackupAllGroupSessionsListeners()
                                 }
@@ -397,8 +397,10 @@ internal class DefaultKeysBackupService @Inject constructor(
         })
     }
 
-    override fun getKeysBackupTrust(keysBackupVersion: KeysVersionResult,
-                                    callback: MatrixCallback<KeysBackupVersionTrust>) {
+    override fun getKeysBackupTrust(
+            keysBackupVersion: KeysVersionResult,
+            callback: MatrixCallback<KeysBackupVersionTrust>
+    ) {
         // TODO Validate with François that this is correct
         object : Task<KeysVersionResult, KeysBackupVersionTrust> {
             override suspend fun execute(params: KeysVersionResult): KeysBackupVersionTrust {
@@ -505,9 +507,11 @@ internal class DefaultKeysBackupService @Inject constructor(
         )
     }
 
-    override fun trustKeysBackupVersion(keysBackupVersion: KeysVersionResult,
-                                        trust: Boolean,
-                                        callback: MatrixCallback<Unit>) {
+    override fun trustKeysBackupVersion(
+            keysBackupVersion: KeysVersionResult,
+            trust: Boolean,
+            callback: MatrixCallback<Unit>
+    ) {
         Timber.v("trustKeyBackupVersion: $trust, version ${keysBackupVersion.version}")
 
         // Get auth data to update it
@@ -589,9 +593,11 @@ internal class DefaultKeysBackupService @Inject constructor(
         }
     }
 
-    override fun trustKeysBackupVersionWithRecoveryKey(keysBackupVersion: KeysVersionResult,
-                                                       recoveryKey: String,
-                                                       callback: MatrixCallback<Unit>) {
+    override fun trustKeysBackupVersionWithRecoveryKey(
+            keysBackupVersion: KeysVersionResult,
+            recoveryKey: String,
+            callback: MatrixCallback<Unit>
+    ) {
         Timber.v("trustKeysBackupVersionWithRecoveryKey: version ${keysBackupVersion.version}")
 
         cryptoCoroutineScope.launch(coroutineDispatchers.io) {
@@ -608,9 +614,11 @@ internal class DefaultKeysBackupService @Inject constructor(
         }
     }
 
-    override fun trustKeysBackupVersionWithPassphrase(keysBackupVersion: KeysVersionResult,
-                                                      password: String,
-                                                      callback: MatrixCallback<Unit>) {
+    override fun trustKeysBackupVersionWithPassphrase(
+            keysBackupVersion: KeysVersionResult,
+            password: String,
+            callback: MatrixCallback<Unit>
+    ) {
         Timber.v("trustKeysBackupVersionWithPassphrase: version ${keysBackupVersion.version}")
 
         cryptoCoroutineScope.launch(coroutineDispatchers.io) {
@@ -628,7 +636,7 @@ internal class DefaultKeysBackupService @Inject constructor(
         }
     }
 
-    override fun onSecretKeyGossip(secret: String) {
+    fun onSecretKeyGossip(secret: String) {
         Timber.i("## CrossSigning - onSecretKeyGossip")
 
         cryptoCoroutineScope.launch(coroutineDispatchers.io) {
@@ -707,12 +715,14 @@ internal class DefaultKeysBackupService @Inject constructor(
         progressListener.onProgress(backedUpKeys, total)
     }
 
-    override fun restoreKeysWithRecoveryKey(keysVersionResult: KeysVersionResult,
-                                            recoveryKey: String,
-                                            roomId: String?,
-                                            sessionId: String?,
-                                            stepProgressListener: StepProgressListener?,
-                                            callback: MatrixCallback<ImportRoomKeysResult>) {
+    override fun restoreKeysWithRecoveryKey(
+            keysVersionResult: KeysVersionResult,
+            recoveryKey: String,
+            roomId: String?,
+            sessionId: String?,
+            stepProgressListener: StepProgressListener?,
+            callback: MatrixCallback<ImportRoomKeysResult>
+    ) {
         Timber.v("restoreKeysWithRecoveryKey: From backup version: ${keysVersionResult.version}")
 
         cryptoCoroutineScope.launch(coroutineDispatchers.io) {
@@ -806,12 +816,14 @@ internal class DefaultKeysBackupService @Inject constructor(
         }
     }
 
-    override fun restoreKeyBackupWithPassword(keysBackupVersion: KeysVersionResult,
-                                              password: String,
-                                              roomId: String?,
-                                              sessionId: String?,
-                                              stepProgressListener: StepProgressListener?,
-                                              callback: MatrixCallback<ImportRoomKeysResult>) {
+    override fun restoreKeyBackupWithPassword(
+            keysBackupVersion: KeysVersionResult,
+            password: String,
+            roomId: String?,
+            sessionId: String?,
+            stepProgressListener: StepProgressListener?,
+            callback: MatrixCallback<ImportRoomKeysResult>
+    ) {
         Timber.v("[MXKeyBackup] restoreKeyBackup with password: From backup version: ${keysBackupVersion.version}")
 
         cryptoCoroutineScope.launch(coroutineDispatchers.io) {
@@ -859,9 +871,11 @@ internal class DefaultKeysBackupService @Inject constructor(
      * Same method as [RoomKeysRestClient.getRoomKey] except that it accepts nullable
      * parameters and always returns a KeysBackupData object through the Callback.
      */
-    private suspend fun getKeys(sessionId: String?,
-                                roomId: String?,
-                                version: String): KeysBackupData {
+    private suspend fun getKeys(
+            sessionId: String?,
+            roomId: String?,
+            version: String
+    ): KeysBackupData {
         return if (roomId != null && sessionId != null) {
             // Get key for the room and for the session
             val data = getRoomSessionDataTask.execute(GetRoomSessionDataTask.Params(roomId, sessionId, version))
@@ -915,12 +929,12 @@ internal class DefaultKeysBackupService @Inject constructor(
      */
     fun maybeBackupKeys() {
         when {
-            isStucked                              -> {
+            isStuck()                                   -> {
                 // If not already done, or in error case, check for a valid backup version on the homeserver.
                 // If there is one, maybeBackupKeys will be called again.
                 checkAndStartKeysBackup()
             }
-            state == KeysBackupState.ReadyToBackUp -> {
+            getState() == KeysBackupState.ReadyToBackUp -> {
                 keysBackupStateManager.state = KeysBackupState.WillBackUp
 
                 // Wait between 0 and 10 seconds, to avoid backup requests from
@@ -933,14 +947,16 @@ internal class DefaultKeysBackupService @Inject constructor(
                     uiHandler.post { backupKeys() }
                 }
             }
-            else                                   -> {
-                Timber.v("maybeBackupKeys: Skip it because state: $state")
+            else                                        -> {
+                Timber.v("maybeBackupKeys: Skip it because state: ${getState()}")
             }
         }
     }
 
-    override fun getVersion(version: String,
-                            callback: MatrixCallback<KeysVersionResult?>) {
+    override fun getVersion(
+            version: String,
+            callback: MatrixCallback<KeysVersionResult?>
+    ) {
         getKeysBackupVersionTask
                 .configureWith(version) {
                     this.callback = object : MatrixCallback<KeysVersionResult> {
@@ -1018,9 +1034,9 @@ internal class DefaultKeysBackupService @Inject constructor(
     }
 
     override fun checkAndStartKeysBackup() {
-        if (!isStucked) {
+        if (!isStuck()) {
             // Try to start or restart the backup only if it is in unknown or bad state
-            Timber.w("checkAndStartKeysBackup: invalid state: $state")
+            Timber.w("checkAndStartKeysBackup: invalid state: ${getState()}")
 
             return
         }
@@ -1179,10 +1195,12 @@ internal class DefaultKeysBackupService @Inject constructor(
         }
     }
 
-    override fun computePrivateKey(passphrase: String,
-                                   privateKeySalt: String,
-                                   privateKeyIterations: Int,
-                                   progressListener: ProgressListener): ByteArray {
+    override fun computePrivateKey(
+            passphrase: String,
+            privateKeySalt: String,
+            privateKeyIterations: Int,
+            progressListener: ProgressListener
+    ): ByteArray {
         return deriveKey(passphrase, privateKeySalt, privateKeyIterations, progressListener)
     }
 
@@ -1259,16 +1277,16 @@ internal class DefaultKeysBackupService @Inject constructor(
         Timber.v("backupKeys")
 
         // Sanity check, as this method can be called after a delay, the state may have change during the delay
-        if (!isEnabled || backupOlmPkEncryption == null || keysBackupVersion == null) {
+        if (!isEnabled() || backupOlmPkEncryption == null || keysBackupVersion == null) {
             Timber.v("backupKeys: Invalid configuration")
             backupAllGroupSessionsCallback?.onFailure(IllegalStateException("Invalid configuration"))
             resetBackupAllGroupSessionsListeners()
             return
         }
 
-        if (state === KeysBackupState.BackingUp) {
+        if (getState() === KeysBackupState.BackingUp) {
             // Do nothing if we are already backing up
-            Timber.v("backupKeys: Invalid state: $state")
+            Timber.v("backupKeys: Invalid state: ${getState()}")
             return
         }
 
@@ -1482,8 +1500,10 @@ internal class DefaultKeysBackupService @Inject constructor(
         get() = cryptoStore
 
     @VisibleForTesting
-    fun createFakeKeysBackupVersion(keysBackupCreationInfo: MegolmBackupCreationInfo,
-                                    callback: MatrixCallback<KeysVersion>) {
+    fun createFakeKeysBackupVersion(
+            keysBackupCreationInfo: MegolmBackupCreationInfo,
+            callback: MatrixCallback<KeysVersion>
+    ) {
         @Suppress("UNCHECKED_CAST")
         val createKeysBackupVersionBody = CreateKeysBackupVersionBody(
                 algorithm = keysBackupCreationInfo.algorithm,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPassword.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPassword.kt
index f821fdcf6d..8560eb5fc1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPassword.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPassword.kt
@@ -49,8 +49,9 @@ internal data class GeneratePrivateKeyResult(
  * @return a {privateKey, salt, iterations} tuple.
  */
 @WorkerThread
-internal fun generatePrivateKeyWithPassword(password: String,
-                                            progressListener: ProgressListener?
+internal fun generatePrivateKeyWithPassword(
+        password: String,
+        progressListener: ProgressListener?
 ): GeneratePrivateKeyResult {
     val salt = generateSalt()
     val iterations = DEFAULT_ITERATION
@@ -70,10 +71,12 @@ internal fun generatePrivateKeyWithPassword(password: String,
  * @return a private key.
  */
 @WorkerThread
-internal fun retrievePrivateKeyWithPassword(password: String,
-                                            salt: String,
-                                            iterations: Int,
-                                            progressListener: ProgressListener? = null): ByteArray {
+internal fun retrievePrivateKeyWithPassword(
+        password: String,
+        salt: String,
+        iterations: Int,
+        progressListener: ProgressListener? = null
+): ByteArray {
     return deriveKey(password, salt, iterations, progressListener)
 }
 
@@ -88,10 +91,12 @@ internal fun retrievePrivateKeyWithPassword(password: String,
  * @return a private key.
  */
 @WorkerThread
-internal fun deriveKey(password: String,
-                       salt: String,
-                       iterations: Int,
-                       progressListener: ProgressListener?): ByteArray {
+internal fun deriveKey(
+        password: String,
+        salt: String,
+        iterations: Int,
+        progressListener: ProgressListener?
+): ByteArray {
     // Note: copied and adapted from MXMegolmExportEncryption
     // based on https://en.wikipedia.org/wiki/PBKDF2 algorithm
     // it is simpler than the generic algorithm because the expected key length is equal to the mac key length.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupStateManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupStateManager.kt
index 78ef958bbf..0614eceb16 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupStateManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupStateManager.kt
@@ -49,7 +49,7 @@ internal class KeysBackupStateManager(private val uiHandler: Handler) {
                 state == KeysBackupState.BackingUp
 
     // True if unknown or bad state
-    val isStucked: Boolean
+    val isStuck: Boolean
         get() = state == KeysBackupState.Unknown ||
                 state == KeysBackupState.Disabled ||
                 state == KeysBackupState.WrongBackUpVersion ||
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/api/RoomKeysApi.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/api/RoomKeysApi.kt
index d9c63b46ab..48a735018a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/api/RoomKeysApi.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/api/RoomKeysApi.kt
@@ -71,8 +71,10 @@ internal interface RoomKeysApi {
      * @param updateKeysBackupVersionBody the body
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/version/{version}")
-    suspend fun updateKeysBackupVersion(@Path("version") version: String,
-                                        @Body updateKeysBackupVersionBody: UpdateKeysBackupVersionBody)
+    suspend fun updateKeysBackupVersion(
+            @Path("version") version: String,
+            @Body updateKeysBackupVersionBody: UpdateKeysBackupVersionBody
+    )
 
     /* ==========================================================================================
      * Storing keys
@@ -93,10 +95,12 @@ internal interface RoomKeysApi {
      * @param keyBackupData the data to send
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/keys/{roomId}/{sessionId}")
-    suspend fun storeRoomSessionData(@Path("roomId") roomId: String,
-                                     @Path("sessionId") sessionId: String,
-                                     @Query("version") version: String,
-                                     @Body keyBackupData: KeyBackupData): BackupKeysResult
+    suspend fun storeRoomSessionData(
+            @Path("roomId") roomId: String,
+            @Path("sessionId") sessionId: String,
+            @Query("version") version: String,
+            @Body keyBackupData: KeyBackupData
+    ): BackupKeysResult
 
     /**
      * Store several keys for the given room, using the given backup version.
@@ -106,9 +110,11 @@ internal interface RoomKeysApi {
      * @param roomKeysBackupData the data to send
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/keys/{roomId}")
-    suspend fun storeRoomSessionsData(@Path("roomId") roomId: String,
-                                      @Query("version") version: String,
-                                      @Body roomKeysBackupData: RoomKeysBackupData): BackupKeysResult
+    suspend fun storeRoomSessionsData(
+            @Path("roomId") roomId: String,
+            @Query("version") version: String,
+            @Body roomKeysBackupData: RoomKeysBackupData
+    ): BackupKeysResult
 
     /**
      * Store several keys, using the given backup version.
@@ -117,8 +123,10 @@ internal interface RoomKeysApi {
      * @param keysBackupData the data to send
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/keys")
-    suspend fun storeSessionsData(@Query("version") version: String,
-                                  @Body keysBackupData: KeysBackupData): BackupKeysResult
+    suspend fun storeSessionsData(
+            @Query("version") version: String,
+            @Body keysBackupData: KeysBackupData
+    ): BackupKeysResult
 
     /* ==========================================================================================
      * Retrieving keys
@@ -132,9 +140,11 @@ internal interface RoomKeysApi {
      * @param version the version of the backup, or empty String to retrieve the last version
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/keys/{roomId}/{sessionId}")
-    suspend fun getRoomSessionData(@Path("roomId") roomId: String,
-                                   @Path("sessionId") sessionId: String,
-                                   @Query("version") version: String): KeyBackupData
+    suspend fun getRoomSessionData(
+            @Path("roomId") roomId: String,
+            @Path("sessionId") sessionId: String,
+            @Query("version") version: String
+    ): KeyBackupData
 
     /**
      * Retrieve all the keys for the given room from the backup.
@@ -143,8 +153,10 @@ internal interface RoomKeysApi {
      * @param version the version of the backup, or empty String to retrieve the last version
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/keys/{roomId}")
-    suspend fun getRoomSessionsData(@Path("roomId") roomId: String,
-                                    @Query("version") version: String): RoomKeysBackupData
+    suspend fun getRoomSessionsData(
+            @Path("roomId") roomId: String,
+            @Query("version") version: String
+    ): RoomKeysBackupData
 
     /**
      * Retrieve all the keys from the backup.
@@ -162,16 +174,20 @@ internal interface RoomKeysApi {
      * Deletes keys from the backup.
      */
     @DELETE(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/keys/{roomId}/{sessionId}")
-    suspend fun deleteRoomSessionData(@Path("roomId") roomId: String,
-                                      @Path("sessionId") sessionId: String,
-                                      @Query("version") version: String)
+    suspend fun deleteRoomSessionData(
+            @Path("roomId") roomId: String,
+            @Path("sessionId") sessionId: String,
+            @Query("version") version: String
+    )
 
     /**
      * Deletes keys from the backup.
      */
     @DELETE(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/keys/{roomId}")
-    suspend fun deleteRoomSessionsData(@Path("roomId") roomId: String,
-                                       @Query("version") version: String)
+    suspend fun deleteRoomSessionsData(
+            @Path("roomId") roomId: String,
+            @Query("version") version: String
+    )
 
     /**
      * Deletes keys from the backup.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationAccept.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationAccept.kt
index 9fdeda01c9..85ba1762d3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationAccept.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationAccept.kt
@@ -69,12 +69,14 @@ internal data class KeyVerificationAccept(
     override fun toSendToDeviceObject() = this
 
     companion object : VerificationInfoAcceptFactory {
-        override fun create(tid: String,
-                            keyAgreementProtocol: String,
-                            hash: String,
-                            commitment: String,
-                            messageAuthenticationCode: String,
-                            shortAuthenticationStrings: List<String>): VerificationInfoAccept {
+        override fun create(
+                tid: String,
+                keyAgreementProtocol: String,
+                hash: String,
+                commitment: String,
+                messageAuthenticationCode: String,
+                shortAuthenticationStrings: List<String>
+        ): VerificationInfoAccept {
             return KeyVerificationAccept(
                     transactionId = tid,
                     keyAgreementProtocol = keyAgreementProtocol,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt
index 1ded9c6c7e..0e9590a2d5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt
@@ -30,6 +30,7 @@ import org.matrix.android.sdk.api.session.securestorage.EncryptedSecretContent
 import org.matrix.android.sdk.api.session.securestorage.IntegrityResult
 import org.matrix.android.sdk.api.session.securestorage.KeyInfo
 import org.matrix.android.sdk.api.session.securestorage.KeyInfoResult
+import org.matrix.android.sdk.api.session.securestorage.KeyRef
 import org.matrix.android.sdk.api.session.securestorage.KeySigner
 import org.matrix.android.sdk.api.session.securestorage.RawBytesKeySpec
 import org.matrix.android.sdk.api.session.securestorage.SecretStorageKeyContent
@@ -62,10 +63,12 @@ internal class DefaultSharedSecretStorageService @Inject constructor(
         private val cryptoCoroutineScope: CoroutineScope
 ) : SharedSecretStorageService {
 
-    override suspend fun generateKey(keyId: String,
-                                     key: SsssKeySpec?,
-                                     keyName: String,
-                                     keySigner: KeySigner?): SsssKeyCreationInfo {
+    override suspend fun generateKey(
+            keyId: String,
+            key: SsssKeySpec?,
+            keyName: String,
+            keySigner: KeySigner?
+    ): SsssKeyCreationInfo {
         return withContext(cryptoCoroutineScope.coroutineContext + coroutineDispatchers.computation) {
             val bytes = (key as? RawBytesKeySpec)?.privateKey
                     ?: ByteArray(32).also {
@@ -94,11 +97,13 @@ internal class DefaultSharedSecretStorageService @Inject constructor(
         }
     }
 
-    override suspend fun generateKeyWithPassphrase(keyId: String,
-                                                   keyName: String,
-                                                   passphrase: String,
-                                                   keySigner: KeySigner,
-                                                   progressListener: ProgressListener?): SsssKeyCreationInfo {
+    override suspend fun generateKeyWithPassphrase(
+            keyId: String,
+            keyName: String,
+            passphrase: String,
+            keySigner: KeySigner,
+            progressListener: ProgressListener?
+    ): SsssKeyCreationInfo {
         return withContext(cryptoCoroutineScope.coroutineContext + coroutineDispatchers.computation) {
             val privatePart = generatePrivateKeyWithPassword(passphrase, progressListener)
 
@@ -157,7 +162,7 @@ internal class DefaultSharedSecretStorageService @Inject constructor(
         return getKey(keyId)
     }
 
-    override suspend fun storeSecret(name: String, secretBase64: String, keys: List<SharedSecretStorageService.KeyRef>) {
+    override suspend fun storeSecret(name: String, secretBase64: String, keys: List<KeyRef>) {
         withContext(cryptoCoroutineScope.coroutineContext + coroutineDispatchers.computation) {
             val encryptedContents = HashMap<String, EncryptedSecretContent>()
             keys.forEach {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt
index 9b1c785059..b18de34329 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt
@@ -192,10 +192,12 @@ internal interface IMXCryptoStore {
      */
     fun storeUserDevices(userId: String, devices: Map<String, CryptoDeviceInfo>?)
 
-    fun storeUserCrossSigningKeys(userId: String,
-                                  masterKey: CryptoCrossSigningKey?,
-                                  selfSigningKey: CryptoCrossSigningKey?,
-                                  userSigningKey: CryptoCrossSigningKey?)
+    fun storeUserCrossSigningKeys(
+            userId: String,
+            masterKey: CryptoCrossSigningKey?,
+            selfSigningKey: CryptoCrossSigningKey?,
+            userSigningKey: CryptoCrossSigningKey?
+    )
 
     /**
      * Retrieve the known devices for a user.
@@ -392,7 +394,8 @@ internal interface IMXCryptoStore {
             algorithm: String,
             senderKey: String,
             fromDevice: String?,
-            event: Event)
+            event: Event
+    )
 
     fun deleteOutgoingRoomKeyRequest(requestId: String)
     fun deleteOutgoingRoomKeyRequestInState(state: OutgoingRoomKeyRequestState)
@@ -479,8 +482,14 @@ internal interface IMXCryptoStore {
     fun addWithHeldMegolmSession(withHeldContent: RoomKeyWithHeldContent)
     fun getWithHeldMegolmSession(roomId: String, sessionId: String): RoomKeyWithHeldContent?
 
-    fun markedSessionAsShared(roomId: String?, sessionId: String, userId: String, deviceId: String,
-                              deviceIdentityKey: String, chainIndex: Int)
+    fun markedSessionAsShared(
+            roomId: String?,
+            sessionId: String,
+            userId: String,
+            deviceId: String,
+            deviceIdentityKey: String,
+            chainIndex: Int
+    )
 
     /**
      * Query for information on this session sharing history.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
index 533ab70bba..c56e4d320b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
@@ -322,10 +322,12 @@ internal class RealmCryptoStore @Inject constructor(
         }
     }
 
-    override fun storeUserCrossSigningKeys(userId: String,
-                                           masterKey: CryptoCrossSigningKey?,
-                                           selfSigningKey: CryptoCrossSigningKey?,
-                                           userSigningKey: CryptoCrossSigningKey?) {
+    override fun storeUserCrossSigningKeys(
+            userId: String,
+            masterKey: CryptoCrossSigningKey?,
+            selfSigningKey: CryptoCrossSigningKey?,
+            userSigningKey: CryptoCrossSigningKey?
+    ) {
         doRealmTransaction(realmConfiguration) { realm ->
             UserEntity.getOrCreate(realm, userId)
                     .let { userEntity ->
@@ -1154,9 +1156,11 @@ internal class RealmCryptoStore @Inject constructor(
         }
     }
 
-    override fun getOrAddOutgoingRoomKeyRequest(requestBody: RoomKeyRequestBody,
-                                                recipients: Map<String, List<String>>,
-                                                fromIndex: Int): OutgoingKeyRequest {
+    override fun getOrAddOutgoingRoomKeyRequest(
+            requestBody: RoomKeyRequestBody,
+            recipients: Map<String, List<String>>,
+            fromIndex: Int
+    ): OutgoingKeyRequest {
         // Insert the request and return the one passed in parameter
         lateinit var request: OutgoingKeyRequest
         doRealmTransaction(realmConfiguration) { realm ->
@@ -1220,12 +1224,14 @@ internal class RealmCryptoStore @Inject constructor(
         }
     }
 
-    override fun updateOutgoingRoomKeyReply(roomId: String,
-                                            sessionId: String,
-                                            algorithm: String,
-                                            senderKey: String,
-                                            fromDevice: String?,
-                                            event: Event) {
+    override fun updateOutgoingRoomKeyReply(
+            roomId: String,
+            sessionId: String,
+            algorithm: String,
+            senderKey: String,
+            fromDevice: String?,
+            event: Event
+    ) {
         doRealmTransaction(realmConfiguration) { realm ->
             realm.where<OutgoingKeyRequestEntity>()
                     .equalTo(OutgoingKeyRequestEntityFields.ROOM_ID, roomId)
@@ -1266,7 +1272,8 @@ internal class RealmCryptoStore @Inject constructor(
             senderKey: String,
             algorithm: String,
             fromUser: String,
-            fromDevice: String) {
+            fromDevice: String
+    ) {
         monarchy.writeAsync { realm ->
             val now = clock.epochMillis()
             realm.createObject<AuditTrailEntity>().apply {
@@ -1288,13 +1295,15 @@ internal class RealmCryptoStore @Inject constructor(
         }
     }
 
-    override fun saveWithheldAuditTrail(roomId: String,
-                                        sessionId: String,
-                                        senderKey: String,
-                                        algorithm: String,
-                                        code: WithHeldCode,
-                                        userId: String,
-                                        deviceId: String) {
+    override fun saveWithheldAuditTrail(
+            roomId: String,
+            sessionId: String,
+            senderKey: String,
+            algorithm: String,
+            code: WithHeldCode,
+            userId: String,
+            deviceId: String
+    ) {
         monarchy.writeAsync { realm ->
             val now = clock.epochMillis()
             realm.createObject<AuditTrailEntity>().apply {
@@ -1316,34 +1325,39 @@ internal class RealmCryptoStore @Inject constructor(
         }
     }
 
-    override fun saveForwardKeyAuditTrail(roomId: String,
-                                          sessionId: String,
-                                          senderKey: String,
-                                          algorithm: String,
-                                          userId: String,
-                                          deviceId: String,
-                                          chainIndex: Long?) {
+    override fun saveForwardKeyAuditTrail(
+            roomId: String,
+            sessionId: String,
+            senderKey: String,
+            algorithm: String,
+            userId: String,
+            deviceId: String,
+            chainIndex: Long?
+    ) {
         saveForwardKeyTrail(roomId, sessionId, senderKey, algorithm, userId, deviceId, chainIndex, false)
     }
 
-    override fun saveIncomingForwardKeyAuditTrail(roomId: String,
-                                                  sessionId: String,
-                                                  senderKey: String,
-                                                  algorithm: String,
-                                                  userId: String,
-                                                  deviceId: String,
-                                                  chainIndex: Long?) {
+    override fun saveIncomingForwardKeyAuditTrail(
+            roomId: String,
+            sessionId: String,
+            senderKey: String,
+            algorithm: String,
+            userId: String,
+            deviceId: String,
+            chainIndex: Long?
+    ) {
         saveForwardKeyTrail(roomId, sessionId, senderKey, algorithm, userId, deviceId, chainIndex, true)
     }
 
-    private fun saveForwardKeyTrail(roomId: String,
-                                    sessionId: String,
-                                    senderKey: String,
-                                    algorithm: String,
-                                    userId: String,
-                                    deviceId: String,
-                                    chainIndex: Long?,
-                                    incoming: Boolean
+    private fun saveForwardKeyTrail(
+            roomId: String,
+            sessionId: String,
+            senderKey: String,
+            algorithm: String,
+            userId: String,
+            deviceId: String,
+            chainIndex: Long?,
+            incoming: Boolean
     ) {
         monarchy.writeAsync { realm ->
             val now = clock.epochMillis()
@@ -1617,12 +1631,14 @@ internal class RealmCryptoStore @Inject constructor(
         }
     }
 
-    override fun markedSessionAsShared(roomId: String?,
-                                       sessionId: String,
-                                       userId: String,
-                                       deviceId: String,
-                                       deviceIdentityKey: String,
-                                       chainIndex: Int) {
+    override fun markedSessionAsShared(
+            roomId: String?,
+            sessionId: String,
+            userId: String,
+            deviceId: String,
+            deviceIdentityKey: String,
+            chainIndex: Int
+    ) {
         doRealmTransaction(realmConfiguration) { realm ->
             SharedSessionEntity.create(
                     realm = realm,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmInboundGroupSessionEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmInboundGroupSessionEntity.kt
index 83671b28d9..a4f6c279ac 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmInboundGroupSessionEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmInboundGroupSessionEntity.kt
@@ -33,7 +33,8 @@ internal open class OlmInboundGroupSessionEntity(
         // olmInboundGroupSessionData contains Json
         var olmInboundGroupSessionData: String? = null,
         // Indicate if the key has been backed up to the homeserver
-        var backedUp: Boolean = false) :
+        var backedUp: Boolean = false
+) :
         RealmObject() {
 
     fun getInboundGroupSession(): OlmInboundGroupSessionWrapper2? {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmSessionEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmSessionEntity.kt
index 1a637d76c4..9f010db288 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmSessionEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmSessionEntity.kt
@@ -25,11 +25,13 @@ import org.matrix.olm.OlmSession
 internal fun OlmSessionEntity.Companion.createPrimaryKey(sessionId: String, deviceKey: String) = "$sessionId|$deviceKey"
 
 // olmSessionData is a serialized OlmSession
-internal open class OlmSessionEntity(@PrimaryKey var primaryKey: String = "",
-                                     var sessionId: String? = null,
-                                     var deviceKey: String? = null,
-                                     var olmSessionData: String? = null,
-                                     var lastReceivedMessageTs: Long = 0) :
+internal open class OlmSessionEntity(
+        @PrimaryKey var primaryKey: String = "",
+        var sessionId: String? = null,
+        var deviceKey: String? = null,
+        var olmSessionData: String? = null,
+        var lastReceivedMessageTs: Long = 0
+) :
         RealmObject() {
 
     fun getOlmSession(): OlmSession? {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OutgoingKeyRequestEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OutgoingKeyRequestEntity.kt
index 7a8ba18809..854d148b76 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OutgoingKeyRequestEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OutgoingKeyRequestEntity.kt
@@ -117,7 +117,7 @@ internal open class OutgoingKeyRequestEntity(
 
     private fun eventToResult(event: Event): RequestResult? {
         return when (event.getClearType()) {
-            EventType.ROOM_KEY_WITHHELD  -> {
+            EventType.ROOM_KEY_WITHHELD -> {
                 event.content.toModel<RoomKeyWithHeldContent>()?.code?.let {
                     RequestResult.Failure(it)
                 }
@@ -125,7 +125,7 @@ internal open class OutgoingKeyRequestEntity(
             EventType.FORWARDED_ROOM_KEY -> {
                 RequestResult.Success((event.content?.get("chain_index") as? Number)?.toInt() ?: 0)
             }
-            else                         -> null
+            else -> null
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/SharedSessionQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/SharedSessionQueries.kt
index 8bf9794375..85dd50c88e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/SharedSessionQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/SharedSessionQueries.kt
@@ -24,12 +24,14 @@ import org.matrix.android.sdk.api.crypto.MXCRYPTO_ALGORITHM_MEGOLM
 import org.matrix.android.sdk.internal.crypto.store.db.model.SharedSessionEntity
 import org.matrix.android.sdk.internal.crypto.store.db.model.SharedSessionEntityFields
 
-internal fun SharedSessionEntity.Companion.get(realm: Realm,
-                                               roomId: String?,
-                                               sessionId: String,
-                                               userId: String,
-                                               deviceId: String,
-                                               deviceIdentityKey: String?): SharedSessionEntity? {
+internal fun SharedSessionEntity.Companion.get(
+        realm: Realm,
+        roomId: String?,
+        sessionId: String,
+        userId: String,
+        deviceId: String,
+        deviceIdentityKey: String?
+): SharedSessionEntity? {
     return realm.where<SharedSessionEntity>()
             .equalTo(SharedSessionEntityFields.ROOM_ID, roomId)
             .equalTo(SharedSessionEntityFields.SESSION_ID, sessionId)
@@ -48,12 +50,15 @@ internal fun SharedSessionEntity.Companion.get(realm: Realm, roomId: String?, se
             .findAll()
 }
 
-internal fun SharedSessionEntity.Companion.create(realm: Realm, roomId: String?,
-                                                  sessionId: String,
-                                                  userId: String,
-                                                  deviceId: String,
-                                                  deviceIdentityKey: String,
-                                                  chainIndex: Int): SharedSessionEntity {
+internal fun SharedSessionEntity.Companion.create(
+        realm: Realm,
+        roomId: String?,
+        sessionId: String,
+        userId: String,
+        deviceId: String,
+        deviceIdentityKey: String,
+        chainIndex: Int
+): SharedSessionEntity {
     return realm.createObject<SharedSessionEntity>().apply {
         this.roomId = roomId
         this.algorithm = MXCRYPTO_ALGORITHM_MEGOLM
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/EncryptEventTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/EncryptEventTask.kt
index 394c618968..a4b4cd0761 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/EncryptEventTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/EncryptEventTask.kt
@@ -31,10 +31,11 @@ import org.matrix.android.sdk.internal.task.Task
 import javax.inject.Inject
 
 internal interface EncryptEventTask : Task<EncryptEventTask.Params, Event> {
-    data class Params(val roomId: String,
-                      val event: Event,
-                      /**Do not encrypt these keys, keep them as is in encrypted content (e.g. m.relates_to)*/
-                      val keepKeys: List<String>? = null
+    data class Params(
+            val roomId: String,
+            val event: Event,
+            /**Do not encrypt these keys, keep them as is in encrypted content (e.g. m.relates_to)*/
+            val keepKeys: List<String>? = null
     )
 }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/RedactEventTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/RedactEventTask.kt
index d6a7f3c6a0..56bdc8cae8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/RedactEventTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/RedactEventTask.kt
@@ -32,7 +32,8 @@ internal interface RedactEventTask : Task<RedactEventTask.Params, String> {
 
 internal class DefaultRedactEventTask @Inject constructor(
         private val roomAPI: RoomAPI,
-        private val globalErrorReceiver: GlobalErrorReceiver) : RedactEventTask {
+        private val globalErrorReceiver: GlobalErrorReceiver
+) : RedactEventTask {
 
     override suspend fun execute(params: RedactEventTask.Params): String {
         val response = executeRequest(globalErrorReceiver) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt
index 50efe51bc1..fbd9d245d9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt
@@ -39,7 +39,8 @@ internal class DefaultSendEventTask @Inject constructor(
         private val encryptEventTask: EncryptEventTask,
         private val loadRoomMembersTask: LoadRoomMembersTask,
         private val roomAPI: RoomAPI,
-        private val globalErrorReceiver: GlobalErrorReceiver) : SendEventTask {
+        private val globalErrorReceiver: GlobalErrorReceiver
+) : SendEventTask {
 
     override suspend fun execute(params: SendEventTask.Params): String {
         try {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt
index 7c52c62d92..944f41d488 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt
@@ -37,7 +37,8 @@ internal class DefaultSendVerificationMessageTask @Inject constructor(
         private val encryptEventTask: EncryptEventTask,
         private val roomAPI: RoomAPI,
         private val cryptoSessionInfoProvider: CryptoSessionInfoProvider,
-        private val globalErrorReceiver: GlobalErrorReceiver) : SendVerificationMessageTask {
+        private val globalErrorReceiver: GlobalErrorReceiver
+) : SendVerificationMessageTask {
 
     override suspend fun execute(params: SendVerificationMessageTask.Params): String {
         val event = handleEncryption(params)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationService.kt
index af48283767..7d8245da30 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationService.kt
@@ -472,9 +472,11 @@ internal class DefaultVerificationService @Inject constructor(
     /**
      * Return a CancelCode to make the caller cancel the verification. Else return null
      */
-    private suspend fun handleStart(otherUserId: String?,
-                                    startReq: ValidVerificationInfoStart,
-                                    txConfigure: (DefaultVerificationTransaction) -> Unit): CancelCode? {
+    private suspend fun handleStart(
+            otherUserId: String?,
+            startReq: ValidVerificationInfoStart,
+            txConfigure: (DefaultVerificationTransaction) -> Unit
+    ): CancelCode? {
         Timber.d("## SAS onStartRequestReceived $startReq")
         if (otherUserId?.let { checkKeysAreDownloaded(it, startReq.fromDevice) } != null) {
             val tid = startReq.transactionId
@@ -589,8 +591,10 @@ internal class DefaultVerificationService @Inject constructor(
     }
 
     // TODO Refacto: It could just return a boolean
-    private suspend fun checkKeysAreDownloaded(otherUserId: String,
-                                               otherDeviceId: String): MXUsersDevicesMap<CryptoDeviceInfo>? {
+    private suspend fun checkKeysAreDownloaded(
+            otherUserId: String,
+            otherDeviceId: String
+    ): MXUsersDevicesMap<CryptoDeviceInfo>? {
         return try {
             var keys = deviceListManager.downloadKeys(listOf(otherUserId), false)
             if (keys.getUserDeviceIds(otherUserId)?.contains(otherDeviceId) == true) {
@@ -899,9 +903,11 @@ internal class DefaultVerificationService @Inject constructor(
         }
     }
 
-    private fun handleReadyReceived(senderId: String,
-                                    readyReq: ValidVerificationInfoReady,
-                                    transportCreator: (DefaultVerificationTransaction) -> VerificationTransport) {
+    private fun handleReadyReceived(
+            senderId: String,
+            readyReq: ValidVerificationInfoReady,
+            transportCreator: (DefaultVerificationTransaction) -> VerificationTransport
+    ) {
         val existingRequest = getExistingVerificationRequests(senderId).find { it.transactionId == readyReq.transactionId }
         if (existingRequest == null) {
             Timber.e("## SAS Received Ready for unknown request txId:${readyReq.transactionId} fromDevice ${readyReq.fromDevice}")
@@ -939,7 +945,7 @@ internal class DefaultVerificationService @Inject constructor(
 
         updatePendingRequest(
                 existingRequest.copy(
-                    readyInfo = readyReq
+                        readyInfo = readyReq
                 )
         )
 
@@ -1158,10 +1164,12 @@ internal class DefaultVerificationService @Inject constructor(
         }
     }
 
-    override fun requestKeyVerificationInDMs(methods: List<VerificationMethod>,
-                                             otherUserId: String,
-                                             roomId: String,
-                                             localId: String?): PendingVerificationRequest {
+    override fun requestKeyVerificationInDMs(
+            methods: List<VerificationMethod>,
+            otherUserId: String,
+            roomId: String,
+            localId: String?
+    ): PendingVerificationRequest {
         Timber.i("## SAS Requesting verification to user: $otherUserId in room $roomId")
 
         val requestsForUser = pendingRequests.getOrPut(otherUserId) { mutableListOf() }
@@ -1328,11 +1336,13 @@ internal class DefaultVerificationService @Inject constructor(
         dispatchRequestUpdated(updated)
     }
 
-    override fun beginKeyVerificationInDMs(method: VerificationMethod,
-                                           transactionId: String,
-                                           roomId: String,
-                                           otherUserId: String,
-                                           otherDeviceId: String): String {
+    override fun beginKeyVerificationInDMs(
+            method: VerificationMethod,
+            transactionId: String,
+            roomId: String,
+            otherUserId: String,
+            otherDeviceId: String
+    ): String {
         if (method == VerificationMethod.SAS) {
             val tx = DefaultOutgoingSASDefaultVerificationTransaction(
                     setDeviceVerificationAction,
@@ -1357,10 +1367,12 @@ internal class DefaultVerificationService @Inject constructor(
         }
     }
 
-    override fun readyPendingVerificationInDMs(methods: List<VerificationMethod>,
-                                               otherUserId: String,
-                                               roomId: String,
-                                               transactionId: String): Boolean {
+    override fun readyPendingVerificationInDMs(
+            methods: List<VerificationMethod>,
+            otherUserId: String,
+            roomId: String,
+            transactionId: String
+    ): Boolean {
         Timber.v("## SAS readyPendingVerificationInDMs $otherUserId room:$roomId tx:$transactionId")
         // Let's find the related request
         val existingRequest = getExistingVerificationRequest(otherUserId, transactionId)
@@ -1399,9 +1411,11 @@ internal class DefaultVerificationService @Inject constructor(
         }
     }
 
-    override fun readyPendingVerification(methods: List<VerificationMethod>,
-                                          otherUserId: String,
-                                          transactionId: String): Boolean {
+    override fun readyPendingVerification(
+            methods: List<VerificationMethod>,
+            otherUserId: String,
+            transactionId: String
+    ): Boolean {
         Timber.v("## SAS readyPendingVerification $otherUserId tx:$transactionId")
         // Let's find the related request
         val existingRequest = getExistingVerificationRequest(otherUserId, transactionId)
@@ -1445,7 +1459,8 @@ internal class DefaultVerificationService @Inject constructor(
             otherDeviceId: String,
             otherUserMethods: List<String>?,
             methods: List<VerificationMethod>,
-            transportCreator: (DefaultVerificationTransaction) -> VerificationTransport): List<String> {
+            transportCreator: (DefaultVerificationTransaction) -> VerificationTransport
+    ): List<String> {
         if (otherUserMethods.isNullOrEmpty()) {
             return emptyList()
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationTransaction.kt
index 27bc764395..9d19fd137e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationTransaction.kt
@@ -37,7 +37,8 @@ internal abstract class DefaultVerificationTransaction(
         override val transactionId: String,
         override val otherUserId: String,
         override var otherDeviceId: String? = null,
-        override val isIncoming: Boolean) : VerificationTransaction {
+        override val isIncoming: Boolean
+) : VerificationTransaction {
 
     lateinit var transport: VerificationTransport
 
@@ -55,9 +56,12 @@ internal abstract class DefaultVerificationTransaction(
         listeners.remove(listener)
     }
 
-    protected fun trust(canTrustOtherUserMasterKey: Boolean,
-                        toVerifyDeviceIds: List<String>,
-                        eventuallyMarkMyMasterKeyAsTrusted: Boolean, autoDone: Boolean = true) {
+    protected fun trust(
+            canTrustOtherUserMasterKey: Boolean,
+            toVerifyDeviceIds: List<String>,
+            eventuallyMarkMyMasterKeyAsTrusted: Boolean,
+            autoDone: Boolean = true
+    ) {
         Timber.d("## Verification: trust ($otherUserId,$otherDeviceId) , verifiedDevices:$toVerifyDeviceIds")
         Timber.d("## Verification: trust Mark myMSK trusted $eventuallyMarkMyMasterKeyAsTrusted")
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt
index 68dd57478e..d68f2c429d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt
@@ -314,11 +314,13 @@ internal abstract class SASDefaultVerificationTransaction(
         transport.cancelTransaction(transactionId, otherUserId, otherDeviceId ?: "", code)
     }
 
-    protected fun <T> sendToOther(type: String,
-                                  keyToDevice: VerificationInfo<T>,
-                                  nextState: VerificationTxState,
-                                  onErrorReason: CancelCode,
-                                  onDone: (() -> Unit)?) {
+    protected fun <T> sendToOther(
+            type: String,
+            keyToDevice: VerificationInfo<T>,
+            nextState: VerificationTxState,
+            onErrorReason: CancelCode,
+            onDone: (() -> Unit)?
+    ) {
         transport.sendToOther(type, keyToDevice, nextState, onErrorReason, onDone)
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoAccept.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoAccept.kt
index 3ddb0ca758..0b9287cb05 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoAccept.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoAccept.kt
@@ -63,12 +63,14 @@ internal interface VerificationInfoAccept : VerificationInfo<ValidVerificationIn
 
 internal interface VerificationInfoAcceptFactory {
 
-    fun create(tid: String,
-               keyAgreementProtocol: String,
-               hash: String,
-               commitment: String,
-               messageAuthenticationCode: String,
-               shortAuthenticationStrings: List<String>): VerificationInfoAccept
+    fun create(
+            tid: String,
+            keyAgreementProtocol: String,
+            hash: String,
+            commitment: String,
+            messageAuthenticationCode: String,
+            shortAuthenticationStrings: List<String>
+    ): VerificationInfoAccept
 }
 
 internal data class ValidVerificationInfoAccept(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoStart.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoStart.kt
index d71bd7359e..991470a848 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoStart.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoStart.kt
@@ -105,7 +105,8 @@ internal interface VerificationInfoStart : VerificationInfo<ValidVerificationInf
 
 internal sealed class ValidVerificationInfoStart(
         open val transactionId: String,
-        open val fromDevice: String) {
+        open val fromDevice: String
+) {
     data class SasVerificationInfoStart(
             override val transactionId: String,
             override val fromDevice: String,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransport.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransport.kt
index 69dec12ef3..5314c23870 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransport.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransport.kt
@@ -28,11 +28,13 @@ internal interface VerificationTransport {
     /**
      * Sends a message.
      */
-    fun <T> sendToOther(type: String,
-                        verificationInfo: VerificationInfo<T>,
-                        nextState: VerificationTxState,
-                        onErrorReason: CancelCode,
-                        onDone: (() -> Unit)?)
+    fun <T> sendToOther(
+            type: String,
+            verificationInfo: VerificationInfo<T>,
+            nextState: VerificationTxState,
+            onErrorReason: CancelCode,
+            onDone: (() -> Unit)?
+    )
 
     /**
      * @param supportedMethods list of supported method by this client
@@ -42,65 +44,85 @@ internal interface VerificationTransport {
      * @param toDevices list of device Ids
      * @param callback will be called with eventId and ValidVerificationInfoRequest in case of success
      */
-    fun sendVerificationRequest(supportedMethods: List<String>,
-                                localId: String,
-                                otherUserId: String,
-                                roomId: String?,
-                                toDevices: List<String>?,
-                                callback: (String?, ValidVerificationInfoRequest?) -> Unit)
+    fun sendVerificationRequest(
+            supportedMethods: List<String>,
+            localId: String,
+            otherUserId: String,
+            roomId: String?,
+            toDevices: List<String>?,
+            callback: (String?, ValidVerificationInfoRequest?) -> Unit
+    )
 
-    fun cancelTransaction(transactionId: String,
-                          otherUserId: String,
-                          otherUserDeviceId: String?,
-                          code: CancelCode)
+    fun cancelTransaction(
+            transactionId: String,
+            otherUserId: String,
+            otherUserDeviceId: String?,
+            code: CancelCode
+    )
 
-    fun cancelTransaction(transactionId: String,
-                          otherUserId: String,
-                          otherUserDeviceIds: List<String>,
-                          code: CancelCode)
+    fun cancelTransaction(
+            transactionId: String,
+            otherUserId: String,
+            otherUserDeviceIds: List<String>,
+            code: CancelCode
+    )
 
-    fun done(transactionId: String,
-             onDone: (() -> Unit)?)
+    fun done(
+            transactionId: String,
+            onDone: (() -> Unit)?
+    )
 
     /**
      * Creates an accept message suitable for this transport.
      */
-    fun createAccept(tid: String,
-                     keyAgreementProtocol: String,
-                     hash: String,
-                     commitment: String,
-                     messageAuthenticationCode: String,
-                     shortAuthenticationStrings: List<String>): VerificationInfoAccept
+    fun createAccept(
+            tid: String,
+            keyAgreementProtocol: String,
+            hash: String,
+            commitment: String,
+            messageAuthenticationCode: String,
+            shortAuthenticationStrings: List<String>
+    ): VerificationInfoAccept
 
-    fun createKey(tid: String,
-                  pubKey: String): VerificationInfoKey
+    fun createKey(
+            tid: String,
+            pubKey: String
+    ): VerificationInfoKey
 
     /**
      * Create start for SAS verification.
      */
-    fun createStartForSas(fromDevice: String,
-                          transactionId: String,
-                          keyAgreementProtocols: List<String>,
-                          hashes: List<String>,
-                          messageAuthenticationCodes: List<String>,
-                          shortAuthenticationStrings: List<String>): VerificationInfoStart
+    fun createStartForSas(
+            fromDevice: String,
+            transactionId: String,
+            keyAgreementProtocols: List<String>,
+            hashes: List<String>,
+            messageAuthenticationCodes: List<String>,
+            shortAuthenticationStrings: List<String>
+    ): VerificationInfoStart
 
     /**
      * Create start for QR code verification.
      */
-    fun createStartForQrCode(fromDevice: String,
-                             transactionId: String,
-                             sharedSecret: String): VerificationInfoStart
+    fun createStartForQrCode(
+            fromDevice: String,
+            transactionId: String,
+            sharedSecret: String
+    ): VerificationInfoStart
 
     fun createMac(tid: String, mac: Map<String, String>, keys: String): VerificationInfoMac
 
-    fun createReady(tid: String,
-                    fromDevice: String,
-                    methods: List<String>): VerificationInfoReady
+    fun createReady(
+            tid: String,
+            fromDevice: String,
+            methods: List<String>
+    ): VerificationInfoReady
 
     // TODO Refactor
-    fun sendVerificationReady(keyReq: VerificationInfoReady,
-                              otherUserId: String,
-                              otherDeviceId: String?,
-                              callback: (() -> Unit)?)
+    fun sendVerificationReady(
+            keyReq: VerificationInfoReady,
+            otherUserId: String,
+            otherDeviceId: String?,
+            callback: (() -> Unit)?
+    )
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt
index 03df849d22..f38a604890 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt
@@ -61,11 +61,13 @@ internal class VerificationTransportRoomMessage(
     private val verificationSenderScope = CoroutineScope(cryptoCoroutineScope.coroutineContext + dispatcher)
     private val sequencer = SemaphoreCoroutineSequencer()
 
-    override fun <T> sendToOther(type: String,
-                                 verificationInfo: VerificationInfo<T>,
-                                 nextState: VerificationTxState,
-                                 onErrorReason: CancelCode,
-                                 onDone: (() -> Unit)?) {
+    override fun <T> sendToOther(
+            type: String,
+            verificationInfo: VerificationInfo<T>,
+            nextState: VerificationTxState,
+            onErrorReason: CancelCode,
+            onDone: (() -> Unit)?
+    ) {
         Timber.d("## SAS sending msg type $type")
         Timber.v("## SAS sending msg info $verificationInfo")
         val event = createEventAndLocalEcho(
@@ -92,12 +94,14 @@ internal class VerificationTransportRoomMessage(
         }
     }
 
-    override fun sendVerificationRequest(supportedMethods: List<String>,
-                                         localId: String,
-                                         otherUserId: String,
-                                         roomId: String?,
-                                         toDevices: List<String>?,
-                                         callback: (String?, ValidVerificationInfoRequest?) -> Unit) {
+    override fun sendVerificationRequest(
+            supportedMethods: List<String>,
+            localId: String,
+            otherUserId: String,
+            roomId: String?,
+            toDevices: List<String>?,
+            callback: (String?, ValidVerificationInfoRequest?) -> Unit
+    ) {
         Timber.d("## SAS sending verification request with supported methods: $supportedMethods")
         // This transport requires a room
         requireNotNull(roomId)
@@ -160,11 +164,17 @@ internal class VerificationTransportRoomMessage(
         }
     }
 
-    override fun cancelTransaction(transactionId: String, otherUserId: String, otherUserDeviceIds: List<String>, code: CancelCode) =
-            cancelTransaction(transactionId, otherUserId, null, code)
+    override fun cancelTransaction(
+            transactionId: String,
+            otherUserId: String,
+            otherUserDeviceIds: List<String>,
+            code: CancelCode
+    ) = cancelTransaction(transactionId, otherUserId, null, code)
 
-    override fun done(transactionId: String,
-                      onDone: (() -> Unit)?) {
+    override fun done(
+            transactionId: String,
+            onDone: (() -> Unit)?
+    ) {
         Timber.d("## SAS sending done for $transactionId")
         val event = createEventAndLocalEcho(
                 type = EventType.KEY_VERIFICATION_DONE,
@@ -191,12 +201,14 @@ internal class VerificationTransportRoomMessage(
         }
     }
 
-    override fun createAccept(tid: String,
-                              keyAgreementProtocol: String,
-                              hash: String,
-                              commitment: String,
-                              messageAuthenticationCode: String,
-                              shortAuthenticationStrings: List<String>): VerificationInfoAccept =
+    override fun createAccept(
+            tid: String,
+            keyAgreementProtocol: String,
+            hash: String,
+            commitment: String,
+            messageAuthenticationCode: String,
+            shortAuthenticationStrings: List<String>
+    ): VerificationInfoAccept =
             MessageVerificationAcceptContent.create(
                     tid,
                     keyAgreementProtocol,
@@ -210,12 +222,14 @@ internal class VerificationTransportRoomMessage(
 
     override fun createMac(tid: String, mac: Map<String, String>, keys: String) = MessageVerificationMacContent.create(tid, mac, keys)
 
-    override fun createStartForSas(fromDevice: String,
-                                   transactionId: String,
-                                   keyAgreementProtocols: List<String>,
-                                   hashes: List<String>,
-                                   messageAuthenticationCodes: List<String>,
-                                   shortAuthenticationStrings: List<String>): VerificationInfoStart {
+    override fun createStartForSas(
+            fromDevice: String,
+            transactionId: String,
+            keyAgreementProtocols: List<String>,
+            hashes: List<String>,
+            messageAuthenticationCodes: List<String>,
+            shortAuthenticationStrings: List<String>
+    ): VerificationInfoStart {
         return MessageVerificationStartContent(
                 fromDevice,
                 hashes,
@@ -231,9 +245,11 @@ internal class VerificationTransportRoomMessage(
         )
     }
 
-    override fun createStartForQrCode(fromDevice: String,
-                                      transactionId: String,
-                                      sharedSecret: String): VerificationInfoStart {
+    override fun createStartForQrCode(
+            fromDevice: String,
+            transactionId: String,
+            sharedSecret: String
+    ): VerificationInfoStart {
         return MessageVerificationStartContent(
                 fromDevice,
                 null,
@@ -274,10 +290,12 @@ internal class VerificationTransportRoomMessage(
         }
     }
 
-    override fun sendVerificationReady(keyReq: VerificationInfoReady,
-                                       otherUserId: String,
-                                       otherDeviceId: String?,
-                                       callback: (() -> Unit)?) {
+    override fun sendVerificationReady(
+            keyReq: VerificationInfoReady,
+            otherUserId: String,
+            otherDeviceId: String?,
+            callback: (() -> Unit)?
+    ) {
         // Not applicable (send event is called directly)
         Timber.w("## SAS ignored verification ready with methods: ${keyReq.methods}")
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt
index 974adf3888..861a7a3a77 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt
@@ -47,12 +47,14 @@ internal class VerificationTransportToDevice(
         private val clock: Clock,
 ) : VerificationTransport {
 
-    override fun sendVerificationRequest(supportedMethods: List<String>,
-                                         localId: String,
-                                         otherUserId: String,
-                                         roomId: String?,
-                                         toDevices: List<String>?,
-                                         callback: (String?, ValidVerificationInfoRequest?) -> Unit) {
+    override fun sendVerificationRequest(
+            supportedMethods: List<String>,
+            localId: String,
+            otherUserId: String,
+            roomId: String?,
+            toDevices: List<String>?,
+            callback: (String?, ValidVerificationInfoRequest?) -> Unit
+    ) {
         Timber.d("## SAS sending verification request with supported methods: $supportedMethods")
         val contentMap = MXUsersDevicesMap<Any>()
         val validKeyReq = ValidVerificationInfoRequest(
@@ -86,10 +88,12 @@ internal class VerificationTransportToDevice(
                 .executeBy(taskExecutor)
     }
 
-    override fun sendVerificationReady(keyReq: VerificationInfoReady,
-                                       otherUserId: String,
-                                       otherDeviceId: String?,
-                                       callback: (() -> Unit)?) {
+    override fun sendVerificationReady(
+            keyReq: VerificationInfoReady,
+            otherUserId: String,
+            otherDeviceId: String?,
+            callback: (() -> Unit)?
+    ) {
         Timber.d("## SAS sending verification ready with methods: ${keyReq.methods}")
         val contentMap = MXUsersDevicesMap<Any>()
 
@@ -111,11 +115,13 @@ internal class VerificationTransportToDevice(
                 .executeBy(taskExecutor)
     }
 
-    override fun <T> sendToOther(type: String,
-                                 verificationInfo: VerificationInfo<T>,
-                                 nextState: VerificationTxState,
-                                 onErrorReason: CancelCode,
-                                 onDone: (() -> Unit)?) {
+    override fun <T> sendToOther(
+            type: String,
+            verificationInfo: VerificationInfo<T>,
+            nextState: VerificationTxState,
+            onErrorReason: CancelCode,
+            onDone: (() -> Unit)?
+    ) {
         Timber.d("## SAS sending msg type $type")
         Timber.v("## SAS sending msg info $verificationInfo")
         val stateBeforeCall = tx?.state
@@ -214,12 +220,14 @@ internal class VerificationTransportToDevice(
                 .executeBy(taskExecutor)
     }
 
-    override fun createAccept(tid: String,
-                              keyAgreementProtocol: String,
-                              hash: String,
-                              commitment: String,
-                              messageAuthenticationCode: String,
-                              shortAuthenticationStrings: List<String>): VerificationInfoAccept = KeyVerificationAccept.create(
+    override fun createAccept(
+            tid: String,
+            keyAgreementProtocol: String,
+            hash: String,
+            commitment: String,
+            messageAuthenticationCode: String,
+            shortAuthenticationStrings: List<String>
+    ): VerificationInfoAccept = KeyVerificationAccept.create(
             tid,
             keyAgreementProtocol,
             hash,
@@ -232,12 +240,14 @@ internal class VerificationTransportToDevice(
 
     override fun createMac(tid: String, mac: Map<String, String>, keys: String) = KeyVerificationMac.create(tid, mac, keys)
 
-    override fun createStartForSas(fromDevice: String,
-                                   transactionId: String,
-                                   keyAgreementProtocols: List<String>,
-                                   hashes: List<String>,
-                                   messageAuthenticationCodes: List<String>,
-                                   shortAuthenticationStrings: List<String>): VerificationInfoStart {
+    override fun createStartForSas(
+            fromDevice: String,
+            transactionId: String,
+            keyAgreementProtocols: List<String>,
+            hashes: List<String>,
+            messageAuthenticationCodes: List<String>,
+            shortAuthenticationStrings: List<String>
+    ): VerificationInfoStart {
         return KeyVerificationStart(
                 fromDevice,
                 VERIFICATION_METHOD_SAS,
@@ -250,9 +260,11 @@ internal class VerificationTransportToDevice(
         )
     }
 
-    override fun createStartForQrCode(fromDevice: String,
-                                      transactionId: String,
-                                      sharedSecret: String): VerificationInfoStart {
+    override fun createStartForQrCode(
+            fromDevice: String,
+            transactionId: String,
+            sharedSecret: String
+    ): VerificationInfoStart {
         return KeyVerificationStart(
                 fromDevice,
                 VERIFICATION_METHOD_RECIPROCATE,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/EventInsertLiveObserver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/EventInsertLiveObserver.kt
index 751992fa7f..4434347db1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/EventInsertLiveObserver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/EventInsertLiveObserver.kt
@@ -33,8 +33,10 @@ import org.matrix.android.sdk.internal.session.EventInsertLiveProcessor
 import timber.log.Timber
 import javax.inject.Inject
 
-internal class EventInsertLiveObserver @Inject constructor(@SessionDatabase realmConfiguration: RealmConfiguration,
-                                                           private val processors: Set<@JvmSuppressWildcards EventInsertLiveProcessor>) :
+internal class EventInsertLiveObserver @Inject constructor(
+        @SessionDatabase realmConfiguration: RealmConfiguration,
+        private val processors: Set<@JvmSuppressWildcards EventInsertLiveProcessor>
+) :
         RealmLiveEntityObserver<EventInsertEntity>(realmConfiguration) {
 
     override val query = Monarchy.Query {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmKeysUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmKeysUtils.kt
index 392c1a7185..b3a039d119 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmKeysUtils.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmKeysUtils.kt
@@ -38,8 +38,10 @@ import javax.inject.Inject
  * then we generate a random secret key. The database key is encrypted with the secret key; The secret
  * key is encrypted with the public RSA key and stored with the encrypted key in the shared pref
  */
-internal class RealmKeysUtils @Inject constructor(context: Context,
-                                                  private val secretStoringUtils: SecretStoringUtils) {
+internal class RealmKeysUtils @Inject constructor(
+        context: Context,
+        private val secretStoringUtils: SecretStoringUtils
+) {
 
     private val rng = SecureRandom()
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmQueryLatch.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmQueryLatch.kt
index c9c797304a..c5ca861e9b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmQueryLatch.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmQueryLatch.kt
@@ -27,9 +27,11 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeout
 
-internal suspend fun <T> awaitNotEmptyResult(realmConfiguration: RealmConfiguration,
-                                             timeoutMillis: Long,
-                                             builder: (Realm) -> RealmQuery<T>) {
+internal suspend fun <T> awaitNotEmptyResult(
+        realmConfiguration: RealmConfiguration,
+        timeoutMillis: Long,
+        builder: (Realm) -> RealmQuery<T>
+) {
     withTimeout(timeoutMillis) {
         // Confine Realm interaction to a single thread with Looper.
         withContext(Dispatchers.Main) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
index 55bccfd1ec..592461f927 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
@@ -46,6 +46,7 @@ import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo025
 import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo026
 import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo027
 import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo028
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo029
 import org.matrix.android.sdk.internal.util.Normalizer
 import timber.log.Timber
 import javax.inject.Inject
@@ -60,7 +61,7 @@ internal class RealmSessionStoreMigration @Inject constructor(
     override fun equals(other: Any?) = other is RealmSessionStoreMigration
     override fun hashCode() = 1000
 
-    val schemaVersion = 28L
+    val schemaVersion = 29L
 
     override fun migrate(realm: DynamicRealm, oldVersion: Long, newVersion: Long) {
         Timber.d("Migrating Realm Session from $oldVersion to $newVersion")
@@ -93,5 +94,6 @@ internal class RealmSessionStoreMigration @Inject constructor(
         if (oldVersion < 26) MigrateSessionTo026(realm).perform()
         if (oldVersion < 27) MigrateSessionTo027(realm).perform()
         if (oldVersion < 28) MigrateSessionTo028(realm).perform()
+        if (oldVersion < 29) MigrateSessionTo029(realm).perform()
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
index 08d55b5647..949dd5daa1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
@@ -44,7 +44,8 @@ internal class SessionRealmConfigurationFactory @Inject constructor(
         @SessionFilesDirectory val directory: File,
         @SessionId val sessionId: String,
         @UserMd5 val userMd5: String,
-        context: Context) {
+        context: Context
+) {
 
     // Keep legacy preferences name for compatibility reason
     private val sharedPreferences = context.getSharedPreferences("im.vector.matrix.android.realm", Context.MODE_PRIVATE)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt
index caaf6b8110..efcbc9de12 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt
@@ -79,11 +79,13 @@ internal fun ChunkEntity.addStateEvent(roomId: String, stateEvent: EventEntity,
     }
 }
 
-internal fun ChunkEntity.addTimelineEvent(roomId: String,
-                                          eventEntity: EventEntity,
-                                          direction: PaginationDirection,
-                                          ownedByThreadChunk: Boolean = false,
-                                          roomMemberContentsByUser: Map<String, RoomMemberContent?>? = null): TimelineEventEntity? {
+internal fun ChunkEntity.addTimelineEvent(
+        roomId: String,
+        eventEntity: EventEntity,
+        direction: PaginationDirection,
+        ownedByThreadChunk: Boolean = false,
+        roomMemberContentsByUser: Map<String, RoomMemberContent?>? = null
+): TimelineEventEntity? {
     val eventId = eventEntity.eventId
     if (timelineEvents.find(eventId) != null) {
         return null
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadEventsHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadEventsHelper.kt
index 5db859bce2..dfac7f6708 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadEventsHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadEventsHelper.kt
@@ -47,9 +47,11 @@ private typealias Summary = Pair<Int, TimelineEventEntity>?
  */
 internal fun Map<String, EventEntity>.updateThreadSummaryIfNeeded(
         roomId: String,
-        realm: Realm, currentUserId: String,
+        realm: Realm,
+        currentUserId: String,
         chunkEntity: ChunkEntity? = null,
-        shouldUpdateNotifications: Boolean = true) {
+        shouldUpdateNotifications: Boolean = true
+) {
     for ((rootThreadEventId, eventEntity) in this) {
         eventEntity.threadSummaryInThread(eventEntity.realm, rootThreadEventId, chunkEntity)?.let { threadSummary ->
 
@@ -87,7 +89,8 @@ internal fun EventEntity.findRootThreadEvent(): EventEntity? =
  */
 internal fun EventEntity.markEventAsRoot(
         inThreadMessages: Int,
-        latestMessageTimelineEventEntity: TimelineEventEntity?) {
+        latestMessageTimelineEventEntity: TimelineEventEntity?
+) {
     isRootThread = true
     numberOfThreads = inThreadMessages
     threadSummaryLatestMessage = latestMessageTimelineEventEntity
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadSummaryHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadSummaryHelper.kt
index 5b4fe287cb..ebe8de7841 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadSummaryHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadSummaryHelper.kt
@@ -54,7 +54,8 @@ internal fun ThreadSummaryEntity.updateThreadSummary(
         numberOfThreads: Int?,
         latestThreadEventEntity: EventEntity?,
         isUserParticipating: Boolean,
-        roomMemberContentsByUser: HashMap<String, RoomMemberContent?>) {
+        roomMemberContentsByUser: HashMap<String, RoomMemberContent?>
+) {
     updateThreadSummaryRootEvent(rootThreadEventEntity, roomMemberContentsByUser)
     updateThreadSummaryLatestEvent(latestThreadEventEntity, roomMemberContentsByUser)
     this.isUserParticipating = isUserParticipating
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt
index c747ad334f..6bbeb17fdd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt
@@ -58,7 +58,7 @@ internal object EventAnnotationsSummaryMapper {
                     PollResponseAggregatedSummaryEntityMapper.map(it)
                 },
                 liveLocationShareAggregatedSummary = annotationsSummary.liveLocationShareAggregatedSummary?.let {
-                    LiveLocationShareAggregatedSummaryMapper.map(it)
+                    LiveLocationShareAggregatedSummaryMapper().map(it)
                 }
         )
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt
index bc7d40bf6f..5b60c53642 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt
@@ -127,10 +127,12 @@ internal fun EventEntity.asDomain(castJsonNumbers: Boolean = false): Event {
     return EventMapper.map(this, castJsonNumbers)
 }
 
-internal fun Event.toEntity(roomId: String,
-                            sendState: SendState,
-                            ageLocalTs: Long?,
-                            contentToInject: String? = null): EventEntity {
+internal fun Event.toEntity(
+        roomId: String,
+        sendState: SendState,
+        ageLocalTs: Long?,
+        contentToInject: String? = null
+): EventEntity {
     return EventMapper.map(this, roomId).apply {
         this.sendState = sendState
         this.ageLocalTs = ageLocalTs
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/LiveLocationShareAggregatedSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/LiveLocationShareAggregatedSummaryMapper.kt
index 71b36f88bd..9460e4c6ba 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/LiveLocationShareAggregatedSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/LiveLocationShareAggregatedSummaryMapper.kt
@@ -20,11 +20,13 @@ import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.livelocation.LiveLocationShareAggregatedSummary
 import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconLocationDataContent
 import org.matrix.android.sdk.internal.database.model.livelocation.LiveLocationShareAggregatedSummaryEntity
+import javax.inject.Inject
 
-internal object LiveLocationShareAggregatedSummaryMapper {
+internal class LiveLocationShareAggregatedSummaryMapper @Inject constructor() {
 
     fun map(entity: LiveLocationShareAggregatedSummaryEntity): LiveLocationShareAggregatedSummary {
         return LiveLocationShareAggregatedSummary(
+                userId = entity.userId,
                 isActive = entity.isActive,
                 endOfLiveTimestampMillis = entity.endOfLiveTimestampMillis,
                 lastLocationDataContent = ContentMapper.map(entity.lastLocationContent).toModel<MessageBeaconLocationDataContent>()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
index 41faf30a82..9952a46f03 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
@@ -29,8 +29,10 @@ import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
 import org.matrix.android.sdk.internal.database.model.presence.toUserPresence
 import javax.inject.Inject
 
-internal class RoomSummaryMapper @Inject constructor(private val timelineEventMapper: TimelineEventMapper,
-                                                     private val typingUsersTracker: TypingUsersTracker) {
+internal class RoomSummaryMapper @Inject constructor(
+        private val timelineEventMapper: TimelineEventMapper,
+        private val typingUsersTracker: TypingUsersTracker
+) {
 
     fun map(roomSummaryEntity: RoomSummaryEntity): RoomSummary {
         val tags = roomSummaryEntity.tags().map {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo019.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo019.kt
index 754a66bb4b..38de70cc7c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo019.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo019.kt
@@ -21,8 +21,10 @@ import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
 import org.matrix.android.sdk.internal.util.Normalizer
 import org.matrix.android.sdk.internal.util.database.RealmMigrator
 
-internal class MigrateSessionTo019(realm: DynamicRealm,
-                                   private val normalizer: Normalizer) : RealmMigrator(realm, 19) {
+internal class MigrateSessionTo019(
+        realm: DynamicRealm,
+        private val normalizer: Normalizer
+) : RealmMigrator(realm, 19) {
 
     override fun doMigrate(realm: DynamicRealm) {
         realm.schema.get("RoomSummaryEntity")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo029.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo029.kt
new file mode 100644
index 0000000000..aebca11c2b
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo029.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.database.migration
+
+import io.realm.DynamicRealm
+import io.realm.FieldAttribute
+import org.matrix.android.sdk.internal.database.model.livelocation.LiveLocationShareAggregatedSummaryEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+/**
+ * Migrating to:
+ * Live location sharing aggregated summary: adding new field userId.
+ */
+internal class MigrateSessionTo029(realm: DynamicRealm) : RealmMigrator(realm, 28) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("LiveLocationShareAggregatedSummaryEntity")
+                ?.addField(LiveLocationShareAggregatedSummaryEntityFields.USER_ID, String::class.java, FieldAttribute.REQUIRED)
+                ?.transform { obj ->
+                    obj.setString(LiveLocationShareAggregatedSummaryEntityFields.USER_ID, "")
+                }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ChunkEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ChunkEntity.kt
index 8399d82d5d..e5360ce0b6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ChunkEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ChunkEntity.kt
@@ -53,7 +53,8 @@ internal open class ChunkEntity(
 
 internal fun ChunkEntity.deleteOnCascade(
         deleteStateEvents: Boolean,
-        canDeleteRoot: Boolean) {
+        canDeleteRoot: Boolean
+) {
     assertIsManaged()
     if (deleteStateEvents) {
         stateEvents.deleteAllFromRealm()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/CurrentStateEventEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/CurrentStateEventEntity.kt
index 251b057722..9deef69dab 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/CurrentStateEventEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/CurrentStateEventEntity.kt
@@ -20,11 +20,12 @@ package org.matrix.android.sdk.internal.database.model
 import io.realm.RealmObject
 import io.realm.annotations.Index
 
-internal open class CurrentStateEventEntity(var eventId: String = "",
-                                            var root: EventEntity? = null,
-                                            @Index var roomId: String = "",
-                                            @Index var type: String = "",
-                                            @Index var stateKey: String = ""
+internal open class CurrentStateEventEntity(
+        var eventId: String = "",
+        var root: EventEntity? = null,
+        @Index var roomId: String = "",
+        @Index var type: String = "",
+        @Index var stateKey: String = ""
 ) : RealmObject() {
     companion object
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/DraftEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/DraftEntity.kt
index fd09da4448..3c19d4d443 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/DraftEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/DraftEntity.kt
@@ -18,9 +18,10 @@ package org.matrix.android.sdk.internal.database.model
 
 import io.realm.RealmObject
 
-internal open class DraftEntity(var content: String = "",
-                                var draftMode: String = MODE_REGULAR,
-                                var linkedEventId: String = ""
+internal open class DraftEntity(
+        var content: String = "",
+        var draftMode: String = MODE_REGULAR,
+        var linkedEventId: String = ""
 ) : RealmObject() {
 
     companion object {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
index ba80cc8302..8b5a211fba 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
@@ -25,28 +25,29 @@ import org.matrix.android.sdk.api.session.threads.ThreadNotificationState
 import org.matrix.android.sdk.internal.di.MoshiProvider
 import org.matrix.android.sdk.internal.extensions.assertIsManaged
 
-internal open class EventEntity(@Index var eventId: String = "",
-                                @Index var roomId: String = "",
-                                @Index var type: String = "",
-                                var content: String? = null,
-                                var prevContent: String? = null,
-                                var isUseless: Boolean = false,
-                                @Index var stateKey: String? = null,
-                                var originServerTs: Long? = null,
-                                @Index var sender: String? = null,
+internal open class EventEntity(
+        @Index var eventId: String = "",
+        @Index var roomId: String = "",
+        @Index var type: String = "",
+        var content: String? = null,
+        var prevContent: String? = null,
+        var isUseless: Boolean = false,
+        @Index var stateKey: String? = null,
+        var originServerTs: Long? = null,
+        @Index var sender: String? = null,
         // Can contain a serialized MatrixError
-                                var sendStateDetails: String? = null,
-                                var age: Long? = 0,
-                                var unsignedData: String? = null,
-                                var redacts: String? = null,
-                                var decryptionResultJson: String? = null,
-                                var ageLocalTs: Long? = null,
+        var sendStateDetails: String? = null,
+        var age: Long? = 0,
+        var unsignedData: String? = null,
+        var redacts: String? = null,
+        var decryptionResultJson: String? = null,
+        var ageLocalTs: Long? = null,
         // Thread related, no need to create a new Entity for performance
-                                @Index var isRootThread: Boolean = false,
-                                @Index var rootThreadEventId: String? = null,
+        @Index var isRootThread: Boolean = false,
+        @Index var rootThreadEventId: String? = null,
         // Number messages within the thread
-                                var numberOfThreads: Int = 0,
-                                var threadSummaryLatestMessage: TimelineEventEntity? = null
+        var numberOfThreads: Int = 0,
+        var threadSummaryLatestMessage: TimelineEventEntity? = null
 ) : RealmObject() {
 
     private var sendStateStr: String = SendState.UNKNOWN.name
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventInsertEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventInsertEntity.kt
index 5cfd306d2f..eff332dc3a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventInsertEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventInsertEntity.kt
@@ -22,13 +22,14 @@ import io.realm.RealmObject
  * This class is used to get notification on new events being inserted. It's to avoid realm getting slow when listening to insert
  * in EventEntity table.
  */
-internal open class EventInsertEntity(var eventId: String = "",
-                                      var eventType: String = "",
-                                      /**
-                                       * This flag will be used to filter EventInsertEntity in EventInsertLiveObserver.
-                                       * Currently it's set to false when the event content is encrypted.
-                                       */
-                                      var canBeProcessed: Boolean = true
+internal open class EventInsertEntity(
+        var eventId: String = "",
+        var eventType: String = "",
+        /**
+         * This flag will be used to filter EventInsertEntity in EventInsertLiveObserver.
+         * Currently it's set to false when the event content is encrypted.
+         */
+        var canBeProcessed: Boolean = true
 ) : RealmObject() {
 
     private var insertTypeStr: String = EventInsertType.INCREMENTAL_SYNC.name
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/GroupSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/GroupSummaryEntity.kt
index 4ba45dcda2..d965148559 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/GroupSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/GroupSummaryEntity.kt
@@ -21,12 +21,13 @@ import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 import org.matrix.android.sdk.api.session.room.model.Membership
 
-internal open class GroupSummaryEntity(@PrimaryKey var groupId: String = "",
-                                       var displayName: String = "",
-                                       var shortDescription: String = "",
-                                       var avatarUrl: String = "",
-                                       var roomIds: RealmList<String> = RealmList(),
-                                       var userIds: RealmList<String> = RealmList()
+internal open class GroupSummaryEntity(
+        @PrimaryKey var groupId: String = "",
+        var displayName: String = "",
+        var shortDescription: String = "",
+        var avatarUrl: String = "",
+        var roomIds: RealmList<String> = RealmList(),
+        var userIds: RealmList<String> = RealmList()
 ) : RealmObject() {
 
     private var membershipStr: String = Membership.NONE.name
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadReceiptEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadReceiptEntity.kt
index e01d849cc2..9623c95359 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadReceiptEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadReceiptEntity.kt
@@ -21,11 +21,12 @@ import io.realm.RealmResults
 import io.realm.annotations.LinkingObjects
 import io.realm.annotations.PrimaryKey
 
-internal open class ReadReceiptEntity(@PrimaryKey var primaryKey: String = "",
-                                      var eventId: String = "",
-                                      var roomId: String = "",
-                                      var userId: String = "",
-                                      var originServerTs: Double = 0.0
+internal open class ReadReceiptEntity(
+        @PrimaryKey var primaryKey: String = "",
+        var eventId: String = "",
+        var roomId: String = "",
+        var userId: String = "",
+        var originServerTs: Double = 0.0
 ) : RealmObject() {
     companion object
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomEntity.kt
index d8e6b8af0f..d2116fa9b8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomEntity.kt
@@ -24,11 +24,12 @@ import org.matrix.android.sdk.internal.database.model.threads.ThreadSummaryEntit
 import org.matrix.android.sdk.internal.database.query.findRootOrLatest
 import org.matrix.android.sdk.internal.extensions.assertIsManaged
 
-internal open class RoomEntity(@PrimaryKey var roomId: String = "",
-                               var chunks: RealmList<ChunkEntity> = RealmList(),
-                               var sendingTimelineEvents: RealmList<TimelineEventEntity> = RealmList(),
-                               var threadSummaries: RealmList<ThreadSummaryEntity> = RealmList(),
-                               var accountData: RealmList<RoomAccountDataEntity> = RealmList()
+internal open class RoomEntity(
+        @PrimaryKey var roomId: String = "",
+        var chunks: RealmList<ChunkEntity> = RealmList(),
+        var sendingTimelineEvents: RealmList<TimelineEventEntity> = RealmList(),
+        var threadSummaries: RealmList<ThreadSummaryEntity> = RealmList(),
+        var accountData: RealmList<RoomAccountDataEntity> = RealmList()
 ) : RealmObject() {
 
     private var membershipStr: String = Membership.NONE.name
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomMemberSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomMemberSummaryEntity.kt
index a8a76d1681..6fb9324fcd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomMemberSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomMemberSummaryEntity.kt
@@ -23,13 +23,14 @@ import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.util.MatrixItem
 import org.matrix.android.sdk.internal.database.model.presence.UserPresenceEntity
 
-internal open class RoomMemberSummaryEntity(@PrimaryKey var primaryKey: String = "",
-                                            @Index var userId: String = "",
-                                            @Index var roomId: String = "",
-                                            @Index var displayName: String? = null,
-                                            var avatarUrl: String? = null,
-                                            var reason: String? = null,
-                                            var isDirect: Boolean = false
+internal open class RoomMemberSummaryEntity(
+        @PrimaryKey var primaryKey: String = "",
+        @Index var userId: String = "",
+        @Index var roomId: String = "",
+        @Index var displayName: String? = null,
+        var avatarUrl: String? = null,
+        var reason: String? = null,
+        var isDirect: Boolean = false
 ) : RealmObject() {
 
     private var membershipStr: String = Membership.NONE.name
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SyncEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SyncEntity.kt
index a82ec41456..ff261b80c1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SyncEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SyncEntity.kt
@@ -19,6 +19,7 @@ package org.matrix.android.sdk.internal.database.model
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 
-internal open class SyncEntity(var nextBatch: String? = null,
-                               @PrimaryKey var id: Long = 0
+internal open class SyncEntity(
+        var nextBatch: String? = null,
+        @PrimaryKey var id: Long = 0
 ) : RealmObject()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/TimelineEventEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/TimelineEventEntity.kt
index 477c04fe51..c8f22dc2cc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/TimelineEventEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/TimelineEventEntity.kt
@@ -22,20 +22,21 @@ import io.realm.annotations.Index
 import io.realm.annotations.LinkingObjects
 import org.matrix.android.sdk.internal.extensions.assertIsManaged
 
-internal open class TimelineEventEntity(var localId: Long = 0,
-                                        @Index var eventId: String = "",
-                                        @Index var roomId: String = "",
-                                        @Index var displayIndex: Int = 0,
-                                        var root: EventEntity? = null,
-                                        var annotations: EventAnnotationsSummaryEntity? = null,
-                                        var senderName: String? = null,
-                                        var isUniqueDisplayName: Boolean = false,
-                                        var senderAvatar: String? = null,
-                                        var senderMembershipEventId: String? = null,
+internal open class TimelineEventEntity(
+        var localId: Long = 0,
+        @Index var eventId: String = "",
+        @Index var roomId: String = "",
+        @Index var displayIndex: Int = 0,
+        var root: EventEntity? = null,
+        var annotations: EventAnnotationsSummaryEntity? = null,
+        var senderName: String? = null,
+        var isUniqueDisplayName: Boolean = false,
+        var senderAvatar: String? = null,
+        var senderMembershipEventId: String? = null,
         // ownedByThreadChunk indicates that the current TimelineEventEntity belongs
         // to a thread chunk and is a temporarily event.
-                                        var ownedByThreadChunk: Boolean = false,
-                                        var readReceipts: ReadReceiptsSummaryEntity? = null
+        var ownedByThreadChunk: Boolean = false,
+        var readReceipts: ReadReceiptsSummaryEntity? = null
 ) : RealmObject() {
 
     @LinkingObjects("timelineEvents")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserDraftsEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserDraftsEntity.kt
index 2c778f9797..7ccfc6b104 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserDraftsEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserDraftsEntity.kt
@@ -24,7 +24,8 @@ import io.realm.annotations.LinkingObjects
 /**
  * Create a specific table to be able to do direct query on it and keep the draft ordered.
  */
-internal open class UserDraftsEntity(var userDrafts: RealmList<DraftEntity> = RealmList()
+internal open class UserDraftsEntity(
+        var userDrafts: RealmList<DraftEntity> = RealmList()
 ) : RealmObject() {
 
     // Link to RoomSummaryEntity
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserEntity.kt
index bd6e73582d..3644d12ac9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserEntity.kt
@@ -19,9 +19,10 @@ package org.matrix.android.sdk.internal.database.model
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 
-internal open class UserEntity(@PrimaryKey var userId: String = "",
-                               var displayName: String = "",
-                               var avatarUrl: String = ""
+internal open class UserEntity(
+        @PrimaryKey var userId: String = "",
+        var displayName: String = "",
+        var avatarUrl: String = ""
 ) : RealmObject() {
 
     companion object
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/livelocation/LiveLocationShareAggregatedSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/livelocation/LiveLocationShareAggregatedSummaryEntity.kt
index 4d0d2c5c64..c5df8e9338 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/livelocation/LiveLocationShareAggregatedSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/livelocation/LiveLocationShareAggregatedSummaryEntity.kt
@@ -31,6 +31,11 @@ internal open class LiveLocationShareAggregatedSummaryEntity(
 
         var roomId: String = "",
 
+        var userId: String = "",
+
+        /**
+         * Indicate whether the live is currently running.
+         */
         var isActive: Boolean? = null,
 
         var endOfLiveTimestampMillis: Long? = null,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/presence/UserPresenceEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/presence/UserPresenceEntity.kt
index 5713337ec5..8d808417c2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/presence/UserPresenceEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/presence/UserPresenceEntity.kt
@@ -21,12 +21,13 @@ import io.realm.annotations.PrimaryKey
 import org.matrix.android.sdk.api.session.presence.model.PresenceEnum
 import org.matrix.android.sdk.api.session.presence.model.UserPresence
 
-internal open class UserPresenceEntity(@PrimaryKey var userId: String = "",
-                                       var lastActiveAgo: Long? = null,
-                                       var statusMessage: String? = null,
-                                       var isCurrentlyActive: Boolean? = null,
-                                       var avatarUrl: String? = null,
-                                       var displayName: String? = null
+internal open class UserPresenceEntity(
+        @PrimaryKey var userId: String = "",
+        var lastActiveAgo: Long? = null,
+        var statusMessage: String? = null,
+        var isCurrentlyActive: Boolean? = null,
+        var avatarUrl: String? = null,
+        var displayName: String? = null
 ) : RealmObject() {
 
     var presence: PresenceEnum
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/threads/ThreadSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/threads/ThreadSummaryEntity.kt
index ab9d66548e..45f9e3aa20 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/threads/ThreadSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/threads/ThreadSummaryEntity.kt
@@ -23,17 +23,18 @@ import io.realm.annotations.LinkingObjects
 import org.matrix.android.sdk.internal.database.model.EventEntity
 import org.matrix.android.sdk.internal.database.model.RoomEntity
 
-internal open class ThreadSummaryEntity(@Index var rootThreadEventId: String? = "",
-                                        var rootThreadEventEntity: EventEntity? = null,
-                                        var latestThreadEventEntity: EventEntity? = null,
-                                        var rootThreadSenderName: String? = null,
-                                        var latestThreadSenderName: String? = null,
-                                        var rootThreadSenderAvatar: String? = null,
-                                        var latestThreadSenderAvatar: String? = null,
-                                        var rootThreadIsUniqueDisplayName: Boolean = false,
-                                        var isUserParticipating: Boolean = false,
-                                        var latestThreadIsUniqueDisplayName: Boolean = false,
-                                        var numberOfThreads: Int = 0
+internal open class ThreadSummaryEntity(
+        @Index var rootThreadEventId: String? = "",
+        var rootThreadEventEntity: EventEntity? = null,
+        var latestThreadEventEntity: EventEntity? = null,
+        var rootThreadSenderName: String? = null,
+        var latestThreadSenderName: String? = null,
+        var rootThreadSenderAvatar: String? = null,
+        var latestThreadSenderAvatar: String? = null,
+        var rootThreadIsUniqueDisplayName: Boolean = false,
+        var isUserParticipating: Boolean = false,
+        var latestThreadIsUniqueDisplayName: Boolean = false,
+        var numberOfThreads: Int = 0
 ) : RealmObject() {
 
     @LinkingObjects("threadSummaries")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/CurrentStateEventEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/CurrentStateEventEntityQueries.kt
index 716783f2ba..e0dbf2eee8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/CurrentStateEventEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/CurrentStateEventEntityQueries.kt
@@ -23,40 +23,50 @@ import io.realm.kotlin.createObject
 import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntity
 import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntityFields
 
-internal fun CurrentStateEventEntity.Companion.whereType(realm: Realm,
-                                                         roomId: String,
-                                                         type: String): RealmQuery<CurrentStateEventEntity> {
+internal fun CurrentStateEventEntity.Companion.whereType(
+        realm: Realm,
+        roomId: String,
+        type: String
+): RealmQuery<CurrentStateEventEntity> {
     return realm.where(CurrentStateEventEntity::class.java)
             .equalTo(CurrentStateEventEntityFields.ROOM_ID, roomId)
             .equalTo(CurrentStateEventEntityFields.TYPE, type)
 }
 
-internal fun CurrentStateEventEntity.Companion.whereStateKey(realm: Realm,
-                                                             roomId: String,
-                                                             type: String,
-                                                             stateKey: String): RealmQuery<CurrentStateEventEntity> {
+internal fun CurrentStateEventEntity.Companion.whereStateKey(
+        realm: Realm,
+        roomId: String,
+        type: String,
+        stateKey: String
+): RealmQuery<CurrentStateEventEntity> {
     return whereType(realm = realm, roomId = roomId, type = type)
             .equalTo(CurrentStateEventEntityFields.STATE_KEY, stateKey)
 }
 
-internal fun CurrentStateEventEntity.Companion.getOrNull(realm: Realm,
-                                                         roomId: String,
-                                                         stateKey: String,
-                                                         type: String): CurrentStateEventEntity? {
+internal fun CurrentStateEventEntity.Companion.getOrNull(
+        realm: Realm,
+        roomId: String,
+        stateKey: String,
+        type: String
+): CurrentStateEventEntity? {
     return whereStateKey(realm = realm, roomId = roomId, type = type, stateKey = stateKey).findFirst()
 }
 
-internal fun CurrentStateEventEntity.Companion.getOrCreate(realm: Realm,
-                                                           roomId: String,
-                                                           stateKey: String,
-                                                           type: String): CurrentStateEventEntity {
+internal fun CurrentStateEventEntity.Companion.getOrCreate(
+        realm: Realm,
+        roomId: String,
+        stateKey: String,
+        type: String
+): CurrentStateEventEntity {
     return getOrNull(realm = realm, roomId = roomId, stateKey = stateKey, type = type) ?: create(realm, roomId, stateKey, type)
 }
 
-private fun create(realm: Realm,
-                   roomId: String,
-                   stateKey: String,
-                   type: String): CurrentStateEventEntity {
+private fun create(
+        realm: Realm,
+        roomId: String,
+        stateKey: String,
+        type: String
+): CurrentStateEventEntity {
     return realm.createObject<CurrentStateEventEntity>().apply {
         this.type = type
         this.roomId = roomId
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventEntityQueries.kt
index f7fa1037ba..0f1c226044 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventEntityQueries.kt
@@ -59,9 +59,10 @@ internal fun EventEntity.Companion.where(realm: Realm, eventIds: List<String>):
             .`in`(EventEntityFields.EVENT_ID, eventIds.toTypedArray())
 }
 
-internal fun EventEntity.Companion.whereType(realm: Realm,
-                                             type: String,
-                                             roomId: String? = null
+internal fun EventEntity.Companion.whereType(
+        realm: Realm,
+        type: String,
+        roomId: String? = null
 ): RealmQuery<EventEntity> {
     val query = realm.where<EventEntity>()
     if (roomId != null) {
@@ -70,9 +71,11 @@ internal fun EventEntity.Companion.whereType(realm: Realm,
     return query.equalTo(EventEntityFields.TYPE, type)
 }
 
-internal fun EventEntity.Companion.whereTypes(realm: Realm,
-                                              typeList: List<String> = emptyList(),
-                                              roomId: String? = null): RealmQuery<EventEntity> {
+internal fun EventEntity.Companion.whereTypes(
+        realm: Realm,
+        typeList: List<String> = emptyList(),
+        roomId: String? = null
+): RealmQuery<EventEntity> {
     val query = realm.where<EventEntity>()
     query.`in`(EventEntityFields.TYPE, typeList.toTypedArray())
     if (roomId != null) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/LiveLocationShareAggregatedSummaryEntityQuery.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/LiveLocationShareAggregatedSummaryEntityQuery.kt
index 2e2e939fa2..0cc41413f6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/LiveLocationShareAggregatedSummaryEntityQuery.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/LiveLocationShareAggregatedSummaryEntityQuery.kt
@@ -28,9 +28,15 @@ internal fun LiveLocationShareAggregatedSummaryEntity.Companion.where(
         roomId: String,
         eventId: String,
 ): RealmQuery<LiveLocationShareAggregatedSummaryEntity> {
+    return LiveLocationShareAggregatedSummaryEntity
+            .whereRoomId(realm, roomId = roomId)
+            .equalTo(LiveLocationShareAggregatedSummaryEntityFields.EVENT_ID, eventId)
+}
+
+internal fun LiveLocationShareAggregatedSummaryEntity.Companion.whereRoomId(realm: Realm,
+                                                                            roomId: String): RealmQuery<LiveLocationShareAggregatedSummaryEntity> {
     return realm.where<LiveLocationShareAggregatedSummaryEntity>()
             .equalTo(LiveLocationShareAggregatedSummaryEntityFields.ROOM_ID, roomId)
-            .equalTo(LiveLocationShareAggregatedSummaryEntityFields.EVENT_ID, eventId)
 }
 
 internal fun LiveLocationShareAggregatedSummaryEntity.Companion.create(
@@ -55,3 +61,39 @@ internal fun LiveLocationShareAggregatedSummaryEntity.Companion.getOrCreate(
     return LiveLocationShareAggregatedSummaryEntity.where(realm, roomId, eventId).findFirst()
             ?: LiveLocationShareAggregatedSummaryEntity.create(realm, roomId, eventId)
 }
+
+internal fun LiveLocationShareAggregatedSummaryEntity.Companion.get(
+        realm: Realm,
+        roomId: String,
+        eventId: String,
+): LiveLocationShareAggregatedSummaryEntity? {
+    return LiveLocationShareAggregatedSummaryEntity.where(realm, roomId, eventId).findFirst()
+}
+
+internal fun LiveLocationShareAggregatedSummaryEntity.Companion.findActiveLiveInRoomForUser(
+        realm: Realm,
+        roomId: String,
+        userId: String,
+        ignoredEventId: String
+): List<LiveLocationShareAggregatedSummaryEntity> {
+    return LiveLocationShareAggregatedSummaryEntity
+            .whereRoomId(realm, roomId = roomId)
+            .equalTo(LiveLocationShareAggregatedSummaryEntityFields.USER_ID, userId)
+            .equalTo(LiveLocationShareAggregatedSummaryEntityFields.IS_ACTIVE, true)
+            .notEqualTo(LiveLocationShareAggregatedSummaryEntityFields.EVENT_ID, ignoredEventId)
+            .findAll()
+}
+
+/**
+ * A live is considered as running when active and with at least a last known location.
+ */
+internal fun LiveLocationShareAggregatedSummaryEntity.Companion.findRunningLiveInRoom(
+        realm: Realm,
+        roomId: String,
+): RealmQuery<LiveLocationShareAggregatedSummaryEntity> {
+    return LiveLocationShareAggregatedSummaryEntity
+            .whereRoomId(realm, roomId = roomId)
+            .equalTo(LiveLocationShareAggregatedSummaryEntityFields.IS_ACTIVE, true)
+            .isNotEmpty(LiveLocationShareAggregatedSummaryEntityFields.USER_ID)
+            .isNotNull(LiveLocationShareAggregatedSummaryEntityFields.LAST_LOCATION_CONTENT)
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/PushersQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/PushersQueries.kt
index 3cea19a690..67fd8296d5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/PushersQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/PushersQueries.kt
@@ -26,8 +26,10 @@ import org.matrix.android.sdk.internal.database.model.PushRulesEntityFields
 import org.matrix.android.sdk.internal.database.model.PusherEntity
 import org.matrix.android.sdk.internal.database.model.PusherEntityFields
 
-internal fun PusherEntity.Companion.where(realm: Realm,
-                                          pushKey: String? = null): RealmQuery<PusherEntity> {
+internal fun PusherEntity.Companion.where(
+        realm: Realm,
+        pushKey: String? = null
+): RealmQuery<PusherEntity> {
     return realm.where<PusherEntity>()
             .apply {
                 if (pushKey != null) {
@@ -36,17 +38,21 @@ internal fun PusherEntity.Companion.where(realm: Realm,
             }
 }
 
-internal fun PushRulesEntity.Companion.where(realm: Realm,
-                                             scope: String,
-                                             kind: RuleKind): RealmQuery<PushRulesEntity> {
+internal fun PushRulesEntity.Companion.where(
+        realm: Realm,
+        scope: String,
+        kind: RuleKind
+): RealmQuery<PushRulesEntity> {
     return realm.where<PushRulesEntity>()
             .equalTo(PushRulesEntityFields.SCOPE, scope)
             .equalTo(PushRulesEntityFields.KIND_STR, kind.name)
 }
 
-internal fun PushRuleEntity.Companion.where(realm: Realm,
-                                            scope: String,
-                                            ruleId: String): RealmQuery<PushRuleEntity> {
+internal fun PushRuleEntity.Companion.where(
+        realm: Realm,
+        scope: String,
+        ruleId: String
+): RealmQuery<PushRuleEntity> {
     return realm.where<PushRuleEntity>()
             .equalTo(PushRuleEntityFields.PARENT.SCOPE, scope)
             .equalTo(PushRuleEntityFields.RULE_ID, ruleId)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt
index 1a832a29bb..6d295cd2ea 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt
@@ -24,10 +24,12 @@ import org.matrix.android.sdk.internal.database.model.ReadMarkerEntity
 import org.matrix.android.sdk.internal.database.model.ReadReceiptEntity
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
 
-internal fun isEventRead(realmConfiguration: RealmConfiguration,
-                         userId: String?,
-                         roomId: String?,
-                         eventId: String?): Boolean {
+internal fun isEventRead(
+        realmConfiguration: RealmConfiguration,
+        userId: String?,
+        roomId: String?,
+        eventId: String?
+): Boolean {
     if (userId.isNullOrBlank() || roomId.isNullOrBlank() || eventId.isNullOrBlank()) {
         return false
     }
@@ -77,9 +79,11 @@ private fun Realm.hasReadReceiptInLatestChunk(latestChunkEntity: ChunkEntity, ro
     } != null
 }
 
-internal fun isReadMarkerMoreRecent(realmConfiguration: RealmConfiguration,
-                                    roomId: String?,
-                                    eventId: String?): Boolean {
+internal fun isReadMarkerMoreRecent(
+        realmConfiguration: RealmConfiguration,
+        roomId: String?,
+        eventId: String?
+): Boolean {
     if (roomId.isNullOrBlank() || eventId.isNullOrBlank()) {
         return false
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomSummaryEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomSummaryEntityQueries.kt
index 8993c36a30..3c8d61432a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomSummaryEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomSummaryEntityQueries.kt
@@ -53,8 +53,10 @@ internal fun RoomSummaryEntity.Companion.getOrNull(realm: Realm, roomId: String)
     return where(realm, roomId).findFirst()
 }
 
-internal fun RoomSummaryEntity.Companion.getDirectRooms(realm: Realm,
-                                                        excludeRoomIds: Set<String>? = null): RealmResults<RoomSummaryEntity> {
+internal fun RoomSummaryEntity.Companion.getDirectRooms(
+        realm: Realm,
+        excludeRoomIds: Set<String>? = null
+): RealmResults<RoomSummaryEntity> {
     return RoomSummaryEntity.where(realm)
             .equalTo(RoomSummaryEntityFields.IS_DIRECT, true)
             .apply {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt
index 1654a33806..30010f90fd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt
@@ -33,39 +33,49 @@ internal fun TimelineEventEntity.Companion.where(realm: Realm): RealmQuery<Timel
     return realm.where()
 }
 
-internal fun TimelineEventEntity.Companion.where(realm: Realm,
-                                                 roomId: String,
-                                                 eventId: String): RealmQuery<TimelineEventEntity> {
+internal fun TimelineEventEntity.Companion.where(
+        realm: Realm,
+        roomId: String,
+        eventId: String
+): RealmQuery<TimelineEventEntity> {
     return where(realm)
             .equalTo(TimelineEventEntityFields.ROOM_ID, roomId)
             .equalTo(TimelineEventEntityFields.EVENT_ID, eventId)
 }
 
-internal fun TimelineEventEntity.Companion.where(realm: Realm,
-                                                 roomId: String,
-                                                 eventIds: List<String>): RealmQuery<TimelineEventEntity> {
+internal fun TimelineEventEntity.Companion.where(
+        realm: Realm,
+        roomId: String,
+        eventIds: List<String>
+): RealmQuery<TimelineEventEntity> {
     return where(realm)
             .equalTo(TimelineEventEntityFields.ROOM_ID, roomId)
             .`in`(TimelineEventEntityFields.EVENT_ID, eventIds.toTypedArray())
 }
 
-internal fun TimelineEventEntity.Companion.whereRoomId(realm: Realm,
-                                                       roomId: String): RealmQuery<TimelineEventEntity> {
+internal fun TimelineEventEntity.Companion.whereRoomId(
+        realm: Realm,
+        roomId: String
+): RealmQuery<TimelineEventEntity> {
     return where(realm)
             .equalTo(TimelineEventEntityFields.ROOM_ID, roomId)
 }
 
-internal fun TimelineEventEntity.Companion.findWithSenderMembershipEvent(realm: Realm,
-                                                                         senderMembershipEventId: String): List<TimelineEventEntity> {
+internal fun TimelineEventEntity.Companion.findWithSenderMembershipEvent(
+        realm: Realm,
+        senderMembershipEventId: String
+): List<TimelineEventEntity> {
     return where(realm)
             .equalTo(TimelineEventEntityFields.SENDER_MEMBERSHIP_EVENT_ID, senderMembershipEventId)
             .findAll()
 }
 
-internal fun TimelineEventEntity.Companion.latestEvent(realm: Realm,
-                                                       roomId: String,
-                                                       includesSending: Boolean,
-                                                       filters: TimelineEventFilters = TimelineEventFilters()): TimelineEventEntity? {
+internal fun TimelineEventEntity.Companion.latestEvent(
+        realm: Realm,
+        roomId: String,
+        includesSending: Boolean,
+        filters: TimelineEventFilters = TimelineEventFilters()
+): TimelineEventEntity? {
     val roomEntity = RoomEntity.where(realm, roomId).findFirst() ?: return null
     val sendingTimelineEvents = roomEntity.sendingTimelineEvents.where().filterEvents(filters)
 
@@ -129,9 +139,11 @@ internal fun RealmList<TimelineEventEntity>.find(eventId: String): TimelineEvent
             .findFirst()
 }
 
-internal fun TimelineEventEntity.Companion.findAllInRoomWithSendStates(realm: Realm,
-                                                                       roomId: String,
-                                                                       sendStates: List<SendState>): RealmResults<TimelineEventEntity> {
+internal fun TimelineEventEntity.Companion.findAllInRoomWithSendStates(
+        realm: Realm,
+        roomId: String,
+        sendStates: List<SendState>
+): RealmResults<TimelineEventEntity> {
     return whereRoomId(realm, roomId)
             .filterSendStates(sendStates)
             .findAll()
@@ -145,8 +157,10 @@ internal fun RealmQuery<TimelineEventEntity>.filterSendStates(sendStates: List<S
 /**
  * Find all TimelineEventEntity items where sender is in senderIds collection, excluding state events.
  */
-internal fun TimelineEventEntity.Companion.findAllFrom(realm: Realm,
-                                                       senderIds: Collection<String>): RealmResults<TimelineEventEntity> {
+internal fun TimelineEventEntity.Companion.findAllFrom(
+        realm: Realm,
+        senderIds: Collection<String>
+): RealmResults<TimelineEventEntity> {
     return where(realm)
             .`in`(TimelineEventEntityFields.ROOT.SENDER, senderIds.toTypedArray())
             .isNull(TimelineEventEntityFields.ROOT.STATE_KEY)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixComponent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixComponent.kt
index dbc6aac6b5..095916643c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixComponent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixComponent.kt
@@ -100,7 +100,9 @@ internal interface MatrixComponent {
 
     @Component.Factory
     interface Factory {
-        fun create(@BindsInstance context: Context,
-                   @BindsInstance matrixConfiguration: MatrixConfiguration): MatrixComponent
+        fun create(
+                @BindsInstance context: Context,
+                @BindsInstance matrixConfiguration: MatrixConfiguration
+        ): MatrixComponent
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt
index 0cbbe1210d..862cf463b2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt
@@ -62,13 +62,15 @@ internal object NetworkModule {
     @Provides
     @JvmStatic
     @Unauthenticated
-    fun providesOkHttpClient(matrixConfiguration: MatrixConfiguration,
-                             stethoInterceptor: StethoInterceptor,
-                             timeoutInterceptor: TimeOutInterceptor,
-                             userAgentInterceptor: UserAgentInterceptor,
-                             httpLoggingInterceptor: HttpLoggingInterceptor,
-                             curlLoggingInterceptor: CurlLoggingInterceptor,
-                             apiInterceptor: ApiInterceptor): OkHttpClient {
+    fun providesOkHttpClient(
+            matrixConfiguration: MatrixConfiguration,
+            stethoInterceptor: StethoInterceptor,
+            timeoutInterceptor: TimeOutInterceptor,
+            userAgentInterceptor: UserAgentInterceptor,
+            httpLoggingInterceptor: HttpLoggingInterceptor,
+            curlLoggingInterceptor: CurlLoggingInterceptor,
+            apiInterceptor: ApiInterceptor
+    ): OkHttpClient {
         val spec = ConnectionSpec.Builder(matrixConfiguration.connectionSpec).build()
 
         return OkHttpClient.Builder()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt
index c59936af94..ad28286a84 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt
@@ -59,8 +59,10 @@ internal class WorkManagerProvider @Inject constructor(
     /**
      * Create a PeriodicWorkRequestBuilder, with the Matrix SDK tag.
      */
-    inline fun <reified W : ListenableWorker> matrixPeriodicWorkRequestBuilder(repeatInterval: Long,
-                                                                               repeatIntervalTimeUnit: TimeUnit) =
+    inline fun <reified W : ListenableWorker> matrixPeriodicWorkRequestBuilder(
+            repeatInterval: Long,
+            repeatIntervalTimeUnit: TimeUnit
+    ) =
             PeriodicWorkRequestBuilder<W>(repeatInterval, repeatIntervalTimeUnit)
                     .addTag(tag)
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/FederationModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/FederationModule.kt
index a4eef80c58..bbb29b6255 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/FederationModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/FederationModule.kt
@@ -34,9 +34,11 @@ internal abstract class FederationModule {
     companion object {
         @Provides
         @JvmStatic
-        fun providesFederationAPI(@Unauthenticated okHttpClient: Lazy<OkHttpClient>,
-                                  sessionParams: SessionParams,
-                                  retrofitFactory: RetrofitFactory): FederationAPI {
+        fun providesFederationAPI(
+                @Unauthenticated okHttpClient: Lazy<OkHttpClient>,
+                sessionParams: SessionParams,
+                retrofitFactory: RetrofitFactory
+        ): FederationAPI {
             return retrofitFactory.create(okHttpClient, sessionParams.homeServerUrlBase)
                     .create(FederationAPI::class.java)
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/DefaultLegacySessionImporter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/DefaultLegacySessionImporter.kt
index 0a76fb2eef..56d9cc2143 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/DefaultLegacySessionImporter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/DefaultLegacySessionImporter.kt
@@ -132,7 +132,7 @@ internal class DefaultLegacySessionImporter @Inject constructor(
                                     bytes = it.bytes,
                                     hashType = when (it.type) {
                                         LegacyFingerprint.HashType.SHA1,
-                                        null                              -> Fingerprint.HashType.SHA1
+                                        null -> Fingerprint.HashType.SHA1
                                         LegacyFingerprint.HashType.SHA256 -> Fingerprint.HashType.SHA256
                                     }
                             )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkCallbackStrategy.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkCallbackStrategy.kt
index 8e18d2d850..f75fb01746 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkCallbackStrategy.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkCallbackStrategy.kt
@@ -31,8 +31,10 @@ internal interface NetworkCallbackStrategy {
     fun unregister()
 }
 
-internal class FallbackNetworkCallbackStrategy @Inject constructor(private val context: Context,
-                                                                   private val networkInfoReceiver: NetworkInfoReceiver) : NetworkCallbackStrategy {
+internal class FallbackNetworkCallbackStrategy @Inject constructor(
+        private val context: Context,
+        private val networkInfoReceiver: NetworkInfoReceiver
+) : NetworkCallbackStrategy {
 
     @Suppress("DEPRECATION")
     val filter = IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConnectivityChecker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConnectivityChecker.kt
index 65bf3fcadf..c54227a786 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConnectivityChecker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConnectivityChecker.kt
@@ -41,9 +41,11 @@ internal interface NetworkConnectivityChecker {
 }
 
 @SessionScope
-internal class DefaultNetworkConnectivityChecker @Inject constructor(private val homeServerPinger: HomeServerPinger,
-                                                                     private val backgroundDetectionObserver: BackgroundDetectionObserver,
-                                                                     private val networkCallbackStrategy: NetworkCallbackStrategy) :
+internal class DefaultNetworkConnectivityChecker @Inject constructor(
+        private val homeServerPinger: HomeServerPinger,
+        private val backgroundDetectionObserver: BackgroundDetectionObserver,
+        private val networkCallbackStrategy: NetworkCallbackStrategy
+) :
         NetworkConnectivityChecker {
 
     private val hasInternetAccess = AtomicBoolean(true)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ProgressRequestBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ProgressRequestBody.kt
index 818d7d6af3..6e4d064a0f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ProgressRequestBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ProgressRequestBody.kt
@@ -26,8 +26,10 @@ import okio.buffer
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import java.io.IOException
 
-internal class ProgressRequestBody(private val delegate: RequestBody,
-                                   private val listener: Listener) : RequestBody() {
+internal class ProgressRequestBody(
+        private val delegate: RequestBody,
+        private val listener: Listener
+) : RequestBody() {
 
     private lateinit var countingSink: CountingSink
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
index 87a98e03f6..565111b9ab 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
@@ -40,11 +40,13 @@ import java.io.IOException
  * @param maxRetriesCount the max number of retries
  * @param requestBlock a suspend lambda to perform the network request
  */
-internal suspend inline fun <DATA> executeRequest(globalErrorReceiver: GlobalErrorReceiver?,
-                                                  canRetry: Boolean = false,
-                                                  maxDelayBeforeRetry: Long = 32_000L,
-                                                  maxRetriesCount: Int = 4,
-                                                  noinline requestBlock: suspend () -> DATA): DATA {
+internal suspend inline fun <DATA> executeRequest(
+        globalErrorReceiver: GlobalErrorReceiver?,
+        canRetry: Boolean = false,
+        maxDelayBeforeRetry: Long = 32_000L,
+        maxRetriesCount: Int = 4,
+        noinline requestBlock: suspend () -> DATA
+): DATA {
     var currentRetryCount = 0
     var currentDelay = 1_000L
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RequestExecutor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RequestExecutor.kt
index 71df7c08be..2e8b2bc771 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RequestExecutor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RequestExecutor.kt
@@ -19,19 +19,23 @@ package org.matrix.android.sdk.internal.network
 import org.matrix.android.sdk.internal.network.executeRequest as internalExecuteRequest
 
 internal interface RequestExecutor {
-    suspend fun <DATA> executeRequest(globalErrorReceiver: GlobalErrorReceiver?,
-                                      canRetry: Boolean = false,
-                                      maxDelayBeforeRetry: Long = 32_000L,
-                                      maxRetriesCount: Int = 4,
-                                      requestBlock: suspend () -> DATA): DATA
+    suspend fun <DATA> executeRequest(
+            globalErrorReceiver: GlobalErrorReceiver?,
+            canRetry: Boolean = false,
+            maxDelayBeforeRetry: Long = 32_000L,
+            maxRetriesCount: Int = 4,
+            requestBlock: suspend () -> DATA
+    ): DATA
 }
 
 internal object DefaultRequestExecutor : RequestExecutor {
-    override suspend fun <DATA> executeRequest(globalErrorReceiver: GlobalErrorReceiver?,
-                                               canRetry: Boolean,
-                                               maxDelayBeforeRetry: Long,
-                                               maxRetriesCount: Int,
-                                               requestBlock: suspend () -> DATA): DATA {
+    override suspend fun <DATA> executeRequest(
+            globalErrorReceiver: GlobalErrorReceiver?,
+            canRetry: Boolean,
+            maxDelayBeforeRetry: Long,
+            maxRetriesCount: Int,
+            requestBlock: suspend () -> DATA
+    ): DATA {
         return internalExecuteRequest(globalErrorReceiver, canRetry, maxDelayBeforeRetry, maxRetriesCount, requestBlock)
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UnitConverterFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UnitConverterFactory.kt
index f2571ab73f..8dcff59cba 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UnitConverterFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UnitConverterFactory.kt
@@ -22,8 +22,10 @@ import retrofit2.Retrofit
 import java.lang.reflect.Type
 
 internal object UnitConverterFactory : Converter.Factory() {
-    override fun responseBodyConverter(type: Type, annotations: Array<out Annotation>,
-                                       retrofit: Retrofit): Converter<ResponseBody, *>? {
+    override fun responseBodyConverter(
+            type: Type, annotations: Array<out Annotation>,
+            retrofit: Retrofit
+    ): Converter<ResponseBody, *>? {
         return if (type == Unit::class.java) UnitConverter else null
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UserAgentHolder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UserAgentHolder.kt
index 00e15c283e..28d96dfce7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UserAgentHolder.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UserAgentHolder.kt
@@ -24,8 +24,10 @@ import timber.log.Timber
 import javax.inject.Inject
 
 @MatrixScope
-internal class UserAgentHolder @Inject constructor(private val context: Context,
-                                                   matrixConfiguration: MatrixConfiguration) {
+internal class UserAgentHolder @Inject constructor(
+        private val context: Context,
+        matrixConfiguration: MatrixConfiguration
+) {
 
     var userAgent: String = ""
         private set
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/RuntimeJsonAdapterFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/RuntimeJsonAdapterFactory.kt
index dd41b9f6fc..7cf3603cc5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/RuntimeJsonAdapterFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/RuntimeJsonAdapterFactory.kt
@@ -70,11 +70,13 @@ internal class RuntimeJsonAdapterFactory<T>(
     }
 
     @Suppress("UNCHECKED_CAST")
-    internal class RuntimeJsonAdapter(val labelKey: String,
-                                      val labelToAdapter: Map<String, JsonAdapter<Any>>,
-                                      val typeToLabel: Map<Type, String>,
-                                      val objectJsonAdapter: JsonAdapter<Any>,
-                                      val fallbackAdapter: JsonAdapter<Any>) : JsonAdapter<Any?>() {
+    internal class RuntimeJsonAdapter(
+            val labelKey: String,
+            val labelToAdapter: Map<String, JsonAdapter<Any>>,
+            val typeToLabel: Map<Type, String>,
+            val objectJsonAdapter: JsonAdapter<Any>,
+            val fallbackAdapter: JsonAdapter<Any>
+    ) : JsonAdapter<Any?>() {
         @Throws(IOException::class)
         override fun fromJson(reader: JsonReader): Any? {
             val peekedToken = reader.peek()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManager.kt
index 539570cdd9..1b957c3855 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManager.kt
@@ -29,8 +29,10 @@ import javax.net.ssl.X509TrustManager
  * @property defaultTrustManager Optional trust manager to fall back on if cert does not match
  * any of the fingerprints. Can be null.
  */
-internal class PinnedTrustManager(private val fingerprints: List<Fingerprint>,
-                                  private val defaultTrustManager: X509TrustManager?) : X509TrustManager {
+internal class PinnedTrustManager(
+        private val fingerprints: List<Fingerprint>,
+        private val defaultTrustManager: X509TrustManager?
+) : X509TrustManager {
 
     @Throws(CertificateException::class)
     override fun checkClientTrusted(chain: Array<X509Certificate>, s: String) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManagerApi24.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManagerApi24.kt
index 191bb90a67..ef703f3b61 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManagerApi24.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManagerApi24.kt
@@ -34,8 +34,10 @@ import javax.net.ssl.X509ExtendedTrustManager
  * any of the fingerprints. Can be null.
  */
 @RequiresApi(Build.VERSION_CODES.N)
-internal class PinnedTrustManagerApi24(private val fingerprints: List<Fingerprint>,
-                                       private val defaultTrustManager: X509ExtendedTrustManager?) : X509ExtendedTrustManager() {
+internal class PinnedTrustManagerApi24(
+        private val fingerprints: List<Fingerprint>,
+        private val defaultTrustManager: X509ExtendedTrustManager?
+) : X509ExtendedTrustManager() {
 
     @Throws(CertificateException::class)
     override fun checkClientTrusted(chain: Array<X509Certificate>, authType: String, engine: SSLEngine?) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManagerProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManagerProvider.kt
index f01ee7af24..bfdc4e537e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManagerProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManagerProvider.kt
@@ -25,8 +25,10 @@ internal object PinnedTrustManagerProvider {
     // Set to false to perform some tests
     private const val USE_DEFAULT_TRUST_MANAGER = true
 
-    fun provide(fingerprints: List<Fingerprint>?,
-                defaultTrustManager: X509TrustManager?): X509TrustManager {
+    fun provide(
+            fingerprints: List<Fingerprint>?,
+            defaultTrustManager: X509TrustManager?
+    ): X509TrustManager {
         return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && defaultTrustManager is X509ExtendedTrustManager) {
             PinnedTrustManagerApi24(
                     fingerprints.orEmpty(),
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawModule.kt
index a830976671..4b643f1fef 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawModule.kt
@@ -51,8 +51,10 @@ internal abstract class RawModule {
         @Provides
         @GlobalDatabase
         @MatrixScope
-        fun providesRealmConfiguration(realmKeysUtils: RealmKeysUtils,
-                                       globalRealmMigration: GlobalRealmMigration): RealmConfiguration {
+        fun providesRealmConfiguration(
+                realmKeysUtils: RealmKeysUtils,
+                globalRealmMigration: GlobalRealmMigration
+        ): RealmConfiguration {
             return RealmConfiguration.Builder()
                     .apply {
                         realmKeysUtils.configureEncryption(this, DB_ALIAS)
@@ -67,8 +69,10 @@ internal abstract class RawModule {
 
         @Provides
         @JvmStatic
-        fun providesRawAPI(@Unauthenticated okHttpClient: Lazy<OkHttpClient>,
-                           retrofitFactory: RetrofitFactory): RawAPI {
+        fun providesRawAPI(
+                @Unauthenticated okHttpClient: Lazy<OkHttpClient>,
+                retrofitFactory: RetrofitFactory
+        ): RawAPI {
             return retrofitFactory.create(okHttpClient, "https://example.org").create(RawAPI::class.java)
         }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
index 760aa41081..d3c51a7b7b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
@@ -80,10 +80,12 @@ internal class DefaultFileService @Inject constructor(
      * Download file in the cache folder, and eventually decrypt it.
      * TODO looks like files are copied 3 times
      */
-    override suspend fun downloadFile(fileName: String,
-                                      mimeType: String?,
-                                      url: String?,
-                                      elementToDecrypt: ElementToDecrypt?): File {
+    override suspend fun downloadFile(
+            fileName: String,
+            mimeType: String?,
+            url: String?,
+            elementToDecrypt: ElementToDecrypt?
+    ): File {
         url ?: throw IllegalArgumentException("url is null")
 
         Timber.v("## FileService downloadFile $url")
@@ -218,11 +220,13 @@ internal class DefaultFileService @Inject constructor(
         return result.getOrThrow()
     }
 
-    fun storeDataFor(mxcUrl: String,
-                     filename: String?,
-                     mimeType: String?,
-                     originalFile: File,
-                     encryptedFile: File?) {
+    fun storeDataFor(
+            mxcUrl: String,
+            filename: String?,
+            mimeType: String?,
+            originalFile: File,
+            encryptedFile: File?
+    ) {
         val files = getFiles(mxcUrl, filename, mimeType, encryptedFile != null)
         if (encryptedFile != null) {
             // We switch the two files here, original file it the decrypted file
@@ -256,10 +260,12 @@ internal class DefaultFileService @Inject constructor(
         }
     }
 
-    override fun isFileInCache(mxcUrl: String?,
-                               fileName: String,
-                               mimeType: String?,
-                               elementToDecrypt: ElementToDecrypt?): Boolean {
+    override fun isFileInCache(
+            mxcUrl: String?,
+            fileName: String,
+            mimeType: String?,
+            elementToDecrypt: ElementToDecrypt?
+    ): Boolean {
         return fileState(mxcUrl, fileName, mimeType, elementToDecrypt) is FileService.FileState.InCache
     }
 
@@ -272,10 +278,12 @@ internal class DefaultFileService @Inject constructor(
         fun getClearFile(): File = decryptedFile ?: file
     }
 
-    private fun getFiles(mxcUrl: String,
-                         fileName: String?,
-                         mimeType: String?,
-                         isEncrypted: Boolean): CachedFiles {
+    private fun getFiles(
+            mxcUrl: String,
+            fileName: String?,
+            mimeType: String?,
+            isEncrypted: Boolean
+    ): CachedFiles {
         val hashFolder = mxcUrl.md5()
         val safeFileName = safeFileName(fileName, mimeType)
         return if (isEncrypted) {
@@ -293,10 +301,12 @@ internal class DefaultFileService @Inject constructor(
         }
     }
 
-    override fun fileState(mxcUrl: String?,
-                           fileName: String,
-                           mimeType: String?,
-                           elementToDecrypt: ElementToDecrypt?): FileService.FileState {
+    override fun fileState(
+            mxcUrl: String?,
+            fileName: String,
+            mimeType: String?,
+            elementToDecrypt: ElementToDecrypt?
+    ): FileService.FileState {
         mxcUrl ?: return FileService.FileState.Unknown
         val files = getFiles(mxcUrl, fileName, mimeType, elementToDecrypt != null)
         if (files.file.exists()) {
@@ -314,10 +324,12 @@ internal class DefaultFileService @Inject constructor(
      * Use this URI and pass it to intent using flag Intent.FLAG_GRANT_READ_URI_PERMISSION
      * (if not other app won't be able to access it).
      */
-    override fun getTemporarySharableURI(mxcUrl: String?,
-                                         fileName: String,
-                                         mimeType: String?,
-                                         elementToDecrypt: ElementToDecrypt?): Uri? {
+    override fun getTemporarySharableURI(
+            mxcUrl: String?,
+            fileName: String,
+            mimeType: String?,
+            elementToDecrypt: ElementToDecrypt?
+    ): Uri? {
         mxcUrl ?: return null
         // this string could be extracted no?
         val authority = "${context.packageName}.mx-sdk.fileprovider"
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
index 5f77cfb23a..32269c9afd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
@@ -44,7 +44,6 @@ import org.matrix.android.sdk.api.session.file.FileService
 import org.matrix.android.sdk.api.session.group.GroupService
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilitiesService
 import org.matrix.android.sdk.api.session.identity.IdentityService
-import org.matrix.android.sdk.api.session.initsync.SyncStatusService
 import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerService
 import org.matrix.android.sdk.api.session.media.MediaService
 import org.matrix.android.sdk.api.session.openid.OpenIdService
@@ -61,6 +60,7 @@ import org.matrix.android.sdk.api.session.securestorage.SharedSecretStorageServi
 import org.matrix.android.sdk.api.session.signout.SignOutService
 import org.matrix.android.sdk.api.session.space.SpaceService
 import org.matrix.android.sdk.api.session.sync.FilterService
+import org.matrix.android.sdk.api.session.sync.SyncService
 import org.matrix.android.sdk.api.session.terms.TermsService
 import org.matrix.android.sdk.api.session.thirdparty.ThirdPartyService
 import org.matrix.android.sdk.api.session.typing.TypingUsersTracker
@@ -76,13 +76,8 @@ import org.matrix.android.sdk.internal.di.SessionId
 import org.matrix.android.sdk.internal.di.UnauthenticatedWithCertificate
 import org.matrix.android.sdk.internal.di.WorkManagerProvider
 import org.matrix.android.sdk.internal.network.GlobalErrorHandler
-import org.matrix.android.sdk.internal.session.sync.SyncTokenStore
-import org.matrix.android.sdk.internal.session.sync.job.SyncThread
-import org.matrix.android.sdk.internal.session.sync.job.SyncWorker
 import org.matrix.android.sdk.internal.util.createUIHandler
-import timber.log.Timber
 import javax.inject.Inject
-import javax.inject.Provider
 
 @SessionScope
 internal class DefaultSession @Inject constructor(
@@ -112,16 +107,14 @@ internal class DefaultSession @Inject constructor(
         private val permalinkService: Lazy<PermalinkService>,
         private val secureStorageService: Lazy<SecureStorageService>,
         private val profileService: Lazy<ProfileService>,
+        private val syncService: Lazy<SyncService>,
         private val mediaService: Lazy<MediaService>,
         private val widgetService: Lazy<WidgetService>,
-        private val syncThreadProvider: Provider<SyncThread>,
         private val contentUrlResolver: ContentUrlResolver,
-        private val syncTokenStore: SyncTokenStore,
         private val sessionParamsStore: SessionParamsStore,
         private val contentUploadProgressTracker: ContentUploadStateTracker,
         private val typingUsersTracker: TypingUsersTracker,
         private val contentDownloadStateTracker: ContentDownloadStateTracker,
-        private val syncStatusService: Lazy<SyncStatusService>,
         private val homeServerCapabilitiesService: Lazy<HomeServerCapabilitiesService>,
         private val accountDataService: Lazy<SessionAccountDataService>,
         private val sharedSecretStorageService: Lazy<SharedSecretStorageService>,
@@ -138,14 +131,11 @@ internal class DefaultSession @Inject constructor(
         private val toDeviceService: Lazy<ToDeviceService>,
         private val eventStreamService: Lazy<EventStreamService>,
         @UnauthenticatedWithCertificate
-        private val unauthenticatedWithCertificateOkHttpClient: Lazy<OkHttpClient>
+        private val unauthenticatedWithCertificateOkHttpClient: Lazy<OkHttpClient>,
+        private val sessionState: SessionState,
 ) : Session,
         GlobalErrorHandler.Listener {
 
-    private var isOpen = false
-
-    private var syncThread: SyncThread? = null
-
     private val uiHandler = createUIHandler()
 
     override val isOpenable: Boolean
@@ -153,8 +143,7 @@ internal class DefaultSession @Inject constructor(
 
     @MainThread
     override fun open() {
-        assert(!isOpen)
-        isOpen = true
+        sessionState.setIsOpen(true)
         globalErrorHandler.listener = this
         cryptoService.get().ensureDevice()
         uiHandler.post {
@@ -167,40 +156,9 @@ internal class DefaultSession @Inject constructor(
         }
     }
 
-    override fun requireBackgroundSync() {
-        SyncWorker.requireBackgroundSync(workManagerProvider, sessionId)
-    }
-
-    override fun startAutomaticBackgroundSync(timeOutInSeconds: Long, repeatDelayInSeconds: Long) {
-        SyncWorker.automaticallyBackgroundSync(workManagerProvider, sessionId, timeOutInSeconds, repeatDelayInSeconds)
-    }
-
-    override fun stopAnyBackgroundSync() {
-        SyncWorker.stopAnyBackgroundSync(workManagerProvider)
-    }
-
-    override fun startSync(fromForeground: Boolean) {
-        Timber.i("Starting sync thread")
-        assert(isOpen)
-        val localSyncThread = getSyncThread()
-        localSyncThread.setInitialForeground(fromForeground)
-        if (!localSyncThread.isAlive) {
-            localSyncThread.start()
-        } else {
-            localSyncThread.restart()
-            Timber.w("Attempt to start an already started thread")
-        }
-    }
-
-    override fun stopSync() {
-        assert(isOpen)
-        syncThread?.kill()
-        syncThread = null
-    }
-
     override fun close() {
-        assert(isOpen)
-        stopSync()
+        assert(sessionState.isOpen)
+        syncService.get().stopSync()
         // timelineEventDecryptor.destroy()
         uiHandler.post {
             lifecycleObservers.forEach { it.onSessionStopped(this) }
@@ -210,28 +168,12 @@ internal class DefaultSession @Inject constructor(
         }
         cryptoService.get().close()
         globalErrorHandler.listener = null
-        isOpen = false
-    }
-
-    override fun getSyncStateLive() = getSyncThread().liveState()
-
-    override fun syncFlow() = getSyncThread().syncFlow()
-
-    override fun getSyncState() = getSyncThread().currentState()
-
-    override fun hasAlreadySynced(): Boolean {
-        return syncTokenStore.getLastToken() != null
-    }
-
-    private fun getSyncThread(): SyncThread {
-        return syncThread ?: syncThreadProvider.get().also {
-            syncThread = it
-        }
+        sessionState.setIsOpen(false)
     }
 
     override suspend fun clearCache() {
-        stopSync()
-        stopAnyBackgroundSync()
+        syncService.get().stopSync()
+        syncService.get().stopAnyBackgroundSync()
         uiHandler.post {
             lifecycleObservers.forEach {
                 it.onClearCache(this)
@@ -271,7 +213,7 @@ internal class DefaultSession @Inject constructor(
     override fun pushersService(): PushersService = pushersService.get()
     override fun eventService(): EventService = eventService.get()
     override fun termsService(): TermsService = termsService.get()
-    override fun syncStatusService(): SyncStatusService = syncStatusService.get()
+    override fun syncService(): SyncService = syncService.get()
     override fun secureStorageService(): SecureStorageService = secureStorageService.get()
     override fun profileService(): ProfileService = profileService.get()
     override fun presenceService(): PresenceService = presenceService.get()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt
index 050480e6c9..f01451b688 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt
@@ -46,6 +46,7 @@ import org.matrix.android.sdk.internal.session.profile.ProfileModule
 import org.matrix.android.sdk.internal.session.pushers.AddPusherWorker
 import org.matrix.android.sdk.internal.session.pushers.PushersModule
 import org.matrix.android.sdk.internal.session.room.RoomModule
+import org.matrix.android.sdk.internal.session.room.aggregation.livelocation.DeactivateLiveLocationShareWorker
 import org.matrix.android.sdk.internal.session.room.send.MultipleEventSendingDispatcherWorker
 import org.matrix.android.sdk.internal.session.room.send.RedactEventWorker
 import org.matrix.android.sdk.internal.session.room.send.SendEventWorker
@@ -131,10 +132,13 @@ internal interface SessionComponent {
 
     fun inject(worker: UpdateTrustWorker)
 
+    fun inject(worker: DeactivateLiveLocationShareWorker)
+
     @Component.Factory
     interface Factory {
         fun create(
                 matrixComponent: MatrixComponent,
-                @BindsInstance sessionParams: SessionParams): SessionComponent
+                @BindsInstance sessionParams: SessionParams
+        ): SessionComponent
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
index 9208ff219b..2c2317de0d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
@@ -39,7 +39,6 @@ import org.matrix.android.sdk.api.session.ToDeviceService
 import org.matrix.android.sdk.api.session.accountdata.SessionAccountDataService
 import org.matrix.android.sdk.api.session.events.EventService
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilitiesService
-import org.matrix.android.sdk.api.session.initsync.SyncStatusService
 import org.matrix.android.sdk.api.session.openid.OpenIdService
 import org.matrix.android.sdk.api.session.permalinks.PermalinkService
 import org.matrix.android.sdk.api.session.securestorage.SecureStorageService
@@ -82,7 +81,6 @@ import org.matrix.android.sdk.internal.session.download.DownloadProgressIntercep
 import org.matrix.android.sdk.internal.session.events.DefaultEventService
 import org.matrix.android.sdk.internal.session.homeserver.DefaultHomeServerCapabilitiesService
 import org.matrix.android.sdk.internal.session.identity.DefaultIdentityService
-import org.matrix.android.sdk.internal.session.initsync.DefaultSyncStatusService
 import org.matrix.android.sdk.internal.session.integrationmanager.IntegrationManager
 import org.matrix.android.sdk.internal.session.openid.DefaultOpenIdService
 import org.matrix.android.sdk.internal.session.permalinks.DefaultPermalinkService
@@ -166,9 +164,11 @@ internal abstract class SessionModule {
         @Provides
         @SessionFilesDirectory
         @SessionScope
-        fun providesFilesDir(@UserMd5 userMd5: String,
-                             @SessionId sessionId: String,
-                             context: Context): File {
+        fun providesFilesDir(
+                @UserMd5 userMd5: String,
+                @SessionId sessionId: String,
+                context: Context
+        ): File {
             // Temporary code for migration
             val old = File(context.filesDir, userMd5)
             if (old.exists()) {
@@ -181,8 +181,10 @@ internal abstract class SessionModule {
         @JvmStatic
         @Provides
         @SessionDownloadsDirectory
-        fun providesDownloadsCacheDir(@SessionId sessionId: String,
-                                      @CacheDirectory cacheFile: File): File {
+        fun providesDownloadsCacheDir(
+                @SessionId sessionId: String,
+                @CacheDirectory cacheFile: File
+        ): File {
             return File(cacheFile, "downloads/$sessionId")
         }
 
@@ -208,8 +210,10 @@ internal abstract class SessionModule {
         @Provides
         @SessionScope
         @UnauthenticatedWithCertificate
-        fun providesOkHttpClientWithCertificate(@Unauthenticated okHttpClient: OkHttpClient,
-                                                homeServerConnectionConfig: HomeServerConnectionConfig): OkHttpClient {
+        fun providesOkHttpClientWithCertificate(
+                @Unauthenticated okHttpClient: OkHttpClient,
+                homeServerConnectionConfig: HomeServerConnectionConfig
+        ): OkHttpClient {
             return okHttpClient
                     .newBuilder()
                     .addSocketFactory(homeServerConnectionConfig)
@@ -220,10 +224,12 @@ internal abstract class SessionModule {
         @Provides
         @SessionScope
         @Authenticated
-        fun providesOkHttpClient(@UnauthenticatedWithCertificate okHttpClient: OkHttpClient,
-                                 @Authenticated accessTokenProvider: AccessTokenProvider,
-                                 @SessionId sessionId: String,
-                                 @MockHttpInterceptor testInterceptor: TestInterceptor?): OkHttpClient {
+        fun providesOkHttpClient(
+                @UnauthenticatedWithCertificate okHttpClient: OkHttpClient,
+                @Authenticated accessTokenProvider: AccessTokenProvider,
+                @SessionId sessionId: String,
+                @MockHttpInterceptor testInterceptor: TestInterceptor?
+        ): OkHttpClient {
             return okHttpClient
                     .newBuilder()
                     .addAccessTokenInterceptor(accessTokenProvider)
@@ -240,8 +246,10 @@ internal abstract class SessionModule {
         @Provides
         @SessionScope
         @UnauthenticatedWithCertificateWithProgress
-        fun providesProgressOkHttpClient(@UnauthenticatedWithCertificate okHttpClient: OkHttpClient,
-                                         downloadProgressInterceptor: DownloadProgressInterceptor): OkHttpClient {
+        fun providesProgressOkHttpClient(
+                @UnauthenticatedWithCertificate okHttpClient: OkHttpClient,
+                downloadProgressInterceptor: DownloadProgressInterceptor
+        ): OkHttpClient {
             return okHttpClient.newBuilder()
                     .apply {
                         // Remove the previous CurlLoggingInterceptor, to add it after the accessTokenInterceptor
@@ -260,9 +268,11 @@ internal abstract class SessionModule {
         @JvmStatic
         @Provides
         @SessionScope
-        fun providesRetrofit(@Authenticated okHttpClient: Lazy<OkHttpClient>,
-                             sessionParams: SessionParams,
-                             retrofitFactory: RetrofitFactory): Retrofit {
+        fun providesRetrofit(
+                @Authenticated okHttpClient: Lazy<OkHttpClient>,
+                sessionParams: SessionParams,
+                retrofitFactory: RetrofitFactory
+        ): Retrofit {
             return retrofitFactory
                     .create(okHttpClient, sessionParams.homeServerConnectionConfig.homeServerUriBase.toString())
         }
@@ -270,8 +280,9 @@ internal abstract class SessionModule {
         @JvmStatic
         @Provides
         @SessionScope
-        fun providesNetworkCallbackStrategy(fallbackNetworkCallbackStrategy: Provider<FallbackNetworkCallbackStrategy>,
-                                            preferredNetworkCallbackStrategy: Provider<PreferredNetworkCallbackStrategy>
+        fun providesNetworkCallbackStrategy(
+                fallbackNetworkCallbackStrategy: Provider<FallbackNetworkCallbackStrategy>,
+                preferredNetworkCallbackStrategy: Provider<PreferredNetworkCallbackStrategy>
         ): NetworkCallbackStrategy {
             return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                 preferredNetworkCallbackStrategy.get()
@@ -349,9 +360,6 @@ internal abstract class SessionModule {
     @IntoSet
     abstract fun bindEventSenderProcessorAsSessionLifecycleObserver(processor: EventSenderProcessorCoroutine): SessionLifecycleObserver
 
-    @Binds
-    abstract fun bindSyncStatusService(service: DefaultSyncStatusService): SyncStatusService
-
     @Binds
     abstract fun bindSecureStorageService(service: DefaultSecureStorageService): SecureStorageService
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionState.kt
new file mode 100644
index 0000000000..b109a9aa60
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionState.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session
+
+import javax.inject.Inject
+
+@SessionScope
+internal class SessionState @Inject constructor() {
+    var isOpen = false
+        private set
+
+    /**
+     * Set the new state. Throw if already in the new state.
+     */
+    fun setIsOpen(newState: Boolean) {
+        assert(newState != isOpen)
+        isOpen = newState
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountTask.kt
index 9f3f1f649e..5f4d3d5fbc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountTask.kt
@@ -60,10 +60,10 @@ internal class DefaultDeactivateAccountTask @Inject constructor(
                         execute(params.copy(userAuthParam = authUpdate))
                     }
             )) {
-                UiaResult.SUCCESS   -> {
+                UiaResult.SUCCESS -> {
                     false
                 }
-                UiaResult.FAILURE   -> {
+                UiaResult.FAILURE -> {
                     Timber.d("## UIA: propagate failure")
                     throw throwable
                 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DefaultAccountService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DefaultAccountService.kt
index dc77d7bffb..bb830a5e41 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DefaultAccountService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DefaultAccountService.kt
@@ -20,8 +20,10 @@ import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor
 import org.matrix.android.sdk.api.session.account.AccountService
 import javax.inject.Inject
 
-internal class DefaultAccountService @Inject constructor(private val changePasswordTask: ChangePasswordTask,
-                                                         private val deactivateAccountTask: DeactivateAccountTask) : AccountService {
+internal class DefaultAccountService @Inject constructor(
+        private val changePasswordTask: ChangePasswordTask,
+        private val deactivateAccountTask: DeactivateAccountTask
+) : AccountService {
 
     override suspend fun changePassword(password: String, newPassword: String) {
         changePasswordTask.execute(ChangePasswordTask.Params(password, newPassword))
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/MxCallFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/MxCallFactory.kt
index 9ec892b65d..5b4100f276 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/MxCallFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/MxCallFactory.kt
@@ -79,10 +79,12 @@ internal class MxCallFactory @Inject constructor(
         }
     }
 
-    fun updateOutgoingCallWithOpponentData(call: MxCall,
-                                           userId: String,
-                                           content: CallSignalingContent,
-                                           callCapabilities: CallCapabilities?) {
+    fun updateOutgoingCallWithOpponentData(
+            call: MxCall,
+            userId: String,
+            content: CallSignalingContent,
+            callCapabilities: CallCapabilities?
+    ) {
         (call as? MxCallImpl)?.updateOpponentData(userId, content, callCapabilities)
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/model/MxCallImpl.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/model/MxCallImpl.kt
index 796e83311f..13a77e55e1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/model/MxCallImpl.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/model/MxCallImpl.kt
@@ -220,10 +220,12 @@ internal class MxCallImpl(
                 .also { eventSenderProcessor.postEvent(it) }
     }
 
-    override suspend fun transfer(targetUserId: String,
-                                  targetRoomId: String?,
-                                  createCallId: String?,
-                                  awaitCallId: String?) {
+    override suspend fun transfer(
+            targetUserId: String,
+            targetRoomId: String?,
+            createCallId: String?,
+            awaitCallId: String?
+    ) {
         val profileInfoParams = GetProfileInfoTask.Params(targetUserId)
         val profileInfo = try {
             getProfileInfoTask.execute(profileInfoParams)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUrlResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUrlResolver.kt
index 5d77424482..ad2b9d0905 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUrlResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUrlResolver.kt
@@ -80,9 +80,11 @@ internal class DefaultContentUrlResolver @Inject constructor(
                 }
     }
 
-    private fun resolve(contentUrl: String,
-                        toThumbnail: Boolean,
-                        params: String = ""): String {
+    private fun resolve(
+            contentUrl: String,
+            toThumbnail: Boolean,
+            params: String = ""
+    ): String {
         var serverAndMediaId = contentUrl.removeMxcPrefix()
 
         val apiPath = if (scannerService.isScannerEnabled()) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt
index f96a019fe2..c023646c7f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt
@@ -62,10 +62,12 @@ internal class FileUploader @Inject constructor(
     private val uploadUrl = contentUrlResolver.uploadUrl
     private val responseAdapter = moshi.adapter(ContentUploadResponse::class.java)
 
-    suspend fun uploadFile(file: File,
-                           filename: String?,
-                           mimeType: String?,
-                           progressListener: ProgressRequestBody.Listener? = null): ContentUploadResponse {
+    suspend fun uploadFile(
+            file: File,
+            filename: String?,
+            mimeType: String?,
+            progressListener: ProgressRequestBody.Listener? = null
+    ): ContentUploadResponse {
         // Check size limit
         val maxUploadFileSize = homeServerCapabilitiesService.getHomeServerCapabilities().maxUploadFileSize
 
@@ -99,18 +101,22 @@ internal class FileUploader @Inject constructor(
         return upload(uploadBody, filename, progressListener)
     }
 
-    suspend fun uploadByteArray(byteArray: ByteArray,
-                                filename: String?,
-                                mimeType: String?,
-                                progressListener: ProgressRequestBody.Listener? = null): ContentUploadResponse {
+    suspend fun uploadByteArray(
+            byteArray: ByteArray,
+            filename: String?,
+            mimeType: String?,
+            progressListener: ProgressRequestBody.Listener? = null
+    ): ContentUploadResponse {
         val uploadBody = byteArray.toRequestBody(mimeType?.toMediaTypeOrNull())
         return upload(uploadBody, filename, progressListener)
     }
 
-    suspend fun uploadFromUri(uri: Uri,
-                              filename: String?,
-                              mimeType: String?,
-                              progressListener: ProgressRequestBody.Listener? = null): ContentUploadResponse {
+    suspend fun uploadFromUri(
+            uri: Uri,
+            filename: String?,
+            mimeType: String?,
+            progressListener: ProgressRequestBody.Listener? = null
+    ): ContentUploadResponse {
         val workingFile = context.copyUriToTempFile(uri)
         return uploadFile(workingFile, filename, mimeType, progressListener).also {
             tryOrNull { workingFile.delete() }
@@ -128,9 +134,11 @@ internal class FileUploader @Inject constructor(
         }
     }
 
-    private suspend fun upload(uploadBody: RequestBody,
-                               filename: String?,
-                               progressListener: ProgressRequestBody.Listener?): ContentUploadResponse {
+    private suspend fun upload(
+            uploadBody: RequestBody,
+            filename: String?,
+            progressListener: ProgressRequestBody.Listener?
+    ): ContentUploadResponse {
         val urlBuilder = uploadUrl.toHttpUrlOrNull()?.newBuilder() ?: throw RuntimeException()
 
         val httpUrl = urlBuilder
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt
index c5aa6cd5e7..cca01b4dc7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt
@@ -35,7 +35,8 @@ internal class ImageCompressor @Inject constructor(
             imageFile: File,
             desiredWidth: Int,
             desiredHeight: Int,
-            desiredQuality: Int = 80): File {
+            desiredQuality: Int = 80
+    ): File {
         return withContext(coroutineDispatchers.io) {
             val compressedBitmap = BitmapFactory.Options().run {
                 inJustDecodeBounds = true
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
index 5a00c4b5b4..b62ca2c0f6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
@@ -375,12 +375,14 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
         )
     }
 
-    private suspend fun handleSuccess(params: Params,
-                                      attachmentUrl: String,
-                                      encryptedFileInfo: EncryptedFileInfo?,
-                                      thumbnailUrl: String?,
-                                      thumbnailEncryptedFileInfo: EncryptedFileInfo?,
-                                      newAttachmentAttributes: NewAttachmentAttributes): Result {
+    private suspend fun handleSuccess(
+            params: Params,
+            attachmentUrl: String,
+            encryptedFileInfo: EncryptedFileInfo?,
+            thumbnailUrl: String?,
+            thumbnailEncryptedFileInfo: EncryptedFileInfo?,
+            newAttachmentAttributes: NewAttachmentAttributes
+    ): Result {
         notifyTracker(params) { contentUploadStateTracker.setSuccess(it) }
         params.localEchoIds.forEach {
             updateEvent(it.eventId, attachmentUrl, encryptedFileInfo, thumbnailUrl, thumbnailEncryptedFileInfo, newAttachmentAttributes)
@@ -396,12 +398,14 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
         }
     }
 
-    private suspend fun updateEvent(eventId: String,
-                                    url: String,
-                                    encryptedFileInfo: EncryptedFileInfo?,
-                                    thumbnailUrl: String? = null,
-                                    thumbnailEncryptedFileInfo: EncryptedFileInfo?,
-                                    newAttachmentAttributes: NewAttachmentAttributes) {
+    private suspend fun updateEvent(
+            eventId: String,
+            url: String,
+            encryptedFileInfo: EncryptedFileInfo?,
+            thumbnailUrl: String? = null,
+            thumbnailEncryptedFileInfo: EncryptedFileInfo?,
+            newAttachmentAttributes: NewAttachmentAttributes
+    ) {
         localEchoRepository.updateEcho(eventId) { _, event ->
             val messageContent: MessageContent? = event.asDomain().content.toModel()
             val updatedContent = when (messageContent) {
@@ -419,9 +423,11 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
         params.localEchoIds.forEach { function.invoke(it.eventId) }
     }
 
-    private fun MessageImageContent.update(url: String,
-                                           encryptedFileInfo: EncryptedFileInfo?,
-                                           newAttachmentAttributes: NewAttachmentAttributes?): MessageImageContent {
+    private fun MessageImageContent.update(
+            url: String,
+            encryptedFileInfo: EncryptedFileInfo?,
+            newAttachmentAttributes: NewAttachmentAttributes?
+    ): MessageImageContent {
         return copy(
                 url = if (encryptedFileInfo == null) url else null,
                 encryptedFileInfo = encryptedFileInfo?.copy(url = url),
@@ -433,11 +439,13 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
         )
     }
 
-    private fun MessageVideoContent.update(url: String,
-                                           encryptedFileInfo: EncryptedFileInfo?,
-                                           thumbnailUrl: String?,
-                                           thumbnailEncryptedFileInfo: EncryptedFileInfo?,
-                                           newAttachmentAttributes: NewAttachmentAttributes?): MessageVideoContent {
+    private fun MessageVideoContent.update(
+            url: String,
+            encryptedFileInfo: EncryptedFileInfo?,
+            thumbnailUrl: String?,
+            thumbnailEncryptedFileInfo: EncryptedFileInfo?,
+            newAttachmentAttributes: NewAttachmentAttributes?
+    ): MessageVideoContent {
         return copy(
                 url = if (encryptedFileInfo == null) url else null,
                 encryptedFileInfo = encryptedFileInfo?.copy(url = url),
@@ -451,9 +459,11 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
         )
     }
 
-    private fun MessageFileContent.update(url: String,
-                                          encryptedFileInfo: EncryptedFileInfo?,
-                                          size: Long): MessageFileContent {
+    private fun MessageFileContent.update(
+            url: String,
+            encryptedFileInfo: EncryptedFileInfo?,
+            size: Long
+    ): MessageFileContent {
         return copy(
                 url = if (encryptedFileInfo == null) url else null,
                 encryptedFileInfo = encryptedFileInfo?.copy(url = url),
@@ -461,9 +471,11 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
         )
     }
 
-    private fun MessageAudioContent.update(url: String,
-                                           encryptedFileInfo: EncryptedFileInfo?,
-                                           size: Long): MessageAudioContent {
+    private fun MessageAudioContent.update(
+            url: String,
+            encryptedFileInfo: EncryptedFileInfo?,
+            size: Long
+    ): MessageAudioContent {
         return copy(
                 url = if (encryptedFileInfo == null) url else null,
                 encryptedFileInfo = encryptedFileInfo?.copy(url = url),
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
index a43f8abf33..85f59ab043 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
@@ -32,8 +32,10 @@ internal class VideoCompressor @Inject constructor(
         private val temporaryFileCreator: TemporaryFileCreator
 ) {
 
-    suspend fun compress(videoFile: File,
-                         progressListener: ProgressListener?): VideoCompressionResult {
+    suspend fun compress(
+            videoFile: File,
+            progressListener: ProgressListener?
+    ): VideoCompressionResult {
         val destinationFile = temporaryFileCreator.create()
 
         val job = Job()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/ContentScannerModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/ContentScannerModule.kt
index 7ea74225cd..89b5c44ef0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/ContentScannerModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/ContentScannerModule.kt
@@ -49,9 +49,11 @@ internal abstract class ContentScannerModule {
         @Provides
         @ContentScannerDatabase
         @SessionScope
-        fun providesContentScannerRealmConfiguration(realmKeysUtils: RealmKeysUtils,
-                                                     @SessionFilesDirectory directory: File,
-                                                     @UserMd5 userMd5: String): RealmConfiguration {
+        fun providesContentScannerRealmConfiguration(
+                realmKeysUtils: RealmKeysUtils,
+                @SessionFilesDirectory directory: File,
+                @UserMd5 userMd5: String
+        ): RealmConfiguration {
             return RealmConfiguration.Builder()
                     .directory(directory)
                     .name("matrix-sdk-content-scanning.realm")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/ContentScannerEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/ContentScannerEntityQueries.kt
index e4b64a1a0e..bb3051bc96 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/ContentScannerEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/ContentScannerEntityQueries.kt
@@ -31,10 +31,12 @@ internal fun ContentScanResultEntity.Companion.get(realm: Realm, attachmentUrl:
             .findFirst()
 }
 
-internal fun ContentScanResultEntity.Companion.getOrCreate(realm: Realm,
-                                                           attachmentUrl: String,
-                                                           contentScannerUrl: String?,
-                                                           currentTimeMillis: Long): ContentScanResultEntity {
+internal fun ContentScanResultEntity.Companion.getOrCreate(
+        realm: Realm,
+        attachmentUrl: String,
+        contentScannerUrl: String?,
+        currentTimeMillis: Long
+): ContentScanResultEntity {
     return ContentScanResultEntity.get(realm, attachmentUrl, contentScannerUrl)
             ?: realm.createObject<ContentScanResultEntity>().also {
                 it.mediaUrl = attachmentUrl
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/directory/DirectoryAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/directory/DirectoryAPI.kt
index 0db6812609..488c61206b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/directory/DirectoryAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/directory/DirectoryAPI.kt
@@ -49,8 +49,10 @@ internal interface DirectoryAPI {
      * @param body the body containing the new directory visibility
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "directory/list/room/{roomId}")
-    suspend fun setRoomDirectoryVisibility(@Path("roomId") roomId: String,
-                                           @Body body: RoomDirectoryVisibilityJson)
+    suspend fun setRoomDirectoryVisibility(
+            @Path("roomId") roomId: String,
+            @Body body: RoomDirectoryVisibilityJson
+    )
 
     /**
      * Add alias to the room.
@@ -58,8 +60,10 @@ internal interface DirectoryAPI {
      * @param body the Json body
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "directory/room/{roomAlias}")
-    suspend fun addRoomAlias(@Path("roomAlias") roomAlias: String,
-                             @Body body: AddRoomAliasBody)
+    suspend fun addRoomAlias(
+            @Path("roomAlias") roomAlias: String,
+            @Body body: AddRoomAliasBody
+    )
 
     /**
      * Delete a room alias.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/download/ProgressResponseBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/download/ProgressResponseBody.kt
index 4fd4fda7d1..4e0096b7dd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/download/ProgressResponseBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/download/ProgressResponseBody.kt
@@ -27,7 +27,8 @@ import okio.buffer
 internal class ProgressResponseBody(
         private val responseBody: ResponseBody,
         private val chainUrl: String,
-        private val progressListener: ProgressListener) : ResponseBody() {
+        private val progressListener: ProgressListener
+) : ResponseBody() {
 
     private var bufferedSource: BufferedSource? = null
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/DefaultFilterService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/DefaultFilterService.kt
index 9a16b8fd4a..2e68d02d8c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/DefaultFilterService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/DefaultFilterService.kt
@@ -21,8 +21,10 @@ import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.task.configureWith
 import javax.inject.Inject
 
-internal class DefaultFilterService @Inject constructor(private val saveFilterTask: SaveFilterTask,
-                                                        private val taskExecutor: TaskExecutor) : FilterService {
+internal class DefaultFilterService @Inject constructor(
+        private val saveFilterTask: SaveFilterTask,
+        private val taskExecutor: TaskExecutor
+) : FilterService {
 
     // TODO Pass a list of support events instead
     override fun setFilter(filterPreset: FilterService.FilterPreset) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterApi.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterApi.kt
index d1df77d14a..ac1e9a654c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterApi.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterApi.kt
@@ -31,8 +31,10 @@ internal interface FilterApi {
      * @param body the Json representation of a FilterBody object
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "user/{userId}/filter")
-    suspend fun uploadFilter(@Path("userId") userId: String,
-                             @Body body: Filter): FilterResponse
+    suspend fun uploadFilter(
+            @Path("userId") userId: String,
+            @Body body: Filter
+    ): FilterResponse
 
     /**
      * Gets a filter with a given filterId from the homeserver.
@@ -42,6 +44,8 @@ internal interface FilterApi {
      * @return Filter
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "user/{userId}/filter/{filterId}")
-    suspend fun getFilterById(@Path("userId") userId: String,
-                              @Path("filterId") filterId: String): Filter
+    suspend fun getFilterById(
+            @Path("userId") userId: String,
+            @Path("filterId") filterId: String
+    ): Filter
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/DefaultGroup.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/DefaultGroup.kt
index 4f610fd81b..9c37d4db6c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/DefaultGroup.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/DefaultGroup.kt
@@ -18,8 +18,10 @@ package org.matrix.android.sdk.internal.session.group
 
 import org.matrix.android.sdk.api.session.group.Group
 
-internal class DefaultGroup(override val groupId: String,
-                            private val getGroupDataTask: GetGroupDataTask) : Group {
+internal class DefaultGroup(
+        override val groupId: String,
+        private val getGroupDataTask: GetGroupDataTask
+) : Group {
 
     override suspend fun fetchGroupData() {
         val params = GetGroupDataTask.Params.FetchWithIds(listOf(groupId))
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
index b1a518724c..d22da8f6f2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
@@ -109,10 +109,12 @@ internal class DefaultGetHomeServerCapabilitiesTask @Inject constructor(
         insertInDb(capabilities, mediaConfig, versions, wellknownResult)
     }
 
-    private suspend fun insertInDb(getCapabilitiesResult: GetCapabilitiesResult?,
-                                   getMediaConfigResult: GetMediaConfigResult?,
-                                   getVersionResult: Versions?,
-                                   getWellknownResult: WellknownResult?) {
+    private suspend fun insertInDb(
+            getCapabilitiesResult: GetCapabilitiesResult?,
+            getMediaConfigResult: GetMediaConfigResult?,
+            getVersionResult: Versions?,
+            getWellknownResult: WellknownResult?
+    ) {
         monarchy.awaitTransaction { realm ->
             val homeServerCapabilitiesEntity = HomeServerCapabilitiesEntity.getOrCreate(realm)
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerPinger.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerPinger.kt
index 70e1e551aa..a3d6b7fa49 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerPinger.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerPinger.kt
@@ -22,8 +22,10 @@ import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import javax.inject.Inject
 
-internal class HomeServerPinger @Inject constructor(private val taskExecutor: TaskExecutor,
-                                                    private val capabilitiesAPI: CapabilitiesAPI) {
+internal class HomeServerPinger @Inject constructor(
+        private val taskExecutor: TaskExecutor,
+        private val capabilitiesAPI: CapabilitiesAPI
+) {
 
     fun canReachHomeServer(callback: (Boolean) -> Unit) {
         taskExecutor.executorScope.launch {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAPI.kt
index aef86ed08e..7b04bc52b0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAPI.kt
@@ -95,8 +95,10 @@ internal interface IdentityAPI {
      * - https://matrix.org/docs/spec/identity_service/latest#post-matrix-identity-v2-validate-email-submittoken
      */
     @POST(NetworkConstants.URI_IDENTITY_PATH_V2 + "validate/{medium}/submitToken")
-    suspend fun submitToken(@Path("medium") medium: String,
-                            @Body body: IdentityRequestOwnershipParams): SuccessResult
+    suspend fun submitToken(
+            @Path("medium") medium: String,
+            @Body body: IdentityRequestOwnershipParams
+    ): SuccessResult
 
     /**
      * https://matrix.org/docs/spec/identity_service/r0.3.0#post-matrix-identity-v2-sign-ed25519.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt
index f642ed4cf2..21b59cca9d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt
@@ -75,10 +75,12 @@ internal class DefaultIdentityBulkLookupTask @Inject constructor(
             val identityLookUpResponse: IdentityLookUpResponse
     )
 
-    private suspend fun lookUpInternal(identityAPI: IdentityAPI,
-                                       threePids: List<ThreePid>,
-                                       hashDetailResponse: IdentityHashDetailResponse,
-                                       canRetry: Boolean): LookUpData {
+    private suspend fun lookUpInternal(
+            identityAPI: IdentityAPI,
+            threePids: List<ThreePid>,
+            hashDetailResponse: IdentityHashDetailResponse,
+            canRetry: Boolean
+    ): LookUpData {
         val hashedAddresses = getHashedAddresses(threePids, hashDetailResponse.pepper)
         return try {
             LookUpData(hashedAddresses,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityModule.kt
index 4e9d7dc7f7..464ae96e3a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityModule.kt
@@ -47,8 +47,10 @@ internal abstract class IdentityModule {
         @Provides
         @SessionScope
         @AuthenticatedIdentity
-        fun providesOkHttpClient(@UnauthenticatedWithCertificate okHttpClient: OkHttpClient,
-                                 @AuthenticatedIdentity accessTokenProvider: AccessTokenProvider): OkHttpClient {
+        fun providesOkHttpClient(
+                @UnauthenticatedWithCertificate okHttpClient: OkHttpClient,
+                @AuthenticatedIdentity accessTokenProvider: AccessTokenProvider
+        ): OkHttpClient {
             return okHttpClient
                     .newBuilder()
                     .addAccessTokenInterceptor(accessTokenProvider)
@@ -59,10 +61,12 @@ internal abstract class IdentityModule {
         @Provides
         @IdentityDatabase
         @SessionScope
-        fun providesIdentityRealmConfiguration(realmKeysUtils: RealmKeysUtils,
-                                               realmIdentityStoreMigration: RealmIdentityStoreMigration,
-                                               @SessionFilesDirectory directory: File,
-                                               @UserMd5 userMd5: String): RealmConfiguration {
+        fun providesIdentityRealmConfiguration(
+                realmKeysUtils: RealmKeysUtils,
+                realmIdentityStoreMigration: RealmIdentityStoreMigration,
+                @SessionFilesDirectory directory: File,
+                @UserMd5 userMd5: String
+        ): RealmConfiguration {
             return RealmConfiguration.Builder()
                     .directory(directory)
                     .name("matrix-sdk-identity.realm")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityDataEntityQuery.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityDataEntityQuery.kt
index aecf21678c..08e5b43977 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityDataEntityQuery.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityDataEntityQuery.kt
@@ -32,8 +32,10 @@ private fun IdentityDataEntity.Companion.getOrCreate(realm: Realm): IdentityData
     return get(realm) ?: realm.createObject()
 }
 
-internal fun IdentityDataEntity.Companion.setUrl(realm: Realm,
-                                                 url: String?) {
+internal fun IdentityDataEntity.Companion.setUrl(
+        realm: Realm,
+        url: String?
+) {
     realm.where<IdentityDataEntity>().findAll().deleteAllFromRealm()
     // Delete all pending binding if any
     IdentityPendingBindingEntity.deleteAll(realm)
@@ -45,23 +47,29 @@ internal fun IdentityDataEntity.Companion.setUrl(realm: Realm,
     }
 }
 
-internal fun IdentityDataEntity.Companion.setToken(realm: Realm,
-                                                   newToken: String?) {
+internal fun IdentityDataEntity.Companion.setToken(
+        realm: Realm,
+        newToken: String?
+) {
     get(realm)?.apply {
         token = newToken
     }
 }
 
-internal fun IdentityDataEntity.Companion.setUserConsent(realm: Realm,
-                                                         newConsent: Boolean) {
+internal fun IdentityDataEntity.Companion.setUserConsent(
+        realm: Realm,
+        newConsent: Boolean
+) {
     get(realm)?.apply {
         userConsent = newConsent
     }
 }
 
-internal fun IdentityDataEntity.Companion.setHashDetails(realm: Realm,
-                                                         pepper: String,
-                                                         algorithms: List<String>) {
+internal fun IdentityDataEntity.Companion.setHashDetails(
+        realm: Realm,
+        pepper: String,
+        algorithms: List<String>
+) {
     get(realm)?.apply {
         hashLookupPepper = pepper
         hashLookupAlgorithm = RealmList<String>().apply { addAll(algorithms) }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/Extensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/Extensions.kt
deleted file mode 100644
index b40b1a56bf..0000000000
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/Extensions.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2021 The Matrix.org Foundation C.I.C.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.matrix.android.sdk.internal.session.initsync
-
-import org.matrix.android.sdk.api.session.initsync.InitSyncStep
-
-internal inline fun <T> reportSubtask(reporter: ProgressReporter?,
-                                      initSyncStep: InitSyncStep,
-                                      totalProgress: Int,
-                                      parentWeight: Float,
-                                      block: () -> T): T {
-    reporter?.startTask(initSyncStep, totalProgress, parentWeight)
-    return block().also {
-        reporter?.endTask()
-    }
-}
-
-internal inline fun <K, V, R> Map<out K, V>.mapWithProgress(reporter: ProgressReporter?,
-                                                            initSyncStep: InitSyncStep,
-                                                            parentWeight: Float,
-                                                            transform: (Map.Entry<K, V>) -> R): List<R> {
-    var current = 0F
-    reporter?.startTask(initSyncStep, count() + 1, parentWeight)
-    return map {
-        reporter?.reportProgress(current)
-        current++
-        transform.invoke(it)
-    }.also {
-        reporter?.endTask()
-    }
-}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt
index 8034e5b974..7588037b46 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt
@@ -54,11 +54,13 @@ import javax.inject.Inject
  *
  */
 @SessionScope
-internal class IntegrationManager @Inject constructor(matrixConfiguration: MatrixConfiguration,
-                                                      @SessionDatabase private val monarchy: Monarchy,
-                                                      private val updateUserAccountDataTask: UpdateUserAccountDataTask,
-                                                      private val accountDataDataSource: UserAccountDataDataSource,
-                                                      private val widgetFactory: WidgetFactory) :
+internal class IntegrationManager @Inject constructor(
+        matrixConfiguration: MatrixConfiguration,
+        @SessionDatabase private val monarchy: Monarchy,
+        private val updateUserAccountDataTask: UpdateUserAccountDataTask,
+        private val accountDataDataSource: UserAccountDataDataSource,
+        private val widgetFactory: WidgetFactory
+) :
         SessionLifecycleObserver {
 
     private val currentConfigs = ArrayList<IntegrationManagerConfig>()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/GetOpenIdTokenTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/GetOpenIdTokenTask.kt
index a6ad025b8d..5ab6aca88c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/GetOpenIdTokenTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/GetOpenIdTokenTask.kt
@@ -28,7 +28,8 @@ internal interface GetOpenIdTokenTask : Task<Unit, OpenIdToken>
 internal class DefaultGetOpenIdTokenTask @Inject constructor(
         @UserId private val userId: String,
         private val openIdAPI: OpenIdAPI,
-        private val globalErrorReceiver: GlobalErrorReceiver) : GetOpenIdTokenTask {
+        private val globalErrorReceiver: GlobalErrorReceiver
+) : GetOpenIdTokenTask {
 
     override suspend fun execute(params: Unit): OpenIdToken {
         return executeRequest(globalErrorReceiver) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/OpenIdAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/OpenIdAPI.kt
index c3caaefdec..180ecbb1a3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/OpenIdAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/OpenIdAPI.kt
@@ -35,6 +35,8 @@ internal interface OpenIdAPI {
      * @param body an empty json body
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "user/{userId}/openid/request_token")
-    suspend fun openIdToken(@Path("userId") userId: String,
-                            @Body body: JsonDict = emptyMap()): OpenIdToken
+    suspend fun openIdToken(
+            @Path("userId") userId: String,
+            @Body body: JsonDict = emptyMap()
+    ): OpenIdToken
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/presence/PresenceAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/presence/PresenceAPI.kt
index 53d0d5e963..4af0307cb5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/presence/PresenceAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/presence/PresenceAPI.kt
@@ -31,8 +31,10 @@ internal interface PresenceAPI {
      * Ref: https://matrix.org/docs/spec/client_server/latest#put-matrix-client-r0-presence-userid-status
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "presence/{userId}/status")
-    suspend fun setPresence(@Path("userId") userId: String,
-                            @Body body: SetPresenceBody)
+    suspend fun setPresence(
+            @Path("userId") userId: String,
+            @Body body: SetPresenceBody
+    )
 
     /**
      * Get the given user's presence state.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt
index 678d399428..f7798dc9e9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt
@@ -37,7 +37,8 @@ internal class DefaultAddThreePidTask @Inject constructor(
         private val profileAPI: ProfileAPI,
         @SessionDatabase private val monarchy: Monarchy,
         private val pendingThreePidMapper: PendingThreePidMapper,
-        private val globalErrorReceiver: GlobalErrorReceiver) : AddThreePidTask() {
+        private val globalErrorReceiver: GlobalErrorReceiver
+) : AddThreePidTask() {
 
     override suspend fun execute(params: Params) {
         when (params.threePid) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt
index f630c2c225..5e892b32c3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt
@@ -33,11 +33,12 @@ internal abstract class BindThreePidsTask : Task<BindThreePidsTask.Params, Unit>
     )
 }
 
-internal class DefaultBindThreePidsTask @Inject constructor(private val profileAPI: ProfileAPI,
-                                                            private val identityStore: IdentityStore,
-                                                            @AuthenticatedIdentity
-                                                            private val accessTokenProvider: AccessTokenProvider,
-                                                            private val globalErrorReceiver: GlobalErrorReceiver) : BindThreePidsTask() {
+internal class DefaultBindThreePidsTask @Inject constructor(
+        private val profileAPI: ProfileAPI,
+        private val identityStore: IdentityStore,
+        @AuthenticatedIdentity private val accessTokenProvider: AccessTokenProvider,
+        private val globalErrorReceiver: GlobalErrorReceiver
+) : BindThreePidsTask() {
     override suspend fun execute(params: Params) {
         val identityServerUrlWithoutProtocol = identityStore.getIdentityServerUrlWithoutProtocol() ?: throw IdentityServiceError.NoIdentityServerConfigured
         val identityServerAccessToken = accessTokenProvider.getToken() ?: throw IdentityServiceError.NoIdentityServerConfigured
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt
index 5e64a6af0e..0776569661 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt
@@ -38,20 +38,22 @@ import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.task.configureWith
 import javax.inject.Inject
 
-internal class DefaultProfileService @Inject constructor(private val taskExecutor: TaskExecutor,
-                                                         @SessionDatabase private val monarchy: Monarchy,
-                                                         private val coroutineDispatchers: MatrixCoroutineDispatchers,
-                                                         private val refreshUserThreePidsTask: RefreshUserThreePidsTask,
-                                                         private val getProfileInfoTask: GetProfileInfoTask,
-                                                         private val setDisplayNameTask: SetDisplayNameTask,
-                                                         private val setAvatarUrlTask: SetAvatarUrlTask,
-                                                         private val addThreePidTask: AddThreePidTask,
-                                                         private val validateSmsCodeTask: ValidateSmsCodeTask,
-                                                         private val finalizeAddingThreePidTask: FinalizeAddingThreePidTask,
-                                                         private val deleteThreePidTask: DeleteThreePidTask,
-                                                         private val pendingThreePidMapper: PendingThreePidMapper,
-                                                         private val userStore: UserStore,
-                                                         private val fileUploader: FileUploader) : ProfileService {
+internal class DefaultProfileService @Inject constructor(
+        private val taskExecutor: TaskExecutor,
+        @SessionDatabase private val monarchy: Monarchy,
+        private val coroutineDispatchers: MatrixCoroutineDispatchers,
+        private val refreshUserThreePidsTask: RefreshUserThreePidsTask,
+        private val getProfileInfoTask: GetProfileInfoTask,
+        private val setDisplayNameTask: SetDisplayNameTask,
+        private val setAvatarUrlTask: SetAvatarUrlTask,
+        private val addThreePidTask: AddThreePidTask,
+        private val validateSmsCodeTask: ValidateSmsCodeTask,
+        private val finalizeAddingThreePidTask: FinalizeAddingThreePidTask,
+        private val deleteThreePidTask: DeleteThreePidTask,
+        private val pendingThreePidMapper: PendingThreePidMapper,
+        private val userStore: UserStore,
+        private val fileUploader: FileUploader
+) : ProfileService {
 
     override suspend fun getDisplayName(userId: String): Optional<String> {
         val params = GetProfileInfoTask.Params(userId)
@@ -132,8 +134,10 @@ internal class DefaultProfileService @Inject constructor(private val taskExecuto
         validateSmsCodeTask.execute(ValidateSmsCodeTask.Params(threePid, code))
     }
 
-    override suspend fun finalizeAddingThreePid(threePid: ThreePid,
-                                                userInteractiveAuthInterceptor: UserInteractiveAuthInterceptor) {
+    override suspend fun finalizeAddingThreePid(
+            threePid: ThreePid,
+            userInteractiveAuthInterceptor: UserInteractiveAuthInterceptor
+    ) {
         finalizeAddingThreePidTask
                 .execute(
                         FinalizeAddingThreePidTask.Params(
@@ -165,8 +169,8 @@ internal class DefaultProfileService @Inject constructor(private val taskExecuto
 
 private fun UserThreePidEntity.asDomain(): ThreePid {
     return when (medium) {
-        ThirdPartyIdentifier.MEDIUM_EMAIL  -> ThreePid.Email(address)
+        ThirdPartyIdentifier.MEDIUM_EMAIL -> ThreePid.Email(address)
         ThirdPartyIdentifier.MEDIUM_MSISDN -> ThreePid.Msisdn(address)
-        else                               -> error("Invalid medium type")
+        else -> error("Invalid medium type")
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidTask.kt
index 7b7617aa80..a8047a0118 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidTask.kt
@@ -31,7 +31,8 @@ internal abstract class DeleteThreePidTask : Task<DeleteThreePidTask.Params, Uni
 
 internal class DefaultDeleteThreePidTask @Inject constructor(
         private val profileAPI: ProfileAPI,
-        private val globalErrorReceiver: GlobalErrorReceiver) : DeleteThreePidTask() {
+        private val globalErrorReceiver: GlobalErrorReceiver
+) : DeleteThreePidTask() {
 
     override suspend fun execute(params: Params) {
         val body = DeleteThreePidBody(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt
index 501aff63bd..89fcbca1ca 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt
@@ -47,7 +47,8 @@ internal class DefaultFinalizeAddingThreePidTask @Inject constructor(
         private val profileAPI: ProfileAPI,
         @SessionDatabase private val monarchy: Monarchy,
         private val pendingThreePidMapper: PendingThreePidMapper,
-        private val globalErrorReceiver: GlobalErrorReceiver) : FinalizeAddingThreePidTask() {
+        private val globalErrorReceiver: GlobalErrorReceiver
+) : FinalizeAddingThreePidTask() {
 
     override suspend fun execute(params: Params) {
         val canCleanup = if (params.userWantsToCancel) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/GetProfileInfoTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/GetProfileInfoTask.kt
index fed4288f84..40444edcab 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/GetProfileInfoTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/GetProfileInfoTask.kt
@@ -29,8 +29,10 @@ internal abstract class GetProfileInfoTask : Task<GetProfileInfoTask.Params, Jso
     )
 }
 
-internal class DefaultGetProfileInfoTask @Inject constructor(private val profileAPI: ProfileAPI,
-                                                             private val globalErrorReceiver: GlobalErrorReceiver) : GetProfileInfoTask() {
+internal class DefaultGetProfileInfoTask @Inject constructor(
+        private val profileAPI: ProfileAPI,
+        private val globalErrorReceiver: GlobalErrorReceiver
+) : GetProfileInfoTask() {
 
     override suspend fun execute(params: Params): JsonDict {
         return executeRequest(globalErrorReceiver) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt
index 4d4506be76..aa7f21d332 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt
@@ -49,15 +49,19 @@ internal interface ProfileAPI {
      * Change user display name.
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "profile/{userId}/displayname")
-    suspend fun setDisplayName(@Path("userId") userId: String,
-                               @Body body: SetDisplayNameBody)
+    suspend fun setDisplayName(
+            @Path("userId") userId: String,
+            @Body body: SetDisplayNameBody
+    )
 
     /**
      * Change user avatar url.
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "profile/{userId}/avatar_url")
-    suspend fun setAvatarUrl(@Path("userId") userId: String,
-                             @Body body: SetAvatarUrlBody)
+    suspend fun setAvatarUrl(
+            @Path("userId") userId: String,
+            @Body body: SetAvatarUrlBody
+    )
 
     /**
      * Bind a threePid
@@ -89,8 +93,10 @@ internal interface ProfileAPI {
      * Validate Msisdn code (same model than for identity server API).
      */
     @POST
-    suspend fun validateMsisdn(@Url url: String,
-                               @Body params: ValidationCodeBody): SuccessResult
+    suspend fun validateMsisdn(
+            @Url url: String,
+            @Body params: ValidationCodeBody
+    ): SuccessResult
 
     /**
      * Ref: https://matrix.org/docs/spec/client_server/r0.6.1#post-matrix-client-r0-account-3pid-add
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/RefreshUserThreePidsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/RefreshUserThreePidsTask.kt
index 8a064b4fd1..9ec296f20b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/RefreshUserThreePidsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/RefreshUserThreePidsTask.kt
@@ -28,9 +28,11 @@ import javax.inject.Inject
 
 internal abstract class RefreshUserThreePidsTask : Task<Unit, Unit>
 
-internal class DefaultRefreshUserThreePidsTask @Inject constructor(private val profileAPI: ProfileAPI,
-                                                                   @SessionDatabase private val monarchy: Monarchy,
-                                                                   private val globalErrorReceiver: GlobalErrorReceiver) : RefreshUserThreePidsTask() {
+internal class DefaultRefreshUserThreePidsTask @Inject constructor(
+        private val profileAPI: ProfileAPI,
+        @SessionDatabase private val monarchy: Monarchy,
+        private val globalErrorReceiver: GlobalErrorReceiver
+) : RefreshUserThreePidsTask() {
 
     override suspend fun execute(params: Unit) {
         val accountThreePidsResponse = executeRequest(globalErrorReceiver) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetAvatarUrlTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetAvatarUrlTask.kt
index a7d116d919..80282a894b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetAvatarUrlTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetAvatarUrlTask.kt
@@ -30,7 +30,8 @@ internal abstract class SetAvatarUrlTask : Task<SetAvatarUrlTask.Params, Unit> {
 
 internal class DefaultSetAvatarUrlTask @Inject constructor(
         private val profileAPI: ProfileAPI,
-        private val globalErrorReceiver: GlobalErrorReceiver) : SetAvatarUrlTask() {
+        private val globalErrorReceiver: GlobalErrorReceiver
+) : SetAvatarUrlTask() {
 
     override suspend fun execute(params: Params) {
         val body = SetAvatarUrlBody(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetDisplayNameTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetDisplayNameTask.kt
index 61d3042310..e3f04792b6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetDisplayNameTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetDisplayNameTask.kt
@@ -30,7 +30,8 @@ internal abstract class SetDisplayNameTask : Task<SetDisplayNameTask.Params, Uni
 
 internal class DefaultSetDisplayNameTask @Inject constructor(
         private val profileAPI: ProfileAPI,
-        private val globalErrorReceiver: GlobalErrorReceiver) : SetDisplayNameTask() {
+        private val globalErrorReceiver: GlobalErrorReceiver
+) : SetDisplayNameTask() {
 
     override suspend fun execute(params: Params) {
         val body = SetDisplayNameBody(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidsTask.kt
index acbecc9fbe..2e2eb65bd4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidsTask.kt
@@ -32,9 +32,11 @@ internal abstract class UnbindThreePidsTask : Task<UnbindThreePidsTask.Params, B
     )
 }
 
-internal class DefaultUnbindThreePidsTask @Inject constructor(private val profileAPI: ProfileAPI,
-                                                              private val identityStore: IdentityStore,
-                                                              private val globalErrorReceiver: GlobalErrorReceiver) : UnbindThreePidsTask() {
+internal class DefaultUnbindThreePidsTask @Inject constructor(
+        private val profileAPI: ProfileAPI,
+        private val identityStore: IdentityStore,
+        private val globalErrorReceiver: GlobalErrorReceiver
+) : UnbindThreePidsTask() {
     override suspend fun execute(params: Params): Boolean {
         val identityServerUrlWithoutProtocol = identityStore.getIdentityServerUrlWithoutProtocol()
                 ?: throw IdentityServiceError.NoIdentityServerConfigured
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultConditionResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultConditionResolver.kt
index 67fba390d0..ace5ee0b9a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultConditionResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultConditionResolver.kt
@@ -34,18 +34,24 @@ internal class DefaultConditionResolver @Inject constructor(
         @UserId private val userId: String
 ) : ConditionResolver {
 
-    override fun resolveEventMatchCondition(event: Event,
-                                            condition: EventMatchCondition): Boolean {
+    override fun resolveEventMatchCondition(
+            event: Event,
+            condition: EventMatchCondition
+    ): Boolean {
         return condition.isSatisfied(event)
     }
 
-    override fun resolveRoomMemberCountCondition(event: Event,
-                                                 condition: RoomMemberCountCondition): Boolean {
+    override fun resolveRoomMemberCountCondition(
+            event: Event,
+            condition: RoomMemberCountCondition
+    ): Boolean {
         return condition.isSatisfied(event, roomGetter)
     }
 
-    override fun resolveSenderNotificationPermissionCondition(event: Event,
-                                                              condition: SenderNotificationPermissionCondition): Boolean {
+    override fun resolveSenderNotificationPermissionCondition(
+            event: Event,
+            condition: SenderNotificationPermissionCondition
+    ): Boolean {
         val roomId = event.roomId ?: return false
         val room = roomGetter.getRoom(roomId) ?: return false
 
@@ -57,8 +63,10 @@ internal class DefaultConditionResolver @Inject constructor(
         return condition.isSatisfied(event, powerLevelsContent)
     }
 
-    override fun resolveContainsDisplayNameCondition(event: Event,
-                                                     condition: ContainsDisplayNameCondition): Boolean {
+    override fun resolveContainsDisplayNameCondition(
+            event: Event,
+            condition: ContainsDisplayNameCondition
+    ): Boolean {
         val roomId = event.roomId ?: return false
         val room = roomGetter.getRoom(roomId) ?: return false
         val myDisplayName = room.membershipService().getRoomMember(userId)?.displayName ?: return false
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
index 13b990a9ff..e912d9ccf8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
@@ -18,6 +18,7 @@ package org.matrix.android.sdk.internal.session.pushers
 import androidx.lifecycle.LiveData
 import androidx.work.BackoffPolicy
 import com.zhuinden.monarchy.Monarchy
+import org.matrix.android.sdk.api.session.pushers.HttpPusher
 import org.matrix.android.sdk.api.session.pushers.Pusher
 import org.matrix.android.sdk.api.session.pushers.PushersService
 import org.matrix.android.sdk.internal.database.mapper.asDomain
@@ -45,10 +46,12 @@ internal class DefaultPushersService @Inject constructor(
         private val taskExecutor: TaskExecutor
 ) : PushersService {
 
-    override suspend fun testPush(url: String,
-                                  appId: String,
-                                  pushkey: String,
-                                  eventId: String) {
+    override suspend fun testPush(
+            url: String,
+            appId: String,
+            pushkey: String,
+            eventId: String
+    ) {
         pushGatewayNotifyTask.execute(PushGatewayNotifyTask.Params(url, appId, pushkey, eventId))
     }
 
@@ -58,15 +61,15 @@ internal class DefaultPushersService @Inject constructor(
                 .executeBy(taskExecutor)
     }
 
-    override fun enqueueAddHttpPusher(httpPusher: PushersService.HttpPusher): UUID {
+    override fun enqueueAddHttpPusher(httpPusher: HttpPusher): UUID {
         return enqueueAddPusher(httpPusher.toJsonPusher())
     }
 
-    override suspend fun addHttpPusher(httpPusher: PushersService.HttpPusher) {
+    override suspend fun addHttpPusher(httpPusher: HttpPusher) {
         addPusherTask.execute(AddPusherTask.Params(httpPusher.toJsonPusher()))
     }
 
-    private fun PushersService.HttpPusher.toJsonPusher() = JsonPusher(
+    private fun HttpPusher.toJsonPusher() = JsonPusher(
             pushKey = pushkey,
             kind = "http",
             appId = appId,
@@ -78,12 +81,14 @@ internal class DefaultPushersService @Inject constructor(
             append = append
     )
 
-    override suspend fun addEmailPusher(email: String,
-                                        lang: String,
-                                        emailBranding: String,
-                                        appDisplayName: String,
-                                        deviceDisplayName: String,
-                                        append: Boolean) {
+    override suspend fun addEmailPusher(
+            email: String,
+            lang: String,
+            emailBranding: String,
+            appDisplayName: String,
+            deviceDisplayName: String,
+            append: Boolean
+    ) {
         addPusherTask.execute(
                 AddPusherTask.Params(
                         JsonPusher(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushRulesApi.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushRulesApi.kt
index fbae04a1f1..1b316c7872 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushRulesApi.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushRulesApi.kt
@@ -38,9 +38,11 @@ internal interface PushRulesApi {
      * @param enabledBody the new enable status
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "pushrules/global/{kind}/{ruleId}/enabled")
-    suspend fun updateEnableRuleStatus(@Path("kind") kind: String,
-                                       @Path("ruleId") ruleId: String,
-                                       @Body enabledBody: EnabledBody)
+    suspend fun updateEnableRuleStatus(
+            @Path("kind") kind: String,
+            @Path("ruleId") ruleId: String,
+            @Body enabledBody: EnabledBody
+    )
 
     /**
      * Update the ruleID action.
@@ -51,9 +53,11 @@ internal interface PushRulesApi {
      * @param actions the actions
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "pushrules/global/{kind}/{ruleId}/actions")
-    suspend fun updateRuleActions(@Path("kind") kind: String,
-                                  @Path("ruleId") ruleId: String,
-                                  @Body actions: Any)
+    suspend fun updateRuleActions(
+            @Path("kind") kind: String,
+            @Path("ruleId") ruleId: String,
+            @Body actions: Any
+    )
 
     /**
      * Delete a rule.
@@ -62,8 +66,10 @@ internal interface PushRulesApi {
      * @param ruleId the ruleId
      */
     @DELETE(NetworkConstants.URI_API_PREFIX_PATH_R0 + "pushrules/global/{kind}/{ruleId}")
-    suspend fun deleteRule(@Path("kind") kind: String,
-                           @Path("ruleId") ruleId: String)
+    suspend fun deleteRule(
+            @Path("kind") kind: String,
+            @Path("ruleId") ruleId: String
+    )
 
     /**
      * Add the ruleID enable status.
@@ -73,7 +79,9 @@ internal interface PushRulesApi {
      * @param rule the rule to add.
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "pushrules/global/{kind}/{ruleId}")
-    suspend fun addRule(@Path("kind") kind: String,
-                        @Path("ruleId") ruleId: String,
-                        @Body rule: PushRule)
+    suspend fun addRule(
+            @Path("kind") kind: String,
+            @Path("ruleId") ruleId: String,
+            @Body rule: PushRule
+    )
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePusherTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePusherTask.kt
index 057c309078..86ba33cb98 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePusherTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePusherTask.kt
@@ -30,8 +30,10 @@ import org.matrix.android.sdk.internal.util.awaitTransaction
 import javax.inject.Inject
 
 internal interface RemovePusherTask : Task<RemovePusherTask.Params, Unit> {
-    data class Params(val pushKey: String,
-                      val pushAppId: String)
+    data class Params(
+            val pushKey: String,
+            val pushAppId: String
+    )
 }
 
 internal class DefaultRemovePusherTask @Inject constructor(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt
index 815661a1ce..a923f1932b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt
@@ -23,9 +23,11 @@ import org.matrix.android.sdk.internal.task.Task
 import javax.inject.Inject
 
 internal interface UpdatePushRuleEnableStatusTask : Task<UpdatePushRuleEnableStatusTask.Params, Unit> {
-    data class Params(val kind: RuleKind,
-                      val pushRule: PushRule,
-                      val enabled: Boolean)
+    data class Params(
+            val kind: RuleKind,
+            val pushRule: PushRule,
+            val enabled: Boolean
+    )
 }
 
 internal class DefaultUpdatePushRuleEnableStatusTask @Inject constructor(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
index 7326adee4c..abea2d34cd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
@@ -23,6 +23,7 @@ import org.matrix.android.sdk.api.session.room.accountdata.RoomAccountDataServic
 import org.matrix.android.sdk.api.session.room.alias.AliasService
 import org.matrix.android.sdk.api.session.room.call.RoomCallService
 import org.matrix.android.sdk.api.session.room.crypto.RoomCryptoService
+import org.matrix.android.sdk.api.session.room.location.LocationSharingService
 import org.matrix.android.sdk.api.session.room.members.MembershipService
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.RoomType
@@ -69,6 +70,7 @@ internal class DefaultRoom(
         private val roomAccountDataService: RoomAccountDataService,
         private val roomVersionService: RoomVersionService,
         private val viaParameterFinder: ViaParameterFinder,
+        private val locationSharingService: LocationSharingService,
         override val coroutineDispatchers: MatrixCoroutineDispatchers
 ) : Room {
 
@@ -104,4 +106,5 @@ internal class DefaultRoom(
     override fun roomPushRuleService() = roomPushRuleService
     override fun roomAccountDataService() = roomAccountDataService
     override fun roomVersionService() = roomVersionService
+    override fun locationSharingService() = locationSharingService
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomDirectoryService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomDirectoryService.kt
index 7330c91c20..1edc4c1e66 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomDirectoryService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomDirectoryService.kt
@@ -35,8 +35,10 @@ internal class DefaultRoomDirectoryService @Inject constructor(
         private val roomAliasAvailabilityChecker: RoomAliasAvailabilityChecker
 ) : RoomDirectoryService {
 
-    override suspend fun getPublicRooms(server: String?,
-                                        publicRoomsParams: PublicRoomsParams): PublicRoomsResponse {
+    override suspend fun getPublicRooms(
+            server: String?,
+            publicRoomsParams: PublicRoomsParams
+    ): PublicRoomsResponse {
         return getPublicRoomTask.execute(GetPublicRoomTask.Params(server, publicRoomsParams))
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
index 8424ee8a36..5e6d052443 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
@@ -20,7 +20,6 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
 import androidx.paging.PagedList
 import com.zhuinden.monarchy.Monarchy
-import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.identity.model.SignInvitationResult
 import org.matrix.android.sdk.api.session.room.Room
@@ -91,18 +90,27 @@ internal class DefaultRoomService @Inject constructor(
         return roomSummaryDataSource.getRoomSummary(roomIdOrAlias)
     }
 
-    override fun getRoomSummaries(queryParams: RoomSummaryQueryParams,
-                                  sortOrder: RoomSortOrder): List<RoomSummary> {
+    override fun getRoomSummaryLive(roomId: String): LiveData<Optional<RoomSummary>> {
+        return roomSummaryDataSource.getRoomSummaryLive(roomId)
+    }
+
+    override fun getRoomSummaries(
+            queryParams: RoomSummaryQueryParams,
+            sortOrder: RoomSortOrder
+    ): List<RoomSummary> {
         return roomSummaryDataSource.getRoomSummaries(queryParams, sortOrder)
     }
 
     override fun refreshJoinedRoomSummaryPreviews(roomId: String?) {
-        val roomSummaries = getRoomSummaries(roomSummaryQueryParams {
-            if (roomId != null) {
-                this.roomId = QueryStringValue.Equals(roomId)
-            }
-            memberships = listOf(Membership.JOIN)
-        })
+        val roomSummaries = if (roomId == null) {
+            getRoomSummaries(roomSummaryQueryParams {
+                memberships = listOf(Membership.JOIN)
+            })
+        } else {
+            listOfNotNull(
+                    getRoomSummary(roomId)?.takeIf { it.membership == Membership.JOIN }
+            )
+        }
 
         if (roomSummaries.isNotEmpty()) {
             monarchy.runTransactionSync { realm ->
@@ -113,21 +121,28 @@ internal class DefaultRoomService @Inject constructor(
         }
     }
 
-    override fun getRoomSummariesLive(queryParams: RoomSummaryQueryParams,
-                                      sortOrder: RoomSortOrder): LiveData<List<RoomSummary>> {
+    override fun getRoomSummariesLive(
+            queryParams: RoomSummaryQueryParams,
+            sortOrder: RoomSortOrder
+    ): LiveData<List<RoomSummary>> {
         return roomSummaryDataSource.getRoomSummariesLive(queryParams, sortOrder)
     }
 
-    override fun getPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams,
-                                           pagedListConfig: PagedList.Config,
-                                           sortOrder: RoomSortOrder): LiveData<PagedList<RoomSummary>> {
+    override fun getPagedRoomSummariesLive(
+            queryParams: RoomSummaryQueryParams,
+            pagedListConfig: PagedList.Config,
+            sortOrder: RoomSortOrder
+    ): LiveData<PagedList<RoomSummary>> {
         return roomSummaryDataSource.getSortedPagedRoomSummariesLive(queryParams, pagedListConfig, sortOrder)
     }
 
-    override fun getFilteredPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams,
-                                                   pagedListConfig: PagedList.Config,
-                                                   sortOrder: RoomSortOrder): UpdatableLivePageResult {
-        return roomSummaryDataSource.getUpdatablePagedRoomSummariesLive(queryParams, pagedListConfig, sortOrder)
+    override fun getFilteredPagedRoomSummariesLive(
+            queryParams: RoomSummaryQueryParams,
+            pagedListConfig: PagedList.Config,
+            sortOrder: RoomSortOrder,
+            getFlattenParents: Boolean
+    ): UpdatableLivePageResult {
+        return roomSummaryDataSource.getUpdatablePagedRoomSummariesLive(queryParams, pagedListConfig, sortOrder, getFlattenParents)
     }
 
     override fun getRoomCountLive(queryParams: RoomSummaryQueryParams): LiveData<Int> {
@@ -154,9 +169,11 @@ internal class DefaultRoomService @Inject constructor(
         joinRoomTask.execute(JoinRoomTask.Params(roomIdOrAlias, reason, viaServers))
     }
 
-    override suspend fun joinRoom(roomId: String,
-                                  reason: String?,
-                                  thirdPartySigned: SignInvitationResult) {
+    override suspend fun joinRoom(
+            roomId: String,
+            reason: String?,
+            thirdPartySigned: SignInvitationResult
+    ) {
         joinRoomTask.execute(JoinRoomTask.Params(roomId, reason, thirdPartySigned = thirdPartySigned))
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
index 3efeef7688..5a794c6ba3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
@@ -258,7 +258,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
                         liveLocationAggregationProcessor.handleBeaconInfo(realm, event, it, roomId, isLocalEcho)
                     }
                 }
-                in EventType.BEACON_LOCATION_DATA -> {
+                in EventType.BEACON_LOCATION_DATA   -> {
                     handleBeaconLocationData(event, realm, roomId, isLocalEcho)
                 }
                 else                                -> Timber.v("UnHandled event ${event.eventId}")
@@ -271,12 +271,14 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
     // OPT OUT serer aggregation until API mature enough
     private val SHOULD_HANDLE_SERVER_AGREGGATION = false // should be true to work with e2e
 
-    private fun handleReplace(realm: Realm,
-                              event: Event,
-                              content: MessageContent,
-                              roomId: String,
-                              isLocalEcho: Boolean,
-                              relatedEventId: String? = null) {
+    private fun handleReplace(
+            realm: Realm,
+            event: Event,
+            content: MessageContent,
+            roomId: String,
+            isLocalEcho: Boolean,
+            relatedEventId: String? = null
+    ) {
         val eventId = event.eventId ?: return
         val targetEventId = relatedEventId ?: content.relatesTo?.eventId ?: return
         val newContent = content.newContent ?: return
@@ -366,9 +368,11 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
      * @param replaceEvent The new event
      * @param editions list of edition of event
      */
-    private fun handleThreadSummaryEdition(editedEvent: EventEntity?,
-                                           replaceEvent: TimelineEventEntity?,
-                                           editions: List<EditionOfEvent>?) {
+    private fun handleThreadSummaryEdition(
+            editedEvent: EventEntity?,
+            replaceEvent: TimelineEventEntity?,
+            editions: List<EditionOfEvent>?
+    ) {
         replaceEvent ?: return
         editedEvent ?: return
         editedEvent.findRootThreadEvent()?.apply {
@@ -387,10 +391,12 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
                 ?.let { PowerLevelsHelper(it) }
     }
 
-    private fun handleInitialAggregatedRelations(realm: Realm,
-                                                 event: Event,
-                                                 roomId: String,
-                                                 aggregation: AggregatedAnnotation) {
+    private fun handleInitialAggregatedRelations(
+            realm: Realm,
+            event: Event,
+            roomId: String,
+            aggregation: AggregatedAnnotation
+    ) {
         if (SHOULD_HANDLE_SERVER_AGREGGATION) {
             aggregation.chunk?.forEach {
                 if (it.type == EventType.REACTION) {
@@ -412,10 +418,12 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
         }
     }
 
-    private fun handleReaction(realm: Realm,
-                               event: Event,
-                               roomId: String,
-                               isLocalEcho: Boolean) {
+    private fun handleReaction(
+            realm: Realm,
+            event: Event,
+            roomId: String,
+            isLocalEcho: Boolean
+    ) {
         val content = event.content.toModel<ReactionContent>()
         if (content == null) {
             Timber.e("Malformed reaction content ${event.content}")
@@ -480,9 +488,11 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
     /**
      * Called when an event is deleted.
      */
-    private fun handleRedactionOfReplace(realm: Realm,
-                                         redacted: EventEntity,
-                                         relatedEventId: String) {
+    private fun handleRedactionOfReplace(
+            realm: Realm,
+            redacted: EventEntity,
+            relatedEventId: String
+    ) {
         Timber.d("Handle redaction of m.replace")
         val eventSummary = EventAnnotationsSummaryEntity.where(realm, redacted.roomId, relatedEventId).findFirst()
         if (eventSummary == null) {
@@ -498,8 +508,10 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
         sourceToDiscard.deleteFromRealm()
     }
 
-    private fun handleReactionRedact(realm: Realm,
-                                     eventToPrune: EventEntity) {
+    private fun handleReactionRedact(
+            realm: Realm,
+            eventToPrune: EventEntity
+    ) {
         Timber.v("REDACTION of reaction ${eventToPrune.eventId}")
         // delete a reaction, need to update the annotation summary if any
         val reactionContent: ReactionContent = EventMapper.map(eventToPrune).content.toModel() ?: return
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
index ba7f4cf5ad..ac2880de69 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
@@ -58,8 +58,9 @@ internal interface RoomAPI {
      * Ref: https://matrix.org/docs/spec/client_server/r0.4.0.html#post-matrix-client-r0-publicrooms
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "publicRooms")
-    suspend fun publicRooms(@Query("server") server: String?,
-                            @Body publicRoomsParams: PublicRoomsParams
+    suspend fun publicRooms(
+            @Query("server") server: String?,
+            @Body publicRoomsParams: PublicRoomsParams
     ): PublicRoomsResponse
 
     /**
@@ -84,11 +85,12 @@ internal interface RoomAPI {
      * @param filter A JSON RoomEventFilter to filter returned events with. Optional.
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/messages")
-    suspend fun getRoomMessagesFrom(@Path("roomId") roomId: String,
-                                    @Query("from") from: String,
-                                    @Query("dir") dir: String,
-                                    @Query("limit") limit: Int?,
-                                    @Query("filter") filter: String?
+    suspend fun getRoomMessagesFrom(
+            @Path("roomId") roomId: String,
+            @Query("from") from: String,
+            @Query("dir") dir: String,
+            @Query("limit") limit: Int?,
+            @Query("filter") filter: String?
     ): PaginationResponse
 
     /**
@@ -100,10 +102,11 @@ internal interface RoomAPI {
      * @param notMembership to exclude one type of membership (optional)
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/members")
-    suspend fun getMembers(@Path("roomId") roomId: String,
-                           @Query("at") syncToken: String?,
-                           @Query("membership") membership: Membership?,
-                           @Query("not_membership") notMembership: Membership?
+    suspend fun getMembers(
+            @Path("roomId") roomId: String,
+            @Query("at") syncToken: String?,
+            @Query("membership") membership: Membership?,
+            @Query("not_membership") notMembership: Membership?
     ): RoomMembersResponse
 
     /**
@@ -115,10 +118,11 @@ internal interface RoomAPI {
      * @param content the event content
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/send/{eventType}/{txId}")
-    suspend fun send(@Path("txId") txId: String,
-                     @Path("roomId") roomId: String,
-                     @Path("eventType") eventType: String,
-                     @Body content: Content?
+    suspend fun send(
+            @Path("txId") txId: String,
+            @Path("roomId") roomId: String,
+            @Path("eventType") eventType: String,
+            @Body content: Content?
     ): SendResponse
 
     /**
@@ -130,10 +134,12 @@ internal interface RoomAPI {
      * @param filter A JSON RoomEventFilter to filter returned events with. Optional.
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/context/{eventId}")
-    suspend fun getContextOfEvent(@Path("roomId") roomId: String,
-                                  @Path("eventId") eventId: String,
-                                  @Query("limit") limit: Int,
-                                  @Query("filter") filter: String? = null): EventContextResponse
+    suspend fun getContextOfEvent(
+            @Path("roomId") roomId: String,
+            @Path("eventId") eventId: String,
+            @Query("limit") limit: Int,
+            @Query("filter") filter: String? = null
+    ): EventContextResponse
 
     /**
      * Retrieve an event from its room id / events id.
@@ -142,8 +148,10 @@ internal interface RoomAPI {
      * @param eventId the event Id
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/event/{eventId}")
-    suspend fun getEvent(@Path("roomId") roomId: String,
-                         @Path("eventId") eventId: String): Event
+    suspend fun getEvent(
+            @Path("roomId") roomId: String,
+            @Path("eventId") eventId: String
+    ): Event
 
     /**
      * Send read markers.
@@ -152,17 +160,21 @@ internal interface RoomAPI {
      * @param markers the read markers
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/read_markers")
-    suspend fun sendReadMarker(@Path("roomId") roomId: String,
-                               @Body markers: Map<String, String>)
+    suspend fun sendReadMarker(
+            @Path("roomId") roomId: String,
+            @Body markers: Map<String, String>
+    )
 
     /**
      * Send receipt to a room.
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/receipt/{receiptType}/{eventId}")
-    suspend fun sendReceipt(@Path("roomId") roomId: String,
-                            @Path("receiptType") receiptType: String,
-                            @Path("eventId") eventId: String,
-                            @Body body: JsonDict = emptyMap())
+    suspend fun sendReceipt(
+            @Path("roomId") roomId: String,
+            @Path("receiptType") receiptType: String,
+            @Path("eventId") eventId: String,
+            @Body body: JsonDict = emptyMap()
+    )
 
     /**
      * Invite a user to the given room.
@@ -172,8 +184,10 @@ internal interface RoomAPI {
      * @param body a object that just contains a user id
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/invite")
-    suspend fun invite(@Path("roomId") roomId: String,
-                       @Body body: InviteBody)
+    suspend fun invite(
+            @Path("roomId") roomId: String,
+            @Body body: InviteBody
+    )
 
     /**
      * Invite a user to a room, using a ThreePid
@@ -182,8 +196,10 @@ internal interface RoomAPI {
      * @param body the Json body
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/invite")
-    suspend fun invite3pid(@Path("roomId") roomId: String,
-                           @Body body: ThreePidInviteBody)
+    suspend fun invite3pid(
+            @Path("roomId") roomId: String,
+            @Body body: ThreePidInviteBody
+    )
 
     /**
      * Send a generic state event.
@@ -193,9 +209,10 @@ internal interface RoomAPI {
      * @param params the request parameters
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/state/{state_event_type}")
-    suspend fun sendStateEvent(@Path("roomId") roomId: String,
-                               @Path("state_event_type") stateEventType: String,
-                               @Body params: JsonDict
+    suspend fun sendStateEvent(
+            @Path("roomId") roomId: String,
+            @Path("state_event_type") stateEventType: String,
+            @Body params: JsonDict
     ): SendResponse
 
     /**
@@ -207,10 +224,11 @@ internal interface RoomAPI {
      * @param params the request parameters
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/state/{state_event_type}/{state_key}")
-    suspend fun sendStateEvent(@Path("roomId") roomId: String,
-                               @Path("state_event_type") stateEventType: String,
-                               @Path("state_key") stateKey: String,
-                               @Body params: JsonDict
+    suspend fun sendStateEvent(
+            @Path("roomId") roomId: String,
+            @Path("state_event_type") stateEventType: String,
+            @Path("state_key") stateKey: String,
+            @Body params: JsonDict
     ): SendResponse
 
     /**
@@ -231,13 +249,14 @@ internal interface RoomAPI {
      * @param limit max number of Event to retrieve
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "rooms/{roomId}/relations/{eventId}/{relationType}/{eventType}")
-    suspend fun getRelations(@Path("roomId") roomId: String,
-                             @Path("eventId") eventId: String,
-                             @Path("relationType") relationType: String,
-                             @Path("eventType") eventType: String,
-                             @Query("from") from: String? = null,
-                             @Query("to") to: String? = null,
-                             @Query("limit") limit: Int? = null
+    suspend fun getRelations(
+            @Path("roomId") roomId: String,
+            @Path("eventId") eventId: String,
+            @Path("relationType") relationType: String,
+            @Path("eventType") eventType: String,
+            @Query("from") from: String? = null,
+            @Query("to") to: String? = null,
+            @Query("limit") limit: Int? = null
     ): RelationsResponse
 
     /**
@@ -251,12 +270,13 @@ internal interface RoomAPI {
      * @param limit max number of Event to retrieve
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "rooms/{roomId}/relations/{eventId}/{relationType}")
-    suspend fun getThreadsRelations(@Path("roomId") roomId: String,
-                                    @Path("eventId") eventId: String,
-                                    @Path("relationType") relationType: String = RelationType.THREAD,
-                                    @Query("from") from: String? = null,
-                                    @Query("to") to: String? = null,
-                                    @Query("limit") limit: Int? = null
+    suspend fun getThreadsRelations(
+            @Path("roomId") roomId: String,
+            @Path("eventId") eventId: String,
+            @Path("relationType") relationType: String = RelationType.THREAD,
+            @Query("from") from: String? = null,
+            @Query("to") to: String? = null,
+            @Query("limit") limit: Int? = null
     ): RelationsResponse
 
     /**
@@ -267,9 +287,11 @@ internal interface RoomAPI {
      * @param params the request body
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "join/{roomIdOrAlias}")
-    suspend fun join(@Path("roomIdOrAlias") roomIdOrAlias: String,
-                     @Query("server_name") viaServers: List<String>,
-                     @Body params: JsonDict): JoinRoomResponse
+    suspend fun join(
+            @Path("roomIdOrAlias") roomIdOrAlias: String,
+            @Query("server_name") viaServers: List<String>,
+            @Body params: JsonDict
+    ): JoinRoomResponse
 
     /**
      * Leave the given room.
@@ -278,8 +300,10 @@ internal interface RoomAPI {
      * @param params the request body
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/leave")
-    suspend fun leave(@Path("roomId") roomId: String,
-                      @Body params: Map<String, String?>)
+    suspend fun leave(
+            @Path("roomId") roomId: String,
+            @Body params: Map<String, String?>
+    )
 
     /**
      * Ban a user from the given room.
@@ -288,8 +312,10 @@ internal interface RoomAPI {
      * @param userIdAndReason the banned user object (userId and reason for ban)
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/ban")
-    suspend fun ban(@Path("roomId") roomId: String,
-                    @Body userIdAndReason: UserIdAndReason)
+    suspend fun ban(
+            @Path("roomId") roomId: String,
+            @Body userIdAndReason: UserIdAndReason
+    )
 
     /**
      * unban a user from the given room.
@@ -298,8 +324,10 @@ internal interface RoomAPI {
      * @param userIdAndReason the unbanned user object (userId and reason for unban)
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/unban")
-    suspend fun unban(@Path("roomId") roomId: String,
-                      @Body userIdAndReason: UserIdAndReason)
+    suspend fun unban(
+            @Path("roomId") roomId: String,
+            @Body userIdAndReason: UserIdAndReason
+    )
 
     /**
      * Kick a user from the given room.
@@ -308,8 +336,10 @@ internal interface RoomAPI {
      * @param userIdAndReason the kicked user object (userId and reason for kicking)
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/kick")
-    suspend fun kick(@Path("roomId") roomId: String,
-                     @Body userIdAndReason: UserIdAndReason)
+    suspend fun kick(
+            @Path("roomId") roomId: String,
+            @Body userIdAndReason: UserIdAndReason
+    )
 
     /**
      * Strips all information out of an event which isn't critical to the integrity of the server-side representation of the room.
@@ -337,9 +367,11 @@ internal interface RoomAPI {
      * @param body body containing score and reason
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/report/{eventId}")
-    suspend fun reportContent(@Path("roomId") roomId: String,
-                              @Path("eventId") eventId: String,
-                              @Body body: ReportContentBody)
+    suspend fun reportContent(
+            @Path("roomId") roomId: String,
+            @Path("eventId") eventId: String,
+            @Body body: ReportContentBody
+    )
 
     /**
      * Get a list of aliases maintained by the local server for the given room.
@@ -352,9 +384,11 @@ internal interface RoomAPI {
      * Inform that the user is starting to type or has stopped typing.
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/typing/{userId}")
-    suspend fun sendTypingState(@Path("roomId") roomId: String,
-                                @Path("userId") userId: String,
-                                @Body body: TypingBody)
+    suspend fun sendTypingState(
+            @Path("roomId") roomId: String,
+            @Path("userId") userId: String,
+            @Body body: TypingBody
+    )
 
     /*
      * Room tagging
@@ -364,27 +398,33 @@ internal interface RoomAPI {
      * Add a tag to a room.
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "user/{userId}/rooms/{roomId}/tags/{tag}")
-    suspend fun putTag(@Path("userId") userId: String,
-                       @Path("roomId") roomId: String,
-                       @Path("tag") tag: String,
-                       @Body body: TagBody)
+    suspend fun putTag(
+            @Path("userId") userId: String,
+            @Path("roomId") roomId: String,
+            @Path("tag") tag: String,
+            @Body body: TagBody
+    )
 
     /**
      * Delete a tag from a room.
      */
     @DELETE(NetworkConstants.URI_API_PREFIX_PATH_R0 + "user/{userId}/rooms/{roomId}/tags/{tag}")
-    suspend fun deleteTag(@Path("userId") userId: String,
-                          @Path("roomId") roomId: String,
-                          @Path("tag") tag: String)
+    suspend fun deleteTag(
+            @Path("userId") userId: String,
+            @Path("roomId") roomId: String,
+            @Path("tag") tag: String
+    )
 
     /**
      * Set an AccountData event to the room.
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "user/{userId}/rooms/{roomId}/account_data/{type}")
-    suspend fun setRoomAccountData(@Path("userId") userId: String,
-                                   @Path("roomId") roomId: String,
-                                   @Path("type") type: String,
-                                   @Body content: JsonDict)
+    suspend fun setRoomAccountData(
+            @Path("userId") userId: String,
+            @Path("roomId") roomId: String,
+            @Path("type") type: String,
+            @Body content: JsonDict
+    )
 
     /**
      * Upgrades the given room to a particular room version.
@@ -394,8 +434,10 @@ internal interface RoomAPI {
      * 403: The user is not permitted to upgrade the room.(M_FORBIDDEN)
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/upgrade")
-    suspend fun upgradeRoom(@Path("roomId") roomId: String,
-                            @Body body: RoomUpgradeBody): RoomUpgradeResponse
+    suspend fun upgradeRoom(
+            @Path("roomId") roomId: String,
+            @Body body: RoomUpgradeBody
+    ): RoomUpgradeResponse
 
     /**
      * The API returns the summary of the specified room, if the room could be found and the client should be able to view
@@ -404,6 +446,8 @@ internal interface RoomAPI {
      * https://github.com/deepbluev7/matrix-doc/blob/room-summaries/proposals/3266-room-summary.md
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "im.nheko.summary/rooms/{roomIdOrAlias}/summary")
-    suspend fun getRoomSummary(@Path("roomIdOrAlias") roomidOrAlias: String,
-                               @Query("via") viaServers: List<String>?): RoomStrippedState
+    suspend fun getRoomSummary(
+            @Path("roomIdOrAlias") roomidOrAlias: String,
+            @Query("via") viaServers: List<String>?
+    ): RoomStrippedState
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt
index 01c4fd1501..ffe7679575 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt
@@ -25,6 +25,7 @@ import org.matrix.android.sdk.internal.session.room.alias.DefaultAliasService
 import org.matrix.android.sdk.internal.session.room.call.DefaultRoomCallService
 import org.matrix.android.sdk.internal.session.room.crypto.DefaultRoomCryptoService
 import org.matrix.android.sdk.internal.session.room.draft.DefaultDraftService
+import org.matrix.android.sdk.internal.session.room.location.DefaultLocationSharingService
 import org.matrix.android.sdk.internal.session.room.membership.DefaultMembershipService
 import org.matrix.android.sdk.internal.session.room.notification.DefaultRoomPushRuleService
 import org.matrix.android.sdk.internal.session.room.read.DefaultReadService
@@ -69,6 +70,7 @@ internal class DefaultRoomFactory @Inject constructor(
         private val roomVersionServiceFactory: DefaultRoomVersionService.Factory,
         private val roomAccountDataServiceFactory: DefaultRoomAccountDataService.Factory,
         private val viaParameterFinder: ViaParameterFinder,
+        private val locationSharingServiceFactory: DefaultLocationSharingService.Factory,
         private val coroutineDispatchers: MatrixCoroutineDispatchers
 ) : RoomFactory {
 
@@ -96,6 +98,7 @@ internal class DefaultRoomFactory @Inject constructor(
                 roomAccountDataService = roomAccountDataServiceFactory.create(roomId),
                 roomVersionService = roomVersionServiceFactory.create(roomId),
                 viaParameterFinder = viaParameterFinder,
+                locationSharingService = locationSharingServiceFactory.create(roomId),
                 coroutineDispatchers = coroutineDispatchers
         )
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/accountdata/DefaultRoomAccountDataService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/accountdata/DefaultRoomAccountDataService.kt
index caeeb3bf53..aea786b46b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/accountdata/DefaultRoomAccountDataService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/accountdata/DefaultRoomAccountDataService.kt
@@ -25,9 +25,10 @@ import org.matrix.android.sdk.api.session.room.accountdata.RoomAccountDataEvent
 import org.matrix.android.sdk.api.session.room.accountdata.RoomAccountDataService
 import org.matrix.android.sdk.api.util.Optional
 
-internal class DefaultRoomAccountDataService @AssistedInject constructor(@Assisted private val roomId: String,
-                                                                         private val dataSource: RoomAccountDataDataSource,
-                                                                         private val updateRoomAccountDataTask: UpdateRoomAccountDataTask
+internal class DefaultRoomAccountDataService @AssistedInject constructor(
+        @Assisted private val roomId: String,
+        private val dataSource: RoomAccountDataDataSource,
+        private val updateRoomAccountDataTask: UpdateRoomAccountDataTask
 ) : RoomAccountDataService {
 
     @AssistedFactory
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/accountdata/RoomAccountDataDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/accountdata/RoomAccountDataDataSource.kt
index d5a110dfc2..5196f004ea 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/accountdata/RoomAccountDataDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/accountdata/RoomAccountDataDataSource.kt
@@ -33,9 +33,11 @@ import org.matrix.android.sdk.internal.database.model.RoomEntityFields
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import javax.inject.Inject
 
-internal class RoomAccountDataDataSource @Inject constructor(@SessionDatabase private val monarchy: Monarchy,
-                                                             private val realmSessionProvider: RealmSessionProvider,
-                                                             private val accountDataMapper: AccountDataMapper) {
+internal class RoomAccountDataDataSource @Inject constructor(
+        @SessionDatabase private val monarchy: Monarchy,
+        private val realmSessionProvider: RealmSessionProvider,
+        private val accountDataMapper: AccountDataMapper
+) {
 
     fun getAccountDataEvent(roomId: String, type: String): RoomAccountDataEvent? {
         return getAccountDataEvents(roomId, setOf(type)).firstOrNull()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/livelocation/DeactivateLiveLocationShareWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/livelocation/DeactivateLiveLocationShareWorker.kt
new file mode 100644
index 0000000000..b17753b25a
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/livelocation/DeactivateLiveLocationShareWorker.kt
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.room.aggregation.livelocation
+
+import android.content.Context
+import androidx.work.WorkerParameters
+import com.squareup.moshi.JsonClass
+import io.realm.RealmConfiguration
+import org.matrix.android.sdk.api.util.md5
+import org.matrix.android.sdk.internal.SessionManager
+import org.matrix.android.sdk.internal.database.awaitTransaction
+import org.matrix.android.sdk.internal.database.model.livelocation.LiveLocationShareAggregatedSummaryEntity
+import org.matrix.android.sdk.internal.database.query.get
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.session.SessionComponent
+import org.matrix.android.sdk.internal.worker.SessionSafeCoroutineWorker
+import org.matrix.android.sdk.internal.worker.SessionWorkerParams
+import timber.log.Timber
+import javax.inject.Inject
+
+/**
+ * Worker dedicated to update live location summary data so that it is considered as deactivated.
+ * For the context: it is needed since a live location share should be deactivated after a certain timeout.
+ */
+internal class DeactivateLiveLocationShareWorker(context: Context, params: WorkerParameters, sessionManager: SessionManager) :
+        SessionSafeCoroutineWorker<DeactivateLiveLocationShareWorker.Params>(
+                context,
+                params,
+                sessionManager,
+                Params::class.java
+        ) {
+
+    @JsonClass(generateAdapter = true)
+    internal data class Params(
+            override val sessionId: String,
+            override val lastFailureMessage: String? = null,
+            val eventId: String,
+            val roomId: String
+    ) : SessionWorkerParams
+
+    @SessionDatabase
+    @Inject lateinit var realmConfiguration: RealmConfiguration
+
+    override fun injectWith(injector: SessionComponent) {
+        injector.inject(this)
+    }
+
+    override suspend fun doSafeWork(params: Params): Result {
+        return runCatching {
+            deactivateLiveLocationShare(params)
+        }.fold(
+                onSuccess = {
+                    Result.success()
+                },
+                onFailure = {
+                    Timber.e("failed to deactivate live, eventId: ${params.eventId}, roomId: ${params.roomId}")
+                    Result.failure()
+                }
+        )
+    }
+
+    private suspend fun deactivateLiveLocationShare(params: Params) {
+        awaitTransaction(realmConfiguration) { realm ->
+            Timber.d("deactivating live with id=${params.eventId}")
+            val aggregatedSummary = LiveLocationShareAggregatedSummaryEntity.get(
+                    realm = realm,
+                    roomId = params.roomId,
+                    eventId = params.eventId
+            )
+            aggregatedSummary?.isActive = false
+        }
+    }
+
+    override fun buildErrorParams(params: Params, message: String): Params {
+        return params.copy(lastFailureMessage = params.lastFailureMessage ?: message)
+    }
+
+    companion object {
+        fun getWorkName(eventId: String, roomId: String): String {
+            val hash = "$eventId$roomId".md5()
+            return "DeactivateLiveLocationWork-$hash"
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/livelocation/LiveLocationAggregationProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/livelocation/LiveLocationAggregationProcessor.kt
index 76b7a4ec8e..05bde8f83f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/livelocation/LiveLocationAggregationProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/livelocation/LiveLocationAggregationProcessor.kt
@@ -16,6 +16,7 @@
 
 package org.matrix.android.sdk.internal.session.room.aggregation.livelocation
 
+import androidx.work.ExistingWorkPolicy
 import io.realm.Realm
 import org.matrix.android.sdk.api.extensions.orTrue
 import org.matrix.android.sdk.api.session.events.model.Event
@@ -25,18 +26,30 @@ import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconInfoCo
 import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconLocationDataContent
 import org.matrix.android.sdk.internal.database.mapper.ContentMapper
 import org.matrix.android.sdk.internal.database.model.livelocation.LiveLocationShareAggregatedSummaryEntity
+import org.matrix.android.sdk.internal.database.query.findActiveLiveInRoomForUser
 import org.matrix.android.sdk.internal.database.query.getOrCreate
+import org.matrix.android.sdk.internal.di.SessionId
+import org.matrix.android.sdk.internal.di.WorkManagerProvider
+import org.matrix.android.sdk.internal.util.time.Clock
+import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
 import timber.log.Timber
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
-internal class LiveLocationAggregationProcessor @Inject constructor() {
+// TODO add unit tests
+internal class LiveLocationAggregationProcessor @Inject constructor(
+        @SessionId private val sessionId: String,
+        private val workManagerProvider: WorkManagerProvider,
+        private val clock: Clock,
+) {
 
     fun handleBeaconInfo(realm: Realm, event: Event, content: MessageBeaconInfoContent, roomId: String, isLocalEcho: Boolean) {
         if (event.senderId.isNullOrEmpty() || isLocalEcho) {
             return
         }
 
-        val targetEventId = if (content.isLive.orTrue()) {
+        val isLive = content.isLive.orTrue()
+        val targetEventId = if (isLive) {
             event.eventId
         } else {
             // when live is set to false, we use the id of the event that should have been replaced
@@ -54,10 +67,47 @@ internal class LiveLocationAggregationProcessor @Inject constructor() {
                 eventId = targetEventId
         )
 
-        Timber.d("updating summary of id=$targetEventId with isLive=${content.isLive}")
+        // remote event can stay with isLive == true while the local summary is no more active
+        val isActive = aggregatedSummary.isActive.orTrue() && isLive
+        val endOfLiveTimestampMillis = content.getBestTimestampMillis()?.let { it + (content.timeout ?: 0) }
+        Timber.d("updating summary of id=$targetEventId with isActive=$isActive and endTimestamp=$endOfLiveTimestampMillis")
 
-        aggregatedSummary.endOfLiveTimestampMillis = content.getBestTimestampMillis()?.let { it + (content.timeout ?: 0) }
-        aggregatedSummary.isActive = content.isLive
+        aggregatedSummary.endOfLiveTimestampMillis = endOfLiveTimestampMillis
+        aggregatedSummary.isActive = isActive
+        aggregatedSummary.userId = event.senderId
+
+        deactivateAllPreviousBeacons(realm, roomId, event.senderId, targetEventId)
+
+        if (isActive) {
+            scheduleDeactivationAfterTimeout(targetEventId, roomId, endOfLiveTimestampMillis)
+        } else {
+            cancelDeactivationAfterTimeout(targetEventId, roomId)
+        }
+    }
+
+    private fun scheduleDeactivationAfterTimeout(eventId: String, roomId: String, endOfLiveTimestampMillis: Long?) {
+        endOfLiveTimestampMillis ?: return
+
+        val workParams = DeactivateLiveLocationShareWorker.Params(sessionId = sessionId, eventId = eventId, roomId = roomId)
+        val workData = WorkerParamsFactory.toData(workParams)
+        val workName = DeactivateLiveLocationShareWorker.getWorkName(eventId = eventId, roomId = roomId)
+        val workDelayMillis = (endOfLiveTimestampMillis - clock.epochMillis()).coerceAtLeast(0)
+        Timber.d("scheduling deactivation of $eventId after $workDelayMillis millis")
+        val workRequest = workManagerProvider.matrixOneTimeWorkRequestBuilder<DeactivateLiveLocationShareWorker>()
+                .setInitialDelay(workDelayMillis, TimeUnit.MILLISECONDS)
+                .setInputData(workData)
+                .build()
+
+        workManagerProvider.workManager.enqueueUniqueWork(
+                workName,
+                ExistingWorkPolicy.REPLACE,
+                workRequest
+        )
+    }
+
+    private fun cancelDeactivationAfterTimeout(eventId: String, roomId: String) {
+        val workName = DeactivateLiveLocationShareWorker.getWorkName(eventId = eventId, roomId = roomId)
+        workManagerProvider.workManager.cancelUniqueWork(workName)
     }
 
     fun handleBeaconLocationData(
@@ -95,5 +145,16 @@ internal class LiveLocationAggregationProcessor @Inject constructor() {
         }
     }
 
+    private fun deactivateAllPreviousBeacons(realm: Realm, roomId: String, userId: String, currentEventId: String) {
+        LiveLocationShareAggregatedSummaryEntity
+                .findActiveLiveInRoomForUser(
+                        realm = realm,
+                        roomId = roomId,
+                        userId = userId,
+                        ignoredEventId = currentEventId
+                )
+                .forEach { it.isActive = false }
+    }
+
     private fun Long.isMoreRecentThan(timestamp: Long) = this > timestamp
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/poll/DefaultPollAggregationProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/poll/DefaultPollAggregationProcessor.kt
index d4b414aaea..90d8e02c39 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/poll/DefaultPollAggregationProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/poll/DefaultPollAggregationProcessor.kt
@@ -193,8 +193,10 @@ class DefaultPollAggregationProcessor @Inject constructor() : PollAggregationPro
                 ?: EventAnnotationsSummaryEntity.create(realm, roomId, eventId)
     }
 
-    private fun getAggregatedPollSummaryEntity(realm: Realm,
-                                               eventAnnotationsSummaryEntity: EventAnnotationsSummaryEntity): PollResponseAggregatedSummaryEntity {
+    private fun getAggregatedPollSummaryEntity(
+            realm: Realm,
+            eventAnnotationsSummaryEntity: EventAnnotationsSummaryEntity
+    ): PollResponseAggregatedSummaryEntity {
         return eventAnnotationsSummaryEntity.pollResponseSummary
                 ?: realm.createObject(PollResponseAggregatedSummaryEntity::class.java).also {
                     eventAnnotationsSummaryEntity.pollResponseSummary = it
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DefaultDraftService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DefaultDraftService.kt
index 3867e0dc8d..1ea8addb20 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DefaultDraftService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DefaultDraftService.kt
@@ -26,9 +26,10 @@ import org.matrix.android.sdk.api.session.room.send.DraftService
 import org.matrix.android.sdk.api.session.room.send.UserDraft
 import org.matrix.android.sdk.api.util.Optional
 
-internal class DefaultDraftService @AssistedInject constructor(@Assisted private val roomId: String,
-                                                               private val draftRepository: DraftRepository,
-                                                               private val coroutineDispatchers: MatrixCoroutineDispatchers
+internal class DefaultDraftService @AssistedInject constructor(
+        @Assisted private val roomId: String,
+        private val draftRepository: DraftRepository,
+        private val coroutineDispatchers: MatrixCoroutineDispatchers
 ) : DraftService {
 
     @AssistedFactory
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DraftRepository.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DraftRepository.kt
index c8c52c4b23..b672ef7e46 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DraftRepository.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DraftRepository.kt
@@ -35,8 +35,10 @@ import org.matrix.android.sdk.internal.util.awaitTransaction
 import timber.log.Timber
 import javax.inject.Inject
 
-internal class DraftRepository @Inject constructor(@SessionDatabase private val monarchy: Monarchy,
-                                                   private val realmSessionProvider: RealmSessionProvider) {
+internal class DraftRepository @Inject constructor(
+        @SessionDatabase private val monarchy: Monarchy,
+        private val realmSessionProvider: RealmSessionProvider
+) {
 
     suspend fun saveDraft(roomId: String, userDraft: UserDraft) {
         monarchy.awaitTransaction {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/location/DefaultLocationSharingService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/location/DefaultLocationSharingService.kt
new file mode 100644
index 0000000000..8cf6fcdfbf
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/location/DefaultLocationSharingService.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.room.location
+
+import androidx.lifecycle.LiveData
+import com.zhuinden.monarchy.Monarchy
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import org.matrix.android.sdk.api.session.room.location.LocationSharingService
+import org.matrix.android.sdk.api.session.room.model.livelocation.LiveLocationShareAggregatedSummary
+import org.matrix.android.sdk.internal.database.mapper.LiveLocationShareAggregatedSummaryMapper
+import org.matrix.android.sdk.internal.database.model.livelocation.LiveLocationShareAggregatedSummaryEntity
+import org.matrix.android.sdk.internal.database.query.findRunningLiveInRoom
+import org.matrix.android.sdk.internal.di.SessionDatabase
+
+// TODO add unit tests
+internal class DefaultLocationSharingService @AssistedInject constructor(
+        @Assisted private val roomId: String,
+        @SessionDatabase private val monarchy: Monarchy,
+        private val liveLocationShareAggregatedSummaryMapper: LiveLocationShareAggregatedSummaryMapper,
+) : LocationSharingService {
+
+    @AssistedFactory
+    interface Factory {
+        fun create(roomId: String): DefaultLocationSharingService
+    }
+
+    override fun getRunningLiveLocationShareSummaries(): LiveData<List<LiveLocationShareAggregatedSummary>> {
+        return monarchy.findAllMappedWithChanges(
+                { LiveLocationShareAggregatedSummaryEntity.findRunningLiveInRoom(it, roomId = roomId) },
+                { liveLocationShareAggregatedSummaryMapper.map(it) }
+        )
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
index 9e672dcc5c..23d7e0fc51 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
@@ -158,8 +158,10 @@ internal class RoomDisplayNameResolver @Inject constructor(
     }
 
     /** See [org.matrix.android.sdk.api.session.room.sender.SenderInfo.disambiguatedDisplayName]. */
-    private fun resolveRoomMemberName(roomMemberSummary: RoomMemberSummaryEntity,
-                                      roomMemberHelper: RoomMemberHelper): String {
+    private fun resolveRoomMemberName(
+            roomMemberSummary: RoomMemberSummaryEntity,
+            roomMemberHelper: RoomMemberHelper
+    ): String {
         val isUnique = roomMemberHelper.isUniqueDisplayName(roomMemberSummary.displayName)
         return if (isUnique) {
             displayNameResolver.getBestName(roomMemberSummary.toMatrixItem())
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt
index a1b30a0be5..1e36e9c6da 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt
@@ -34,11 +34,13 @@ internal class RoomMemberEventHandler @Inject constructor(
         @UserId private val myUserId: String
 ) {
 
-    fun handle(realm: Realm,
-               roomId: String,
-               event: Event,
-               isInitialSync: Boolean,
-               aggregator: SyncResponsePostTreatmentAggregator? = null): Boolean {
+    fun handle(
+            realm: Realm,
+            roomId: String,
+            event: Event,
+            isInitialSync: Boolean,
+            aggregator: SyncResponsePostTreatmentAggregator? = null
+    ): Boolean {
         if (event.type != EventType.STATE_ROOM_MEMBER) {
             return false
         }
@@ -59,12 +61,14 @@ internal class RoomMemberEventHandler @Inject constructor(
         }
     }
 
-    private fun handleInitialSync(realm: Realm,
-                                  roomId: String,
-                                  currentUserId: String,
-                                  eventUserId: String,
-                                  roomMember: RoomMemberContent,
-                                  aggregator: SyncResponsePostTreatmentAggregator?): Boolean {
+    private fun handleInitialSync(
+            realm: Realm,
+            roomId: String,
+            currentUserId: String,
+            eventUserId: String,
+            roomMember: RoomMemberContent,
+            aggregator: SyncResponsePostTreatmentAggregator?
+    ): Boolean {
         if (currentUserId != eventUserId) {
             saveUserEntityLocallyIfNecessary(realm, eventUserId, roomMember)
         }
@@ -73,10 +77,12 @@ internal class RoomMemberEventHandler @Inject constructor(
         return true
     }
 
-    private fun saveRoomMemberEntityLocally(realm: Realm,
-                                            roomId: String,
-                                            userId: String,
-                                            roomMember: RoomMemberContent) {
+    private fun saveRoomMemberEntityLocally(
+            realm: Realm,
+            roomId: String,
+            userId: String,
+            roomMember: RoomMemberContent
+    ) {
         val roomMemberEntity = RoomMemberEntityFactory.create(
                 roomId,
                 userId,
@@ -96,9 +102,11 @@ internal class RoomMemberEventHandler @Inject constructor(
         return RoomMemberSummaryEntity.where(realm, roomId, userId).findFirst()?.userPresenceEntity
     }
 
-    private fun saveUserEntityLocallyIfNecessary(realm: Realm,
-                                                 userId: String,
-                                                 roomMember: RoomMemberContent) {
+    private fun saveUserEntityLocallyIfNecessary(
+            realm: Realm,
+            userId: String,
+            roomMember: RoomMemberContent
+    ) {
         if (roomMember.membership.isActive()) {
             saveUserLocally(realm, userId, roomMember)
         }
@@ -109,9 +117,11 @@ internal class RoomMemberEventHandler @Inject constructor(
         realm.insertOrUpdate(userEntity)
     }
 
-    private fun updateDirectChatsIfNecessary(roomId: String,
-                                             roomMember: RoomMemberContent,
-                                             aggregator: SyncResponsePostTreatmentAggregator?) {
+    private fun updateDirectChatsIfNecessary(
+            roomId: String,
+            roomMember: RoomMemberContent,
+            aggregator: SyncResponsePostTreatmentAggregator?
+    ) {
         // check whether this new room member event may be used to update the directs dictionary in account data
         // this is required to handle correctly invite by email in DM
         val mxId = roomMember.thirdPartyInvite?.signed?.mxid
@@ -120,12 +130,14 @@ internal class RoomMemberEventHandler @Inject constructor(
         }
     }
 
-    private fun handleIncrementalSync(realm: Realm,
-                                      roomId: String,
-                                      eventUserId: String,
-                                      roomMember: RoomMemberContent,
-                                      prevContent: Content?,
-                                      aggregator: SyncResponsePostTreatmentAggregator?): Boolean {
+    private fun handleIncrementalSync(
+            realm: Realm,
+            roomId: String,
+            eventUserId: String,
+            roomMember: RoomMemberContent,
+            prevContent: Content?,
+            aggregator: SyncResponsePostTreatmentAggregator?
+    ): Boolean {
         if (aggregator != null) {
             val previousDisplayName = prevContent?.get("displayname") as? String
             val previousAvatar = prevContent?.get("avatar_url") as? String
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberHelper.kt
index 40228fe8c9..7da12a75de 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberHelper.kt
@@ -33,8 +33,9 @@ import org.matrix.android.sdk.internal.database.query.where
  * It allows to get the live membership of a user.
  */
 
-internal class RoomMemberHelper(private val realm: Realm,
-                                private val roomId: String
+internal class RoomMemberHelper(
+        private val realm: Realm,
+        private val roomId: String
 ) {
 
     private val roomSummary: RoomSummaryEntity? by lazy {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/DefaultRoomPushRuleService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/DefaultRoomPushRuleService.kt
index 85f53e1346..d46100a3a8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/DefaultRoomPushRuleService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/DefaultRoomPushRuleService.kt
@@ -29,9 +29,11 @@ import org.matrix.android.sdk.internal.database.model.PushRuleEntity
 import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.di.SessionDatabase
 
-internal class DefaultRoomPushRuleService @AssistedInject constructor(@Assisted private val roomId: String,
-                                                                      private val setRoomNotificationStateTask: SetRoomNotificationStateTask,
-                                                                      @SessionDatabase private val monarchy: Monarchy) :
+internal class DefaultRoomPushRuleService @AssistedInject constructor(
+        @Assisted private val roomId: String,
+        private val setRoomNotificationStateTask: SetRoomNotificationStateTask,
+        @SessionDatabase private val monarchy: Monarchy
+) :
         RoomPushRuleService {
 
     @AssistedFactory
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/SetRoomNotificationStateTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/SetRoomNotificationStateTask.kt
index 021d7dbefb..3d51d19cba 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/SetRoomNotificationStateTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/SetRoomNotificationStateTask.kt
@@ -35,9 +35,11 @@ internal interface SetRoomNotificationStateTask : Task<SetRoomNotificationStateT
     )
 }
 
-internal class DefaultSetRoomNotificationStateTask @Inject constructor(@SessionDatabase private val monarchy: Monarchy,
-                                                                       private val removePushRuleTask: RemovePushRuleTask,
-                                                                       private val addPushRuleTask: AddPushRuleTask) :
+internal class DefaultSetRoomNotificationStateTask @Inject constructor(
+        @SessionDatabase private val monarchy: Monarchy,
+        private val removePushRuleTask: RemovePushRuleTask,
+        private val addPushRuleTask: AddPushRuleTask
+) :
         SetRoomNotificationStateTask {
 
     override suspend fun execute(params: SetRoomNotificationStateTask.Params) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
index 7b68e2a74c..9839a44427 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
@@ -92,25 +92,31 @@ internal class DefaultRelationService @AssistedInject constructor(
         }
     }
 
-    override fun editPoll(targetEvent: TimelineEvent,
-                          pollType: PollType,
-                          question: String,
-                          options: List<String>): Cancelable {
+    override fun editPoll(
+            targetEvent: TimelineEvent,
+            pollType: PollType,
+            question: String,
+            options: List<String>
+    ): Cancelable {
         return eventEditor.editPoll(targetEvent, pollType, question, options)
     }
 
-    override fun editTextMessage(targetEvent: TimelineEvent,
-                                 msgType: String,
-                                 newBodyText: CharSequence,
-                                 newBodyAutoMarkdown: Boolean,
-                                 compatibilityBodyText: String): Cancelable {
+    override fun editTextMessage(
+            targetEvent: TimelineEvent,
+            msgType: String,
+            newBodyText: CharSequence,
+            newBodyAutoMarkdown: Boolean,
+            compatibilityBodyText: String
+    ): Cancelable {
         return eventEditor.editTextMessage(targetEvent, msgType, newBodyText, newBodyAutoMarkdown, compatibilityBodyText)
     }
 
-    override fun editReply(replyToEdit: TimelineEvent,
-                           originalTimelineEvent: TimelineEvent,
-                           newBodyText: String,
-                           compatibilityBodyText: String): Cancelable {
+    override fun editReply(
+            replyToEdit: TimelineEvent,
+            originalTimelineEvent: TimelineEvent,
+            newBodyText: String,
+            compatibilityBodyText: String
+    ): Cancelable {
         return eventEditor.editReply(replyToEdit, originalTimelineEvent, newBodyText, compatibilityBodyText)
     }
 
@@ -164,7 +170,8 @@ internal class DefaultRelationService @AssistedInject constructor(
             msgType: String,
             autoMarkdown: Boolean,
             formattedText: String?,
-            eventReplied: TimelineEvent?): Cancelable? {
+            eventReplied: TimelineEvent?
+    ): Cancelable? {
         val event = if (eventReplied != null) {
             // Reply within a thread
             eventFactory.createReplyTextEvent(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/EventEditor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/EventEditor.kt
index 7bf7d6b587..795e9003ce 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/EventEditor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/EventEditor.kt
@@ -38,11 +38,13 @@ internal class EventEditor @Inject constructor(
         private val clock: Clock,
 ) {
 
-    fun editTextMessage(targetEvent: TimelineEvent,
-                        msgType: String,
-                        newBodyText: CharSequence,
-                        newBodyAutoMarkdown: Boolean,
-                        compatibilityBodyText: String): Cancelable {
+    fun editTextMessage(
+            targetEvent: TimelineEvent,
+            msgType: String,
+            newBodyText: CharSequence,
+            newBodyAutoMarkdown: Boolean,
+            compatibilityBodyText: String
+    ): Cancelable {
         val roomId = targetEvent.roomId
         if (targetEvent.root.sendState.hasFailed()) {
             // We create a new in memory event for the EventSenderProcessor but we keep the eventId of the failed event.
@@ -61,10 +63,12 @@ internal class EventEditor @Inject constructor(
         }
     }
 
-    fun editPoll(targetEvent: TimelineEvent,
-                 pollType: PollType,
-                 question: String,
-                 options: List<String>): Cancelable {
+    fun editPoll(
+            targetEvent: TimelineEvent,
+            pollType: PollType,
+            question: String,
+            options: List<String>
+    ): Cancelable {
         val roomId = targetEvent.roomId
         if (targetEvent.root.sendState.hasFailed()) {
             val editedEvent = eventFactory.createPollEvent(roomId, pollType, question, options).copy(
@@ -92,10 +96,12 @@ internal class EventEditor @Inject constructor(
         return eventSenderProcessor.postEvent(editedEvent)
     }
 
-    fun editReply(replyToEdit: TimelineEvent,
-                  originalTimelineEvent: TimelineEvent,
-                  newBodyText: String,
-                  compatibilityBodyText: String): Cancelable {
+    fun editReply(
+            replyToEdit: TimelineEvent,
+            originalTimelineEvent: TimelineEvent,
+            newBodyText: String,
+            compatibilityBodyText: String
+    ): Cancelable {
         val roomId = replyToEdit.roomId
         if (replyToEdit.root.sendState.hasFailed()) {
             // We create a new in memory event for the EventSenderProcessor but we keep the eventId of the failed event.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FindReactionEventForUndoTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FindReactionEventForUndoTask.kt
index f7cfa3489d..585f896f32 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FindReactionEventForUndoTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FindReactionEventForUndoTask.kt
@@ -41,7 +41,8 @@ internal interface FindReactionEventForUndoTask : Task<FindReactionEventForUndoT
 
 internal class DefaultFindReactionEventForUndoTask @Inject constructor(
         @SessionDatabase private val monarchy: Monarchy,
-        @UserId private val userId: String) : FindReactionEventForUndoTask {
+        @UserId private val userId: String
+) : FindReactionEventForUndoTask {
 
     override suspend fun execute(params: FindReactionEventForUndoTask.Params): FindReactionEventForUndoTask.Result {
         val eventId = Realm.getInstance(monarchy.realmConfiguration).use { realm ->
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/UpdateQuickReactionTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/UpdateQuickReactionTask.kt
index d0ab430dad..24e8ba7f9e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/UpdateQuickReactionTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/UpdateQuickReactionTask.kt
@@ -41,8 +41,10 @@ internal interface UpdateQuickReactionTask : Task<UpdateQuickReactionTask.Params
     )
 }
 
-internal class DefaultUpdateQuickReactionTask @Inject constructor(@SessionDatabase private val monarchy: Monarchy,
-                                                                  @UserId private val userId: String) : UpdateQuickReactionTask {
+internal class DefaultUpdateQuickReactionTask @Inject constructor(
+        @SessionDatabase private val monarchy: Monarchy,
+        @UserId private val userId: String
+) : UpdateQuickReactionTask {
 
     override suspend fun execute(params: UpdateQuickReactionTask.Params): UpdateQuickReactionTask.Result {
         var res: Pair<String?, List<String>?>? = null
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadSummariesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadSummariesTask.kt
index c5f9bd13fd..254dee4295 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadSummariesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadSummariesTask.kt
@@ -77,8 +77,10 @@ internal class DefaultFetchThreadSummariesTask @Inject constructor(
         return handleResponse(response, params)
     }
 
-    private suspend fun handleResponse(response: PaginationResponse,
-                                       params: FetchThreadSummariesTask.Params): Result {
+    private suspend fun handleResponse(
+            response: PaginationResponse,
+            params: FetchThreadSummariesTask.Params
+    ): Result {
         val rootThreadList = response.events
         monarchy.awaitTransaction { realm ->
             val roomEntity = RoomEntity.where(realm, roomId = params.roomId).findFirst() ?: return@awaitTransaction
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadTimelineTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadTimelineTask.kt
index dabdd04f60..bad734173e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadTimelineTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadTimelineTask.kt
@@ -109,8 +109,10 @@ internal class DefaultFetchThreadTimelineTask @Inject constructor(
         return handleRelationsResponse(response, params)
     }
 
-    private suspend fun handleRelationsResponse(response: RelationsResponse,
-                                                params: FetchThreadTimelineTask.Params): Result {
+    private suspend fun handleRelationsResponse(
+            response: RelationsResponse,
+            params: FetchThreadTimelineTask.Params
+    ): Result {
         val threadList = response.chunks
         val threadRootEvent = response.originalEvent
         val hasReachEnd = response.nextBatch == null
@@ -232,9 +234,11 @@ internal class DefaultFetchThreadTimelineTask @Inject constructor(
         }
     }
 
-    private fun handleReaction(realm: Realm,
-                               event: Event,
-                               roomId: String) {
+    private fun handleReaction(
+            realm: Realm,
+            event: Event,
+            roomId: String
+    ) {
         val unsignedData = event.unsignedData ?: return
         val relatedEventId = event.eventId ?: return
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomChildRelationInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomChildRelationInfo.kt
index 5bad334afc..fffca96acf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomChildRelationInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomChildRelationInfo.kt
@@ -43,7 +43,6 @@ internal class RoomChildRelationInfo(
     data class SpaceChildInfo(
             val roomId: String,
             val order: String?,
-//            val autoJoin: Boolean,
             val viaServers: List<String>
     )
 
@@ -60,18 +59,13 @@ internal class RoomChildRelationInfo(
     fun getDirectChildrenDescriptions(): List<SpaceChildInfo> {
         return CurrentStateEventEntity.whereType(realm, roomId, EventType.STATE_SPACE_CHILD)
                 .findAll()
-//                .also {
-//                    Timber.v("## Space: Found ${it.count()} m.space.child state events for $roomId")
-//                }
                 .mapNotNull {
                     ContentMapper.map(it.root?.content).toModel<SpaceChildContent>()?.let { scc ->
-//                        Timber.v("## Space child desc state event $scc")
                         // Children where via is not present are ignored.
                         scc.via?.let { via ->
                             SpaceChildInfo(
                                     roomId = it.stateKey,
                                     order = scc.validOrder(),
-//                                    autoJoin = scc.autoJoin ?: false,
                                     viaServers = via
                             )
                         }
@@ -83,17 +77,13 @@ internal class RoomChildRelationInfo(
     fun getParentDescriptions(): List<SpaceParentInfo> {
         return CurrentStateEventEntity.whereType(realm, roomId, EventType.STATE_SPACE_PARENT)
                 .findAll()
-//                .also {
-//                    Timber.v("## Space: Found ${it.count()} m.space.parent state events for $roomId")
-//                }
                 .mapNotNull {
-                    ContentMapper.map(it.root?.content).toModel<SpaceParentContent>()?.let { scc ->
-//                        Timber.v("## Space parent desc state event $scc")
+                    ContentMapper.map(it.root?.content).toModel<SpaceParentContent>()?.let { spaceParentContent ->
                         // Parent where via is not present are ignored.
-                        scc.via?.let { via ->
+                        spaceParentContent.via?.let { via ->
                             SpaceParentInfo(
                                     roomId = it.stateKey,
-                                    canonical = scc.canonical ?: false,
+                                    canonical = spaceParentContent.canonical ?: false,
                                     viaServers = via,
                                     stateEventSender = it.root?.sender ?: ""
                             )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/DefaultReportingService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/DefaultReportingService.kt
index c961f718ef..1e32bf5e16 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/DefaultReportingService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/DefaultReportingService.kt
@@ -21,8 +21,9 @@ import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import org.matrix.android.sdk.api.session.room.reporting.ReportingService
 
-internal class DefaultReportingService @AssistedInject constructor(@Assisted private val roomId: String,
-                                                                   private val reportContentTask: ReportContentTask
+internal class DefaultReportingService @AssistedInject constructor(
+        @Assisted private val roomId: String,
+        private val reportContentTask: ReportContentTask
 ) : ReportingService {
 
     @AssistedFactory
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
index 8529365858..ffca0204a8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
@@ -265,10 +265,11 @@ internal class DefaultSendService @AssistedInject constructor(
         }
     }
 
-    override fun sendMedias(attachments: List<ContentAttachmentData>,
-                            compressBeforeSending: Boolean,
-                            roomIds: Set<String>,
-                            rootThreadEventId: String?
+    override fun sendMedias(
+            attachments: List<ContentAttachmentData>,
+            compressBeforeSending: Boolean,
+            roomIds: Set<String>,
+            rootThreadEventId: String?
     ): Cancelable {
         return attachments.mapTo(CancelableBag()) {
             sendMedia(
@@ -280,10 +281,11 @@ internal class DefaultSendService @AssistedInject constructor(
         }
     }
 
-    override fun sendMedia(attachment: ContentAttachmentData,
-                           compressBeforeSending: Boolean,
-                           roomIds: Set<String>,
-                           rootThreadEventId: String?
+    override fun sendMedia(
+            attachment: ContentAttachmentData,
+            compressBeforeSending: Boolean,
+            roomIds: Set<String>,
+            rootThreadEventId: String?
     ): Cancelable {
         // Ensure that the event will not be send in a thread if we are a different flow.
         // Like sending files to multiple rooms
@@ -354,10 +356,12 @@ internal class DefaultSendService @AssistedInject constructor(
         return "${roomId}_$identifier"
     }
 
-    private fun createUploadMediaWork(allLocalEchos: List<Event>,
-                                      attachment: ContentAttachmentData,
-                                      isRoomEncrypted: Boolean,
-                                      compressBeforeSending: Boolean): OneTimeWorkRequest {
+    private fun createUploadMediaWork(
+            allLocalEchos: List<Event>,
+            attachment: ContentAttachmentData,
+            isRoomEncrypted: Boolean,
+            compressBeforeSending: Boolean
+    ): OneTimeWorkRequest {
         val localEchoIds = allLocalEchos.map {
             LocalEchoIdentifiers(it.roomId!!, it.eventId!!)
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
index d39088bd6d..2bb6f3e04f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
@@ -119,12 +119,14 @@ internal class LocalEchoEventFactory @Inject constructor(
         return createMessageEvent(roomId, textContent.toMessageTextContent(msgType))
     }
 
-    fun createReplaceTextEvent(roomId: String,
-                               targetEventId: String,
-                               newBodyText: CharSequence,
-                               newBodyAutoMarkdown: Boolean,
-                               msgType: String,
-                               compatibilityText: String): Event {
+    fun createReplaceTextEvent(
+            roomId: String,
+            targetEventId: String,
+            newBodyText: CharSequence,
+            newBodyAutoMarkdown: Boolean,
+            msgType: String,
+            compatibilityText: String
+    ): Event {
         return createMessageEvent(
                 roomId,
                 MessageTextContent(
@@ -138,9 +140,11 @@ internal class LocalEchoEventFactory @Inject constructor(
         )
     }
 
-    private fun createPollContent(question: String,
-                                  options: List<String>,
-                                  pollType: PollType): MessagePollContent {
+    private fun createPollContent(
+            question: String,
+            options: List<String>,
+            pollType: PollType
+    ): MessagePollContent {
         return MessagePollContent(
                 unstablePollCreationInfo = PollCreationInfo(
                         question = PollQuestion(unstableQuestion = question),
@@ -152,11 +156,13 @@ internal class LocalEchoEventFactory @Inject constructor(
         )
     }
 
-    fun createPollReplaceEvent(roomId: String,
-                               pollType: PollType,
-                               targetEventId: String,
-                               question: String,
-                               options: List<String>): Event {
+    fun createPollReplaceEvent(
+            roomId: String,
+            pollType: PollType,
+            targetEventId: String,
+            question: String,
+            options: List<String>
+    ): Event {
         val newContent = MessagePollContent(
                 relatesTo = RelationDefaultContent(RelationType.REPLACE, targetEventId),
                 newContent = createPollContent(question, options, pollType).toContent()
@@ -172,9 +178,11 @@ internal class LocalEchoEventFactory @Inject constructor(
         )
     }
 
-    fun createPollReplyEvent(roomId: String,
-                             pollEventId: String,
-                             answerId: String): Event {
+    fun createPollReplyEvent(
+            roomId: String,
+            pollEventId: String,
+            answerId: String
+    ): Event {
         val content = MessagePollResponseContent(
                 body = answerId,
                 relatesTo = RelationDefaultContent(
@@ -195,10 +203,12 @@ internal class LocalEchoEventFactory @Inject constructor(
         )
     }
 
-    fun createPollEvent(roomId: String,
-                        pollType: PollType,
-                        question: String,
-                        options: List<String>): Event {
+    fun createPollEvent(
+            roomId: String,
+            pollType: PollType,
+            question: String,
+            options: List<String>
+    ): Event {
         val content = createPollContent(question, options, pollType)
         val localId = LocalEcho.createLocalEchoId()
         return Event(
@@ -212,8 +222,10 @@ internal class LocalEchoEventFactory @Inject constructor(
         )
     }
 
-    fun createEndPollEvent(roomId: String,
-                           eventId: String): Event {
+    fun createEndPollEvent(
+            roomId: String,
+            eventId: String
+    ): Event {
         val content = MessageEndPollContent(
                 relatesTo = RelationDefaultContent(
                         type = RelationType.REFERENCE,
@@ -232,11 +244,13 @@ internal class LocalEchoEventFactory @Inject constructor(
         )
     }
 
-    fun createLocationEvent(roomId: String,
-                            latitude: Double,
-                            longitude: Double,
-                            uncertainty: Double?,
-                            isUserLocation: Boolean): Event {
+    fun createLocationEvent(
+            roomId: String,
+            latitude: Double,
+            longitude: Double,
+            uncertainty: Double?,
+            isUserLocation: Boolean
+    ): Event {
         val geoUri = buildGeoUri(latitude, longitude, uncertainty)
         val assetType = if (isUserLocation) LocationAssetType.SELF else LocationAssetType.PIN
         val content = MessageLocationContent(
@@ -250,11 +264,13 @@ internal class LocalEchoEventFactory @Inject constructor(
         return createMessageEvent(roomId, content)
     }
 
-    fun createLiveLocationEvent(beaconInfoEventId: String,
-                                roomId: String,
-                                latitude: Double,
-                                longitude: Double,
-                                uncertainty: Double?): Event {
+    fun createLiveLocationEvent(
+            beaconInfoEventId: String,
+            roomId: String,
+            latitude: Double,
+            longitude: Double,
+            uncertainty: Double?
+    ): Event {
         val geoUri = buildGeoUri(latitude, longitude, uncertainty)
         val content = MessageBeaconLocationDataContent(
                 body = geoUri,
@@ -277,13 +293,15 @@ internal class LocalEchoEventFactory @Inject constructor(
         )
     }
 
-    fun createReplaceTextOfReply(roomId: String,
-                                 eventReplaced: TimelineEvent,
-                                 originalEvent: TimelineEvent,
-                                 newBodyText: String,
-                                 autoMarkdown: Boolean,
-                                 msgType: String,
-                                 compatibilityText: String): Event {
+    fun createReplaceTextOfReply(
+            roomId: String,
+            eventReplaced: TimelineEvent,
+            originalEvent: TimelineEvent,
+            newBodyText: String,
+            autoMarkdown: Boolean,
+            msgType: String,
+            compatibilityText: String
+    ): Event {
         val permalink = permalinkFactory.createPermalink(roomId, originalEvent.root.eventId ?: "", false)
         val userLink = originalEvent.root.senderId?.let { permalinkFactory.createPermalink(it, false) } ?: ""
 
@@ -321,9 +339,10 @@ internal class LocalEchoEventFactory @Inject constructor(
         )
     }
 
-    fun createMediaEvent(roomId: String,
-                         attachment: ContentAttachmentData,
-                         rootThreadEventId: String?
+    fun createMediaEvent(
+            roomId: String,
+            attachment: ContentAttachmentData,
+            rootThreadEventId: String?
     ): Event {
         return when (attachment.type) {
             ContentAttachmentData.Type.IMAGE         -> createImageEvent(roomId, attachment, rootThreadEventId)
@@ -435,10 +454,11 @@ internal class LocalEchoEventFactory @Inject constructor(
         return createMessageEvent(roomId, content)
     }
 
-    private fun createAudioEvent(roomId: String,
-                                 attachment: ContentAttachmentData,
-                                 isVoiceMessage: Boolean,
-                                 rootThreadEventId: String?
+    private fun createAudioEvent(
+            roomId: String,
+            attachment: ContentAttachmentData,
+            isVoiceMessage: Boolean,
+            rootThreadEventId: String?
     ): Event {
         val content = MessageAudioContent(
                 msgType = MessageType.MSGTYPE_AUDIO,
@@ -534,7 +554,8 @@ internal class LocalEchoEventFactory @Inject constructor(
             text: CharSequence,
             msgType: String,
             autoMarkdown: Boolean,
-            formattedText: String?): Event {
+            formattedText: String?
+    ): Event {
         val content = formattedText?.let { TextContent(text.toString(), it) } ?: createTextContent(text, autoMarkdown)
         return createEvent(
                 roomId,
@@ -555,12 +576,14 @@ internal class LocalEchoEventFactory @Inject constructor(
     /**
      * Creates a reply to a regular timeline Event or a thread Event if needed.
      */
-    fun createReplyTextEvent(roomId: String,
-                             eventReplied: TimelineEvent,
-                             replyText: CharSequence,
-                             autoMarkdown: Boolean,
-                             rootThreadEventId: String? = null,
-                             showInThread: Boolean): Event? {
+    fun createReplyTextEvent(
+            roomId: String,
+            eventReplied: TimelineEvent,
+            replyText: CharSequence,
+            autoMarkdown: Boolean,
+            rootThreadEventId: String? = null,
+            showInThread: Boolean
+    ): Event? {
         // Fallbacks and event representation
         // TODO Add error/warning logs when any of this is null
         val permalink = permalinkFactory.createPermalink(eventReplied.root, false) ?: return null
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/TextContentExtension.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/TextContentExtension.kt
index 49bc05f40c..c5728ba527 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/TextContentExtension.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/TextContentExtension.kt
@@ -43,7 +43,8 @@ internal fun TextContent.toMessageTextContent(msgType: String = MessageType.MSGT
 internal fun TextContent.toThreadTextContent(
         rootThreadEventId: String,
         latestThreadEventId: String,
-        msgType: String = MessageType.MSGTYPE_TEXT): MessageTextContent {
+        msgType: String = MessageType.MSGTYPE_TEXT
+): MessageTextContent {
     return MessageTextContent(
             msgType = msgType,
             format = MessageFormat.FORMAT_MATRIX_HTML.takeIf { formattedText != null },
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueueMemento.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueueMemento.kt
index 545fc41737..a00c33f780 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueueMemento.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueueMemento.kt
@@ -35,11 +35,13 @@ import javax.inject.Inject
 
 private const val PERSISTENCE_KEY = "ManagedBySender"
 
-internal class QueueMemento @Inject constructor(context: Context,
-                                                @SessionId sessionId: String,
-                                                private val queuedTaskFactory: QueuedTaskFactory,
-                                                private val localEchoRepository: LocalEchoRepository,
-                                                private val cryptoService: CryptoService) {
+internal class QueueMemento @Inject constructor(
+        context: Context,
+        @SessionId sessionId: String,
+        private val queuedTaskFactory: QueuedTaskFactory,
+        private val localEchoRepository: LocalEchoRepository,
+        private val cryptoService: CryptoService
+) {
 
     private val storage = context.getSharedPreferences("QueueMemento_$sessionId", Context.MODE_PRIVATE)
     private val trackedTasks = mutableListOf<QueuedTask>()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
index 60231892e1..8b9300029b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
@@ -41,11 +41,12 @@ import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.internal.session.content.FileUploader
 import org.matrix.android.sdk.internal.session.permalinks.ViaParameterFinder
 
-internal class DefaultStateService @AssistedInject constructor(@Assisted private val roomId: String,
-                                                               private val stateEventDataSource: StateEventDataSource,
-                                                               private val sendStateTask: SendStateTask,
-                                                               private val fileUploader: FileUploader,
-                                                               private val viaParameterFinder: ViaParameterFinder
+internal class DefaultStateService @AssistedInject constructor(
+        @Assisted private val roomId: String,
+        private val stateEventDataSource: StateEventDataSource,
+        private val sendStateTask: SendStateTask,
+        private val fileUploader: FileUploader,
+        private val viaParameterFinder: ViaParameterFinder
 ) : StateService {
 
     @AssistedFactory
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/StateEventDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/StateEventDataSource.kt
index 42d6677409..18c709adf2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/StateEventDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/StateEventDataSource.kt
@@ -76,10 +76,11 @@ internal class StateEventDataSource @Inject constructor(
         }
     }
 
-    private fun buildStateEventQuery(realm: Realm,
-                                     roomId: String,
-                                     eventTypes: Set<String>,
-                                     stateKey: QueryStringValue
+    private fun buildStateEventQuery(
+            realm: Realm,
+            roomId: String,
+            eventTypes: Set<String>,
+            stateKey: QueryStringValue
     ): RealmQuery<CurrentStateEventEntity> {
         return with(queryStringValueProcessor) {
             realm.where<CurrentStateEventEntity>()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/HierarchyLiveDataHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/HierarchyLiveDataHelper.kt
index 29db8431fd..b141dfffa7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/HierarchyLiveDataHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/HierarchyLiveDataHelper.kt
@@ -24,7 +24,8 @@ import org.matrix.android.sdk.api.util.Optional
 internal class HierarchyLiveDataHelper(
         val spaceId: String,
         val memberships: List<Membership>,
-        val roomSummaryDataSource: RoomSummaryDataSource) {
+        val roomSummaryDataSource: RoomSummaryDataSource
+) {
 
     private val sources = HashMap<String, LiveData<Optional<RoomSummary>>>()
     private val mediatorLiveData = MediatorLiveData<List<String>>()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
index 96e8d3c73f..b3467c694d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
@@ -26,8 +26,9 @@ import com.zhuinden.monarchy.Monarchy
 import io.realm.Realm
 import io.realm.RealmQuery
 import io.realm.kotlin.where
-import org.matrix.android.sdk.api.query.ActiveSpaceFilter
+import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.query.RoomCategoryFilter
+import org.matrix.android.sdk.api.query.SpaceFilter
 import org.matrix.android.sdk.api.query.isNormalized
 import org.matrix.android.sdk.api.session.room.ResultBoundaries
 import org.matrix.android.sdk.api.session.room.RoomSortOrder
@@ -84,16 +85,20 @@ internal class RoomSummaryDataSource @Inject constructor(
         }
     }
 
-    fun getRoomSummaries(queryParams: RoomSummaryQueryParams,
-                         sortOrder: RoomSortOrder = RoomSortOrder.NONE): List<RoomSummary> {
+    fun getRoomSummaries(
+            queryParams: RoomSummaryQueryParams,
+            sortOrder: RoomSortOrder = RoomSortOrder.NONE
+    ): List<RoomSummary> {
         return monarchy.fetchAllMappedSync(
                 { roomSummariesQuery(it, queryParams).process(sortOrder) },
                 { roomSummaryMapper.map(it) }
         )
     }
 
-    fun getRoomSummariesLive(queryParams: RoomSummaryQueryParams,
-                             sortOrder: RoomSortOrder = RoomSortOrder.NONE): LiveData<List<RoomSummary>> {
+    fun getRoomSummariesLive(
+            queryParams: RoomSummaryQueryParams,
+            sortOrder: RoomSortOrder = RoomSortOrder.NONE
+    ): LiveData<List<RoomSummary>> {
         return monarchy.findAllMappedWithChanges(
                 {
                     roomSummariesQuery(it, queryParams).process(sortOrder)
@@ -102,8 +107,10 @@ internal class RoomSummaryDataSource @Inject constructor(
         )
     }
 
-    fun getSpaceSummariesLive(queryParams: SpaceSummaryQueryParams,
-                              sortOrder: RoomSortOrder = RoomSortOrder.NONE): LiveData<List<RoomSummary>> {
+    fun getSpaceSummariesLive(
+            queryParams: SpaceSummaryQueryParams,
+            sortOrder: RoomSortOrder = RoomSortOrder.NONE
+    ): LiveData<List<RoomSummary>> {
         return getRoomSummariesLive(queryParams, sortOrder)
     }
 
@@ -128,8 +135,10 @@ internal class RoomSummaryDataSource @Inject constructor(
         }
     }
 
-    fun getSpaceSummaries(spaceSummaryQueryParams: SpaceSummaryQueryParams,
-                          sortOrder: RoomSortOrder = RoomSortOrder.NONE): List<RoomSummary> {
+    fun getSpaceSummaries(
+            spaceSummaryQueryParams: SpaceSummaryQueryParams,
+            sortOrder: RoomSortOrder = RoomSortOrder.NONE
+    ): List<RoomSummary> {
         return getRoomSummaries(spaceSummaryQueryParams, sortOrder)
     }
 
@@ -170,9 +179,11 @@ internal class RoomSummaryDataSource @Inject constructor(
                 .sort(RoomSummaryEntityFields.BREADCRUMBS_INDEX)
     }
 
-    fun getSortedPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams,
-                                        pagedListConfig: PagedList.Config,
-                                        sortOrder: RoomSortOrder): LiveData<PagedList<RoomSummary>> {
+    fun getSortedPagedRoomSummariesLive(
+            queryParams: RoomSummaryQueryParams,
+            pagedListConfig: PagedList.Config,
+            sortOrder: RoomSortOrder
+    ): LiveData<PagedList<RoomSummary>> {
         val realmDataSourceFactory = monarchy.createDataSourceFactory { realm ->
             roomSummariesQuery(realm, queryParams).process(sortOrder)
         }
@@ -185,15 +196,18 @@ internal class RoomSummaryDataSource @Inject constructor(
         )
     }
 
-    fun getUpdatablePagedRoomSummariesLive(queryParams: RoomSummaryQueryParams,
-                                           pagedListConfig: PagedList.Config,
-                                           sortOrder: RoomSortOrder): UpdatableLivePageResult {
+    fun getUpdatablePagedRoomSummariesLive(
+            queryParams: RoomSummaryQueryParams,
+            pagedListConfig: PagedList.Config,
+            sortOrder: RoomSortOrder,
+            getFlattenedParents: Boolean = false
+    ): UpdatableLivePageResult {
         val realmDataSourceFactory = monarchy.createDataSourceFactory { realm ->
             roomSummariesQuery(realm, queryParams).process(sortOrder)
         }
         val dataSourceFactory = realmDataSourceFactory.map {
             roomSummaryMapper.map(it)
-        }
+        }.map { if (getFlattenedParents) it.getWithParents() else it }
 
         val boundaries = MutableLiveData(ResultBoundaries())
 
@@ -232,6 +246,13 @@ internal class RoomSummaryDataSource @Inject constructor(
         }
     }
 
+    private fun RoomSummary.getWithParents(): RoomSummary {
+        val parents = flattenParentIds.mapNotNull { parentId ->
+            getRoomSummary(parentId)
+        }
+        return copy(flattenParents = parents)
+    }
+
     fun getCountLive(queryParams: RoomSummaryQueryParams): LiveData<Int> {
         val liveRooms = monarchy.findAllManagedWithChanges {
             roomSummariesQuery(it, queryParams)
@@ -258,29 +279,13 @@ internal class RoomSummaryDataSource @Inject constructor(
     private fun roomSummariesQuery(realm: Realm, queryParams: RoomSummaryQueryParams): RealmQuery<RoomSummaryEntity> {
         val query = with(queryStringValueProcessor) {
             RoomSummaryEntity.where(realm)
-                    .process(RoomSummaryEntityFields.ROOM_ID, queryParams.roomId)
-                    .let {
-                        if (queryParams.displayName.isNormalized()) {
-                            it.process(RoomSummaryEntityFields.NORMALIZED_DISPLAY_NAME, queryParams.displayName)
-                        } else {
-                            it.process(RoomSummaryEntityFields.DISPLAY_NAME, queryParams.displayName)
-                        }
-                    }
+                    .process(RoomSummaryEntityFields.ROOM_ID, QueryStringValue.IsNotEmpty)
+                    .process(queryParams.displayName.toDisplayNameField(), queryParams.displayName)
                     .process(RoomSummaryEntityFields.CANONICAL_ALIAS, queryParams.canonicalAlias)
                     .process(RoomSummaryEntityFields.MEMBERSHIP_STR, queryParams.memberships)
                     .equalTo(RoomSummaryEntityFields.IS_HIDDEN_FROM_USER, false)
         }
 
-        queryParams.roomCategoryFilter?.let {
-            when (it) {
-                RoomCategoryFilter.ONLY_DM                 -> query.equalTo(RoomSummaryEntityFields.IS_DIRECT, true)
-                RoomCategoryFilter.ONLY_ROOMS              -> query.equalTo(RoomSummaryEntityFields.IS_DIRECT, false)
-                RoomCategoryFilter.ONLY_WITH_NOTIFICATIONS -> query.greaterThan(RoomSummaryEntityFields.NOTIFICATION_COUNT, 0)
-                RoomCategoryFilter.ALL                     -> {
-                    // nop
-                }
-            }
-        }
         queryParams.roomTagQueryFilter?.let {
             it.isFavorite?.let { fav ->
                 query.equalTo(RoomSummaryEntityFields.IS_FAVOURITE, fav)
@@ -303,28 +308,24 @@ internal class RoomSummaryDataSource @Inject constructor(
             RoomCategoryFilter.ONLY_DM                 -> query.equalTo(RoomSummaryEntityFields.IS_DIRECT, true)
             RoomCategoryFilter.ONLY_ROOMS              -> query.equalTo(RoomSummaryEntityFields.IS_DIRECT, false)
             RoomCategoryFilter.ONLY_WITH_NOTIFICATIONS -> query.greaterThan(RoomSummaryEntityFields.NOTIFICATION_COUNT, 0)
-            RoomCategoryFilter.ALL                     -> Unit // nop
             null                                       -> Unit
         }
 
         // Timber.w("VAL: activeSpaceId : ${queryParams.activeSpaceId}")
-        when (queryParams.activeSpaceFilter) {
-            is ActiveSpaceFilter.ActiveSpace  -> {
+        when (queryParams.spaceFilter) {
+            SpaceFilter.OrphanRooms     -> {
+                // orphan rooms
+                query.isNull(RoomSummaryEntityFields.FLATTEN_PARENT_IDS)
+            }
+            is SpaceFilter.ActiveSpace  -> {
                 // It's annoying but for now realm java does not support querying in primitive list :/
                 // https://github.com/realm/realm-java/issues/5361
-                if (queryParams.activeSpaceFilter.currentSpaceId == null) {
-                    // orphan rooms
-                    query.isNull(RoomSummaryEntityFields.FLATTEN_PARENT_IDS)
-                } else {
-                    query.contains(RoomSummaryEntityFields.FLATTEN_PARENT_IDS, queryParams.activeSpaceFilter.currentSpaceId)
-                }
+                query.contains(RoomSummaryEntityFields.FLATTEN_PARENT_IDS, queryParams.spaceFilter.spaceId)
             }
-            is ActiveSpaceFilter.ExcludeSpace -> {
-                query.not().contains(RoomSummaryEntityFields.FLATTEN_PARENT_IDS, queryParams.activeSpaceFilter.spaceId)
-            }
-            else                              -> {
-                // nop
+            is SpaceFilter.ExcludeSpace -> {
+                query.not().contains(RoomSummaryEntityFields.FLATTEN_PARENT_IDS, queryParams.spaceFilter.spaceId)
             }
+            null                        -> Unit // nop
         }
 
         queryParams.activeGroupId?.let { activeGroupId ->
@@ -333,6 +334,14 @@ internal class RoomSummaryDataSource @Inject constructor(
         return query
     }
 
+    private fun QueryStringValue.toDisplayNameField(): String {
+        return if (isNormalized()) {
+            RoomSummaryEntityFields.NORMALIZED_DISPLAY_NAME
+        } else {
+            RoomSummaryEntityFields.DISPLAY_NAME
+        }
+    }
+
     fun getAllRoomSummaryChildOf(spaceAliasOrId: String, memberShips: List<Membership>): List<RoomSummary> {
         val space = getSpaceSummary(spaceAliasOrId) ?: return emptyList()
         val result = ArrayList<RoomSummary>()
@@ -427,11 +436,13 @@ internal class RoomSummaryDataSource @Inject constructor(
         }
     }
 
-    fun flattenSubSpace(current: RoomSummary,
-                        parenting: List<String>,
-                        output: MutableList<RoomSummary>,
-                        memberShips: List<Membership>,
-                        includeCurrent: Boolean = true) {
+    fun flattenSubSpace(
+            current: RoomSummary,
+            parenting: List<String>,
+            output: MutableList<RoomSummary>,
+            memberShips: List<Membership>,
+            includeCurrent: Boolean = true
+    ) {
         if (includeCurrent) {
             output.add(current)
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
index 611d6dc65e..e4afe7aa49 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
@@ -85,13 +85,15 @@ internal class RoomSummaryUpdater @Inject constructor(
         }
     }
 
-    fun update(realm: Realm,
-               roomId: String,
-               membership: Membership? = null,
-               roomSummary: RoomSyncSummary? = null,
-               unreadNotifications: RoomSyncUnreadNotifications? = null,
-               updateMembers: Boolean = false,
-               inviterId: String? = null) {
+    fun update(
+            realm: Realm,
+            roomId: String,
+            membership: Membership? = null,
+            roomSummary: RoomSyncSummary? = null,
+            unreadNotifications: RoomSyncUnreadNotifications? = null,
+            updateMembers: Boolean = false,
+            inviterId: String? = null
+    ) {
         val roomSummaryEntity = RoomSummaryEntity.getOrCreate(realm, roomId)
         if (roomSummary != null) {
             if (roomSummary.heroes.isNotEmpty()) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LiveTimelineEvent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LiveTimelineEvent.kt
index e765e05578..4be97efd6c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LiveTimelineEvent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LiveTimelineEvent.kt
@@ -36,11 +36,13 @@ import org.matrix.android.sdk.internal.database.query.where
 /**
  * This class takes care of handling case where local echo is replaced by the synced event in the db.
  */
-internal class LiveTimelineEvent(private val monarchy: Monarchy,
-                                 private val coroutineScope: CoroutineScope,
-                                 private val timelineEventMapper: TimelineEventMapper,
-                                 private val roomId: String,
-                                 private val eventId: String) :
+internal class LiveTimelineEvent(
+        private val monarchy: Monarchy,
+        private val coroutineScope: CoroutineScope,
+        private val timelineEventMapper: TimelineEventMapper,
+        private val roomId: String,
+        private val eventId: String
+) :
         MediatorLiveData<Optional<TimelineEvent>>() {
 
     init {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt
index 6a5f9da8a6..1d389d79e7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt
@@ -486,6 +486,31 @@ internal class TimelineChunk(
     private fun handleDatabaseChangeSet(results: RealmResults<TimelineEventEntity>, changeSet: OrderedCollectionChangeSet) {
         val insertions = changeSet.insertionRanges
         for (range in insertions) {
+            // Check if the insertion's displayIndices match our expectations - or skip this insertion.
+            // Inconsistencies (missing messages) can happen otherwise if we get insertions before having loaded all timeline events of the chunk.
+            if (builtEvents.isNotEmpty()) {
+                // Check consistency to item before insertions
+                if (range.startIndex > 0) {
+                    val firstInsertion = results[range.startIndex]!!
+                    val lastBeforeInsertion = builtEvents[range.startIndex - 1]
+                    if (firstInsertion.displayIndex + 1 != lastBeforeInsertion.displayIndex) {
+                        Timber.i("handleDatabaseChangeSet: skip insertion at ${range.startIndex}/${builtEvents.size}, " +
+                                "displayIndex mismatch at ${range.startIndex}: ${firstInsertion.displayIndex} -> ${lastBeforeInsertion.displayIndex}")
+                        continue
+                    }
+                }
+                // Check consistency to item after insertions
+                if (range.startIndex < builtEvents.size) {
+                    val lastInsertion = results[range.startIndex + range.length - 1]!!
+                    val firstAfterInsertion = builtEvents[range.startIndex]
+                    if (firstAfterInsertion.displayIndex + 1 != lastInsertion.displayIndex) {
+                        Timber.i("handleDatabaseChangeSet: skip insertion at ${range.startIndex}/${builtEvents.size}, " +
+                                "displayIndex mismatch at ${range.startIndex + range.length}: " +
+                                "${firstAfterInsertion.displayIndex} -> ${lastInsertion.displayIndex}")
+                        continue
+                    }
+                }
+            }
             val newItems = results
                     .subList(range.startIndex, range.startIndex + range.length)
                     .map { it.buildAndDecryptIfNeeded() }
@@ -503,8 +528,12 @@ internal class TimelineChunk(
         for (range in modifications) {
             for (modificationIndex in (range.startIndex until range.startIndex + range.length)) {
                 val updatedEntity = results[modificationIndex] ?: continue
+                val displayIndex = builtEventsIndexes[updatedEntity.eventId]
+                if (displayIndex == null) {
+                    continue
+                }
                 try {
-                    builtEvents[modificationIndex] = updatedEntity.buildAndDecryptIfNeeded()
+                    builtEvents[displayIndex] = updatedEntity.buildAndDecryptIfNeeded()
                 } catch (failure: Throwable) {
                     Timber.v("Fail to update items at index: $modificationIndex")
                 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDataSource.kt
index 8b58d3ca5c..b9aca7d37b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDataSource.kt
@@ -33,10 +33,12 @@ import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import javax.inject.Inject
 
-internal class TimelineEventDataSource @Inject constructor(private val realmSessionProvider: RealmSessionProvider,
-                                                           private val timelineEventMapper: TimelineEventMapper,
-                                                           private val taskExecutor: TaskExecutor,
-                                                           @SessionDatabase private val monarchy: Monarchy) {
+internal class TimelineEventDataSource @Inject constructor(
+        private val realmSessionProvider: RealmSessionProvider,
+        private val timelineEventMapper: TimelineEventMapper,
+        private val taskExecutor: TaskExecutor,
+        @SessionDatabase private val monarchy: Monarchy
+) {
 
     fun getTimelineEvent(roomId: String, eventId: String): TimelineEvent? {
         return realmSessionProvider.withRealm { realm ->
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
index 96ceb6c6dc..3c68191521 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
@@ -65,9 +65,11 @@ internal class TokenChunkEventPersistor @Inject constructor(
         SUCCESS
     }
 
-    suspend fun insertInDb(receivedChunk: TokenChunkEvent,
-                           roomId: String,
-                           direction: PaginationDirection): Result {
+    suspend fun insertInDb(
+            receivedChunk: TokenChunkEvent,
+            roomId: String,
+            direction: PaginationDirection
+    ): Result {
         monarchy
                 .awaitTransaction { realm ->
                     Timber.v("Start persisting ${receivedChunk.events.size} events in $roomId towards $direction")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt
index 12ca36fa6b..5e33631f2c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt
@@ -24,14 +24,16 @@ internal class DefaultSearchService @Inject constructor(
         private val searchTask: SearchTask
 ) : SearchService {
 
-    override suspend fun search(searchTerm: String,
-                                roomId: String,
-                                nextBatch: String?,
-                                orderByRecent: Boolean,
-                                limit: Int,
-                                beforeLimit: Int,
-                                afterLimit: Int,
-                                includeProfile: Boolean): SearchResult {
+    override suspend fun search(
+            searchTerm: String,
+            roomId: String,
+            nextBatch: String?,
+            orderByRecent: Boolean,
+            limit: Int,
+            beforeLimit: Int,
+            afterLimit: Int,
+            includeProfile: Boolean
+    ): SearchResult {
         return searchTask.execute(
                 SearchTask.Params(
                         searchTerm = searchTerm,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchAPI.kt
index b5099e7238..4cd96c408a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchAPI.kt
@@ -30,6 +30,8 @@ internal interface SearchAPI {
      * Ref: https://matrix.org/docs/spec/client_server/r0.6.1#post-matrix-client-r0-search
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "search")
-    suspend fun search(@Query("next_batch") nextBatch: String?,
-                       @Body body: SearchRequestBody): SearchResponse
+    suspend fun search(
+            @Query("next_batch") nextBatch: String?,
+            @Body body: SearchRequestBody
+    ): SearchResponse
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/DefaultSignOutService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/DefaultSignOutService.kt
index e7b20f905b..1bb86ecb4b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/DefaultSignOutService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/DefaultSignOutService.kt
@@ -21,9 +21,10 @@ import org.matrix.android.sdk.api.session.signout.SignOutService
 import org.matrix.android.sdk.internal.auth.SessionParamsStore
 import javax.inject.Inject
 
-internal class DefaultSignOutService @Inject constructor(private val signOutTask: SignOutTask,
-                                                         private val signInAgainTask: SignInAgainTask,
-                                                         private val sessionParamsStore: SessionParamsStore
+internal class DefaultSignOutService @Inject constructor(
+        private val signOutTask: SignOutTask,
+        private val signInAgainTask: SignInAgainTask,
+        private val sessionParamsStore: SessionParamsStore
 ) : SignOutService {
 
     override suspend fun signInAgain(password: String) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
index 178a29a5a0..32faffa670 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
@@ -44,11 +44,13 @@ internal class DefaultSpace(
         return spaceSummaryDataSource.getSpaceSummary(room.roomId)
     }
 
-    override suspend fun addChildren(roomId: String,
-                                     viaServers: List<String>?,
-                                     order: String?,
+    override suspend fun addChildren(
+            roomId: String,
+            viaServers: List<String>?,
+            order: String?,
 //                                     autoJoin: Boolean,
-                                     suggested: Boolean?) {
+            suggested: Boolean?
+    ) {
         // Find best via
         val bestVia = viaServers
                 ?: (spaceSummaryDataSource.getRoomSummary(roomId)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
index 9320665688..c08d9389a8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
@@ -99,13 +99,17 @@ internal class DefaultSpaceService @Inject constructor(
         return spaceGetter.get(spaceId)
     }
 
-    override fun getSpaceSummariesLive(queryParams: SpaceSummaryQueryParams,
-                                       sortOrder: RoomSortOrder): LiveData<List<RoomSummary>> {
+    override fun getSpaceSummariesLive(
+            queryParams: SpaceSummaryQueryParams,
+            sortOrder: RoomSortOrder
+    ): LiveData<List<RoomSummary>> {
         return roomSummaryDataSource.getSpaceSummariesLive(queryParams, sortOrder)
     }
 
-    override fun getSpaceSummaries(spaceSummaryQueryParams: SpaceSummaryQueryParams,
-                                   sortOrder: RoomSortOrder): List<RoomSummary> {
+    override fun getSpaceSummaries(
+            spaceSummaryQueryParams: SpaceSummaryQueryParams,
+            sortOrder: RoomSortOrder
+    ): List<RoomSummary> {
         return roomSummaryDataSource.getSpaceSummaries(spaceSummaryQueryParams, sortOrder)
     }
 
@@ -221,9 +225,11 @@ internal class DefaultSpaceService @Inject constructor(
             worldReadable = summary.isWorldReadable
     )
 
-    override suspend fun joinSpace(spaceIdOrAlias: String,
-                                   reason: String?,
-                                   viaServers: List<String>): JoinSpaceResult {
+    override suspend fun joinSpace(
+            spaceIdOrAlias: String,
+            reason: String?,
+            viaServers: List<String>
+    ): JoinSpaceResult {
         return joinSpaceTask.execute(JoinSpaceTask.Params(spaceIdOrAlias, reason, viaServers))
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceApi.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceApi.kt
index 33c3c3929f..126245d015 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceApi.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceApi.kt
@@ -38,7 +38,8 @@ internal interface SpaceApi {
             @Query("suggested_only") suggestedOnly: Boolean?,
             @Query("limit") limit: Int?,
             @Query("max_depth") maxDepth: Int?,
-            @Query("from") from: String?): SpacesResponse
+            @Query("from") from: String?
+    ): SpacesResponse
 
     /**
      * Unstable version of [getSpaceHierarchy].
@@ -49,5 +50,6 @@ internal interface SpaceApi {
             @Query("suggested_only") suggestedOnly: Boolean?,
             @Query("limit") limit: Int?,
             @Query("max_depth") maxDepth: Int?,
-            @Query("from") from: String?): SpacesResponse
+            @Query("from") from: String?
+    ): SpacesResponse
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/DefaultSyncService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/DefaultSyncService.kt
new file mode 100644
index 0000000000..37869b88f9
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/DefaultSyncService.kt
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.sync
+
+import androidx.lifecycle.LiveData
+import org.matrix.android.sdk.api.session.sync.SyncRequestState
+import org.matrix.android.sdk.api.session.sync.SyncService
+import org.matrix.android.sdk.internal.di.SessionId
+import org.matrix.android.sdk.internal.di.WorkManagerProvider
+import org.matrix.android.sdk.internal.session.SessionState
+import org.matrix.android.sdk.internal.session.sync.job.SyncThread
+import org.matrix.android.sdk.internal.session.sync.job.SyncWorker
+import timber.log.Timber
+import javax.inject.Inject
+import javax.inject.Provider
+
+internal class DefaultSyncService @Inject constructor(
+        @SessionId val sessionId: String,
+        private val workManagerProvider: WorkManagerProvider,
+        private val syncThreadProvider: Provider<SyncThread>,
+        private val syncTokenStore: SyncTokenStore,
+        private val syncRequestStateTracker: SyncRequestStateTracker,
+        private val sessionState: SessionState,
+) : SyncService {
+    private var syncThread: SyncThread? = null
+
+    override fun requireBackgroundSync() {
+        SyncWorker.requireBackgroundSync(workManagerProvider, sessionId)
+    }
+
+    override fun startAutomaticBackgroundSync(timeOutInSeconds: Long, repeatDelayInSeconds: Long) {
+        SyncWorker.automaticallyBackgroundSync(workManagerProvider, sessionId, timeOutInSeconds, repeatDelayInSeconds)
+    }
+
+    override fun stopAnyBackgroundSync() {
+        SyncWorker.stopAnyBackgroundSync(workManagerProvider)
+    }
+
+    override fun startSync(fromForeground: Boolean) {
+        Timber.i("Starting sync thread")
+        assert(sessionState.isOpen)
+        val localSyncThread = getSyncThread()
+        localSyncThread.setInitialForeground(fromForeground)
+        if (!localSyncThread.isAlive) {
+            localSyncThread.start()
+        } else {
+            localSyncThread.restart()
+            Timber.w("Attempt to start an already started thread")
+        }
+    }
+
+    override fun stopSync() {
+        assert(sessionState.isOpen)
+        syncThread?.kill()
+        syncThread = null
+    }
+
+    override fun getSyncStateLive() = getSyncThread().liveState()
+
+    override fun syncFlow() = getSyncThread().syncFlow()
+
+    override fun getSyncState() = getSyncThread().currentState()
+
+    override fun getSyncRequestStateLive(): LiveData<SyncRequestState> {
+        return syncRequestStateTracker.syncRequestState
+    }
+
+    override fun hasAlreadySynced(): Boolean {
+        return syncTokenStore.getLastToken() != null
+    }
+
+    private fun getSyncThread(): SyncThread {
+        return syncThread ?: syncThreadProvider.get().also {
+            syncThread = it
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/Extensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/Extensions.kt
new file mode 100644
index 0000000000..ae542103b7
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/Extensions.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.sync
+
+import org.matrix.android.sdk.api.session.sync.InitialSyncStep
+
+internal inline fun <T> reportSubtask(
+        reporter: ProgressReporter?,
+        initialSyncStep: InitialSyncStep,
+        totalProgress: Int,
+        parentWeight: Float,
+        block: () -> T
+): T {
+    reporter?.startTask(initialSyncStep, totalProgress, parentWeight)
+    return block().also {
+        reporter?.endTask()
+    }
+}
+
+internal inline fun <K, V, R> Map<out K, V>.mapWithProgress(
+        reporter: ProgressReporter?,
+        initialSyncStep: InitialSyncStep,
+        parentWeight: Float,
+        transform: (Map.Entry<K, V>) -> R
+): List<R> {
+    var current = 0F
+    reporter?.startTask(initialSyncStep, count() + 1, parentWeight)
+    return map {
+        reporter?.reportProgress(current)
+        current++
+        transform.invoke(it)
+    }.also {
+        reporter?.endTask()
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/ProgressReporter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ProgressReporter.kt
similarity index 74%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/ProgressReporter.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ProgressReporter.kt
index 8a7b26b4b8..6d77b9be5e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/ProgressReporter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ProgressReporter.kt
@@ -14,14 +14,16 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.session.initsync
+package org.matrix.android.sdk.internal.session.sync
 
-import org.matrix.android.sdk.api.session.initsync.InitSyncStep
+import org.matrix.android.sdk.api.session.sync.InitialSyncStep
 
 internal interface ProgressReporter {
-    fun startTask(initSyncStep: InitSyncStep,
-                  totalProgress: Int,
-                  parentWeight: Float)
+    fun startTask(
+            initialSyncStep: InitialSyncStep,
+            totalProgress: Int,
+            parentWeight: Float
+    )
 
     fun reportProgress(progress: Float)
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncAPI.kt
index 6c8a71f35e..2a2fd6ab1d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncAPI.kt
@@ -31,10 +31,11 @@ internal interface SyncAPI {
      * Set all the timeouts to 1 minute by default.
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "sync")
-    suspend fun sync(@QueryMap params: Map<String, String>,
-                     @Header(TimeOutInterceptor.CONNECT_TIMEOUT) connectTimeOut: Long = TimeOutInterceptor.DEFAULT_LONG_TIMEOUT,
-                     @Header(TimeOutInterceptor.READ_TIMEOUT) readTimeOut: Long = TimeOutInterceptor.DEFAULT_LONG_TIMEOUT,
-                     @Header(TimeOutInterceptor.WRITE_TIMEOUT) writeTimeOut: Long = TimeOutInterceptor.DEFAULT_LONG_TIMEOUT
+    suspend fun sync(
+            @QueryMap params: Map<String, String>,
+            @Header(TimeOutInterceptor.CONNECT_TIMEOUT) connectTimeOut: Long = TimeOutInterceptor.DEFAULT_LONG_TIMEOUT,
+            @Header(TimeOutInterceptor.READ_TIMEOUT) readTimeOut: Long = TimeOutInterceptor.DEFAULT_LONG_TIMEOUT,
+            @Header(TimeOutInterceptor.WRITE_TIMEOUT) writeTimeOut: Long = TimeOutInterceptor.DEFAULT_LONG_TIMEOUT
     ): SyncResponse
 
     /**
@@ -42,9 +43,10 @@ internal interface SyncAPI {
      */
     @Streaming
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "sync")
-    fun syncStream(@QueryMap params: Map<String, String>,
-                   @Header(TimeOutInterceptor.CONNECT_TIMEOUT) connectTimeOut: Long = TimeOutInterceptor.DEFAULT_LONG_TIMEOUT,
-                   @Header(TimeOutInterceptor.READ_TIMEOUT) readTimeOut: Long = TimeOutInterceptor.DEFAULT_LONG_TIMEOUT,
-                   @Header(TimeOutInterceptor.WRITE_TIMEOUT) writeTimeOut: Long = TimeOutInterceptor.DEFAULT_LONG_TIMEOUT
+    fun syncStream(
+            @QueryMap params: Map<String, String>,
+            @Header(TimeOutInterceptor.CONNECT_TIMEOUT) connectTimeOut: Long = TimeOutInterceptor.DEFAULT_LONG_TIMEOUT,
+            @Header(TimeOutInterceptor.READ_TIMEOUT) readTimeOut: Long = TimeOutInterceptor.DEFAULT_LONG_TIMEOUT,
+            @Header(TimeOutInterceptor.WRITE_TIMEOUT) writeTimeOut: Long = TimeOutInterceptor.DEFAULT_LONG_TIMEOUT
     ): Call<ResponseBody>
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncModule.kt
index 4b31dc4d9b..d78070439c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncModule.kt
@@ -19,6 +19,7 @@ package org.matrix.android.sdk.internal.session.sync
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
+import org.matrix.android.sdk.api.session.sync.SyncService
 import org.matrix.android.sdk.internal.session.SessionScope
 import retrofit2.Retrofit
 
@@ -35,6 +36,9 @@ internal abstract class SyncModule {
         }
     }
 
+    @Binds
+    abstract fun bindSyncService(service: DefaultSyncService): SyncService
+
     @Binds
     abstract fun bindSyncTask(task: DefaultSyncTask): SyncTask
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/DefaultSyncStatusService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncRequestStateTracker.kt
similarity index 63%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/DefaultSyncStatusService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncRequestStateTracker.kt
index 2aa0be80c9..bcc5fcf9ab 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/DefaultSyncStatusService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncRequestStateTracker.kt
@@ -13,52 +13,51 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.matrix.android.sdk.internal.session.initsync
 
-import androidx.lifecycle.LiveData
+package org.matrix.android.sdk.internal.session.sync
+
 import androidx.lifecycle.MutableLiveData
-import org.matrix.android.sdk.api.session.initsync.InitSyncStep
-import org.matrix.android.sdk.api.session.initsync.SyncStatusService
+import org.matrix.android.sdk.api.session.sync.InitialSyncStep
+import org.matrix.android.sdk.api.session.sync.SyncRequestState
 import org.matrix.android.sdk.internal.session.SessionScope
 import javax.inject.Inject
 
 @SessionScope
-internal class DefaultSyncStatusService @Inject constructor() :
-        SyncStatusService,
+internal class SyncRequestStateTracker @Inject constructor() :
         ProgressReporter {
 
-    private val status = MutableLiveData<SyncStatusService.Status>()
+    val syncRequestState = MutableLiveData<SyncRequestState>()
 
     private var rootTask: TaskInfo? = null
 
-    override fun getSyncStatusLive(): LiveData<SyncStatusService.Status> {
-        return status
-    }
-
     // Only to be used for incremental sync
-    fun setStatus(newStatus: SyncStatusService.Status.IncrementalSyncStatus) {
-        status.postValue(newStatus)
+    fun setSyncRequestState(newSyncRequestState: SyncRequestState.IncrementalSyncRequestState) {
+        syncRequestState.postValue(newSyncRequestState)
     }
 
     /**
      * Create a rootTask.
      */
-    fun startRoot(initSyncStep: InitSyncStep,
-                  totalProgress: Int) {
+    fun startRoot(
+            initialSyncStep: InitialSyncStep,
+            totalProgress: Int
+    ) {
         endAll()
-        rootTask = TaskInfo(initSyncStep, totalProgress, null, 1F)
+        rootTask = TaskInfo(initialSyncStep, totalProgress, null, 1F)
         reportProgress(0F)
     }
 
     /**
      * Add a child to the leaf.
      */
-    override fun startTask(initSyncStep: InitSyncStep,
-                           totalProgress: Int,
-                           parentWeight: Float) {
+    override fun startTask(
+            initialSyncStep: InitialSyncStep,
+            totalProgress: Int,
+            parentWeight: Float
+    ) {
         val currentLeaf = rootTask?.leaf() ?: return
         currentLeaf.child = TaskInfo(
-                initSyncStep = initSyncStep,
+                initialSyncStep = initialSyncStep,
                 totalProgress = totalProgress,
                 parent = currentLeaf,
                 parentWeight = parentWeight
@@ -72,7 +71,7 @@ internal class DefaultSyncStatusService @Inject constructor() :
                 // Update the progress of the leaf and all its parents
                 leaf.setProgress(progress)
                 // Then update the live data using leaf wording and root progress
-                status.postValue(SyncStatusService.Status.InitialSyncProgressing(leaf.initSyncStep, root.currentProgress.toInt()))
+                syncRequestState.postValue(SyncRequestState.InitialSyncProgressing(leaf.initialSyncStep, root.currentProgress.toInt()))
             }
         }
     }
@@ -87,13 +86,13 @@ internal class DefaultSyncStatusService @Inject constructor() :
                 // And close it
                 endedTask.parent.child = null
             } else {
-                status.postValue(SyncStatusService.Status.Idle)
+                syncRequestState.postValue(SyncRequestState.Idle)
             }
         }
     }
 
     fun endAll() {
         rootTask = null
-        status.postValue(SyncStatusService.Status.Idle)
+        syncRequestState.postValue(SyncRequestState.Idle)
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
index 02a7a9a37f..9e5302222a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
@@ -18,9 +18,9 @@ package org.matrix.android.sdk.internal.session.sync
 
 import androidx.work.ExistingPeriodicWorkPolicy
 import com.zhuinden.monarchy.Monarchy
-import org.matrix.android.sdk.api.session.initsync.InitSyncStep
 import org.matrix.android.sdk.api.session.pushrules.PushRuleService
 import org.matrix.android.sdk.api.session.pushrules.RuleScope
+import org.matrix.android.sdk.api.session.sync.InitialSyncStep
 import org.matrix.android.sdk.api.session.sync.model.GroupsSyncResponse
 import org.matrix.android.sdk.api.session.sync.model.RoomsSyncResponse
 import org.matrix.android.sdk.api.session.sync.model.SyncResponse
@@ -32,8 +32,6 @@ import org.matrix.android.sdk.internal.di.WorkManagerProvider
 import org.matrix.android.sdk.internal.session.SessionListeners
 import org.matrix.android.sdk.internal.session.dispatchTo
 import org.matrix.android.sdk.internal.session.group.GetGroupDataWorker
-import org.matrix.android.sdk.internal.session.initsync.ProgressReporter
-import org.matrix.android.sdk.internal.session.initsync.reportSubtask
 import org.matrix.android.sdk.internal.session.pushrules.ProcessEventForPushTask
 import org.matrix.android.sdk.internal.session.sync.handler.CryptoSyncHandler
 import org.matrix.android.sdk.internal.session.sync.handler.GroupSyncHandler
@@ -68,9 +66,11 @@ internal class SyncResponseHandler @Inject constructor(
         private val presenceSyncHandler: PresenceSyncHandler
 ) {
 
-    suspend fun handleResponse(syncResponse: SyncResponse,
-                               fromToken: String?,
-                               reporter: ProgressReporter?) {
+    suspend fun handleResponse(
+            syncResponse: SyncResponse,
+            fromToken: String?,
+            reporter: ProgressReporter?
+    ) {
         val isInitialSync = fromToken == null
         Timber.v("Start handling sync, is InitialSync: $isInitialSync")
 
@@ -88,7 +88,7 @@ internal class SyncResponseHandler @Inject constructor(
         // to ensure to decrypt them properly
         measureTimeMillis {
             Timber.v("Handle toDevice")
-            reportSubtask(reporter, InitSyncStep.ImportingAccountCrypto, 100, 0.1f) {
+            reportSubtask(reporter, InitialSyncStep.ImportingAccountCrypto, 100, 0.1f) {
                 if (syncResponse.toDevice != null) {
                     cryptoSyncHandler.handleToDevice(syncResponse.toDevice, reporter)
                 }
@@ -109,7 +109,7 @@ internal class SyncResponseHandler @Inject constructor(
             // IMPORTANT nothing should be suspend here as we are accessing the realm instance (thread local)
             measureTimeMillis {
                 Timber.v("Handle rooms")
-                reportSubtask(reporter, InitSyncStep.ImportingAccountRoom, 1, 0.7f) {
+                reportSubtask(reporter, InitialSyncStep.ImportingAccountRoom, 1, 0.7f) {
                     if (syncResponse.rooms != null) {
                         roomSyncHandler.handle(realm, syncResponse.rooms, isInitialSync, aggregator, reporter)
                     }
@@ -119,7 +119,7 @@ internal class SyncResponseHandler @Inject constructor(
             }
 
             measureTimeMillis {
-                reportSubtask(reporter, InitSyncStep.ImportingAccountGroups, 1, 0.1f) {
+                reportSubtask(reporter, InitialSyncStep.ImportingAccountGroups, 1, 0.1f) {
                     Timber.v("Handle groups")
                     if (syncResponse.groups != null) {
                         groupSyncHandler.handle(realm, syncResponse.groups, reporter)
@@ -130,7 +130,7 @@ internal class SyncResponseHandler @Inject constructor(
             }
 
             measureTimeMillis {
-                reportSubtask(reporter, InitSyncStep.ImportingAccountData, 1, 0.1f) {
+                reportSubtask(reporter, InitialSyncStep.ImportingAccountData, 1, 0.1f) {
                     Timber.v("Handle accountData")
                     userAccountDataSyncHandler.handle(realm, syncResponse.accountData)
                 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
index f88d973101..ea296d379d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
@@ -21,10 +21,10 @@ import okhttp3.ResponseBody
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.logger.LoggerTag
 import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.initsync.InitSyncStep
-import org.matrix.android.sdk.api.session.initsync.SyncStatusService
 import org.matrix.android.sdk.api.session.statistics.StatisticEvent
+import org.matrix.android.sdk.api.session.sync.InitialSyncStep
 import org.matrix.android.sdk.api.session.sync.InitialSyncStrategy
+import org.matrix.android.sdk.api.session.sync.SyncRequestState
 import org.matrix.android.sdk.api.session.sync.initialSyncStrategy
 import org.matrix.android.sdk.api.session.sync.model.LazyRoomSyncEphemeral
 import org.matrix.android.sdk.api.session.sync.model.SyncResponse
@@ -38,8 +38,6 @@ import org.matrix.android.sdk.internal.session.SessionListeners
 import org.matrix.android.sdk.internal.session.dispatchTo
 import org.matrix.android.sdk.internal.session.filter.FilterRepository
 import org.matrix.android.sdk.internal.session.homeserver.GetHomeServerCapabilitiesTask
-import org.matrix.android.sdk.internal.session.initsync.DefaultSyncStatusService
-import org.matrix.android.sdk.internal.session.initsync.reportSubtask
 import org.matrix.android.sdk.internal.session.sync.parsing.InitialSyncResponseParser
 import org.matrix.android.sdk.internal.session.user.UserStore
 import org.matrix.android.sdk.internal.task.Task
@@ -68,7 +66,7 @@ internal class DefaultSyncTask @Inject constructor(
         @UserId private val userId: String,
         private val filterRepository: FilterRepository,
         private val syncResponseHandler: SyncResponseHandler,
-        private val defaultSyncStatusService: DefaultSyncStatusService,
+        private val syncRequestStateTracker: SyncRequestStateTracker,
         private val syncTokenStore: SyncTokenStore,
         private val getHomeServerCapabilitiesTask: GetHomeServerCapabilitiesTask,
         private val userStore: UserStore,
@@ -115,7 +113,7 @@ internal class DefaultSyncTask @Inject constructor(
                     displayName = user?.displayName,
                     avatarUrl = user?.avatarUrl
             )
-            defaultSyncStatusService.startRoot(InitSyncStep.ImportingAccount, 100)
+            syncRequestStateTracker.startRoot(InitialSyncStep.ImportingAccount, 100)
         }
         // Maybe refresh the homeserver capabilities data we know
         getHomeServerCapabilitiesTask.execute(GetHomeServerCapabilitiesTask.Params(forceRefresh = false))
@@ -132,7 +130,7 @@ internal class DefaultSyncTask @Inject constructor(
                     roomSyncEphemeralTemporaryStore.reset()
                     workingDir.mkdirs()
                     val file = downloadInitSyncResponse(requestParams, syncStatisticsData)
-                    syncResponseToReturn = reportSubtask(defaultSyncStatusService, InitSyncStep.ImportingAccount, 1, 0.7F) {
+                    syncResponseToReturn = reportSubtask(syncRequestStateTracker, InitialSyncStep.ImportingAccount, 1, 0.7F) {
                         handleSyncFile(file, initSyncStrategy)
                     }
                     // Delete all files
@@ -150,15 +148,15 @@ internal class DefaultSyncTask @Inject constructor(
                     syncStatisticsData.requestInitSyncTime = SystemClock.elapsedRealtime()
                     syncStatisticsData.downloadInitSyncTime = syncStatisticsData.requestInitSyncTime
                     logDuration("INIT_SYNC Database insertion", loggerTag, clock) {
-                        syncResponseHandler.handleResponse(syncResponse, token, defaultSyncStatusService)
+                        syncResponseHandler.handleResponse(syncResponse, token, syncRequestStateTracker)
                     }
                     syncResponseToReturn = syncResponse
                 }
             }
-            defaultSyncStatusService.endAll()
+            syncRequestStateTracker.endAll()
         } else {
             Timber.tag(loggerTag.value).d("Start incremental sync request with since token $token")
-            defaultSyncStatusService.setStatus(SyncStatusService.Status.IncrementalSyncIdle)
+            syncRequestStateTracker.setSyncRequestState(SyncRequestState.IncrementalSyncIdle)
             val syncResponse = try {
                 executeRequest(globalErrorReceiver) {
                     syncAPI.sync(
@@ -168,7 +166,7 @@ internal class DefaultSyncTask @Inject constructor(
                 }
             } catch (throwable: Throwable) {
                 Timber.tag(loggerTag.value).e(throwable, "Incremental sync request error")
-                defaultSyncStatusService.setStatus(SyncStatusService.Status.IncrementalSyncError)
+                syncRequestStateTracker.setSyncRequestState(SyncRequestState.IncrementalSyncError)
                 throw throwable
             }
             val nbRooms = syncResponse.rooms?.invite.orEmpty().size + syncResponse.rooms?.join.orEmpty().size + syncResponse.rooms?.leave.orEmpty().size
@@ -177,8 +175,8 @@ internal class DefaultSyncTask @Inject constructor(
             Timber.tag(loggerTag.value).d(
                     "Incremental sync request parsing, $nbRooms room(s) $nbToDevice toDevice(s). Got nextBatch: $nextBatch"
             )
-            defaultSyncStatusService.setStatus(
-                    SyncStatusService.Status.IncrementalSyncParsing(
+            syncRequestStateTracker.setSyncRequestState(
+                    SyncRequestState.IncrementalSyncParsing(
                             rooms = nbRooms,
                             toDevice = nbToDevice
                     )
@@ -186,7 +184,7 @@ internal class DefaultSyncTask @Inject constructor(
             syncResponseHandler.handleResponse(syncResponse, token, null)
             syncResponseToReturn = syncResponse
             Timber.tag(loggerTag.value).d("Incremental sync done")
-            defaultSyncStatusService.setStatus(SyncStatusService.Status.IncrementalSyncDone)
+            syncRequestStateTracker.setSyncRequestState(SyncRequestState.IncrementalSyncDone)
         }
         syncStatisticsData.treatmentSyncTime = SystemClock.elapsedRealtime()
         syncStatisticsData.nbOfRooms = syncResponseToReturn?.rooms?.join?.size ?: 0
@@ -201,20 +199,20 @@ internal class DefaultSyncTask @Inject constructor(
         val status = initialSyncStatusRepository.getStep()
         if (workingFile.exists() && status >= InitialSyncStatus.STEP_DOWNLOADED) {
             Timber.tag(loggerTag.value).d("INIT_SYNC file is already here")
-            reportSubtask(defaultSyncStatusService, InitSyncStep.Downloading, 1, 0.3f) {
+            reportSubtask(syncRequestStateTracker, InitialSyncStep.Downloading, 1, 0.3f) {
                 // Empty task
             }
         } else {
             initialSyncStatusRepository.setStep(InitialSyncStatus.STEP_DOWNLOADING)
             val syncResponse = logDuration("INIT_SYNC Perform server request", loggerTag, clock) {
-                reportSubtask(defaultSyncStatusService, InitSyncStep.ServerComputing, 1, 0.2f) {
+                reportSubtask(syncRequestStateTracker, InitialSyncStep.ServerComputing, 1, 0.2f) {
                     getSyncResponse(requestParams, MAX_NUMBER_OF_RETRY_AFTER_TIMEOUT)
                 }
             }
             syncStatisticsData.requestInitSyncTime = SystemClock.elapsedRealtime()
             if (syncResponse.isSuccessful) {
                 logDuration("INIT_SYNC Download and save to file", loggerTag, clock) {
-                    reportSubtask(defaultSyncStatusService, InitSyncStep.Downloading, 1, 0.1f) {
+                    reportSubtask(syncRequestStateTracker, InitialSyncStep.Downloading, 1, 0.1f) {
                         syncResponse.body()?.byteStream()?.use { inputStream ->
                             workingFile.outputStream().use { outputStream ->
                                 inputStream.copyTo(outputStream)
@@ -263,7 +261,7 @@ internal class DefaultSyncTask @Inject constructor(
             Timber.tag(loggerTag.value).d("INIT_SYNC $nbOfJoinedRooms rooms, $nbOfJoinedRoomsInFile ephemeral stored into files")
 
             logDuration("INIT_SYNC Database insertion", loggerTag, clock) {
-                syncResponseHandler.handleResponse(syncResponse, null, defaultSyncStatusService)
+                syncResponseHandler.handleResponse(syncResponse, null, syncRequestStateTracker)
             }
             initialSyncStatusRepository.setStep(InitialSyncStatus.STEP_SUCCESS)
             syncResponse
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/TaskInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/TaskInfo.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/TaskInfo.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/TaskInfo.kt
index fef16bf1d7..7032aae2b2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/TaskInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/TaskInfo.kt
@@ -14,15 +14,17 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.session.initsync
+package org.matrix.android.sdk.internal.session.sync
 
-import org.matrix.android.sdk.api.session.initsync.InitSyncStep
+import org.matrix.android.sdk.api.session.sync.InitialSyncStep
 import timber.log.Timber
 
-internal class TaskInfo(val initSyncStep: InitSyncStep,
-                        val totalProgress: Int,
-                        val parent: TaskInfo?,
-                        val parentWeight: Float) {
+internal class TaskInfo(
+        val initialSyncStep: InitialSyncStep,
+        val totalProgress: Int,
+        val parent: TaskInfo?,
+        val parentWeight: Float
+) {
     var child: TaskInfo? = null
     var currentProgress = 0F
         private set
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/CryptoSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/CryptoSyncHandler.kt
index e5a5a0bbad..b6142b3a7a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/CryptoSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/CryptoSyncHandler.kt
@@ -29,14 +29,16 @@ import org.matrix.android.sdk.api.session.sync.model.SyncResponse
 import org.matrix.android.sdk.api.session.sync.model.ToDeviceSyncResponse
 import org.matrix.android.sdk.internal.crypto.DefaultCryptoService
 import org.matrix.android.sdk.internal.crypto.verification.DefaultVerificationService
-import org.matrix.android.sdk.internal.session.initsync.ProgressReporter
+import org.matrix.android.sdk.internal.session.sync.ProgressReporter
 import timber.log.Timber
 import javax.inject.Inject
 
 private val loggerTag = LoggerTag("CryptoSyncHandler", LoggerTag.CRYPTO)
 
-internal class CryptoSyncHandler @Inject constructor(private val cryptoService: DefaultCryptoService,
-                                                     private val verificationService: DefaultVerificationService) {
+internal class CryptoSyncHandler @Inject constructor(
+        private val cryptoService: DefaultCryptoService,
+        private val verificationService: DefaultVerificationService
+) {
 
     suspend fun handleToDevice(toDevice: ToDeviceSyncResponse, progressReporter: ProgressReporter? = null) {
         val total = toDevice.events?.size ?: 0
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/GroupSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/GroupSyncHandler.kt
index 552462e25e..6e12578ef6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/GroupSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/GroupSyncHandler.kt
@@ -17,16 +17,16 @@
 package org.matrix.android.sdk.internal.session.sync.handler
 
 import io.realm.Realm
-import org.matrix.android.sdk.api.session.initsync.InitSyncStep
 import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.sync.InitialSyncStep
 import org.matrix.android.sdk.api.session.sync.model.GroupsSyncResponse
 import org.matrix.android.sdk.api.session.sync.model.InvitedGroupSync
 import org.matrix.android.sdk.internal.database.model.GroupEntity
 import org.matrix.android.sdk.internal.database.model.GroupSummaryEntity
 import org.matrix.android.sdk.internal.database.query.getOrCreate
 import org.matrix.android.sdk.internal.database.query.where
-import org.matrix.android.sdk.internal.session.initsync.ProgressReporter
-import org.matrix.android.sdk.internal.session.initsync.mapWithProgress
+import org.matrix.android.sdk.internal.session.sync.ProgressReporter
+import org.matrix.android.sdk.internal.session.sync.mapWithProgress
 import javax.inject.Inject
 
 internal class GroupSyncHandler @Inject constructor() {
@@ -37,9 +37,11 @@ internal class GroupSyncHandler @Inject constructor() {
         data class LEFT(val data: Map<String, Any>) : HandlingStrategy()
     }
 
-    fun handle(realm: Realm,
-               roomsSyncResponse: GroupsSyncResponse,
-               reporter: ProgressReporter? = null) {
+    fun handle(
+            realm: Realm,
+            roomsSyncResponse: GroupsSyncResponse,
+            reporter: ProgressReporter? = null
+    ) {
         handleGroupSync(realm, HandlingStrategy.JOINED(roomsSyncResponse.join), reporter)
         handleGroupSync(realm, HandlingStrategy.INVITED(roomsSyncResponse.invite), reporter)
         handleGroupSync(realm, HandlingStrategy.LEFT(roomsSyncResponse.leave), reporter)
@@ -50,25 +52,27 @@ internal class GroupSyncHandler @Inject constructor() {
     private fun handleGroupSync(realm: Realm, handlingStrategy: HandlingStrategy, reporter: ProgressReporter?) {
         val groups = when (handlingStrategy) {
             is HandlingStrategy.JOINED  ->
-                handlingStrategy.data.mapWithProgress(reporter, InitSyncStep.ImportingAccountGroups, 0.6f) {
+                handlingStrategy.data.mapWithProgress(reporter, InitialSyncStep.ImportingAccountGroups, 0.6f) {
                     handleJoinedGroup(realm, it.key)
                 }
 
             is HandlingStrategy.INVITED ->
-                handlingStrategy.data.mapWithProgress(reporter, InitSyncStep.ImportingAccountGroups, 0.3f) {
+                handlingStrategy.data.mapWithProgress(reporter, InitialSyncStep.ImportingAccountGroups, 0.3f) {
                     handleInvitedGroup(realm, it.key)
                 }
 
             is HandlingStrategy.LEFT    ->
-                handlingStrategy.data.mapWithProgress(reporter, InitSyncStep.ImportingAccountGroups, 0.1f) {
+                handlingStrategy.data.mapWithProgress(reporter, InitialSyncStep.ImportingAccountGroups, 0.1f) {
                     handleLeftGroup(realm, it.key)
                 }
         }
         realm.insertOrUpdate(groups)
     }
 
-    private fun handleJoinedGroup(realm: Realm,
-                                  groupId: String): GroupEntity {
+    private fun handleJoinedGroup(
+            realm: Realm,
+            groupId: String
+    ): GroupEntity {
         val groupEntity = GroupEntity.where(realm, groupId).findFirst() ?: GroupEntity(groupId)
         val groupSummaryEntity = GroupSummaryEntity.getOrCreate(realm, groupId)
         groupEntity.membership = Membership.JOIN
@@ -76,8 +80,10 @@ internal class GroupSyncHandler @Inject constructor() {
         return groupEntity
     }
 
-    private fun handleInvitedGroup(realm: Realm,
-                                   groupId: String): GroupEntity {
+    private fun handleInvitedGroup(
+            realm: Realm,
+            groupId: String
+    ): GroupEntity {
         val groupEntity = GroupEntity.where(realm, groupId).findFirst() ?: GroupEntity(groupId)
         val groupSummaryEntity = GroupSummaryEntity.getOrCreate(realm, groupId)
         groupEntity.membership = Membership.INVITE
@@ -85,8 +91,10 @@ internal class GroupSyncHandler @Inject constructor() {
         return groupEntity
     }
 
-    private fun handleLeftGroup(realm: Realm,
-                                groupId: String): GroupEntity {
+    private fun handleLeftGroup(
+            realm: Realm,
+            groupId: String
+    ): GroupEntity {
         val groupEntity = GroupEntity.where(realm, groupId).findFirst() ?: GroupEntity(groupId)
         val groupSummaryEntity = GroupSummaryEntity.getOrCreate(realm, groupId)
         groupEntity.membership = Membership.LEAVE
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/ReadReceiptHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/ReadReceiptHandler.kt
index 77bee18df9..7329611a01 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/ReadReceiptHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/ReadReceiptHandler.kt
@@ -44,9 +44,11 @@ internal class ReadReceiptHandler @Inject constructor(
 
     companion object {
 
-        fun createContent(userId: String,
-                          eventId: String,
-                          currentTimeMillis: Long): ReadReceiptContent {
+        fun createContent(
+                userId: String,
+                eventId: String,
+                currentTimeMillis: Long
+        ): ReadReceiptContent {
             return mapOf(
                     eventId to mapOf(
                             READ_KEY to mapOf(
@@ -59,11 +61,13 @@ internal class ReadReceiptHandler @Inject constructor(
         }
     }
 
-    fun handle(realm: Realm,
-               roomId: String,
-               content: ReadReceiptContent?,
-               isInitialSync: Boolean,
-               aggregator: SyncResponsePostTreatmentAggregator?) {
+    fun handle(
+            realm: Realm,
+            roomId: String,
+            content: ReadReceiptContent?,
+            isInitialSync: Boolean,
+            aggregator: SyncResponsePostTreatmentAggregator?
+    ) {
         content ?: return
 
         try {
@@ -73,11 +77,13 @@ internal class ReadReceiptHandler @Inject constructor(
         }
     }
 
-    private fun handleReadReceiptContent(realm: Realm,
-                                         roomId: String,
-                                         content: ReadReceiptContent,
-                                         isInitialSync: Boolean,
-                                         aggregator: SyncResponsePostTreatmentAggregator?) {
+    private fun handleReadReceiptContent(
+            realm: Realm,
+            roomId: String,
+            content: ReadReceiptContent,
+            isInitialSync: Boolean,
+            aggregator: SyncResponsePostTreatmentAggregator?
+    ) {
         if (isInitialSync) {
             initialSyncStrategy(realm, roomId, content)
         } else {
@@ -101,10 +107,12 @@ internal class ReadReceiptHandler @Inject constructor(
         realm.insertOrUpdate(readReceiptSummaries)
     }
 
-    private fun incrementalSyncStrategy(realm: Realm,
-                                        roomId: String,
-                                        content: ReadReceiptContent,
-                                        aggregator: SyncResponsePostTreatmentAggregator?) {
+    private fun incrementalSyncStrategy(
+            realm: Realm,
+            roomId: String,
+            content: ReadReceiptContent,
+            aggregator: SyncResponsePostTreatmentAggregator?
+    ) {
         // First check if we have data from init sync to handle
         getContentFromInitSync(roomId)?.let {
             Timber.w("INIT_SYNC Insert during incremental sync RR for room $roomId")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
index c5d14afac0..88fa52a0bb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
@@ -27,11 +27,11 @@ import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilitiesService
-import org.matrix.android.sdk.api.session.initsync.InitSyncStep
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
 import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.session.room.threads.model.ThreadSummaryUpdateType
+import org.matrix.android.sdk.api.session.sync.InitialSyncStep
 import org.matrix.android.sdk.api.session.sync.InitialSyncStrategy
 import org.matrix.android.sdk.api.session.sync.initialSyncStrategy
 import org.matrix.android.sdk.api.session.sync.model.InvitedRoomSync
@@ -67,17 +67,17 @@ import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.extensions.clearWith
 import org.matrix.android.sdk.internal.session.StreamEventsManager
 import org.matrix.android.sdk.internal.session.events.getFixedRoomMemberContent
-import org.matrix.android.sdk.internal.session.initsync.ProgressReporter
-import org.matrix.android.sdk.internal.session.initsync.mapWithProgress
-import org.matrix.android.sdk.internal.session.initsync.reportSubtask
 import org.matrix.android.sdk.internal.session.room.membership.RoomChangeMembershipStateDataSource
 import org.matrix.android.sdk.internal.session.room.membership.RoomMemberEventHandler
 import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryUpdater
 import org.matrix.android.sdk.internal.session.room.timeline.PaginationDirection
 import org.matrix.android.sdk.internal.session.room.timeline.TimelineInput
 import org.matrix.android.sdk.internal.session.room.typing.TypingEventContent
+import org.matrix.android.sdk.internal.session.sync.ProgressReporter
 import org.matrix.android.sdk.internal.session.sync.SyncResponsePostTreatmentAggregator
+import org.matrix.android.sdk.internal.session.sync.mapWithProgress
 import org.matrix.android.sdk.internal.session.sync.parsing.RoomSyncAccountDataHandler
+import org.matrix.android.sdk.internal.session.sync.reportSubtask
 import org.matrix.android.sdk.internal.util.computeBestChunkSize
 import org.matrix.android.sdk.internal.util.time.Clock
 import timber.log.Timber
@@ -106,11 +106,13 @@ internal class RoomSyncHandler @Inject constructor(
         data class LEFT(val data: Map<String, RoomSync>) : HandlingStrategy()
     }
 
-    fun handle(realm: Realm,
-               roomsSyncResponse: RoomsSyncResponse,
-               isInitialSync: Boolean,
-               aggregator: SyncResponsePostTreatmentAggregator,
-               reporter: ProgressReporter? = null) {
+    fun handle(
+            realm: Realm,
+            roomsSyncResponse: RoomsSyncResponse,
+            isInitialSync: Boolean,
+            aggregator: SyncResponsePostTreatmentAggregator,
+            reporter: ProgressReporter? = null
+    ) {
         handleRoomSync(realm, HandlingStrategy.JOINED(roomsSyncResponse.join), isInitialSync, aggregator, reporter)
         handleRoomSync(realm, HandlingStrategy.INVITED(roomsSyncResponse.invite), isInitialSync, aggregator, reporter)
         handleRoomSync(realm, HandlingStrategy.LEFT(roomsSyncResponse.leave), isInitialSync, aggregator, reporter)
@@ -124,11 +126,13 @@ internal class RoomSyncHandler @Inject constructor(
     }
     // PRIVATE METHODS *****************************************************************************
 
-    private fun handleRoomSync(realm: Realm,
-                               handlingStrategy: HandlingStrategy,
-                               isInitialSync: Boolean,
-                               aggregator: SyncResponsePostTreatmentAggregator,
-                               reporter: ProgressReporter?) {
+    private fun handleRoomSync(
+            realm: Realm,
+            handlingStrategy: HandlingStrategy,
+            isInitialSync: Boolean,
+            aggregator: SyncResponsePostTreatmentAggregator,
+            reporter: ProgressReporter?
+    ) {
         val insertType = if (isInitialSync) {
             EventInsertType.INITIAL_SYNC
         } else {
@@ -142,18 +146,18 @@ internal class RoomSyncHandler @Inject constructor(
                     // Rooms are already inserted, return an empty list
                     emptyList()
                 } else {
-                    handlingStrategy.data.mapWithProgress(reporter, InitSyncStep.ImportingAccountJoinedRooms, 0.6f) {
+                    handlingStrategy.data.mapWithProgress(reporter, InitialSyncStep.ImportingAccountJoinedRooms, 0.6f) {
                         handleJoinedRoom(realm, it.key, it.value, insertType, syncLocalTimeStampMillis, aggregator)
                     }
                 }
             }
             is HandlingStrategy.INVITED ->
-                handlingStrategy.data.mapWithProgress(reporter, InitSyncStep.ImportingAccountInvitedRooms, 0.1f) {
+                handlingStrategy.data.mapWithProgress(reporter, InitialSyncStep.ImportingAccountInvitedRooms, 0.1f) {
                     handleInvitedRoom(realm, it.key, it.value, insertType, syncLocalTimeStampMillis)
                 }
 
             is HandlingStrategy.LEFT    -> {
-                handlingStrategy.data.mapWithProgress(reporter, InitSyncStep.ImportingAccountLeftRooms, 0.3f) {
+                handlingStrategy.data.mapWithProgress(reporter, InitialSyncStep.ImportingAccountLeftRooms, 0.3f) {
                     handleLeftRoom(realm, it.key, it.value, insertType, syncLocalTimeStampMillis)
                 }
             }
@@ -161,18 +165,20 @@ internal class RoomSyncHandler @Inject constructor(
         realm.insertOrUpdate(rooms)
     }
 
-    private fun insertJoinRoomsFromInitSync(realm: Realm,
-                                            handlingStrategy: HandlingStrategy.JOINED,
-                                            syncLocalTimeStampMillis: Long,
-                                            aggregator: SyncResponsePostTreatmentAggregator,
-                                            reporter: ProgressReporter?) {
+    private fun insertJoinRoomsFromInitSync(
+            realm: Realm,
+            handlingStrategy: HandlingStrategy.JOINED,
+            syncLocalTimeStampMillis: Long,
+            aggregator: SyncResponsePostTreatmentAggregator,
+            reporter: ProgressReporter?
+    ) {
         val bestChunkSize = computeBestChunkSize(
                 listSize = handlingStrategy.data.keys.size,
                 limit = (initialSyncStrategy as? InitialSyncStrategy.Optimized)?.maxRoomsToInsert ?: Int.MAX_VALUE
         )
 
         if (bestChunkSize.shouldChunk()) {
-            reportSubtask(reporter, InitSyncStep.ImportingAccountJoinedRooms, bestChunkSize.numberOfChunks, 0.6f) {
+            reportSubtask(reporter, InitialSyncStep.ImportingAccountJoinedRooms, bestChunkSize.numberOfChunks, 0.6f) {
                 Timber.d("INIT_SYNC ${handlingStrategy.data.keys.size} rooms to insert, split with $bestChunkSize")
                 // I cannot find a better way to chunk a map, so chunk the keys and then create new maps
                 handlingStrategy.data.keys
@@ -196,19 +202,21 @@ internal class RoomSyncHandler @Inject constructor(
             }
         } else {
             // No need to split
-            val rooms = handlingStrategy.data.mapWithProgress(reporter, InitSyncStep.ImportingAccountJoinedRooms, 0.6f) {
+            val rooms = handlingStrategy.data.mapWithProgress(reporter, InitialSyncStep.ImportingAccountJoinedRooms, 0.6f) {
                 handleJoinedRoom(realm, it.key, it.value, EventInsertType.INITIAL_SYNC, syncLocalTimeStampMillis, aggregator)
             }
             realm.insertOrUpdate(rooms)
         }
     }
 
-    private fun handleJoinedRoom(realm: Realm,
-                                 roomId: String,
-                                 roomSync: RoomSync,
-                                 insertType: EventInsertType,
-                                 syncLocalTimestampMillis: Long,
-                                 aggregator: SyncResponsePostTreatmentAggregator): RoomEntity {
+    private fun handleJoinedRoom(
+            realm: Realm,
+            roomId: String,
+            roomSync: RoomSync,
+            insertType: EventInsertType,
+            syncLocalTimestampMillis: Long,
+            aggregator: SyncResponsePostTreatmentAggregator
+    ): RoomEntity {
         Timber.v("Handle join sync for room $roomId")
         val isInitialSync = insertType == EventInsertType.INITIAL_SYNC
 
@@ -281,11 +289,13 @@ internal class RoomSyncHandler @Inject constructor(
         return roomEntity
     }
 
-    private fun handleInvitedRoom(realm: Realm,
-                                  roomId: String,
-                                  roomSync: InvitedRoomSync,
-                                  insertType: EventInsertType,
-                                  syncLocalTimestampMillis: Long): RoomEntity {
+    private fun handleInvitedRoom(
+            realm: Realm,
+            roomId: String,
+            roomSync: InvitedRoomSync,
+            insertType: EventInsertType,
+            syncLocalTimestampMillis: Long
+    ): RoomEntity {
         Timber.v("Handle invited sync for room $roomId")
         val isInitialSync = insertType == EventInsertType.INITIAL_SYNC
         val roomEntity = RoomEntity.getOrCreate(realm, roomId)
@@ -312,11 +322,13 @@ internal class RoomSyncHandler @Inject constructor(
         return roomEntity
     }
 
-    private fun handleLeftRoom(realm: Realm,
-                               roomId: String,
-                               roomSync: RoomSync,
-                               insertType: EventInsertType,
-                               syncLocalTimestampMillis: Long): RoomEntity {
+    private fun handleLeftRoom(
+            realm: Realm,
+            roomId: String,
+            roomSync: RoomSync,
+            insertType: EventInsertType,
+            syncLocalTimestampMillis: Long
+    ): RoomEntity {
         val isInitialSync = insertType == EventInsertType.INITIAL_SYNC
         val roomEntity = RoomEntity.getOrCreate(realm, roomId)
         for (event in roomSync.state?.events.orEmpty()) {
@@ -357,15 +369,17 @@ internal class RoomSyncHandler @Inject constructor(
         return roomEntity
     }
 
-    private fun handleTimelineEvents(realm: Realm,
-                                     roomId: String,
-                                     roomEntity: RoomEntity,
-                                     eventList: List<Event>,
-                                     prevToken: String? = null,
-                                     isLimited: Boolean = true,
-                                     insertType: EventInsertType,
-                                     syncLocalTimestampMillis: Long,
-                                     aggregator: SyncResponsePostTreatmentAggregator): ChunkEntity {
+    private fun handleTimelineEvents(
+            realm: Realm,
+            roomId: String,
+            roomEntity: RoomEntity,
+            eventList: List<Event>,
+            prevToken: String? = null,
+            isLimited: Boolean = true,
+            insertType: EventInsertType,
+            syncLocalTimestampMillis: Long,
+            aggregator: SyncResponsePostTreatmentAggregator
+    ): ChunkEntity {
         val lastChunk = ChunkEntity.findLastForwardChunkOfRoom(realm, roomEntity.roomId)
         if (isLimited && lastChunk != null) {
             lastChunk.deleteOnCascade(deleteStateEvents = false, canDeleteRoot = true)
@@ -500,11 +514,13 @@ internal class RoomSyncHandler @Inject constructor(
      * Adds new event to the appropriate thread chunk. If the event is already in
      * the thread timeline and /relations api, we should not added it
      */
-    private fun addToThreadChunkIfNeeded(realm: Realm,
-                                         roomId: String,
-                                         threadId: String,
-                                         timelineEventEntity: TimelineEventEntity?,
-                                         roomEntity: RoomEntity) {
+    private fun addToThreadChunkIfNeeded(
+            realm: Realm,
+            roomId: String,
+            threadId: String,
+            timelineEventEntity: TimelineEventEntity?,
+            roomEntity: RoomEntity
+    ) {
         val eventId = timelineEventEntity?.eventId ?: return
 
         ChunkEntity.findLastForwardChunkOfThread(realm, roomId, threadId)?.let { threadChunk ->
@@ -520,9 +536,10 @@ internal class RoomSyncHandler @Inject constructor(
 
     private fun decryptIfNeeded(event: Event, roomId: String) {
         try {
+            val timelineId = generateTimelineId(roomId)
             // Event from sync does not have roomId, so add it to the event first
             // note: runBlocking should be used here while we are in realm single thread executor, to avoid thread switching
-            val result = runBlocking { cryptoService.decryptEvent(event.copy(roomId = roomId), "") }
+            val result = runBlocking { cryptoService.decryptEvent(event.copy(roomId = roomId), timelineId) }
             event.mxDecryptionResult = OlmDecryptionResult(
                     payload = result.clearEvent,
                     senderKey = result.senderCurve25519Key,
@@ -537,15 +554,21 @@ internal class RoomSyncHandler @Inject constructor(
         }
     }
 
+    private fun generateTimelineId(roomId: String): String {
+        return "RoomSyncHandler$roomId"
+    }
+
     data class EphemeralResult(
             val typingUserIds: List<String> = emptyList()
     )
 
-    private fun handleEphemeral(realm: Realm,
-                                roomId: String,
-                                ephemeralEvents: List<Event>,
-                                isInitialSync: Boolean,
-                                aggregator: SyncResponsePostTreatmentAggregator): EphemeralResult {
+    private fun handleEphemeral(
+            realm: Realm,
+            roomId: String,
+            ephemeralEvents: List<Event>,
+            isInitialSync: Boolean,
+            aggregator: SyncResponsePostTreatmentAggregator
+    ): EphemeralResult {
         var result = EphemeralResult()
         for (event in ephemeralEvents) {
             when (event.type) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomTypingUsersHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomTypingUsersHandler.kt
index 63db13a5b8..54bb63753c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomTypingUsersHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomTypingUsersHandler.kt
@@ -23,8 +23,10 @@ import org.matrix.android.sdk.internal.session.room.membership.RoomMemberHelper
 import org.matrix.android.sdk.internal.session.typing.DefaultTypingUsersTracker
 import javax.inject.Inject
 
-internal class RoomTypingUsersHandler @Inject constructor(@UserId private val userId: String,
-                                                          private val typingUsersTracker: DefaultTypingUsersTracker) {
+internal class RoomTypingUsersHandler @Inject constructor(
+        @UserId private val userId: String,
+        private val typingUsersTracker: DefaultTypingUsersTracker
+) {
 
     // TODO This could be handled outside of the Realm transaction. Use the new aggregator?
     fun handle(realm: Realm, roomId: String, ephemeralResult: RoomSyncHandler.EphemeralResult?) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/ThreadsAwarenessHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/ThreadsAwarenessHandler.kt
index 9beb8333a4..8c7557a5b8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/ThreadsAwarenessHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/ThreadsAwarenessHandler.kt
@@ -156,10 +156,12 @@ internal class ThreadsAwarenessHandler @Inject constructor(
      * Handle events mainly coming from the RoomSyncHandler.
      * @return The content to inject in the roomSyncHandler live events
      */
-    fun makeEventThreadAware(realm: Realm,
-                             roomId: String?,
-                             event: Event?,
-                             eventEntity: EventEntity? = null): String? {
+    fun makeEventThreadAware(
+            realm: Realm,
+            roomId: String?,
+            event: Event?,
+            eventEntity: EventEntity? = null
+    ): String? {
         event ?: return null
         roomId ?: return null
         if (lightweightSettingsStorage.areThreadMessagesEnabled() && !isReplyEvent(event)) return null
@@ -271,10 +273,12 @@ internal class ThreadsAwarenessHandler @Inject constructor(
      * Actual update the eventEntity with the new payload.
      * @return the content to inject when this is executed by RoomSyncHandler
      */
-    private fun updateEventEntity(event: Event,
-                                  eventEntity: EventEntity?,
-                                  eventPayload: MutableMap<String, Any>,
-                                  messageTextContent: Content): String? {
+    private fun updateEventEntity(
+            event: Event,
+            eventEntity: EventEntity?,
+            eventPayload: MutableMap<String, Any>,
+            messageTextContent: Content
+    ): String? {
         eventPayload["content"] = messageTextContent
 
         if (event.isEncrypted()) {
@@ -304,11 +308,12 @@ internal class ThreadsAwarenessHandler @Inject constructor(
      * @param threadRelation the information about thread
      * @return The final content with the injected event
      */
-    private fun injectEvent(roomId: String,
-                            eventBody: String,
-                            eventToInject: Event,
-                            eventToInjectBody: String,
-                            threadRelation: RelationDefaultContent?
+    private fun injectEvent(
+            roomId: String,
+            eventBody: String,
+            eventToInject: Event,
+            eventToInjectBody: String,
+            threadRelation: RelationDefaultContent?
     ): Content? {
         val eventToInjectId = eventToInject.eventId ?: return null
         val eventIdToInjectSenderId = eventToInject.senderId.orEmpty()
@@ -334,11 +339,13 @@ internal class ThreadsAwarenessHandler @Inject constructor(
     /**
      * Integrate fallback Quote reply.
      */
-    private fun injectFallbackIndicator(event: Event,
-                                        eventBody: String,
-                                        eventEntity: EventEntity?,
-                                        eventPayload: MutableMap<String, Any>,
-                                        threadRelation: RelationDefaultContent?): String? {
+    private fun injectFallbackIndicator(
+            event: Event,
+            eventBody: String,
+            eventEntity: EventEntity?,
+            eventPayload: MutableMap<String, Any>,
+            threadRelation: RelationDefaultContent?
+    ): String? {
         val replyFormatted = LocalEchoEventFactory.QUOTE_PATTERN.format(
                 "In reply to a thread",
                 eventBody
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
index fc6a4e03d6..2d8cdc4e7f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
@@ -56,11 +56,12 @@ private const val DEFAULT_LONG_POOL_TIMEOUT = 30_000L
 
 private val loggerTag = LoggerTag("SyncThread", LoggerTag.SYNC)
 
-internal class SyncThread @Inject constructor(private val syncTask: SyncTask,
-                                              private val networkConnectivityChecker: NetworkConnectivityChecker,
-                                              private val backgroundDetectionObserver: BackgroundDetectionObserver,
-                                              private val activeCallHandler: ActiveCallHandler,
-                                              private val lightweightSettingsStorage: DefaultLightweightSettingsStorage
+internal class SyncThread @Inject constructor(
+        private val syncTask: SyncTask,
+        private val networkConnectivityChecker: NetworkConnectivityChecker,
+        private val backgroundDetectionObserver: BackgroundDetectionObserver,
+        private val activeCallHandler: ActiveCallHandler,
+        private val lightweightSettingsStorage: DefaultLightweightSettingsStorage
 ) : Thread("SyncThread"), NetworkConnectivityChecker.Listener, BackgroundDetectionObserver.Listener {
 
     private var state: SyncState = SyncState.Idle
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
index bbb18b664c..0cc7944d58 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
@@ -119,9 +119,11 @@ internal class SyncWorker(context: Context, workerParameters: WorkerParameters,
     companion object {
         private const val BG_SYNC_WORK_NAME = "BG_SYNCP"
 
-        fun requireBackgroundSync(workManagerProvider: WorkManagerProvider,
-                                  sessionId: String,
-                                  serverTimeoutInSeconds: Long = 0) {
+        fun requireBackgroundSync(
+                workManagerProvider: WorkManagerProvider,
+                sessionId: String,
+                serverTimeoutInSeconds: Long = 0
+        ) {
             val data = WorkerParamsFactory.toData(
                     Params(
                             sessionId = sessionId,
@@ -139,11 +141,13 @@ internal class SyncWorker(context: Context, workerParameters: WorkerParameters,
                     .enqueueUniqueWork(BG_SYNC_WORK_NAME, ExistingWorkPolicy.APPEND_OR_REPLACE, workRequest)
         }
 
-        fun automaticallyBackgroundSync(workManagerProvider: WorkManagerProvider,
-                                        sessionId: String,
-                                        serverTimeoutInSeconds: Long = 0,
-                                        delayInSeconds: Long = 30,
-                                        forceImmediate: Boolean = false) {
+        fun automaticallyBackgroundSync(
+                workManagerProvider: WorkManagerProvider,
+                sessionId: String,
+                serverTimeoutInSeconds: Long = 0,
+                delayInSeconds: Long = 30,
+                forceImmediate: Boolean = false
+        ) {
             val data = WorkerParamsFactory.toData(
                     Params(
                             sessionId = sessionId,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/TokensChunkResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/TokensChunkResponse.kt
index 533ba70b05..40fdcbbb84 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/TokensChunkResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/TokensChunkResponse.kt
@@ -22,4 +22,5 @@ import com.squareup.moshi.JsonClass
 internal data class TokensChunkResponse<T>(
         val start: String? = null,
         val end: String? = null,
-        val chunk: List<T>? = null)
+        val chunk: List<T>? = null
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/RoomSyncAccountDataHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/RoomSyncAccountDataHandler.kt
index 5e7bde87e7..b1b2bfef33 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/RoomSyncAccountDataHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/RoomSyncAccountDataHandler.kt
@@ -32,8 +32,10 @@ import org.matrix.android.sdk.internal.session.sync.handler.room.RoomFullyReadHa
 import org.matrix.android.sdk.internal.session.sync.handler.room.RoomTagHandler
 import javax.inject.Inject
 
-internal class RoomSyncAccountDataHandler @Inject constructor(private val roomTagHandler: RoomTagHandler,
-                                                              private val roomFullyReadHandler: RoomFullyReadHandler) {
+internal class RoomSyncAccountDataHandler @Inject constructor(
+        private val roomTagHandler: RoomTagHandler,
+        private val roomFullyReadHandler: RoomFullyReadHandler
+) {
 
     fun handle(realm: Realm, roomId: String, accountData: RoomSyncAccountData) {
         if (accountData.events.isNullOrEmpty()) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt
index 9876643bed..7075a56803 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt
@@ -51,8 +51,10 @@ internal class DefaultTermsService @Inject constructor(
         private val updateUserAccountDataTask: UpdateUserAccountDataTask
 ) : TermsService {
 
-    override suspend fun getTerms(serviceType: TermsService.ServiceType,
-                                  baseUrl: String): GetTermsResponse {
+    override suspend fun getTerms(
+            serviceType: TermsService.ServiceType,
+            baseUrl: String
+    ): GetTermsResponse {
         val url = buildUrl(baseUrl, serviceType)
         val termsResponse = executeRequest(null) {
             termsAPI.getTerms("${url}terms")
@@ -90,10 +92,12 @@ internal class DefaultTermsService @Inject constructor(
         }
     }
 
-    override suspend fun agreeToTerms(serviceType: TermsService.ServiceType,
-                                      baseUrl: String,
-                                      agreedUrls: List<String>,
-                                      token: String?) {
+    override suspend fun agreeToTerms(
+            serviceType: TermsService.ServiceType,
+            baseUrl: String,
+            agreedUrls: List<String>,
+            token: String?
+    ) {
         val url = buildUrl(baseUrl, serviceType)
         val tokenToUse = token?.takeIf { it.isNotEmpty() } ?: getToken(baseUrl)
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsAPI.kt
index f6f57bf0ef..6a3328ee52 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsAPI.kt
@@ -37,15 +37,19 @@ internal interface TermsAPI {
      * This request requires authentication.
      */
     @POST
-    suspend fun agreeToTerms(@Url url: String,
-                             @Body params: AcceptTermsBody,
-                             @Header(HttpHeaders.Authorization) token: String)
+    suspend fun agreeToTerms(
+            @Url url: String,
+            @Body params: AcceptTermsBody,
+            @Header(HttpHeaders.Authorization) token: String
+    )
 
     /**
      * API to retrieve the terms for a homeserver. The API /terms does not exist yet, so retrieve the terms from the login flow.
      * We do not care about the result (Credentials).
      */
     @POST
-    suspend fun register(@Url url: String,
-                         @Body body: JsonDict = emptyJsonDict)
+    suspend fun register(
+            @Url url: String,
+            @Body body: JsonDict = emptyJsonDict
+    )
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsModule.kt
index d7b6f68add..06d12bfe76 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsModule.kt
@@ -34,8 +34,10 @@ internal abstract class TermsModule {
         @Provides
         @JvmStatic
         @SessionScope
-        fun providesTermsAPI(@UnauthenticatedWithCertificate unauthenticatedOkHttpClient: Lazy<OkHttpClient>,
-                             retrofitFactory: RetrofitFactory): TermsAPI {
+        fun providesTermsAPI(
+                @UnauthenticatedWithCertificate unauthenticatedOkHttpClient: Lazy<OkHttpClient>,
+                retrofitFactory: RetrofitFactory
+        ): TermsAPI {
             val retrofit = retrofitFactory.create(unauthenticatedOkHttpClient, "https://foo.bar")
             return retrofit.create(TermsAPI::class.java)
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/thirdparty/DefaultThirdPartyService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/thirdparty/DefaultThirdPartyService.kt
index 210cb192e7..c8b9eaf810 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/thirdparty/DefaultThirdPartyService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/thirdparty/DefaultThirdPartyService.kt
@@ -21,8 +21,10 @@ import org.matrix.android.sdk.api.session.thirdparty.ThirdPartyService
 import org.matrix.android.sdk.api.session.thirdparty.model.ThirdPartyUser
 import javax.inject.Inject
 
-internal class DefaultThirdPartyService @Inject constructor(private val getThirdPartyProtocolTask: GetThirdPartyProtocolsTask,
-                                                            private val getThirdPartyUserTask: GetThirdPartyUserTask) :
+internal class DefaultThirdPartyService @Inject constructor(
+        private val getThirdPartyProtocolTask: GetThirdPartyProtocolsTask,
+        private val getThirdPartyUserTask: GetThirdPartyUserTask
+) :
         ThirdPartyService {
 
     override suspend fun getThirdPartyProtocols(): Map<String, ThirdPartyProtocol> {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/thirdparty/ThirdPartyAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/thirdparty/ThirdPartyAPI.kt
index 3ecc39ac94..6759205bf3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/thirdparty/ThirdPartyAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/thirdparty/ThirdPartyAPI.kt
@@ -39,6 +39,8 @@ internal interface ThirdPartyAPI {
      * Ref: https://matrix.org/docs/spec/client_server/r0.6.1#get-matrix-client-r0-thirdparty-user-protocol
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "thirdparty/user/{protocol}")
-    suspend fun getThirdPartyUser(@Path("protocol") protocol: String,
-                                  @QueryMap params: Map<String, String>?): List<ThirdPartyUser>
+    suspend fun getThirdPartyUser(
+            @Path("protocol") protocol: String,
+            @QueryMap params: Map<String, String>?
+    ): List<ThirdPartyUser>
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/DefaultUserService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/DefaultUserService.kt
index 4ffc42e714..660cf118df 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/DefaultUserService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/DefaultUserService.kt
@@ -26,10 +26,12 @@ import org.matrix.android.sdk.internal.session.user.accountdata.UpdateIgnoredUse
 import org.matrix.android.sdk.internal.session.user.model.SearchUserTask
 import javax.inject.Inject
 
-internal class DefaultUserService @Inject constructor(private val userDataSource: UserDataSource,
-                                                      private val searchUserTask: SearchUserTask,
-                                                      private val updateIgnoredUserIdsTask: UpdateIgnoredUserIdsTask,
-                                                      private val getProfileInfoTask: GetProfileInfoTask) : UserService {
+internal class DefaultUserService @Inject constructor(
+        private val userDataSource: UserDataSource,
+        private val searchUserTask: SearchUserTask,
+        private val updateIgnoredUserIdsTask: UpdateIgnoredUserIdsTask,
+        private val getProfileInfoTask: GetProfileInfoTask
+) : UserService {
 
     override fun getUser(userId: String): User? {
         return userDataSource.getUser(userId)
@@ -59,9 +61,11 @@ internal class DefaultUserService @Inject constructor(private val userDataSource
         return userDataSource.getIgnoredUsersLive()
     }
 
-    override suspend fun searchUsersDirectory(search: String,
-                                              limit: Int,
-                                              excludedUserIds: Set<String>): List<User> {
+    override suspend fun searchUsersDirectory(
+            search: String,
+            limit: Int,
+            excludedUserIds: Set<String>
+    ): List<User> {
         val params = SearchUserTask.Params(limit, search, excludedUserIds)
         return searchUserTask.execute(params)
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserDataSource.kt
index e83725b10d..f9feb04e97 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserDataSource.kt
@@ -36,8 +36,10 @@ import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import javax.inject.Inject
 
-internal class UserDataSource @Inject constructor(@SessionDatabase private val monarchy: Monarchy,
-                                                  private val realmSessionProvider: RealmSessionProvider) {
+internal class UserDataSource @Inject constructor(
+        @SessionDatabase private val monarchy: Monarchy,
+        private val realmSessionProvider: RealmSessionProvider
+) {
 
     private val realmDataSourceFactory: Monarchy.RealmDataSourceFactory<UserEntity> by lazy {
         monarchy.createDataSourceFactory { realm ->
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
index 178f349ec8..b283d51845 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
@@ -31,7 +31,9 @@ internal interface AccountDataAPI {
      * @param params the put params
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "user/{userId}/account_data/{type}")
-    suspend fun setAccountData(@Path("userId") userId: String,
-                               @Path("type") type: String,
-                               @Body params: Any)
+    suspend fun setAccountData(
+            @Path("userId") userId: String,
+            @Path("type") type: String,
+            @Body params: Any
+    )
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateUserAccountDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateUserAccountDataTask.kt
index 88db381852..ff0e960f0f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateUserAccountDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateUserAccountDataTask.kt
@@ -35,8 +35,9 @@ internal interface UpdateUserAccountDataTask : Task<UpdateUserAccountDataTask.Pa
         fun getData(): Any
     }
 
-    data class IdentityParams(override val type: String = UserAccountDataTypes.TYPE_IDENTITY_SERVER,
-                              private val identityContent: IdentityServerContent
+    data class IdentityParams(
+            override val type: String = UserAccountDataTypes.TYPE_IDENTITY_SERVER,
+            private val identityContent: IdentityServerContent
     ) : Params {
 
         override fun getData(): Any {
@@ -44,8 +45,9 @@ internal interface UpdateUserAccountDataTask : Task<UpdateUserAccountDataTask.Pa
         }
     }
 
-    data class AcceptedTermsParams(override val type: String = UserAccountDataTypes.TYPE_ACCEPTED_TERMS,
-                                   private val acceptedTermsContent: AcceptedTermsContent
+    data class AcceptedTermsParams(
+            override val type: String = UserAccountDataTypes.TYPE_ACCEPTED_TERMS,
+            private val acceptedTermsContent: AcceptedTermsContent
     ) : Params {
 
         override fun getData(): Any {
@@ -54,8 +56,9 @@ internal interface UpdateUserAccountDataTask : Task<UpdateUserAccountDataTask.Pa
     }
 
     // TODO Use [UserAccountDataDirectMessages] class?
-    data class DirectChatParams(override val type: String = UserAccountDataTypes.TYPE_DIRECT_MESSAGES,
-                                private val directMessages: Map<String, List<String>>
+    data class DirectChatParams(
+            override val type: String = UserAccountDataTypes.TYPE_DIRECT_MESSAGES,
+            private val directMessages: Map<String, List<String>>
     ) : Params {
 
         override fun getData(): Any {
@@ -63,8 +66,9 @@ internal interface UpdateUserAccountDataTask : Task<UpdateUserAccountDataTask.Pa
         }
     }
 
-    data class BreadcrumbsParams(override val type: String = UserAccountDataTypes.TYPE_BREADCRUMBS,
-                                 private val breadcrumbsContent: BreadcrumbsContent
+    data class BreadcrumbsParams(
+            override val type: String = UserAccountDataTypes.TYPE_BREADCRUMBS,
+            private val breadcrumbsContent: BreadcrumbsContent
     ) : Params {
 
         override fun getData(): Any {
@@ -72,24 +76,29 @@ internal interface UpdateUserAccountDataTask : Task<UpdateUserAccountDataTask.Pa
         }
     }
 
-    data class AllowedWidgets(override val type: String = UserAccountDataTypes.TYPE_ALLOWED_WIDGETS,
-                              private val allowedWidgetsContent: AllowedWidgetsContent) : Params {
+    data class AllowedWidgets(
+            override val type: String = UserAccountDataTypes.TYPE_ALLOWED_WIDGETS,
+            private val allowedWidgetsContent: AllowedWidgetsContent
+    ) : Params {
 
         override fun getData(): Any {
             return allowedWidgetsContent
         }
     }
 
-    data class IntegrationProvisioning(override val type: String = UserAccountDataTypes.TYPE_INTEGRATION_PROVISIONING,
-                                       private val integrationProvisioningContent: IntegrationProvisioningContent) : Params {
+    data class IntegrationProvisioning(
+            override val type: String = UserAccountDataTypes.TYPE_INTEGRATION_PROVISIONING,
+            private val integrationProvisioningContent: IntegrationProvisioningContent
+    ) : Params {
 
         override fun getData(): Any {
             return integrationProvisioningContent
         }
     }
 
-    data class AnyParams(override val type: String,
-                         private val any: Any
+    data class AnyParams(
+            override val type: String,
+            private val any: Any
     ) : Params {
         override fun getData(): Any {
             return any
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UserAccountDataDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UserAccountDataDataSource.kt
index 2c3d660333..39f155096a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UserAccountDataDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UserAccountDataDataSource.kt
@@ -31,9 +31,11 @@ import org.matrix.android.sdk.internal.database.model.UserAccountDataEntityField
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import javax.inject.Inject
 
-internal class UserAccountDataDataSource @Inject constructor(@SessionDatabase private val monarchy: Monarchy,
-                                                             private val realmSessionProvider: RealmSessionProvider,
-                                                             private val accountDataMapper: AccountDataMapper) {
+internal class UserAccountDataDataSource @Inject constructor(
+        @SessionDatabase private val monarchy: Monarchy,
+        private val realmSessionProvider: RealmSessionProvider,
+        private val accountDataMapper: AccountDataMapper
+) {
 
     fun getAccountDataEvent(type: String): UserAccountDataEvent? {
         return getAccountDataEvents(setOf(type)).firstOrNull()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/CreateWidgetTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/CreateWidgetTask.kt
index 06508def1c..51e6812a8b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/CreateWidgetTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/CreateWidgetTask.kt
@@ -41,10 +41,12 @@ internal interface CreateWidgetTask : Task<CreateWidgetTask.Params, String> {
     )
 }
 
-internal class DefaultCreateWidgetTask @Inject constructor(@SessionDatabase private val monarchy: Monarchy,
-                                                           private val roomAPI: RoomAPI,
-                                                           @UserId private val userId: String,
-                                                           private val globalErrorReceiver: GlobalErrorReceiver) : CreateWidgetTask {
+internal class DefaultCreateWidgetTask @Inject constructor(
+        @SessionDatabase private val monarchy: Monarchy,
+        private val roomAPI: RoomAPI,
+        @UserId private val userId: String,
+        private val globalErrorReceiver: GlobalErrorReceiver
+) : CreateWidgetTask {
 
     override suspend fun execute(params: CreateWidgetTask.Params): String {
         val response = executeRequest(globalErrorReceiver) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetPostAPIMediator.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetPostAPIMediator.kt
index 857105f6ef..2665809d9a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetPostAPIMediator.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetPostAPIMediator.kt
@@ -27,8 +27,10 @@ import timber.log.Timber
 import java.lang.reflect.Type
 import javax.inject.Inject
 
-internal class DefaultWidgetPostAPIMediator @Inject constructor(private val moshi: Moshi,
-                                                                private val widgetPostMessageAPIProvider: WidgetPostMessageAPIProvider) :
+internal class DefaultWidgetPostAPIMediator @Inject constructor(
+        private val moshi: Moshi,
+        private val widgetPostMessageAPIProvider: WidgetPostMessageAPIProvider
+) :
         WidgetPostAPIMediator {
 
     private val jsonAdapter = moshi.adapter<JsonDict>(JSON_DICT_PARAMETERIZED_TYPE)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetService.kt
index 53a435d217..7b2edf2dbf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetService.kt
@@ -26,9 +26,11 @@ import org.matrix.android.sdk.api.session.widgets.model.Widget
 import javax.inject.Inject
 import javax.inject.Provider
 
-internal class DefaultWidgetService @Inject constructor(private val widgetManager: WidgetManager,
-                                                        private val widgetURLFormatter: WidgetURLFormatter,
-                                                        private val widgetPostAPIMediator: Provider<WidgetPostAPIMediator>) :
+internal class DefaultWidgetService @Inject constructor(
+        private val widgetManager: WidgetManager,
+        private val widgetURLFormatter: WidgetURLFormatter,
+        private val widgetPostAPIMediator: Provider<WidgetPostAPIMediator>
+) :
         WidgetService {
 
     override fun getWidgetURLFormatter(): WidgetURLFormatter {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetURLFormatter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetURLFormatter.kt
index 5879b62446..019edf21b6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetURLFormatter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetURLFormatter.kt
@@ -30,9 +30,10 @@ import org.matrix.android.sdk.internal.session.widgets.token.GetScalarTokenTask
 import javax.inject.Inject
 
 @SessionScope
-internal class DefaultWidgetURLFormatter @Inject constructor(private val integrationManager: IntegrationManager,
-                                                             private val getScalarTokenTask: GetScalarTokenTask,
-                                                             private val matrixConfiguration: MatrixConfiguration
+internal class DefaultWidgetURLFormatter @Inject constructor(
+        private val integrationManager: IntegrationManager,
+        private val getScalarTokenTask: GetScalarTokenTask,
+        private val matrixConfiguration: MatrixConfiguration
 ) : IntegrationManagerService.Listener, WidgetURLFormatter, SessionLifecycleObserver {
 
     private lateinit var currentConfig: IntegrationManagerConfig
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt
index 07ed91c179..3f7db93b97 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt
@@ -45,12 +45,14 @@ import org.matrix.android.sdk.internal.session.widgets.helper.extractWidgetSeque
 import javax.inject.Inject
 
 @SessionScope
-internal class WidgetManager @Inject constructor(private val integrationManager: IntegrationManager,
-                                                 private val userAccountDataDataSource: UserAccountDataDataSource,
-                                                 private val stateEventDataSource: StateEventDataSource,
-                                                 private val createWidgetTask: CreateWidgetTask,
-                                                 private val widgetFactory: WidgetFactory,
-                                                 @UserId private val userId: String) :
+internal class WidgetManager @Inject constructor(
+        private val integrationManager: IntegrationManager,
+        private val userAccountDataDataSource: UserAccountDataDataSource,
+        private val stateEventDataSource: StateEventDataSource,
+        private val createWidgetTask: CreateWidgetTask,
+        private val widgetFactory: WidgetFactory,
+        @UserId private val userId: String
+) :
 
         IntegrationManagerService.Listener, SessionLifecycleObserver {
 
@@ -103,8 +105,10 @@ internal class WidgetManager @Inject constructor(private val integrationManager:
         return widgetFactory.computeURL(widget, isLightTheme)
     }
 
-    private fun List<Event>.mapEventsToWidgets(widgetTypes: Set<String>? = null,
-                                               excludedTypes: Set<String>? = null): List<Widget> {
+    private fun List<Event>.mapEventsToWidgets(
+            widgetTypes: Set<String>? = null,
+            excludedTypes: Set<String>? = null
+    ): List<Widget> {
         val widgetEvents = this
         // Widget id -> widget
         val widgets: MutableMap<String, Widget> = HashMap()
@@ -149,8 +153,10 @@ internal class WidgetManager @Inject constructor(private val integrationManager:
         return widgetsAccountData.mapToWidgets(widgetTypes, excludedTypes)
     }
 
-    private fun UserAccountDataEvent.mapToWidgets(widgetTypes: Set<String>? = null,
-                                                  excludedTypes: Set<String>? = null): List<Widget> {
+    private fun UserAccountDataEvent.mapToWidgets(
+            widgetTypes: Set<String>? = null,
+            excludedTypes: Set<String>? = null
+    ): List<Widget> {
         return extractWidgetSequence(widgetFactory)
                 .filter {
                     val widgetType = it.widgetContent.type ?: return@filter false
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetsAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetsAPI.kt
index 97b40e545e..2a4af9ffaa 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetsAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetsAPI.kt
@@ -30,10 +30,14 @@ internal interface WidgetsAPI {
      * @param version the widget API version
      */
     @POST("register")
-    suspend fun register(@Body body: OpenIdToken,
-                         @Query("v") version: String?): RegisterWidgetResponse
+    suspend fun register(
+            @Body body: OpenIdToken,
+            @Query("v") version: String?
+    ): RegisterWidgetResponse
 
     @GET("account")
-    suspend fun validateToken(@Query("scalar_token") scalarToken: String?,
-                              @Query("v") version: String?)
+    suspend fun validateToken(
+            @Query("scalar_token") scalarToken: String?,
+            @Query("v") version: String?
+    )
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetsAPIProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetsAPIProvider.kt
index 48c8fcdb03..25caadbade 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetsAPIProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetsAPIProvider.kt
@@ -24,8 +24,10 @@ import org.matrix.android.sdk.internal.session.SessionScope
 import javax.inject.Inject
 
 @SessionScope
-internal class WidgetsAPIProvider @Inject constructor(@Unauthenticated private val okHttpClient: Lazy<OkHttpClient>,
-                                                      private val retrofitFactory: RetrofitFactory) {
+internal class WidgetsAPIProvider @Inject constructor(
+        @Unauthenticated private val okHttpClient: Lazy<OkHttpClient>,
+        private val retrofitFactory: RetrofitFactory
+) {
 
     // Map to keep one WidgetAPI instance by serverUrl
     private val widgetsAPIs = mutableMapOf<String, WidgetsAPI>()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/WidgetFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/WidgetFactory.kt
index a5e74a8af0..8bd61a7bdf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/WidgetFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/WidgetFactory.kt
@@ -33,11 +33,13 @@ import org.matrix.android.sdk.internal.session.user.UserDataSource
 import java.net.URLEncoder
 import javax.inject.Inject
 
-internal class WidgetFactory @Inject constructor(private val userDataSource: UserDataSource,
-                                                 private val realmSessionProvider: RealmSessionProvider,
-                                                 private val displayNameResolver: DisplayNameResolver,
-                                                 private val urlResolver: ContentUrlResolver,
-                                                 @UserId private val userId: String) {
+internal class WidgetFactory @Inject constructor(
+        private val userDataSource: UserDataSource,
+        private val realmSessionProvider: RealmSessionProvider,
+        private val displayNameResolver: DisplayNameResolver,
+        private val urlResolver: ContentUrlResolver,
+        @UserId private val userId: String
+) {
 
     fun create(widgetEvent: Event): Widget? {
         val widgetContent = widgetEvent.content.toModel<WidgetContent>()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/token/GetScalarTokenTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/token/GetScalarTokenTask.kt
index 17797cad52..49ae52afaa 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/token/GetScalarTokenTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/token/GetScalarTokenTask.kt
@@ -37,9 +37,11 @@ internal interface GetScalarTokenTask : Task<GetScalarTokenTask.Params, String>
 
 private const val WIDGET_API_VERSION = "1.1"
 
-internal class DefaultGetScalarTokenTask @Inject constructor(private val widgetsAPIProvider: WidgetsAPIProvider,
-                                                             private val scalarTokenStore: ScalarTokenStore,
-                                                             private val getOpenIdTokenTask: GetOpenIdTokenTask) : GetScalarTokenTask {
+internal class DefaultGetScalarTokenTask @Inject constructor(
+        private val widgetsAPIProvider: WidgetsAPIProvider,
+        private val scalarTokenStore: ScalarTokenStore,
+        private val getOpenIdTokenTask: GetOpenIdTokenTask
+) : GetScalarTokenTask {
 
     override suspend fun execute(params: GetScalarTokenTask.Params): String {
         val widgetsAPI = widgetsAPIProvider.get(params.serverUrl)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/ConfigurableTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/ConfigurableTask.kt
index bc80cf7ee8..eead25b57c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/ConfigurableTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/ConfigurableTask.kt
@@ -21,8 +21,9 @@ import org.matrix.android.sdk.api.NoOpMatrixCallback
 import org.matrix.android.sdk.api.util.Cancelable
 import java.util.UUID
 
-internal fun <PARAMS, RESULT> Task<PARAMS, RESULT>.configureWith(params: PARAMS,
-                                                                 init: (ConfigurableTask.Builder<PARAMS, RESULT>.() -> Unit) = {}
+internal fun <PARAMS, RESULT> Task<PARAMS, RESULT>.configureWith(
+        params: PARAMS,
+        init: (ConfigurableTask.Builder<PARAMS, RESULT>.() -> Unit) = {}
 ): ConfigurableTask<PARAMS, RESULT> {
     return ConfigurableTask.Builder(this, params).apply(init).build()
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/CancelableWork.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/CancelableWork.kt
index 6b04cea936..2240a408ef 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/CancelableWork.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/CancelableWork.kt
@@ -20,8 +20,10 @@ import androidx.work.WorkManager
 import org.matrix.android.sdk.api.util.Cancelable
 import java.util.UUID
 
-internal class CancelableWork(private val workManager: WorkManager,
-                              private val workId: UUID) : Cancelable {
+internal class CancelableWork(
+        private val workManager: WorkManager,
+        private val workId: UUID
+) : Cancelable {
 
     override fun cancel() {
         workManager.cancelWorkById(workId)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LogUtil.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LogUtil.kt
index ffad0b856c..2306ddf850 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LogUtil.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LogUtil.kt
@@ -33,10 +33,12 @@ internal fun <T> Collection<T>.logLimit(maxQuantity: Int = 5): String {
     }
 }
 
-internal suspend fun <T> logDuration(message: String,
-                                     loggerTag: LoggerTag,
-                                     clock: Clock,
-                                     block: suspend () -> T): T {
+internal suspend fun <T> logDuration(
+        message: String,
+        loggerTag: LoggerTag,
+        clock: Clock,
+        block: suspend () -> T
+): T {
     Timber.tag(loggerTag.value).d("$message -- BEGIN")
     val start = clock.epochMillis()
     val result = logRamUsage(message) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/database/RealmMigrator.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/database/RealmMigrator.kt
index 8f3c89f2d4..8da1bed97e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/database/RealmMigrator.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/database/RealmMigrator.kt
@@ -20,8 +20,10 @@ import io.realm.DynamicRealm
 import io.realm.RealmObjectSchema
 import timber.log.Timber
 
-internal abstract class RealmMigrator(private val realm: DynamicRealm,
-                                      private val targetSchemaVersion: Int) {
+internal abstract class RealmMigrator(
+        private val realm: DynamicRealm,
+        private val targetSchemaVersion: Int
+) {
     fun perform() {
         Timber.d("Migrate ${realm.configuration.realmFileName} to $targetSchemaVersion")
         doMigrate(realm)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt
index 95b3662c67..9e464a80dc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt
@@ -27,6 +27,7 @@ import org.matrix.android.sdk.internal.di.MatrixScope
 import org.matrix.android.sdk.internal.session.content.UploadContentWorker
 import org.matrix.android.sdk.internal.session.group.GetGroupDataWorker
 import org.matrix.android.sdk.internal.session.pushers.AddPusherWorker
+import org.matrix.android.sdk.internal.session.room.aggregation.livelocation.DeactivateLiveLocationShareWorker
 import org.matrix.android.sdk.internal.session.room.send.MultipleEventSendingDispatcherWorker
 import org.matrix.android.sdk.internal.session.room.send.RedactEventWorker
 import org.matrix.android.sdk.internal.session.room.send.SendEventWorker
@@ -64,9 +65,11 @@ internal class MatrixWorkerFactory @Inject constructor(private val sessionManage
                 SyncWorker(appContext, workerParameters, sessionManager)
             UpdateTrustWorker::class.java.name                    ->
                 UpdateTrustWorker(appContext, workerParameters, sessionManager)
-            UploadContentWorker::class.java.name                  ->
+            UploadContentWorker::class.java.name                    ->
                 UploadContentWorker(appContext, workerParameters, sessionManager)
-            else                                                  -> {
+            DeactivateLiveLocationShareWorker::class.java.name ->
+                DeactivateLiveLocationShareWorker(appContext, workerParameters, sessionManager)
+            else                                                    -> {
                 Timber.w("No worker defined on MatrixWorkerFactory for $workerClassName will delegate to default.")
                 // Return null to delegate to the default WorkerFactory.
                 null
@@ -78,9 +81,11 @@ internal class MatrixWorkerFactory @Inject constructor(private val sessionManage
      * This worker is launched by the factory with the isCreatedByMatrixWorkerFactory flag to true.
      * If the MatrixWorkerFactory is not set up, it will default to the other constructor and it will throw
      */
-    class CheckFactoryWorker(context: Context,
-                             workerParameters: WorkerParameters,
-                             private val isCreatedByMatrixWorkerFactory: Boolean) :
+    class CheckFactoryWorker(
+            context: Context,
+            workerParameters: WorkerParameters,
+            private val isCreatedByMatrixWorkerFactory: Boolean
+    ) :
             CoroutineWorker(context, workerParameters) {
 
         // Called by WorkManager if there is no MatrixWorkerFactory
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/userstories/Us000InitMatrix.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/userstories/Us000InitMatrix.kt
new file mode 100644
index 0000000000..06c6cc9ef9
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/userstories/Us000InitMatrix.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:Suppress("unused")
+
+package org.matrix.android.sdk.userstories
+
+/**
+ * ### Title
+ * Init a Matrix object.
+ *
+ * ### Required APIs:
+ * - [org.matrix.android.sdk.api.Matrix] constructor
+ */
+class Us000InitMatrix private constructor()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/userstories/Us100SignIn.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/userstories/Us100SignIn.kt
new file mode 100644
index 0000000000..f508a75db7
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/userstories/Us100SignIn.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:Suppress("unused")
+
+package org.matrix.android.sdk.userstories
+
+/**
+ * ### Title
+ * Sign in to an existing account.
+ *
+ * #### Required APIs:
+ * - [org.matrix.android.sdk.api.Matrix.authenticationService]
+ * - [org.matrix.android.sdk.api.auth.AuthenticationService.getLoginFlow]
+ * - [org.matrix.android.sdk.api.auth.AuthenticationService.getLoginWizard]
+ * - [org.matrix.android.sdk.api.auth.login.LoginWizard.login]
+ */
+class Us100SignIn private constructor()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/userstories/Us150VerifySession.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/userstories/Us150VerifySession.kt
new file mode 100644
index 0000000000..ac56cc35dd
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/userstories/Us150VerifySession.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:Suppress("unused")
+
+package org.matrix.android.sdk.userstories
+
+/**
+ * ### Title
+ * Verify a Session after a Sign in.
+ *
+ * #### Required APIs:
+ * - TODO
+ */
+class Us150VerifySession private constructor()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/userstories/Us190SignOut.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/userstories/Us190SignOut.kt
new file mode 100644
index 0000000000..0c74c0dfef
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/userstories/Us190SignOut.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:Suppress("unused")
+
+package org.matrix.android.sdk.userstories
+
+/**
+ * ### Title
+ * Sign out.
+ *
+ * #### Required APIs:
+ * - TODO
+ */
+class Us190SignOut private constructor()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/userstories/Us200RoomList.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/userstories/Us200RoomList.kt
new file mode 100644
index 0000000000..1f0b2e4103
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/userstories/Us200RoomList.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:Suppress("unused")
+
+package org.matrix.android.sdk.userstories
+
+/**
+ * ### Title
+ * Get the Room list.
+ *
+ * #### Required APIs:
+ * - TODO
+ */
+class Us200RoomList private constructor()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/userstories/Us300RoomTimeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/userstories/Us300RoomTimeline.kt
new file mode 100644
index 0000000000..5db06f95f6
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/userstories/Us300RoomTimeline.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:Suppress("unused")
+
+package org.matrix.android.sdk.userstories
+
+/**
+ * ### Title
+ * Display a Room timeline, and navigate backward and forward.
+ *
+ * #### Required APIs:
+ * - TODO
+ */
+class Us300RoomTimeline private constructor()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/userstories/Us350RoomTimelineFromPermalink.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/userstories/Us350RoomTimelineFromPermalink.kt
new file mode 100644
index 0000000000..5e0f6d3b3d
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/userstories/Us350RoomTimelineFromPermalink.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:Suppress("unused")
+
+package org.matrix.android.sdk.userstories
+
+/**
+ * ### Title
+ * Display a Room timeline at a specific point.
+ *
+ * #### Required APIs:
+ * - TODO
+ */
+class Us350RoomTimelineFromPermalink private constructor()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/userstories/Us400RoomSendContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/userstories/Us400RoomSendContent.kt
new file mode 100644
index 0000000000..3f72cd0b9e
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/userstories/Us400RoomSendContent.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:Suppress("unused")
+
+package org.matrix.android.sdk.userstories
+
+/**
+ * ### Title
+ * Send content to a room, including monitoring the sending state.
+ *
+ * #### Required APIs:
+ * - TODO
+ */
+class Us400RoomSendContent private constructor()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/userstories/Us500Notification.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/userstories/Us500Notification.kt
new file mode 100644
index 0000000000..c5c2107fa6
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/userstories/Us500Notification.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:Suppress("unused")
+
+package org.matrix.android.sdk.userstories
+
+/**
+ * ### Title
+ * Get notified when new Events are received.
+ *
+ * #### Required APIs:
+ * - TODO
+ */
+class Us500Notification private constructor()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/userstories/Us600SyncWithTheServer.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/userstories/Us600SyncWithTheServer.kt
new file mode 100644
index 0000000000..6b8fb87df7
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/userstories/Us600SyncWithTheServer.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:Suppress("unused")
+
+package org.matrix.android.sdk.userstories
+
+/**
+ * ### Title
+ * Manage the sync with the server.
+ *
+ * #### Required APIs:
+ * - TODO
+ */
+class Us600SyncWithTheServer private constructor()
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/auth/version/HomeServerVersionTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/auth/version/HomeServerVersionTest.kt
new file mode 100644
index 0000000000..413af9c434
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/auth/version/HomeServerVersionTest.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.matrix.android.sdk.internal.auth.version
+
+import org.amshove.kluent.internal.assertEquals
+import org.junit.Test
+
+class HomeServerVersionTest {
+
+    @Test
+    fun `given a semantic version, when parsing, then converts to home server version`() {
+        val supportedVersions = listOf(
+                case("1.5", expected = aVersion(1, 5, 0)),
+                case("0.5.1", expected = aVersion(0, 5, 1)),
+                case("1.0.0", expected = aVersion(1, 0, 0)),
+                case("1.10.3", expected = aVersion(1, 10, 3)),
+        ).withPrefixes("v", "r")
+
+        val unsupportedVersions = listOf(
+                case("v-1.5.1", expected = null),
+                case("1.4.", expected = null),
+                case("1.5.1.", expected = null),
+                case("r1", expected = null),
+                case("a", expected = null),
+                case("1a.2b.3c", expected = null),
+                case("r", expected = null),
+        )
+
+        (supportedVersions + unsupportedVersions).forEach { (input, expected) ->
+            val result = HomeServerVersion.parse(input)
+
+            assertEquals(expected, result, "Expected $input to be $expected but got $result")
+        }
+    }
+}
+
+private fun aVersion(major: Int, minor: Int, patch: Int) = HomeServerVersion(major, minor, patch)
+private fun case(input: String, expected: HomeServerVersion?) = Case(input, expected)
+
+private fun List<Case>.withPrefixes(vararg prefixes: String) = map { case ->
+    prefixes.map { prefix -> case.copy(input = "$prefix${case.input}") }
+}.flatten()
+
+private data class Case(val input: String, val expected: HomeServerVersion?)
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/database/mapper/LiveLocationShareAggregatedSummaryMapperTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/database/mapper/LiveLocationShareAggregatedSummaryMapperTest.kt
new file mode 100644
index 0000000000..47d5f46525
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/database/mapper/LiveLocationShareAggregatedSummaryMapperTest.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.database.mapper
+
+import com.squareup.moshi.Moshi
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Test
+import org.matrix.android.sdk.api.session.room.model.livelocation.LiveLocationShareAggregatedSummary
+import org.matrix.android.sdk.api.session.room.model.message.LocationInfo
+import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconLocationDataContent
+import org.matrix.android.sdk.internal.database.model.livelocation.LiveLocationShareAggregatedSummaryEntity
+
+private const val ANY_USER_ID = "a-user-id"
+private const val ANY_ACTIVE_STATE = true
+private const val ANY_TIMEOUT = 123L
+private val A_LOCATION_INFO = LocationInfo("a-geo-uri")
+
+class LiveLocationShareAggregatedSummaryMapperTest {
+
+    private val mapper = LiveLocationShareAggregatedSummaryMapper()
+
+    @Test
+    fun `given an entity then result should be mapped correctly`() {
+        val entity = anEntity(content = MessageBeaconLocationDataContent(locationInfo = A_LOCATION_INFO))
+
+        val summary = mapper.map(entity)
+
+        summary shouldBeEqualTo LiveLocationShareAggregatedSummary(
+                userId = ANY_USER_ID,
+                isActive = ANY_ACTIVE_STATE,
+                endOfLiveTimestampMillis = ANY_TIMEOUT,
+                lastLocationDataContent = MessageBeaconLocationDataContent(locationInfo = A_LOCATION_INFO)
+        )
+    }
+
+    private fun anEntity(content: MessageBeaconLocationDataContent) = LiveLocationShareAggregatedSummaryEntity(
+            userId = ANY_USER_ID,
+            isActive = ANY_ACTIVE_STATE,
+            endOfLiveTimestampMillis = ANY_TIMEOUT,
+            lastLocationContent = Moshi.Builder().build().adapter(MessageBeaconLocationDataContent::class.java).toJson(content)
+    )
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeRequestExecutor.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeRequestExecutor.kt
index 2f332a89a8..ad20abf63c 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeRequestExecutor.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeRequestExecutor.kt
@@ -21,11 +21,13 @@ import org.matrix.android.sdk.internal.network.RequestExecutor
 
 internal class FakeRequestExecutor : RequestExecutor {
 
-    override suspend fun <DATA> executeRequest(globalErrorReceiver: GlobalErrorReceiver?,
-                                               canRetry: Boolean,
-                                               maxDelayBeforeRetry: Long,
-                                               maxRetriesCount: Int,
-                                               requestBlock: suspend () -> DATA): DATA {
+    override suspend fun <DATA> executeRequest(
+            globalErrorReceiver: GlobalErrorReceiver?,
+            canRetry: Boolean,
+            maxDelayBeforeRetry: Long,
+            maxRetriesCount: Int,
+            requestBlock: suspend () -> DATA
+    ): DATA {
         return requestBlock()
     }
 }
diff --git a/vector-config/build.gradle b/vector-config/build.gradle
index 4156e74274..95b6a6215d 100644
--- a/vector-config/build.gradle
+++ b/vector-config/build.gradle
@@ -1,6 +1,5 @@
 plugins {
     id 'com.android.library'
-    id 'org.jetbrains.kotlin.android'
 }
 
 android {
@@ -14,7 +13,4 @@ android {
         sourceCompatibility versions.sourceCompat
         targetCompatibility versions.targetCompat
     }
-    kotlinOptions {
-        jvmTarget = "11"
-    }
 }
diff --git a/vector/build.gradle b/vector/build.gradle
index 4ae6527e0b..751d15122b 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -31,7 +31,7 @@ ext.versionMinor = 4
 // Note: even values are reserved for regular release, odd values for hotfix release.
 // When creating a hotfix, you should decrease the value, since the current value
 // is the value for the next regular release.
-ext.versionPatch = 18
+ext.versionPatch = 20
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'
@@ -244,6 +244,7 @@ android {
             buildConfigField "boolean", "ENABLE_STRICT_MODE_LOGS", "false"
 
             signingConfig signingConfigs.debug
+            testCoverageEnabled true
         }
 
         release {
@@ -370,7 +371,6 @@ dependencies {
     implementation libs.androidx.lifecycleProcess
     implementation libs.androidx.lifecycleRuntimeKtx
 
-    implementation libs.androidx.datastore
     implementation libs.androidx.datastorepreferences
 
 
@@ -381,12 +381,11 @@ dependencies {
     implementation 'com.facebook.stetho:stetho:1.6.0'
 
     // Phone number https://github.com/google/libphonenumber
-    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.48'
+    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.49'
 
     // FlowBinding
     implementation libs.github.flowBinding
     implementation libs.github.flowBindingAppcompat
-    implementation libs.github.flowBindingMaterial
 
     implementation libs.airbnb.epoxy
     implementation libs.airbnb.epoxyGlide
@@ -507,9 +506,14 @@ dependencies {
     implementation 'commons-codec:commons-codec:1.15'
 
     // MapTiler
-    implementation 'org.maplibre.gl:android-sdk:9.5.2'
-    implementation 'org.maplibre.gl:android-plugin-annotation-v9:1.0.0'
-
+    fdroidImplementation(libs.maplibre.androidSdk) {
+        exclude group: 'com.google.android.gms', module: 'play-services-location'
+    }
+    fdroidImplementation(libs.maplibre.pluginAnnotation) {
+        exclude group: 'com.google.android.gms', module: 'play-services-location'
+    }
+    gplayImplementation libs.maplibre.androidSdk
+    gplayImplementation libs.maplibre.pluginAnnotation
 
     // TESTS
     testImplementation libs.tests.junit
diff --git a/vector/sampledata/live_location_users.json b/vector/sampledata/live_location_users.json
new file mode 100644
index 0000000000..58d0fb5fa1
--- /dev/null
+++ b/vector/sampledata/live_location_users.json
@@ -0,0 +1,14 @@
+{
+  "data": [
+    {
+      "displayName": "Amandine",
+      "remainingTime": "9min left",
+      "lastUpdatedAt": "Updated 12min ago"
+    },
+    {
+      "displayName": "You",
+      "remainingTime": "19min left",
+      "lastUpdatedAt": "Updated 1min ago"
+    }
+  ]
+}
diff --git a/vector/src/androidTest/java/im/vector/app/EspressoExt.kt b/vector/src/androidTest/java/im/vector/app/EspressoExt.kt
index efb28cdff5..0dbda64879 100644
--- a/vector/src/androidTest/java/im/vector/app/EspressoExt.kt
+++ b/vector/src/androidTest/java/im/vector/app/EspressoExt.kt
@@ -142,7 +142,7 @@ fun initialSyncIdlingResource(session: Session): IdlingResource {
         override fun getName() = "InitialSyncIdlingResource for ${session.myUserId}"
 
         override fun isIdleNow(): Boolean {
-            val isIdle = session.hasAlreadySynced()
+            val isIdle = session.syncService().hasAlreadySynced()
             return isIdle
         }
 
@@ -151,16 +151,16 @@ fun initialSyncIdlingResource(session: Session): IdlingResource {
         }
 
         override fun onChanged(t: SyncState?) {
-            val isIdle = session.hasAlreadySynced()
+            val isIdle = session.syncService().hasAlreadySynced()
             if (isIdle) {
                 callback?.onTransitionToIdle()
-                session.getSyncStateLive().removeObserver(this)
+                session.syncService().getSyncStateLive().removeObserver(this)
             }
         }
     }
 
     runOnUiThread {
-        session.getSyncStateLive().observeForever(res)
+        session.syncService().getSyncStateLive().observeForever(res)
     }
 
     return res
diff --git a/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt b/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt
index 21fd226317..eaf39310a8 100644
--- a/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt
@@ -165,7 +165,7 @@ class SecurityBootstrapTest : VerificationTestBase() {
         assert(uiSession.cryptoService().crossSigningService().isCrossSigningInitialized())
         assert(uiSession.cryptoService().crossSigningService().canCrossSign())
         assert(uiSession.cryptoService().crossSigningService().allPrivateKeysKnown())
-        assert(uiSession.cryptoService().keysBackupService().isEnabled)
+        assert(uiSession.cryptoService().keysBackupService().isEnabled())
         assert(uiSession.cryptoService().keysBackupService().currentBackupVersion != null)
         assert(uiSession.sharedSecretStorageService().isRecoverySetup())
         assert(uiSession.sharedSecretStorageService().isMegolmKeyInBackup())
diff --git a/vector/src/androidTest/java/im/vector/app/TestMatrixCallback.kt b/vector/src/androidTest/java/im/vector/app/TestMatrixCallback.kt
index 2e254d48ef..f39960ce7e 100644
--- a/vector/src/androidTest/java/im/vector/app/TestMatrixCallback.kt
+++ b/vector/src/androidTest/java/im/vector/app/TestMatrixCallback.kt
@@ -27,8 +27,10 @@ import java.util.concurrent.CountDownLatch
  * @param onlySuccessful true to fail if an error occurs. This is the default behavior
  * @param <T>
  */
-open class TestMatrixCallback<T>(private val countDownLatch: CountDownLatch,
-                                 private val onlySuccessful: Boolean = true) : MatrixCallback<T> {
+open class TestMatrixCallback<T>(
+        private val countDownLatch: CountDownLatch,
+        private val onlySuccessful: Boolean = true
+) : MatrixCallback<T> {
 
     @CallSuper
     override fun onSuccess(data: T) {
diff --git a/vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt b/vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt
index 6ac3226674..97a2a14da3 100644
--- a/vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt
+++ b/vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt
@@ -42,10 +42,12 @@ abstract class VerificationTestBase {
 
     protected val uiTestBase = OnboardingRobot()
 
-    fun createAccountAndSync(matrix: Matrix,
-                             userName: String,
-                             password: String,
-                             withInitialSync: Boolean): Session {
+    fun createAccountAndSync(
+            matrix: Matrix,
+            userName: String,
+            password: String,
+            withInitialSync: Boolean
+    ): Session {
         val hs = createHomeServerConfig()
 
         runBlockingTest {
@@ -114,14 +116,14 @@ abstract class VerificationTestBase {
 
         GlobalScope.launch(Dispatchers.Main) { session.open() }
 
-        session.startSync(true)
+        session.syncService().startSync(true)
 
         val syncLiveData = runBlocking(Dispatchers.Main) {
-            session.getSyncStateLive()
+            session.syncService().getSyncStateLive()
         }
         val syncObserver = object : Observer<SyncState> {
             override fun onChanged(t: SyncState?) {
-                if (session.hasAlreadySynced()) {
+                if (session.syncService().hasAlreadySynced()) {
                     lock.countDown()
                     syncLiveData.removeObserver(this)
                 }
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt
index b9292bd916..fb80e292c2 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt
@@ -129,7 +129,7 @@ class ElementRobot {
                 // We need to wait for the initial sync to complete; but we can't
                 // use waitForHome() like login does.
 
-		// waitForHome() -- does not work because we have already fufilled the initialSync
+                // waitForHome() -- does not work because we have already fufilled the initialSync
                 // so we can racily have an IllegalStateException that we have transitioned from busy -> idle
                 // but never having sent the signal.
 
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt
index 97e3b281c0..350bbf8ba3 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt
@@ -79,10 +79,12 @@ class OnboardingRobot {
         initSession(false, userId, password, homeServerUrl)
     }
 
-    private fun initSession(createAccount: Boolean,
-                            userId: String,
-                            password: String,
-                            homeServerUrl: String) {
+    private fun initSession(
+            createAccount: Boolean,
+            userId: String,
+            password: String,
+            homeServerUrl: String
+    ) {
         waitUntilViewVisible(withId(R.id.loginSplashSubmit))
         assertDisplayed(R.id.loginSplashSubmit, R.string.login_splash_create_account)
         if (createAccount) {
diff --git a/vector/src/debug/AndroidManifest.xml b/vector/src/debug/AndroidManifest.xml
index 87aade0c8b..0b2b5cf90f 100644
--- a/vector/src/debug/AndroidManifest.xml
+++ b/vector/src/debug/AndroidManifest.xml
@@ -2,8 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="im.vector.app">
 
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
-
     <application>
         <activity android:name=".features.debug.TestLinkifyActivity" />
         <activity android:name=".features.debug.DebugPermissionActivity" />
diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt b/vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
index 00a073f832..aa4df5e308 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
@@ -60,6 +60,11 @@ class DebugFeaturesStateFactory @Inject constructor(
                                 key = DebugFeatureKeys.onboardingCombinedRegister,
                                 factory = VectorFeatures::isOnboardingCombinedRegisterEnabled
                         ),
+                        createBooleanFeature(
+                                label = "FTUE Combined login",
+                                key = DebugFeatureKeys.onboardingCombinedLogin,
+                                factory = VectorFeatures::isOnboardingCombinedLoginEnabled
+                        ),
                 )
         )
     }
diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt b/vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
index 1bc37ff97e..f36b1a804a 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
@@ -57,6 +57,9 @@ class DebugVectorFeatures(
     override fun isOnboardingCombinedRegisterEnabled(): Boolean = read(DebugFeatureKeys.onboardingCombinedRegister)
             ?: vectorFeatures.isOnboardingCombinedRegisterEnabled()
 
+    override fun isOnboardingCombinedLoginEnabled(): Boolean = read(DebugFeatureKeys.onboardingCombinedLogin)
+            ?: vectorFeatures.isOnboardingCombinedLoginEnabled()
+
     override fun isScreenSharingEnabled(): Boolean = read(DebugFeatureKeys.screenSharing)
             ?: vectorFeatures.isScreenSharingEnabled()
 
@@ -113,6 +116,7 @@ object DebugFeatureKeys {
     val onboardingUseCase = booleanPreferencesKey("onboarding-splash-carousel")
     val onboardingPersonalize = booleanPreferencesKey("onboarding-personalize")
     val onboardingCombinedRegister = booleanPreferencesKey("onboarding-combined-register")
+    val onboardingCombinedLogin = booleanPreferencesKey("onboarding-combined-login")
     val liveLocationSharing = booleanPreferencesKey("live-location-sharing")
     val screenSharing = booleanPreferencesKey("screen-sharing")
 }
diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/BackgroundSyncStarter.kt b/vector/src/fdroid/java/im/vector/app/fdroid/BackgroundSyncStarter.kt
index e890180c4f..023c9cad26 100644
--- a/vector/src/fdroid/java/im/vector/app/fdroid/BackgroundSyncStarter.kt
+++ b/vector/src/fdroid/java/im/vector/app/fdroid/BackgroundSyncStarter.kt
@@ -25,17 +25,19 @@ import im.vector.app.features.settings.VectorPreferences
 import timber.log.Timber
 
 object BackgroundSyncStarter {
-    fun start(context: Context,
-              vectorPreferences: VectorPreferences,
-              activeSessionHolder: ActiveSessionHolder,
-              clock: Clock) {
+    fun start(
+            context: Context,
+            vectorPreferences: VectorPreferences,
+            activeSessionHolder: ActiveSessionHolder,
+            clock: Clock
+    ) {
         if (vectorPreferences.areNotificationEnabledForDevice()) {
             val activeSession = activeSessionHolder.getSafeActiveSession() ?: return
             when (vectorPreferences.getFdroidSyncBackgroundMode()) {
                 BackgroundSyncMode.FDROID_BACKGROUND_SYNC_MODE_FOR_BATTERY  -> {
                     // we rely on periodic worker
                     Timber.i("## Sync: Work scheduled to periodically sync in ${vectorPreferences.backgroundSyncDelay()}s")
-                    activeSession.startAutomaticBackgroundSync(
+                    activeSession.syncService().startAutomaticBackgroundSync(
                             vectorPreferences.backgroundSyncTimeOut().toLong(),
                             vectorPreferences.backgroundSyncDelay().toLong()
                     )
diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt b/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt
index 6d741a36ba..e028ed0988 100644
--- a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt
+++ b/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt
@@ -26,8 +26,10 @@ import javax.inject.Inject
 /**
  * Test that the application is started on boot
  */
-class TestAutoStartBoot @Inject constructor(private val vectorPreferences: VectorPreferences,
-                                            private val stringProvider: StringProvider) :
+class TestAutoStartBoot @Inject constructor(
+        private val vectorPreferences: VectorPreferences,
+        private val stringProvider: StringProvider
+) :
         TroubleshootTest(R.string.settings_troubleshoot_test_service_boot_title) {
 
     override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt b/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt
index 5932d2c372..746301018b 100644
--- a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt
+++ b/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt
@@ -26,8 +26,10 @@ import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.settings.troubleshoot.TroubleshootTest
 import javax.inject.Inject
 
-class TestBackgroundRestrictions @Inject constructor(private val context: FragmentActivity,
-                                                     private val stringProvider: StringProvider) :
+class TestBackgroundRestrictions @Inject constructor(
+        private val context: FragmentActivity,
+        private val stringProvider: StringProvider
+) :
         TroubleshootTest(R.string.settings_troubleshoot_test_bg_restricted_title) {
 
     override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt b/vector/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt
index 09bd56654d..bd1e0eb0ee 100644
--- a/vector/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt
+++ b/vector/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt
@@ -26,9 +26,9 @@ import androidx.core.content.ContextCompat
 import androidx.core.content.getSystemService
 import im.vector.app.core.extensions.singletonEntryPoint
 import im.vector.app.core.platform.PendingIntentCompat
-import im.vector.app.core.services.VectorSyncService
+import im.vector.app.core.services.VectorSyncAndroidService
 import im.vector.app.core.time.Clock
-import org.matrix.android.sdk.api.session.sync.job.SyncService
+import org.matrix.android.sdk.api.session.sync.job.SyncAndroidService
 import timber.log.Timber
 
 class AlarmSyncBroadcastReceiver : BroadcastReceiver() {
@@ -43,8 +43,8 @@ class AlarmSyncBroadcastReceiver : BroadcastReceiver() {
         val vectorPreferences = singletonEntryPoint.vectorPreferences()
         val clock = singletonEntryPoint.clock()
 
-        val sessionId = intent.getStringExtra(SyncService.EXTRA_SESSION_ID) ?: return
-        VectorSyncService.newPeriodicIntent(
+        val sessionId = intent.getStringExtra(SyncAndroidService.EXTRA_SESSION_ID) ?: return
+        VectorSyncAndroidService.newPeriodicIntent(
                 context = context,
                 sessionId = sessionId,
                 syncTimeoutSeconds = vectorPreferences.backgroundSyncTimeOut(),
@@ -69,8 +69,8 @@ class AlarmSyncBroadcastReceiver : BroadcastReceiver() {
             // Reschedule
             Timber.v("## Sync: Scheduling alarm for background sync in $delayInSeconds seconds")
             val intent = Intent(context, AlarmSyncBroadcastReceiver::class.java).apply {
-                putExtra(SyncService.EXTRA_SESSION_ID, sessionId)
-                putExtra(SyncService.EXTRA_PERIODIC, true)
+                putExtra(SyncAndroidService.EXTRA_SESSION_ID, sessionId)
+                putExtra(SyncAndroidService.EXTRA_PERIODIC, true)
             }
             val pIntent = PendingIntent.getBroadcast(
                     context,
@@ -100,7 +100,7 @@ class AlarmSyncBroadcastReceiver : BroadcastReceiver() {
             alarmMgr.cancel(pIntent)
 
             // Stop current service to restart
-            VectorSyncService.stopIntent(context).let {
+            VectorSyncAndroidService.stopIntent(context).let {
                 try {
                     ContextCompat.startForegroundService(context, it)
                 } catch (ex: Throwable) {
diff --git a/vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt b/vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt
index 6e36d5dd81..7533eae856 100755
--- a/vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt
+++ b/vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt
@@ -63,14 +63,16 @@ object FcmHelper {
 
     fun onEnterForeground(context: Context, activeSessionHolder: ActiveSessionHolder) {
         // try to stop all regardless of background mode
-        activeSessionHolder.getSafeActiveSession()?.stopAnyBackgroundSync()
+        activeSessionHolder.getSafeActiveSession()?.syncService()?.stopAnyBackgroundSync()
         AlarmSyncBroadcastReceiver.cancelAlarm(context)
     }
 
-    fun onEnterBackground(context: Context,
-                          vectorPreferences: VectorPreferences,
-                          activeSessionHolder: ActiveSessionHolder,
-                          clock: Clock) {
+    fun onEnterBackground(
+            context: Context,
+            vectorPreferences: VectorPreferences,
+            activeSessionHolder: ActiveSessionHolder,
+            clock: Clock
+    ) {
         BackgroundSyncStarter.start(context, vectorPreferences, activeSessionHolder, clock)
     }
 }
diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
index 89270cce55..26350a6f67 100644
--- a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
@@ -30,8 +30,10 @@ import javax.inject.Inject
 /*
 * Test that app can successfully retrieve a token via firebase
  */
-class TestFirebaseToken @Inject constructor(private val context: FragmentActivity,
-                                            private val stringProvider: StringProvider) : TroubleshootTest(R.string.settings_troubleshoot_test_fcm_title) {
+class TestFirebaseToken @Inject constructor(
+        private val context: FragmentActivity,
+        private val stringProvider: StringProvider
+) : TroubleshootTest(R.string.settings_troubleshoot_test_fcm_title) {
 
     override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
         status = TestStatus.RUNNING
diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt
index ecb457bf9f..f1ea4a4153 100644
--- a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt
@@ -29,8 +29,10 @@ import javax.inject.Inject
 /*
 * Check that the play services APK is available an up-to-date. If needed provide quick fix to install it.
  */
-class TestPlayServices @Inject constructor(private val context: FragmentActivity,
-                                           private val stringProvider: StringProvider) :
+class TestPlayServices @Inject constructor(
+        private val context: FragmentActivity,
+        private val stringProvider: StringProvider
+) :
         TroubleshootTest(R.string.settings_troubleshoot_test_play_services_title) {
 
     override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
index f485de760a..b4b8a936d0 100644
--- a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
@@ -36,11 +36,13 @@ import javax.inject.Inject
 /**
  * Test Push by asking the Push Gateway to send a Push back
  */
-class TestPushFromPushGateway @Inject constructor(private val context: FragmentActivity,
-                                                  private val stringProvider: StringProvider,
-                                                  private val errorFormatter: ErrorFormatter,
-                                                  private val pushersManager: PushersManager,
-                                                  private val activeSessionHolder: ActiveSessionHolder) :
+class TestPushFromPushGateway @Inject constructor(
+        private val context: FragmentActivity,
+        private val stringProvider: StringProvider,
+        private val errorFormatter: ErrorFormatter,
+        private val pushersManager: PushersManager,
+        private val activeSessionHolder: ActiveSessionHolder
+) :
         TroubleshootTest(R.string.settings_troubleshoot_test_push_loop_title) {
 
     private var action: Job? = null
diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt
index 2db03f3428..a6220c2018 100644
--- a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt
@@ -33,10 +33,12 @@ import javax.inject.Inject
 /**
  * Force registration of the token to HomeServer
  */
-class TestTokenRegistration @Inject constructor(private val context: FragmentActivity,
-                                                private val stringProvider: StringProvider,
-                                                private val pushersManager: PushersManager,
-                                                private val activeSessionHolder: ActiveSessionHolder) :
+class TestTokenRegistration @Inject constructor(
+        private val context: FragmentActivity,
+        private val stringProvider: StringProvider,
+        private val pushersManager: PushersManager,
+        private val activeSessionHolder: ActiveSessionHolder
+) :
         TroubleshootTest(R.string.settings_troubleshoot_test_token_registration_title) {
 
     override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
diff --git a/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt b/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
index a7d814052a..8d0126d6af 100755
--- a/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
@@ -164,7 +164,7 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
                     getEventFastLane(session, roomId, eventId)
 
                     Timber.tag(loggerTag.value).d("Requesting background sync")
-                    session.requireBackgroundSync()
+                    session.syncService().requireBackgroundSync()
                 }
             }
         } catch (e: Exception) {
diff --git a/vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt b/vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
index 74ab3b38f1..ac2d063700 100755
--- a/vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
+++ b/vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
@@ -55,8 +55,10 @@ object FcmHelper {
      * @param context android context
      * @param token the token to store
      */
-    fun storeFcmToken(context: Context,
-                      token: String?) {
+    fun storeFcmToken(
+            context: Context,
+            token: String?
+    ) {
         DefaultSharedPreferences.getInstance(context).edit {
             putString(PREFS_KEY_FCM_TOKEN, token)
         }
@@ -108,10 +110,12 @@ object FcmHelper {
     }
 
     @Suppress("UNUSED_PARAMETER")
-    fun onEnterBackground(context: Context,
-                          vectorPreferences: VectorPreferences,
-                          activeSessionHolder: ActiveSessionHolder,
-                          clock: Clock) {
+    fun onEnterBackground(
+            context: Context,
+            vectorPreferences: VectorPreferences,
+            activeSessionHolder: ActiveSessionHolder,
+            clock: Clock
+    ) {
         // No op
     }
 }
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 20b7c4908a..89c600b052 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -45,8 +45,6 @@
     <!-- Location Sharing -->
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <!--  Debug only whilst live location sharing is WIP -->
-    <!--<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />-->
 
     <!-- Jitsi SDK is now API23+ -->
     <uses-sdk tools:overrideLibrary="org.jitsi.meet.sdk,com.oney.WebRTCModule,com.learnium.RNDeviceInfo,com.reactnativecommunity.asyncstorage,com.ocetnik.timer,com.calendarevents,com.reactnativecommunity.netinfo,com.kevinresol.react_native_default_preference,com.rnimmersive,com.corbt.keepawake,com.BV.LinearGradient,com.horcrux.svg,com.oblador.performance,com.reactnativecommunity.slider,com.brentvatne.react,com.reactnativecommunity.clipboard,com.swmansion.gesturehandler.react,org.linusu,org.reactnative.maskedview,com.reactnativepagerview,com.swmansion.reanimated,com.th3rdwave.safeareacontext,com.swmansion.rnscreens,org.devio.rn.splashscreen,com.reactnativecommunity.webview" />
@@ -306,7 +304,9 @@
             android:supportsPictureInPicture="true" />
 
         <activity android:name=".features.terms.ReviewTermsActivity" />
-        <activity android:name=".features.widgets.WidgetActivity" />
+        <activity android:name=".features.widgets.WidgetActivity"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation" />
+
         <activity android:name=".features.pin.PinActivity" />
         <activity android:name=".features.analytics.ui.consent.AnalyticsOptInActivity" />
         <activity android:name=".features.home.room.detail.search.SearchActivity" />
@@ -343,6 +343,7 @@
         <activity android:name=".features.spaces.leave.SpaceLeaveAdvancedActivity" />
         <activity android:name=".features.poll.create.CreatePollActivity" />
         <activity android:name=".features.location.LocationSharingActivity" />
+        <activity android:name=".features.location.live.map.LocationLiveMapViewActivity" />
 
         <!-- Services -->
 
@@ -357,7 +358,7 @@
 
         <!-- Add tools:ignore="Instantiatable" for the error reported only by Buildkite and for lintGplayRelease check :/ -->
         <service
-            android:name=".core.services.VectorSyncService"
+            android:name=".core.services.VectorSyncAndroidService"
             android:exported="false"
             tools:ignore="Instantiatable" />
 
diff --git a/vector/src/main/java/im/vector/app/AppStateHandler.kt b/vector/src/main/java/im/vector/app/AppStateHandler.kt
index 1608d561bc..039662e686 100644
--- a/vector/src/main/java/im/vector/app/AppStateHandler.kt
+++ b/vector/src/main/java/im/vector/app/AppStateHandler.kt
@@ -41,8 +41,8 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.getRoomSummary
 import org.matrix.android.sdk.api.session.group.model.GroupSummary
-import org.matrix.android.sdk.api.session.initsync.SyncStatusService
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.sync.SyncRequestState
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -72,6 +72,8 @@ class AppStateHandler @Inject constructor(
 
     val selectedRoomGroupingFlow = selectedSpaceDataSource.stream()
 
+    private val spaceBackstack = ArrayDeque<String?>()
+
     fun getCurrentRoomGroupingMethod(): RoomGroupingMethod? {
         // XXX we should somehow make it live :/ just a work around
         // For example just after creating a space and switching to it the
@@ -87,12 +89,16 @@ class AppStateHandler @Inject constructor(
         }
     }
 
-    fun setCurrentSpace(spaceId: String?, session: Session? = null, persistNow: Boolean = false) {
+    fun setCurrentSpace(spaceId: String?, session: Session? = null, persistNow: Boolean = false, isForwardNavigation: Boolean = true) {
+        val currentSpace = (selectedSpaceDataSource.currentValue?.orNull() as? RoomGroupingMethod.BySpace)?.space()
         val uSession = session ?: activeSessionHolder.getSafeActiveSession() ?: return
-        if (selectedSpaceDataSource.currentValue?.orNull() is RoomGroupingMethod.BySpace &&
-                spaceId == selectedSpaceDataSource.currentValue?.orNull()?.space()?.roomId) return
+        if (currentSpace != null && spaceId == currentSpace.roomId) return
         val spaceSum = spaceId?.let { uSession.getRoomSummary(spaceId) }
 
+        if (isForwardNavigation) {
+            spaceBackstack.addLast(currentSpace?.roomId)
+        }
+
         if (persistNow) {
             uiStateRepository.storeGroupingMethod(true, uSession.sessionId)
             uiStateRepository.storeSelectedSpace(spaceSum?.roomId, uSession.sessionId)
@@ -141,9 +147,9 @@ class AppStateHandler @Inject constructor(
     }
 
     private fun observeSyncStatus(session: Session) {
-        session.syncStatusService().getSyncStatusLive()
+        session.syncService().getSyncRequestStateLive()
                 .asFlow()
-                .filterIsInstance<SyncStatusService.Status.IncrementalSyncDone>()
+                .filterIsInstance<SyncRequestState.IncrementalSyncDone>()
                 .map { session.spaceService().getRootSpaceSummaries().size }
                 .distinctUntilChanged()
                 .onEach { spacesNumber ->
@@ -151,6 +157,8 @@ class AppStateHandler @Inject constructor(
                 }.launchIn(session.coroutineScope)
     }
 
+    fun getSpaceBackstack() = spaceBackstack
+
     fun safeActiveSpaceId(): String? {
         return (selectedSpaceDataSource.currentValue?.orNull() as? RoomGroupingMethod.BySpace)?.spaceSummary?.roomId
     }
diff --git a/vector/src/main/java/im/vector/app/AutoRageShaker.kt b/vector/src/main/java/im/vector/app/AutoRageShaker.kt
index c77ce2b647..dc561aa821 100644
--- a/vector/src/main/java/im/vector/app/AutoRageShaker.kt
+++ b/vector/src/main/java/im/vector/app/AutoRageShaker.kt
@@ -36,7 +36,7 @@ import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.toContent
-import org.matrix.android.sdk.api.session.initsync.SyncStatusService
+import org.matrix.android.sdk.api.session.sync.SyncRequestState
 import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -260,11 +260,11 @@ class AutoRageShaker @Inject constructor(
         }
         this.currentActiveSessionId = sessionId
 
-        hasSynced = session.hasAlreadySynced()
-        session.syncStatusService().getSyncStatusLive()
+        hasSynced = session.syncService().hasAlreadySynced()
+        session.syncService().getSyncRequestStateLive()
                 .asFlow()
                 .onEach {
-                    hasSynced = it !is SyncStatusService.Status.InitialSyncProgressing
+                    hasSynced = it !is SyncRequestState.InitialSyncProgressing
                 }
                 .launchIn(session.coroutineScope)
         activeSessionIds.add(sessionId)
diff --git a/vector/src/main/java/im/vector/app/VectorApplication.kt b/vector/src/main/java/im/vector/app/VectorApplication.kt
index a55351f74b..7db0f99f5f 100644
--- a/vector/src/main/java/im/vector/app/VectorApplication.kt
+++ b/vector/src/main/java/im/vector/app/VectorApplication.kt
@@ -176,7 +176,7 @@ class VectorApplication :
                 Timber.i("App entered foreground")
                 FcmHelper.onEnterForeground(appContext, activeSessionHolder)
                 activeSessionHolder.getSafeActiveSession()?.also {
-                    it.stopAnyBackgroundSync()
+                    it.syncService().stopAnyBackgroundSync()
                 }
             }
 
diff --git a/vector/src/main/java/im/vector/app/core/date/DateFormatterProviders.kt b/vector/src/main/java/im/vector/app/core/date/DateFormatterProviders.kt
index a216b6b5d8..a686c1e410 100644
--- a/vector/src/main/java/im/vector/app/core/date/DateFormatterProviders.kt
+++ b/vector/src/main/java/im/vector/app/core/date/DateFormatterProviders.kt
@@ -18,8 +18,10 @@ package im.vector.app.core.date
 
 import javax.inject.Inject
 
-class DateFormatterProviders @Inject constructor(private val defaultDateFormatterProvider: DefaultDateFormatterProvider,
-                                                 private val abbrevDateFormatterProvider: AbbrevDateFormatterProvider) {
+class DateFormatterProviders @Inject constructor(
+        private val defaultDateFormatterProvider: DefaultDateFormatterProvider,
+        private val abbrevDateFormatterProvider: AbbrevDateFormatterProvider
+) {
 
     fun provide(abbrev: Boolean): DateFormatterProvider {
         return if (abbrev) {
diff --git a/vector/src/main/java/im/vector/app/core/date/DefaultDateFormatterProvider.kt b/vector/src/main/java/im/vector/app/core/date/DefaultDateFormatterProvider.kt
index 361868cd95..138cc51cc4 100644
--- a/vector/src/main/java/im/vector/app/core/date/DefaultDateFormatterProvider.kt
+++ b/vector/src/main/java/im/vector/app/core/date/DefaultDateFormatterProvider.kt
@@ -22,8 +22,10 @@ import im.vector.app.core.resources.LocaleProvider
 import org.threeten.bp.format.DateTimeFormatter
 import javax.inject.Inject
 
-class DefaultDateFormatterProvider @Inject constructor(private val context: Context,
-                                                       private val localeProvider: LocaleProvider) :
+class DefaultDateFormatterProvider @Inject constructor(
+        private val context: Context,
+        private val localeProvider: LocaleProvider
+) :
         DateFormatterProvider {
 
     override val dateWithMonthFormatter: DateTimeFormatter by lazy {
diff --git a/vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt b/vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt
index 983850e3be..f0c956365f 100644
--- a/vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt
+++ b/vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt
@@ -31,14 +31,15 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class ActiveSessionHolder @Inject constructor(private val activeSessionDataSource: ActiveSessionDataSource,
-                                              private val keyRequestHandler: KeyRequestHandler,
-                                              private val incomingVerificationRequestHandler: IncomingVerificationRequestHandler,
-                                              private val callManager: WebRtcCallManager,
-                                              private val pushRuleTriggerListener: PushRuleTriggerListener,
-                                              private val sessionListener: SessionListener,
-                                              private val imageManager: ImageManager,
-                                              private val guardServiceStarter: GuardServiceStarter
+class ActiveSessionHolder @Inject constructor(
+        private val activeSessionDataSource: ActiveSessionDataSource,
+        private val keyRequestHandler: KeyRequestHandler,
+        private val incomingVerificationRequestHandler: IncomingVerificationRequestHandler,
+        private val callManager: WebRtcCallManager,
+        private val pushRuleTriggerListener: PushRuleTriggerListener,
+        private val sessionListener: SessionListener,
+        private val imageManager: ImageManager,
+        private val guardServiceStarter: GuardServiceStarter
 ) {
 
     private var activeSession: AtomicReference<Session?> = AtomicReference()
diff --git a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
index 3dba8b797b..e76f0ad672 100644
--- a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
@@ -101,6 +101,9 @@ import im.vector.app.features.onboarding.ftueauth.FtueAuthAccountCreatedFragment
 import im.vector.app.features.onboarding.ftueauth.FtueAuthCaptchaFragment
 import im.vector.app.features.onboarding.ftueauth.FtueAuthChooseDisplayNameFragment
 import im.vector.app.features.onboarding.ftueauth.FtueAuthChooseProfilePictureFragment
+import im.vector.app.features.onboarding.ftueauth.FtueAuthCombinedLoginFragment
+import im.vector.app.features.onboarding.ftueauth.FtueAuthCombinedRegisterFragment
+import im.vector.app.features.onboarding.ftueauth.FtueAuthCombinedServerSelectionFragment
 import im.vector.app.features.onboarding.ftueauth.FtueAuthEmailEntryFragment
 import im.vector.app.features.onboarding.ftueauth.FtueAuthGenericTextInputFormFragment
 import im.vector.app.features.onboarding.ftueauth.FtueAuthLegacyStyleCaptchaFragment
@@ -521,6 +524,21 @@ interface FragmentModule {
     @FragmentKey(FtueAuthPersonalizationCompleteFragment::class)
     fun bindFtueAuthPersonalizationCompleteFragment(fragment: FtueAuthPersonalizationCompleteFragment): Fragment
 
+    @Binds
+    @IntoMap
+    @FragmentKey(FtueAuthCombinedLoginFragment::class)
+    fun bindFtueAuthCombinedLoginFragment(fragment: FtueAuthCombinedLoginFragment): Fragment
+
+    @Binds
+    @IntoMap
+    @FragmentKey(FtueAuthCombinedRegisterFragment::class)
+    fun bindFtueAuthCombinedRegisterFragment(fragment: FtueAuthCombinedRegisterFragment): Fragment
+
+    @Binds
+    @IntoMap
+    @FragmentKey(FtueAuthCombinedServerSelectionFragment::class)
+    fun bindFtueAuthCombinedServerSelectionFragment(fragment: FtueAuthCombinedServerSelectionFragment): Fragment
+
     @Binds
     @IntoMap
     @FragmentKey(UserListFragment::class)
diff --git a/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt b/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
index 33afcf1dfb..313fd7b98c 100644
--- a/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
@@ -54,6 +54,7 @@ import im.vector.app.features.home.room.list.RoomListViewModel
 import im.vector.app.features.homeserver.HomeServerCapabilitiesViewModel
 import im.vector.app.features.invite.InviteUsersToRoomViewModel
 import im.vector.app.features.location.LocationSharingViewModel
+import im.vector.app.features.location.live.map.LocationLiveMapViewModel
 import im.vector.app.features.login.LoginViewModel
 import im.vector.app.features.login2.LoginViewModel2
 import im.vector.app.features.login2.created.AccountCreatedViewModel
@@ -600,4 +601,9 @@ interface MavericksViewModelModule {
     @IntoMap
     @MavericksViewModelKey(VectorAttachmentViewerViewModel::class)
     fun vectorAttachmentViewerViewModelFactory(factory: VectorAttachmentViewerViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+    @Binds
+    @IntoMap
+    @MavericksViewModelKey(LocationLiveMapViewModel::class)
+    fun locationLiveMapViewModelFactory(factory: LocationLiveMapViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
 }
diff --git a/vector/src/main/java/im/vector/app/core/di/SingletonModule.kt b/vector/src/main/java/im/vector/app/core/di/SingletonModule.kt
index 2945ae7d87..085a9a5d12 100644
--- a/vector/src/main/java/im/vector/app/core/di/SingletonModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/SingletonModule.kt
@@ -33,6 +33,7 @@ import im.vector.app.config.analyticsConfig
 import im.vector.app.core.dispatchers.CoroutineDispatchers
 import im.vector.app.core.error.DefaultErrorFormatter
 import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.resources.BuildMeta
 import im.vector.app.core.time.Clock
 import im.vector.app.core.time.DefaultClock
 import im.vector.app.features.analytics.AnalyticsConfig
@@ -118,7 +119,8 @@ object VectorStaticModule {
     @Provides
     fun providesMatrixConfiguration(
             vectorPreferences: VectorPreferences,
-            vectorRoomDisplayNameFallbackProvider: VectorRoomDisplayNameFallbackProvider): MatrixConfiguration {
+            vectorRoomDisplayNameFallbackProvider: VectorRoomDisplayNameFallbackProvider
+    ): MatrixConfiguration {
         return MatrixConfiguration(
                 applicationFlavor = BuildConfig.FLAVOR_DESCRIPTION,
                 roomDisplayNameFallbackProvider = vectorRoomDisplayNameFallbackProvider,
@@ -185,4 +187,8 @@ object VectorStaticModule {
     fun providesAnalyticsConfig(): AnalyticsConfig {
         return analyticsConfig
     }
+
+    @Provides
+    @Singleton
+    fun providesBuildMeta() = BuildMeta()
 }
diff --git a/vector/src/main/java/im/vector/app/core/dialogs/ConfirmationDialogBuilder.kt b/vector/src/main/java/im/vector/app/core/dialogs/ConfirmationDialogBuilder.kt
index 6f45091cf9..01d369b019 100644
--- a/vector/src/main/java/im/vector/app/core/dialogs/ConfirmationDialogBuilder.kt
+++ b/vector/src/main/java/im/vector/app/core/dialogs/ConfirmationDialogBuilder.kt
@@ -25,13 +25,15 @@ import im.vector.app.databinding.DialogConfirmationWithReasonBinding
 
 object ConfirmationDialogBuilder {
 
-    fun show(activity: Activity,
-             askForReason: Boolean,
-             @StringRes titleRes: Int,
-             @StringRes confirmationRes: Int,
-             @StringRes positiveRes: Int,
-             @StringRes reasonHintRes: Int,
-             confirmation: (String?) -> Unit) {
+    fun show(
+            activity: Activity,
+            askForReason: Boolean,
+            @StringRes titleRes: Int,
+            @StringRes confirmationRes: Int,
+            @StringRes positiveRes: Int,
+            @StringRes reasonHintRes: Int,
+            confirmation: (String?) -> Unit
+    ) {
         val layout = activity.layoutInflater.inflate(R.layout.dialog_confirmation_with_reason, null)
         val views = DialogConfirmationWithReasonBinding.bind(layout)
         views.dialogConfirmationText.setText(confirmationRes)
diff --git a/vector/src/main/java/im/vector/app/core/dialogs/PhotoOrVideoDialog.kt b/vector/src/main/java/im/vector/app/core/dialogs/PhotoOrVideoDialog.kt
index 0b76446ce2..73c936a599 100644
--- a/vector/src/main/java/im/vector/app/core/dialogs/PhotoOrVideoDialog.kt
+++ b/vector/src/main/java/im/vector/app/core/dialogs/PhotoOrVideoDialog.kt
@@ -63,9 +63,11 @@ class PhotoOrVideoDialog(
         }
     }
 
-    private fun submit(views: DialogPhotoOrVideoBinding,
-                       vectorPreferences: VectorPreferences,
-                       listener: PhotoOrVideoDialogListener) {
+    private fun submit(
+            views: DialogPhotoOrVideoBinding,
+            vectorPreferences: VectorPreferences,
+            listener: PhotoOrVideoDialogListener
+    ) {
         val mode = if (views.dialogPhotoOrVideoPhoto.isChecked) {
             VectorPreferences.TAKE_PHOTO_VIDEO_MODE_PHOTO
         } else {
diff --git a/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt b/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt
index 8eaced1c48..df50175f87 100644
--- a/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt
+++ b/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt
@@ -43,9 +43,11 @@ class UnrecognizedCertificateDialog @Inject constructor(
      * @param unrecognizedFingerprint the fingerprint for the unknown certificate
      * @param callback callback to fire when the user makes a decision
      */
-    fun show(activity: Activity,
-             unrecognizedFingerprint: Fingerprint,
-             callback: Callback) {
+    fun show(
+            activity: Activity,
+            unrecognizedFingerprint: Fingerprint,
+            callback: Callback
+    ) {
         val userId = activeSessionHolder.getSafeActiveSession()?.myUserId
         val hsConfig = activeSessionHolder.getSafeActiveSession()?.sessionParams?.homeServerConnectionConfig ?: return
 
@@ -63,10 +65,12 @@ class UnrecognizedCertificateDialog @Inject constructor(
     /**
      * To use during login flow.
      */
-    fun show(activity: Activity,
-             unrecognizedFingerprint: Fingerprint,
-             homeServerUrl: String,
-             callback: Callback) {
+    fun show(
+            activity: Activity,
+            unrecognizedFingerprint: Fingerprint,
+            homeServerUrl: String,
+            callback: Callback
+    ) {
         internalShow(
                 activity = activity,
                 unrecognizedFingerprint = unrecognizedFingerprint,
@@ -89,13 +93,15 @@ class UnrecognizedCertificateDialog @Inject constructor(
      * @param homeServerUrl the homeserver url
      * @param homeServerConnectionConfigHasFingerprints true if the homeServerConnectionConfig has fingerprint
      */
-    private fun internalShow(activity: Activity,
-                             unrecognizedFingerprint: Fingerprint,
-                             existing: Boolean,
-                             callback: Callback,
-                             userId: String?,
-                             homeServerUrl: String,
-                             homeServerConnectionConfigHasFingerprints: Boolean) {
+    private fun internalShow(
+            activity: Activity,
+            unrecognizedFingerprint: Fingerprint,
+            existing: Boolean,
+            callback: Callback,
+            userId: String?,
+            homeServerUrl: String,
+            homeServerConnectionConfigHasFingerprints: Boolean
+    ) {
         val dialogId = userId ?: homeServerUrl + unrecognizedFingerprint.displayableHexRepr
 
         if (openDialogIds.contains(dialogId)) {
diff --git a/vector/src/main/java/im/vector/app/core/dispatchers/CoroutineDispatchers.kt b/vector/src/main/java/im/vector/app/core/dispatchers/CoroutineDispatchers.kt
index 008ca4a9ce..8fdc9dc637 100644
--- a/vector/src/main/java/im/vector/app/core/dispatchers/CoroutineDispatchers.kt
+++ b/vector/src/main/java/im/vector/app/core/dispatchers/CoroutineDispatchers.kt
@@ -21,4 +21,5 @@ import javax.inject.Inject
 
 data class CoroutineDispatchers @Inject constructor(
         val io: CoroutineDispatcher,
-        val computation: CoroutineDispatcher)
+        val computation: CoroutineDispatcher
+)
diff --git a/vector/src/main/java/im/vector/app/core/error/ResourceLimitErrorFormatter.kt b/vector/src/main/java/im/vector/app/core/error/ResourceLimitErrorFormatter.kt
index da9a63d4c0..cfe9d2db58 100644
--- a/vector/src/main/java/im/vector/app/core/error/ResourceLimitErrorFormatter.kt
+++ b/vector/src/main/java/im/vector/app/core/error/ResourceLimitErrorFormatter.kt
@@ -34,10 +34,12 @@ class ResourceLimitErrorFormatter(private val context: Context) {
         object Hard : Mode(R.string.resource_limit_hard_mau, R.string.resource_limit_hard_default, R.string.resource_limit_hard_contact)
     }
 
-    fun format(matrixError: MatrixError,
-               mode: Mode,
-               separator: CharSequence = " ",
-               clickable: Boolean = false): CharSequence {
+    fun format(
+            matrixError: MatrixError,
+            mode: Mode,
+            separator: CharSequence = " ",
+            clickable: Boolean = false
+    ): CharSequence {
         val error = if (MatrixError.LIMIT_TYPE_MAU == matrixError.limitType) {
             context.getString(mode.mauErrorRes)
         } else {
diff --git a/vector/src/main/java/im/vector/app/core/extensions/Activity.kt b/vector/src/main/java/im/vector/app/core/extensions/Activity.kt
index 6f2ea9699a..77808c3fbf 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/Activity.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/Activity.kt
@@ -39,7 +39,8 @@ fun ComponentActivity.registerStartForActivityResult(onResult: (ActivityResult)
 fun AppCompatActivity.addFragment(
         container: ViewGroup,
         fragment: Fragment,
-        allowStateLoss: Boolean = false) {
+        allowStateLoss: Boolean = false
+) {
     supportFragmentManager.commitTransaction(allowStateLoss) { add(container.id, fragment) }
 }
 
@@ -48,7 +49,8 @@ fun <T : Fragment> AppCompatActivity.addFragment(
         fragmentClass: Class<T>,
         params: Parcelable? = null,
         tag: String? = null,
-        allowStateLoss: Boolean = false) {
+        allowStateLoss: Boolean = false
+) {
     supportFragmentManager.commitTransaction(allowStateLoss) {
         add(container.id, fragmentClass, params.toMvRxBundle(), tag)
     }
@@ -58,7 +60,8 @@ fun AppCompatActivity.replaceFragment(
         container: ViewGroup,
         fragment: Fragment,
         tag: String? = null,
-        allowStateLoss: Boolean = false) {
+        allowStateLoss: Boolean = false
+) {
     supportFragmentManager.commitTransaction(allowStateLoss) {
         replace(container.id, fragment, tag)
     }
@@ -70,7 +73,8 @@ fun <T : Fragment> AppCompatActivity.replaceFragment(
         params: Parcelable? = null,
         tag: String? = null,
         allowStateLoss: Boolean = false,
-        useCustomAnimation: Boolean = false) {
+        useCustomAnimation: Boolean = false
+) {
     supportFragmentManager.commitTransaction(allowStateLoss) {
         if (useCustomAnimation) {
             setCustomAnimations(R.anim.fade_in, R.anim.fade_out, R.anim.fade_in, R.anim.fade_out)
@@ -83,7 +87,8 @@ fun AppCompatActivity.addFragmentToBackstack(
         container: ViewGroup,
         fragment: Fragment,
         tag: String? = null,
-        allowStateLoss: Boolean = false) {
+        allowStateLoss: Boolean = false
+) {
     supportFragmentManager.commitTransaction(allowStateLoss) {
         replace(container.id, fragment).addToBackStack(tag)
     }
@@ -95,7 +100,8 @@ fun <T : Fragment> AppCompatActivity.addFragmentToBackstack(
         params: Parcelable? = null,
         tag: String? = null,
         allowStateLoss: Boolean = false,
-        option: ((FragmentTransaction) -> Unit)? = null) {
+        option: ((FragmentTransaction) -> Unit)? = null
+) {
     supportFragmentManager.commitTransaction(allowStateLoss) {
         option?.invoke(this)
         replace(container.id, fragmentClass, params.toMvRxBundle(), tag).addToBackStack(tag)
diff --git a/vector/src/main/java/im/vector/app/core/extensions/Context.kt b/vector/src/main/java/im/vector/app/core/extensions/Context.kt
index 0f785e43a3..d50fe0ceab 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/Context.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/Context.kt
@@ -16,9 +16,13 @@
 
 package im.vector.app.core.extensions
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.drawable.Drawable
+import android.net.ConnectivityManager
+import android.net.NetworkCapabilities
 import android.net.Uri
+import android.os.Build
 import android.text.Spannable
 import android.text.SpannableString
 import android.text.style.ImageSpan
@@ -27,11 +31,13 @@ import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
 import androidx.annotation.FloatRange
 import androidx.core.content.ContextCompat
+import androidx.core.content.getSystemService
 import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import dagger.hilt.EntryPoints
 import im.vector.app.core.datastore.dataStoreProvider
 import im.vector.app.core.di.SingletonEntryPoint
+import im.vector.app.core.resources.BuildMeta
 import java.io.OutputStream
 import kotlin.math.roundToInt
 
@@ -53,9 +59,10 @@ fun Context.getResTintedDrawable(@DrawableRes drawableRes: Int, @ColorRes tint:
     return getTintedDrawable(drawableRes, ContextCompat.getColor(this, tint), alpha)
 }
 
-fun Context.getTintedDrawable(@DrawableRes drawableRes: Int,
-                              @ColorInt tint: Int,
-                              @FloatRange(from = 0.0, to = 1.0) alpha: Float = 1f
+fun Context.getTintedDrawable(
+        @DrawableRes drawableRes: Int,
+        @ColorInt tint: Int,
+        @FloatRange(from = 0.0, to = 1.0) alpha: Float = 1f
 ) = ContextCompat.getDrawable(this, drawableRes)
         ?.mutate()
         ?.also { drawable ->
@@ -77,3 +84,31 @@ val Context.dataStoreProvider: (String) -> DataStore<Preferences> by dataStorePr
 fun Context.safeOpenOutputStream(uri: Uri): OutputStream? {
     return contentResolver.openOutputStream(uri, "wt")
 }
+
+/**
+ * Checks for an active connection to infer if the device is offline.
+ * This is useful for breaking down UnknownHost exceptions and should not be used to determine if a valid connection is present
+ *
+ * @return true if no active connection is found
+ */
+@Suppress("deprecation")
+@SuppressLint("NewApi") // false positive
+fun Context.inferNoConnectivity(buildMeta: BuildMeta): Boolean {
+    val connectivityManager = getSystemService<ConnectivityManager>()!!
+    return if (buildMeta.sdkInt > Build.VERSION_CODES.M) {
+        val networkCapabilities = connectivityManager.getNetworkCapabilities(connectivityManager.activeNetwork)
+        when {
+            networkCapabilities?.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) == true -> false
+            networkCapabilities?.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) == true     -> false
+            networkCapabilities?.hasTransport(NetworkCapabilities.TRANSPORT_VPN) == true      -> false
+            else                                                                              -> true
+        }
+    } else {
+        when (connectivityManager.activeNetworkInfo?.type) {
+            ConnectivityManager.TYPE_WIFI   -> false
+            ConnectivityManager.TYPE_MOBILE -> false
+            ConnectivityManager.TYPE_VPN    -> false
+            else                            -> true
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/extensions/EditText.kt b/vector/src/main/java/im/vector/app/core/extensions/EditText.kt
index 0eb9dcdaf9..24c8e6bd36 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/EditText.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/EditText.kt
@@ -27,8 +27,10 @@ import androidx.annotation.DrawableRes
 import im.vector.app.R
 import im.vector.app.core.platform.SimpleTextWatcher
 
-fun EditText.setupAsSearch(@DrawableRes searchIconRes: Int = R.drawable.ic_search,
-                           @DrawableRes clearIconRes: Int = R.drawable.ic_x_gray) {
+fun EditText.setupAsSearch(
+        @DrawableRes searchIconRes: Int = R.drawable.ic_search,
+        @DrawableRes clearIconRes: Int = R.drawable.ic_x_gray
+) {
     addTextChangedListener(object : SimpleTextWatcher() {
         override fun afterTextChanged(s: Editable) {
             val clearIcon = if (s.isNotEmpty()) clearIconRes else 0
diff --git a/vector/src/main/java/im/vector/app/core/extensions/Fragment.kt b/vector/src/main/java/im/vector/app/core/extensions/Fragment.kt
index dfbd2eba97..61c4fe2174 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/Fragment.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/Fragment.kt
@@ -36,9 +36,10 @@ fun Fragment.registerStartForActivityResult(onResult: (ActivityResult) -> Unit):
 fun Fragment.addFragment(
         frameId: Int,
         fragment: Fragment,
+        tag: String? = null,
         allowStateLoss: Boolean = false
 ) {
-    parentFragmentManager.commitTransaction(allowStateLoss) { add(frameId, fragment) }
+    parentFragmentManager.commitTransaction(allowStateLoss) { add(frameId, fragment, tag) }
 }
 
 fun <T : Fragment> Fragment.addFragment(
diff --git a/vector/src/main/java/im/vector/app/core/extensions/RecyclerView.kt b/vector/src/main/java/im/vector/app/core/extensions/RecyclerView.kt
index eeb5ddce03..3ee20e362d 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/RecyclerView.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/RecyclerView.kt
@@ -27,13 +27,15 @@ import com.airbnb.epoxy.EpoxyVisibilityTracker
 /**
  * Apply a Vertical LinearLayout Manager to the recyclerView and set the adapter from the epoxy controller.
  */
-fun RecyclerView.configureWith(epoxyController: EpoxyController,
-                               itemAnimator: RecyclerView.ItemAnimator? = null,
-                               viewPool: RecyclerView.RecycledViewPool? = null,
-                               @DrawableRes
-                               dividerDrawable: Int? = null,
-                               hasFixedSize: Boolean = true,
-                               disableItemAnimation: Boolean = false) {
+fun RecyclerView.configureWith(
+        epoxyController: EpoxyController,
+        itemAnimator: RecyclerView.ItemAnimator? = null,
+        viewPool: RecyclerView.RecycledViewPool? = null,
+        @DrawableRes
+        dividerDrawable: Int? = null,
+        hasFixedSize: Boolean = true,
+        disableItemAnimation: Boolean = false
+) {
     layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false).apply {
         recycleChildrenOnDetach = viewPool != null
     }
diff --git a/vector/src/main/java/im/vector/app/core/extensions/Session.kt b/vector/src/main/java/im/vector/app/core/extensions/Session.kt
index 1884909906..caed413e2b 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/Session.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/Session.kt
@@ -20,7 +20,7 @@ import android.content.Context
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.ProcessLifecycleOwner
-import im.vector.app.core.services.VectorSyncService
+import im.vector.app.core.services.VectorSyncAndroidService
 import im.vector.app.features.session.VectorSessionStore
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupState
@@ -40,9 +40,9 @@ fun Session.configureAndStart(context: Context, startSyncing: Boolean = true) {
 
 fun Session.startSyncing(context: Context) {
     val applicationContext = context.applicationContext
-    if (!hasAlreadySynced()) {
+    if (!syncService().hasAlreadySynced()) {
         // initial sync is done as a service so it can continue below app lifecycle
-        VectorSyncService.newOneShotIntent(
+        VectorSyncAndroidService.newOneShotIntent(
                 context = applicationContext,
                 sessionId = sessionId
         )
@@ -57,7 +57,7 @@ fun Session.startSyncing(context: Context) {
     } else {
         val isAtLeastStarted = ProcessLifecycleOwner.get().lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)
         Timber.v("--> is at least started? $isAtLeastStarted")
-        startSync(isAtLeastStarted)
+        syncService().startSync(isAtLeastStarted)
     }
 }
 
@@ -66,7 +66,7 @@ fun Session.startSyncing(context: Context) {
  */
 fun Session.hasUnsavedKeys(): Boolean {
     return cryptoService().inboundGroupSessionsCount(false) > 0 &&
-            cryptoService().keysBackupService().state != KeysBackupState.ReadyToBackUp
+            cryptoService().keysBackupService().getState() != KeysBackupState.ReadyToBackUp
 }
 
 fun Session.cannotLogoutSafely(): Boolean {
diff --git a/vector/src/main/java/im/vector/app/core/extensions/String.kt b/vector/src/main/java/im/vector/app/core/extensions/String.kt
new file mode 100644
index 0000000000..f035de469c
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/extensions/String.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.core.extensions
+
+private const val RTL_OVERRIDE_CHAR = '\u202E'
+private const val LTR_OVERRIDE_CHAR = '\u202D'
+
+fun String.ensureEndsLeftToRight() = if (containsRtLOverride()) "$this$LTR_OVERRIDE_CHAR" else this
+
+fun String.containsRtLOverride() = contains(RTL_OVERRIDE_CHAR)
+
+fun String.filterDirectionOverrides() = filterNot { it == RTL_OVERRIDE_CHAR || it == LTR_OVERRIDE_CHAR }
diff --git a/vector/src/main/java/im/vector/app/core/extensions/TextView.kt b/vector/src/main/java/im/vector/app/core/extensions/TextView.kt
index 7d8b60ed58..3c453d854d 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/TextView.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/TextView.kt
@@ -60,11 +60,13 @@ fun TextView.setTextOrHide(newText: CharSequence?, hideWhenBlank: Boolean = true
  * @param underline true to also underline the text. Default to false
  * @param onClick attributes to handle click on the colored part if needed
  */
-fun TextView.setTextWithColoredPart(@StringRes fullTextRes: Int,
-                                    @StringRes coloredTextRes: Int,
-                                    @AttrRes colorAttribute: Int = R.attr.colorPrimary,
-                                    underline: Boolean = false,
-                                    onClick: (() -> Unit)? = null) {
+fun TextView.setTextWithColoredPart(
+        @StringRes fullTextRes: Int,
+        @StringRes coloredTextRes: Int,
+        @AttrRes colorAttribute: Int = R.attr.colorPrimary,
+        underline: Boolean = false,
+        onClick: (() -> Unit)? = null
+) {
     val coloredPart = resources.getString(coloredTextRes)
     // Insert colored part into the full text
     val fullText = resources.getString(fullTextRes, coloredPart)
@@ -80,11 +82,13 @@ fun TextView.setTextWithColoredPart(@StringRes fullTextRes: Int,
  * @param underline true to also underline the text. Default to false
  * @param onClick attributes to handle click on the colored part if needed
  */
-fun TextView.setTextWithColoredPart(fullText: String,
-                                    coloredPart: String,
-                                    @AttrRes colorAttribute: Int = R.attr.colorPrimary,
-                                    underline: Boolean = true,
-                                    onClick: (() -> Unit)? = null) {
+fun TextView.setTextWithColoredPart(
+        fullText: String,
+        coloredPart: String,
+        @AttrRes colorAttribute: Int = R.attr.colorPrimary,
+        underline: Boolean = true,
+        onClick: (() -> Unit)? = null
+) {
     val color = ThemeUtils.getColor(context, colorAttribute)
 
     val foregroundSpan = ForegroundColorSpan(color)
diff --git a/vector/src/main/java/im/vector/app/core/files/FileSaver.kt b/vector/src/main/java/im/vector/app/core/files/FileSaver.kt
index d0f2247f33..7de5286854 100644
--- a/vector/src/main/java/im/vector/app/core/files/FileSaver.kt
+++ b/vector/src/main/java/im/vector/app/core/files/FileSaver.kt
@@ -55,11 +55,13 @@ fun writeToFile(data: ByteArray, file: File): Try<Unit> {
     }
 }
 
-fun addEntryToDownloadManager(context: Context,
-                              file: File,
-                              mimeType: String,
-                              title: String = file.name,
-                              description: String = file.name): Uri? {
+fun addEntryToDownloadManager(
+        context: Context,
+        file: File,
+        mimeType: String,
+        title: String = file.name,
+        description: String = file.name
+): Uri? {
     try {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             val contentValues = ContentValues().apply {
diff --git a/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt b/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
index a643ee908c..92c95d3062 100644
--- a/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
+++ b/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
@@ -60,10 +60,12 @@ class VectorGlideModelLoader(private val context: Context) :
     }
 }
 
-class VectorGlideDataFetcher(context: Context,
-                             private val data: ImageContentRenderer.Data,
-                             private val width: Int,
-                             private val height: Int) :
+class VectorGlideDataFetcher(
+        context: Context,
+        private val data: ImageContentRenderer.Data,
+        private val width: Int,
+        private val height: Int
+) :
         DataFetcher<InputStream> {
 
     private val localFilesHelper = LocalFilesHelper(context)
diff --git a/vector/src/main/java/im/vector/app/core/linkify/VectorLinkify.kt b/vector/src/main/java/im/vector/app/core/linkify/VectorLinkify.kt
index d2184d9bd7..c833f39063 100644
--- a/vector/src/main/java/im/vector/app/core/linkify/VectorLinkify.kt
+++ b/vector/src/main/java/im/vector/app/core/linkify/VectorLinkify.kt
@@ -143,10 +143,12 @@ object VectorLinkify {
         }
     }
 
-    private data class LinkSpec(val span: URLSpan,
-                                val start: Int,
-                                val end: Int,
-                                val important: Boolean = false)
+    private data class LinkSpec(
+            val span: URLSpan,
+            val start: Int,
+            val end: Int,
+            val important: Boolean = false
+    )
 
     private val COMPARATOR = Comparator<LinkSpec> { (_, startA, endA), (_, startB, endB) ->
         if (startA < startB) {
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
index 8a4aaa4b26..0c6708af33 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
@@ -261,11 +261,11 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
 
     private fun handleGlobalError(globalError: GlobalError) {
         when (globalError) {
-            is GlobalError.InvalidToken         -> handleInvalidToken(globalError)
+            is GlobalError.InvalidToken -> handleInvalidToken(globalError)
             is GlobalError.ConsentNotGivenError -> displayConsentNotGivenDialog(globalError)
-            is GlobalError.CertificateError     -> handleCertificateError(globalError)
-            GlobalError.ExpiredAccount          -> Unit // TODO Handle account expiration
-            is GlobalError.InitialSyncRequest   -> handleInitialSyncRequest(globalError)
+            is GlobalError.CertificateError -> handleCertificateError(globalError)
+            GlobalError.ExpiredAccount -> Unit // TODO Handle account expiration
+            is GlobalError.InitialSyncRequest -> handleInitialSyncRequest(globalError)
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/core/platform/livedata/SharedPreferenceLiveData.kt b/vector/src/main/java/im/vector/app/core/platform/livedata/SharedPreferenceLiveData.kt
index 3e0733b35d..dddce313ff 100644
--- a/vector/src/main/java/im/vector/app/core/platform/livedata/SharedPreferenceLiveData.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/livedata/SharedPreferenceLiveData.kt
@@ -19,9 +19,11 @@ package im.vector.app.core.platform.livedata
 import android.content.SharedPreferences
 import androidx.lifecycle.LiveData
 
-abstract class SharedPreferenceLiveData<T>(protected val sharedPrefs: SharedPreferences,
-                                           protected val key: String,
-                                           private val defValue: T) : LiveData<T>() {
+abstract class SharedPreferenceLiveData<T>(
+        protected val sharedPrefs: SharedPreferences,
+        protected val key: String,
+        private val defValue: T
+) : LiveData<T>() {
 
     private val preferenceChangeListener = SharedPreferences.OnSharedPreferenceChangeListener { _, key ->
         if (key == this.key) {
diff --git a/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt b/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
index b1bb4c7d88..c89dc7a73c 100644
--- a/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
+++ b/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
@@ -21,7 +21,7 @@ import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.resources.AppNameProvider
 import im.vector.app.core.resources.LocaleProvider
 import im.vector.app.core.resources.StringProvider
-import org.matrix.android.sdk.api.session.pushers.PushersService
+import org.matrix.android.sdk.api.session.pushers.HttpPusher
 import java.util.UUID
 import javax.inject.Inject
 import kotlin.math.abs
@@ -55,7 +55,7 @@ class PushersManager @Inject constructor(
         currentSession.pushersService().addHttpPusher(createHttpPusher(pushKey))
     }
 
-    private fun createHttpPusher(pushKey: String) = PushersService.HttpPusher(
+    private fun createHttpPusher(pushKey: String) = HttpPusher(
             pushKey,
             stringProvider.getString(R.string.pusher_app_id),
             profileTag = DEFAULT_PUSHER_FILE_TAG + "_" + abs(activeSessionHolder.getActiveSession().myUserId.hashCode()),
diff --git a/vector/src/main/java/im/vector/app/core/qrcode/QrCode.kt b/vector/src/main/java/im/vector/app/core/qrcode/QrCode.kt
index 170baa04fe..226ec5ee59 100644
--- a/vector/src/main/java/im/vector/app/core/qrcode/QrCode.kt
+++ b/vector/src/main/java/im/vector/app/core/qrcode/QrCode.kt
@@ -32,8 +32,10 @@ fun String.toBitMatrix(size: Int): BitMatrix {
     )
 }
 
-fun BitMatrix.toBitmap(@ColorInt backgroundColor: Int = Color.WHITE,
-                       @ColorInt foregroundColor: Int = Color.BLACK): Bitmap {
+fun BitMatrix.toBitmap(
+        @ColorInt backgroundColor: Int = Color.WHITE,
+        @ColorInt foregroundColor: Int = Color.BLACK
+): Bitmap {
     val colorBuffer = IntArray(width * height)
     var rowOffset = 0
     for (y in 0 until height) {
diff --git a/vector/src/main/java/im/vector/app/core/resources/BuildMeta.kt b/vector/src/main/java/im/vector/app/core/resources/BuildMeta.kt
new file mode 100644
index 0000000000..14d97e4c8f
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/resources/BuildMeta.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.core.resources
+
+import android.os.Build
+
+data class BuildMeta(
+        val sdkInt: Int = Build.VERSION.SDK_INT
+)
diff --git a/vector/src/main/java/im/vector/app/core/resources/LocaleProvider.kt b/vector/src/main/java/im/vector/app/core/resources/LocaleProvider.kt
index 2f1b46b555..d91a09e6df 100644
--- a/vector/src/main/java/im/vector/app/core/resources/LocaleProvider.kt
+++ b/vector/src/main/java/im/vector/app/core/resources/LocaleProvider.kt
@@ -26,7 +26,7 @@ import javax.inject.Inject
 class LocaleProvider @Inject constructor(private val resources: Resources) {
 
     fun current(): Locale {
-        return ConfigurationCompat.getLocales(resources.configuration)[0]
+        return ConfigurationCompat.getLocales(resources.configuration).get(0) ?: Locale.getDefault()
     }
 }
 
diff --git a/vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt b/vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
index d39dcbe318..09bb78c926 100644
--- a/vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
+++ b/vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
@@ -56,4 +56,8 @@ class UserPreferencesProvider @Inject constructor(private val vectorPreferences:
     fun showLiveSenderInfo(): Boolean {
         return vectorPreferences.showLiveSenderInfo()
     }
+
+    fun autoplayAnimatedImages(): Boolean {
+        return vectorPreferences.autoplayAnimatedImages()
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/core/services/CallService.kt b/vector/src/main/java/im/vector/app/core/services/CallService.kt
index df9e670423..b7db7b2542 100644
--- a/vector/src/main/java/im/vector/app/core/services/CallService.kt
+++ b/vector/src/main/java/im/vector/app/core/services/CallService.kt
@@ -321,9 +321,11 @@ class CallService : VectorService() {
         private const val EXTRA_END_CALL_REJECTED = "EXTRA_END_CALL_REJECTED"
         private const val EXTRA_END_CALL_REASON = "EXTRA_END_CALL_REASON"
 
-        fun onIncomingCallRinging(context: Context,
-                                  callId: String,
-                                  isInBackground: Boolean) {
+        fun onIncomingCallRinging(
+                context: Context,
+                callId: String,
+                isInBackground: Boolean
+        ) {
             val intent = Intent(context, CallService::class.java)
                     .apply {
                         action = ACTION_INCOMING_RINGING_CALL
@@ -333,8 +335,10 @@ class CallService : VectorService() {
             ContextCompat.startForegroundService(context, intent)
         }
 
-        fun onOutgoingCallRinging(context: Context,
-                                  callId: String) {
+        fun onOutgoingCallRinging(
+                context: Context,
+                callId: String
+        ) {
             val intent = Intent(context, CallService::class.java)
                     .apply {
                         action = ACTION_OUTGOING_RINGING_CALL
@@ -343,8 +347,10 @@ class CallService : VectorService() {
             ContextCompat.startForegroundService(context, intent)
         }
 
-        fun onPendingCall(context: Context,
-                          callId: String) {
+        fun onPendingCall(
+                context: Context,
+                callId: String
+        ) {
             val intent = Intent(context, CallService::class.java)
                     .apply {
                         action = ACTION_ONGOING_CALL
@@ -353,10 +359,12 @@ class CallService : VectorService() {
             ContextCompat.startForegroundService(context, intent)
         }
 
-        fun onCallTerminated(context: Context,
-                             callId: String,
-                             endCallReason: EndCallReason,
-                             rejected: Boolean) {
+        fun onCallTerminated(
+                context: Context,
+                callId: String,
+                endCallReason: EndCallReason,
+                rejected: Boolean
+        ) {
             val intent = Intent(context, CallService::class.java)
                     .apply {
                         action = ACTION_CALL_TERMINATED
diff --git a/vector/src/main/java/im/vector/app/core/services/VectorSyncService.kt b/vector/src/main/java/im/vector/app/core/services/VectorSyncAndroidService.kt
similarity index 81%
rename from vector/src/main/java/im/vector/app/core/services/VectorSyncService.kt
rename to vector/src/main/java/im/vector/app/core/services/VectorSyncAndroidService.kt
index 131276bea6..864f69a136 100644
--- a/vector/src/main/java/im/vector/app/core/services/VectorSyncService.kt
+++ b/vector/src/main/java/im/vector/app/core/services/VectorSyncAndroidService.kt
@@ -38,30 +38,34 @@ import im.vector.app.core.time.DefaultClock
 import im.vector.app.features.notifications.NotificationUtils
 import im.vector.app.features.settings.BackgroundSyncMode
 import org.matrix.android.sdk.api.Matrix
-import org.matrix.android.sdk.api.session.sync.job.SyncService
+import org.matrix.android.sdk.api.session.sync.job.SyncAndroidService
 import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class VectorSyncService : SyncService() {
+class VectorSyncAndroidService : SyncAndroidService() {
 
     companion object {
 
-        fun newOneShotIntent(context: Context,
-                             sessionId: String): Intent {
-            return Intent(context, VectorSyncService::class.java).also {
+        fun newOneShotIntent(
+                context: Context,
+                sessionId: String
+        ): Intent {
+            return Intent(context, VectorSyncAndroidService::class.java).also {
                 it.putExtra(EXTRA_SESSION_ID, sessionId)
                 it.putExtra(EXTRA_TIMEOUT_SECONDS, 0)
                 it.putExtra(EXTRA_PERIODIC, false)
             }
         }
 
-        fun newPeriodicIntent(context: Context,
-                              sessionId: String,
-                              syncTimeoutSeconds: Int,
-                              syncDelaySeconds: Int,
-                              isNetworkBack: Boolean): Intent {
-            return Intent(context, VectorSyncService::class.java).also {
+        fun newPeriodicIntent(
+                context: Context,
+                sessionId: String,
+                syncTimeoutSeconds: Int,
+                syncDelaySeconds: Int,
+                isNetworkBack: Boolean
+        ): Intent {
+            return Intent(context, VectorSyncAndroidService::class.java).also {
                 it.putExtra(EXTRA_SESSION_ID, sessionId)
                 it.putExtra(EXTRA_TIMEOUT_SECONDS, syncTimeoutSeconds)
                 it.putExtra(EXTRA_PERIODIC, true)
@@ -71,7 +75,7 @@ class VectorSyncService : SyncService() {
         }
 
         fun stopIntent(context: Context): Intent {
-            return Intent(context, VectorSyncService::class.java).also {
+            return Intent(context, VectorSyncAndroidService::class.java).also {
                 it.action = ACTION_STOP
             }
         }
@@ -97,9 +101,11 @@ class VectorSyncService : SyncService() {
         startForeground(NotificationUtils.NOTIFICATION_ID_FOREGROUND_SERVICE, notification)
     }
 
-    override fun onRescheduleAsked(sessionId: String,
-                                   syncTimeoutSeconds: Int,
-                                   syncDelaySeconds: Int) {
+    override fun onRescheduleAsked(
+            sessionId: String,
+            syncTimeoutSeconds: Int,
+            syncDelaySeconds: Int
+    ) {
         rescheduleSyncService(
                 sessionId = sessionId,
                 syncTimeoutSeconds = syncTimeoutSeconds,
@@ -110,10 +116,12 @@ class VectorSyncService : SyncService() {
         )
     }
 
-    override fun onNetworkError(sessionId: String,
-                                syncTimeoutSeconds: Int,
-                                syncDelaySeconds: Int,
-                                isPeriodic: Boolean) {
+    override fun onNetworkError(
+            sessionId: String,
+            syncTimeoutSeconds: Int,
+            syncDelaySeconds: Int,
+            isPeriodic: Boolean
+    ) {
         Timber.d("## Sync: A network error occurred during sync")
         val rescheduleSyncWorkRequest: WorkRequest =
                 OneTimeWorkRequestBuilder<RestartWhenNetworkOn>()
@@ -169,10 +177,11 @@ class VectorSyncService : SyncService() {
         }
 
         companion object {
-            fun createInputData(sessionId: String,
-                                syncTimeoutSeconds: Int,
-                                syncDelaySeconds: Int,
-                                isPeriodic: Boolean
+            fun createInputData(
+                    sessionId: String,
+                    syncTimeoutSeconds: Int,
+                    syncDelaySeconds: Int,
+                    isPeriodic: Boolean
             ): Data {
                 return Data.Builder()
                         .putString(KEY_SESSION_ID, sessionId)
@@ -190,15 +199,17 @@ class VectorSyncService : SyncService() {
     }
 }
 
-private fun Context.rescheduleSyncService(sessionId: String,
-                                          syncTimeoutSeconds: Int,
-                                          syncDelaySeconds: Int,
-                                          isPeriodic: Boolean,
-                                          isNetworkBack: Boolean,
-                                          currentTimeMillis: Long) {
+private fun Context.rescheduleSyncService(
+        sessionId: String,
+        syncTimeoutSeconds: Int,
+        syncDelaySeconds: Int,
+        isPeriodic: Boolean,
+        isNetworkBack: Boolean,
+        currentTimeMillis: Long
+) {
     Timber.d("## Sync: rescheduleSyncService")
     val intent = if (isPeriodic) {
-        VectorSyncService.newPeriodicIntent(
+        VectorSyncAndroidService.newPeriodicIntent(
                 context = this,
                 sessionId = sessionId,
                 syncTimeoutSeconds = syncTimeoutSeconds,
@@ -206,7 +217,7 @@ private fun Context.rescheduleSyncService(sessionId: String,
                 isNetworkBack = isNetworkBack
         )
     } else {
-        VectorSyncService.newOneShotIntent(
+        VectorSyncAndroidService.newOneShotIntent(
                 context = this,
                 sessionId = sessionId
         )
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/PasswordStrengthBar.kt b/vector/src/main/java/im/vector/app/core/ui/views/PasswordStrengthBar.kt
index 04bc821387..eb5b05e79b 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/PasswordStrengthBar.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/PasswordStrengthBar.kt
@@ -35,7 +35,8 @@ import im.vector.app.databinding.ViewPasswordStrengthBarBinding
 class PasswordStrengthBar @JvmOverloads constructor(
         context: Context,
         attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0) :
+        defStyleAttr: Int = 0
+) :
         LinearLayout(context, attrs, defStyleAttr) {
 
     private val views: ViewPasswordStrengthBarBinding
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/PresenceStateImageView.kt b/vector/src/main/java/im/vector/app/core/ui/views/PresenceStateImageView.kt
index a1d3e49f3b..6fd8cba94e 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/PresenceStateImageView.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/PresenceStateImageView.kt
@@ -49,7 +49,7 @@ class PresenceStateImageView @JvmOverloads constructor(
                 setImageResource(R.drawable.ic_presence_offline)
                 contentDescription = context.getString(R.string.a11y_presence_offline)
             }
-            PresenceEnum.BUSY     -> {
+            PresenceEnum.BUSY        -> {
                 setImageResource(R.drawable.ic_presence_busy)
                 contentDescription = context.getString(R.string.a11y_presence_busy)
             }
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt b/vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt
index 8477eddeea..2b7da49a71 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt
@@ -28,8 +28,7 @@ import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptData
 import im.vector.app.features.home.room.detail.timeline.item.toMatrixItem
 
-private const val MAX_RECEIPT_DISPLAYED = 5
-private const val MAX_RECEIPT_DESCRIBED = 3
+private const val MAX_RECEIPT_DISPLAYED = 3
 
 class ReadReceiptsView @JvmOverloads constructor(
         context: Context,
@@ -45,13 +44,7 @@ class ReadReceiptsView @JvmOverloads constructor(
     }
 
     private val receiptAvatars: List<ImageView> by lazy {
-        listOf(
-                views.receiptAvatar1,
-                views.receiptAvatar2,
-                views.receiptAvatar3,
-                views.receiptAvatar4,
-                views.receiptAvatar5
-        )
+        listOf(views.receiptAvatar1, views.receiptAvatar2, views.receiptAvatar3)
     }
 
     private fun setupView() {
@@ -60,66 +53,58 @@ class ReadReceiptsView @JvmOverloads constructor(
     }
 
     fun render(readReceipts: List<ReadReceiptData>, avatarRenderer: AvatarRenderer) {
-        if (readReceipts.isNotEmpty()) {
-            isVisible = true
-            for (index in 0 until MAX_RECEIPT_DISPLAYED) {
-                val receiptData = readReceipts.getOrNull(index)
-                if (receiptData == null) {
-                    receiptAvatars[index].visibility = View.INVISIBLE
-                } else {
-                    receiptAvatars[index].visibility = View.VISIBLE
-                    avatarRenderer.render(receiptData.toMatrixItem(), receiptAvatars[index])
-                }
-            }
+        receiptAvatars.forEach { it.isVisible = false }
 
-            val displayNames = readReceipts
-                    .mapNotNull { it.displayName }
-                    .filter { it.isNotBlank() }
-                    .take(MAX_RECEIPT_DESCRIBED)
+        readReceipts.take(MAX_RECEIPT_DISPLAYED).forEachIndexed { index, receiptData ->
+            receiptAvatars[index].isVisible = true
+            avatarRenderer.render(receiptData.toMatrixItem(), receiptAvatars[index])
+        }
 
-            if (readReceipts.size > MAX_RECEIPT_DISPLAYED) {
-                views.receiptMore.visibility = View.VISIBLE
-                views.receiptMore.text = context.getString(
-                        R.string.x_plus, readReceipts.size - MAX_RECEIPT_DISPLAYED
-                )
-            } else {
-                views.receiptMore.visibility = View.GONE
-            }
-            contentDescription = when (readReceipts.size) {
-                1    ->
-                    if (displayNames.size == 1) {
-                        context.getString(R.string.one_user_read, displayNames[0])
-                    } else {
-                        context.resources.getQuantityString(R.plurals.fallback_users_read, readReceipts.size)
-                    }
-                2    ->
-                    if (displayNames.size == 2) {
-                        context.getString(R.string.two_users_read, displayNames[0], displayNames[1])
-                    } else {
-                        context.resources.getQuantityString(R.plurals.fallback_users_read, readReceipts.size)
-                    }
-                3    ->
-                    if (displayNames.size == 3) {
-                        context.getString(R.string.three_users_read, displayNames[0], displayNames[1], displayNames[2])
-                    } else {
-                        context.resources.getQuantityString(R.plurals.fallback_users_read, readReceipts.size)
-                    }
-                else ->
-                    if (displayNames.size >= 2) {
-                        val qty = readReceipts.size - 2
-                        context.resources.getQuantityString(
-                                R.plurals.two_and_some_others_read,
-                                qty,
-                                displayNames[0],
-                                displayNames[1],
-                                qty
-                        )
-                    } else {
-                        context.resources.getQuantityString(R.plurals.fallback_users_read, readReceipts.size)
-                    }
-            }
+        val displayNames = readReceipts
+                .mapNotNull { it.displayName }
+                .filter { it.isNotBlank() }
+                .take(MAX_RECEIPT_DISPLAYED)
+
+        if (readReceipts.size > MAX_RECEIPT_DISPLAYED) {
+            views.receiptMore.visibility = View.VISIBLE
+            views.receiptMore.text = context.getString(
+                    R.string.x_plus, readReceipts.size - MAX_RECEIPT_DISPLAYED
+            )
         } else {
-            isVisible = false
+            views.receiptMore.visibility = View.GONE
+        }
+        contentDescription = when (readReceipts.size) {
+            1    ->
+                if (displayNames.size == 1) {
+                    context.getString(R.string.one_user_read, displayNames[0])
+                } else {
+                    context.resources.getQuantityString(R.plurals.fallback_users_read, readReceipts.size)
+                }
+            2    ->
+                if (displayNames.size == 2) {
+                    context.getString(R.string.two_users_read, displayNames[0], displayNames[1])
+                } else {
+                    context.resources.getQuantityString(R.plurals.fallback_users_read, readReceipts.size)
+                }
+            3    ->
+                if (displayNames.size == 3) {
+                    context.getString(R.string.three_users_read, displayNames[0], displayNames[1], displayNames[2])
+                } else {
+                    context.resources.getQuantityString(R.plurals.fallback_users_read, readReceipts.size)
+                }
+            else ->
+                if (displayNames.size >= 2) {
+                    val qty = readReceipts.size - 2
+                    context.resources.getQuantityString(
+                                R.plurals.two_and_some_others_read,
+                            qty,
+                            displayNames[0],
+                            displayNames[1],
+                            qty
+                        )
+                } else {
+                    context.resources.getQuantityString(R.plurals.fallback_users_read, readReceipts.size)
+                }
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/core/utils/Dialogs.kt b/vector/src/main/java/im/vector/app/core/utils/Dialogs.kt
index 9f3e6a91cf..c9bd4e54b0 100644
--- a/vector/src/main/java/im/vector/app/core/utils/Dialogs.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/Dialogs.kt
@@ -45,8 +45,10 @@ fun Context.displayInWebView(url: String) {
             .show()
 }
 
-fun Context.showIdentityServerConsentDialog(identityServerWithTerms: ServerAndPolicies?,
-                                            consentCallBack: (() -> Unit)) {
+fun Context.showIdentityServerConsentDialog(
+        identityServerWithTerms: ServerAndPolicies?,
+        consentCallBack: (() -> Unit)
+) {
     // Build the message
     val content = span {
         +getString(R.string.identity_server_consent_dialog_content_3)
diff --git a/vector/src/main/java/im/vector/app/core/utils/Emoji.kt b/vector/src/main/java/im/vector/app/core/utils/Emoji.kt
index d6a63dca10..3e82ecd5f2 100644
--- a/vector/src/main/java/im/vector/app/core/utils/Emoji.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/Emoji.kt
@@ -16,7 +16,7 @@
 
 package im.vector.app.core.utils
 
-import com.vanniktech.emoji.EmojiUtils
+import com.vanniktech.emoji.isOnlyEmojis
 
 /**
  * Test if a string contains emojis.
@@ -28,7 +28,7 @@ import com.vanniktech.emoji.EmojiUtils
  */
 fun containsOnlyEmojis(str: String?): Boolean {
     // Now rely on vanniktech library
-    return EmojiUtils.isOnlyEmojis(str)
+    return str.isOnlyEmojis()
 }
 
 /**
diff --git a/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
index 9616e35840..bb5f7dcf9c 100644
--- a/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
@@ -89,9 +89,11 @@ fun openUrlInExternalBrowser(context: Context, uri: Uri?) {
  * If several compatible browsers are installed, the user will be proposed to choose one.
  * Ref: https://developer.chrome.com/multidevice/android/customtabs.
  */
-fun openUrlInChromeCustomTab(context: Context,
-                             session: CustomTabsSession?,
-                             url: String) {
+fun openUrlInChromeCustomTab(
+        context: Context,
+        session: CustomTabsSession?,
+        url: String
+) {
     try {
         CustomTabsIntent.Builder()
                 .setDefaultColorSchemeParams(
@@ -122,10 +124,12 @@ fun openUrlInChromeCustomTab(context: Context,
 /**
  * Open file selection activity.
  */
-fun openFileSelection(activity: Activity,
-                      activityResultLauncher: ActivityResultLauncher<Intent>?,
-                      allowMultipleSelection: Boolean,
-                      requestCode: Int) {
+fun openFileSelection(
+        activity: Activity,
+        activityResultLauncher: ActivityResultLauncher<Intent>?,
+        allowMultipleSelection: Boolean,
+        requestCode: Int
+) {
     val fileIntent = Intent(Intent.ACTION_GET_CONTENT)
     fileIntent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, allowMultipleSelection)
 
@@ -251,12 +255,14 @@ private fun appendTimeToFilename(name: String): String {
     return """${filename}_$dateExtension.$fileExtension"""
 }
 
-suspend fun saveMedia(context: Context,
-                      file: File,
-                      title: String,
-                      mediaMimeType: String?,
-                      notificationUtils: NotificationUtils,
-                      currentTimeMillis: Long) {
+suspend fun saveMedia(
+        context: Context,
+        file: File,
+        title: String,
+        mediaMimeType: String?,
+        notificationUtils: NotificationUtils,
+        currentTimeMillis: Long
+) {
     withContext(Dispatchers.IO) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             val filename = appendTimeToFilename(title)
@@ -303,11 +309,13 @@ suspend fun saveMedia(context: Context,
 }
 
 @Suppress("DEPRECATION")
-private fun saveMediaLegacy(context: Context,
-                            mediaMimeType: String?,
-                            title: String,
-                            file: File,
-                            currentTimeMillis: Long) {
+private fun saveMediaLegacy(
+        context: Context,
+        mediaMimeType: String?,
+        title: String,
+        file: File,
+        currentTimeMillis: Long
+) {
     val state = Environment.getExternalStorageState()
     if (Environment.MEDIA_MOUNTED != state) {
         context.toast(context.getString(R.string.error_saving_media_file))
diff --git a/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt b/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt
index a41abba7ab..9ad95d3c55 100644
--- a/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt
@@ -19,7 +19,6 @@ package im.vector.app.core.utils
 import android.Manifest
 import android.app.Activity
 import android.content.pm.PackageManager
-import android.os.Build
 import androidx.activity.ComponentActivity
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
@@ -43,11 +42,6 @@ val PERMISSIONS_FOR_ROOM_AVATAR = listOf(Manifest.permission.CAMERA)
 val PERMISSIONS_FOR_WRITING_FILES = listOf(Manifest.permission.WRITE_EXTERNAL_STORAGE)
 val PERMISSIONS_FOR_PICKING_CONTACT = listOf(Manifest.permission.READ_CONTACTS)
 val PERMISSIONS_FOR_FOREGROUND_LOCATION_SHARING = listOf(Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION)
-val PERMISSIONS_FOR_BACKGROUND_LOCATION_SHARING = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-    listOf(Manifest.permission.ACCESS_BACKGROUND_LOCATION)
-} else {
-    PERMISSIONS_EMPTY
-}
 
 // This is not ideal to store the value like that, but it works
 private var permissionDialogDisplayed = false
@@ -106,10 +100,12 @@ private fun onPermissionResult(result: Map<String, Boolean>, lambda: (allGranted
  * @param rationaleMessage message to be displayed BEFORE requesting for the permission
  * @return true if the permissions are granted (synchronous flow), false otherwise (asynchronous flow)
  */
-fun checkPermissions(permissionsToBeGranted: List<String>,
-                     activity: Activity,
-                     activityResultLauncher: ActivityResultLauncher<Array<String>>,
-                     @StringRes rationaleMessage: Int = 0): Boolean {
+fun checkPermissions(
+        permissionsToBeGranted: List<String>,
+        activity: Activity,
+        activityResultLauncher: ActivityResultLauncher<Array<String>>,
+        @StringRes rationaleMessage: Int = 0
+): Boolean {
     // retrieve the permissions to be granted according to the permission list
     val missingPermissions = permissionsToBeGranted.filter { permission ->
         ContextCompat.checkSelfPermission(activity.applicationContext, permission) == PackageManager.PERMISSION_DENIED
@@ -149,8 +145,10 @@ fun checkPermissions(permissionsToBeGranted: List<String>,
  *
  * @return true if one of the permission has been denied and the user check the do not ask again checkbox
  */
-private fun permissionsDeniedPermanently(permissionsToBeGranted: List<String>,
-                                         activity: Activity): Boolean {
+private fun permissionsDeniedPermanently(
+        permissionsToBeGranted: List<String>,
+        activity: Activity
+): Boolean {
     return permissionsToBeGranted
             .filter { permission ->
                 ContextCompat.checkSelfPermission(activity.applicationContext, permission) == PackageManager.PERMISSION_DENIED
diff --git a/vector/src/main/java/im/vector/app/core/utils/SnapHelperUtils.kt b/vector/src/main/java/im/vector/app/core/utils/SnapHelperUtils.kt
index 070c953a3f..7d1bfc926d 100644
--- a/vector/src/main/java/im/vector/app/core/utils/SnapHelperUtils.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/SnapHelperUtils.kt
@@ -27,7 +27,8 @@ interface OnSnapPositionChangeListener {
 fun RecyclerView.attachSnapHelperWithListener(
         snapHelper: SnapHelper,
         behavior: SnapOnScrollListener.Behavior = SnapOnScrollListener.Behavior.NOTIFY_ON_SCROLL_STATE_IDLE,
-        onSnapPositionChangeListener: OnSnapPositionChangeListener) {
+        onSnapPositionChangeListener: OnSnapPositionChangeListener
+) {
     snapHelper.attachToRecyclerView(this)
     val snapOnScrollListener = SnapOnScrollListener(snapHelper, behavior, onSnapPositionChangeListener)
     addOnScrollListener(snapOnScrollListener)
diff --git a/vector/src/main/java/im/vector/app/core/utils/SpannableUtils.kt b/vector/src/main/java/im/vector/app/core/utils/SpannableUtils.kt
index aa1917e326..146df82e35 100644
--- a/vector/src/main/java/im/vector/app/core/utils/SpannableUtils.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/SpannableUtils.kt
@@ -48,8 +48,10 @@ fun Spannable.tappableMatchingText(match: String, clickSpan: ClickableSpan): Spa
     return this
 }
 
-fun Span.bullet(text: CharSequence = "",
-                init: Span.() -> Unit = {}): Span = apply {
+fun Span.bullet(
+        text: CharSequence = "",
+        init: Span.() -> Unit = {}
+): Span = apply {
     append(Span(parent = this).apply {
         this.text = text
         this.spans.add(BulletSpan())
diff --git a/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt b/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
index 1d9ac6c3ef..1939bdf6a9 100644
--- a/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
@@ -145,12 +145,14 @@ fun startInstallFromSourceIntent(context: Context, activityResultLauncher: Activ
     }
 }
 
-fun startSharePlainTextIntent(fragment: Fragment,
-                              activityResultLauncher: ActivityResultLauncher<Intent>?,
-                              chooserTitle: String?,
-                              text: String,
-                              subject: String? = null,
-                              extraTitle: String? = null) {
+fun startSharePlainTextIntent(
+        fragment: Fragment,
+        activityResultLauncher: ActivityResultLauncher<Intent>?,
+        chooserTitle: String?,
+        text: String,
+        subject: String? = null,
+        extraTitle: String? = null
+) {
     val share = Intent(Intent.ACTION_SEND)
     share.type = "text/plain"
     share.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT)
diff --git a/vector/src/main/java/im/vector/app/core/utils/TextUtils.kt b/vector/src/main/java/im/vector/app/core/utils/TextUtils.kt
index d2f8c4022b..d6af3f5afb 100644
--- a/vector/src/main/java/im/vector/app/core/utils/TextUtils.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/TextUtils.kt
@@ -20,6 +20,7 @@ import android.content.Context
 import android.os.Build
 import android.text.format.Formatter
 import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
 import org.threeten.bp.Duration
 import java.util.TreeMap
 
@@ -85,50 +86,66 @@ object TextUtils {
         }
     }
 
-    fun formatDurationWithUnits(context: Context, duration: Duration): String {
+    fun formatDurationWithUnits(context: Context, duration: Duration, appendSeconds: Boolean = true): String {
+        return formatDurationWithUnits(duration, context::getString, appendSeconds)
+    }
+
+    fun formatDurationWithUnits(stringProvider: StringProvider, duration: Duration, appendSeconds: Boolean = true): String {
+        return formatDurationWithUnits(duration, stringProvider::getString, appendSeconds)
+    }
+
+    /**
+     * We don't always have Context to get strings or we want to use StringProvider instead.
+     * So we can pass the getString function either from Context or the StringProvider.
+     * @param duration duration to be formatted
+     * @param getString getString method from Context or StringProvider
+     * @param appendSeconds if false than formatter will not append seconds
+     * @return formatted duration with a localized form like "10h 30min 5sec"
+     */
+    private fun formatDurationWithUnits(duration: Duration, getString: ((Int) -> String), appendSeconds: Boolean = true): String {
         val hours = getHours(duration)
         val minutes = getMinutes(duration)
         val seconds = getSeconds(duration)
         val builder = StringBuilder()
         when {
             hours > 0   -> {
-                appendHours(context, builder, hours)
+                appendHours(getString, builder, hours)
                 if (minutes > 0) {
                     builder.append(" ")
-                    appendMinutes(context, builder, minutes)
+                    appendMinutes(getString, builder, minutes)
                 }
-                if (seconds > 0) {
+                if (appendSeconds && seconds > 0) {
                     builder.append(" ")
-                    appendSeconds(context, builder, seconds)
+                    appendSeconds(getString, builder, seconds)
                 }
             }
             minutes > 0 -> {
-                appendMinutes(context, builder, minutes)
-                if (seconds > 0) {
+                appendMinutes(getString, builder, minutes)
+                if (appendSeconds && seconds > 0) {
                     builder.append(" ")
-                    appendSeconds(context, builder, seconds)
+                    appendSeconds(getString, builder, seconds)
                 }
             }
             else        -> {
-                appendSeconds(context, builder, seconds)
+                appendSeconds(getString, builder, seconds)
             }
         }
         return builder.toString()
     }
 
-    private fun appendHours(context: Context, builder: StringBuilder, hours: Int) {
+    private fun appendHours(getString: ((Int) -> String), builder: StringBuilder, hours: Int) {
         builder.append(hours)
-        builder.append(context.resources.getString(R.string.time_unit_hour_short))
+        builder.append(getString(R.string.time_unit_hour_short))
     }
 
-    private fun appendMinutes(context: Context, builder: StringBuilder, minutes: Int) {
+    private fun appendMinutes(getString: ((Int) -> String), builder: StringBuilder, minutes: Int) {
         builder.append(minutes)
-        builder.append(context.getString(R.string.time_unit_minute_short))
+        builder.append(getString(R.string.time_unit_minute_short))
     }
 
-    private fun appendSeconds(context: Context, builder: StringBuilder, seconds: Int) {
+    private fun appendSeconds(getString: ((Int) -> String), builder: StringBuilder, seconds: Int) {
         builder.append(seconds)
-        builder.append(context.getString(R.string.time_unit_second_short))
+        builder.append(getString(R.string.time_unit_second_short))
     }
 
     private fun getHours(duration: Duration): Int = duration.toHours().toInt()
diff --git a/vector/src/main/java/im/vector/app/core/utils/ToggleableAppBarLayoutBehavior.kt b/vector/src/main/java/im/vector/app/core/utils/ToggleableAppBarLayoutBehavior.kt
index c829313256..b2509a145d 100644
--- a/vector/src/main/java/im/vector/app/core/utils/ToggleableAppBarLayoutBehavior.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/ToggleableAppBarLayoutBehavior.kt
@@ -32,35 +32,41 @@ class ToggleableAppBarLayoutBehavior : AppBarLayout.Behavior {
 
     var isEnabled = true
 
-    override fun onStartNestedScroll(parent: CoordinatorLayout,
-                                     child: AppBarLayout,
-                                     directTargetChild: View,
-                                     target: View,
-                                     nestedScrollAxes: Int,
-                                     type: Int): Boolean {
+    override fun onStartNestedScroll(
+            parent: CoordinatorLayout,
+            child: AppBarLayout,
+            directTargetChild: View,
+            target: View,
+            nestedScrollAxes: Int,
+            type: Int
+    ): Boolean {
         return isEnabled && super.onStartNestedScroll(parent, child, directTargetChild, target, nestedScrollAxes, type)
     }
 
-    override fun onNestedScroll(coordinatorLayout: CoordinatorLayout,
-                                child: AppBarLayout,
-                                target: View,
-                                dxConsumed: Int,
-                                dyConsumed: Int,
-                                dxUnconsumed: Int,
-                                dyUnconsumed: Int,
-                                type: Int,
-                                consumed: IntArray) {
+    override fun onNestedScroll(
+            coordinatorLayout: CoordinatorLayout,
+            child: AppBarLayout,
+            target: View,
+            dxConsumed: Int,
+            dyConsumed: Int,
+            dxUnconsumed: Int,
+            dyUnconsumed: Int,
+            type: Int,
+            consumed: IntArray
+    ) {
         if (!isEnabled) return
         super.onNestedScroll(coordinatorLayout, child, target, dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed, type, consumed)
     }
 
-    override fun onNestedPreScroll(coordinatorLayout: CoordinatorLayout,
-                                   child: AppBarLayout,
-                                   target: View,
-                                   dx: Int,
-                                   dy: Int,
-                                   consumed: IntArray,
-                                   type: Int) {
+    override fun onNestedPreScroll(
+            coordinatorLayout: CoordinatorLayout,
+            child: AppBarLayout,
+            target: View,
+            dx: Int,
+            dy: Int,
+            consumed: IntArray,
+            type: Int
+    ) {
         if (!isEnabled) return
         super.onNestedPreScroll(coordinatorLayout, child, target, dx, dy, consumed, type)
     }
diff --git a/vector/src/main/java/im/vector/app/features/VectorFeatures.kt b/vector/src/main/java/im/vector/app/features/VectorFeatures.kt
index e3fded2824..6a7a0865de 100644
--- a/vector/src/main/java/im/vector/app/features/VectorFeatures.kt
+++ b/vector/src/main/java/im/vector/app/features/VectorFeatures.kt
@@ -26,6 +26,7 @@ interface VectorFeatures {
     fun isOnboardingUseCaseEnabled(): Boolean
     fun isOnboardingPersonalizeEnabled(): Boolean
     fun isOnboardingCombinedRegisterEnabled(): Boolean
+    fun isOnboardingCombinedLoginEnabled(): Boolean
     fun isScreenSharingEnabled(): Boolean
 
     enum class OnboardingVariant {
@@ -42,5 +43,6 @@ class DefaultVectorFeatures : VectorFeatures {
     override fun isOnboardingUseCaseEnabled() = true
     override fun isOnboardingPersonalizeEnabled() = false
     override fun isOnboardingCombinedRegisterEnabled() = false
+    override fun isOnboardingCombinedLoginEnabled() = false
     override fun isScreenSharingEnabled(): Boolean = true
 }
diff --git a/vector/src/main/java/im/vector/app/features/analytics/accountdata/AnalyticsAccountDataViewModel.kt b/vector/src/main/java/im/vector/app/features/analytics/accountdata/AnalyticsAccountDataViewModel.kt
index 221a9d8843..05358decc9 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/accountdata/AnalyticsAccountDataViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/accountdata/AnalyticsAccountDataViewModel.kt
@@ -37,7 +37,7 @@ import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.events.model.toModel
-import org.matrix.android.sdk.api.session.initsync.SyncStatusService
+import org.matrix.android.sdk.api.session.sync.SyncRequestState
 import org.matrix.android.sdk.flow.flow
 import timber.log.Timber
 import java.util.UUID
@@ -66,11 +66,11 @@ class AnalyticsAccountDataViewModel @AssistedInject constructor(
 
     private fun observeInitSync() {
         combine(
-                session.syncStatusService().getSyncStatusLive().asFlow(),
+                session.syncService().getSyncRequestStateLive().asFlow(),
                 analytics.getUserConsent(),
                 analytics.getAnalyticsId()
         ) { status, userConsent, analyticsId ->
-            if (status is SyncStatusService.Status.IncrementalSyncIdle &&
+            if (status is SyncRequestState.IncrementalSyncIdle &&
                     userConsent &&
                     analyticsId.isEmpty() &&
                     !checkDone) {
diff --git a/vector/src/main/java/im/vector/app/features/analytics/extensions/SignUpExt.kt b/vector/src/main/java/im/vector/app/features/analytics/extensions/SignUpExt.kt
new file mode 100644
index 0000000000..e63aafbfc4
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/analytics/extensions/SignUpExt.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.analytics.extensions
+
+import im.vector.app.features.analytics.plan.Signup
+import im.vector.app.features.onboarding.AuthenticationDescription
+
+fun AuthenticationDescription.AuthenticationType.toAnalyticsType() = when (this) {
+    AuthenticationDescription.AuthenticationType.Password -> Signup.AuthenticationType.Password
+    AuthenticationDescription.AuthenticationType.Apple    -> Signup.AuthenticationType.Apple
+    AuthenticationDescription.AuthenticationType.Facebook -> Signup.AuthenticationType.Facebook
+    AuthenticationDescription.AuthenticationType.GitHub -> Signup.AuthenticationType.GitHub
+    AuthenticationDescription.AuthenticationType.GitLab -> Signup.AuthenticationType.GitLab
+    AuthenticationDescription.AuthenticationType.Google -> Signup.AuthenticationType.Google
+    AuthenticationDescription.AuthenticationType.SSO      -> Signup.AuthenticationType.SSO
+    AuthenticationDescription.AuthenticationType.Other    -> Signup.AuthenticationType.Other
+}
diff --git a/vector/src/main/java/im/vector/app/features/analytics/plan/Interaction.kt b/vector/src/main/java/im/vector/app/features/analytics/plan/Interaction.kt
index 4e4bfe53be..deb9088259 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/plan/Interaction.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/plan/Interaction.kt
@@ -105,6 +105,12 @@ data class Interaction(
          */
         WebHomeExploreRoomsButton,
 
+        /**
+         * User clicked on the mini avatar uploader in the home page of Element
+         * Web/Desktop.
+         */
+        WebHomeMiniAvatarUploadButton,
+
         /**
          * User clicked the explore rooms button next to the search field at the
          * top of the left panel in Element Web/Desktop.
diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
index d1f0efae6c..c2eb5a29a8 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
@@ -51,9 +51,10 @@ private const val ANIMATION_DURATION = 250
  * It will return result through [Callback].
  */
 
-class AttachmentTypeSelectorView(context: Context,
-                                 inflater: LayoutInflater,
-                                 var callback: Callback?
+class AttachmentTypeSelectorView(
+        context: Context,
+        inflater: LayoutInflater,
+        var callback: Callback?
 ) : PopupWindow(context) {
 
     interface Callback {
diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
index 14324896bc..d5f65a4aef 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
@@ -96,10 +96,12 @@ class AttachmentsHelper(val context: Context, val callback: Callback) : Restorab
     /**
      * Starts the process for handling image/video capture. Can open a dialog
      */
-    fun openCamera(activity: Activity,
-                   vectorPreferences: VectorPreferences,
-                   cameraActivityResultLauncher: ActivityResultLauncher<Intent>,
-                   cameraVideoActivityResultLauncher: ActivityResultLauncher<Intent>) {
+    fun openCamera(
+            activity: Activity,
+            vectorPreferences: VectorPreferences,
+            cameraActivityResultLauncher: ActivityResultLauncher<Intent>,
+            cameraVideoActivityResultLauncher: ActivityResultLauncher<Intent>
+    ) {
         PhotoOrVideoDialog(activity, vectorPreferences).show(object : PhotoOrVideoDialog.PhotoOrVideoDialogListener {
             override fun takePhoto() {
                 captureUri = MultiPicker.get(MultiPicker.CAMERA).startWithExpectingFile(context, cameraActivityResultLauncher)
diff --git a/vector/src/main/java/im/vector/app/features/auth/ReAuthActivity.kt b/vector/src/main/java/im/vector/app/features/auth/ReAuthActivity.kt
index f92ec8ea9e..1e9ccd7243 100644
--- a/vector/src/main/java/im/vector/app/features/auth/ReAuthActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/auth/ReAuthActivity.kt
@@ -196,11 +196,13 @@ class ReAuthActivity : SimpleFragmentActivity() {
         const val RESULT_VALUE = "RESULT_VALUE"
         const val DEFAULT_RESULT_KEYSTORE_ALIAS = "ReAuthActivity"
 
-        fun newIntent(context: Context,
-                      fromError: RegistrationFlowResponse,
-                      lastErrorCode: String?,
-                      reasonTitle: String?,
-                      resultKeyStoreAlias: String = DEFAULT_RESULT_KEYSTORE_ALIAS): Intent {
+        fun newIntent(
+                context: Context,
+                fromError: RegistrationFlowResponse,
+                lastErrorCode: String?,
+                reasonTitle: String?,
+                resultKeyStoreAlias: String = DEFAULT_RESULT_KEYSTORE_ALIAS
+        ): Intent {
             val authType = when (fromError.nextUncompletedStage()) {
                 LoginFlowTypes.PASSWORD -> {
                     LoginFlowTypes.PASSWORD
diff --git a/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandPresenter.kt b/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandPresenter.kt
index 5e4528d381..497c5b5d51 100644
--- a/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandPresenter.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandPresenter.kt
@@ -30,7 +30,8 @@ class AutocompleteCommandPresenter @AssistedInject constructor(
         @Assisted val isInThreadTimeline: Boolean,
         context: Context,
         private val controller: AutocompleteCommandController,
-        private val vectorPreferences: VectorPreferences) :
+        private val vectorPreferences: VectorPreferences
+) :
         RecyclerViewPresenter<Command>(context), AutocompleteClickListener<Command> {
 
     @AssistedFactory
diff --git a/vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiPresenter.kt b/vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiPresenter.kt
index 4f272c7a24..2b83c1dc30 100644
--- a/vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiPresenter.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiPresenter.kt
@@ -28,9 +28,11 @@ import kotlinx.coroutines.cancelChildren
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
-class AutocompleteEmojiPresenter @Inject constructor(context: Context,
-                                                     private val emojiDataSource: EmojiDataSource,
-                                                     private val controller: AutocompleteEmojiController) :
+class AutocompleteEmojiPresenter @Inject constructor(
+        context: Context,
+        private val emojiDataSource: EmojiDataSource,
+        private val controller: AutocompleteEmojiController
+) :
         RecyclerViewPresenter<String>(context), AutocompleteClickListener<String> {
 
     private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
diff --git a/vector/src/main/java/im/vector/app/features/autocomplete/group/AutocompleteGroupPresenter.kt b/vector/src/main/java/im/vector/app/features/autocomplete/group/AutocompleteGroupPresenter.kt
index fc7479eb21..32a1bed1c6 100644
--- a/vector/src/main/java/im/vector/app/features/autocomplete/group/AutocompleteGroupPresenter.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/group/AutocompleteGroupPresenter.kt
@@ -26,9 +26,10 @@ import org.matrix.android.sdk.api.session.group.groupSummaryQueryParams
 import org.matrix.android.sdk.api.session.group.model.GroupSummary
 import javax.inject.Inject
 
-class AutocompleteGroupPresenter @Inject constructor(context: Context,
-                                                     private val controller: AutocompleteGroupController,
-                                                     private val session: Session
+class AutocompleteGroupPresenter @Inject constructor(
+        context: Context,
+        private val controller: AutocompleteGroupController,
+        private val session: Session
 ) : RecyclerViewPresenter<GroupSummary>(context), AutocompleteClickListener<GroupSummary> {
 
     init {
diff --git a/vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberPresenter.kt b/vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberPresenter.kt
index 88d015ec0c..a480b1c279 100644
--- a/vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberPresenter.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberPresenter.kt
@@ -36,10 +36,11 @@ import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.util.MatrixItem
 
-class AutocompleteMemberPresenter @AssistedInject constructor(context: Context,
-                                                              @Assisted val roomId: String,
-                                                              private val session: Session,
-                                                              private val controller: AutocompleteMemberController
+class AutocompleteMemberPresenter @AssistedInject constructor(
+        context: Context,
+        @Assisted val roomId: String,
+        private val session: Session,
+        private val controller: AutocompleteMemberController
 ) : RecyclerViewPresenter<AutocompleteMemberItem>(context), AutocompleteClickListener<AutocompleteMemberItem> {
 
     /* ==========================================================================================
diff --git a/vector/src/main/java/im/vector/app/features/autocomplete/room/AutocompleteRoomPresenter.kt b/vector/src/main/java/im/vector/app/features/autocomplete/room/AutocompleteRoomPresenter.kt
index d9310e295d..2d61508796 100644
--- a/vector/src/main/java/im/vector/app/features/autocomplete/room/AutocompleteRoomPresenter.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/room/AutocompleteRoomPresenter.kt
@@ -26,9 +26,10 @@ import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import javax.inject.Inject
 
-class AutocompleteRoomPresenter @Inject constructor(context: Context,
-                                                    private val controller: AutocompleteRoomController,
-                                                    private val session: Session
+class AutocompleteRoomPresenter @Inject constructor(
+        context: Context,
+        private val controller: AutocompleteRoomController,
+        private val session: Session
 ) : RecyclerViewPresenter<RoomSummary>(context), AutocompleteClickListener<RoomSummary> {
 
     init {
diff --git a/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt b/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt
index a904658e9c..daafecc643 100644
--- a/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt
@@ -706,13 +706,15 @@ class VectorCallActivity : VectorBaseActivity<ActivityCallBinding>(), CallContro
             }
         }
 
-        fun newIntent(context: Context,
-                      callId: String,
-                      signalingRoomId: String,
-                      otherUserId: String,
-                      isIncomingCall: Boolean,
-                      isVideoCall: Boolean,
-                      mode: String?): Intent {
+        fun newIntent(
+                context: Context,
+                callId: String,
+                signalingRoomId: String,
+                otherUserId: String,
+                isIncomingCall: Boolean,
+                isVideoCall: Boolean,
+                mode: String?
+        ): Intent {
             val callArgs = CallArgs(signalingRoomId, callId, otherUserId, isIncomingCall, isVideoCall)
             return Intent(context, VectorCallActivity::class.java).apply {
                 // what could be the best flags?
diff --git a/vector/src/main/java/im/vector/app/features/call/audio/API21AudioDeviceDetector.kt b/vector/src/main/java/im/vector/app/features/call/audio/API21AudioDeviceDetector.kt
index 15d213e017..1c7dcd841d 100644
--- a/vector/src/main/java/im/vector/app/features/call/audio/API21AudioDeviceDetector.kt
+++ b/vector/src/main/java/im/vector/app/features/call/audio/API21AudioDeviceDetector.kt
@@ -30,9 +30,10 @@ import timber.log.Timber
 
 private val loggerTag = LoggerTag("API21AudioDeviceDetector", LoggerTag.VOIP)
 
-internal class API21AudioDeviceDetector(private val context: Context,
-                                        private val audioManager: AudioManager,
-                                        private val callAudioManager: CallAudioManager
+internal class API21AudioDeviceDetector(
+        private val context: Context,
+        private val audioManager: AudioManager,
+        private val callAudioManager: CallAudioManager
 ) : CallAudioManager.AudioDeviceDetector, WiredHeadsetStateReceiver.HeadsetEventListener, BluetoothHeadsetReceiver.EventListener {
 
     private var bluetoothAdapter: BluetoothAdapter? = null
diff --git a/vector/src/main/java/im/vector/app/features/call/audio/API23AudioDeviceDetector.kt b/vector/src/main/java/im/vector/app/features/call/audio/API23AudioDeviceDetector.kt
index ccf79cc02d..f4e7687d39 100644
--- a/vector/src/main/java/im/vector/app/features/call/audio/API23AudioDeviceDetector.kt
+++ b/vector/src/main/java/im/vector/app/features/call/audio/API23AudioDeviceDetector.kt
@@ -23,8 +23,9 @@ import androidx.annotation.RequiresApi
 import timber.log.Timber
 
 @RequiresApi(Build.VERSION_CODES.M)
-internal class API23AudioDeviceDetector(private val audioManager: AudioManager,
-                                        private val callAudioManager: CallAudioManager
+internal class API23AudioDeviceDetector(
+        private val audioManager: AudioManager,
+        private val callAudioManager: CallAudioManager
 ) : CallAudioManager.AudioDeviceDetector {
 
     private val onAudioDeviceChangeRunner = Runnable {
@@ -45,13 +46,15 @@ internal class API23AudioDeviceDetector(private val audioManager: AudioManager,
     }
     private val audioDeviceCallback: AudioDeviceCallback = object : AudioDeviceCallback() {
         override fun onAudioDevicesAdded(
-                addedDevices: Array<AudioDeviceInfo>) {
+                addedDevices: Array<AudioDeviceInfo>
+        ) {
             Timber.d(" Audio devices added")
             onAudioDeviceChange()
         }
 
         override fun onAudioDevicesRemoved(
-                removedDevices: Array<AudioDeviceInfo>) {
+                removedDevices: Array<AudioDeviceInfo>
+        ) {
             Timber.d(" Audio devices removed")
             onAudioDeviceChange()
         }
diff --git a/vector/src/main/java/im/vector/app/features/call/audio/DefaultAudioDeviceRouter.kt b/vector/src/main/java/im/vector/app/features/call/audio/DefaultAudioDeviceRouter.kt
index c3500c7bc2..8b1c4ded7c 100644
--- a/vector/src/main/java/im/vector/app/features/call/audio/DefaultAudioDeviceRouter.kt
+++ b/vector/src/main/java/im/vector/app/features/call/audio/DefaultAudioDeviceRouter.kt
@@ -22,8 +22,9 @@ import androidx.media.AudioFocusRequestCompat
 import androidx.media.AudioManagerCompat
 import timber.log.Timber
 
-class DefaultAudioDeviceRouter(private val audioManager: AudioManager,
-                               private val callAudioManager: CallAudioManager
+class DefaultAudioDeviceRouter(
+        private val audioManager: AudioManager,
+        private val callAudioManager: CallAudioManager
 ) : CallAudioManager.AudioDeviceRouter, AudioManager.OnAudioFocusChangeListener {
 
     private var audioFocusLost = false
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/ConferenceEvent.kt b/vector/src/main/java/im/vector/app/features/call/conference/ConferenceEvent.kt
index 0d8e538eca..6474825fa2 100644
--- a/vector/src/main/java/im/vector/app/features/call/conference/ConferenceEvent.kt
+++ b/vector/src/main/java/im/vector/app/features/call/conference/ConferenceEvent.kt
@@ -49,8 +49,10 @@ class ConferenceEventEmitter(private val context: Context) {
     }
 }
 
-class ConferenceEventObserver(private val context: Context,
-                              private val onBroadcastEvent: (ConferenceEvent) -> Unit) :
+class ConferenceEventObserver(
+        private val context: Context,
+        private val onBroadcastEvent: (ConferenceEvent) -> Unit
+) :
         DefaultLifecycleObserver {
 
     // See https://jitsi.github.io/handbook/docs/dev-guide/dev-guide-android-sdk#listening-for-broadcasted-events
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewActions.kt b/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewActions.kt
index 7c9b9385f9..be0d8775d6 100644
--- a/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewActions.kt
+++ b/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewActions.kt
@@ -19,8 +19,10 @@ package im.vector.app.features.call.conference
 import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class JitsiCallViewActions : VectorViewModelAction {
-    data class SwitchTo(val args: VectorJitsiActivity.Args,
-                        val withConfirmation: Boolean) : JitsiCallViewActions()
+    data class SwitchTo(
+            val args: VectorJitsiActivity.Args,
+            val withConfirmation: Boolean
+    ) : JitsiCallViewActions()
 
     /**
      * The ViewModel will either ask the View to finish, or to join another conf.
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
index 5a12337e4f..be917c61b2 100644
--- a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
@@ -138,8 +138,10 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
                 .show()
     }
 
-    override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean,
-                                               newConfig: Configuration) {
+    override fun onPictureInPictureModeChanged(
+            isInPictureInPictureMode: Boolean,
+            newConfig: Configuration
+    ) {
         super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
         checkIfActivityShouldBeFinished()
         Timber.w("onPictureInPictureModeChanged($isInPictureInPictureMode)")
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/jwt/JitsiJWTFactory.kt b/vector/src/main/java/im/vector/app/features/call/conference/jwt/JitsiJWTFactory.kt
index 39b87c5d63..8809606e6e 100644
--- a/vector/src/main/java/im/vector/app/features/call/conference/jwt/JitsiJWTFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/call/conference/jwt/JitsiJWTFactory.kt
@@ -29,11 +29,13 @@ class JitsiJWTFactory @Inject constructor() {
      * Create a JWT token for jitsi openidtoken-jwt authentication
      * See https://github.com/matrix-org/prosody-mod-auth-matrix-user-verification
      */
-    fun create(openIdToken: OpenIdToken,
-               jitsiServerDomain: String,
-               roomId: String,
-               userAvatarUrl: String,
-               userDisplayName: String): String {
+    fun create(
+            openIdToken: OpenIdToken,
+            jitsiServerDomain: String,
+            roomId: String,
+            userAvatarUrl: String,
+            userDisplayName: String
+    ): String {
         // The secret key here is irrelevant, we're only using the JWT to transport data to Prosody in the Jitsi stack.
         val key = Keys.secretKeyFor(SignatureAlgorithm.HS256)
         val context = mapOf(
diff --git a/vector/src/main/java/im/vector/app/features/call/dialpad/DialPadFragment.kt b/vector/src/main/java/im/vector/app/features/call/dialpad/DialPadFragment.kt
index 606ba1d1e9..05337e2064 100644
--- a/vector/src/main/java/im/vector/app/features/call/dialpad/DialPadFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/call/dialpad/DialPadFragment.kt
@@ -73,7 +73,8 @@ class DialPadFragment : Fragment(), TextWatcher {
     override fun onCreateView(
             inflater: LayoutInflater,
             container: ViewGroup?,
-            savedInstanceState: Bundle?): View {
+            savedInstanceState: Bundle?
+    ): View {
         initArgs(savedInstanceState)
         val view = inflater.inflate(R.layout.dialpad_fragment, container, false)
         view.setBackgroundColor(ThemeUtils.getColor(requireContext(), R.attr.backgroundColor))
diff --git a/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferViewModel.kt b/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferViewModel.kt
index 67f0949dcf..189b1ab2a7 100644
--- a/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferViewModel.kt
@@ -29,8 +29,10 @@ import im.vector.app.features.call.webrtc.WebRtcCallManager
 import org.matrix.android.sdk.api.session.call.CallState
 import org.matrix.android.sdk.api.session.call.MxCall
 
-class CallTransferViewModel @AssistedInject constructor(@Assisted initialState: CallTransferViewState,
-                                                        private val callManager: WebRtcCallManager) :
+class CallTransferViewModel @AssistedInject constructor(
+        @Assisted initialState: CallTransferViewState,
+        private val callManager: WebRtcCallManager
+) :
         VectorViewModel<CallTransferViewState, EmptyAction, CallTransferViewEvents>(initialState) {
 
     @AssistedFactory
diff --git a/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt b/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
index 5f50747d77..fa991501ea 100644
--- a/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
+++ b/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
@@ -273,7 +273,7 @@ class WebRtcCallManager @Inject constructor(
             // did we start background sync? so we should stop it
             if (isInBackground) {
                 if (FcmHelper.isPushSupported()) {
-                    currentSession?.stopAnyBackgroundSync()
+                    currentSession?.syncService()?.stopAnyBackgroundSync()
                 } else {
                     // for fdroid we should not stop, it should continue syncing
                     // maybe we should restore default timeout/delay though?
@@ -380,7 +380,7 @@ class WebRtcCallManager @Inject constructor(
         if (isInBackground) {
             if (FcmHelper.isPushSupported()) {
                 // only for push version as fdroid version is already doing it?
-                currentSession?.startAutomaticBackgroundSync(30, 0)
+                currentSession?.syncService()?.startAutomaticBackgroundSync(30, 0)
             } else {
                 // Maybe increase sync freq? but how to set back to default values?
             }
diff --git a/vector/src/main/java/im/vector/app/features/command/Command.kt b/vector/src/main/java/im/vector/app/features/command/Command.kt
index 24b4ed5300..20c8f9d8fe 100644
--- a/vector/src/main/java/im/vector/app/features/command/Command.kt
+++ b/vector/src/main/java/im/vector/app/features/command/Command.kt
@@ -24,12 +24,14 @@ import im.vector.app.R
  * The user can write theses messages to perform some actions.
  * The list will be displayed in this order.
  */
-enum class Command(val command: String,
-                   val aliases: Array<CharSequence>?,
-                   val parameters: String,
-                   @StringRes val description: Int,
-                   val isDevCommand: Boolean,
-                   val isThreadCommand: Boolean) {
+enum class Command(
+        val command: String,
+        val aliases: Array<CharSequence>?,
+        val parameters: String,
+        @StringRes val description: Int,
+        val isDevCommand: Boolean,
+        val isThreadCommand: Boolean
+) {
     EMOTE("/me", null, "<message>", R.string.command_description_emote, false, true),
     BAN_USER("/ban", null, "<user-id> [reason]", R.string.command_description_ban_user, false, false),
     UNBAN_USER("/unban", null, "<user-id> [reason]", R.string.command_description_unban_user, false, false),
diff --git a/vector/src/main/java/im/vector/app/features/consent/ConsentNotGivenHelper.kt b/vector/src/main/java/im/vector/app/features/consent/ConsentNotGivenHelper.kt
index 463954dff7..d2bb6b78b0 100644
--- a/vector/src/main/java/im/vector/app/features/consent/ConsentNotGivenHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/consent/ConsentNotGivenHelper.kt
@@ -24,8 +24,10 @@ import im.vector.app.core.platform.Restorable
 import im.vector.app.features.webview.VectorWebViewActivity
 import im.vector.app.features.webview.WebViewMode
 
-class ConsentNotGivenHelper(private val activity: Activity,
-                            private val dialogLocker: DialogLocker) :
+class ConsentNotGivenHelper(
+        private val activity: Activity,
+        private val dialogLocker: DialogLocker
+) :
         Restorable by dialogLocker {
 
     /* ==========================================================================================
diff --git a/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookController.kt b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookController.kt
index 219be0abeb..2530e9c867 100644
--- a/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookController.kt
+++ b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookController.kt
@@ -35,7 +35,8 @@ import javax.inject.Inject
 class ContactsBookController @Inject constructor(
         private val stringProvider: StringProvider,
         private val avatarRenderer: AvatarRenderer,
-        private val errorFormatter: ErrorFormatter) : EpoxyController() {
+        private val errorFormatter: ErrorFormatter
+) : EpoxyController() {
 
     private var state: ContactsBookViewState? = null
 
diff --git a/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookFragment.kt b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookFragment.kt
index 7425e0ae8a..8cd7f2de45 100644
--- a/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookFragment.kt
@@ -70,7 +70,7 @@ class ContactsBookFragment @Inject constructor(
                 .allowBack(useCross = true)
         contactsBookViewModel.observeViewEvents {
             when (it) {
-                is ContactsBookViewEvents.Failure             -> showFailure(it.throwable)
+                is ContactsBookViewEvents.Failure -> showFailure(it.throwable)
                 is ContactsBookViewEvents.OnPoliciesRetrieved -> showConsentDialog(it)
             }
         }
diff --git a/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt
index d016558764..402fc40c9a 100644
--- a/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt
@@ -160,10 +160,10 @@ class ContactsBookViewModel @AssistedInject constructor(
 
     override fun handle(action: ContactsBookAction) {
         when (action) {
-            is ContactsBookAction.FilterWith        -> handleFilterWith(action)
+            is ContactsBookAction.FilterWith -> handleFilterWith(action)
             is ContactsBookAction.OnlyBoundContacts -> handleOnlyBoundContacts(action)
-            ContactsBookAction.UserConsentGranted   -> handleUserConsentGranted()
-            ContactsBookAction.UserConsentRequest   -> handleUserConsentRequest()
+            ContactsBookAction.UserConsentGranted -> handleUserConsentGranted()
+            ContactsBookAction.UserConsentRequest -> handleUserConsentRequest()
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keys/KeysImporter.kt b/vector/src/main/java/im/vector/app/features/crypto/keys/KeysImporter.kt
index 4b27111851..b360055bc9 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keys/KeysImporter.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keys/KeysImporter.kt
@@ -33,9 +33,11 @@ class KeysImporter @Inject constructor(
     /**
      * Import keys from provided Uri.
      */
-    suspend fun import(uri: Uri,
-                       mimetype: String?,
-                       password: String): ImportRoomKeysResult {
+    suspend fun import(
+            uri: Uri,
+            mimetype: String?,
+            password: String
+    ): ImportRoomKeysResult {
         return withContext(Dispatchers.IO) {
             val resource = openResource(context, uri, mimetype ?: getMimeTypeFromUri(context, uri))
             val stream = resource?.mContentStream ?: throw Exception("Error")
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt
index a8c3f41efe..df24666285 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt
@@ -83,7 +83,7 @@ class KeysBackupRestoreSharedViewModel @Inject constructor(
     val progressObserver = object : StepProgressListener {
         override fun onStepProgress(step: StepProgressListener.Step) {
             when (step) {
-                is StepProgressListener.Step.ComputingKey  -> {
+                is StepProgressListener.Step.ComputingKey -> {
                     loadingEvent.postValue(
                             WaitingViewData(
                                     stringProvider.getString(R.string.keys_backup_restoring_waiting_message) +
@@ -102,7 +102,7 @@ class KeysBackupRestoreSharedViewModel @Inject constructor(
                             )
                     )
                 }
-                is StepProgressListener.Step.ImportingKey  -> {
+                is StepProgressListener.Step.ImportingKey -> {
                     Timber.d("backupKeys.ImportingKey.progress: ${step.progress}")
                     // Progress 0 can take a while, display an indeterminate progress in this case
                     if (step.progress == 0) {
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt
index 7c1105277b..8d43b72ad9 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt
@@ -23,8 +23,10 @@ import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupState
 import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupVersionTrust
 import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysVersionResult
 
-data class KeysBackupSettingViewState(val keysBackupVersionTrust: Async<KeysBackupVersionTrust> = Uninitialized,
-                                      val keysBackupState: KeysBackupState? = null,
-                                      val keysBackupVersion: KeysVersionResult? = null,
-                                      val deleteBackupRequest: Async<Unit> = Uninitialized) :
+data class KeysBackupSettingViewState(
+        val keysBackupVersionTrust: Async<KeysBackupVersionTrust> = Uninitialized,
+        val keysBackupState: KeysBackupState? = null,
+        val keysBackupVersion: KeysVersionResult? = null,
+        val deleteBackupRequest: Async<Unit> = Uninitialized
+) :
         MavericksState
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt
index b47b84af71..70acf9d30e 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt
@@ -41,8 +41,9 @@ import org.matrix.android.sdk.api.util.awaitCallback
 import org.matrix.android.sdk.api.util.toBase64NoPadding
 import timber.log.Timber
 
-class KeysBackupSettingsViewModel @AssistedInject constructor(@Assisted initialState: KeysBackupSettingViewState,
-                                                              private val session: Session
+class KeysBackupSettingsViewModel @AssistedInject constructor(
+        @Assisted initialState: KeysBackupSettingViewState,
+        private val session: Session
 ) : VectorViewModel<KeysBackupSettingViewState, KeyBackupSettingsAction, KeysBackupViewEvents>(initialState),
         KeysBackupStateListener {
 
@@ -60,7 +61,7 @@ class KeysBackupSettingsViewModel @AssistedInject constructor(@Assisted initialS
     init {
         setState {
             this.copy(
-                    keysBackupState = keysBackupService.state,
+                    keysBackupState = keysBackupService.getState(),
                     keysBackupVersion = keysBackupService.keysBackupVersion
             )
         }
@@ -206,7 +207,7 @@ class KeysBackupSettingsViewModel @AssistedInject constructor(@Assisted initialS
     }
 
     fun canExit(): Boolean {
-        val currentBackupState = keysBackupService.state
+        val currentBackupState = keysBackupService.getState()
 
         return currentBackupState == KeysBackupState.Unknown ||
                 currentBackupState == KeysBackupState.CheckingBackUpOnHomeserver
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysrequest/KeyRequestHandler.kt b/vector/src/main/java/im/vector/app/features/crypto/keysrequest/KeyRequestHandler.kt
index 034c667aac..b234b3109b 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysrequest/KeyRequestHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysrequest/KeyRequestHandler.kt
@@ -143,12 +143,14 @@ class KeyRequestHandler @Inject constructor(
         })
     }
 
-    private fun postAlert(context: Context,
-                          userId: String,
-                          deviceId: String,
-                          wasNewDevice: Boolean,
-                          deviceInfo: CryptoDeviceInfo?,
-                          moreInfo: DeviceInfo? = null) {
+    private fun postAlert(
+            context: Context,
+            userId: String,
+            deviceId: String,
+            wasNewDevice: Boolean,
+            deviceInfo: CryptoDeviceInfo?,
+            moreInfo: DeviceInfo? = null
+    ) {
         val deviceName = if (deviceInfo!!.displayName().isNullOrEmpty()) deviceInfo.deviceId else deviceInfo.displayName()
         val dialogText: String?
 
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysrequest/OutboundSessionKeySharingStrategy.kt b/vector/src/main/java/im/vector/app/features/crypto/keysrequest/OutboundSessionKeySharingStrategy.kt
index 2018a5b053..5396ce908e 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysrequest/OutboundSessionKeySharingStrategy.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysrequest/OutboundSessionKeySharingStrategy.kt
@@ -19,6 +19,7 @@ package im.vector.app.features.crypto.keysrequest
 enum class OutboundSessionKeySharingStrategy {
     /**
      * Keys will be sent for the first time when the first message is sent.
+     * This is handled by the Matrix SDK so there's no need to do it in Vector.
      */
     WhenSendingEvent,
 
diff --git a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt
index 40ad2859fe..ed3e6a146b 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt
@@ -149,10 +149,12 @@ class SharedSecureStorageActivity :
         const val EXTRA_DATA_RESET = "EXTRA_DATA_RESET"
         const val DEFAULT_RESULT_KEYSTORE_ALIAS = "SharedSecureStorageActivity"
 
-        fun newReadIntent(context: Context,
-                          keyId: String? = null,
-                          requestedSecrets: List<String>,
-                          resultKeyStoreAlias: String = DEFAULT_RESULT_KEYSTORE_ALIAS): Intent {
+        fun newReadIntent(
+                context: Context,
+                keyId: String? = null,
+                requestedSecrets: List<String>,
+                resultKeyStoreAlias: String = DEFAULT_RESULT_KEYSTORE_ALIAS
+        ): Intent {
             require(requestedSecrets.isNotEmpty())
             return Intent(context, SharedSecureStorageActivity::class.java).also {
                 it.putExtra(
@@ -166,10 +168,12 @@ class SharedSecureStorageActivity :
             }
         }
 
-        fun newWriteIntent(context: Context,
-                           keyId: String? = null,
-                           writeSecrets: List<Pair<String, String>>,
-                           resultKeyStoreAlias: String = DEFAULT_RESULT_KEYSTORE_ALIAS): Intent {
+        fun newWriteIntent(
+                context: Context,
+                keyId: String? = null,
+                writeSecrets: List<Pair<String, String>>,
+                resultKeyStoreAlias: String = DEFAULT_RESULT_KEYSTORE_ALIAS
+        ): Intent {
             require(writeSecrets.isNotEmpty())
             return Intent(context, SharedSecureStorageActivity::class.java).also {
                 it.putExtra(
diff --git a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt
index e045ac020d..222c392e53 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt
@@ -41,8 +41,8 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.securestorage.IntegrityResult
 import org.matrix.android.sdk.api.session.securestorage.KeyInfo
 import org.matrix.android.sdk.api.session.securestorage.KeyInfoResult
+import org.matrix.android.sdk.api.session.securestorage.KeyRef
 import org.matrix.android.sdk.api.session.securestorage.RawBytesKeySpec
-import org.matrix.android.sdk.api.session.securestorage.SharedSecretStorageService
 import org.matrix.android.sdk.api.util.toBase64NoPadding
 import org.matrix.android.sdk.flow.flow
 import timber.log.Timber
@@ -86,7 +86,8 @@ data class SharedSecureStorageViewState(
 class SharedSecureStorageViewModel @AssistedInject constructor(
         @Assisted private val initialState: SharedSecureStorageViewState,
         private val stringProvider: StringProvider,
-        private val session: Session) :
+        private val session: Session
+) :
         VectorViewModel<SharedSecureStorageViewState, SharedSecureStorageAction, SharedSecureStorageViewEvent>(initialState) {
 
     @AssistedFactory
@@ -283,7 +284,7 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
                     session.sharedSecretStorageService().storeSecret(
                             name = name,
                             secretBase64 = value,
-                            keys = listOf(SharedSecretStorageService.KeyRef(keyInfo.id, keySpec))
+                            keys = listOf(KeyRef(keyInfo.id, keySpec))
                     )
                     decryptedSecretMap[name] = value
                 }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BackupToQuadSMigrationTask.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BackupToQuadSMigrationTask.kt
index e620500d70..5d866c7220 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BackupToQuadSMigrationTask.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BackupToQuadSMigrationTask.kt
@@ -26,8 +26,8 @@ import org.matrix.android.sdk.api.session.crypto.crosssigning.KEYBACKUP_SECRET_S
 import org.matrix.android.sdk.api.session.crypto.keysbackup.computeRecoveryKey
 import org.matrix.android.sdk.api.session.crypto.keysbackup.extractCurveKeyFromRecoveryKey
 import org.matrix.android.sdk.api.session.securestorage.EmptyKeySigner
+import org.matrix.android.sdk.api.session.securestorage.KeyRef
 import org.matrix.android.sdk.api.session.securestorage.RawBytesKeySpec
-import org.matrix.android.sdk.api.session.securestorage.SharedSecretStorageService
 import org.matrix.android.sdk.api.session.securestorage.SsssKeyCreationInfo
 import org.matrix.android.sdk.api.util.awaitCallback
 import org.matrix.android.sdk.api.util.toBase64NoPadding
@@ -142,7 +142,7 @@ class BackupToQuadSMigrationTask @Inject constructor(
             quadS.storeSecret(
                     KEYBACKUP_SECRET_SSSS_NAME,
                     curveKey.toBase64NoPadding(),
-                    listOf(SharedSecretStorageService.KeyRef(info.keyId, info.keySpec))
+                    listOf(KeyRef(info.keyId, info.keySpec))
             )
 
             // save for gossiping
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt
index c26aec45dd..c7c367f5ec 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt
@@ -34,7 +34,7 @@ import org.matrix.android.sdk.api.session.crypto.keysbackup.MegolmBackupCreation
 import org.matrix.android.sdk.api.session.crypto.keysbackup.extractCurveKeyFromRecoveryKey
 import org.matrix.android.sdk.api.session.crypto.keysbackup.toKeysVersionResult
 import org.matrix.android.sdk.api.session.securestorage.EmptyKeySigner
-import org.matrix.android.sdk.api.session.securestorage.SharedSecretStorageService
+import org.matrix.android.sdk.api.session.securestorage.KeyRef
 import org.matrix.android.sdk.api.session.securestorage.SsssKeyCreationInfo
 import org.matrix.android.sdk.api.session.securestorage.SsssKeySpec
 import org.matrix.android.sdk.api.util.awaitCallback
@@ -67,6 +67,7 @@ data class Params(
         val progressListener: BootstrapProgressListener? = null,
         val passphrase: String?,
         val keySpec: SsssKeySpec? = null,
+        val forceResetIfSomeSecretsAreMissing: Boolean = false,
         val setupMode: SetupMode
 )
 
@@ -83,6 +84,7 @@ class BootstrapCrossSigningTask @Inject constructor(
         // Ensure cross-signing is initialized. Due to migration it is maybe not always correctly initialized
 
         val shouldSetCrossSigning = !crossSigningService.isCrossSigningInitialized() ||
+                (params.forceResetIfSomeSecretsAreMissing && !crossSigningService.allPrivateKeysKnown()) ||
                 (params.setupMode == SetupMode.PASSPHRASE_AND_NEEDED_SECRETS_RESET && !crossSigningService.allPrivateKeysKnown()) ||
                 (params.setupMode == SetupMode.HARD_RESET)
         if (shouldSetCrossSigning) {
@@ -183,7 +185,7 @@ class BootstrapCrossSigningTask @Inject constructor(
             ssssService.storeSecret(
                     MASTER_KEY_SSSS_NAME,
                     mskPrivateKey,
-                    listOf(SharedSecretStorageService.KeyRef(keyInfo.keyId, keyInfo.keySpec))
+                    listOf(KeyRef(keyInfo.keyId, keyInfo.keySpec))
             )
             params.progressListener?.onProgress(
                     WaitingViewData(
@@ -195,7 +197,7 @@ class BootstrapCrossSigningTask @Inject constructor(
             ssssService.storeSecret(
                     USER_SIGNING_KEY_SSSS_NAME,
                     uskPrivateKey,
-                    listOf(SharedSecretStorageService.KeyRef(keyInfo.keyId, keyInfo.keySpec))
+                    listOf(KeyRef(keyInfo.keyId, keyInfo.keySpec))
             )
             params.progressListener?.onProgress(
                     WaitingViewData(
@@ -206,7 +208,7 @@ class BootstrapCrossSigningTask @Inject constructor(
             ssssService.storeSecret(
                     SELF_SIGNING_KEY_SSSS_NAME,
                     sskPrivateKey,
-                    listOf(SharedSecretStorageService.KeyRef(keyInfo.keyId, keyInfo.keySpec))
+                    listOf(KeyRef(keyInfo.keyId, keyInfo.keySpec))
             )
         } catch (failure: Failure) {
             Timber.e("## BootstrapCrossSigningTask: Creating 4S - Failed to store keys <${failure.localizedMessage}>")
@@ -258,7 +260,7 @@ class BootstrapCrossSigningTask @Inject constructor(
                     ssssService.storeSecret(
                             KEYBACKUP_SECRET_SSSS_NAME,
                             secret,
-                            listOf(SharedSecretStorageService.KeyRef(keyInfo.keyId, keyInfo.keySpec))
+                            listOf(KeyRef(keyInfo.keyId, keyInfo.keySpec))
                     )
                 }
             } else {
@@ -275,7 +277,7 @@ class BootstrapCrossSigningTask @Inject constructor(
                             ssssService.storeSecret(
                                     KEYBACKUP_SECRET_SSSS_NAME,
                                     secret,
-                                    listOf(SharedSecretStorageService.KeyRef(keyInfo.keyId, keyInfo.keySpec))
+                                    listOf(KeyRef(keyInfo.keyId, keyInfo.keySpec))
                             )
                         }
                     } else {
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt
index 3be2f020b8..3d078a82ed 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt
@@ -26,6 +26,7 @@ import com.airbnb.mvrx.withState
 import im.vector.app.R
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentBootstrapSetupRecoveryBinding
+import im.vector.app.features.raw.wellknown.SecureBackupMethod
 import javax.inject.Inject
 
 class BootstrapSetupRecoveryKeyFragment @Inject constructor() :
@@ -55,27 +56,40 @@ class BootstrapSetupRecoveryKeyFragment @Inject constructor() :
     }
 
     override fun invalidate() = withState(sharedViewModel) { state ->
-        if (state.step is BootstrapStep.FirstForm) {
-            if (state.step.keyBackUpExist) {
-                // Display the set up action
-                views.bootstrapSetupSecureSubmit.isVisible = true
-                views.bootstrapSetupSecureUseSecurityKey.isVisible = false
-                views.bootstrapSetupSecureUseSecurityPassphrase.isVisible = false
-                views.bootstrapSetupSecureUseSecurityPassphraseSeparator.isVisible = false
-            } else {
-                if (state.step.reset) {
-                    views.bootstrapSetupSecureText.text = getString(R.string.reset_secure_backup_title)
-                    views.bootstrapSetupWarningTextView.isVisible = true
-                } else {
-                    views.bootstrapSetupSecureText.text = getString(R.string.bottom_sheet_setup_secure_backup_subtitle)
-                    views.bootstrapSetupWarningTextView.isVisible = false
-                }
-                // Choose between create a passphrase or use a recovery key
-                views.bootstrapSetupSecureSubmit.isVisible = false
-                views.bootstrapSetupSecureUseSecurityKey.isVisible = true
-                views.bootstrapSetupSecureUseSecurityPassphrase.isVisible = true
-                views.bootstrapSetupSecureUseSecurityPassphraseSeparator.isVisible = true
-            }
+        val firstFormStep = state.step as? BootstrapStep.FirstForm ?: return@withState
+
+        if (firstFormStep.keyBackUpExist) {
+            renderStateWithExistingKeyBackup()
+        } else {
+            renderSetupHeader(needsReset = firstFormStep.reset)
+            views.bootstrapSetupSecureSubmit.isVisible = false
+
+            // Choose between create a passphrase or use a recovery key
+            renderBackupMethodActions(firstFormStep.methods)
         }
     }
+
+    private fun renderStateWithExistingKeyBackup() = with(views) {
+        // Display the set up action
+        bootstrapSetupSecureSubmit.isVisible = true
+        // Disable creating backup / passphrase options
+        bootstrapSetupSecureUseSecurityKey.isVisible = false
+        bootstrapSetupSecureUseSecurityPassphrase.isVisible = false
+        bootstrapSetupSecureUseSecurityPassphraseSeparator.isVisible = false
+    }
+
+    private fun renderSetupHeader(needsReset: Boolean) = with(views) {
+        bootstrapSetupSecureText.text = if (needsReset) {
+            getString(R.string.reset_secure_backup_title)
+        } else {
+            getString(R.string.bottom_sheet_setup_secure_backup_subtitle)
+        }
+        bootstrapSetupWarningTextView.isVisible = needsReset
+    }
+
+    private fun renderBackupMethodActions(method: SecureBackupMethod) = with(views) {
+        bootstrapSetupSecureUseSecurityKey.isVisible = method.isKeyAvailable
+        bootstrapSetupSecureUseSecurityPassphrase.isVisible = method.isPassphraseAvailable
+        bootstrapSetupSecureUseSecurityPassphraseSeparator.isVisible = method.isPassphraseAvailable
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
index b67970e61f..15ea90ae0a 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
@@ -33,6 +33,10 @@ import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.platform.WaitingViewData
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.auth.ReAuthActivity
+import im.vector.app.features.raw.wellknown.SecureBackupMethod
+import im.vector.app.features.raw.wellknown.getElementWellknown
+import im.vector.app.features.raw.wellknown.isSecureBackupRequired
+import im.vector.app.features.raw.wellknown.secureBackupMethod
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.auth.UIABaseAuth
@@ -41,7 +45,9 @@ import org.matrix.android.sdk.api.auth.UserPasswordAuth
 import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
 import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse
 import org.matrix.android.sdk.api.auth.registration.nextUncompletedStage
+import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.raw.RawService
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupLastVersionResult
 import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysVersionResult
@@ -61,6 +67,7 @@ class BootstrapSharedViewModel @AssistedInject constructor(
         private val stringProvider: StringProvider,
         private val errorFormatter: ErrorFormatter,
         private val session: Session,
+        private val rawService: RawService,
         private val bootstrapTask: BootstrapCrossSigningTask,
         private val migrationTask: BackupToQuadSMigrationTask,
 ) : VectorViewModel<BootstrapViewState, BootstrapActions, BootstrapViewEvents>(initialState) {
@@ -83,12 +90,33 @@ class BootstrapSharedViewModel @AssistedInject constructor(
 
     init {
 
+        setState {
+            copy(step = BootstrapStep.CheckingMigration, isRecoverySetup = session.sharedSecretStorageService().isRecoverySetup())
+        }
+
+        // Refresh the well-known configuration
+        viewModelScope.launch(Dispatchers.IO) {
+            val wellKnown = rawService.getElementWellknown(session.sessionParams)
+            setState {
+                copy(
+                        isSecureBackupRequired = wellKnown?.isSecureBackupRequired().orFalse(),
+                        secureBackupMethod = wellKnown?.secureBackupMethod() ?: SecureBackupMethod.KEY_OR_PASSPHRASE,
+                )
+            }
+        }
+
         when (initialState.setupMode) {
             SetupMode.PASSPHRASE_RESET,
             SetupMode.PASSPHRASE_AND_NEEDED_SECRETS_RESET,
             SetupMode.HARD_RESET         -> {
                 setState {
-                    copy(step = BootstrapStep.FirstForm(keyBackUpExist = false, reset = true))
+                    copy(
+                            step = BootstrapStep.FirstForm(
+                                keyBackUpExist = false,
+                                reset = session.sharedSecretStorageService().isRecoverySetup(),
+                                methods = this.secureBackupMethod
+                            )
+                    )
                 }
             }
             SetupMode.CROSS_SIGNING_ONLY -> {
@@ -112,7 +140,7 @@ class BootstrapSharedViewModel @AssistedInject constructor(
                         // we just resume plain bootstrap
                         doesKeyBackupExist = false
                         setState {
-                            copy(step = BootstrapStep.FirstForm(keyBackUpExist = doesKeyBackupExist))
+                            copy(step = BootstrapStep.FirstForm(keyBackUpExist = doesKeyBackupExist, methods = this.secureBackupMethod))
                         }
                     } else {
                         // we need to get existing backup passphrase/key and convert to SSSS
@@ -126,7 +154,7 @@ class BootstrapSharedViewModel @AssistedInject constructor(
                             doesKeyBackupExist = true
                             isBackupCreatedFromPassphrase = keyVersion.getAuthDataAsMegolmBackupAuthData()?.privateKeySalt != null
                             setState {
-                                copy(step = BootstrapStep.FirstForm(keyBackUpExist = doesKeyBackupExist))
+                                copy(step = BootstrapStep.FirstForm(keyBackUpExist = doesKeyBackupExist, methods = this.secureBackupMethod))
                             }
                         }
                     }
@@ -411,6 +439,7 @@ class BootstrapSharedViewModel @AssistedInject constructor(
                             progressListener = progressListener,
                             passphrase = state.passphrase,
                             keySpec = state.migrationRecoveryKey?.let { extractCurveKeyFromRecoveryKey(it)?.let { RawBytesKeySpec(it) } },
+                            forceResetIfSomeSecretsAreMissing = state.isSecureBackupRequired,
                             setupMode = state.setupMode
                     )
             ) { bootstrapResult ->
@@ -419,14 +448,22 @@ class BootstrapSharedViewModel @AssistedInject constructor(
                         _viewEvents.post(BootstrapViewEvents.Dismiss(true))
                     }
                     is BootstrapResult.Success                 -> {
-                        setState {
-                            copy(
-                                    recoveryKeyCreationInfo = bootstrapResult.keyInfo,
-                                    step = BootstrapStep.SaveRecoveryKey(
-                                            // If a passphrase was used, saving key is optional
-                                            state.passphrase != null
-                                    )
-                            )
+                        val isSecureBackupRequired = state.isSecureBackupRequired
+                        val secureBackupMethod = state.secureBackupMethod
+
+                        if (state.passphrase != null && isSecureBackupRequired && secureBackupMethod == SecureBackupMethod.PASSPHRASE) {
+                            // Go straight to conclusion, skip the save key step
+                            _viewEvents.post(BootstrapViewEvents.Dismiss(success = true))
+                        } else {
+                            setState {
+                                copy(
+                                        recoveryKeyCreationInfo = bootstrapResult.keyInfo,
+                                        step = BootstrapStep.SaveRecoveryKey(
+                                                // If a passphrase was used, saving key is optional
+                                                state.passphrase != null
+                                        )
+                                )
+                            }
                         }
                     }
                     is BootstrapResult.InvalidPasswordError    -> {
@@ -476,7 +513,7 @@ class BootstrapSharedViewModel @AssistedInject constructor(
                 } else {
                     setState {
                         copy(
-                                step = BootstrapStep.FirstForm(keyBackUpExist = doesKeyBackupExist),
+                                step = BootstrapStep.FirstForm(keyBackUpExist = doesKeyBackupExist, methods = this.secureBackupMethod),
                                 // Also reset the passphrase
                                 passphrase = null,
                                 passphraseRepeat = null,
@@ -489,7 +526,7 @@ class BootstrapSharedViewModel @AssistedInject constructor(
             is BootstrapStep.SetupPassphrase                 -> {
                 setState {
                     copy(
-                            step = BootstrapStep.FirstForm(keyBackUpExist = doesKeyBackupExist),
+                            step = BootstrapStep.FirstForm(keyBackUpExist = doesKeyBackupExist, methods = this.secureBackupMethod),
                             // Also reset the passphrase
                             passphrase = null,
                             passphraseRepeat = null
@@ -504,11 +541,25 @@ class BootstrapSharedViewModel @AssistedInject constructor(
                 }
             }
             is BootstrapStep.AccountReAuth                   -> {
-                _viewEvents.post(BootstrapViewEvents.SkipBootstrap(state.passphrase != null))
+                if (state.canLeave) {
+                    _viewEvents.post(BootstrapViewEvents.SkipBootstrap(state.passphrase != null))
+                } else {
+                    // Go back to the first step
+                    setState {
+                        copy(
+                                step = BootstrapStep.FirstForm(keyBackUpExist = doesKeyBackupExist, methods = this.secureBackupMethod),
+                                // Also reset the passphrase
+                                passphrase = null,
+                                passphraseRepeat = null
+                        )
+                    }
+                }
             }
             BootstrapStep.Initializing                       -> {
                 // do we let you cancel from here?
-                _viewEvents.post(BootstrapViewEvents.SkipBootstrap(state.passphrase != null))
+                if (state.canLeave) {
+                    _viewEvents.post(BootstrapViewEvents.SkipBootstrap(state.passphrase != null))
+                }
             }
             is BootstrapStep.SaveRecoveryKey,
             BootstrapStep.DoneSuccess                        -> {
@@ -516,18 +567,20 @@ class BootstrapSharedViewModel @AssistedInject constructor(
             }
             BootstrapStep.CheckingMigration                  -> Unit
             is BootstrapStep.FirstForm                       -> {
-                _viewEvents.post(
-                        when (state.setupMode) {
-                            SetupMode.CROSS_SIGNING_ONLY,
-                            SetupMode.NORMAL -> BootstrapViewEvents.SkipBootstrap()
-                            else             -> BootstrapViewEvents.Dismiss(success = false)
-                        }
-                )
+                if (state.canLeave) {
+                    _viewEvents.post(
+                            when (state.setupMode) {
+                                SetupMode.CROSS_SIGNING_ONLY,
+                                SetupMode.NORMAL -> BootstrapViewEvents.SkipBootstrap()
+                                else             -> BootstrapViewEvents.Dismiss(success = false)
+                            }
+                    )
+                }
             }
             is BootstrapStep.GetBackupSecretForMigration     -> {
                 setState {
                     copy(
-                            step = BootstrapStep.FirstForm(keyBackUpExist = doesKeyBackupExist),
+                            step = BootstrapStep.FirstForm(keyBackUpExist = doesKeyBackupExist, methods = this.secureBackupMethod),
                             // Also reset the passphrase
                             passphrase = null,
                             passphraseRepeat = null,
@@ -549,3 +602,5 @@ class BootstrapSharedViewModel @AssistedInject constructor(
         }
     }
 }
+
+private val BootstrapViewState.canLeave: Boolean get() = !isSecureBackupRequired || isRecoverySetup
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapStep.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapStep.kt
index a4fa31ad03..3fb20ccf9f 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapStep.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapStep.kt
@@ -16,6 +16,8 @@
 
 package im.vector.app.features.crypto.recover
 
+import im.vector.app.features.raw.wellknown.SecureBackupMethod
+
 /**
  * TODO The schema is not up to date
  *
@@ -89,7 +91,7 @@ sealed class BootstrapStep {
     object CheckingMigration : BootstrapStep()
 
     // Use will be asked to choose between passphrase or recovery key, or to start process if a key backup exists
-    data class FirstForm(val keyBackUpExist: Boolean, val reset: Boolean = false) : BootstrapStep()
+    data class FirstForm(val keyBackUpExist: Boolean, val reset: Boolean = false, val methods: SecureBackupMethod) : BootstrapStep()
 
     object SetupPassphrase : BootstrapStep()
     object ConfirmPassphrase : BootstrapStep()
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapViewState.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapViewState.kt
index 9d5760cbf9..2d27c165e6 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapViewState.kt
@@ -21,6 +21,7 @@ import com.airbnb.mvrx.MavericksState
 import com.airbnb.mvrx.Uninitialized
 import com.nulabinc.zxcvbn.Strength
 import im.vector.app.core.platform.WaitingViewData
+import im.vector.app.features.raw.wellknown.SecureBackupMethod
 import org.matrix.android.sdk.api.session.securestorage.SsssKeyCreationInfo
 
 data class BootstrapViewState(
@@ -34,7 +35,10 @@ data class BootstrapViewState(
         val passphraseConfirmMatch: Async<Unit> = Uninitialized,
         val recoveryKeyCreationInfo: SsssKeyCreationInfo? = null,
         val initializationWaitingViewData: WaitingViewData? = null,
-        val recoverySaveFileProcess: Async<Unit> = Uninitialized
+        val recoverySaveFileProcess: Async<Unit> = Uninitialized,
+        val isSecureBackupRequired: Boolean = false,
+        val secureBackupMethod: SecureBackupMethod = SecureBackupMethod.KEY_OR_PASSPHRASE,
+        val isRecoverySetup: Boolean = true
 ) : MavericksState {
 
     constructor(args: BootstrapBottomSheet.Args) : this(setupMode = args.setUpMode)
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
index e0aa4592a4..91bb3fa7f2 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
@@ -65,7 +65,7 @@ class IncomingVerificationRequestHandler @Inject constructor(
         // TODO maybe check also if
         val uid = "kvr_${tx.transactionId}"
         when (tx.state) {
-            is VerificationTxState.OnStarted       -> {
+            is VerificationTxState.OnStarted -> {
                 // Add a notification for every incoming request
                 val user = session?.userService()?.getUser(tx.otherUserId)
                 val name = user?.toMatrixItem()?.getBestName() ?: tx.otherUserId
@@ -116,7 +116,7 @@ class IncomingVerificationRequestHandler @Inject constructor(
                 // cancel related notification
                 popupAlertManager.cancelAlert(uid)
             }
-            else                                   -> Unit
+            else -> Unit
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationAction.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationAction.kt
index a5142ad8bf..c4ae2d278b 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationAction.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationAction.kt
@@ -27,7 +27,7 @@ sealed class VerificationAction : VectorViewModelAction {
     object OtherUserDidNotScanned : VerificationAction()
     data class SASMatchAction(val otherUserId: String, val sasTransactionId: String) : VerificationAction()
     data class SASDoNotMatchAction(val otherUserId: String, val sasTransactionId: String) : VerificationAction()
-    object GotItConclusion : VerificationAction()
+    data class GotItConclusion(val verified: Boolean) : VerificationAction()
     object SkipVerification : VerificationAction()
     object VerifyFromPassphrase : VerificationAction()
     data class GotResultFromSsss(val cypherData: String, val alias: String) : VerificationAction()
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
index dc79136cad..bf2c62a647 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
@@ -95,12 +95,14 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetV
             when (it) {
                 is VerificationBottomSheetViewEvents.Dismiss           -> dismiss()
                 is VerificationBottomSheetViewEvents.AccessSecretStore -> {
-                    secretStartForActivityResult.launch(SharedSecureStorageActivity.newReadIntent(
-                            requireContext(),
-                            null, // use default key
-                            listOf(MASTER_KEY_SSSS_NAME, USER_SIGNING_KEY_SSSS_NAME, SELF_SIGNING_KEY_SSSS_NAME, KEYBACKUP_SECRET_SSSS_NAME),
-                            SharedSecureStorageActivity.DEFAULT_RESULT_KEYSTORE_ALIAS
-                    ))
+                    secretStartForActivityResult.launch(
+                            SharedSecureStorageActivity.newReadIntent(
+                                    requireContext(),
+                                    null, // use default key
+                                    listOf(MASTER_KEY_SSSS_NAME, USER_SIGNING_KEY_SSSS_NAME, SELF_SIGNING_KEY_SSSS_NAME, KEYBACKUP_SECRET_SSSS_NAME),
+                                    SharedSecureStorageActivity.DEFAULT_RESULT_KEYSTORE_ALIAS
+                            )
+                    )
                 }
                 is VerificationBottomSheetViewEvents.ModalError        -> {
                     MaterialAlertDialogBuilder(requireContext())
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
index b65ce4b30b..b82ef1d164 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
@@ -30,9 +30,13 @@ import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.raw.wellknown.getElementWellknown
+import im.vector.app.features.raw.wellknown.isSecureBackupRequired
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.raw.RawService
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
 import org.matrix.android.sdk.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME
@@ -78,6 +82,7 @@ data class VerificationBottomSheetViewState(
         val userWantsToCancel: Boolean = false,
         val userThinkItsNotHim: Boolean = false,
         val quadSContainsSecrets: Boolean = true,
+        val isVerificationRequired: Boolean = false,
         val quadSHasBeenReset: Boolean = false,
         val hasAnyOtherSession: Boolean = false
 ) : MavericksState {
@@ -92,9 +97,11 @@ data class VerificationBottomSheetViewState(
 
 class VerificationBottomSheetViewModel @AssistedInject constructor(
         @Assisted initialState: VerificationBottomSheetViewState,
+        private val rawService: RawService,
         private val session: Session,
         private val supportedVerificationMethodsProvider: SupportedVerificationMethodsProvider,
-        private val stringProvider: StringProvider) :
+        private val stringProvider: StringProvider
+) :
         VectorViewModel<VerificationBottomSheetViewState, VerificationAction, VerificationBottomSheetViewEvents>(initialState),
         VerificationService.Listener {
 
@@ -108,6 +115,15 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
     init {
         session.cryptoService().verificationService().addListener(this)
 
+        // This is async, but at this point should be in cache
+        // so it's ok to not wait until result
+        viewModelScope.launch(Dispatchers.IO) {
+            val wellKnown = rawService.getElementWellknown(session.sessionParams)
+            setState {
+                copy(isVerificationRequired = wellKnown?.isSecureBackupRequired().orFalse())
+            }
+        }
+
         val userItem = session.getUser(initialState.otherUserId)
 
         var autoReady = false
@@ -182,8 +198,10 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
                     state.verifyingFrom4S) {
                 // you cannot cancel anymore
             } else {
-                setState {
-                    copy(userWantsToCancel = true)
+                if (!state.isVerificationRequired) {
+                    setState {
+                        copy(userWantsToCancel = true)
+                    }
                 }
             }
         }
@@ -341,7 +359,18 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
                         ?.shortCodeDoesNotMatch()
             }
             is VerificationAction.GotItConclusion              -> {
-                _viewEvents.post(VerificationBottomSheetViewEvents.Dismiss)
+                if (state.isVerificationRequired && !action.verified) {
+                    // we should go back to first screen
+                    setState {
+                        copy(
+                                pendingRequest = Uninitialized,
+                                sasTransactionState = null,
+                                qrTransactionState = null
+                        )
+                    }
+                } else {
+                    _viewEvents.post(VerificationBottomSheetViewEvents.Dismiss)
+                }
             }
             is VerificationAction.SkipVerification             -> {
                 _viewEvents.post(VerificationBottomSheetViewEvents.Dismiss)
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionController.kt
index 7f6678a73c..9203b8ab0a 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionController.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionController.kt
@@ -84,7 +84,7 @@ class VerificationConclusionController @Inject constructor(
                     notice(host.eventHtmlRenderer.render(host.stringProvider.getString(R.string.verification_conclusion_compromised)).toEpoxyCharSequence())
                 }
 
-                bottomDone()
+                bottomGotIt()
             }
             ConclusionState.CANCELLED -> {
                 bottomSheetVerificationNoticeItem {
@@ -92,18 +92,7 @@ class VerificationConclusionController @Inject constructor(
                     notice(host.stringProvider.getString(R.string.verify_cancelled_notice).toEpoxyCharSequence())
                 }
 
-                bottomSheetDividerItem {
-                    id("sep0")
-                }
-
-                bottomSheetVerificationActionItem {
-                    id("got_it")
-                    title(host.stringProvider.getString(R.string.sas_got_it))
-                    titleColor(host.colorProvider.getColorFromAttribute(R.attr.colorPrimary))
-                    iconRes(R.drawable.ic_arrow_right)
-                    iconColor(host.colorProvider.getColorFromAttribute(R.attr.colorPrimary))
-                    listener { host.listener?.onButtonTapped() }
-                }
+                bottomGotIt()
             }
         }
     }
@@ -120,11 +109,27 @@ class VerificationConclusionController @Inject constructor(
             titleColor(host.colorProvider.getColorFromAttribute(R.attr.vctr_content_primary))
             iconRes(R.drawable.ic_arrow_right)
             iconColor(host.colorProvider.getColorFromAttribute(R.attr.vctr_content_primary))
-            listener { host.listener?.onButtonTapped() }
+            listener { host.listener?.onButtonTapped(true) }
+        }
+    }
+
+    private fun bottomGotIt() {
+        val host = this
+        bottomSheetDividerItem {
+            id("sep0")
+        }
+
+        bottomSheetVerificationActionItem {
+            id("got_it")
+            title(host.stringProvider.getString(R.string.sas_got_it))
+            titleColor(host.colorProvider.getColorFromAttribute(R.attr.vctr_content_primary))
+            iconRes(R.drawable.ic_arrow_right)
+            iconColor(host.colorProvider.getColorFromAttribute(R.attr.vctr_content_primary))
+            listener { host.listener?.onButtonTapped(false) }
         }
     }
 
     interface Listener {
-        fun onButtonTapped()
+        fun onButtonTapped(success: Boolean)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionFragment.kt
index f45bc3d44e..85b90e6004 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionFragment.kt
@@ -73,7 +73,7 @@ class VerificationConclusionFragment @Inject constructor(
         controller.update(state)
     }
 
-    override fun onButtonTapped() {
-        sharedViewModel.handle(VerificationAction.GotItConclusion)
+    override fun onButtonTapped(success: Boolean) {
+        sharedViewModel.handle(VerificationAction.GotItConclusion(success))
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt
index 781677433b..3c7b4ffebd 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt
@@ -88,17 +88,19 @@ class VerificationRequestController @Inject constructor(
                 }
             }
 
-            bottomSheetDividerItem {
-                id("sep1")
-            }
+            if (!state.isVerificationRequired) {
+                bottomSheetDividerItem {
+                    id("sep1")
+                }
 
-            bottomSheetVerificationActionItem {
-                id("skip")
-                title(host.stringProvider.getString(R.string.action_skip))
-                titleColor(host.colorProvider.getColorFromAttribute(R.attr.colorError))
-                iconRes(R.drawable.ic_arrow_right)
-                iconColor(host.colorProvider.getColorFromAttribute(R.attr.colorError))
-                listener { host.listener?.onClickSkip() }
+                bottomSheetVerificationActionItem {
+                    id("skip")
+                    title(host.stringProvider.getString(R.string.action_skip))
+                    titleColor(host.colorProvider.getColorFromAttribute(R.attr.colorError))
+                    iconRes(R.drawable.ic_arrow_right)
+                    iconColor(host.colorProvider.getColorFromAttribute(R.attr.colorError))
+                    listener { host.listener?.onClickSkip() }
+                }
             }
         } else {
             val styledText =
diff --git a/vector/src/main/java/im/vector/app/features/discovery/Extensions.kt b/vector/src/main/java/im/vector/app/features/discovery/Extensions.kt
index dc25a35646..1efe9f7bc2 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/Extensions.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/Extensions.kt
@@ -36,9 +36,11 @@ suspend fun Session.fetchHomeserverWithTerms(userLanguage: String): ServerAndPol
     return buildServerAndPolicies(homeserverUrl, terms, userLanguage)
 }
 
-private fun buildServerAndPolicies(serviceUrl: String,
-                                   termsResponse: TermsResponse,
-                                   userLanguage: String): ServerAndPolicies {
+private fun buildServerAndPolicies(
+        serviceUrl: String,
+        termsResponse: TermsResponse,
+        userLanguage: String
+): ServerAndPolicies {
     val terms = termsResponse.getLocalizedTerms(userLanguage)
     val policyUrls = terms.mapNotNull {
         val name = it.localizedName ?: it.policyName
diff --git a/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewModel.kt b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewModel.kt
index ae1c7f7753..c5dc0c17ea 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewModel.kt
@@ -38,7 +38,8 @@ import java.net.UnknownHostException
 class SetIdentityServerViewModel @AssistedInject constructor(
         @Assisted initialState: SetIdentityServerState,
         private val mxSession: Session,
-        stringProvider: StringProvider) :
+        stringProvider: StringProvider
+) :
         VectorViewModel<SetIdentityServerState, SetIdentityServerAction, SetIdentityServerViewEvents>(initialState) {
 
     @AssistedFactory
diff --git a/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt b/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
index cb24382e6a..d02f8f0bd4 100644
--- a/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
@@ -55,9 +55,11 @@ import javax.inject.Inject
 /**
  * This helper centralise ways to retrieve avatar into ImageView or even generic Target<Drawable>.
  */
-class AvatarRenderer @Inject constructor(private val activeSessionHolder: ActiveSessionHolder,
-                                         private val matrixItemColorProvider: MatrixItemColorProvider,
-                                         private val dimensionConverter: DimensionConverter) {
+class AvatarRenderer @Inject constructor(
+        private val activeSessionHolder: ActiveSessionHolder,
+        private val matrixItemColorProvider: MatrixItemColorProvider,
+        private val dimensionConverter: DimensionConverter
+) {
 
     companion object {
         private const val THUMBNAIL_SIZE = 250
@@ -150,9 +152,11 @@ class AvatarRenderer @Inject constructor(private val activeSessionHolder: Active
     }
 
     @UiThread
-    fun render(glideRequests: GlideRequests,
-               matrixItem: MatrixItem,
-               target: Target<Drawable>) {
+    fun render(
+            glideRequests: GlideRequests,
+            matrixItem: MatrixItem,
+            target: Target<Drawable>
+    ) {
         val placeholder = getPlaceholderDrawable(matrixItem)
         glideRequests.loadResolvedUrl(matrixItem.avatarUrl)
                 .let {
@@ -182,10 +186,12 @@ class AvatarRenderer @Inject constructor(private val activeSessionHolder: Active
 
     @AnyThread
     @Throws
-    fun adaptiveShortcutDrawable(glideRequests: GlideRequests,
-                                 matrixItem: MatrixItem, iconSize: Int,
-                                 adaptiveIconSize: Int,
-                                 adaptiveIconOuterSides: Float): Bitmap {
+    fun adaptiveShortcutDrawable(
+            glideRequests: GlideRequests,
+            matrixItem: MatrixItem, iconSize: Int,
+            adaptiveIconSize: Int,
+            adaptiveIconOuterSides: Float
+    ): Bitmap {
         return glideRequests
                 .asBitmap()
                 .avatarOrText(matrixItem, iconSize)
@@ -216,12 +222,14 @@ class AvatarRenderer @Inject constructor(private val activeSessionHolder: Active
     }
 
     @UiThread
-    fun renderBlur(matrixItem: MatrixItem,
-                   imageView: ImageView,
-                   sampling: Int,
-                   rounded: Boolean,
-                   @ColorInt colorFilter: Int? = null,
-                   addPlaceholder: Boolean) {
+    fun renderBlur(
+            matrixItem: MatrixItem,
+            imageView: ImageView,
+            sampling: Int,
+            rounded: Boolean,
+            @ColorInt colorFilter: Int? = null,
+            addPlaceholder: Boolean
+    ) {
         val transformations = mutableListOf<Transformation<Bitmap>>(
                 BlurTransformation(20, sampling)
         )
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index ee9340f37d..cfc0672119 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -50,11 +50,13 @@ import im.vector.app.features.MainActivityArgs
 import im.vector.app.features.analytics.accountdata.AnalyticsAccountDataViewModel
 import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.analytics.plan.ViewRoom
+import im.vector.app.features.crypto.recover.SetupMode
 import im.vector.app.features.disclaimer.showDisclaimerDialog
 import im.vector.app.features.matrixto.MatrixToBottomSheet
 import im.vector.app.features.matrixto.OriginOfMatrixTo
 import im.vector.app.features.navigation.Navigator
 import im.vector.app.features.notifications.NotificationDrawerManager
+import im.vector.app.features.onboarding.AuthenticationDescription
 import im.vector.app.features.permalink.NavigationInterceptor
 import im.vector.app.features.permalink.PermalinkHandler
 import im.vector.app.features.permalink.PermalinkHandler.Companion.MATRIX_TO_CUSTOM_SCHEME_URL_BASE
@@ -79,9 +81,9 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import kotlinx.parcelize.Parcelize
-import org.matrix.android.sdk.api.session.initsync.SyncStatusService
 import org.matrix.android.sdk.api.session.permalinks.PermalinkService
 import org.matrix.android.sdk.api.session.sync.InitialSyncStrategy
+import org.matrix.android.sdk.api.session.sync.SyncRequestState
 import org.matrix.android.sdk.api.session.sync.initialSyncStrategy
 import org.matrix.android.sdk.api.util.MatrixItem
 import timber.log.Timber
@@ -90,7 +92,7 @@ import javax.inject.Inject
 @Parcelize
 data class HomeActivityArgs(
         val clearNotification: Boolean,
-        val accountCreation: Boolean,
+        val authenticationDescription: AuthenticationDescription? = null,
         val hasExistingSession: Boolean = false,
         val inviteNotificationRoomId: String? = null
 ) : Parcelable
@@ -199,43 +201,13 @@ class HomeActivity :
                     when (sharedAction) {
                         is HomeActivitySharedAction.OpenDrawer        -> views.drawerLayout.openDrawer(GravityCompat.START)
                         is HomeActivitySharedAction.CloseDrawer       -> views.drawerLayout.closeDrawer(GravityCompat.START)
-                        is HomeActivitySharedAction.OpenGroup         -> {
-                            views.drawerLayout.closeDrawer(GravityCompat.START)
-
-                            // Temporary
-                            // When switching from space to group or group to space, we need to reload the fragment
-                            // To be removed when dropping legacy groups
-                            if (sharedAction.clearFragment) {
-                                replaceFragment(views.homeDetailFragmentContainer, HomeDetailFragment::class.java, allowStateLoss = true)
-                            } else {
-                                // nop
-                            }
-                            // we might want to delay that to avoid having the drawer animation lagging
-                            // would be probably better to let the drawer do that? in the on closed callback?
-                        }
-                        is HomeActivitySharedAction.OpenSpacePreview  -> {
-                            startActivity(SpacePreviewActivity.newIntent(this, sharedAction.spaceId))
-                        }
-                        is HomeActivitySharedAction.AddSpace          -> {
-                            createSpaceResultLauncher.launch(SpaceCreationActivity.newIntent(this))
-                        }
-                        is HomeActivitySharedAction.ShowSpaceSettings -> {
-                            // open bottom sheet
-                            SpaceSettingsMenuBottomSheet
-                                    .newInstance(sharedAction.spaceId, object : SpaceSettingsMenuBottomSheet.InteractionListener {
-                                        override fun onShareSpaceSelected(spaceId: String) {
-                                            ShareSpaceBottomSheet.show(supportFragmentManager, spaceId)
-                                        }
-                                    })
-                                    .show(supportFragmentManager, "SPACE_SETTINGS")
-                        }
-                        is HomeActivitySharedAction.OpenSpaceInvite   -> {
-                            SpaceInviteBottomSheet.newInstance(sharedAction.spaceId)
-                                    .show(supportFragmentManager, "SPACE_INVITE")
-                        }
-                        HomeActivitySharedAction.SendSpaceFeedBack    -> {
-                            bugReporter.openBugReportScreen(this, ReportType.SPACE_BETA_FEEDBACK)
-                        }
+                        is HomeActivitySharedAction.OpenGroup         -> openGroup(sharedAction.shouldClearFragment)
+                        is HomeActivitySharedAction.OpenSpacePreview  -> startActivity(SpacePreviewActivity.newIntent(this, sharedAction.spaceId))
+                        is HomeActivitySharedAction.AddSpace          -> createSpaceResultLauncher.launch(SpaceCreationActivity.newIntent(this))
+                        is HomeActivitySharedAction.ShowSpaceSettings -> showSpaceSettings(sharedAction.spaceId)
+                        is HomeActivitySharedAction.OpenSpaceInvite   -> openSpaceInvite(sharedAction.spaceId)
+                        HomeActivitySharedAction.SendSpaceFeedBack    -> bugReporter.openBugReportScreen(this, ReportType.SPACE_BETA_FEEDBACK)
+                        HomeActivitySharedAction.CloseGroup           -> closeGroup()
                     }
                 }
                 .launchIn(lifecycleScope)
@@ -256,6 +228,14 @@ class HomeActivity :
                 is HomeActivityViewEvents.AskPasswordToInitCrossSigning -> handleAskPasswordToInitCrossSigning(it)
                 is HomeActivityViewEvents.OnNewSession                  -> handleOnNewSession(it)
                 HomeActivityViewEvents.PromptToEnableSessionPush        -> handlePromptToEnablePush()
+                HomeActivityViewEvents.StartRecoverySetupFlow           -> handleStartRecoverySetup()
+                is HomeActivityViewEvents.ForceVerification             ->  {
+                    if (it.sendRequest) {
+                        navigator.requestSelfSessionVerification(this)
+                    } else {
+                        navigator.waitSessionVerification(this)
+                    }
+                }
                 is HomeActivityViewEvents.OnCrossSignedInvalidated      -> handleCrossSigningInvalidated(it)
                 HomeActivityViewEvents.ShowAnalyticsOptIn               -> handleShowAnalyticsOptIn()
                 HomeActivityViewEvents.NotifyUserForThreadsMigration    -> handleNotifyUserForThreadsMigration()
@@ -272,6 +252,37 @@ class HomeActivity :
         homeActivityViewModel.handle(HomeActivityViewActions.ViewStarted)
     }
 
+    private fun openGroup(shouldClearFragment: Boolean) {
+        views.drawerLayout.closeDrawer(GravityCompat.START)
+
+        // When switching from space to group or group to space, we need to reload the fragment
+        if (shouldClearFragment) {
+            replaceFragment(views.homeDetailFragmentContainer, HomeDetailFragment::class.java, allowStateLoss = true)
+        } else {
+            // do nothing
+        }
+    }
+
+    private fun showSpaceSettings(spaceId: String) {
+        // open bottom sheet
+        SpaceSettingsMenuBottomSheet
+                .newInstance(spaceId, object : SpaceSettingsMenuBottomSheet.InteractionListener {
+                    override fun onShareSpaceSelected(spaceId: String) {
+                        ShareSpaceBottomSheet.show(supportFragmentManager, spaceId)
+                    }
+                })
+                .show(supportFragmentManager, "SPACE_SETTINGS")
+    }
+
+    private fun openSpaceInvite(spaceId: String) {
+        SpaceInviteBottomSheet.newInstance(spaceId)
+                .show(supportFragmentManager, "SPACE_INVITE")
+    }
+
+    private fun closeGroup() {
+        views.drawerLayout.openDrawer(GravityCompat.START)
+    }
+
     private fun handleShowAnalyticsOptIn() {
         navigator.openAnalyticsOptIn(this)
     }
@@ -354,10 +365,17 @@ class HomeActivity :
         }
     }
 
+    private fun handleStartRecoverySetup() {
+        // To avoid IllegalStateException in case the transaction was executed after onSaveInstanceState
+        lifecycleScope.launchWhenResumed {
+            navigator.open4SSetup(this@HomeActivity, SetupMode.NORMAL)
+        }
+    }
+
     private fun renderState(state: HomeActivityViewState) {
-        when (val status = state.syncStatusServiceStatus) {
-            is SyncStatusService.Status.InitialSyncProgressing -> {
-                val initSyncStepStr = initSyncStepFormatter.format(status.initSyncStep)
+        when (val status = state.syncRequestState) {
+            is SyncRequestState.InitialSyncProgressing -> {
+                val initSyncStepStr = initSyncStepFormatter.format(status.initialSyncStep)
                 Timber.v("$initSyncStepStr ${status.percentProgress}")
                 views.waitingView.root.setOnClickListener {
                     // block interactions
@@ -374,7 +392,7 @@ class HomeActivity :
                 }
                 views.waitingView.root.isVisible = true
             }
-            else                                               -> {
+            else                                 -> {
                 // Idle or Incremental sync status
                 views.waitingView.root.isVisible = false
             }
@@ -592,15 +610,16 @@ class HomeActivity :
     }
 
     companion object {
-        fun newIntent(context: Context,
-                      clearNotification: Boolean = false,
-                      accountCreation: Boolean = false,
-                      existingSession: Boolean = false,
-                      inviteNotificationRoomId: String? = null
+        fun newIntent(
+                context: Context,
+                clearNotification: Boolean = false,
+                authenticationDescription: AuthenticationDescription? = null,
+                existingSession: Boolean = false,
+                inviteNotificationRoomId: String? = null
         ): Intent {
             val args = HomeActivityArgs(
                     clearNotification = clearNotification,
-                    accountCreation = accountCreation,
+                    authenticationDescription = authenticationDescription,
                     hasExistingSession = existingSession,
                     inviteNotificationRoomId = inviteNotificationRoomId
             )
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt
index d460efb564..a16d710f4e 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt
@@ -24,7 +24,8 @@ import im.vector.app.core.platform.VectorSharedAction
 sealed class HomeActivitySharedAction : VectorSharedAction {
     object OpenDrawer : HomeActivitySharedAction()
     object CloseDrawer : HomeActivitySharedAction()
-    data class OpenGroup(val clearFragment: Boolean) : HomeActivitySharedAction()
+    data class OpenGroup(val shouldClearFragment: Boolean) : HomeActivitySharedAction()
+    object CloseGroup : HomeActivitySharedAction()
     object AddSpace : HomeActivitySharedAction()
     data class OpenSpacePreview(val spaceId: String) : HomeActivitySharedAction()
     data class OpenSpaceInvite(val spaceId: String) : HomeActivitySharedAction()
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewEvents.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewEvents.kt
index 5efd49a579..cb31a568e4 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewEvents.kt
@@ -27,4 +27,6 @@ sealed interface HomeActivityViewEvents : VectorViewEvents {
     object ShowAnalyticsOptIn : HomeActivityViewEvents
     object NotifyUserForThreadsMigration : HomeActivityViewEvents
     data class MigrateThreads(val checkSession: Boolean) : HomeActivityViewEvents
+    object StartRecoverySetupFlow : HomeActivityViewEvents
+    data class ForceVerification(val sendRequest: Boolean) : HomeActivityViewEvents
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
index c47ca0880e..a97c86e960 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
@@ -17,7 +17,9 @@
 package im.vector.app.features.home
 
 import androidx.lifecycle.asFlow
+import com.airbnb.mvrx.Mavericks
 import com.airbnb.mvrx.MavericksViewModelFactory
+import com.airbnb.mvrx.ViewModelContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
@@ -26,14 +28,25 @@ import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.analytics.AnalyticsTracker
+import im.vector.app.features.analytics.extensions.toAnalyticsType
+import im.vector.app.features.analytics.plan.Signup
 import im.vector.app.features.analytics.store.AnalyticsStore
 import im.vector.app.features.login.ReAuthHelper
+import im.vector.app.features.onboarding.AuthenticationDescription
+import im.vector.app.features.raw.wellknown.ElementWellKnown
+import im.vector.app.features.raw.wellknown.getElementWellknown
+import im.vector.app.features.raw.wellknown.isSecureBackupRequired
+import im.vector.app.features.raw.wellknown.withElementWellKnown
 import im.vector.app.features.session.coroutineScope
 import im.vector.app.features.settings.VectorPreferences
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onCompletion
 import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.takeWhile
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.auth.UIABaseAuth
 import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor
@@ -42,13 +55,15 @@ import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
 import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse
 import org.matrix.android.sdk.api.auth.registration.nextUncompletedStage
 import org.matrix.android.sdk.api.extensions.tryOrNull
+import org.matrix.android.sdk.api.raw.RawService
+import org.matrix.android.sdk.api.session.crypto.crosssigning.CrossSigningService
 import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
 import org.matrix.android.sdk.api.session.crypto.model.MXUsersDevicesMap
 import org.matrix.android.sdk.api.session.getUser
-import org.matrix.android.sdk.api.session.initsync.SyncStatusService
 import org.matrix.android.sdk.api.session.pushrules.RuleIds
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
+import org.matrix.android.sdk.api.session.sync.SyncRequestState
 import org.matrix.android.sdk.api.settings.LightweightSettingsStorage
 import org.matrix.android.sdk.api.util.awaitCallback
 import org.matrix.android.sdk.api.util.toMatrixItem
@@ -59,12 +74,14 @@ import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 
 class HomeActivityViewModel @AssistedInject constructor(
-        @Assisted initialState: HomeActivityViewState,
+        @Assisted private val initialState: HomeActivityViewState,
         private val activeSessionHolder: ActiveSessionHolder,
+        private val rawService: RawService,
         private val reAuthHelper: ReAuthHelper,
         private val analyticsStore: AnalyticsStore,
         private val lightweightSettingsStorage: LightweightSettingsStorage,
-        private val vectorPreferences: VectorPreferences
+        private val vectorPreferences: VectorPreferences,
+        private val analyticsTracker: AnalyticsTracker
 ) : VectorViewModel<HomeActivityViewState, HomeActivityViewActions, HomeActivityViewEvents>(initialState) {
 
     @AssistedFactory
@@ -72,10 +89,17 @@ class HomeActivityViewModel @AssistedInject constructor(
         override fun create(initialState: HomeActivityViewState): HomeActivityViewModel
     }
 
-    companion object : MavericksViewModelFactory<HomeActivityViewModel, HomeActivityViewState> by hiltMavericksViewModelFactory()
+    companion object : MavericksViewModelFactory<HomeActivityViewModel, HomeActivityViewState> by hiltMavericksViewModelFactory() {
+        override fun initialState(viewModelContext: ViewModelContext): HomeActivityViewState? {
+            val activity: HomeActivity = viewModelContext.activity()
+            val args: HomeActivityArgs? = activity.intent.getParcelableExtra(Mavericks.KEY_ARG)
+            return args?.let { HomeActivityViewState(authenticationDescription = it.authenticationDescription) }
+                    ?: super.initialState(viewModelContext)
+        }
+    }
 
     private var isInitialized = false
-    private var checkBootstrap = false
+    private var hasCheckedBootstrap = false
     private var onceTrusted = false
 
     private fun initialize() {
@@ -98,9 +122,32 @@ class HomeActivityViewModel @AssistedInject constructor(
                         }
                     }
                     .launchIn(viewModelScope)
+
+            when (val recentAuthentication = initialState.authenticationDescription) {
+                is AuthenticationDescription.Register -> {
+                    viewModelScope.launch {
+                        analyticsStore.onUserGaveConsent {
+                            analyticsTracker.capture(Signup(authenticationType = recentAuthentication.type.toAnalyticsType()))
+                        }
+                    }
+                }
+                AuthenticationDescription.Login       -> {
+                    // do nothing
+                }
+                null                                  -> {
+                    // do nothing
+                }
+            }
         }
     }
 
+    private suspend fun AnalyticsStore.onUserGaveConsent(action: () -> Unit) {
+        userConsentFlow
+                .takeWhile { !it }
+                .onCompletion { action() }
+                .collect()
+    }
+
     private fun cleanupFiles() {
         // Mitigation: delete all cached decrypted files each time the application is started.
         activeSessionHolder.getSafeActiveSession()?.fileService()?.clearDecryptedCache()
@@ -116,17 +163,12 @@ class HomeActivityViewModel @AssistedInject constructor(
         safeActiveSession
                 .flow()
                 .liveCrossSigningInfo(safeActiveSession.myUserId)
-                .onEach {
-                    val isVerified = it.getOrNull()?.isTrusted() ?: false
+                .onEach { info ->
+                    val isVerified = info.getOrNull()?.isTrusted() ?: false
                     if (!isVerified && onceTrusted) {
-                        // cross signing keys have been reset
-                        // Trigger a popup to re-verify
-                        // Note: user can be null in case of logout
-                        safeActiveSession.getUser(safeActiveSession.myUserId)
-                                ?.toMatrixItem()
-                                ?.let { user ->
-                                    _viewEvents.post(HomeActivityViewEvents.OnCrossSignedInvalidated(user))
-                                }
+                        rawService.withElementWellKnown(viewModelScope, safeActiveSession.sessionParams) {
+                            sessionHasBeenUnverified(it)
+                        }
                     }
                     onceTrusted = isVerified
                 }
@@ -176,30 +218,27 @@ class HomeActivityViewModel @AssistedInject constructor(
     private fun observeInitialSync() {
         val session = activeSessionHolder.getSafeActiveSession() ?: return
 
-        session.syncStatusService().getSyncStatusLive()
+        session.syncService().getSyncRequestStateLive()
                 .asFlow()
                 .onEach { status ->
                     when (status) {
-                        is SyncStatusService.Status.InitialSyncProgressing -> {
-                            // Schedule a check of the bootstrap when the init sync will be finished
-                            checkBootstrap = true
+                        is SyncRequestState.Idle -> {
+                            maybeVerifyOrBootstrapCrossSigning()
                         }
-                        is SyncStatusService.Status.Idle                   -> {
-                            if (checkBootstrap) {
-                                checkBootstrap = false
-                                maybeBootstrapCrossSigningAfterInitialSync()
-                            }
-                        }
-                        else                                               -> Unit
+                        else                     -> Unit
                     }
 
                     setState {
                         copy(
-                                syncStatusServiceStatus = status
+                                syncRequestState = status
                         )
                     }
                 }
                 .launchIn(viewModelScope)
+
+        if (session.syncService().hasAlreadySynced()) {
+            maybeVerifyOrBootstrapCrossSigning()
+        }
     }
 
     /**
@@ -240,12 +279,72 @@ class HomeActivityViewModel @AssistedInject constructor(
         }
     }
 
-    private fun maybeBootstrapCrossSigningAfterInitialSync() {
+    private fun sessionHasBeenUnverified(elementWellKnown: ElementWellKnown?) {
+        val session = activeSessionHolder.getSafeActiveSession() ?: return
+        val isSecureBackupRequired = elementWellKnown?.isSecureBackupRequired() ?: false
+        if (isSecureBackupRequired) {
+            // If 4S is forced, force verification
+            // for stability cancel all pending verifications?
+            session.cryptoService().verificationService().getExistingVerificationRequests(session.myUserId).forEach {
+                session.cryptoService().verificationService().cancelVerificationRequest(it)
+            }
+            _viewEvents.post(HomeActivityViewEvents.ForceVerification(false))
+        } else {
+            // cross signing keys have been reset
+            // Trigger a popup to re-verify
+            // Note: user can be null in case of logout
+            session.getUser(session.myUserId)
+                    ?.toMatrixItem()
+                    ?.let { user ->
+                        _viewEvents.post(HomeActivityViewEvents.OnCrossSignedInvalidated(user))
+                    }
+        }
+    }
+
+    private fun maybeVerifyOrBootstrapCrossSigning() {
+        // The contents of this method should only run once
+        if (hasCheckedBootstrap) return
+        hasCheckedBootstrap = true
+
         // We do not use the viewModel context because we do not want to tie this action to activity view model
         activeSessionHolder.getSafeActiveSession()?.coroutineScope?.launch(Dispatchers.IO) {
-            val session = activeSessionHolder.getSafeActiveSession() ?: return@launch
+            val session = activeSessionHolder.getSafeActiveSession() ?: return@launch Unit.also {
+                Timber.w("## No session to init cross signing or bootstrap")
+            }
 
-            tryOrNull("## MaybeBootstrapCrossSigning: Failed to download keys") {
+            val elementWellKnown = rawService.getElementWellknown(session.sessionParams)
+            val isSecureBackupRequired = elementWellKnown?.isSecureBackupRequired() ?: false
+
+            // In case of account creation, it is already done before
+            if (initialState.authenticationDescription is AuthenticationDescription.Register) {
+                if (isSecureBackupRequired) {
+                    _viewEvents.post(HomeActivityViewEvents.StartRecoverySetupFlow)
+                } else {
+                    val password = reAuthHelper.data ?: return@launch Unit.also {
+                        Timber.w("No password to init cross signing")
+                    }
+
+                    // Silently initialize cross signing without 4S
+                    // We do not use the viewModel context because we do not want to cancel this action
+                    Timber.d("Initialize cross signing")
+                    try {
+                        session.cryptoService().crossSigningService().awaitCrossSigninInitialization { response, _ ->
+                            resume(
+                                    UserPasswordAuth(
+                                            session = response.session,
+                                            user = session.myUserId,
+                                            password = password
+                                    )
+                            )
+                        }
+                    } catch (failure: Throwable) {
+                        Timber.e(failure, "Failed to initialize cross signing")
+                    }
+                }
+                return@launch
+            }
+
+            tryOrNull("## MaybeVerifyOrBootstrapCrossSigning: Failed to download keys") {
                 awaitCallback<MXUsersDevicesMap<CryptoDeviceInfo>> {
                     session.cryptoService().downloadKeys(listOf(session.myUserId), true, it)
                 }
@@ -255,47 +354,68 @@ class HomeActivityViewModel @AssistedInject constructor(
             // Is there already cross signing keys here?
             val mxCrossSigningInfo = session.cryptoService().crossSigningService().getMyCrossSigningKeys()
             if (mxCrossSigningInfo != null) {
-                // Cross-signing is already set up for this user, is it trusted?
-                if (!mxCrossSigningInfo.isTrusted()) {
-                    // New session
-                    _viewEvents.post(
-                            HomeActivityViewEvents.OnNewSession(
-                                    session.getUser(session.myUserId)?.toMatrixItem(),
-                                    // Always send request instead of waiting for an incoming as per recent EW changes
-                                    false
+                if (isSecureBackupRequired && !session.sharedSecretStorageService().isRecoverySetup()) {
+                    // If 4S is forced, start the full interactive setup flow
+                    _viewEvents.post(HomeActivityViewEvents.StartRecoverySetupFlow)
+                } else {
+                    // Cross-signing is already set up for this user, is it trusted?
+                    if (!mxCrossSigningInfo.isTrusted()) {
+                        if (isSecureBackupRequired) {
+                            // If 4S is forced, force verification
+                            _viewEvents.post(HomeActivityViewEvents.ForceVerification(true))
+                        } else {
+                            // New session
+                            _viewEvents.post(
+                                    HomeActivityViewEvents.OnNewSession(
+                                            session.getUser(session.myUserId)?.toMatrixItem(),
+                                            // Always send request instead of waiting for an incoming as per recent EW changes
+                                            false
+                                    )
                             )
-                    )
+                        }
+                    }
                 }
             } else {
-                // Try to initialize cross signing in background if possible
-                Timber.d("Initialize cross signing...")
-                try {
-                    awaitCallback<Unit> {
-                        session.cryptoService().crossSigningService().initializeCrossSigning(
-                                object : UserInteractiveAuthInterceptor {
-                                    override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
-                                        // We missed server grace period or it's not setup, see if we remember locally password
-                                        if (flowResponse.nextUncompletedStage() == LoginFlowTypes.PASSWORD &&
-                                                errCode == null &&
-                                                reAuthHelper.data != null) {
-                                            promise.resume(
-                                                    UserPasswordAuth(
-                                                            session = flowResponse.session,
-                                                            user = session.myUserId,
-                                                            password = reAuthHelper.data
-                                                    )
+                // Cross signing is not initialized
+                if (isSecureBackupRequired) {
+                    // If 4S is forced, start the full interactive setup flow
+                    _viewEvents.post(HomeActivityViewEvents.StartRecoverySetupFlow)
+                } else {
+                    // Initialize cross-signing silently
+                    val password = reAuthHelper.data
+
+                    if (password == null) {
+                        // Check this is not an SSO account
+                        if (session.homeServerCapabilitiesService().getHomeServerCapabilities().canChangePassword) {
+                            // Ask password to the user: Upgrade security
+                            _viewEvents.post(HomeActivityViewEvents.AskPasswordToInitCrossSigning(session.getUser(session.myUserId)?.toMatrixItem()))
+                        }
+                        // Else (SSO) just ignore for the moment
+                    } else {
+                        // Try to initialize cross signing in background if possible
+                        Timber.d("Initialize cross signing...")
+                        try {
+                            session.cryptoService().crossSigningService().awaitCrossSigninInitialization { response, errCode ->
+                                // We missed server grace period or it's not setup, see if we remember locally password
+                                if (response.nextUncompletedStage() == LoginFlowTypes.PASSWORD &&
+                                        errCode == null &&
+                                        reAuthHelper.data != null) {
+                                    resume(
+                                            UserPasswordAuth(
+                                                    session = response.session,
+                                                    user = session.myUserId,
+                                                    password = reAuthHelper.data
                                             )
-                                        } else {
-                                            promise.resumeWithException(Exception("Cannot silently initialize cross signing, UIA missing"))
-                                        }
-                                    }
-                                },
-                                callback = it
-                        )
-                        Timber.d("Initialize cross signing SUCCESS")
+                                    )
+                                    Timber.d("Initialize cross signing SUCCESS")
+                                } else {
+                                    resumeWithException(Exception("Cannot silently initialize cross signing, UIA missing"))
+                                }
+                            }
+                        } catch (failure: Throwable) {
+                            Timber.e(failure, "Failed to initialize cross signing")
+                        }
                     }
-                } catch (failure: Throwable) {
-                    Timber.e(failure, "Failed to initialize cross signing")
                 }
             }
         }
@@ -312,3 +432,18 @@ class HomeActivityViewModel @AssistedInject constructor(
         }
     }
 }
+
+private suspend fun CrossSigningService.awaitCrossSigninInitialization(
+        block: Continuation<UIABaseAuth>.(response: RegistrationFlowResponse, errCode: String?) -> Unit
+) {
+    awaitCallback<Unit> {
+        initializeCrossSigning(
+                object : UserInteractiveAuthInterceptor {
+                    override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
+                        promise.block(flowResponse, errCode)
+                    }
+                },
+                callback = it
+        )
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewState.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewState.kt
index 68131e8569..843f9bdfec 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewState.kt
@@ -17,8 +17,10 @@
 package im.vector.app.features.home
 
 import com.airbnb.mvrx.MavericksState
-import org.matrix.android.sdk.api.session.initsync.SyncStatusService
+import im.vector.app.features.onboarding.AuthenticationDescription
+import org.matrix.android.sdk.api.session.sync.SyncRequestState
 
 data class HomeActivityViewState(
-        val syncStatusServiceStatus: SyncStatusService.Status = SyncStatusService.Status.Idle
+        val syncRequestState: SyncRequestState = SyncRequestState.Idle,
+        val authenticationDescription: AuthenticationDescription? = null
 ) : MavericksState
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
index 2753ba817d..3079003314 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
@@ -33,6 +33,7 @@ import im.vector.app.R
 import im.vector.app.RoomGroupingMethod
 import im.vector.app.core.extensions.commitTransaction
 import im.vector.app.core.extensions.toMvRxBundle
+import im.vector.app.core.platform.OnBackPressed
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.resources.ColorProvider
@@ -69,7 +70,8 @@ class HomeDetailFragment @Inject constructor(
         private val appStateHandler: AppStateHandler
 ) : VectorBaseFragment<FragmentHomeDetailBinding>(),
         KeysBackupBanner.Delegate,
-        CurrentCallsView.Callback {
+        CurrentCallsView.Callback,
+        OnBackPressed {
 
     private val viewModel: HomeDetailViewModel by fragmentViewModel()
     private val unknownDeviceDetectorSharedViewModel: UnknownDeviceDetectorSharedViewModel by activityViewModel()
@@ -130,12 +132,8 @@ class HomeDetailFragment @Inject constructor(
 
         viewModel.onEach(HomeDetailViewState::roomGroupingMethod) { roomGroupingMethod ->
             when (roomGroupingMethod) {
-                is RoomGroupingMethod.ByLegacyGroup -> {
-                    onGroupChange(roomGroupingMethod.groupSummary)
-                }
-                is RoomGroupingMethod.BySpace       -> {
-                    onSpaceChange(roomGroupingMethod.spaceSummary)
-                }
+                is RoomGroupingMethod.ByLegacyGroup -> onGroupChange(roomGroupingMethod.groupSummary)
+                is RoomGroupingMethod.BySpace       -> onSpaceChange(roomGroupingMethod.spaceSummary)
             }
         }
 
@@ -157,7 +155,6 @@ class HomeDetailFragment @Inject constructor(
 
         unknownDeviceDetectorSharedViewModel.onEach { state ->
             state.unknownSessions.invoke()?.let { unknownDevices ->
-//                Timber.v("## Detector Triggerred in fragment - ${unknownDevices.firstOrNull()}")
                 if (unknownDevices.firstOrNull()?.currentSessionTrust == true) {
                     val uid = "review_login"
                     alertManager.cancelAlert(uid)
@@ -190,6 +187,27 @@ class HomeDetailFragment @Inject constructor(
                 }
     }
 
+    private fun navigateBack() {
+        try {
+            val lastSpace = appStateHandler.getSpaceBackstack().removeLast()
+            setCurrentSpace(lastSpace)
+        } catch (e: NoSuchElementException) {
+            navigateUpOneSpace()
+        }
+    }
+
+    private fun setCurrentSpace(spaceId: String?) {
+        appStateHandler.setCurrentSpace(spaceId, isForwardNavigation = false)
+        sharedActionViewModel.post(HomeActivitySharedAction.CloseGroup)
+    }
+
+    private fun navigateUpOneSpace() {
+        val parentId = getCurrentSpace()?.flattenParentIds?.lastOrNull()
+        setCurrentSpace(parentId)
+    }
+
+    private fun getCurrentSpace() = (appStateHandler.getCurrentRoomGroupingMethod() as? RoomGroupingMethod.BySpace)?.spaceSummary
+
     private fun handleCallStarted() {
         dismissLoadingDialog()
         val fragmentTag = HomeTab.DialPad.toFragmentTag()
@@ -203,20 +221,16 @@ class HomeDetailFragment @Inject constructor(
 
     override fun onResume() {
         super.onResume()
-        // update notification tab if needed
         updateTabVisibilitySafely(R.id.bottom_action_notification, vectorPreferences.labAddNotificationTab())
         callManager.checkForProtocolsSupportIfNeeded()
+        refreshSpaceState()
+    }
 
-        // Current space/group is not live so at least refresh toolbar on resume
-        appStateHandler.getCurrentRoomGroupingMethod()?.let { roomGroupingMethod ->
-            when (roomGroupingMethod) {
-                is RoomGroupingMethod.ByLegacyGroup -> {
-                    onGroupChange(roomGroupingMethod.groupSummary)
-                }
-                is RoomGroupingMethod.BySpace       -> {
-                    onSpaceChange(roomGroupingMethod.spaceSummary)
-                }
-            }
+    private fun refreshSpaceState() {
+        when (val roomGroupingMethod = appStateHandler.getCurrentRoomGroupingMethod()) {
+            is RoomGroupingMethod.ByLegacyGroup -> onGroupChange(roomGroupingMethod.groupSummary)
+            is RoomGroupingMethod.BySpace       -> onSpaceChange(roomGroupingMethod.spaceSummary)
+            else                                -> Unit
         }
     }
 
@@ -260,12 +274,12 @@ class HomeDetailFragment @Inject constructor(
                     viewBinder = VerificationVectorAlert.ViewBinder(user, avatarRenderer)
                     colorInt = colorProvider.getColorFromAttribute(R.attr.colorPrimary)
                     contentAction = Runnable {
-                        (weakCurrentActivity?.get() as? VectorBaseActivity<*>)?.let {
+                        (weakCurrentActivity?.get() as? VectorBaseActivity<*>)?.let { activity ->
                             // mark as ignored to avoid showing it again
                             unknownDeviceDetectorSharedViewModel.handle(
                                     UnknownDeviceDetectorSharedViewModel.Action.IgnoreDevice(oldUnverified.mapNotNull { it.deviceId })
                             )
-                            it.navigator.openSettings(it, EXTRA_DIRECT_ACCESS_SECURITY_PRIVACY_MANAGE_SESSIONS)
+                            activity.navigator.openSettings(activity, EXTRA_DIRECT_ACCESS_SECURITY_PRIVACY_MANAGE_SESSIONS)
                         }
                     }
                     dismissedAction = Runnable {
@@ -324,11 +338,11 @@ class HomeDetailFragment @Inject constructor(
             withState(viewModel) {
                 when (it.roomGroupingMethod) {
                     is RoomGroupingMethod.ByLegacyGroup -> {
-                        // nothing do far
+                        // do nothing
                     }
                     is RoomGroupingMethod.BySpace       -> {
-                        it.roomGroupingMethod.spaceSummary?.let {
-                            sharedActionViewModel.post(HomeActivitySharedAction.ShowSpaceSettings(it.roomId))
+                        it.roomGroupingMethod.spaceSummary?.let { spaceSummary ->
+                            sharedActionViewModel.post(HomeActivitySharedAction.ShowSpaceSettings(spaceSummary.roomId))
                         }
                     }
                 }
@@ -348,17 +362,6 @@ class HomeDetailFragment @Inject constructor(
             viewModel.handle(HomeDetailAction.SwitchTab(tab))
             true
         }
-
-//        val menuView = bottomNavigationView.getChildAt(0) as BottomNavigationMenuView
-
-//        bottomNavigationView.getOrCreateBadge()
-//        menuView.forEachIndexed { index, view ->
-//            val itemView = view as BottomNavigationItemView
-//            val badgeLayout = LayoutInflater.from(requireContext()).inflate(R.layout.vector_home_badge_unread_layout, menuView, false)
-//            val unreadCounterBadgeView: UnreadCounterBadgeView = badgeLayout.findViewById(R.id.actionUnreadCounterBadgeView)
-//            itemView.addView(badgeLayout)
-//            unreadCounterBadgeViews.add(index, unreadCounterBadgeView)
-//        }
     }
 
     private fun updateUIForTab(tab: HomeTab) {
@@ -436,13 +439,12 @@ class HomeDetailFragment @Inject constructor(
     }
 
     override fun invalidate() = withState(viewModel) {
-//        Timber.v(it.toString())
         views.bottomNavigationView.getOrCreateBadge(R.id.bottom_action_people).render(it.notificationCountPeople, it.notificationHighlightPeople)
         views.bottomNavigationView.getOrCreateBadge(R.id.bottom_action_rooms).render(it.notificationCountRooms, it.notificationHighlightRooms)
         views.bottomNavigationView.getOrCreateBadge(R.id.bottom_action_notification).render(it.notificationCountCatchup, it.notificationHighlightCatchup)
         views.syncStateView.render(
                 it.syncState,
-                it.incrementalSyncStatus,
+                it.incrementalSyncRequestState,
                 it.pushCounter,
                 vectorPreferences.developerShowDebugInfo()
         )
@@ -496,4 +498,11 @@ class HomeDetailFragment @Inject constructor(
         }
         return this
     }
+
+    override fun onBackPressed(toolbarButton: Boolean) = if (getCurrentSpace() != null) {
+        navigateBack()
+        true
+    } else {
+        false
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index a4f1566eff..208f773eac 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -45,14 +45,15 @@ import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.query.ActiveSpaceFilter
 import org.matrix.android.sdk.api.query.RoomCategoryFilter
+import org.matrix.android.sdk.api.query.SpaceFilter
+import org.matrix.android.sdk.api.query.toActiveSpaceOrOrphanRooms
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.NewSessionListener
-import org.matrix.android.sdk.api.session.initsync.SyncStatusService
 import org.matrix.android.sdk.api.session.room.RoomSortOrder
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
+import org.matrix.android.sdk.api.session.sync.SyncRequestState
 import org.matrix.android.sdk.api.util.toMatrixItem
 import org.matrix.android.sdk.flow.flow
 import timber.log.Timber
@@ -198,11 +199,11 @@ class HomeDetailViewModel @AssistedInject constructor(
                     copy(syncState = syncState)
                 }
 
-        session.syncStatusService().getSyncStatusLive()
+        session.syncService().getSyncRequestStateLive()
                 .asFlow()
-                .filterIsInstance<SyncStatusService.Status.IncrementalSyncStatus>()
+                .filterIsInstance<SyncRequestState.IncrementalSyncRequestState>()
                 .setOnEach {
-                    copy(incrementalSyncStatus = it)
+                    copy(incrementalSyncRequestState = it)
                 }
     }
 
@@ -241,7 +242,7 @@ class HomeDetailViewModel @AssistedInject constructor(
                                         roomSummaryQueryParams {
                                             memberships = listOf(Membership.INVITE)
                                             roomCategoryFilter = RoomCategoryFilter.ONLY_DM
-                                            activeSpaceFilter = activeSpaceRoomId?.let { ActiveSpaceFilter.ActiveSpace(it) } ?: ActiveSpaceFilter.None
+                                            spaceFilter = activeSpaceRoomId?.let { SpaceFilter.ActiveSpace(it) }
                                         }
                                 ).size
 
@@ -249,7 +250,7 @@ class HomeDetailViewModel @AssistedInject constructor(
                                         roomSummaryQueryParams {
                                             memberships = listOf(Membership.INVITE)
                                             roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
-                                            activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(groupingMethod.spaceSummary?.roomId)
+                                            spaceFilter = groupingMethod.toActiveSpaceOrOrphanRooms()
                                         }
                                 ).size
                             }
@@ -258,7 +259,7 @@ class HomeDetailViewModel @AssistedInject constructor(
                                     roomSummaryQueryParams {
                                         memberships = listOf(Membership.JOIN)
                                         roomCategoryFilter = RoomCategoryFilter.ONLY_DM
-                                        activeSpaceFilter = activeSpaceRoomId?.let { ActiveSpaceFilter.ActiveSpace(it) } ?: ActiveSpaceFilter.None
+                                        spaceFilter = activeSpaceRoomId?.let { SpaceFilter.ActiveSpace(it) }
                                     }
                             )
 
@@ -266,7 +267,7 @@ class HomeDetailViewModel @AssistedInject constructor(
                                     roomSummaryQueryParams {
                                         memberships = listOf(Membership.JOIN)
                                         roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
-                                        activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(groupingMethod.spaceSummary?.roomId)
+                                        spaceFilter = groupingMethod.toActiveSpaceOrOrphanRooms()
                                     }
                             )
 
@@ -287,4 +288,8 @@ class HomeDetailViewModel @AssistedInject constructor(
                 }
                 .launchIn(viewModelScope)
     }
+
+    private fun RoomGroupingMethod.BySpace.toActiveSpaceOrOrphanRooms(): SpaceFilter? {
+        return spaceSummary?.roomId?.toActiveSpaceOrOrphanRooms()
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
index fbf67cdcff..7b8319d8d1 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
@@ -22,8 +22,8 @@ import com.airbnb.mvrx.MavericksState
 import com.airbnb.mvrx.Uninitialized
 import im.vector.app.R
 import im.vector.app.RoomGroupingMethod
-import org.matrix.android.sdk.api.session.initsync.SyncStatusService
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.sync.SyncRequestState
 import org.matrix.android.sdk.api.session.sync.SyncState
 import org.matrix.android.sdk.api.util.MatrixItem
 
@@ -40,7 +40,7 @@ data class HomeDetailViewState(
         val notificationHighlightRooms: Boolean = false,
         val hasUnreadMessages: Boolean = false,
         val syncState: SyncState = SyncState.Idle,
-        val incrementalSyncStatus: SyncStatusService.Status.IncrementalSyncStatus = SyncStatusService.Status.IncrementalSyncIdle,
+        val incrementalSyncRequestState: SyncRequestState.IncrementalSyncRequestState = SyncRequestState.IncrementalSyncIdle,
         val pushCounter: Int = 0,
         val pstnSupportFlag: Boolean = false,
         val forceDialPadTab: Boolean = false
diff --git a/vector/src/main/java/im/vector/app/features/home/InitSyncStepFormatter.kt b/vector/src/main/java/im/vector/app/features/home/InitSyncStepFormatter.kt
index 51ca96341e..3978bc43d8 100644
--- a/vector/src/main/java/im/vector/app/features/home/InitSyncStepFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/InitSyncStepFormatter.kt
@@ -18,25 +18,25 @@ package im.vector.app.features.home
 
 import im.vector.app.R
 import im.vector.app.core.resources.StringProvider
-import org.matrix.android.sdk.api.session.initsync.InitSyncStep
+import org.matrix.android.sdk.api.session.sync.InitialSyncStep
 import javax.inject.Inject
 
 class InitSyncStepFormatter @Inject constructor(
         private val stringProvider: StringProvider
 ) {
-    fun format(initSyncStep: InitSyncStep): String {
+    fun format(initialSyncStep: InitialSyncStep): String {
         return stringProvider.getString(
-                when (initSyncStep) {
-                    InitSyncStep.ServerComputing              -> R.string.initial_sync_start_server_computing
-                    InitSyncStep.Downloading                  -> R.string.initial_sync_start_downloading
-                    InitSyncStep.ImportingAccount             -> R.string.initial_sync_start_importing_account
-                    InitSyncStep.ImportingAccountCrypto       -> R.string.initial_sync_start_importing_account_crypto
-                    InitSyncStep.ImportingAccountRoom         -> R.string.initial_sync_start_importing_account_rooms
-                    InitSyncStep.ImportingAccountGroups       -> R.string.initial_sync_start_importing_account_groups
-                    InitSyncStep.ImportingAccountData         -> R.string.initial_sync_start_importing_account_data
-                    InitSyncStep.ImportingAccountJoinedRooms  -> R.string.initial_sync_start_importing_account_joined_rooms
-                    InitSyncStep.ImportingAccountInvitedRooms -> R.string.initial_sync_start_importing_account_invited_rooms
-                    InitSyncStep.ImportingAccountLeftRooms    -> R.string.initial_sync_start_importing_account_left_rooms
+                when (initialSyncStep) {
+                    InitialSyncStep.ServerComputing              -> R.string.initial_sync_start_server_computing
+                    InitialSyncStep.Downloading                  -> R.string.initial_sync_start_downloading
+                    InitialSyncStep.ImportingAccount             -> R.string.initial_sync_start_importing_account
+                    InitialSyncStep.ImportingAccountCrypto       -> R.string.initial_sync_start_importing_account_crypto
+                    InitialSyncStep.ImportingAccountRoom         -> R.string.initial_sync_start_importing_account_rooms
+                    InitialSyncStep.ImportingAccountGroups       -> R.string.initial_sync_start_importing_account_groups
+                    InitialSyncStep.ImportingAccountData         -> R.string.initial_sync_start_importing_account_data
+                    InitialSyncStep.ImportingAccountJoinedRooms  -> R.string.initial_sync_start_importing_account_joined_rooms
+                    InitialSyncStep.ImportingAccountInvitedRooms -> R.string.initial_sync_start_importing_account_invited_rooms
+                    InitialSyncStep.ImportingAccountLeftRooms    -> R.string.initial_sync_start_importing_account_left_rooms
                 }
         )
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
index c1b3937fee..6894d883dd 100644
--- a/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
@@ -37,7 +37,7 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOn
-import org.matrix.android.sdk.api.query.ActiveSpaceFilter
+import org.matrix.android.sdk.api.query.SpaceFilter
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.RoomSortOrder
 import org.matrix.android.sdk.api.session.room.model.Membership
@@ -55,11 +55,13 @@ data class CountInfo(
         val otherCount: RoomAggregateNotificationCount
 )
 
-class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initialState: UnreadMessagesState,
-                                                                session: Session,
-                                                                private val vectorPreferences: VectorPreferences,
-                                                                appStateHandler: AppStateHandler,
-                                                                private val autoAcceptInvites: AutoAcceptInvites) :
+class UnreadMessagesSharedViewModel @AssistedInject constructor(
+        @Assisted initialState: UnreadMessagesState,
+        session: Session,
+        private val vectorPreferences: VectorPreferences,
+        appStateHandler: AppStateHandler,
+        private val autoAcceptInvites: AutoAcceptInvites
+) :
         VectorViewModel<UnreadMessagesState, EmptyAction, EmptyViewEvents>(initialState) {
 
     @AssistedFactory
@@ -74,11 +76,10 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initia
     private val roomService = session.roomService()
 
     init {
-
         roomService.getPagedRoomSummariesLive(
                 roomSummaryQueryParams {
                     this.memberships = listOf(Membership.JOIN)
-                    this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null)
+                    this.spaceFilter = SpaceFilter.OrphanRooms
                 }, sortOrder = RoomSortOrder.NONE
         ).asFlow()
                 .throttleFirst(300)
@@ -86,7 +87,7 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initia
                     val counts = roomService.getNotificationCountForRooms(
                             roomSummaryQueryParams {
                                 this.memberships = listOf(Membership.JOIN)
-                                this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null)
+                                this.spaceFilter = SpaceFilter.OrphanRooms
                             }
                     )
                     val invites = if (autoAcceptInvites.hideInvites) {
@@ -95,7 +96,7 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initia
                         roomService.getRoomSummaries(
                                 roomSummaryQueryParams {
                                     this.memberships = listOf(Membership.INVITE)
-                                    this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null)
+                                    this.spaceFilter = SpaceFilter.OrphanRooms
                                 }
                         ).size
                     }
@@ -151,9 +152,9 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initia
                     val totalCount = roomService.getNotificationCountForRooms(
                             roomSummaryQueryParams {
                                 this.memberships = listOf(Membership.JOIN)
-                                this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null).takeIf {
+                                this.spaceFilter = SpaceFilter.OrphanRooms.takeIf {
                                     !vectorPreferences.prefSpacesShowAllRoomInHome()
-                                } ?: ActiveSpaceFilter.None
+                                }
                             }
                     )
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsViewModel.kt
index 112b7e8574..651c323c86 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsViewModel.kt
@@ -31,8 +31,10 @@ import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.flow.flow
 
-class BreadcrumbsViewModel @AssistedInject constructor(@Assisted initialState: BreadcrumbsViewState,
-                                                       private val session: Session) :
+class BreadcrumbsViewModel @AssistedInject constructor(
+        @Assisted initialState: BreadcrumbsViewState,
+        private val session: Session
+) :
         VectorViewModel<BreadcrumbsViewState, EmptyAction, EmptyViewEvents>(initialState) {
 
     @AssistedFactory
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/JumpToBottomViewVisibilityManager.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/JumpToBottomViewVisibilityManager.kt
index 7c0dcbb0d2..58da62d503 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/JumpToBottomViewVisibilityManager.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/JumpToBottomViewVisibilityManager.kt
@@ -31,7 +31,8 @@ class JumpToBottomViewVisibilityManager(
         private val jumpToBottomView: FloatingActionButton,
         private val debouncer: Debouncer,
         recyclerView: RecyclerView,
-        private val layoutManager: LinearLayoutManager) {
+        private val layoutManager: LinearLayoutManager
+) {
 
     init {
         recyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
index f6ea8b76ef..64670c73ac 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
@@ -60,7 +60,8 @@ sealed class RoomDetailAction : VectorViewModelAction {
             val senderId: String?,
             val reason: String,
             val spam: Boolean = false,
-            val inappropriate: Boolean = false) : RoomDetailAction()
+            val inappropriate: Boolean = false
+    ) : RoomDetailAction()
 
     data class IgnoreUser(val userId: String?) : RoomDetailAction()
 
@@ -86,9 +87,11 @@ sealed class RoomDetailAction : VectorViewModelAction {
     object JoinJitsiCall : RoomDetailAction()
     object LeaveJitsiCall : RoomDetailAction()
 
-    data class EnsureNativeWidgetAllowed(val widget: Widget,
-                                         val userJustAccepted: Boolean,
-                                         val grantedEvents: RoomDetailViewEvents) : RoomDetailAction()
+    data class EnsureNativeWidgetAllowed(
+            val widget: Widget,
+            val userJustAccepted: Boolean,
+            val grantedEvents: RoomDetailViewEvents
+    ) : RoomDetailAction()
 
     data class UpdateJoinJitsiCallStatus(val conferenceEvent: ConferenceEvent) : RoomDetailAction()
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt
index b168bfea97..4d57647a1d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt
@@ -75,9 +75,11 @@ sealed class RoomDetailViewEvents : VectorViewEvents {
 
     object OpenIntegrationManager : RoomDetailViewEvents()
     object OpenActiveWidgetBottomSheet : RoomDetailViewEvents()
-    data class RequestNativeWidgetPermission(val widget: Widget,
-                                             val domain: String,
-                                             val grantedEvents: RoomDetailViewEvents) : RoomDetailViewEvents()
+    data class RequestNativeWidgetPermission(
+            val widget: Widget,
+            val domain: String,
+            val grantedEvents: RoomDetailViewEvents
+    ) : RoomDetailViewEvents()
 
     data class StartChatEffect(val type: ChatEffect) : RoomDetailViewEvents()
     object StopChatEffects : RoomDetailViewEvents()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
index e01c5ba3b7..47db50d0d4 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
@@ -22,11 +22,11 @@ import com.airbnb.mvrx.Uninitialized
 import im.vector.app.features.home.room.detail.arguments.TimelineArgs
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.events.model.Event
-import org.matrix.android.sdk.api.session.initsync.SyncStatusService
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.sender.SenderInfo
+import org.matrix.android.sdk.api.session.sync.SyncRequestState
 import org.matrix.android.sdk.api.session.sync.SyncState
 import org.matrix.android.sdk.api.session.threads.ThreadNotificationBadgeState
 import org.matrix.android.sdk.api.session.widgets.model.Widget
@@ -59,7 +59,7 @@ data class RoomDetailViewState(
         val tombstoneEvent: Event? = null,
         val joinUpgradedRoomAsync: Async<String> = Uninitialized,
         val syncState: SyncState = SyncState.Idle,
-        val incrementalSyncStatus: SyncStatusService.Status.IncrementalSyncStatus = SyncStatusService.Status.IncrementalSyncIdle,
+        val incrementalSyncRequestState: SyncRequestState.IncrementalSyncRequestState = SyncRequestState.IncrementalSyncIdle,
         val pushCounter: Int = 0,
         val highlightedEventId: String? = null,
         val unreadState: UnreadState = UnreadState.Unknown,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomMessageTouchHelperCallback.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomMessageTouchHelperCallback.kt
index 1f1124b8c0..5a1342b7da 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomMessageTouchHelperCallback.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomMessageTouchHelperCallback.kt
@@ -98,13 +98,15 @@ class RoomMessageTouchHelperCallback(
         return super.convertToAbsoluteDirection(flags, layoutDirection)
     }
 
-    override fun onChildDraw(c: Canvas,
-                             recyclerView: RecyclerView,
-                             viewHolder: EpoxyViewHolder,
-                             dX: Float,
-                             dY: Float,
-                             actionState: Int,
-                             isCurrentlyActive: Boolean) {
+    override fun onChildDraw(
+            c: Canvas,
+            recyclerView: RecyclerView,
+            viewHolder: EpoxyViewHolder,
+            dX: Float,
+            dY: Float,
+            actionState: Int,
+            isCurrentlyActive: Boolean
+    ) {
         if (actionState == ACTION_STATE_SWIPE) {
             setTouchListener(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive)
         }
@@ -119,13 +121,15 @@ class RoomMessageTouchHelperCallback(
 
     @Suppress("UNUSED_PARAMETER")
     @SuppressLint("ClickableViewAccessibility")
-    private fun setTouchListener(c: Canvas,
-                                 recyclerView: RecyclerView,
-                                 viewHolder: EpoxyViewHolder,
-                                 dX: Float,
-                                 dY: Float,
-                                 actionState: Int,
-                                 isCurrentlyActive: Boolean) {
+    private fun setTouchListener(
+            c: Canvas,
+            recyclerView: RecyclerView,
+            viewHolder: EpoxyViewHolder,
+            dX: Float,
+            dY: Float,
+            actionState: Int,
+            isCurrentlyActive: Boolean
+    ) {
         // TODO can this interfere with other interactions? should i remove it
         recyclerView.setOnTouchListener { _, event ->
             swipeBack = event.action == MotionEvent.ACTION_CANCEL || event.action == MotionEvent.ACTION_UP
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnHighlightedEventCallback.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnHighlightedEventCallback.kt
index 7f652a2eea..3f9d7beb74 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnHighlightedEventCallback.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnHighlightedEventCallback.kt
@@ -25,9 +25,11 @@ import java.util.concurrent.atomic.AtomicReference
 /**
  * This handles scrolling to an event which wasn't yet loaded when scheduled.
  */
-class ScrollOnHighlightedEventCallback(private val recyclerView: RecyclerView,
-                                       private val layoutManager: LinearLayoutManager,
-                                       private val timelineEventController: TimelineEventController) : DefaultListUpdateCallback {
+class ScrollOnHighlightedEventCallback(
+        private val recyclerView: RecyclerView,
+        private val layoutManager: LinearLayoutManager,
+        private val timelineEventController: TimelineEventController
+) : DefaultListUpdateCallback {
 
     private val scheduledEventId = AtomicReference<String?>()
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnNewMessageCallback.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnNewMessageCallback.kt
index 249618e12f..467906ac59 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnNewMessageCallback.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnNewMessageCallback.kt
@@ -23,8 +23,10 @@ import im.vector.app.features.home.room.detail.timeline.item.ItemWithEvents
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import java.util.concurrent.CopyOnWriteArrayList
 
-class ScrollOnNewMessageCallback(private val layoutManager: LinearLayoutManager,
-                                 private val timelineEventController: TimelineEventController) : DefaultListUpdateCallback {
+class ScrollOnNewMessageCallback(
+        private val layoutManager: LinearLayoutManager,
+        private val timelineEventController: TimelineEventController
+) : DefaultListUpdateCallback {
 
     private val newTimelineEventIds = CopyOnWriteArrayList<String>()
     private var forceScroll = false
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/StartCallActionsHandler.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/StartCallActionsHandler.kt
index d75b9ff69d..97cc58e78c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/StartCallActionsHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/StartCallActionsHandler.kt
@@ -35,7 +35,8 @@ class StartCallActionsHandler(
         private val timelineViewModel: TimelineViewModel,
         private val startCallActivityResultLauncher: ActivityResultLauncher<Array<String>>,
         private val showDialogWithMessage: (String) -> Unit,
-        private val onTapToReturnToCall: () -> Unit) {
+        private val onTapToReturnToCall: () -> Unit
+) {
 
     fun onVideoCallClicked() {
         handleCallRequest(true)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
index 635b00c05d..efb50fba97 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
@@ -68,12 +68,16 @@ import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.vanniktech.emoji.EmojiPopup
+import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.core.animations.play
 import im.vector.app.core.dialogs.ConfirmationDialogBuilder
 import im.vector.app.core.dialogs.GalleryOrCameraDialogHelper
 import im.vector.app.core.epoxy.LayoutManagerStateRestorer
 import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.containsRtLOverride
+import im.vector.app.core.extensions.ensureEndsLeftToRight
+import im.vector.app.core.extensions.filterDirectionOverrides
 import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.extensions.setTextOrHide
@@ -221,6 +225,7 @@ import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconInfoContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageFormat
 import org.matrix.android.sdk.api.session.room.model.message.MessageImageInfoContent
@@ -426,7 +431,7 @@ class TimelineFragment @Inject constructor(
 
         timelineViewModel.onEach(
                 RoomDetailViewState::syncState,
-                RoomDetailViewState::incrementalSyncStatus,
+                RoomDetailViewState::incrementalSyncRequestState,
                 RoomDetailViewState::pushCounter
         ) { syncState, incrementalSyncStatus, pushCounter ->
             views.syncStateView.render(
@@ -647,6 +652,13 @@ class TimelineFragment @Inject constructor(
                 )
     }
 
+    private fun navigateToLocationLiveMap() {
+        navigator.openLocationLiveMap(
+                context = requireContext(),
+                roomId = timelineArgs.roomId
+        )
+    }
+
     private fun handleChangeLocationIndicator(event: RoomDetailViewEvents.ChangeLocationIndicator) {
         views.locationLiveStatusIndicator.isVisible = event.isVisible
     }
@@ -706,31 +718,31 @@ class TimelineFragment @Inject constructor(
     }
 
     private fun createEmojiPopup(): EmojiPopup {
-        return EmojiPopup
-                .Builder
-                .fromRootView(views.rootConstraintLayout)
-                .setKeyboardAnimationStyle(R.style.emoji_fade_animation_style)
-                .setOnEmojiPopupShownListener {
+        return EmojiPopup(
+                rootView = views.rootConstraintLayout,
+                keyboardAnimationStyle = R.style.emoji_fade_animation_style,
+                onEmojiPopupShownListener = {
                     views.composerLayout.views.composerEmojiButton.apply {
                         contentDescription = getString(R.string.a11y_close_emoji_picker)
                         setImageResource(R.drawable.ic_keyboard)
                     }
-                }
-                .setOnEmojiPopupDismissListenerLifecycleAware {
+                },
+                onEmojiPopupDismissListener = lifecycleAwareDismissAction {
                     views.composerLayout.views.composerEmojiButton.apply {
                         contentDescription = getString(R.string.a11y_open_emoji_picker)
                         setImageResource(R.drawable.ic_insert_emoji)
                     }
-                }
-                .build(views.composerLayout.views.composerEditText)
+                },
+                editText = views.composerLayout.views.composerEditText
+        )
     }
 
     /**
      *  Ensure dismiss actions only trigger when the fragment is in the started state.
      *  EmojiPopup by default dismisses onViewDetachedFromWindow, this can cause race conditions with onDestroyView.
      */
-    private fun EmojiPopup.Builder.setOnEmojiPopupDismissListenerLifecycleAware(action: () -> Unit): EmojiPopup.Builder {
-        return setOnEmojiPopupDismissListener {
+    private fun lifecycleAwareDismissAction(action: () -> Unit): () -> Unit {
+        return {
             if (lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) {
                 action()
             }
@@ -1230,10 +1242,12 @@ class TimelineFragment @Inject constructor(
         views.composerLayout.views.sendButton.contentDescription = getString(R.string.action_send)
     }
 
-    private fun renderSpecialMode(event: TimelineEvent,
-                                  @DrawableRes iconRes: Int,
-                                  @StringRes descriptionRes: Int,
-                                  defaultContent: String) {
+    private fun renderSpecialMode(
+            event: TimelineEvent,
+            @DrawableRes iconRes: Int,
+            @StringRes descriptionRes: Int,
+            defaultContent: String
+    ) {
         autoCompleter.enterSpecialMode()
         // switch to expanded bar
         views.composerLayout.views.composerRelatedMessageTitle.apply {
@@ -1539,7 +1553,7 @@ class TimelineFragment @Inject constructor(
                     attachmentTypeSelector = AttachmentTypeSelectorView(vectorBaseActivity, vectorBaseActivity.layoutInflater, this@TimelineFragment)
                     attachmentTypeSelector.setAttachmentVisibility(
                             AttachmentTypeSelectorView.Type.LOCATION,
-                            vectorPreferences.isLocationSharingEnabled()
+                            BuildConfig.enableLocationSharing
                     )
                     attachmentTypeSelector.setAttachmentVisibility(
                             AttachmentTypeSelectorView.Type.POLL, !isThreadTimeLine()
@@ -1914,23 +1928,20 @@ class TimelineFragment @Inject constructor(
                         }
                     })
             if (!isManaged) {
-                if (title.isValidUrl() && url.isValidUrl() && URL(title).host != URL(url).host) {
-                    MaterialAlertDialogBuilder(requireActivity(), R.style.ThemeOverlay_Vector_MaterialAlertDialog_NegativeDestructive)
-                            .setTitle(R.string.external_link_confirmation_title)
-                            .setMessage(
-                                    getString(R.string.external_link_confirmation_message, title, url)
-                                            .toSpannable()
-                                            .colorizeMatchingText(url, colorProvider.getColorFromAttribute(R.attr.vctr_content_tertiary))
-                                            .colorizeMatchingText(title, colorProvider.getColorFromAttribute(R.attr.vctr_content_tertiary))
-                            )
-                            .setPositiveButton(R.string._continue) { _, _ ->
-                                openUrlInExternalBrowser(requireContext(), url)
-                            }
-                            .setNegativeButton(R.string.action_cancel, null)
-                            .show()
-                } else {
-                    // Open in external browser, in a new Tab
-                    openUrlInExternalBrowser(requireContext(), url)
+                when {
+                    url.containsRtLOverride()                                                  -> {
+                        displayUrlConfirmationDialog(
+                                seenUrl = title.ensureEndsLeftToRight(),
+                                actualUrl = url.filterDirectionOverrides(),
+                                continueTo = url
+                        )
+                    }
+                    title.isValidUrl() && url.isValidUrl() && URL(title).host != URL(url).host -> {
+                        displayUrlConfirmationDialog(title, url)
+                    }
+                    else                                                                       -> {
+                        openUrlInExternalBrowser(requireContext(), url)
+                    }
                 }
             }
         }
@@ -1938,6 +1949,22 @@ class TimelineFragment @Inject constructor(
         return true
     }
 
+    private fun displayUrlConfirmationDialog(seenUrl: String, actualUrl: String, continueTo: String = actualUrl) {
+        MaterialAlertDialogBuilder(requireActivity(), R.style.ThemeOverlay_Vector_MaterialAlertDialog_NegativeDestructive)
+                .setTitle(R.string.external_link_confirmation_title)
+                .setMessage(
+                        getString(R.string.external_link_confirmation_message, seenUrl, actualUrl)
+                                .toSpannable()
+                                .colorizeMatchingText(actualUrl, colorProvider.getColorFromAttribute(R.attr.vctr_content_tertiary))
+                                .colorizeMatchingText(seenUrl, colorProvider.getColorFromAttribute(R.attr.vctr_content_tertiary))
+                )
+                .setPositiveButton(R.string._continue) { _, _ ->
+                    openUrlInExternalBrowser(requireContext(), continueTo)
+                }
+                .setNegativeButton(R.string.action_cancel, null)
+                .show()
+    }
+
     override fun onUrlLongClicked(url: String): Boolean {
         if (url != getString(R.string.edited_suffix) && url.isValidUrl()) {
             // Copy the url to the clipboard
@@ -1958,10 +1985,12 @@ class TimelineFragment @Inject constructor(
         vectorBaseActivity.notImplemented("encrypted message click")
     }
 
-    override fun onImageMessageClicked(messageImageContent: MessageImageInfoContent,
-                                       mediaData: ImageContentRenderer.Data,
-                                       view: View,
-                                       inMemory: List<AttachmentData>) {
+    override fun onImageMessageClicked(
+            messageImageContent: MessageImageInfoContent,
+            mediaData: ImageContentRenderer.Data,
+            view: View,
+            inMemory: List<AttachmentData>
+    ) {
         navigator.openMediaViewer(
                 activity = requireActivity(),
                 roomId = timelineArgs.roomId,
@@ -2015,6 +2044,9 @@ class TimelineFragment @Inject constructor(
             is MessageLocationContent            -> {
                 handleShowLocationPreview(messageContent, informationData.senderId)
             }
+            is MessageBeaconInfoContent          -> {
+                navigateToLocationLiveMap()
+            }
             else                                 -> {
                 val handled = onThreadSummaryClicked(informationData.eventId, isRootThreadEvent)
                 if (!handled) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
index e81bab3e3e..6e903e40ec 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
@@ -29,7 +29,6 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import im.vector.app.AppStateHandler
-import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
@@ -56,6 +55,8 @@ import im.vector.app.features.home.room.typing.TypingHelper
 import im.vector.app.features.location.LocationSharingServiceConnection
 import im.vector.app.features.notifications.NotificationDrawerManager
 import im.vector.app.features.powerlevel.PowerLevelsFlowFactory
+import im.vector.app.features.raw.wellknown.getOutboundSessionKeySharingStrategyOrDefault
+import im.vector.app.features.raw.wellknown.withElementWellKnown
 import im.vector.app.features.session.coroutineScope
 import im.vector.app.features.settings.VectorDataStore
 import im.vector.app.features.settings.VectorPreferences
@@ -76,6 +77,7 @@ import kotlinx.coroutines.withContext
 import org.matrix.android.sdk.api.MatrixPatterns
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.raw.RawService
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.MXCryptoError
 import org.matrix.android.sdk.api.session.events.model.EventType
@@ -88,7 +90,6 @@ import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.file.FileService
 import org.matrix.android.sdk.api.session.getRoom
-import org.matrix.android.sdk.api.session.initsync.SyncStatusService
 import org.matrix.android.sdk.api.session.room.getStateEvent
 import org.matrix.android.sdk.api.session.room.getTimelineEvent
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
@@ -103,6 +104,7 @@ import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
 import org.matrix.android.sdk.api.session.room.read.ReadService
 import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.sync.SyncRequestState
 import org.matrix.android.sdk.api.session.threads.ThreadNotificationBadgeState
 import org.matrix.android.sdk.api.session.threads.ThreadNotificationState
 import org.matrix.android.sdk.api.session.widgets.model.WidgetType
@@ -118,6 +120,7 @@ class TimelineViewModel @AssistedInject constructor(
         private val vectorDataStore: VectorDataStore,
         private val stringProvider: StringProvider,
         private val session: Session,
+        private val rawService: RawService,
         private val supportedVerificationMethodsProvider: SupportedVerificationMethodsProvider,
         private val stickerPickerActionHandler: StickerPickerActionHandler,
         private val typingHelper: TypingHelper,
@@ -196,8 +199,13 @@ class TimelineViewModel @AssistedInject constructor(
         chatEffectManager.delegate = this
 
         // Ensure to share the outbound session keys with all members
-        if (OutboundSessionKeySharingStrategy.WhenEnteringRoom == BuildConfig.outboundSessionKeySharingStrategy && room.roomCryptoService().isEncrypted()) {
-            prepareForEncryption()
+        if (room.roomCryptoService().isEncrypted()) {
+            rawService.withElementWellKnown(viewModelScope, session.sessionParams) {
+                val strategy = it.getOutboundSessionKeySharingStrategyOrDefault()
+                if (strategy == OutboundSessionKeySharingStrategy.WhenEnteringRoom) {
+                    prepareForEncryption()
+                }
+            }
         }
 
         // If the user had already accepted the invitation in the room list
@@ -211,7 +219,8 @@ class TimelineViewModel @AssistedInject constructor(
             appStateHandler.getCurrentRoomGroupingMethod()?.space().let { currentSpace ->
                 val currentRoomSummary = room.roomSummary() ?: return@let
                 // nothing we are good
-                if (currentSpace == null || !currentRoomSummary.flattenParentIds.contains(currentSpace.roomId)) {
+                if ((currentSpace == null && !vectorPreferences.prefSpacesShowAllRoomInHome()) ||
+                        (currentSpace != null && !currentRoomSummary.flattenParentIds.contains(currentSpace.roomId))) {
                     // take first one or switch to home
                     appStateHandler.setCurrentSpace(
                             currentRoomSummary
@@ -666,10 +675,13 @@ class TimelineViewModel @AssistedInject constructor(
 
     private fun handleComposerFocusChange(action: RoomDetailAction.ComposerFocusChange) {
         // Ensure outbound session keys
-        if (OutboundSessionKeySharingStrategy.WhenTyping == BuildConfig.outboundSessionKeySharingStrategy && room.roomCryptoService().isEncrypted()) {
-            if (action.focused) {
-                // Should we add some rate limit here, or do it only once per model lifecycle?
-                prepareForEncryption()
+        if (room.roomCryptoService().isEncrypted()) {
+            rawService.withElementWellKnown(viewModelScope, session.sessionParams) {
+                val strategy = it.getOutboundSessionKeySharingStrategyOrDefault()
+                if (strategy == OutboundSessionKeySharingStrategy.WhenTyping && action.focused) {
+                    // Should we add some rate limit here, or do it only once per model lifecycle?
+                    prepareForEncryption()
+                }
             }
         }
     }
@@ -1118,11 +1130,11 @@ class TimelineViewModel @AssistedInject constructor(
                     copy(syncState = syncState)
                 }
 
-        session.syncStatusService().getSyncStatusLive()
+        session.syncService().getSyncRequestStateLive()
                 .asFlow()
-                .filterIsInstance<SyncStatusService.Status.IncrementalSyncStatus>()
+                .filterIsInstance<SyncRequestState.IncrementalSyncRequestState>()
                 .setOnEach {
-                    copy(incrementalSyncStatus = it)
+                    copy(incrementalSyncRequestState = it)
                 }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerView.kt
index e77ad66a9f..1522960cc9 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerView.kt
@@ -39,7 +39,8 @@ import im.vector.app.databinding.ComposerLayoutBinding
 class MessageComposerView @JvmOverloads constructor(
         context: Context,
         attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0) : ConstraintLayout(context, attrs, defStyleAttr) {
+        defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
 
     interface Callback : ComposerEditText.Callback {
         fun onCloseRelatedMessage()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsController.kt
index 5246906223..76f2d72456 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsController.kt
@@ -28,9 +28,11 @@ import javax.inject.Inject
 /**
  * Epoxy controller for read receipt event list.
  */
-class DisplayReadReceiptsController @Inject constructor(private val dateFormatter: VectorDateFormatter,
-                                                        private val session: Session,
-                                                        private val avatarRender: AvatarRenderer) :
+class DisplayReadReceiptsController @Inject constructor(
+        private val dateFormatter: VectorDateFormatter,
+        private val session: Session,
+        private val avatarRender: AvatarRenderer
+) :
         TypedEpoxyController<List<ReadReceiptData>>() {
 
     var listener: Listener? = null
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/MessageColorProvider.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/MessageColorProvider.kt
index 2b39eb1e26..8214029a3a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/MessageColorProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/MessageColorProvider.kt
@@ -28,7 +28,8 @@ import javax.inject.Inject
 class MessageColorProvider @Inject constructor(
         private val colorProvider: ColorProvider,
         private val matrixItemColorProvider: MatrixItemColorProvider,
-        private val vectorPreferences: VectorPreferences) {
+        private val vectorPreferences: VectorPreferences
+) {
 
     @ColorInt
     fun getMemberNameTextColor(matrixItem: MatrixItem): Int {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
index a601870ae8..a02eaa3202 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
@@ -131,10 +131,12 @@ class TimelineEventController @Inject constructor(
         fun onEventVisible(event: TimelineEvent)
         fun onRoomCreateLinkClicked(url: String)
         fun onEncryptedMessageClicked(informationData: MessageInformationData, view: View)
-        fun onImageMessageClicked(messageImageContent: MessageImageInfoContent,
-                                  mediaData: ImageContentRenderer.Data,
-                                  view: View,
-                                  inMemory: List<AttachmentData>)
+        fun onImageMessageClicked(
+                messageImageContent: MessageImageInfoContent,
+                mediaData: ImageContentRenderer.Data,
+                view: View,
+                inMemory: List<AttachmentData>
+        )
 
         fun onVideoMessageClicked(messageVideoContent: MessageVideoContent, mediaData: VideoContentRenderer.Data, view: View)
 
@@ -474,10 +476,12 @@ class TimelineEventController @Inject constructor(
         )
     }
 
-    private fun CacheItemData.enrichWithModels(event: TimelineEvent,
-                                               nextEvent: TimelineEvent?,
-                                               position: Int,
-                                               receiptsByEvents: Map<String, List<ReadReceipt>>): CacheItemData {
+    private fun CacheItemData.enrichWithModels(
+            event: TimelineEvent,
+            nextEvent: TimelineEvent?,
+            position: Int,
+            receiptsByEvents: Map<String, List<ReadReceipt>>
+    ): CacheItemData {
         val wantsDateSeparator = wantsDateSeparator(event, nextEvent)
         val mergedHeaderModel = mergedHeaderItemFactory.create(
                 event,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt
index 5f12c2f174..7bf9f536f2 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt
@@ -24,9 +24,11 @@ import im.vector.app.features.home.room.detail.timeline.item.MessageInformationD
 import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageWithAttachmentContent
 
-sealed class EventSharedAction(@StringRes val titleRes: Int,
-                               @DrawableRes val iconResId: Int,
-                               val destructive: Boolean = false) : VectorSharedAction {
+sealed class EventSharedAction(
+        @StringRes val titleRes: Int,
+        @DrawableRes val iconResId: Int,
+        val destructive: Boolean = false
+) : VectorSharedAction {
     object Separator :
             EventSharedAction(0, 0)
 
@@ -52,7 +54,7 @@ sealed class EventSharedAction(@StringRes val titleRes: Int,
             EventSharedAction(R.string.reply_in_thread, R.drawable.ic_reply_in_thread)
 
     object ViewInRoom :
-            EventSharedAction(R.string.view_in_room, R.drawable.ic_thread_view_in_room_menu_item)
+            EventSharedAction(R.string.view_in_room, R.drawable.ic_threads_view_in_room_24)
 
     data class Share(val eventId: String, val messageContent: MessageContent) :
             EventSharedAction(R.string.action_share, R.drawable.ic_share)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
index 4bc513284b..c308164901 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
@@ -280,10 +280,12 @@ class MessageActionsViewModel @AssistedInject constructor(
         }
     }
 
-    private fun ArrayList<EventSharedAction>.addActionsForFailedState(timelineEvent: TimelineEvent,
-                                                                      actionPermissions: ActionPermissions,
-                                                                      messageContent: MessageContent?,
-                                                                      msgType: String?) {
+    private fun ArrayList<EventSharedAction>.addActionsForFailedState(
+            timelineEvent: TimelineEvent,
+            actionPermissions: ActionPermissions,
+            messageContent: MessageContent?,
+            msgType: String?
+    ) {
         val eventId = timelineEvent.eventId
         if (canRetry(timelineEvent, actionPermissions)) {
             add(EventSharedAction.Resend(eventId))
@@ -320,10 +322,12 @@ class MessageActionsViewModel @AssistedInject constructor(
         // TODO sent by me or sufficient power level
     }
 
-    private fun ArrayList<EventSharedAction>.addActionsForSyncedState(timelineEvent: TimelineEvent,
-                                                                      actionPermissions: ActionPermissions,
-                                                                      messageContent: MessageContent?,
-                                                                      msgType: String?) {
+    private fun ArrayList<EventSharedAction>.addActionsForSyncedState(
+            timelineEvent: TimelineEvent,
+            actionPermissions: ActionPermissions,
+            messageContent: MessageContent?,
+            msgType: String?
+    ) {
         val eventId = timelineEvent.eventId
         if (!timelineEvent.root.isRedacted()) {
             if (canReply(timelineEvent, messageContent, actionPermissions)) {
@@ -401,8 +405,8 @@ class MessageActionsViewModel @AssistedInject constructor(
         if (vectorPreferences.developerMode()) {
             if (timelineEvent.isEncrypted() && timelineEvent.root.mCryptoError != null) {
                 val keysBackupService = session.cryptoService().keysBackupService()
-                if (keysBackupService.state == KeysBackupState.NotTrusted ||
-                        (keysBackupService.state == KeysBackupState.ReadyToBackUp &&
+                if (keysBackupService.getState() == KeysBackupState.NotTrusted ||
+                        (keysBackupService.getState() == KeysBackupState.ReadyToBackUp &&
                                 keysBackupService.canRestoreKeys())
                 ) {
                     add(EventSharedAction.UseKeyBackup)
@@ -452,9 +456,11 @@ class MessageActionsViewModel @AssistedInject constructor(
      * Determine whether or not the Reply In Thread bottom sheet action will be visible
      * to the user.
      */
-    private fun canReplyInThread(event: TimelineEvent,
-                                 messageContent: MessageContent?,
-                                 actionPermissions: ActionPermissions): Boolean {
+    private fun canReplyInThread(
+            event: TimelineEvent,
+            messageContent: MessageContent?,
+            actionPermissions: ActionPermissions
+    ): Boolean {
         // We let reply in thread visible even if threads are not enabled, with an enhanced flow to attract users
 //        if (!vectorPreferences.areThreadMessagesEnabled()) return false
         // Disable beta prompt if the homeserver do not support threads
@@ -483,9 +489,11 @@ class MessageActionsViewModel @AssistedInject constructor(
     /**
      * Determine whether or not the view in room action will be available for the current event.
      */
-    private fun canViewInRoom(event: TimelineEvent,
-                              messageContent: MessageContent?,
-                              actionPermissions: ActionPermissions): Boolean {
+    private fun canViewInRoom(
+            event: TimelineEvent,
+            messageContent: MessageContent?,
+            actionPermissions: ActionPermissions
+    ): Boolean {
         if (!vectorPreferences.areThreadMessagesEnabled()) return false
         if (!initialState.isFromThreadTimeline) return false
         if (event.root.getClearType() != EventType.MESSAGE &&
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewState.kt
index dd344c4c82..fc5b58815b 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewState.kt
@@ -26,7 +26,8 @@ data class ViewEditHistoryViewState(
         val eventId: String,
         val roomId: String,
         val isOriginalAReply: Boolean = false,
-        val editList: Async<List<Event>> = Uninitialized) :
+        val editList: Async<List<Event>> = Uninitialized
+) :
         MavericksState {
 
     constructor(args: TimelineEventFragmentArgs) : this(roomId = args.roomId, eventId = args.eventId)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/CallItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/CallItemFactory.kt
index a5d6f75387..6f955b656b 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/CallItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/CallItemFactory.kt
@@ -40,7 +40,8 @@ class CallItemFactory @Inject constructor(
         private val messageInformationDataFactory: MessageInformationDataFactory,
         private val messageItemAttributesFactory: MessageItemAttributesFactory,
         private val avatarSizeProvider: AvatarSizeProvider,
-        private val noticeItemFactory: NoticeItemFactory) {
+        private val noticeItemFactory: NoticeItemFactory
+) {
 
     fun create(params: TimelineItemFactoryParams): VectorEpoxyModel<*>? {
         val event = params.event
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/DefaultItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/DefaultItemFactory.kt
index db7b84ed06..d704003627 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/DefaultItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/DefaultItemFactory.kt
@@ -27,15 +27,19 @@ import im.vector.app.features.home.room.detail.timeline.item.DefaultItem_
 import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData
 import javax.inject.Inject
 
-class DefaultItemFactory @Inject constructor(private val avatarSizeProvider: AvatarSizeProvider,
-                                             private val avatarRenderer: AvatarRenderer,
-                                             private val stringProvider: StringProvider,
-                                             private val informationDataFactory: MessageInformationDataFactory) {
+class DefaultItemFactory @Inject constructor(
+        private val avatarSizeProvider: AvatarSizeProvider,
+        private val avatarRenderer: AvatarRenderer,
+        private val stringProvider: StringProvider,
+        private val informationDataFactory: MessageInformationDataFactory
+) {
 
-    fun create(text: String,
-               informationData: MessageInformationData,
-               highlight: Boolean,
-               callback: TimelineEventController.Callback?): DefaultItem {
+    fun create(
+            text: String,
+            informationData: MessageInformationData,
+            highlight: Boolean,
+            callback: TimelineEventController.Callback?
+    ): DefaultItem {
         val attributes = DefaultItem.Attributes(
                 avatarRenderer = avatarRenderer,
                 informationData = informationData,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt
index dd91f00ab9..ebfb318cc9 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt
@@ -37,13 +37,15 @@ import org.matrix.android.sdk.api.session.events.model.toModel
 import javax.inject.Inject
 
 // This class handles timeline events who haven't been successfully decrypted
-class EncryptedItemFactory @Inject constructor(private val messageInformationDataFactory: MessageInformationDataFactory,
-                                               private val colorProvider: ColorProvider,
-                                               private val stringProvider: StringProvider,
-                                               private val avatarSizeProvider: AvatarSizeProvider,
-                                               private val drawableProvider: DrawableProvider,
-                                               private val attributesFactory: MessageItemAttributesFactory,
-                                               private val vectorPreferences: VectorPreferences) {
+class EncryptedItemFactory @Inject constructor(
+        private val messageInformationDataFactory: MessageInformationDataFactory,
+        private val colorProvider: ColorProvider,
+        private val stringProvider: StringProvider,
+        private val avatarSizeProvider: AvatarSizeProvider,
+        private val drawableProvider: DrawableProvider,
+        private val attributesFactory: MessageItemAttributesFactory,
+        private val vectorPreferences: VectorPreferences
+) {
 
     fun create(params: TimelineItemFactoryParams): VectorEpoxyModel<*>? {
         val event = params.event
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
index 0cbd92f525..dd058197b4 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
@@ -38,7 +38,8 @@ class EncryptionItemFactory @Inject constructor(
         private val stringProvider: StringProvider,
         private val informationDataFactory: MessageInformationDataFactory,
         private val avatarSizeProvider: AvatarSizeProvider,
-        private val session: Session) {
+        private val session: Session
+) {
 
     fun create(params: TimelineItemFactoryParams): StatusTileTimelineItem? {
         val event = params.event
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/LiveLocationShareMessageItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/LiveLocationShareMessageItemFactory.kt
index 479a742369..3c7b6c32e1 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/LiveLocationShareMessageItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/LiveLocationShareMessageItemFactory.kt
@@ -33,7 +33,6 @@ import im.vector.app.features.home.room.detail.timeline.item.MessageLiveLocation
 import im.vector.app.features.location.INITIAL_MAP_ZOOM_IN_TIMELINE
 import im.vector.app.features.location.UrlMapProvider
 import im.vector.app.features.location.toLocationData
-import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.threeten.bp.LocalDateTime
@@ -75,7 +74,8 @@ class LiveLocationShareMessageItemFactory @Inject constructor(
         val height = dimensionConverter.dpToPx(MessageItemFactory.MESSAGE_LOCATION_ITEM_HEIGHT_IN_DP)
 
         return MessageLiveLocationInactiveItem_()
-                .attributes(attributes)
+                // disable the click on this state item
+                .attributes(attributes.copy(itemClickListener = null))
                 .mapWidth(width)
                 .mapHeight(height)
                 .highlighted(highlight)
@@ -90,7 +90,8 @@ class LiveLocationShareMessageItemFactory @Inject constructor(
         val height = dimensionConverter.dpToPx(MessageItemFactory.MESSAGE_LOCATION_ITEM_HEIGHT_IN_DP)
 
         return MessageLiveLocationStartItem_()
-                .attributes(attributes)
+                // disable the click on this state item
+                .attributes(attributes.copy(itemClickListener = null))
                 .mapWidth(width)
                 .mapHeight(height)
                 .highlighted(highlight)
@@ -127,7 +128,7 @@ class LiveLocationShareMessageItemFactory @Inject constructor(
     private fun getViewState(liveLocationShareSummaryData: LiveLocationShareSummaryData?): LiveLocationShareViewState {
         return when {
             liveLocationShareSummaryData?.isActive == null                                                   -> LiveLocationShareViewState.Unkwown
-            liveLocationShareSummaryData.isActive.not() || isLiveTimedOut(liveLocationShareSummaryData)      -> LiveLocationShareViewState.Inactive
+            liveLocationShareSummaryData.isActive.not()                                                      -> LiveLocationShareViewState.Inactive
             liveLocationShareSummaryData.isActive && liveLocationShareSummaryData.lastGeoUri.isNullOrEmpty() -> LiveLocationShareViewState.Loading
             else                                                                                             ->
                 LiveLocationShareViewState.Running(
@@ -137,16 +138,6 @@ class LiveLocationShareMessageItemFactory @Inject constructor(
         }.also { viewState -> Timber.d("computed viewState: $viewState") }
     }
 
-    private fun isLiveTimedOut(liveLocationShareSummaryData: LiveLocationShareSummaryData): Boolean {
-        return getEndOfLiveDateTime(liveLocationShareSummaryData)
-                ?.let { endOfLive ->
-                    // this will only cover users with different timezones but not users with manually time set
-                    val now = LocalDateTime.now()
-                    now.isAfter(endOfLive)
-                }
-                .orFalse()
-    }
-
     private fun getEndOfLiveDateTime(liveLocationShareSummaryData: LiveLocationShareSummaryData): LocalDateTime? {
         return liveLocationShareSummaryData.endOfLiveTimestampMillis?.let { DateProvider.toLocalDateTime(timestamp = it) }
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
index 224c1cdbea..8c39584a94 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
@@ -46,10 +46,12 @@ import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import javax.inject.Inject
 
-class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolder: ActiveSessionHolder,
-                                                  private val avatarRenderer: AvatarRenderer,
-                                                  private val avatarSizeProvider: AvatarSizeProvider,
-                                                  private val timelineEventVisibilityHelper: TimelineEventVisibilityHelper) {
+class MergedHeaderItemFactory @Inject constructor(
+        private val activeSessionHolder: ActiveSessionHolder,
+        private val avatarRenderer: AvatarRenderer,
+        private val avatarSizeProvider: AvatarSizeProvider,
+        private val timelineEventVisibilityHelper: TimelineEventVisibilityHelper
+) {
 
     private val collapsedEventIds = linkedSetOf<Long>()
     private val mergeItemCollapseStates = HashMap<Long, Boolean>()
@@ -65,15 +67,17 @@ class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolde
      * @param callback callback for user event
      * @param requestModelBuild lambda to let the built Item request a model build when the collapse state is changed
      */
-    fun create(event: TimelineEvent,
-               nextEvent: TimelineEvent?,
-               items: List<TimelineEvent>,
-               partialState: TimelineEventController.PartialState,
-               addDaySeparator: Boolean,
-               currentPosition: Int,
-               eventIdToHighlight: String?,
-               callback: TimelineEventController.Callback?,
-               requestModelBuild: () -> Unit): BasedMergedItem<*>? {
+    fun create(
+            event: TimelineEvent,
+            nextEvent: TimelineEvent?,
+            items: List<TimelineEvent>,
+            partialState: TimelineEventController.PartialState,
+            addDaySeparator: Boolean,
+            currentPosition: Int,
+            eventIdToHighlight: String?,
+            callback: TimelineEventController.Callback?,
+            requestModelBuild: () -> Unit
+    ): BasedMergedItem<*>? {
         return if (nextEvent?.root?.getClearType() == EventType.STATE_ROOM_CREATE &&
                 event.isRoomConfiguration(nextEvent.root.getClearContent()?.toModel<RoomCreateContent>()?.creator)) {
             // It's the first item before room.create
@@ -86,13 +90,15 @@ class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolde
         }
     }
 
-    private fun buildMembershipEventsMergedSummary(currentPosition: Int,
-                                                   items: List<TimelineEvent>,
-                                                   partialState: TimelineEventController.PartialState,
-                                                   event: TimelineEvent,
-                                                   eventIdToHighlight: String?,
-                                                   requestModelBuild: () -> Unit,
-                                                   callback: TimelineEventController.Callback?): MergedSimilarEventsItem_? {
+    private fun buildMembershipEventsMergedSummary(
+            currentPosition: Int,
+            items: List<TimelineEvent>,
+            partialState: TimelineEventController.PartialState,
+            event: TimelineEvent,
+            eventIdToHighlight: String?,
+            requestModelBuild: () -> Unit,
+            callback: TimelineEventController.Callback?
+    ): MergedSimilarEventsItem_? {
         val mergedEvents = timelineEventVisibilityHelper.prevSameTypeEvents(
                 items,
                 currentPosition,
@@ -134,9 +140,9 @@ class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolde
             }
             val mergeId = mergedEventIds.joinToString(separator = "_") { it.toString() }
             val summaryTitleResId = when (event.root.getClearType()) {
-                EventType.STATE_ROOM_MEMBER     -> R.plurals.membership_changes
+                EventType.STATE_ROOM_MEMBER -> R.plurals.membership_changes
                 EventType.STATE_ROOM_SERVER_ACL -> R.plurals.notice_room_server_acl_changes
-                else                            -> null
+                else -> null
             }
             summaryTitleResId?.let { summaryTitle ->
                 val attributes = MergedSimilarEventsItem.Attributes(
@@ -161,13 +167,15 @@ class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolde
         }
     }
 
-    private fun buildRoomCreationMergedSummary(currentPosition: Int,
-                                               items: List<TimelineEvent>,
-                                               partialState: TimelineEventController.PartialState,
-                                               event: TimelineEvent,
-                                               eventIdToHighlight: String?,
-                                               requestModelBuild: () -> Unit,
-                                               callback: TimelineEventController.Callback?): MergedRoomCreationItem_? {
+    private fun buildRoomCreationMergedSummary(
+            currentPosition: Int,
+            items: List<TimelineEvent>,
+            partialState: TimelineEventController.PartialState,
+            event: TimelineEvent,
+            eventIdToHighlight: String?,
+            requestModelBuild: () -> Unit,
+            callback: TimelineEventController.Callback?
+    ): MergedRoomCreationItem_? {
         var prevEvent = items.prevOrNull(currentPosition)
         var tmpPos = currentPosition - 1
         val mergedEvents = mutableListOf(event)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
index 13f783cded..19ae4e873d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
@@ -209,13 +209,7 @@ class MessageItemFactory @Inject constructor(
             is MessageAudioContent               -> buildAudioContent(params, messageContent, informationData, highlight, attributes)
             is MessageVerificationRequestContent -> buildVerificationRequestMessageItem(messageContent, informationData, highlight, callback, attributes)
             is MessagePollContent                -> buildPollItem(messageContent, informationData, highlight, callback, attributes)
-            is MessageLocationContent            -> {
-                if (vectorPreferences.labsRenderLocationsInTimeline()) {
-                    buildLocationItem(messageContent, informationData, highlight, attributes)
-                } else {
-                    buildMessageTextItem(messageContent.body, false, informationData, highlight, callback, attributes)
-                }
-            }
+            is MessageLocationContent            -> buildLocationItem(messageContent, informationData, highlight, attributes)
             is MessageBeaconInfoContent          -> liveLocationShareMessageItemFactory.create(params.event, highlight, attributes)
             else                                 -> buildNotHandledMessageItem(messageContent, informationData, highlight, callback, attributes)
         }
@@ -501,7 +495,8 @@ class MessageItemFactory @Inject constructor(
             informationData: MessageInformationData,
             highlight: Boolean,
             callback: TimelineEventController.Callback?,
-            attributes: AbsMessageItem.Attributes): MessageTextItem? {
+            attributes: AbsMessageItem.Attributes
+    ): MessageTextItem? {
         // For compatibility reason we should display the body
         return buildMessageTextItem(messageContent.body, false, informationData, highlight, callback, attributes)
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/NoticeItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/NoticeItemFactory.kt
index 6951c3c316..d1f2eaf607 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/NoticeItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/NoticeItemFactory.kt
@@ -26,10 +26,12 @@ import im.vector.lib.core.utils.epoxy.charsequence.EpoxyCharSequence
 import org.matrix.android.sdk.api.extensions.orFalse
 import javax.inject.Inject
 
-class NoticeItemFactory @Inject constructor(private val eventFormatter: NoticeEventFormatter,
-                                            private val avatarRenderer: AvatarRenderer,
-                                            private val informationDataFactory: MessageInformationDataFactory,
-                                            private val avatarSizeProvider: AvatarSizeProvider) {
+class NoticeItemFactory @Inject constructor(
+        private val eventFormatter: NoticeEventFormatter,
+        private val avatarRenderer: AvatarRenderer,
+        private val informationDataFactory: MessageInformationDataFactory,
+        private val avatarSizeProvider: AvatarSizeProvider
+) {
 
     fun create(params: TimelineItemFactoryParams): NoticeItem? {
         val event = params.event
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/ReadReceiptsItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/ReadReceiptsItemFactory.kt
index ed3cc8df53..6a711ec2dc 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/ReadReceiptsItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/ReadReceiptsItemFactory.kt
@@ -30,7 +30,8 @@ class ReadReceiptsItemFactory @Inject constructor(private val avatarRenderer: Av
             eventId: String,
             readReceipts: List<ReadReceipt>,
             callback: TimelineEventController.Callback?,
-            isFromThreadTimeLine: Boolean): ReadReceiptsItem? {
+            isFromThreadTimeLine: Boolean
+    ): ReadReceiptsItem? {
         if (readReceipts.isEmpty()) {
             return null
         }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/RoomCreateItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/RoomCreateItemFactory.kt
index fff709f346..33851c808a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/RoomCreateItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/RoomCreateItemFactory.kt
@@ -28,10 +28,12 @@ import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.create.RoomCreateContent
 import javax.inject.Inject
 
-class RoomCreateItemFactory @Inject constructor(private val stringProvider: StringProvider,
-                                                private val userPreferencesProvider: UserPreferencesProvider,
-                                                private val session: Session,
-                                                private val noticeItemFactory: NoticeItemFactory) {
+class RoomCreateItemFactory @Inject constructor(
+        private val stringProvider: StringProvider,
+        private val userPreferencesProvider: UserPreferencesProvider,
+        private val session: Session,
+        private val noticeItemFactory: NoticeItemFactory
+) {
 
     fun create(params: TimelineItemFactoryParams): VectorEpoxyModel<*>? {
         val event = params.event
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
index 07ae9d66c3..3f94c161d7 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
@@ -158,11 +158,13 @@ class TimelineItemFactory @Inject constructor(
         )
     }
 
-    private fun buildEmptyItem(timelineEvent: TimelineEvent,
-                               prevEvent: TimelineEvent?,
-                               highlightedEventId: String?,
-                               rootThreadEventId: String?,
-                               isFromThreadTimeline: Boolean): TimelineEmptyItem {
+    private fun buildEmptyItem(
+            timelineEvent: TimelineEvent,
+            prevEvent: TimelineEvent?,
+            highlightedEventId: String?,
+            rootThreadEventId: String?,
+            isFromThreadTimeline: Boolean
+    ): TimelineEmptyItem {
         val isNotBlank = prevEvent == null || timelineEventVisibilityHelper.shouldShowEvent(
                 timelineEvent = prevEvent,
                 highlightedEventId = highlightedEventId,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/WidgetItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/WidgetItemFactory.kt
index 647b34c626..019028dfd4 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/WidgetItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/WidgetItemFactory.kt
@@ -37,7 +37,8 @@ class WidgetItemFactory @Inject constructor(
         private val avatarSizeProvider: AvatarSizeProvider,
         private val messageColorProvider: MessageColorProvider,
         private val avatarRenderer: AvatarRenderer,
-        private val userPreferencesProvider: UserPreferencesProvider) {
+        private val userPreferencesProvider: UserPreferencesProvider
+) {
 
     fun create(params: TimelineItemFactoryParams): VectorEpoxyModel<*>? {
         val event = params.event
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
index 3c2bdb53ab..aeed9e0a41 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
@@ -146,7 +146,8 @@ class DisplayableEventFormatter @Inject constructor(
 
     fun formatThreadSummary(
             event: Event?,
-            latestEdition: String? = null): CharSequence {
+            latestEdition: String? = null
+    ): CharSequence {
         event ?: return ""
 
         // There event have been edited
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
index 8e06b3ee5d..918118f854 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
@@ -669,11 +669,13 @@ class NoticeEventFormatter @Inject constructor(
         return displayText.toString()
     }
 
-    private fun buildMembershipNotice(event: Event,
-                                      senderName: String?,
-                                      eventContent: RoomMemberContent?,
-                                      prevEventContent: RoomMemberContent?,
-                                      isDm: Boolean): String? {
+    private fun buildMembershipNotice(
+            event: Event,
+            senderName: String?,
+            eventContent: RoomMemberContent?,
+            prevEventContent: RoomMemberContent?,
+            isDm: Boolean
+    ): String? {
         val senderDisplayName = senderName ?: event.senderId ?: ""
         val targetDisplayName = eventContent?.displayName ?: prevEventContent?.displayName ?: event.stateKey ?: ""
         return when (eventContent?.membership) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/AvatarSizeProvider.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/AvatarSizeProvider.kt
index a34c216fad..99b42a8c61 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/AvatarSizeProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/AvatarSizeProvider.kt
@@ -21,8 +21,10 @@ import im.vector.app.features.home.room.detail.timeline.style.TimelineLayoutSett
 import im.vector.app.features.home.room.detail.timeline.style.TimelineLayoutSettingsProvider
 import javax.inject.Inject
 
-class AvatarSizeProvider @Inject constructor(private val dimensionConverter: DimensionConverter,
-                                             private val layoutSettingsProvider: TimelineLayoutSettingsProvider) {
+class AvatarSizeProvider @Inject constructor(
+        private val dimensionConverter: DimensionConverter,
+        private val layoutSettingsProvider: TimelineLayoutSettingsProvider
+) {
 
     private val avatarStyle by lazy {
         when (layoutSettingsProvider.getLayoutSettings()) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentDownloadStateTrackerBinder.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentDownloadStateTrackerBinder.kt
index 8f5f80c834..178007b38a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentDownloadStateTrackerBinder.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentDownloadStateTrackerBinder.kt
@@ -31,8 +31,10 @@ class ContentDownloadStateTrackerBinder @Inject constructor(private val activeSe
 
     private val updateListeners = mutableMapOf<String, ContentDownloadUpdater>()
 
-    fun bind(mxcUrl: String,
-             holder: MessageFileItem.Holder) {
+    fun bind(
+            mxcUrl: String,
+            holder: MessageFileItem.Holder
+    ) {
         activeSessionHolder.getSafeActiveSession()?.also { session ->
             val downloadStateTracker = session.contentDownloadProgressTracker()
             val updateListener = ContentDownloadUpdater(holder)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt
index b8882b3f47..97b2cc6eab 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt
@@ -33,15 +33,19 @@ import org.matrix.android.sdk.api.session.room.send.SendState
 import javax.inject.Inject
 
 @ActivityScoped
-class ContentUploadStateTrackerBinder @Inject constructor(private val activeSessionHolder: ActiveSessionHolder,
-                                                          private val messageColorProvider: MessageColorProvider,
-                                                          private val errorFormatter: ErrorFormatter) {
+class ContentUploadStateTrackerBinder @Inject constructor(
+        private val activeSessionHolder: ActiveSessionHolder,
+        private val messageColorProvider: MessageColorProvider,
+        private val errorFormatter: ErrorFormatter
+) {
 
     private val updateListeners = mutableMapOf<String, ContentUploadStateTracker.UpdateListener>()
 
-    fun bind(eventId: String,
-             isLocalFile: Boolean,
-             progressLayout: ViewGroup) {
+    fun bind(
+            eventId: String,
+            isLocalFile: Boolean,
+            progressLayout: ViewGroup
+    ) {
         activeSessionHolder.getSafeActiveSession()?.also { session ->
             val uploadStateTracker = session.contentUploadProgressTracker()
             val updateListener = ContentMediaProgressUpdater(progressLayout, isLocalFile, messageColorProvider, errorFormatter)
@@ -66,10 +70,12 @@ class ContentUploadStateTrackerBinder @Inject constructor(private val activeSess
     }
 }
 
-private class ContentMediaProgressUpdater(private val progressLayout: ViewGroup,
-                                          private val isLocalFile: Boolean,
-                                          private val messageColorProvider: MessageColorProvider,
-                                          private val errorFormatter: ErrorFormatter) : ContentUploadStateTracker.UpdateListener {
+private class ContentMediaProgressUpdater(
+        private val progressLayout: ViewGroup,
+        private val isLocalFile: Boolean,
+        private val messageColorProvider: MessageColorProvider,
+        private val errorFormatter: ErrorFormatter
+) : ContentUploadStateTracker.UpdateListener {
 
     private val progressBar: ProgressBar = progressLayout.findViewById(R.id.mediaProgressBar)
     private val progressTextView: TextView = progressLayout.findViewById(R.id.mediaProgressTextView)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
index 7874f843e1..55f559e885 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
@@ -32,6 +32,7 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationState
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.content.EncryptedEventContent
+import org.matrix.android.sdk.api.session.events.model.getMsgType
 import org.matrix.android.sdk.api.session.events.model.isAttachmentMessage
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.ReferencesAggregatedContent
@@ -46,10 +47,12 @@ import javax.inject.Inject
 /**
  * This class is responsible of building extra information data associated to a given event.
  */
-class MessageInformationDataFactory @Inject constructor(private val session: Session,
-                                                        private val dateFormatter: VectorDateFormatter,
-                                                        private val messageLayoutFactory: TimelineMessageLayoutFactory,
-                                                        private val reactionsSummaryFactory: ReactionsSummaryFactory) {
+class MessageInformationDataFactory @Inject constructor(
+        private val session: Session,
+        private val dateFormatter: VectorDateFormatter,
+        private val messageLayoutFactory: TimelineMessageLayoutFactory,
+        private val reactionsSummaryFactory: ReactionsSummaryFactory
+) {
 
     fun create(params: TimelineItemFactoryParams): MessageInformationData {
         val event = params.event
@@ -119,12 +122,15 @@ class MessageInformationDataFactory @Inject constructor(private val session: Ses
                 isLastFromThisSender = isLastFromThisSender,
                 e2eDecoration = e2eDecoration,
                 sendStateDecoration = sendStateDecoration,
+                messageType = event.root.getMsgType()
         )
     }
 
-    private fun getSendStateDecoration(event: TimelineEvent,
-                                       lastSentEventWithoutReadReceipts: String?,
-                                       isMedia: Boolean): SendStateDecoration {
+    private fun getSendStateDecoration(
+            event: TimelineEvent,
+            lastSentEventWithoutReadReceipts: String?,
+            isMedia: Boolean
+    ): SendStateDecoration {
         val eventSendState = event.root.sendState
         return if (eventSendState.isSending()) {
             if (isMedia) SendStateDecoration.SENDING_MEDIA else SendStateDecoration.SENDING_NON_MEDIA
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageItemAttributesFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageItemAttributesFactory.kt
index 737b0dc85d..ad7482d9a5 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageItemAttributesFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageItemAttributesFactory.kt
@@ -36,13 +36,16 @@ class MessageItemAttributesFactory @Inject constructor(
         private val stringProvider: StringProvider,
         private val displayableEventFormatter: DisplayableEventFormatter,
         private val preferencesProvider: UserPreferencesProvider,
-        private val emojiCompatFontProvider: EmojiCompatFontProvider) {
+        private val emojiCompatFontProvider: EmojiCompatFontProvider
+) {
 
-    fun create(messageContent: Any?,
-               informationData: MessageInformationData,
-               callback: TimelineEventController.Callback?,
-               reactionsSummaryEvents: ReactionsSummaryEvents?,
-               threadDetails: ThreadDetails? = null): AbsMessageItem.Attributes {
+    fun create(
+            messageContent: Any?,
+            informationData: MessageInformationData,
+            callback: TimelineEventController.Callback?,
+            reactionsSummaryEvents: ReactionsSummaryEvents?,
+            threadDetails: ThreadDetails? = null
+    ): AbsMessageItem.Attributes {
         return AbsMessageItem.Attributes(
                 avatarSize = avatarSizeProvider.avatarSize,
                 informationData = informationData,
@@ -67,7 +70,8 @@ class MessageItemAttributesFactory @Inject constructor(
                 threadSummaryFormatted = displayableEventFormatter.formatThreadSummary(threadDetails?.threadSummaryLatestEvent).toString(),
                 threadDetails = threadDetails,
                 reactionsSummaryEvents = reactionsSummaryEvents,
-                areThreadMessagesEnabled = preferencesProvider.areThreadMessagesEnabled()
+                areThreadMessagesEnabled = preferencesProvider.areThreadMessagesEnabled(),
+                autoplayAnimatedImages = preferencesProvider.autoplayAnimatedImages()
         )
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
index e9361e564c..6739eff010 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
@@ -30,8 +30,9 @@ import kotlin.reflect.KMutableProperty0
 
 private const val DEFAULT_PREFETCH_THRESHOLD = 30
 
-class TimelineControllerInterceptorHelper(private val positionOfReadMarker: KMutableProperty0<Int?>,
-                                          private val adapterPositionMapping: MutableMap<String, Int>
+class TimelineControllerInterceptorHelper(
+        private val positionOfReadMarker: KMutableProperty0<Int?>,
+        private val adapterPositionMapping: MutableMap<String, Int>
 ) {
 
     private var previousModelsSize = 0
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventDiffUtilCallback.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventDiffUtilCallback.kt
index 7aa43a4513..c2569b038b 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventDiffUtilCallback.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventDiffUtilCallback.kt
@@ -19,8 +19,10 @@ package im.vector.app.features.home.room.detail.timeline.helper
 import androidx.recyclerview.widget.DiffUtil
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 
-class TimelineEventDiffUtilCallback(private val oldList: List<TimelineEvent>,
-                                    private val newList: List<TimelineEvent>) : DiffUtil.Callback() {
+class TimelineEventDiffUtilCallback(
+        private val oldList: List<TimelineEvent>,
+        private val newList: List<TimelineEvent>
+) : DiffUtil.Callback() {
 
     override fun getOldListSize(): Int {
         return oldList.size
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt
index 8ca999309a..e4e0ea8352 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt
@@ -47,7 +47,8 @@ class TimelineEventVisibilityHelper @Inject constructor(private val userPreferen
             minSize: Int,
             eventIdToHighlight: String?,
             rootThreadEventId: String?,
-            isFromThreadTimeline: Boolean): List<TimelineEvent> {
+            isFromThreadTimeline: Boolean
+    ): List<TimelineEvent> {
         if (index >= timelineEvents.size - 1) {
             return emptyList()
         }
@@ -99,7 +100,8 @@ class TimelineEventVisibilityHelper @Inject constructor(private val userPreferen
             minSize: Int,
             eventIdToHighlight: String?,
             rootThreadEventId: String?,
-            isFromThreadTimeline: Boolean): List<TimelineEvent> {
+            isFromThreadTimeline: Boolean
+    ): List<TimelineEvent> {
         val prevSub = timelineEvents.subList(0, index + 1)
         return prevSub
                 .reversed()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt
index 53c2f6c0d4..107873b776 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt
@@ -25,8 +25,10 @@ import javax.inject.Inject
 import kotlin.math.roundToInt
 
 @ActivityScoped
-class TimelineMediaSizeProvider @Inject constructor(private val resources: Resources,
-                                                    private val vectorPreferences: VectorPreferences) {
+class TimelineMediaSizeProvider @Inject constructor(
+        private val resources: Resources,
+        private val vectorPreferences: VectorPreferences
+) {
 
     var recyclerView: RecyclerView? = null
     private var cachedSize: Pair<Int, Int>? = null
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineVisibilityStateChangedListeners.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineVisibilityStateChangedListeners.kt
index 95feef83c0..61a7557906 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineVisibilityStateChangedListeners.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineVisibilityStateChangedListeners.kt
@@ -31,8 +31,10 @@ class ReadMarkerVisibilityStateChangedListener(private val callback: TimelineEve
     }
 }
 
-class TimelineEventVisibilityStateChangedListener(private val callback: TimelineEventController.Callback?,
-                                                  private val event: TimelineEvent) :
+class TimelineEventVisibilityStateChangedListener(
+        private val callback: TimelineEventController.Callback?,
+        private val event: TimelineEvent
+) :
         VectorEpoxyModel.OnVisibilityStateChangedListener {
 
     override fun onVisibilityStateChanged(visibilityState: Int) {
@@ -44,8 +46,10 @@ class TimelineEventVisibilityStateChangedListener(private val callback: Timeline
     }
 }
 
-class MergedTimelineEventVisibilityStateChangedListener(private val callback: TimelineEventController.Callback?,
-                                                        private val events: List<TimelineEvent>) :
+class MergedTimelineEventVisibilityStateChangedListener(
+        private val callback: TimelineEventController.Callback?,
+        private val events: List<TimelineEvent>
+) :
         VectorEpoxyModel.OnVisibilityStateChangedListener {
 
     override fun onVisibilityStateChanged(visibilityState: Int) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
index b9d79d5818..24a148885f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
@@ -188,6 +188,7 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder> : AbsBaseMessageItem<H>
             val threadSummaryFormatted: String? = null,
             val threadDetails: ThreadDetails? = null,
             val areThreadMessagesEnabled: Boolean = false,
+            val autoplayAnimatedImages: Boolean = false,
             override val reactionsSummaryEvents: ReactionsSummaryEvents? = null,
     ) : AbsBaseMessageItem.Attributes {
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageLocationItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageLocationItem.kt
index e7823845fa..935d5e9aa1 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageLocationItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageLocationItem.kt
@@ -77,20 +77,24 @@ abstract class AbsMessageLocationItem<H : AbsMessageLocationItem.Holder> : AbsMe
                 .apply(RequestOptions.centerCropTransform())
                 .placeholder(holder.staticMapImageView.drawable)
                 .listener(object : RequestListener<Drawable> {
-                    override fun onLoadFailed(e: GlideException?,
-                                              model: Any?,
-                                              target: Target<Drawable>?,
-                                              isFirstResource: Boolean): Boolean {
+                    override fun onLoadFailed(
+                            e: GlideException?,
+                            model: Any?,
+                            target: Target<Drawable>?,
+                            isFirstResource: Boolean
+                    ): Boolean {
                         holder.staticMapPinImageView.setImageResource(R.drawable.ic_location_pin_failed)
                         holder.staticMapErrorTextView.isVisible = true
                         return false
                     }
 
-                    override fun onResourceReady(resource: Drawable?,
-                                                 model: Any?,
-                                                 target: Target<Drawable>?,
-                                                 dataSource: DataSource?,
-                                                 isFirstResource: Boolean): Boolean {
+                    override fun onResourceReady(
+                            resource: Drawable?,
+                            model: Any?,
+                            target: Target<Drawable>?,
+                            dataSource: DataSource?,
+                            isFirstResource: Boolean
+                    ): Boolean {
                         locationPinProvider?.create(locationUserId) { pinDrawable ->
                             // we are not using Glide since it does not display it correctly when there is no user photo
                             holder.staticMapPinImageView.setImageDrawable(pinDrawable)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
index 8485c40ef9..f3ab0e838b 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
@@ -34,6 +34,7 @@ import im.vector.app.features.home.room.detail.timeline.helper.ContentUploadStat
 import im.vector.app.features.home.room.detail.timeline.style.TimelineMessageLayout
 import im.vector.app.features.home.room.detail.timeline.style.granularRoundedCorners
 import im.vector.app.features.media.ImageContentRenderer
+import org.matrix.android.sdk.api.session.room.model.message.MessageType
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base)
 abstract class MessageImageVideoItem : AbsMessageItem<MessageImageVideoItem.Holder>() {
@@ -80,7 +81,17 @@ abstract class MessageImageVideoItem : AbsMessageItem<MessageImageVideoItem.Hold
         ViewCompat.setTransitionName(holder.imageView, "imagePreview_${id()}")
         holder.mediaContentView.onClick(attributes.itemClickListener)
         holder.mediaContentView.setOnLongClickListener(attributes.itemLongClickListener)
-        holder.playContentView.visibility = if (playable) View.VISIBLE else View.GONE
+
+        val isImageMessage = attributes.informationData.messageType == MessageType.MSGTYPE_IMAGE
+        val autoplayAnimatedImages = attributes.autoplayAnimatedImages
+
+        holder.playContentView.visibility = if (playable && isImageMessage && autoplayAnimatedImages) {
+            View.GONE
+        } else if (playable) {
+            View.VISIBLE
+        } else {
+            View.GONE
+        }
     }
 
     override fun unbind(holder: Holder) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
index 258424c7de..554dd0ada8 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
@@ -43,6 +43,7 @@ data class MessageInformationData(
         val sendStateDecoration: SendStateDecoration = SendStateDecoration.NONE,
         val isFirstFromThisSender: Boolean = false,
         val isLastFromThisSender: Boolean = false,
+        val messageType: String? = null
 ) : Parcelable {
 
     val matrixItem: MatrixItem
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/PollOptionViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/PollOptionViewState.kt
index fe17f9e9e7..826c6c5395 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/PollOptionViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/PollOptionViewState.kt
@@ -16,47 +16,54 @@
 
 package im.vector.app.features.home.room.detail.timeline.item
 
-sealed class PollOptionViewState(open val optionId: String,
-                                 open val optionAnswer: String) {
+sealed class PollOptionViewState(
+        open val optionId: String,
+        open val optionAnswer: String
+) {
     /**
      * Represents a poll that is not sent to the server yet.
      */
-    data class PollSending(override val optionId: String,
-                           override val optionAnswer: String
+    data class PollSending(
+            override val optionId: String,
+            override val optionAnswer: String
     ) : PollOptionViewState(optionId, optionAnswer)
 
     /**
      * Represents a poll that is sent but not voted by the user.
      */
-    data class PollReady(override val optionId: String,
-                         override val optionAnswer: String
+    data class PollReady(
+            override val optionId: String,
+            override val optionAnswer: String
     ) : PollOptionViewState(optionId, optionAnswer)
 
     /**
      * Represents a poll that user already voted.
      */
-    data class PollVoted(override val optionId: String,
-                         override val optionAnswer: String,
-                         val voteCount: Int,
-                         val votePercentage: Double,
-                         val isSelected: Boolean
+    data class PollVoted(
+            override val optionId: String,
+            override val optionAnswer: String,
+            val voteCount: Int,
+            val votePercentage: Double,
+            val isSelected: Boolean
     ) : PollOptionViewState(optionId, optionAnswer)
 
     /**
      * Represents a poll that is ended.
      */
-    data class PollEnded(override val optionId: String,
-                         override val optionAnswer: String,
-                         val voteCount: Int,
-                         val votePercentage: Double,
-                         val isWinner: Boolean
+    data class PollEnded(
+            override val optionId: String,
+            override val optionAnswer: String,
+            val voteCount: Int,
+            val votePercentage: Double,
+            val isWinner: Boolean
     ) : PollOptionViewState(optionId, optionAnswer)
 
     /**
      * Represent a poll that is undisclosed, votes will be hidden until the poll is ended.
      */
-    data class PollUndisclosed(override val optionId: String,
-                               override val optionAnswer: String,
-                               val isSelected: Boolean
+    data class PollUndisclosed(
+            override val optionId: String,
+            override val optionAnswer: String,
+            val isSelected: Boolean
     ) : PollOptionViewState(optionId, optionAnswer)
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/merged/MergedTimelines.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/merged/MergedTimelines.kt
index a517aab720..58ad08f026 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/merged/MergedTimelines.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/merged/MergedTimelines.kt
@@ -35,7 +35,8 @@ import kotlin.reflect.KMutableProperty0
 class MergedTimelines(
         private val coroutineScope: CoroutineScope,
         private val mainTimeline: Timeline,
-        private val secondaryTimelineParams: SecondaryTimelineParams) : Timeline by mainTimeline {
+        private val secondaryTimelineParams: SecondaryTimelineParams
+) : Timeline by mainTimeline {
 
     data class SecondaryTimelineParams(
             val timeline: Timeline,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsEpoxyController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsEpoxyController.kt
index a4677da1d9..7554885aec 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsEpoxyController.kt
@@ -34,7 +34,8 @@ import javax.inject.Inject
  */
 class ViewReactionsEpoxyController @Inject constructor(
         private val stringProvider: StringProvider,
-        private val emojiSpanify: EmojiSpanify) :
+        private val emojiSpanify: EmojiSpanify
+) :
         TypedEpoxyController<DisplayReactionsViewState>() {
 
     var listener: Listener? = null
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsViewModel.kt
index 1c9127aa1e..1ce4341167 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsViewModel.kt
@@ -41,7 +41,8 @@ import org.matrix.android.sdk.flow.unwrap
 data class DisplayReactionsViewState(
         val eventId: String,
         val roomId: String,
-        val mapReactionKeyToMemberList: Async<List<ReactionInfo>> = Uninitialized) :
+        val mapReactionKeyToMemberList: Async<List<ReactionInfo>> = Uninitialized
+) :
         MavericksState {
 
     constructor(args: TimelineEventFragmentArgs) : this(roomId = args.roomId, eventId = args.eventId)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/render/EventTextRenderer.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/render/EventTextRenderer.kt
index 83cffc4279..920f3e3b80 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/render/EventTextRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/render/EventTextRenderer.kt
@@ -30,10 +30,12 @@ import im.vector.app.features.html.PillImageSpan
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.util.MatrixItem
 
-class EventTextRenderer @AssistedInject constructor(@Assisted private val roomId: String?,
-                                                    private val context: Context,
-                                                    private val avatarRenderer: AvatarRenderer,
-                                                    private val sessionHolder: ActiveSessionHolder) {
+class EventTextRenderer @AssistedInject constructor(
+        @Assisted private val roomId: String?,
+        private val context: Context,
+        private val avatarRenderer: AvatarRenderer,
+        private val sessionHolder: ActiveSessionHolder
+) {
 
     /* ==========================================================================================
      * Public api
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
index a0d10a8a75..3d6dee371f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
@@ -34,11 +34,13 @@ import org.matrix.android.sdk.api.session.room.timeline.isEdition
 import org.matrix.android.sdk.api.session.room.timeline.isRootThread
 import javax.inject.Inject
 
-class TimelineMessageLayoutFactory @Inject constructor(private val session: Session,
-                                                       private val layoutSettingsProvider: TimelineLayoutSettingsProvider,
-                                                       private val localeProvider: LocaleProvider,
-                                                       private val resources: Resources,
-                                                       private val vectorPreferences: VectorPreferences) {
+class TimelineMessageLayoutFactory @Inject constructor(
+        private val session: Session,
+        private val layoutSettingsProvider: TimelineLayoutSettingsProvider,
+        private val localeProvider: LocaleProvider,
+        private val resources: Resources,
+        private val vectorPreferences: VectorPreferences
+) {
 
     companion object {
         // Can be rendered in bubbles, other types will fallback to default
@@ -60,16 +62,15 @@ class TimelineMessageLayoutFactory @Inject constructor(private val session: Sess
                 MessageType.MSGTYPE_STICKER_LOCAL,
                 MessageType.MSGTYPE_EMOTE,
                 MessageType.MSGTYPE_BEACON_INFO,
+                MessageType.MSGTYPE_LOCATION,
+                MessageType.MSGTYPE_BEACON_LOCATION_DATA,
         )
         private val MSG_TYPES_WITH_TIMESTAMP_INSIDE_MESSAGE = setOf(
                 MessageType.MSGTYPE_IMAGE,
                 MessageType.MSGTYPE_VIDEO,
                 MessageType.MSGTYPE_BEACON_INFO,
-        )
-
-        private val MSG_TYPES_WITH_LOCATION_DATA = setOf(
                 MessageType.MSGTYPE_LOCATION,
-                MessageType.MSGTYPE_BEACON_LOCATION_DATA
+                MessageType.MSGTYPE_BEACON_LOCATION_DATA,
         )
     }
 
@@ -145,14 +146,12 @@ class TimelineMessageLayoutFactory @Inject constructor(private val session: Sess
 
     private fun MessageContent?.isPseudoBubble(): Boolean {
         if (this == null) return false
-        if (msgType == MessageType.MSGTYPE_LOCATION) return vectorPreferences.labsRenderLocationsInTimeline()
         return this.msgType in MSG_TYPES_WITH_PSEUDO_BUBBLE_LAYOUT
     }
 
     private fun MessageContent?.timestampInsideMessage(): Boolean {
         return when {
             this == null                            -> false
-            msgType in MSG_TYPES_WITH_LOCATION_DATA -> vectorPreferences.labsRenderLocationsInTimeline()
             else                                    -> msgType in MSG_TYPES_WITH_TIMESTAMP_INSIDE_MESSAGE
         }
     }
@@ -160,7 +159,6 @@ class TimelineMessageLayoutFactory @Inject constructor(private val session: Sess
     private fun MessageContent?.shouldAddMessageOverlay(): Boolean {
         return when {
             this == null || msgType == MessageType.MSGTYPE_BEACON_INFO -> false
-            msgType == MessageType.MSGTYPE_LOCATION                    -> vectorPreferences.labsRenderLocationsInTimeline()
             else                                                       -> msgType in MSG_TYPES_WITH_TIMESTAMP_INSIDE_MESSAGE
         }
     }
@@ -182,9 +180,11 @@ class TimelineMessageLayoutFactory @Inject constructor(private val session: Sess
         )
     }
 
-    private fun buildCornersRadius(isIncoming: Boolean,
-                                   isFirstFromThisSender: Boolean,
-                                   isLastFromThisSender: Boolean): TimelineMessageLayout.Bubble.CornersRadius {
+    private fun buildCornersRadius(
+            isIncoming: Boolean,
+            isFirstFromThisSender: Boolean,
+            isLastFromThisSender: Boolean
+    ): TimelineMessageLayout.Bubble.CornersRadius {
         return if ((isIncoming && !isRTL) || (!isIncoming && isRTL)) {
             TimelineMessageLayout.Bubble.CornersRadius(
                     topStartRadius = if (isFirstFromThisSender) cornerRadius else 0f,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt
index c97fae055d..eef649dbc0 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt
@@ -25,8 +25,10 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.session.room.timeline.getLatestEventId
 
-class PreviewUrlRetriever(session: Session,
-                          private val coroutineScope: CoroutineScope) {
+class PreviewUrlRetriever(
+        session: Session,
+        private val coroutineScope: CoroutineScope
+) {
     private val mediaService = session.mediaService()
 
     private data class EventIdPreviewUrlUiState(
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlUiState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlUiState.kt
index 29a314d1b3..e0df5c466f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlUiState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlUiState.kt
@@ -35,7 +35,9 @@ sealed class PreviewUrlUiState {
     data class Error(val throwable: Throwable) : PreviewUrlUiState()
 
     // PreviewUrl data
-    data class Data(val eventId: String,
-                    val url: String,
-                    val previewUrlData: PreviewUrlData) : PreviewUrlUiState()
+    data class Data(
+            val eventId: String,
+            val url: String,
+            val previewUrlData: PreviewUrlData
+    ) : PreviewUrlUiState()
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlView.kt
index 69455c767e..50388246f4 100755
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlView.kt
@@ -62,9 +62,11 @@ class PreviewUrlView @JvmOverloads constructor(
      * @param imageContentRenderer the tool to render the image
      * @param force true to force refresh
      */
-    fun render(newState: PreviewUrlUiState,
-               imageContentRenderer: ImageContentRenderer,
-               force: Boolean = false) {
+    fun render(
+            newState: PreviewUrlUiState,
+            imageContentRenderer: ImageContentRenderer,
+            force: Boolean = false
+    ) {
         if (newState == state && !force) {
             return
         }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/upgrade/MigrateRoomBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/upgrade/MigrateRoomBottomSheet.kt
index 03a0e64d9b..3f89b99e59 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/upgrade/MigrateRoomBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/upgrade/MigrateRoomBottomSheet.kt
@@ -149,9 +149,10 @@ class MigrateRoomBottomSheet :
         const val REQUEST_KEY = "MigrateRoomBottomSheetRequest"
         const val BUNDLE_KEY_REPLACEMENT_ROOM = "BUNDLE_KEY_REPLACEMENT_ROOM"
 
-        fun newInstance(roomId: String, newVersion: String,
-                        reason: MigrationReason = MigrationReason.MANUAL,
-                        customDescription: CharSequence? = null
+        fun newInstance(
+                roomId: String, newVersion: String,
+                reason: MigrationReason = MigrationReason.MANUAL,
+                customDescription: CharSequence? = null
         ): MigrateRoomBottomSheet {
             return MigrateRoomBottomSheet().apply {
                 setArguments(Args(roomId, newVersion, reason, customDescription))
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/upgrade/MigrateRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/upgrade/MigrateRoomViewModel.kt
index 50eecb90fb..0a49c2c775 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/upgrade/MigrateRoomViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/upgrade/MigrateRoomViewModel.kt
@@ -35,7 +35,8 @@ import org.matrix.android.sdk.api.session.getRoomSummary
 class MigrateRoomViewModel @AssistedInject constructor(
         @Assisted initialState: MigrateRoomViewState,
         private val session: Session,
-        private val upgradeRoomViewModelTask: UpgradeRoomViewModelTask) :
+        private val upgradeRoomViewModelTask: UpgradeRoomViewModelTask
+) :
         VectorViewModel<MigrateRoomViewState, MigrateRoomAction, EmptyViewEvents>(initialState) {
 
     init {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsController.kt
index 0f91f7b7c6..ef122509a4 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsController.kt
@@ -31,7 +31,8 @@ import javax.inject.Inject
  */
 class RoomWidgetsController @Inject constructor(
         val stringProvider: StringProvider,
-        val colorProvider: ColorProvider) :
+        val colorProvider: ColorProvider
+) :
         TypedEpoxyController<List<Widget>>() {
 
     var listener: Listener? = null
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/CollapsableTypedEpoxyController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/CollapsableTypedEpoxyController.kt
index 8cf7e6bcab..35396d52d5 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/CollapsableTypedEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/CollapsableTypedEpoxyController.kt
@@ -68,7 +68,7 @@ abstract class CollapsableTypedEpoxyController<T> :
     }
 
     override fun buildModels() {
-        check(isBuildingModels()) {
+        check(isBuildingModels) {
             ("You cannot call `buildModels` directly. Call `setData` instead to trigger a model " +
                     "refresh with new data.")
         }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
index 2be6130a5d..674f5022f2 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
@@ -211,7 +211,7 @@ class RoomListFragment @Inject constructor(
             RoomListDisplayMode.NOTIFICATIONS -> views.createChatFabMenu.isVisible = true
             RoomListDisplayMode.PEOPLE        -> views.createChatRoomButton.isVisible = true
             RoomListDisplayMode.ROOMS         -> views.createGroupRoomButton.isVisible = true
-            else                              -> Unit // No button in this mode
+            RoomListDisplayMode.FILTERED      -> Unit // No button in this mode
         }
 
         views.createChatRoomButton.debouncedClicks {
@@ -237,7 +237,7 @@ class RoomListFragment @Inject constructor(
                                     RoomListDisplayMode.NOTIFICATIONS -> views.createChatFabMenu.hide()
                                     RoomListDisplayMode.PEOPLE        -> views.createChatRoomButton.hide()
                                     RoomListDisplayMode.ROOMS         -> views.createGroupRoomButton.hide()
-                                    else                              -> Unit
+                                    RoomListDisplayMode.FILTERED      -> Unit
                                 }
                             }
                         }
@@ -294,7 +294,7 @@ class RoomListFragment @Inject constructor(
             val contentAdapter =
                     when {
                         section.livePages != null     -> {
-                            pagedControllerFactory.createRoomSummaryPagedController()
+                            pagedControllerFactory.createRoomSummaryPagedController(roomListParams.displayMode)
                                     .also { controller ->
                                         section.livePages.observe(viewLifecycleOwner) { pl ->
                                             controller.submitList(pl)
@@ -316,7 +316,7 @@ class RoomListFragment @Inject constructor(
                                                 )
                                             }
                                         }
-                                        section.isExpanded.observe(viewLifecycleOwner) { _ ->
+                                        section.isExpanded.observe(viewLifecycleOwner) {
                                             refreshCollapseStates()
                                         }
                                         controller.listener = this
@@ -337,14 +337,14 @@ class RoomListFragment @Inject constructor(
                                             checkEmptyState()
                                         }
                                         observeItemCount(section, sectionAdapter)
-                                        section.isExpanded.observe(viewLifecycleOwner) { _ ->
+                                        section.isExpanded.observe(viewLifecycleOwner) {
                                             refreshCollapseStates()
                                         }
                                         controller.listener = this
                                     }
                         }
                         else                          -> {
-                            pagedControllerFactory.createRoomSummaryListController()
+                            pagedControllerFactory.createRoomSummaryListController(roomListParams.displayMode)
                                     .also { controller ->
                                         section.liveList?.observe(viewLifecycleOwner) { list ->
                                             controller.setData(list)
@@ -366,7 +366,7 @@ class RoomListFragment @Inject constructor(
                                                 )
                                             }
                                         }
-                                        section.isExpanded.observe(viewLifecycleOwner) { _ ->
+                                        section.isExpanded.observe(viewLifecycleOwner) {
                                             refreshCollapseStates()
                                         }
                                         controller.listener = this
@@ -402,7 +402,7 @@ class RoomListFragment @Inject constructor(
                 RoomListDisplayMode.NOTIFICATIONS -> views.createChatFabMenu.show()
                 RoomListDisplayMode.PEOPLE        -> views.createChatRoomButton.show()
                 RoomListDisplayMode.ROOMS         -> views.createGroupRoomButton.show()
-                else                              -> Unit
+                RoomListDisplayMode.FILTERED      -> Unit
             }
         }
     }
@@ -498,7 +498,7 @@ class RoomListFragment @Inject constructor(
                             isBigImage = true,
                             message = getString(R.string.room_list_rooms_empty_body)
                     )
-                else                              ->
+                RoomListDisplayMode.FILTERED      ->
                     // Always display the content in this mode, because if the footer
                     StateView.State.Content
             }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt
index 80c7b4e921..01fced6489 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt
@@ -38,6 +38,7 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.UpdatableLivePageResult
 import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 
 class RoomListSectionBuilderGroup(
         private val coroutineScope: CoroutineScope,
@@ -70,7 +71,7 @@ class RoomListSectionBuilderGroup(
                         },
                         { qpm ->
                             val name = stringProvider.getString(R.string.bottom_action_rooms)
-                            val updatableFilterLivePageResult = session.roomService().getFilteredPagedRoomSummariesLive(qpm)
+                            val updatableFilterLivePageResult = session.roomService().getFilteredPagedRoomSummariesLive(qpm, getFlattenParents = true)
                             onUpdatable(updatableFilterLivePageResult)
 
                             val itemCountFlow = updatableFilterLivePageResult.livePagedList.asFlow()
@@ -96,7 +97,6 @@ class RoomListSectionBuilderGroup(
                             true
                     ) {
                         it.memberships = listOf(Membership.INVITE)
-                        it.roomCategoryFilter = RoomCategoryFilter.ALL
                         it.activeGroupId = actualGroupId
                     }
                 }
@@ -126,9 +126,11 @@ class RoomListSectionBuilderGroup(
         return sections
     }
 
-    private fun buildRoomsSections(sections: MutableList<RoomsSection>,
-                                   activeSpaceAwareQueries: MutableList<UpdatableLivePageResult>,
-                                   actualGroupId: String?) {
+    private fun buildRoomsSections(
+            sections: MutableList<RoomsSection>,
+            activeSpaceAwareQueries: MutableList<UpdatableLivePageResult>,
+            actualGroupId: String?
+    ) {
         if (autoAcceptInvites.showInvites()) {
             addSection(
                     sections,
@@ -246,11 +248,13 @@ class RoomListSectionBuilderGroup(
         }
     }
 
-    private fun addSection(sections: MutableList<RoomsSection>,
-                           activeSpaceUpdaters: MutableList<UpdatableLivePageResult>,
-                           @StringRes nameRes: Int,
-                           notifyOfLocalEcho: Boolean = false,
-                           query: (RoomSummaryQueryParams.Builder) -> Unit) {
+    private fun addSection(
+            sections: MutableList<RoomsSection>,
+            activeSpaceUpdaters: MutableList<UpdatableLivePageResult>,
+            @StringRes nameRes: Int,
+            notifyOfLocalEcho: Boolean = false,
+            query: (RoomSummaryQueryParams.Builder) -> Unit
+    ) {
         withQueryParams(query) { roomQueryParams ->
             val name = stringProvider.getString(nameRes)
             session.roomService().getFilteredPagedRoomSummariesLive(roomQueryParams)
@@ -281,9 +285,6 @@ class RoomListSectionBuilderGroup(
     }
 
     private fun withQueryParams(builder: (RoomSummaryQueryParams.Builder) -> Unit, block: (RoomSummaryQueryParams) -> Unit) {
-        RoomSummaryQueryParams.Builder()
-                .apply { builder.invoke(this) }
-                .build()
-                .let { block(it) }
+        block(roomSummaryQueryParams { builder.invoke(this) })
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
index 59137ec490..362c446115 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
@@ -43,14 +43,16 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.update
 import org.matrix.android.sdk.api.extensions.tryOrNull
-import org.matrix.android.sdk.api.query.ActiveSpaceFilter
 import org.matrix.android.sdk.api.query.RoomCategoryFilter
 import org.matrix.android.sdk.api.query.RoomTagQueryFilter
+import org.matrix.android.sdk.api.query.SpaceFilter
+import org.matrix.android.sdk.api.query.toActiveSpaceOrOrphanRooms
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.getRoomSummary
 import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.UpdatableLivePageResult
 import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
 import timber.log.Timber
 
@@ -105,8 +107,10 @@ class RoomListSectionBuilderSpace(
         return sections
     }
 
-    private fun buildRoomsSections(sections: MutableList<RoomsSection>,
-                                   activeSpaceAwareQueries: MutableList<RoomListViewModel.ActiveSpaceQueryUpdater>) {
+    private fun buildRoomsSections(
+            sections: MutableList<RoomsSection>,
+            activeSpaceAwareQueries: MutableList<RoomListViewModel.ActiveSpaceQueryUpdater>
+    ) {
         if (autoAcceptInvites.showInvites()) {
             addSection(
                     sections = sections,
@@ -228,8 +232,10 @@ class RoomListSectionBuilderSpace(
         )
     }
 
-    private fun buildDmSections(sections: MutableList<RoomsSection>,
-                                activeSpaceAwareQueries: MutableList<RoomListViewModel.ActiveSpaceQueryUpdater>) {
+    private fun buildDmSections(
+            sections: MutableList<RoomsSection>,
+            activeSpaceAwareQueries: MutableList<RoomListViewModel.ActiveSpaceQueryUpdater>
+    ) {
         if (autoAcceptInvites.showInvites()) {
             addSection(
                     sections = sections,
@@ -281,8 +287,10 @@ class RoomListSectionBuilderSpace(
         }
     }
 
-    private fun buildNotificationsSection(sections: MutableList<RoomsSection>,
-                                          activeSpaceAwareQueries: MutableList<RoomListViewModel.ActiveSpaceQueryUpdater>) {
+    private fun buildNotificationsSection(
+            sections: MutableList<RoomsSection>,
+            activeSpaceAwareQueries: MutableList<RoomListViewModel.ActiveSpaceQueryUpdater>
+    ) {
         if (autoAcceptInvites.showInvites()) {
             addSection(
                     sections = sections,
@@ -297,7 +305,6 @@ class RoomListSectionBuilderSpace(
                     countRoomAsNotif = true
             ) {
                 it.memberships = listOf(Membership.INVITE)
-                it.roomCategoryFilter = RoomCategoryFilter.ALL
             }
         }
 
@@ -323,9 +330,9 @@ class RoomListSectionBuilderSpace(
                 {
                     it.memberships = Membership.activeMemberships()
                 },
-                { qpm ->
+                { queryParams ->
                     val name = stringProvider.getString(R.string.bottom_action_rooms)
-                    val updatableFilterLivePageResult = session.roomService().getFilteredPagedRoomSummariesLive(qpm)
+                    val updatableFilterLivePageResult = session.roomService().getFilteredPagedRoomSummariesLive(queryParams, getFlattenParents = true)
                     onUpdatable(updatableFilterLivePageResult)
 
                     val itemCountFlow = updatableFilterLivePageResult.livePagedList.asFlow()
@@ -343,13 +350,15 @@ class RoomListSectionBuilderSpace(
         )
     }
 
-    private fun addSection(sections: MutableList<RoomsSection>,
-                           activeSpaceUpdaters: MutableList<RoomListViewModel.ActiveSpaceQueryUpdater>,
-                           @StringRes nameRes: Int,
-                           notifyOfLocalEcho: Boolean = false,
-                           spaceFilterStrategy: RoomListViewModel.SpaceFilterStrategy = RoomListViewModel.SpaceFilterStrategy.NONE,
-                           countRoomAsNotif: Boolean = false,
-                           query: (RoomSummaryQueryParams.Builder) -> Unit) {
+    private fun addSection(
+            sections: MutableList<RoomsSection>,
+            activeSpaceUpdaters: MutableList<RoomListViewModel.ActiveSpaceQueryUpdater>,
+            @StringRes nameRes: Int,
+            notifyOfLocalEcho: Boolean = false,
+            spaceFilterStrategy: RoomListViewModel.SpaceFilterStrategy = RoomListViewModel.SpaceFilterStrategy.NONE,
+            countRoomAsNotif: Boolean = false,
+            query: (RoomSummaryQueryParams.Builder) -> Unit
+    ) {
         withQueryParams(query) { roomQueryParams ->
             val updatedQueryParams = roomQueryParams.process(spaceFilterStrategy, appStateHandler.safeActiveSpaceId())
             val liveQueryParams = MutableStateFlow(updatedQueryParams)
@@ -370,7 +379,7 @@ class RoomListSectionBuilderSpace(
                     activeSpaceUpdaters.add(object : RoomListViewModel.ActiveSpaceQueryUpdater {
                         override fun updateForSpaceId(roomId: String?) {
                             filteredPagedRoomSummariesLive.queryParams = roomQueryParams.copy(
-                                    activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(roomId)
+                                    spaceFilter = roomId?.toActiveSpaceOrOrphanRooms()
                             )
                             liveQueryParams.update { filteredPagedRoomSummariesLive.queryParams }
                         }
@@ -381,11 +390,11 @@ class RoomListSectionBuilderSpace(
                         override fun updateForSpaceId(roomId: String?) {
                             if (roomId != null) {
                                 filteredPagedRoomSummariesLive.queryParams = roomQueryParams.copy(
-                                        activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(roomId)
+                                        spaceFilter = SpaceFilter.ActiveSpace(roomId)
                                 )
                             } else {
                                 filteredPagedRoomSummariesLive.queryParams = roomQueryParams.copy(
-                                        activeSpaceFilter = ActiveSpaceFilter.None
+                                        spaceFilter = null
                                 )
                             }
                             liveQueryParams.update { filteredPagedRoomSummariesLive.queryParams }
@@ -429,29 +438,20 @@ class RoomListSectionBuilderSpace(
     }
 
     private fun withQueryParams(builder: (RoomSummaryQueryParams.Builder) -> Unit, block: (RoomSummaryQueryParams) -> Unit) {
-        RoomSummaryQueryParams.Builder()
-                .apply { builder.invoke(this) }
-                .build()
-                .let { block(it) }
+        block(roomSummaryQueryParams { builder.invoke(this) })
     }
 
     internal fun RoomSummaryQueryParams.process(spaceFilter: RoomListViewModel.SpaceFilterStrategy, currentSpace: String?): RoomSummaryQueryParams {
         return when (spaceFilter) {
             RoomListViewModel.SpaceFilterStrategy.ORPHANS_IF_SPACE_NULL -> {
                 copy(
-                        activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(currentSpace)
+                        spaceFilter = currentSpace?.toActiveSpaceOrOrphanRooms()
                 )
             }
             RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL     -> {
-                if (currentSpace == null) {
-                    copy(
-                            activeSpaceFilter = ActiveSpaceFilter.None
-                    )
-                } else {
-                    copy(
-                            activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(currentSpace)
-                    )
-                }
+                copy(
+                        spaceFilter = currentSpace?.let { SpaceFilter.ActiveSpace(it) }
+                )
             }
             RoomListViewModel.SpaceFilterStrategy.NONE                  -> this
         }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
index 70c5846646..5452b03992 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
@@ -18,9 +18,9 @@ package im.vector.app.features.home.room.list
 
 import android.view.HapticFeedbackConstants
 import android.view.View
-import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
@@ -36,6 +36,7 @@ import im.vector.app.core.ui.views.PresenceStateImageView
 import im.vector.app.core.ui.views.ShieldImageView
 import im.vector.app.features.displayname.getBestName
 import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.RoomListDisplayMode
 import im.vector.app.features.themes.ThemeUtils
 import im.vector.lib.core.utils.epoxy.charsequence.EpoxyCharSequence
 import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
@@ -45,48 +46,102 @@ import org.matrix.android.sdk.api.util.MatrixItem
 @EpoxyModelClass(layout = R.layout.item_room)
 abstract class RoomSummaryItem : VectorEpoxyModel<RoomSummaryItem.Holder>() {
 
-    @EpoxyAttribute lateinit var typingMessage: String
-    @EpoxyAttribute lateinit var avatarRenderer: AvatarRenderer
-    @EpoxyAttribute lateinit var matrixItem: MatrixItem
+    @EpoxyAttribute
+    lateinit var typingMessage: String
 
-    @EpoxyAttribute lateinit var lastFormattedEvent: EpoxyCharSequence
-    @EpoxyAttribute lateinit var lastEventTime: String
-    @EpoxyAttribute var encryptionTrustLevel: RoomEncryptionTrustLevel? = null
-    @EpoxyAttribute var userPresence: UserPresence? = null
-    @EpoxyAttribute var showPresence: Boolean = false
-    @EpoxyAttribute var izPublic: Boolean = false
-    @EpoxyAttribute var unreadNotificationCount: Int = 0
-    @EpoxyAttribute var hasUnreadMessage: Boolean = false
-    @EpoxyAttribute var hasDraft: Boolean = false
-    @EpoxyAttribute var showHighlighted: Boolean = false
-    @EpoxyAttribute var hasFailedSending: Boolean = false
-    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var itemLongClickListener: View.OnLongClickListener? = null
-    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var itemClickListener: ClickListener? = null
-    @EpoxyAttribute var showSelected: Boolean = false
+    @EpoxyAttribute
+    lateinit var avatarRenderer: AvatarRenderer
+
+    @EpoxyAttribute
+    lateinit var matrixItem: MatrixItem
+
+    @EpoxyAttribute
+    var displayMode: RoomListDisplayMode = RoomListDisplayMode.PEOPLE
+
+    @EpoxyAttribute
+    lateinit var subtitle: String
+
+    @EpoxyAttribute
+    lateinit var lastFormattedEvent: EpoxyCharSequence
+
+    @EpoxyAttribute
+    lateinit var lastEventTime: String
+
+    @EpoxyAttribute
+    var encryptionTrustLevel: RoomEncryptionTrustLevel? = null
+
+    @EpoxyAttribute
+    var userPresence: UserPresence? = null
+
+    @EpoxyAttribute
+    var showPresence: Boolean = false
+
+    @EpoxyAttribute @JvmField
+    var isPublic: Boolean = false
+
+    @EpoxyAttribute
+    var unreadNotificationCount: Int = 0
+
+    @EpoxyAttribute
+    var hasUnreadMessage: Boolean = false
+
+    @EpoxyAttribute
+    var hasDraft: Boolean = false
+
+    @EpoxyAttribute
+    var showHighlighted: Boolean = false
+
+    @EpoxyAttribute
+    var hasFailedSending: Boolean = false
+
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
+    var itemLongClickListener: View.OnLongClickListener? = null
+
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
+    var itemClickListener: ClickListener? = null
+
+    @EpoxyAttribute
+    var showSelected: Boolean = false
 
     override fun bind(holder: Holder) {
         super.bind(holder)
+
+        renderDisplayMode(holder)
         holder.rootView.onClick(itemClickListener)
         holder.rootView.setOnLongClickListener {
             it.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
             itemLongClickListener?.onLongClick(it) ?: false
         }
         holder.titleView.text = matrixItem.getBestName()
-        holder.lastEventTimeView.text = lastEventTime
-        holder.lastEventView.text = lastFormattedEvent.charSequence
         holder.unreadCounterBadgeView.render(UnreadCounterBadgeView.State(unreadNotificationCount, showHighlighted))
         holder.unreadIndentIndicator.isVisible = hasUnreadMessage
         holder.draftView.isVisible = hasDraft
         avatarRenderer.render(matrixItem, holder.avatarImageView)
         holder.roomAvatarDecorationImageView.render(encryptionTrustLevel)
-        holder.roomAvatarPublicDecorationImageView.isVisible = izPublic
+        holder.roomAvatarPublicDecorationImageView.isVisible = isPublic
         holder.roomAvatarFailSendingImageView.isVisible = hasFailedSending
         renderSelection(holder, showSelected)
-        holder.typingView.setTextOrHide(typingMessage)
-        holder.lastEventView.isInvisible = holder.typingView.isVisible
         holder.roomAvatarPresenceImageView.render(showPresence, userPresence)
     }
 
+    private fun renderDisplayMode(holder: Holder) = when (displayMode) {
+        RoomListDisplayMode.ROOMS,
+        RoomListDisplayMode.PEOPLE,
+        RoomListDisplayMode.NOTIFICATIONS -> renderForDefaultDisplayMode(holder)
+        RoomListDisplayMode.FILTERED      -> renderForFilteredDisplayMode(holder)
+    }
+
+    private fun renderForDefaultDisplayMode(holder: Holder) {
+        holder.subtitleView.text = lastFormattedEvent.charSequence
+        holder.lastEventTimeView.text = lastEventTime
+        holder.typingView.setTextOrHide(typingMessage)
+        holder.subtitleView.isInvisible = holder.typingView.isVisible
+    }
+
+    private fun renderForFilteredDisplayMode(holder: Holder) {
+        holder.subtitleView.text = subtitle
+    }
+
     override fun unbind(holder: Holder) {
         holder.rootView.setOnClickListener(null)
         holder.rootView.setOnLongClickListener(null)
@@ -110,7 +165,7 @@ abstract class RoomSummaryItem : VectorEpoxyModel<RoomSummaryItem.Holder>() {
         val titleView by bind<TextView>(R.id.roomNameView)
         val unreadCounterBadgeView by bind<UnreadCounterBadgeView>(R.id.roomUnreadCounterBadgeView)
         val unreadIndentIndicator by bind<View>(R.id.roomUnreadIndicator)
-        val lastEventView by bind<TextView>(R.id.roomLastEventView)
+        val subtitleView by bind<TextView>(R.id.subtitleView)
         val typingView by bind<TextView>(R.id.roomTypingView)
         val draftView by bind<ImageView>(R.id.roomDraftBadge)
         val lastEventTimeView by bind<TextView>(R.id.roomLastEventTimeView)
@@ -120,6 +175,6 @@ abstract class RoomSummaryItem : VectorEpoxyModel<RoomSummaryItem.Holder>() {
         val roomAvatarPublicDecorationImageView by bind<ImageView>(R.id.roomAvatarPublicDecorationImageView)
         val roomAvatarFailSendingImageView by bind<ImageView>(R.id.roomAvatarFailSendingImageView)
         val roomAvatarPresenceImageView by bind<PresenceStateImageView>(R.id.roomAvatarPresenceImageView)
-        val rootView by bind<ViewGroup>(R.id.itemRoomLayout)
+        val rootView by bind<ConstraintLayout>(R.id.itemRoomLayout)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemCentered.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemCentered.kt
new file mode 100644
index 0000000000..8f2d949178
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemCentered.kt
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.list
+
+import android.view.HapticFeedbackConstants
+import android.view.View
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.isVisible
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import com.amulyakhare.textdrawable.TextDrawable
+import im.vector.app.R
+import im.vector.app.core.epoxy.ClickListener
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.epoxy.onClick
+import im.vector.app.core.ui.views.PresenceStateImageView
+import im.vector.app.core.ui.views.ShieldImageView
+import im.vector.app.features.displayname.getBestName
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.RoomListDisplayMode
+import im.vector.app.features.themes.ThemeUtils
+import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
+import org.matrix.android.sdk.api.session.presence.model.UserPresence
+import org.matrix.android.sdk.api.util.MatrixItem
+
+@EpoxyModelClass(layout = R.layout.item_room_centered)
+abstract class RoomSummaryItemCentered : VectorEpoxyModel<RoomSummaryItemCentered.Holder>() {
+
+    @EpoxyAttribute
+    lateinit var avatarRenderer: AvatarRenderer
+
+    @EpoxyAttribute
+    lateinit var matrixItem: MatrixItem
+
+    @EpoxyAttribute
+    var displayMode: RoomListDisplayMode = RoomListDisplayMode.PEOPLE
+
+    @EpoxyAttribute
+    var encryptionTrustLevel: RoomEncryptionTrustLevel? = null
+
+    @EpoxyAttribute
+    var userPresence: UserPresence? = null
+
+    @EpoxyAttribute
+    var showPresence: Boolean = false
+
+    @EpoxyAttribute @JvmField
+    var isPublic: Boolean = false
+
+    @EpoxyAttribute
+    var unreadNotificationCount: Int = 0
+
+    @EpoxyAttribute
+    var hasUnreadMessage: Boolean = false
+
+    @EpoxyAttribute
+    var hasDraft: Boolean = false
+
+    @EpoxyAttribute
+    var hasFailedSending: Boolean = false
+
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
+    var itemLongClickListener: View.OnLongClickListener? = null
+
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
+    var itemClickListener: ClickListener? = null
+
+    @EpoxyAttribute
+    var showSelected: Boolean = false
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+
+        holder.rootView.onClick(itemClickListener)
+        holder.rootView.setOnLongClickListener {
+            it.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
+            itemLongClickListener?.onLongClick(it) ?: false
+        }
+        holder.titleView.text = matrixItem.getBestName()
+        avatarRenderer.render(matrixItem, holder.avatarImageView)
+        holder.roomAvatarDecorationImageView.render(encryptionTrustLevel)
+        holder.roomAvatarPublicDecorationImageView.isVisible = isPublic
+        holder.roomAvatarFailSendingImageView.isVisible = hasFailedSending
+        renderSelection(holder, showSelected)
+        holder.roomAvatarPresenceImageView.render(showPresence, userPresence)
+    }
+
+    override fun unbind(holder: Holder) {
+        holder.rootView.setOnClickListener(null)
+        holder.rootView.setOnLongClickListener(null)
+        avatarRenderer.clear(holder.avatarImageView)
+        super.unbind(holder)
+    }
+
+    private fun renderSelection(holder: Holder, isSelected: Boolean) {
+        if (isSelected) {
+            holder.avatarCheckedImageView.visibility = View.VISIBLE
+            val backgroundColor = ThemeUtils.getColor(holder.view.context, R.attr.colorPrimary)
+            val backgroundDrawable = TextDrawable.builder().buildRound("", backgroundColor)
+            holder.avatarImageView.setImageDrawable(backgroundDrawable)
+        } else {
+            holder.avatarCheckedImageView.visibility = View.GONE
+            avatarRenderer.render(matrixItem, holder.avatarImageView)
+        }
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val titleView by bind<TextView>(R.id.roomNameView)
+        val avatarCheckedImageView by bind<ImageView>(R.id.roomAvatarCheckedImageView)
+        val avatarImageView by bind<ImageView>(R.id.roomAvatarImageView)
+        val roomAvatarDecorationImageView by bind<ShieldImageView>(R.id.roomAvatarDecorationImageView)
+        val roomAvatarPublicDecorationImageView by bind<ImageView>(R.id.roomAvatarPublicDecorationImageView)
+        val roomAvatarFailSendingImageView by bind<ImageView>(R.id.roomAvatarFailSendingImageView)
+        val roomAvatarPresenceImageView by bind<PresenceStateImageView>(R.id.roomAvatarPresenceImageView)
+        val rootView by bind<ConstraintLayout>(R.id.itemRoomLayout)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
index 6326d9c97a..9b0427792f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
@@ -26,6 +26,7 @@ import im.vector.app.core.epoxy.VectorEpoxyModel
 import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.RoomListDisplayMode
 import im.vector.app.features.home.room.detail.timeline.format.DisplayableEventFormatter
 import im.vector.app.features.home.room.typing.TypingHelper
 import im.vector.lib.core.utils.epoxy.charsequence.toEpoxyCharSequence
@@ -36,29 +37,38 @@ import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
-class RoomSummaryItemFactory @Inject constructor(private val displayableEventFormatter: DisplayableEventFormatter,
-                                                 private val dateFormatter: VectorDateFormatter,
-                                                 private val stringProvider: StringProvider,
-                                                 private val typingHelper: TypingHelper,
-                                                 private val avatarRenderer: AvatarRenderer,
-                                                 private val errorFormatter: ErrorFormatter) {
+class RoomSummaryItemFactory @Inject constructor(
+        private val displayableEventFormatter: DisplayableEventFormatter,
+        private val dateFormatter: VectorDateFormatter,
+        private val stringProvider: StringProvider,
+        private val typingHelper: TypingHelper,
+        private val avatarRenderer: AvatarRenderer,
+        private val errorFormatter: ErrorFormatter
+) {
 
-    fun create(roomSummary: RoomSummary,
-               roomChangeMembershipStates: Map<String, ChangeMembershipState>,
-               selectedRoomIds: Set<String>,
-               listener: RoomListListener?): VectorEpoxyModel<*> {
+    fun create(
+            roomSummary: RoomSummary,
+            roomChangeMembershipStates: Map<String, ChangeMembershipState>,
+            selectedRoomIds: Set<String>,
+            displayMode: RoomListDisplayMode,
+            listener: RoomListListener?
+    ): VectorEpoxyModel<*> {
         return when (roomSummary.membership) {
             Membership.INVITE -> {
                 val changeMembershipState = roomChangeMembershipStates[roomSummary.roomId] ?: ChangeMembershipState.Unknown
                 createInvitationItem(roomSummary, changeMembershipState, listener)
             }
-            else              -> createRoomItem(roomSummary, selectedRoomIds, listener?.let { it::onRoomClicked }, listener?.let { it::onRoomLongClicked })
+            else              -> createRoomItem(
+                    roomSummary, selectedRoomIds, displayMode, listener?.let { it::onRoomClicked }, listener?.let { it::onRoomLongClicked }
+            )
         }
     }
 
-    fun createSuggestion(spaceChildInfo: SpaceChildInfo,
-                         suggestedRoomJoiningStates: Map<String, Async<Unit>>,
-                         listener: RoomListListener?): VectorEpoxyModel<*> {
+    fun createSuggestion(
+            spaceChildInfo: SpaceChildInfo,
+            suggestedRoomJoiningStates: Map<String, Async<Unit>>,
+            listener: RoomListListener?
+    ): VectorEpoxyModel<*> {
         val error = (suggestedRoomJoiningStates[spaceChildInfo.childRoomId] as? Fail)?.error
         return SpaceChildInfoItem_()
                 .id("sug_${spaceChildInfo.childRoomId}")
@@ -80,9 +90,11 @@ class RoomSummaryItemFactory @Inject constructor(private val displayableEventFor
                 .itemClickListener { listener?.onSuggestedRoomClicked(spaceChildInfo) }
     }
 
-    private fun createInvitationItem(roomSummary: RoomSummary,
-                                     changeMembershipState: ChangeMembershipState,
-                                     listener: RoomListListener?): VectorEpoxyModel<*> {
+    private fun createInvitationItem(
+            roomSummary: RoomSummary,
+            changeMembershipState: ChangeMembershipState,
+            listener: RoomListListener?
+    ): VectorEpoxyModel<*> {
         val secondLine = if (roomSummary.isDirect) {
             roomSummary.inviterId
         } else {
@@ -105,9 +117,11 @@ class RoomSummaryItemFactory @Inject constructor(private val displayableEventFor
     fun createRoomItem(
             roomSummary: RoomSummary,
             selectedRoomIds: Set<String>,
+            displayMode: RoomListDisplayMode,
             onClick: ((RoomSummary) -> Unit)?,
             onLongClick: ((RoomSummary) -> Boolean)?
     ): VectorEpoxyModel<*> {
+        val subtitle = getSearchResultSubtitle(roomSummary)
         val unreadCount = roomSummary.notificationCount
         val showHighlighted = roomSummary.highlightCount > 0
         val showSelected = selectedRoomIds.contains(roomSummary.roomId)
@@ -118,28 +132,84 @@ class RoomSummaryItemFactory @Inject constructor(private val displayableEventFor
             latestFormattedEvent = displayableEventFormatter.format(latestEvent, roomSummary.isDirect, roomSummary.isDirect.not())
             latestEventTime = dateFormatter.format(latestEvent.root.originServerTs, DateFormatKind.ROOM_LIST)
         }
+
         val typingMessage = typingHelper.getTypingMessage(roomSummary.typingUsers)
-        return RoomSummaryItem_()
-                .id(roomSummary.roomId)
-                .avatarRenderer(avatarRenderer)
-                // We do not display shield in the room list anymore
-                // .encryptionTrustLevel(roomSummary.roomEncryptionTrustLevel)
-                .izPublic(roomSummary.isPublic)
-                .showPresence(roomSummary.isDirect)
-                .userPresence(roomSummary.directUserPresence)
-                .matrixItem(roomSummary.toMatrixItem())
-                .lastEventTime(latestEventTime)
-                .typingMessage(typingMessage)
-                .lastFormattedEvent(latestFormattedEvent.toEpoxyCharSequence())
-                .showHighlighted(showHighlighted)
-                .showSelected(showSelected)
-                .hasFailedSending(roomSummary.hasFailedSending)
-                .unreadNotificationCount(unreadCount)
-                .hasUnreadMessage(roomSummary.hasUnreadMessages)
-                .hasDraft(roomSummary.userDrafts.isNotEmpty())
-                .itemLongClickListener { _ ->
-                    onLongClick?.invoke(roomSummary) ?: false
-                }
-                .itemClickListener { onClick?.invoke(roomSummary) }
+
+        return if (subtitle.isBlank() && displayMode == RoomListDisplayMode.FILTERED) {
+            createCenteredRoomSummaryItem(roomSummary, displayMode, showSelected, unreadCount, onClick, onLongClick)
+        } else {
+            createRoomSummaryItem(
+                    roomSummary, displayMode, subtitle, latestEventTime, typingMessage,
+                    latestFormattedEvent, showHighlighted, showSelected, unreadCount, onClick, onLongClick
+            )
+        }
+    }
+
+    private fun createRoomSummaryItem(
+            roomSummary: RoomSummary,
+            displayMode: RoomListDisplayMode,
+            subtitle: String,
+            latestEventTime: String,
+            typingMessage: String,
+            latestFormattedEvent: CharSequence,
+            showHighlighted: Boolean,
+            showSelected: Boolean,
+            unreadCount: Int,
+            onClick: ((RoomSummary) -> Unit)?,
+            onLongClick: ((RoomSummary) -> Boolean)?
+    ) = RoomSummaryItem_()
+            .id(roomSummary.roomId)
+            .avatarRenderer(avatarRenderer)
+            // We do not display shield in the room list anymore
+            // .encryptionTrustLevel(roomSummary.roomEncryptionTrustLevel)
+            .displayMode(displayMode)
+            .subtitle(subtitle)
+            .isPublic(roomSummary.isPublic)
+            .showPresence(roomSummary.isDirect)
+            .userPresence(roomSummary.directUserPresence)
+            .matrixItem(roomSummary.toMatrixItem())
+            .lastEventTime(latestEventTime)
+            .typingMessage(typingMessage)
+            .lastFormattedEvent(latestFormattedEvent.toEpoxyCharSequence())
+            .showHighlighted(showHighlighted)
+            .showSelected(showSelected)
+            .hasFailedSending(roomSummary.hasFailedSending)
+            .unreadNotificationCount(unreadCount)
+            .hasUnreadMessage(roomSummary.hasUnreadMessages)
+            .hasDraft(roomSummary.userDrafts.isNotEmpty())
+            .itemLongClickListener { _ -> onLongClick?.invoke(roomSummary) ?: false }
+            .itemClickListener { onClick?.invoke(roomSummary) }
+
+    private fun createCenteredRoomSummaryItem(
+            roomSummary: RoomSummary,
+            displayMode: RoomListDisplayMode,
+            showSelected: Boolean,
+            unreadCount: Int,
+            onClick: ((RoomSummary) -> Unit)?,
+            onLongClick: ((RoomSummary) -> Boolean)?
+    ) = RoomSummaryItemCentered_()
+            .id(roomSummary.roomId)
+            .avatarRenderer(avatarRenderer)
+            // We do not display shield in the room list anymore
+            // .encryptionTrustLevel(roomSummary.roomEncryptionTrustLevel)
+            .displayMode(displayMode)
+            .isPublic(roomSummary.isPublic)
+            .showPresence(roomSummary.isDirect)
+            .userPresence(roomSummary.directUserPresence)
+            .matrixItem(roomSummary.toMatrixItem())
+            .showSelected(showSelected)
+            .hasFailedSending(roomSummary.hasFailedSending)
+            .unreadNotificationCount(unreadCount)
+            .hasUnreadMessage(roomSummary.hasUnreadMessages)
+            .hasDraft(roomSummary.userDrafts.isNotEmpty())
+            .itemLongClickListener { _ -> onLongClick?.invoke(roomSummary) ?: false }
+            .itemClickListener { onClick?.invoke(roomSummary) }
+
+    private fun getSearchResultSubtitle(roomSummary: RoomSummary): String {
+        val userId = roomSummary.directUserId
+        val spaceName = roomSummary.flattenParents.lastOrNull()?.name
+        val canonicalAlias = roomSummary.canonicalAlias
+
+        return (userId ?: spaceName ?: canonicalAlias).orEmpty()
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryListController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryListController.kt
index 75aaee45cb..2eb8921fd5 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryListController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryListController.kt
@@ -16,17 +16,19 @@
 
 package im.vector.app.features.home.room.list
 
+import im.vector.app.features.home.RoomListDisplayMode
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
 class RoomSummaryListController(
-        private val roomSummaryItemFactory: RoomSummaryItemFactory
+        private val roomSummaryItemFactory: RoomSummaryItemFactory,
+        private val displayMode: RoomListDisplayMode
 ) : CollapsableTypedEpoxyController<List<RoomSummary>>() {
 
     var listener: RoomListListener? = null
 
     override fun buildModels(data: List<RoomSummary>?) {
         data?.forEach {
-            add(roomSummaryItemFactory.create(it, emptyMap(), emptySet(), listener))
+            add(roomSummaryItemFactory.create(it, emptyMap(), emptySet(), displayMode, listener))
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt
index e9cbc69215..445438eec9 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt
@@ -19,11 +19,13 @@ package im.vector.app.features.home.room.list
 import com.airbnb.epoxy.EpoxyModel
 import com.airbnb.epoxy.paging.PagedListEpoxyController
 import im.vector.app.core.utils.createUIHandler
+import im.vector.app.features.home.RoomListDisplayMode
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
 class RoomSummaryPagedController(
-        private val roomSummaryItemFactory: RoomSummaryItemFactory
+        private val roomSummaryItemFactory: RoomSummaryItemFactory,
+        private val displayMode: RoomListDisplayMode
 ) : PagedListEpoxyController<RoomSummary>(
         // Important it must match the PageList builder notify Looper
         modelBuildingHandler = createUIHandler()
@@ -57,6 +59,6 @@ class RoomSummaryPagedController(
     override fun buildItemModel(currentPosition: Int, item: RoomSummary?): EpoxyModel<*> {
         // for place holder if enabled
         item ?: return RoomSummaryItemPlaceHolder_().apply { id(currentPosition) }
-        return roomSummaryItemFactory.create(item, roomChangeMembershipStates.orEmpty(), emptySet(), listener)
+        return roomSummaryItemFactory.create(item, roomChangeMembershipStates.orEmpty(), emptySet(), displayMode, listener)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedControllerFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedControllerFactory.kt
index c86d8ab243..f72698048d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedControllerFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedControllerFactory.kt
@@ -16,18 +16,19 @@
 
 package im.vector.app.features.home.room.list
 
+import im.vector.app.features.home.RoomListDisplayMode
 import javax.inject.Inject
 
 class RoomSummaryPagedControllerFactory @Inject constructor(
         private val roomSummaryItemFactory: RoomSummaryItemFactory
 ) {
 
-    fun createRoomSummaryPagedController(): RoomSummaryPagedController {
-        return RoomSummaryPagedController(roomSummaryItemFactory)
+    fun createRoomSummaryPagedController(displayMode: RoomListDisplayMode): RoomSummaryPagedController {
+        return RoomSummaryPagedController(roomSummaryItemFactory, displayMode)
     }
 
-    fun createRoomSummaryListController(): RoomSummaryListController {
-        return RoomSummaryListController(roomSummaryItemFactory)
+    fun createRoomSummaryListController(displayMode: RoomListDisplayMode): RoomSummaryListController {
+        return RoomSummaryListController(roomSummaryItemFactory, displayMode)
     }
 
     fun createSuggestedRoomListController(): SuggestedRoomListController {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt
index 21fbd8b914..0423a8fffc 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt
@@ -24,7 +24,8 @@ import im.vector.app.core.platform.VectorSharedAction
 sealed class RoomListQuickActionsSharedAction(
         @StringRes val titleRes: Int,
         @DrawableRes val iconResId: Int?,
-        val destructive: Boolean = false) :
+        val destructive: Boolean = false
+) :
         VectorSharedAction {
 
     data class NotificationsAllNoisy(val roomId: String) : RoomListQuickActionsSharedAction(
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/widget/NotifsFabMenuView.kt b/vector/src/main/java/im/vector/app/features/home/room/list/widget/NotifsFabMenuView.kt
index 72b58fc7ca..1487c30957 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/widget/NotifsFabMenuView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/widget/NotifsFabMenuView.kt
@@ -24,8 +24,10 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton
 import im.vector.app.R
 import im.vector.app.databinding.MotionNotifsFabMenuMergeBinding
 
-class NotifsFabMenuView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null,
-                                                  defStyleAttr: Int = 0) : MotionLayout(context, attrs, defStyleAttr) {
+class NotifsFabMenuView @JvmOverloads constructor(
+        context: Context, attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : MotionLayout(context, attrs, defStyleAttr) {
 
     private val views: MotionNotifsFabMenuMergeBinding
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListViewModel.kt
index d038b14491..eafad43016 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListViewModel.kt
@@ -37,9 +37,11 @@ import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.threads.ThreadTimelineEvent
 import org.matrix.android.sdk.flow.flow
 
-class ThreadListViewModel @AssistedInject constructor(@Assisted val initialState: ThreadListViewState,
-                                                      private val analyticsTracker: AnalyticsTracker,
-                                                      private val session: Session) :
+class ThreadListViewModel @AssistedInject constructor(
+        @Assisted val initialState: ThreadListViewState,
+        private val analyticsTracker: AnalyticsTracker,
+        private val session: Session
+) :
         VectorViewModel<ThreadListViewState, EmptyAction, EmptyViewEvents>(initialState) {
 
     private val room = session.getRoom(initialState.roomId)
diff --git a/vector/src/main/java/im/vector/app/features/html/PillImageSpan.kt b/vector/src/main/java/im/vector/app/features/html/PillImageSpan.kt
index ae285b074c..b285bef9ec 100644
--- a/vector/src/main/java/im/vector/app/features/html/PillImageSpan.kt
+++ b/vector/src/main/java/im/vector/app/features/html/PillImageSpan.kt
@@ -43,10 +43,11 @@ import java.lang.ref.WeakReference
  * It's needed to call [bind] method to start requesting avatar, otherwise only the placeholder icon will be displayed if not already cached.
  * Implements MatrixItemSpan so that it could be automatically transformed in matrix links and displayed as pills.
  */
-class PillImageSpan(private val glideRequests: GlideRequests,
-                    private val avatarRenderer: AvatarRenderer,
-                    private val context: Context,
-                    override val matrixItem: MatrixItem
+class PillImageSpan(
+        private val glideRequests: GlideRequests,
+        private val avatarRenderer: AvatarRenderer,
+        private val context: Context,
+        override val matrixItem: MatrixItem
 ) : ReplacementSpan(), MatrixItemSpan {
 
     private val pillDrawable = createChipDrawable()
@@ -61,10 +62,12 @@ class PillImageSpan(private val glideRequests: GlideRequests,
 
     // ReplacementSpan *****************************************************************************
 
-    override fun getSize(paint: Paint, text: CharSequence,
-                         start: Int,
-                         end: Int,
-                         fm: Paint.FontMetricsInt?): Int {
+    override fun getSize(
+            paint: Paint, text: CharSequence,
+            start: Int,
+            end: Int,
+            fm: Paint.FontMetricsInt?
+    ): Int {
         val rect = pillDrawable.bounds
         if (fm != null) {
             val fmPaint = paint.fontMetricsInt
@@ -80,14 +83,16 @@ class PillImageSpan(private val glideRequests: GlideRequests,
         return rect.right
     }
 
-    override fun draw(canvas: Canvas, text: CharSequence,
-                      start: Int,
-                      end: Int,
-                      x: Float,
-                      top: Int,
-                      y: Int,
-                      bottom: Int,
-                      paint: Paint) {
+    override fun draw(
+            canvas: Canvas, text: CharSequence,
+            start: Int,
+            end: Int,
+            x: Float,
+            top: Int,
+            y: Int,
+            bottom: Int,
+            paint: Paint
+    ) {
         canvas.save()
         val fm = paint.fontMetricsInt
         val transY: Int = y + (fm.descent + fm.ascent - pillDrawable.bounds.bottom) / 2
diff --git a/vector/src/main/java/im/vector/app/features/html/PillsPostProcessor.kt b/vector/src/main/java/im/vector/app/features/html/PillsPostProcessor.kt
index 2d63d69c35..72519cd97a 100644
--- a/vector/src/main/java/im/vector/app/features/html/PillsPostProcessor.kt
+++ b/vector/src/main/java/im/vector/app/features/html/PillsPostProcessor.kt
@@ -34,10 +34,12 @@ import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.util.MatrixItem
 import org.matrix.android.sdk.api.util.toMatrixItem
 
-class PillsPostProcessor @AssistedInject constructor(@Assisted private val roomId: String?,
-                                                     private val context: Context,
-                                                     private val avatarRenderer: AvatarRenderer,
-                                                     private val sessionHolder: ActiveSessionHolder) :
+class PillsPostProcessor @AssistedInject constructor(
+        @Assisted private val roomId: String?,
+        private val context: Context,
+        private val avatarRenderer: AvatarRenderer,
+        private val sessionHolder: ActiveSessionHolder
+) :
         EventHtmlRenderer.PostProcessor {
 
     /* ==========================================================================================
diff --git a/vector/src/main/java/im/vector/app/features/location/DefaultLocationSharingNavigator.kt b/vector/src/main/java/im/vector/app/features/location/DefaultLocationSharingNavigator.kt
index 8f424af9ec..ec8638fdbb 100644
--- a/vector/src/main/java/im/vector/app/features/location/DefaultLocationSharingNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/location/DefaultLocationSharingNavigator.kt
@@ -17,20 +17,10 @@
 package im.vector.app.features.location
 
 import android.app.Activity
-import im.vector.app.core.utils.openAppSettingsPage
 
 class DefaultLocationSharingNavigator constructor(val activity: Activity?) : LocationSharingNavigator {
 
-    override var goingToAppSettings: Boolean = false
-
     override fun quit() {
         activity?.finish()
     }
-
-    override fun goToAppSettings() {
-        activity?.let {
-            goingToAppSettings = true
-            openAppSettingsPage(it)
-        }
-    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
index cc5586e7f5..89aedf3aa9 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
@@ -32,9 +32,9 @@ import com.mapbox.mapboxsdk.maps.MapView
 import im.vector.app.R
 import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.app.core.platform.VectorBaseFragment
-import im.vector.app.core.utils.PERMISSIONS_FOR_BACKGROUND_LOCATION_SHARING
 import im.vector.app.core.utils.PERMISSIONS_FOR_FOREGROUND_LOCATION_SHARING
 import im.vector.app.core.utils.checkPermissions
+import im.vector.app.core.utils.onPermissionDeniedDialog
 import im.vector.app.core.utils.registerForPermissionsResult
 import im.vector.app.databinding.FragmentLocationSharingBinding
 import im.vector.app.features.home.AvatarRenderer
@@ -100,11 +100,6 @@ class LocationSharingFragment @Inject constructor(
     override fun onResume() {
         super.onResume()
         views.mapView.onResume()
-        if (locationSharingNavigator.goingToAppSettings) {
-            locationSharingNavigator.goingToAppSettings = false
-            // retry to start live location
-            tryStartLiveLocationSharing()
-        }
     }
 
     override fun onPause() {
@@ -162,18 +157,6 @@ class LocationSharingFragment @Inject constructor(
                 .show()
     }
 
-    private fun handleMissingBackgroundLocationPermission() {
-        MaterialAlertDialogBuilder(requireActivity())
-                .setTitle(R.string.location_in_background_missing_permission_dialog_title)
-                .setMessage(R.string.location_in_background_missing_permission_dialog_content)
-                .setPositiveButton(R.string.settings) { _, _ ->
-                    locationSharingNavigator.goToAppSettings()
-                }
-                .setNegativeButton(R.string.action_not_now, null)
-                .setCancelable(false)
-                .show()
-    }
-
     private fun initLocateButton() {
         views.mapView.locateButton.setOnClickListener {
             viewModel.handle(LocationSharingAction.ZoomToUserLocation)
@@ -181,7 +164,7 @@ class LocationSharingFragment @Inject constructor(
     }
 
     private fun handleZoomToUserLocationEvent(event: LocationSharingViewEvents.ZoomToUserLocation) {
-        views.mapView.zoomToLocation(event.userLocation.latitude, event.userLocation.longitude)
+        views.mapView.zoomToLocation(event.userLocation)
     }
 
     private fun handleStartLiveLocationService(event: LocationSharingViewEvents.StartLiveLocationService) {
@@ -212,30 +195,16 @@ class LocationSharingFragment @Inject constructor(
     }
 
     private val foregroundLocationResultLauncher = registerForPermissionsResult { allGranted, deniedPermanently ->
-        if (allGranted && checkPermissions(PERMISSIONS_FOR_BACKGROUND_LOCATION_SHARING, requireActivity(), backgroundLocationResultLauncher)) {
-            startLiveLocationSharing()
-        } else if (deniedPermanently) {
-            handleMissingBackgroundLocationPermission()
-        }
-    }
-
-    private val backgroundLocationResultLauncher = registerForPermissionsResult { allGranted, deniedPermanently ->
         if (allGranted) {
             startLiveLocationSharing()
         } else if (deniedPermanently) {
-            handleMissingBackgroundLocationPermission()
+            activity?.onPermissionDeniedDialog(R.string.denied_permission_generic)
         }
     }
 
     private fun tryStartLiveLocationSharing() {
         // we need to re-check foreground location to be sure it has not changed after landing on this screen
-        if (checkPermissions(PERMISSIONS_FOR_FOREGROUND_LOCATION_SHARING, requireActivity(), foregroundLocationResultLauncher) &&
-                checkPermissions(
-                        PERMISSIONS_FOR_BACKGROUND_LOCATION_SHARING,
-                        requireActivity(),
-                        backgroundLocationResultLauncher,
-                        R.string.location_in_background_missing_permission_dialog_content
-                )) {
+        if (checkPermissions(PERMISSIONS_FOR_FOREGROUND_LOCATION_SHARING, requireActivity(), foregroundLocationResultLauncher)) {
             startLiveLocationSharing()
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingNavigator.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingNavigator.kt
index 8927da9239..6f4759a1e4 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationSharingNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingNavigator.kt
@@ -17,7 +17,5 @@
 package im.vector.app.features.location
 
 interface LocationSharingNavigator {
-    var goingToAppSettings: Boolean
     fun quit()
-    fun goToAppSettings()
 }
diff --git a/vector/src/main/java/im/vector/app/features/location/MapBoxMapExt.kt b/vector/src/main/java/im/vector/app/features/location/MapBoxMapExt.kt
new file mode 100644
index 0000000000..cbfdf1dfda
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/location/MapBoxMapExt.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.location
+
+import com.mapbox.mapboxsdk.camera.CameraPosition
+import com.mapbox.mapboxsdk.constants.MapboxConstants
+import com.mapbox.mapboxsdk.geometry.LatLng
+import com.mapbox.mapboxsdk.geometry.LatLngBounds
+import com.mapbox.mapboxsdk.maps.MapboxMap
+
+fun MapboxMap?.zoomToLocation(locationData: LocationData, preserveCurrentZoomLevel: Boolean = false) {
+    val zoomLevel = if (preserveCurrentZoomLevel && this?.cameraPosition != null) {
+        cameraPosition.zoom
+    } else {
+        INITIAL_MAP_ZOOM_IN_PREVIEW
+    }
+    this?.cameraPosition = CameraPosition.Builder()
+            .target(LatLng(locationData.latitude, locationData.longitude))
+            .zoom(zoomLevel)
+            .build()
+}
+
+fun MapboxMap?.zoomToBounds(latLngBounds: LatLngBounds) {
+    this?.getCameraForLatLngBounds(latLngBounds)?.let { camPosition ->
+        // unZoom a little to avoid having pins exactly at the edges of the map
+        cameraPosition = CameraPosition.Builder(camPosition)
+                .zoom((camPosition.zoom - 1).coerceAtLeast(MapboxConstants.MINIMUM_ZOOM.toDouble()))
+                .build()
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/location/MapTilerMapView.kt b/vector/src/main/java/im/vector/app/features/location/MapTilerMapView.kt
index 69e4e9fc20..dd2a56fb3a 100644
--- a/vector/src/main/java/im/vector/app/features/location/MapTilerMapView.kt
+++ b/vector/src/main/java/im/vector/app/features/location/MapTilerMapView.kt
@@ -25,7 +25,6 @@ import androidx.core.content.ContextCompat
 import androidx.core.view.marginBottom
 import androidx.core.view.marginTop
 import androidx.core.view.updateLayoutParams
-import com.mapbox.mapboxsdk.camera.CameraPosition
 import com.mapbox.mapboxsdk.geometry.LatLng
 import com.mapbox.mapboxsdk.maps.MapView
 import com.mapbox.mapboxsdk.maps.MapboxMap
@@ -164,7 +163,7 @@ class MapTilerMapView @JvmOverloads constructor(
 
         state.userLocationData?.let { locationData ->
             if (!initZoomDone || !state.zoomOnlyOnce) {
-                zoomToLocation(locationData.latitude, locationData.longitude)
+                zoomToLocation(locationData)
                 initZoomDone = true
             }
 
@@ -180,12 +179,9 @@ class MapTilerMapView @JvmOverloads constructor(
         }
     }
 
-    fun zoomToLocation(latitude: Double, longitude: Double) {
+    fun zoomToLocation(locationData: LocationData) {
         Timber.d("## Location: zoomToLocation")
-        mapRefs?.map?.cameraPosition = CameraPosition.Builder()
-                .target(LatLng(latitude, longitude))
-                .zoom(INITIAL_MAP_ZOOM_IN_PREVIEW)
-                .build()
+        mapRefs?.map?.zoomToLocation(locationData)
     }
 
     fun getLocationOfMapCenter(): LocationData? =
diff --git a/vector/src/main/java/im/vector/app/features/location/UrlMapProvider.kt b/vector/src/main/java/im/vector/app/features/location/UrlMapProvider.kt
index 3e4e16861e..f0d1581724 100644
--- a/vector/src/main/java/im/vector/app/features/location/UrlMapProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/location/UrlMapProvider.kt
@@ -44,10 +44,12 @@ class UrlMapProvider @Inject constructor(
         return upstreamMapUrl ?: fallbackMapUrl
     }
 
-    fun buildStaticMapUrl(locationData: LocationData,
-                          zoom: Double,
-                          width: Int,
-                          height: Int): String {
+    fun buildStaticMapUrl(
+            locationData: LocationData,
+            zoom: Double,
+            width: Int,
+            height: Int
+    ): String {
         return buildString {
             append(STATIC_MAP_BASE_URL)
             append(locationData.longitude)
diff --git a/vector/src/main/java/im/vector/app/features/location/live/map/GetListOfUserLiveLocationUseCase.kt b/vector/src/main/java/im/vector/app/features/location/live/map/GetListOfUserLiveLocationUseCase.kt
new file mode 100644
index 0000000000..91f6999e2c
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/location/live/map/GetListOfUserLiveLocationUseCase.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.location.live.map
+
+import androidx.lifecycle.asFlow
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.flow.mapLatest
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getRoom
+import javax.inject.Inject
+
+class GetListOfUserLiveLocationUseCase @Inject constructor(
+        private val session: Session,
+        private val userLiveLocationViewStateMapper: UserLiveLocationViewStateMapper,
+) {
+
+    fun execute(roomId: String): Flow<List<UserLiveLocationViewState>> {
+        return session.getRoom(roomId)
+                ?.locationSharingService()
+                ?.getRunningLiveLocationShareSummaries()
+                ?.asFlow()
+                ?.mapLatest { it.mapNotNull { summary -> userLiveLocationViewStateMapper.map(summary) } }
+                ?: emptyFlow()
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationBottomSheetController.kt b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationBottomSheetController.kt
new file mode 100644
index 0000000000..c07104e72c
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationBottomSheetController.kt
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.location.live.map
+
+import android.content.Context
+import com.airbnb.epoxy.EpoxyController
+import im.vector.app.R
+import im.vector.app.core.date.DateFormatKind
+import im.vector.app.core.date.VectorDateFormatter
+import im.vector.app.core.resources.DateProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.resources.toTimestamp
+import im.vector.app.core.time.Clock
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.location.live.map.bottomsheet.LiveLocationUserItem
+import im.vector.app.features.location.live.map.bottomsheet.liveLocationUserItem
+import javax.inject.Inject
+
+class LiveLocationBottomSheetController @Inject constructor(
+        private val avatarRenderer: AvatarRenderer,
+        private val vectorDateFormatter: VectorDateFormatter,
+        private val stringProvider: StringProvider,
+        private val clock: Clock,
+        private val context: Context,
+) : EpoxyController() {
+
+    interface Callback {
+        fun onUserSelected(userId: String)
+        fun onStopLocationClicked()
+    }
+
+    private var userLocations: List<UserLiveLocationViewState>? = null
+    var callback: Callback? = null
+
+    fun setData(userLocations: List<UserLiveLocationViewState>) {
+        this.userLocations = userLocations
+        requestModelBuild()
+    }
+
+    override fun buildModels() {
+        val currentUserLocations = userLocations ?: return
+        val host = this
+
+        val userItemCallback = object : LiveLocationUserItem.Callback {
+            override fun onUserSelected(userId: String) {
+                host.callback?.onUserSelected(userId)
+            }
+
+            override fun onStopSharingClicked() {
+                host.callback?.onStopLocationClicked()
+            }
+        }
+
+        currentUserLocations.forEach { liveLocationViewState ->
+            val remainingTime = getFormattedLocalTimeEndOfLive(liveLocationViewState.endOfLiveTimestampMillis)
+            liveLocationUserItem {
+                id(liveLocationViewState.matrixItem.id)
+                callback(userItemCallback)
+                matrixItem(liveLocationViewState.matrixItem)
+                stringProvider(host.stringProvider)
+                clock(host.clock)
+                avatarRenderer(host.avatarRenderer)
+                remainingTime(remainingTime)
+                locationUpdateTimeMillis(liveLocationViewState.locationTimestampMillis)
+                showStopSharingButton(liveLocationViewState.showStopSharingButton)
+            }
+        }
+    }
+
+    private fun getFormattedLocalTimeEndOfLive(endOfLiveDateTimestampMillis: Long?): String {
+        val endOfLiveDateTime = DateProvider.toLocalDateTime(endOfLiveDateTimestampMillis)
+        val formattedDateTime = endOfLiveDateTime.toTimestamp().let { vectorDateFormatter.format(it, DateFormatKind.MESSAGE_SIMPLE) }
+        return stringProvider.getString(R.string.location_share_live_until, formattedDateTime)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationUserItem.kt b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationUserItem.kt
new file mode 100644
index 0000000000..336f688434
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationUserItem.kt
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.location.live.map.bottomsheet
+
+import android.widget.Button
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.core.view.isVisible
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.epoxy.onClick
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.time.Clock
+import im.vector.app.core.utils.TextUtils
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.lib.core.utils.timer.CountUpTimer
+import org.matrix.android.sdk.api.util.MatrixItem
+import org.threeten.bp.Duration
+
+@EpoxyModelClass(layout = R.layout.item_live_location_users_bottom_sheet)
+abstract class LiveLocationUserItem : VectorEpoxyModel<LiveLocationUserItem.Holder>() {
+
+    interface Callback {
+        fun onUserSelected(userId: String)
+        fun onStopSharingClicked()
+    }
+
+    @EpoxyAttribute
+    var callback: Callback? = null
+
+    @EpoxyAttribute
+    lateinit var matrixItem: MatrixItem
+
+    @EpoxyAttribute
+    lateinit var avatarRenderer: AvatarRenderer
+
+    @EpoxyAttribute
+    lateinit var stringProvider: StringProvider
+
+    @EpoxyAttribute
+    lateinit var clock: Clock
+
+    @EpoxyAttribute
+    var remainingTime: String? = null
+
+    @EpoxyAttribute
+    var locationUpdateTimeMillis: Long? = null
+
+    @EpoxyAttribute
+    var showStopSharingButton: Boolean = false
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        avatarRenderer.render(matrixItem, holder.itemUserAvatarImageView)
+        holder.itemUserDisplayNameTextView.text = matrixItem.displayName
+        holder.itemRemainingTimeTextView.text = remainingTime
+
+        holder.itemStopSharingButton.isVisible = showStopSharingButton
+        if (showStopSharingButton) {
+            holder.itemStopSharingButton.onClick {
+                callback?.onStopSharingClicked()
+            }
+        }
+
+        stopTimer(holder)
+        holder.timer = CountUpTimer(1000).apply {
+            tickListener = object : CountUpTimer.TickListener {
+                override fun onTick(milliseconds: Long) {
+                    holder.itemLastUpdatedAtTextView.text = getFormattedLastUpdatedAt(locationUpdateTimeMillis)
+                }
+            }
+            resume()
+        }
+
+        holder.view.setOnClickListener { callback?.onUserSelected(matrixItem.id) }
+    }
+
+    override fun unbind(holder: Holder) {
+        super.unbind(holder)
+        stopTimer(holder)
+    }
+
+    private fun stopTimer(holder: Holder) {
+        holder.timer?.stop()
+        holder.timer = null
+    }
+
+    private fun getFormattedLastUpdatedAt(locationUpdateTimeMillis: Long?): String {
+        if (locationUpdateTimeMillis == null) return ""
+        val elapsedTime = clock.epochMillis() - locationUpdateTimeMillis
+        val duration = Duration.ofMillis(elapsedTime.coerceAtLeast(0L))
+        val formattedDuration = TextUtils.formatDurationWithUnits(stringProvider, duration, appendSeconds = false)
+        return stringProvider.getString(R.string.live_location_bottom_sheet_last_updated_at, formattedDuration)
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        var timer: CountUpTimer? = null
+        val itemUserAvatarImageView by bind<ImageView>(R.id.itemUserAvatarImageView)
+        val itemUserDisplayNameTextView by bind<TextView>(R.id.itemUserDisplayNameTextView)
+        val itemRemainingTimeTextView by bind<TextView>(R.id.itemRemainingTimeTextView)
+        val itemLastUpdatedAtTextView by bind<TextView>(R.id.itemLastUpdatedAtTextView)
+        val itemStopSharingButton by bind<Button>(R.id.itemStopSharingButton)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapAction.kt b/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapAction.kt
new file mode 100644
index 0000000000..b88fffc733
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapAction.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.location.live.map
+
+import im.vector.app.core.platform.VectorViewModelAction
+
+sealed class LocationLiveMapAction : VectorViewModelAction {
+    data class AddMapSymbol(val key: String, val value: Long) : LocationLiveMapAction()
+    data class RemoveMapSymbol(val key: String) : LocationLiveMapAction()
+    object StopSharing : LocationLiveMapAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewActivity.kt b/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewActivity.kt
new file mode 100644
index 0000000000..c0f07dba57
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewActivity.kt
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.location.live.map
+
+import android.content.Context
+import android.content.Intent
+import android.os.Parcelable
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.R
+import im.vector.app.core.extensions.addFragment
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.databinding.ActivityLocationSharingBinding
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class LocationLiveMapViewArgs(
+        val roomId: String
+) : Parcelable
+
+@AndroidEntryPoint
+class LocationLiveMapViewActivity : VectorBaseActivity<ActivityLocationSharingBinding>() {
+
+    override fun getBinding() = ActivityLocationSharingBinding.inflate(layoutInflater)
+
+    override fun initUiAndData() {
+        val mapViewArgs: LocationLiveMapViewArgs? = intent?.extras?.getParcelable(EXTRA_LOCATION_LIVE_MAP_VIEW_ARGS)
+        if (mapViewArgs == null) {
+            finish()
+            return
+        }
+        setupToolbar(views.toolbar)
+                .setTitle(getString(R.string.location_activity_title_preview))
+                .allowBack()
+
+        if (isFirstCreation()) {
+            addFragment(
+                    views.fragmentContainer,
+                    LocationLiveMapViewFragment::class.java,
+                    mapViewArgs
+            )
+        }
+    }
+
+    companion object {
+
+        private const val EXTRA_LOCATION_LIVE_MAP_VIEW_ARGS = "EXTRA_LOCATION_LIVE_MAP_VIEW_ARGS"
+
+        fun getIntent(context: Context, locationLiveMapViewArgs: LocationLiveMapViewArgs): Intent {
+            return Intent(context, LocationLiveMapViewActivity::class.java).apply {
+                putExtra(EXTRA_LOCATION_LIVE_MAP_VIEW_ARGS, locationLiveMapViewArgs)
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewEvents.kt b/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewEvents.kt
new file mode 100644
index 0000000000..6645ff58d9
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewEvents.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.location.live.map
+
+import im.vector.app.core.platform.VectorViewEvents
+
+sealed interface LocationLiveMapViewEvents : VectorViewEvents
diff --git a/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewFragment.kt b/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewFragment.kt
new file mode 100644
index 0000000000..9a4975e2e0
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewFragment.kt
@@ -0,0 +1,232 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.location.live.map
+
+import android.graphics.drawable.Drawable
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.graphics.drawable.toBitmap
+import androidx.lifecycle.lifecycleScope
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
+import com.mapbox.mapboxsdk.geometry.LatLng
+import com.mapbox.mapboxsdk.geometry.LatLngBounds
+import com.mapbox.mapboxsdk.maps.MapView
+import com.mapbox.mapboxsdk.maps.MapboxMap
+import com.mapbox.mapboxsdk.maps.MapboxMapOptions
+import com.mapbox.mapboxsdk.maps.Style
+import com.mapbox.mapboxsdk.maps.SupportMapFragment
+import com.mapbox.mapboxsdk.plugins.annotation.SymbolManager
+import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions
+import com.mapbox.mapboxsdk.style.layers.Property
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.R
+import im.vector.app.core.extensions.addChildFragment
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.databinding.FragmentLocationLiveMapViewBinding
+import im.vector.app.features.location.UrlMapProvider
+import im.vector.app.features.location.zoomToBounds
+import im.vector.app.features.location.zoomToLocation
+import kotlinx.coroutines.launch
+import timber.log.Timber
+import java.lang.ref.WeakReference
+import javax.inject.Inject
+
+/**
+ * Screen showing a map with all the current users sharing their live location in a room.
+ */
+
+@AndroidEntryPoint
+class LocationLiveMapViewFragment @Inject constructor() : VectorBaseFragment<FragmentLocationLiveMapViewBinding>() {
+
+    @Inject lateinit var urlMapProvider: UrlMapProvider
+    @Inject lateinit var bottomSheetController: LiveLocationBottomSheetController
+
+    private val viewModel: LocationLiveMapViewModel by fragmentViewModel()
+
+    private var mapboxMap: WeakReference<MapboxMap>? = null
+    private var symbolManager: SymbolManager? = null
+    private var mapStyle: Style? = null
+    private val pendingLiveLocations = mutableListOf<UserLiveLocationViewState>()
+    private var isMapFirstUpdate = true
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLocationLiveMapViewBinding {
+        return FragmentLocationLiveMapViewBinding.inflate(layoutInflater, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        views.liveLocationBottomSheetRecyclerView.configureWith(bottomSheetController, hasFixedSize = false, disableItemAnimation = true)
+
+        bottomSheetController.callback = object : LiveLocationBottomSheetController.Callback {
+            override fun onUserSelected(userId: String) {
+                handleBottomSheetUserSelected(userId)
+            }
+
+            override fun onStopLocationClicked() {
+                viewModel.handle(LocationLiveMapAction.StopSharing)
+            }
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        setupMap()
+    }
+
+    private fun setupMap() {
+        val mapFragment = getOrCreateSupportMapFragment()
+        mapFragment.getMapAsync { mapboxMap ->
+            lifecycleScope.launch {
+                mapboxMap.setStyle(urlMapProvider.getMapUrl()) { style ->
+                    mapStyle = style
+                    this@LocationLiveMapViewFragment.mapboxMap = WeakReference(mapboxMap)
+                    symbolManager = SymbolManager(mapFragment.view as MapView, mapboxMap, style).apply {
+                        iconAllowOverlap = true
+                    }
+                    pendingLiveLocations
+                            .takeUnless { it.isEmpty() }
+                            ?.let { updateMap(it) }
+                }
+            }
+        }
+    }
+
+    private fun getOrCreateSupportMapFragment() =
+            childFragmentManager.findFragmentByTag(MAP_FRAGMENT_TAG) as? SupportMapFragment
+                    ?: run {
+                        val options = MapboxMapOptions.createFromAttributes(requireContext(), null)
+                        SupportMapFragment.newInstance(options)
+                                .also { addChildFragment(R.id.liveLocationMapFragmentContainer, it, tag = MAP_FRAGMENT_TAG) }
+                    }
+
+    override fun invalidate() = withState(viewModel) { viewState ->
+        updateMap(viewState.userLocations)
+        updateUserListBottomSheet(viewState.userLocations)
+    }
+
+    private fun updateUserListBottomSheet(userLocations: List<UserLiveLocationViewState>) {
+        bottomSheetController.setData(userLocations)
+    }
+
+    private fun updateMap(userLiveLocations: List<UserLiveLocationViewState>) {
+        symbolManager?.let { sManager ->
+            val latLngBoundsBuilder = LatLngBounds.Builder()
+            userLiveLocations.forEach { userLocation ->
+                createOrUpdateSymbol(userLocation, sManager)
+                if (isMapFirstUpdate) {
+                    val latLng = LatLng(userLocation.locationData.latitude, userLocation.locationData.longitude)
+                    latLngBoundsBuilder.include(latLng)
+                }
+            }
+
+            removeOutdatedSymbols(userLiveLocations, sManager)
+            updateMapZoomWhenNeeded(userLiveLocations, latLngBoundsBuilder)
+        } ?: postponeUpdateOfMap(userLiveLocations)
+    }
+
+    private fun createOrUpdateSymbol(userLocation: UserLiveLocationViewState, symbolManager: SymbolManager) = withState(viewModel) { state ->
+        val symbolId = state.mapSymbolIds[userLocation.matrixItem.id]
+
+        if (symbolId == null || symbolManager.annotations.get(symbolId) == null) {
+            createSymbol(userLocation, symbolManager)
+        } else {
+            updateSymbol(symbolId, userLocation, symbolManager)
+        }
+    }
+
+    private fun createSymbol(userLocation: UserLiveLocationViewState, symbolManager: SymbolManager) {
+        addUserPinToMapStyle(userLocation.matrixItem.id, userLocation.pinDrawable)
+        val symbolOptions = buildSymbolOptions(userLocation)
+        val symbol = symbolManager.create(symbolOptions)
+        viewModel.handle(LocationLiveMapAction.AddMapSymbol(userLocation.matrixItem.id, symbol.id))
+    }
+
+    private fun updateSymbol(symbolId: Long, userLocation: UserLiveLocationViewState, symbolManager: SymbolManager) {
+        val newLocation = LatLng(userLocation.locationData.latitude, userLocation.locationData.longitude)
+        val symbol = symbolManager.annotations.get(symbolId)
+        symbol?.let {
+            it.latLng = newLocation
+            symbolManager.update(it)
+        }
+    }
+
+    private fun removeOutdatedSymbols(userLiveLocations: List<UserLiveLocationViewState>, symbolManager: SymbolManager) = withState(viewModel) { state ->
+        val userIdsToRemove = state.mapSymbolIds.keys.subtract(userLiveLocations.map { it.matrixItem.id }.toSet())
+        userIdsToRemove.forEach { userId ->
+            removeUserPinFromMapStyle(userId)
+            viewModel.handle(LocationLiveMapAction.RemoveMapSymbol(userId))
+
+            state.mapSymbolIds[userId]?.let { symbolId ->
+                Timber.d("trying to delete symbol with id: $symbolId")
+                symbolManager.annotations.get(symbolId)?.let {
+                    symbolManager.delete(it)
+                }
+            }
+        }
+    }
+
+    private fun updateMapZoomWhenNeeded(userLiveLocations: List<UserLiveLocationViewState>, latLngBoundsBuilder: LatLngBounds.Builder) {
+        if (userLiveLocations.isNotEmpty() && isMapFirstUpdate) {
+            isMapFirstUpdate = false
+            if (userLiveLocations.size > 1) {
+                mapboxMap?.get()?.zoomToBounds(latLngBoundsBuilder.build())
+            } else {
+                mapboxMap?.get()?.zoomToLocation(userLiveLocations.first().locationData)
+            }
+        }
+    }
+
+    private fun postponeUpdateOfMap(userLiveLocations: List<UserLiveLocationViewState>) {
+        pendingLiveLocations.clear()
+        pendingLiveLocations.addAll(userLiveLocations)
+    }
+
+    private fun addUserPinToMapStyle(userId: String, userPinDrawable: Drawable) {
+        mapStyle?.let { style ->
+            if (style.getImage(userId) == null) {
+                style.addImage(userId, userPinDrawable.toBitmap())
+            }
+        }
+    }
+
+    private fun removeUserPinFromMapStyle(userId: String) {
+        mapStyle?.removeImage(userId)
+    }
+
+    private fun buildSymbolOptions(userLiveLocation: UserLiveLocationViewState) =
+            SymbolOptions()
+                    .withLatLng(LatLng(userLiveLocation.locationData.latitude, userLiveLocation.locationData.longitude))
+                    .withIconImage(userLiveLocation.matrixItem.id)
+                    .withIconAnchor(Property.ICON_ANCHOR_BOTTOM)
+
+    private fun handleBottomSheetUserSelected(userId: String) = withState(viewModel) { state ->
+        state.userLocations
+                .find { it.matrixItem.id == userId }
+                ?.locationData
+                ?.let { locationData ->
+                    mapboxMap?.get()?.zoomToLocation(locationData, preserveCurrentZoomLevel = true)
+                }
+    }
+
+    companion object {
+        private const val MAP_FRAGMENT_TAG = "im.vector.app.features.location.live.map"
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewModel.kt b/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewModel.kt
new file mode 100644
index 0000000000..64802c7090
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewModel.kt
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.location.live.map
+
+import com.airbnb.mvrx.MavericksViewModelFactory
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.core.di.MavericksAssistedViewModelFactory
+import im.vector.app.core.di.hiltMavericksViewModelFactory
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.location.LocationSharingServiceConnection
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+
+class LocationLiveMapViewModel @AssistedInject constructor(
+        @Assisted private val initialState: LocationLiveMapViewState,
+        getListOfUserLiveLocationUseCase: GetListOfUserLiveLocationUseCase,
+        private val locationSharingServiceConnection: LocationSharingServiceConnection,
+) : VectorViewModel<LocationLiveMapViewState, LocationLiveMapAction, LocationLiveMapViewEvents>(initialState), LocationSharingServiceConnection.Callback {
+
+    @AssistedFactory
+    interface Factory : MavericksAssistedViewModelFactory<LocationLiveMapViewModel, LocationLiveMapViewState> {
+        override fun create(initialState: LocationLiveMapViewState): LocationLiveMapViewModel
+    }
+
+    companion object : MavericksViewModelFactory<LocationLiveMapViewModel, LocationLiveMapViewState> by hiltMavericksViewModelFactory()
+
+    init {
+        getListOfUserLiveLocationUseCase.execute(initialState.roomId)
+                .onEach { setState { copy(userLocations = it) } }
+                .launchIn(viewModelScope)
+        locationSharingServiceConnection.bind(this)
+    }
+
+    override fun handle(action: LocationLiveMapAction) {
+        when (action) {
+            is LocationLiveMapAction.AddMapSymbol    -> handleAddMapSymbol(action)
+            is LocationLiveMapAction.RemoveMapSymbol -> handleRemoveMapSymbol(action)
+            LocationLiveMapAction.StopSharing        -> handleStopSharing()
+        }
+    }
+
+    private fun handleAddMapSymbol(action: LocationLiveMapAction.AddMapSymbol) = withState { state ->
+        val newMapSymbolIds = state.mapSymbolIds.toMutableMap().apply { set(action.key, action.value) }
+        setState {
+            copy(mapSymbolIds = newMapSymbolIds)
+        }
+    }
+
+    private fun handleRemoveMapSymbol(action: LocationLiveMapAction.RemoveMapSymbol) = withState { state ->
+        val newMapSymbolIds = state.mapSymbolIds.toMutableMap().apply { remove(action.key) }
+        setState {
+            copy(mapSymbolIds = newMapSymbolIds)
+        }
+    }
+
+    private fun handleStopSharing() {
+        locationSharingServiceConnection.stopLiveLocationSharing(initialState.roomId)
+    }
+
+    override fun onLocationServiceRunning() {
+        // NOOP
+    }
+
+    override fun onLocationServiceStopped() {
+        // NOOP
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewState.kt b/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewState.kt
new file mode 100644
index 0000000000..e96fdb2645
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewState.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.location.live.map
+
+import android.graphics.drawable.Drawable
+import com.airbnb.mvrx.MavericksState
+import im.vector.app.features.location.LocationData
+import org.matrix.android.sdk.api.util.MatrixItem
+
+data class LocationLiveMapViewState(
+        val roomId: String,
+        val userLocations: List<UserLiveLocationViewState> = emptyList(),
+        /**
+         * Map to keep track of symbol ids associated to each user Id.
+         */
+        val mapSymbolIds: Map<String, Long> = emptyMap()
+) : MavericksState {
+    constructor(locationLiveMapViewArgs: LocationLiveMapViewArgs) : this(
+            roomId = locationLiveMapViewArgs.roomId
+    )
+}
+
+data class UserLiveLocationViewState(
+        val matrixItem: MatrixItem,
+        val pinDrawable: Drawable,
+        val locationData: LocationData,
+        val endOfLiveTimestampMillis: Long?,
+        val locationTimestampMillis: Long?,
+        val showStopSharingButton: Boolean
+)
diff --git a/vector/src/main/java/im/vector/app/features/location/live/map/UserLiveLocationViewStateMapper.kt b/vector/src/main/java/im/vector/app/features/location/live/map/UserLiveLocationViewStateMapper.kt
new file mode 100644
index 0000000000..09922b77d4
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/location/live/map/UserLiveLocationViewStateMapper.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.location.live.map
+
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.features.home.room.detail.timeline.helper.LocationPinProvider
+import im.vector.app.features.location.toLocationData
+import kotlinx.coroutines.suspendCancellableCoroutine
+import org.matrix.android.sdk.api.session.getUser
+import org.matrix.android.sdk.api.session.room.model.livelocation.LiveLocationShareAggregatedSummary
+import org.matrix.android.sdk.api.util.toMatrixItem
+import javax.inject.Inject
+
+class UserLiveLocationViewStateMapper @Inject constructor(
+        private val locationPinProvider: LocationPinProvider,
+        private val activeSessionHolder: ActiveSessionHolder,
+) {
+
+    suspend fun map(liveLocationShareAggregatedSummary: LiveLocationShareAggregatedSummary) =
+            suspendCancellableCoroutine<UserLiveLocationViewState?> { continuation ->
+                val userId = liveLocationShareAggregatedSummary.userId
+                val locationData = liveLocationShareAggregatedSummary.lastLocationDataContent
+                        ?.getBestLocationInfo()
+                        ?.geoUri
+                        .toLocationData()
+
+                when {
+                    userId.isNullOrEmpty() || locationData == null -> continuation.resume(null) {
+                        // do nothing on cancellation
+                    }
+                    else                                           -> {
+                        locationPinProvider.create(userId) { pinDrawable ->
+                            val session = activeSessionHolder.getActiveSession()
+                            session.getUser(userId)?.toMatrixItem()?.let { matrixItem ->
+                                val locationTimestampMillis = liveLocationShareAggregatedSummary.lastLocationDataContent?.getBestTimestampMillis()
+                                val viewState = UserLiveLocationViewState(
+                                        matrixItem = matrixItem,
+                                        pinDrawable = pinDrawable,
+                                        locationData = locationData,
+                                        endOfLiveTimestampMillis = liveLocationShareAggregatedSummary.endOfLiveTimestampMillis,
+                                        locationTimestampMillis = locationTimestampMillis,
+                                        showStopSharingButton = userId == session.myUserId
+                                )
+                                continuation.resume(viewState) {
+                                    // do nothing on cancellation
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+}
diff --git a/vector/src/main/java/im/vector/app/features/login/AbstractLoginFragment.kt b/vector/src/main/java/im/vector/app/features/login/AbstractLoginFragment.kt
index 2308f2c544..b11e6739eb 100644
--- a/vector/src/main/java/im/vector/app/features/login/AbstractLoginFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/AbstractLoginFragment.kt
@@ -78,10 +78,10 @@ abstract class AbstractLoginFragment<VB : ViewBinding> : VectorBaseFragment<VB>(
         }
 
         when (throwable) {
-            is CancellationException                  ->
+            is CancellationException ->
                 /* Ignore this error, user has cancelled the action */
                 Unit
-            is Failure.ServerError                    ->
+            is Failure.ServerError ->
                 if (throwable.error.code == MatrixError.M_FORBIDDEN &&
                         throwable.httpCode == HttpsURLConnection.HTTP_FORBIDDEN /* 403 */) {
                     MaterialAlertDialogBuilder(requireActivity())
@@ -94,7 +94,7 @@ abstract class AbstractLoginFragment<VB : ViewBinding> : VectorBaseFragment<VB>(
                 }
             is Failure.UnrecognizedCertificateFailure ->
                 showUnrecognizedCertificateFailure(throwable)
-            else                                      ->
+            else ->
                 onError(throwable)
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginAction.kt b/vector/src/main/java/im/vector/app/features/login/LoginAction.kt
index 800df32b9d..5947fa0cb5 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginAction.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginAction.kt
@@ -66,9 +66,11 @@ sealed class LoginAction : VectorViewModelAction {
     object ClearHomeServerHistory : LoginAction()
 
     // For the soft logout case
-    data class SetupSsoForSessionRecovery(val homeServerUrl: String,
-                                          val deviceId: String,
-                                          val ssoIdentityProviders: List<SsoIdentityProvider>?) : LoginAction()
+    data class SetupSsoForSessionRecovery(
+            val homeServerUrl: String,
+            val deviceId: String,
+            val ssoIdentityProviders: List<SsoIdentityProvider>?
+    ) : LoginAction()
 
     data class PostViewEvent(val viewEvent: LoginViewEvents) : LoginAction()
 
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt b/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
index 42a9b18558..f763d26bf5 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
@@ -42,6 +42,7 @@ import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.home.HomeActivity
 import im.vector.app.features.login.terms.LoginTermsFragment
 import im.vector.app.features.login.terms.LoginTermsFragmentArgument
+import im.vector.app.features.onboarding.AuthenticationDescription
 import im.vector.app.features.pin.UnlockedActivity
 import org.matrix.android.sdk.api.auth.registration.FlowResult
 import org.matrix.android.sdk.api.auth.registration.Stage
@@ -218,10 +219,8 @@ open class LoginActivity : VectorBaseActivity<ActivityLoginBinding>(), UnlockedA
                 // change the screen name
                 analyticsScreenName = MobileScreen.ScreenName.Register
             }
-            val intent = HomeActivity.newIntent(
-                    this,
-                    accountCreation = loginViewState.signMode == SignMode.SignUp
-            )
+            val authDescription = inferAuthDescription(loginViewState)
+            val intent = HomeActivity.newIntent(this, authenticationDescription = authDescription)
             startActivity(intent)
             finish()
             return
@@ -231,6 +230,13 @@ open class LoginActivity : VectorBaseActivity<ActivityLoginBinding>(), UnlockedA
         views.loginLoading.isVisible = loginViewState.isLoading()
     }
 
+    private fun inferAuthDescription(loginViewState: LoginViewState) = when (loginViewState.signMode) {
+        SignMode.Unknown            -> null
+        SignMode.SignUp             -> AuthenticationDescription.Register(type = AuthenticationDescription.AuthenticationType.Other)
+        SignMode.SignIn             -> AuthenticationDescription.Login
+        SignMode.SignInWithMatrixId -> AuthenticationDescription.Login
+    }
+
     private fun onWebLoginError(onWebLoginError: LoginViewEvents.OnWebLoginError) {
         // Pop the backstack
         supportFragmentManager.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
index e8c0b25027..f575aed3f8 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
@@ -37,6 +37,7 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
+import org.matrix.android.sdk.api.auth.data.SsoIdentityProvider
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.failure.MatrixError
 import org.matrix.android.sdk.api.failure.isInvalidPassword
@@ -202,11 +203,11 @@ class LoginFragment @Inject constructor() : AbstractSSOLoginFragment<FragmentLog
                 views.loginSocialLoginContainer.isVisible = true
                 views.loginSocialLoginButtons.ssoIdentityProviders = state.loginMode.ssoIdentityProviders?.sorted()
                 views.loginSocialLoginButtons.listener = object : SocialLoginButtonsView.InteractionListener {
-                    override fun onProviderSelected(id: String?) {
+                    override fun onProviderSelected(provider: SsoIdentityProvider?) {
                         loginViewModel.getSsoUrl(
                                 redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
                                 deviceId = state.deviceId,
-                                providerId = id
+                                providerId = provider?.id
                         )
                                 ?.let { openInCustomTab(it) }
                     }
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginSignUpSignInSelectionFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginSignUpSignInSelectionFragment.kt
index ebefbbec24..6ee90b325b 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginSignUpSignInSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginSignUpSignInSelectionFragment.kt
@@ -25,6 +25,7 @@ import com.airbnb.mvrx.withState
 import im.vector.app.R
 import im.vector.app.core.extensions.toReducedUrl
 import im.vector.app.databinding.FragmentLoginSignupSigninSelectionBinding
+import org.matrix.android.sdk.api.auth.data.SsoIdentityProvider
 import javax.inject.Inject
 
 /**
@@ -74,11 +75,11 @@ class LoginSignUpSignInSelectionFragment @Inject constructor() : AbstractSSOLogi
                 views.loginSignupSigninSignInSocialLoginContainer.isVisible = true
                 views.loginSignupSigninSocialLoginButtons.ssoIdentityProviders = state.loginMode.ssoIdentityProviders()?.sorted()
                 views.loginSignupSigninSocialLoginButtons.listener = object : SocialLoginButtonsView.InteractionListener {
-                    override fun onProviderSelected(id: String?) {
+                    override fun onProviderSelected(provider: SsoIdentityProvider?) {
                         loginViewModel.getSsoUrl(
                                 redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
                                 deviceId = state.deviceId,
-                                providerId = id
+                                providerId = provider?.id
                         )
                                 ?.let { openInCustomTab(it) }
                     }
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
index 1b08d2a86f..116b035c8e 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
@@ -91,11 +91,11 @@ class LoginViewModel @AssistedInject constructor(
     private val matrixOrgUrl = stringProvider.getString(R.string.matrix_org_server_url).ensureTrailingSlash()
 
     val currentThreePid: String?
-        get() = registrationWizard?.currentThreePid
+        get() = registrationWizard?.getCurrentThreePid()
 
     // True when login and password has been sent with success to the homeserver
     val isRegistrationStarted: Boolean
-        get() = authenticationService.isRegistrationStarted
+        get() = authenticationService.isRegistrationStarted()
 
     private val registrationWizard: RegistrationWizard?
         get() = authenticationService.getRegistrationWizard()
@@ -261,8 +261,10 @@ class LoginViewModel @AssistedInject constructor(
         }
     }
 
-    private fun executeRegistrationStep(withLoading: Boolean = true,
-                                        block: suspend (RegistrationWizard) -> RegistrationResult): Job {
+    private fun executeRegistrationStep(
+            withLoading: Boolean = true,
+            block: suspend (RegistrationWizard) -> RegistrationResult
+    ): Job {
         if (withLoading) {
             setState { copy(asyncRegistration = Loading()) }
         }
@@ -411,7 +413,8 @@ class LoginViewModel @AssistedInject constructor(
                     copy(
                             asyncResetPassword = Uninitialized,
                             asyncResetMailConfirmed = Uninitialized,
-                            resetPasswordEmail = null
+                            resetPasswordEmail = null,
+                            resetPasswordNewPassword = null
                     )
                 }
             }
@@ -455,7 +458,7 @@ class LoginViewModel @AssistedInject constructor(
 
         // If there is a pending email validation continue on this step
         try {
-            if (registrationWizard?.isRegistrationStarted == true) {
+            if (registrationWizard?.isRegistrationStarted() == true) {
                 currentThreePid?.let {
                     handle(LoginAction.PostViewEvent(LoginViewEvents.OnSendEmailSuccess(it)))
                 }
@@ -486,7 +489,7 @@ class LoginViewModel @AssistedInject constructor(
 
             currentJob = viewModelScope.launch {
                 try {
-                    safeLoginWizard.resetPassword(action.email, action.newPassword)
+                    safeLoginWizard.resetPassword(action.email)
                 } catch (failure: Throwable) {
                     setState {
                         copy(
@@ -499,7 +502,8 @@ class LoginViewModel @AssistedInject constructor(
                 setState {
                     copy(
                             asyncResetPassword = Success(Unit),
-                            resetPasswordEmail = action.email
+                            resetPasswordEmail = action.email,
+                            resetPasswordNewPassword = action.newPassword
                     )
                 }
 
@@ -527,24 +531,35 @@ class LoginViewModel @AssistedInject constructor(
             }
 
             currentJob = viewModelScope.launch {
-                try {
-                    safeLoginWizard.resetPasswordMailConfirmed()
-                } catch (failure: Throwable) {
+                val state = awaitState()
+
+                if (state.resetPasswordNewPassword == null) {
                     setState {
                         copy(
-                                asyncResetMailConfirmed = Fail(failure)
+                                asyncResetPassword = Uninitialized,
+                                asyncResetMailConfirmed = Fail(Throwable("Developer error - New password not set"))
                         )
                     }
-                    return@launch
+                } else {
+                    try {
+                        safeLoginWizard.resetPasswordMailConfirmed(state.resetPasswordNewPassword)
+                    } catch (failure: Throwable) {
+                        setState {
+                            copy(
+                                    asyncResetMailConfirmed = Fail(failure)
+                            )
+                        }
+                        return@launch
+                    }
+                    setState {
+                        copy(
+                                asyncResetMailConfirmed = Success(Unit),
+                                resetPasswordEmail = null,
+                                resetPasswordNewPassword = null
+                        )
+                    }
+                    _viewEvents.post(LoginViewEvents.OnResetPasswordMailConfirmationSuccess)
                 }
-                setState {
-                    copy(
-                            asyncResetMailConfirmed = Success(Unit),
-                            resetPasswordEmail = null
-                    )
-                }
-
-                _viewEvents.post(LoginViewEvents.OnResetPasswordMailConfirmationSuccess)
             }
         }
     }
@@ -598,9 +613,11 @@ class LoginViewModel @AssistedInject constructor(
         _viewEvents.post(LoginViewEvents.Failure(Exception(stringProvider.getString(R.string.autodiscover_well_known_error))))
     }
 
-    private suspend fun onWellknownSuccess(action: LoginAction.LoginOrRegister,
-                                           wellKnownPrompt: WellknownResult.Prompt,
-                                           homeServerConnectionConfig: HomeServerConnectionConfig?) {
+    private suspend fun onWellknownSuccess(
+            action: LoginAction.LoginOrRegister,
+            wellKnownPrompt: WellknownResult.Prompt,
+            homeServerConnectionConfig: HomeServerConnectionConfig?
+    ) {
         val alteredHomeServerConnectionConfig = homeServerConnectionConfig
                 ?.copy(
                         homeServerUriBase = Uri.parse(wellKnownPrompt.homeServerUrl),
@@ -754,8 +771,10 @@ class LoginViewModel @AssistedInject constructor(
         }
     }
 
-    private fun getLoginFlow(homeServerConnectionConfig: HomeServerConnectionConfig,
-                             serverTypeOverride: ServerType? = null) {
+    private fun getLoginFlow(
+            homeServerConnectionConfig: HomeServerConnectionConfig,
+            serverTypeOverride: ServerType? = null
+    ) {
         currentHomeServerConnectionConfig = homeServerConnectionConfig
 
         currentJob = viewModelScope.launch {
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginViewState.kt b/vector/src/main/java/im/vector/app/features/login/LoginViewState.kt
index 23689225b5..83540d6205 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginViewState.kt
@@ -38,6 +38,8 @@ data class LoginViewState(
         @PersistState
         val resetPasswordEmail: String? = null,
         @PersistState
+        val resetPasswordNewPassword: String? = null,
+        @PersistState
         val homeServerUrlFromUser: String? = null,
 
         // Can be modified after a Wellknown request
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginWebFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginWebFragment.kt
index 02ce0bb670..007c27d3be 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginWebFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginWebFragment.kt
@@ -123,8 +123,10 @@ class LoginWebFragment @Inject constructor(
         views.loginWebWebView.loadUrl(url)
 
         views.loginWebWebView.webViewClient = object : WebViewClient() {
-            override fun onReceivedSslError(view: WebView, handler: SslErrorHandler,
-                                            error: SslError) {
+            override fun onReceivedSslError(
+                    view: WebView, handler: SslErrorHandler,
+                    error: SslError
+            ) {
                 MaterialAlertDialogBuilder(requireActivity())
                         .setMessage(R.string.ssl_could_not_verify)
                         .setPositiveButton(R.string.ssl_trust) { _, _ -> handler.proceed() }
diff --git a/vector/src/main/java/im/vector/app/features/login/SocialLoginButtonsView.kt b/vector/src/main/java/im/vector/app/features/login/SocialLoginButtonsView.kt
index 68fc2d1c59..7324552161 100644
--- a/vector/src/main/java/im/vector/app/features/login/SocialLoginButtonsView.kt
+++ b/vector/src/main/java/im/vector/app/features/login/SocialLoginButtonsView.kt
@@ -31,7 +31,7 @@ class SocialLoginButtonsView @JvmOverloads constructor(context: Context, attrs:
         LinearLayout(context, attrs, defStyle) {
 
     fun interface InteractionListener {
-        fun onProviderSelected(id: String?)
+        fun onProviderSelected(provider: SsoIdentityProvider?)
     }
 
     enum class Mode {
@@ -113,7 +113,7 @@ class SocialLoginButtonsView @JvmOverloads constructor(context: Context, attrs:
             button.text = getButtonTitle(identityProvider.name)
             button.setTag(R.id.loginSignupSigninSocialLoginButtons, identityProvider.id)
             button.setOnClickListener {
-                listener?.onProviderSelected(identityProvider.id)
+                listener?.onProviderSelected(identityProvider)
             }
             addView(button)
         }
@@ -159,3 +159,9 @@ class SocialLoginButtonsView @JvmOverloads constructor(context: Context, attrs:
         return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp.toFloat(), resources.displayMetrics).toInt()
     }
 }
+
+fun SocialLoginButtonsView.render(ssoProviders: List<SsoIdentityProvider>?, mode: SocialLoginButtonsView.Mode, listener: (SsoIdentityProvider?) -> Unit) {
+    this.mode = mode
+    this.ssoIdentityProviders = ssoProviders?.sorted()
+    this.listener = SocialLoginButtonsView.InteractionListener { listener(it) }
+}
diff --git a/vector/src/main/java/im/vector/app/features/login/terms/LocalizedFlowDataLoginTermsChecked.kt b/vector/src/main/java/im/vector/app/features/login/terms/LocalizedFlowDataLoginTermsChecked.kt
index a248b3471b..d235db8d8e 100644
--- a/vector/src/main/java/im/vector/app/features/login/terms/LocalizedFlowDataLoginTermsChecked.kt
+++ b/vector/src/main/java/im/vector/app/features/login/terms/LocalizedFlowDataLoginTermsChecked.kt
@@ -18,5 +18,7 @@ package im.vector.app.features.login.terms
 
 import org.matrix.android.sdk.api.auth.data.LocalizedFlowDataLoginTerms
 
-data class LocalizedFlowDataLoginTermsChecked(val localizedFlowDataLoginTerms: LocalizedFlowDataLoginTerms,
-                                              var checked: Boolean = false)
+data class LocalizedFlowDataLoginTermsChecked(
+        val localizedFlowDataLoginTerms: LocalizedFlowDataLoginTerms,
+        var checked: Boolean = false
+)
diff --git a/vector/src/main/java/im/vector/app/features/login2/AbstractLoginFragment2.kt b/vector/src/main/java/im/vector/app/features/login2/AbstractLoginFragment2.kt
index 0b82ea445d..e722fadffa 100644
--- a/vector/src/main/java/im/vector/app/features/login2/AbstractLoginFragment2.kt
+++ b/vector/src/main/java/im/vector/app/features/login2/AbstractLoginFragment2.kt
@@ -76,12 +76,12 @@ abstract class AbstractLoginFragment2<VB : ViewBinding> : VectorBaseFragment<VB>
         }
 
         when (throwable) {
-            is CancellationException                  ->
+            is CancellationException ->
                 /* Ignore this error, user has cancelled the action */
                 Unit
             is Failure.UnrecognizedCertificateFailure ->
                 showUnrecognizedCertificateFailure(throwable)
-            else                                      ->
+            else ->
                 onError(throwable)
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginAction2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginAction2.kt
index 85e2e0cea3..37dafbfbe0 100644
--- a/vector/src/main/java/im/vector/app/features/login2/LoginAction2.kt
+++ b/vector/src/main/java/im/vector/app/features/login2/LoginAction2.kt
@@ -77,9 +77,11 @@ sealed class LoginAction2 : VectorViewModelAction {
     object ClearHomeServerHistory : LoginAction2()
 
     // For the soft logout case
-    data class SetupSsoForSessionRecovery(val homeServerUrl: String,
-                                          val deviceId: String,
-                                          val ssoIdentityProviders: List<SsoIdentityProvider>?) : LoginAction2()
+    data class SetupSsoForSessionRecovery(
+            val homeServerUrl: String,
+            val deviceId: String,
+            val ssoIdentityProviders: List<SsoIdentityProvider>?
+    ) : LoginAction2()
 
     data class PostViewEvent(val viewEvent: LoginViewEvents2) : LoginAction2()
 
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginFragmentSignupUsername2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginFragmentSignupUsername2.kt
index f9917a4c31..a7c4b25344 100644
--- a/vector/src/main/java/im/vector/app/features/login2/LoginFragmentSignupUsername2.kt
+++ b/vector/src/main/java/im/vector/app/features/login2/LoginFragmentSignupUsername2.kt
@@ -35,6 +35,7 @@ import im.vector.app.features.login.SocialLoginButtonsView
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
+import org.matrix.android.sdk.api.auth.data.SsoIdentityProvider
 import reactivecircus.flowbinding.android.widget.textChanges
 import javax.inject.Inject
 
@@ -96,11 +97,11 @@ class LoginFragmentSignupUsername2 @Inject constructor() : AbstractSSOLoginFragm
             views.loginSocialLoginContainer.isVisible = true
             views.loginSocialLoginButtons.ssoIdentityProviders = state.loginMode.ssoIdentityProviders?.sorted()
             views.loginSocialLoginButtons.listener = object : SocialLoginButtonsView.InteractionListener {
-                override fun onProviderSelected(id: String?) {
+                override fun onProviderSelected(provider: SsoIdentityProvider?) {
                     loginViewModel.getSsoUrl(
                             redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
                             deviceId = state.deviceId,
-                            providerId = id
+                            providerId = provider?.id
                     )
                             ?.let { openInCustomTab(it) }
                 }
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginFragmentToAny2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginFragmentToAny2.kt
index 064889876b..cc143b9255 100644
--- a/vector/src/main/java/im/vector/app/features/login2/LoginFragmentToAny2.kt
+++ b/vector/src/main/java/im/vector/app/features/login2/LoginFragmentToAny2.kt
@@ -37,6 +37,7 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
+import org.matrix.android.sdk.api.auth.data.SsoIdentityProvider
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.failure.MatrixError
 import org.matrix.android.sdk.api.failure.isInvalidPassword
@@ -123,11 +124,11 @@ class LoginFragmentToAny2 @Inject constructor() : AbstractSSOLoginFragment2<Frag
             views.loginSocialLoginContainer.isVisible = true
             views.loginSocialLoginButtons.ssoIdentityProviders = state.loginMode.ssoIdentityProviders?.sorted()
             views.loginSocialLoginButtons.listener = object : SocialLoginButtonsView.InteractionListener {
-                override fun onProviderSelected(id: String?) {
+                override fun onProviderSelected(provider: SsoIdentityProvider?) {
                     loginViewModel.getSsoUrl(
                             redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
                             deviceId = state.deviceId,
-                            providerId = id
+                            providerId = provider?.id
                     )
                             ?.let { openInCustomTab(it) }
                 }
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginViewModel2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginViewModel2.kt
index 6b9d255937..2120d2997c 100644
--- a/vector/src/main/java/im/vector/app/features/login2/LoginViewModel2.kt
+++ b/vector/src/main/java/im/vector/app/features/login2/LoginViewModel2.kt
@@ -92,11 +92,11 @@ class LoginViewModel2 @AssistedInject constructor(
     private val matrixOrgUrl = stringProvider.getString(R.string.matrix_org_server_url).ensureTrailingSlash()
 
     val currentThreePid: String?
-        get() = registrationWizard?.currentThreePid
+        get() = registrationWizard?.getCurrentThreePid()
 
     // True when login and password has been sent with success to the homeserver
     val isRegistrationStarted: Boolean
-        get() = authenticationService.isRegistrationStarted
+        get() = authenticationService.isRegistrationStarted()
 
     private val registrationWizard: RegistrationWizard?
         get() = authenticationService.getRegistrationWizard()
@@ -248,8 +248,10 @@ class LoginViewModel2 @AssistedInject constructor(
         }
     }
 
-    private fun executeRegistrationStep(withLoading: Boolean = true,
-                                        block: suspend (RegistrationWizard) -> RegistrationResult): Job {
+    private fun executeRegistrationStep(
+            withLoading: Boolean = true,
+            block: suspend (RegistrationWizard) -> RegistrationResult
+    ): Job {
         if (withLoading) {
             setState { copy(isLoading = true) }
         }
@@ -390,7 +392,8 @@ class LoginViewModel2 @AssistedInject constructor(
             LoginAction2.ResetResetPassword -> {
                 setState {
                     copy(
-                            resetPasswordEmail = null
+                            resetPasswordEmail = null,
+                            resetPasswordNewPassword = null
                     )
                 }
             }
@@ -420,7 +423,7 @@ class LoginViewModel2 @AssistedInject constructor(
 
         // If there is a pending email validation continue on this step
         try {
-            if (registrationWizard?.isRegistrationStarted == true) {
+            if (registrationWizard?.isRegistrationStarted() == true) {
                 currentThreePid?.let {
                     handle(LoginAction2.PostViewEvent(LoginViewEvents2.OnSendEmailSuccess(it)))
                 }
@@ -441,7 +444,7 @@ class LoginViewModel2 @AssistedInject constructor(
 
             currentJob = viewModelScope.launch {
                 try {
-                    safeLoginWizard.resetPassword(action.email, action.newPassword)
+                    safeLoginWizard.resetPassword(action.email)
                 } catch (failure: Throwable) {
                     _viewEvents.post(LoginViewEvents2.Failure(failure))
                     setState { copy(isLoading = false) }
@@ -451,7 +454,8 @@ class LoginViewModel2 @AssistedInject constructor(
                 setState {
                     copy(
                             isLoading = false,
-                            resetPasswordEmail = action.email
+                            resetPasswordEmail = action.email,
+                            resetPasswordNewPassword = action.newPassword
                     )
                 }
 
@@ -470,7 +474,8 @@ class LoginViewModel2 @AssistedInject constructor(
 
             currentJob = viewModelScope.launch {
                 try {
-                    safeLoginWizard.resetPasswordMailConfirmed()
+                    val state = awaitState()
+                    safeLoginWizard.resetPasswordMailConfirmed(state.resetPasswordNewPassword!!)
                 } catch (failure: Throwable) {
                     _viewEvents.post(LoginViewEvents2.Failure(failure))
                     setState { copy(isLoading = false) }
@@ -479,7 +484,8 @@ class LoginViewModel2 @AssistedInject constructor(
                 setState {
                     copy(
                             isLoading = false,
-                            resetPasswordEmail = null
+                            resetPasswordEmail = null,
+                            resetPasswordNewPassword = null
                     )
                 }
 
@@ -596,9 +602,11 @@ class LoginViewModel2 @AssistedInject constructor(
         setState { copy(isLoading = false) }
     }
 
-    private suspend fun onWellknownSuccess(action: LoginAction2.SetUserName,
-                                           wellKnownPrompt: WellknownResult.Prompt,
-                                           homeServerConnectionConfig: HomeServerConnectionConfig?) {
+    private suspend fun onWellknownSuccess(
+            action: LoginAction2.SetUserName,
+            wellKnownPrompt: WellknownResult.Prompt,
+            homeServerConnectionConfig: HomeServerConnectionConfig?
+    ) {
         val alteredHomeServerConnectionConfig = homeServerConnectionConfig
                 ?.copy(
                         homeServerUriBase = Uri.parse(wellKnownPrompt.homeServerUrl),
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginViewState2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginViewState2.kt
index 276d1111bb..8405381c4f 100644
--- a/vector/src/main/java/im/vector/app/features/login2/LoginViewState2.kt
+++ b/vector/src/main/java/im/vector/app/features/login2/LoginViewState2.kt
@@ -36,6 +36,8 @@ data class LoginViewState2(
         @PersistState
         val resetPasswordEmail: String? = null,
         @PersistState
+        val resetPasswordNewPassword: String? = null,
+        @PersistState
         val homeServerUrlFromUser: String? = null,
 
         // Can be modified after a Wellknown request
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginWebFragment2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginWebFragment2.kt
index cf8952b944..e633a110ef 100644
--- a/vector/src/main/java/im/vector/app/features/login2/LoginWebFragment2.kt
+++ b/vector/src/main/java/im/vector/app/features/login2/LoginWebFragment2.kt
@@ -124,8 +124,11 @@ class LoginWebFragment2 @Inject constructor(
         views.loginWebWebView.loadUrl(url)
 
         views.loginWebWebView.webViewClient = object : WebViewClient() {
-            override fun onReceivedSslError(view: WebView, handler: SslErrorHandler,
-                                            error: SslError) {
+            override fun onReceivedSslError(
+                    view: WebView,
+                    handler: SslErrorHandler,
+                    error: SslError
+            ) {
                 MaterialAlertDialogBuilder(requireActivity())
                         .setMessage(R.string.ssl_could_not_verify)
                         .setPositiveButton(R.string.ssl_trust) { _, _ -> handler.proceed() }
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/SpaceCardRenderer.kt b/vector/src/main/java/im/vector/app/features/matrixto/SpaceCardRenderer.kt
index b72b36a564..87ba176255 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/SpaceCardRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/SpaceCardRenderer.kt
@@ -38,11 +38,13 @@ class SpaceCardRenderer @Inject constructor(
         private val stringProvider: StringProvider
 ) {
 
-    fun render(spaceSummary: RoomSummary?,
-               peopleYouKnow: List<User>,
-               matrixLinkCallback: TimelineEventController.UrlClickCallback?,
-               inCard: FragmentMatrixToRoomSpaceCardBinding,
-               showDescription: Boolean) {
+    fun render(
+            spaceSummary: RoomSummary?,
+            peopleYouKnow: List<User>,
+            matrixLinkCallback: TimelineEventController.UrlClickCallback?,
+            inCard: FragmentMatrixToRoomSpaceCardBinding,
+            showDescription: Boolean
+    ) {
         if (spaceSummary == null) {
             inCard.matrixToCardContentVisibility.isVisible = false
             inCard.matrixToCardButtonLoading.isVisible = true
@@ -87,10 +89,12 @@ class SpaceCardRenderer @Inject constructor(
         })
     }
 
-    fun render(spaceChildInfo: SpaceChildInfo?,
-               peopleYouKnow: List<User>,
-               matrixLinkCallback: TimelineEventController.UrlClickCallback?,
-               inCard: FragmentMatrixToRoomSpaceCardBinding) {
+    fun render(
+            spaceChildInfo: SpaceChildInfo?,
+            peopleYouKnow: List<User>,
+            matrixLinkCallback: TimelineEventController.UrlClickCallback?,
+            inCard: FragmentMatrixToRoomSpaceCardBinding
+    ) {
         if (spaceChildInfo == null) {
             inCard.matrixToCardContentVisibility.isVisible = false
             inCard.matrixToCardButtonLoading.isVisible = true
diff --git a/vector/src/main/java/im/vector/app/features/media/AttachmentProviderFactory.kt b/vector/src/main/java/im/vector/app/features/media/AttachmentProviderFactory.kt
index f067cd7599..ff41425f9b 100644
--- a/vector/src/main/java/im/vector/app/features/media/AttachmentProviderFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/media/AttachmentProviderFactory.kt
@@ -31,8 +31,9 @@ class AttachmentProviderFactory @Inject constructor(
         private val session: Session
 ) {
 
-    fun createProvider(attachments: List<TimelineEvent>,
-                       coroutineScope: CoroutineScope
+    fun createProvider(
+            attachments: List<TimelineEvent>,
+            coroutineScope: CoroutineScope
     ): RoomEventsAttachmentProvider {
         return RoomEventsAttachmentProvider(
                 attachments = attachments,
@@ -44,9 +45,10 @@ class AttachmentProviderFactory @Inject constructor(
         )
     }
 
-    fun createProvider(attachments: List<AttachmentData>,
-                       room: Room?,
-                       coroutineScope: CoroutineScope
+    fun createProvider(
+            attachments: List<AttachmentData>,
+            room: Room?,
+            coroutineScope: CoroutineScope
     ): DataAttachmentRoomProvider {
         return DataAttachmentRoomProvider(
                 attachments = attachments,
diff --git a/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt b/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
index 49bced7e81..3406e8f7c4 100644
--- a/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
@@ -41,6 +41,7 @@ import im.vector.app.core.glide.GlideRequest
 import im.vector.app.core.glide.GlideRequests
 import im.vector.app.core.ui.model.Size
 import im.vector.app.core.utils.DimensionConverter
+import im.vector.app.features.settings.VectorPreferences
 import kotlinx.parcelize.Parcelize
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.content.ContentUrlResolver
@@ -65,9 +66,12 @@ interface AttachmentData : Parcelable {
 private const val URL_PREVIEW_IMAGE_MIN_FULL_WIDTH_PX = 600
 private const val URL_PREVIEW_IMAGE_MIN_FULL_HEIGHT_PX = 315
 
-class ImageContentRenderer @Inject constructor(private val localFilesHelper: LocalFilesHelper,
-                                               private val activeSessionHolder: ActiveSessionHolder,
-                                               private val dimensionConverter: DimensionConverter) {
+class ImageContentRenderer @Inject constructor(
+        private val localFilesHelper: LocalFilesHelper,
+        private val activeSessionHolder: ActiveSessionHolder,
+        private val dimensionConverter: DimensionConverter,
+        private val vectorPreferences: VectorPreferences
+) {
 
     @Parcelize
     data class Data(
@@ -133,7 +137,10 @@ class ImageContentRenderer @Inject constructor(private val localFilesHelper: Loc
         imageView.contentDescription = data.filename
 
         createGlideRequest(data, mode, imageView, size)
-                .dontAnimate()
+                .let {
+                    if (vectorPreferences.autoplayAnimatedImages()) it
+                    else it.dontAnimate()
+                }
                 .transform(cornerTransformation)
                 // .thumbnail(0.3f)
                 .into(imageView)
@@ -179,19 +186,23 @@ class ImageContentRenderer @Inject constructor(private val localFilesHelper: Loc
 
         createGlideRequest(data, mode, imageView, size)
                 .listener(object : RequestListener<Drawable> {
-                    override fun onLoadFailed(e: GlideException?,
-                                              model: Any?,
-                                              target: Target<Drawable>?,
-                                              isFirstResource: Boolean): Boolean {
+                    override fun onLoadFailed(
+                            e: GlideException?,
+                            model: Any?,
+                            target: Target<Drawable>?,
+                            isFirstResource: Boolean
+                    ): Boolean {
                         callback?.invoke(false)
                         return false
                     }
 
-                    override fun onResourceReady(resource: Drawable?,
-                                                 model: Any?,
-                                                 target: Target<Drawable>?,
-                                                 dataSource: DataSource?,
-                                                 isFirstResource: Boolean): Boolean {
+                    override fun onResourceReady(
+                            resource: Drawable?,
+                            model: Any?,
+                            target: Target<Drawable>?,
+                            dataSource: DataSource?,
+                            isFirstResource: Boolean
+                    ): Boolean {
                         callback?.invoke(true)
                         return false
                     }
@@ -222,19 +233,23 @@ class ImageContentRenderer @Inject constructor(private val localFilesHelper: Loc
         }
 
         req.listener(object : RequestListener<Drawable> {
-            override fun onLoadFailed(e: GlideException?,
-                                      model: Any?,
-                                      target: Target<Drawable>?,
-                                      isFirstResource: Boolean): Boolean {
+            override fun onLoadFailed(
+                    e: GlideException?,
+                    model: Any?,
+                    target: Target<Drawable>?,
+                    isFirstResource: Boolean
+            ): Boolean {
                 callback?.invoke(false)
                 return false
             }
 
-            override fun onResourceReady(resource: Drawable?,
-                                         model: Any?,
-                                         target: Target<Drawable>?,
-                                         dataSource: DataSource?,
-                                         isFirstResource: Boolean): Boolean {
+            override fun onResourceReady(
+                    resource: Drawable?,
+                    model: Any?,
+                    target: Target<Drawable>?,
+                    dataSource: DataSource?,
+                    isFirstResource: Boolean
+            ): Boolean {
                 callback?.invoke(true)
                 return false
             }
diff --git a/vector/src/main/java/im/vector/app/features/media/UCropHelper.kt b/vector/src/main/java/im/vector/app/features/media/UCropHelper.kt
index a6be47553f..7f73f3387e 100644
--- a/vector/src/main/java/im/vector/app/features/media/UCropHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/media/UCropHelper.kt
@@ -23,10 +23,12 @@ import com.yalantis.ucrop.UCropActivity
 import im.vector.app.R
 import im.vector.app.core.resources.ColorProvider
 
-fun createUCropWithDefaultSettings(colorProvider: ColorProvider,
-                                   source: Uri,
-                                   destination: Uri,
-                                   toolbarTitle: String?): UCrop {
+fun createUCropWithDefaultSettings(
+        colorProvider: ColorProvider,
+        source: Uri,
+        destination: Uri,
+        toolbarTitle: String?
+): UCrop {
     return UCrop.of(source, destination)
             .withOptions(
                     UCrop.Options()
diff --git a/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt b/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt
index 2259eb513f..08d87b528c 100644
--- a/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt
@@ -307,12 +307,14 @@ class VectorAttachmentViewerActivity : AttachmentViewerActivity(), AttachmentInt
         private const val EXTRA_IMAGE_DATA = "EXTRA_IMAGE_DATA"
         private const val EXTRA_IN_MEMORY_DATA = "EXTRA_IN_MEMORY_DATA"
 
-        fun newIntent(context: Context,
-                      mediaData: AttachmentData,
-                      roomId: String?,
-                      eventId: String,
-                      inMemoryData: List<AttachmentData>,
-                      sharedTransitionName: String?) = Intent(context, VectorAttachmentViewerActivity::class.java).also {
+        fun newIntent(
+                context: Context,
+                mediaData: AttachmentData,
+                roomId: String?,
+                eventId: String,
+                inMemoryData: List<AttachmentData>,
+                sharedTransitionName: String?
+        ) = Intent(context, VectorAttachmentViewerActivity::class.java).also {
             it.putExtra(EXTRA_ARGS, Args(roomId, eventId, sharedTransitionName))
             it.putExtra(EXTRA_IMAGE_DATA, mediaData)
             if (inMemoryData.isNotEmpty()) {
diff --git a/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt b/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt
index c7bb54fcf4..cdfa3d2e28 100644
--- a/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt
@@ -36,9 +36,11 @@ import timber.log.Timber
 import java.net.URLEncoder
 import javax.inject.Inject
 
-class VideoContentRenderer @Inject constructor(private val localFilesHelper: LocalFilesHelper,
-                                               private val activeSessionHolder: ActiveSessionHolder,
-                                               private val errorFormatter: ErrorFormatter) {
+class VideoContentRenderer @Inject constructor(
+        private val localFilesHelper: LocalFilesHelper,
+        private val activeSessionHolder: ActiveSessionHolder,
+        private val errorFormatter: ErrorFormatter
+) {
 
     private val sessionScope: CoroutineScope
         get() = activeSessionHolder.getActiveSession().coroutineScope
@@ -55,11 +57,13 @@ class VideoContentRenderer @Inject constructor(private val localFilesHelper: Loc
             override val allowNonMxcUrls: Boolean = false
     ) : AttachmentData
 
-    fun render(data: Data,
-               thumbnailView: ImageView,
-               loadingView: ProgressBar,
-               videoView: VideoView,
-               errorView: TextView) {
+    fun render(
+            data: Data,
+            thumbnailView: ImageView,
+            loadingView: ProgressBar,
+            videoView: VideoView,
+            errorView: TextView
+    ) {
         val contentUrlResolver = activeSessionHolder.getActiveSession().contentUrlResolver()
 
         if (data.elementToDecrypt != null) {
diff --git a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
index 0f921ab80a..47f76bfc3c 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
@@ -68,6 +68,8 @@ import im.vector.app.features.location.LocationData
 import im.vector.app.features.location.LocationSharingActivity
 import im.vector.app.features.location.LocationSharingArgs
 import im.vector.app.features.location.LocationSharingMode
+import im.vector.app.features.location.live.map.LocationLiveMapViewActivity
+import im.vector.app.features.location.live.map.LocationLiveMapViewArgs
 import im.vector.app.features.login.LoginActivity
 import im.vector.app.features.login.LoginConfig
 import im.vector.app.features.matrixto.MatrixToBottomSheet
@@ -467,29 +469,35 @@ class DefaultNavigator @Inject constructor(
         context.startActivity(Intent(context, AnalyticsOptInActivity::class.java))
     }
 
-    override fun openTerms(context: Context,
-                           activityResultLauncher: ActivityResultLauncher<Intent>,
-                           serviceType: TermsService.ServiceType,
-                           baseUrl: String,
-                           token: String?) {
+    override fun openTerms(
+            context: Context,
+            activityResultLauncher: ActivityResultLauncher<Intent>,
+            serviceType: TermsService.ServiceType,
+            baseUrl: String,
+            token: String?
+    ) {
         val intent = ReviewTermsActivity.intent(context, serviceType, baseUrl, token)
         activityResultLauncher.launch(intent)
     }
 
-    override fun openStickerPicker(context: Context,
-                                   activityResultLauncher: ActivityResultLauncher<Intent>,
-                                   roomId: String,
-                                   widget: Widget) {
+    override fun openStickerPicker(
+            context: Context,
+            activityResultLauncher: ActivityResultLauncher<Intent>,
+            roomId: String,
+            widget: Widget
+    ) {
         val widgetArgs = widgetArgsBuilder.buildStickerPickerArgs(roomId, widget)
         val intent = WidgetActivity.newIntent(context, widgetArgs)
         activityResultLauncher.launch(intent)
     }
 
-    override fun openIntegrationManager(context: Context,
-                                        activityResultLauncher: ActivityResultLauncher<Intent>,
-                                        roomId: String,
-                                        integId: String?,
-                                        screen: String?) {
+    override fun openIntegrationManager(
+            context: Context,
+            activityResultLauncher: ActivityResultLauncher<Intent>,
+            roomId: String,
+            integId: String?,
+            screen: String?
+    ) {
         val widgetArgs = widgetArgsBuilder.buildIntegrationManagerArgs(roomId, integId, screen)
         val intent = WidgetActivity.newIntent(context, widgetArgs)
         activityResultLauncher.launch(intent)
@@ -514,19 +522,23 @@ class DefaultNavigator @Inject constructor(
         }
     }
 
-    override fun openPinCode(context: Context,
-                             activityResultLauncher: ActivityResultLauncher<Intent>,
-                             pinMode: PinMode) {
+    override fun openPinCode(
+            context: Context,
+            activityResultLauncher: ActivityResultLauncher<Intent>,
+            pinMode: PinMode
+    ) {
         val intent = PinActivity.newIntent(context, PinArgs(pinMode))
         activityResultLauncher.launch(intent)
     }
 
-    override fun openMediaViewer(activity: Activity,
-                                 roomId: String,
-                                 mediaData: AttachmentData,
-                                 view: View,
-                                 inMemory: List<AttachmentData>,
-                                 options: ((MutableList<Pair<View, String>>) -> Unit)?) {
+    override fun openMediaViewer(
+            activity: Activity,
+            roomId: String,
+            mediaData: AttachmentData,
+            view: View,
+            inMemory: List<AttachmentData>,
+            options: ((MutableList<Pair<View, String>>) -> Unit)?
+    ) {
         VectorAttachmentViewerActivity.newIntent(
                 activity,
                 mediaData,
@@ -551,10 +563,12 @@ class DefaultNavigator @Inject constructor(
         }
     }
 
-    override fun openSearch(context: Context,
-                            roomId: String,
-                            roomDisplayName: String?,
-                            roomAvatarUrl: String?) {
+    override fun openSearch(
+            context: Context,
+            roomId: String,
+            roomDisplayName: String?,
+            roomAvatarUrl: String?
+    ) {
         val intent = SearchActivity.newIntent(context, SearchArgs(roomId, roomDisplayName, roomAvatarUrl))
         context.startActivity(intent)
     }
@@ -580,11 +594,13 @@ class DefaultNavigator @Inject constructor(
         context.startActivity(intent)
     }
 
-    override fun openLocationSharing(context: Context,
-                                     roomId: String,
-                                     mode: LocationSharingMode,
-                                     initialLocationData: LocationData?,
-                                     locationOwnerId: String?) {
+    override fun openLocationSharing(
+            context: Context,
+            roomId: String,
+            mode: LocationSharingMode,
+            initialLocationData: LocationData?,
+            locationOwnerId: String?
+    ) {
         val intent = LocationSharingActivity.getIntent(
                 context,
                 LocationSharingArgs(roomId = roomId, mode = mode, initialLocationData = initialLocationData, locationOwnerId = locationOwnerId)
@@ -592,6 +608,14 @@ class DefaultNavigator @Inject constructor(
         context.startActivity(intent)
     }
 
+    override fun openLocationLiveMap(context: Context, roomId: String) {
+        val intent = LocationLiveMapViewActivity.getIntent(
+                context = context,
+                locationLiveMapViewArgs = LocationLiveMapViewArgs(roomId = roomId)
+        )
+        context.startActivity(intent)
+    }
+
     private fun startActivity(context: Context, intent: Intent, buildTask: Boolean) {
         if (buildTask) {
             val stackBuilder = TaskStackBuilder.create(context)
@@ -628,8 +652,10 @@ class DefaultNavigator @Inject constructor(
         )
     }
 
-    override fun openScreenSharingPermissionDialog(screenCaptureIntent: Intent,
-                                                   activityResultLauncher: ActivityResultLauncher<Intent>) {
+    override fun openScreenSharingPermissionDialog(
+            screenCaptureIntent: Intent,
+            activityResultLauncher: ActivityResultLauncher<Intent>
+    ) {
         activityResultLauncher.launch(screenCaptureIntent)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
index 075b41daf3..7b6a81db52 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
@@ -52,12 +52,14 @@ interface Navigator {
 
     fun softLogout(context: Context)
 
-    fun openRoom(context: Context,
-                 roomId: String,
-                 eventId: String? = null,
-                 buildTask: Boolean = false,
-                 isInviteAlreadyAccepted: Boolean = false,
-                 trigger: ViewRoom.Trigger? = null)
+    fun openRoom(
+            context: Context,
+            roomId: String,
+            eventId: String? = null,
+            buildTask: Boolean = false,
+            isInviteAlreadyAccepted: Boolean = false,
+            trigger: ViewRoom.Trigger? = null
+    )
 
     sealed class PostSwitchSpaceAction {
         object None : PostSwitchSpaceAction()
@@ -124,35 +126,45 @@ interface Navigator {
 
     fun openAnalyticsOptIn(context: Context)
 
-    fun openPinCode(context: Context,
-                    activityResultLauncher: ActivityResultLauncher<Intent>,
-                    pinMode: PinMode)
+    fun openPinCode(
+            context: Context,
+            activityResultLauncher: ActivityResultLauncher<Intent>,
+            pinMode: PinMode
+    )
 
-    fun openTerms(context: Context,
-                  activityResultLauncher: ActivityResultLauncher<Intent>,
-                  serviceType: TermsService.ServiceType,
-                  baseUrl: String,
-                  token: String?)
+    fun openTerms(
+            context: Context,
+            activityResultLauncher: ActivityResultLauncher<Intent>,
+            serviceType: TermsService.ServiceType,
+            baseUrl: String,
+            token: String?
+    )
 
-    fun openStickerPicker(context: Context,
-                          activityResultLauncher: ActivityResultLauncher<Intent>,
-                          roomId: String,
-                          widget: Widget)
+    fun openStickerPicker(
+            context: Context,
+            activityResultLauncher: ActivityResultLauncher<Intent>,
+            roomId: String,
+            widget: Widget
+    )
 
-    fun openIntegrationManager(context: Context,
-                               activityResultLauncher: ActivityResultLauncher<Intent>,
-                               roomId: String,
-                               integId: String?,
-                               screen: String?)
+    fun openIntegrationManager(
+            context: Context,
+            activityResultLauncher: ActivityResultLauncher<Intent>,
+            roomId: String,
+            integId: String?,
+            screen: String?
+    )
 
     fun openRoomWidget(context: Context, roomId: String, widget: Widget, options: Map<String, Any>? = null)
 
-    fun openMediaViewer(activity: Activity,
-                        roomId: String,
-                        mediaData: AttachmentData,
-                        view: View,
-                        inMemory: List<AttachmentData> = emptyList(),
-                        options: ((MutableList<Pair<View, String>>) -> Unit)?)
+    fun openMediaViewer(
+            activity: Activity,
+            roomId: String,
+            mediaData: AttachmentData,
+            view: View,
+            inMemory: List<AttachmentData> = emptyList(),
+            options: ((MutableList<Pair<View, String>>) -> Unit)?
+    )
 
     fun openSearch(context: Context, roomId: String, roomDisplayName: String?, roomAvatarUrl: String?)
 
@@ -166,11 +178,15 @@ interface Navigator {
 
     fun openCreatePoll(context: Context, roomId: String, editedEventId: String?, mode: PollMode)
 
-    fun openLocationSharing(context: Context,
-                            roomId: String,
-                            mode: LocationSharingMode,
-                            initialLocationData: LocationData?,
-                            locationOwnerId: String?)
+    fun openLocationSharing(
+            context: Context,
+            roomId: String,
+            mode: LocationSharingMode,
+            initialLocationData: LocationData?,
+            locationOwnerId: String?
+    )
+
+    fun openLocationLiveMap(context: Context, roomId: String)
 
     fun openThread(context: Context, threadTimelineArgs: ThreadTimelineArgs, eventIdToNavigate: String? = null)
 
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
index b9d9261abe..acc4e5945b 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
@@ -151,7 +151,7 @@ class NotifiableEventResolver @Inject constructor(
                     senderName = senderDisplayName,
                     senderId = event.root.senderId,
                     body = body.toString(),
-                    imageUri = event.fetchImageIfPresent(session),
+                    imageUriString = event.fetchImageIfPresent(session)?.toString(),
                     roomId = event.root.roomId!!,
                     roomName = roomName,
                     matrixID = session.myUserId
@@ -176,7 +176,7 @@ class NotifiableEventResolver @Inject constructor(
                             senderName = senderDisplayName,
                             senderId = event.root.senderId,
                             body = body,
-                            imageUri = event.fetchImageIfPresent(session),
+                            imageUriString = event.fetchImageIfPresent(session)?.toString(),
                             roomId = event.root.roomId!!,
                             roomName = roomName,
                             roomIsDirect = room.roomSummary()?.isDirect ?: false,
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotifiableMessageEvent.kt b/vector/src/main/java/im/vector/app/features/notifications/NotifiableMessageEvent.kt
index d13e41daa8..68268739a0 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotifiableMessageEvent.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotifiableMessageEvent.kt
@@ -27,7 +27,9 @@ data class NotifiableMessageEvent(
         val senderName: String?,
         val senderId: String?,
         val body: String?,
-        val imageUri: Uri?,
+        // We cannot use Uri? type here, as that could trigger a
+        // NotSerializableException when persisting this to storage
+        val imageUriString: String?,
         val roomId: String,
         val roomName: String?,
         val roomIsDirect: Boolean = false,
@@ -45,4 +47,7 @@ data class NotifiableMessageEvent(
     val type: String = EventType.MESSAGE
     val description: String = body ?: ""
     val title: String = senderName ?: ""
+
+    val imageUri: Uri?
+        get() = imageUriString?.let { Uri.parse(it) }
 }
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
index a4022f75c8..736b501772 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
@@ -145,7 +145,7 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
                         ?: context?.getString(R.string.notification_sender_me),
                 senderId = session.myUserId,
                 body = message,
-                imageUri = null,
+                imageUriString = null,
                 roomId = room.roomId,
                 roomName = room.roomSummary()?.displayName ?: room.roomId,
                 roomIsDirect = room.roomSummary()?.isDirect == true,
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationFactory.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationFactory.kt
index 4b6815e7e4..dfe214124e 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationFactory.kt
@@ -81,10 +81,12 @@ class NotificationFactory @Inject constructor(
         }
     }
 
-    fun createSummaryNotification(roomNotifications: List<RoomNotification>,
-                                  invitationNotifications: List<OneShotNotification>,
-                                  simpleNotifications: List<OneShotNotification>,
-                                  useCompleteNotificationFormat: Boolean): SummaryNotification {
+    fun createSummaryNotification(
+            roomNotifications: List<RoomNotification>,
+            invitationNotifications: List<OneShotNotification>,
+            simpleNotifications: List<OneShotNotification>,
+            useCompleteNotificationFormat: Boolean
+    ): SummaryNotification {
         val roomMeta = roomNotifications.filterIsInstance<RoomNotification.Message>().map { it.meta }
         val invitationMeta = invitationNotifications.filterIsInstance<OneShotNotification.Append>().map { it.meta }
         val simpleMeta = simpleNotifications.filterIsInstance<OneShotNotification.Append>().map { it.meta }
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationRenderer.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationRenderer.kt
index e0e21a39a7..449c32cbf4 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationRenderer.kt
@@ -24,16 +24,20 @@ import im.vector.app.features.notifications.NotificationDrawerManager.Companion.
 import timber.log.Timber
 import javax.inject.Inject
 
-class NotificationRenderer @Inject constructor(private val notificationDisplayer: NotificationDisplayer,
-                                               private val notificationFactory: NotificationFactory,
-                                               private val appContext: Context) {
+class NotificationRenderer @Inject constructor(
+        private val notificationDisplayer: NotificationDisplayer,
+        private val notificationFactory: NotificationFactory,
+        private val appContext: Context
+) {
 
     @WorkerThread
-    fun render(myUserId: String,
-               myUserDisplayName: String,
-               myUserAvatarUrl: String?,
-               useCompleteNotificationFormat: Boolean,
-               eventsToProcess: List<ProcessedEvent<NotifiableEvent>>) {
+    fun render(
+            myUserId: String,
+            myUserDisplayName: String,
+            myUserAvatarUrl: String?,
+            useCompleteNotificationFormat: Boolean,
+            eventsToProcess: List<ProcessedEvent<NotifiableEvent>>
+    ) {
         val (roomEvents, simpleEvents, invitationEvents) = eventsToProcess.groupByType()
         with(notificationFactory) {
             val roomNotifications = roomEvents.toNotifications(myUserDisplayName, myUserAvatarUrl)
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationState.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationState.kt
index 3114cd45ca..42d009a501 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationState.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationState.kt
@@ -36,8 +36,10 @@ class NotificationState(
         private val renderedEvents: MutableList<ProcessedEvent<NotifiableEvent>>,
 ) {
 
-    fun <T> updateQueuedEvents(drawerManager: NotificationDrawerManager,
-                               action: NotificationDrawerManager.(NotificationEventQueue, List<ProcessedEvent<NotifiableEvent>>) -> T): T {
+    fun <T> updateQueuedEvents(
+            drawerManager: NotificationDrawerManager,
+            action: NotificationDrawerManager.(NotificationEventQueue, List<ProcessedEvent<NotifiableEvent>>) -> T
+    ): T {
         return synchronized(queuedEvents) {
             action(drawerManager, queuedEvents, renderedEvents)
         }
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
index abfca1a64c..c0fc231c8a 100755
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
@@ -305,9 +305,11 @@ class NotificationUtils @Inject constructor(
      * @return the call notification.
      */
     @SuppressLint("NewApi")
-    fun buildIncomingCallNotification(call: WebRtcCall,
-                                      title: String,
-                                      fromBg: Boolean): Notification {
+    fun buildIncomingCallNotification(
+            call: WebRtcCall,
+            title: String,
+            fromBg: Boolean
+    ): Notification {
         val accentColor = ContextCompat.getColor(context, R.color.notification_accent_color)
         val notificationChannel = if (fromBg) CALL_NOTIFICATION_CHANNEL_ID else SILENT_NOTIFICATION_CHANNEL_ID
         val builder = NotificationCompat.Builder(context, notificationChannel)
@@ -378,8 +380,10 @@ class NotificationUtils @Inject constructor(
         return builder.build()
     }
 
-    fun buildOutgoingRingingCallNotification(call: WebRtcCall,
-                                             title: String): Notification {
+    fun buildOutgoingRingingCallNotification(
+            call: WebRtcCall,
+            title: String
+    ): Notification {
         val accentColor = ContextCompat.getColor(context, R.color.notification_accent_color)
         val builder = NotificationCompat.Builder(context, SILENT_NOTIFICATION_CHANNEL_ID)
                 .setContentTitle(ensureTitleNotEmpty(title))
@@ -434,8 +438,10 @@ class NotificationUtils @Inject constructor(
      * @return the call notification.
      */
     @SuppressLint("NewApi")
-    fun buildPendingCallNotification(call: WebRtcCall,
-                                     title: String): Notification {
+    fun buildPendingCallNotification(
+            call: WebRtcCall,
+            title: String
+    ): Notification {
         val builder = NotificationCompat.Builder(context, SILENT_NOTIFICATION_CHANNEL_ID)
                 .setContentTitle(ensureTitleNotEmpty(title))
                 .apply {
@@ -586,12 +592,14 @@ class NotificationUtils @Inject constructor(
     /**
      * Build a notification for a Room.
      */
-    fun buildMessagesListNotification(messageStyle: NotificationCompat.MessagingStyle,
-                                      roomInfo: RoomEventGroupInfo,
-                                      largeIcon: Bitmap?,
-                                      lastMessageTimestamp: Long,
-                                      senderDisplayNameForReplyCompat: String?,
-                                      tickerText: String): Notification {
+    fun buildMessagesListNotification(
+            messageStyle: NotificationCompat.MessagingStyle,
+            roomInfo: RoomEventGroupInfo,
+            largeIcon: Bitmap?,
+            lastMessageTimestamp: Long,
+            senderDisplayNameForReplyCompat: String?,
+            tickerText: String
+    ): Notification {
         val accentColor = ContextCompat.getColor(context, R.color.notification_accent_color)
         // Build the pending intent for when the notification is clicked
         val openRoomIntent = buildOpenRoomIntent(roomInfo.roomId)
@@ -702,8 +710,10 @@ class NotificationUtils @Inject constructor(
                 .build()
     }
 
-    fun buildRoomInvitationNotification(inviteNotifiableEvent: InviteNotifiableEvent,
-                                        matrixId: String): Notification {
+    fun buildRoomInvitationNotification(
+            inviteNotifiableEvent: InviteNotifiableEvent,
+            matrixId: String
+    ): Notification {
         val accentColor = ContextCompat.getColor(context, R.color.notification_accent_color)
         // Build the pending intent for when the notification is clicked
         val smallIcon = R.drawable.ic_status_bar
@@ -776,8 +786,10 @@ class NotificationUtils @Inject constructor(
                 .build()
     }
 
-    fun buildSimpleEventNotification(simpleNotifiableEvent: SimpleNotifiableEvent,
-                                     matrixId: String): Notification {
+    fun buildSimpleEventNotification(
+            simpleNotifiableEvent: SimpleNotifiableEvent,
+            matrixId: String
+    ): Notification {
         val accentColor = ContextCompat.getColor(context, R.color.notification_accent_color)
         // Build the pending intent for when the notification is clicked
         val smallIcon = R.drawable.ic_status_bar
@@ -887,10 +899,12 @@ class NotificationUtils @Inject constructor(
     /**
      * Build the summary notification.
      */
-    fun buildSummaryListNotification(style: NotificationCompat.InboxStyle?,
-                                     compatSummary: String,
-                                     noisy: Boolean,
-                                     lastMessageTimestamp: Long): Notification {
+    fun buildSummaryListNotification(
+            style: NotificationCompat.InboxStyle?,
+            compatSummary: String,
+            noisy: Boolean,
+            lastMessageTimestamp: Long
+    ): Notification {
         val accentColor = ContextCompat.getColor(context, R.color.notification_accent_color)
         val smallIcon = R.drawable.ic_status_bar
 
diff --git a/vector/src/main/java/im/vector/app/features/notifications/RoomGroupMessageCreator.kt b/vector/src/main/java/im/vector/app/features/notifications/RoomGroupMessageCreator.kt
index aa54176815..9ef60e62c9 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/RoomGroupMessageCreator.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/RoomGroupMessageCreator.kt
@@ -112,7 +112,7 @@ class RoomGroupMessageCreator @Inject constructor(
     private fun createRoomMessagesGroupSummaryLine(events: List<NotifiableMessageEvent>, roomName: String, roomIsDirect: Boolean): CharSequence {
         return try {
             when (events.size) {
-                1    -> createFirstMessageSummaryLine(events.first(), roomName, roomIsDirect)
+                1 -> createFirstMessageSummaryLine(events.first(), roomName, roomIsDirect)
                 else -> {
                     stringProvider.getQuantityString(
                             R.plurals.notification_compat_summary_line_for_room,
diff --git a/vector/src/main/java/im/vector/app/features/notifications/SummaryGroupMessageCreator.kt b/vector/src/main/java/im/vector/app/features/notifications/SummaryGroupMessageCreator.kt
index 7d1cb074ec..d998c480d0 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/SummaryGroupMessageCreator.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/SummaryGroupMessageCreator.kt
@@ -41,10 +41,12 @@ class SummaryGroupMessageCreator @Inject constructor(
         private val notificationUtils: NotificationUtils
 ) {
 
-    fun createSummaryNotification(roomNotifications: List<RoomNotification.Message.Meta>,
-                                  invitationNotifications: List<OneShotNotification.Append.Meta>,
-                                  simpleNotifications: List<OneShotNotification.Append.Meta>,
-                                  useCompleteNotificationFormat: Boolean): Notification {
+    fun createSummaryNotification(
+            roomNotifications: List<RoomNotification.Message.Meta>,
+            invitationNotifications: List<OneShotNotification.Append.Meta>,
+            simpleNotifications: List<OneShotNotification.Append.Meta>,
+            useCompleteNotificationFormat: Boolean
+    ): Notification {
         val summaryInboxStyle = NotificationCompat.InboxStyle().also { style ->
             roomNotifications.forEach { style.addLine(it.summaryLine) }
             invitationNotifications.forEach { style.addLine(it.summaryLine) }
@@ -86,12 +88,14 @@ class SummaryGroupMessageCreator @Inject constructor(
         }
     }
 
-    private fun processSimpleGroupSummary(summaryIsNoisy: Boolean,
-                                          messageEventsCount: Int,
-                                          simpleEventsCount: Int,
-                                          invitationEventsCount: Int,
-                                          roomCount: Int,
-                                          lastMessageTimestamp: Long): Notification {
+    private fun processSimpleGroupSummary(
+            summaryIsNoisy: Boolean,
+            messageEventsCount: Int,
+            simpleEventsCount: Int,
+            invitationEventsCount: Int,
+            roomCount: Int,
+            lastMessageTimestamp: Long
+    ): Notification {
         // Add the simple events as message (?)
         val messageNotificationCount = messageEventsCount + simpleEventsCount
 
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/AuthenticationDescription.kt b/vector/src/main/java/im/vector/app/features/onboarding/AuthenticationDescription.kt
new file mode 100644
index 0000000000..3672b8eef3
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/onboarding/AuthenticationDescription.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.onboarding
+
+import android.os.Parcelable
+import im.vector.app.features.onboarding.AuthenticationDescription.AuthenticationType
+import kotlinx.parcelize.Parcelize
+import org.matrix.android.sdk.api.auth.data.SsoIdentityProvider
+
+sealed interface AuthenticationDescription : Parcelable {
+    @Parcelize
+    object Login : AuthenticationDescription
+
+    @Parcelize
+    data class Register(val type: AuthenticationType) : AuthenticationDescription
+
+    enum class AuthenticationType {
+        Password,
+        Apple,
+        Facebook,
+        GitHub,
+        GitLab,
+        Google,
+        SSO,
+        Other
+    }
+}
+
+fun SsoIdentityProvider?.toAuthenticationType() = when (this?.brand) {
+    SsoIdentityProvider.BRAND_GOOGLE   -> AuthenticationType.Google
+    SsoIdentityProvider.BRAND_GITHUB   -> AuthenticationType.GitHub
+    SsoIdentityProvider.BRAND_APPLE    -> AuthenticationType.Apple
+    SsoIdentityProvider.BRAND_FACEBOOK -> AuthenticationType.Facebook
+    SsoIdentityProvider.BRAND_GITLAB   -> AuthenticationType.GitLab
+    SsoIdentityProvider.BRAND_TWITTER  -> AuthenticationType.SSO
+    null                               -> AuthenticationType.SSO
+    else                               -> AuthenticationType.SSO
+}
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/DirectLoginUseCase.kt b/vector/src/main/java/im/vector/app/features/onboarding/DirectLoginUseCase.kt
index 3014b199b4..925c838d80 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/DirectLoginUseCase.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/DirectLoginUseCase.kt
@@ -19,7 +19,7 @@ package im.vector.app.features.onboarding
 import im.vector.app.R
 import im.vector.app.core.extensions.andThen
 import im.vector.app.core.resources.StringProvider
-import im.vector.app.features.onboarding.OnboardingAction.LoginOrRegister
+import im.vector.app.features.onboarding.OnboardingAction.AuthenticateAction.LoginDirect
 import org.matrix.android.sdk.api.MatrixPatterns.getServerName
 import org.matrix.android.sdk.api.auth.AuthenticationService
 import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
@@ -33,8 +33,8 @@ class DirectLoginUseCase @Inject constructor(
         private val uriFactory: UriFactory
 ) {
 
-    suspend fun execute(action: LoginOrRegister, homeServerConnectionConfig: HomeServerConnectionConfig?): Result<Session> {
-        return fetchWellKnown(action.username, homeServerConnectionConfig)
+    suspend fun execute(action: LoginDirect, homeServerConnectionConfig: HomeServerConnectionConfig?): Result<Session> {
+        return fetchWellKnown(action.matrixId, homeServerConnectionConfig)
                 .andThen { wellKnown -> createSessionFor(wellKnown, action, homeServerConnectionConfig) }
     }
 
@@ -42,13 +42,13 @@ class DirectLoginUseCase @Inject constructor(
         authenticationService.getWellKnownData(matrixId, config)
     }
 
-    private suspend fun createSessionFor(data: WellknownResult, action: LoginOrRegister, config: HomeServerConnectionConfig?) = when (data) {
-        is WellknownResult.Prompt     -> loginDirect(action, data, config)
+    private suspend fun createSessionFor(data: WellknownResult, action: LoginDirect, config: HomeServerConnectionConfig?) = when (data) {
+        is WellknownResult.Prompt -> loginDirect(action, data, config)
         is WellknownResult.FailPrompt -> handleFailPrompt(data, action, config)
-        else                          -> onWellKnownError()
+        else -> onWellKnownError()
     }
 
-    private suspend fun handleFailPrompt(data: WellknownResult.FailPrompt, action: LoginOrRegister, config: HomeServerConnectionConfig?): Result<Session> {
+    private suspend fun handleFailPrompt(data: WellknownResult.FailPrompt, action: LoginDirect, config: HomeServerConnectionConfig?): Result<Session> {
         // Relax on IS discovery if homeserver is valid
         val isMissingInformationToLogin = data.homeServerUrl == null || data.wellKnown == null
         return when {
@@ -57,12 +57,12 @@ class DirectLoginUseCase @Inject constructor(
         }
     }
 
-    private suspend fun loginDirect(action: LoginOrRegister, wellKnownPrompt: WellknownResult.Prompt, config: HomeServerConnectionConfig?): Result<Session> {
+    private suspend fun loginDirect(action: LoginDirect, wellKnownPrompt: WellknownResult.Prompt, config: HomeServerConnectionConfig?): Result<Session> {
         val alteredHomeServerConnectionConfig = config?.updateWith(wellKnownPrompt) ?: fallbackConfig(action, wellKnownPrompt)
         return runCatching {
             authenticationService.directAuthentication(
                     alteredHomeServerConnectionConfig,
-                    action.username,
+                    action.matrixId,
                     action.password,
                     action.initialDeviceName
             )
@@ -74,8 +74,8 @@ class DirectLoginUseCase @Inject constructor(
             identityServerUri = wellKnownPrompt.identityServerUrl?.let { uriFactory.parse(it) }
     )
 
-    private fun fallbackConfig(action: LoginOrRegister, wellKnownPrompt: WellknownResult.Prompt) = HomeServerConnectionConfig(
-            homeServerUri = uriFactory.parse("https://${action.username.getServerName()}"),
+    private fun fallbackConfig(action: LoginDirect, wellKnownPrompt: WellknownResult.Prompt) = HomeServerConnectionConfig(
+            homeServerUri = uriFactory.parse("https://${action.matrixId.getServerName()}"),
             homeServerUriBase = uriFactory.parse(wellKnownPrompt.homeServerUrl),
             identityServerUri = wellKnownPrompt.identityServerUrl?.let { uriFactory.parse(it) }
     )
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/Login2Variant.kt b/vector/src/main/java/im/vector/app/features/onboarding/Login2Variant.kt
index e6b5cfc95c..ed8112f369 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/Login2Variant.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/Login2Variant.kt
@@ -276,7 +276,7 @@ class Login2Variant(
             is LoginViewEvents2.OnLoginModeNotSupported                    ->
                 onLoginModeNotSupported(event.supportedTypes)
             is LoginViewEvents2.OnSessionCreated                           -> handleOnSessionCreated(event)
-            is LoginViewEvents2.Finish                                     -> terminate(true)
+            is LoginViewEvents2.Finish                                     -> terminate()
             is LoginViewEvents2.CancelRegistration                         -> handleCancelRegistration()
         }
     }
@@ -296,14 +296,13 @@ class Login2Variant(
                     option = commonOption
             )
         } else {
-            terminate(false)
+            terminate()
         }
     }
 
-    private fun terminate(newAccount: Boolean) {
+    private fun terminate() {
         val intent = HomeActivity.newIntent(
-                activity,
-                accountCreation = newAccount
+                activity
         )
         activity.startActivity(intent)
         activity.finish()
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt
index 9f7dce56ea..bd2ff1a26a 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt
@@ -25,8 +25,12 @@ import org.matrix.android.sdk.api.auth.data.Credentials
 import org.matrix.android.sdk.api.network.ssl.Fingerprint
 
 sealed interface OnboardingAction : VectorViewModelAction {
-    data class OnGetStarted(val resetLoginConfig: Boolean, val onboardingFlow: OnboardingFlow) : OnboardingAction
-    data class OnIAlreadyHaveAnAccount(val resetLoginConfig: Boolean, val onboardingFlow: OnboardingFlow) : OnboardingAction
+    sealed interface SplashAction : OnboardingAction {
+        val onboardingFlow: OnboardingFlow
+
+        data class OnGetStarted(override val onboardingFlow: OnboardingFlow) : SplashAction
+        data class OnIAlreadyHaveAnAccount(override val onboardingFlow: OnboardingFlow) : SplashAction
+    }
 
     data class UpdateServerType(val serverType: ServerType) : OnboardingAction
 
@@ -46,16 +50,19 @@ sealed interface OnboardingAction : VectorViewModelAction {
     data class ResetPassword(val email: String, val newPassword: String) : OnboardingAction
     object ResetPasswordMailConfirmed : OnboardingAction
 
-    // Login or Register, depending on the signMode
-    data class LoginOrRegister(val username: String, val password: String, val initialDeviceName: String) : OnboardingAction
-    data class Register(val username: String, val password: String, val initialDeviceName: String) : OnboardingAction
+    sealed interface AuthenticateAction : OnboardingAction {
+        data class Register(val username: String, val password: String, val initialDeviceName: String) : AuthenticateAction
+        data class Login(val username: String, val password: String, val initialDeviceName: String) : AuthenticateAction
+        data class LoginDirect(val matrixId: String, val password: String, val initialDeviceName: String) : AuthenticateAction
+    }
+
     object StopEmailValidationCheck : OnboardingAction
 
     data class PostRegisterAction(val registerAction: RegisterAction) : OnboardingAction
 
     // Reset actions
     sealed interface ResetAction : OnboardingAction
-
+    object ResetDeeplinkConfig : ResetAction
     object ResetHomeServerType : ResetAction
     object ResetHomeServerUrl : ResetAction
     object ResetSignMode : ResetAction
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingVariantFactory.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingVariantFactory.kt
index 52423d7019..d63acb4f82 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingVariantFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingVariantFactory.kt
@@ -28,10 +28,11 @@ class OnboardingVariantFactory @Inject constructor(
         private val orientationLocker: ScreenOrientationLocker,
 ) {
 
-    fun create(activity: OnboardingActivity,
-               views: ActivityLoginBinding,
-               onboardingViewModel: Lazy<OnboardingViewModel>,
-               loginViewModel2: Lazy<LoginViewModel2>
+    fun create(
+            activity: OnboardingActivity,
+            views: ActivityLoginBinding,
+            onboardingViewModel: Lazy<OnboardingViewModel>,
+            loginViewModel2: Lazy<LoginViewModel2>
     ) = when (vectorFeatures.onboardingVariant()) {
         VectorFeatures.OnboardingVariant.LEGACY    -> error("Legacy is not supported by the FTUE")
         VectorFeatures.OnboardingVariant.FTUE_AUTH -> FtueAuthVariant(
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewEvents.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewEvents.kt
index 6ffece4ab6..5d6e7005c4 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewEvents.kt
@@ -28,6 +28,7 @@ import org.matrix.android.sdk.api.auth.registration.FlowResult
 sealed class OnboardingViewEvents : VectorViewEvents {
     data class Loading(val message: CharSequence? = null) : OnboardingViewEvents()
     data class Failure(val throwable: Throwable) : OnboardingViewEvents()
+    data class DeeplinkAuthenticationFailure(val retryAction: OnboardingAction) : OnboardingViewEvents()
 
     data class RegistrationFlowResult(val flowResult: FlowResult, val isRegistrationStarted: Boolean) : OnboardingViewEvents()
     object OutdatedHomeserver : OnboardingViewEvents()
@@ -37,6 +38,7 @@ sealed class OnboardingViewEvents : VectorViewEvents {
     object OpenUseCaseSelection : OnboardingViewEvents()
     object OpenServerSelection : OnboardingViewEvents()
     object OpenCombinedRegister : OnboardingViewEvents()
+    object OpenCombinedLogin : OnboardingViewEvents()
     object EditServerSelection : OnboardingViewEvents()
     data class OnServerSelectionDone(val serverType: ServerType) : OnboardingViewEvents()
     object OnLoginFlowRetrieved : OnboardingViewEvents()
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
index a7caa9d0c2..c24d3dbb48 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
@@ -27,9 +27,12 @@ import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.extensions.cancelCurrentOnSet
 import im.vector.app.core.extensions.configureAndStart
+import im.vector.app.core.extensions.inferNoConnectivity
 import im.vector.app.core.extensions.vectorStore
 import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.resources.BuildMeta
 import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.utils.ensureProtocol
 import im.vector.app.core.utils.ensureTrailingSlash
 import im.vector.app.features.VectorFeatures
 import im.vector.app.features.VectorOverrides
@@ -42,17 +45,21 @@ import im.vector.app.features.login.LoginMode
 import im.vector.app.features.login.ReAuthHelper
 import im.vector.app.features.login.ServerType
 import im.vector.app.features.login.SignMode
+import im.vector.app.features.onboarding.OnboardingAction.AuthenticateAction
 import im.vector.app.features.onboarding.StartAuthenticationFlowUseCase.StartAuthenticationResult
+import im.vector.app.features.onboarding.ftueauth.MatrixOrgRegistrationStagesComparator
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.auth.AuthenticationService
 import org.matrix.android.sdk.api.auth.HomeServerHistoryService
 import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.api.auth.data.SsoIdentityProvider
 import org.matrix.android.sdk.api.auth.login.LoginWizard
 import org.matrix.android.sdk.api.auth.registration.FlowResult
 import org.matrix.android.sdk.api.auth.registration.RegistrationWizard
 import org.matrix.android.sdk.api.auth.registration.Stage
+import org.matrix.android.sdk.api.failure.isHomeserverUnavailable
 import org.matrix.android.sdk.api.session.Session
 import timber.log.Timber
 import java.util.UUID
@@ -76,7 +83,8 @@ class OnboardingViewModel @AssistedInject constructor(
         private val registrationActionHandler: RegistrationActionHandler,
         private val directLoginUseCase: DirectLoginUseCase,
         private val startAuthenticationFlowUseCase: StartAuthenticationFlowUseCase,
-        private val vectorOverrides: VectorOverrides
+        private val vectorOverrides: VectorOverrides,
+        private val buildMeta: BuildMeta
 ) : VectorViewModel<OnboardingViewState, OnboardingAction, OnboardingViewEvents>(initialState) {
 
     @AssistedFactory
@@ -114,13 +122,13 @@ class OnboardingViewModel @AssistedInject constructor(
         get() = authenticationService.getRegistrationWizard()
 
     val currentThreePid: String?
-        get() = registrationWizard.currentThreePid
+        get() = registrationWizard.getCurrentThreePid()
 
     // True when login and password has been sent with success to the homeserver
     val isRegistrationStarted: Boolean
-        get() = authenticationService.isRegistrationStarted
+        get() = authenticationService.isRegistrationStarted()
 
-    private val loginWizard: LoginWizard?
+    private val loginWizard: LoginWizard
         get() = authenticationService.getLoginWizard()
 
     private var loginConfig: LoginConfig? = null
@@ -130,16 +138,14 @@ class OnboardingViewModel @AssistedInject constructor(
 
     override fun handle(action: OnboardingAction) {
         when (action) {
-            is OnboardingAction.OnGetStarted               -> handleSplashAction(action.resetLoginConfig, action.onboardingFlow)
-            is OnboardingAction.OnIAlreadyHaveAnAccount    -> handleSplashAction(action.resetLoginConfig, action.onboardingFlow)
+            is OnboardingAction.SplashAction               -> handleSplashAction(action)
             is OnboardingAction.UpdateUseCase              -> handleUpdateUseCase(action)
             OnboardingAction.ResetUseCase                  -> resetUseCase()
             is OnboardingAction.UpdateServerType           -> handleUpdateServerType(action)
             is OnboardingAction.UpdateSignMode             -> handleUpdateSignMode(action)
             is OnboardingAction.InitWith                   -> handleInitWith(action)
             is OnboardingAction.HomeServerChange           -> withAction(action) { handleHomeserverChange(action) }
-            is OnboardingAction.LoginOrRegister            -> handleLoginOrRegister(action).also { lastAction = action }
-            is OnboardingAction.Register                   -> handleRegisterWith(action).also { lastAction = action }
+            is AuthenticateAction                          -> withAction(action) { handleAuthenticateAction(action) }
             is OnboardingAction.LoginWithToken             -> handleLoginWithToken(action)
             is OnboardingAction.WebLoginSuccess            -> handleWebLoginSuccess(action)
             is OnboardingAction.ResetPassword              -> handleResetPassword(action)
@@ -164,39 +170,46 @@ class OnboardingViewModel @AssistedInject constructor(
         block(action)
     }
 
-    private fun handleSplashAction(resetConfig: Boolean, onboardingFlow: OnboardingFlow) {
-        if (resetConfig) {
-            loginConfig = null
-        }
-        setState { copy(onboardingFlow = onboardingFlow) }
-
-        return when (val config = loginConfig.toHomeserverConfig()) {
-            null -> continueToPageAfterSplash(onboardingFlow)
-            else -> startAuthenticationFlow(trigger = null, config, ServerType.Other)
+    private fun handleAuthenticateAction(action: AuthenticateAction) {
+        when (action) {
+            is AuthenticateAction.Register    -> handleRegisterWith(action)
+            is AuthenticateAction.Login       -> handleLogin(action)
+            is AuthenticateAction.LoginDirect -> handleDirectLogin(action, homeServerConnectionConfig = null)
         }
     }
 
-    private fun LoginConfig?.toHomeserverConfig(): HomeServerConnectionConfig? {
-        return this?.homeServerUrl?.takeIf { it.isNotEmpty() }?.let { url ->
-            homeServerConnectionConfigFactory.create(url).also {
-                if (it == null) {
-                    Timber.w("Url from config url was invalid: $url")
-                }
-            }
-        }
+    private fun handleSplashAction(action: OnboardingAction.SplashAction) {
+        setState { copy(onboardingFlow = action.onboardingFlow) }
+        continueToPageAfterSplash(action.onboardingFlow)
     }
 
     private fun continueToPageAfterSplash(onboardingFlow: OnboardingFlow) {
-        val nextOnboardingStep = when (onboardingFlow) {
-            OnboardingFlow.SignUp       -> if (vectorFeatures.isOnboardingUseCaseEnabled()) {
-                OnboardingViewEvents.OpenUseCaseSelection
-            } else {
-                OnboardingViewEvents.OpenServerSelection
+        when (onboardingFlow) {
+            OnboardingFlow.SignUp       -> {
+                _viewEvents.post(
+                        if (vectorFeatures.isOnboardingUseCaseEnabled()) {
+                            OnboardingViewEvents.OpenUseCaseSelection
+                        } else {
+                            OnboardingViewEvents.OpenServerSelection
+                        }
+                )
             }
-            OnboardingFlow.SignIn,
-            OnboardingFlow.SignInSignUp -> OnboardingViewEvents.OpenServerSelection
+            OnboardingFlow.SignIn       -> when {
+                vectorFeatures.isOnboardingCombinedLoginEnabled() -> {
+                    handle(OnboardingAction.HomeServerChange.SelectHomeServer(deeplinkOrDefaultHomeserverUrl()))
+                }
+                else                                              -> openServerSelectionOrDeeplinkToOther()
+            }
+
+            OnboardingFlow.SignInSignUp -> openServerSelectionOrDeeplinkToOther()
+        }
+    }
+
+    private fun openServerSelectionOrDeeplinkToOther() {
+        when (loginConfig) {
+            null -> _viewEvents.post(OnboardingViewEvents.OpenServerSelection)
+            else -> handleHomeserverChange(OnboardingAction.HomeServerChange.SelectHomeServer(deeplinkOrDefaultHomeserverUrl()), ServerType.Other)
         }
-        _viewEvents.post(nextOnboardingStep)
     }
 
     private fun handleUserAcceptCertificate(action: OnboardingAction.UserAcceptCertificate) {
@@ -206,9 +219,9 @@ class OnboardingViewModel @AssistedInject constructor(
             is OnboardingAction.HomeServerChange.SelectHomeServer -> {
                 currentHomeServerConnectionConfig
                         ?.let { it.copy(allowedFingerprints = it.allowedFingerprints + action.fingerprint) }
-                        ?.let { startAuthenticationFlow(finalLastAction, it) }
+                        ?.let { startAuthenticationFlow(finalLastAction, it, serverTypeOverride = null) }
             }
-            is OnboardingAction.LoginOrRegister                   ->
+            is AuthenticateAction.LoginDirect                     ->
                 handleDirectLogin(
                         finalLastAction,
                         HomeServerConnectionConfig.Builder()
@@ -233,21 +246,15 @@ class OnboardingViewModel @AssistedInject constructor(
 
     private fun handleLoginWithToken(action: OnboardingAction.LoginWithToken) {
         val safeLoginWizard = loginWizard
+        setState { copy(isLoading = true) }
 
-        if (safeLoginWizard == null) {
-            setState { copy(isLoading = false) }
-            _viewEvents.post(OnboardingViewEvents.Failure(Throwable("Bad configuration")))
-        } else {
-            setState { copy(isLoading = true) }
-
-            currentJob = viewModelScope.launch {
-                try {
-                    val result = safeLoginWizard.loginWithToken(action.loginToken)
-                    onSessionCreated(result, isAccountCreated = false)
-                } catch (failure: Throwable) {
-                    setState { copy(isLoading = false) }
-                    _viewEvents.post(OnboardingViewEvents.Failure(failure))
-                }
+        currentJob = viewModelScope.launch {
+            try {
+                val result = safeLoginWizard.loginWithToken(action.loginToken)
+                onSessionCreated(result, authenticationDescription = AuthenticationDescription.Login)
+            } catch (failure: Throwable) {
+                setState { copy(isLoading = false) }
+                _viewEvents.post(OnboardingViewEvents.Failure(failure))
             }
         }
     }
@@ -277,7 +284,11 @@ class OnboardingViewModel @AssistedInject constructor(
                                     // do nothing
                                 }
                                 else                   -> when (it) {
-                                    is RegistrationResult.Complete         -> onSessionCreated(it.session, isAccountCreated = true)
+                                    is RegistrationResult.Complete         -> onSessionCreated(
+                                            it.session,
+                                            authenticationDescription = awaitState().selectedAuthenticationState.description
+                                                    ?: AuthenticationDescription.Register(AuthenticationDescription.AuthenticationType.Other)
+                                    )
                                     is RegistrationResult.NextStep         -> onFlowResponse(it.flowResult, onNextRegistrationStepAction)
                                     is RegistrationResult.SendEmailSuccess -> _viewEvents.post(OnboardingViewEvents.OnSendEmailSuccess(it.email))
                                     is RegistrationResult.Error            -> _viewEvents.post(OnboardingViewEvents.Failure(it.cause))
@@ -293,10 +304,24 @@ class OnboardingViewModel @AssistedInject constructor(
     }
 
     private fun emitFlowResultViewEvent(flowResult: FlowResult) {
-        _viewEvents.post(OnboardingViewEvents.RegistrationFlowResult(flowResult, isRegistrationStarted))
+        withState { state ->
+            val orderedResult = when {
+                state.hasSelectedMatrixOrg() && vectorFeatures.isOnboardingCombinedRegisterEnabled() -> flowResult.copy(
+                        missingStages = flowResult.missingStages.sortedWith(MatrixOrgRegistrationStagesComparator())
+                )
+                else                                                                                 -> flowResult
+            }
+            _viewEvents.post(OnboardingViewEvents.RegistrationFlowResult(orderedResult, isRegistrationStarted))
+        }
     }
 
-    private fun handleRegisterWith(action: OnboardingAction.Register) {
+    private fun OnboardingViewState.hasSelectedMatrixOrg() = selectedHomeserver.userFacingUrl == matrixOrgUrl
+
+    private fun handleRegisterWith(action: AuthenticateAction.Register) {
+        setState {
+            val authDescription = AuthenticationDescription.Register(AuthenticationDescription.AuthenticationType.Password)
+            copy(selectedAuthenticationState = SelectedAuthenticationState(authDescription))
+        }
         reAuthHelper.data = action.password
         handleRegisterAction(
                 RegisterAction.CreateAccount(
@@ -346,10 +371,11 @@ class OnboardingViewModel @AssistedInject constructor(
                 setState {
                     copy(
                             isLoading = false,
-                            resetPasswordEmail = null
+                            resetState = ResetState()
                     )
                 }
             }
+            OnboardingAction.ResetDeeplinkConfig        -> loginConfig = null
         }
     }
 
@@ -370,11 +396,13 @@ class OnboardingViewModel @AssistedInject constructor(
     private fun handleUpdateUseCase(action: OnboardingAction.UpdateUseCase) {
         setState { copy(useCase = action.useCase) }
         when (vectorFeatures.isOnboardingCombinedRegisterEnabled()) {
-            true  -> handle(OnboardingAction.HomeServerChange.SelectHomeServer(defaultHomeserverUrl))
+            true  -> handle(OnboardingAction.HomeServerChange.SelectHomeServer(deeplinkOrDefaultHomeserverUrl()))
             false -> _viewEvents.post(OnboardingViewEvents.OpenServerSelection)
         }
     }
 
+    private fun deeplinkOrDefaultHomeserverUrl() = loginConfig?.homeServerUrl?.ensureProtocol() ?: defaultHomeserverUrl
+
     private fun resetUseCase() {
         setState { copy(useCase = null) }
     }
@@ -398,10 +426,9 @@ class OnboardingViewModel @AssistedInject constructor(
 
     private fun handleInitWith(action: OnboardingAction.InitWith) {
         loginConfig = action.loginConfig
-
         // If there is a pending email validation continue on this step
         try {
-            if (registrationWizard.isRegistrationStarted) {
+            if (registrationWizard.isRegistrationStarted()) {
                 currentThreePid?.let {
                     handle(OnboardingAction.PostViewEvent(OnboardingViewEvents.OnSendEmailSuccess(it)))
                 }
@@ -414,77 +441,18 @@ class OnboardingViewModel @AssistedInject constructor(
 
     private fun handleResetPassword(action: OnboardingAction.ResetPassword) {
         val safeLoginWizard = loginWizard
-
-        if (safeLoginWizard == null) {
-            setState { copy(isLoading = false) }
-            _viewEvents.post(OnboardingViewEvents.Failure(Throwable("Bad configuration")))
-        } else {
-            setState { copy(isLoading = true) }
-
-            currentJob = viewModelScope.launch {
-                try {
-                    safeLoginWizard.resetPassword(action.email, action.newPassword)
-                } catch (failure: Throwable) {
-                    setState { copy(isLoading = false) }
-                    _viewEvents.post(OnboardingViewEvents.Failure(failure))
-                    return@launch
-                }
-
-                setState {
-                    copy(
-                            isLoading = false,
-                            resetPasswordEmail = action.email
-                    )
-                }
-
-                _viewEvents.post(OnboardingViewEvents.OnResetPasswordSendThreePidDone)
-            }
-        }
-    }
-
-    private fun handleResetPasswordMailConfirmed() {
-        val safeLoginWizard = loginWizard
-
-        if (safeLoginWizard == null) {
-            setState { copy(isLoading = false) }
-            _viewEvents.post(OnboardingViewEvents.Failure(Throwable("Bad configuration")))
-        } else {
-            setState { copy(isLoading = false) }
-
-            currentJob = viewModelScope.launch {
-                try {
-                    safeLoginWizard.resetPasswordMailConfirmed()
-                } catch (failure: Throwable) {
-                    setState { copy(isLoading = false) }
-                    _viewEvents.post(OnboardingViewEvents.Failure(failure))
-                    return@launch
-                }
-                setState {
-                    copy(
-                            isLoading = false,
-                            resetPasswordEmail = null
-                    )
-                }
-
-                _viewEvents.post(OnboardingViewEvents.OnResetPasswordMailConfirmationSuccess)
-            }
-        }
-    }
-
-    private fun handleLoginOrRegister(action: OnboardingAction.LoginOrRegister) = withState { state ->
-        when (state.signMode) {
-            SignMode.Unknown            -> error("Developer error, invalid sign mode")
-            SignMode.SignIn             -> handleLogin(action)
-            SignMode.SignUp             -> handleRegisterWith(OnboardingAction.Register(action.username, action.password, action.initialDeviceName))
-            SignMode.SignInWithMatrixId -> handleDirectLogin(action, null)
-        }
-    }
-
-    private fun handleDirectLogin(action: OnboardingAction.LoginOrRegister, homeServerConnectionConfig: HomeServerConnectionConfig?) {
         setState { copy(isLoading = true) }
         currentJob = viewModelScope.launch {
-            directLoginUseCase.execute(action, homeServerConnectionConfig).fold(
-                    onSuccess = { onSessionCreated(it, isAccountCreated = false) },
+            runCatching { safeLoginWizard.resetPassword(action.email) }.fold(
+                    onSuccess = {
+                        setState {
+                            copy(
+                                    isLoading = false,
+                                    resetState = ResetState(email = action.email, newPassword = action.newPassword)
+                            )
+                        }
+                        _viewEvents.post(OnboardingViewEvents.OnResetPasswordSendThreePidDone)
+                    },
                     onFailure = {
                         setState { copy(isLoading = false) }
                         _viewEvents.post(OnboardingViewEvents.Failure(it))
@@ -493,27 +461,64 @@ class OnboardingViewModel @AssistedInject constructor(
         }
     }
 
-    private fun handleLogin(action: OnboardingAction.LoginOrRegister) {
-        val safeLoginWizard = loginWizard
-
-        if (safeLoginWizard == null) {
-            setState { copy(isLoading = false) }
-            _viewEvents.post(OnboardingViewEvents.Failure(Throwable("Bad configuration")))
-        } else {
-            setState { copy(isLoading = true) }
-            currentJob = viewModelScope.launch {
-                try {
-                    val result = safeLoginWizard.login(
-                            action.username,
-                            action.password,
-                            action.initialDeviceName
-                    )
-                    reAuthHelper.data = action.password
-                    onSessionCreated(result, isAccountCreated = false)
-                } catch (failure: Throwable) {
+    private fun handleResetPasswordMailConfirmed() {
+        setState { copy(isLoading = true) }
+        currentJob = viewModelScope.launch {
+            val resetState = awaitState().resetState
+            when (val newPassword = resetState.newPassword) {
+                null -> {
                     setState { copy(isLoading = false) }
-                    _viewEvents.post(OnboardingViewEvents.Failure(failure))
+                    _viewEvents.post(OnboardingViewEvents.Failure(IllegalStateException("Developer error - No new password has been set")))
                 }
+                else -> {
+                    runCatching { loginWizard.resetPasswordMailConfirmed(newPassword) }.fold(
+                            onSuccess = {
+                                setState {
+                                    copy(
+                                            isLoading = false,
+                                            resetState = ResetState()
+                                    )
+                                }
+                                _viewEvents.post(OnboardingViewEvents.OnResetPasswordMailConfirmationSuccess)
+                            },
+                            onFailure = {
+                                setState { copy(isLoading = false) }
+                                _viewEvents.post(OnboardingViewEvents.Failure(it))
+                            }
+                    )
+                }
+            }
+        }
+    }
+
+    private fun handleDirectLogin(action: AuthenticateAction.LoginDirect, homeServerConnectionConfig: HomeServerConnectionConfig?) {
+        setState { copy(isLoading = true) }
+        currentJob = viewModelScope.launch {
+            directLoginUseCase.execute(action, homeServerConnectionConfig).fold(
+                    onSuccess = { onSessionCreated(it, authenticationDescription = AuthenticationDescription.Login) },
+                    onFailure = {
+                        setState { copy(isLoading = false) }
+                        _viewEvents.post(OnboardingViewEvents.Failure(it))
+                    }
+            )
+        }
+    }
+
+    private fun handleLogin(action: AuthenticateAction.Login) {
+        val safeLoginWizard = loginWizard
+        setState { copy(isLoading = true) }
+        currentJob = viewModelScope.launch {
+            try {
+                val result = safeLoginWizard.login(
+                        action.username,
+                        action.password,
+                        action.initialDeviceName
+                )
+                reAuthHelper.data = action.password
+                onSessionCreated(result, authenticationDescription = AuthenticationDescription.Login)
+            } catch (failure: Throwable) {
+                setState { copy(isLoading = false) }
+                _viewEvents.post(OnboardingViewEvents.Failure(failure))
             }
         }
     }
@@ -538,7 +543,7 @@ class OnboardingViewModel @AssistedInject constructor(
         internalRegisterAction(RegisterAction.RegisterDummy, onNextRegistrationStepAction)
     }
 
-    private suspend fun onSessionCreated(session: Session, isAccountCreated: Boolean) {
+    private suspend fun onSessionCreated(session: Session, authenticationDescription: AuthenticationDescription) {
         val state = awaitState()
         state.useCase?.let { useCase ->
             session.vectorStore(applicationContext).setUseCase(useCase)
@@ -549,15 +554,15 @@ class OnboardingViewModel @AssistedInject constructor(
         authenticationService.reset()
         session.configureAndStart(applicationContext)
 
-        when (isAccountCreated) {
-            true  -> {
+        when (authenticationDescription) {
+            is AuthenticationDescription.Register -> {
                 val personalizationState = createPersonalizationState(session, state)
                 setState {
                     copy(isLoading = false, personalizationState = personalizationState)
                 }
                 _viewEvents.post(OnboardingViewEvents.OnAccountCreated)
             }
-            false -> {
+            AuthenticationDescription.Login       -> {
                 setState { copy(isLoading = false) }
                 _viewEvents.post(OnboardingViewEvents.OnAccountSignedIn)
             }
@@ -588,7 +593,7 @@ class OnboardingViewModel @AssistedInject constructor(
             currentJob = viewModelScope.launch {
                 try {
                     val result = authenticationService.createSessionFromSso(homeServerConnectionConfigFinal, action.credentials)
-                    onSessionCreated(result, isAccountCreated = false)
+                    onSessionCreated(result, authenticationDescription = AuthenticationDescription.Login)
                 } catch (failure: Throwable) {
                     setState { copy(isLoading = false) }
                 }
@@ -596,20 +601,20 @@ class OnboardingViewModel @AssistedInject constructor(
         }
     }
 
-    private fun handleHomeserverChange(action: OnboardingAction.HomeServerChange) {
+    private fun handleHomeserverChange(action: OnboardingAction.HomeServerChange, serverTypeOverride: ServerType? = null) {
         val homeServerConnectionConfig = homeServerConnectionConfigFactory.create(action.homeServerUrl)
         if (homeServerConnectionConfig == null) {
             // This is invalid
             _viewEvents.post(OnboardingViewEvents.Failure(Throwable("Unable to create a HomeServerConnectionConfig")))
         } else {
-            startAuthenticationFlow(action, homeServerConnectionConfig)
+            startAuthenticationFlow(action, homeServerConnectionConfig, serverTypeOverride)
         }
     }
 
     private fun startAuthenticationFlow(
-            trigger: OnboardingAction?,
+            trigger: OnboardingAction.HomeServerChange,
             homeServerConnectionConfig: HomeServerConnectionConfig,
-            serverTypeOverride: ServerType? = null
+            serverTypeOverride: ServerType?
     ) {
         currentHomeServerConnectionConfig = homeServerConnectionConfig
 
@@ -617,14 +622,36 @@ class OnboardingViewModel @AssistedInject constructor(
             setState { copy(isLoading = true) }
             runCatching { startAuthenticationFlowUseCase.execute(homeServerConnectionConfig) }.fold(
                     onSuccess = { onAuthenticationStartedSuccess(trigger, homeServerConnectionConfig, it, serverTypeOverride) },
-                    onFailure = { _viewEvents.post(OnboardingViewEvents.Failure(it)) }
+                    onFailure = { onAuthenticationStartError(it, trigger) }
             )
             setState { copy(isLoading = false) }
         }
     }
 
+    private fun onAuthenticationStartError(error: Throwable, trigger: OnboardingAction.HomeServerChange) {
+        when {
+            error.isHomeserverUnavailable() && applicationContext.inferNoConnectivity(buildMeta) -> _viewEvents.post(
+                    OnboardingViewEvents.Failure(error)
+            )
+            deeplinkUrlIsUnavailable(error, trigger)                                             -> _viewEvents.post(
+                    OnboardingViewEvents.DeeplinkAuthenticationFailure(
+                            retryAction = (trigger as OnboardingAction.HomeServerChange.SelectHomeServer).resetToDefaultUrl()
+                    )
+            )
+            else                                                                                 -> _viewEvents.post(
+                    OnboardingViewEvents.Failure(error)
+            )
+        }
+    }
+
+    private fun deeplinkUrlIsUnavailable(error: Throwable, trigger: OnboardingAction.HomeServerChange) = error.isHomeserverUnavailable() &&
+            loginConfig != null &&
+            trigger is OnboardingAction.HomeServerChange.SelectHomeServer
+
+    private fun OnboardingAction.HomeServerChange.SelectHomeServer.resetToDefaultUrl() = copy(homeServerUrl = defaultHomeserverUrl)
+
     private suspend fun onAuthenticationStartedSuccess(
-            trigger: OnboardingAction?,
+            trigger: OnboardingAction.HomeServerChange,
             config: HomeServerConnectionConfig,
             authResult: StartAuthenticationResult,
             serverTypeOverride: ServerType?
@@ -635,40 +662,51 @@ class OnboardingViewModel @AssistedInject constructor(
         }
 
         when (trigger) {
-            is OnboardingAction.HomeServerChange.EditHomeServer   -> {
-                when (awaitState().onboardingFlow) {
-                    OnboardingFlow.SignUp -> internalRegisterAction(RegisterAction.StartRegistration) { _ ->
-                        updateServerSelection(config, serverTypeOverride, authResult)
-                        _viewEvents.post(OnboardingViewEvents.OnHomeserverEdited)
-                    }
-                    else                  -> throw IllegalArgumentException("developer error")
-                }
-            }
             is OnboardingAction.HomeServerChange.SelectHomeServer -> {
-                updateServerSelection(config, serverTypeOverride, authResult)
-                if (authResult.selectedHomeserver.preferredLoginMode.supportsSignModeScreen()) {
-                    when (awaitState().onboardingFlow) {
-                        OnboardingFlow.SignIn -> {
-                            updateSignMode(SignMode.SignIn)
-                            _viewEvents.post(OnboardingViewEvents.OnSignModeSelected(SignMode.SignIn))
-                        }
-                        OnboardingFlow.SignUp -> {
-                            updateSignMode(SignMode.SignUp)
-                            internalRegisterAction(RegisterAction.StartRegistration, ::emitFlowResultViewEvent)
-                        }
-                        OnboardingFlow.SignInSignUp,
-                        null                  -> {
-                            _viewEvents.post(OnboardingViewEvents.OnLoginFlowRetrieved)
-                        }
+                onHomeServerSelected(config, serverTypeOverride, authResult)
+            }
+            is OnboardingAction.HomeServerChange.EditHomeServer   -> {
+                onHomeServerEdited(config, serverTypeOverride, authResult)
+            }
+        }
+    }
+
+    private suspend fun onHomeServerSelected(config: HomeServerConnectionConfig, serverTypeOverride: ServerType?, authResult: StartAuthenticationResult) {
+        updateServerSelection(config, serverTypeOverride, authResult)
+        if (authResult.selectedHomeserver.preferredLoginMode.supportsSignModeScreen()) {
+            when (awaitState().onboardingFlow) {
+                OnboardingFlow.SignIn -> {
+                    updateSignMode(SignMode.SignIn)
+                    when (vectorFeatures.isOnboardingCombinedLoginEnabled()) {
+                        true  -> _viewEvents.post(OnboardingViewEvents.OpenCombinedLogin)
+                        false -> _viewEvents.post(OnboardingViewEvents.OnSignModeSelected(SignMode.SignIn))
                     }
-                } else {
+                }
+                OnboardingFlow.SignUp -> {
+                    updateSignMode(SignMode.SignUp)
+                    internalRegisterAction(RegisterAction.StartRegistration, ::emitFlowResultViewEvent)
+                }
+                OnboardingFlow.SignInSignUp,
+                null                  -> {
                     _viewEvents.post(OnboardingViewEvents.OnLoginFlowRetrieved)
                 }
             }
-            else                                                  -> {
+        } else {
+            _viewEvents.post(OnboardingViewEvents.OnLoginFlowRetrieved)
+        }
+    }
+
+    private suspend fun onHomeServerEdited(config: HomeServerConnectionConfig, serverTypeOverride: ServerType?, authResult: StartAuthenticationResult) {
+        when (awaitState().onboardingFlow) {
+            OnboardingFlow.SignUp -> internalRegisterAction(RegisterAction.StartRegistration) {
                 updateServerSelection(config, serverTypeOverride, authResult)
-                _viewEvents.post(OnboardingViewEvents.OnLoginFlowRetrieved)
+                _viewEvents.post(OnboardingViewEvents.OnHomeserverEdited)
             }
+            OnboardingFlow.SignIn -> {
+                updateServerSelection(config, serverTypeOverride, authResult)
+                _viewEvents.post(OnboardingViewEvents.OnHomeserverEdited)
+            }
+            else                  -> throw IllegalArgumentException("developer error")
         }
     }
 
@@ -697,8 +735,12 @@ class OnboardingViewModel @AssistedInject constructor(
         return loginConfig?.homeServerUrl
     }
 
-    fun getSsoUrl(redirectUrl: String, deviceId: String?, providerId: String?): String? {
-        return authenticationService.getSsoUrl(redirectUrl, deviceId, providerId)
+    fun fetchSsoUrl(redirectUrl: String, deviceId: String?, provider: SsoIdentityProvider?): String? {
+        setState {
+            val authDescription = AuthenticationDescription.Register(provider.toAuthenticationType())
+            copy(selectedAuthenticationState = SelectedAuthenticationState(authDescription))
+        }
+        return authenticationService.getSsoUrl(redirectUrl, deviceId, provider?.id)
     }
 
     fun getFallbackUrl(forSignIn: Boolean, deviceId: String?): String? {
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt
index 442a0a7df1..268b1e7d49 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewState.kt
@@ -39,7 +39,7 @@ data class OnboardingViewState(
         @PersistState
         val signMode: SignMode = SignMode.Unknown,
         @PersistState
-        val resetPasswordEmail: String? = null,
+        val resetState: ResetState = ResetState(),
 
         // For SSO session recovery
         @PersistState
@@ -51,6 +51,9 @@ data class OnboardingViewState(
         @PersistState
         val selectedHomeserver: SelectedHomeserverState = SelectedHomeserverState(),
 
+        @PersistState
+        val selectedAuthenticationState: SelectedAuthenticationState = SelectedAuthenticationState(),
+
         @PersistState
         val personalizationState: PersonalizationState = PersonalizationState()
 ) : MavericksState
@@ -80,3 +83,14 @@ data class PersonalizationState(
 
     fun supportsPersonalization() = supportsChangingDisplayName || supportsChangingProfilePicture
 }
+
+@Parcelize
+data class ResetState(
+        val email: String? = null,
+        val newPassword: String? = null,
+) : Parcelable
+
+@Parcelize
+data class SelectedAuthenticationState(
+        val description: AuthenticationDescription? = null,
+) : Parcelable
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/AbstractFtueAuthFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/AbstractFtueAuthFragment.kt
index f5c81773ea..a851e13e36 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/AbstractFtueAuthFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/AbstractFtueAuthFragment.kt
@@ -80,11 +80,11 @@ abstract class AbstractFtueAuthFragment<VB : ViewBinding> : VectorBaseFragment<V
         }
 
         when (throwable) {
-            is CancellationException                  ->
+            is CancellationException ->
                 /* Ignore this error, user has cancelled the action */
                 Unit
             is Failure.UnrecognizedCertificateFailure -> showUnrecognizedCertificateFailure(throwable)
-            else                                      -> onError(throwable)
+            else -> onError(throwable)
         }
     }
 
@@ -153,7 +153,7 @@ abstract class AbstractFtueAuthFragment<VB : ViewBinding> : VectorBaseFragment<V
 
     final override fun invalidate() = withState(viewModel) { state ->
         // True when email is sent with success to the homeserver
-        isResetPasswordStarted = state.resetPasswordEmail.isNullOrBlank().not()
+        isResetPasswordStarted = state.resetState.email.isNullOrBlank().not()
 
         updateWithState(state)
     }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/AbstractSSOFtueAuthFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/AbstractSSOFtueAuthFragment.kt
index a032181e4d..1b764f4ce6 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/AbstractSSOFtueAuthFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/AbstractSSOFtueAuthFragment.kt
@@ -90,10 +90,10 @@ abstract class AbstractSSOFtueAuthFragment<VB : ViewBinding> : AbstractFtueAuthF
         withState(viewModel) { state ->
             if (state.selectedHomeserver.preferredLoginMode.hasSso() && state.selectedHomeserver.preferredLoginMode.ssoIdentityProviders().isNullOrEmpty()) {
                 // in this case we can prefetch (not other cases for privacy concerns)
-                viewModel.getSsoUrl(
+                viewModel.fetchSsoUrl(
                         redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
                         deviceId = state.deviceId,
-                        providerId = null
+                        provider = null
                 )
                         ?.let { prefetchUrl(it) }
             }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedLoginFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedLoginFragment.kt
new file mode 100644
index 0000000000..c3c662902d
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedLoginFragment.kt
@@ -0,0 +1,161 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.onboarding.ftueauth
+
+import android.os.Build
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.autofill.HintConstants
+import androidx.core.view.isVisible
+import androidx.lifecycle.lifecycleScope
+import im.vector.app.R
+import im.vector.app.core.extensions.content
+import im.vector.app.core.extensions.editText
+import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.core.extensions.hidePassword
+import im.vector.app.core.extensions.realignPercentagesToParent
+import im.vector.app.core.extensions.setOnImeDoneListener
+import im.vector.app.core.extensions.toReducedUrl
+import im.vector.app.databinding.FragmentFtueCombinedLoginBinding
+import im.vector.app.features.login.LoginMode
+import im.vector.app.features.login.SSORedirectRouterActivity
+import im.vector.app.features.login.SocialLoginButtonsView
+import im.vector.app.features.login.render
+import im.vector.app.features.onboarding.OnboardingAction
+import im.vector.app.features.onboarding.OnboardingViewEvents
+import im.vector.app.features.onboarding.OnboardingViewState
+import kotlinx.coroutines.flow.launchIn
+import org.matrix.android.sdk.api.auth.data.SsoIdentityProvider
+import javax.inject.Inject
+
+class FtueAuthCombinedLoginFragment @Inject constructor(
+        private val loginFieldsValidation: LoginFieldsValidation,
+        private val loginErrorParser: LoginErrorParser
+) : AbstractSSOFtueAuthFragment<FragmentFtueCombinedLoginBinding>() {
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFtueCombinedLoginBinding {
+        return FragmentFtueCombinedLoginBinding.inflate(inflater, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupSubmitButton()
+        views.loginRoot.realignPercentagesToParent()
+        views.editServerButton.debouncedClicks { viewModel.handle(OnboardingAction.PostViewEvent(OnboardingViewEvents.EditServerSelection)) }
+        views.loginPasswordInput.setOnImeDoneListener { submit() }
+    }
+
+    private fun setupSubmitButton() {
+        views.loginSubmit.setOnClickListener { submit() }
+        observeContentChangesAndResetErrors(views.loginInput, views.loginPasswordInput, views.loginSubmit)
+                .launchIn(viewLifecycleOwner.lifecycleScope)
+    }
+
+    private fun submit() {
+        cleanupUi()
+        loginFieldsValidation.validate(views.loginInput.content(), views.loginPasswordInput.content())
+                .onUsernameOrIdError { views.loginInput.error = it }
+                .onPasswordError { views.loginPasswordInput.error = it }
+                .onValid { usernameOrId, password ->
+                    val initialDeviceName = getString(R.string.login_default_session_public_name)
+                    viewModel.handle(OnboardingAction.AuthenticateAction.Login(usernameOrId, password, initialDeviceName))
+                }
+    }
+
+    private fun cleanupUi() {
+        views.loginSubmit.hideKeyboard()
+        views.loginInput.error = null
+        views.loginPasswordInput.error = null
+    }
+
+    override fun resetViewModel() {
+        viewModel.handle(OnboardingAction.ResetAuthenticationAttempt)
+    }
+
+    override fun onError(throwable: Throwable) {
+        // Trick to display the error without text.
+        views.loginInput.error = " "
+        loginErrorParser.parse(throwable, views.loginPasswordInput.content())
+                .onUnknown { super.onError(it) }
+                .onUsernameOrIdError { views.loginInput.error = it }
+                .onPasswordError { views.loginPasswordInput.error = it }
+    }
+
+    override fun updateWithState(state: OnboardingViewState) {
+        setupUi(state)
+        setupAutoFill()
+
+        views.selectedServerName.text = state.selectedHomeserver.userFacingUrl.toReducedUrl()
+        views.selectedServerDescription.text = state.selectedHomeserver.description
+
+        if (state.isLoading) {
+            // Ensure password is hidden
+            views.loginPasswordInput.editText().hidePassword()
+        }
+    }
+
+    private fun setupUi(state: OnboardingViewState) {
+        when (state.selectedHomeserver.preferredLoginMode) {
+            is LoginMode.SsoAndPassword -> {
+                showUsernamePassword()
+                renderSsoProviders(state.deviceId, state.selectedHomeserver.preferredLoginMode.ssoIdentityProviders)
+            }
+            is LoginMode.Sso            -> {
+                hideUsernamePassword()
+                renderSsoProviders(state.deviceId, state.selectedHomeserver.preferredLoginMode.ssoIdentityProviders)
+            }
+            else                        -> {
+                showUsernamePassword()
+                hideSsoProviders()
+            }
+        }
+    }
+
+    private fun renderSsoProviders(deviceId: String?, ssoProviders: List<SsoIdentityProvider>?) {
+        views.ssoGroup.isVisible = ssoProviders?.isNotEmpty() == true
+        views.ssoButtonsHeader.isVisible = views.ssoGroup.isVisible && views.loginEntryGroup.isVisible
+        views.ssoButtons.render(ssoProviders, SocialLoginButtonsView.Mode.MODE_CONTINUE) { id ->
+            viewModel.fetchSsoUrl(
+                    redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
+                    deviceId = deviceId,
+                    provider = id
+            )?.let { openInCustomTab(it) }
+        }
+    }
+
+    private fun hideSsoProviders() {
+        views.ssoGroup.isVisible = false
+        views.ssoButtons.ssoIdentityProviders = null
+    }
+
+    private fun hideUsernamePassword() {
+        views.loginEntryGroup.isVisible = false
+    }
+
+    private fun showUsernamePassword() {
+        views.loginEntryGroup.isVisible = true
+    }
+
+    private fun setupAutoFill() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            views.loginInput.setAutofillHints(HintConstants.AUTOFILL_HINT_NEW_USERNAME)
+            views.loginPasswordInput.setAutofillHints(HintConstants.AUTOFILL_HINT_NEW_PASSWORD)
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt
index 0755f18c8c..a6273dc822 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt
@@ -21,7 +21,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.view.inputmethod.EditorInfo
 import androidx.autofill.HintConstants
 import androidx.core.text.isDigitsOnly
 import androidx.core.view.isVisible
@@ -31,22 +30,22 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import im.vector.app.R
 import im.vector.app.core.extensions.content
 import im.vector.app.core.extensions.editText
-import im.vector.app.core.extensions.hasContentFlow
 import im.vector.app.core.extensions.hasSurroundingSpaces
 import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.extensions.hidePassword
 import im.vector.app.core.extensions.realignPercentagesToParent
+import im.vector.app.core.extensions.setOnImeDoneListener
 import im.vector.app.core.extensions.toReducedUrl
 import im.vector.app.databinding.FragmentFtueCombinedRegisterBinding
 import im.vector.app.features.login.LoginMode
 import im.vector.app.features.login.SSORedirectRouterActivity
 import im.vector.app.features.login.SocialLoginButtonsView
+import im.vector.app.features.login.render
 import im.vector.app.features.onboarding.OnboardingAction
+import im.vector.app.features.onboarding.OnboardingAction.AuthenticateAction
 import im.vector.app.features.onboarding.OnboardingViewEvents
 import im.vector.app.features.onboarding.OnboardingViewState
-import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
 import org.matrix.android.sdk.api.auth.data.SsoIdentityProvider
 import org.matrix.android.sdk.api.failure.isInvalidPassword
 import org.matrix.android.sdk.api.failure.isInvalidUsername
@@ -66,36 +65,16 @@ class FtueAuthCombinedRegisterFragment @Inject constructor() : AbstractSSOFtueAu
         super.onViewCreated(view, savedInstanceState)
         setupSubmitButton()
         views.createAccountRoot.realignPercentagesToParent()
-        views.editServerButton.debouncedClicks {
-            viewModel.handle(OnboardingAction.PostViewEvent(OnboardingViewEvents.EditServerSelection))
-        }
-
-        views.createAccountPasswordInput.editText().setOnEditorActionListener { _, actionId, _ ->
-            if (actionId == EditorInfo.IME_ACTION_DONE) {
-                submit()
-                return@setOnEditorActionListener true
-            }
-            return@setOnEditorActionListener false
-        }
+        views.editServerButton.debouncedClicks { viewModel.handle(OnboardingAction.PostViewEvent(OnboardingViewEvents.EditServerSelection)) }
+        views.createAccountPasswordInput.setOnImeDoneListener { submit() }
     }
 
     private fun setupSubmitButton() {
         views.createAccountSubmit.setOnClickListener { submit() }
-        observeInputFields()
-                .onEach {
-                    views.createAccountPasswordInput.error = null
-                    views.createAccountInput.error = null
-                    views.createAccountSubmit.isEnabled = it
-                }
+        observeContentChangesAndResetErrors(views.createAccountInput, views.createAccountPasswordInput, views.createAccountSubmit)
                 .launchIn(viewLifecycleOwner.lifecycleScope)
     }
 
-    private fun observeInputFields() = combine(
-            views.createAccountInput.hasContentFlow { it.trim() },
-            views.createAccountPasswordInput.hasContentFlow(),
-            transform = { isLoginNotEmpty, isPasswordNotEmpty -> isLoginNotEmpty && isPasswordNotEmpty }
-    )
-
     private fun submit() {
         withState(viewModel) { state ->
             cleanupUi()
@@ -119,7 +98,7 @@ class FtueAuthCombinedRegisterFragment @Inject constructor() : AbstractSSOFtueAu
             }
 
             if (error == 0) {
-                viewModel.handle(OnboardingAction.Register(login, password, getString(R.string.login_default_session_public_name)))
+                viewModel.handle(AuthenticateAction.Register(login, password, getString(R.string.login_default_session_public_name)))
             }
         }
     }
@@ -138,26 +117,26 @@ class FtueAuthCombinedRegisterFragment @Inject constructor() : AbstractSSOFtueAu
         // Trick to display the error without text.
         views.createAccountInput.error = " "
         when {
-            throwable.isUsernameInUse() || throwable.isInvalidUsername()                             -> {
+            throwable.isUsernameInUse() || throwable.isInvalidUsername() -> {
                 views.createAccountInput.error = errorFormatter.toHumanReadable(throwable)
             }
-            throwable.isLoginEmailUnknown()                                                          -> {
+            throwable.isLoginEmailUnknown() -> {
                 views.createAccountInput.error = getString(R.string.login_login_with_email_error)
             }
             throwable.isInvalidPassword() && views.createAccountPasswordInput.hasSurroundingSpaces() -> {
                 views.createAccountPasswordInput.error = getString(R.string.auth_invalid_login_param_space_in_password)
             }
-            throwable.isWeakPassword() || throwable.isInvalidPassword()                              -> {
+            throwable.isWeakPassword() || throwable.isInvalidPassword() -> {
                 views.createAccountPasswordInput.error = errorFormatter.toHumanReadable(throwable)
             }
-            throwable.isRegistrationDisabled()                                                       -> {
+            throwable.isRegistrationDisabled() -> {
                 MaterialAlertDialogBuilder(requireActivity())
                         .setTitle(R.string.dialog_title_error)
                         .setMessage(getString(R.string.login_registration_disabled))
                         .setPositiveButton(R.string.ok, null)
                         .show()
             }
-            else                                                                                     -> {
+            else -> {
                 super.onError(throwable)
             }
         }
@@ -185,13 +164,11 @@ class FtueAuthCombinedRegisterFragment @Inject constructor() : AbstractSSOFtueAu
 
     private fun renderSsoProviders(deviceId: String?, ssoProviders: List<SsoIdentityProvider>?) {
         views.ssoGroup.isVisible = ssoProviders?.isNotEmpty() == true
-        views.ssoButtons.mode = SocialLoginButtonsView.Mode.MODE_CONTINUE
-        views.ssoButtons.ssoIdentityProviders = ssoProviders?.sorted()
-        views.ssoButtons.listener = SocialLoginButtonsView.InteractionListener { id ->
-            viewModel.getSsoUrl(
+        views.ssoButtons.render(ssoProviders, SocialLoginButtonsView.Mode.MODE_CONTINUE) { provider ->
+            viewModel.fetchSsoUrl(
                     redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
                     deviceId = deviceId,
-                    providerId = id
+                    provider = provider
             )?.let { openInCustomTab(it) }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt
index 2308280400..6f33de3a94 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt
@@ -26,6 +26,7 @@ import androidx.autofill.HintConstants
 import androidx.core.text.isDigitsOnly
 import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
+import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import im.vector.app.R
 import im.vector.app.core.extensions.hideKeyboard
@@ -44,6 +45,7 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
+import org.matrix.android.sdk.api.auth.data.SsoIdentityProvider
 import org.matrix.android.sdk.api.failure.isInvalidPassword
 import org.matrix.android.sdk.api.failure.isInvalidUsername
 import org.matrix.android.sdk.api.failure.isLoginEmailUnknown
@@ -119,40 +121,43 @@ class FtueAuthLoginFragment @Inject constructor() : AbstractSSOFtueAuthFragment<
     }
 
     private fun submit() {
-        cleanupUi()
+        withState(viewModel) { state ->
+            cleanupUi()
 
-        val login = views.loginField.text.toString()
-        val password = views.passwordField.text.toString()
+            val login = views.loginField.text.toString()
+            val password = views.passwordField.text.toString()
 
-        // This can be called by the IME action, so deal with empty cases
-        var error = 0
-        if (login.isEmpty()) {
-            views.loginFieldTil.error = getString(
-                    if (isSignupMode) {
-                        R.string.error_empty_field_choose_user_name
-                    } else {
-                        R.string.error_empty_field_enter_user_name
-                    }
-            )
-            error++
-        }
-        if (isSignupMode && isNumericOnlyUserIdForbidden && login.isDigitsOnly()) {
-            views.loginFieldTil.error = getString(R.string.error_forbidden_digits_only_username)
-            error++
-        }
-        if (password.isEmpty()) {
-            views.passwordFieldTil.error = getString(
-                    if (isSignupMode) {
-                        R.string.error_empty_field_choose_password
-                    } else {
-                        R.string.error_empty_field_your_password
-                    }
-            )
-            error++
-        }
+            // This can be called by the IME action, so deal with empty cases
+            var error = 0
+            if (login.isEmpty()) {
+                views.loginFieldTil.error = getString(
+                        if (isSignupMode) {
+                            R.string.error_empty_field_choose_user_name
+                        } else {
+                            R.string.error_empty_field_enter_user_name
+                        }
+                )
+                error++
+            }
+            if (isSignupMode && isNumericOnlyUserIdForbidden && login.isDigitsOnly()) {
+                views.loginFieldTil.error = getString(R.string.error_forbidden_digits_only_username)
+                error++
+            }
+            if (password.isEmpty()) {
+                views.passwordFieldTil.error = getString(
+                        if (isSignupMode) {
+                            R.string.error_empty_field_choose_password
+                        } else {
+                            R.string.error_empty_field_your_password
+                        }
+                )
+                error++
+            }
 
-        if (error == 0) {
-            viewModel.handle(OnboardingAction.LoginOrRegister(login, password, getString(R.string.login_default_session_public_name)))
+            if (error == 0) {
+                val initialDeviceName = getString(R.string.login_default_session_public_name)
+                viewModel.handle(state.signMode.toAuthenticateAction(login, password, initialDeviceName))
+            }
         }
     }
 
@@ -212,11 +217,11 @@ class FtueAuthLoginFragment @Inject constructor() : AbstractSSOFtueAuthFragment<
                 views.loginSocialLoginContainer.isVisible = true
                 views.loginSocialLoginButtons.ssoIdentityProviders = state.selectedHomeserver.preferredLoginMode.ssoIdentityProviders?.sorted()
                 views.loginSocialLoginButtons.listener = object : SocialLoginButtonsView.InteractionListener {
-                    override fun onProviderSelected(id: String?) {
-                        viewModel.getSsoUrl(
+                    override fun onProviderSelected(provider: SsoIdentityProvider?) {
+                        viewModel.fetchSsoUrl(
                                 redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
                                 deviceId = state.deviceId,
-                                providerId = id
+                                provider = provider
                         )
                                 ?.let { openInCustomTab(it) }
                     }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordMailConfirmationFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordMailConfirmationFragment.kt
index fd7f14b1cc..76fbae6f40 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordMailConfirmationFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordMailConfirmationFragment.kt
@@ -44,7 +44,7 @@ class FtueAuthResetPasswordMailConfirmationFragment @Inject constructor() : Abst
     }
 
     private fun setupUi(state: OnboardingViewState) {
-        views.resetPasswordMailConfirmationNotice.text = getString(R.string.login_reset_password_mail_confirmation_notice, state.resetPasswordEmail)
+        views.resetPasswordMailConfirmationNotice.text = getString(R.string.login_reset_password_mail_confirmation_notice, state.resetState.email)
     }
 
     private fun submit() {
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSignUpSignInSelectionFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSignUpSignInSelectionFragment.kt
index 69fbd3459b..9a85e46802 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSignUpSignInSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSignUpSignInSelectionFragment.kt
@@ -34,6 +34,7 @@ import im.vector.app.features.login.SocialLoginButtonsView
 import im.vector.app.features.login.ssoIdentityProviders
 import im.vector.app.features.onboarding.OnboardingAction
 import im.vector.app.features.onboarding.OnboardingViewState
+import org.matrix.android.sdk.api.auth.data.SsoIdentityProvider
 import javax.inject.Inject
 
 /**
@@ -81,11 +82,11 @@ class FtueAuthSignUpSignInSelectionFragment @Inject constructor() : AbstractSSOF
                 views.loginSignupSigninSignInSocialLoginContainer.isVisible = true
                 views.loginSignupSigninSocialLoginButtons.ssoIdentityProviders = state.selectedHomeserver.preferredLoginMode.ssoIdentityProviders()?.sorted()
                 views.loginSignupSigninSocialLoginButtons.listener = object : SocialLoginButtonsView.InteractionListener {
-                    override fun onProviderSelected(id: String?) {
-                        viewModel.getSsoUrl(
+                    override fun onProviderSelected(provider: SsoIdentityProvider?) {
+                        viewModel.fetchSsoUrl(
                                 redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
                                 deviceId = state.deviceId,
-                                providerId = id
+                                provider = provider
                         )
                                 ?.let { openInCustomTab(it) }
                     }
@@ -123,10 +124,10 @@ class FtueAuthSignUpSignInSelectionFragment @Inject constructor() : AbstractSSOF
 
     private fun submit() = withState(viewModel) { state ->
         if (state.selectedHomeserver.preferredLoginMode is LoginMode.Sso) {
-            viewModel.getSsoUrl(
+            viewModel.fetchSsoUrl(
                     redirectUrl = SSORedirectRouterActivity.VECTOR_REDIRECT_URL,
                     deviceId = state.deviceId,
-                    providerId = null
+                    provider = null
             )
                     ?.let { openInCustomTab(it) }
         } else {
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashCarouselFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashCarouselFragment.kt
index 30416bde9e..0d86c4cd24 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashCarouselFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashCarouselFragment.kt
@@ -26,8 +26,6 @@ import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import androidx.viewpager2.widget.ViewPager2
-import com.airbnb.mvrx.withState
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.tabs.TabLayoutMediator
 import im.vector.app.BuildConfig
 import im.vector.app.R
@@ -41,8 +39,6 @@ import im.vector.app.features.settings.VectorPreferences
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.failure.Failure
-import java.net.UnknownHostException
 import javax.inject.Inject
 
 private const val CAROUSEL_ROTATION_DELAY_MS = 5000L
@@ -128,33 +124,14 @@ class FtueAuthSplashCarouselFragment @Inject constructor(
 
     private fun splashSubmit(isAlreadyHaveAccountEnabled: Boolean) {
         val getStartedFlow = if (isAlreadyHaveAccountEnabled) OnboardingFlow.SignUp else OnboardingFlow.SignInSignUp
-        viewModel.handle(OnboardingAction.OnGetStarted(resetLoginConfig = false, onboardingFlow = getStartedFlow))
+        viewModel.handle(OnboardingAction.SplashAction.OnGetStarted(onboardingFlow = getStartedFlow))
     }
 
     private fun alreadyHaveAnAccount() {
-        viewModel.handle(OnboardingAction.OnIAlreadyHaveAnAccount(resetLoginConfig = false, onboardingFlow = OnboardingFlow.SignIn))
+        viewModel.handle(OnboardingAction.SplashAction.OnIAlreadyHaveAnAccount(onboardingFlow = OnboardingFlow.SignIn))
     }
 
     override fun resetViewModel() {
         // Nothing to do
     }
-
-    override fun onError(throwable: Throwable) {
-        if (throwable is Failure.NetworkConnection &&
-                throwable.ioException is UnknownHostException) {
-            // Invalid homeserver from URL config
-            val url = viewModel.getInitialHomeServerUrl().orEmpty()
-            MaterialAlertDialogBuilder(requireActivity())
-                    .setTitle(R.string.dialog_title_error)
-                    .setMessage(getString(R.string.login_error_homeserver_from_url_not_found, url))
-                    .setPositiveButton(R.string.login_error_homeserver_from_url_not_found_enter_manual) { _, _ ->
-                        val flow = withState(viewModel) { it.onboardingFlow } ?: OnboardingFlow.SignInSignUp
-                        viewModel.handle(OnboardingAction.OnGetStarted(resetLoginConfig = true, flow))
-                    }
-                    .setNegativeButton(R.string.action_cancel, null)
-                    .show()
-        } else {
-            super.onError(throwable)
-        }
-    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashFragment.kt
index 2fa3b52706..cd1e4b2714 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashFragment.kt
@@ -22,8 +22,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
-import com.airbnb.mvrx.withState
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.databinding.FragmentFtueAuthSplashBinding
@@ -31,8 +29,6 @@ import im.vector.app.features.VectorFeatures
 import im.vector.app.features.onboarding.OnboardingAction
 import im.vector.app.features.onboarding.OnboardingFlow
 import im.vector.app.features.settings.VectorPreferences
-import org.matrix.android.sdk.api.failure.Failure
-import java.net.UnknownHostException
 import javax.inject.Inject
 
 /**
@@ -75,33 +71,14 @@ class FtueAuthSplashFragment @Inject constructor(
 
     private fun splashSubmit(isAlreadyHaveAccountEnabled: Boolean) {
         val getStartedFlow = if (isAlreadyHaveAccountEnabled) OnboardingFlow.SignUp else OnboardingFlow.SignInSignUp
-        viewModel.handle(OnboardingAction.OnGetStarted(resetLoginConfig = false, onboardingFlow = getStartedFlow))
+        viewModel.handle(OnboardingAction.SplashAction.OnGetStarted(onboardingFlow = getStartedFlow))
     }
 
     private fun alreadyHaveAnAccount() {
-        viewModel.handle(OnboardingAction.OnIAlreadyHaveAnAccount(resetLoginConfig = false, onboardingFlow = OnboardingFlow.SignIn))
+        viewModel.handle(OnboardingAction.SplashAction.OnIAlreadyHaveAnAccount(onboardingFlow = OnboardingFlow.SignIn))
     }
 
     override fun resetViewModel() {
         // Nothing to do
     }
-
-    override fun onError(throwable: Throwable) {
-        if (throwable is Failure.NetworkConnection &&
-                throwable.ioException is UnknownHostException) {
-            // Invalid homeserver from URL config
-            val url = viewModel.getInitialHomeServerUrl().orEmpty()
-            MaterialAlertDialogBuilder(requireActivity())
-                    .setTitle(R.string.dialog_title_error)
-                    .setMessage(getString(R.string.login_error_homeserver_from_url_not_found, url))
-                    .setPositiveButton(R.string.login_error_homeserver_from_url_not_found_enter_manual) { _, _ ->
-                        val flow = withState(viewModel) { it.onboardingFlow } ?: OnboardingFlow.SignInSignUp
-                        viewModel.handle(OnboardingAction.OnGetStarted(resetLoginConfig = true, flow))
-                    }
-                    .setNegativeButton(R.string.action_cancel, null)
-                    .show()
-        } else {
-            super.onError(throwable)
-        }
-    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthUseCaseFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthUseCaseFragment.kt
index 5325b25e93..35439a794e 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthUseCaseFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthUseCaseFragment.kt
@@ -44,7 +44,7 @@ private const val DARK_MODE_ICON_BACKGROUND_ALPHA = 0.30f
 private const val LIGHT_MODE_ICON_BACKGROUND_ALPHA = 0.15f
 
 class FtueAuthUseCaseFragment @Inject constructor(
-        private val themeProvider: ThemeProvider
+        private val themeProvider: ThemeProvider,
 ) : AbstractFtueAuthFragment<FragmentFtueAuthUseCaseBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFtueAuthUseCaseBinding {
@@ -104,7 +104,7 @@ class FtueAuthUseCaseFragment @Inject constructor(
     private fun createIcon(@ColorRes tint: Int, icon: Int, isLightMode: Boolean): Drawable {
         val context = requireContext()
         val alpha = when (isLightMode) {
-            true  -> LIGHT_MODE_ICON_BACKGROUND_ALPHA
+            true -> LIGHT_MODE_ICON_BACKGROUND_ALPHA
             false -> DARK_MODE_ICON_BACKGROUND_ALPHA
         }
         val iconBackground = context.getResTintedDrawable(R.drawable.bg_feature_icon, tint, alpha = alpha)
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
index 036f8eb9a2..355200ca30 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
@@ -54,7 +54,6 @@ import im.vector.app.features.onboarding.OnboardingViewState
 import im.vector.app.features.onboarding.ftueauth.terms.FtueAuthLegacyStyleTermsFragment
 import im.vector.app.features.onboarding.ftueauth.terms.FtueAuthTermsFragment
 import im.vector.app.features.onboarding.ftueauth.terms.FtueAuthTermsLegacyStyleFragmentArgument
-import org.matrix.android.sdk.api.auth.registration.FlowResult
 import org.matrix.android.sdk.api.auth.registration.Stage
 import org.matrix.android.sdk.api.auth.toLocalizedLoginTerms
 import org.matrix.android.sdk.api.extensions.tryOrNull
@@ -217,7 +216,7 @@ class FtueAuthVariant(
             is OnboardingViewEvents.OnAccountCreated                           -> onAccountCreated()
             OnboardingViewEvents.OnAccountSignedIn                             -> onAccountSignedIn()
             OnboardingViewEvents.OnChooseDisplayName                           -> onChooseDisplayName()
-            OnboardingViewEvents.OnTakeMeHome                                  -> navigateToHome(createdAccount = true)
+            OnboardingViewEvents.OnTakeMeHome                                  -> navigateToHome()
             OnboardingViewEvents.OnChooseProfilePicture                        -> onChooseProfilePicture()
             OnboardingViewEvents.OnPersonalizationComplete                     -> onPersonalizationComplete()
             OnboardingViewEvents.OnBack                                        -> activity.popBackstack()
@@ -229,23 +228,40 @@ class FtueAuthVariant(
                 )
             }
             OnboardingViewEvents.OnHomeserverEdited                            -> activity.popBackstack()
+            OnboardingViewEvents.OpenCombinedLogin                             -> onStartCombinedLogin()
+            is OnboardingViewEvents.DeeplinkAuthenticationFailure              -> onDeeplinkedHomeserverUnavailable(viewEvents)
         }
     }
 
+    private fun onDeeplinkedHomeserverUnavailable(viewEvents: OnboardingViewEvents.DeeplinkAuthenticationFailure) {
+        showHomeserverUnavailableDialog(onboardingViewModel.getInitialHomeServerUrl().orEmpty()) {
+            onboardingViewModel.handle(OnboardingAction.ResetDeeplinkConfig)
+            onboardingViewModel.handle(viewEvents.retryAction)
+        }
+    }
+
+    private fun showHomeserverUnavailableDialog(url: String, action: () -> Unit) {
+        MaterialAlertDialogBuilder(activity)
+                .setTitle(R.string.dialog_title_error)
+                .setMessage(activity.getString(R.string.login_error_homeserver_from_url_not_found, url))
+                .setPositiveButton(R.string.login_error_homeserver_from_url_not_found_enter_manual) { _, _ -> action() }
+                .setNegativeButton(R.string.action_cancel, null)
+                .show()
+    }
+
+    private fun onStartCombinedLogin() {
+        addRegistrationStageFragmentToBackstack(FtueAuthCombinedLoginFragment::class.java)
+    }
+
     private fun onRegistrationFlow(viewEvents: OnboardingViewEvents.RegistrationFlowResult) {
         when {
             registrationShouldFallback(viewEvents)               -> displayFallbackWebDialog()
-            viewEvents.isRegistrationStarted                     -> handleRegistrationNavigation(viewEvents.flowResult.orderedStages())
+            viewEvents.isRegistrationStarted                     -> handleRegistrationNavigation(viewEvents.flowResult.missingStages)
             vectorFeatures.isOnboardingCombinedRegisterEnabled() -> openStartCombinedRegister()
             else                                                 -> openAuthLoginFragmentWithTag(FRAGMENT_REGISTRATION_STAGE_TAG)
         }
     }
 
-    private fun FlowResult.orderedStages() = when {
-        vectorFeatures.isOnboardingCombinedRegisterEnabled() -> missingStages.sortedWith(FtueMissingRegistrationStagesComparator())
-        else                                                 -> missingStages
-    }
-
     private fun openStartCombinedRegister() {
         addRegistrationStageFragmentToBackstack(FtueAuthCombinedRegisterFragment::class.java)
     }
@@ -451,7 +467,7 @@ class FtueAuthVariant(
     }
 
     private fun onAccountSignedIn() {
-        navigateToHome(createdAccount = false)
+        navigateToHome()
     }
 
     private fun onAccountCreated() {
@@ -463,10 +479,12 @@ class FtueAuthVariant(
         )
     }
 
-    private fun navigateToHome(createdAccount: Boolean) {
-        val intent = HomeActivity.newIntent(activity, accountCreation = createdAccount)
-        activity.startActivity(intent)
-        activity.finish()
+    private fun navigateToHome() {
+        withState(onboardingViewModel) {
+            val intent = HomeActivity.newIntent(activity, authenticationDescription = it.selectedAuthenticationState.description)
+            activity.startActivity(intent)
+            activity.finish()
+        }
     }
 
     private fun onChooseDisplayName() {
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthWebFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthWebFragment.kt
index 68e8632608..4d912b8ed8 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthWebFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthWebFragment.kt
@@ -120,8 +120,10 @@ class FtueAuthWebFragment @Inject constructor(
         views.loginWebWebView.loadUrl(url)
 
         views.loginWebWebView.webViewClient = object : WebViewClient() {
-            override fun onReceivedSslError(view: WebView, handler: SslErrorHandler,
-                                            error: SslError) {
+            override fun onReceivedSslError(
+                    view: WebView, handler: SslErrorHandler,
+                    error: SslError
+            ) {
                 MaterialAlertDialogBuilder(requireActivity())
                         .setMessage(R.string.ssl_could_not_verify)
                         .setPositiveButton(R.string.ssl_trust) { _, _ -> handler.proceed() }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueExtensions.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueExtensions.kt
new file mode 100644
index 0000000000..8d63fbf547
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueExtensions.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.onboarding.ftueauth
+
+import android.widget.Button
+import com.google.android.material.textfield.TextInputLayout
+import im.vector.app.core.extensions.hasContentFlow
+import im.vector.app.features.login.SignMode
+import im.vector.app.features.onboarding.OnboardingAction
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.onEach
+
+fun SignMode.toAuthenticateAction(login: String, password: String, initialDeviceName: String): OnboardingAction.AuthenticateAction {
+    return when (this) {
+        SignMode.Unknown -> error("developer error")
+        SignMode.SignUp -> OnboardingAction.AuthenticateAction.Register(username = login, password, initialDeviceName)
+        SignMode.SignIn -> OnboardingAction.AuthenticateAction.Login(username = login, password, initialDeviceName)
+        SignMode.SignInWithMatrixId -> OnboardingAction.AuthenticateAction.LoginDirect(matrixId = login, password, initialDeviceName)
+    }
+}
+
+/**
+ * A flow to monitor content changes from both username/id and password fields,
+ * clearing errors and enabling/disabling the submission button on non empty content changes.
+ */
+fun observeContentChangesAndResetErrors(username: TextInputLayout, password: TextInputLayout, submit: Button): Flow<*> {
+    return combine(
+            username.hasContentFlow { it.trim() },
+            password.hasContentFlow(),
+            transform = { usernameHasContent, passwordHasContent -> usernameHasContent && passwordHasContent }
+    ).onEach {
+        username.error = null
+        password.error = null
+        submit.isEnabled = it
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/LoginErrorParser.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/LoginErrorParser.kt
new file mode 100644
index 0000000000..a92fdea04a
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/LoginErrorParser.kt
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.onboarding.ftueauth
+
+import im.vector.app.R
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.onboarding.ftueauth.LoginErrorParser.LoginErrorResult
+import org.matrix.android.sdk.api.failure.isInvalidPassword
+import org.matrix.android.sdk.api.failure.isInvalidUsername
+import org.matrix.android.sdk.api.failure.isLoginEmailUnknown
+import javax.inject.Inject
+
+class LoginErrorParser @Inject constructor(
+        private val errorFormatter: ErrorFormatter,
+        private val stringProvider: StringProvider,
+) {
+    fun parse(throwable: Throwable, password: String): LoginErrorResult {
+        return when {
+            throwable.isInvalidUsername()                                    -> {
+                LoginErrorResult(throwable, usernameOrIdError = errorFormatter.toHumanReadable(throwable))
+            }
+            throwable.isLoginEmailUnknown()                                  -> {
+                LoginErrorResult(throwable, usernameOrIdError = stringProvider.getString(R.string.login_login_with_email_error))
+            }
+            throwable.isInvalidPassword() && password.hasSurroundingSpaces() -> {
+                LoginErrorResult(throwable, passwordError = stringProvider.getString(R.string.auth_invalid_login_param_space_in_password))
+            }
+            else                                                             -> {
+                LoginErrorResult(throwable)
+            }
+        }
+    }
+
+    private fun String.hasSurroundingSpaces() = trim() != this
+
+    data class LoginErrorResult(val cause: Throwable, val usernameOrIdError: String? = null, val passwordError: String? = null)
+}
+
+fun LoginErrorResult.onUnknown(action: (Throwable) -> Unit): LoginErrorResult {
+    when {
+        usernameOrIdError == null && passwordError == null -> action(cause)
+    }
+    return this
+}
+
+fun LoginErrorResult.onUsernameOrIdError(action: (String) -> Unit): LoginErrorResult {
+    usernameOrIdError?.let(action)
+    return this
+}
+
+fun LoginErrorResult.onPasswordError(action: (String) -> Unit): LoginErrorResult {
+    passwordError?.let(action)
+    return this
+}
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/LoginFieldsValidation.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/LoginFieldsValidation.kt
new file mode 100644
index 0000000000..659a8cd2c1
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/LoginFieldsValidation.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.onboarding.ftueauth
+
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import javax.inject.Inject
+
+class LoginFieldsValidation @Inject constructor(
+        private val stringProvider: StringProvider
+) {
+
+    fun validate(usernameOrId: String, password: String): LoginValidationResult {
+        return LoginValidationResult(usernameOrId, password, validateUsernameOrId(usernameOrId), validatePassword(password))
+    }
+
+    private fun validateUsernameOrId(usernameOrId: String): String? {
+        val accountError = when {
+            usernameOrId.isEmpty() -> stringProvider.getString(R.string.error_empty_field_enter_user_name)
+            else                   -> null
+        }
+        return accountError
+    }
+
+    private fun validatePassword(password: String): String? {
+        val passwordError = when {
+            password.isEmpty() -> stringProvider.getString(R.string.error_empty_field_your_password)
+            else               -> null
+        }
+        return passwordError
+    }
+}
+
+fun LoginValidationResult.onValid(action: (String, String) -> Unit): LoginValidationResult {
+    when {
+        usernameOrIdError == null && passwordError == null -> action(usernameOrId, password)
+    }
+    return this
+}
+
+fun LoginValidationResult.onUsernameOrIdError(action: (String) -> Unit): LoginValidationResult {
+    usernameOrIdError?.let(action)
+    return this
+}
+
+fun LoginValidationResult.onPasswordError(action: (String) -> Unit): LoginValidationResult {
+    passwordError?.let(action)
+    return this
+}
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/LoginValidationResult.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/LoginValidationResult.kt
new file mode 100644
index 0000000000..caf127332a
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/LoginValidationResult.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.onboarding.ftueauth
+
+data class LoginValidationResult(
+        val usernameOrId: String,
+        val password: String,
+        val usernameOrIdError: String?,
+        val passwordError: String?
+)
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueMissingRegistrationStagesComparator.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/MatrixOrgRegistrationStagesComparator.kt
similarity index 84%
rename from vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueMissingRegistrationStagesComparator.kt
rename to vector/src/main/java/im/vector/app/features/onboarding/ftueauth/MatrixOrgRegistrationStagesComparator.kt
index 6a6326625e..527c20987a 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueMissingRegistrationStagesComparator.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/MatrixOrgRegistrationStagesComparator.kt
@@ -18,10 +18,10 @@ package im.vector.app.features.onboarding.ftueauth
 
 import org.matrix.android.sdk.api.auth.registration.Stage
 
-class FtueMissingRegistrationStagesComparator : Comparator<Stage> {
+class MatrixOrgRegistrationStagesComparator : Comparator<Stage> {
 
-    override fun compare(a: Stage?, b: Stage?): Int {
-        return (a?.toPriority() ?: 0) - (b?.toPriority() ?: 0)
+    override fun compare(a: Stage, b: Stage): Int {
+        return a.toPriority().compareTo(b.toPriority())
     }
 
     private fun Stage.toPriority() = when (this) {
diff --git a/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt b/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
index 5d1ba4e20c..663275e2f7 100644
--- a/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
@@ -45,9 +45,11 @@ import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.room.timeline.isRootThread
 import javax.inject.Inject
 
-class PermalinkHandler @Inject constructor(private val activeSessionHolder: ActiveSessionHolder,
-                                           private val userPreferencesProvider: UserPreferencesProvider,
-                                           private val navigator: Navigator) {
+class PermalinkHandler @Inject constructor(
+        private val activeSessionHolder: ActiveSessionHolder,
+        private val userPreferencesProvider: UserPreferencesProvider,
+        private val navigator: Navigator
+) {
 
     suspend fun launch(
             context: Context,
@@ -204,13 +206,14 @@ class PermalinkHandler @Inject constructor(private val activeSessionHolder: Acti
         }
     }
 
-    private fun NavigationInterceptor?.openJoinedRoomScreen(buildTask: Boolean,
-                                                            roomId: String,
-                                                            eventId: String?,
-                                                            rawLink: Uri,
-                                                            context: Context,
-                                                            rootThreadEventId: String?,
-                                                            roomSummary: RoomSummary
+    private fun NavigationInterceptor?.openJoinedRoomScreen(
+            buildTask: Boolean,
+            roomId: String,
+            eventId: String?,
+            rawLink: Uri,
+            context: Context,
+            rootThreadEventId: String?,
+            roomSummary: RoomSummary
     ) {
         if (this?.navToRoom(roomId, eventId, rawLink, rootThreadEventId) != true) {
             if (rootThreadEventId != null && userPreferencesProvider.areThreadMessagesEnabled()) {
diff --git a/vector/src/main/java/im/vector/app/features/popup/IncomingCallAlert.kt b/vector/src/main/java/im/vector/app/features/popup/IncomingCallAlert.kt
index 3b7aa18ee9..2c640cd2ca 100644
--- a/vector/src/main/java/im/vector/app/features/popup/IncomingCallAlert.kt
+++ b/vector/src/main/java/im/vector/app/features/popup/IncomingCallAlert.kt
@@ -26,8 +26,9 @@ import im.vector.app.features.displayname.getBestName
 import im.vector.app.features.home.AvatarRenderer
 import org.matrix.android.sdk.api.util.MatrixItem
 
-class IncomingCallAlert(uid: String,
-                        override val shouldBeDisplayedIn: ((Activity) -> Boolean) = { true }
+class IncomingCallAlert(
+        uid: String,
+        override val shouldBeDisplayedIn: ((Activity) -> Boolean) = { true }
 ) : DefaultVectorAlert(uid, "", "", 0, shouldBeDisplayedIn) {
 
     override val priority = PopupAlertManager.INCOMING_CALL_PRIORITY
@@ -36,11 +37,13 @@ class IncomingCallAlert(uid: String,
     override val dismissOnClick: Boolean = false
     override val isLight: Boolean = true
 
-    class ViewBinder(private val matrixItem: MatrixItem?,
-                     private val avatarRenderer: AvatarRenderer,
-                     private val isVideoCall: Boolean,
-                     private val onAccept: () -> Unit,
-                     private val onReject: () -> Unit) : VectorAlert.ViewBinder {
+    class ViewBinder(
+            private val matrixItem: MatrixItem?,
+            private val avatarRenderer: AvatarRenderer,
+            private val isVideoCall: Boolean,
+            private val onAccept: () -> Unit,
+            private val onReject: () -> Unit
+    ) : VectorAlert.ViewBinder {
 
         override fun bind(view: View) {
             val views = AlerterIncomingCallLayoutBinding.bind(view)
diff --git a/vector/src/main/java/im/vector/app/features/popup/VerificationVectorAlert.kt b/vector/src/main/java/im/vector/app/features/popup/VerificationVectorAlert.kt
index d02d5dbfe8..6848bbb1f3 100644
--- a/vector/src/main/java/im/vector/app/features/popup/VerificationVectorAlert.kt
+++ b/vector/src/main/java/im/vector/app/features/popup/VerificationVectorAlert.kt
@@ -25,19 +25,22 @@ import im.vector.app.databinding.AlerterVerificationLayoutBinding
 import im.vector.app.features.home.AvatarRenderer
 import org.matrix.android.sdk.api.util.MatrixItem
 
-class VerificationVectorAlert(uid: String,
-                              title: String,
-                              override val description: String,
-                              @DrawableRes override val iconId: Int?,
-                              /**
-                               * Alert are displayed by default, but let this lambda return false to prevent displaying.
-                               */
-                              override val shouldBeDisplayedIn: ((Activity) -> Boolean) = { true }
+class VerificationVectorAlert(
+        uid: String,
+        title: String,
+        override val description: String,
+        @DrawableRes override val iconId: Int?,
+        /**
+         * Alert are displayed by default, but let this lambda return false to prevent displaying.
+         */
+        override val shouldBeDisplayedIn: ((Activity) -> Boolean) = { true }
 ) : DefaultVectorAlert(uid, title, description, iconId, shouldBeDisplayedIn) {
     override val layoutRes = R.layout.alerter_verification_layout
 
-    class ViewBinder(private val matrixItem: MatrixItem?,
-                     private val avatarRenderer: AvatarRenderer) : VectorAlert.ViewBinder {
+    class ViewBinder(
+            private val matrixItem: MatrixItem?,
+            private val avatarRenderer: AvatarRenderer
+    ) : VectorAlert.ViewBinder {
 
         override fun bind(view: View) {
             val views = AlerterVerificationLayoutBinding.bind(view)
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
index e2c1aaa2a4..dfc188180e 100755
--- a/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
@@ -168,16 +168,18 @@ class BugReporter @Inject constructor(
      * @param listener the listener
      */
     @SuppressLint("StaticFieldLeak")
-    fun sendBugReport(reportType: ReportType,
-                      withDevicesLogs: Boolean,
-                      withCrashLogs: Boolean,
-                      withKeyRequestHistory: Boolean,
-                      withScreenshot: Boolean,
-                      theBugDescription: String,
-                      serverVersion: String,
-                      canContact: Boolean = false,
-                      customFields: Map<String, String>? = null,
-                      listener: IMXBugReportListener?) {
+    fun sendBugReport(
+            reportType: ReportType,
+            withDevicesLogs: Boolean,
+            withCrashLogs: Boolean,
+            withKeyRequestHistory: Boolean,
+            withScreenshot: Boolean,
+            theBugDescription: String,
+            serverVersion: String,
+            canContact: Boolean = false,
+            customFields: Map<String, String>? = null,
+            listener: IMXBugReportListener?
+    ) {
         // enumerate files to delete
         val mBugReportFiles: MutableList<File> = ArrayList()
 
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/RageShake.kt b/vector/src/main/java/im/vector/app/features/rageshake/RageShake.kt
index ce738b85b9..513f99f27d 100644
--- a/vector/src/main/java/im/vector/app/features/rageshake/RageShake.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/RageShake.kt
@@ -31,11 +31,13 @@ import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.VectorSettingsActivity
 import javax.inject.Inject
 
-class RageShake @Inject constructor(private val activity: FragmentActivity,
-                                    private val bugReporter: BugReporter,
-                                    private val navigator: Navigator,
-                                    private val sessionHolder: ActiveSessionHolder,
-                                    private val vectorPreferences: VectorPreferences) : ShakeDetector.Listener {
+class RageShake @Inject constructor(
+        private val activity: FragmentActivity,
+        private val bugReporter: BugReporter,
+        private val navigator: Navigator,
+        private val sessionHolder: ActiveSessionHolder,
+        private val vectorPreferences: VectorPreferences
+) : ShakeDetector.Listener {
 
     private var shakeDetector: ShakeDetector? = null
 
diff --git a/vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnown.kt b/vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnown.kt
index c451c35f20..0df5f0e9cf 100644
--- a/vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnown.kt
+++ b/vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnown.kt
@@ -53,7 +53,26 @@ data class E2EWellKnownConfig(
          * (as it was before) for various environments where this is desired.
          */
         @Json(name = "default")
-        val e2eDefault: Boolean? = null
+        val e2eDefault: Boolean? = null,
+
+        @Json(name = "secure_backup_required")
+        val secureBackupRequired: Boolean? = null,
+
+        /**
+         * The new field secure_backup_setup_methods is an array listing the methods the client should display.
+         * Supported values currently include key and passphrase.
+         * If the secure_backup_setup_methods field is not present or exists but does not contain any supported methods,
+         * clients should fallback to the default value of: ["key", "passphrase"].
+         */
+        @Json(name = "secure_backup_setup_methods")
+        val secureBackupSetupMethods: List<String>? = null,
+
+        /**
+         * Configuration for sharing keys strategy which should be used instead of [im.vector.app.BuildConfig.outboundSessionKeySharingStrategy].
+         * One of on_room_opening, on_typing or disabled.
+         */
+        @Json(name = "outbound_keys_pre_sharing_mode")
+        val outboundsKeyPreSharingMode: String? = null,
 )
 
 @JsonClass(generateAdapter = true)
diff --git a/vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnownExt.kt b/vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnownExt.kt
index 91269cb114..73662613f7 100644
--- a/vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnownExt.kt
+++ b/vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnownExt.kt
@@ -16,6 +16,11 @@
 
 package im.vector.app.features.raw.wellknown
 
+import im.vector.app.BuildConfig
+import im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.MatrixPatterns.getServerName
 import org.matrix.android.sdk.api.auth.data.SessionParams
 import org.matrix.android.sdk.api.extensions.tryOrNull
@@ -29,3 +34,41 @@ suspend fun RawService.getElementWellknown(sessionParams: SessionParams): Elemen
 }
 
 fun ElementWellKnown.isE2EByDefault() = elementE2E?.e2eDefault ?: riotE2E?.e2eDefault ?: true
+
+fun ElementWellKnown?.getOutboundSessionKeySharingStrategyOrDefault(): OutboundSessionKeySharingStrategy {
+    return when (this?.elementE2E?.outboundsKeyPreSharingMode) {
+        "on_room_opening" -> OutboundSessionKeySharingStrategy.WhenEnteringRoom
+        "on_typing" -> OutboundSessionKeySharingStrategy.WhenTyping
+        "disabled" -> OutboundSessionKeySharingStrategy.WhenSendingEvent
+        else -> BuildConfig.outboundSessionKeySharingStrategy
+    }
+}
+
+fun RawService.withElementWellKnown(
+        coroutineScope: CoroutineScope,
+        sessionParams: SessionParams,
+        block: ((ElementWellKnown?) -> Unit)
+) = with(coroutineScope) {
+    launch(Dispatchers.IO) {
+        block(getElementWellknown(sessionParams))
+    }
+}
+
+fun ElementWellKnown.isSecureBackupRequired() = elementE2E?.secureBackupRequired
+        ?: riotE2E?.secureBackupRequired
+        ?: false
+
+fun ElementWellKnown?.secureBackupMethod(): SecureBackupMethod {
+    val methodList = this?.elementE2E?.secureBackupSetupMethods
+            ?: this?.riotE2E?.secureBackupSetupMethods
+            ?: listOf("key", "passphrase")
+    return if (methodList.contains("key") && methodList.contains("passphrase")) {
+        SecureBackupMethod.KEY_OR_PASSPHRASE
+    } else if (methodList.contains("key")) {
+        SecureBackupMethod.KEY
+    } else if (methodList.contains("passphrase")) {
+        SecureBackupMethod.PASSPHRASE
+    } else {
+        SecureBackupMethod.KEY_OR_PASSPHRASE
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/ActiveSpaceFilter.kt b/vector/src/main/java/im/vector/app/features/raw/wellknown/SecureBackupMethod.kt
similarity index 66%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/ActiveSpaceFilter.kt
rename to vector/src/main/java/im/vector/app/features/raw/wellknown/SecureBackupMethod.kt
index 48619b9394..c65ad8b8bc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/ActiveSpaceFilter.kt
+++ b/vector/src/main/java/im/vector/app/features/raw/wellknown/SecureBackupMethod.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ * Copyright (c) 2022 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,13 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.api.query
+package im.vector.app.features.raw.wellknown
 
-sealed class ActiveSpaceFilter {
-    object None : ActiveSpaceFilter()
-    data class ActiveSpace(val currentSpaceId: String?) : ActiveSpaceFilter()
-    data class ExcludeSpace(val spaceId: String) : ActiveSpaceFilter()
+enum class SecureBackupMethod {
+    KEY,
+    PASSPHRASE,
+    KEY_OR_PASSPHRASE;
+
+    val isKeyAvailable: Boolean get() = this == KEY || this == KEY_OR_PASSPHRASE
+    val isPassphraseAvailable: Boolean get() = this == PASSPHRASE || this == KEY_OR_PASSPHRASE
 }
diff --git a/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultViewModel.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultViewModel.kt
index 720061e326..829c06616e 100644
--- a/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultViewModel.kt
@@ -35,7 +35,8 @@ data class EmojiSearchResultViewState(
 
 class EmojiSearchResultViewModel @AssistedInject constructor(
         @Assisted initialState: EmojiSearchResultViewState,
-        private val dataSource: EmojiDataSource) :
+        private val dataSource: EmojiDataSource
+) :
         VectorViewModel<EmojiSearchResultViewState, EmojiSearchAction, EmptyViewEvents>(initialState) {
 
     @AssistedFactory
diff --git a/vector/src/main/java/im/vector/app/features/reactions/widget/CircleView.kt b/vector/src/main/java/im/vector/app/features/reactions/widget/CircleView.kt
index d2ada9e7cf..b8bba289a1 100644
--- a/vector/src/main/java/im/vector/app/features/reactions/widget/CircleView.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/widget/CircleView.kt
@@ -32,8 +32,10 @@ import kotlin.math.min
  * This view is responsible for drawing big circle that will pulse when clicked
  * As describe in http://frogermcs.github.io/twitters-like-animation-in-android-alternative/
  */
-class CircleView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null,
-                                           defStyleAttr: Int = 0) : View(context, attrs, defStyleAttr) {
+class CircleView @JvmOverloads constructor(
+        context: Context, attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : View(context, attrs, defStyleAttr) {
 
     var startColor = -0xa8de
     var endColor = -0x3ef9
diff --git a/vector/src/main/java/im/vector/app/features/reactions/widget/DotsView.kt b/vector/src/main/java/im/vector/app/features/reactions/widget/DotsView.kt
index 7b0052db0b..f6a7c4e6b9 100644
--- a/vector/src/main/java/im/vector/app/features/reactions/widget/DotsView.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/widget/DotsView.kt
@@ -29,8 +29,10 @@ import kotlin.math.sin
  * This view will draw dots floating around the center of it's view
  * As describe in http://frogermcs.github.io/twitters-like-animation-in-android-alternative/
  */
-class DotsView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null,
-                                         defStyleAttr: Int = 0) : View(context, attrs, defStyleAttr) {
+class DotsView @JvmOverloads constructor(
+        context: Context, attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : View(context, attrs, defStyleAttr) {
 
     private var COLOR_1 = -0x3ef9
     private var COLOR_2 = -0x6800
diff --git a/vector/src/main/java/im/vector/app/features/reactions/widget/ReactionButton.kt b/vector/src/main/java/im/vector/app/features/reactions/widget/ReactionButton.kt
index 7340953f32..1bad4ff248 100644
--- a/vector/src/main/java/im/vector/app/features/reactions/widget/ReactionButton.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/widget/ReactionButton.kt
@@ -34,10 +34,12 @@ import javax.inject.Inject
  * Displays a String reaction (emoji), with a count, and that can be selected or not (toggle)
  */
 @AndroidEntryPoint
-class ReactionButton @JvmOverloads constructor(context: Context,
-                                               attrs: AttributeSet? = null,
-                                               defStyleAttr: Int = 0,
-                                               defStyleRes: Int = R.style.TimelineReactionView) :
+class ReactionButton @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0,
+        defStyleRes: Int = R.style.TimelineReactionView
+) :
         LinearLayout(context, attrs, defStyleAttr, defStyleRes), View.OnClickListener, View.OnLongClickListener {
 
     @Inject lateinit var emojiSpanify: EmojiSpanify
diff --git a/vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewModel.kt b/vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewModel.kt
index 0cd289cf64..0626749ff4 100644
--- a/vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewModel.kt
@@ -51,7 +51,8 @@ import org.matrix.android.sdk.flow.unwrap
 class RequireActiveMembershipViewModel @AssistedInject constructor(
         @Assisted initialState: RequireActiveMembershipViewState,
         private val stringProvider: StringProvider,
-        private val session: Session) :
+        private val session: Session
+) :
         VectorViewModel<RequireActiveMembershipViewState, RequireActiveMembershipAction, RequireActiveMembershipViewEvents>(initialState) {
 
     @AssistedFactory
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsController.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsController.kt
index a350bff0bb..fdb2f5ab15 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsController.kt
@@ -35,9 +35,11 @@ import org.matrix.android.sdk.api.util.MatrixItem
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
-class PublicRoomsController @Inject constructor(private val stringProvider: StringProvider,
-                                                private val avatarRenderer: AvatarRenderer,
-                                                private val errorFormatter: ErrorFormatter) : TypedEpoxyController<PublicRoomsViewState>() {
+class PublicRoomsController @Inject constructor(
+        private val stringProvider: StringProvider,
+        private val avatarRenderer: AvatarRenderer,
+        private val errorFormatter: ErrorFormatter
+) : TypedEpoxyController<PublicRoomsViewState>() {
 
     var callback: Callback? = null
 
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt
index 154c0bbb9d..5ba1b1f64e 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt
@@ -81,11 +81,13 @@ class CreateRoomActivity : VectorBaseActivity<ActivitySimpleBinding>() {
 
         private const val RESULT_CREATED_ROOM_ID = "RESULT_CREATED_ROOM_ID"
 
-        fun getIntent(context: Context,
-                      initialName: String = "",
-                      isSpace: Boolean = false,
-                      openAfterCreate: Boolean = true,
-                      currentSpaceId: String? = null): Intent {
+        fun getIntent(
+                context: Context,
+                initialName: String = "",
+                isSpace: Boolean = false,
+                openAfterCreate: Boolean = true,
+                currentSpaceId: String? = null
+        ): Intent {
             return Intent(context, CreateRoomActivity::class.java).apply {
                 putExtra(
                         Mavericks.KEY_ARG, CreateRoomArgs(
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
index fae88ed8a2..71c83946d0 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
@@ -94,7 +94,7 @@ class CreateRoomController @Inject constructor(
         }
 
         when (viewState.roomJoinRules) {
-            RoomJoinRules.INVITE     -> {
+            RoomJoinRules.INVITE -> {
                 buildProfileAction(
                         id = "joinRule",
                         title = stringProvider.getString(R.string.room_settings_room_access_private_title),
@@ -104,7 +104,7 @@ class CreateRoomController @Inject constructor(
                         action = { host.listener?.selectVisibility() }
                 )
             }
-            RoomJoinRules.PUBLIC     -> {
+            RoomJoinRules.PUBLIC -> {
                 buildProfileAction(
                         id = "joinRule",
                         title = stringProvider.getString(R.string.room_settings_room_access_public_title),
@@ -124,7 +124,7 @@ class CreateRoomController @Inject constructor(
                         action = { host.listener?.selectVisibility() }
                 )
             }
-            else                     -> {
+            else -> {
                 // not yet supported
             }
         }
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateSubSpaceController.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateSubSpaceController.kt
index 6d2fc15a0b..07f35956d7 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateSubSpaceController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateSubSpaceController.kt
@@ -112,7 +112,7 @@ class CreateSubSpaceController @Inject constructor(
         }
 
         when (data.roomJoinRules) {
-            RoomJoinRules.INVITE     -> {
+            RoomJoinRules.INVITE -> {
                 buildProfileAction(
                         id = "joinRule",
                         title = stringProvider.getString(R.string.room_settings_room_access_private_title),
@@ -122,7 +122,7 @@ class CreateSubSpaceController @Inject constructor(
                         action = { host.listener?.selectVisibility() }
                 )
             }
-            RoomJoinRules.PUBLIC     -> {
+            RoomJoinRules.PUBLIC -> {
                 buildProfileAction(
                         id = "joinRule",
                         title = stringProvider.getString(R.string.room_settings_room_access_public_title),
@@ -142,7 +142,7 @@ class CreateSubSpaceController @Inject constructor(
                         action = { host.listener?.selectVisibility() }
                 )
             }
-            else                     -> {
+            else -> {
                 // not yet supported
             }
         }
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryListCreator.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryListCreator.kt
index a168ea749c..0e8c3efa97 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryListCreator.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryListCreator.kt
@@ -30,8 +30,10 @@ class RoomDirectoryListCreator @Inject constructor(
         private val session: Session
 ) {
 
-    fun computeDirectories(thirdPartyProtocolData: Map<String, ThirdPartyProtocol>,
-                           customHomeservers: Set<String>): List<RoomDirectoryServer> {
+    fun computeDirectories(
+            thirdPartyProtocolData: Map<String, ThirdPartyProtocol>,
+            customHomeservers: Set<String>
+    ): List<RoomDirectoryServer> {
         val result = ArrayList<RoomDirectoryServer>()
 
         val protocols = ArrayList<RoomDirectoryData>()
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerController.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerController.kt
index 7d121d1ff4..8c2eec86ae 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerController.kt
@@ -135,7 +135,7 @@ class RoomDirectoryPickerController @Inject constructor(
             }
             when (data.addServerAsync) {
                 Uninitialized,
-                is Fail    -> settingsContinueCancelItem {
+                is Fail -> settingsContinueCancelItem {
                     id("continueCancel")
                     continueText(host.stringProvider.getString(R.string.ok))
                     canContinue(data.enteredServer.isNotEmpty())
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt
index cb71f93a0e..66e09bb2d4 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt
@@ -39,7 +39,8 @@ import im.vector.app.features.roomdirectory.RoomDirectoryViewModel
 import timber.log.Timber
 import javax.inject.Inject
 
-class RoomDirectoryPickerFragment @Inject constructor(private val roomDirectoryPickerController: RoomDirectoryPickerController
+class RoomDirectoryPickerFragment @Inject constructor(
+        private val roomDirectoryPickerController: RoomDirectoryPickerController
 ) : VectorBaseFragment<FragmentRoomDirectoryPickerBinding>(),
         OnBackPressed,
         RoomDirectoryPickerController.Callback {
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt
index e58feef5b3..9cfa6cb815 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt
@@ -35,7 +35,6 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.tryOrNull
-import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.getRoomSummary
 import org.matrix.android.sdk.api.session.identity.SharedState
@@ -43,8 +42,8 @@ import org.matrix.android.sdk.api.session.identity.ThreePid
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.peeking.PeekResult
-import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.flow.flow
+import org.matrix.android.sdk.flow.unwrap
 import timber.log.Timber
 
 class RoomPreviewViewModel @AssistedInject constructor(
@@ -160,24 +159,25 @@ class RoomPreviewViewModel @AssistedInject constructor(
     }
 
     private fun observeRoomSummary() {
-        val queryParams = roomSummaryQueryParams {
-            roomId = QueryStringValue.Equals(initialState.roomId)
-            excludeType = null
-        }
         session
                 .flow()
-                .liveRoomSummaries(queryParams)
-                .onEach { list ->
-                    val isRoomJoined = list.any {
-                        it.membership == Membership.JOIN
-                    }
-                    list.firstOrNull { it.roomId == initialState.roomId }?.roomType?.let {
-                        setState {
-                            copy(roomType = it)
-                        }
-                    }
+                .liveRoomSummary(initialState.roomId)
+                .unwrap()
+                .onEach { roomSummary ->
+                    val isRoomJoined = roomSummary.membership == Membership.JOIN
                     if (isRoomJoined) {
-                        setState { copy(roomJoinState = JoinState.JOINED) }
+                        setState {
+                            copy(
+                                    roomType = roomSummary.roomType,
+                                    roomJoinState = JoinState.JOINED
+                            )
+                        }
+                    } else {
+                        setState {
+                            copy(
+                                    roomType = roomSummary.roomType
+                            )
+                        }
                     }
                 }
                 .launchIn(viewModelScope)
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
index adc720b0a5..bdf2978cca 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
@@ -278,7 +278,7 @@ class RoomMemberProfileController @Inject constructor(
 
         if (canKick) {
             when (membership) {
-                Membership.JOIN   -> {
+                Membership.JOIN -> {
                     buildProfileAction(
                             id = "kick",
                             editable = false,
@@ -298,7 +298,7 @@ class RoomMemberProfileController @Inject constructor(
                             action = { callback?.onCancelInviteClicked() }
                     )
                 }
-                else              -> Unit
+                else -> Unit
             }
         }
         if (canBan) {
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt
index 19040a1fde..ed8945c9e2 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt
@@ -48,8 +48,10 @@ data class DeviceListViewState(
         val selectedDevice: CryptoDeviceInfo? = null
 ) : MavericksState
 
-class DeviceListBottomSheetViewModel @AssistedInject constructor(@Assisted private val initialState: DeviceListViewState,
-                                                                 private val session: Session) :
+class DeviceListBottomSheetViewModel @AssistedInject constructor(
+        @Assisted private val initialState: DeviceListViewState,
+        private val session: Session
+) :
         VectorViewModel<DeviceListViewState, DeviceListAction, DeviceListBottomSheetViewEvents>(initialState) {
 
     @AssistedFactory
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListEpoxyController.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListEpoxyController.kt
index 6a9d053d2a..1934528d6f 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListEpoxyController.kt
@@ -37,10 +37,12 @@ import me.gujun.android.span.span
 import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
 import javax.inject.Inject
 
-class DeviceListEpoxyController @Inject constructor(private val stringProvider: StringProvider,
-                                                    private val colorProvider: ColorProvider,
-                                                    private val dimensionConverter: DimensionConverter,
-                                                    private val vectorPreferences: VectorPreferences) :
+class DeviceListEpoxyController @Inject constructor(
+        private val stringProvider: StringProvider,
+        private val colorProvider: ColorProvider,
+        private val dimensionConverter: DimensionConverter,
+        private val vectorPreferences: VectorPreferences
+) :
         TypedEpoxyController<DeviceListViewState>() {
 
     interface InteractionListener {
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt
index 0e25ec5f8f..569a7f980c 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt
@@ -32,10 +32,12 @@ import me.gujun.android.span.span
 import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
 import javax.inject.Inject
 
-class DeviceTrustInfoEpoxyController @Inject constructor(private val stringProvider: StringProvider,
-                                                         private val colorProvider: ColorProvider,
-                                                         private val dimensionConverter: DimensionConverter,
-                                                         private val vectorPreferences: VectorPreferences) :
+class DeviceTrustInfoEpoxyController @Inject constructor(
+        private val stringProvider: StringProvider,
+        private val colorProvider: ColorProvider,
+        private val dimensionConverter: DimensionConverter,
+        private val vectorPreferences: VectorPreferences
+) :
         TypedEpoxyController<DeviceListViewState>() {
 
     interface InteractionListener {
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt
index 926c9fb60e..66b0a0be5c 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt
@@ -29,10 +29,12 @@ import org.matrix.android.sdk.api.session.room.powerlevels.Role
 
 object EditPowerLevelDialogs {
 
-    fun showChoice(activity: Activity,
-                   @StringRes titleRes: Int,
-                   currentRole: Role,
-                   listener: (Int) -> Unit) {
+    fun showChoice(
+            activity: Activity,
+            @StringRes titleRes: Int,
+            currentRole: Role,
+            listener: (Int) -> Unit
+    ) {
         val dialogLayout = activity.layoutInflater.inflate(R.layout.dialog_edit_power_level, null)
         val views = DialogEditPowerLevelBinding.bind(dialogLayout)
         views.powerLevelRadioGroup.setOnCheckedChangeListener { _, checkedId ->
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasViewModel.kt
index a66ef9a659..af4021e715 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasViewModel.kt
@@ -43,8 +43,10 @@ import org.matrix.android.sdk.flow.flow
 import org.matrix.android.sdk.flow.mapOptional
 import org.matrix.android.sdk.flow.unwrap
 
-class RoomAliasViewModel @AssistedInject constructor(@Assisted initialState: RoomAliasViewState,
-                                                     private val session: Session) :
+class RoomAliasViewModel @AssistedInject constructor(
+        @Assisted initialState: RoomAliasViewState,
+        private val session: Session
+) :
         VectorViewModel<RoomAliasViewState, RoomAliasAction, RoomAliasViewEvents>(initialState) {
 
     @AssistedFactory
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheet.kt b/vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheet.kt
index 6d6d4564da..7204c227f7 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheet.kt
@@ -86,11 +86,13 @@ class RoomAliasBottomSheet :
     }
 
     companion object {
-        fun newInstance(alias: String,
-                        isPublished: Boolean,
-                        isMainAlias: Boolean,
-                        isLocal: Boolean,
-                        canEditCanonicalAlias: Boolean): RoomAliasBottomSheet {
+        fun newInstance(
+                alias: String,
+                isPublished: Boolean,
+                isMainAlias: Boolean,
+                isLocal: Boolean,
+                canEditCanonicalAlias: Boolean
+        ): RoomAliasBottomSheet {
             return RoomAliasBottomSheet().apply {
                 setArguments(
                         RoomAliasBottomSheetArgs(
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheetSharedAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheetSharedAction.kt
index d50c19635d..ea18e0ff8f 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheetSharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheetSharedAction.kt
@@ -24,7 +24,8 @@ import im.vector.app.core.platform.VectorSharedAction
 sealed class RoomAliasBottomSheetSharedAction(
         @StringRes val titleRes: Int,
         @DrawableRes val iconResId: Int = 0,
-        val destructive: Boolean = false) :
+        val destructive: Boolean = false
+) :
         VectorSharedAction {
 
     data class ShareAlias(val matrixTo: String) : RoomAliasBottomSheetSharedAction(
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListViewModel.kt
index 1fef5e8ff2..d7728f7772 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListViewModel.kt
@@ -42,9 +42,11 @@ import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
 import org.matrix.android.sdk.flow.flow
 import org.matrix.android.sdk.flow.unwrap
 
-class RoomBannedMemberListViewModel @AssistedInject constructor(@Assisted initialState: RoomBannedMemberListViewState,
-                                                                private val stringProvider: StringProvider,
-                                                                private val session: Session) :
+class RoomBannedMemberListViewModel @AssistedInject constructor(
+        @Assisted initialState: RoomBannedMemberListViewState,
+        private val stringProvider: StringProvider,
+        private val session: Session
+) :
         VectorViewModel<RoomBannedMemberListViewState, RoomBannedMemberListAction, RoomBannedMemberListViewEvents>(initialState) {
 
     @AssistedFactory
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt
index ebcebfa470..8f310a6a89 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt
@@ -117,10 +117,12 @@ class RoomMemberListController @Inject constructor(
         }
     }
 
-    private fun buildRoomMember(roomMember: RoomMemberSummary,
-                                powerLevelCategory: RoomMemberListCategories,
-                                host: RoomMemberListController,
-                                data: RoomMemberListViewState) {
+    private fun buildRoomMember(
+            roomMember: RoomMemberSummary,
+            powerLevelCategory: RoomMemberListCategories,
+            host: RoomMemberListController,
+            data: RoomMemberListViewState
+    ) {
         val powerLabel = stringProvider.getString(powerLevelCategory.titleRes)
 
         profileMatrixItemWithPowerLevelWithPresence {
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
index c1e97f0416..951e3e1dcd 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
@@ -79,7 +79,7 @@ class RoomMemberListFragment @Inject constructor(
                 object : RecyclerView.OnScrollListener() {
                     override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
                         when (newState) {
-                            RecyclerView.SCROLL_STATE_IDLE     -> {
+                            RecyclerView.SCROLL_STATE_IDLE -> {
                                 if (withState(viewModel) { it.actionsPermissions.canInvite }) {
                                     views.inviteUsersButton.show()
                                 }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
index 8863d18560..0ca99eb3c8 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
@@ -51,9 +51,11 @@ import org.matrix.android.sdk.flow.mapOptional
 import org.matrix.android.sdk.flow.unwrap
 import timber.log.Timber
 
-class RoomMemberListViewModel @AssistedInject constructor(@Assisted initialState: RoomMemberListViewState,
-                                                          private val roomMemberSummaryComparator: RoomMemberSummaryComparator,
-                                                          private val session: Session) :
+class RoomMemberListViewModel @AssistedInject constructor(
+        @Assisted initialState: RoomMemberListViewState,
+        private val roomMemberSummaryComparator: RoomMemberSummaryComparator,
+        private val session: Session
+) :
         VectorViewModel<RoomMemberListViewState, RoomMemberListAction, EmptyViewEvents>(initialState) {
 
     @AssistedFactory
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/EditablePermission.kt b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/EditablePermission.kt
index 22d74ff7a3..d9c1bca2da 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/EditablePermission.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/EditablePermission.kt
@@ -25,9 +25,10 @@ import org.matrix.android.sdk.api.session.events.model.EventType
  */
 sealed class EditablePermission(@StringRes val labelResId: Int, @StringRes val spaceLabelResId: Int = labelResId) {
     // Updates `content.events.[eventType]`
-    open class EventTypeEditablePermission(val eventType: String,
-                                           @StringRes labelResId: Int,
-                                           @StringRes spaceLabelResId: Int = labelResId
+    open class EventTypeEditablePermission(
+            val eventType: String,
+            @StringRes labelResId: Int,
+            @StringRes spaceLabelResId: Int = labelResId
     ) : EditablePermission(labelResId, spaceLabelResId)
 
     class ModifyWidgets : EventTypeEditablePermission(
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsController.kt
index fffae6159c..5c9695a6f5 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsController.kt
@@ -168,10 +168,12 @@ class RoomPermissionsController @Inject constructor(
         }
     }
 
-    private fun buildPermission(editablePermission: EditablePermission,
-                                content: PowerLevelsContent,
-                                editable: Boolean,
-                                isSpace: Boolean) {
+    private fun buildPermission(
+            editablePermission: EditablePermission,
+            content: PowerLevelsContent,
+            editable: Boolean,
+            isSpace: Boolean
+    ) {
         val currentRole = getCurrentRole(editablePermission, content)
         buildProfileAction(
                 id = editablePermission.labelResId.toString(),
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsViewModel.kt
index e387cca004..99c1531a03 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsViewModel.kt
@@ -37,8 +37,10 @@ import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
 import org.matrix.android.sdk.flow.flow
 import org.matrix.android.sdk.flow.unwrap
 
-class RoomPermissionsViewModel @AssistedInject constructor(@Assisted initialState: RoomPermissionsViewState,
-                                                           private val session: Session) :
+class RoomPermissionsViewModel @AssistedInject constructor(
+        @Assisted initialState: RoomPermissionsViewState,
+        private val session: Session
+) :
         VectorViewModel<RoomPermissionsViewState, RoomPermissionsAction, RoomPermissionsViewEvents>(initialState) {
 
     @AssistedFactory
@@ -88,7 +90,7 @@ class RoomPermissionsViewModel @AssistedInject constructor(@Assisted initialStat
 
     override fun handle(action: RoomPermissionsAction) {
         when (action) {
-            is RoomPermissionsAction.UpdatePermission      -> updatePermission(action)
+            is RoomPermissionsAction.UpdatePermission -> updatePermission(action)
             RoomPermissionsAction.ToggleShowAllPermissions -> toggleShowAllPermissions()
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
index ee04d22ddc..cec972d982 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
@@ -46,9 +46,11 @@ import org.matrix.android.sdk.flow.flow
 import org.matrix.android.sdk.flow.mapOptional
 import org.matrix.android.sdk.flow.unwrap
 
-class RoomSettingsViewModel @AssistedInject constructor(@Assisted initialState: RoomSettingsViewState,
-                                                        private val vectorPreferences: VectorPreferences,
-                                                        private val session: Session) :
+class RoomSettingsViewModel @AssistedInject constructor(
+        @Assisted initialState: RoomSettingsViewState,
+        private val vectorPreferences: VectorPreferences,
+        private val session: Session
+) :
         VectorViewModel<RoomSettingsViewState, RoomSettingsAction, RoomSettingsViewEvents>(initialState) {
 
     @AssistedFactory
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt
index fe7c984cb4..ae5aadbaa7 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt
@@ -62,8 +62,10 @@ data class RoomSettingsViewState(
     sealed class AvatarAction {
         object None : AvatarAction()
         object DeleteAvatar : AvatarAction()
-        data class UpdateAvatar(val newAvatarUri: Uri,
-                                val newAvatarFileName: String) : AvatarAction()
+        data class UpdateAvatar(
+                val newAvatarUri: Uri,
+                val newAvatarFileName: String
+        ) : AvatarAction()
     }
 
     data class NewJoinRule(
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleBottomSheet.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleBottomSheet.kt
index 4185c2031b..dbbd193631 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleBottomSheet.kt
@@ -69,12 +69,13 @@ class RoomJoinRuleBottomSheet : BottomSheetGeneric<RoomJoinRuleState, RoomJoinRu
     }
 
     companion object {
-        fun newInstance(currentRoomJoinRule: RoomJoinRules,
-                        allowedJoinedRules: List<JoinRulesOptionSupport> = listOf(
-                                RoomJoinRules.INVITE, RoomJoinRules.PUBLIC
-                        ).map { it.toOption(true) },
-                        isSpace: Boolean = false,
-                        parentSpaceName: String? = null
+        fun newInstance(
+                currentRoomJoinRule: RoomJoinRules,
+                allowedJoinedRules: List<JoinRulesOptionSupport> = listOf(
+                        RoomJoinRules.INVITE, RoomJoinRules.PUBLIC
+                ).map { it.toOption(true) },
+                isSpace: Boolean = false,
+                parentSpaceName: String? = null
         ): RoomJoinRuleBottomSheet {
             return RoomJoinRuleBottomSheet().apply {
                 setArguments(
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
index 72f6080417..9d3edeb25a 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
@@ -105,6 +105,7 @@ class VectorPreferences @Inject constructor(
         private const val SETTINGS_SHOW_EMOJI_KEYBOARD = "SETTINGS_SHOW_EMOJI_KEYBOARD"
         private const val SETTINGS_LABS_ENABLE_LATEX_MATHS = "SETTINGS_LABS_ENABLE_LATEX_MATHS"
         const val SETTINGS_PRESENCE_USER_ALWAYS_APPEARS_OFFLINE = "SETTINGS_PRESENCE_USER_ALWAYS_APPEARS_OFFLINE"
+        const val SETTINGS_AUTOPLAY_ANIMATED_IMAGES = "SETTINGS_AUTOPLAY_ANIMATED_IMAGES"
 
         // Room directory
         private const val SETTINGS_ROOM_DIRECTORY_SHOW_ALL_PUBLIC_ROOMS = "SETTINGS_ROOM_DIRECTORY_SHOW_ALL_PUBLIC_ROOMS"
@@ -190,9 +191,6 @@ class VectorPreferences @Inject constructor(
 
         private const val DID_ASK_TO_ENABLE_SESSION_PUSH = "DID_ASK_TO_ENABLE_SESSION_PUSH"
 
-        // Location Sharing
-        const val SETTINGS_PREF_ENABLE_LOCATION_SHARING = "SETTINGS_PREF_ENABLE_LOCATION_SHARING"
-
         private const val MEDIA_SAVING_3_DAYS = 0
         private const val MEDIA_SAVING_1_WEEK = 1
         private const val MEDIA_SAVING_1_MONTH = 2
@@ -202,7 +200,6 @@ class VectorPreferences @Inject constructor(
 
         private const val TAKE_PHOTO_VIDEO_MODE = "TAKE_PHOTO_VIDEO_MODE"
 
-        private const val SETTINGS_LABS_RENDER_LOCATIONS_IN_TIMELINE = "SETTINGS_LABS_RENDER_LOCATIONS_IN_TIMELINE"
         private const val SETTINGS_LABS_ENABLE_LIVE_LOCATION = "SETTINGS_LABS_ENABLE_LIVE_LOCATION"
 
         // This key will be used to identify clients with the old thread support enabled io.element.thread
@@ -773,6 +770,15 @@ class VectorPreferences @Inject constructor(
         return defaultPrefs.getBoolean(SETTINGS_ALWAYS_SHOW_TIMESTAMPS_KEY, false)
     }
 
+    /**
+     * Tells if animated image attachments should automatically play their animation in the timeline.
+     *
+     * @return true if animated image attachments should automatically play their animation in the timeline
+     */
+    fun autoplayAnimatedImages(): Boolean {
+        return defaultPrefs.getBoolean(SETTINGS_AUTOPLAY_ANIMATED_IMAGES, false)
+    }
+
     /**
      * Tells if the typing notifications should be sent.
      *
@@ -1034,14 +1040,6 @@ class VectorPreferences @Inject constructor(
         }
     }
 
-    fun isLocationSharingEnabled(): Boolean {
-        return defaultPrefs.getBoolean(SETTINGS_PREF_ENABLE_LOCATION_SHARING, false) && BuildConfig.enableLocationSharing
-    }
-
-    fun labsRenderLocationsInTimeline(): Boolean {
-        return defaultPrefs.getBoolean(SETTINGS_LABS_RENDER_LOCATIONS_IN_TIMELINE, true)
-    }
-
     fun labsEnableLiveLocation(): Boolean {
         return defaultPrefs.getBoolean(SETTINGS_LABS_ENABLE_LIVE_LOCATION, false)
     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
index 5033400425..cada7c97a2 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
@@ -24,7 +24,6 @@ import androidx.core.view.children
 import androidx.lifecycle.lifecycleScope
 import androidx.preference.Preference
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.core.dialogs.PhotoOrVideoDialog
 import im.vector.app.core.extensions.restart
@@ -173,8 +172,6 @@ class VectorSettingsPreferencesFragment @Inject constructor(
             })
             true
         }
-
-        findPreference<VectorSwitchPreference>(VectorPreferences.SETTINGS_PREF_ENABLE_LOCATION_SHARING)?.isVisible = BuildConfig.enableLocationSharing
     }
 
     private fun updateTakePhotoOrVideoPreferenceSummary() {
diff --git a/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt
index ad73854060..b9f272f88f 100644
--- a/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt
@@ -43,8 +43,10 @@ data class DeactivateAccountViewState(
         val dummy: Boolean = false
 ) : MavericksState
 
-class DeactivateAccountViewModel @AssistedInject constructor(@Assisted private val initialState: DeactivateAccountViewState,
-                                                             private val session: Session) :
+class DeactivateAccountViewModel @AssistedInject constructor(
+        @Assisted private val initialState: DeactivateAccountViewState,
+        private val session: Session
+) :
         VectorViewModel<DeactivateAccountViewState, DeactivateAccountAction, DeactivateAccountViewEvents>(initialState) {
 
     @AssistedFactory
diff --git a/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewModel.kt
index c81064c8d9..572f287a40 100644
--- a/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewModel.kt
@@ -92,9 +92,11 @@ class CrossSigningSettingsViewModel @AssistedInject constructor(
                         awaitCallback<Unit> {
                             session.cryptoService().crossSigningService().initializeCrossSigning(
                                     object : UserInteractiveAuthInterceptor {
-                                        override fun performStage(flowResponse: RegistrationFlowResponse,
-                                                                  errCode: String?,
-                                                                  promise: Continuation<UIABaseAuth>) {
+                                        override fun performStage(
+                                                flowResponse: RegistrationFlowResponse,
+                                                errCode: String?,
+                                                promise: Continuation<UIABaseAuth>
+                                        ) {
                                             Timber.d("## UIA : initializeCrossSigning UIA")
                                             if (flowResponse.nextUncompletedStage() == LoginFlowTypes.PASSWORD &&
                                                     reAuthHelper.data != null && errCode == null) {
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
index 648e9b3261..933f035474 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
@@ -34,7 +34,8 @@ import javax.inject.Inject
 
 class DeviceVerificationInfoBottomSheetController @Inject constructor(
         private val stringProvider: StringProvider,
-        private val colorProvider: ColorProvider) :
+        private val colorProvider: ColorProvider
+) :
         TypedEpoxyController<DeviceVerificationInfoBottomSheetViewState>() {
 
     var callback: Callback? = null
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt
index b24b8475a5..beabcd3b84 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt
@@ -30,8 +30,9 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
 import org.matrix.android.sdk.flow.flow
 
-class DeviceVerificationInfoBottomSheetViewModel @AssistedInject constructor(@Assisted initialState: DeviceVerificationInfoBottomSheetViewState,
-                                                                             val session: Session
+class DeviceVerificationInfoBottomSheetViewModel @AssistedInject constructor(
+        @Assisted initialState: DeviceVerificationInfoBottomSheetViewState,
+        val session: Session
 ) : VectorViewModel<DeviceVerificationInfoBottomSheetViewState, EmptyAction, EmptyViewEvents>(initialState) {
 
     @AssistedFactory
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesController.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesController.kt
index 2659ff4966..2077f07fc3 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesController.kt
@@ -36,12 +36,14 @@ import org.matrix.android.sdk.api.session.crypto.crosssigning.DeviceTrustLevel
 import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
 import javax.inject.Inject
 
-class DevicesController @Inject constructor(private val errorFormatter: ErrorFormatter,
-                                            private val stringProvider: StringProvider,
-                                            private val colorProvider: ColorProvider,
-                                            private val dateFormatter: VectorDateFormatter,
-                                            private val dimensionConverter: DimensionConverter,
-                                            private val vectorPreferences: VectorPreferences) : EpoxyController() {
+class DevicesController @Inject constructor(
+        private val errorFormatter: ErrorFormatter,
+        private val stringProvider: StringProvider,
+        private val colorProvider: ColorProvider,
+        private val dateFormatter: VectorDateFormatter,
+        private val dimensionConverter: DimensionConverter,
+        private val vectorPreferences: VectorPreferences
+) : EpoxyController() {
 
     var callback: Callback? = null
     private var viewState: DevicesViewState? = null
@@ -75,10 +77,12 @@ class DevicesController @Inject constructor(private val errorFormatter: ErrorFor
         }
     }
 
-    private fun buildDevicesList(devices: List<DeviceFullInfo>,
-                                 myDeviceId: String,
-                                 legacyMode: Boolean,
-                                 currentSessionCrossTrusted: Boolean) {
+    private fun buildDevicesList(
+            devices: List<DeviceFullInfo>,
+            myDeviceId: String,
+            legacyMode: Boolean,
+            currentSessionCrossTrusted: Boolean
+    ) {
         val host = this
         devices
                 .firstOrNull {
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/TrustUtils.kt b/vector/src/main/java/im/vector/app/features/settings/devices/TrustUtils.kt
index eadf020f7e..3477f10e74 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/TrustUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/TrustUtils.kt
@@ -21,10 +21,12 @@ import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
 
 object TrustUtils {
 
-    fun shieldForTrust(currentDevice: Boolean,
-                       trustMSK: Boolean,
-                       legacyMode: Boolean,
-                       deviceTrustLevel: DeviceTrustLevel?): RoomEncryptionTrustLevel {
+    fun shieldForTrust(
+            currentDevice: Boolean,
+            trustMSK: Boolean,
+            legacyMode: Boolean,
+            deviceTrustLevel: DeviceTrustLevel?
+    ): RoomEncryptionTrustLevel {
         return when {
             currentDevice -> {
                 if (legacyMode) {
diff --git a/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataViewModel.kt
index 72085d37fd..d773d80c93 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataViewModel.kt
@@ -36,8 +36,10 @@ data class AccountDataViewState(
         val accountData: Async<List<UserAccountDataEvent>> = Uninitialized
 ) : MavericksState
 
-class AccountDataViewModel @AssistedInject constructor(@Assisted initialState: AccountDataViewState,
-                                                       private val session: Session) :
+class AccountDataViewModel @AssistedInject constructor(
+        @Assisted initialState: AccountDataViewState,
+        private val session: Session
+) :
         VectorViewModel<AccountDataViewState, AccountDataAction, EmptyViewEvents>(initialState) {
 
     init {
diff --git a/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailViewModel.kt
index e7f09b09e0..576cb1bf6b 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailViewModel.kt
@@ -38,8 +38,10 @@ data class GossipingEventsPaperTrailState(
         val events: Async<PagedList<AuditTrail>> = Uninitialized
 ) : MavericksState
 
-class GossipingEventsPaperTrailViewModel @AssistedInject constructor(@Assisted initialState: GossipingEventsPaperTrailState,
-                                                                     private val session: Session) :
+class GossipingEventsPaperTrailViewModel @AssistedInject constructor(
+        @Assisted initialState: GossipingEventsPaperTrailState,
+        private val session: Session
+) :
         VectorViewModel<GossipingEventsPaperTrailState, EmptyAction, EmptyViewEvents>(initialState) {
 
     init {
diff --git a/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsSerializer.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsSerializer.kt
index b8d82699e6..0d79501753 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsSerializer.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsSerializer.kt
@@ -34,10 +34,10 @@ class GossipingEventsSerializer {
                 append("[${getFormattedDate(trail.ageLocalTs)}] ${type.name} ")
                 append("sessionId: ${info.sessionId} ")
                 when (type) {
-                    TrailType.IncomingKeyRequest -> {
+                    TrailType.IncomingKeyRequest  -> {
                         append("from:${info.userId}|${info.deviceId} - ")
                     }
-                    TrailType.OutgoingKeyForward -> {
+                    TrailType.OutgoingKeyForward  -> {
                         append("to:${info.userId}|${info.deviceId} - ")
                         (trail.info as? ForwardInfo)?.let {
                             append("chainIndex: ${it.chainIndex} ")
@@ -49,13 +49,13 @@ class GossipingEventsSerializer {
                             append("code: ${it.code} ")
                         }
                     }
-                    TrailType.IncomingKeyForward -> {
+                    TrailType.IncomingKeyForward  -> {
                         append("from:${info.userId}|${info.deviceId} - ")
                         (trail.info as? ForwardInfo)?.let {
                             append("chainIndex: ${it.chainIndex} ")
                         }
                     }
-                    else                         -> {
+                    else                          -> {
                         append("??")
                     }
                 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestListViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestListViewModel.kt
index e0a130a1e6..7574339bb1 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestListViewModel.kt
@@ -40,8 +40,10 @@ data class KeyRequestListViewState(
         val outgoingRoomKeyRequests: Async<PagedList<OutgoingKeyRequest>> = Uninitialized
 ) : MavericksState
 
-class KeyRequestListViewModel @AssistedInject constructor(@Assisted initialState: KeyRequestListViewState,
-                                                          private val session: Session) :
+class KeyRequestListViewModel @AssistedInject constructor(
+        @Assisted initialState: KeyRequestListViewState,
+        private val session: Session
+) :
         VectorViewModel<KeyRequestListViewState, EmptyAction, EmptyViewEvents>(initialState) {
 
     init {
diff --git a/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestViewModel.kt
index f2df0e4211..3c451c4fc3 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestViewModel.kt
@@ -50,7 +50,8 @@ data class KeyRequestViewState(
 
 class KeyRequestViewModel @AssistedInject constructor(
         @Assisted initialState: KeyRequestViewState,
-        private val session: Session) :
+        private val session: Session
+) :
         VectorViewModel<KeyRequestViewState, KeyRequestAction, KeyRequestEvents>(initialState) {
 
     @AssistedFactory
diff --git a/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersController.kt b/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersController.kt
index 286379986d..c0ab0bb02f 100644
--- a/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersController.kt
@@ -25,8 +25,10 @@ import org.matrix.android.sdk.api.session.user.model.User
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
-class IgnoredUsersController @Inject constructor(private val stringProvider: StringProvider,
-                                                 private val avatarRenderer: AvatarRenderer) : EpoxyController() {
+class IgnoredUsersController @Inject constructor(
+        private val stringProvider: StringProvider,
+        private val avatarRenderer: AvatarRenderer
+) : EpoxyController() {
 
     var callback: Callback? = null
     private var viewState: IgnoredUsersViewState? = null
diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt
index 14b7a53b65..9ae8b45c3c 100644
--- a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt
@@ -35,8 +35,10 @@ data class PushGatewayViewState(
         val pushGateways: Async<List<Pusher>> = Uninitialized
 ) : MavericksState
 
-class PushGatewaysViewModel @AssistedInject constructor(@Assisted initialState: PushGatewayViewState,
-                                                        private val session: Session) :
+class PushGatewaysViewModel @AssistedInject constructor(
+        @Assisted initialState: PushGatewayViewState,
+        private val session: Session
+) :
         VectorViewModel<PushGatewayViewState, PushGatewayAction, PushGatewayViewEvents>(initialState) {
 
     @AssistedFactory
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt
index c567026eb1..e8a92c9e3f 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt
@@ -32,8 +32,10 @@ import javax.inject.Inject
 /**
  * Check that the main pushRule (RULE_ID_DISABLE_ALL) is correctly setup.
  */
-class TestAccountSettings @Inject constructor(private val stringProvider: StringProvider,
-                                              private val activeSessionHolder: ActiveSessionHolder) :
+class TestAccountSettings @Inject constructor(
+        private val stringProvider: StringProvider,
+        private val activeSessionHolder: ActiveSessionHolder
+) :
         TroubleshootTest(R.string.settings_troubleshoot_test_account_settings_title) {
 
     override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestDeviceSettings.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestDeviceSettings.kt
index c58b7f4ebc..e18c6ce4e1 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestDeviceSettings.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestDeviceSettings.kt
@@ -25,8 +25,10 @@ import javax.inject.Inject
 /**
  * Checks if notifications are enable in the system settings for this app.
  */
-class TestDeviceSettings @Inject constructor(private val vectorPreferences: VectorPreferences,
-                                             private val stringProvider: StringProvider) :
+class TestDeviceSettings @Inject constructor(
+        private val vectorPreferences: VectorPreferences,
+        private val stringProvider: StringProvider
+) :
         TroubleshootTest(R.string.settings_troubleshoot_test_device_settings_title) {
 
     override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestNotification.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestNotification.kt
index c2e5dc4997..22fab0cad4 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestNotification.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestNotification.kt
@@ -27,9 +27,11 @@ import javax.inject.Inject
 /**
  * Checks if notifications can be displayed and clicked by the user.
  */
-class TestNotification @Inject constructor(private val context: Context,
-                                           private val notificationUtils: NotificationUtils,
-                                           private val stringProvider: StringProvider) :
+class TestNotification @Inject constructor(
+        private val context: Context,
+        private val notificationUtils: NotificationUtils,
+        private val stringProvider: StringProvider
+) :
         TroubleshootTest(R.string.settings_troubleshoot_test_notification_title) {
 
     override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt
index ae57babf9a..837b4952f0 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt
@@ -25,8 +25,10 @@ import org.matrix.android.sdk.api.session.pushrules.RuleIds
 import org.matrix.android.sdk.api.session.pushrules.getActions
 import javax.inject.Inject
 
-class TestPushRulesSettings @Inject constructor(private val activeSessionHolder: ActiveSessionHolder,
-                                                private val stringProvider: StringProvider) :
+class TestPushRulesSettings @Inject constructor(
+        private val activeSessionHolder: ActiveSessionHolder,
+        private val stringProvider: StringProvider
+) :
         TroubleshootTest(R.string.settings_troubleshoot_test_bing_settings_title) {
 
     private val testedRules =
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestSystemSettings.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestSystemSettings.kt
index f3e64659cf..2c73bef701 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestSystemSettings.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestSystemSettings.kt
@@ -27,8 +27,10 @@ import javax.inject.Inject
 /**
  * Checks if notifications are enable in the system settings for this app.
  */
-class TestSystemSettings @Inject constructor(private val context: FragmentActivity,
-                                             private val stringProvider: StringProvider) :
+class TestSystemSettings @Inject constructor(
+        private val context: FragmentActivity,
+        private val stringProvider: StringProvider
+) :
         TroubleshootTest(R.string.settings_troubleshoot_test_system_settings_title) {
 
     override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
diff --git a/vector/src/main/java/im/vector/app/features/share/IncomingShareController.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareController.kt
index fd35bf11a4..6eede93143 100644
--- a/vector/src/main/java/im/vector/app/features/share/IncomingShareController.kt
+++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareController.kt
@@ -22,12 +22,15 @@ import im.vector.app.R
 import im.vector.app.core.epoxy.loadingItem
 import im.vector.app.core.epoxy.noResultItem
 import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.home.RoomListDisplayMode
 import im.vector.app.features.home.room.list.RoomSummaryItemFactory
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import javax.inject.Inject
 
-class IncomingShareController @Inject constructor(private val roomSummaryItemFactory: RoomSummaryItemFactory,
-                                                  private val stringProvider: StringProvider) : TypedEpoxyController<IncomingShareViewState>() {
+class IncomingShareController @Inject constructor(
+        private val roomSummaryItemFactory: RoomSummaryItemFactory,
+        private val stringProvider: StringProvider
+) : TypedEpoxyController<IncomingShareViewState>() {
 
     interface Callback {
         fun onRoomClicked(roomSummary: RoomSummary)
@@ -53,7 +56,13 @@ class IncomingShareController @Inject constructor(private val roomSummaryItemFac
         } else {
             roomSummaries.forEach { roomSummary ->
                 roomSummaryItemFactory
-                        .createRoomItem(roomSummary, data.selectedRoomIds, callback?.let { it::onRoomClicked }, callback?.let { it::onRoomLongClicked })
+                        .createRoomItem(
+                                roomSummary,
+                                data.selectedRoomIds,
+                                RoomListDisplayMode.FILTERED,
+                                callback?.let { it::onRoomClicked },
+                                callback?.let { it::onRoomLongClicked }
+                        )
                         .addTo(this)
             }
         }
diff --git a/vector/src/main/java/im/vector/app/features/share/IncomingShareViewEvents.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareViewEvents.kt
index 3f5a43e103..3c61503b01 100644
--- a/vector/src/main/java/im/vector/app/features/share/IncomingShareViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareViewEvents.kt
@@ -21,9 +21,11 @@ import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
 sealed class IncomingShareViewEvents : VectorViewEvents {
-    data class ShareToRoom(val roomSummary: RoomSummary,
-                           val sharedData: SharedData,
-                           val showAlert: Boolean) : IncomingShareViewEvents()
+    data class ShareToRoom(
+            val roomSummary: RoomSummary,
+            val sharedData: SharedData,
+            val showAlert: Boolean
+    ) : IncomingShareViewEvents()
 
     data class EditMediaBeforeSending(val contentAttachmentData: List<ContentAttachmentData>) : IncomingShareViewEvents()
     data class MultipleRoomsShareDone(val roomId: String) : IncomingShareViewEvents()
diff --git a/vector/src/main/java/im/vector/app/features/share/IncomingShareViewModel.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareViewModel.kt
index d184713f60..deb0b14a42 100644
--- a/vector/src/main/java/im/vector/app/features/share/IncomingShareViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareViewModel.kt
@@ -42,7 +42,8 @@ import org.matrix.android.sdk.flow.flow
 class IncomingShareViewModel @AssistedInject constructor(
         @Assisted initialState: IncomingShareViewState,
         private val session: Session,
-        private val breadcrumbsRoomComparator: BreadcrumbsRoomComparator) :
+        private val breadcrumbsRoomComparator: BreadcrumbsRoomComparator
+) :
         VectorViewModel<IncomingShareViewState, IncomingShareAction, IncomingShareViewEvents>(initialState) {
 
     @AssistedFactory
@@ -142,10 +143,12 @@ class IncomingShareViewModel @AssistedInject constructor(
         }
     }
 
-    private fun shareAttachments(attachmentData: List<ContentAttachmentData>,
-                                 selectedRoomIds: Set<String>,
-                                 proposeMediaEdition: Boolean,
-                                 compressMediaBeforeSending: Boolean) {
+    private fun shareAttachments(
+            attachmentData: List<ContentAttachmentData>,
+            selectedRoomIds: Set<String>,
+            proposeMediaEdition: Boolean,
+            compressMediaBeforeSending: Boolean
+    ) {
         if (proposeMediaEdition) {
             val grouped = attachmentData.toGroupedContentAttachmentData()
             if (grouped.notPreviewables.isNotEmpty()) {
diff --git a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt
index 1d67f1ec98..a68ab5287b 100644
--- a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt
@@ -211,7 +211,7 @@ class SoftLogoutViewModel @AssistedInject constructor(
     private fun onSessionRestored() {
         activeSessionHolder.setActiveSession(session)
         // Start the sync
-        session.startSync(true)
+        session.syncService().startSync(true)
 
         // TODO Configure and start ? Check that the push still works...
         setState {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewModel.kt
index 52b6cc0749..a688241982 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewModel.kt
@@ -44,8 +44,8 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.sample
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.tryOrNull
-import org.matrix.android.sdk.api.query.ActiveSpaceFilter
 import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.query.SpaceFilter
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.events.model.toModel
@@ -63,12 +63,13 @@ import org.matrix.android.sdk.api.session.space.model.TopLevelSpaceComparator
 import org.matrix.android.sdk.api.util.toMatrixItem
 import org.matrix.android.sdk.flow.flow
 
-class SpaceListViewModel @AssistedInject constructor(@Assisted initialState: SpaceListViewState,
-                                                     private val appStateHandler: AppStateHandler,
-                                                     private val session: Session,
-                                                     private val vectorPreferences: VectorPreferences,
-                                                     private val autoAcceptInvites: AutoAcceptInvites,
-                                                     private val analyticsTracker: AnalyticsTracker
+class SpaceListViewModel @AssistedInject constructor(
+        @Assisted initialState: SpaceListViewState,
+        private val appStateHandler: AppStateHandler,
+        private val session: Session,
+        private val vectorPreferences: VectorPreferences,
+        private val autoAcceptInvites: AutoAcceptInvites,
+        private val analyticsTracker: AnalyticsTracker
 ) : VectorViewModel<SpaceListViewState, SpaceListAction, SpaceListViewEvents>(initialState) {
 
     @AssistedFactory
@@ -110,9 +111,9 @@ class SpaceListViewModel @AssistedInject constructor(@Assisted initialState: Spa
         session.roomService().getPagedRoomSummariesLive(
                 roomSummaryQueryParams {
                     this.memberships = listOf(Membership.JOIN)
-                    this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null).takeIf {
+                    this.spaceFilter = SpaceFilter.OrphanRooms.takeIf {
                         !vectorPreferences.prefSpacesShowAllRoomInHome()
-                    } ?: ActiveSpaceFilter.None
+                    }
                 }, sortOrder = RoomSortOrder.NONE
         ).asFlow()
                 .sample(300)
@@ -127,9 +128,9 @@ class SpaceListViewModel @AssistedInject constructor(@Assisted initialState: Spa
                     val totalCount = session.roomService().getNotificationCountForRooms(
                             roomSummaryQueryParams {
                                 this.memberships = listOf(Membership.JOIN)
-                                this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null).takeIf {
+                                this.spaceFilter = SpaceFilter.OrphanRooms.takeIf {
                                     !vectorPreferences.prefSpacesShowAllRoomInHome()
-                                } ?: ActiveSpaceFilter.None
+                                }
                             }
                     )
                     val counts = RoomAggregateNotificationCount(
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceMenuViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceMenuViewModel.kt
index 4e1489ef9b..c3e4cfdbf5 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceMenuViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceMenuViewModel.kt
@@ -34,8 +34,8 @@ import im.vector.app.features.session.coroutineScope
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.query.ActiveSpaceFilter
 import org.matrix.android.sdk.api.query.RoomCategoryFilter
+import org.matrix.android.sdk.api.query.SpaceFilter
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.getRoom
@@ -141,7 +141,7 @@ class SpaceMenuViewModel @AssistedInject constructor(
                     session.roomService().getRoomSummaries(
                             roomSummaryQueryParams {
                                 excludeType = null
-                                activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(initialState.spaceId)
+                                spaceFilter = SpaceFilter.ActiveSpace(initialState.spaceId)
                                 memberships = listOf(Membership.JOIN)
                                 roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
                             }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
index ca9c05f3f9..302676a27c 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
@@ -107,11 +107,13 @@ class SpaceSummaryController @Inject constructor(
         }
     }
 
-    private fun buildGroupModels(summaries: List<RoomSummary>?,
-                                 selected: RoomGroupingMethod,
-                                 rootSpaces: List<RoomSummary>?,
-                                 expandedStates: Map<String, Boolean>,
-                                 homeCount: RoomAggregateNotificationCount) {
+    private fun buildGroupModels(
+            summaries: List<RoomSummary>?,
+            selected: RoomGroupingMethod,
+            rootSpaces: List<RoomSummary>?,
+            expandedStates: Map<String, Boolean>,
+            homeCount: RoomAggregateNotificationCount
+    ) {
         val host = this
         spaceBetaHeaderItem {
             id("beta_header")
@@ -187,11 +189,13 @@ class SpaceSummaryController @Inject constructor(
         }
     }
 
-    private fun buildSubSpace(idPrefix: String,
-                              summaries: List<RoomSummary>?,
-                              expandedStates: Map<String, Boolean>,
-                              selected: RoomGroupingMethod,
-                              info: SpaceChildInfo, currentDepth: Int, maxDepth: Int) {
+    private fun buildSubSpace(
+            idPrefix: String,
+            summaries: List<RoomSummary>?,
+            expandedStates: Map<String, Boolean>,
+            selected: RoomGroupingMethod,
+            info: SpaceChildInfo, currentDepth: Int, maxDepth: Int
+    ) {
         val host = this
         if (currentDepth >= maxDepth) return
         val childSummary = summaries?.firstOrNull { it.roomId == info.childRoomId } ?: return
diff --git a/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheetViewModel.kt
index 5e56373a88..ea36908dd2 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheetViewModel.kt
@@ -101,7 +101,7 @@ class SpaceInviteBottomSheetViewModel @AssistedInject constructor(
 
     override fun handle(action: SpaceInviteBottomSheetAction) {
         when (action) {
-            SpaceInviteBottomSheetAction.DoJoin   -> {
+            SpaceInviteBottomSheetAction.DoJoin -> {
                 setState { copy(joinActionState = Loading()) }
                 session.coroutineScope.launch(Dispatchers.IO) {
                     try {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/leave/SpaceLeaveAdvancedFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/leave/SpaceLeaveAdvancedFragment.kt
index 308572a30f..ed724db6c0 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/leave/SpaceLeaveAdvancedFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/leave/SpaceLeaveAdvancedFragment.kt
@@ -141,7 +141,8 @@ class SpaceLeaveAdvancedFragment @Inject constructor(
     private fun MenuItem.bind(
             onExpanded: () -> Unit,
             onCollapsed: () -> Unit,
-            onTextChanged: (String) -> Unit) {
+            onTextChanged: (String) -> Unit
+    ) {
         setOnActionExpandListener(object : MenuItem.OnActionExpandListener {
             override fun onMenuItemActionExpand(item: MenuItem?): Boolean {
                 onExpanded()
diff --git a/vector/src/main/java/im/vector/app/features/spaces/leave/SpaceLeaveAdvancedViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/leave/SpaceLeaveAdvancedViewModel.kt
index 2ab417ac55..926739f96c 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/leave/SpaceLeaveAdvancedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/leave/SpaceLeaveAdvancedViewModel.kt
@@ -33,8 +33,8 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import okhttp3.internal.toImmutableList
-import org.matrix.android.sdk.api.query.ActiveSpaceFilter
 import org.matrix.android.sdk.api.query.RoomCategoryFilter
+import org.matrix.android.sdk.api.query.SpaceFilter
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
@@ -93,7 +93,7 @@ class SpaceLeaveAdvancedViewModel @AssistedInject constructor(
                     roomSummaryQueryParams {
                         includeType = null
                         memberships = listOf(Membership.JOIN)
-                        activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(initialState.spaceId)
+                        spaceFilter = SpaceFilter.ActiveSpace(initialState.spaceId)
                         roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
                     }
             )
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
index 0be0fb0464..8c1880e372 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
@@ -35,9 +35,9 @@ import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.matrix.android.sdk.api.query.ActiveSpaceFilter
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.query.RoomCategoryFilter
+import org.matrix.android.sdk.api.query.SpaceFilter
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.getRoomSummary
 import org.matrix.android.sdk.api.session.room.RoomSortOrder
@@ -72,7 +72,7 @@ class SpaceAddRoomsViewModel @AssistedInject constructor(
                     this.memberships = listOf(Membership.JOIN)
                     this.excludeType = null
                     this.includeType = listOf(RoomType.SPACE)
-                    this.activeSpaceFilter = ActiveSpaceFilter.ExcludeSpace(initialState.spaceId)
+                    this.spaceFilter = SpaceFilter.ExcludeSpace(initialState.spaceId)
                     this.displayName = QueryStringValue.Contains(initialState.currentFilter, QueryStringValue.Case.INSENSITIVE)
                 },
                 pagedListConfig = PagedList.Config.Builder()
@@ -98,7 +98,7 @@ class SpaceAddRoomsViewModel @AssistedInject constructor(
                     this.excludeType = listOf(RoomType.SPACE)
                     this.includeType = null
                     this.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
-                    this.activeSpaceFilter = ActiveSpaceFilter.ExcludeSpace(initialState.spaceId)
+                    this.spaceFilter = SpaceFilter.ExcludeSpace(initialState.spaceId)
                     this.displayName = QueryStringValue.Contains(initialState.currentFilter, QueryStringValue.Case.INSENSITIVE)
                 },
                 pagedListConfig = PagedList.Config.Builder()
@@ -124,7 +124,7 @@ class SpaceAddRoomsViewModel @AssistedInject constructor(
                     this.excludeType = listOf(RoomType.SPACE)
                     this.includeType = null
                     this.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
-                    this.activeSpaceFilter = ActiveSpaceFilter.ExcludeSpace(initialState.spaceId)
+                    this.spaceFilter = SpaceFilter.ExcludeSpace(initialState.spaceId)
                     this.displayName = QueryStringValue.Contains(initialState.currentFilter, QueryStringValue.Case.INSENSITIVE)
                 },
                 pagedListConfig = PagedList.Config.Builder()
@@ -168,9 +168,6 @@ class SpaceAddRoomsViewModel @AssistedInject constructor(
     override fun handle(action: SpaceAddRoomActions) {
         when (action) {
             is SpaceAddRoomActions.UpdateFilter    -> {
-                roomUpdatableLivePageResult.queryParams = roomUpdatableLivePageResult.queryParams.copy(
-                        displayName = QueryStringValue.Contains(action.filter, QueryStringValue.Case.INSENSITIVE)
-                )
                 roomUpdatableLivePageResult.queryParams = roomUpdatableLivePageResult.queryParams.copy(
                         displayName = QueryStringValue.Contains(action.filter, QueryStringValue.Case.INSENSITIVE)
                 )
diff --git a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt
index 1fbe9bbbf9..5e6efcc816 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt
@@ -150,9 +150,9 @@ class SpacePeopleListController @Inject constructor(
 
     private fun toPowerLevelLabel(categories: RoomMemberListCategories): String? {
         return when (categories) {
-            RoomMemberListCategories.ADMIN     -> stringProvider.getString(R.string.power_level_admin)
+            RoomMemberListCategories.ADMIN -> stringProvider.getString(R.string.power_level_admin)
             RoomMemberListCategories.MODERATOR -> stringProvider.getString(R.string.power_level_moderator)
-            else                               -> null
+            else -> null
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpaceTabView.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpaceTabView.kt
index ea28129262..0ad3be5ce7 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/preview/SpaceTabView.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpaceTabView.kt
@@ -21,9 +21,11 @@ import android.util.AttributeSet
 import android.widget.LinearLayout
 import im.vector.app.R
 
-class SpaceTabView constructor(context: Context,
-                               attrs: AttributeSet? = null,
-                               defStyleAttr: Int = 0) :
+class SpaceTabView constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) :
         LinearLayout(context, attrs, defStyleAttr) {
 
     constructor(context: Context, attrs: AttributeSet) : this(context, attrs, 0) {}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceViewModel.kt
index 43d69e6fef..bbec676fb2 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceViewModel.kt
@@ -36,7 +36,8 @@ import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
 
 class ShareSpaceViewModel @AssistedInject constructor(
         @Assisted private val initialState: ShareSpaceViewState,
-        private val session: Session) : VectorViewModel<ShareSpaceViewState, ShareSpaceAction, ShareSpaceViewEvents>(initialState) {
+        private val session: Session
+) : VectorViewModel<ShareSpaceViewState, ShareSpaceAction, ShareSpaceViewEvents>(initialState) {
 
     @AssistedFactory
     interface Factory : MavericksAssistedViewModelFactory<ShareSpaceViewModel, ShareSpaceViewState> {
diff --git a/vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt b/vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt
index 27116093d2..0e9eb91317 100755
--- a/vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt
+++ b/vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt
@@ -24,7 +24,7 @@ import androidx.core.view.isVisible
 import im.vector.app.R
 import im.vector.app.core.utils.isAirplaneModeOn
 import im.vector.app.databinding.ViewSyncStateBinding
-import org.matrix.android.sdk.api.session.initsync.SyncStatusService
+import org.matrix.android.sdk.api.session.sync.SyncRequestState
 import org.matrix.android.sdk.api.session.sync.SyncState
 
 class SyncStateView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0) :
@@ -39,15 +39,16 @@ class SyncStateView @JvmOverloads constructor(context: Context, attrs: Attribute
     }
 
     @SuppressLint("SetTextI18n")
-    fun render(newState: SyncState,
-               incrementalSyncStatus: SyncStatusService.Status.IncrementalSyncStatus,
-               pushCounter: Int,
-               showDebugInfo: Boolean
+    fun render(
+            newState: SyncState,
+            incrementalSyncRequestState: SyncRequestState.IncrementalSyncRequestState,
+            pushCounter: Int,
+            showDebugInfo: Boolean
     ) {
         views.syncStateDebugInfo.isVisible = showDebugInfo
         if (showDebugInfo) {
             views.syncStateDebugInfoText.text =
-                    "Sync thread : ${newState.toHumanReadable()}\nSync request: ${incrementalSyncStatus.toHumanReadable()}"
+                    "Sync thread : ${newState.toHumanReadable()}\nSync request: ${incrementalSyncRequestState.toHumanReadable()}"
             views.syncStateDebugInfoPushCounter.text =
                     "Push: $pushCounter"
         }
@@ -75,13 +76,13 @@ class SyncStateView @JvmOverloads constructor(context: Context, attrs: Attribute
         }
     }
 
-    private fun SyncStatusService.Status.IncrementalSyncStatus.toHumanReadable(): String {
+    private fun SyncRequestState.IncrementalSyncRequestState.toHumanReadable(): String {
         return when (this) {
-            SyncStatusService.Status.IncrementalSyncIdle       -> "Idle"
-            is SyncStatusService.Status.IncrementalSyncParsing -> "Parsing ${this.rooms} room(s) ${this.toDevice} toDevice(s)"
-            SyncStatusService.Status.IncrementalSyncError      -> "Error"
-            SyncStatusService.Status.IncrementalSyncDone       -> "Done"
-            else                                               -> "?"
+            SyncRequestState.IncrementalSyncIdle       -> "Idle"
+            is SyncRequestState.IncrementalSyncParsing -> "Parsing ${this.rooms} room(s) ${this.toDevice} toDevice(s)"
+            SyncRequestState.IncrementalSyncError      -> "Error"
+            SyncRequestState.IncrementalSyncDone       -> "Done"
+            else                                       -> "?"
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt b/vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
index 8c21e96bea..656110c43d 100644
--- a/vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
+++ b/vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
@@ -23,8 +23,10 @@ import im.vector.app.R
  * Class to manage Activity other possible themes.
  * Note that style for light theme is default and is declared in the Android Manifest
  */
-sealed class ActivityOtherThemes(@StyleRes val dark: Int,
-                                 @StyleRes val black: Int) {
+sealed class ActivityOtherThemes(
+        @StyleRes val dark: Int,
+        @StyleRes val black: Int
+) {
 
     object Default : ActivityOtherThemes(
             R.style.Theme_Vector_Dark,
diff --git a/vector/src/main/java/im/vector/app/features/usercode/UserCodeSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/usercode/UserCodeSharedViewModel.kt
index 505bbdd2dd..8f761e2dbd 100644
--- a/vector/src/main/java/im/vector/app/features/usercode/UserCodeSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/usercode/UserCodeSharedViewModel.kt
@@ -42,7 +42,8 @@ class UserCodeSharedViewModel @AssistedInject constructor(
         private val session: Session,
         private val stringProvider: StringProvider,
         private val directRoomHelper: DirectRoomHelper,
-        private val rawService: RawService) : VectorViewModel<UserCodeState, UserCodeActions, UserCodeShareViewEvents>(initialState) {
+        private val rawService: RawService
+) : VectorViewModel<UserCodeState, UserCodeActions, UserCodeShareViewEvents>(initialState) {
 
     companion object : MavericksViewModelFactory<UserCodeSharedViewModel, UserCodeState> by hiltMavericksViewModelFactory()
 
diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/UserListController.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserListController.kt
index 55858b2baf..f04b70beee 100644
--- a/vector/src/main/java/im/vector/app/features/userdirectory/UserListController.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserListController.kt
@@ -40,11 +40,13 @@ import org.matrix.android.sdk.api.session.user.model.User
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
-class UserListController @Inject constructor(private val session: Session,
-                                             private val avatarRenderer: AvatarRenderer,
-                                             private val stringProvider: StringProvider,
-                                             private val colorProvider: ColorProvider,
-                                             private val errorFormatter: ErrorFormatter) : EpoxyController() {
+class UserListController @Inject constructor(
+        private val session: Session,
+        private val avatarRenderer: AvatarRenderer,
+        private val stringProvider: StringProvider,
+        private val colorProvider: ColorProvider,
+        private val errorFormatter: ErrorFormatter
+) : EpoxyController() {
 
     private var state: UserListViewState? = null
 
diff --git a/vector/src/main/java/im/vector/app/features/voice/AudioWaveformView.kt b/vector/src/main/java/im/vector/app/features/voice/AudioWaveformView.kt
index 32f30fe458..944f71ef3e 100644
--- a/vector/src/main/java/im/vector/app/features/voice/AudioWaveformView.kt
+++ b/vector/src/main/java/im/vector/app/features/voice/AudioWaveformView.kt
@@ -151,12 +151,14 @@ class AudioWaveformView @JvmOverloads constructor(
 
     private fun handleNewFftList(fftList: List<FFT>) {
         val maxVisibleBarCount = getMaxVisibleBarCount()
+
         fftList.forEach { fft ->
             rawFftList.add(fft)
             val barHeight = max(fft.value / MAX_FFT * (height - verticalPadding * 2), barMinHeight)
             visibleBarHeights.add(FFT(barHeight, fft.color))
+
             if (visibleBarHeights.size > maxVisibleBarCount) {
-                visibleBarHeights = visibleBarHeights.subList(visibleBarHeights.size - maxVisibleBarCount, visibleBarHeights.size)
+                visibleBarHeights = visibleBarHeights.takeLast(maxVisibleBarCount).toMutableList()
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/webview/ConsentWebViewEventListener.kt b/vector/src/main/java/im/vector/app/features/webview/ConsentWebViewEventListener.kt
index e7f5ac29b9..2eaaa7ac51 100644
--- a/vector/src/main/java/im/vector/app/features/webview/ConsentWebViewEventListener.kt
+++ b/vector/src/main/java/im/vector/app/features/webview/ConsentWebViewEventListener.kt
@@ -29,9 +29,11 @@ private const val RIOT_BOT_ID = "@riot-bot:matrix.org"
  * This class is the Consent implementation of WebViewEventListener.
  * It is used to manage the consent agreement flow.
  */
-class ConsentWebViewEventListener(activity: VectorBaseActivity<*>,
-                                  private val session: Session,
-                                  private val delegate: WebViewEventListener) :
+class ConsentWebViewEventListener(
+        activity: VectorBaseActivity<*>,
+        private val session: Session,
+        private val delegate: WebViewEventListener
+) :
         WebViewEventListener by delegate {
 
     private val safeActivity: VectorBaseActivity<*>? by weak(activity)
diff --git a/vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt b/vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt
index fd26fff017..0678d5143d 100644
--- a/vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt
@@ -115,10 +115,12 @@ class VectorWebViewActivity : VectorBaseActivity<ActivityVectorWebViewBinding>()
 
         private const val USE_TITLE_FROM_WEB_PAGE = ""
 
-        fun getIntent(context: Context,
-                      url: String,
-                      title: String = USE_TITLE_FROM_WEB_PAGE,
-                      mode: WebViewMode = WebViewMode.DEFAULT): Intent {
+        fun getIntent(
+                context: Context,
+                url: String,
+                title: String = USE_TITLE_FROM_WEB_PAGE,
+                mode: WebViewMode = WebViewMode.DEFAULT
+        ): Intent {
             return Intent(context, VectorWebViewActivity::class.java)
                     .apply {
                         putExtra(EXTRA_URL, url)
diff --git a/vector/src/main/java/im/vector/app/features/webview/WebChromeEventListener.kt b/vector/src/main/java/im/vector/app/features/webview/WebChromeEventListener.kt
new file mode 100644
index 0000000000..d4bd2be186
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/webview/WebChromeEventListener.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.webview
+
+import android.webkit.PermissionRequest
+
+interface WebChromeEventListener {
+
+    /**
+     * Triggered when the web view requests permissions.
+     *
+     * @param request The permission request.
+     */
+    fun onPermissionRequest(request: PermissionRequest)
+}
diff --git a/vector/src/main/java/im/vector/app/features/webview/WebEventListener.kt b/vector/src/main/java/im/vector/app/features/webview/WebEventListener.kt
new file mode 100644
index 0000000000..d4bf5b898b
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/webview/WebEventListener.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.webview
+
+interface WebEventListener : WebViewEventListener, WebChromeEventListener
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt
index cd2a4dcdf4..0f399d7c45 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt
@@ -26,6 +26,8 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
+import android.webkit.PermissionRequest
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import com.airbnb.mvrx.Fail
@@ -42,7 +44,8 @@ import im.vector.app.core.platform.OnBackPressed
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.utils.openUrlInExternalBrowser
 import im.vector.app.databinding.FragmentRoomWidgetBinding
-import im.vector.app.features.webview.WebViewEventListener
+import im.vector.app.features.webview.WebEventListener
+import im.vector.app.features.widgets.webview.WebviewPermissionUtils
 import im.vector.app.features.widgets.webview.clearAfterWidget
 import im.vector.app.features.widgets.webview.setupForWidget
 import kotlinx.parcelize.Parcelize
@@ -60,9 +63,11 @@ data class WidgetArgs(
         val urlParams: Map<String, String> = emptyMap()
 ) : Parcelable
 
-class WidgetFragment @Inject constructor() :
+class WidgetFragment @Inject constructor(
+        private val permissionUtils: WebviewPermissionUtils
+) :
         VectorBaseFragment<FragmentRoomWidgetBinding>(),
-        WebViewEventListener,
+        WebEventListener,
         OnBackPressed {
 
     private val fragmentArgs: WidgetArgs by args()
@@ -271,6 +276,20 @@ class WidgetFragment @Inject constructor() :
         viewModel.handle(WidgetAction.OnWebViewLoadingError(url, true, errorCode, description))
     }
 
+    private val permissionResultLauncher = registerForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { result ->
+        permissionUtils.onPermissionResult(result)
+    }
+
+    override fun onPermissionRequest(request: PermissionRequest) {
+        permissionUtils.promptForPermissions(
+                title = R.string.room_widget_resource_permission_title,
+                request = request,
+                context = requireContext(),
+                activity = requireActivity(),
+                activityResultLauncher = permissionResultLauncher
+        )
+    }
+
     private fun displayTerms(displayTerms: WidgetViewEvents.DisplayTerms) {
         navigator.openTerms(
                 context = requireContext(),
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
index fc73e71b51..203b63d70b 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
@@ -42,9 +42,11 @@ import org.matrix.android.sdk.api.session.widgets.WidgetPostAPIMediator
 import org.matrix.android.sdk.api.util.JsonDict
 import timber.log.Timber
 
-class WidgetPostAPIHandler @AssistedInject constructor(@Assisted private val roomId: String,
-                                                       private val stringProvider: StringProvider,
-                                                       private val session: Session) : WidgetPostAPIMediator.Handler {
+class WidgetPostAPIHandler @AssistedInject constructor(
+        @Assisted private val roomId: String,
+        private val stringProvider: StringProvider,
+        private val session: Session
+) : WidgetPostAPIMediator.Handler {
 
     @AssistedFactory
     interface Factory {
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt
index c7b1429304..e06c8b2134 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt
@@ -48,10 +48,12 @@ import org.matrix.android.sdk.flow.unwrap
 import timber.log.Timber
 import javax.net.ssl.HttpsURLConnection
 
-class WidgetViewModel @AssistedInject constructor(@Assisted val initialState: WidgetViewState,
-                                                  widgetPostAPIHandlerFactory: WidgetPostAPIHandler.Factory,
-                                                  private val stringProvider: StringProvider,
-                                                  private val session: Session) :
+class WidgetViewModel @AssistedInject constructor(
+        @Assisted val initialState: WidgetViewState,
+        widgetPostAPIHandlerFactory: WidgetPostAPIHandler.Factory,
+        private val stringProvider: StringProvider,
+        private val session: Session
+) :
         VectorViewModel<WidgetViewState, WidgetAction, WidgetViewEvents>(initialState),
         WidgetPostAPIHandler.NavigationCallback,
         IntegrationManagerService.Listener {
diff --git a/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewModel.kt b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewModel.kt
index 7ab2cf174d..b6b805e5f0 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewModel.kt
@@ -35,8 +35,10 @@ import org.matrix.android.sdk.flow.flow
 import timber.log.Timber
 import java.net.URL
 
-class RoomWidgetPermissionViewModel @AssistedInject constructor(@Assisted val initialState: RoomWidgetPermissionViewState,
-                                                                private val session: Session) :
+class RoomWidgetPermissionViewModel @AssistedInject constructor(
+        @Assisted val initialState: RoomWidgetPermissionViewState,
+        private val session: Session
+) :
         VectorViewModel<RoomWidgetPermissionViewState, RoomWidgetPermissionActions, RoomWidgetPermissionViewEvents>(initialState) {
 
     private val widgetService = session.widgetService()
diff --git a/vector/src/main/java/im/vector/app/features/widgets/permissions/WidgetPermissionsHelper.kt b/vector/src/main/java/im/vector/app/features/widgets/permissions/WidgetPermissionsHelper.kt
index 5664609a99..c9f71749c1 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/permissions/WidgetPermissionsHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/permissions/WidgetPermissionsHelper.kt
@@ -20,8 +20,10 @@ import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerService
 import org.matrix.android.sdk.api.session.widgets.WidgetService
 
-class WidgetPermissionsHelper(private val integrationManagerService: IntegrationManagerService,
-                              private val widgetService: WidgetService) {
+class WidgetPermissionsHelper(
+        private val integrationManagerService: IntegrationManagerService,
+        private val widgetService: WidgetService
+) {
 
     suspend fun changePermission(roomId: String, widgetId: String, allow: Boolean) {
         val widget = widgetService.getRoomWidgets(
diff --git a/vector/src/main/java/im/vector/app/features/widgets/webview/WebviewPermissionUtils.kt b/vector/src/main/java/im/vector/app/features/widgets/webview/WebviewPermissionUtils.kt
index 12b58cc208..3bcd2b67bd 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/webview/WebviewPermissionUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/webview/WebviewPermissionUtils.kt
@@ -15,17 +15,34 @@
  */
 package im.vector.app.features.widgets.webview
 
-import android.annotation.SuppressLint
+import android.Manifest
 import android.content.Context
 import android.webkit.PermissionRequest
+import androidx.activity.result.ActivityResultLauncher
 import androidx.annotation.StringRes
+import androidx.annotation.VisibleForTesting
+import androidx.fragment.app.FragmentActivity
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import im.vector.app.R
+import im.vector.app.core.error.fatalError
+import im.vector.app.core.utils.checkPermissions
+import im.vector.app.features.settings.VectorPreferences
+import javax.inject.Inject
 
-object WebviewPermissionUtils {
+class WebviewPermissionUtils @Inject constructor(
+        private val vectorPreferences: VectorPreferences,
+) {
 
-    @SuppressLint("NewApi")
-    fun promptForPermissions(@StringRes title: Int, request: PermissionRequest, context: Context) {
+    private var permissionRequest: PermissionRequest? = null
+    private var selectedPermissions = listOf<String>()
+
+    fun promptForPermissions(
+            @StringRes title: Int,
+            request: PermissionRequest,
+            context: Context,
+            activity: FragmentActivity,
+            activityResultLauncher: ActivityResultLauncher<Array<String>>
+    ) {
         val allowedPermissions = request.resources.map {
             it to false
         }.toMutableList()
@@ -37,9 +54,21 @@ object WebviewPermissionUtils {
                     allowedPermissions[which] = allowedPermissions[which].first to isChecked
                 }
                 .setPositiveButton(R.string.room_widget_resource_grant_permission) { _, _ ->
-                    request.grant(allowedPermissions.mapNotNull { perm ->
+                    permissionRequest = request
+                    selectedPermissions = allowedPermissions.mapNotNull { perm ->
                         perm.first.takeIf { perm.second }
-                    }.toTypedArray())
+                    }
+
+                    val requiredAndroidPermissions = selectedPermissions.mapNotNull { permission ->
+                        webPermissionToAndroidPermission(permission)
+                    }
+
+                    // When checkPermissions returns false, some of the required Android permissions will
+                    // have to be requested and the flow completes asynchronously via onPermissionResult
+                    if (checkPermissions(requiredAndroidPermissions, activity, activityResultLauncher)) {
+                        request.grant(selectedPermissions.toTypedArray())
+                        reset()
+                    }
                 }
                 .setNegativeButton(R.string.room_widget_resource_decline_permission) { _, _ ->
                     request.deny()
@@ -47,6 +76,38 @@ object WebviewPermissionUtils {
                 .show()
     }
 
+    fun onPermissionResult(result: Map<String, Boolean>) {
+        if (permissionRequest == null) {
+            fatalError(
+                message = "permissionRequest was null! Make sure to call promptForPermissions first.",
+                failFast = vectorPreferences.failFast()
+            )
+            return
+        }
+        val grantedPermissions = filterPermissionsToBeGranted(selectedPermissions, result)
+        if (grantedPermissions.isNotEmpty()) {
+            permissionRequest?.grant(grantedPermissions.toTypedArray())
+        } else {
+            permissionRequest?.deny()
+        }
+        reset()
+    }
+
+    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    fun filterPermissionsToBeGranted(selectedWebPermissions: List<String>, androidPermissionResult: Map<String, Boolean>): List<String> {
+        return selectedWebPermissions.filter { webPermission ->
+            val androidPermission = webPermissionToAndroidPermission(webPermission)
+                    ?: return@filter true // No corresponding Android permission exists
+            return@filter androidPermissionResult[androidPermission]
+                    ?: return@filter true // Android permission already granted before
+        }
+    }
+
+    private fun reset() {
+        permissionRequest = null
+        selectedPermissions = listOf()
+    }
+
     private fun webPermissionToHumanReadable(permission: String, context: Context): String {
         return when (permission) {
             PermissionRequest.RESOURCE_AUDIO_CAPTURE      -> context.getString(R.string.room_widget_webview_access_microphone)
@@ -55,4 +116,12 @@ object WebviewPermissionUtils {
             else                                          -> permission
         }
     }
+
+    private fun webPermissionToAndroidPermission(permission: String): String? {
+        return when (permission) {
+            PermissionRequest.RESOURCE_AUDIO_CAPTURE -> Manifest.permission.RECORD_AUDIO
+            PermissionRequest.RESOURCE_VIDEO_CAPTURE -> Manifest.permission.CAMERA
+            else                                     -> null
+        }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/widgets/webview/WidgetWebView.kt b/vector/src/main/java/im/vector/app/features/widgets/webview/WidgetWebView.kt
index 7147529e5f..0207987ca3 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/webview/WidgetWebView.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/webview/WidgetWebView.kt
@@ -25,10 +25,10 @@ import android.webkit.WebView
 import im.vector.app.R
 import im.vector.app.features.themes.ThemeUtils
 import im.vector.app.features.webview.VectorWebViewClient
-import im.vector.app.features.webview.WebViewEventListener
+import im.vector.app.features.webview.WebEventListener
 
 @SuppressLint("NewApi")
-fun WebView.setupForWidget(webViewEventListener: WebViewEventListener) {
+fun WebView.setupForWidget(eventListener: WebEventListener) {
     // xml value seems ignored
     setBackgroundColor(ThemeUtils.getColor(context, R.attr.colorSurface))
 
@@ -59,10 +59,10 @@ fun WebView.setupForWidget(webViewEventListener: WebViewEventListener) {
     // Permission requests
     webChromeClient = object : WebChromeClient() {
         override fun onPermissionRequest(request: PermissionRequest) {
-            WebviewPermissionUtils.promptForPermissions(R.string.room_widget_resource_permission_title, request, context)
+            eventListener.onPermissionRequest(request)
         }
     }
-    webViewClient = VectorWebViewClient(webViewEventListener)
+    webViewClient = VectorWebViewClient(eventListener)
 
     val cookieManager = CookieManager.getInstance()
     cookieManager.setAcceptThirdPartyCookies(this, false)
diff --git a/vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt b/vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt
index 8c24b2893a..a6392c4cec 100644
--- a/vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt
@@ -62,8 +62,10 @@ sealed class BannerState {
     object BackingUp : BannerState()
 }
 
-class ServerBackupStatusViewModel @AssistedInject constructor(@Assisted initialState: ServerBackupStatusViewState,
-                                                              private val session: Session) :
+class ServerBackupStatusViewModel @AssistedInject constructor(
+        @Assisted initialState: ServerBackupStatusViewState,
+        private val session: Session
+) :
         VectorViewModel<ServerBackupStatusViewState, EmptyAction, EmptyViewEvents>(initialState), KeysBackupStateListener {
 
     @AssistedFactory
@@ -81,7 +83,7 @@ class ServerBackupStatusViewModel @AssistedInject constructor(@Assisted initialS
 
     init {
         session.cryptoService().keysBackupService().addListener(this)
-        keysBackupState.value = session.cryptoService().keysBackupService().state
+        keysBackupState.value = session.cryptoService().keysBackupService().getState()
         val liveUserAccountData = session.flow().liveUserAccountData(setOf(MASTER_KEY_SSSS_NAME, USER_SIGNING_KEY_SSSS_NAME, SELF_SIGNING_KEY_SSSS_NAME))
         val liveCrossSigningInfo = session.flow().liveCrossSigningInfo(session.myUserId)
         val liveCrossSigningPrivateKeys = session.flow().liveCrossSigningPrivateKeys()
@@ -116,7 +118,7 @@ class ServerBackupStatusViewModel @AssistedInject constructor(@Assisted initialS
                 }
 
         viewModelScope.launch {
-            keyBackupFlow.tryEmit(session.cryptoService().keysBackupService().state)
+            keyBackupFlow.tryEmit(session.cryptoService().keysBackupService().getState())
         }
     }
 
@@ -148,7 +150,7 @@ class ServerBackupStatusViewModel @AssistedInject constructor(@Assisted initialS
 
     override fun onStateChange(newState: KeysBackupState) {
         viewModelScope.launch {
-            keyBackupFlow.tryEmit(session.cryptoService().keysBackupService().state)
+            keyBackupFlow.tryEmit(session.cryptoService().keysBackupService().getState())
         }
         keysBackupState.value = newState
     }
diff --git a/vector/src/main/java/im/vector/app/features/workers/signout/SignoutCheckViewModel.kt b/vector/src/main/java/im/vector/app/features/workers/signout/SignoutCheckViewModel.kt
index 79df62d7fb..49d1192b2b 100644
--- a/vector/src/main/java/im/vector/app/features/workers/signout/SignoutCheckViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/workers/signout/SignoutCheckViewModel.kt
@@ -76,7 +76,7 @@ class SignoutCheckViewModel @AssistedInject constructor(
 
         val quad4SIsSetup = session.sharedSecretStorageService().isRecoverySetup()
         val allKeysKnown = session.cryptoService().crossSigningService().allPrivateKeysKnown()
-        val backupState = session.cryptoService().keysBackupService().state
+        val backupState = session.cryptoService().keysBackupService().getState()
         setState {
             copy(
                     userId = session.myUserId,
diff --git a/vector/src/main/res/drawable/bg_live_location_users_bottom_sheet.xml b/vector/src/main/res/drawable/bg_live_location_users_bottom_sheet.xml
new file mode 100644
index 0000000000..e6012ebe42
--- /dev/null
+++ b/vector/src/main/res/drawable/bg_live_location_users_bottom_sheet.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners
+        android:topLeftRadius="16dp"
+        android:topRightRadius="16dp" />
+    <solid android:color="?android:colorBackground" />
+</shape>
diff --git a/vector/src/main/res/drawable/ic_bottom_sheet_handle.xml b/vector/src/main/res/drawable/ic_bottom_sheet_handle.xml
new file mode 100644
index 0000000000..fe3c93497b
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_bottom_sheet_handle.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <size android:width="36dp" android:height="6dp" />
+    <solid android:color="?vctr_content_quinary" />
+    <corners android:radius="3dp" />
+</shape>
diff --git a/vector/src/main/res/drawable/ic_thread_view_in_room_menu_item.xml b/vector/src/main/res/drawable/ic_thread_view_in_room_menu_item.xml
deleted file mode 100644
index f408f99713..0000000000
--- a/vector/src/main/res/drawable/ic_thread_view_in_room_menu_item.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M3,4H21"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#737D8C"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M3,10H16"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#737D8C"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M3,14H11"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#737D8C"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M3,20H21"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#737D8C"
-      android:strokeLineCap="round"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_threads_view_in_room_24.xml b/vector/src/main/res/drawable/ic_threads_view_in_room_24.xml
new file mode 100644
index 0000000000..4b73f5c389
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_threads_view_in_room_24.xml
@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M2,4C2,3.448 2.448,3 3,3H3.005C3.557,3 4.005,3.448 4.005,4C4.005,4.552 3.557,5 3.005,5H3C2.448,5 2,4.552 2,4ZM4.995,4C4.995,3.448 5.443,3 5.995,3H6.005C6.557,3 7.005,3.448 7.005,4C7.005,4.552 6.557,5 6.005,5H5.995C5.443,5 4.995,4.552 4.995,4ZM7.995,4C7.995,3.448 8.443,3 8.995,3H9.005C9.557,3 10.005,3.448 10.005,4C10.005,4.552 9.557,5 9.005,5H8.995C8.443,5 7.995,4.552 7.995,4ZM10.995,4C10.995,3.448 11.443,3 11.995,3H12.005C12.557,3 13.005,3.448 13.005,4C13.005,4.552 12.557,5 12.005,5H11.995C11.443,5 10.995,4.552 10.995,4ZM13.995,4C13.995,3.448 14.443,3 14.995,3H15.005C15.557,3 16.005,3.448 16.005,4C16.005,4.552 15.557,5 15.005,5H14.995C14.443,5 13.995,4.552 13.995,4ZM16.995,4C16.995,3.448 17.443,3 17.995,3H18.005C18.557,3 19.005,3.448 19.005,4C19.005,4.552 18.557,5 18.005,5H17.995C17.443,5 16.995,4.552 16.995,4ZM19.995,4C19.995,3.448 20.443,3 20.995,3H21C21.552,3 22,3.448 22,4C22,4.552 21.552,5 21,5H20.995C20.443,5 19.995,4.552 19.995,4Z"
+      android:fillColor="#17191C"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M2,10C2,9.448 2.448,9 3,9H16C16.552,9 17,9.448 17,10C17,10.552 16.552,11 16,11H3C2.448,11 2,10.552 2,10Z"
+      android:fillColor="#17191C"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M2,14C2,13.448 2.448,13 3,13H11C11.552,13 12,13.448 12,14C12,14.552 11.552,15 11,15H3C2.448,15 2,14.552 2,14Z"
+      android:fillColor="#17191C"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M2,20C2,19.448 2.448,19 3,19H3.005C3.557,19 4.005,19.448 4.005,20C4.005,20.552 3.557,21 3.005,21H3C2.448,21 2,20.552 2,20ZM4.995,20C4.995,19.448 5.443,19 5.995,19H6.005C6.557,19 7.005,19.448 7.005,20C7.005,20.552 6.557,21 6.005,21H5.995C5.443,21 4.995,20.552 4.995,20ZM7.995,20C7.995,19.448 8.443,19 8.995,19H9.005C9.557,19 10.005,19.448 10.005,20C10.005,20.552 9.557,21 9.005,21H8.995C8.443,21 7.995,20.552 7.995,20ZM10.995,20C10.995,19.448 11.443,19 11.995,19H12.005C12.557,19 13.005,19.448 13.005,20C13.005,20.552 12.557,21 12.005,21H11.995C11.443,21 10.995,20.552 10.995,20ZM13.995,20C13.995,19.448 14.443,19 14.995,19H15.005C15.557,19 16.005,19.448 16.005,20C16.005,20.552 15.557,21 15.005,21H14.995C14.443,21 13.995,20.552 13.995,20ZM16.995,20C16.995,19.448 17.443,19 17.995,19H18.005C18.557,19 19.005,19.448 19.005,20C19.005,20.552 18.557,21 18.005,21H17.995C17.443,21 16.995,20.552 16.995,20ZM19.995,20C19.995,19.448 20.443,19 20.995,19H21C21.552,19 22,19.448 22,20C22,20.552 21.552,21 21,21H20.995C20.443,21 19.995,20.552 19.995,20Z"
+      android:fillColor="#17191C"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/vector/src/main/res/layout/bottom_sheet_bootstrap.xml b/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
index c3fa9d2931..be209c2dd4 100644
--- a/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
+++ b/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
@@ -25,7 +25,8 @@
             android:scaleType="fitCenter"
             android:src="@drawable/ic_security_key_24dp"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toTopOf="@id/bootstrapTitleText"
+            app:layout_constraintBottom_toBottomOf="@id/bootstrapTitleText"
             app:tint="?vctr_content_primary"
             tools:ignore="MissingPrefix" />
 
@@ -36,13 +37,13 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
+            android:layout_marginTop="16dp"
             android:ellipsize="end"
             android:textColor="?vctr_content_primary"
             android:textStyle="bold"
-            app:layout_constraintBottom_toBottomOf="@id/bootstrapIcon"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/bootstrapIcon"
-            app:layout_constraintTop_toTopOf="@id/bootstrapIcon"
+            app:layout_constraintTop_toTopOf="parent"
             tools:text="@string/bottom_sheet_setup_secure_backup_title" />
 
         <androidx.fragment.app.FragmentContainerView
diff --git a/vector/src/main/res/layout/fragment_ftue_combined_login.xml b/vector/src/main/res/layout/fragment_ftue_combined_login.xml
new file mode 100644
index 0000000000..1b65056e9f
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_ftue_combined_login.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    style="@style/LoginFormScrollView"
+    android:layout_height="match_parent"
+    android:background="?android:colorBackground"
+    android:fillViewport="true"
+    android:paddingTop="0dp"
+    android:paddingBottom="0dp">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/loginRoot"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/loginGutterStart"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            app:layout_constraintGuide_percent="@dimen/ftue_auth_gutter_start_percent" />
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/loginGutterEnd"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            app:layout_constraintGuide_percent="@dimen/ftue_auth_gutter_end_percent" />
+
+        <Space
+            android:id="@+id/headerSpacing"
+            android:layout_width="match_parent"
+            android:layout_height="52dp"
+            app:layout_constraintBottom_toTopOf="@id/loginHeaderTitle"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0"
+            app:layout_constraintVertical_chainStyle="packed" />
+
+        <TextView
+            android:id="@+id/loginHeaderTitle"
+            style="@style/Widget.Vector.TextView.Title.Medium"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:text="@string/ftue_auth_welcome_back_title"
+            android:textColor="?vctr_content_primary"
+            app:layout_constraintBottom_toTopOf="@id/titleContentSpacing"
+            app:layout_constraintEnd_toEndOf="@id/loginGutterEnd"
+            app:layout_constraintStart_toStartOf="@id/loginGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/headerSpacing" />
+
+        <Space
+            android:id="@+id/titleContentSpacing"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toTopOf="@id/chooseYourServerHeader"
+            app:layout_constraintHeight_percent="0.03"
+            app:layout_constraintTop_toBottomOf="@id/loginHeaderTitle" />
+
+        <TextView
+            android:id="@+id/chooseYourServerHeader"
+            style="@style/Widget.Vector.TextView.Caption"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="12dp"
+            android:layout_marginTop="4dp"
+            android:text="@string/ftue_auth_create_account_choose_server_header"
+            android:textColor="?vctr_content_secondary"
+            app:layout_constraintBottom_toTopOf="@id/selectedServerName"
+            app:layout_constraintEnd_toStartOf="@id/editServerButton"
+            app:layout_constraintStart_toStartOf="@id/loginGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/titleContentSpacing" />
+
+        <TextView
+            android:id="@+id/selectedServerName"
+            style="@style/Widget.Vector.TextView.Subtitle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="12dp"
+            android:textColor="?vctr_content_primary"
+            app:layout_constraintBottom_toTopOf="@id/selectedServerDescription"
+            app:layout_constraintEnd_toStartOf="@id/editServerButton"
+            app:layout_constraintStart_toStartOf="@id/loginGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/chooseYourServerHeader" />
+
+        <TextView
+            android:id="@+id/selectedServerDescription"
+            style="@style/Widget.Vector.TextView.Micro"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="12dp"
+            android:textColor="?vctr_content_tertiary"
+            app:layout_constraintBottom_toTopOf="@id/serverSelectionSpacing"
+            app:layout_constraintEnd_toStartOf="@id/editServerButton"
+            app:layout_constraintStart_toStartOf="@id/loginGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/selectedServerName" />
+
+        <Button
+            android:id="@+id/editServerButton"
+            style="@style/Widget.Vector.Button.Outlined"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minWidth="0dp"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            android:text="@string/ftue_auth_create_account_edit_server_selection"
+            android:textAllCaps="true"
+            app:layout_constraintBottom_toBottomOf="@id/selectedServerDescription"
+            app:layout_constraintEnd_toEndOf="@id/loginGutterEnd"
+            app:layout_constraintTop_toTopOf="@id/chooseYourServerHeader" />
+
+        <Space
+            android:id="@+id/serverSelectionSpacing"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toTopOf="@id/loginInput"
+            app:layout_constraintHeight_percent="0.05"
+            app:layout_constraintTop_toBottomOf="@id/selectedServerDescription" />
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:background="?vctr_content_quaternary"
+            app:layout_constraintBottom_toBottomOf="@id/serverSelectionSpacing"
+            app:layout_constraintEnd_toEndOf="@id/loginGutterEnd"
+            app:layout_constraintStart_toStartOf="@id/loginGutterStart"
+            app:layout_constraintTop_toTopOf="@id/serverSelectionSpacing" />
+
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/loginEntryGroup"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="visible"
+            app:constraint_referenced_ids="loginInput,loginPasswordInput,entrySpacing,actionSpacing,loginSubmit" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/loginInput"
+            style="@style/Widget.Vector.TextInputLayout.Username"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:hint="@string/username"
+            app:layout_constraintBottom_toTopOf="@id/entrySpacing"
+            app:layout_constraintEnd_toEndOf="@id/loginGutterEnd"
+            app:layout_constraintStart_toStartOf="@id/loginGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/serverSelectionSpacing">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:imeOptions="actionNext"
+                android:inputType="text"
+                android:maxLines="1"
+                android:nextFocusForward="@id/loginPasswordInput" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <Space
+            android:id="@+id/entrySpacing"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toTopOf="@id/loginPasswordInput"
+            app:layout_constraintHeight_percent="0.03"
+            app:layout_constraintTop_toBottomOf="@id/loginInput" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/loginPasswordInput"
+            style="@style/Widget.Vector.TextInputLayout.Password"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:hint="@string/login_signup_password_hint"
+            app:layout_constraintBottom_toTopOf="@id/actionSpacing"
+            app:layout_constraintEnd_toEndOf="@id/loginGutterEnd"
+            app:layout_constraintStart_toStartOf="@id/loginGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/entrySpacing">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:imeOptions="actionDone"
+                android:inputType="textPassword"
+                android:maxLines="1" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <Space
+            android:id="@+id/actionSpacing"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toTopOf="@id/loginSubmit"
+            app:layout_constraintHeight_percent="0.02"
+            app:layout_constraintTop_toBottomOf="@id/loginPasswordInput" />
+
+        <Button
+            android:id="@+id/loginSubmit"
+            style="@style/Widget.Vector.Button.Login"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="@string/login_signup_submit"
+            android:textAllCaps="true"
+            app:layout_constraintBottom_toTopOf="@id/ssoButtonsHeader"
+            app:layout_constraintEnd_toEndOf="@id/loginGutterEnd"
+            app:layout_constraintStart_toStartOf="@id/loginGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/actionSpacing" />
+
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/ssoGroup"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            app:constraint_referenced_ids="ssoButtonsHeader,ssoButtons"
+            app:layout_constraintBottom_toTopOf="@id/ssoButtonsHeader"
+            app:layout_constraintTop_toBottomOf="@id/loginSubmit"
+            tools:visibility="visible" />
+
+        <TextView
+            android:id="@+id/ssoButtonsHeader"
+            style="@style/Widget.Vector.TextView.Subtitle.Medium"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp"
+            android:text="@string/ftue_auth_create_account_sso_section_header"
+            android:textColor="?vctr_content_secondary"
+            app:layout_constraintBottom_toTopOf="@id/ssoButtons"
+            app:layout_constraintEnd_toEndOf="@id/loginGutterEnd"
+            app:layout_constraintStart_toStartOf="@id/loginGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/loginSubmit" />
+
+        <im.vector.app.features.login.SocialLoginButtonsView
+            android:id="@+id/ssoButtons"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="16dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="@id/loginGutterEnd"
+            app:layout_constraintStart_toStartOf="@id/loginGutterStart"
+            app:layout_constraintTop_toBottomOf="@id/ssoButtonsHeader"
+            tools:signMode="signup" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.core.widget.NestedScrollView>
diff --git a/vector/src/main/res/layout/fragment_home_detail.xml b/vector/src/main/res/layout/fragment_home_detail.xml
index a53f001125..e3db68434e 100644
--- a/vector/src/main/res/layout/fragment_home_detail.xml
+++ b/vector/src/main/res/layout/fragment_home_detail.xml
@@ -153,4 +153,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:menu="@menu/home_bottom_navigation" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_location_live_map_view.xml b/vector/src/main/res/layout/fragment_location_live_map_view.xml
new file mode 100644
index 0000000000..9b576c6485
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_location_live_map_view.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/bg_live_location_users_bottom_sheet">
+
+    <FrameLayout
+        android:id="@+id/liveLocationMapFragmentContainer"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/bottomSheet"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/bg_live_location_users_bottom_sheet"
+        app:behavior_peekHeight="200dp"
+        app:behavior_hideable="false"
+        app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
+
+        <View
+            android:id="@+id/liveLocationMapBottomSheetHandle"
+            android:layout_width="36dp"
+            android:layout_height="6dp"
+            android:layout_marginTop="12dp"
+            android:background="@drawable/ic_bottom_sheet_handle"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/liveLocationBottomSheetRecyclerView"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginTop="8dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/liveLocationMapBottomSheetHandle"
+            tools:listitem="@layout/item_live_location_users_bottom_sheet" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/vector/src/main/res/layout/item_live_location_users_bottom_sheet.xml b/vector/src/main/res/layout/item_live_location_users_bottom_sheet.xml
new file mode 100644
index 0000000000..73023ceae5
--- /dev/null
+++ b/vector/src/main/res/layout/item_live_location_users_bottom_sheet.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="80dp"
+    android:background="?selectableItemBackground">
+
+    <ImageView
+        android:id="@+id/itemUserAvatarImageView"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="12dp"
+        android:importantForAccessibility="no"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@sample/user_round_avatars" />
+
+    <TextView
+        android:id="@+id/itemUserDisplayNameTextView"
+        style="@style/TextAppearance.Vector.Body.BottomSheetDisplayName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        app:layout_constraintStart_toEndOf="@id/itemUserAvatarImageView"
+        app:layout_constraintTop_toTopOf="@id/itemUserAvatarImageView"
+        tools:text="@sample/live_location_users.json/data/displayName" />
+
+    <TextView
+        android:id="@+id/itemRemainingTimeTextView"
+        style="@style/TextAppearance.Vector.Body.BottomSheetRemainingTime"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        app:layout_constraintStart_toStartOf="@id/itemUserDisplayNameTextView"
+        app:layout_constraintTop_toBottomOf="@id/itemUserDisplayNameTextView"
+        tools:text="@sample/live_location_users.json/data/remainingTime" />
+
+    <TextView
+        android:id="@+id/itemLastUpdatedAtTextView"
+        style="@style/TextAppearance.Vector.Body.BottomSheetLastUpdatedAt"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        app:layout_constraintStart_toStartOf="@id/itemRemainingTimeTextView"
+        app:layout_constraintTop_toBottomOf="@id/itemRemainingTimeTextView"
+        tools:text="@sample/live_location_users.json/data/lastUpdatedAt" />
+
+    <Button
+        android:id="@+id/itemStopSharingButton"
+        style="@style/Widget.Vector.Button.Text.BottomSheetStopSharing"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:text="@string/live_location_bottom_sheet_stop_sharing"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml
index 2b27cb8efe..ab0af18acb 100644
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@@ -183,7 +183,7 @@
         tools:text="@tools:sample/date/hhmm" />
 
     <TextView
-        android:id="@+id/roomLastEventView"
+        android:id="@+id/subtitleView"
         style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -213,7 +213,8 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@id/roomNameView"
         app:layout_constraintTop_toBottomOf="@id/roomNameView"
-        tools:text="Alice is typing…" />
+        tools:text="Alice is typing…"
+        tools:visibility="gone" />
 
     <!-- Margin bottom does not work, so I use space -->
     <Space
@@ -221,7 +222,7 @@
         android:layout_width="0dp"
         android:layout_height="7dp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/roomLastEventView"
+        app:layout_constraintTop_toBottomOf="@id/subtitleView"
         tools:layout_marginStart="120dp" />
 
     <androidx.constraintlayout.widget.Barrier
diff --git a/vector/src/main/res/layout/item_room_centered.xml b/vector/src/main/res/layout/item_room_centered.xml
new file mode 100644
index 0000000000..32e7111507
--- /dev/null
+++ b/vector/src/main/res/layout/item_room_centered.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/itemRoomLayout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:colorBackground"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="?attr/selectableItemBackground"
+    tools:viewBindingIgnore="true">
+
+    <FrameLayout
+        android:id="@+id/roomAvatarContainer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="12dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/roomAvatarImageView"
+            android:layout_width="56dp"
+            android:layout_height="56dp"
+            android:importantForAccessibility="no"
+            tools:src="@sample/room_round_avatars" />
+
+        <ImageView
+            android:id="@+id/roomAvatarCheckedImageView"
+            android:layout_width="56dp"
+            android:layout_height="56dp"
+            android:contentDescription="@string/a11y_checked"
+            android:scaleType="centerInside"
+            android:src="@drawable/ic_material_done"
+            app:tint="@android:color/white"
+            tools:ignore="MissingPrefix" />
+
+    </FrameLayout>
+
+    <ImageView
+        android:id="@+id/roomAvatarFailSendingImageView"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:contentDescription="@string/a11y_error_some_message_not_sent"
+        android:src="@drawable/ic_warning_badge"
+        app:layout_constraintCircle="@id/roomAvatarContainer"
+        app:layout_constraintCircleAngle="45"
+        app:layout_constraintCircleRadius="30dp"
+        tools:ignore="MissingConstraints" />
+
+    <!-- Note: this is always gone now -->
+    <im.vector.app.core.ui.views.ShieldImageView
+        android:id="@+id/roomAvatarDecorationImageView"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        app:layout_constraintCircle="@id/roomAvatarContainer"
+        app:layout_constraintCircleAngle="135"
+        app:layout_constraintCircleRadius="28dp"
+        tools:ignore="MissingConstraints"
+        tools:visibility="gone" />
+
+    <ImageView
+        android:id="@+id/roomAvatarPublicDecorationImageView"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:background="@drawable/background_circle"
+        android:contentDescription="@string/a11y_public_room"
+        android:padding="2dp"
+        android:src="@drawable/ic_public_room"
+        android:visibility="gone"
+        app:layout_constraintCircle="@id/roomAvatarContainer"
+        app:layout_constraintCircleAngle="135"
+        app:layout_constraintCircleRadius="28dp"
+        tools:ignore="MissingConstraints"
+        tools:visibility="visible" />
+
+    <im.vector.app.core.ui.views.PresenceStateImageView
+        android:id="@+id/roomAvatarPresenceImageView"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:background="@drawable/background_circle"
+        android:importantForAccessibility="no"
+        android:padding="2dp"
+        android:visibility="gone"
+        app:layout_constraintCircle="@id/roomAvatarContainer"
+        app:layout_constraintCircleAngle="135"
+        app:layout_constraintCircleRadius="28dp"
+        tools:ignore="MissingConstraints"
+        tools:layout_constraintCircleRadius="8dp"
+        tools:src="@drawable/ic_presence_offline"
+        tools:visibility="visible" />
+
+    <!-- Margin bottom does not work, so I use space -->
+    <Space
+        android:id="@+id/roomAvatarBottomSpace"
+        android:layout_width="0dp"
+        android:layout_height="12dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/roomAvatarContainer"
+        tools:layout_marginStart="20dp" />
+
+    <TextView
+        android:id="@+id/roomNameView"
+        style="@style/Widget.Vector.TextView.Subtitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:layout_marginEnd="8dp"
+        android:duplicateParentState="true"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?vctr_content_primary"
+        android:textStyle="bold"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toEndOf="@id/roomAvatarContainer"
+        app:layout_constraintTop_toTopOf="@id/roomAvatarContainer"
+        app:layout_constraintBottom_toBottomOf="@id/roomAvatarContainer"
+        tools:text="@sample/users.json/data/displayName" />
+
+    <TextView
+        android:id="@+id/roomTypingView"
+        style="@style/Widget.Vector.TextView.Body"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="3dp"
+        android:layout_marginEnd="8dp"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:textAlignment="viewStart"
+        android:textColor="?colorPrimary"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@id/roomNameView"
+        app:layout_constraintTop_toBottomOf="@id/roomNameView"
+        tools:text="Alice is typing…"
+        tools:visibility="gone" />
+
+    <!-- We use vctr_list_separator_system here for a better rendering -->
+    <View
+        android:id="@+id/roomDividerView"
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:background="?vctr_list_separator_system"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/view_read_receipts.xml b/vector/src/main/res/layout/view_read_receipts.xml
index 907f1ec0e3..6203161de0 100644
--- a/vector/src/main/res/layout/view_read_receipts.xml
+++ b/vector/src/main/res/layout/view_read_receipts.xml
@@ -3,11 +3,12 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:gravity="end"
     tools:parentTag="android.widget.LinearLayout">
 
     <TextView
         android:id="@+id/receiptMore"
-        style="@style/Widget.Vector.TextView.Caption"
+        style="@style/TimelineFixedSizeCaptionStyle"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/item_event_message_state_size"
         android:background="@drawable/pill_receipt"
@@ -18,53 +19,40 @@
         android:textColor="?vctr_content_primary"
         tools:text="999+" />
 
-    <ImageView
-        android:id="@+id/receiptAvatar5"
-        android:layout_width="@dimen/item_event_message_state_size"
-        android:layout_height="@dimen/item_event_message_state_size"
-        android:layout_marginStart="2dp"
-        android:adjustViewBounds="true"
-        android:importantForAccessibility="no"
-        android:scaleType="centerCrop"
-        tools:src="@sample/user_round_avatars" />
-
-    <ImageView
-        android:id="@+id/receiptAvatar4"
-        android:layout_width="@dimen/item_event_message_state_size"
-        android:layout_height="@dimen/item_event_message_state_size"
-        android:layout_marginStart="2dp"
-        android:adjustViewBounds="true"
-        android:importantForAccessibility="no"
-        android:scaleType="centerCrop"
-        tools:src="@sample/user_round_avatars" />
-
     <ImageView
         android:id="@+id/receiptAvatar3"
         android:layout_width="@dimen/item_event_message_state_size"
         android:layout_height="@dimen/item_event_message_state_size"
         android:layout_marginStart="2dp"
+        android:layout_marginEnd="-6dp"
         android:adjustViewBounds="true"
         android:importantForAccessibility="no"
+        android:padding="1dp"
         android:scaleType="centerCrop"
+        tools:ignore="NegativeMargin"
         tools:src="@sample/user_round_avatars" />
 
     <ImageView
         android:id="@+id/receiptAvatar2"
         android:layout_width="@dimen/item_event_message_state_size"
         android:layout_height="@dimen/item_event_message_state_size"
-        android:layout_marginStart="2dp"
+        android:layout_marginEnd="-6dp"
         android:adjustViewBounds="true"
+        android:background="@drawable/pill_receipt"
         android:importantForAccessibility="no"
+        android:padding="1dp"
         android:scaleType="centerCrop"
+        tools:ignore="NegativeMargin"
         tools:src="@sample/user_round_avatars" />
 
     <ImageView
         android:id="@+id/receiptAvatar1"
         android:layout_width="@dimen/item_event_message_state_size"
         android:layout_height="@dimen/item_event_message_state_size"
-        android:layout_marginStart="2dp"
         android:adjustViewBounds="true"
+        android:background="@drawable/pill_receipt"
         android:importantForAccessibility="no"
+        android:padding="1dp"
         android:scaleType="centerCrop"
         tools:src="@sample/user_round_avatars" />
 
diff --git a/vector/src/main/res/menu/menu_timeline.xml b/vector/src/main/res/menu/menu_timeline.xml
index 8b1ea02a4a..5c35540932 100644
--- a/vector/src/main/res/menu/menu_timeline.xml
+++ b/vector/src/main/res/menu/menu_timeline.xml
@@ -72,7 +72,7 @@
 
     <item
         android:id="@+id/menu_thread_timeline_view_in_room"
-        android:icon="@drawable/ic_thread_view_in_room_menu_item"
+        android:icon="@drawable/ic_threads_view_in_room_24"
         android:title="@string/action_thread_view_in_room"
         app:iconTint="?vctr_content_secondary"
         app:showAsAction="withText" />
diff --git a/vector/src/main/res/values-ar/strings.xml b/vector/src/main/res/values-ar/strings.xml
index 9e5e7025da..9c436d24f0 100644
--- a/vector/src/main/res/values-ar/strings.xml
+++ b/vector/src/main/res/values-ar/strings.xml
@@ -265,7 +265,7 @@
     <string name="settings_app_info_link_title">معلومات التطبيق</string>
     <string name="settings_notification_ringtone">صوت الإخطارات</string>
     <string name="settings_containing_my_display_name">الرسائل التي فيها اسم العرض</string>
-    <string name="settings_containing_my_user_name">الرسائل التي فيها اسم المستخدم</string>
+    <string name="settings_containing_my_user_name">الرسائل التي تحوي اسم مستخدمي</string>
     <string name="settings_messages_in_one_to_one">الرسائل في محادثات الطرفين</string>
     <string name="settings_messages_in_group_chat">الرسائل في دردشات المجموعات</string>
     <string name="settings_invited_to_room">عندما أُدعى إلى غرفة ما</string>
@@ -1138,4 +1138,34 @@
     <string name="room_widget_permission_avatar_url">رابط صورتك الرمزية</string>
     <string name="room_widget_permission_display_name">اسمك العلني</string>
     <string name="room_widget_open_in_browser">افتح في المتصفح</string>
-</resources>
+    <string name="tooltip_attachment_contact">فتح جهات الإتصال</string>
+    <string name="tooltip_attachment_poll">إنشَاء اِسْتِطْلاعٌ</string>
+    <string name="location_share_external">اِفْتَحه بواسطة</string>
+    <string name="poll_type_title">نَوْعُ الاِسْتِطْلاع</string>
+    <string name="open_poll_option_title">اِفْتَحْ الاِسْتِطْلاع</string>
+    <string name="a11y_static_map_image">الخَرِيطَة</string>
+    <string name="location_activity_title_preview">المَوْقِع</string>
+    <string name="location_share_option_pinned">شارك هذا الموقع</string>
+    <string name="location_timeline_failed_to_load_map">فَشِلَ تحميل الخريطة</string>
+    <string name="user_directory_search_hint_2">ابحث باسم المستخدم، أو الهوية (ID) أو البريد</string>
+    <string name="settings_background_fdroid_sync_mode_disabled">لا توجد مزامنة في الخلفية</string>
+    <string name="settings_room_invitations">دعوات الغُرف</string>
+    <string name="settings_background_fdroid_sync_mode_battery">الأمثل للبطارية</string>
+    <string name="settings_messages_at_room">الرسائل التي تحتوي على @room</string>
+    <string name="room_unsupported_e2e_algorithm_as_admin">هُيِئَتْ التَعْمِيَةُ بشَكَلٍ خَاطِئ لِذَا لا تَسْتَطِيعُ إرْسَال الرَسَائِل. اُنْقُرْ لِفَتْحِ الإعدَادَات.</string>
+    <string name="login_error_homeserver_from_url_not_found_enter_manual">اِخْتَرْ خَادِمًا رَّئِيسِيًا</string>
+    <string name="encryption_information_unknown_ip">عنوان ip مجهول</string>
+    <string name="directory_add_a_new_server">أَضِفْ خَادِمًا جَدِيدًا</string>
+    <string name="notification_new_messages">رَسَائِلُ جَدِيدةٌ</string>
+    <string name="notification_unknown_room_name">غُرفة</string>
+    <string name="notification_unread_notified_messages_and_invitation">%1$s و%2$s</string>
+    <string name="notification_unread_notified_messages_in_room_and_invitation">%1$s فِي %2$s و%3$s</string>
+    <string name="directory_your_server">خَادِمُك</string>
+    <string name="call_stop_screen_sharing">وَقَّفْ مشاركة الشاشة</string>
+    <string name="call_start_screen_sharing">شارك الشاشة</string>
+    <string name="settings_room_directory_show_all_rooms">عرض الغُرف ذات المحتوى الواضح</string>
+    <string name="initial_sync_request_reason_unignored_users">أُلْغِيَ تجاهل بعض المستخدمين</string>
+    <string name="initial_sync_request_title">طَلَبُ مُزامَنة أوَّلِيّ</string>
+    <string name="a11y_public_room">غُرفة عامة</string>
+    <string name="a11y_video">تسجيل مرئيّ</string>
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-ca/strings.xml b/vector/src/main/res/values-ca/strings.xml
index 157396781a..6f5e318be0 100644
--- a/vector/src/main/res/values-ca/strings.xml
+++ b/vector/src/main/res/values-ca/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="notice_room_leave">%1$s ha marxat de la sala</string>
     <string name="notice_room_join">%1$s s\'ha unit a la sala</string>
     <string name="medium_phone_number">Número de telèfon</string>
@@ -10,7 +10,7 @@
     <string name="notice_room_reject">%1$s ha rebutjat la invitació</string>
     <string name="notice_room_remove">%1$s ha expulsat %2$s</string>
     <string name="notice_display_name_changed_from">%1$s ha canviat el seu àlies de %2$s a %3$s</string>
-    <string name="notice_display_name_removed">%1$s ha eliminat el àlies (era %2$s)</string>
+    <string name="notice_display_name_removed">%1$s ha eliminat l\'àlies (era %2$s)</string>
     <string name="notice_room_topic_changed">%1$s ha canviat el tema a: %2$s</string>
     <string name="notice_room_name_changed">%1$s ha canviat el nom de la sala a: %2$s</string>
     <string name="notice_answered_call">%s ha respost a la trucada.</string>
@@ -36,7 +36,7 @@
     <string name="notice_display_name_set">%1$s a canviat el seu àlies a %2$s</string>
     <string name="notice_placed_video_call">%s ha realitzat una videotrucada.</string>
     <string name="notice_placed_voice_call">%s ha realitzat una trucada de veu.</string>
-    <string name="room_displayname_room_invite">Convida a la sala</string>
+    <string name="room_displayname_room_invite">Invitació de sala</string>
     <string name="room_displayname_two_members">%1$s i %2$s</string>
     <string name="room_displayname_empty_room">Sala buida</string>
     <string name="notice_direct_room_update">%s s\'ha actualitzat aquí.</string>
@@ -333,7 +333,7 @@
     <string name="room_jump_to_first_unread">Vés fins al primer no llegit</string>
     <string name="room_participants_leave_prompt_title">Marxa de la sala</string>
     <string name="room_participants_leave_prompt_msg">Estàs segur que vols marxar de la sala\?</string>
-    <string name="room_participants_header_direct_chats">Xats personals</string>
+    <string name="room_participants_header_direct_chats">Xats directes</string>
     <string name="room_participants_action_invite">Convida</string>
     <string name="room_participants_action_ban">Veta</string>
     <string name="room_participants_action_unban">Treu el vet</string>
@@ -505,7 +505,7 @@
     <string name="create">Crea</string>
     <string name="group_details_home">Inici</string>
     <string name="rooms">Sales</string>
-    <string name="invited">Ha sigut convidat</string>
+    <string name="invited">Convidat</string>
     <string name="has_been_removed">%2$s t\'ha expulsat de %1$s</string>
     <string name="has_been_banned">%2$s l\'ha expulsat de la sala %1$s</string>
     <string name="reason_colon">Raó: %1$s</string>
@@ -617,7 +617,7 @@
     <string name="settings_show_join_leave_messages_summary">No afecta a invitacions, expulsions i vetos.</string>
     <string name="settings_show_avatar_display_name_changes_messages">Mostra els esdeveniments del compte</string>
     <string name="auth_accept_policies">Reviseu i accepteu les polítiques d\'aquest servidor base:</string>
-    <string name="video_call_in_progress">Videotrucada en procés…</string>
+    <string name="video_call_in_progress">Videotrucada en curs…</string>
     <string name="settings_troubleshoot_diagnostic_run_button_title">Executa les proves</string>
     <string name="settings_troubleshoot_diagnostic_running_status">S\'està executant… (%1$d de %2$d)</string>
     <string name="settings_troubleshoot_diagnostic_success_status">El diagnòstic bàsic és correcte. Si encara no reps notificacions, envia un informe d\'errors per ajudar-nos a investigar-ho.</string>
@@ -846,7 +846,7 @@
     <string name="keys_backup_setup_override_backup_prompt_tile">Ja existeix una còpia de seguretat al teu servidor</string>
     <string name="keys_backup_setup_override_backup_prompt_description">Sembla que ja has configurat una còpia de seguretat de claus des d\'una altra sessió. Vols reemplaçar-la amb la que estàs creant\?</string>
     <string name="keys_backup_setup_override_replace">Reemplaçar</string>
-    <string name="keys_backup_setup_override_stop">Aturar</string>
+    <string name="keys_backup_setup_override_stop">Atura</string>
     <string name="keys_backup_settings_checking_backup_state">Comprovant l\'estat de la còpia de seguretat</string>
     <string name="sas_verified">Verificat!</string>
     <string name="sas_got_it">Entesos</string>
@@ -880,7 +880,7 @@
     <string name="group_all_communities">Totes les comunitats</string>
     <string name="room_preview_no_preview">Aquesta sala no es pot pre-visualitzar</string>
     <string name="fab_menu_create_room">Sales</string>
-    <string name="fab_menu_create_chat">Xats personals</string>
+    <string name="fab_menu_create_chat">Xats directes</string>
     <string name="create_room_action_create">CREAR</string>
     <string name="create_room_name_hint">Nom</string>
     <string name="create_room_public_title">Públic</string>
@@ -912,7 +912,7 @@
     <string name="delete_event_dialog_content">Estàs segur que vols eliminar aquest esdeveniment\? Tingues en compte que, si suprimeixes un nom de sala o es canvia el tema, es podria revertir el canvi.</string>
     <string name="room_settings_enable_encryption_dialog_content">Una vegada activat, el xifrat d\'una sala no es pot desactivar. El servidor no pot llegir els missatges enviats en una sala xifrada, només els poden llegir els participants. L\'activació del xifrat pot fer que molts bots i enllaços no funcionin correctament.</string>
     <string name="room_profile_section_more_notifications">Notificacions</string>
-    <string name="direct_room_profile_not_encrypted_subtitle">Els missatges aquí NO estan xifrats d\'extrem a extrem.</string>
+    <string name="direct_room_profile_not_encrypted_subtitle">Els missatges d\'aquí NO estan xifrats d\'extrem a extrem.</string>
     <string name="room_profile_not_encrypted_subtitle">Els missatges d\'aquesta sala NO estan encriptats d\'extrem a extrem.</string>
     <string name="create_room_encryption_description">Una vegada activat, el xifrat no es pot desactivar.</string>
     <string name="login_reset_password_warning_content">Si canvies la contrasenya es restabliran les claus de xifrat d\'extrem a extrem de totes les teves sessions de manera que l\'històric del xat no es podrà llegir. Fes una còpia de seguretat de les claus o exporta les teves claus de sala d\'una altra sessió abans de fer el canvi de contrasenya.</string>
@@ -1057,15 +1057,15 @@
     <string name="login_splash_title">Aquest xat és teu. Apropia-te\'n.</string>
     <string name="room_filtering_filter_hint">Filtra xats…</string>
     <string name="this_is_the_beginning_of_dm">Inici de l\'històric del xat personal amb %s.</string>
-    <string name="settings_hs_admin_e2e_disabled">L\'administrador del servidor ha desactivat el xifrat d\'extrem a extrem per defecte en sales privades i xats personals.</string>
+    <string name="settings_hs_admin_e2e_disabled">L\'administrador del servidor ha desactivat el xifrat d\'extrem a extrem per defecte en sales privades i en xats directes.</string>
     <string name="room_member_open_or_create_dm">Xat personal</string>
-    <string name="direct_room_profile_encrypted_subtitle">Els missatges aquí estan xifrats d\'extrem a extrem.
+    <string name="direct_room_profile_encrypted_subtitle">Els missatges d\'aquí estan xifrats d\'extrem a extrem.
 \n
-\nEls missatges estan protegits i només tu i el destinatari teniu les úniques claus per poder desxifrar-los.</string>
+\nEls missatges estan protegits i només tu i el destinatari teniu les claus úniques per poder desxifrar-los.</string>
     <string name="a11y_create_direct_message">Crea un nou xat personal</string>
     <string name="room_filtering_footer_create_new_direct_message">Envia un nou missatge</string>
-    <string name="bottom_action_people_x">Xats personals</string>
-    <string name="direct_room_encryption_enabled_tile_description">Els missatges en aquesta sala estan xifrats d\'extrem a extrem.</string>
+    <string name="bottom_action_people_x">Xats directes</string>
+    <string name="direct_room_encryption_enabled_tile_description">Els missatges d\'aquesta sala estan xifrats d\'extrem a extrem.</string>
     <string name="settings_labs_show_hidden_events_in_timeline">Mostra els esdeveniments amagats a la cronologia</string>
     <string name="send_suggestion_failed">No s\'ha pogut enviat el suggeriment (%s)</string>
     <string name="send_suggestion_sent">Gràcies, el suggeriment s\'ha enviat correctament</string>
@@ -1185,7 +1185,7 @@
     <string name="room_permissions_ban_users">Vetar usuaris</string>
     <string name="room_permissions_remove_users">Expulsar usuaris</string>
     <string name="room_permissions_change_settings">Canviar la configuració</string>
-    <string name="room_permissions_invite_users">Convidar usuaris</string>
+    <string name="room_permissions_invite_users">Convida usuaris</string>
     <string name="room_permissions_send_messages">Enviar missatges</string>
     <string name="room_permissions_default_role">Rol predeterminat</string>
     <string name="room_permissions_notice_read_only">No tens permisos per modificar els rols necessaris per canviar les diferents parts de la sala</string>
@@ -1290,9 +1290,9 @@
     <string name="bootstrap_dont_reuse_pwd">No utilitzis la contrasenya del teu compte.</string>
     <string name="bootstrap_crosssigning_save_usb">Desa-ho en una clau USB o una unitat de seguretat</string>
     <string name="bootstrap_crosssigning_save_cloud">Copia-ho al teu emmagatzematge al núvol</string>
-    <string name="bootstrap_crosssigning_progress_save_usk">Sincronitzant la clau d\'usuari</string>
-    <string name="bootstrap_crosssigning_progress_save_ssk">Sincronitzant la clau d\'autosignatura</string>
-    <string name="bootstrap_crosssigning_progress_save_msk">Sincronitzant la clau mestra</string>
+    <string name="bootstrap_crosssigning_progress_save_usk">Sincronitzant clau d\'usuari</string>
+    <string name="bootstrap_crosssigning_progress_save_ssk">Sincronitzant clau d\'autosignatura</string>
+    <string name="bootstrap_crosssigning_progress_save_msk">Sincronitzant clau mestra</string>
     <string name="bootstrap_crosssigning_progress_pbkdf2">Generant clau segura a partir de la frase</string>
     <string name="bootstrap_crosssigning_progress_key_backup">Configurant còpia de seguretat de les claus</string>
     <string name="bootstrap_crosssigning_progress_initializing">Publicant claus d\'identitat creades</string>
@@ -1633,9 +1633,9 @@
     <string name="user_code_info_text">Comparteix aquest codi amb la gent perquè puguin escanejar-lo, afegir-te i començar a xatejar amb tu.</string>
     <string name="identity_server_user_consent_not_provided">L\'usuari no s\'ha acceptat el consentiment.</string>
     <string name="command_confetti">Envia el missatge proporcionat amb confetis</string>
-    <string name="command_snow">Envia el missatge proporcionat nevant</string>
-    <string name="default_message_emote_confetti">envia confetis 🎉</string>
-    <string name="default_message_emote_snow">envia una nevada❄️</string>
+    <string name="command_snow">Envia el missatge proporcionat amb una nevada</string>
+    <string name="default_message_emote_confetti">ha enviat confetis 🎉</string>
+    <string name="default_message_emote_snow">ha enviat una nevada ❄️</string>
     <string name="user_code_my_code">El meu codi</string>
     <string name="user_code_share">Comparteix el meu codi</string>
     <string name="user_code_scan">Escaneja un codi QR</string>
@@ -1651,8 +1651,8 @@
     <string name="room_settings_enable_encryption_no_permission">No tens permís per activar el xifrat en aquesta sala.</string>
     <string name="room_settings_enable_encryption">Activa el xifrat d\'extrem a extrem…</string>
     <string name="settings_category_composer">Editor de missatges</string>
-    <string name="command_description_rainbow_emote">Envia l\'emoticona proporcionat pintat amb un arc de Sant Martí</string>
-    <string name="command_description_rainbow">Envia el missatge proporcionat pintat amb un arc de Sant Martí</string>
+    <string name="command_description_rainbow_emote">Envia l\'emoticona proporcionat pintat en arc de Sant Martí</string>
+    <string name="command_description_rainbow">Envia el missatge proporcionat pintat en arc de Sant Martí</string>
     <string name="signed_out_notice">Pot ser causat per diferents motius:
 \n
 \n• Has canviat la teva contrasenya des d\'una altra sessió.
@@ -1767,7 +1767,7 @@
     <string name="verification_request_waiting">Esperant…</string>
     <string name="sent_verification_conclusion">Conclusió de la verificació</string>
     <string name="sent_a_reaction">Ha reaccionat amb: %s</string>
-    <string name="sent_a_poll">Votació</string>
+    <string name="sent_a_poll">Enquesta</string>
     <string name="send_a_sticker">Adhesiu</string>
     <string name="sent_an_image">Imatge.</string>
     <string name="sent_a_video">Vídeo.</string>
@@ -1957,7 +1957,7 @@
     <string name="room_settings_room_access_public_title">Públic</string>
     <string name="room_settings_room_access_private_description">Només els convidats poden trobar-la i unir-s\'hi</string>
     <string name="room_settings_room_access_entry_knock">Qualsevol pot demanar entrar a la sala, els participants poden acceptar-ho o rebutjar-ho</string>
-    <string name="room_settings_guest_access_title">Permet als convidats unir-se</string>
+    <string name="room_settings_guest_access_title">Permet que els convidats s\'uneixin</string>
     <string name="suggested_header">Sales suggerides</string>
     <string name="settings_notification_emails_enable_for_email">Activa les notificacions per correu de %s</string>
     <string name="settings_notification_emails_category">Notificacions per correu</string>
@@ -1995,7 +1995,7 @@
     <string name="space_settings_permissions_subtitle">Visualitza i actualitza els rols necessaris per modificar diferents parts de l\'espai.</string>
     <string name="space_settings_permissions_title">Permisos de l\'espai</string>
     <string name="room_unsupported_e2e_algorithm_as_admin">El xifrat no s\'ha configurat correctament per tant no pots enviar missatges. Clica per obrir la configuració.</string>
-    <string name="room_unsupported_e2e_algorithm">El xifrat no s\'ha configurat correctament per tant no pots enviar missatges. Contacta amb l\'administrador o restableix el xifrat a un estat vàlid.</string>
+    <string name="room_unsupported_e2e_algorithm">El xifrat no s\'ha configurat correctament per tant no pots enviar missatges. Contacta amb un administrador per restablir el xifrat a un estat vàlid.</string>
     <string name="room_notification_more_than_two_users_are_typing">%1$s, %2$s i altres</string>
     <string name="room_notification_two_users_are_typing">%1$s i %2$s</string>
     <string name="space_participants_unban_prompt_msg">Si deixes de vetar un usuari, es podrà tornar a unir a l\'espai.</string>
@@ -2029,8 +2029,8 @@
     <string name="action_thread_copy_link_to_thread">Copia l\'enllaç al fil</string>
     <string name="action_thread_view_in_room">Mostra a la sala</string>
     <string name="action_learn_more">Més informació</string>
-    <string name="action_try_it_out">Provar-ho</string>
-    <string name="action_not_now">Ara, no</string>
+    <string name="action_try_it_out">Prova-ho</string>
+    <string name="action_not_now">Ara no</string>
     <string name="action_disable">Desactiva</string>
     <string name="action_enable">Activa</string>
     <string name="action_view_threads">Mostra els fils</string>
@@ -2051,4 +2051,443 @@
         <item quantity="one">%d canvi a l\'ACL del servidor</item>
         <item quantity="other">%d canvis a l\'ACL del servidor</item>
     </plurals>
+    <string name="space_type_private">Privat</string>
+    <string name="space_type_public">Públic</string>
+    <string name="create_spaces_organise_rooms">Espai privat per organitzar les teves sales</string>
+    <string name="your_public_space">Espai públic (teu)</string>
+    <string name="your_private_space">Espai privat (teu)</string>
+    <string name="add_space">Afegeix espai</string>
+    <string name="private_space">Espai privat</string>
+    <string name="public_space">Espai públic</string>
+    <string name="command_description_upgrade_room">Actualitza una sala a una nova versió</string>
+    <string name="a11y_presence_unavailable">A fora</string>
+    <string name="a11y_presence_busy">Ocupat</string>
+    <string name="a11y_presence_offline">Fora de línia</string>
+    <string name="a11y_pause_audio_message">Pausa %1$s</string>
+    <string name="a11y_pause_voice_message">Pausa missatge de veu</string>
+    <string name="command_description_unignore_user">Deixa d\'ignorar un usuari, es mostraran els nous missatges</string>
+    <string name="a11y_play_audio_message">Reprodueix %1$s</string>
+    <string name="a11y_audio_playback_duration">%1$d minuts %2$d segons</string>
+    <string name="a11y_audio_message_item">%1$s, %2$s, %3$s</string>
+    <string name="voice_message_reply_content">Missatge de veu (%1$s)</string>
+    <string name="error_voice_message_cannot_reply_or_edit">No pots respondre o editar mentre el missatge de veu està actiu</string>
+    <string name="error_voice_message_unable_to_record">No es pot enregistrar missatge de veu</string>
+    <string name="error_voice_message_unable_to_play">Aquest missatge de veu no es pot reproduir</string>
+    <string name="voice_message_tap_to_stop_toast">Clica l\'enregistrament per aturar-lo o escoltar-lo</string>
+    <string name="voice_message_n_seconds_warning_toast">%1$ds restants</string>
+    <string name="voice_message_release_to_send_toast">Manté per enregistrar, deixa anar per enviar</string>
+    <string name="a11y_delete_recorded_voice_message">Elimina enregistrament</string>
+    <string name="a11y_recording_voice_message">Enregistrant missatge de veu</string>
+    <string name="a11y_stop_voice_message">Atura l\'enregistrament</string>
+    <string name="a11y_play_voice_message">Reprodueix missatge de veu</string>
+    <string name="voice_message_slide_to_cancel">Llisca per cancel·lar</string>
+    <string name="a11y_start_voice_message">Enregistra missatge de veu</string>
+    <string name="error_failed_to_join_room">S\'ha produït un error en provar d\'entrar a: %s</string>
+    <string name="room_upgrade_to_recommended_version">Actualitza a la versió de sala recomanada</string>
+    <string name="room_using_unstable_room_version">Aquesta sala té la versió %s, la qual està marcada com a no estable pel servidor.</string>
+    <string name="space_type_private_desc">Només amb invitació, per tu o per equips</string>
+    <string name="live_location_sharing_notification_title">${app_name} Ubicació en directe</string>
+    <string name="location_share_live_stop">Atura</string>
+    <string name="location_share_live_started">Carregant ubicació en directe…</string>
+    <string name="location_share_live_enabled">Compartició d\'ubicació en directe activada</string>
+    <string name="location_timeline_failed_to_load_map">No s\'ha pogut carregar el mapa</string>
+    <string name="labs_render_locations_in_timeline">Mostra les ubicacions dels usuaris a la cronologia</string>
+    <string name="settings_enable_location_sharing_summary">Si està activat, podràs enviar la teva ubicació a qualsevol sala</string>
+    <string name="settings_enable_location_sharing">Activa la compartició d\'ubicació</string>
+    <string name="location_share_external">Obre amb</string>
+    <string name="location_not_available_dialog_content">${app_name} no ha pogut accedir a la teva ubicació. Torna-ho a provar més tard.</string>
+    <string name="location_not_available_dialog_title">${app_name} no ha pogut accedir a la teva ubicació</string>
+    <string name="location_in_background_missing_permission_dialog_title">Permet l\'accés</string>
+    <string name="location_share_live_select_duration_option_3">8 hores</string>
+    <string name="location_share_live_select_duration_option_2">1 hora</string>
+    <string name="location_share_live_select_duration_option_1">15 minuts</string>
+    <string name="location_share_live_select_duration_title">Comparteix la teva ubicació en directe durant</string>
+    <string name="a11y_location_share_option_pinned_icon">Comparteix la ubicació</string>
+    <string name="location_share_option_pinned">Comparteix la ubicació</string>
+    <string name="invite_people_to_your_space">Convida gent al teu espai</string>
+    <string name="invite_people_menu">Convida gent</string>
+    <string name="create_space_error_empty_field_space_name">Posa-li un nom per continuar.</string>
+    <string name="settings_messages_direct_messages">Xats directes</string>
+    <string name="settings_encrypted_direct_messages">Xats directes xifrats</string>
+    <string name="create_spaces_invite_public_header">Qui son els teus companys\?</string>
+    <string name="a11y_unchecked">Sense marcar</string>
+    <string name="you_may_contact_me">Pots contactar amb mi si tens més preguntes al respecte</string>
+    <string name="a11y_location_share_pin_on_map">Pin d\'ubicació seleccionada al mapa</string>
+    <string name="upgrade_room_warning">L\'actualització d\'una sala és una acció avançada i normalment es recomana si la sala és inestable per culpa d\'errors, funcions que falten o vulnerabilitats de seguretat.
+\nNormalment això només afecta a com es processa la sala al servidor.</string>
+    <string name="joining_replacement_room">Uneix-te a la sala substituta</string>
+    <string name="this_space_has_no_rooms_not_admin">Algunes sales poden estar amagades perquè són privades i necessites invitació prèvia.
+\nNo tens permís per afegir sales.</string>
+    <string name="spaces_no_server_support_description">Posa\'t en contacte amb l\'administrador del teu servidor per obtenir més informació</string>
+    <string name="looking_for_someone_not_in_space">Busques algú que no està a %s\?</string>
+    <string name="user_invites_you">%s t\'ha convidat</string>
+    <string name="settings_show_latest_profile_description">Mostra la informació de perfil més recent per a tots els missatges (foto i àlies).</string>
+    <string name="you_are_invited">T\'han convidat</string>
+    <string name="finish_setting_up_discovery">Acaba de configurar el descobriment.</string>
+    <string name="create_space_identity_server_info_none">Actualment no estàs utilitzant un servidor d\'identitat. Per convidar persones i poder ser descobert per elles, configura\'n un a continuació.</string>
+    <string name="room_alias_preview_not_found">Aquest àlies no està accessible ara mateix.
+\nTorna-ho a provar més tard o demana a un administrador de la sala que en comprovi l\'accés.</string>
+    <string name="invite_people_to_your_space_desc">De moment només hi ets tu. %s serà encara millor amb altres persones.</string>
+    <string name="create_spaces_room_private_header_desc">Crearem una sala per a cadascun d\'ells. També pots afegir-ne més després, incloses les ja existents.</string>
+    <string name="create_spaces_invite_public_header_desc">Assegura\'t que les persones adequades tinguin accés a %s. Pots convidar-ne més després.</string>
+    <string name="create_spaces_make_sure_access">Assegura\'t que les persones adequades tinguin accés a %s.</string>
+    <string name="send_images_and_video_with_original_size">Envia multimèdia a mida real</string>
+    <string name="identity_server_consent_dialog_content_3">Per descobrir contactes existents, s\'ha d\'enviar informació de contacte (correus i números de telèfon) al servidor d\'identitat utilitzat. Es fa un \'hash\' de les dades abans d\'enviar-les per privacitat.</string>
+    <string name="identity_server_consent_dialog_title_2">Envia correus i números de telèfon a %s</string>
+    <string name="settings_discovery_consent_notice_off_2">Els teus contactes són privats. Per descobrir els usuaris dels teus contactes, necessitem permís per enviar informació dels contactes al servidor d\'identitat que estiguis utilitzant.</string>
+    <string name="send_feedback_space_info">Estàs utilitzant una versió beta dels espais. Els teus comentaris ajudaran a les properes versions. S\'anotaran la teva plataforma i nom d\'usuari per poder utilitzar els teus comentaris tant bé com puguem.</string>
+    <string name="room_settings_room_access_restricted_description">Qualsevol a un espai amb aquesta sala podrà trobar-la i unir-s\'hi. Només els administradors d\'aquesta sala poden afegir-la a un espai.</string>
+    <string name="upgrade_room_for_restricted">Qualsevol a·%s podrà trobar i unir-se a aquesta sala; no caldrà convidar tothom manualment. Podràs canviar-ho a la configuració de sala en qualsevol moment.</string>
+    <string name="upgrade_room_for_restricted_no_param">Qualsevol persona d\'un espai principal podrà trobar i unir-se a aquesta sala; no caldrà convidar tothom manualment. Podràs canviar-ho a la configuració de sala en qualsevol moment.</string>
+    <string name="location_in_background_missing_permission_dialog_content">Per compartir la teva ubicació en directe, ${app_name} necessita accedir a la teva ubicació mentre l\'aplicació està en segon pla.
+\nNomés s\'accedirà a la teva ubicació durant el temps que escullis.</string>
+    <string name="command_description_ignore_user">Ignora un usuari i amaga els seus missatges</string>
+    <string name="space_you_know_that_contains_this_room">Espai que saps que conté aquesta sala</string>
+    <string name="decide_which_spaces_can_access">Tria quins espais poden accedir a aquesta sala. Si se selecciona un espai, els seus membres podran trobar i unir-se a la sala.</string>
+    <string name="spaces_which_can_access">Espais als quals es pot accedir</string>
+    <string name="allow_space_member_to_find_and_access">Permet als membres de l\'espai trobar i accedir-hi.</string>
+    <string name="upgrade_room_for_restricted_note">Tingues en compte que l\'actualització crearà una nova versió de la sala. Tots els missatges actuals romandran a aquesta sala arxivada.</string>
+    <string name="this_invite_to_this_room_was_sent">La invitació a aquesta sala s\'ha enviat a %s que no està associat al teu compte</string>
+    <string name="this_invite_to_this_space_was_sent">La invitació a aquest espai s\'ha enviat a %s que no està associat al teu compte</string>
+    <string name="link_this_email_with_your_account">%s a la configuració per rebre invitacions directament a ${app_name}.</string>
+    <string name="screen_sharing_notification_title">Compartició de pantalla ${app_name}</string>
+    <string name="room_message_autocomplete_notification">Notificació de sala</string>
+    <string name="room_message_notify_everyone">Notifica a tota la sala</string>
+    <string name="room_message_autocomplete_users">Usuaris</string>
+    <string name="a11y_location_share_option_user_live_icon">Comparteix ubicació en directe</string>
+    <string name="location_share_option_user_live">Comparteix ubicació en directe</string>
+    <string name="a11y_location_share_option_user_current_icon">Comparteix la meva ubicació actual</string>
+    <string name="location_share_option_user_current">Comparteix la meva ubicació actual</string>
+    <string name="a11y_location_share_locate_button">Fes zoom a la ubicació actual</string>
+    <string name="a11y_static_map_image">Mapa</string>
+    <string name="location_activity_title_preview">Ubicació</string>
+    <string name="location_activity_title_static_sharing">Comparteix ubicació</string>
+    <string name="restart_the_application_to_apply_changes">Reinicia l\'aplicació per aplicar els canvis.</string>
+    <string name="labs_enable_latex_maths">Activa format matemàtic amb LaTeX</string>
+    <string name="link_this_email_settings_link">Enllaça aquest correu amb el teu compte</string>
+    <string name="audio_message_file_size">(%1$s)</string>
+    <string name="audio_message_reply_content">%1$s (%2$s)</string>
+    <string name="error_audio_message_unable_to_play">No s\'ha pogut reproduir %1$s</string>
+    <string name="upgrade_room_no_power_to_manage">Necessites permisos per actualitzar la sala</string>
+    <string name="upgrade_room_update_parent_space">Actualitza automàticament l\'espai principal</string>
+    <string name="upgrade_room_auto_invite">Convida usuaris automàticament</string>
+    <string name="upgrade_public_room_from_to">Actualitzaràs la sala de %1$s a %2$s.</string>
+    <string name="upgrade_private_room">Actualitza sala privada</string>
+    <string name="upgrade_public_room">Actualitza sala pública</string>
+    <string name="upgrade_required">Actualització necessària</string>
+    <string name="upgrade">Actualitza</string>
+    <string name="it_may_take_some_time">Tingues paciència, pot trigar una estona.</string>
+    <string name="unnamed_room">Sala sense nom</string>
+    <string name="this_space_has_no_rooms_admin">Algunes sales poden estar amagades perquè són privades i necessites invitació prèvia.</string>
+    <string name="this_space_has_no_rooms">L\'espai no conté sales</string>
+    <string name="spaces_no_server_support_title">Sembla que el servidor actual encara no admet els espais</string>
+    <string name="spaces_feeling_experimental_subspace">Amb ganes d\'experimentar\?
+\nPots afegir espais a un espai.</string>
+    <string name="all_rooms_youre_in_will_be_shown_in_home">Totes les sales en què et trobes es mostraran a l\'inici.</string>
+    <string name="preference_show_all_rooms_in_home">Mostra totes les sales a l\'inici</string>
+    <string name="space_manage_rooms_and_spaces">Gestiona sales i espais</string>
+    <string name="space_mark_as_not_suggested">Marca com a no suggerit</string>
+    <string name="space_mark_as_suggested">Marca com a suggerit</string>
+    <string name="space_suggested">Suggerit</string>
+    <string name="space_settings_manage_rooms">Gestiona les sales</string>
+    <string name="settings_show_latest_profile">Mostra la informació d\'usuari més recent</string>
+    <plurals name="space_people_you_know">
+        <item quantity="one">%d persona que coneixes ja s\'ha unit</item>
+        <item quantity="other">%d persones que coneixes ja s\'han unit</item>
+    </plurals>
+    <string name="discovery_section">Descobriment (%s)</string>
+    <string name="finish_setup">Acaba la configuració</string>
+    <string name="discovery_invite">Convida per correu, busca contactes i més…</string>
+    <string name="join_anyway">Uneix-te de totes maneres</string>
+    <string name="join_space">Uneix-te a l\'espai</string>
+    <string name="skip_for_now">Omet per ara</string>
+    <string name="share_space_link_message">Uneix-te al meu espai %1$s·%2$s</string>
+    <string name="invite_just_to_this_room_desc">No formaran part de %s</string>
+    <string name="invite_just_to_this_room">Només aquesta sala</string>
+    <string name="invite_to_space_with_name_desc">Podran veure %s</string>
+    <string name="invite_to_space_with_name">Invitació per %s</string>
+    <string name="invite_by_link">Comparteix enllaç</string>
+    <string name="invite_by_email">Convida mitjançant correu electrònic</string>
+    <string name="invite_by_username_or_mail">Convida mitjançant de nom d\'usuari o correu</string>
+    <string name="invite_to_space">Invitació per %s</string>
+    <string name="create_spaces_room_private_header">En quines coses esteu treballant\?</string>
+    <string name="create_spaces_room_public_header_desc">Crearem sales per ells. També en podràs afegir després.</string>
+    <string name="create_spaces_room_public_header">De què podrien ser alguns temes dels que parleu a %s\?</string>
+    <string name="create_spaces_details_private_header">Afegeix alguns detalls per ajudar la gent a identificar-lo Pots canviar-ho en qualsevol moment.</string>
+    <string name="create_spaces_details_public_header">Afegeix alguns detalls per ajudar a destacar-lo. Pots canviar-ho en qualsevol moment.</string>
+    <string name="create_spaces_private_teammates">Un espai privat per tu i els teus</string>
+    <string name="space_type_public_desc">Obert a tothom, perfecte per a comunitats</string>
+    <string name="ftue_display_name_subtitle">Es mostrarà quan enviïs missatges.</string>
+    <string name="ftue_display_name_title">Escull un àlies</string>
+    <string name="ftue_account_created_subtitle">El teu compte %s s\'ha creat.</string>
+    <string name="ftue_account_created_congratulations_title">Felicitats!</string>
+    <string name="ftue_account_created_take_me_home">Torna a l\'inici</string>
+    <string name="ftue_account_created_personalize">Personalitza el perfil</string>
+    <string name="ftue_auth_use_case_connect_to_server">Connectat al servidor</string>
+    <string name="ftue_auth_use_case_join_existing_server">Vols unir-te a un servidor existent\?</string>
+    <string name="ftue_auth_use_case_skip_partial">ometre aquesta pregunta</string>
+    <string name="ftue_auth_use_case_skip">Encara no n\'estàs segur\? Pots %s</string>
+    <string name="ftue_auth_use_case_option_three">Comunitats</string>
+    <string name="ftue_auth_use_case_option_two">Equips</string>
+    <string name="ftue_auth_use_case_option_one">Família i amics</string>
+    <string name="ftue_auth_use_case_subtitle">T\'ajudarem a connectar-te.</string>
+    <string name="ftue_auth_use_case_title">Amb qui parlaràs més sovint\?</string>
+    <string name="ftue_auth_carousel_workplace_body">${app_name} també és ideal per a la feina. Les organitzacions més segures del món hi confien.</string>
+    <string name="identity_server_consent_dialog_content_question">Estàs d\'acord amb enviar aquesta informació\?</string>
+    <string name="error_file_too_big_simple">El fitxer és massa gran per carregar-lo.</string>
+    <string name="attachment_type_location">Ubicació</string>
+    <string name="ftue_auth_carousel_encrypted_body">Xifrat d\'extrem a extrem i sense haver de donar cap número de telèfon. Sense anuncis ni extracció de dades.</string>
+    <string name="ftue_auth_carousel_control_body">Tria on es desen les teves converses, donant-te control i independència. Connectat a través de Matrix.</string>
+    <string name="ftue_auth_carousel_secure_body">Comunicació segura i independent que t\'ofereix el mateix nivell de privadesa que una conversa cara a cara a casa teva.</string>
+    <string name="ftue_auth_carousel_workplace_title">Missatgeria pel teu equip.</string>
+    <string name="ftue_auth_carousel_encrypted_title">Missatgeria segura.</string>
+    <string name="ftue_auth_carousel_secure_title">Ets propietari de les teves converses.</string>
+    <string name="ftue_auth_carousel_control_title">Tu tens el control.</string>
+    <string name="call_tile_voice_call_has_ended">Trucada finalitzada • %1$s</string>
+    <string name="call_tile_video_active">Videotrucada activa</string>
+    <string name="call_tile_voice_active">Trucada activa</string>
+    <string name="call_tile_video_incoming">Videotrucada entrant</string>
+    <string name="call_tile_voice_incoming">Trucada entrant</string>
+    <string name="call_tile_you_declined_this_call">Has rebutjat la trucada</string>
+    <string name="error_forbidden_digits_only_username">Els servidor no accepta noms d\'usuari amb només dígits.</string>
+    <string name="ftue_personalize_skip_this_step">Omet aquest pas</string>
+    <string name="ftue_personalize_submit">Desa i continua</string>
+    <string name="ftue_personalize_complete_subtitle">Les teves preferències s\'han desat.</string>
+    <string name="ftue_personalize_complete_title">Tot a punt!</string>
+    <string name="ftue_personalize_lets_go">Som-hi</string>
+    <string name="ftue_profile_picture_subtitle">Ho pots canviar en qualsevol moment.</string>
+    <string name="ftue_display_name_entry_footer">Ho podràs canviar després</string>
+    <string name="ftue_profile_picture_title">Afegeix foto de perfil</string>
+    <string name="ftue_display_name_entry_title">Àlies</string>
+    <string name="labs_enable_thread_messages_desc">Avís: l\'aplicació es reiniciarà</string>
+    <string name="labs_enable_thread_messages">Activa missatges de fil</string>
+    <string name="labs_auto_report_uisi_desc">El sistema enviarà automàticament registres quan es produeixi un error de desxifrat</string>
+    <string name="labs_auto_report_uisi">Informa automàticament d\'errors de desxifrat.</string>
+    <string name="space_add_space_to_any_space_you_manage">Afegeix espai a un espai gestionat per tu.</string>
+    <string name="space_add_existing_spaces">Afegeix espais existents</string>
+    <string name="space_add_existing_rooms_only">Afegeix sales existents</string>
+    <string name="space_add_existing_rooms">Afegeix sales i espais existents</string>
+    <string name="space_leave_prompt_msg_as_admin">Ets l\'únic administrador d\'aquest espai. Si marxes ningú en podrà tenir el control.</string>
+    <string name="space_leave_prompt_msg_private">No podràs tornar a unir-t\'hi mentre no t\'hi tornin a convidar.</string>
+    <string name="space_leave_prompt_msg_only_you">Ets l\'única persona aquí. Si marxes, ningú podrà unir-s\'hi en el futur, incloent-te a tu.</string>
+    <string name="space_leave_prompt_msg_with_name">Estàs segur que vols marxar %s\?</string>
+    <string name="leave_space">Marxa</string>
+    <string name="space_add_child_title">Afegeix sales</string>
+    <string name="space_explore_activity_title">Explora sales</string>
+    <string name="command_description_leave_room">Marxa de la sala amb l\'ID especificat (o la sala actual si és \'null\')</string>
+    <string name="command_description_join_space">Uneix-te a l\'espai amb l\'ID especificat</string>
+    <string name="command_description_add_to_space">Afegeix a l\'espai especificat</string>
+    <string name="a11y_presence_online">En línia</string>
+    <string name="a11y_public_room">Sala pública</string>
+    <string name="call_slide_to_end_conference">Llisca per finalitzar la trucada</string>
+    <string name="call_transfer_unknown_person">Persona desconeguda</string>
+    <string name="call_transfer_transfer_to_title">Transferència a %1$s</string>
+    <string name="call_transfer_consulting_with">Consultant amb %1$s</string>
+    <string name="call_tap_to_return">%1$s Clica per tornar</string>
+    <string name="call_one_active">Trucada activa (%1$s) ·</string>
+    <plurals name="call_active_status">
+        <item quantity="one">Trucada activa ·</item>
+        <item quantity="other">%1$d trucades actives ·</item>
+    </plurals>
+    <string name="call_tile_no_answer">Sense resposta</string>
+    <string name="call_tile_video_missed">Videotrucada perduda</string>
+    <string name="call_tile_voice_missed">Trucada perduda</string>
+    <string name="call_tile_video_declined">Videotrucada rebutjada</string>
+    <string name="call_tile_voice_declined">Trucada rebutjada</string>
+    <string name="call_tile_video_call_has_ended">Videotrucada finalitzada • %1$s</string>
+    <string name="closed_poll_option_description">Els resultats només es mostraran quan acabi l\'enquesta</string>
+    <string name="closed_poll_option_title">Enquesta tancada</string>
+    <string name="open_poll_option_description">Els votants veuran els resultats actuals tan bon punt hagin votat</string>
+    <string name="open_poll_option_title">Enquesta oberta</string>
+    <string name="poll_type_title">Tipus d\'enquesta</string>
+    <string name="edit_poll_title">Edita l\'enquesta</string>
+    <string name="delete_poll_dialog_content">Estàs segur que vols eliminar l\'enquesta\? No la podràs recuperar un cop eliminada.</string>
+    <string name="delete_poll_dialog_title">Elimina l\'enquesta</string>
+    <string name="poll_end_room_list_preview">S\'ha acabat l\'enquesta</string>
+    <string name="poll_response_room_list_preview">Vot emès</string>
+    <string name="end_poll_confirmation_approve_button">Acaba l\'enquesta</string>
+    <string name="end_poll_confirmation_description">Això impedirà que la gent pugui votar i es mostraran els resultats finals de l\'enquesta.</string>
+    <string name="end_poll_confirmation_title">Vols acabar l\'enquesta\?</string>
+    <string name="a11y_poll_winner_option">opció guanyadora</string>
+    <plurals name="create_poll_not_enough_options_error">
+        <item quantity="one">Es necessita almenys %1$s opció</item>
+        <item quantity="other">Es necessiten almenys %1$s opcions</item>
+    </plurals>
+    <string name="create_poll_empty_question_error">La pregunta no pot estar buida</string>
+    <string name="create_poll_button">CREA ENQUESTA</string>
+    <string name="create_poll_add_option">AFEGEIX OPCIÓ</string>
+    <string name="create_poll_options_hint">Opció %1$d</string>
+    <string name="create_poll_options_title">Crea opcions</string>
+    <string name="create_poll_question_hint">Pregunta o tema</string>
+    <string name="create_poll_question_title">Pregunta o tema de l\'enquesta</string>
+    <string name="create_poll_title">Crea enquesta</string>
+    <string name="attachment_type_poll">Enquesta</string>
+    <string name="poll_end_action">Acaba l\'enquesta</string>
+    <plurals name="poll_total_vote_count_after_ended">
+        <item quantity="one">Resultat final basat en %1$d vot</item>
+        <item quantity="other">Resultat final basat en %1$d vots</item>
+    </plurals>
+    <plurals name="poll_total_vote_count_before_ended_and_not_voted">
+        <item quantity="one">%1$d vot emès. Vota per veure els resultats</item>
+        <item quantity="other">%1$d vots emesos. Vota per veure els resultats</item>
+    </plurals>
+    <string name="poll_no_votes_cast">No s\'han emès vots</string>
+    <plurals name="poll_total_vote_count_before_ended_and_voted">
+        <item quantity="one">Basat en %1$d vot</item>
+        <item quantity="other">Basat en %1$d vots</item>
+    </plurals>
+    <plurals name="poll_option_vote_count">
+        <item quantity="one">%1$d vot</item>
+        <item quantity="other">%1$d vots</item>
+    </plurals>
+    <string name="encryption_misconfigured">Xifrat mal configurat</string>
+    <plurals name="send_videos_with_original_size">
+        <item quantity="one">Envia vídeo a mida real</item>
+        <item quantity="other">Envia vídeos a mida real</item>
+    </plurals>
+    <string name="settings_server_room_version_unstable">inestable</string>
+    <string name="settings_server_room_version_stable">estable</string>
+    <string name="settings_server_default_room_version">Versió per defecte</string>
+    <string name="settings_server_room_versions">Versions de sala 👓</string>
+    <string name="room_member_override_nick_color">Canvia el color de l\'àlies</string>
+    <string name="room_profile_section_restore_security">Restableix xifrat</string>
+    <string name="contact_admin_to_restore_encryption">Contacta amb un administrador per restablir el xifrat a un estat vàlid.</string>
+    <string name="encryption_has_been_misconfigured">El xifrat s\'ha configurat malament.</string>
+    <string name="verification_scan_self_emoji_subtitle">Fes la verificació comparant emoticones</string>
+    <string name="verification_scan_with_this_device">Escaneja amb aquest dispositiu</string>
+    <string name="verification_scan_self_notice">Escaneja el codi amb un altre dispositiu o canvia i fes l\'escaneig amb aquest dispositiu</string>
+    <string name="sent_live_location">Ha compartit la seva ubicació en directe</string>
+    <string name="sent_location">Ha compartit la seva ubicació</string>
+    <string name="sent_a_voice_message">Veu</string>
+    <string name="command_description_lenny">Afegeix ( ͡° ͜ʖ ͡°) abans d\'un missatge de text</string>
+    <string name="settings_developer_mode_show_info_on_screen_summary">Mostra informació útil per ajudar a depurar l\'aplicació</string>
+    <string name="settings_developer_mode_show_info_on_screen_title">Mostra la informació de depuració a la pantalla</string>
+    <string name="does_not_look_like_valid_email">Sembla que l\'adreça de correu no és vàlida</string>
+    <string name="login_splash_already_have_account">Ja tinc un compte</string>
+    <string name="login_splash_create_account">Crea compte</string>
+    <string name="settings_discovery_no_policy_provided">El servidor d\'identitat no ha proporcionat cap política</string>
+    <string name="settings_discovery_hide_identity_server_policy_title">Amaga les polítiques del servidor d\'identitat</string>
+    <string name="settings_discovery_show_identity_server_policy_title">Mostra les polítiques del servidor d\'identitat</string>
+    <string name="open_discovery_settings">Obre la configuració de descobriment</string>
+    <string name="user_directory_search_hint_2">Cerca per nom, ID o correu</string>
+    <string name="send_file_step_compressing_video">Comprimint vídeo %d%%</string>
+    <string name="send_file_step_compressing_image">Comprimint imatge…</string>
+    <string name="beta">BETA</string>
+    <string name="send_feedback_threads_info">Els fils encara s\'estan implementant amb noves i emocionants funcionalitats, com per exemple notificacions millorades. Ens encantaria saber la teva opinió!</string>
+    <string name="send_feedback_threads_title">Comentaris de la beta de fils</string>
+    <string name="give_feedback_threads">Envia comentaris</string>
+    <string name="give_feedback" tools:ignore="UnusedResources">Envia comentaris</string>
+    <string name="feedback_failed">No s\'han pogut enviar els teus comentaris (%s)</string>
+    <string name="feedback_sent">Gràcies, els teus comentaris s\'han enviat correctament</string>
+    <string name="feedback">Comentaris</string>
+    <string name="send_feedback_space_title">Comentaris sobre els espais</string>
+    <string name="beta_title_bottom_sheet_action">BETA</string>
+    <string name="preference_system_settings">Configuració del sistema</string>
+    <string name="preference_versions">Versions</string>
+    <string name="preference_help_summary">Obté ajuda sobre com utilitzar ${app_name}</string>
+    <string name="preference_help_title">Ajuda i suport</string>
+    <string name="preference_help">Ajuda</string>
+    <string name="preference_root_legals">Legal</string>
+    <string name="navigate_to_thread_when_already_in_the_thread">Ja estàs visualitzant aquest fil!</string>
+    <string name="view_in_room">Mostra-ho a la sala</string>
+    <string name="reply_in_thread">Respon en un fil</string>
+    <string name="keys_backup_settings_signature_from_this_user">La còpia de seguretat conté una signatura vàlida d\'aquest usuari.</string>
+    <string name="command_description_whois">Mostra informació d\'un usuari</string>
+    <string name="command_description_nick_for_room">Canvia el teu l\'àlies només dins la sala actual</string>
+    <string name="command_description_room_name">Estableix el nom de la sala</string>
+    <string name="command_not_supported_in_threads">La comanda \"%s\" s\'ha reconegut però no s\'admet als fils.</string>
+    <string name="error_jitsi_join_conf">S\'ha produït un error en intentar unir-se a la conferència</string>
+    <string name="directory_add_a_new_server_error_already_added">Aquest servidor ja es troba a la llista</string>
+    <string name="directory_add_a_new_server_error">No s\'ha pogut trobar el servidor o la seva llista de sales</string>
+    <string name="directory_add_a_new_server_prompt">Introdueix el nom d\'un servidor nou que vulguis visitar.</string>
+    <string name="directory_add_a_new_server">Afegeix un nou servidor</string>
+    <string name="directory_your_server">El teu servidor</string>
+    <string name="other_spaces_or_rooms_you_might_not_know">Altres espais o sales que potser no coneixes</string>
+    <string name="decide_who_can_find_and_join">Tria qui pot trobar i unir-se a la sala.</string>
+    <string name="tap_to_edit_spaces">Clica per editar els espais</string>
+    <string name="select_spaces">Selecciona espais</string>
+    <string name="room_create_member_of_space_name_can_join">Les persones de l\'espai %s poden trobar-la, veure-la i unir-s\'hi.</string>
+    <string name="room_settings_room_access_restricted_title">Només persones de l\'espai</string>
+    <string name="room_settings_space_access_public_description">Qualsevol pot trobar l\'espai i unir-s\'hi</string>
+    <string name="room_settings_room_access_private_invite_only_title">Privada (només amb invitació)</string>
+    <string name="room_settings_room_access_entry_unknown">Configuració d\'accés desconeguda (%s)</string>
+    <string name="space_settings_alias_subtitle">Mostra i gestiona les adreces de l\'espai.</string>
+    <string name="space_settings_alias_title">Adreces de l\'espai</string>
+    <string name="room_settings_space_access_title">Accés a l\'espai</string>
+    <string name="room_settings_access_rules_pref_dialog_title">Qui hi pot accedir\?</string>
+    <string name="room_settings_room_notifications_account_settings">Configuració del compte</string>
+    <string name="room_settings_room_notifications_manage_notifications">Pots gestionar les notificacions a %1$s.</string>
+    <string name="settings_mentions_and_keywords_encryption_notice">No rebràs notificacions al mòbil de mencions ni paraules clau a sales xifrades.</string>
+    <string name="room_settings_room_notifications_encryption_notice">Tingues en compte que les notificacions al mòbil de mencions i paraules clau no estan disponibles en sales xifrades.</string>
+    <string name="room_settings_room_notifications_notify_me">Notifica\'m de</string>
+    <string name="settings_presence_user_always_appears_offline_summary">Si ho actives, sempre apareixeràs fora de línia pels altres usuaris, encara que estiguis utilitzant l\'aplicació.</string>
+    <string name="settings_presence_user_always_appears_offline">Mode fora de línia</string>
+    <string name="settings_presence">Presència</string>
+    <string name="legals_no_policy_provided">El servidor no ha proporcionat cap política.</string>
+    <string name="legals_third_party_notices">Llibreries de tercers</string>
+    <string name="legals_identity_server_title">Polítiques del servidor d\'identitat</string>
+    <string name="legals_home_server_title">Polítiques del servidor</string>
+    <string name="legals_application_title">Polítiques d\'${app_name}</string>
+    <string name="analytics_opt_in_list_item_3">Pots desactivar-ho en qualsevol moment, a la configuració</string>
+    <string name="analytics_opt_in_list_item_2">&lt;b&gt;No&lt;/b&gt; compartim informació a tercers</string>
+    <string name="analytics_opt_in_list_item_1">&lt;b&gt;No&lt;/b&gt; recopilem o tractem dades del teu compte</string>
+    <string name="analytics_opt_in_content_link">aquí</string>
+    <string name="analytics_opt_in_content">Ajuda\'ns a identificar problemes i millorar ${app_name} compartint dades d\'ús anònimes. Per entendre com la gent utilitza diversos dispositius, generarem un identificador aleatori compartit pels teus dispositius.
+\n
+\nPots llegir tots els nostres termes %s.</string>
+    <string name="analytics_opt_in_title">Ajuda a millorar ${app_name}</string>
+    <string name="settings_room_upgrades">Actualitzacions de sala</string>
+    <string name="settings_messages_by_bot">Missatges de bot</string>
+    <string name="settings_room_invitations">Invitacions a la sala</string>
+    <string name="settings_messages_containing_keywords">Paraules clau</string>
+    <string name="settings_mentions_at_room">\@sala</string>
+    <string name="settings_group_messages">Missatges de grup</string>
+    <string name="settings_encrypted_group_messages">Missatges de grup xifrats</string>
+    <string name="settings_messages_containing_display_name">Àlies</string>
+    <string name="settings_messages_containing_username">Nom d\'usuari</string>
+    <string name="settings_notification_keyword_contains_invalid_character">Les paraules clau no poden contenir \'%s\'</string>
+    <string name="settings_notification_keyword_contains_dot">Les paraules clau no poden començar amb \'.\'</string>
+    <string name="settings_notification_new_keyword">Afegeix nova paraula clau</string>
+    <string name="settings_notification_your_keywords">Paraules clau</string>
+    <string name="settings_notification_notify_me_for">Notifica\'m de</string>
+    <string name="settings_notification_other">Altres</string>
+    <string name="settings_notification_mentions_and_keywords">Mencions i paraules clau</string>
+    <string name="settings_notification_default">Notificacions per defecte</string>
+    <string name="settings_notification_emails_no_emails">Per rebre notificacions per correu, has d\'associar un correu electrònic amb el teu compte de Matrix</string>
+    <string name="shortcut_disabled_reason_sign_out">S\'ha tancat la sessió!</string>
+    <string name="shortcut_disabled_reason_room_left">La sala ha estat abandonada!</string>
+    <string name="room_settings_none">Cap</string>
+    <string name="room_settings_mention_and_keyword_only">Només mencions i paraules clau</string>
+    <string name="threads_labs_enable_notice_message">El servidor actual no admet els fils, per tant aquesta funcionalitat pot ser poc fiable. És possible que alguns missatges dels fils no estiguin disponibles. %sVols activar els fils igualment\?</string>
+    <string name="threads_labs_enable_notice_title">Fils beta</string>
+    <string name="thread_list_empty_title">Manté els xats organitzats mitjançant fils</string>
+    <string name="room_threads_filter">Filtra fils de la sala</string>
+    <string name="threads_beta_enable_notice_message">Els fils ajuden a mantenir el tema de les converses i fer-les més fàcils de seguir. %sSi actives els fils, l\'aplicació s\'actualitzarà. Això pot tardar més en alguns comptes.</string>
+    <string name="threads_notice_migration_title">Els fils ja quasi estan en beta 🎉</string>
+    <string name="threads_beta_enable_notice_title">Fils beta</string>
+    <string name="threads_notice_migration_message">Estem a prop del llançament d\'una versió beta pública dels Fils (Threads).
+\n
+\nMentre ens preparem, hem de fer alguns canvis: els fils creats abans d\'aquest punt es mostraran com a respostes regulars.
+\n
+\nSerà una transició única, ja que els fils ara formen part de l\'especificació de Matrix.</string>
+    <string name="search_thread_from_a_thread">D\'un fil</string>
+    <string name="thread_list_empty_notice">Consell: manté premut un missatge i utilitza “%s”.</string>
+    <string name="thread_list_empty_subtitle">Els fils ajuden a mantenir el tema de les converses i fer-les més fàcils de seguir.</string>
+    <string name="room_permissions_change_main_address_for_the_space">Canvia l\'adreça principal de l\'espai</string>
+    <string name="space_permissions_notice_read_only">No tens permís per actualitzar els rols necessaris per canviar algunes parts d\'aquest espai</string>
+    <string name="screen_sharing_notification_description">Compartició de pantalla en curs</string>
+    <string name="live_location_sharing_notification_description">Compartició d\'ubicació en curs</string>
+    <plurals name="message_reaction_show_more">
+        <item quantity="one">%1$d més</item>
+        <item quantity="other">%1$d més</item>
+    </plurals>
+    <string name="message_reaction_show_less">Mostra menys</string>
+    <string name="tooltip_attachment_location">Comparteix ubicació</string>
+    <string name="tooltip_attachment_poll">Crea enquesta</string>
+    <string name="tooltip_attachment_contact">Obre contactes</string>
+    <string name="tooltip_attachment_sticker">Envia adhesiu</string>
+    <string name="tooltip_attachment_file">Puja fitxer</string>
+    <string name="tooltip_attachment_gallery">Envia imatges i vídeos</string>
+    <string name="tooltip_attachment_photo">Obre càmera</string>
+    <string name="message_bubbles">Mostra els contorns dels missatges</string>
 </resources>
diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index 1ecc1c26f6..5222cdf54d 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -2238,10 +2238,6 @@
     <string name="space_add_space_to_any_space_you_manage">Přidejte prostor do jakéhokoli prostoru, který spravujete.</string>
     <string name="space_add_existing_spaces">Přidat stávající prostory</string>
     <string name="space_add_existing_rooms_only">Přidat stávající místnosti</string>
-    <string name="pick_tings_to_leave">Vyberte místa, která chcete opustit</string>
-    <string name="leave_specific_ones">Opustit konkrétní místnosti a prostory…</string>
-    <string name="dont_leave_any">Neopouštět žádné místnosti a prostory</string>
-    <string name="leave_all_rooms_and_spaces">Opustit všechny místnosti a prostory</string>
     <string name="space_leave_prompt_msg_with_name">Opravdu chcete opustit %s\?</string>
     <string name="discovery_section">Objevování (%s)</string>
     <string name="finish_setup">Dokončit nastavení</string>
@@ -2291,7 +2287,7 @@
     <string name="command_description_room_name">Nastaví název místnosti</string>
     <string name="command_description_unignore_user">Přestane ignorovat uživatele a zobrazí jeho zprávy</string>
     <string name="command_description_ignore_user">Ignoruje uživatele a skrývá jeho zprávy</string>
-    <string name="a11y_presence_unavailable">Nedostupný</string>
+    <string name="a11y_presence_unavailable">Pryč</string>
     <string name="a11y_presence_offline">Offline</string>
     <string name="a11y_presence_online">Online</string>
     <string name="notification_listening_for_notifications">Naslouchání oznámením</string>
@@ -2378,7 +2374,7 @@
     <string name="tooltip_attachment_photo">Otevřít fotoaparát</string>
     <string name="labs_auto_report_uisi_desc">Váš systém bude automaticky odesílat chybové protokoly, když dojde k chybě dešifrování</string>
     <string name="labs_auto_report_uisi">Automaticky nahlašovat chyby dešifrování.</string>
-    <string name="room_member_override_nick_color">Přepsat barvu přezdívky</string>
+    <string name="room_member_override_nick_color">Přepsat barvu zobrazovaného jména</string>
     <string name="login_splash_already_have_account">Již mám účet</string>
     <string name="ftue_auth_carousel_encrypted_title">Bezpečené zasílání zpráv.</string>
     <string name="ftue_auth_carousel_control_title">Máte vše pod kontrolou.</string>
@@ -2537,4 +2533,8 @@
 \n
 \nTato akce povede k restartování aplikace a může trvat nějakou dobu.</string>
     <string name="initial_sync_request_title">Požadavek na počáteční synchronizaci</string>
+    <string name="settings_show_latest_profile">Zobrazit nejnovější informace o uživateli</string>
+    <string name="settings_show_latest_profile_description">Zobrazit nejnovější informace o profilu (avatar a zobrazované jméno) u všech zpráv.</string>
+    <string name="a11y_presence_busy">Zaneprázdněn</string>
+    <string name="keys_backup_settings_signature_from_this_user">Záloha má platný podpis tohoto uživatele.</string>
 </resources>
diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 9796c7bef6..d406e4d762 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -2189,9 +2189,6 @@
     <string name="settings_mentions_and_keywords_encryption_notice">Auf deinem Mobilgerät wirst du keine Benachrichtigungen für Erwähnungen und Schlüsselwörter in verschlüsselten Räumen erhalten.</string>
     <string name="space_add_existing_spaces">Existierende Spaces hinzufügen</string>
     <string name="space_add_existing_rooms_only">Existierende Räume hinzufügen</string>
-    <string name="leave_specific_ones">Ausgewählte Räume oder Subspaces verlassen…</string>
-    <string name="dont_leave_any">Keine Räume und Subspaces verlassen</string>
-    <string name="leave_all_rooms_and_spaces">Alle Räume und Spaces verlassen</string>
     <string name="space_leave_prompt_msg_with_name">Willst du %s wirklich verlassen\?</string>
     <string name="invite_by_username_or_mail">Mit Benutzername oder E-Mail einladen</string>
     <string name="command_description_add_to_space">Zum ausgewählten Space hinzufügen</string>
@@ -2219,7 +2216,6 @@
 \n
 \nUm sie für immer zu entfernen, solltest du sie bannen.</string>
     <string name="a11y_stop_voice_message">Aufnahme beenden</string>
-    <string name="pick_tings_to_leave">Welche Räume willst du verlassen\?</string>
     <string name="finish_setup">Einrichtung beenden</string>
     <string name="a11y_presence_unavailable">Nicht stören</string>
     <string name="a11y_presence_offline">Offline</string>
diff --git a/vector/src/main/res/values-eo/strings.xml b/vector/src/main/res/values-eo/strings.xml
index 466d0b2e93..f0171242ae 100644
--- a/vector/src/main/res/values-eo/strings.xml
+++ b/vector/src/main/res/values-eo/strings.xml
@@ -2141,10 +2141,6 @@
     <string name="denied_permission_generic">Iuj permesoj necesaj por ĉi tiu ago mankas. Bonvolu doni la permesojn per la sistemaj agordoj.</string>
     <string name="space_add_existing_spaces">Aldoni jamajn arojn</string>
     <string name="space_add_existing_rooms_only">Aldoni jamajn ĉambrojn</string>
-    <string name="pick_tings_to_leave">Elektu, de kie vi foriru</string>
-    <string name="leave_specific_ones">Foriri de iuj ĉambroj kaj aroj…</string>
-    <string name="dont_leave_any">Foriri de neniuj ĉambroj kaj aroj</string>
-    <string name="leave_all_rooms_and_spaces">Foriri de ĉiuj ĉambroj kaj aroj</string>
     <string name="space_leave_prompt_msg_with_name">Ĉu vi certe volas foriri de %s\?</string>
     <string name="discovery_section">Trovado (%s)</string>
     <string name="invite_by_username_or_mail">Inviti laŭ uzantonomo aŭ retpoŝtadreso</string>
diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index ba5a8dfc02..b71f0ebc39 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -2110,10 +2110,6 @@
     <string name="send_images_and_video_with_original_size">Enviar contenido multimedia con su tamaño original</string>
     <string name="settings_server_room_version_unstable">inestable</string>
     <string name="space_add_existing_rooms_only">Agregar salas existentes</string>
-    <string name="pick_tings_to_leave">Elige cosas para dar</string>
-    <string name="leave_specific_ones">Dejar salas y espacios específicos…</string>
-    <string name="dont_leave_any">No dejes salas y espacios</string>
-    <string name="leave_all_rooms_and_spaces">Deja todas las habitaciones y espacios</string>
     <string name="space_leave_prompt_msg_with_name">¿Estás seguro de que quieres irte %s\?</string>
     <string name="discovery_section">Descubrimiento (%s)</string>
     <string name="finish_setup">Terminar la configuración</string>
@@ -2486,4 +2482,8 @@
 \n
 \nTen en cuenta que esta acción reiniciará la aplicación y podría tardar algo de tiempo.</string>
     <string name="initial_sync_request_title">Petición inicial de sincronización</string>
+    <string name="keys_backup_settings_signature_from_this_user">La copia de seguridad tiene una firma válida de este usuario.</string>
+    <string name="settings_show_latest_profile_description">Mostrar la última información del perfil (avatar y nick) para todos los mensajes.</string>
+    <string name="settings_show_latest_profile">Mostrar última información del usuario</string>
+    <string name="a11y_presence_busy">Ocupado</string>
 </resources>
diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index 8aa1dfb09b..689fd57a99 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -2198,10 +2198,6 @@
     <string name="space_add_space_to_any_space_you_manage">Lisa kogukond ükspuha millisesse kogukonda, mida sa juba haldad.</string>
     <string name="space_add_existing_spaces">Lisa olemasolevaid kogukondi</string>
     <string name="space_add_existing_rooms_only">Lisa olemasolevaid jututubasid</string>
-    <string name="pick_tings_to_leave">Vali, kust soovid lahkuda</string>
-    <string name="leave_specific_ones">Lahku neist jututubadest ja kogukondadest…</string>
-    <string name="dont_leave_any">Ära lahku ainsamastki jututoast ega kogukonnast</string>
-    <string name="leave_all_rooms_and_spaces">Lahku kõikidest jututubadest ja kogukondadest</string>
     <string name="space_leave_prompt_msg_with_name">Kas oled kindel, et soovid lahkuda %s kogukonnast\?</string>
     <string name="discovery_section">Isikutuvastuse server (%s)</string>
     <string name="finish_setup">Lõpeta seadistamine</string>
@@ -2251,7 +2247,7 @@
     <string name="command_description_room_name">Määrab jututoa nime</string>
     <string name="command_description_unignore_user">Lõpeta kasutaja eiramine ja näita edaspidi tema sõnumeid</string>
     <string name="command_description_ignore_user">Eirab kasutajat peites kõik tema sõnumid sinu eest</string>
-    <string name="a11y_presence_unavailable">Pole leitav</string>
+    <string name="a11y_presence_unavailable">Eemal</string>
     <string name="a11y_presence_offline">Võrgust väljas</string>
     <string name="a11y_presence_online">Võrgus</string>
     <string name="login_error_homeserver_from_url_not_found_enter_manual">Vali koduserver</string>
@@ -2333,7 +2329,7 @@
     <string name="a11y_poll_winner_option">populaarsem valik</string>
     <string name="labs_auto_report_uisi_desc">Kui sõnumite dekrüptimisel tekib viga, siis rakendus saadab selle kohta automaatse teate arendajatele</string>
     <string name="labs_auto_report_uisi">Automaatselt teata dekrüptimise vigadest.</string>
-    <string name="room_member_override_nick_color">Asenda hüüdnime värvid</string>
+    <string name="room_member_override_nick_color">Asenda kuvatava nime värvid</string>
     <string name="login_splash_already_have_account">Mul on kasutajakonto juba olemas</string>
     <string name="ftue_auth_carousel_encrypted_title">Turvaline sõnumivahetus.</string>
     <string name="ftue_auth_carousel_control_title">Sul on kontroll oma andmete üle.</string>
@@ -2490,4 +2486,8 @@
 \n
 \nPalun arvesta, et selle käigus rakendus käivitub uuesti ja see võib aega võtta.</string>
     <string name="initial_sync_request_title">Alusandmete sünkroniseerimise päring</string>
+    <string name="settings_show_latest_profile_description">Näita kõikide sõnumite puhul viimast profiili teavet (tunnuspilt ja kuvatav nimi).</string>
+    <string name="settings_show_latest_profile">Näita viimast kasutajateavet</string>
+    <string name="a11y_presence_busy">Hõivatud</string>
+    <string name="keys_backup_settings_signature_from_this_user">Varukoopial on kehtiv allkiri sellelt kasutajalt.</string>
 </resources>
diff --git a/vector/src/main/res/values-fa/strings.xml b/vector/src/main/res/values-fa/strings.xml
index 171a145eb6..b4f7a8ecf7 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@@ -2198,10 +2198,6 @@
     <string name="space_add_space_to_any_space_you_manage">افزودن فضایی به هر فضایی که مدیریت می‌کنید.</string>
     <string name="space_add_existing_spaces">افزودن فضاهای موجود</string>
     <string name="space_add_existing_rooms_only">افزودن اتاق‌های موجود</string>
-    <string name="pick_tings_to_leave">گزینش خارج شدن‌ها</string>
-    <string name="leave_specific_ones">خارج شدن از اتاق‌ها و فضاهایی خاص…</string>
-    <string name="dont_leave_any">از هیچ اتاق و فضایی خارج نشو</string>
-    <string name="leave_all_rooms_and_spaces">ترک تمامی اتاق‌ها و فضاها</string>
     <string name="space_leave_prompt_msg_with_name">مطمئنید می‌خواهید %s را ترک کنید؟</string>
     <string name="discovery_section">کشف (%s)</string>
     <string name="finish_setup">پایان برپایی</string>
@@ -2251,7 +2247,7 @@
     <string name="command_description_room_name">نام اتاق را تنظیم می‌کند</string>
     <string name="command_description_unignore_user">به کاربری چشم گشوده و پیام‌های بعدیش را نشان می‌دهد</string>
     <string name="command_description_ignore_user">از کاربری چشم‌پوشی کرده و پیام‌هایش را از شما پنهان می‌کند</string>
-    <string name="a11y_presence_unavailable">ناموجود</string>
+    <string name="a11y_presence_unavailable">بیرون</string>
     <string name="a11y_presence_offline">برون‌خط</string>
     <string name="a11y_presence_online">برخط</string>
     <string name="login_error_homeserver_from_url_not_found_enter_manual">گزینش کارساز خانگی</string>
@@ -2359,7 +2355,7 @@
     <string name="closed_poll_option_description">نتایج تنها هنگامی که نظرسنجی را پایان دهید آشکار می‌شوند</string>
     <string name="open_poll_option_description">رأی دهندگان به محض دادن رأی، نتایج را می‌بینند</string>
     <string name="encryption_misconfigured">رمزنگاری بد پیکربندی شده</string>
-    <string name="room_member_override_nick_color">پایمالی رنگ نام مستعار</string>
+    <string name="room_member_override_nick_color">پایمالی رنگ نام نمایشی</string>
     <string name="contact_admin_to_restore_encryption">لطفاً برای بازگردانی رمزنگاری به یه وضعیتی معتبر، با مدیری تماس بگیرید.</string>
     <string name="encryption_has_been_misconfigured">رمزنگاری بد پیکربندی شده.</string>
     <string name="ftue_auth_carousel_encrypted_body">رمزنگاشتهٔ سرتاسری و بدون نیاز به شماره تلفن. بدون تبلیغات یا داده‌کاوی.</string>
@@ -2490,4 +2486,8 @@
     <string name="call_start_screen_sharing">هم‌رسانی صفحه</string>
     <string name="initial_sync_request_reason_unignored_users">- برخی کاربران ناچشم‌پوشی شده‌اند</string>
     <string name="initial_sync_request_title">درخواست همگام سازی نخستین</string>
+    <string name="settings_show_latest_profile_description">نمایش جدیدترین اطَلاعات نمایه (چهرک و نام نمایشی) برای تمامی پیام‌ها.</string>
+    <string name="settings_show_latest_profile">نمایش جدیدترین اطّلاعات کاربری</string>
+    <string name="a11y_presence_busy">مشغول</string>
+    <string name="keys_backup_settings_signature_from_this_user">پشتیبان امضای معتبری از این کاربر دارد.</string>
 </resources>
diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml
index 3a889ec0c9..c872db4e1a 100644
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/vector/src/main/res/values-fi/strings.xml
@@ -2063,8 +2063,6 @@
     <string name="location_share_option_user_current">Jaa nykyinen sijaintini</string>
     <string name="restart_the_application_to_apply_changes">Käynnistä sovellus uudelleen, jotta muutos tulee voimaan.</string>
     <string name="space_add_existing_rooms">Lisää olemassa olevia huoneita ja avaruuksia</string>
-    <string name="dont_leave_any">Älä poistu mistään huoneesta ja avaruudesta</string>
-    <string name="leave_all_rooms_and_spaces">Poistu kaikista huoneista ja avaruuksista</string>
     <string name="use_latest_app">Käytä ${app_name}in uusinta versiota muilla laitteillasi:</string>
     <string name="ftue_personalize_skip_this_step">Ohita tämä vaihe</string>
     <string name="ftue_personalize_submit">Tallenna ja jatka</string>
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index fc41b217c1..6ed2995a81 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -407,9 +407,7 @@
     <string name="settings_user_settings">Paramètres utilisateur</string>
     <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
     <string name="account_email_validation_message">Vérifiez votre courriel et cliquez sur le lien qu’il contient. Une fois ceci fait, cliquez sur continuer.</string>
-    <string name="settings_unignore_user">Afficher tous les messages de %s \?
-\n
-\nVeuillez noter que cette action redémarrera l’application et pourra prendre un certain temps.</string>
+    <string name="settings_unignore_user">Afficher tous les messages de %s \?</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">Qui peut lire l’historique \?</string>
     <string name="room_settings_read_history_entry_members_only_option_time_shared">Uniquement les membres (à partir de l’activation de cette option)</string>
     <string name="room_settings_read_history_entry_members_only_invited">Uniquement les membres (depuis leur invitation)</string>
@@ -1683,7 +1681,7 @@
     <string name="settings_emails">Adresses électroniques</string>
     <string name="settings_phone_number_empty">Aucun numéro de téléphone n’a été ajouté à votre compte</string>
     <string name="search_banned_user_hint">Filtrer les utilisateurs exclus</string>
-    <string name="room_participants_action_unignore_prompt_msg">Ne plus ignorer cet utilisateur aura pour effet de ré-afficher ses messages.</string>
+    <string name="room_participants_action_unignore_prompt_msg">Ne plus ignorer cet utilisateur affichera à nouveau ses messages.</string>
     <string name="room_participants_remove_prompt_msg">expulser un utilisateur le supprimera de ce salon.
 \n
 \nPour l’empêcher de revenir, vous devez plutôt le bannir.</string>
@@ -2201,10 +2199,6 @@
     <string name="space_add_space_to_any_space_you_manage">Ajouter un espace à un espace que vous gérez.</string>
     <string name="space_add_existing_spaces">Ajouter des espaces existants</string>
     <string name="space_add_existing_rooms_only">Ajouter des salons existants</string>
-    <string name="pick_tings_to_leave">Choisissez les endroits à quitter</string>
-    <string name="leave_specific_ones">Quitter certains salons et espaces…</string>
-    <string name="dont_leave_any">Ne quitter aucun salon ni espace</string>
-    <string name="leave_all_rooms_and_spaces">Quitter tous les salons et espaces</string>
     <string name="space_leave_prompt_msg_with_name">Voulez-vous vraiment quitter %s \?</string>
     <string name="discovery_section">Découverte (%s)</string>
     <string name="finish_setup">Terminer le réglage</string>
@@ -2253,7 +2247,7 @@
     <string name="space_participants_remove_prompt_msg">L’expulsion des utilisateurs va les supprimer de cet espace
 \n
 \nPour les empêcher de revenir, vous devriez les exclure.</string>
-    <string name="a11y_presence_unavailable">Indisponible</string>
+    <string name="a11y_presence_unavailable">Absent</string>
     <string name="a11y_presence_offline">Hors ligne</string>
     <string name="a11y_presence_online">En ligne</string>
     <string name="login_error_homeserver_from_url_not_found_enter_manual">Choisir un serveur d’accueil</string>
@@ -2334,7 +2328,7 @@
     <string name="labs_enable_latex_maths">Activer les mathématiques LaTeX</string>
     <string name="labs_auto_report_uisi_desc">Votre système enverra automatiquement des informations dès qu’une erreur de déchiffrement de message se présente</string>
     <string name="labs_auto_report_uisi">Signalement automatique des erreurs de déchiffrement.</string>
-    <string name="room_member_override_nick_color">Outrepasser la couleur du pseudo</string>
+    <string name="room_member_override_nick_color">Outrepasser la couleur du pseudonyme</string>
     <string name="login_splash_already_have_account">J’ai déjà un compte</string>
     <string name="ftue_auth_carousel_encrypted_title">Messagerie sécurisée.</string>
     <string name="ftue_auth_carousel_control_title">Vous êtes aux commandes.</string>
@@ -2454,4 +2448,46 @@
 \nPour nous y préparer, nous avons besoin de faire certains changements : les fils créés avant maintenant seront affichés comme des réponses classiques.
 \n
 \nCette transition sera unique, maintenant que les fils de discussions ont intégré la spécification de Matrix.</string>
+    <string name="screen_sharing_notification_description">Partage d’écran en cours</string>
+    <string name="screen_sharing_notification_title">Partage d’écran pour ${app_name}</string>
+    <string name="location_share_live_started">Chargement de la position en direct…</string>
+    <string name="location_share_live_select_duration_option_3">8 heures</string>
+    <string name="location_share_live_select_duration_option_2">1 heure</string>
+    <string name="location_share_live_select_duration_option_1">15 minutes</string>
+    <string name="location_share_live_select_duration_title">Partager votre position en direct pendant</string>
+    <string name="audio_message_file_size">(%1$s)</string>
+    <string name="audio_message_reply_content">%1$s (%2$s)</string>
+    <string name="error_audio_message_unable_to_play">Impossible de lire %1$s</string>
+    <string name="a11y_pause_audio_message">Pause %1$s</string>
+    <string name="a11y_play_audio_message">Lire %1$s</string>
+    <string name="a11y_audio_playback_duration">%1$d minutes %2$d secondes</string>
+    <string name="a11y_audio_message_item">%1$s, %2$s, %3$s</string>
+    <string name="settings_show_latest_profile_description">Afficher les informations des profils les plus récentes (avatar et nom d’affichage) pour tous les messages.</string>
+    <string name="settings_show_latest_profile">Afficher les informations utilisateurs les plus récentes</string>
+    <string name="a11y_presence_busy">Occupé</string>
+    <string name="sent_live_location">On partagé leur position en direct</string>
+    <string name="ftue_auth_carousel_workplace_body">${app_name} est parfaite pour le bureau. Les sociétés aux plus gros besoins de sécurité lui font confiance.</string>
+    <string name="beta">BÊTA</string>
+    <string name="send_feedback_threads_info">Les fils de discussion sont en cours de développement avec des fonctionnalités nouvelles et excitantes à venir, telles que des notifications améliorées. Nous adorerions avoir vos remarques !</string>
+    <string name="send_feedback_threads_title">Remarques sur les fils de discussion Bêta</string>
+    <string name="give_feedback_threads">Emvoyer des remarques</string>
+    <string name="beta_title_bottom_sheet_action">BÊTA</string>
+    <string name="keys_backup_settings_signature_from_this_user">La sauvegarde a une signature valide de cet utilisateur.</string>
+    <string name="settings_presence_user_always_appears_offline_summary">Si active, vous apparaîtrez toujours hors-ligne aux autres utilisateurs, même lorsque vous utilisez l’application.</string>
+    <string name="settings_presence_user_always_appears_offline">Mode hors-ligne</string>
+    <string name="settings_presence">Présence</string>
+    <string name="threads_labs_enable_notice_message">Votre serveur d\'accueil ne prend pas actuellement en charge les fils de discussions, cette fonctionnalité peut donc ne pas être fiable. Certains messages dans les fils de discussions peuvent ne pas être disponibles de manière fiable. %sVoulez-vous activer les fils de discussion malgré tout \?</string>
+    <string name="threads_labs_enable_notice_title">Fils de discussion Bêta</string>
+    <string name="threads_beta_enable_notice_message">Les fils de discussion vous permettent de recentrer vos conversations et de les rendre facile à suivre. %sActiver les fils de discussion rechargera l’application. Cela peut prendre du temps pour certains comptes.</string>
+    <string name="threads_beta_enable_notice_title">Fils de discussion Bêta</string>
+    <string name="initial_sync_request_reason_unignored_users">– Certains utilisateurs ne sont plus ignorés</string>
+    <string name="call_stop_screen_sharing">Arrêter le partage d’écran</string>
+    <string name="call_start_screen_sharing">Partager l’écran</string>
+    <string name="action_learn_more">En savoir plus</string>
+    <string name="action_try_it_out">Essayer</string>
+    <string name="initial_sync_request_content">${app_name} a besoin d’effacer le cache pour la mise-à-jour, pour la raison suivante :
+\n%s
+\n
+\nCette action va redémarrer l’application et pourra prendre du temps.</string>
+    <string name="initial_sync_request_title">Requête de synchronisation initiale</string>
 </resources>
diff --git a/vector/src/main/res/values-fy/strings.xml b/vector/src/main/res/values-fy/strings.xml
index bb1dce247d..d16b81d39b 100644
--- a/vector/src/main/res/values-fy/strings.xml
+++ b/vector/src/main/res/values-fy/strings.xml
@@ -38,7 +38,6 @@
     <string name="action_revoke">Ynlûke</string>
     <string name="action_disconnect">Ferbining ferbrekke</string>
     <string name="report_content">Ynhâld melde</string>
-
     <string name="or">of</string>
     <string name="action_invite">Utnûgje</string>
     <string name="action_accept">Akseptearje</string>
@@ -70,7 +69,6 @@
     <string name="matrix_only_filter">Allinnich Matrix-kontakten</string>
     <string name="no_result_placeholder">Gjin resultaten</string>
     <string name="rooms_header">Petearen</string>
-
     <string name="groups_header">Mienskippen</string>
     <string name="send_bug_report_include_logs">Lochboek ferstjoere</string>
     <string name="send_bug_report_include_crash_logs">Ungeloklochboek ferstjoere</string>
@@ -365,7 +363,6 @@
     <string name="settings_home_server">Thússerver</string>
     <string name="settings_logged_in">Oanmeld as</string>
     <string name="devices_delete_dialog_title">Autentikaasje</string>
-
     <string name="devices_details_last_seen_title">Foar it letst sjoen</string>
     <string name="devices_details_device_name">Iepenbiere namme wizigje</string>
     <string name="devices_details_name_title">Iepenbiere namme</string>
@@ -382,8 +379,6 @@
     <string name="identity_server_set_alternative_submit">Ferstjoere</string>
     <string name="identity_server_not_defined">Jo brûke gjin identiteitsserver</string>
     <string name="sas_error_unknown">Unbekende flater</string>
-
-
     <string name="sas_incoming_request_notif_title">Ferifikaasjeoanfraach</string>
     <string name="sas_incoming_request_notif_content">%s wol jo sesje ferifiearje</string>
     <string name="sas_verified">Ferifiearre!</string>
@@ -680,7 +675,6 @@
     <string name="notice_room_guest_access_can_join">%1$s hat gasten tastien om dizze keamer binnen te gean.</string>
     <string name="system_theme">Systeemstandert</string>
     <string name="notice_end_to_end_unknown_algorithm_by_you">Jo hawwe end-to-end-fersifering ynskeakele (ûnbekend algoritme %1$s).</string>
-
     <plurals name="room_displayname_four_and_more_members">
         <item quantity="one">%1$s, %2$s, %3$s en %4$d oar</item>
         <item quantity="other">%1$s, %2$s, %3$s en %4$d oaren</item>
@@ -844,8 +838,6 @@
     <string name="login_error_ssl_peer_unverified">SSL-flater: de identiteit fan de oar is net befêstige.</string>
     <string name="login_error_homeserver_from_url_not_found_enter_manual">Thússerver kieze</string>
     <string name="auth_accept_policies">Graach it belied fan dizze thússerver lêze en oanfurdigje:</string>
-
-
     <string name="auth_msisdn_already_defined">Dit telefoannûmer is al definiearre.</string>
     <string name="auth_invalid_email">Dit is gjin jildich e-mailadres</string>
     <string name="auth_invalid_login_param">Ferkearde brûkersnamme en/of wachtwurd</string>
@@ -857,7 +849,6 @@
     <string name="call_failed_no_connection_description">Live ferbining opsetten mislearre.
 \nFreegje de behearder fan jo thússerver om in TURN-server te konfigurearjen, sadat oproppen betrouber wurkje.</string>
     <string name="call_failed_no_connection">${app_name} Oprop mislearre</string>
-
     <string name="start_video_call_prompt_msg">Binne jo wis dat jo in fideo-oprop begjinne wolle\?</string>
     <string name="start_voice_call_prompt_msg">Binne jo wis dat jo in spraakoprop begjinne wolle\?</string>
     <string name="send_bug_report_rage_shake">Skodzje om in probleem te melden</string>
@@ -893,20 +884,15 @@
         <item quantity="one">%1$s hat %2$s as alternatyf keameradres tafoege.</item>
         <item quantity="other">%1$s hat %2$s as alternative keameradressen tafoege.</item>
     </plurals>
-
     <string name="room_jump_to_first_unread">Gean nei net-lêzen</string>
     <string name="list_members">Ledelist</string>
     <string name="action_reject">Ofwize</string>
     <string name="permissions_denied_add_contact">Tagong jaan ta jo kontaktpersoanen.</string>
     <string name="permissions_denied_qr_code">Om de QR-koade te scannen moatte jo tagong ta de kamera jaan.</string>
-
     <string name="permissions_rationale_msg_camera_and_audio">${app_name} hat tagong nedich ta jo kamera en mikrofoan om fideo-oproppen te meitsjen.
 \n
 \nJou tagong op de folgjende pop-ups om de oprop te meitsjen.</string>
-
     <string name="permissions_rationale_msg_record_audio">${app_name} hat tagong nedich ta jo mikrofoan om spraakoproppen te meitsjen.</string>
-
-
     <string name="call_remove_jitsi_widget_progress">Oprop beëinigje…</string>
     <string name="call_error_user_not_responding">De oare kant hat net opnommen.</string>
     <string name="call_ended_invite_timeout_title">Gjin antwurd</string>
@@ -957,15 +943,10 @@
 \nBinne jo wis\?</string>
     <string name="room_participants_action_unban">Untballe</string>
     <string name="room_participants_leave_private_warning">Dit petear is net iepenbier. Jo kinne net opnij ta trede sûnder útnûging.</string>
-
-
-
-
     <plurals name="room_title_members">
         <item quantity="one">%d dielnimmer</item>
         <item quantity="other">%d dielnimmers</item>
     </plurals>
-
     <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">Der binne ien of mear tests mislearre, probearje de oanrekommandearre oplossing(en).</string>
     <string name="settings_troubleshoot_diagnostic_success_status">Basisdiagnoaze is oké. As jo noch hieltyd gjin meldingen ûntfange, meitsje dan in bugmelding oan om ús te helpen ûndersykjen.</string>
     <string name="settings_troubleshoot_diagnostic">Diagnostyske probleemoplossingsynformaasje</string>
@@ -981,10 +962,7 @@
     <string name="shortcut_disabled_reason_room_left">De keamer is ferlitten!</string>
     <string name="room_settings_add_homescreen_shortcut">Fluchkeppeling oan startskerm tafoegje</string>
     <string name="room_settings_mention_and_keyword_only">Allinnich fermeldingen en kaaiwurden</string>
-
-
     <string name="search_banned_user_hint">Ferballe brûkers filterje</string>
-
     <string name="room_permissions_change_topic">Underwerp wizigje</string>
     <string name="room_permissions_upgrade_the_space">De romte opwurdearje</string>
     <string name="room_permissions_upgrade_the_room">De keamer opwurdearje</string>
@@ -1011,4 +989,7 @@
     <string name="room_one_user_is_typing">%s is oan it typen…</string>
     <string name="room_participants_unban_prompt_msg">Troch dizze brûker net mear te ferballen kin dy opnij oan it petear meidwaan.</string>
     <string name="space_participants_unban_prompt_msg">Troch dizze brûker net mear te ferballen kin dy opnij yn de romte komme.</string>
+    <string name="initial_sync_request_reason_unignored_users">- Beskate brûkers binne net mear negearre</string>
+    <string name="initial_sync_request_title">Inisjele syngronisaasje oanfreegje</string>
+    <string name="room_error_access_unauthorized">It is jo net tastien dizze keamer binnen te gean</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index 07d97a8c86..deee03d0d8 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -2198,10 +2198,6 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="space_add_space_to_any_space_you_manage">Add hozzá a teret bármelyik általad kezelt térhez.</string>
     <string name="space_add_existing_spaces">Meglévő terek hozzáadása</string>
     <string name="space_add_existing_rooms_only">Létező szobák hozzáadása</string>
-    <string name="pick_tings_to_leave">Válaszd ki ahonnan kilépsz</string>
-    <string name="leave_specific_ones">Kilépés a megadott szobákból és terekből…</string>
-    <string name="dont_leave_any">Nem lépek ki egyetlen szobából vagy térből sem</string>
-    <string name="leave_all_rooms_and_spaces">Minden szoba és tér elhagyása</string>
     <string name="space_leave_prompt_msg_with_name">Biztos, hogy ki akarsz lépni innen: %s\?</string>
     <string name="discovery_section">Felderítés (%s)</string>
     <string name="finish_setup">Beállítás befejezése</string>
@@ -2251,7 +2247,7 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="command_description_room_name">Szobanév beállítása</string>
     <string name="command_description_unignore_user">A felhasználó újbóli figyelembe vétele, és az üzenetei megjelenítése a jövőben</string>
     <string name="command_description_ignore_user">Figyelmen kívül hagy egy felhasználót, elrejtve előled az üzeneteit</string>
-    <string name="a11y_presence_unavailable">Elérhetetlen</string>
+    <string name="a11y_presence_unavailable">Távol</string>
     <string name="a11y_presence_offline">Kapcsolat nélkül</string>
     <string name="a11y_presence_online">Kapcsolódva</string>
     <string name="login_error_homeserver_from_url_not_found_enter_manual">Matrix szerver kiválasztása</string>
@@ -2334,7 +2330,7 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="tooltip_attachment_file">Fájl feltöltése</string>
     <string name="tooltip_attachment_gallery">Képek és videók küldése</string>
     <string name="tooltip_attachment_photo">Kamera megnyitása</string>
-    <string name="room_member_override_nick_color">Becenév színének megváltoztatása</string>
+    <string name="room_member_override_nick_color">Megjelenítendő név színének megváltoztatása</string>
     <string name="login_splash_already_have_account">Már van fiókom</string>
     <string name="ftue_auth_carousel_encrypted_title">Biztonságos üzenetküldés.</string>
     <string name="ftue_auth_carousel_control_title">Te irányítasz.</string>
@@ -2490,4 +2486,8 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
 \n
 \nFigyelem, ez az alkalmazást újra is indítja, ami eltarthat egy darabig.</string>
     <string name="initial_sync_request_title">Kezdő szinkronizálási kérés</string>
+    <string name="settings_show_latest_profile_description">A legfrissebb profil információk (profilkép és megjelenítendő név) megjelenítése minden üzenetnél.</string>
+    <string name="settings_show_latest_profile">Legfrissebb felhasználói információ megjelenítése</string>
+    <string name="a11y_presence_busy">Foglalt</string>
+    <string name="keys_backup_settings_signature_from_this_user">A mentésnek érvényes aláírása van ettől a felhasználótól.</string>
 </resources>
diff --git a/vector/src/main/res/values-in/strings.xml b/vector/src/main/res/values-in/strings.xml
index a8a457b4af..59477d4b91 100644
--- a/vector/src/main/res/values-in/strings.xml
+++ b/vector/src/main/res/values-in/strings.xml
@@ -1716,10 +1716,6 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="space_add_existing_spaces">Tambahkan space yang sudah ada</string>
     <string name="space_add_existing_rooms_only">Tambahkan ruangan yang sudah ada</string>
     <string name="space_add_existing_rooms">Tambahkan ruangan dan space yang sudah ada</string>
-    <string name="pick_tings_to_leave">Pilih hal-hal yang ditinggalkan</string>
-    <string name="leave_specific_ones">Tinggalkan ruangan dan space yang dipilih…</string>
-    <string name="dont_leave_any">Jangan tinggalkan ruangan dan space apa saja</string>
-    <string name="leave_all_rooms_and_spaces">Tinggalkan semua ruangan dan space</string>
     <string name="space_leave_prompt_msg_as_admin">Anda adalah admin satu-satunya di space ini. Meninggalkannya berarti siapa saja tidak akan mempunyai kontrol atas space-nya.</string>
     <string name="space_leave_prompt_msg_private">Anda tidak akan dapat bergabung lagi kecuali jika Anda diundang lagi.</string>
     <string name="space_leave_prompt_msg_only_you">Anda orang satu-satunya di sini. Jika Anda tinggalkan, siapa saja tidak dapat bergabung di masa depan, termasuk Anda.</string>
@@ -2213,7 +2209,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="command_description_room_avatar">Mengubah avatar ruangan saat ini</string>
     <string name="command_description_avatar_for_room">Mengubah avatar Anda di ruangan saat ini saja</string>
     <string name="command_description_whois">Menampilkan</string>
-    <string name="a11y_presence_unavailable">Tidak Tersedia</string>
+    <string name="a11y_presence_unavailable">Tidak tersedia</string>
     <string name="a11y_presence_offline">Luring</string>
     <string name="a11y_presence_online">Daring</string>
     <string name="login_error_homeserver_from_url_not_found_enter_manual">Pilih homeserver</string>
@@ -2445,4 +2441,8 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
 \n
 \nDicatat bahwa tindakan ini akan memulai ulang aplikasinya dan mungkin membutuhkan beberapa waktu.</string>
     <string name="initial_sync_request_title">Permintaan sinkronisasi awal</string>
+    <string name="settings_show_latest_profile_description">Tampilkan info profil (avatar dan nama tampilan) terkini untuk semua pesan.</string>
+    <string name="settings_show_latest_profile">Tampilkan info pengguna terkini</string>
+    <string name="a11y_presence_busy">Sibuk</string>
+    <string name="keys_backup_settings_signature_from_this_user">Cadangan memiliki tandatangan yang valid dari pengguna ini.</string>
 </resources>
diff --git a/vector/src/main/res/values-is/strings.xml b/vector/src/main/res/values-is/strings.xml
index 892d56b795..19000920e0 100644
--- a/vector/src/main/res/values-is/strings.xml
+++ b/vector/src/main/res/values-is/strings.xml
@@ -1060,7 +1060,7 @@
     <string name="dev_tools_form_hint_type">Tegund</string>
     <string name="dev_tools_send_custom_event">Senda sérsniðinn atburð</string>
     <string name="dev_tools_explore_room_state">Skoða stöðu spjallrásar</string>
-    <string name="a11y_presence_unavailable">Ekki tiltækt</string>
+    <string name="a11y_presence_unavailable">Fjarverandi</string>
     <string name="a11y_presence_offline">Ónettengt</string>
     <string name="a11y_presence_online">Nettengt</string>
     <string name="a11y_rule_notify_off">Ekki tilkynna</string>
@@ -1724,7 +1724,6 @@
     <string name="settings_troubleshoot_test_play_services_title">Athugun á Play-þjónustum</string>
     <string name="upgrade_private_room">Uppfæra einkaspjallrás</string>
     <string name="upgrade_public_room">Uppfæra almenningsspjallrás</string>
-    <string name="leave_all_rooms_and_spaces">Yfirgefa allar spjallrásir og svæði</string>
     <string name="invite_by_email">Bjóða með tölvupósti</string>
     <string name="create_spaces_organise_rooms">Einkasvæði til að skipuleggja spjallrásirnar þínar</string>
     <string name="create_spaces_who_are_you_working_with">Hverjum ertu að vinna með\?</string>
@@ -1932,9 +1931,6 @@
     <string name="labs_auto_report_uisi">Tilkynna afkóðunarvillur sjálfvirkt.</string>
     <string name="space_add_space_to_any_space_you_manage">Bættu svæði við eitthvað svæði sem þú stýrir.</string>
     <string name="space_add_existing_rooms">Bæta við fyrirliggjandi spjallrásum og svæði</string>
-    <string name="pick_tings_to_leave">Veldu það sem á að yfirgefa</string>
-    <string name="leave_specific_ones">Yfirgefa tilteknar spjallrásir og svæði…</string>
-    <string name="dont_leave_any">Ekki yfirgefa neinar spjallrásir eða svæði</string>
     <string name="space_leave_prompt_msg_with_name">Ertu viss um að þú viljir yfirgefa %s\?</string>
     <string name="create_spaces_private_teammates">Einkasvæði fyrir þig og félaga í teyminu þínu</string>
     <string name="command_description_add_to_space">Bæta við í uppgefið svæði</string>
@@ -1976,4 +1972,54 @@
     <string name="threads_notice_migration_title">Spjallþræðir í bráðlegri Beta-útgáfu 🎉</string>
     <string name="call_transfer_consulting_with">Ráðfæri við %1$s</string>
     <string name="call_transfer_consult_first">Ráðfæra fyrst</string>
+    <string name="screen_sharing_notification_description">Deiling á skjá er í vinnslu</string>
+    <string name="screen_sharing_notification_title">${app_name} skjádeiling</string>
+    <string name="live_location_sharing_notification_description">Deiling staðsetningar er í vinnslu</string>
+    <string name="live_location_sharing_notification_title">${app_name} rauntímastaðsetning</string>
+    <string name="location_share_live_started">Hleð inn rauntímastaðsetningu…</string>
+    <string name="location_share_live_select_duration_option_3">8 klukkustundir</string>
+    <string name="location_share_live_select_duration_option_2">1 klukkustund</string>
+    <string name="location_share_live_select_duration_option_1">15 mínútur</string>
+    <string name="location_share_live_select_duration_title">Deildu rauntímastaðsetningu þinni í</string>
+    <string name="audio_message_file_size">(%1$s)</string>
+    <string name="audio_message_reply_content">%1$s (%2$s)</string>
+    <string name="error_audio_message_unable_to_play">Gat ekki spilað %1$s</string>
+    <string name="a11y_pause_audio_message">Setja %1$s í bið</string>
+    <string name="a11y_play_audio_message">Spila %1$s</string>
+    <string name="a11y_audio_playback_duration">%1$d mínútur %2$d sekúndur</string>
+    <string name="a11y_audio_message_item">%1$s, %2$s, %3$s</string>
+    <string name="a11y_presence_busy">Upptekinn</string>
+    <string name="call_transfer_transfer_to_title">Flytja yfir í %1$s</string>
+    <string name="bootstrap_progress_generating_ssss_recovery">Útbý SSSS-lykil úr endurheimtulykli</string>
+    <string name="bootstrap_progress_generating_ssss_with_info">Útbý SSSS-lykil úr lykilsetningu (%s)</string>
+    <string name="bootstrap_progress_generating_ssss">Útbý SSSS-lykil úr lykilsetningu</string>
+    <string name="bootstrap_progress_checking_backup_with_info">Athuga öryggisafritunarlykil (%s)</string>
+    <string name="bootstrap_finish_title">Þú ert búin/n!</string>
+    <string name="sent_live_location">Deildu raunstaðsetningu sinni</string>
+    <string name="notification_initial_sync">Upphafleg samstilling…</string>
+    <string name="seen_by">Séð af</string>
+    <string name="ftue_personalize_skip_this_step">Sleppa þessu skrefi</string>
+    <string name="ftue_personalize_submit">Vista og halda áfram</string>
+    <string name="ftue_personalize_complete_subtitle">Kjörstillingarnar þínar hafa verið vistaðar.</string>
+    <string name="ftue_personalize_complete_title">Nú ertu tilbúin(n)!</string>
+    <string name="ftue_personalize_lets_go">Hefjumst handa</string>
+    <string name="ftue_profile_picture_subtitle">Þú getur breytt þessu hvenær sem er.</string>
+    <string name="ftue_profile_picture_title">Bættu við auðkennismynd</string>
+    <string name="ftue_display_name_entry_footer">Þú getur breytt þessu síðar</string>
+    <string name="ftue_display_name_entry_title">Birtingarnafn</string>
+    <string name="ftue_display_name_title">Veldu birtingarnafn</string>
+    <string name="ftue_account_created_congratulations_title">Til hamingju!</string>
+    <string name="labs_allow_extended_logging">Virkja ítarlega atvikaskráningu.</string>
+    <string name="beta">BETA-prófunarútgáfa</string>
+    <string name="give_feedback_threads">Gefðu umsögn</string>
+    <string name="beta_title_bottom_sheet_action">BETA-prófunarútgáfa</string>
+    <string name="keys_backup_restore_is_getting_backup_version">Næ í útgáfu öryggisafrits…</string>
+    <string name="settings_presence_user_always_appears_offline">Ónettengdur hamur</string>
+    <string name="settings_presence">Viðvera</string>
+    <string name="call_stop_screen_sharing">Hætta skjádeilingu</string>
+    <string name="call_start_screen_sharing">Deila skjá</string>
+    <string name="action_learn_more">Kanna nánar</string>
+    <string name="action_try_it_out">Prófaðu það</string>
+    <string name="action_disable">Gera óvirkt</string>
+    <string name="initial_sync_request_title">Upphafleg samstillingarbeiðni</string>
 </resources>
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 3eec2c5f14..84b2285cc4 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -2192,10 +2192,6 @@
     <string name="space_add_space_to_any_space_you_manage">Aggiungi uno spazio ad un altro che gestisci.</string>
     <string name="space_add_existing_spaces">Aggiungi spazi esistenti</string>
     <string name="space_add_existing_rooms_only">Aggiungi stanze esistenti</string>
-    <string name="pick_tings_to_leave">Scegli da cosa uscire</string>
-    <string name="leave_specific_ones">Esci da stanze e spazi specifici…</string>
-    <string name="dont_leave_any">Non uscire da alcuna stanza e spazio</string>
-    <string name="leave_all_rooms_and_spaces">Esci da tutte le stanze e gli spazi</string>
     <string name="space_leave_prompt_msg_with_name">Vuoi davvero uscire da %s\?</string>
     <string name="finish_setup">Termina configurazione</string>
     <string name="discovery_invite">Invita per email, trova contatti e altro…</string>
@@ -2242,7 +2238,7 @@
     <string name="command_description_room_name">Imposta il nome della stanza</string>
     <string name="command_description_unignore_user">Smetti di ignorare un utente, mostrando i suoi messaggi successivi</string>
     <string name="command_description_ignore_user">Ignora un utente, non mostrandoti i suoi messaggi</string>
-    <string name="a11y_presence_unavailable">Non disponibile</string>
+    <string name="a11y_presence_unavailable">Assente</string>
     <string name="a11y_presence_offline">Offline</string>
     <string name="a11y_presence_online">Online</string>
     <string name="login_error_homeserver_from_url_not_found_enter_manual">Scegli homeserver</string>
@@ -2324,7 +2320,7 @@
     <string name="tooltip_attachment_photo">Apri fotocamera</string>
     <string name="labs_auto_report_uisi_desc">Il tuo sistema invierà automaticamente i log quando si verifica un errore di decifrazione</string>
     <string name="labs_auto_report_uisi">Auto-segnala errori di decifrazione.</string>
-    <string name="room_member_override_nick_color">Sovrascrivi colore nick</string>
+    <string name="room_member_override_nick_color">Sovrascrivi colore nome visualizzato</string>
     <string name="login_splash_already_have_account">Ho già un account</string>
     <string name="ftue_auth_carousel_encrypted_title">Messaggistica sicura.</string>
     <string name="ftue_auth_carousel_control_title">Tu hai il controllo.</string>
@@ -2481,4 +2477,8 @@
 \n
 \nNota che questa azione riavvierà l\'app e potrebbe richiedere del tempo.</string>
     <string name="initial_sync_request_title">Richiesta di sincronizzazione iniziale</string>
+    <string name="settings_show_latest_profile_description">Mostra le informazioni di profilo più recenti (avatar e nome visualizzato) per tutti i messaggi.</string>
+    <string name="settings_show_latest_profile">Mostra info utente più recenti</string>
+    <string name="a11y_presence_busy">Occupato</string>
+    <string name="keys_backup_settings_signature_from_this_user">Il backup ha una firma valida da questo utente.</string>
 </resources>
diff --git a/vector/src/main/res/values-iw/strings.xml b/vector/src/main/res/values-iw/strings.xml
index 2a40246e3b..65071af708 100644
--- a/vector/src/main/res/values-iw/strings.xml
+++ b/vector/src/main/res/values-iw/strings.xml
@@ -2272,10 +2272,6 @@
     <string name="space_add_existing_spaces">הוסף מרחבים קיימים</string>
     <string name="space_add_existing_rooms_only">הוסף חדרים קיימים</string>
     <string name="space_add_existing_rooms">הוסף חדרים ומרחבים קיימים</string>
-    <string name="pick_tings_to_leave">בחר דברים להשאיר</string>
-    <string name="leave_specific_ones">השאירו חדרים ומרחבים ספציפיים…</string>
-    <string name="dont_leave_any">אל תעזובו חדרים וא מרחבים</string>
-    <string name="leave_all_rooms_and_spaces">עזבו את כל החדרים והמרחבים</string>
     <string name="space_leave_prompt_msg_as_admin">אתה המנהל היחיד של המרחב הזה. עזיבה תגרום לכך שאף אחד לא ישלוט על המרחב.</string>
     <string name="space_leave_prompt_msg_private">לא תוכל להצטרף מחדש אלא אם כן תוזמן מחדש.</string>
     <string name="space_leave_prompt_msg_only_you">אתה האדם היחיד כאן. אם תעזוב, אף אחד לא יוכל להצטרף בעתיד, כולל אותך.</string>
diff --git a/vector/src/main/res/values-ja/strings.xml b/vector/src/main/res/values-ja/strings.xml
index 8852358966..3510db2dac 100644
--- a/vector/src/main/res/values-ja/strings.xml
+++ b/vector/src/main/res/values-ja/strings.xml
@@ -1653,7 +1653,6 @@
     <string name="login_a11y_choose_matrix_org">matrix.orgを選択</string>
     <string name="space_add_existing_spaces">既存のスペースを追加</string>
     <string name="space_add_existing_rooms_only">既存のルームを追加</string>
-    <string name="leave_all_rooms_and_spaces">全てのルームとスペースから退出</string>
     <string name="finish_setup">セットアップを終了</string>
     <string name="create_spaces_default_public_random_room_name">ランダム</string>
     <string name="create_spaces_loading_message">スペースを作成しています…</string>
@@ -1879,8 +1878,6 @@
     </plurals>
     <string name="invite_to_space">%sに招待</string>
     <string name="invite_by_username_or_mail">ユーザー名かメールアドレスで招待</string>
-    <string name="dont_leave_any">どのルームやスペースからも退出しない</string>
-    <string name="pick_tings_to_leave">退出するルームとスペースを選択</string>
     <string name="space_leave_prompt_msg_with_name">%sを退出してよろしいですか？</string>
     <string name="spaces_beta_welcome_to_spaces_desc">スペースは、ルームや連絡先をグループ化する新しい方法です。</string>
     <string name="you_are_invited">招待されています</string>
@@ -1939,7 +1936,6 @@
     <string name="login_server_url_form_modular_hint">Element Matrix Servicesのアドレス</string>
     <string name="login_signin_to">%1$sにサインイン</string>
     <string name="ftue_auth_use_case_title">誰と最もよく会話しますか？</string>
-    <string name="leave_specific_ones">特定のルームとスペースから退出…</string>
     <string name="this_space_has_no_rooms_not_admin">非公開で招待が必要なルームは表示されていません。
 \nルームを追加する権限はありません。</string>
     <string name="this_space_has_no_rooms_admin">非公開で招待が必要なルームは表示されていません。</string>
diff --git a/vector/src/main/res/values-lo/strings.xml b/vector/src/main/res/values-lo/strings.xml
index 3d12927ac7..af65313257 100644
--- a/vector/src/main/res/values-lo/strings.xml
+++ b/vector/src/main/res/values-lo/strings.xml
@@ -1471,10 +1471,6 @@
     <string name="space_add_existing_spaces">ເພີ່ມພື້ນທີ່ທີ່ມີຢູ່</string>
     <string name="space_add_existing_rooms_only">ເພີ່ມຫ້ອງທີ່ມີຢູ່</string>
     <string name="space_add_existing_rooms">ເພີ່ມຫ້ອງ ແລະພື້ນທີ່ທີ່ມີຢູ່</string>
-    <string name="pick_tings_to_leave">ເລືອກສິ່ງທີ່ຕ້ອງອອກໄປ</string>
-    <string name="leave_specific_ones">ອອກຈາກຫ້ອງ ແລະພື້ນທີ່ສະເພາະ…</string>
-    <string name="dont_leave_any">ຢ່າອອກຈາກຫ້ອງ ແລະ ພື້ນທີ່ໃດໆ</string>
-    <string name="leave_all_rooms_and_spaces">ອອກຈາກຫ້ອງ ແລະ ພື້ນທີ່ທັງໝົດ</string>
     <string name="space_leave_prompt_msg_as_admin">ທ່ານພຽງຜູ້ທີ່ເບິ່ງແຍງລະບົບພື້ນທີ່ນີ້. ການອອກຈາກລະບົບນັ້ນຫມາຍຄວາມວ່າບໍ່ມີໃຜຄວບຄຸມມັນ.</string>
     <string name="space_leave_prompt_msg_private">ທ່ານຈະບໍ່ສາມາດເຂົ້າຮ່ວມຄືນໃໝ່ໄດ້ເວັ້ນເສຍແຕ່ວ່າທ່ານໄດ້ຮັບເຊີນຄືນໃໝ່.</string>
     <string name="space_leave_prompt_msg_only_you">ທ່ານເປັນຄົນດຽວຢູ່ທີ່ນີ້. ຖ້າທ່ານອອກໄປ, ບໍ່ມີໃຜຈະສາມາດເຂົ້າຮ່ວມໃນອະນາຄົດ, ລວມທັງທ່ານ.</string>
@@ -2018,7 +2014,7 @@
     <string name="dev_tools_send_custom_event">ສົ່ງເຫດການທີ່ກຳນົດເອງ</string>
     <string name="dev_tools_explore_room_state">ສຳຫຼວດສະຖານະຫ້ອງ</string>
     <string name="dev_tools_menu_name">ເຄື່ອງມືພັດທະນາ</string>
-    <string name="a11y_presence_unavailable">ບໍ່ສາມາດໃຊ້ໄດ້</string>
+    <string name="a11y_presence_unavailable">ບໍ່ຢູ່</string>
     <string name="a11y_presence_offline">ອອຟລາຍ</string>
     <string name="a11y_presence_online">ອອນລາຍ</string>
     <string name="a11y_public_room">ຫ້ອງສາທາລະນະ</string>
@@ -2243,7 +2239,7 @@
     <string name="room_member_power_level_custom">ກຳນົດເອງ</string>
     <string name="room_member_power_level_moderators">ຜູ້ຄວບຄຸມ</string>
     <string name="room_member_power_level_admins">ຜູ້ເບິ່ງແຍງລະບົບ</string>
-    <string name="room_member_override_nick_color">ລົບລ້າງສີ nick</string>
+    <string name="room_member_override_nick_color">ໂຊທັບສີຂອງຊື່ນີ້</string>
     <string name="room_profile_leaving_room">ກຳລັງອອກຈາກຫ້ອງ…</string>
     <string name="direct_room_profile_section_more_leave">ອອກໄປ</string>
     <string name="room_profile_section_more_leave">ອອກຈາກຫ້ອງ</string>
@@ -2441,4 +2437,8 @@
     <string name="a11y_stop_voice_message">ຢຸດການບັນທຶກ</string>
     <string name="a11y_pause_voice_message">ຢຸດຂໍ້ຄວາມສຽງຊົ່ວຄາວ</string>
     <string name="a11y_play_voice_message">ຫຼິ້ນຂໍ້ຄວາມສຽງ</string>
+    <string name="settings_show_latest_profile_description">ໂຊຂໍ້ມູນໂປຟາຍລ້າສຸດ (ໂຕກະຕູນ ແລະ ຊື່ສະແດງ) ສຳລັບທຸກໆຂໍ້ຄວາມ.</string>
+    <string name="settings_show_latest_profile">ໂຊຂໍ້ມູນຜູ້ໃຊ້ລ້າສຸດ</string>
+    <string name="a11y_presence_busy">ບໍ່ວ່າງ</string>
+    <string name="keys_backup_settings_signature_from_this_user">ແບັກອັບມີລາຍເຊັນຖືກຕ້ອງຈາກຜູ້ໃຊ້ນີ້.</string>
 </resources>
diff --git a/vector/src/main/res/values-lo/strings_no_weblate.xml b/vector/src/main/res/values-lo/strings_no_weblate.xml
new file mode 100644
index 0000000000..d4c584c65f
--- /dev/null
+++ b/vector/src/main/res/values-lo/strings_no_weblate.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="resources_language">lo</string>
+    <string name="resources_country_code">LA</string>
+    <string name="resources_script">Laoo</string>
+
+</resources>
diff --git a/vector/src/main/res/values-nl/strings.xml b/vector/src/main/res/values-nl/strings.xml
index 3397415ab7..a8fd805668 100644
--- a/vector/src/main/res/values-nl/strings.xml
+++ b/vector/src/main/res/values-nl/strings.xml
@@ -1691,7 +1691,7 @@
     <string name="dev_tools_send_custom_event">Aangepaste gebeurtenis versturen</string>
     <string name="dev_tools_explore_room_state">Kamer status ontdekken</string>
     <string name="dev_tools_menu_name">Ontwikkel tools</string>
-    <string name="a11y_presence_unavailable">Niet beschikbaar</string>
+    <string name="a11y_presence_unavailable">Afwezig</string>
     <string name="a11y_presence_offline">Offline</string>
     <string name="a11y_presence_online">Online</string>
     <string name="a11y_public_room">Openbare kamer</string>
@@ -2268,10 +2268,6 @@
     <string name="space_add_existing_spaces">Bestaande spaces toevoegen</string>
     <string name="space_add_existing_rooms_only">Bestaande kamers toevoegen</string>
     <string name="space_add_existing_rooms">Bestaande kamers en space toevoegen</string>
-    <string name="pick_tings_to_leave">Kies dingen om te verlaten</string>
-    <string name="leave_specific_ones">Specifieke kamers en spaces verlaten…</string>
-    <string name="dont_leave_any">Verlaat geen kamers en spaces</string>
-    <string name="leave_all_rooms_and_spaces">Verlaat alle kamers en spaces</string>
     <string name="space_leave_prompt_msg_private">U kunt pas weer deelnemen als u opnieuw wordt uitgenodigd.</string>
     <string name="space_leave_prompt_msg_only_you">U bent de enige persoon hier. Als u weggaat, kan niemand meer meedoen, ook u niet.</string>
     <string name="space_leave_prompt_msg_with_name">Weet u zeker dat u %s wilt verlaten\?</string>
@@ -2334,7 +2330,7 @@
     <string name="command_description_join_space">Word lid van de Space met het opgegeven id</string>
     <string name="command_description_add_to_space">Toevoegen aan een Space</string>
     <string name="command_description_create_space">Maak een Space</string>
-    <string name="room_member_override_nick_color">Bijnaam kleur overschrijven</string>
+    <string name="room_member_override_nick_color">Kleur weergavenaam overschrijven</string>
     <string name="login_splash_already_have_account">Ik heb al een account</string>
     <string name="ftue_auth_carousel_encrypted_title">Veilig berichtenverkeer.</string>
     <string name="ftue_auth_carousel_control_title">U heeft de controle.</string>
@@ -2490,4 +2486,8 @@
 \n
 \nHoud er rekening mee dat deze actie de app opnieuw zal starten en dat dit enige tijd kan duren.</string>
     <string name="initial_sync_request_title">Initieel synchronisatieverzoek</string>
+    <string name="settings_show_latest_profile_description">Toon de laatste profielinformatie (avatar en weergavenaam) voor alle berichten.</string>
+    <string name="settings_show_latest_profile">Toon laatste persoonsinformatie</string>
+    <string name="a11y_presence_busy">Bezet</string>
+    <string name="keys_backup_settings_signature_from_this_user">Back-up heeft een geldige handtekening van deze persoon.</string>
 </resources>
diff --git a/vector/src/main/res/values-pl/strings.xml b/vector/src/main/res/values-pl/strings.xml
index d6fef1c620..7738b099df 100644
--- a/vector/src/main/res/values-pl/strings.xml
+++ b/vector/src/main/res/values-pl/strings.xml
@@ -736,8 +736,8 @@
     <string name="settings_show_join_leave_messages_summary">Zaproszenia, usunięcia i bany pozostają nienaruszone.</string>
     <string name="settings_send_message_with_enter">Wysyłaj wiadomości za pomocą klawisza enter</string>
     <string name="settings_send_message_with_enter_summary">Przycisk enter na klawiaturze programowej wyśle wiadomość zamiast wprowadzania łamanania linii</string>
-    <string name="settings_discovery_category">Znajdź</string>
-    <string name="settings_discovery_manage">Zarządzaj ustawieniami wyszukiwania.</string>
+    <string name="settings_discovery_category">Ustawienia wyszukiwania</string>
+    <string name="settings_discovery_manage">Ustal jak inni mogą odnaleść twoje konto.</string>
     <string name="settings_media">Media</string>
     <string name="settings_default_media_source">Domyślne źródło mediów</string>
     <string name="encryption_message_recovery">Odzyskiwanie zaszyforwanych wiadomości</string>
@@ -1619,7 +1619,7 @@
     <string name="settings_security_pin_code_summary">Jeżeli chcesz zresetować kod PIN, naciśnij Zapomnij kod PIN aby wylogować i zresetować.</string>
     <string name="settings_security_pin_code_title">Włącz kod PIN</string>
     <string name="settings_security_application_protection_screen_title">Skonfiguruj ochronę</string>
-    <string name="settings_security_application_protection_summary">Ochrona dostępu poprzez kod PIN oraz biometrię.</string>
+    <string name="settings_security_application_protection_summary">Blokada aplikacji poprzez kod PIN oraz biometrię.</string>
     <string name="settings_security_application_protection_title">Ochrona dostępu</string>
     <string name="auth_pin_reset_content">Aby zresetować kod PIN musisz się ponownie zalogować i utworzyć nowy.</string>
     <string name="auth_pin_new_pin_action">Nowy kod PIN</string>
@@ -1851,7 +1851,7 @@
         <item quantity="many">%d nie odebranych połączeń głosowych</item>
         <item quantity="other">%d nie odebranych połączeń głosowych</item>
     </plurals>
-    <string name="call_ringing">Połączenie przychodzące…</string>
+    <string name="call_ringing">Dzwoni…</string>
     <string name="error_unauthorized">Błąd autoryzacji, niepoprawne dane logowania</string>
     <string name="login_error_homeserver_from_url_not_found_enter_manual">Wybierz serwer domowy</string>
     <string name="login_error_homeserver_from_url_not_found">Nie można było połączyć się z serwerem domowym %s. Proszę sprawdzić link lub wybrać serwer domowy manualnie.</string>
@@ -1964,15 +1964,11 @@
     <string name="looking_for_someone_not_in_space">Szukasz kogoś , kto nie jest w %s\?</string>
     <string name="user_invites_you">%s Cię zaprasza</string>
     <string name="you_are_invited">Zostałeś zaproszony</string>
-    <string name="spaces_beta_welcome_to_spaces_desc">Przestrzenie są nową metodą na zarządzanie pokojami i osobami.</string>
+    <string name="spaces_beta_welcome_to_spaces_desc">Przestrzenie są nową metodą na grupowanie razem wielu pokoi i osób.</string>
     <string name="space_add_space_to_any_space_you_manage">Dodaj przestrzeń do jakiejkolwiek przestrzeni którą zarządzasz.</string>
     <string name="space_add_existing_spaces">Dodaj istniejące przestrzenie</string>
     <string name="space_add_existing_rooms_only">Dodaj istniejące pokoje</string>
     <string name="space_add_existing_rooms">Dodaj istniejące pokoje i przestrzenie</string>
-    <string name="pick_tings_to_leave">Wybierz aby opuścić</string>
-    <string name="leave_specific_ones">Opuść wybrane pokoje i przestrzenie…</string>
-    <string name="dont_leave_any">Nie opuszczaj żadnych pokojów i przestrzeni</string>
-    <string name="leave_all_rooms_and_spaces">Opuść wszystkie pokoje i przestrzenie</string>
     <string name="space_leave_prompt_msg_as_admin">Jesteś jedynym administratorem tej przestrzeni. Opuszczenie jej oznacza brak kontroli nad nią.</string>
     <string name="space_leave_prompt_msg_private">Nie będziesz w stanie ponownie dołączyć, do momentu kiedy nie zostaniesz ponownie zaproszony.</string>
     <string name="space_leave_prompt_msg_only_you">Jesteś jedyną osoba tutaj. Jeśli wyjdziesz, nikt nie będzie w stanie dołączyć w przyszłości, włączając Ciebie.</string>
@@ -2083,7 +2079,7 @@
     <string name="give_feedback">Podziel się opinią</string>
     <string name="feedback_failed">Nie udało się przesłać opinii (%s)</string>
     <string name="feedback_sent">Dziękujemy, Twoja opinia została wysłana</string>
-    <string name="you_may_contact_me">Zachęcamy do kontaktu, jeśli masz dodatkowe pytania</string>
+    <string name="you_may_contact_me">Pozwalam na kontakt ze mną w razie dodatkowych pytań</string>
     <string name="send_feedback_space_info">Używasz przestrzeni w wersji beta. Ta opinia pomoże nam w tworzeniu kolejnych wersji. Twoja platforma i nazwa użytkownika zostaną odnotowane, abyśmy mogli w pełni wykorzystać Twoje sugestie.</string>
     <string name="send_feedback_space_title">Prześlij opinię o przestrzeniach</string>
     <string name="create_new_space">Stwórz nową przestrzeń</string>
@@ -2258,7 +2254,7 @@
     <string name="dev_tools_edit_content">Edytuj treść</string>
     <string name="dev_tools_explore_room_state">Poznaj stan pokoju</string>
     <string name="dev_tools_menu_name">Narzędzia deweloperskie</string>
-    <string name="a11y_presence_unavailable">Niedostępny</string>
+    <string name="a11y_presence_unavailable">Nieobecny</string>
     <string name="a11y_public_room">Pokój publiczny</string>
     <string name="a11y_rule_notify_off">Nie powiadamiaj</string>
     <string name="a11y_rule_notify_silent">Powiadom bez dźwięku</string>
@@ -2321,7 +2317,7 @@
         <item quantity="many">Usunąłeś(aś) %1$s jako adresy tego pokoju.</item>
         <item quantity="other">Usunąłeś(aś) %1$s jako adresy tego pokoju.</item>
     </plurals>
-    <string name="room_member_override_nick_color">Nadpisz kolor nicku</string>
+    <string name="room_member_override_nick_color">Zastąp kolor wyświetlanej nazwy</string>
     <string name="login_splash_already_have_account">Posiadam już konto</string>
     <string name="ftue_auth_carousel_encrypted_title">Połącz się z każdym.</string>
     <string name="ftue_auth_carousel_control_title">Ty jesteś w kontroli.</string>
@@ -2583,4 +2579,8 @@
     <string name="call_start_screen_sharing">Udostępnij ekran</string>
     <string name="initial_sync_request_reason_unignored_users">- Niektórzy użytkownicy przestali być ignorowani</string>
     <string name="initial_sync_request_title">Początkowe żądanie synchronizacji</string>
+    <string name="keys_backup_settings_signature_from_this_user">Kopia zapasowa ma poprawny podpis tego użytkownika.</string>
+    <string name="settings_show_latest_profile_description">Pokazuj aktualny stan profilu (obraz i nazwa) w całej historii konwersacji.</string>
+    <string name="settings_show_latest_profile">Pokazuj najnowsze informacje o użytkowniku</string>
+    <string name="a11y_presence_busy">Zajęty</string>
 </resources>
diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index 97896dec64..4bc0888b01 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -2198,10 +2198,6 @@
     <string name="space_add_space_to_any_space_you_manage">Adicione um espaço a qualquer espaço que você gerencia.</string>
     <string name="space_add_existing_spaces">Adicionar espaços existentes</string>
     <string name="space_add_existing_rooms_only">Adicionar salas existentes</string>
-    <string name="pick_tings_to_leave">Escolha coisas para sair</string>
-    <string name="leave_specific_ones">Sair de salas e espaços específicos…</string>
-    <string name="dont_leave_any">Não sair de nenhuma sala ou espaço</string>
-    <string name="leave_all_rooms_and_spaces">Sair de todas as salas e espaços</string>
     <string name="space_leave_prompt_msg_with_name">Você tem certeza que você quer sair de %s\?</string>
     <string name="discovery_section">Descoberta (%s)</string>
     <string name="finish_setup">Terminar configuração</string>
@@ -2251,7 +2247,7 @@
     <string name="command_description_room_name">Define o nome da sala</string>
     <string name="command_description_unignore_user">Para de ignorar um/uma usuário(a), mostrando as mensagens dele/dela de agora em diante</string>
     <string name="command_description_ignore_user">Ignora um/uma usuário(a), escondendo as mensagens dele/dela de você</string>
-    <string name="a11y_presence_unavailable">Indisponível</string>
+    <string name="a11y_presence_unavailable">Fora</string>
     <string name="a11y_presence_offline">Offline</string>
     <string name="a11y_presence_online">Online</string>
     <string name="login_error_homeserver_from_url_not_found_enter_manual">Escolher servidorcasa</string>
@@ -2333,7 +2329,7 @@
     <string name="tooltip_attachment_photo">Abrir câmera</string>
     <string name="labs_auto_report_uisi_desc">Seu sistema vai automaticamente enviar logs quando um erro incapaz de decriptar ocorre</string>
     <string name="labs_auto_report_uisi">Auro Reportar Erros de Decriptação.</string>
-    <string name="room_member_override_nick_color">Sobrepor cor de nick</string>
+    <string name="room_member_override_nick_color">Sobrepor cor de nome de exibição</string>
     <string name="login_splash_already_have_account">Eu já tenho uma conta</string>
     <string name="ftue_auth_carousel_encrypted_title">Mensageria segura.</string>
     <string name="ftue_auth_carousel_control_title">Você está em controle.</string>
@@ -2490,4 +2486,8 @@
 \n
 \nNote que esta ação vai recomeçar o app e pode levar algum tempo.</string>
     <string name="initial_sync_request_title">Requisição de sinc inicial</string>
+    <string name="settings_show_latest_profile_description">Mostrar a info de perfil mais recente (avatar e nome de exibição) para todas as mensagens.</string>
+    <string name="settings_show_latest_profile">Mostrar info de usuária(o) mais recente</string>
+    <string name="a11y_presence_busy">Ocupada(o)</string>
+    <string name="keys_backup_settings_signature_from_this_user">Backup tem uma assinatura válida desta(e) usuária(o).</string>
 </resources>
diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index cbc4bea123..5d8a8a7c10 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="notice_room_invite_no_invitee">%s приглашение</string>
+    <string name="notice_room_invite_no_invitee">приглашение %s</string>
     <string name="notice_room_invite">%1$s пригласил(а) %2$s</string>
     <string name="notice_room_invite_you">%1$s пригласил(а) вас</string>
     <string name="notice_room_join">%1$s вошёл(ла) в комнату</string>
@@ -46,7 +46,7 @@
     <string name="initial_sync_start_importing_account_rooms">Начальная синхронизация:
 \nИмпорт комнат</string>
     <string name="initial_sync_start_importing_account_joined_rooms">Начальная синхронизация:
-\nЗагрузка ваших бесед
+\nВаши беседы загружаются
 \nЕсли вы присоединились к большому количеству комнат, это может занять некоторое время</string>
     <string name="initial_sync_start_importing_account_invited_rooms">Начальная синхронизация:
 \nИмпорт приглашенных комнат</string>
@@ -417,9 +417,7 @@
     <string name="settings_new_password">Новый пароль</string>
     <string name="settings_fail_to_update_password">Не удалось обновить пароль</string>
     <string name="settings_password_updated">Пароль был обновлен</string>
-    <string name="settings_unignore_user">Отображать сообщения пользователя %s\? 
-\n
-\nУчтите, что это действие перезапустит приложение и может занять некоторое время.</string>
+    <string name="settings_unignore_user">Показать все сообщения %s\?</string>
     <string name="settings_select_country">Выберите страну</string>
     <string name="room_settings_topic">Тема</string>
     <string name="room_settings_room_read_history_rules_pref_title">Доступ к истории комнаты</string>
@@ -531,7 +529,7 @@
     <string name="has_been_banned">Вас заблокировал %2$s в %1$s</string>
     <string name="reason_colon">Причина: %1$s</string>
     <string name="send_bug_report_rage_shake">Встряхните устройство, чтобы сообщить об ошибке</string>
-    <string name="list_members">Список участников</string>
+    <string name="list_members">Участники</string>
     <plurals name="notification_unread_notified_messages_in_room_rooms">
         <item quantity="one">%d комната</item>
         <item quantity="few">%d комнаты</item>
@@ -610,8 +608,8 @@
     <string name="command_description_nick">Изменить ваше отображаемое имя</string>
     <string name="command_description_markdown">Вкл/выкл markdown</string>
     <string name="room_tombstone_versioned_description">Эта комната была заменена и больше не активна.</string>
-    <string name="room_tombstone_continuation_link">Этот разговор продолжается здесь</string>
-    <string name="room_tombstone_continuation_description">Эта комната является продолжением другого разговора</string>
+    <string name="room_tombstone_continuation_link">Беседа продолжается здесь</string>
+    <string name="room_tombstone_continuation_description">Эта комната — продолжение другой беседы</string>
     <string name="room_tombstone_predecessor_link">Нажмите здесь для просмотра старых сообщений</string>
     <string name="command_description_join_room">Присоединиться к комнате с указанным адресом</string>
     <string name="command_description_clear_scalar_token">Для исправления управления приложениями Matrix</string>
@@ -901,7 +899,7 @@
     <string name="room_list_catchup_empty_title">Вы в теме!</string>
     <string name="room_list_catchup_empty_body">У вас больше нет непрочитанных сообщений</string>
     <string name="room_list_people_empty_title">Беседы</string>
-    <string name="room_list_people_empty_body">Здесь будут отображаться ваши диалоги. Нажмите + внизу справа, чтобы начать что-то.</string>
+    <string name="room_list_people_empty_body">Здесь будут ваши диалоги. Нажмите кнопку «+» внизу справа, чтобы начать беседу.</string>
     <string name="room_list_rooms_empty_title">Комнаты</string>
     <string name="room_list_rooms_empty_body">Здесь будут отображаться ваши комнаты. Коснитесь + внизу справа, чтобы найти существующие или создать свои.</string>
     <string name="title_activity_emoji_reaction_picker">Реакции</string>
@@ -961,7 +959,7 @@
     <string name="edited_suffix">(изменено)</string>
     <string name="message_edits">Изменение сообщения</string>
     <string name="no_message_edits_found">Изменения не найдены</string>
-    <string name="room_filtering_filter_hint">Отфильтровывать разговоры…</string>
+    <string name="room_filtering_filter_hint">Отфильтровать беседы…</string>
     <string name="room_filtering_footer_title">Не можете найти то, что ищете\?</string>
     <string name="room_filtering_footer_create_new_room">Создать новую комнату</string>
     <string name="room_filtering_footer_create_new_direct_message">Отправить новое сообщение в диалог</string>
@@ -1073,7 +1071,7 @@
     <string name="reaction_search_type_hint">Введите ключевые слова, чтобы найти реакцию.</string>
     <string name="help_long_click_on_room_for_more_options">Долгий клик по комнате покажет дополнительные опции</string>
     <string name="timeline_unread_messages">Непрочитанные сообщения</string>
-    <string name="login_splash_title">Это ваш разговор. Владейте им.</string>
+    <string name="login_splash_title">Это ваша переписка. Контролируйте её.</string>
     <string name="login_splash_text1">Общайтесь с людьми напрямую или в группах</string>
     <string name="login_splash_submit">Начнем</string>
     <string name="login_server_title">Выберите сервер</string>
@@ -1307,7 +1305,7 @@
 \n
 \nВы можете отменить это действие в любое время в общих настройках.</string>
     <string name="room_participants_action_unignore_title">Перестать игнорировать пользователя</string>
-    <string name="room_participants_action_unignore_prompt_msg">Если вы перестанете игнорировать этого пользователя, то все его сообщения вновь будут отображаться.</string>
+    <string name="room_participants_action_unignore_prompt_msg">Если вы перестанете игнорировать этого пользователя, то вы увидите все его сообщения снова.</string>
     <string name="room_participants_action_cancel_invite_title">Отменить приглашение</string>
     <string name="room_participants_action_cancel_invite_prompt_msg">Вы уверены, что хотите отменить приглашение для этого пользователя\?</string>
     <string name="room_participants_remove_title">Выгнать пользователя</string>
@@ -1354,7 +1352,7 @@
     <string name="no_ignored_users">Вы не игнорируете никаких пользователей</string>
     <string name="room_join_rules_public_by_you">Вы сделали комнату доступной для всех, у кого есть ссылка.</string>
     <string name="room_join_rules_invite_by_you">Вы сделали комнату только по приглашению.</string>
-    <string name="login_splash_text2">Сохраняйте конфиденциальность разговоров с помощью шифрования</string>
+    <string name="login_splash_text2">Храните тайну переписки с помощью шифрования</string>
     <string name="login_splash_text3">Расширьте и персонализируйте свой опыт использования</string>
     <string name="login_server_matrix_org_text">Присоединяйтесь к миллионам бесплатно на крупнейшем публичном сервере</string>
     <string name="login_signin_to">Войти в %1$s</string>
@@ -1824,7 +1822,7 @@
     <string name="add_people">Добавить людей</string>
     <string name="topic_prefix">"Тема: "</string>
     <string name="add_a_topic_link_text">Добавьте тему</string>
-    <string name="this_is_the_beginning_of_room_no_name">Это начало разговора.</string>
+    <string name="this_is_the_beginning_of_room_no_name">Это начало беседы.</string>
     <string name="this_is_the_beginning_of_room">Это начало %s.</string>
     <string name="room_settings_enable_encryption_no_permission">У вас нет разрешения на включение шифрования в этой комнате.</string>
     <string name="create_room_in_progress">Создание комнаты…</string>
@@ -2264,10 +2262,6 @@
     <string name="space_add_space_to_any_space_you_manage">Добавьте пространство в любое пространство, которым вы управляете.</string>
     <string name="space_add_existing_spaces">Добавить существующие пространства</string>
     <string name="space_add_existing_rooms_only">Добавить существующие комнаты</string>
-    <string name="pick_tings_to_leave">Выберите, что нужно покинуть</string>
-    <string name="leave_specific_ones">Покинуть определенные комнаты и пространства…</string>
-    <string name="dont_leave_any">Не покидать ни одну комнату и пространство</string>
-    <string name="leave_all_rooms_and_spaces">Покинуть все комнаты и пространства</string>
     <string name="space_leave_prompt_msg_with_name">Вы уверены, что хотите покинуть %s\?</string>
     <string name="discovery_section">Обнаружение (%s)</string>
     <string name="finish_setup">Завершение настройки</string>
@@ -2404,11 +2398,11 @@
     <string name="login_splash_create_account">Создать учетную запись</string>
     <string name="ftue_auth_carousel_workplace_title">Обмен сообщениями для вашей команды.</string>
     <string name="ftue_auth_carousel_encrypted_body">Сквозное шифрование не требующее номера телефона. Нет рекламы или сбора данных.</string>
-    <string name="ftue_auth_carousel_control_body">Выбор где хранятся ваши разговоры дает вам власть и независимость. Подключено с помощью Matrix.</string>
+    <string name="ftue_auth_carousel_control_body">Решайте самостоятельно и независимо, где хранить беседы. Благодаря Matrix.</string>
     <string name="ftue_auth_carousel_secure_body">Безопасное и независимое общение, обеспечивающее вам такой же уровень конфиденциальности, как при личном общении в вашем собственном доме.</string>
     <string name="ftue_auth_carousel_encrypted_title">Безопасный обмен сообщениями.</string>
     <string name="ftue_auth_carousel_control_title">Ваше управление.</string>
-    <string name="ftue_auth_carousel_secure_title">Ваши собственные разговоры.</string>
+    <string name="ftue_auth_carousel_secure_title">Контролируйте свою переписку.</string>
     <string name="attachment_type_location">Местоположение</string>
     <string name="identity_server_consent_dialog_content_question">Вы согласны отправить эту информацию\?</string>
     <string name="identity_server_consent_dialog_content_3">Чтобы обнаружить существующие контакты, необходимо отправить контактную информацию (электронную почту и номера телефонов) на сервер обнаружения. Мы хешируем ваши данные перед отправкой для обеспечения конфиденциальности.</string>
@@ -2441,7 +2435,7 @@
     <string name="login_error_homeserver_from_url_not_found">Не могу связаться с домашним сервером на URL %s. Пожалуйста, проверьте вашу ссылку или выберите домашний сервер вручную.</string>
     <string name="action_not_now">Не сейчас</string>
     <string name="action_enable">Включить</string>
-    <string name="notification_listening_for_notifications">Поиск уведомлений</string>
+    <string name="notification_listening_for_notifications">Ожидание уведомлений</string>
     <string name="room_error_access_unauthorized">Вам не разрешено подключаться к этой комнате</string>
     <string name="thread_list_empty_title">Организуйте обсуждение с помощью веток</string>
     <string name="thread_list_modal_my_threads_subtitle">Показать все ветки, в которых вы участвуете</string>
@@ -2468,7 +2462,7 @@
     <string name="command_not_supported_in_threads">Команда «%s» распознается, но не поддерживается в ветках.</string>
     <string name="search_thread_from_a_thread">Из ветки</string>
     <string name="thread_list_empty_notice">Совет: нажмите и удерживайте сообщение и используйте «%s».</string>
-    <string name="thread_list_empty_subtitle">Ветки помогают хранить ваши разговоры по темам и легко отслеживать их.</string>
+    <string name="thread_list_empty_subtitle">Ветки помогают не терять нить беседы, и за ними легко следить.</string>
     <string name="thread_list_modal_my_threads_title">Мои ветки</string>
     <string name="thread_list_modal_all_threads_subtitle">Показать все ветки этой комнаты</string>
     <string name="thread_list_modal_title">Фильтр</string>
@@ -2494,4 +2488,32 @@
         <item quantity="many">%d изменений ACL сервера</item>
         <item quantity="other">%d изменений ACL сервера</item>
     </plurals>
+    <string name="ftue_personalize_lets_go">Поехали!</string>
+    <string name="ftue_profile_picture_subtitle">Его можно изменить позже</string>
+    <string name="ftue_profile_picture_title">Добавить аватар</string>
+    <string name="ftue_display_name_entry_footer">Его можно изменить позже</string>
+    <string name="ftue_display_name_entry_title">Имя для показа</string>
+    <string name="ftue_display_name_subtitle">Показывается, когда вы отправляете сообщения.</string>
+    <string name="ftue_display_name_title">Выберите имя для показа</string>
+    <string name="ftue_account_created_subtitle">Ваш аккаунт «%s» создан.</string>
+    <string name="ftue_account_created_congratulations_title">Поздравляем!</string>
+    <string name="ftue_account_created_take_me_home">Домой</string>
+    <string name="ftue_account_created_personalize">Персонализировать</string>
+    <string name="beta">БЕТА</string>
+    <string name="send_feedback_threads_title">Отзывы на бета-версию веток</string>
+    <string name="give_feedback_threads">Оставить отзыв</string>
+    <string name="beta_title_bottom_sheet_action">БЕТА</string>
+    <string name="settings_presence_user_always_appears_offline_summary">Если включено, для других вы всегда будете выглядеть, как в офлайне, даже при использовании приложения.</string>
+    <string name="settings_presence_user_always_appears_offline">Офлайн-режим</string>
+    <string name="threads_labs_enable_notice_title">Бета-версия веток</string>
+    <string name="threads_beta_enable_notice_title">Бета-версия веток</string>
+    <string name="threads_notice_migration_title">Ветки почти в бете 🎉</string>
+    <string name="call_stop_screen_sharing">Остановить демонстрацию экрана</string>
+    <string name="call_start_screen_sharing">Демонстрировать экран</string>
+    <string name="action_learn_more">Узнать больше</string>
+    <string name="action_try_it_out">Попробуйте</string>
+    <string name="action_disable">Отключить</string>
+    <string name="initial_sync_request_reason_unignored_users">- Несколько пользователей больше не игнорируются</string>
+    <string name="initial_sync_request_title">Начальный запрос на синхронизацию</string>
+    <string name="threads_beta_enable_notice_message">Ветки помогают не терять нить беседы, и за ними легко следить.%sВключение веток обновит приложение. Может занять продолжительное время.</string>
 </resources>
diff --git a/vector/src/main/res/values-sk/strings.xml b/vector/src/main/res/values-sk/strings.xml
index a7a9f152fd..05562b7b4b 100644
--- a/vector/src/main/res/values-sk/strings.xml
+++ b/vector/src/main/res/values-sk/strings.xml
@@ -1752,7 +1752,6 @@
     <string name="space_add_space_to_any_space_you_manage">Pridať priestor do priestoru, ktorý spravujete.</string>
     <string name="space_add_existing_rooms_only">Pridať existujúce miestnosti</string>
     <string name="space_add_existing_rooms">Pridať existujúce miestnosti a priestor</string>
-    <string name="dont_leave_any">Neopustiť žiadne miestnosti ani priestory</string>
     <string name="space_leave_prompt_msg_as_admin">Ste jediným správcom tohto priestoru. Jeho opustenie bude znamenať, že nad ním nikto nebude mať kontrolu.</string>
     <string name="space_leave_prompt_msg_only_you">Ste tu jediný človek. Ak odídete, nikto sa už v budúcnosti nebude môcť pripojiť do tejto miestnosti, vrátane vás.</string>
     <string name="space_leave_prompt_msg_with_name">Ste si istí, že chcete opustiť %s\?</string>
@@ -1882,8 +1881,6 @@
     <string name="space_manage_rooms_and_spaces">Spravovať miestnosti a priestory</string>
     <string name="spaces_beta_welcome_to_spaces_desc">Priestory sú novým spôsobom spájania miestností a ľudí.</string>
     <string name="space_add_existing_spaces">Pridať existujúce priestory</string>
-    <string name="leave_specific_ones">Opustiť konkrétne miestnosti a priestory…</string>
-    <string name="leave_all_rooms_and_spaces">Opustiť všetky miestnosti a priestory</string>
     <string name="create_spaces_room_private_header_desc">Vytvorme pre každého z nich miestnosť. Neskôr môžete pridať aj ďalšie, vrátane už existujúcich.</string>
     <string name="create_spaces_room_private_header">Na akých veciach pracujete\?</string>
     <string name="create_spaces_invite_public_header_desc">Zabezpečte, aby mali k spoločnosti %s prístup správni ľudia. Neskôr môžete pozvať ďalších.</string>
@@ -2385,7 +2382,7 @@
     <string name="search_hint_room_name">Hľadať názov</string>
     <string name="feedback_failed">Spätnú väzbu sa nepodarilo odoslať (%s)</string>
     <string name="settings_developer_mode_show_info_on_screen_title">Zobraziť informácie o ladení chýb na obrazovke</string>
-    <string name="room_member_override_nick_color">Nahradiť farbu prezývky</string>
+    <string name="room_member_override_nick_color">Nahradiť farbu zobrazovaného mena</string>
     <string name="ftue_auth_use_case_join_existing_server">Chcete sa pripojiť k existujúcemu serveru\?</string>
     <string name="event_redacted_by_admin_reason_with_reason">Udalosť bola upravená administrátorom miestnosti, dôvod: %1$s</string>
     <string name="room_preview_not_found">Táto miestnosť je momentálne neprístupná.
@@ -2457,7 +2454,6 @@
     <string name="bootstrap_crosssigning_progress_default_key">Definovanie predvoleného kľúča SSSS</string>
     <string name="settings_developer_mode_fail_fast_title">Rýchle-zlyhanie</string>
     <string name="call_transfer_consult_first">Najprv konzultovať</string>
-    <string name="pick_tings_to_leave">Vyberte si, čo opustíte</string>
     <string name="command_description_leave_room">Opustiť miestnosť s daným id (alebo aktuálnu miestnosť, ak je prázdna)</string>
     <string name="a11y_trust_level_warning">Varovná úroveň dôveryhodnosti</string>
     <string name="call_transfer_connect_action">Pripojiť</string>
@@ -2537,4 +2533,8 @@
 \n
 \nUpozorňujeme, že táto akcia spôsobí reštart aplikácie a môže chvíľu trvať.</string>
     <string name="initial_sync_request_title">Úvodná žiadosť o synchronizáciu</string>
+    <string name="settings_show_latest_profile_description">Zobraziť najnovšie informácie o profile (obrázok a zobrazované meno) pre všetky správy.</string>
+    <string name="settings_show_latest_profile">Zobraziť najnovšie informácie o používateľovi</string>
+    <string name="a11y_presence_busy">Obsadený/zaneprázdnený</string>
+    <string name="keys_backup_settings_signature_from_this_user">Zálohovanie má platný podpis od tohto používateľa.</string>
 </resources>
diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index 669cfa6b68..103afebed7 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -2190,10 +2190,6 @@
     <string name="space_add_space_to_any_space_you_manage">Shtoni një hapësirë te cilado hapësirë që administroni.</string>
     <string name="space_add_existing_spaces">Shtoni hapësira ekzistuese</string>
     <string name="space_add_existing_rooms_only">Shtoni dhoma ekzistuese</string>
-    <string name="pick_tings_to_leave">Zgjidhni gjëra që duhen braktisur</string>
-    <string name="leave_specific_ones">Braktisni dhoma dhe hapësira të përcaktuara…</string>
-    <string name="dont_leave_any">Mos braktis ndonjë dhomë dhe hapësirë</string>
-    <string name="leave_all_rooms_and_spaces">Braktis krejt dhomat dhe hapësirat</string>
     <string name="space_leave_prompt_msg_with_name">Jeni i sigurt se doni të dilni nga \'%s\?</string>
     <string name="discovery_section">Zbulim (%s)</string>
     <string name="finish_setup">Përfundoje ujdisjen</string>
diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index 5a05f73cf4..9f54bc2c33 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -2239,10 +2239,6 @@
     <string name="space_add_space_to_any_space_you_manage">Lägg till ett utrymme till alla utrymmen du hanterar.</string>
     <string name="space_add_existing_spaces">Lägg till befintliga utrymmen</string>
     <string name="space_add_existing_rooms_only">Lägg till befintliga rum</string>
-    <string name="pick_tings_to_leave">Välj saker att lämna</string>
-    <string name="leave_specific_ones">Lämna specifika rum och utrymmen…</string>
-    <string name="dont_leave_any">Lämna inga rum och utrymmen</string>
-    <string name="leave_all_rooms_and_spaces">Lämna alla rum och utrymmen</string>
     <string name="space_leave_prompt_msg_with_name">Är du säker på att du vill lämna %s\?</string>
     <string name="discovery_section">Upptäckt (%s)</string>
     <string name="finish_setup">Slutför konfigurationen</string>
@@ -2251,7 +2247,7 @@
     <string name="finish_setting_up_discovery">Slutför inställning av upptäckbarhet.</string>
     <string name="create_space_identity_server_info_none">Du använder för närvarande ingen identitetsserver. För att bjuda in teammedlemmar och kunna upptäckas av dem, konfigurera en nedan.</string>
     <string name="invite_by_username_or_mail">Bjud in med användarnamn eller e-postadress</string>
-    <string name="a11y_presence_unavailable">Otillgänglig</string>
+    <string name="a11y_presence_unavailable">Borta</string>
     <string name="a11y_presence_offline">Offline</string>
     <string name="a11y_presence_online">Online</string>
     <string name="login_error_homeserver_from_url_not_found_enter_manual">Välj hemserver</string>
@@ -2490,4 +2486,8 @@
 \n
 \nObservera att detta startar om appen, och kan ta ett tag.</string>
     <string name="initial_sync_request_title">Förfrågan om inledande synk</string>
+    <string name="settings_show_latest_profile_description">Visa den senaste profilinfon (avatar och visningsnamn) för alla meddelandena.</string>
+    <string name="settings_show_latest_profile">Visa senaste användarinfon</string>
+    <string name="a11y_presence_busy">Upptagen</string>
+    <string name="keys_backup_settings_signature_from_this_user">Säkerhetskopian har en giltig signatur från den här användaren.</string>
 </resources>
diff --git a/vector/src/main/res/values-ta/strings.xml b/vector/src/main/res/values-ta/strings.xml
index 26f337757f..5150c3e87b 100644
--- a/vector/src/main/res/values-ta/strings.xml
+++ b/vector/src/main/res/values-ta/strings.xml
@@ -1,4 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="notice_room_join">%1$s அறையில் சேர்ந்தார்</string>
+    <string name="notice_room_join">%1$s அறையில் சேர்ந்துள்ளார்</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• IP எழுத்துக்கள் உடன் பொருந்தக்கூடிய சேவையகங்கள் இப்போது தடைசெய்யப்பட்டுள்ளன.</string>
+    <string name="notice_room_server_acl_updated_banned">• %s உடன் பொருந்தக்கூடிய சேவையகங்கள் இப்போது தடைசெய்யப்பட்டுள்ளன.</string>
+    <plurals name="notice_room_server_acl_changes">
+        <item quantity="one">%d சேவையக-அணுகல் கட்டுப்பாட்டுப் பட்டியல் மாற்றம்</item>
+        <item quantity="other">%d சேவையக-அணுகல் கட்டுப்பாட்டுப் பட்டியல் மாற்றங்கள்</item>
+    </plurals>
+    <string name="notice_room_server_acl_updated_title_by_you">நீங்கள் இந்த அறைக்கான சேவையக-அணுகல் கட்டுப்பாட்டுப் பட்டியல் (ACL) களை மாற்றினீர்கள்.</string>
+    <string name="notice_room_server_acl_updated_title">%s இந்த அறைக்கான சேவையக-அணுகல் கட்டுப்பாட்டுப் பட்டியல் (ACL) களை மாற்றினார்.</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• IP எழுத்துக்கள் உடன் பொருந்தக்கூடிய சேவையகங்கள் தடைசெய்யப்பட்டுள்ளன.</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• IP எழுத்துக்கள் உடன் பொருந்தக்கூடிய சேவையகங்கள் அனுமதிக்கப்பட்டுள்ளன.</string>
+    <string name="notice_room_server_acl_set_allowed">• %s உடன் பொருந்தக்கூடிய சேவையகங்கள் அனுமதிக்கப்பட்டுள்ளன.</string>
+    <string name="notice_room_server_acl_set_banned">• %s உடன் பொருந்தக்கூடிய சேவையகங்கள் தடைசெய்யப்பட்டுள்ளன.</string>
+    <string name="notice_room_server_acl_set_title_by_you">நீங்கள் இந்த அறைக்கான சேவையக-அணுகல் கட்டுப்பாட்டுப் பட்டியல் (ACL) களை அமைத்தீர்கள்.</string>
+    <string name="notice_room_server_acl_set_title">%s இந்த அறைக்கான சேவையக-அணுகல் கட்டுப்பாட்டுப் பட்டியல் (ACL) களை அமைத்தார்.</string>
+    <string name="notice_direct_room_update">%s இங்குத் திறமுயர்த்தினார்.</string>
+    <string name="notice_direct_room_update_by_you">நீங்கள் இங்குத் திறமுயர்த்தினீர்கள்.</string>
+    <string name="notice_room_update_by_you">நீங்கள் இந்த அறையைத் திறமுயர்த்தினீர்கள்.</string>
+    <string name="notice_room_update">%s இந்த அறையைத் திறமுயர்த்தினார்.</string>
+    <string name="notice_room_visibility_world_readable">யாரேனும் ஒருவர்.</string>
+    <string name="notice_room_visibility_shared">எல்லா அறை உறுப்பினர்களும்.</string>
+    <string name="notice_room_visibility_joined">எல்லா அறை உறுப்பினர்களும், அவர்கள் இணைந்த இடத்திலிருந்து.</string>
+    <string name="notice_room_visibility_invited">எல்லா அறை உறுப்பினர்களும், அவர்கள் அழைக்கப்பட்ட இடத்திலிருந்து.</string>
+    <string name="notice_call_candidates">அழைப்பை அமைக்க %s தரவை அனுப்பியுள்ளார்.</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s என்பவர் வருங்கால குறுஞ்செய்திகள் %2$s க்கு புலப்படும்படி அமைத்தார்</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">நீங்கள் வருங்கால குறுஞ்செய்திகள் %1$s க்கு புலப்படும்படி அமைத்தீர்கள்</string>
+    <string name="notice_made_future_room_visibility_by_you">நீங்கள் வருங்கால அறை வரலாறு %1$s க்கு புலப்படும்படி அமைத்தீர்கள்</string>
+    <string name="notice_made_future_room_visibility">%1$s என்பவர் வருங்கால அறை வரலாறு %2$s க்கு புலப்படும்படி அமைத்தார்</string>
+    <string name="notice_ended_call_by_you">நீங்கள் அழைப்பை முடித்தீர்கள்.</string>
+    <string name="notice_ended_call">%s அழைப்பை முடித்தார்.</string>
+    <string name="notice_answered_call_by_you">நீங்கள் அழைப்புக்குப் பதிலளித்தீர்கள்.</string>
+    <string name="notice_answered_call">%s அழைப்புக்கு பதிலளித்தார்.</string>
+    <string name="notice_call_candidates_by_you">அழைப்பை அமைக்க நீங்கள் தரவை அனுப்பியுள்ளீர்கள்.</string>
+    <string name="notice_placed_voice_call_by_you">நீங்கள் குரல் அழைப்பு விடுத்துள்ளீர்.</string>
+    <string name="notice_placed_voice_call">%s என்பவர் குரல் அழைப்பு விடுத்துள்ளார்.</string>
+    <string name="notice_placed_video_call_by_you">நீங்கள் காணொளி அழைப்பு விடுத்துள்ளீர்.</string>
+    <string name="notice_placed_video_call">%s என்பவர் காணொளி அழைப்பு விடுத்துள்ளார்.</string>
+    <string name="notice_room_name_changed">%1$s என்பவர் அறை பெயரை %2$s என மாற்றியுள்ளார்</string>
+    <string name="notice_room_name_changed_by_you">நீங்கள் அறை பெயரை %1$s என மாற்றியுள்ளீர்கள்</string>
+    <string name="notice_room_avatar_changed_by_you">நீங்கள் அறை படத்தை மாற்றியுள்ளீர்கள்</string>
+    <string name="notice_room_topic_changed">%1$s என்பவர் தலைப்பை %2$s க்கு மாற்றினார்</string>
+    <string name="notice_room_avatar_changed">%1$s என்பவர் அறை படத்தை மாற்றியுள்ளார்</string>
+    <string name="notice_room_topic_changed_by_you">நீங்கள் தலைப்பை %1$s க்கு மாற்றியுள்ளீர்கள்</string>
+    <string name="notice_display_name_removed_by_you">நீங்கள் உங்கள் காட்சிப் பெயரை நீக்கியுள்ளீர்கள் (முன்பு %1$s ஆக இருந்தது)</string>
+    <string name="notice_display_name_removed">%1$s தனது காட்சிப் பெயரை நீக்கியுள்ளார் (முன்பு %2$s ஆக இருந்தது)</string>
+    <string name="notice_display_name_changed_from_by_you">நீங்கள் உங்கள் காட்சிப் பெயரை %1$s இருந்து %2$s க்கு மாற்றியுள்ளீர்கள்</string>
+    <string name="notice_display_name_changed_from">%1$s தனது காட்சிப் பெயரை %2$s இருந்து %3$s க்கு மாற்றினார்</string>
+    <string name="notice_display_name_set">%1$s தனது காட்சிப் பெயரை %2$s என அமைத்தார்</string>
+    <string name="notice_display_name_set_by_you">நீங்கள் உங்கள் காட்சிப் பெயரை %1$s என அமைத்துள்ளீர்கள்</string>
+    <string name="notice_avatar_url_changed_by_you">நீங்கள் உங்கள் சுயவிவரப் படத்தை மாற்றினீர்கள்</string>
+    <string name="notice_avatar_url_changed">%1$s தனது சுயவிவரப் படத்தை மாற்றினார்</string>
+    <string name="notice_room_withdraw">%2$s இன் அழைப்பிதழை %1$s திரும்பப் பெற்றார்</string>
+    <string name="notice_room_withdraw_by_you">%1$s இன் அழைப்பிதழை நீங்கள் திரும்பப் பெற்றீர்கள்</string>
+    <string name="notice_room_ban_by_you">நீங்கள் %1$s ஐ தடை செய்துள்ளீர்கள்</string>
+    <string name="notice_room_ban">%1$s என்பவர் %2$s ஐ தடை செய்துள்ளார்</string>
+    <string name="notice_room_unban_by_you">நீங்கள் %1$s இன் தடையை நீக்கியுள்ளீர்கள்</string>
+    <string name="notice_room_unban">%1$s என்பவர் %2$s இன் தடையை நீக்கியுள்ளார்</string>
+    <string name="notice_room_remove">%2$s ஐ %1$s நீக்கினார்</string>
+    <string name="notice_room_remove_by_you">%1$s ஐ நீங்கள் நீக்கினீர்கள்</string>
+    <string name="notice_direct_room_leave_by_you">நீங்கள் அறையை விட்டு வெளியேறினீர்கள்</string>
+    <string name="notice_direct_room_leave">%1$s அறையை விட்டு வெளியேறினார்</string>
+    <string name="notice_room_leave_by_you">நீங்கள் அறையை விட்டு வெளியேறினீர்கள்</string>
+    <string name="notice_room_leave">%1$s அறையை விட்டு வெளியேறினார்</string>
+    <string name="notice_direct_room_join_by_you">நீங்கள் சேர்ந்துள்ளீர்கள்</string>
+    <string name="notice_direct_room_join">%1$s சேர்ந்துள்ளார்</string>
+    <string name="notice_room_join_by_you">நீங்கள் அறையில் சேர்ந்துள்ளீர்கள்</string>
+    <string name="notice_room_invite_you">%1$s உங்களை அழைத்துள்ளார்</string>
+    <string name="notice_room_invite_by_you">நீங்கள் %1$s ஐ அழைத்துள்ளீர்கள்</string>
+    <string name="notice_room_invite">%1$s என்பவர் %2$s ஐ அழைத்துள்ளார்</string>
+    <string name="notice_direct_room_created_by_you">நீங்கள் கலந்துரையாடலை உருவாக்கியுள்ளீர்கள்</string>
+    <string name="notice_direct_room_created">%1$s கலந்துரையாடலை உருவாக்கியுள்ளார்</string>
+    <string name="notice_room_created_by_you">நீங்கள் இந்த அறையை உருவாக்கியுள்ளீர்கள்</string>
+    <string name="notice_room_created">%1$s அறையை உருவாக்கியுள்ளார்</string>
+    <string name="notice_room_invite_no_invitee_by_you">உங்கள் அழைப்பிதழ்</string>
+    <string name="notice_room_invite_no_invitee">%s இன் அழைப்பிதழ்</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• %s உடன் பொருந்தக்கூடிய சேவையகங்கள் அனுமதிக்கப்பட்ட பட்டியலில் இருந்து நீக்கப்பட்டுள்ளது.</string>
+    <string name="notice_room_server_acl_updated_allowed">• %s உடன் பொருந்தக்கூடிய சேவையகங்கள் இப்போது அனுமதிக்கப்பட்டுள்ளன.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• %s உடன் பொருந்தக்கூடிய சேவையகங்கள் தடை பட்டியலில் இருந்து நீக்கப்பட்டுள்ளது.</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-uk/strings.xml b/vector/src/main/res/values-uk/strings.xml
index d9847bbb81..ea982f906b 100644
--- a/vector/src/main/res/values-uk/strings.xml
+++ b/vector/src/main/res/values-uk/strings.xml
@@ -2133,7 +2133,6 @@
     <string name="space_add_space_to_any_space_you_manage">Додайте простір до будь-якого простору, яким ви керуєте.</string>
     <string name="space_add_existing_spaces">Додати наявні простори</string>
     <string name="space_add_existing_rooms_only">Додати наявні кімнати</string>
-    <string name="leave_all_rooms_and_spaces">Вийти з усіх кімнат і просторів</string>
     <string name="space_leave_prompt_msg_with_name">Ви впевнені, що хочете вийти з %s\?</string>
     <string name="create_spaces_private_teammates">Приватний простір для вас і учасників вашої команди</string>
     <string name="create_spaces_me_and_teammates">Я та учасники команди</string>
@@ -2155,7 +2154,7 @@
     <string name="dev_tools_send_state_event">Надіслати подію стану</string>
     <string name="dev_tools_send_custom_event">Надіслати власну подію</string>
     <string name="dev_tools_explore_room_state">Дізнатися стан кімнати</string>
-    <string name="a11y_presence_unavailable">Недоступний</string>
+    <string name="a11y_presence_unavailable">Відсутній</string>
     <string name="a11y_presence_offline">Не в мережі</string>
     <string name="a11y_presence_online">У мережі</string>
     <string name="a11y_view_read_receipts">Перегляд підтвердження прочитання</string>
@@ -2197,9 +2196,6 @@
     <string name="spaces_no_server_support_description">Зверніться до адміністратора домашнього сервера за подробицями</string>
     <string name="spaces_no_server_support_title">Схоже, ваш домашній сервер ще не підтримує просторів</string>
     <string name="looking_for_someone_not_in_space">Шукаєте когось не в %s\?</string>
-    <string name="pick_tings_to_leave">Виберіть, звідки хочете вийти</string>
-    <string name="leave_specific_ones">Вийти з обраних кімнат і просторів…</string>
-    <string name="dont_leave_any">Не виходити з жодної кімнати й простору</string>
     <string name="finish_setup">Завершити налаштування</string>
     <string name="skip_for_now">На разі пропустити</string>
     <string name="share_space_link_message">Приєднуйтеся до мого простору %1$s %2$s</string>
@@ -2421,7 +2417,7 @@
     <string name="tooltip_attachment_photo">Відкрити камеру</string>
     <string name="labs_auto_report_uisi_desc">Ваша система автоматично надсилатиме журнали, коли виникне помилка неможливості розшифрування</string>
     <string name="labs_auto_report_uisi">Автозвіт про помилки шифрування.</string>
-    <string name="room_member_override_nick_color">Замінити колір псевдоніма</string>
+    <string name="room_member_override_nick_color">Замінити колір показуваного імені</string>
     <string name="login_splash_already_have_account">Я вже маю обліковий запис</string>
     <string name="ftue_auth_carousel_encrypted_title">Захищене спілкування.</string>
     <string name="ftue_auth_carousel_control_title">Ви контролюєте все.</string>
@@ -2582,4 +2578,8 @@
 \n
 \nЗауважте, що ця дія перезапустить застосунок, і це може тривати деякий час.</string>
     <string name="initial_sync_request_title">Початковий запит синхронізації</string>
+    <string name="settings_show_latest_profile_description">Показати найновіші відомості про профіль (аватар і показуване ім\'я) для всіх повідомлень.</string>
+    <string name="settings_show_latest_profile">Показати найновіші відомості про користувача</string>
+    <string name="a11y_presence_busy">Зайнятий</string>
+    <string name="keys_backup_settings_signature_from_this_user">Резервна копія має дійсний підпис від цього користувача.</string>
 </resources>
diff --git a/vector/src/main/res/values-vi/strings.xml b/vector/src/main/res/values-vi/strings.xml
index 1ca481e798..c377ae49e3 100644
--- a/vector/src/main/res/values-vi/strings.xml
+++ b/vector/src/main/res/values-vi/strings.xml
@@ -1270,10 +1270,6 @@
     <string name="space_add_existing_spaces">Thêm Space hiện có</string>
     <string name="space_add_existing_rooms_only">Thêm các phòng hiện có</string>
     <string name="space_add_existing_rooms">Thêm các phòng và Space hiện có</string>
-    <string name="pick_tings_to_leave">Chọn những thứ để rời khỏi</string>
-    <string name="leave_specific_ones">Để lại các phòng và Space cụ thể…</string>
-    <string name="dont_leave_any">Không rời bất kỳ phòng và Space nào</string>
-    <string name="leave_all_rooms_and_spaces">Rời khỏi tất cả phòng và Space</string>
     <string name="space_leave_prompt_msg_as_admin">Bạn là quản trị viên duy nhất của không gian này. Rời khỏi nó sẽ có nghĩa là không ai có quyền kiểm soát nó.</string>
     <string name="space_leave_prompt_msg_private">Bạn sẽ không thể tham gia lại trừ khi bạn được mời lại.</string>
     <string name="space_leave_prompt_msg_only_you">Bạn là người duy nhất ở đây. Nếu bạn rời đi, sẽ không ai có thể tham gia trong tương lai, kể cả bạn</string>
diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index 0130c20879..36292ff61d 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -2162,10 +2162,6 @@
     <string name="space_add_space_to_any_space_you_manage">将一个空间添加到您管理的任何空间。</string>
     <string name="space_add_existing_spaces">添加现有空间</string>
     <string name="space_add_existing_rooms_only">添加现有聊天室</string>
-    <string name="pick_tings_to_leave">选择要离开的项目</string>
-    <string name="leave_specific_ones">离开特定聊天室和空间…</string>
-    <string name="dont_leave_any">不要离开任何聊天室和空间</string>
-    <string name="leave_all_rooms_and_spaces">离开所有聊天室和空间</string>
     <string name="space_leave_prompt_msg_with_name">你确定要离开 %s 吗？</string>
     <string name="discovery_section">发现 (%s)</string>
     <string name="finish_setup">完成设置</string>
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index 8fd51266f5..3ce2d9c595 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -2158,10 +2158,6 @@
     <string name="space_add_space_to_any_space_you_manage">新增空間至您管理的任何空間。</string>
     <string name="space_add_existing_spaces">新增既有的空間</string>
     <string name="space_add_existing_rooms_only">新增既有的聊天室</string>
-    <string name="pick_tings_to_leave">挑選要離開的對象</string>
-    <string name="leave_specific_ones">離開特定的聊天室與空間……</string>
-    <string name="dont_leave_any">不要離開任何聊天室與空間</string>
-    <string name="leave_all_rooms_and_spaces">離開所有聊天室與空間</string>
     <string name="space_leave_prompt_msg_with_name">您確定您想要離開 %s？</string>
     <string name="discovery_section">探索 (%s)</string>
     <string name="finish_setup">結束設定</string>
@@ -2211,7 +2207,7 @@
     <string name="command_description_room_name">設定聊天室名稱</string>
     <string name="command_description_unignore_user">停止忽略使用者，繼續顯示他們的訊息</string>
     <string name="command_description_ignore_user">忽略使用者，為您隱藏他們的訊息</string>
-    <string name="a11y_presence_unavailable">不可用</string>
+    <string name="a11y_presence_unavailable">離開</string>
     <string name="a11y_presence_offline">離線</string>
     <string name="a11y_presence_online">線上</string>
     <string name="login_error_homeserver_from_url_not_found_enter_manual">選擇家伺服器</string>
@@ -2288,7 +2284,7 @@
     <string name="tooltip_attachment_photo">開啟攝影機</string>
     <string name="labs_auto_report_uisi_desc">發生無法解密錯誤時，您的系統將會自動傳送紀錄檔</string>
     <string name="labs_auto_report_uisi">自動回報解密錯誤。</string>
-    <string name="room_member_override_nick_color">覆寫暱稱色彩</string>
+    <string name="room_member_override_nick_color">覆寫顯示名稱色彩</string>
     <string name="login_splash_already_have_account">我已有一個帳號</string>
     <string name="ftue_auth_carousel_encrypted_title">安全傳送訊息。</string>
     <string name="ftue_auth_carousel_control_title">您已掌控了您的資料。</string>
@@ -2443,4 +2439,8 @@
 \n
 \n注意，此動作將會重新啟動應用程式，並可能需要一些時間。</string>
     <string name="initial_sync_request_title">初始同步請求</string>
+    <string name="settings_show_latest_profile_description">顯示所有訊息的最新個人檔案資訊（大頭照與顯示名稱）。</string>
+    <string name="settings_show_latest_profile">顯示最新的使用者資訊</string>
+    <string name="a11y_presence_busy">忙碌</string>
+    <string name="keys_backup_settings_signature_from_this_user">備份具有來自該使用者的有效簽名。</string>
 </resources>
diff --git a/vector/src/main/res/values/donottranslate.xml b/vector/src/main/res/values/donottranslate.xml
index 2dcd36d7c8..eb8efa0ad2 100755
--- a/vector/src/main/res/values/donottranslate.xml
+++ b/vector/src/main/res/values/donottranslate.xml
@@ -19,6 +19,8 @@
     <string name="ftue_auth_create_account_matrix_dot_org_server_description">Join millions for free on the largest public server</string>
     <string name="ftue_auth_create_account_edit_server_selection">Edit</string>
 
+    <string name="ftue_auth_welcome_back_title">Welcome back!</string>
+
     <string name="ftue_auth_choose_server_title">Choose your server</string>
     <string name="ftue_auth_choose_server_subtitle">What is the address of your server? Server is like a home for all your data.</string>
     <string name="ftue_auth_choose_server_entry_hint">Server URL</string>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 63d4730dc5..97ef900ce3 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -973,6 +973,8 @@
     <string name="settings_show_read_receipts_summary">Click on the read receipts for a detailed list.</string>
     <string name="settings_chat_effects_title">Show chat effects</string>
     <string name="settings_chat_effects_description">Use /confetti command or send a message containing ❄️ or 🎉</string>
+    <string name="settings_autoplay_animated_images_title">Autoplay animated images</string>
+    <string name="settings_autoplay_animated_images_summary">Play animated images in the timeline as soon as they are visible</string>
     <string name="settings_show_join_leave_messages">Show join and leave events</string>
     <string name="settings_show_join_leave_messages_summary">Invites, removes, and bans are unaffected.</string>
     <string name="settings_show_avatar_display_name_changes_messages">Show account events</string>
@@ -1422,7 +1424,7 @@
     <string name="merged_events_collapse">collapse</string>
 
     <string name="generic_label_and_value">%1$s: %2$s</string>
-    <string name="x_plus">%d+</string>
+    <string name="x_plus">+%d</string>
     <string name="no_valid_google_play_services_apk">No valid Google Play Services APK found. Notifications may not work properly.</string>
 
     <!-- Passphrase -->
@@ -1584,9 +1586,11 @@
     <string name="room_list_catchup_empty_title">You’re all caught up!</string>
     <string name="room_list_catchup_empty_body">You have no more unread messages</string>
     <string name="room_list_people_empty_title">Conversations</string>
-    <string name="room_list_people_empty_body">Your direct message conversations will be displayed here. Tap the + bottom right to start some.</string>
+    <!-- Note to translators: for RTL languages, the + will be at the bottom left. Please translate "bottom left" instead of "bottom right". Thanks! -->
+    <string name="room_list_people_empty_body">Your direct message conversations will be displayed here. Tap the + at the bottom right to start some.</string>
     <string name="room_list_rooms_empty_title">Rooms</string>
-    <string name="room_list_rooms_empty_body">Your rooms will be displayed here. Tap the + bottom right to find existing ones or start some of your own.</string>
+    <!-- Note to translators: for RTL languages, the + will be at the bottom left. Please translate "bottom left" instead of "bottom right". Thanks! -->
+    <string name="room_list_rooms_empty_body">Your rooms will be displayed here. Tap the + at the bottom right to find existing ones or start some of your own.</string>
 
     <string name="title_activity_emoji_reaction_picker">Reactions</string>
     <string name="message_add_reaction">Add Reaction</string>
@@ -2847,15 +2851,6 @@
     <string name="space_leave_prompt_msg_private">You won\'t be able to rejoin unless you are re-invited.</string>
     <string name="space_leave_prompt_msg_as_admin">You\'re the only admin of this space. Leaving it will mean no one has control over it.</string>
 
-    <!-- TODO delete -->
-    <string name="leave_all_rooms_and_spaces" tools:ignore="UnusedResources">Leave all rooms and spaces</string>
-    <!-- TODO delete -->
-    <string name="dont_leave_any" tools:ignore="UnusedResources">Don’t leave any rooms and spaces</string>
-    <!-- TODO delete -->
-    <string name="leave_specific_ones" tools:ignore="UnusedResources">Leave specific rooms and spaces…</string>
-    <!-- TODO delete -->
-    <string name="pick_tings_to_leave" tools:ignore="UnusedResources">Pick things to leave</string>
-
     <string name="space_explore_filter_no_result_title">No results found</string>
     <string name="space_explore_filter_no_result_description">Some results may be hidden because they’re private and you need an invite to them.</string>
 
@@ -3015,14 +3010,19 @@
     <string name="location_share_live_select_duration_option_1">15 minutes</string>
     <string name="location_share_live_select_duration_option_2">1 hour</string>
     <string name="location_share_live_select_duration_option_3">8 hours</string>
-    <string name="location_in_background_missing_permission_dialog_title">Allow access</string>
-    <string name="location_in_background_missing_permission_dialog_content">If you’d like to share your Live location, ${app_name} needs location access all the time when the app is in the background.\nWe will only access your location for the duration that you choose.</string>
+    <!--TODO delete-->
+    <string name="location_in_background_missing_permission_dialog_title" tools:ignore="UnusedResources">Allow access</string>
+    <!--TODO delete-->
+    <string name="location_in_background_missing_permission_dialog_content" xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources">If you’d like to share your Live location, ${app_name} needs location access all the time when the app is in the background.\nWe will only access your location for the duration that you choose.</string>
     <string name="location_not_available_dialog_title">${app_name} could not access your location</string>
     <string name="location_not_available_dialog_content">${app_name} could not access your location. Please try again later.</string>
     <string name="location_share_external">Open with</string>
-    <string name="settings_enable_location_sharing">Enable location sharing</string>
-    <string name="settings_enable_location_sharing_summary">Once enabled you will be able to send your location to any room</string>
-    <string name="labs_render_locations_in_timeline">Render user locations in the timeline</string>
+    <!--TODO delete-->
+    <string name="settings_enable_location_sharing" tools:ignore="UnusedResources">Enable location sharing</string>
+    <!--TODO delete-->
+    <string name="settings_enable_location_sharing_summary" tools:ignore="UnusedResources">Once enabled you will be able to send your location to any room</string>
+    <!--TODO delete-->
+    <string name="labs_render_locations_in_timeline" tools:ignore="UnusedResources">Render user locations in the timeline</string>
     <string name="location_timeline_failed_to_load_map">Failed to load map</string>
     <string name="location_share_live_enabled">Live location enabled</string>
     <string name="location_share_live_started">Loading live location…</string>
@@ -3037,6 +3037,8 @@
     <string name="live_location_sharing_notification_description">Location sharing is in progress</string>
     <string name="labs_enable_live_location">Enable Live Location Sharing</string>
     <string name="labs_enable_live_location_summary">Temporary implementation: locations persist in room history</string>
+    <string name="live_location_bottom_sheet_stop_sharing">Stop sharing</string>
+    <string name="live_location_bottom_sheet_last_updated_at">Updated %1$s ago</string>
 
     <string name="message_bubbles">Show Message bubbles</string>
 
diff --git a/vector/src/main/res/xml/vector_settings_labs.xml b/vector/src/main/res/xml/vector_settings_labs.xml
index 19ee7e366f..9b9293e2e2 100644
--- a/vector/src/main/res/xml/vector_settings_labs.xml
+++ b/vector/src/main/res/xml/vector_settings_labs.xml
@@ -64,11 +64,6 @@
         android:summary="@string/labs_auto_report_uisi_desc"
         android:title="@string/labs_auto_report_uisi" />
 
-    <im.vector.app.core.preference.VectorSwitchPreference
-        android:defaultValue="true"
-        android:key="SETTINGS_LABS_RENDER_LOCATIONS_IN_TIMELINE"
-        android:title="@string/labs_render_locations_in_timeline" />
-
     <im.vector.app.core.preference.VectorSwitchPreference
         android:defaultValue="false"
         android:key="SETTINGS_LABS_ENABLE_LIVE_LOCATION"
diff --git a/vector/src/main/res/xml/vector_settings_preferences.xml b/vector/src/main/res/xml/vector_settings_preferences.xml
index 7ff588ca76..a3b8a3476c 100644
--- a/vector/src/main/res/xml/vector_settings_preferences.xml
+++ b/vector/src/main/res/xml/vector_settings_preferences.xml
@@ -72,12 +72,6 @@
             android:title="@string/option_take_photo_video"
             tools:summary="@string/option_always_ask" />
 
-        <im.vector.app.core.preference.VectorSwitchPreference
-            android:defaultValue="false"
-            android:key="SETTINGS_PREF_ENABLE_LOCATION_SHARING"
-            android:summary="@string/settings_enable_location_sharing_summary"
-            android:title="@string/settings_enable_location_sharing" />
-
     </im.vector.app.core.preference.VectorPreferenceCategory>
 
     <im.vector.app.core.preference.VectorPreferenceCategory android:title="@string/settings_category_timeline">
@@ -140,6 +134,12 @@
             android:summary="@string/settings_chat_effects_description"
             android:title="@string/settings_chat_effects_title" />
 
+        <im.vector.app.core.preference.VectorSwitchPreference
+            android:defaultValue="false"
+            android:key="SETTINGS_AUTOPLAY_ANIMATED_IMAGES"
+            android:summary="@string/settings_autoplay_animated_images_summary"
+            android:title="@string/settings_autoplay_animated_images_title" />
+
         <im.vector.app.core.preference.VectorSwitchPreference
             android:key="SETTINGS_VIBRATE_ON_MENTION_KEY"
             android:title="@string/settings_vibrate_on_mention"
diff --git a/vector/src/test/java/im/vector/app/core/extensions/StringExtensionsTest.kt b/vector/src/test/java/im/vector/app/core/extensions/StringExtensionsTest.kt
new file mode 100644
index 0000000000..c4c7a2d38a
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/core/extensions/StringExtensionsTest.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.core.extensions
+
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Test
+
+class StringExtensionsTest {
+
+    @Test
+    fun `given text with RtL unicode override, when checking contains RtL Override, then returns true`() {
+        val textWithRtlOverride = "hello\u202Eworld"
+
+        val result = textWithRtlOverride.containsRtLOverride()
+
+        result shouldBeEqualTo true
+    }
+
+    @Test
+    fun `given text without RtL unicode override, when checking contains RtL Override, then returns false`() {
+        val textWithRtlOverride = "hello world"
+
+        val result = textWithRtlOverride.containsRtLOverride()
+
+        result shouldBeEqualTo false
+    }
+
+    @Test
+    fun `given text with RtL unicode override, when ensuring ends LtR, then appends a LtR unicode override`() {
+        val textWithRtlOverride = "123\u202E456"
+
+        val result = textWithRtlOverride.ensureEndsLeftToRight()
+
+        result shouldBeEqualTo "$textWithRtlOverride\u202D"
+    }
+
+    @Test
+    fun `given text with unicode direction overrides, when filtering direction overrides, then removes all overrides`() {
+        val textWithDirectionOverrides = "123\u202E456\u202d789"
+
+        val result = textWithDirectionOverrides.filterDirectionOverrides()
+
+        result shouldBeEqualTo "123456789"
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/location/live/map/GetListOfUserLiveLocationUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/location/live/map/GetListOfUserLiveLocationUseCaseTest.kt
new file mode 100644
index 0000000000..8a5a30e612
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/location/live/map/GetListOfUserLiveLocationUseCaseTest.kt
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.location.live.map
+
+import androidx.lifecycle.asFlow
+import com.airbnb.mvrx.test.MvRxTestRule
+import im.vector.app.features.location.LocationData
+import im.vector.app.test.fakes.FakeSession
+import io.mockk.coEvery
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.unmockkStatic
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.test.runTest
+import org.amshove.kluent.internal.assertEquals
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.matrix.android.sdk.api.session.room.model.livelocation.LiveLocationShareAggregatedSummary
+import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconLocationDataContent
+import org.matrix.android.sdk.api.util.MatrixItem
+
+class GetListOfUserLiveLocationUseCaseTest {
+
+    @get:Rule
+    val mvRxTestRule = MvRxTestRule()
+
+    private val fakeSession = FakeSession()
+
+    private val viewStateMapper = mockk<UserLiveLocationViewStateMapper>()
+
+    private val getListOfUserLiveLocationUseCase = GetListOfUserLiveLocationUseCase(fakeSession, viewStateMapper)
+
+    @Before
+    fun setUp() {
+        mockkStatic("androidx.lifecycle.FlowLiveDataConversions")
+    }
+
+    @After
+    fun tearDown() {
+        unmockkStatic("androidx.lifecycle.FlowLiveDataConversions")
+    }
+
+    @Test
+    fun `given a room id then the correct flow of view states list is collected`() = runTest {
+        val roomId = "roomId"
+
+        val summary1 = LiveLocationShareAggregatedSummary(
+                userId = "userId1",
+                isActive = true,
+                endOfLiveTimestampMillis = 123,
+                lastLocationDataContent = MessageBeaconLocationDataContent()
+        )
+        val summary2 = LiveLocationShareAggregatedSummary(
+                userId = "userId2",
+                isActive = true,
+                endOfLiveTimestampMillis = 1234,
+                lastLocationDataContent = MessageBeaconLocationDataContent()
+        )
+        val summary3 = LiveLocationShareAggregatedSummary(
+                userId = "userId3",
+                isActive = true,
+                endOfLiveTimestampMillis = 1234,
+                lastLocationDataContent = MessageBeaconLocationDataContent()
+        )
+        val summaries = listOf(summary1, summary2, summary3)
+        val liveData = fakeSession.roomService()
+                .getRoom(roomId)
+                .locationSharingService()
+                .givenRunningLiveLocationShareSummaries(summaries)
+
+        every { liveData.asFlow() } returns flowOf(summaries)
+
+        val viewState1 = UserLiveLocationViewState(
+                matrixItem = MatrixItem.UserItem(id = "@userId1:matrix.org", displayName = "User 1", avatarUrl = ""),
+                pinDrawable = mockk(),
+                locationData = LocationData(latitude = 1.0, longitude = 2.0, uncertainty = null),
+                endOfLiveTimestampMillis = 123,
+                locationTimestampMillis = 123,
+                showStopSharingButton = false
+        )
+        val viewState2 = UserLiveLocationViewState(
+                matrixItem = MatrixItem.UserItem(id = "@userId2:matrix.org", displayName = "User 2", avatarUrl = ""),
+                pinDrawable = mockk(),
+                locationData = LocationData(latitude = 1.0, longitude = 2.0, uncertainty = null),
+                endOfLiveTimestampMillis = 1234,
+                locationTimestampMillis = 1234,
+                showStopSharingButton = false
+        )
+        coEvery { viewStateMapper.map(summary1) } returns viewState1
+        coEvery { viewStateMapper.map(summary2) } returns viewState2
+        coEvery { viewStateMapper.map(summary3) } returns null
+
+        val viewStates = getListOfUserLiveLocationUseCase.execute(roomId).first()
+
+        assertEquals(listOf(viewState1, viewState2), viewStates)
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/location/live/map/LocationLiveMapViewModelTest.kt b/vector/src/test/java/im/vector/app/features/location/live/map/LocationLiveMapViewModelTest.kt
new file mode 100644
index 0000000000..b477265506
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/location/live/map/LocationLiveMapViewModelTest.kt
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.location.live.map
+
+import com.airbnb.mvrx.test.MvRxTestRule
+import im.vector.app.features.location.LocationData
+import im.vector.app.features.location.LocationSharingServiceConnection
+import im.vector.app.test.test
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.runs
+import io.mockk.verify
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.test.runTest
+import org.junit.Rule
+import org.junit.Test
+import org.matrix.android.sdk.api.util.MatrixItem
+
+class LocationLiveMapViewModelTest {
+
+    @get:Rule
+    val mvrxTestRule = MvRxTestRule()
+
+    private val fakeRoomId = ""
+
+    private val args = LocationLiveMapViewArgs(roomId = fakeRoomId)
+
+    private val getListOfUserLiveLocationUseCase = mockk<GetListOfUserLiveLocationUseCase>()
+    private val locationServiceConnection = mockk<LocationSharingServiceConnection>()
+
+    private fun createViewModel(): LocationLiveMapViewModel {
+        return LocationLiveMapViewModel(
+                LocationLiveMapViewState(args),
+                getListOfUserLiveLocationUseCase,
+                locationServiceConnection
+        )
+    }
+
+    @Test
+    fun `given the viewModel has been initialized then viewState contains user locations list`() = runTest {
+        val userLocations = listOf(
+                UserLiveLocationViewState(
+                        MatrixItem.UserItem(id = "@userId1:matrix.org", displayName = "User 1", avatarUrl = ""),
+                        pinDrawable = mockk(),
+                        locationData = LocationData(latitude = 1.0, longitude = 2.0, uncertainty = null),
+                        endOfLiveTimestampMillis = 123,
+                        locationTimestampMillis = 123,
+                        showStopSharingButton = false
+                )
+        )
+        every { locationServiceConnection.bind(any()) } just runs
+        every { getListOfUserLiveLocationUseCase.execute(fakeRoomId) } returns flowOf(userLocations)
+
+        val viewModel = createViewModel()
+        viewModel
+                .test()
+                .assertState(
+                        LocationLiveMapViewState(args).copy(
+                                userLocations = userLocations
+                        )
+                )
+                .finish()
+
+        verify { locationServiceConnection.bind(viewModel) }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/location/live/map/UserLiveLocationViewStateMapperTest.kt b/vector/src/test/java/im/vector/app/features/location/live/map/UserLiveLocationViewStateMapperTest.kt
new file mode 100644
index 0000000000..95e0ff1b0b
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/location/live/map/UserLiveLocationViewStateMapperTest.kt
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.location.live.map
+
+import android.graphics.drawable.Drawable
+import im.vector.app.features.location.LocationData
+import im.vector.app.test.fakes.FakeActiveSessionHolder
+import im.vector.app.test.fakes.FakeLocationPinProvider
+import im.vector.app.test.fakes.FakeSession
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.unmockkStatic
+import kotlinx.coroutines.test.runTest
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.matrix.android.sdk.api.session.getUser
+import org.matrix.android.sdk.api.session.room.model.livelocation.LiveLocationShareAggregatedSummary
+import org.matrix.android.sdk.api.session.room.model.message.LocationInfo
+import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconLocationDataContent
+import org.matrix.android.sdk.api.session.user.model.User
+import org.matrix.android.sdk.api.util.MatrixItem
+import org.matrix.android.sdk.api.util.toMatrixItem
+
+private const val A_USER_ID = "@aUserId:matrix.org"
+private const val A_USER_DISPLAY_NAME = "A_USER_DISPLAY_NAME"
+private const val A_IS_ACTIVE = true
+private const val A_END_OF_LIVE_TIMESTAMP = 123L
+private const val A_LOCATION_TIMESTAMP = 122L
+private const val A_LATITUDE = 40.05
+private const val A_LONGITUDE = 29.24
+private const val A_UNCERTAINTY = 30.0
+private const val A_GEO_URI = "geo:$A_LATITUDE,$A_LONGITUDE;$A_UNCERTAINTY"
+
+class UserLiveLocationViewStateMapperTest {
+
+    private val locationPinProvider = FakeLocationPinProvider()
+    private val fakeSession = FakeSession()
+    private val fakeActiveSessionHolder = FakeActiveSessionHolder(fakeSession)
+
+    private val userLiveLocationViewStateMapper = UserLiveLocationViewStateMapper(locationPinProvider.instance, fakeActiveSessionHolder.instance)
+
+    @Before
+    fun setup() {
+        mockkStatic("org.matrix.android.sdk.api.util.MatrixItemKt")
+        val fakeUser = mockk<User>()
+        every { fakeSession.getUser(A_USER_ID) } returns fakeUser
+        every { fakeUser.toMatrixItem() } returns MatrixItem.UserItem(id = A_USER_ID, displayName = A_USER_DISPLAY_NAME, avatarUrl = "")
+    }
+
+    @After
+    fun tearDown() {
+        unmockkStatic("org.matrix.android.sdk.api.util.MatrixItemKt")
+    }
+
+    @Test
+    fun `given a summary with invalid data then result is null`() = runTest {
+        val summary1 = LiveLocationShareAggregatedSummary(
+                userId = null,
+                isActive = true,
+                endOfLiveTimestampMillis = null,
+                lastLocationDataContent = null,
+        )
+        val summary2 = summary1.copy(userId = "")
+        val summaryWithoutLocation = summary1.copy(userId = A_USER_ID)
+
+        val viewState1 = userLiveLocationViewStateMapper.map(summary1)
+        val viewState2 = userLiveLocationViewStateMapper.map(summary2)
+        val viewState3 = userLiveLocationViewStateMapper.map(summaryWithoutLocation)
+
+        viewState1 shouldBeEqualTo null
+        viewState2 shouldBeEqualTo null
+        viewState3 shouldBeEqualTo null
+    }
+
+    @Test
+    fun `given a summary with valid data then result is correctly mapped`() = runTest {
+        val pinDrawable = mockk<Drawable>()
+
+        val locationDataContent = MessageBeaconLocationDataContent(
+                locationInfo = LocationInfo(geoUri = A_GEO_URI),
+                unstableTimestampMillis = A_LOCATION_TIMESTAMP
+        )
+        val summary = LiveLocationShareAggregatedSummary(
+                userId = A_USER_ID,
+                isActive = A_IS_ACTIVE,
+                endOfLiveTimestampMillis = A_END_OF_LIVE_TIMESTAMP,
+                lastLocationDataContent = locationDataContent,
+        )
+        locationPinProvider.givenCreateForUserId(A_USER_ID, pinDrawable)
+
+        val viewState = userLiveLocationViewStateMapper.map(summary)
+
+        val expectedViewState = UserLiveLocationViewState(
+                matrixItem = MatrixItem.UserItem(id = A_USER_ID, displayName = A_USER_DISPLAY_NAME, avatarUrl = ""),
+                pinDrawable = pinDrawable,
+                locationData = LocationData(
+                        latitude = A_LATITUDE,
+                        longitude = A_LONGITUDE,
+                        uncertainty = A_UNCERTAINTY
+                ),
+                endOfLiveTimestampMillis = A_END_OF_LIVE_TIMESTAMP,
+                locationTimestampMillis = A_LOCATION_TIMESTAMP,
+                showStopSharingButton = false
+        )
+        viewState shouldBeEqualTo expectedViewState
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/notifications/NotificationRendererTest.kt b/vector/src/test/java/im/vector/app/features/notifications/NotificationRendererTest.kt
index 7bfdfdc40c..f13bd90fce 100644
--- a/vector/src/test/java/im/vector/app/features/notifications/NotificationRendererTest.kt
+++ b/vector/src/test/java/im/vector/app/features/notifications/NotificationRendererTest.kt
@@ -205,11 +205,13 @@ class NotificationRendererTest {
         givenNotifications(emptyList(), emptyList(), emptyList(), USE_COMPLETE_NOTIFICATION_FORMAT, A_REMOVE_SUMMARY_NOTIFICATION)
     }
 
-    private fun givenNotifications(roomNotifications: List<RoomNotification> = emptyList(),
-                                   invitationNotifications: List<OneShotNotification> = emptyList(),
-                                   simpleNotifications: List<OneShotNotification> = emptyList(),
-                                   useCompleteNotificationFormat: Boolean = USE_COMPLETE_NOTIFICATION_FORMAT,
-                                   summaryNotification: SummaryNotification = A_SUMMARY_NOTIFICATION) {
+    private fun givenNotifications(
+            roomNotifications: List<RoomNotification> = emptyList(),
+            invitationNotifications: List<OneShotNotification> = emptyList(),
+            simpleNotifications: List<OneShotNotification> = emptyList(),
+            useCompleteNotificationFormat: Boolean = USE_COMPLETE_NOTIFICATION_FORMAT,
+            summaryNotification: SummaryNotification = A_SUMMARY_NOTIFICATION
+    ) {
         notificationFactory.givenNotificationsFor(
                 groupedEvents = A_PROCESSED_EVENTS,
                 myUserId = MY_USER_ID,
diff --git a/vector/src/test/java/im/vector/app/features/onboarding/DirectLoginUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/onboarding/DirectLoginUseCaseTest.kt
index 1fed03b601..d3600940ab 100644
--- a/vector/src/test/java/im/vector/app/features/onboarding/DirectLoginUseCaseTest.kt
+++ b/vector/src/test/java/im/vector/app/features/onboarding/DirectLoginUseCaseTest.kt
@@ -32,13 +32,13 @@ import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
 import org.matrix.android.sdk.api.auth.data.WellKnown
 import org.matrix.android.sdk.api.auth.wellknown.WellknownResult
 
-private val A_LOGIN_OR_REGISTER_ACTION = OnboardingAction.LoginOrRegister("@a-user:id.org", "a-password", "a-device-name")
+private val A_DIRECT_LOGIN_ACTION = OnboardingAction.AuthenticateAction.LoginDirect("@a-user:id.org", "a-password", "a-device-name")
 private val A_WELLKNOWN_SUCCESS_RESULT = WellknownResult.Prompt("https://homeserverurl.com", identityServerUrl = null, WellKnown())
 private val A_WELLKNOWN_FAILED_WITH_CONTENT_RESULT = WellknownResult.FailPrompt("https://homeserverurl.com", WellKnown())
 private val A_WELLKNOWN_FAILED_WITHOUT_CONTENT_RESULT = WellknownResult.FailPrompt(null, null)
 private val NO_HOMESERVER_CONFIG: HomeServerConnectionConfig? = null
 private val A_FALLBACK_CONFIG: HomeServerConnectionConfig = HomeServerConnectionConfig(
-        homeServerUri = FakeUri("https://${A_LOGIN_OR_REGISTER_ACTION.username.getServerName()}").instance,
+        homeServerUri = FakeUri("https://${A_DIRECT_LOGIN_ACTION.matrixId.getServerName()}").instance,
         homeServerUriBase = FakeUri(A_WELLKNOWN_SUCCESS_RESULT.homeServerUrl).instance,
         identityServerUri = null
 )
@@ -54,11 +54,11 @@ class DirectLoginUseCaseTest {
 
     @Test
     fun `when logging in directly, then returns success with direct session result`() = runTest {
-        fakeAuthenticationService.givenWellKnown(A_LOGIN_OR_REGISTER_ACTION.username, config = NO_HOMESERVER_CONFIG, result = A_WELLKNOWN_SUCCESS_RESULT)
-        val (username, password, initialDeviceName) = A_LOGIN_OR_REGISTER_ACTION
+        fakeAuthenticationService.givenWellKnown(A_DIRECT_LOGIN_ACTION.matrixId, config = NO_HOMESERVER_CONFIG, result = A_WELLKNOWN_SUCCESS_RESULT)
+        val (username, password, initialDeviceName) = A_DIRECT_LOGIN_ACTION
         fakeAuthenticationService.givenDirectAuthentication(A_FALLBACK_CONFIG, username, password, initialDeviceName, result = fakeSession)
 
-        val result = useCase.execute(A_LOGIN_OR_REGISTER_ACTION, homeServerConnectionConfig = NO_HOMESERVER_CONFIG)
+        val result = useCase.execute(A_DIRECT_LOGIN_ACTION, homeServerConnectionConfig = NO_HOMESERVER_CONFIG)
 
         result shouldBeEqualTo Result.success(fakeSession)
     }
@@ -66,14 +66,14 @@ class DirectLoginUseCaseTest {
     @Test
     fun `given wellknown fails with content, when logging in directly, then returns success with direct session result`() = runTest {
         fakeAuthenticationService.givenWellKnown(
-                A_LOGIN_OR_REGISTER_ACTION.username,
+                A_DIRECT_LOGIN_ACTION.matrixId,
                 config = NO_HOMESERVER_CONFIG,
                 result = A_WELLKNOWN_FAILED_WITH_CONTENT_RESULT
         )
-        val (username, password, initialDeviceName) = A_LOGIN_OR_REGISTER_ACTION
+        val (username, password, initialDeviceName) = A_DIRECT_LOGIN_ACTION
         fakeAuthenticationService.givenDirectAuthentication(A_FALLBACK_CONFIG, username, password, initialDeviceName, result = fakeSession)
 
-        val result = useCase.execute(A_LOGIN_OR_REGISTER_ACTION, homeServerConnectionConfig = NO_HOMESERVER_CONFIG)
+        val result = useCase.execute(A_DIRECT_LOGIN_ACTION, homeServerConnectionConfig = NO_HOMESERVER_CONFIG)
 
         result shouldBeEqualTo Result.success(fakeSession)
     }
@@ -81,14 +81,14 @@ class DirectLoginUseCaseTest {
     @Test
     fun `given wellknown fails without content, when logging in directly, then returns well known error`() = runTest {
         fakeAuthenticationService.givenWellKnown(
-                A_LOGIN_OR_REGISTER_ACTION.username,
+                A_DIRECT_LOGIN_ACTION.matrixId,
                 config = NO_HOMESERVER_CONFIG,
                 result = A_WELLKNOWN_FAILED_WITHOUT_CONTENT_RESULT
         )
-        val (username, password, initialDeviceName) = A_LOGIN_OR_REGISTER_ACTION
+        val (username, password, initialDeviceName) = A_DIRECT_LOGIN_ACTION
         fakeAuthenticationService.givenDirectAuthentication(A_FALLBACK_CONFIG, username, password, initialDeviceName, result = fakeSession)
 
-        val result = useCase.execute(A_LOGIN_OR_REGISTER_ACTION, homeServerConnectionConfig = NO_HOMESERVER_CONFIG)
+        val result = useCase.execute(A_DIRECT_LOGIN_ACTION, homeServerConnectionConfig = NO_HOMESERVER_CONFIG)
 
         result should { this.isFailure }
         result should { this.exceptionOrNull() is Exception }
@@ -97,20 +97,20 @@ class DirectLoginUseCaseTest {
 
     @Test
     fun `given wellknown throws, when logging in directly, then returns failure result with original cause`() = runTest {
-        fakeAuthenticationService.givenWellKnownThrows(A_LOGIN_OR_REGISTER_ACTION.username, config = NO_HOMESERVER_CONFIG, cause = AN_ERROR)
+        fakeAuthenticationService.givenWellKnownThrows(A_DIRECT_LOGIN_ACTION.matrixId, config = NO_HOMESERVER_CONFIG, cause = AN_ERROR)
 
-        val result = useCase.execute(A_LOGIN_OR_REGISTER_ACTION, homeServerConnectionConfig = NO_HOMESERVER_CONFIG)
+        val result = useCase.execute(A_DIRECT_LOGIN_ACTION, homeServerConnectionConfig = NO_HOMESERVER_CONFIG)
 
         result shouldBeEqualTo Result.failure(AN_ERROR)
     }
 
     @Test
     fun `given direct authentication throws, when logging in directly, then returns failure result with original cause`() = runTest {
-        fakeAuthenticationService.givenWellKnown(A_LOGIN_OR_REGISTER_ACTION.username, config = NO_HOMESERVER_CONFIG, result = A_WELLKNOWN_SUCCESS_RESULT)
-        val (username, password, initialDeviceName) = A_LOGIN_OR_REGISTER_ACTION
+        fakeAuthenticationService.givenWellKnown(A_DIRECT_LOGIN_ACTION.matrixId, config = NO_HOMESERVER_CONFIG, result = A_WELLKNOWN_SUCCESS_RESULT)
+        val (username, password, initialDeviceName) = A_DIRECT_LOGIN_ACTION
         fakeAuthenticationService.givenDirectAuthenticationThrows(A_FALLBACK_CONFIG, username, password, initialDeviceName, cause = AN_ERROR)
 
-        val result = useCase.execute(A_LOGIN_OR_REGISTER_ACTION, homeServerConnectionConfig = NO_HOMESERVER_CONFIG)
+        val result = useCase.execute(A_DIRECT_LOGIN_ACTION, homeServerConnectionConfig = NO_HOMESERVER_CONFIG)
 
         result shouldBeEqualTo Result.failure(AN_ERROR)
     }
diff --git a/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt b/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
index ac8a4c364e..77539da232 100644
--- a/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
+++ b/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
@@ -18,6 +18,8 @@ package im.vector.app.features.onboarding
 
 import android.net.Uri
 import com.airbnb.mvrx.test.MvRxTestRule
+import im.vector.app.R
+import im.vector.app.features.login.LoginConfig
 import im.vector.app.features.login.LoginMode
 import im.vector.app.features.login.ReAuthHelper
 import im.vector.app.features.login.SignMode
@@ -29,6 +31,7 @@ import im.vector.app.test.fakes.FakeContext
 import im.vector.app.test.fakes.FakeDirectLoginUseCase
 import im.vector.app.test.fakes.FakeHomeServerConnectionConfigFactory
 import im.vector.app.test.fakes.FakeHomeServerHistoryService
+import im.vector.app.test.fakes.FakeLoginWizard
 import im.vector.app.test.fakes.FakeRegisterActionHandler
 import im.vector.app.test.fakes.FakeRegistrationWizard
 import im.vector.app.test.fakes.FakeSession
@@ -38,6 +41,8 @@ import im.vector.app.test.fakes.FakeUri
 import im.vector.app.test.fakes.FakeUriFilenameResolver
 import im.vector.app.test.fakes.FakeVectorFeatures
 import im.vector.app.test.fakes.FakeVectorOverrides
+import im.vector.app.test.fakes.toTestString
+import im.vector.app.test.fixtures.aBuildMeta
 import im.vector.app.test.fixtures.aHomeServerCapabilities
 import im.vector.app.test.test
 import kotlinx.coroutines.test.runTest
@@ -59,10 +64,12 @@ private val A_RESULT_IGNORED_REGISTER_ACTION = RegisterAction.SendAgainThreePid
 private val A_HOMESERVER_CAPABILITIES = aHomeServerCapabilities(canChangeDisplayName = true, canChangeAvatar = true)
 private val AN_IGNORED_FLOW_RESULT = FlowResult(missingStages = emptyList(), completedStages = emptyList())
 private val ANY_CONTINUING_REGISTRATION_RESULT = RegistrationResult.NextStep(AN_IGNORED_FLOW_RESULT)
-private val A_LOGIN_OR_REGISTER_ACTION = OnboardingAction.LoginOrRegister("@a-user:id.org", "a-password", "a-device-name")
+private val A_DIRECT_LOGIN = OnboardingAction.AuthenticateAction.LoginDirect("@a-user:id.org", "a-password", "a-device-name")
 private const val A_HOMESERVER_URL = "https://edited-homeserver.org"
 private val A_HOMESERVER_CONFIG = HomeServerConnectionConfig(FakeUri().instance)
 private val SELECTED_HOMESERVER_STATE = SelectedHomeserverState(preferredLoginMode = LoginMode.Password)
+private const val AN_EMAIL = "hello@example.com"
+private const val A_PASSWORD = "a-password"
 
 class OnboardingViewModelTest {
 
@@ -81,6 +88,7 @@ class OnboardingViewModelTest {
     private val fakeHomeServerConnectionConfigFactory = FakeHomeServerConnectionConfigFactory()
     private val fakeStartAuthenticationFlowUseCase = FakeStartAuthenticationFlowUseCase()
     private val fakeHomeServerHistoryService = FakeHomeServerHistoryService()
+    private val fakeLoginWizard = FakeLoginWizard()
 
     private var initialState = OnboardingViewState()
     private lateinit var viewModel: OnboardingViewModel
@@ -142,11 +150,11 @@ class OnboardingViewModelTest {
     @Test
     fun `given has sign in with matrix id sign mode, when handling login or register action, then logs in directly`() = runTest {
         viewModelWith(initialState.copy(signMode = SignMode.SignInWithMatrixId))
-        fakeDirectLoginUseCase.givenSuccessResult(A_LOGIN_OR_REGISTER_ACTION, config = null, result = fakeSession)
+        fakeDirectLoginUseCase.givenSuccessResult(A_DIRECT_LOGIN, config = null, result = fakeSession)
         givenInitialisesSession(fakeSession)
         val test = viewModel.test()
 
-        viewModel.handle(A_LOGIN_OR_REGISTER_ACTION)
+        viewModel.handle(A_DIRECT_LOGIN)
 
         test
                 .assertStatesChanges(
@@ -161,11 +169,11 @@ class OnboardingViewModelTest {
     @Test
     fun `given has sign in with matrix id sign mode, when handling login or register action fails, then emits error`() = runTest {
         viewModelWith(initialState.copy(signMode = SignMode.SignInWithMatrixId))
-        fakeDirectLoginUseCase.givenFailureResult(A_LOGIN_OR_REGISTER_ACTION, config = null, cause = AN_ERROR)
+        fakeDirectLoginUseCase.givenFailureResult(A_DIRECT_LOGIN, config = null, cause = AN_ERROR)
         givenInitialisesSession(fakeSession)
         val test = viewModel.test()
 
-        viewModel.handle(A_LOGIN_OR_REGISTER_ACTION)
+        viewModel.handle(A_DIRECT_LOGIN)
 
         test
                 .assertStatesChanges(
@@ -242,6 +250,27 @@ class OnboardingViewModelTest {
                 .finish()
     }
 
+    @Test
+    fun `given unavailable deeplink, when selecting homeserver, then emits failure with default homeserver as retry action`() = runTest {
+        fakeContext.givenHasConnection()
+        fakeHomeServerConnectionConfigFactory.givenConfigFor(A_HOMESERVER_URL, A_HOMESERVER_CONFIG)
+        fakeStartAuthenticationFlowUseCase.givenHomeserverUnavailable(A_HOMESERVER_CONFIG)
+        val test = viewModel.test()
+
+        viewModel.handle(OnboardingAction.InitWith(LoginConfig(A_HOMESERVER_URL, null)))
+        viewModel.handle(OnboardingAction.HomeServerChange.SelectHomeServer(A_HOMESERVER_URL))
+
+        val expectedRetryAction = OnboardingAction.HomeServerChange.SelectHomeServer("${R.string.matrix_org_server_url.toTestString()}/")
+        test
+                .assertStatesChanges(
+                        initialState,
+                        { copy(isLoading = true) },
+                        { copy(isLoading = false) }
+                )
+                .assertEvents(OnboardingViewEvents.DeeplinkAuthenticationFailure(expectedRetryAction))
+                .finish()
+    }
+
     @Test
     fun `given in the sign up flow, when editing homeserver, then updates selected homeserver state and emits edited event`() = runTest {
         viewModelWith(initialState.copy(onboardingFlow = OnboardingFlow.SignUp))
@@ -441,6 +470,43 @@ class OnboardingViewModelTest {
                 .finish()
     }
 
+    @Test
+    fun `given can successfully reset password, when resetting password, then emits reset done event`() = runTest {
+        val test = viewModel.test()
+        fakeLoginWizard.givenResetPasswordSuccess(AN_EMAIL)
+        fakeAuthenticationService.givenLoginWizard(fakeLoginWizard)
+
+        viewModel.handle(OnboardingAction.ResetPassword(email = AN_EMAIL, newPassword = A_PASSWORD))
+
+        test
+                .assertStatesChanges(
+                        initialState,
+                        { copy(isLoading = true) },
+                        { copy(isLoading = false, resetState = ResetState(AN_EMAIL, A_PASSWORD)) }
+                )
+                .assertEvents(OnboardingViewEvents.OnResetPasswordSendThreePidDone)
+                .finish()
+    }
+
+    @Test
+    fun `given can successfully confirm reset password, when confirm reset password, then emits reset success`() = runTest {
+        viewModelWith(initialState.copy(resetState = ResetState(AN_EMAIL, A_PASSWORD)))
+        val test = viewModel.test()
+        fakeLoginWizard.givenConfirmResetPasswordSuccess(A_PASSWORD)
+        fakeAuthenticationService.givenLoginWizard(fakeLoginWizard)
+
+        viewModel.handle(OnboardingAction.ResetPasswordMailConfirmed)
+
+        test
+                .assertStatesChanges(
+                        initialState,
+                        { copy(isLoading = true) },
+                        { copy(isLoading = false, resetState = ResetState()) }
+                )
+                .assertEvents(OnboardingViewEvents.OnResetPasswordMailConfirmationSuccess)
+                .finish()
+    }
+
     private fun viewModelWith(state: OnboardingViewState) {
         OnboardingViewModel(
                 state,
@@ -457,7 +523,8 @@ class OnboardingViewModelTest {
                 fakeRegisterActionHandler.instance,
                 fakeDirectLoginUseCase.instance,
                 fakeStartAuthenticationFlowUseCase.instance,
-                FakeVectorOverrides()
+                FakeVectorOverrides(),
+                aBuildMeta()
         ).also {
             viewModel = it
             initialState = state
diff --git a/vector/src/test/java/im/vector/app/features/onboarding/ftueauth/FtueMissingRegistrationStagesComparatorTest.kt b/vector/src/test/java/im/vector/app/features/onboarding/ftueauth/MatrixOrgRegistrationStagesComparatorTest.kt
similarity index 92%
rename from vector/src/test/java/im/vector/app/features/onboarding/ftueauth/FtueMissingRegistrationStagesComparatorTest.kt
rename to vector/src/test/java/im/vector/app/features/onboarding/ftueauth/MatrixOrgRegistrationStagesComparatorTest.kt
index 010cf5de60..08be0ee058 100644
--- a/vector/src/test/java/im/vector/app/features/onboarding/ftueauth/FtueMissingRegistrationStagesComparatorTest.kt
+++ b/vector/src/test/java/im/vector/app/features/onboarding/ftueauth/MatrixOrgRegistrationStagesComparatorTest.kt
@@ -25,7 +25,7 @@ import im.vector.app.test.fixtures.anOtherStage
 import org.amshove.kluent.shouldBeEqualTo
 import org.junit.Test
 
-class FtueMissingRegistrationStagesComparatorTest {
+class MatrixOrgRegistrationStagesComparatorTest {
 
     @Test
     fun `when ordering stages, then prioritizes email`() {
@@ -38,7 +38,7 @@ class FtueMissingRegistrationStagesComparatorTest {
                 aTermsStage()
         )
 
-        val result = input.sortedWith(FtueMissingRegistrationStagesComparator())
+        val result = input.sortedWith(MatrixOrgRegistrationStagesComparator())
 
         result shouldBeEqualTo listOf(
                 anEmailStage(),
diff --git a/vector/src/test/java/im/vector/app/features/widgets/WebviewPermissionUtilsTest.kt b/vector/src/test/java/im/vector/app/features/widgets/WebviewPermissionUtilsTest.kt
new file mode 100644
index 0000000000..927a26b453
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/widgets/WebviewPermissionUtilsTest.kt
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.widgets
+
+import android.Manifest
+import android.webkit.PermissionRequest
+import im.vector.app.features.widgets.webview.WebviewPermissionUtils
+import im.vector.app.test.fakes.FakeVectorPreferences
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.FixMethodOrder
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+import org.junit.runners.MethodSorters
+
+@RunWith(JUnit4::class)
+@FixMethodOrder(MethodSorters.JVM)
+class WebviewPermissionUtilsTest {
+
+    private val prefs = FakeVectorPreferences()
+    private val utils = WebviewPermissionUtils(prefs.instance)
+
+    @Test
+    fun filterPermissionsToBeGranted_selectedAndGrantedNothing() {
+        val permissions = utils.filterPermissionsToBeGranted(
+                selectedWebPermissions = listOf(),
+                androidPermissionResult = mapOf())
+        permissions shouldBeEqualTo listOf()
+    }
+
+    @Test
+    fun filterPermissionsToBeGranted_selectedNothingGrantedCamera() {
+        val permissions = utils.filterPermissionsToBeGranted(
+                selectedWebPermissions = listOf(),
+                androidPermissionResult = mapOf(Manifest.permission.CAMERA to true))
+        permissions shouldBeEqualTo listOf()
+    }
+
+    @Test
+    fun filterPermissionsToBeGranted_selectedAndPreviouslyGrantedCamera() {
+        val permissions = utils.filterPermissionsToBeGranted(
+                selectedWebPermissions = listOf(PermissionRequest.RESOURCE_VIDEO_CAPTURE),
+                androidPermissionResult = mapOf())
+        permissions shouldBeEqualTo listOf(PermissionRequest.RESOURCE_VIDEO_CAPTURE)
+    }
+
+    @Test
+    fun filterPermissionsToBeGranted_selectedAndGrantedCamera() {
+        val permissions = utils.filterPermissionsToBeGranted(
+                selectedWebPermissions = listOf(PermissionRequest.RESOURCE_VIDEO_CAPTURE),
+                androidPermissionResult = mapOf(Manifest.permission.CAMERA to true))
+        permissions shouldBeEqualTo listOf(PermissionRequest.RESOURCE_VIDEO_CAPTURE)
+    }
+
+    @Test
+    fun filterPermissionsToBeGranted_selectedAndDeniedCamera() {
+        val permissions = utils.filterPermissionsToBeGranted(
+                selectedWebPermissions = listOf(PermissionRequest.RESOURCE_VIDEO_CAPTURE),
+                androidPermissionResult = mapOf(Manifest.permission.CAMERA to false))
+        permissions shouldBeEqualTo listOf()
+    }
+
+    @Test
+    fun filterPermissionsToBeGranted_selectedProtectedMediaGrantedNothing() {
+        val permissions = utils.filterPermissionsToBeGranted(
+                selectedWebPermissions = listOf(PermissionRequest.RESOURCE_PROTECTED_MEDIA_ID),
+                androidPermissionResult = mapOf(Manifest.permission.CAMERA to false))
+        permissions shouldBeEqualTo listOf(PermissionRequest.RESOURCE_PROTECTED_MEDIA_ID)
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeAuthenticationService.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeAuthenticationService.kt
index fedda18aeb..cc606497f5 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeAuthenticationService.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeAuthenticationService.kt
@@ -23,6 +23,7 @@ import io.mockk.mockk
 import org.matrix.android.sdk.api.auth.AuthenticationService
 import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
 import org.matrix.android.sdk.api.auth.data.LoginFlowResult
+import org.matrix.android.sdk.api.auth.login.LoginWizard
 import org.matrix.android.sdk.api.auth.registration.RegistrationWizard
 import org.matrix.android.sdk.api.auth.wellknown.WellknownResult
 
@@ -33,7 +34,11 @@ class FakeAuthenticationService : AuthenticationService by mockk() {
     }
 
     fun givenRegistrationStarted(started: Boolean) {
-        every { isRegistrationStarted } returns started
+        every { isRegistrationStarted() } returns started
+    }
+
+    fun givenLoginWizard(loginWizard: LoginWizard) {
+        every { getLoginWizard() } returns loginWizard
     }
 
     fun givenLoginFlow(config: HomeServerConnectionConfig, result: LoginFlowResult) {
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeConnectivityManager.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeConnectivityManager.kt
new file mode 100644
index 0000000000..d565105f81
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeConnectivityManager.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.test.fakes
+
+import android.net.ConnectivityManager
+import android.net.Network
+import android.net.NetworkCapabilities
+import io.mockk.every
+import io.mockk.mockk
+
+class FakeConnectivityManager {
+    val instance = mockk<ConnectivityManager>()
+
+    fun givenNoActiveConnection() {
+        every { instance.activeNetwork } returns null
+    }
+
+    fun givenHasActiveConnection() {
+        val network = mockk<Network>()
+        every { instance.activeNetwork } returns network
+
+        val networkCapabilities = FakeNetworkCapabilities()
+        networkCapabilities.givenTransports(
+                NetworkCapabilities.TRANSPORT_CELLULAR,
+                NetworkCapabilities.TRANSPORT_WIFI,
+                NetworkCapabilities.TRANSPORT_VPN
+        )
+        every { instance.getNetworkCapabilities(network) } returns networkCapabilities.instance
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeContext.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeContext.kt
index 2a50c34ca3..eb491c9e0c 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeContext.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeContext.kt
@@ -18,6 +18,7 @@ package im.vector.app.test.fakes
 
 import android.content.ContentResolver
 import android.content.Context
+import android.net.ConnectivityManager
 import android.net.Uri
 import android.os.ParcelFileDescriptor
 import io.mockk.every
@@ -48,4 +49,21 @@ class FakeContext(
     fun givenMissingSafeOutputStreamFor(uri: Uri) {
         every { contentResolver.openOutputStream(uri, "wt") } returns null
     }
+
+    fun givenNoConnection() {
+        val connectivityManager = FakeConnectivityManager()
+        connectivityManager.givenNoActiveConnection()
+        givenService(Context.CONNECTIVITY_SERVICE, ConnectivityManager::class.java, connectivityManager.instance)
+    }
+
+    private fun <T> givenService(name: String, klass: Class<T>, service: T) {
+        every { instance.getSystemService(name) } returns service
+        every { instance.getSystemService(klass) } returns service
+    }
+
+    fun givenHasConnection() {
+        val connectivityManager = FakeConnectivityManager()
+        connectivityManager.givenHasActiveConnection()
+        givenService(Context.CONNECTIVITY_SERVICE, ConnectivityManager::class.java, connectivityManager.instance)
+    }
 }
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeDirectLoginUseCase.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeDirectLoginUseCase.kt
index 8a5c6b1cee..289c0a6159 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeDirectLoginUseCase.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeDirectLoginUseCase.kt
@@ -17,7 +17,7 @@
 package im.vector.app.test.fakes
 
 import im.vector.app.features.onboarding.DirectLoginUseCase
-import im.vector.app.features.onboarding.OnboardingAction
+import im.vector.app.features.onboarding.OnboardingAction.AuthenticateAction
 import io.mockk.coEvery
 import io.mockk.mockk
 import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
@@ -25,11 +25,11 @@ import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
 class FakeDirectLoginUseCase {
     val instance = mockk<DirectLoginUseCase>()
 
-    fun givenSuccessResult(action: OnboardingAction.LoginOrRegister, config: HomeServerConnectionConfig?, result: FakeSession) {
+    fun givenSuccessResult(action: AuthenticateAction.LoginDirect, config: HomeServerConnectionConfig?, result: FakeSession) {
         coEvery { instance.execute(action, config) } returns Result.success(result)
     }
 
-    fun givenFailureResult(action: OnboardingAction.LoginOrRegister, config: HomeServerConnectionConfig?, cause: Throwable) {
+    fun givenFailureResult(action: AuthenticateAction.LoginDirect, config: HomeServerConnectionConfig?, cause: Throwable) {
         coEvery { instance.execute(action, config) } returns Result.failure(cause)
     }
 }
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeLocationPinProvider.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeLocationPinProvider.kt
new file mode 100644
index 0000000000..726093215f
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeLocationPinProvider.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.test.fakes
+
+import android.graphics.drawable.Drawable
+import im.vector.app.features.home.room.detail.timeline.helper.LocationPinProvider
+import io.mockk.every
+import io.mockk.invoke
+import io.mockk.mockk
+
+class FakeLocationPinProvider {
+
+    val instance = mockk<LocationPinProvider>(relaxed = true)
+
+    fun givenCreateForUserId(userId: String, expectedDrawable: Drawable) {
+        every { instance.create(userId, captureLambda()) } answers { lambda<(Drawable) -> Unit>().invoke(expectedDrawable) }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeLocationSharingService.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeLocationSharingService.kt
new file mode 100644
index 0000000000..2cd98c086c
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeLocationSharingService.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.test.fakes
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import io.mockk.every
+import io.mockk.mockk
+import org.matrix.android.sdk.api.session.room.location.LocationSharingService
+import org.matrix.android.sdk.api.session.room.model.livelocation.LiveLocationShareAggregatedSummary
+
+class FakeLocationSharingService : LocationSharingService by mockk() {
+
+    fun givenRunningLiveLocationShareSummaries(summaries: List<LiveLocationShareAggregatedSummary>):
+            LiveData<List<LiveLocationShareAggregatedSummary>> {
+        return MutableLiveData(summaries).also {
+            every { getRunningLiveLocationShareSummaries() } returns it
+        }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeLoginWizard.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeLoginWizard.kt
new file mode 100644
index 0000000000..38bb75087c
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeLoginWizard.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.test.fakes
+
+import io.mockk.coJustRun
+import io.mockk.mockk
+import org.matrix.android.sdk.api.auth.login.LoginWizard
+
+class FakeLoginWizard : LoginWizard by mockk() {
+
+    fun givenResetPasswordSuccess(email: String) {
+        coJustRun { resetPassword(email) }
+    }
+
+    fun givenConfirmResetPasswordSuccess(password: String) {
+        coJustRun { resetPasswordMailConfirmed(password) }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeNetworkCapabilities.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeNetworkCapabilities.kt
new file mode 100644
index 0000000000..36add7128c
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeNetworkCapabilities.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.test.fakes
+
+import android.net.NetworkCapabilities
+import io.mockk.every
+import io.mockk.mockk
+
+class FakeNetworkCapabilities {
+    val instance = mockk<NetworkCapabilities>()
+
+    fun givenTransports(vararg type: Int) {
+        every { instance.hasTransport(any()) } answers {
+            val input = it.invocation.args.first() as Int
+            type.contains(input)
+        }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeNotificationFactory.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeNotificationFactory.kt
index a6e7d1a078..7fec142b3d 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeNotificationFactory.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeNotificationFactory.kt
@@ -28,15 +28,17 @@ class FakeNotificationFactory {
 
     val instance = mockk<NotificationFactory>()
 
-    fun givenNotificationsFor(groupedEvents: GroupedNotificationEvents,
-                              myUserId: String,
-                              myUserDisplayName: String,
-                              myUserAvatarUrl: String?,
-                              useCompleteNotificationFormat: Boolean,
-                              roomNotifications: List<RoomNotification>,
-                              invitationNotifications: List<OneShotNotification>,
-                              simpleNotifications: List<OneShotNotification>,
-                              summaryNotification: SummaryNotification) {
+    fun givenNotificationsFor(
+            groupedEvents: GroupedNotificationEvents,
+            myUserId: String,
+            myUserDisplayName: String,
+            myUserAvatarUrl: String?,
+            useCompleteNotificationFormat: Boolean,
+            roomNotifications: List<RoomNotification>,
+            invitationNotifications: List<OneShotNotification>,
+            simpleNotifications: List<OneShotNotification>,
+            summaryNotification: SummaryNotification
+    ) {
         with(instance) {
             every { groupedEvents.roomEvents.toNotifications(myUserDisplayName, myUserAvatarUrl) } returns roomNotifications
             every { groupedEvents.invitationEvents.toNotifications(myUserId) } returns invitationNotifications
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeRoom.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeRoom.kt
new file mode 100644
index 0000000000..ff87ab0fde
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeRoom.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.test.fakes
+
+import io.mockk.mockk
+import org.matrix.android.sdk.api.session.room.Room
+
+class FakeRoom(
+        private val fakeLocationSharingService: FakeLocationSharingService = FakeLocationSharingService(),
+) : Room by mockk() {
+
+    override fun locationSharingService() = fakeLocationSharingService
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeRoomGroupMessageCreator.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeRoomGroupMessageCreator.kt
index c164b9a661..307a8cee9a 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeRoomGroupMessageCreator.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeRoomGroupMessageCreator.kt
@@ -26,10 +26,12 @@ class FakeRoomGroupMessageCreator {
 
     val instance = mockk<RoomGroupMessageCreator>()
 
-    fun givenCreatesRoomMessageFor(events: List<NotifiableMessageEvent>,
-                                   roomId: String,
-                                   userDisplayName: String,
-                                   userAvatarUrl: String?): RoomNotification.Message {
+    fun givenCreatesRoomMessageFor(
+            events: List<NotifiableMessageEvent>,
+            roomId: String,
+            userDisplayName: String,
+            userAvatarUrl: String?
+    ): RoomNotification.Message {
         val mockMessage = mockk<RoomNotification.Message>()
         every { instance.createRoomMessage(events, roomId, userDisplayName, userAvatarUrl) } returns mockMessage
         return mockMessage
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeRoomService.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeRoomService.kt
new file mode 100644
index 0000000000..b09256f747
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeRoomService.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.test.fakes
+
+import io.mockk.mockk
+import org.matrix.android.sdk.api.session.room.RoomService
+
+class FakeRoomService(
+        private val fakeRoom: FakeRoom = FakeRoom()
+) : RoomService by mockk() {
+
+    override fun getRoom(roomId: String) = fakeRoom
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeSession.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeSession.kt
index 5f02879e65..cf94493f61 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeSession.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeSession.kt
@@ -33,7 +33,8 @@ class FakeSession(
         val fakeCryptoService: FakeCryptoService = FakeCryptoService(),
         val fakeProfileService: FakeProfileService = FakeProfileService(),
         val fakeHomeServerCapabilitiesService: FakeHomeServerCapabilitiesService = FakeHomeServerCapabilitiesService(),
-        val fakeSharedSecretStorageService: FakeSharedSecretStorageService = FakeSharedSecretStorageService()
+        val fakeSharedSecretStorageService: FakeSharedSecretStorageService = FakeSharedSecretStorageService(),
+        private val fakeRoomService: FakeRoomService = FakeRoomService(),
 ) : Session by mockk(relaxed = true) {
 
     init {
@@ -48,6 +49,7 @@ class FakeSession(
     override fun profileService(): ProfileService = fakeProfileService
     override fun homeServerCapabilitiesService(): HomeServerCapabilitiesService = fakeHomeServerCapabilitiesService
     override fun sharedSecretStorageService() = fakeSharedSecretStorageService
+    override fun roomService() = fakeRoomService
 
     fun givenVectorStore(vectorSessionStore: VectorSessionStore) {
         coEvery {
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeSharedSecretStorageService.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeSharedSecretStorageService.kt
index c79a0be542..6ec9a4b593 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeSharedSecretStorageService.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeSharedSecretStorageService.kt
@@ -19,6 +19,7 @@ package im.vector.app.test.fakes
 import org.matrix.android.sdk.api.listeners.ProgressListener
 import org.matrix.android.sdk.api.session.securestorage.IntegrityResult
 import org.matrix.android.sdk.api.session.securestorage.KeyInfoResult
+import org.matrix.android.sdk.api.session.securestorage.KeyRef
 import org.matrix.android.sdk.api.session.securestorage.KeySigner
 import org.matrix.android.sdk.api.session.securestorage.SharedSecretStorageError
 import org.matrix.android.sdk.api.session.securestorage.SharedSecretStorageService
@@ -34,11 +35,13 @@ class FakeSharedSecretStorageService : SharedSecretStorageService {
         TODO("Not yet implemented")
     }
 
-    override suspend fun generateKeyWithPassphrase(keyId: String,
-                                                   keyName: String,
-                                                   passphrase: String,
-                                                   keySigner: KeySigner,
-                                                   progressListener: ProgressListener?): SsssKeyCreationInfo {
+    override suspend fun generateKeyWithPassphrase(
+            keyId: String,
+            keyName: String,
+            passphrase: String,
+            keySigner: KeySigner,
+            progressListener: ProgressListener?
+    ): SsssKeyCreationInfo {
         TODO("Not yet implemented")
     }
 
@@ -56,7 +59,7 @@ class FakeSharedSecretStorageService : SharedSecretStorageService {
         TODO("Not yet implemented")
     }
 
-    override suspend fun storeSecret(name: String, secretBase64: String, keys: List<SharedSecretStorageService.KeyRef>) {
+    override suspend fun storeSecret(name: String, secretBase64: String, keys: List<KeyRef>) {
         TODO("Not yet implemented")
     }
 
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeStartAuthenticationFlowUseCase.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeStartAuthenticationFlowUseCase.kt
index 697de6bf25..bfbef9e565 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeStartAuthenticationFlowUseCase.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeStartAuthenticationFlowUseCase.kt
@@ -18,6 +18,7 @@ package im.vector.app.test.fakes
 
 import im.vector.app.features.onboarding.StartAuthenticationFlowUseCase
 import im.vector.app.features.onboarding.StartAuthenticationFlowUseCase.StartAuthenticationResult
+import im.vector.app.test.fixtures.aHomeserverUnavailableError
 import io.mockk.coEvery
 import io.mockk.mockk
 import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
@@ -29,4 +30,8 @@ class FakeStartAuthenticationFlowUseCase {
     fun givenResult(config: HomeServerConnectionConfig, result: StartAuthenticationResult) {
         coEvery { instance.execute(config) } returns result
     }
+
+    fun givenHomeserverUnavailable(config: HomeServerConnectionConfig) {
+        coEvery { instance.execute(config) } throws aHomeserverUnavailableError()
+    }
 }
diff --git a/vector/src/test/java/im/vector/app/test/fixtures/BuildMetaFixture.kt b/vector/src/test/java/im/vector/app/test/fixtures/BuildMetaFixture.kt
new file mode 100644
index 0000000000..b0e6b1dd51
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fixtures/BuildMetaFixture.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.test.fixtures
+
+import android.os.Build
+import im.vector.app.core.resources.BuildMeta
+
+fun aBuildMeta() = BuildMeta(Build.VERSION_CODES.O)
diff --git a/vector/src/test/java/im/vector/app/test/fixtures/FailureFixture.kt b/vector/src/test/java/im/vector/app/test/fixtures/FailureFixture.kt
index 39c139c208..9ac851ef5e 100644
--- a/vector/src/test/java/im/vector/app/test/fixtures/FailureFixture.kt
+++ b/vector/src/test/java/im/vector/app/test/fixtures/FailureFixture.kt
@@ -18,8 +18,11 @@ package im.vector.app.test.fixtures
 
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.failure.MatrixError
+import java.net.UnknownHostException
 import javax.net.ssl.HttpsURLConnection
 
 fun a401ServerError() = Failure.ServerError(
         MatrixError(MatrixError.M_UNAUTHORIZED, ""), HttpsURLConnection.HTTP_UNAUTHORIZED
 )
+
+fun aHomeserverUnavailableError() = Failure.NetworkConnection(UnknownHostException())
diff --git a/vector/src/test/java/im/vector/app/test/fixtures/NotifiableEventFixture.kt b/vector/src/test/java/im/vector/app/test/fixtures/NotifiableEventFixture.kt
index 53d38aa228..397ca80f84 100644
--- a/vector/src/test/java/im/vector/app/test/fixtures/NotifiableEventFixture.kt
+++ b/vector/src/test/java/im/vector/app/test/fixtures/NotifiableEventFixture.kt
@@ -77,5 +77,5 @@ fun aNotifiableMessageEvent(
         roomIsDirect = false,
         canBeReplaced = false,
         isRedacted = isRedacted,
-        imageUri = null
+        imageUriString = null
 )