CipherLabs
/
alpha-wallet-android
mirror of https://github.com/AlphaWallet/alpha-wallet-android
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor Sign Dialogs (#2962)

Browse Source 
* Move Signing operation from ActionSheetDialog into new dedicated ActionSheetSignDialog
* Complete the refactoring work for the self-contained Signing dialog.
* Fix build issue in test and clean up some formatting issues.
* Fix checkstyle
* Modify the interface and de-duplicate
pull/2949/merge
James Brown 2 years ago committed by GitHub
parent e754b431c7
commit c980f1c982
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
53 changed files with 1239 additions and 2207 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 899
      .editorconfig
  2. 16
      .github/checkstyle-rules.xml
  3. 51
      app/src/main/java/com/alphawallet/app/entity/ActionSheetInterface.java
  4. 3
      app/src/main/java/com/alphawallet/app/entity/SignAuthenticationCallback.java
  5. 8
      app/src/main/java/com/alphawallet/app/interact/CreateTransactionInteract.java
  6. 10
      app/src/main/java/com/alphawallet/app/interact/GenericWalletInteract.java
  7. 65
      app/src/main/java/com/alphawallet/app/repository/TransactionRepository.java
  8. 13
      app/src/main/java/com/alphawallet/app/repository/TransactionRepositoryType.java
  9. 8
      app/src/main/java/com/alphawallet/app/service/AccountKeystoreService.java
  10. 71
      app/src/main/java/com/alphawallet/app/service/KeystoreAccountService.java
  11. 10
      app/src/main/java/com/alphawallet/app/ui/AssetDisplayActivity.java
  12. 23
      app/src/main/java/com/alphawallet/app/ui/BaseActivity.java
  13. 65
      app/src/main/java/com/alphawallet/app/ui/DappBrowserFragment.java
  14. 51
      app/src/main/java/com/alphawallet/app/ui/FunctionActivity.java
  15. 102
      app/src/main/java/com/alphawallet/app/ui/HomeActivity.java
  16. 2
      app/src/main/java/com/alphawallet/app/ui/NFTAssetsFragment.java
  17. 68
      app/src/main/java/com/alphawallet/app/ui/WalletConnectActivity.java
  18. 38
      app/src/main/java/com/alphawallet/app/ui/widget/adapter/NonFungibleTokenAdapter.java
  19. 40
      app/src/main/java/com/alphawallet/app/ui/widget/entity/ActionSheetCallback.java
  20. 4
      app/src/main/java/com/alphawallet/app/viewmodel/ApiV1ViewModel.java
  21. 13
      app/src/main/java/com/alphawallet/app/viewmodel/DappBrowserViewModel.java
  22. 2
      app/src/main/java/com/alphawallet/app/viewmodel/RedeemSignatureDisplayModel.java
  23. 10
      app/src/main/java/com/alphawallet/app/viewmodel/SellDetailViewModel.java
  24. 86
      app/src/main/java/com/alphawallet/app/viewmodel/SignDialogViewModel.java
  25. 11
      app/src/main/java/com/alphawallet/app/viewmodel/TokenFunctionViewModel.java
  26. 4
      app/src/main/java/com/alphawallet/app/viewmodel/TransferTicketDetailViewModel.java
  27. 3
      app/src/main/java/com/alphawallet/app/viewmodel/WalletConnectViewModel.java
  28. 128
      app/src/main/java/com/alphawallet/app/viewmodel/walletconnect/SignMethodDialogViewModel.java
  29. 83
      app/src/main/java/com/alphawallet/app/walletconnect/AWWalletConnectClient.java
  30. 69
      app/src/main/java/com/alphawallet/app/walletconnect/WalletConnectV2SessionRequestHandler.java
  31. 5
      app/src/main/java/com/alphawallet/app/walletconnect/entity/BaseRequest.java
  32. 33
      app/src/main/java/com/alphawallet/app/walletconnect/entity/EthSignRequest.java
  33. 6
      app/src/main/java/com/alphawallet/app/walletconnect/entity/SignPersonalMessageRequest.java
  34. 10
      app/src/main/java/com/alphawallet/app/walletconnect/entity/SignRequest.java
  35. 6
      app/src/main/java/com/alphawallet/app/walletconnect/entity/SignTypedDataRequest.java
  36. 1
      app/src/main/java/com/alphawallet/app/walletconnect/util/WCMethodChecker.java
  37. 2
      app/src/main/java/com/alphawallet/app/walletconnect/util/WalletConnectHelper.java
  38. 21
      app/src/main/java/com/alphawallet/app/web3/Web3TokenView.java
  39. 4
      app/src/main/java/com/alphawallet/app/web3/entity/FunctionCallback.java
  40. 53
      app/src/main/java/com/alphawallet/app/widget/ActionSheet.java
  41. 209
      app/src/main/java/com/alphawallet/app/widget/ActionSheetDialog.java
  42. 157
      app/src/main/java/com/alphawallet/app/widget/ActionSheetSignDialog.java
  43. 7
      app/src/main/java/com/alphawallet/app/widget/ConfirmationWidget.java
  44. 9
      app/src/main/java/com/alphawallet/app/widget/SignDataWidget.java
  45. 188
      app/src/main/java/com/alphawallet/app/widget/SignMethodDialog.java
  46. 4
      app/src/main/java/com/alphawallet/app/widget/SignTransactionDialog.java
  47. 2
      app/src/main/res/layout/activity_wallet_connect_v2.xml
  48. 31
      app/src/main/res/layout/dialog_action_sheet_message.xml
  49. 5
      app/src/main/res/layout/dialog_action_sheet_sign.xml
  50. 7
      app/src/main/res/layout/item_ticket.xml
  51. 5
      app/src/test/java/com/alphawallet/app/ENSTest.java
  52. 6
      app/src/test/java/com/alphawallet/app/QRSelectionTest.java
  53. 7
      app/src/test/java/com/alphawallet/app/walletconnect/SignRequestTest.java

899
.editorconfig
Unescape View File

@ -13,902 +13,3 @@ ij_formatter_tags_enabled = false
ij_smart_tabs = false ij_smart_tabs = false
ij_visual_guides = none ij_visual_guides = none
ij_wrap_on_typing = false 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 = next_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 = true
ij_java_class_annotation_wrap = split_into_lines
ij_java_class_brace_style = next_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 = always
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 = true
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 = true
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 = true
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 = next_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 = true
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 = false
ij_kotlin_align_multiline_binary_operation = false
ij_kotlin_align_multiline_extends_list = false
ij_kotlin_align_multiline_method_parentheses = false
ij_kotlin_align_multiline_parameters = true
ij_kotlin_align_multiline_parameters_in_calls = false
ij_kotlin_allow_trailing_comma = false
ij_kotlin_allow_trailing_comma_on_call_site = false
ij_kotlin_assignment_wrap = normal
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 = true
ij_kotlin_call_parameters_right_paren_on_new_line = true
ij_kotlin_call_parameters_wrap = on_every_item
ij_kotlin_catch_on_new_line = false
ij_kotlin_class_annotation_wrap = split_into_lines
ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
ij_kotlin_continuation_indent_for_chained_calls = false
ij_kotlin_continuation_indent_for_expression_bodies = false
ij_kotlin_continuation_indent_in_argument_lists = false
ij_kotlin_continuation_indent_in_elvis = false
ij_kotlin_continuation_indent_in_if_conditions = false
ij_kotlin_continuation_indent_in_parameter_lists = false
ij_kotlin_continuation_indent_in_supertype_lists = false
ij_kotlin_else_on_new_line = false
ij_kotlin_enum_constants_wrap = off
ij_kotlin_extends_list_wrap = normal
ij_kotlin_field_annotation_wrap = split_into_lines
ij_kotlin_finally_on_new_line = false
ij_kotlin_if_rparen_on_new_line = true
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 = 2
ij_kotlin_keep_blank_lines_in_code = 2
ij_kotlin_keep_blank_lines_in_declarations = 2
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 = normal
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 = on_every_item
ij_kotlin_name_count_to_use_star_import = 5
ij_kotlin_name_count_to_use_star_import_for_members = 3
ij_kotlin_packages_to_use_import_on_demand = java.util.*,kotlinx.android.synthetic.**,io.ktor.**
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 = 1
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
[{*.markdown,*.md}]
ij_markdown_force_one_space_after_blockquote_symbol = true
ij_markdown_force_one_space_after_header_symbol = true
ij_markdown_force_one_space_after_list_bullet = true
ij_markdown_force_one_space_between_words = true
ij_markdown_keep_indents_on_empty_lines = false
ij_markdown_max_lines_around_block_elements = 1
ij_markdown_max_lines_around_header = 1
ij_markdown_max_lines_between_paragraphs = 1
ij_markdown_min_lines_around_block_elements = 1
ij_markdown_min_lines_around_header = 1
ij_markdown_min_lines_between_paragraphs = 1
[{*.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

16
.github/checkstyle-rules.xml
Unescape View File

@ -235,14 +235,14 @@
<message key="ws.illegalFollow" value="GenericWhitespace ''{0}'' should followed by whitespace." /> <message key="ws.illegalFollow" value="GenericWhitespace ''{0}'' should followed by whitespace." />
<message key="ws.notPreceded" value="GenericWhitespace ''{0}'' is not preceded with whitespace." /> <message key="ws.notPreceded" value="GenericWhitespace ''{0}'' is not preceded with whitespace." />
</module> </module>
<module name="Indentation"> <!-- <module name="Indentation">-->
<property name="basicOffset" value="4" /> <!-- <property name="basicOffset" value="4" />-->
<property name="braceAdjustment" value="0" /> <!-- <property name="braceAdjustment" value="0" />-->
<property name="caseIndent" value="4" /> <!-- <property name="caseIndent" value="4" />-->
<property name="throwsIndent" value="4" /> <!-- <property name="throwsIndent" value="4" />-->
<property name="lineWrappingIndentation" value="4" /> <!-- <property name="lineWrappingIndentation" value="4" />-->
<property name="arrayInitIndent" value="2" /> <!-- <property name="arrayInitIndent" value="2" />-->
</module> <!-- </module>-->
<!-- <module name="AbbreviationAsWordInName">--> <!-- <module name="AbbreviationAsWordInName">-->
<!-- <property name="ignoreFinal" value="false" />--> <!-- <property name="ignoreFinal" value="false" />-->
<!-- <property name="allowedAbbreviationLength" value="0" />--> <!-- <property name="allowedAbbreviationLength" value="0" />-->

51
app/src/main/java/com/alphawallet/app/entity/ActionSheetInterface.java
Unescape View File

@ -1,5 +1,11 @@
package com.alphawallet.app.entity; package com.alphawallet.app.entity;
import androidx.activity.result.ActivityResult;
import com.alphawallet.app.web3.entity.Web3Transaction;
import java.math.BigInteger;
/** /**
* Created by JB on 16/01/2021. * Created by JB on 16/01/2021.
*/ */
@ -7,4 +13,49 @@ public interface ActionSheetInterface
{ {
void lockDragging(boolean shouldLock); void lockDragging(boolean shouldLock);
void fullExpand(); void fullExpand();
default void success()
{
}
default void setURL(String url)
{
}
default void setGasEstimate(BigInteger estimate)
{
}
default void completeSignRequest(Boolean gotAuth)
{
}
default void setSigningWallet(String account)
{
}
default void setIcon(String icon)
{
}
default void transactionWritten(String hash)
{
}
default void updateChain(long chainId)
{
}
default Web3Transaction getTransaction()
{
throw new RuntimeException("Implement getTransaction");
}
default void setSignOnly()
{
}
default void setCurrentGasIndex(ActivityResult result)
{
}
} }

3
app/src/main/java/com/alphawallet/app/entity/SignAuthenticationCallback.java
Unescape View File

@ -1,7 +1,5 @@
package com.alphawallet.app.entity; package com.alphawallet.app.entity;
import com.alphawallet.token.entity.Signable;
/** /**
* Created by James on 21/07/2019. * Created by James on 21/07/2019.
* Stormbird in Sydney * Stormbird in Sydney
@ -9,7 +7,6 @@ import com.alphawallet.token.entity.Signable;
public interface SignAuthenticationCallback public interface SignAuthenticationCallback
{ {
void gotAuthorisation(boolean gotAuth); void gotAuthorisation(boolean gotAuth);
default void gotAuthorisationForSigning(boolean gotAuth, Signable messageToSign) { } //if you implement message signing
default void createdKey(String keyAddress) { } default void createdKey(String keyAddress) { }
void cancelAuthentication(); void cancelAuthentication();

8
app/src/main/java/com/alphawallet/app/interact/CreateTransactionInteract.java
Unescape View File

@ -28,15 +28,15 @@ public class CreateTransactionInteract
this.transactionRepository = transactionRepository; this.transactionRepository = transactionRepository;
} }
public Single<SignaturePair> sign(Wallet wallet, MessagePair messagePair, long chainId) public Single<SignaturePair> sign(Wallet wallet, MessagePair messagePair)
{ {
return transactionRepository.getSignature(wallet, messagePair, chainId) return transactionRepository.getSignature(wallet, messagePair)
.map(sig -> new SignaturePair(messagePair.selection, sig.signature, messagePair.message)); .map(sig -> new SignaturePair(messagePair.selection, sig.signature, messagePair.message));
} }
public Single<SignatureFromKey> sign(Wallet wallet, Signable message, long chainId) public Single<SignatureFromKey> sign(Wallet wallet, Signable message)
{ {
return transactionRepository.getSignature(wallet, message, chainId); return transactionRepository.getSignature(wallet, message);
} }
public Single<String> create(Wallet from, String to, BigInteger subunitAmount, BigInteger gasPrice, BigInteger gasLimit, byte[] data, long chainId) public Single<String> create(Wallet from, String to, BigInteger subunitAmount, BigInteger gasPrice, BigInteger gasLimit, byte[] data, long chainId)

10
app/src/main/java/com/alphawallet/app/interact/GenericWalletInteract.java
Unescape View File

@ -3,9 +3,6 @@ package com.alphawallet.app.interact;
import static com.alphawallet.app.C.ETHER_DECIMALS; import static com.alphawallet.app.C.ETHER_DECIMALS;
import static com.alphawallet.app.entity.tokens.Token.TOKEN_BALANCE_PRECISION; import static com.alphawallet.app.entity.tokens.Token.TOKEN_BALANCE_PRECISION;
import android.util.Log;
import com.alphawallet.app.BuildConfig;
import com.alphawallet.app.entity.Wallet; import com.alphawallet.app.entity.Wallet;
import com.alphawallet.app.repository.WalletItem; import com.alphawallet.app.repository.WalletItem;
import com.alphawallet.app.repository.WalletRepositoryType; import com.alphawallet.app.repository.WalletRepositoryType;
@ -33,6 +30,13 @@ public class GenericWalletInteract
.observeOn(AndroidSchedulers.mainThread()); .observeOn(AndroidSchedulers.mainThread());
} }
public Single<Wallet> findWallet(String account)
{
return walletRepository.findWallet(account)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
/** /**
* Called when wallet marked as backed up. * Called when wallet marked as backed up.
* Update the wallet date * Update the wallet date

65
app/src/main/java/com/alphawallet/app/repository/TransactionRepository.java
Unescape View File

@ -24,7 +24,8 @@ import io.reactivex.Single;
import io.reactivex.schedulers.Schedulers; import io.reactivex.schedulers.Schedulers;
import io.realm.Realm; import io.realm.Realm;
public class TransactionRepository implements TransactionRepositoryType { public class TransactionRepository implements TransactionRepositoryType
{
private final String TAG = "TREPO"; private final String TAG = "TREPO";
private final EthereumNetworkRepositoryType networkRepository; private final EthereumNetworkRepositoryType networkRepository;
@ -36,7 +37,8 @@ public class TransactionRepository implements TransactionRepositoryType {
EthereumNetworkRepositoryType networkRepository, EthereumNetworkRepositoryType networkRepository,
AccountKeystoreService accountKeystoreService, AccountKeystoreService accountKeystoreService,
TransactionLocalSource inDiskCache, TransactionLocalSource inDiskCache,
TransactionsService transactionsService) { TransactionsService transactionsService)
{
this.networkRepository = networkRepository; this.networkRepository = networkRepository;
this.accountKeystoreService = accountKeystoreService; this.accountKeystoreService = accountKeystoreService;
this.inDiskCache = inDiskCache; this.inDiskCache = inDiskCache;
@ -64,7 +66,7 @@ public class TransactionRepository implements TransactionRepositoryType {
final BigInteger useGasPrice = gasPriceForNode(chainId, gasPrice); final BigInteger useGasPrice = gasPriceForNode(chainId, gasPrice);
return accountKeystoreService.signTransaction(from, to, subunitAmount, useGasPrice, gasLimit, nonce.longValue(), data, chainId) return accountKeystoreService.signTransaction(from, to, subunitAmount, useGasPrice, gasLimit, nonce.longValue(), data, chainId)
.flatMap(signedMessage -> Single.fromCallable( () -> { .flatMap(signedMessage -> Single.fromCallable(() -> {
if (signedMessage.sigType != SignatureReturnType.SIGNATURE_GENERATED) if (signedMessage.sigType != SignatureReturnType.SIGNATURE_GENERATED)
{ {
throw new Exception(signedMessage.failMessage); throw new Exception(signedMessage.failMessage);
@ -83,7 +85,9 @@ public class TransactionRepository implements TransactionRepositoryType {
} }
@Override @Override
public Single<TransactionData> create1559TransactionWithSig(Wallet from, String toAddress, BigInteger subunitAmount, BigInteger gasLimit, BigInteger maxFeePerGas, BigInteger maxPriorityFee, long nonce, byte[] data, long chainId) { public Single<TransactionData> create1559TransactionWithSig(Wallet from, String toAddress, BigInteger subunitAmount, BigInteger gasLimit, BigInteger maxFeePerGas,
BigInteger maxPriorityFee, long nonce, byte[] data, long chainId)
{
final Web3j web3j = getWeb3jService(chainId); final Web3j web3j = getWeb3jService(chainId);
TransactionData txData = new TransactionData(); TransactionData txData = new TransactionData();
@ -93,7 +97,7 @@ public class TransactionRepository implements TransactionRepositoryType {
txData.nonce = txNonce; txData.nonce = txNonce;
return accountKeystoreService.signTransactionEIP1559(from, toAddress, subunitAmount, gasLimit, maxFeePerGas, maxPriorityFee, txNonce.longValue(), data, chainId); return accountKeystoreService.signTransactionEIP1559(from, toAddress, subunitAmount, gasLimit, maxFeePerGas, maxPriorityFee, txNonce.longValue(), data, chainId);
}) })
.flatMap(signedMessage -> Single.fromCallable( () -> { .flatMap(signedMessage -> Single.fromCallable(() -> {
if (signedMessage.sigType != SignatureReturnType.SIGNATURE_GENERATED) if (signedMessage.sigType != SignatureReturnType.SIGNATURE_GENERATED)
{ {
throw new Exception(signedMessage.failMessage); throw new Exception(signedMessage.failMessage);
@ -102,18 +106,21 @@ public class TransactionRepository implements TransactionRepositoryType {
EthSendTransaction raw = web3j EthSendTransaction raw = web3j
.ethSendRawTransaction(Numeric.toHexString(signedMessage.signature)) .ethSendRawTransaction(Numeric.toHexString(signedMessage.signature))
.send(); .send();
if (raw.hasError()) { if (raw.hasError())
{
throw new Exception(raw.getError().getMessage()); throw new Exception(raw.getError().getMessage());
} }
txData.txHash = raw.getTransactionHash(); txData.txHash = raw.getTransactionHash();
return txData; return txData;
})) }))
.flatMap(tx -> storeUnconfirmedTransaction(from, tx, toAddress, subunitAmount, tx.nonce, maxFeePerGas, maxPriorityFee, gasLimit, chainId, data != null ? Numeric.toHexString(data) : "0x", "")) .flatMap(tx -> storeUnconfirmedTransaction(from, tx, toAddress, subunitAmount, tx.nonce, maxFeePerGas, maxPriorityFee, gasLimit, chainId,
data != null ? Numeric.toHexString(data) : "0x", ""))
.subscribeOn(Schedulers.io()); .subscribeOn(Schedulers.io());
} }
@Override @Override
public Single<TransactionData> createTransactionWithSig(Wallet from, String toAddress, BigInteger subunitAmount, BigInteger gasPrice, BigInteger gasLimit, long nonce, byte[] data, long chainId) { public Single<TransactionData> createTransactionWithSig(Wallet from, String toAddress, BigInteger subunitAmount, BigInteger gasPrice, BigInteger gasLimit, long nonce, byte[] data, long chainId)
{
final Web3j web3j = getWeb3jService(chainId); final Web3j web3j = getWeb3jService(chainId);
final BigInteger useGasPrice = gasPriceForNode(chainId, gasPrice); final BigInteger useGasPrice = gasPriceForNode(chainId, gasPrice);
@ -124,7 +131,7 @@ public class TransactionRepository implements TransactionRepositoryType {
txData.nonce = txNonce; txData.nonce = txNonce;
return accountKeystoreService.signTransaction(from, toAddress, subunitAmount, useGasPrice, gasLimit, txNonce.longValue(), data, chainId); return accountKeystoreService.signTransaction(from, toAddress, subunitAmount, useGasPrice, gasLimit, txNonce.longValue(), data, chainId);
}) })
.flatMap(signedMessage -> Single.fromCallable( () -> { .flatMap(signedMessage -> Single.fromCallable(() -> {
if (signedMessage.sigType != SignatureReturnType.SIGNATURE_GENERATED) if (signedMessage.sigType != SignatureReturnType.SIGNATURE_GENERATED)
{ {
throw new Exception(signedMessage.failMessage); throw new Exception(signedMessage.failMessage);
@ -133,13 +140,15 @@ public class TransactionRepository implements TransactionRepositoryType {
EthSendTransaction raw = web3j EthSendTransaction raw = web3j
.ethSendRawTransaction(Numeric.toHexString(signedMessage.signature)) .ethSendRawTransaction(Numeric.toHexString(signedMessage.signature))
.send(); .send();
if (raw.hasError()) { if (raw.hasError())
{
throw new Exception(raw.getError().getMessage()); throw new Exception(raw.getError().getMessage());
} }
txData.txHash = raw.getTransactionHash(); txData.txHash = raw.getTransactionHash();
return txData; return txData;
})) }))
.flatMap(tx -> storeUnconfirmedTransaction(from, tx, toAddress, subunitAmount, tx.nonce, useGasPrice, gasLimit, chainId, data != null ? Numeric.toHexString(data) : "0x", "")) .flatMap(tx -> storeUnconfirmedTransaction(from, tx, toAddress, subunitAmount, tx.nonce, useGasPrice, gasLimit, chainId,
data != null ? Numeric.toHexString(data) : "0x", ""))
.subscribeOn(Schedulers.io()); .subscribeOn(Schedulers.io());
} }
@ -159,7 +168,9 @@ public class TransactionRepository implements TransactionRepositoryType {
* @return * @return
*/ */
@Override @Override
public Single<TransactionData> getSignatureForTransaction(Wallet from, String toAddress, BigInteger subunitAmount, BigInteger gasPrice, BigInteger gasLimit, long nonce, byte[] data, long chainId) { public Single<TransactionData> getSignatureForTransaction(Wallet from, String toAddress, BigInteger subunitAmount, BigInteger gasPrice, BigInteger gasLimit, long nonce,
byte[] data, long chainId)
{
final Web3j web3j = getWeb3jService(chainId); final Web3j web3j = getWeb3jService(chainId);
final BigInteger useGasPrice = gasPriceForNode(chainId, gasPrice); final BigInteger useGasPrice = gasPriceForNode(chainId, gasPrice);
TransactionData txData = new TransactionData(); TransactionData txData = new TransactionData();
@ -169,7 +180,7 @@ public class TransactionRepository implements TransactionRepositoryType {
txData.nonce = txNonce; txData.nonce = txNonce;
return accountKeystoreService.signTransaction(from, toAddress, subunitAmount, useGasPrice, gasLimit, txNonce.longValue(), data, chainId); return accountKeystoreService.signTransaction(from, toAddress, subunitAmount, useGasPrice, gasLimit, txNonce.longValue(), data, chainId);
}) })
.flatMap(signedMessage -> Single.fromCallable( () -> { .flatMap(signedMessage -> Single.fromCallable(() -> {
if (signedMessage.sigType != SignatureReturnType.SIGNATURE_GENERATED) if (signedMessage.sigType != SignatureReturnType.SIGNATURE_GENERATED)
{ {
throw new Exception(signedMessage.failMessage); throw new Exception(signedMessage.failMessage);
@ -186,10 +197,12 @@ public class TransactionRepository implements TransactionRepositoryType {
} }
//EIP1559 //EIP1559
private Single<TransactionData> storeUnconfirmedTransaction(Wallet from, TransactionData txData, String toAddress, BigInteger value, BigInteger nonce, BigInteger maxFeePerGas, BigInteger maxPriorityFee, BigInteger gasLimit, long chainId, String data, String contractAddr) private Single<TransactionData> storeUnconfirmedTransaction(Wallet from, TransactionData txData, String toAddress, BigInteger value, BigInteger nonce, BigInteger maxFeePerGas,
BigInteger maxPriorityFee, BigInteger gasLimit, long chainId, String data, String contractAddr)
{ {
return Single.fromCallable(() -> { return Single.fromCallable(() -> {
Transaction newTx = new Transaction(txData.txHash, "0", "0", System.currentTimeMillis()/1000, nonce.intValue(), from.address, toAddress, value.toString(10), "0", "0", maxFeePerGas.toString(10), Transaction newTx = new Transaction(txData.txHash, "0", "0", System.currentTimeMillis() / 1000, nonce.intValue(), from.address, toAddress,
value.toString(10), "0", "0", maxFeePerGas.toString(10),
maxPriorityFee.toString(10), data, maxPriorityFee.toString(10), data,
gasLimit.toString(10), chainId, contractAddr); gasLimit.toString(10), chainId, contractAddr);
inDiskCache.putTransaction(from, newTx); inDiskCache.putTransaction(from, newTx);
@ -199,10 +212,12 @@ public class TransactionRepository implements TransactionRepositoryType {
}); });
} }
private Single<TransactionData> storeUnconfirmedTransaction(Wallet from, TransactionData txData, String toAddress, BigInteger value, BigInteger nonce, BigInteger gasPrice, BigInteger gasLimit, long chainId, String data, String contractAddr) private Single<TransactionData> storeUnconfirmedTransaction(Wallet from, TransactionData txData, String toAddress, BigInteger value, BigInteger nonce, BigInteger gasPrice, BigInteger gasLimit,
long chainId, String data, String contractAddr)
{ {
return Single.fromCallable(() -> { return Single.fromCallable(() -> {
Transaction newTx = new Transaction(txData.txHash, "0", "0", System.currentTimeMillis()/1000, nonce.intValue(), from.address, toAddress, value.toString(10), "0", gasPrice.toString(10), data, Transaction newTx = new Transaction(txData.txHash, "0", "0", System.currentTimeMillis() / 1000, nonce.intValue(), from.address, toAddress,
value.toString(10), "0", gasPrice.toString(10), data,
gasLimit.toString(10), chainId, contractAddr); gasLimit.toString(10), chainId, contractAddr);
//newTx.completeSetup(from.address); //newTx.completeSetup(from.address);
inDiskCache.putTransaction(from, newTx); inDiskCache.putTransaction(from, newTx);
@ -212,11 +227,13 @@ public class TransactionRepository implements TransactionRepositoryType {
}); });
} }
private Single<String> storeUnconfirmedTransaction(Wallet from, String txHash, String toAddress, BigInteger value, BigInteger nonce, BigInteger gasPrice, BigInteger gasLimit, long chainId, String data) private Single<String> storeUnconfirmedTransaction(Wallet from, String txHash, String toAddress, BigInteger value, BigInteger nonce, BigInteger gasPrice, BigInteger gasLimit,
long chainId, String data)
{ {
return Single.fromCallable(() -> { return Single.fromCallable(() -> {
Transaction newTx = new Transaction(txHash, "0", "0", System.currentTimeMillis()/1000, nonce.intValue(), from.address, toAddress, value.toString(10), "0", gasPrice.toString(10), data, Transaction newTx = new Transaction(txHash, "0", "0", System.currentTimeMillis() / 1000, nonce.intValue(), from.address,
toAddress, value.toString(10), "0", gasPrice.toString(10), data,
gasLimit.toString(10), chainId, ""); gasLimit.toString(10), chainId, "");
//newTx.completeSetup(from.address); //newTx.completeSetup(from.address);
inDiskCache.putTransaction(from, newTx); inDiskCache.putTransaction(from, newTx);
@ -227,13 +244,15 @@ public class TransactionRepository implements TransactionRepositoryType {
} }
@Override @Override
public Single<SignatureFromKey> getSignature(Wallet wallet, Signable message, long chainId) { public Single<SignatureFromKey> getSignature(Wallet wallet, Signable message)
return accountKeystoreService.signMessage(wallet, message, chainId); {
return accountKeystoreService.signMessage(wallet, message);
} }
@Override @Override
public Single<byte[]> getSignatureFast(Wallet wallet, String password, byte[] message, long chainId) { public Single<byte[]> getSignatureFast(Wallet wallet, String password, byte[] message)
return accountKeystoreService.signTransactionFast(wallet, password, message, chainId); {
return accountKeystoreService.signMessageFast(wallet, password, message);
} }
@Override @Override

13
app/src/main/java/com/alphawallet/app/repository/TransactionRepositoryType.java
Unescape View File

@ -14,21 +14,28 @@ import java.util.List;
import io.reactivex.Single; import io.reactivex.Single;
import io.realm.Realm; import io.realm.Realm;
public interface TransactionRepositoryType { public interface TransactionRepositoryType
{
Single<TransactionData> createTransactionWithSig(Wallet from, String toAddress, BigInteger subunitAmount, BigInteger gasPrice, BigInteger gasLimit, long nonce, byte[] data, long chainId); Single<TransactionData> createTransactionWithSig(Wallet from, String toAddress, BigInteger subunitAmount, BigInteger gasPrice, BigInteger gasLimit, long nonce, byte[] data, long chainId);
Single<TransactionData> create1559TransactionWithSig(Wallet from, String toAddress, BigInteger subunitAmount, BigInteger gasLimit, BigInteger maxFeePerGas, BigInteger maxPriorityFee, long nonce, byte[] data, long chainId); Single<TransactionData> create1559TransactionWithSig(Wallet from, String toAddress, BigInteger subunitAmount, BigInteger gasLimit, BigInteger maxFeePerGas, BigInteger maxPriorityFee, long nonce, byte[] data, long chainId);
Single<TransactionData> getSignatureForTransaction(Wallet from, String toAddress, BigInteger subunitAmount, BigInteger gasPrice, BigInteger gasLimit, long nonce, byte[] data, long chainId); Single<TransactionData> getSignatureForTransaction(Wallet from, String toAddress, BigInteger subunitAmount, BigInteger gasPrice, BigInteger gasLimit, long nonce, byte[] data, long chainId);
Single<SignatureFromKey> getSignature(Wallet wallet, Signable message, long chainId); Single<SignatureFromKey> getSignature(Wallet wallet, Signable message);
Single<byte[]> getSignatureFast(Wallet wallet, String password, byte[] message, long chainId);
Single<byte[]> getSignatureFast(Wallet wallet, String password, byte[] message);
Transaction fetchCachedTransaction(String walletAddr, String hash); Transaction fetchCachedTransaction(String walletAddr, String hash);
long fetchTxCompletionTime(String walletAddr, String hash); long fetchTxCompletionTime(String walletAddr, String hash);
Single<String> resendTransaction(Wallet from, String to, BigInteger subunitAmount, BigInteger nonce, BigInteger gasPrice, BigInteger gasLimit, byte[] data, long chainId); Single<String> resendTransaction(Wallet from, String to, BigInteger subunitAmount, BigInteger nonce, BigInteger gasPrice, BigInteger gasLimit, byte[] data, long chainId);
Single<ActivityMeta[]> fetchCachedTransactionMetas(Wallet wallet, List<Long> networkFilters, long fetchTime, int fetchLimit); Single<ActivityMeta[]> fetchCachedTransactionMetas(Wallet wallet, List<Long> networkFilters, long fetchTime, int fetchLimit);
Single<ActivityMeta[]> fetchCachedTransactionMetas(Wallet wallet, long chainId, String tokenAddress, int historyCount); Single<ActivityMeta[]> fetchCachedTransactionMetas(Wallet wallet, long chainId, String tokenAddress, int historyCount);
Single<ActivityMeta[]> fetchEventMetas(Wallet wallet, List<Long> networkFilters); Single<ActivityMeta[]> fetchEventMetas(Wallet wallet, List<Long> networkFilters);
Realm getRealmInstance(Wallet wallet); Realm getRealmInstance(Wallet wallet);

8
app/src/main/java/com/alphawallet/app/service/AccountKeystoreService.java
Unescape View File

@ -79,14 +79,12 @@ public interface AccountKeystoreService {
Single<SignatureFromKey> signMessage( Single<SignatureFromKey> signMessage(
Wallet signer, Wallet signer,
Signable message, Signable messaged);
long chainId);
Single<byte[]> signTransactionFast( Single<byte[]> signMessageFast(
Wallet signer, Wallet signer,
String password, String password,
byte[] message, byte[] message);
long chainId);
/** /**
* Check if there is an address in the keystore * Check if there is an address in the keystore

71
app/src/main/java/com/alphawallet/app/service/KeystoreAccountService.java
Unescape View File

@ -58,7 +58,8 @@ public class KeystoreAccountService implements AccountKeystoreService
private final KeyService keyService; private final KeyService keyService;
private static final ObjectMapper objectMapper = new ObjectMapper(); private static final ObjectMapper objectMapper = new ObjectMapper();
public KeystoreAccountService(File keyStoreFile, File baseFile, KeyService keyService) { public KeystoreAccountService(File keyStoreFile, File baseFile, KeyService keyService)
{
keyFolder = keyStoreFile; keyFolder = keyStoreFile;
databaseFolder = baseFile; databaseFolder = baseFile;
this.keyService = keyService; this.keyService = keyService;
@ -74,11 +75,13 @@ public class KeystoreAccountService implements AccountKeystoreService
/** /**
* No longer used; keep for testing * No longer used; keep for testing
*
* @param password account password * @param password account password
* @return * @return
*/ */
@Override @Override
public Single<Wallet> createAccount(String password) { public Single<Wallet> createAccount(String password)
{
return Single.fromCallable(() -> { return Single.fromCallable(() -> {
ECKeyPair ecKeyPair = Keys.createEcKeyPair(); ECKeyPair ecKeyPair = Keys.createEcKeyPair();
WalletFile walletFile = org.web3j.crypto.Wallet.createLight(password, ecKeyPair); WalletFile walletFile = org.web3j.crypto.Wallet.createLight(password, ecKeyPair);
@ -89,20 +92,23 @@ public class KeystoreAccountService implements AccountKeystoreService
/** /**
* Import Keystore * Import Keystore
*
* @param store store to include * @param store store to include
* @param password store password * @param password store password
* @param newPassword * @param newPassword
* @return * @return
*/ */
@Override @Override
public Single<Wallet> importKeystore(String store, String password, String newPassword) { public Single<Wallet> importKeystore(String store, String password, String newPassword)
{
return Single.fromCallable(() -> { return Single.fromCallable(() -> {
String address = extractAddressFromStore(store); String address = extractAddressFromStore(store);
Wallet wallet; Wallet wallet;
//delete old account files - these have had their password overwritten. If present user chose to refresh key //delete old account files - these have had their password overwritten. If present user chose to refresh key
deleteAccountFiles(address); deleteAccountFiles(address);
try { try
{
WalletFile walletFile = objectMapper.readValue(store, WalletFile.class); WalletFile walletFile = objectMapper.readValue(store, WalletFile.class);
ECKeyPair kp = org.web3j.crypto.Wallet.decrypt(password, walletFile); ECKeyPair kp = org.web3j.crypto.Wallet.decrypt(password, walletFile);
Credentials credentials = Credentials.create(kp); Credentials credentials = Credentials.create(kp);
@ -118,7 +124,9 @@ public class KeystoreAccountService implements AccountKeystoreService
wallet = new Wallet(credentials.getAddress()); wallet = new Wallet(credentials.getAddress());
wallet.setWalletType(WalletType.KEYSTORE); wallet.setWalletType(WalletType.KEYSTORE);
} catch (Exception ex) { }
catch (Exception ex)
{
// We need to make sure that we do not have a broken account // We need to make sure that we do not have a broken account
deleteAccount(address, newPassword).subscribe(() -> {}, t -> {}).isDisposed(); deleteAccount(address, newPassword).subscribe(() -> {}, t -> {}).isDisposed();
throw ex; throw ex;
@ -128,11 +136,15 @@ public class KeystoreAccountService implements AccountKeystoreService
}).subscribeOn(Schedulers.io()); }).subscribeOn(Schedulers.io());
} }
private String extractAddressFromStore(String store) throws Exception { private String extractAddressFromStore(String store) throws Exception
try { {
try
{
JSONObject jsonObject = new JSONObject(store); JSONObject jsonObject = new JSONObject(store);
return "0x" + Numeric.cleanHexPrefix(jsonObject.getString("address")); return "0x" + Numeric.cleanHexPrefix(jsonObject.getString("address"));
} catch (JSONException ex) { }
catch (JSONException ex)
{
throw new Exception("Invalid keystore"); throw new Exception("Invalid keystore");
} }
} }
@ -145,7 +157,8 @@ public class KeystoreAccountService implements AccountKeystoreService
* @return * @return
*/ */
@Override @Override
public Single<Wallet> importPrivateKey(String privateKey, String newPassword) { public Single<Wallet> importPrivateKey(String privateKey, String newPassword)
{
return Single.fromCallable(() -> { return Single.fromCallable(() -> {
BigInteger key = new BigInteger(privateKey, PRIVATE_KEY_RADIX); BigInteger key = new BigInteger(privateKey, PRIVATE_KEY_RADIX);
ECKeyPair keypair = ECKeyPair.create(key); ECKeyPair keypair = ECKeyPair.create(key);
@ -155,7 +168,8 @@ public class KeystoreAccountService implements AccountKeystoreService
} }
@Override @Override
public Single<String> exportAccount(Wallet wallet, String password, String newPassword) { public Single<String> exportAccount(Wallet wallet, String password, String newPassword)
{
return Single return Single
.fromCallable(() -> getCredentials(keyFolder, wallet.address, password)) .fromCallable(() -> getCredentials(keyFolder, wallet.address, password))
.map(credentials -> org.web3j.crypto.Wallet.createLight(newPassword, credentials.getEcKeyPair())) .map(credentials -> org.web3j.crypto.Wallet.createLight(newPassword, credentials.getEcKeyPair()))
@ -166,12 +180,14 @@ public class KeystoreAccountService implements AccountKeystoreService
/** /**
* Delete 'geth' keystore file then ensure password encrypted bytes and keys in Android keystore * Delete 'geth' keystore file then ensure password encrypted bytes and keys in Android keystore
* are deleted * are deleted
*
* @param address account address * @param address account address
* @param password account password * @param password account password
* @return * @return
*/ */
@Override @Override
public Completable deleteAccount(String address, String password) { public Completable deleteAccount(String address, String password)
{
return Completable.fromAction(() -> { return Completable.fromAction(() -> {
String cleanedAddr = Numeric.cleanHexPrefix(address).toLowerCase(); String cleanedAddr = Numeric.cleanHexPrefix(address).toLowerCase();
deleteAccountFiles(cleanedAddr); deleteAccountFiles(cleanedAddr);
@ -192,7 +208,7 @@ public class KeystoreAccountService implements AccountKeystoreService
//Now delete all traces of the key in Android keystore, encrypted bytes and iv file in private data area //Now delete all traces of the key in Android keystore, encrypted bytes and iv file in private data area
keyService.deleteKey(address); keyService.deleteKey(address);
} ); });
} }
private void deleteAccountFiles(String address) private void deleteAccountFiles(String address)
@ -219,15 +235,18 @@ public class KeystoreAccountService implements AccountKeystoreService
if (contents != null) if (contents != null)
{ {
for (File child : contents) for (File child : contents)
{
deleteRecursive(child); deleteRecursive(child);
} }
} }
}
fp.delete(); fp.delete();
} }
@Override @Override
public Single<SignatureFromKey> signTransaction(Wallet signer, String toAddress, BigInteger amount, BigInteger gasPrice, BigInteger gasLimit, long nonce, byte[] data, long chainId) { public Single<SignatureFromKey> signTransaction(Wallet signer, String toAddress, BigInteger amount, BigInteger gasPrice, BigInteger gasLimit, long nonce, byte[] data, long chainId)
{
return Single.fromCallable(() -> { return Single.fromCallable(() -> {
RawTransaction rtx = formatRawTransaction(toAddress, amount, gasPrice, gasLimit, nonce, data); RawTransaction rtx = formatRawTransaction(toAddress, amount, gasPrice, gasLimit, nonce, data);
byte[] signData = TransactionEncoder.encode(rtx, chainId); byte[] signData = TransactionEncoder.encode(rtx, chainId);
@ -268,7 +287,8 @@ public class KeystoreAccountService implements AccountKeystoreService
SignatureFromKey returnSig = keyService.signData(signer, signData); SignatureFromKey returnSig = keyService.signData(signer, signData);
sigData = sigFromByteArray(returnSig.signature); sigData = sigFromByteArray(returnSig.signature);
if (sigData == null) { if (sigData == null)
{
returnSig.sigType = SignatureReturnType.KEY_CIPHER_ERROR; returnSig.sigType = SignatureReturnType.KEY_CIPHER_ERROR;
returnSig.failMessage = "Incorrect signature length"; //should never see this message returnSig.failMessage = "Incorrect signature length"; //should never see this message
} }
@ -277,11 +297,13 @@ public class KeystoreAccountService implements AccountKeystoreService
}).subscribeOn(Schedulers.io()); }).subscribeOn(Schedulers.io());
} }
private static byte[] encode(RawTransaction rawTransaction, Sign.SignatureData signatureData) { private static byte[] encode(RawTransaction rawTransaction, Sign.SignatureData signatureData)
{
List<RlpType> values = TransactionEncoder.asRlpValues(rawTransaction, signatureData); List<RlpType> values = TransactionEncoder.asRlpValues(rawTransaction, signatureData);
RlpList rlpList = new RlpList(values); RlpList rlpList = new RlpList(values);
byte[] encoded = RlpEncoder.encode(rlpList); byte[] encoded = RlpEncoder.encode(rlpList);
if (!rawTransaction.getType().equals(TransactionType.LEGACY)) { if (!rawTransaction.getType().equals(TransactionType.LEGACY))
{
return ByteBuffer.allocate(encoded.length + 1) return ByteBuffer.allocate(encoded.length + 1)
.put(rawTransaction.getType().getRlpType()) .put(rawTransaction.getType().getRlpType())
.put(encoded) .put(encoded)
@ -292,6 +314,7 @@ public class KeystoreAccountService implements AccountKeystoreService
/** /**
* Get web3j credentials * Get web3j credentials
*
* @param keyFolder KeyStore Folder * @param keyFolder KeyStore Folder
* @param address * @param address
* @param password * @param password
@ -343,7 +366,8 @@ public class KeystoreAccountService implements AccountKeystoreService
} }
@Override @Override
public Single<byte[]> signTransactionFast(Wallet signer, String signerPassword, byte[] message, long chainId) { public Single<byte[]> signMessageFast(Wallet signer, String signerPassword, byte[] message)
{
return Single.fromCallable(() -> { return Single.fromCallable(() -> {
Credentials credentials = getCredentials(keyFolder, signer.address, signerPassword); Credentials credentials = getCredentials(keyFolder, signer.address, signerPassword);
Sign.SignatureData signatureData = Sign.signMessage( Sign.SignatureData signatureData = Sign.signMessage(
@ -355,10 +379,9 @@ public class KeystoreAccountService implements AccountKeystoreService
} }
@Override @Override
public Single<SignatureFromKey> signMessage(Wallet signer, Signable message, long chainId) public Single<SignatureFromKey> signMessage(Wallet signer, Signable message)
{ {
return Single.fromCallable(() -> { return Single.fromCallable(() -> {
//byte[] messageHash = Hash.sha3(message);
SignatureFromKey returnSig = keyService.signData(signer, message.getPrehash()); SignatureFromKey returnSig = keyService.signData(signer, message.getPrehash());
returnSig.signature = patchSignatureVComponent(returnSig.signature); returnSig.signature = patchSignatureVComponent(returnSig.signature);
return returnSig; return returnSig;
@ -366,7 +389,8 @@ public class KeystoreAccountService implements AccountKeystoreService
} }
@Override @Override
public boolean hasAccount(String address) { public boolean hasAccount(String address)
{
address = Numeric.cleanHexPrefix(address); address = Numeric.cleanHexPrefix(address);
File[] contents = keyFolder.listFiles(); File[] contents = keyFolder.listFiles();
if (contents == null) return false; if (contents == null) return false;
@ -382,7 +406,8 @@ public class KeystoreAccountService implements AccountKeystoreService
} }
@Override @Override
public Single<Wallet[]> fetchAccounts() { public Single<Wallet[]> fetchAccounts()
{
return Single.fromCallable(() -> { return Single.fromCallable(() -> {
File[] contents = keyFolder.listFiles(); File[] contents = keyFolder.listFiles();
List<Date> fileDates = new ArrayList<>(); List<Date> fileDates = new ArrayList<>();
@ -397,7 +422,7 @@ public class KeystoreAccountService implements AccountKeystoreService
String address = "0x" + fName.substring(index + 1); String address = "0x" + fName.substring(index + 1);
if (Utils.isAddressValid(address)) if (Utils.isAddressValid(address))
{ {
String d = fName.substring(5, index-1).replace("T", " ").substring(0, 23); String d = fName.substring(5, index - 1).replace("T", " ").substring(0, 23);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH-mm-ss.SSS", Locale.ROOT); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH-mm-ss.SSS", Locale.ROOT);
Date date = simpleDateFormat.parse(d); Date date = simpleDateFormat.parse(d);
fileDates.add(date); fileDates.add(date);
@ -437,7 +462,7 @@ public class KeystoreAccountService implements AccountKeystoreService
{ {
if (signature != null && signature.length == 65 && signature[64] < 27) if (signature != null && signature.length == 65 && signature[64] < 27)
{ {
signature[64] = (byte)(signature[64] + (byte)0x1b); signature[64] = (byte) (signature[64] + (byte) 0x1b);
} }
return signature; return signature;

10
app/src/main/java/com/alphawallet/app/ui/AssetDisplayActivity.java
Unescape View File

@ -1,5 +1,8 @@
package com.alphawallet.app.ui; package com.alphawallet.app.ui;
import static com.alphawallet.app.C.Key.WALLET;
import static com.alphawallet.app.widget.AWalletAlertDialog.WARNING;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
@ -48,15 +51,10 @@ import java.math.BigInteger;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint; import dagger.hilt.android.AndroidEntryPoint;
import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers; import io.reactivex.schedulers.Schedulers;
import static com.alphawallet.app.C.Key.WALLET;
import static com.alphawallet.app.widget.AWalletAlertDialog.WARNING;
/** /**
* Created by James on 22/01/2018. * Created by James on 22/01/2018.
*/ */
@ -441,7 +439,7 @@ public class AssetDisplayActivity extends BaseActivity implements StandardFuncti
{ {
handler.removeCallbacks(this); handler.removeCallbacks(this);
progressView.setVisibility(View.GONE); progressView.setVisibility(View.GONE);
adapter = new NonFungibleTokenAdapter(functionBar, token, viewModel.getAssetDefinitionService(), viewModel.getOpenseaService(), this); adapter = new NonFungibleTokenAdapter(functionBar, token, viewModel.getAssetDefinitionService(), viewModel.getOpenseaService());
functionBar.setupFunctions(this, viewModel.getAssetDefinitionService(), token, adapter, token.getArrayBalance()); functionBar.setupFunctions(this, viewModel.getAssetDefinitionService(), token, adapter, token.getArrayBalance());
functionBar.setWalletType(wallet.type); functionBar.setWalletType(wallet.type);
tokenView.setAdapter(adapter); tokenView.setAdapter(adapter);

23
app/src/main/java/com/alphawallet/app/ui/BaseActivity.java
Unescape View File

@ -5,20 +5,23 @@ import android.view.MenuItem;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.DrawableRes;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import com.alphawallet.app.R; import com.alphawallet.app.R;
import com.alphawallet.app.entity.AuthenticationCallback;
import com.alphawallet.app.entity.AuthenticationFailType; import com.alphawallet.app.entity.AuthenticationFailType;
import com.alphawallet.app.entity.Operation; import com.alphawallet.app.entity.Operation;
import com.alphawallet.app.walletconnect.AWWalletConnectClient;
import com.alphawallet.app.viewmodel.BaseViewModel; import com.alphawallet.app.viewmodel.BaseViewModel;
import com.alphawallet.app.widget.SignTransactionDialog; import com.alphawallet.app.widget.SignTransactionDialog;
import androidx.annotation.DrawableRes;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
public abstract class BaseActivity extends AppCompatActivity public abstract class BaseActivity extends AppCompatActivity
{ {
public static AuthenticationCallback authCallback; // Note: This static is only for signing callbacks
// which won't occur between wallet sessions - do not repeat this pattern
// for other code
protected Toolbar toolbar() protected Toolbar toolbar()
{ {
@ -139,7 +142,7 @@ public abstract class BaseActivity extends AppCompatActivity
//Interpret the return code; if it's within the range of values possible to return from PIN confirmation then separate out //Interpret the return code; if it's within the range of values possible to return from PIN confirmation then separate out
//the task code from the return value. We have to do it this way because there's no way to send a bundle across the PIN dialog //the task code from the return value. We have to do it this way because there's no way to send a bundle across the PIN dialog
//and out through the PIN dialog's return back to here //and out through the PIN dialog's return back to here
if (AWWalletConnectClient.authCallback == null) if (authCallback == null)
{ {
return; return;
} }
@ -149,12 +152,14 @@ public abstract class BaseActivity extends AppCompatActivity
Operation taskCode = Operation.values()[requestCode - SignTransactionDialog.REQUEST_CODE_CONFIRM_DEVICE_CREDENTIALS]; Operation taskCode = Operation.values()[requestCode - SignTransactionDialog.REQUEST_CODE_CONFIRM_DEVICE_CREDENTIALS];
if (resultCode == RESULT_OK) if (resultCode == RESULT_OK)
{ {
AWWalletConnectClient.authCallback.authenticatePass(taskCode); authCallback.authenticatePass(taskCode);
} }
else else
{ {
AWWalletConnectClient.authCallback.authenticateFail("", AuthenticationFailType.PIN_FAILED, taskCode); authCallback.authenticateFail("", AuthenticationFailType.PIN_FAILED, taskCode);
} }
authCallback = null;
} }
} }
} }

65
app/src/main/java/com/alphawallet/app/ui/DappBrowserFragment.java
Unescape View File

@ -2,11 +2,9 @@ package com.alphawallet.app.ui;
import static com.alphawallet.app.C.ETHER_DECIMALS; import static com.alphawallet.app.C.ETHER_DECIMALS;
import static com.alphawallet.app.C.RESET_TOOLBAR; import static com.alphawallet.app.C.RESET_TOOLBAR;
import static com.alphawallet.app.entity.Operation.SIGN_DATA;
import static com.alphawallet.app.entity.tokens.Token.TOKEN_BALANCE_PRECISION; import static com.alphawallet.app.entity.tokens.Token.TOKEN_BALANCE_PRECISION;
import static com.alphawallet.app.ui.HomeActivity.RESET_TOKEN_SERVICE; import static com.alphawallet.app.ui.HomeActivity.RESET_TOKEN_SERVICE;
import static com.alphawallet.app.ui.MyAddressActivity.KEY_ADDRESS; import static com.alphawallet.app.ui.MyAddressActivity.KEY_ADDRESS;
import static com.alphawallet.app.util.KeyboardUtils.showKeyboard;
import static com.alphawallet.app.util.Utils.isValidUrl; import static com.alphawallet.app.util.Utils.isValidUrl;
import static com.alphawallet.app.widget.AWalletAlertDialog.ERROR; import static com.alphawallet.app.widget.AWalletAlertDialog.ERROR;
import static com.alphawallet.app.widget.AWalletAlertDialog.WARNING; import static com.alphawallet.app.widget.AWalletAlertDialog.WARNING;
@ -65,7 +63,6 @@ import com.alphawallet.app.entity.AnalyticsProperties;
import com.alphawallet.app.entity.CryptoFunctions; import com.alphawallet.app.entity.CryptoFunctions;
import com.alphawallet.app.entity.CustomViewSettings; import com.alphawallet.app.entity.CustomViewSettings;
import com.alphawallet.app.entity.DApp; import com.alphawallet.app.entity.DApp;
import com.alphawallet.app.entity.DAppFunction;
import com.alphawallet.app.entity.FragmentMessenger; import com.alphawallet.app.entity.FragmentMessenger;
import com.alphawallet.app.entity.NetworkInfo; import com.alphawallet.app.entity.NetworkInfo;
import com.alphawallet.app.entity.QRResult; import com.alphawallet.app.entity.QRResult;
@ -76,6 +73,7 @@ import com.alphawallet.app.entity.Wallet;
import com.alphawallet.app.entity.WalletConnectActions; import com.alphawallet.app.entity.WalletConnectActions;
import com.alphawallet.app.entity.WalletType; import com.alphawallet.app.entity.WalletType;
import com.alphawallet.app.entity.analytics.ActionSheetSource; import com.alphawallet.app.entity.analytics.ActionSheetSource;
import com.alphawallet.app.entity.cryptokeys.SignatureFromKey;
import com.alphawallet.app.entity.tokens.Token; import com.alphawallet.app.entity.tokens.Token;
import com.alphawallet.app.repository.EthereumNetworkRepository; import com.alphawallet.app.repository.EthereumNetworkRepository;
import com.alphawallet.app.repository.TokenRepository; import com.alphawallet.app.repository.TokenRepository;
@ -107,7 +105,9 @@ import com.alphawallet.app.web3.entity.WalletAddEthereumChainObject;
import com.alphawallet.app.web3.entity.Web3Call; import com.alphawallet.app.web3.entity.Web3Call;
import com.alphawallet.app.web3.entity.Web3Transaction; import com.alphawallet.app.web3.entity.Web3Transaction;
import com.alphawallet.app.widget.AWalletAlertDialog; import com.alphawallet.app.widget.AWalletAlertDialog;
import com.alphawallet.app.widget.ActionSheet;
import com.alphawallet.app.widget.ActionSheetDialog; import com.alphawallet.app.widget.ActionSheetDialog;
import com.alphawallet.app.widget.ActionSheetSignDialog;
import com.alphawallet.app.widget.AddressBar; import com.alphawallet.app.widget.AddressBar;
import com.alphawallet.app.widget.AddressBarListener; import com.alphawallet.app.widget.AddressBarListener;
import com.alphawallet.app.widget.TestNetDialog; import com.alphawallet.app.widget.TestNetDialog;
@ -183,7 +183,7 @@ public class DappBrowserFragment extends BaseFragment implements OnSignTransacti
private WebChromeClient.FileChooserParams fileChooserParams; private WebChromeClient.FileChooserParams fileChooserParams;
private RealmResults<RealmToken> realmUpdate; private RealmResults<RealmToken> realmUpdate;
private Realm realm = null; private Realm realm = null;
private ActionSheetDialog confirmationDialog; private ActionSheet confirmationDialog;
ActivityResultLauncher<Intent> getGasSettings = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), ActivityResultLauncher<Intent> getGasSettings = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(),
result -> confirmationDialog.setCurrentGasIndex(result)); result -> confirmationDialog.setCurrentGasIndex(result));
private DappBrowserViewModel viewModel; private DappBrowserViewModel viewModel;
@ -267,7 +267,6 @@ public class DappBrowserFragment extends BaseFragment implements OnSignTransacti
// Some multi-chain Dapps have a watchdog thread that checks the chain // Some multi-chain Dapps have a watchdog thread that checks the chain
// This thread stays in operation until a new page load is complete. // This thread stays in operation until a new page load is complete.
private String loadUrlAfterReload; private String loadUrlAfterReload;
private DAppFunction dAppFunction;
@Override @Override
public void onCreate(@Nullable Bundle savedInstanceState) public void onCreate(@Nullable Bundle savedInstanceState)
@ -1155,33 +1154,27 @@ public class DappBrowserFragment extends BaseFragment implements OnSignTransacti
private void handleSignMessage(Signable message) private void handleSignMessage(Signable message)
{ {
dAppFunction = new DAppFunction() if (confirmationDialog == null || !confirmationDialog.isShowing())
{
@Override
public void DAppError(Throwable error, Signable message)
{ {
web3.onSignCancel(message.getCallbackId()); confirmationDialog = new ActionSheetSignDialog(requireActivity(), this, message);
confirmationDialog.dismiss(); confirmationDialog.show();
}
} }
@Override @Override
public void DAppReturn(byte[] data, Signable message) public void signingComplete(SignatureFromKey signature, Signable message)
{ {
String signHex = Numeric.toHexString(data); String signHex = Numeric.toHexString(signature.signature);
Timber.d("Initial Msg: %s", message.getMessage()); Timber.d("Initial Msg: %s", message.getMessage());
web3.onSignMessageSuccessful(message, signHex);
confirmationDialog.success(); confirmationDialog.success();
web3.onSignMessageSuccessful(message, signHex);
} }
};
if (confirmationDialog == null || !confirmationDialog.isShowing()) @Override
public void signingFailed(Throwable error, Signable message)
{ {
confirmationDialog = new ActionSheetDialog(requireActivity(), this, this, message); web3.onSignCancel(message.getCallbackId());
confirmationDialog.setCanceledOnTouchOutside(false); confirmationDialog.dismiss();
confirmationDialog.show();
confirmationDialog.fullExpand();
}
} }
@Override @Override
@ -1811,34 +1804,6 @@ public class DappBrowserFragment extends BaseFragment implements OnSignTransacti
} }
} }
@Override
public void gotAuthorisationForSigning(boolean gotAuth, Signable messageToSign)
{
if (gotAuth)
{
viewModel.completeAuthentication(SIGN_DATA);
viewModel.signMessage(messageToSign, dAppFunction);
}
else
{
web3.onSignCancel(messageToSign.getCallbackId());
}
}
/**
* Endpoint from PIN/Swipe authorisation
*
* @param gotAuth
*/
@Override
public void pinAuthorisation(boolean gotAuth)
{
if (confirmationDialog != null && confirmationDialog.isShowing())
{
confirmationDialog.completeSignRequest(gotAuth);
}
}
@Override @Override
public void buttonClick(long callbackId, Token baseToken) public void buttonClick(long callbackId, Token baseToken)
{ {

51
app/src/main/java/com/alphawallet/app/ui/FunctionActivity.java
Unescape View File

@ -18,7 +18,6 @@ import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.webkit.WebView; import android.webkit.WebView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.ProgressBar;
import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts; import androidx.activity.result.contract.ActivityResultContracts;
@ -29,10 +28,10 @@ import androidx.lifecycle.ViewModelProvider;
import com.alphawallet.app.C; import com.alphawallet.app.C;
import com.alphawallet.app.R; import com.alphawallet.app.R;
import com.alphawallet.app.entity.DApp; import com.alphawallet.app.entity.DApp;
import com.alphawallet.app.entity.DAppFunction;
import com.alphawallet.app.entity.SignAuthenticationCallback; import com.alphawallet.app.entity.SignAuthenticationCallback;
import com.alphawallet.app.entity.StandardFunctionInterface; import com.alphawallet.app.entity.StandardFunctionInterface;
import com.alphawallet.app.entity.TransactionData; import com.alphawallet.app.entity.TransactionData;
import com.alphawallet.app.entity.cryptokeys.SignatureFromKey;
import com.alphawallet.app.entity.tokens.Token; import com.alphawallet.app.entity.tokens.Token;
import com.alphawallet.app.entity.tokenscript.TokenScriptRenderCallback; import com.alphawallet.app.entity.tokenscript.TokenScriptRenderCallback;
import com.alphawallet.app.entity.tokenscript.WebCompletionCallback; import com.alphawallet.app.entity.tokenscript.WebCompletionCallback;
@ -49,7 +48,9 @@ import com.alphawallet.app.web3.entity.FunctionCallback;
import com.alphawallet.app.web3.entity.PageReadyCallback; import com.alphawallet.app.web3.entity.PageReadyCallback;
import com.alphawallet.app.web3.entity.Web3Transaction; import com.alphawallet.app.web3.entity.Web3Transaction;
import com.alphawallet.app.widget.AWalletAlertDialog; import com.alphawallet.app.widget.AWalletAlertDialog;
import com.alphawallet.app.widget.ActionSheet;
import com.alphawallet.app.widget.ActionSheetDialog; import com.alphawallet.app.widget.ActionSheetDialog;
import com.alphawallet.app.widget.ActionSheetSignDialog;
import com.alphawallet.app.widget.FunctionButtonBar; import com.alphawallet.app.widget.FunctionButtonBar;
import com.alphawallet.app.widget.SignTransactionDialog; import com.alphawallet.app.widget.SignTransactionDialog;
import com.alphawallet.ethereum.EthereumNetworkBase; import com.alphawallet.ethereum.EthereumNetworkBase;
@ -103,7 +104,7 @@ public class FunctionActivity extends BaseActivity implements FunctionCallback,
private int parsePass = 0; private int parsePass = 0;
private int resolveInputCheckCount; private int resolveInputCheckCount;
private TSAction action; private TSAction action;
private ActionSheetDialog confirmationDialog; private ActionSheet confirmationDialog;
private void initViews() { private void initViews() {
actionMethod = getIntent().getStringExtra(C.EXTRA_STATE); actionMethod = getIntent().getStringExtra(C.EXTRA_STATE);
@ -135,9 +136,6 @@ public class FunctionActivity extends BaseActivity implements FunctionCallback,
viewModel.startGasPriceUpdate(token.tokenInfo.chainId); viewModel.startGasPriceUpdate(token.tokenInfo.chainId);
viewModel.getCurrentWallet(); viewModel.getCurrentWallet();
parsePass = 0; parsePass = 0;
ProgressBar loadSpinner = findViewById(R.id.ticket_load_spinner);
handler.postDelayed(() -> loadSpinner.setVisibility(View.GONE), 2500);
} }
private void displayFunction(String tokenAttrs) private void displayFunction(String tokenAttrs)
@ -549,12 +547,6 @@ public class FunctionActivity extends BaseActivity implements FunctionCallback,
alertDialog.show(); alertDialog.show();
} }
@Override
public void signMessage(Signable message, DAppFunction dAppFunction)
{
viewModel.signMessage(message, dAppFunction, token.tokenInfo.chainId);
}
@Override @Override
public void functionSuccess() public void functionSuccess()
{ {
@ -638,8 +630,7 @@ public class FunctionActivity extends BaseActivity implements FunctionCallback,
public void onSignPersonalMessage(EthereumMessage message) public void onSignPersonalMessage(EthereumMessage message)
{ {
//pop open the actionsheet //pop open the actionsheet
confirmationDialog = new ActionSheetDialog(this, this, this, message); confirmationDialog = new ActionSheetSignDialog(this, this, message); //new ActionSheetDialog(this, this, this, message);
confirmationDialog.setCanceledOnTouchOutside(false);
confirmationDialog.show(); confirmationDialog.show();
confirmationDialog.fullExpand(); confirmationDialog.fullExpand();
} }
@ -785,39 +776,19 @@ public class FunctionActivity extends BaseActivity implements FunctionCallback,
} }
@Override @Override
public void gotAuthorisationForSigning(boolean gotAuth, Signable messageToSign) public void signingComplete(SignatureFromKey signature, Signable message)
{
viewModel.completeAuthentication(SIGN_DATA);
DAppFunction dAppFunction = new DAppFunction()
{
@Override
public void DAppError(Throwable error, Signable message)
{
confirmationDialog.dismiss();
tokenView.onSignCancel(message);
functionFailed();
}
@Override
public void DAppReturn(byte[] data, Signable message)
{ {
String signHex = Numeric.toHexString(data); String signHex = Numeric.toHexString(signature.signature);
signHex = Numeric.cleanHexPrefix(signHex); signHex = Numeric.cleanHexPrefix(signHex);
tokenView.onSignPersonalMessageSuccessful(message, signHex); tokenView.onSignPersonalMessageSuccessful(message, signHex);
testRecoverAddressFromSignature(message.getMessage(), signHex); testRecoverAddressFromSignature(message.getMessage(), signHex);
confirmationDialog.success();
} }
};
if (gotAuth) @Override
{ public void signingFailed(Throwable error, Signable message)
signMessage(messageToSign, dAppFunction);
}
else
{ {
confirmationDialog.dismiss(); tokenView.onSignCancel(message);
} functionFailed();
} }
@Override @Override

102
app/src/main/java/com/alphawallet/app/ui/HomeActivity.java
Unescape View File

@ -55,7 +55,6 @@ import com.alphawallet.app.C;
import com.alphawallet.app.R; import com.alphawallet.app.R;
import com.alphawallet.app.analytics.Analytics; import com.alphawallet.app.analytics.Analytics;
import com.alphawallet.app.api.v1.entity.request.ApiV1Request; import com.alphawallet.app.api.v1.entity.request.ApiV1Request;
import com.alphawallet.app.entity.AnalyticsProperties;
import com.alphawallet.app.entity.ContractLocator; import com.alphawallet.app.entity.ContractLocator;
import com.alphawallet.app.entity.CryptoFunctions; import com.alphawallet.app.entity.CryptoFunctions;
import com.alphawallet.app.entity.CustomViewSettings; import com.alphawallet.app.entity.CustomViewSettings;
@ -66,21 +65,27 @@ import com.alphawallet.app.entity.HomeReceiver;
import com.alphawallet.app.entity.SignAuthenticationCallback; import com.alphawallet.app.entity.SignAuthenticationCallback;
import com.alphawallet.app.entity.Wallet; import com.alphawallet.app.entity.Wallet;
import com.alphawallet.app.entity.WalletPage; import com.alphawallet.app.entity.WalletPage;
import com.alphawallet.app.entity.cryptokeys.SignatureFromKey;
import com.alphawallet.app.repository.EthereumNetworkRepository; import com.alphawallet.app.repository.EthereumNetworkRepository;
import com.alphawallet.app.router.ImportTokenRouter; import com.alphawallet.app.router.ImportTokenRouter;
import com.alphawallet.app.service.NotificationService; import com.alphawallet.app.service.NotificationService;
import com.alphawallet.app.service.PriceAlertsService; import com.alphawallet.app.service.PriceAlertsService;
import com.alphawallet.app.ui.widget.entity.ActionSheetCallback;
import com.alphawallet.app.ui.widget.entity.PagerCallback; import com.alphawallet.app.ui.widget.entity.PagerCallback;
import com.alphawallet.app.util.LocaleUtils; import com.alphawallet.app.util.LocaleUtils;
import com.alphawallet.app.util.UpdateUtils; import com.alphawallet.app.util.UpdateUtils;
import com.alphawallet.app.util.Utils; import com.alphawallet.app.util.Utils;
import com.alphawallet.app.viewmodel.BaseNavigationActivity; import com.alphawallet.app.viewmodel.BaseNavigationActivity;
import com.alphawallet.app.viewmodel.HomeViewModel; import com.alphawallet.app.viewmodel.HomeViewModel;
import com.alphawallet.app.viewmodel.WalletConnectViewModel;
import com.alphawallet.app.walletconnect.AWWalletConnectClient;
import com.alphawallet.app.walletconnect.WCSession; import com.alphawallet.app.walletconnect.WCSession;
import com.alphawallet.app.web3.entity.Web3Transaction;
import com.alphawallet.app.widget.AWalletAlertDialog; import com.alphawallet.app.widget.AWalletAlertDialog;
import com.alphawallet.app.widget.AWalletConfirmationDialog; import com.alphawallet.app.widget.AWalletConfirmationDialog;
import com.alphawallet.app.widget.SignTransactionDialog;
import com.alphawallet.token.entity.SalesOrderMalformed; import com.alphawallet.token.entity.SalesOrderMalformed;
import com.alphawallet.token.entity.Signable;
import com.alphawallet.token.tools.Numeric;
import com.alphawallet.token.tools.ParseMagicLink; import com.alphawallet.token.tools.ParseMagicLink;
import com.github.florent37.tutoshowcase.TutoShowcase; import com.github.florent37.tutoshowcase.TutoShowcase;
@ -90,13 +95,18 @@ import java.lang.reflect.Method;
import java.net.URLDecoder; import java.net.URLDecoder;
import java.util.List; import java.util.List;
import javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint; import dagger.hilt.android.AndroidEntryPoint;
import timber.log.Timber; import timber.log.Timber;
@AndroidEntryPoint @AndroidEntryPoint
public class HomeActivity extends BaseNavigationActivity implements View.OnClickListener, HomeCommsInterface, public class HomeActivity extends BaseNavigationActivity implements View.OnClickListener, HomeCommsInterface,
FragmentMessenger, Runnable, SignAuthenticationCallback, LifecycleObserver, PagerCallback FragmentMessenger, Runnable, SignAuthenticationCallback, ActionSheetCallback, LifecycleObserver, PagerCallback
{ {
@Inject
AWWalletConnectClient awWalletConnectClient;
public static final int RC_ASSET_EXTERNAL_WRITE_PERM = 223; public static final int RC_ASSET_EXTERNAL_WRITE_PERM = 223;
public static final int RC_ASSET_NOTIFICATION_PERM = 224; public static final int RC_ASSET_NOTIFICATION_PERM = 224;
public static final int DAPP_BARCODE_READER_REQUEST_CODE = 1; public static final int DAPP_BARCODE_READER_REQUEST_CODE = 1;
@ -111,6 +121,7 @@ public class HomeActivity extends BaseNavigationActivity implements View.OnClick
result -> getSupportFragmentManager().setFragmentResult(RESET_TOKEN_SERVICE, new Bundle())); result -> getSupportFragmentManager().setFragmentResult(RESET_TOKEN_SERVICE, new Bundle()));
private HomeViewModel viewModel; private HomeViewModel viewModel;
private WalletConnectViewModel viewModelWC;
private Dialog dialog; private Dialog dialog;
private ViewPager2 viewPager; private ViewPager2 viewPager;
private LinearLayout successOverlay; private LinearLayout successOverlay;
@ -197,11 +208,15 @@ public class HomeActivity extends BaseNavigationActivity implements View.OnClick
LocaleUtils.setActiveLocale(this); LocaleUtils.setActiveLocale(this);
getLifecycle().addObserver(this); getLifecycle().addObserver(this);
isForeground = true; isForeground = true;
setWCConnect();
if (getSupportActionBar() != null) getSupportActionBar().hide(); if (getSupportActionBar() != null) getSupportActionBar().hide();
viewModel = new ViewModelProvider(this) viewModel = new ViewModelProvider(this)
.get(HomeViewModel.class); .get(HomeViewModel.class);
viewModelWC = new ViewModelProvider(this)
.get(WalletConnectViewModel.class);
viewModel.identify(); viewModel.identify();
viewModel.setWalletStartup(); viewModel.setWalletStartup();
viewModel.setCurrencyAndLocale(this); viewModel.setCurrencyAndLocale(this);
@ -305,6 +320,18 @@ public class HomeActivity extends BaseNavigationActivity implements View.OnClick
startService(i); startService(i);
} }
private void setWCConnect()
{
try
{
awWalletConnectClient.init(this);
}
catch (Exception e)
{
Timber.tag("WalletConnect").e(e);
}
}
private void onDefaultWallet(Wallet wallet) private void onDefaultWallet(Wallet wallet)
{ {
if (viewModel.checkNewWallet(wallet.address)) if (viewModel.checkNewWallet(wallet.address))
@ -500,6 +527,7 @@ public class HomeActivity extends BaseNavigationActivity implements View.OnClick
protected void onResume() protected void onResume()
{ {
super.onResume(); super.onResume();
setWCConnect();
viewModel.prepare(this); viewModel.prepare(this);
viewModel.getWalletName(this); viewModel.getWalletName(this);
viewModel.setErrorCallback(this); viewModel.setErrorCallback(this);
@ -926,11 +954,7 @@ public class HomeActivity extends BaseNavigationActivity implements View.OnClick
@Override @Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) protected void onActivityResult(int requestCode, int resultCode, Intent data)
{ {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data); // intercept return intent from PIN/Swipe authentications
if (requestCode >= SignTransactionDialog.REQUEST_CODE_CONFIRM_DEVICE_CREDENTIALS && requestCode <= SignTransactionDialog.REQUEST_CODE_CONFIRM_DEVICE_CREDENTIALS + 10)
{
requestCode = SignTransactionDialog.REQUEST_CODE_CONFIRM_DEVICE_CREDENTIALS;
}
switch (requestCode) switch (requestCode)
{ {
@ -945,16 +969,6 @@ public class HomeActivity extends BaseNavigationActivity implements View.OnClick
if (resultCode == RESULT_OK) backupWalletSuccess(keyBackup); if (resultCode == RESULT_OK) backupWalletSuccess(keyBackup);
else backupWalletFail(keyBackup, noLockScreen); else backupWalletFail(keyBackup, noLockScreen);
break; break;
case SignTransactionDialog.REQUEST_CODE_CONFIRM_DEVICE_CREDENTIALS:
switch (getSelectedItem())
{
case DAPP_BROWSER:
getFragment(DAPP_BROWSER).pinAuthorisation(resultCode == RESULT_OK);
break;
default:
break;
}
break;
case C.REQUEST_UNIVERSAL_SCAN: case C.REQUEST_UNIVERSAL_SCAN:
if (data != null && resultCode == Activity.RESULT_OK) if (data != null && resultCode == Activity.RESULT_OK)
{ {
@ -1150,6 +1164,58 @@ public class HomeActivity extends BaseNavigationActivity implements View.OnClick
} }
} }
@Override
public void signingComplete(SignatureFromKey signature, Signable message)
{
String signHex = Numeric.toHexString(signature.signature);
Timber.d("Initial Msg: %s", message.getMessage());
awWalletConnectClient.signComplete(signature, message);
}
@Override
public void signingFailed(Throwable error, Signable message)
{
awWalletConnectClient.signFail(error.getMessage(), message);
}
@Override
public void getAuthorisation(SignAuthenticationCallback callback)
{
viewModelWC.getAuthenticationForSignature(viewModel.defaultWallet().getValue(), this, callback);
}
@Override
public void sendTransaction(Web3Transaction tx)
{
}
@Override
public void dismissed(String txHash, long callbackId, boolean actionCompleted)
{
if (!actionCompleted)
{
awWalletConnectClient.dismissed(callbackId);
}
}
@Override
public void notifyConfirm(String mode)
{
}
//TODO: Implement when passing transactions through here
ActivityResultLauncher<Intent> getGasSettings = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(),
result -> { //awWalletConnectClient.setCurrentGasIndex(result));
});
@Override
public ActivityResultLauncher<Intent> gasSelectLauncher()
{
return getGasSettings;
}
private static class ScreenSlidePagerAdapter extends FragmentStateAdapter private static class ScreenSlidePagerAdapter extends FragmentStateAdapter
{ {
public ScreenSlidePagerAdapter(@NonNull FragmentActivity fragmentActivity) public ScreenSlidePagerAdapter(@NonNull FragmentActivity fragmentActivity)

2
app/src/main/java/com/alphawallet/app/ui/NFTAssetsFragment.java
Unescape View File

@ -164,7 +164,7 @@ public class NFTAssetsFragment extends BaseFragment implements OnAssetClickListe
if (hasTokenScriptOverride(token)) if (hasTokenScriptOverride(token))
{ {
searchLayout.setVisibility(View.GONE); searchLayout.setVisibility(View.GONE);
adapter = new NonFungibleTokenAdapter(this, token, viewModel.getAssetDefinitionService(), viewModel.getOpenseaService(), getActivity(), isGridView); adapter = new NonFungibleTokenAdapter(this, token, viewModel.getAssetDefinitionService(), viewModel.getOpenseaService(), isGridView);
} }
else else
{ {

68
app/src/main/java/com/alphawallet/app/ui/WalletConnectActivity.java
Unescape View File

@ -40,6 +40,7 @@ import com.alphawallet.app.entity.SignAuthenticationCallback;
import com.alphawallet.app.entity.StandardFunctionInterface; import com.alphawallet.app.entity.StandardFunctionInterface;
import com.alphawallet.app.entity.Wallet; import com.alphawallet.app.entity.Wallet;
import com.alphawallet.app.entity.analytics.ActionSheetSource; import com.alphawallet.app.entity.analytics.ActionSheetSource;
import com.alphawallet.app.entity.cryptokeys.SignatureFromKey;
import com.alphawallet.app.entity.tokens.Token; import com.alphawallet.app.entity.tokens.Token;
import com.alphawallet.app.entity.walletconnect.WCRequest; import com.alphawallet.app.entity.walletconnect.WCRequest;
import com.alphawallet.app.repository.EthereumNetworkBase; import com.alphawallet.app.repository.EthereumNetworkBase;
@ -58,7 +59,9 @@ import com.alphawallet.app.web3.entity.Address;
import com.alphawallet.app.web3.entity.WalletAddEthereumChainObject; import com.alphawallet.app.web3.entity.WalletAddEthereumChainObject;
import com.alphawallet.app.web3.entity.Web3Transaction; import com.alphawallet.app.web3.entity.Web3Transaction;
import com.alphawallet.app.widget.AWalletAlertDialog; import com.alphawallet.app.widget.AWalletAlertDialog;
import com.alphawallet.app.widget.ActionSheet;
import com.alphawallet.app.widget.ActionSheetDialog; import com.alphawallet.app.widget.ActionSheetDialog;
import com.alphawallet.app.widget.ActionSheetSignDialog;
import com.alphawallet.app.widget.ChainName; import com.alphawallet.app.widget.ChainName;
import com.alphawallet.app.widget.FunctionButtonBar; import com.alphawallet.app.widget.FunctionButtonBar;
import com.alphawallet.app.widget.SignTransactionDialog; import com.alphawallet.app.widget.SignTransactionDialog;
@ -101,7 +104,7 @@ public class WalletConnectActivity extends BaseActivity implements ActionSheetCa
private WCSession session; private WCSession session;
private WCPeerMeta peerMeta; private WCPeerMeta peerMeta;
private WCPeerMeta remotePeerMeta; private WCPeerMeta remotePeerMeta;
private ActionSheetDialog confirmationDialog; private ActionSheet confirmationDialog;
ActivityResultLauncher<Intent> getGasSettings = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), ActivityResultLauncher<Intent> getGasSettings = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(),
result -> confirmationDialog.setCurrentGasIndex(result)); result -> confirmationDialog.setCurrentGasIndex(result));
private AddEthereumChainPrompt addEthereumChainPrompt; private AddEthereumChainPrompt addEthereumChainPrompt;
@ -840,25 +843,17 @@ public class WalletConnectActivity extends BaseActivity implements ActionSheetCa
private void doSignMessage(final Signable signable) private void doSignMessage(final Signable signable)
{ {
final DAppFunction dappFunction = new DAppFunction() confirmationDialog = new ActionSheetSignDialog(this, this, signable);
{ confirmationDialog.show();
@Override
public void DAppError(Throwable error, Signable message) viewModel.track(Analytics.Action.WALLET_CONNECT_SIGN_MESSAGE_REQUEST);
{
showErrorDialog(error.getMessage());
confirmationDialog.dismiss();
if (fromDappBrowser) switchToDappBrowser();
requestId = 0;
lastId = 0;
signData = null;
} }
@Override @Override
public void DAppReturn(byte[] data, Signable message) public void signingComplete(SignatureFromKey signature, Signable signable)
{ {
//store sign
viewModel.recordSign(signable, getSessionId(), () -> { viewModel.recordSign(signable, getSessionId(), () -> {
viewModel.approveRequest(getApplication(), getSessionId(), message.getCallbackId(), Numeric.toHexString(data)); viewModel.approveRequest(getApplication(), getSessionId(), signable.getCallbackId(), Numeric.toHexString(signature.signature));
confirmationDialog.success(); confirmationDialog.success();
if (fromDappBrowser) if (fromDappBrowser)
{ {
@ -871,49 +866,16 @@ public class WalletConnectActivity extends BaseActivity implements ActionSheetCa
updateSignCount(); updateSignCount();
}); });
} }
};
signCallback = new SignAuthenticationCallback()
{
@Override @Override
public void gotAuthorisation(boolean gotAuth) public void signingFailed(Throwable error, Signable message)
{
viewModel.signMessage(
signable,
dappFunction);
}
@Override
public void gotAuthorisationForSigning(boolean gotAuth, Signable messageToSign)
{
if (gotAuth)
{ {
viewModel.signMessage( showErrorDialog(error.getMessage());
signable,
dappFunction);
}
else
{
cancelAuthentication();
}
}
@Override
public void cancelAuthentication()
{
requestId = 0;
showErrorDialogCancel(getString(R.string.title_dialog_error), getString(R.string.message_authentication_failed));
viewModel.rejectRequest(getApplication(), getSessionId(), lastId, getString(R.string.message_authentication_failed));
confirmationDialog.dismiss(); confirmationDialog.dismiss();
if (fromDappBrowser) switchToDappBrowser(); if (fromDappBrowser) switchToDappBrowser();
} requestId = 0;
}; lastId = 0;
signData = null;
confirmationDialog = new ActionSheetDialog(this, this, signCallback, signable);
confirmationDialog.setCanceledOnTouchOutside(false);
confirmationDialog.show();
viewModel.track(Analytics.Action.WALLET_CONNECT_SIGN_MESSAGE_REQUEST);
} }
private void onEthSignTransaction(Long id, WCEthereumTransaction transaction, long chainId) private void onEthSignTransaction(Long id, WCEthereumTransaction transaction, long chainId)

38
app/src/main/java/com/alphawallet/app/ui/widget/adapter/NonFungibleTokenAdapter.java
Unescape View File

@ -1,6 +1,7 @@
package com.alphawallet.app.ui.widget.adapter; package com.alphawallet.app.ui.widget.adapter;
import android.app.Activity; import static com.alphawallet.app.service.AssetDefinitionService.ASSET_SUMMARY_VIEW_NAME;
import android.content.Context; import android.content.Context;
import android.util.Pair; import android.util.Pair;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -29,10 +30,10 @@ import com.alphawallet.app.ui.widget.holder.AssetInstanceScriptHolder;
import com.alphawallet.app.ui.widget.holder.BinderViewHolder; import com.alphawallet.app.ui.widget.holder.BinderViewHolder;
import com.alphawallet.app.ui.widget.holder.NFTAssetHolder; import com.alphawallet.app.ui.widget.holder.NFTAssetHolder;
import com.alphawallet.app.ui.widget.holder.QuantitySelectorHolder; import com.alphawallet.app.ui.widget.holder.QuantitySelectorHolder;
import com.alphawallet.app.ui.widget.holder.TextHolder;
import com.alphawallet.app.ui.widget.holder.TicketHolder; import com.alphawallet.app.ui.widget.holder.TicketHolder;
import com.alphawallet.app.ui.widget.holder.TokenDescriptionHolder; import com.alphawallet.app.ui.widget.holder.TokenDescriptionHolder;
import com.alphawallet.app.ui.widget.holder.TotalBalanceHolder; import com.alphawallet.app.ui.widget.holder.TotalBalanceHolder;
import com.alphawallet.app.web3.entity.FunctionCallback;
import com.alphawallet.token.entity.TicketRange; import com.alphawallet.token.entity.TicketRange;
import com.bumptech.glide.Glide; import com.bumptech.glide.Glide;
@ -47,8 +48,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers; import io.reactivex.schedulers.Schedulers;
import timber.log.Timber; import timber.log.Timber;
import static com.alphawallet.app.service.AssetDefinitionService.ASSET_SUMMARY_VIEW_NAME;
/** /**
* Created by James on 9/02/2018. * Created by James on 9/02/2018.
*/ */
@ -60,29 +59,27 @@ public class NonFungibleTokenAdapter extends TokensAdapter implements NonFungibl
protected final OpenSeaService openseaService; protected final OpenSeaService openseaService;
private final boolean clickThrough; private final boolean clickThrough;
protected int assetCount; protected int assetCount;
private FunctionCallback functionCallback;
private final Activity activity;
private boolean isGrid; private boolean isGrid;
public NonFungibleTokenAdapter(TokensAdapterCallback tokenClickListener, Token t, AssetDefinitionService service, public NonFungibleTokenAdapter(TokensAdapterCallback tokenClickListener, Token t, AssetDefinitionService service,
OpenSeaService opensea, Activity activity) { OpenSeaService opensea)
{
super(tokenClickListener, service); super(tokenClickListener, service);
assetCount = 0; assetCount = 0;
token = t; token = t;
clickThrough = true; clickThrough = true;
openseaService = opensea; openseaService = opensea;
setToken(t); setToken(t);
this.activity = activity;
} }
public NonFungibleTokenAdapter(TokensAdapterCallback tokenClickListener, Token t, AssetDefinitionService service, public NonFungibleTokenAdapter(TokensAdapterCallback tokenClickListener, Token t, AssetDefinitionService service,
OpenSeaService opensea, Activity activity, boolean isGrid) { OpenSeaService opensea, boolean isGrid)
{
super(tokenClickListener, service); super(tokenClickListener, service);
assetCount = 0; assetCount = 0;
token = t; token = t;
clickThrough = true; clickThrough = true;
openseaService = opensea; openseaService = opensea;
this.activity = activity;
this.isGrid = isGrid; this.isGrid = isGrid;
setToken(t); setToken(t);
} }
@ -96,7 +93,6 @@ public class NonFungibleTokenAdapter extends TokensAdapter implements NonFungibl
clickThrough = false; clickThrough = false;
openseaService = null; openseaService = null;
setTokenRange(token, tokenSelection); setTokenRange(token, tokenSelection);
this.activity = null;
} }
public NonFungibleTokenAdapter(TokensAdapterCallback tokenClickListener, Token t, ArrayList<Pair<BigInteger, NFTAsset>> assetSelection, public NonFungibleTokenAdapter(TokensAdapterCallback tokenClickListener, Token t, ArrayList<Pair<BigInteger, NFTAsset>> assetSelection,
@ -108,7 +104,6 @@ public class NonFungibleTokenAdapter extends TokensAdapter implements NonFungibl
clickThrough = false; clickThrough = false;
openseaService = null; openseaService = null;
setAssetSelection(token, assetSelection); setAssetSelection(token, assetSelection);
this.activity = null;
} }
private void setAssetSelection(Token token, List<Pair<BigInteger, NFTAsset>> selection) private void setAssetSelection(Token token, List<Pair<BigInteger, NFTAsset>> selection)
@ -118,9 +113,11 @@ public class NonFungibleTokenAdapter extends TokensAdapter implements NonFungibl
@NotNull @NotNull
@Override @Override
public BinderViewHolder<?> onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { public BinderViewHolder<?> onCreateViewHolder(@NonNull ViewGroup parent, int viewType)
{
BinderViewHolder<?> holder = null; BinderViewHolder<?> holder = null;
switch (viewType) { switch (viewType)
{
case TicketHolder.VIEW_TYPE: //Ticket holder now deprecated //TODO: remove case TicketHolder.VIEW_TYPE: //Ticket holder now deprecated //TODO: remove
holder = new TicketHolder(R.layout.item_ticket, parent, token, assetService); holder = new TicketHolder(R.layout.item_ticket, parent, token, assetService);
holder.setOnTokenClickListener(tokensAdapterCallback); holder.setOnTokenClickListener(tokensAdapterCallback);
@ -141,14 +138,19 @@ public class NonFungibleTokenAdapter extends TokensAdapter implements NonFungibl
case QuantitySelectorHolder.VIEW_TYPE: case QuantitySelectorHolder.VIEW_TYPE:
holder = new QuantitySelectorHolder(R.layout.item_quantity_selector, parent, assetCount, assetService); holder = new QuantitySelectorHolder(R.layout.item_quantity_selector, parent, assetCount, assetService);
break; break;
default:
holder = new TextHolder(R.layout.item_standard_header, parent);
break;
} }
return holder; return holder;
} }
public int getTicketRangeCount() { public int getTicketRangeCount()
{
int count = 0; int count = 0;
if (currentRange != null) { if (currentRange != null)
{
count = currentRange.tokenIds.size(); count = currentRange.tokenIds.size();
} }
return count; return count;
@ -197,7 +199,7 @@ public class NonFungibleTokenAdapter extends TokensAdapter implements NonFungibl
for (int i = 0; i < selection.size(); i++) for (int i = 0; i < selection.size(); i++)
{ {
items.add(new NFTSortedItem(selection.get(i), i+1)); items.add(new NFTSortedItem(selection.get(i), i + 1));
} }
items.endBatchedUpdates(); items.endBatchedUpdates();
@ -256,7 +258,7 @@ public class NonFungibleTokenAdapter extends TokensAdapter implements NonFungibl
{ {
currentRange = new TicketRange(e.id, t.getAddress()); currentRange = new TicketRange(e.id, t.getAddress());
final T item = generateType(currentRange, 10 + i, id); final T item = generateType(currentRange, 10 + i, id);
items.add((SortedItem)item); items.add((SortedItem) item);
currentTime = e.time; currentTime = e.time;
} }
} }

40
app/src/main/java/com/alphawallet/app/ui/widget/entity/ActionSheetCallback.java
Unescape View File

@ -1,14 +1,14 @@
package com.alphawallet.app.ui.widget.entity; package com.alphawallet.app.ui.widget.entity;
import android.app.Activity;
import android.content.Intent; import android.content.Intent;
import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.ActivityResultLauncher;
import com.alphawallet.app.entity.SignAuthenticationCallback; import com.alphawallet.app.entity.SignAuthenticationCallback;
import com.alphawallet.app.entity.cryptokeys.SignatureFromKey;
import com.alphawallet.app.entity.tokens.Token; import com.alphawallet.app.entity.tokens.Token;
import com.alphawallet.app.walletconnect.entity.WCPeerMeta;
import com.alphawallet.app.web3.entity.Web3Transaction; import com.alphawallet.app.web3.entity.Web3Transaction;
import com.alphawallet.token.entity.Signable;
/** /**
* Created by JB on 27/11/2020. * Created by JB on 27/11/2020.
@ -16,16 +16,40 @@ import com.alphawallet.app.web3.entity.Web3Transaction;
public interface ActionSheetCallback public interface ActionSheetCallback
{ {
void getAuthorisation(SignAuthenticationCallback callback); void getAuthorisation(SignAuthenticationCallback callback);
void sendTransaction(Web3Transaction tx); void sendTransaction(Web3Transaction tx);
void dismissed(String txHash, long callbackId, boolean actionCompleted); void dismissed(String txHash, long callbackId, boolean actionCompleted);
void notifyConfirm(String mode); void notifyConfirm(String mode);
ActivityResultLauncher<Intent> gasSelectLauncher(); ActivityResultLauncher<Intent> gasSelectLauncher();
default void signTransaction(Web3Transaction tx) { } // only WalletConnect uses this so far
default void buttonClick(long callbackId, Token baseToken) { }; //for message only actionsheet default void signTransaction(Web3Transaction tx)
{
} // only WalletConnect uses this so far
default void buttonClick(long callbackId, Token baseToken)
{
}
default void notifyWalletConnectApproval(long chainId)
{
}
default void denyWalletConnect()
{
}
default void openChainSelection()
{
}
default void signingComplete(SignatureFromKey signature, Signable message)
{
}
default void notifyWalletConnectApproval(long chainId) { }; // used by WalletConnectRequest default void signingFailed(Throwable error, Signable message)
default void denyWalletConnect() { }; {
default void openChainSelection() { }; // used by WalletConnectRequest }
default void buttonClick(String action, int Id) { }; // for passing
} }

4
app/src/main/java/com/alphawallet/app/viewmodel/ApiV1ViewModel.java
Unescape View File

@ -1,8 +1,6 @@
package com.alphawallet.app.viewmodel; package com.alphawallet.app.viewmodel;
import static com.alphawallet.ethereum.EthereumNetworkBase.MAINNET_ID;
import android.app.Activity; import android.app.Activity;
import android.net.Uri; import android.net.Uri;
import android.text.TextUtils; import android.text.TextUtils;
@ -76,7 +74,7 @@ public class ApiV1ViewModel extends BaseViewModel
public void signMessage(Signable message) public void signMessage(Signable message)
{ {
disposable = createTransactionInteract.sign(defaultWallet.getValue(), message, MAINNET_ID) disposable = createTransactionInteract.sign(defaultWallet.getValue(), message)
.subscribeOn(Schedulers.computation()) .subscribeOn(Schedulers.computation())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(this::onSignSuccess, this::onSignError); .subscribe(this::onSignSuccess, this::onSignError);

13
app/src/main/java/com/alphawallet/app/viewmodel/DappBrowserViewModel.java
Unescape View File

@ -20,7 +20,6 @@ import com.alphawallet.app.C;
import com.alphawallet.app.R; import com.alphawallet.app.R;
import com.alphawallet.app.analytics.Analytics; import com.alphawallet.app.analytics.Analytics;
import com.alphawallet.app.entity.DApp; import com.alphawallet.app.entity.DApp;
import com.alphawallet.app.entity.DAppFunction;
import com.alphawallet.app.entity.NetworkInfo; import com.alphawallet.app.entity.NetworkInfo;
import com.alphawallet.app.entity.Operation; import com.alphawallet.app.entity.Operation;
import com.alphawallet.app.entity.QRResult; import com.alphawallet.app.entity.QRResult;
@ -48,7 +47,6 @@ import com.alphawallet.app.util.DappBrowserUtils;
import com.alphawallet.app.walletconnect.util.WalletConnectHelper; import com.alphawallet.app.walletconnect.util.WalletConnectHelper;
import com.alphawallet.app.web3.entity.WalletAddEthereumChainObject; import com.alphawallet.app.web3.entity.WalletAddEthereumChainObject;
import com.alphawallet.app.web3.entity.Web3Transaction; import com.alphawallet.app.web3.entity.Web3Transaction;
import com.alphawallet.token.entity.Signable;
import org.web3j.utils.Numeric; import org.web3j.utils.Numeric;
@ -61,7 +59,6 @@ import javax.inject.Inject;
import dagger.hilt.android.lifecycle.HiltViewModel; import dagger.hilt.android.lifecycle.HiltViewModel;
import io.reactivex.Observable; import io.reactivex.Observable;
import io.reactivex.Single; import io.reactivex.Single;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers; import io.reactivex.schedulers.Schedulers;
import io.realm.Realm; import io.realm.Realm;
@ -154,16 +151,6 @@ public class DappBrowserViewModel extends BaseViewModel
} }
} }
public void signMessage(Signable message, DAppFunction dAppFunction)
{
disposable = createTransactionInteract.sign(defaultWallet.getValue(), message,
getActiveNetwork().chainId)
.subscribeOn(Schedulers.computation())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(sig -> dAppFunction.DAppReturn(sig.signature, message),
error -> dAppFunction.DAppError(error, message));
}
public void setLastUrl(Context context, String url) public void setLastUrl(Context context, String url)
{ {
PreferenceManager.getDefaultSharedPreferences(context) PreferenceManager.getDefaultSharedPreferences(context)

2
app/src/main/java/com/alphawallet/app/viewmodel/RedeemSignatureDisplayModel.java
Unescape View File

@ -289,7 +289,7 @@ public class RedeemSignatureDisplayModel extends BaseViewModel
//now run this guy through the signed message system //now run this guy through the signed message system
if (pair != null) if (pair != null)
disposable = createTransactionInteract disposable = createTransactionInteract
.sign(wallet, pair, token.tokenInfo.chainId) .sign(wallet, pair)
.subscribe(this::onSignedMessage, this::onError); .subscribe(this::onSignedMessage, this::onError);
} }

10
app/src/main/java/com/alphawallet/app/viewmodel/SellDetailViewModel.java
Unescape View File

@ -1,21 +1,21 @@
package com.alphawallet.app.viewmodel; package com.alphawallet.app.viewmodel;
import android.app.Activity; import android.app.Activity;
import android.content.Context;
import androidx.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.MutableLiveData;
import android.content.Context;
import com.alphawallet.app.entity.CryptoFunctions; import com.alphawallet.app.entity.CryptoFunctions;
import com.alphawallet.app.entity.NetworkInfo; import com.alphawallet.app.entity.NetworkInfo;
import com.alphawallet.app.entity.Operation; import com.alphawallet.app.entity.Operation;
import com.alphawallet.app.entity.SignAuthenticationCallback; import com.alphawallet.app.entity.SignAuthenticationCallback;
import com.alphawallet.app.entity.cryptokeys.SignatureFromKey;
import com.alphawallet.app.entity.tokens.Token;
import com.alphawallet.app.entity.Wallet; import com.alphawallet.app.entity.Wallet;
import com.alphawallet.app.entity.cryptokeys.SignatureFromKey;
import com.alphawallet.app.entity.tokendata.TokenTicker; import com.alphawallet.app.entity.tokendata.TokenTicker;
import com.alphawallet.app.entity.tokens.Token;
import com.alphawallet.app.interact.CreateTransactionInteract; import com.alphawallet.app.interact.CreateTransactionInteract;
import com.alphawallet.app.interact.FindDefaultNetworkInteract; import com.alphawallet.app.interact.FindDefaultNetworkInteract;
import com.alphawallet.app.interact.GenericWalletInteract;
import com.alphawallet.app.repository.EthereumNetworkRepository; import com.alphawallet.app.repository.EthereumNetworkRepository;
import com.alphawallet.app.router.SellDetailRouter; import com.alphawallet.app.router.SellDetailRouter;
import com.alphawallet.app.service.AssetDefinitionService; import com.alphawallet.app.service.AssetDefinitionService;
@ -130,7 +130,7 @@ public class SellDetailViewModel extends BaseViewModel {
//sign this link //sign this link
disposable = createTransactionInteract disposable = createTransactionInteract
.sign(defaultWallet().getValue(), tradeBytes, token.tokenInfo.chainId) .sign(defaultWallet().getValue(), tradeBytes)
.subscribe(this::gotSignature, this::onError); .subscribe(this::gotSignature, this::onError);
} }

86
app/src/main/java/com/alphawallet/app/viewmodel/SignDialogViewModel.java
Unescape View File

@ -0,0 +1,86 @@
package com.alphawallet.app.viewmodel;
import android.app.Activity;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import com.alphawallet.app.entity.SignAuthenticationCallback;
import com.alphawallet.app.entity.Wallet;
import com.alphawallet.app.entity.cryptokeys.SignatureFromKey;
import com.alphawallet.app.interact.GenericWalletInteract;
import com.alphawallet.app.repository.TransactionRepositoryType;
import com.alphawallet.app.service.KeyService;
import com.alphawallet.app.ui.widget.entity.ActionSheetCallback;
import com.alphawallet.token.entity.Signable;
import javax.inject.Inject;
import dagger.hilt.android.lifecycle.HiltViewModel;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
/**
* Created by JB on 22/11/2022.
*/
@HiltViewModel
public class SignDialogViewModel extends BaseViewModel
{
private final TransactionRepositoryType transactionRepositoryType;
private final KeyService keyService;
private final GenericWalletInteract walletInteract;
private final MutableLiveData<Boolean> completed = new MutableLiveData<>(false);
private Wallet wallet;
@Inject
public SignDialogViewModel(GenericWalletInteract walletInteract, TransactionRepositoryType transactionRepositoryType, KeyService keyService)
{
this.transactionRepositoryType = transactionRepositoryType;
this.keyService = keyService;
this.walletInteract = walletInteract;
disposable = walletInteract.find()
.observeOn(Schedulers.io())
.subscribeOn(Schedulers.io())
.subscribe(w -> wallet = w, this::onError);
}
public void getAuthentication(Activity activity, SignAuthenticationCallback sCallback)
{
keyService.getAuthenticationForSignature(wallet, activity, sCallback);
}
public void signMessage(Signable message, ActionSheetCallback aCallback)
{
disposable = transactionRepositoryType.getSignature(wallet, message)
.subscribeOn(Schedulers.computation())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(sig -> signComplete(sig, message, aCallback),
error -> signFailed(error, message, aCallback));
}
private void signComplete(SignatureFromKey signature, Signable message, ActionSheetCallback aCallback)
{
aCallback.signingComplete(signature, message);
completed.postValue(true);
}
private void signFailed(Throwable error, Signable message, ActionSheetCallback aCallback)
{
aCallback.signingFailed(error, message);
completed.postValue(false);
}
public LiveData<Boolean> completed()
{
return completed;
}
public void setSigningWallet(String account)
{
disposable = walletInteract.findWallet(account)
.observeOn(Schedulers.io())
.subscribeOn(Schedulers.io())
.subscribe(w -> wallet = w, this::onError); // TODO: If wallet not found then report error to user rather than trying to sign on default wallet
}
}

11
app/src/main/java/com/alphawallet/app/viewmodel/TokenFunctionViewModel.java
Unescape View File

@ -15,7 +15,6 @@ import com.alphawallet.app.C;
import com.alphawallet.app.R; import com.alphawallet.app.R;
import com.alphawallet.app.analytics.Analytics; import com.alphawallet.app.analytics.Analytics;
import com.alphawallet.app.entity.AnalyticsProperties; import com.alphawallet.app.entity.AnalyticsProperties;
import com.alphawallet.app.entity.DAppFunction;
import com.alphawallet.app.entity.Operation; import com.alphawallet.app.entity.Operation;
import com.alphawallet.app.entity.SignAuthenticationCallback; import com.alphawallet.app.entity.SignAuthenticationCallback;
import com.alphawallet.app.entity.Transaction; import com.alphawallet.app.entity.Transaction;
@ -55,7 +54,6 @@ import com.alphawallet.token.entity.ContractAddress;
import com.alphawallet.token.entity.FunctionDefinition; import com.alphawallet.token.entity.FunctionDefinition;
import com.alphawallet.token.entity.MethodArg; import com.alphawallet.token.entity.MethodArg;
import com.alphawallet.token.entity.SigReturnType; import com.alphawallet.token.entity.SigReturnType;
import com.alphawallet.token.entity.Signable;
import com.alphawallet.token.entity.TSAction; import com.alphawallet.token.entity.TSAction;
import com.alphawallet.token.entity.TicketRange; import com.alphawallet.token.entity.TicketRange;
import com.alphawallet.token.entity.TokenScriptResult; import com.alphawallet.token.entity.TokenScriptResult;
@ -298,15 +296,6 @@ public class TokenFunctionViewModel extends BaseViewModel
sig.postValue(failSig); sig.postValue(failSig);
} }
public void signMessage(Signable message, DAppFunction dAppFunction, long chainId)
{
disposable = createTransactionInteract.sign(wallet, message, chainId)
.subscribeOn(Schedulers.computation())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(sig -> dAppFunction.DAppReturn(sig.signature, message),
error -> dAppFunction.DAppError(error, message));
}
public String getTransactionBytes(Token token, BigInteger tokenId, FunctionDefinition def) public String getTransactionBytes(Token token, BigInteger tokenId, FunctionDefinition def)
{ {
return assetDefinitionService.generateTransactionPayload(token, tokenId, def); return assetDefinitionService.generateTransactionPayload(token, tokenId, def);

4
app/src/main/java/com/alphawallet/app/viewmodel/TransferTicketDetailViewModel.java
Unescape View File

@ -173,7 +173,7 @@ public class TransferTicketDetailViewModel extends BaseViewModel
//sign this link //sign this link
disposable = createTransactionInteract disposable = createTransactionInteract
.sign(defaultWallet().getValue(), tradeBytes, token.tokenInfo.chainId) .sign(defaultWallet().getValue(), tradeBytes)
.subscribeOn(Schedulers.computation()) .subscribeOn(Schedulers.computation())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(this::gotSignature, this::onError); .subscribe(this::gotSignature, this::onError);
@ -194,7 +194,7 @@ public class TransferTicketDetailViewModel extends BaseViewModel
//sign this link //sign this link
disposable = createTransactionInteract disposable = createTransactionInteract
.sign(defaultWallet().getValue(), tradeBytes, token.tokenInfo.chainId) .sign(defaultWallet().getValue(), tradeBytes)
.subscribeOn(Schedulers.computation()) .subscribeOn(Schedulers.computation())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(this::gotSignature, this::onError); .subscribe(this::gotSignature, this::onError);

3
app/src/main/java/com/alphawallet/app/viewmodel/WalletConnectViewModel.java
Unescape View File

@ -15,7 +15,6 @@ import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.MutableLiveData;
import com.alphawallet.app.C; import com.alphawallet.app.C;
import com.alphawallet.app.entity.AnalyticsProperties;
import com.alphawallet.app.entity.DAppFunction; import com.alphawallet.app.entity.DAppFunction;
import com.alphawallet.app.entity.GenericCallback; import com.alphawallet.app.entity.GenericCallback;
import com.alphawallet.app.entity.NetworkInfo; import com.alphawallet.app.entity.NetworkInfo;
@ -211,7 +210,7 @@ public class WalletConnectViewModel extends BaseViewModel
public void signMessage(Signable message, DAppFunction dAppFunction) public void signMessage(Signable message, DAppFunction dAppFunction)
{ {
resetSignDialog(); resetSignDialog();
disposable = createTransactionInteract.sign(defaultWallet.getValue(), message, MAINNET_ID) disposable = createTransactionInteract.sign(defaultWallet.getValue(), message)
.subscribeOn(Schedulers.computation()) .subscribeOn(Schedulers.computation())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(sig -> dAppFunction.DAppReturn(sig.signature, message), .subscribe(sig -> dAppFunction.DAppReturn(sig.signature, message),

128
app/src/main/java/com/alphawallet/app/viewmodel/walletconnect/SignMethodDialogViewModel.java
Unescape View File

@ -1,128 +0,0 @@
package com.alphawallet.app.viewmodel.walletconnect;
import static com.alphawallet.app.entity.cryptokeys.SignatureReturnType.SIGNATURE_GENERATED;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.widget.Toast;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import com.alphawallet.app.R;
import com.alphawallet.app.entity.Operation;
import com.alphawallet.app.entity.SignAuthenticationCallback;
import com.alphawallet.app.entity.Wallet;
import com.alphawallet.app.entity.cryptokeys.SignatureFromKey;
import com.alphawallet.app.interact.FetchWalletsInteract;
import com.alphawallet.app.repository.TransactionRepositoryType;
import com.alphawallet.app.service.KeyService;
import com.alphawallet.app.viewmodel.BaseViewModel;
import com.alphawallet.app.walletconnect.AWWalletConnectClient;
import com.alphawallet.app.walletconnect.util.WalletConnectHelper;
import com.alphawallet.token.entity.Signable;
import com.alphawallet.token.tools.Numeric;
import com.walletconnect.sign.client.Sign;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
import javax.inject.Inject;
import dagger.hilt.android.lifecycle.HiltViewModel;
import io.reactivex.Single;
import timber.log.Timber;
@HiltViewModel
public class SignMethodDialogViewModel extends BaseViewModel
{
private final AWWalletConnectClient awWalletConnectClient;
private final FetchWalletsInteract fetchWalletsInteract;
private final TransactionRepositoryType transactionRepositoryType;
private final KeyService keyService;
private final MutableLiveData<Boolean> completed = new MutableLiveData<>(false);
@Inject
public SignMethodDialogViewModel(AWWalletConnectClient awWalletConnectClient, FetchWalletsInteract fetchWalletsInteract, TransactionRepositoryType transactionRepositoryType, KeyService keyService)
{
this.awWalletConnectClient = awWalletConnectClient;
this.fetchWalletsInteract = fetchWalletsInteract;
this.transactionRepositoryType = transactionRepositoryType;
this.keyService = keyService;
}
public void sign(Activity activity, Wallet wallet, Sign.Model.SessionRequest sessionRequest, final Signable signable)
{
keyService.getAuthenticationForSignature(wallet, activity, new SignAuthenticationCallback()
{
@SuppressLint("CheckResult")
@Override
public void gotAuthorisation(boolean gotAuth)
{
if (gotAuth)
{
long chainId = WalletConnectHelper.getChainId(Objects.requireNonNull(sessionRequest.getChainId()));
Single<SignatureFromKey> signature = transactionRepositoryType.getSignature(wallet, signable, chainId);
signature
.delay(5, TimeUnit.SECONDS) // The WC connection shutdown when show biometric, when back to foreground, it will open new connection, so need delay to wait the connection opened
.subscribe(signatureFromKey -> onSuccess(signatureFromKey, sessionRequest), SignMethodDialogViewModel.this::onError);
}
else
{
Toast.makeText(activity, activity.getString(R.string.error_while_signing_transaction), Toast.LENGTH_SHORT).show();
}
}
@Override
public void cancelAuthentication()
{
Timber.i("cancelAuthentication");
}
});
}
public void onError(Throwable throwable)
{
Timber.e(throwable);
}
private void onSuccess(SignatureFromKey signatureFromKey, Sign.Model.SessionRequest sessionRequest)
{
if (signatureFromKey.sigType == SIGNATURE_GENERATED)
{
String result = Numeric.toHexString(signatureFromKey.signature);
awWalletConnectClient.approve(sessionRequest, result);
}
else
{
Timber.i("sign fail: %s", signatureFromKey.failMessage);
awWalletConnectClient.reject(sessionRequest, signatureFromKey.failMessage);
}
completed.postValue(true);
}
public void completeAuthentication(Operation taskCode)
{
keyService.completeAuthentication(taskCode);
}
public void failedAuthentication(Operation taskCode)
{
keyService.failedAuthentication(taskCode);
}
public LiveData<Boolean> completed()
{
return completed;
}
public void reject(Sign.Model.SessionRequest sessionRequest)
{
awWalletConnectClient.reject(sessionRequest);
}
public Single<Wallet> findWallet(String walletAddress)
{
return fetchWalletsInteract.getWallet(walletAddress);
}
}

83
app/src/main/java/com/alphawallet/app/walletconnect/AWWalletConnectClient.java
Unescape View File

@ -1,25 +1,23 @@
package com.alphawallet.app.walletconnect; package com.alphawallet.app.walletconnect;
import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
import static com.alphawallet.app.entity.cryptokeys.SignatureReturnType.SIGNATURE_GENERATED;
import android.app.Activity;
import android.app.Application; import android.app.Application;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Build; import android.os.Build;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.util.LongSparseArray;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.MutableLiveData;
import com.alphawallet.app.App;
import com.alphawallet.app.BuildConfig;
import com.alphawallet.app.C; import com.alphawallet.app.C;
import com.alphawallet.app.R; import com.alphawallet.app.R;
import com.alphawallet.app.entity.AuthenticationCallback; import com.alphawallet.app.entity.cryptokeys.SignatureFromKey;
import com.alphawallet.app.entity.walletconnect.NamespaceParser; import com.alphawallet.app.entity.walletconnect.NamespaceParser;
import com.alphawallet.app.entity.walletconnect.WalletConnectSessionItem; import com.alphawallet.app.entity.walletconnect.WalletConnectSessionItem;
import com.alphawallet.app.entity.walletconnect.WalletConnectV2SessionItem; import com.alphawallet.app.entity.walletconnect.WalletConnectV2SessionItem;
@ -27,9 +25,11 @@ import com.alphawallet.app.interact.WalletConnectInteract;
import com.alphawallet.app.repository.KeyProvider; import com.alphawallet.app.repository.KeyProvider;
import com.alphawallet.app.repository.KeyProviderFactory; import com.alphawallet.app.repository.KeyProviderFactory;
import com.alphawallet.app.service.WalletConnectV2Service; import com.alphawallet.app.service.WalletConnectV2Service;
import com.alphawallet.app.ui.HomeActivity;
import com.alphawallet.app.ui.WalletConnectV2Activity; import com.alphawallet.app.ui.WalletConnectV2Activity;
import com.alphawallet.app.viewmodel.walletconnect.SignMethodDialogViewModel;
import com.alphawallet.app.walletconnect.util.WCMethodChecker; import com.alphawallet.app.walletconnect.util.WCMethodChecker;
import com.alphawallet.token.entity.Signable;
import com.alphawallet.token.tools.Numeric;
import com.walletconnect.android.Core; import com.walletconnect.android.Core;
import com.walletconnect.android.CoreClient; import com.walletconnect.android.CoreClient;
import com.walletconnect.android.relay.ConnectionType; import com.walletconnect.android.relay.ConnectionType;
@ -51,19 +51,21 @@ import timber.log.Timber;
public class AWWalletConnectClient implements SignInterface.WalletDelegate public class AWWalletConnectClient implements SignInterface.WalletDelegate
{ {
private static final String TAG = AWWalletConnectClient.class.getName(); private static final String TAG = AWWalletConnectClient.class.getName();
public static AuthenticationCallback authCallback;
private final WalletConnectInteract walletConnectInteract; private final WalletConnectInteract walletConnectInteract;
public static Sign.Model.SessionProposal sessionProposal; public static Sign.Model.SessionProposal sessionProposal;
public static SignMethodDialogViewModel viewModel;
private final Context context; private final Context context;
private final MutableLiveData<List<WalletConnectSessionItem>> sessionItemMutableLiveData = new MutableLiveData<>(Collections.emptyList()); private final MutableLiveData<List<WalletConnectSessionItem>> sessionItemMutableLiveData = new MutableLiveData<>(Collections.emptyList());
private final KeyProvider keyProvider = KeyProviderFactory.get(); private final KeyProvider keyProvider = KeyProviderFactory.get();
private final LongSparseArray<WalletConnectV2SessionRequestHandler> requestHandlers = new LongSparseArray<>();
private HomeActivity activity;
private boolean hasConnection;
public AWWalletConnectClient(Context context, WalletConnectInteract walletConnectInteract) public AWWalletConnectClient(Context context, WalletConnectInteract walletConnectInteract)
{ {
this.context = context; this.context = context;
this.walletConnectInteract = walletConnectInteract; this.walletConnectInteract = walletConnectInteract;
hasConnection = false;
} }
public void onSessionDelete(@NonNull Sign.Model.DeletedSession deletedSession) public void onSessionDelete(@NonNull Sign.Model.DeletedSession deletedSession)
@ -102,7 +104,6 @@ public class AWWalletConnectClient implements SignInterface.WalletDelegate
return true; return true;
} }
@RequiresApi(api = Build.VERSION_CODES.O)
public void onSessionRequest(@NonNull Sign.Model.SessionRequest sessionRequest) public void onSessionRequest(@NonNull Sign.Model.SessionRequest sessionRequest)
{ {
String method = sessionRequest.getRequest().getMethod(); String method = sessionRequest.getRequest().getMethod();
@ -115,9 +116,9 @@ public class AWWalletConnectClient implements SignInterface.WalletDelegate
Sign.Model.Session settledSession = getSession(sessionRequest.getTopic()); Sign.Model.Session settledSession = getSession(sessionRequest.getTopic());
Activity topActivity = App.getInstance().getTopActivity(); WalletConnectV2SessionRequestHandler handler = new WalletConnectV2SessionRequestHandler(sessionRequest, settledSession, activity, this);
WalletConnectV2SessionRequestHandler handler = new WalletConnectV2SessionRequestHandler(sessionRequest, settledSession, topActivity, this); handler.handle(method, activity);
handler.handle(method); requestHandlers.append(sessionRequest.getRequest().getId(), handler);
} }
private Sign.Model.Session getSession(String topic) private Sign.Model.Session getSession(String topic)
@ -134,7 +135,6 @@ public class AWWalletConnectClient implements SignInterface.WalletDelegate
Timber.tag(TAG).e(e); Timber.tag(TAG).e(e);
} }
for (Sign.Model.Session session : listOfSettledSessions) for (Sign.Model.Session session : listOfSettledSessions)
{ {
if (session.getTopic().equals(topic)) if (session.getTopic().equals(topic))
@ -285,6 +285,11 @@ public class AWWalletConnectClient implements SignInterface.WalletDelegate
return null; return null;
} }
public void init(HomeActivity homeActivity)
{
activity = homeActivity;
}
public void init(Application application) public void init(Application application)
{ {
Core.Model.AppMetaData appMetaData = getAppMetaData(application); Core.Model.AppMetaData appMetaData = getAppMetaData(application);
@ -327,6 +332,7 @@ public class AWWalletConnectClient implements SignInterface.WalletDelegate
public void onConnectionStateChange(@NonNull Sign.Model.ConnectionState connectionState) public void onConnectionStateChange(@NonNull Sign.Model.ConnectionState connectionState)
{ {
Timber.tag(TAG).i("onConnectionStateChange"); Timber.tag(TAG).i("onConnectionStateChange");
hasConnection = connectionState.isAvailable();
} }
public void onSessionSettleResponse(@NonNull Sign.Model.SettledSessionResponse settledSessionResponse) public void onSessionSettleResponse(@NonNull Sign.Model.SettledSessionResponse settledSessionResponse)
@ -344,6 +350,57 @@ public class AWWalletConnectClient implements SignInterface.WalletDelegate
Timber.e(error.getThrowable()); Timber.e(error.getThrowable());
} }
public void signComplete(SignatureFromKey signatureFromKey, Signable signable)
{
if (hasConnection)
{
onSign(signatureFromKey, getHandler(signable.getCallbackId())); //have valid connection, can send response
}
else
{
new Handler().postDelayed(() -> signComplete(signatureFromKey, signable), 1000); //Delay by 1 second and check again
}
}
public void signFail(String error, Signable signable)
{
final WalletConnectV2SessionRequestHandler requestHandler = getHandler(signable.getCallbackId());
Timber.i("sign fail: %s", error);
reject(requestHandler.getSessionRequest(), error);
}
//Sign Dialog (and later tx dialog) was dismissed
public void dismissed(long callbackId)
{
final WalletConnectV2SessionRequestHandler requestHandler = getHandler(callbackId);
if (requestHandler != null)
{
reject(requestHandler.getSessionRequest(), activity.getString(R.string.message_reject_request));
}
}
private WalletConnectV2SessionRequestHandler getHandler(long callbackId)
{
WalletConnectV2SessionRequestHandler handler = requestHandlers.get(callbackId);
requestHandlers.remove(callbackId);
return handler;
}
private void onSign(SignatureFromKey signatureFromKey, WalletConnectV2SessionRequestHandler requestHandler)
{
if (signatureFromKey.sigType == SIGNATURE_GENERATED)
{
String result = Numeric.toHexString(signatureFromKey.signature);
approve(requestHandler.getSessionRequest(), result);
}
else
{
Timber.i("sign fail: %s", signatureFromKey.failMessage);
reject(requestHandler.getSessionRequest(), signatureFromKey.failMessage);
}
}
public interface WalletConnectV2Callback public interface WalletConnectV2Callback
{ {
default void onSessionProposalApproved() default void onSessionProposalApproved()

69
app/src/main/java/com/alphawallet/app/walletconnect/WalletConnectV2SessionRequestHandler.java
Unescape View File

@ -1,18 +1,21 @@
package com.alphawallet.app.walletconnect; package com.alphawallet.app.walletconnect;
import android.app.Activity; import android.app.Activity;
import android.app.Dialog;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import com.alphawallet.app.ui.widget.entity.ActionSheetCallback;
import com.alphawallet.app.walletconnect.entity.BaseRequest; import com.alphawallet.app.walletconnect.entity.BaseRequest;
import com.alphawallet.app.walletconnect.entity.SignPersonalMessageRequest; import com.alphawallet.app.walletconnect.entity.EthSignRequest;
import com.alphawallet.app.walletconnect.entity.SignTypedDataRequest; import com.alphawallet.app.widget.ActionSheet;
import com.alphawallet.app.widget.SignMethodDialog; import com.alphawallet.app.widget.ActionSheetSignDialog;
import com.alphawallet.token.entity.Signable;
import com.walletconnect.sign.client.Sign; import com.walletconnect.sign.client.Sign;
import java.util.List;
import java.util.Objects;
import timber.log.Timber; import timber.log.Timber;
public class WalletConnectV2SessionRequestHandler public class WalletConnectV2SessionRequestHandler
@ -30,14 +33,19 @@ public class WalletConnectV2SessionRequestHandler
this.client = client; this.client = client;
} }
public void handle(String method) public void handle(String method, ActionSheetCallback aCallback)
{ {
activity.runOnUiThread(() -> { activity.runOnUiThread(() -> {
showDialog(method); showDialog(method, aCallback);
}); });
} }
private void showDialog(String method) public Sign.Model.SessionRequest getSessionRequest()
{
return sessionRequest;
}
private void showDialog(String method, ActionSheetCallback aCallback)
{ {
boolean isSignTransaction = "eth_signTransaction".equals(method); boolean isSignTransaction = "eth_signTransaction".equals(method);
boolean isSendTransaction = "eth_sendTransaction".equals(method); boolean isSendTransaction = "eth_sendTransaction".equals(method);
@ -49,45 +57,22 @@ public class WalletConnectV2SessionRequestHandler
return; return;
} }
if ("personal_sign".equals(method)) BaseRequest signRequest = EthSignRequest.getSignRequest(sessionRequest);
{ if (signRequest != null)
personalSign().show();
return;
}
if ("eth_sign".equals(method))
{ {
ethSign().show(); Signable signable = signRequest.getSignable(sessionRequest.getRequest().getId(), settledSession.getMetaData().getUrl());
return; ActionSheet actionSheet = new ActionSheetSignDialog(activity, aCallback, signable);
} actionSheet.setSigningWallet(signRequest.getWalletAddress());
List<String> icons = Objects.requireNonNull(settledSession.getMetaData()).getIcons();
if ("eth_signTypedData".equals(method)) if (!icons.isEmpty())
{ {
ethSignTypedData().show(); actionSheet.setIcon(icons.get(0));
return;
} }
actionSheet.show();
Timber.e("Method %s not support.", method);
}
private Dialog ethSign()
{
BaseRequest request = new SignRequest(sessionRequest.getRequest().getParams());
return new SignMethodDialog(activity, sessionRequest, request, settledSession.getMetaData());
} }
else
@NonNull
private SignMethodDialog ethSignTypedData()
{ {
BaseRequest request = new SignTypedDataRequest(sessionRequest.getRequest().getParams()); Timber.e("Method %s not supported.", method);
return new SignMethodDialog(activity, sessionRequest, request, settledSession.getMetaData());
} }
@NonNull
private SignMethodDialog personalSign()
{
BaseRequest request = new SignPersonalMessageRequest(sessionRequest.getRequest().getParams());
return new SignMethodDialog(activity, sessionRequest, request, settledSession.getMetaData());
} }
} }

5
app/src/main/java/com/alphawallet/app/walletconnect/entity/BaseRequest.java
Unescape View File

@ -50,5 +50,10 @@ public abstract class BaseRequest
public abstract Signable getSignable(); public abstract Signable getSignable();
public Signable getSignable(long callbackId, String origin)
{
return null;
}
public abstract String getWalletAddress(); public abstract String getWalletAddress();
} }

33
app/src/main/java/com/alphawallet/app/walletconnect/entity/EthSignRequest.java
Unescape View File

@ -0,0 +1,33 @@
package com.alphawallet.app.walletconnect.entity;
import com.walletconnect.sign.client.Sign;
/**
* Created by JB on 21/11/2022.
*/
public abstract class EthSignRequest
{
public static BaseRequest getSignRequest(Sign.Model.SessionRequest sessionRequest)
{
BaseRequest signRequest = null;
switch (sessionRequest.getRequest().getMethod())
{
case "eth_sign":
// see https://docs.walletconnect.org/json-rpc-api-methods/ethereum
// WalletConnect shouldn't provide access to deprecated eth_sign, as it can be used to scam people
signRequest = new SignRequest(sessionRequest.getRequest().getParams());
break;
case "personal_sign":
signRequest = new SignPersonalMessageRequest(sessionRequest.getRequest().getParams());
break;
case "eth_signTypedData":
signRequest = new SignTypedDataRequest(sessionRequest.getRequest().getParams());
break;
default:
break;
}
return signRequest;
}
}

6
app/src/main/java/com/alphawallet/app/walletconnect/entity/SignPersonalMessageRequest.java
Unescape View File

@ -17,6 +17,12 @@ public class SignPersonalMessageRequest extends BaseRequest
return new EthereumMessage(getMessage(), "", 0, SignMessageType.SIGN_PERSONAL_MESSAGE); return new EthereumMessage(getMessage(), "", 0, SignMessageType.SIGN_PERSONAL_MESSAGE);
} }
@Override
public Signable getSignable(long callbackId, String origin)
{
return new EthereumMessage(getMessage(), origin, callbackId, SignMessageType.SIGN_PERSONAL_MESSAGE);
}
@Override @Override
public String getWalletAddress() public String getWalletAddress()
{ {

10
app/src/main/java/com/alphawallet/app/walletconnect/SignRequest.java → app/src/main/java/com/alphawallet/app/walletconnect/entity/SignRequest.java
Unescape View File

@ -1,7 +1,5 @@
package com.alphawallet.app.walletconnect; package com.alphawallet.app.walletconnect.entity;
import com.alphawallet.app.walletconnect.entity.BaseRequest;
import com.alphawallet.app.walletconnect.entity.WCEthereumSignMessage;
import com.alphawallet.token.entity.EthereumMessage; import com.alphawallet.token.entity.EthereumMessage;
import com.alphawallet.token.entity.SignMessageType; import com.alphawallet.token.entity.SignMessageType;
import com.alphawallet.token.entity.Signable; import com.alphawallet.token.entity.Signable;
@ -19,6 +17,12 @@ public class SignRequest extends BaseRequest
return new EthereumMessage(getMessage(), "", 0, SignMessageType.SIGN_MESSAGE); return new EthereumMessage(getMessage(), "", 0, SignMessageType.SIGN_MESSAGE);
} }
@Override
public Signable getSignable(long callbackId, String origin)
{
return new EthereumMessage(getMessage(), origin, callbackId, SignMessageType.SIGN_MESSAGE);
}
@Override @Override
public String getWalletAddress() public String getWalletAddress()
{ {

6
app/src/main/java/com/alphawallet/app/walletconnect/entity/SignTypedDataRequest.java
Unescape View File

@ -20,4 +20,10 @@ public class SignTypedDataRequest extends BaseRequest
{ {
return new EthereumTypedMessage(getMessage(), "", 0, new CryptoFunctions()); return new EthereumTypedMessage(getMessage(), "", 0, new CryptoFunctions());
} }
@Override
public Signable getSignable(long callbackId, String origin)
{
return new EthereumTypedMessage(getMessage(), origin, callbackId, new CryptoFunctions());
}
} }

1
app/src/main/java/com/alphawallet/app/walletconnect/util/WCMethodChecker.java
Unescape View File

@ -1,6 +1,5 @@
package com.alphawallet.app.walletconnect.util; package com.alphawallet.app.walletconnect.util;
import com.alphawallet.app.entity.TokensMapping;
import com.alphawallet.app.walletconnect.entity.WCMethod; import com.alphawallet.app.walletconnect.entity.WCMethod;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;

2
app/src/main/java/com/alphawallet/app/walletconnect/util/WalletConnectHelper.java
Unescape View File

@ -1,6 +1,6 @@
package com.alphawallet.app.walletconnect.util; package com.alphawallet.app.walletconnect.util;
public class WalletConnectHelper public abstract class WalletConnectHelper
{ {
public static boolean isWalletConnectV1(String text) public static boolean isWalletConnectV1(String text)
{ {

21
app/src/main/java/com/alphawallet/app/web3/Web3TokenView.java
Unescape View File

@ -2,21 +2,16 @@ package com.alphawallet.app.web3;
import static androidx.webkit.WebSettingsCompat.FORCE_DARK_OFF; import static androidx.webkit.WebSettingsCompat.FORCE_DARK_OFF;
import static androidx.webkit.WebSettingsCompat.FORCE_DARK_ON; import static androidx.webkit.WebSettingsCompat.FORCE_DARK_ON;
import static com.alphawallet.app.service.AssetDefinitionService.ASSET_DETAIL_VIEW_NAME;
import static com.alphawallet.app.service.AssetDefinitionService.ASSET_SUMMARY_VIEW_NAME;
import static com.alphawallet.token.tools.TokenDefinition.TOKENSCRIPT_ERROR;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.os.Build;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.webkit.WebSettingsCompat;
import androidx.webkit.WebViewFeature;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.format.DateUtils;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Base64; import android.util.Base64;
import android.util.Log;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.View; import android.view.View;
import android.webkit.ConsoleMessage; import android.webkit.ConsoleMessage;
@ -30,6 +25,11 @@ import android.webkit.WebViewClient;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.webkit.WebSettingsCompat;
import androidx.webkit.WebViewFeature;
import com.alphawallet.app.BuildConfig; import com.alphawallet.app.BuildConfig;
import com.alphawallet.app.R; import com.alphawallet.app.R;
import com.alphawallet.app.entity.tokens.Token; import com.alphawallet.app.entity.tokens.Token;
@ -51,7 +51,6 @@ import com.alphawallet.token.tools.TokenDefinition;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.io.IOException;
import java.io.LineNumberReader; import java.io.LineNumberReader;
import java.io.StringReader; import java.io.StringReader;
import java.math.BigInteger; import java.math.BigInteger;
@ -64,10 +63,6 @@ import io.realm.Realm;
import io.realm.RealmResults; import io.realm.RealmResults;
import timber.log.Timber; import timber.log.Timber;
import static com.alphawallet.app.service.AssetDefinitionService.ASSET_DETAIL_VIEW_NAME;
import static com.alphawallet.app.service.AssetDefinitionService.ASSET_SUMMARY_VIEW_NAME;
import static com.alphawallet.token.tools.TokenDefinition.TOKENSCRIPT_ERROR;
/** /**
* Created by James on 3/04/2019. * Created by James on 3/04/2019.
* Stormbird in Singapore * Stormbird in Singapore

4
app/src/main/java/com/alphawallet/app/web3/entity/FunctionCallback.java
Unescape View File

@ -1,15 +1,11 @@
package com.alphawallet.app.web3.entity; package com.alphawallet.app.web3.entity;
import com.alphawallet.app.entity.DAppFunction;
import com.alphawallet.token.entity.Signable;
/** /**
* Created by James on 6/04/2019. * Created by James on 6/04/2019.
* Stormbird in Singapore * Stormbird in Singapore
*/ */
public interface FunctionCallback public interface FunctionCallback
{ {
void signMessage(Signable sign, DAppFunction dAppFunction);
void functionSuccess(); void functionSuccess();
void functionFailed(); void functionFailed();
} }

53
app/src/main/java/com/alphawallet/app/widget/ActionSheet.java
Unescape View File

@ -0,0 +1,53 @@
package com.alphawallet.app.widget;
import static com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED;
import android.content.Context;
import android.widget.FrameLayout;
import androidx.activity.result.ActivityResult;
import androidx.annotation.NonNull;
import com.alphawallet.app.entity.ActionSheetInterface;
import com.alphawallet.app.web3.entity.Web3Transaction;
import com.google.android.material.bottomsheet.BottomSheetBehavior;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import java.math.BigInteger;
/**
* Created by JB on 20/11/2022.
*/
public abstract class ActionSheet extends BottomSheetDialog implements ActionSheetInterface
{
public ActionSheet(@NonNull Context context)
{
super(context);
}
public void forceDismiss()
{
setOnDismissListener(v -> {
// Do nothing
});
dismiss();
}
public void fullExpand()
{
FrameLayout bottomSheet = findViewById(com.google.android.material.R.id.design_bottom_sheet);
if (bottomSheet != null) BottomSheetBehavior.from(bottomSheet).setState(STATE_EXPANDED);
}
public void lockDragging(boolean lock)
{
getBehavior().setDraggable(!lock);
//ensure view fully expanded when locking scroll. Otherwise we may not be able to see our expanded view
if (lock)
{
FrameLayout bottomSheet = findViewById(com.google.android.material.R.id.design_bottom_sheet);
if (bottomSheet != null) BottomSheetBehavior.from(bottomSheet).setState(STATE_EXPANDED);
}
}
}

209
app/src/main/java/com/alphawallet/app/widget/ActionSheetDialog.java
Unescape View File

@ -7,8 +7,6 @@ import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View; import android.view.View;
import android.widget.FrameLayout;
import android.widget.TextView;
import androidx.activity.result.ActivityResult; import androidx.activity.result.ActivityResult;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@ -38,9 +36,7 @@ import com.alphawallet.app.ui.widget.entity.GasWidgetInterface;
import com.alphawallet.app.util.Utils; import com.alphawallet.app.util.Utils;
import com.alphawallet.app.walletconnect.entity.WCPeerMeta; import com.alphawallet.app.walletconnect.entity.WCPeerMeta;
import com.alphawallet.app.web3.entity.Web3Transaction; import com.alphawallet.app.web3.entity.Web3Transaction;
import com.alphawallet.token.entity.Signable;
import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.google.android.material.bottomsheet.BottomSheetBehavior;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.BigInteger; import java.math.BigInteger;
@ -53,7 +49,7 @@ import io.realm.Realm;
/** /**
* Created by JB on 17/11/2020. * Created by JB on 17/11/2020.
*/ */
public class ActionSheetDialog extends BottomSheetDialog implements StandardFunctionInterface, ActionSheetInterface public class ActionSheetDialog extends ActionSheet implements StandardFunctionInterface, ActionSheetInterface
{ {
private final BottomSheetToolbarView toolbar; private final BottomSheetToolbarView toolbar;
private final GasWidget2 gasWidget; private final GasWidget2 gasWidget;
@ -173,86 +169,6 @@ public class ActionSheetDialog extends BottomSheetDialog implements StandardFunc
setupCancelListeners(); setupCancelListeners();
} }
public ActionSheetDialog(@NonNull Activity activity, ActionSheetCallback aCallback, SignAuthenticationCallback sCallback, Signable message)
{
super(activity);
setContentView(R.layout.dialog_action_sheet_sign);
toolbar = findViewById(R.id.bottom_sheet_toolbar);
gasWidget = findViewById(R.id.gas_widgetx);
gasWidgetLegacy = findViewById(R.id.gas_widget_legacy);
balanceDisplay = findViewById(R.id.balance);
networkDisplay = findViewById(R.id.network_display_widget);
confirmationWidget = findViewById(R.id.confirmation_view);
addressDetail = findViewById(R.id.requester);
amountDisplay = findViewById(R.id.amount_display);
assetDetailView = findViewById(R.id.asset_detail);
functionBar = findViewById(R.id.layoutButtons);
detailWidget = null;
mode = ActionSheetMode.SIGN_MESSAGE;
callbackId = message.getCallbackId();
this.activity = activity;
actionSheetCallback = aCallback;
signCallback = sCallback;
token = null;
tokensService = null;
candidateTransaction = null;
actionCompleted = false;
walletConnectRequestWidget = null;
gasWidgetInterface = null;
addressDetail.setupRequester(message.getOrigin());
SignDataWidget signWidget = findViewById(R.id.sign_widget);
signWidget.setupSignData(message);
signWidget.setLockCallback(this);
toolbar.setTitle(Utils.getSigningTitle(message));
functionBar.setupFunctions(this, new ArrayList<>(Collections.singletonList(R.string.action_confirm)));
functionBar.revealButtons();
setupCancelListeners();
}
public ActionSheetDialog(@NonNull Activity activity, ActionSheetCallback aCallback, int titleId, String message, int buttonTextId,
long cId, Token baseToken)
{
super(activity);
setContentView(R.layout.dialog_action_sheet_message);
toolbar = findViewById(R.id.bottom_sheet_toolbar);
TextView messageView = findViewById(R.id.text_message);
functionBar = findViewById(R.id.layoutButtons);
this.activity = activity;
actionSheetCallback = aCallback;
mode = ActionSheetMode.MESSAGE;
toolbar.setTitle(titleId);
messageView.setText(message);
gasWidget = null;
balanceDisplay = null;
networkDisplay = null;
confirmationWidget = null;
addressDetail = null;
amountDisplay = null;
assetDetailView = null;
detailWidget = null;
callbackId = cId;
token = baseToken;
tokensService = null;
candidateTransaction = null;
walletConnectRequestWidget = null;
gasWidgetLegacy = null;
gasWidgetInterface = null;
functionBar.setupFunctions(this, new ArrayList<>(Collections.singletonList(buttonTextId)));
functionBar.revealButtons();
setupCancelListeners();
}
// wallet connect request // wallet connect request
public ActionSheetDialog(Activity activity, WCPeerMeta wcPeerMeta, long chainIdOverride, String iconUrl, ActionSheetCallback actionSheetCallback) public ActionSheetDialog(Activity activity, WCPeerMeta wcPeerMeta, long chainIdOverride, String iconUrl, ActionSheetCallback actionSheetCallback)
{ {
@ -337,30 +253,6 @@ public class ActionSheetDialog extends BottomSheetDialog implements StandardFunc
setupCancelListeners(); setupCancelListeners();
} }
private GasWidgetInterface setupGasWidget()
{
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
boolean canUse1559Transactions = prefs.getBoolean(SharedPreferenceRepository.EXPERIMENTAL_1559_TX, false);
use1559Transactions = canUse1559Transactions && has1559Gas() //1559 Transactions toggled on in settings and this chain supports 1559
&& !(token.isEthereum() && candidateTransaction.leafPosition == -2) //User not sweeping wallet (if so we need to use legacy tx)
&& !tokensService.hasLockedGas(token.tokenInfo.chainId) //Service has locked gas, can only use legacy (eg Optimism).
&& !candidateTransaction.isConstructor(); //Currently cannot use EIP1559 for constructors due to gas calculation issues
if (use1559Transactions)
{
gasWidget.setupWidget(tokensService, token, candidateTransaction, actionSheetCallback.gasSelectLauncher());
return gasWidget;
}
else
{
gasWidget.setVisibility(View.GONE);
gasWidgetLegacy.setVisibility(View.VISIBLE);
gasWidgetLegacy.setupWidget(tokensService, token, candidateTransaction, this, actionSheetCallback.gasSelectLauncher());
return gasWidgetLegacy;
}
}
public ActionSheetDialog(Activity activity, ActionSheetMode mode) public ActionSheetDialog(Activity activity, ActionSheetMode mode)
{ {
super(activity); super(activity);
@ -390,6 +282,30 @@ public class ActionSheetDialog extends BottomSheetDialog implements StandardFunc
callbackId = 0; callbackId = 0;
} }
private GasWidgetInterface setupGasWidget()
{
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
boolean canUse1559Transactions = prefs.getBoolean(SharedPreferenceRepository.EXPERIMENTAL_1559_TX, false);
use1559Transactions = canUse1559Transactions && has1559Gas() //1559 Transactions toggled on in settings and this chain supports 1559
&& !(token.isEthereum() && candidateTransaction.leafPosition == -2) //User not sweeping wallet (if so we need to use legacy tx)
&& !tokensService.hasLockedGas(token.tokenInfo.chainId) //Service has locked gas, can only use legacy (eg Optimism).
&& !candidateTransaction.isConstructor(); //Currently cannot use EIP1559 for constructors due to gas calculation issues
if (use1559Transactions)
{
gasWidget.setupWidget(tokensService, token, candidateTransaction, actionSheetCallback.gasSelectLauncher());
return gasWidget;
}
else
{
gasWidget.setVisibility(View.GONE);
gasWidgetLegacy.setVisibility(View.VISIBLE);
gasWidgetLegacy.setupWidget(tokensService, token, candidateTransaction, this, actionSheetCallback.gasSelectLauncher());
return gasWidgetLegacy;
}
}
public void setSignOnly() public void setSignOnly()
{ {
//sign only, and return signature to process //sign only, and return signature to process
@ -439,6 +355,7 @@ public class ActionSheetDialog extends BottomSheetDialog implements StandardFunc
} }
} }
@Override
public void setCurrentGasIndex(ActivityResult result) public void setCurrentGasIndex(ActivityResult result)
{ {
if (result == null || result.getData() == null) return; if (result == null || result.getData() == null) return;
@ -495,9 +412,6 @@ public class ActionSheetDialog extends BottomSheetDialog implements StandardFunc
sendTransaction(); sendTransaction();
} }
break; break;
case SIGN_MESSAGE:
signMessage();
break;
case SIGN_TRANSACTION: case SIGN_TRANSACTION:
signTransaction(); signTransaction();
break; break;
@ -543,44 +457,6 @@ public class ActionSheetDialog extends BottomSheetDialog implements StandardFunc
return token.getTransferValueRaw(transaction.transactionInput).toString(); return token.getTransferValueRaw(transaction.transactionInput).toString();
} }
private void signMessage()
{
//get authentication
functionBar.setVisibility(View.GONE);
//authentication screen
SignAuthenticationCallback localSignCallback = new SignAuthenticationCallback()
{
final SignDataWidget signWidget = findViewById(R.id.sign_widget);
@Override
public void gotAuthorisation(boolean gotAuth)
{
actionCompleted = true;
//display success and hand back to calling function
if (gotAuth)
{
confirmationWidget.startProgressCycle(1);
signCallback.gotAuthorisationForSigning(gotAuth, signWidget.getSignable());
actionSheetCallback.notifyConfirm(mode.getValue());
}
else
{
cancelAuthentication();
}
}
@Override
public void cancelAuthentication()
{
confirmationWidget.hide();
signCallback.gotAuthorisationForSigning(false, signWidget.getSignable());
}
};
actionSheetCallback.getAuthorisation(localSignCallback);
}
/** /**
* Popup a dialogbox to ask user if they really want to try to send this transaction, * Popup a dialogbox to ask user if they really want to try to send this transaction,
* as we calculate it will fail due to insufficient gas. User knows best though. * as we calculate it will fail due to insufficient gas. User knows best though.
@ -799,26 +675,6 @@ public class ActionSheetDialog extends BottomSheetDialog implements StandardFunc
actionSheetCallback.getAuthorisation(signCallback); actionSheetCallback.getAuthorisation(signCallback);
} }
@Override
public void lockDragging(boolean lock)
{
getBehavior().setDraggable(!lock);
//ensure view fully expanded when locking scroll. Otherwise we may not be able to see our expanded view
if (lock)
{
FrameLayout bottomSheet = findViewById(com.google.android.material.R.id.design_bottom_sheet);
if (bottomSheet != null) BottomSheetBehavior.from(bottomSheet).setState(STATE_EXPANDED);
}
}
@Override
public void fullExpand()
{
FrameLayout bottomSheet = findViewById(com.google.android.material.R.id.design_bottom_sheet);
if (bottomSheet != null) BottomSheetBehavior.from(bottomSheet).setState(STATE_EXPANDED);
}
//Takes gas estimate from calling activity (eg WalletConnectActivity) and updates dialog //Takes gas estimate from calling activity (eg WalletConnectActivity) and updates dialog
public void setGasEstimate(BigInteger estimate) public void setGasEstimate(BigInteger estimate)
{ {
@ -843,14 +699,6 @@ public class ActionSheetDialog extends BottomSheetDialog implements StandardFunc
} }
} }
public void forceDismiss()
{
setOnDismissListener(v -> {
// Do nothing
});
dismiss();
}
public void waitForEstimate() public void waitForEstimate()
{ {
functionBar.setPrimaryButtonWaiting(); functionBar.setPrimaryButtonWaiting();
@ -887,8 +735,3 @@ public class ActionSheetDialog extends BottomSheetDialog implements StandardFunc
return false; return false;
} }
} }
interface OnGasSelectedCallback
{
void onSelected();
}

157
app/src/main/java/com/alphawallet/app/widget/ActionSheetSignDialog.java
Unescape View File

@ -0,0 +1,157 @@
package com.alphawallet.app.widget;
import static com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED;
import android.app.Activity;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.ViewModelProvider;
import androidx.lifecycle.ViewModelStoreOwner;
import com.alphawallet.app.R;
import com.alphawallet.app.entity.SignAuthenticationCallback;
import com.alphawallet.app.entity.StandardFunctionInterface;
import com.alphawallet.app.entity.analytics.ActionSheetMode;
import com.alphawallet.app.ui.widget.entity.ActionSheetCallback;
import com.alphawallet.app.util.Utils;
import com.alphawallet.app.viewmodel.SignDialogViewModel;
import com.alphawallet.token.entity.Signable;
import com.bumptech.glide.Glide;
import com.google.android.material.bottomsheet.BottomSheetBehavior;
import java.util.ArrayList;
import java.util.Collections;
/**
* Created by JB on 20/11/2022.
*/
public class ActionSheetSignDialog extends ActionSheet implements StandardFunctionInterface, SignAuthenticationCallback
{
private final SignDialogViewModel viewModel;
private final BottomSheetToolbarView toolbar;
private final ConfirmationWidget confirmationWidget;
private final AddressDetailView addressDetail;
private final FunctionButtonBar functionBar;
private final ActionSheetCallback actionSheetCallback;
private final Activity activity;
private final long callbackId;
private boolean actionCompleted;
public ActionSheetSignDialog(@NonNull Activity callingActivity, ActionSheetCallback aCallback, Signable message)
{
super(callingActivity);
View view = LayoutInflater.from(callingActivity).inflate(R.layout.dialog_action_sheet_sign, null);
setContentView(view);
toolbar = findViewById(R.id.bottom_sheet_toolbar);
confirmationWidget = findViewById(R.id.confirmation_view);
addressDetail = findViewById(R.id.requester);
functionBar = findViewById(R.id.layoutButtons);
callbackId = message.getCallbackId();
activity = callingActivity;
actionSheetCallback = aCallback;
addressDetail.setupRequester(message.getOrigin());
SignDataWidget signWidget = findViewById(R.id.sign_widget);
signWidget.setupSignData(message);
toolbar.setTitle(Utils.getSigningTitle(message));
functionBar.setupFunctions(this, new ArrayList<>(Collections.singletonList(R.string.action_confirm)));
functionBar.revealButtons();
setupCancelListeners();
actionCompleted = false;
//ensure view fully expanded when locking scroll. Otherwise we may not be able to see our expanded view
fullExpand();
viewModel = new ViewModelProvider((ViewModelStoreOwner) activity).get(SignDialogViewModel.class);
viewModel.completed().observe((LifecycleOwner) activity, this::signComplete);
setCanceledOnTouchOutside(false);
}
@Override
public void setIcon(String icon)
{
ImageView iconView = findViewById(R.id.logo);
Glide.with(activity)
.load(icon)
.circleCrop()
.into(iconView);
}
@Override
public void handleClick(String action, int id)
{
//get authentication
functionBar.setVisibility(View.GONE);
viewModel.getAuthentication(activity, this);
}
// Set for locked signing account, which WalletConnect v2 requires
@Override
public void setSigningWallet(String account)
{
viewModel.setSigningWallet(account);
}
public void success()
{
if (isShowing() && confirmationWidget != null && confirmationWidget.isShown())
{
confirmationWidget.completeProgressMessage(".", this::dismiss);
}
}
private void setupCancelListeners()
{
toolbar.setCloseListener(v -> dismiss());
setOnDismissListener(v -> {
actionSheetCallback.dismissed("", callbackId, actionCompleted);
});
}
@Override
public void gotAuthorisation(boolean gotAuth)
{
final SignDataWidget signWidget = findViewById(R.id.sign_widget);
if (gotAuth)
{
//start animation
confirmationWidget.startProgressCycle(1);
actionSheetCallback.notifyConfirm(ActionSheetMode.SIGN_MESSAGE.getValue());
viewModel.signMessage(signWidget.getSignable(), actionSheetCallback);
}
else
{
Toast.makeText(activity, activity.getString(R.string.error_while_signing_transaction), Toast.LENGTH_SHORT).show();
cancelAuthentication();
}
}
@Override
public void cancelAuthentication()
{
dismiss();
}
private void signComplete(Boolean success)
{
if (success)
{
actionCompleted = true;
success();
}
else
{
dismiss();
}
}
}

7
app/src/main/java/com/alphawallet/app/widget/ConfirmationWidget.java
Unescape View File

@ -3,6 +3,7 @@ package com.alphawallet.app.widget;
import android.animation.Animator; import android.animation.Animator;
import android.content.Context; import android.content.Context;
import android.os.Handler; import android.os.Handler;
import android.os.Looper;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.View; import android.view.View;
@ -27,7 +28,7 @@ public class ConfirmationWidget extends RelativeLayout
private final TextView hashText; private final TextView hashText;
private final RelativeLayout progressLayout; private final RelativeLayout progressLayout;
private RealmResults<RealmTransaction> realmTransactionUpdates; private RealmResults<RealmTransaction> realmTransactionUpdates;
private final Handler handler = new Handler(); private final Handler handler = new Handler(Looper.getMainLooper());
public ConfirmationWidget(Context context, AttributeSet attrs) public ConfirmationWidget(Context context, AttributeSet attrs)
{ {
@ -56,9 +57,11 @@ public class ConfirmationWidget extends RelativeLayout
public void startProgressCycle(int cycleTime) public void startProgressCycle(int cycleTime)
{ {
handler.post(() -> {
progress.setVisibility(View.VISIBLE); progress.setVisibility(View.VISIBLE);
progressLayout.setVisibility(View.VISIBLE); progressLayout.setVisibility(View.VISIBLE);
progress.startAnimation(cycleTime); progress.startAnimation(cycleTime);
});
} }
public void completeProgressMessage(String message, final ProgressCompleteCallback callback) public void completeProgressMessage(String message, final ProgressCompleteCallback callback)
@ -78,6 +81,7 @@ public class ConfirmationWidget extends RelativeLayout
public void onAnimationRepeat(Animator animation) { } public void onAnimationRepeat(Animator animation) { }
}; };
handler.post(() -> {
if (!TextUtils.isEmpty(message)) if (!TextUtils.isEmpty(message))
{ {
completeProgressSuccess(true); completeProgressSuccess(true);
@ -99,6 +103,7 @@ public class ConfirmationWidget extends RelativeLayout
.setDuration(1500) .setDuration(1500)
.setListener(animatorListener); .setListener(animatorListener);
} }
});
} }
//listen for transaction completion //listen for transaction completion

9
app/src/main/java/com/alphawallet/app/widget/SignDataWidget.java
Unescape View File

@ -12,7 +12,6 @@ import android.widget.TextView;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.alphawallet.app.R; import com.alphawallet.app.R;
import com.alphawallet.app.entity.ActionSheetInterface;
import com.alphawallet.token.entity.Signable; import com.alphawallet.token.entity.Signable;
/** /**
@ -26,7 +25,6 @@ public class SignDataWidget extends LinearLayout
private final ImageView moreArrow; private final ImageView moreArrow;
private final ScrollView scrollView; private final ScrollView scrollView;
private final TextView messageTitle; private final TextView messageTitle;
private ActionSheetInterface sheetInterface;
private Signable signable; private Signable signable;
public SignDataWidget(Context context, @Nullable AttributeSet attrs) public SignDataWidget(Context context, @Nullable AttributeSet attrs)
@ -72,7 +70,6 @@ public class SignDataWidget extends LinearLayout
scrollView.setVisibility(View.VISIBLE); scrollView.setVisibility(View.VISIBLE);
messageTitle.setVisibility(View.GONE); messageTitle.setVisibility(View.GONE);
moreArrow.setImageResource(R.drawable.ic_expand_less_black); moreArrow.setImageResource(R.drawable.ic_expand_less_black);
if (sheetInterface != null) sheetInterface.lockDragging(true);
} }
else else
{ {
@ -80,16 +77,10 @@ public class SignDataWidget extends LinearLayout
messageTitle.setVisibility(View.VISIBLE); messageTitle.setVisibility(View.VISIBLE);
scrollView.setVisibility(View.GONE); scrollView.setVisibility(View.GONE);
moreArrow.setImageResource(R.drawable.ic_expand_more); moreArrow.setImageResource(R.drawable.ic_expand_more);
if (sheetInterface != null) sheetInterface.lockDragging(false);
} }
}); });
} }
public void setLockCallback(ActionSheetInterface asIf)
{
sheetInterface = asIf;
}
public Signable getSignable() public Signable getSignable()
{ {
return signable; return signable;

188
app/src/main/java/com/alphawallet/app/widget/SignMethodDialog.java
Unescape View File

@ -1,188 +0,0 @@
package com.alphawallet.app.widget;
import static com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.ViewModelProvider;
import androidx.lifecycle.ViewModelStoreOwner;
import com.alphawallet.app.R;
import com.alphawallet.app.entity.StandardFunctionInterface;
import com.alphawallet.app.entity.Wallet;
import com.alphawallet.app.repository.EthereumNetworkRepository;
import com.alphawallet.app.util.Hex;
import com.alphawallet.app.viewmodel.walletconnect.SignMethodDialogViewModel;
import com.alphawallet.app.walletconnect.AWWalletConnectClient;
import com.alphawallet.app.walletconnect.entity.BaseRequest;
import com.alphawallet.app.walletconnect.util.WalletConnectHelper;
import com.alphawallet.token.entity.SignMessageType;
import com.alphawallet.token.entity.Signable;
import com.bumptech.glide.Glide;
import com.google.android.material.bottomsheet.BottomSheetBehavior;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.walletconnect.android.Core;
import com.walletconnect.sign.client.Sign;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
public class SignMethodDialog extends BottomSheetDialog
{
private FunctionButtonBar functionBar;
private TextView dAppName;
private ImageView logo;
private TextView url;
private TextView walletTv;
private TextView message;
private ImageView networkIcon;
private ChainName networkName;
private final Activity activity;
private ImageView closeButton;
private final Sign.Model.SessionRequest sessionRequest;
private final BaseRequest request;
private String walletAddress;
private SignMethodDialogViewModel viewModel;
private final Signable signable;
private SignDataWidget signDataWidget;
private final Core.Model.AppMetaData metaData;
public SignMethodDialog(@NonNull Activity activity, Sign.Model.SessionRequest sessionRequest, BaseRequest request, Core.Model.AppMetaData metaData)
{
super(activity);
this.activity = activity;
this.metaData = metaData;
this.sessionRequest = sessionRequest;
this.request = request;
this.signable = request.getSignable();
View view = LayoutInflater.from(activity).inflate(R.layout.dialog_sign_method, null);
setContentView(view);
initViewModel();
BottomSheetBehavior<View> behavior = BottomSheetBehavior.from((View) view.getParent());
behavior.setState(STATE_EXPANDED);
behavior.setSkipCollapsed(true);
setCancelable(false);
initViews();
bindData();
}
private void bindData()
{
List<String> icons = Objects.requireNonNull(metaData).getIcons();
if (icons.isEmpty())
{
logo.setImageResource(R.drawable.ic_coin_eth_small);
}
else
{
Glide.with(activity)
.load(icons.get(0))
.circleCrop()
.into(logo);
}
dAppName.setText(metaData.getName());
url.setText(metaData.getUrl());
walletAddress = request.getWalletAddress();
walletTv.setText(walletAddress);
long chainID = WalletConnectHelper.getChainId(Objects.requireNonNull(sessionRequest.getChainId()));
networkIcon.setImageResource(EthereumNetworkRepository.getChainLogo(chainID));
networkName.setChainID(chainID);
functionBar.setupFunctions(new StandardFunctionInterface()
{
@Override
public void handleClick(String action, int actionId)
{
if (actionId == R.string.action_confirm)
{
approve();
}
}
}, Collections.singletonList(R.string.action_confirm));
closeButton.setOnClickListener(v ->
{
viewModel.reject(sessionRequest);
dismiss();
});
if (signable.getMessageType() == SignMessageType.SIGN_PERSONAL_MESSAGE
|| signable.getMessageType() == SignMessageType.SIGN_MESSAGE)
{
message.setText(Hex.hexToUtf8(signable.getMessage()));
}
else
{
message.setVisibility(View.GONE);
signDataWidget.setVisibility(View.VISIBLE);
signDataWidget.setupSignData(request.getSignable());
}
}
private void initViews()
{
logo = findViewById(R.id.logo);
dAppName = findViewById(R.id.dapp_name);
url = findViewById(R.id.url);
walletTv = findViewById(R.id.wallet);
message = findViewById(R.id.message);
networkIcon = findViewById(R.id.network_icon);
networkName = findViewById(R.id.network_name);
functionBar = findViewById(R.id.layoutButtons);
closeButton = findViewById(R.id.image_close);
signDataWidget = findViewById(R.id.sign_widget);
}
private void initViewModel()
{
viewModel = new ViewModelProvider((ViewModelStoreOwner) activity).get(SignMethodDialogViewModel.class);
}
@SuppressLint("CheckResult")
private void approve()
{
AWWalletConnectClient.viewModel = viewModel;
viewModel.completed().observe((LifecycleOwner) activity, completed ->
{
if (completed)
{
dismiss();
AWWalletConnectClient.viewModel = null;
}
});
viewModel.findWallet(walletAddress)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(this::onWalletFound);
}
private void onWalletFound(Wallet wallet)
{
// The method find may return the first wallet if the specified wallet not found
if (!wallet.address.equals(walletAddress) || wallet.watchOnly())
{
Toast.makeText(getContext(), activity.getString(R.string.wc_wallet_not_match), Toast.LENGTH_SHORT).show();
}
else
{
functionBar.setPrimaryButtonWaiting();
viewModel.sign(activity, wallet, sessionRequest, signable);
}
}
}

4
app/src/main/java/com/alphawallet/app/widget/SignTransactionDialog.java
Unescape View File

@ -22,7 +22,7 @@ import com.alphawallet.app.R;
import com.alphawallet.app.entity.AuthenticationCallback; import com.alphawallet.app.entity.AuthenticationCallback;
import com.alphawallet.app.entity.AuthenticationFailType; import com.alphawallet.app.entity.AuthenticationFailType;
import com.alphawallet.app.entity.Operation; import com.alphawallet.app.entity.Operation;
import com.alphawallet.app.walletconnect.AWWalletConnectClient; import com.alphawallet.app.ui.BaseActivity;
import java.security.ProviderException; import java.security.ProviderException;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
@ -182,7 +182,7 @@ public class SignTransactionDialog
else else
{ {
intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
AWWalletConnectClient.authCallback = authCallback; BaseActivity.authCallback = authCallback;
activity.startActivityForResult(intent, REQUEST_CODE_CONFIRM_DEVICE_CREDENTIALS + callBackId.ordinal()); activity.startActivityForResult(intent, REQUEST_CODE_CONFIRM_DEVICE_CREDENTIALS + callBackId.ordinal());
} }
} }

2
app/src/main/res/layout/activity_wallet_connect_v2.xml
Unescape View File

@ -23,7 +23,7 @@
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp5" android:layout_marginTop="@dimen/dp5"
android:layout_marginBottom="@dimen/dp5" android:layout_marginBottom="@dimen/dp5"
android:src="@mipmap/ic_alpha" /> android:src="@mipmap/ic_launcher" />
<TextView <TextView
android:id="@+id/peer_name" android:id="@+id/peer_name"

31
app/src/main/res/layout/dialog_action_sheet_message.xml
Unescape View File

@ -1,31 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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="wrap_content"
android:orientation="vertical">
<com.alphawallet.app.widget.BottomSheetToolbarView
android:id="@+id/bottom_sheet_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/text_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp24"
android:layout_marginTop="@dimen/dp8"
android:layout_marginEnd="@dimen/dp24"
android:layout_marginBottom="@dimen/dp8"
android:gravity="center_horizontal"
android:text=""
tools:text="This site is requesting you to switch to the Mumbai Testnet (Test) chain with chain ID: 80001. This will reload the page." />
<com.alphawallet.app.widget.FunctionButtonBar
android:id="@+id/layoutButtons"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>

5
app/src/main/res/layout/dialog_action_sheet_sign.xml
Unescape View File

@ -17,11 +17,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
custom:label="@string/requester_url" /> custom:label="@string/requester_url" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/mercury" />
<com.alphawallet.app.widget.SignDataWidget <com.alphawallet.app.widget.SignDataWidget
android:id="@+id/sign_widget" android:id="@+id/sign_widget"
android:layout_width="match_parent" android:layout_width="match_parent"

7
app/src/main/res/layout/item_ticket.xml
Unescape View File

@ -13,13 +13,6 @@
android:minHeight="100dp" android:minHeight="100dp"
android:paddingHorizontal="@dimen/tiny_8"> android:paddingHorizontal="@dimen/tiny_8">
<ProgressBar
android:id="@+id/ticket_load_spinner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:visibility="visible" />
<LinearLayout <LinearLayout
android:id="@+id/total_wrapper" android:id="@+id/total_wrapper"
android:layout_width="match_parent" android:layout_width="match_parent"

5
app/src/test/java/com/alphawallet/app/ENSTest.java
Unescape View File

@ -75,14 +75,15 @@ public class ENSTest
ensResolver.resolve("offchainexample.eth"), ("0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045").toLowerCase()); ensResolver.resolve("offchainexample.eth"), ("0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045").toLowerCase());
} }
@Test //Temporarily remove - DAS seems to be acting up
/*@Test
public void testDASResolve() throws Exception { public void testDASResolve() throws Exception {
assertEquals( assertEquals(
ensResolver.resolve("satoshi.bit"), ("0xee8738e3d3e80482526b33c91dd343caef68e41a").toLowerCase()); ensResolver.resolve("satoshi.bit"), ("0xee8738e3d3e80482526b33c91dd343caef68e41a").toLowerCase());
assertEquals( assertEquals(
ensResolver.resolve("ponzi.bit"), ("0x04e294283fb6c2974b59d15a0bc347f8d4d4bdcd").toLowerCase()); ensResolver.resolve("ponzi.bit"), ("0x04e294283fb6c2974b59d15a0bc347f8d4d4bdcd").toLowerCase());
} }*/
@Test @Test
public void testAvatarResolve() throws Exception { public void testAvatarResolve() throws Exception {

6
app/src/test/java/com/alphawallet/app/QRSelectionTest.java
Unescape View File

@ -84,13 +84,13 @@ public class QRSelectionTest
} }
@Override @Override
public Single<SignatureFromKey> getSignature(Wallet wallet, Signable sign, long chainId) public Single<SignatureFromKey> getSignature(Wallet wallet, Signable sign)
{ {
return null; return null;
} }
@Override @Override
public Single<byte[]> getSignatureFast(Wallet wallet, String pass, byte[] message, long chainId) public Single<byte[]> getSignatureFast(Wallet wallet, String pass, byte[] message)
{ {
return Single.fromCallable(() -> { return Single.fromCallable(() -> {
//sign using the local key //sign using the local key
@ -222,7 +222,7 @@ public class QRSelectionTest
.getMessage(qr.indices, CONTRACT_ADDR, ContractType.ERC875).blockingGet(); .getMessage(qr.indices, CONTRACT_ADDR, ContractType.ERC875).blockingGet();
byte[] sig = transactionRepository byte[] sig = transactionRepository
.getSignatureFast(null, "hackintosh", messagePair.message.getBytes(), 1).blockingGet(); .getSignatureFast(null, "hackintosh", messagePair.message.getBytes()).blockingGet();
qr.sigPair = new SignaturePair(messagePair.selection, sig, messagePair.message); qr.sigPair = new SignaturePair(messagePair.selection, sig, messagePair.message);
} }

7
app/src/test/java/com/alphawallet/app/walletconnect/SignRequestTest.java
Unescape View File

@ -1,13 +1,14 @@
package com.alphawallet.app.walletconnect; package com.alphawallet.app.walletconnect;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
import com.alphawallet.app.walletconnect.entity.SignRequest;
import com.alphawallet.token.entity.SignMessageType; import com.alphawallet.token.entity.SignMessageType;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
public class SignRequestTest public class SignRequestTest
{ {
private SignRequest signRequest; private SignRequest signRequest;

Write Preview
Loading…
Cancel
Save