diff --git a/README.md b/README.md index 7e855016d..ea5b32699 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,7 @@ The source code is published under GPLv3 with OpenSSL exception, the license is * Emoji alpha codes ([MIT License](https://github.com/emojione/emojione/blob/master/extras/alpha-codes/LICENSE.md)) * Catch test framework ([Boost License](https://github.com/philsquared/Catch/blob/master/LICENSE.txt)) * xxHash ([BSD License](https://github.com/Cyan4973/xxHash/blob/dev/LICENSE)) +* QR Code generator ([MIT License](https://github.com/nayuki/QR-Code-generator#license)) ## Build instructions diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index a052fd8a1..fb17c2565 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -17,6 +17,7 @@ if (NOT DESKTOP_APP_DISABLE_SPELLCHECK) endif() add_subdirectory(lib_storage) add_subdirectory(lib_lottie) +add_subdirectory(lib_qr) add_subdirectory(codegen) include(lib_ui/cmake/generate_styles.cmake) @@ -76,11 +77,13 @@ PRIVATE desktop-app::lib_tl desktop-app::lib_storage desktop-app::lib_lottie + desktop-app::lib_qr desktop-app::lib_ffmpeg desktop-app::external_lz4 desktop-app::external_rlottie desktop-app::external_zlib desktop-app::external_qt + desktop-app::external_qr_code_generator desktop-app::external_auto_updates desktop-app::external_openssl desktop-app::external_opus @@ -530,18 +533,22 @@ PRIVATE inline_bots/inline_bot_send_data.h inline_bots/inline_results_widget.cpp inline_bots/inline_results_widget.h - intro/introwidget.cpp - intro/introwidget.h - intro/introcode.cpp - intro/introcode.h - intro/introphone.cpp - intro/introphone.h - intro/intropwdcheck.cpp - intro/intropwdcheck.h - intro/introsignup.cpp - intro/introsignup.h - intro/introstart.cpp - intro/introstart.h + intro/intro_code.cpp + intro/intro_code.h + intro/intro_password_check.cpp + intro/intro_password_check.h + intro/intro_phone.cpp + intro/intro_phone.h + intro/intro_qr.cpp + intro/intro_qr.h + intro/intro_signup.cpp + intro/intro_signup.h + intro/intro_start.cpp + intro/intro_start.h + intro/intro_step.cpp + intro/intro_step.h + intro/intro_widget.cpp + intro/intro_widget.h lang/lang_cloud_manager.cpp lang/lang_cloud_manager.h lang/lang_file_parser.cpp @@ -631,14 +638,8 @@ PRIVATE media/view/media_view_group_thumbs.h media/view/media_view_overlay_widget.cpp media/view/media_view_overlay_widget.h - mtproto/auth_key.cpp - mtproto/auth_key.h - mtproto/concurrent_sender.cpp - mtproto/concurrent_sender.h mtproto/config_loader.cpp mtproto/config_loader.h - mtproto/connection.cpp - mtproto/connection.h mtproto/connection_abstract.cpp mtproto/connection_abstract.h mtproto/connection_http.cpp @@ -647,10 +648,7 @@ PRIVATE mtproto/connection_resolving.h mtproto/connection_tcp.cpp mtproto/connection_tcp.h - mtproto/core_types.cpp mtproto/core_types.h - mtproto/dcenter.cpp - mtproto/dcenter.h mtproto/dc_options.cpp mtproto/dc_options.h mtproto/dedicated_file_loader.cpp @@ -659,13 +657,11 @@ PRIVATE mtproto/facade.h mtproto/mtp_instance.cpp mtproto/mtp_instance.h - mtproto/rsa_public_key.cpp - mtproto/rsa_public_key.h - mtproto/rpc_sender.cpp - mtproto/rpc_sender.h mtproto/sender.h mtproto/session.cpp mtproto/session.h + mtproto/session_private.cpp + mtproto/session_private.h mtproto/special_config_request.cpp mtproto/special_config_request.h mtproto/type_utils.h @@ -788,8 +784,14 @@ PRIVATE settings/settings_privacy_controllers.h settings/settings_privacy_security.cpp settings/settings_privacy_security.h + storage/download_manager_mtproto.cpp + storage/download_manager_mtproto.h storage/file_download.cpp storage/file_download.h + storage/file_download_mtproto.cpp + storage/file_download_mtproto.h + storage/file_download_web.cpp + storage/file_download_web.h storage/file_upload.cpp storage/file_upload.h storage/localimageloader.cpp diff --git a/Telegram/cmake/generate_scheme.cmake b/Telegram/cmake/generate_scheme.cmake index 4a47ef000..75d3995e2 100644 --- a/Telegram/cmake/generate_scheme.cmake +++ b/Telegram/cmake/generate_scheme.cmake @@ -12,6 +12,8 @@ function(generate_scheme target_name script scheme_files) set(gen_files ${gen_dst}/scheme.cpp ${gen_dst}/scheme.h + ${gen_dst}/scheme-dump_to_text.cpp + ${gen_dst}/scheme-dump_to_text.h ) add_custom_command( diff --git a/Telegram/cmake/lib_mtproto.cmake b/Telegram/cmake/lib_mtproto.cmake index c0ffc8b83..87a5f5f19 100644 --- a/Telegram/cmake/lib_mtproto.cmake +++ b/Telegram/cmake/lib_mtproto.cmake @@ -8,15 +8,43 @@ add_library(lib_mtproto OBJECT) init_target(lib_mtproto) add_library(tdesktop::lib_mtproto ALIAS lib_mtproto) -target_precompile_headers(lib_mtproto PRIVATE ${src_loc}/mtproto/mtp_pch.h) +target_precompile_headers(lib_mtproto PRIVATE ${src_loc}/mtproto/mtproto_pch.h) nice_target_sources(lib_mtproto ${src_loc} PRIVATE - mtproto/mtp_abstract_socket.cpp - mtproto/mtp_abstract_socket.h - mtproto/mtp_tcp_socket.cpp - mtproto/mtp_tcp_socket.h - mtproto/mtp_tls_socket.cpp - mtproto/mtp_tls_socket.h + mtproto/details/mtproto_abstract_socket.cpp + mtproto/details/mtproto_abstract_socket.h + mtproto/details/mtproto_bound_key_creator.cpp + mtproto/details/mtproto_bound_key_creator.h + mtproto/details/mtproto_dc_key_binder.cpp + mtproto/details/mtproto_dc_key_binder.h + mtproto/details/mtproto_dc_key_creator.cpp + mtproto/details/mtproto_dc_key_creator.h + mtproto/details/mtproto_dcenter.cpp + mtproto/details/mtproto_dcenter.h + mtproto/details/mtproto_domain_resolver.cpp + mtproto/details/mtproto_domain_resolver.h + mtproto/details/mtproto_dump_to_text.cpp + mtproto/details/mtproto_dump_to_text.h + mtproto/details/mtproto_received_ids_manager.cpp + mtproto/details/mtproto_received_ids_manager.h + mtproto/details/mtproto_rsa_public_key.cpp + mtproto/details/mtproto_rsa_public_key.h + mtproto/details/mtproto_serialized_request.cpp + mtproto/details/mtproto_serialized_request.h + mtproto/details/mtproto_tcp_socket.cpp + mtproto/details/mtproto_tcp_socket.h + mtproto/details/mtproto_tls_socket.cpp + mtproto/details/mtproto_tls_socket.h + mtproto/mtproto_auth_key.cpp + mtproto/mtproto_auth_key.h + mtproto/mtproto_concurrent_sender.cpp + mtproto/mtproto_concurrent_sender.h + mtproto/mtproto_dh_utils.cpp + mtproto/mtproto_dh_utils.h + mtproto/mtproto_proxy_data.cpp + mtproto/mtproto_proxy_data.h + mtproto/mtproto_rpc_sender.cpp + mtproto/mtproto_rpc_sender.h ) target_include_directories(lib_mtproto @@ -27,4 +55,6 @@ PUBLIC target_link_libraries(lib_mtproto PUBLIC tdesktop::lib_scheme +PRIVATE + desktop-app::external_zlib ) diff --git a/Telegram/lib_base b/Telegram/lib_base index e8343f4cc..4592f56c2 160000 --- a/Telegram/lib_base +++ b/Telegram/lib_base @@ -1 +1 @@ -Subproject commit e8343f4cc276665939fd1e6a2b25a5d1c4a83cd1 +Subproject commit 4592f56c23cb1d35f9528c1cbcaa17cb3188943c diff --git a/Telegram/lib_qr b/Telegram/lib_qr index 1efe65125..9877397db 160000 --- a/Telegram/lib_qr +++ b/Telegram/lib_qr @@ -1 +1 @@ -Subproject commit 1efe65125ddca2a4a663c004380f31befd22ea76 +Subproject commit 9877397dbf97b7198d539a3994bf0e9619cf653c diff --git a/cmake b/cmake index 0340f7229..3182d2d4a 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 0340f722942204ef98c3570266870334c01d2613 +Subproject commit 3182d2d4a7cbfd4290a46ee6baeb3355f5028349