Alpha version 1.3.3.

- Bug fixes and other minor improvements.

Telegram/Resources/langs/lang.strings

@@ -23,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_quit_from_tray" = "Quit Telegram";
 "lng_tray_icon_text" = "Telegram is still running here,\nyou can change this from settings page.\nIf this icon disappears from tray menu,\nyou can drag it here from hidden icons.";
 
+// For lng_month_year or plain month name.
 "lng_month1" = "January";
 "lng_month2" = "February";
 "lng_month3" = "March";
@@ -36,6 +37,20 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_month11" = "November";
 "lng_month12" = "December";
 
+// For lng_month_day and lng_month_day_year.
+"lng_month_day1" = "January";
+"lng_month_day2" = "February";
+"lng_month_day3" = "March";
+"lng_month_day4" = "April";
+"lng_month_day5" = "May";
+"lng_month_day6" = "June";
+"lng_month_day7" = "July";
+"lng_month_day8" = "August";
+"lng_month_day9" = "September";
+"lng_month_day10" = "October";
+"lng_month_day11" = "November";
+"lng_month_day12" = "December";
+
 "lng_month1_small" = "Jan";
 "lng_month2_small" = "Feb";
 "lng_month3_small" = "Mar";
@@ -181,19 +196,19 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_signin_title" = "Cloud password check";
 "lng_signin_desc" = "Please enter your cloud password.";
-"lng_signin_recover_desc" = "Please enter the code from the e-mail\n{email}";
+"lng_signin_recover_desc" = "Please enter the code from the email\n{email}";
 "lng_signin_password" = "Your cloud password";
-"lng_signin_code" = "Code from e-mail";
+"lng_signin_code" = "Code from email";
 "lng_signin_recover" = "Forgot password?";
 "lng_signin_recover_title" = "Password reset";
 "lng_signin_hint" = "Hint: {password_hint}";
 "lng_signin_recover_hint" = "Code was sent to {recover_email}";
 "lng_signin_bad_password" = "You have entered a wrong password.";
 "lng_signin_wrong_code" = "You have entered an invalid code.";
-"lng_signin_try_password" = "Having trouble accessing your e-mail?";
+"lng_signin_try_password" = "Having trouble accessing your email?";
 "lng_signin_password_removed" = "Your cloud password was disabled.\nYou can set up a new one in Settings.";
-"lng_signin_no_email_forgot" = "Since you didn't provide a recovery e-mail when setting up your password, your remaining options are either to remember your password or to reset your account.";
-"lng_signin_cant_email_forgot" = "If you can't restore access to the e-mail, your remaining options are either to remember your password or to reset your account.";
+"lng_signin_no_email_forgot" = "Since you didn't provide a recovery email when setting up your password, your remaining options are either to remember your password or to reset your account.";
+"lng_signin_cant_email_forgot" = "If you can't restore access to the email, your remaining options are either to remember your password or to reset your account.";
 "lng_signin_reset_account" = "Reset your account";
 "lng_signin_sure_reset" = "Warning!\n\nYou will lose all your chats and messages, along with any media and files you shared!\n\nDo you want to reset your account?";
 "lng_signin_reset" = "Reset";
@@ -394,18 +409,19 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_cloud_password_hint" = "Enter password hint";
 "lng_cloud_password_change_hint" = "Enter new password hint";
 "lng_cloud_password_bad" = "Password and hint cannot be the same.";
-"lng_cloud_password_email" = "Enter recovery e-mail";
-"lng_cloud_password_bad_email" = "Incorrect e-mail, please try other.";
+"lng_cloud_password_email" = "Enter recovery email";
+"lng_cloud_password_bad_email" = "Incorrect email, please try other.";
 "lng_cloud_password_about" = "This password will be asked when you log in on a new device in addition to the SMS code.";
-"lng_cloud_password_about_recover" = "Warning! Are you sure you don't want to\nadd a password recovery e-mail?\n\nIf you forget your password, you will\nlose access to your Telegram account.";
-"lng_cloud_password_skip_email" = "Skip e-mail";
-"lng_cloud_password_almost" = "A confirmation link was sent to the\ne-mail you provided. Two-step verification will be enabled as soon as you follow that link.";
+"lng_cloud_password_about_recover" = "Warning! Are you sure you don't want to\nadd a password recovery email?\n\nIf you forget your password, you will\nlose access to your Telegram account.";
+"lng_cloud_password_skip_email" = "Skip email";
+"lng_cloud_password_almost" = "A confirmation link was sent to the\nemail you provided. Two-step verification will be enabled as soon as you follow that link.";
 "lng_cloud_password_was_set" = "Two-step verification enabled.";
 "lng_cloud_password_updated" = "Your cloud password was updated.";
 "lng_cloud_password_removed" = "Two-step verification was disabled.";
 "lng_cloud_password_differ" = "Passwords do not match";
 "lng_cloud_password_wrong" = "Wrong cloud password";
 "lng_cloud_password_is_same" = "Password was not changed";
+"lng_cloud_password_passport_losing" = "Warning! All data saved in your Telegram Passport will be lost!";
 
 "lng_connection_type" = "Connection type:";
 "lng_connection_auto_connecting" = "Default (connecting...)";
@@ -825,6 +841,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_action_took_screenshot" = "{from} took a screenshot!";
 "lng_action_you_took_screenshot" = "You took a screenshot!";
 "lng_action_bot_allowed_from_domain" = "You allowed this bot to message you when you logged in on {domain}.";
+"lng_action_secure_values_sent" = "{user} received the following documents: {documents}";
+"lng_action_secure_personal_details" = "personal details";
+"lng_action_secure_proof_of_identity" = "proof of identity";
+"lng_action_secure_address" = "address";
+"lng_action_secure_proof_of_address" = "proof of address";
+"lng_action_secure_phone" = "phone number";
+"lng_action_secure_email" = "email address";
 
 "lng_ttl_photo_received" = "{from} sent you a self-destructing photo. Please view it on your mobile.";
 "lng_ttl_photo_sent" = "You sent a self-destructing photo.";
@@ -1496,7 +1519,139 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_terms_signup" = "By signing up,\nyou agree to the {link}.";
 "lng_terms_signup_link" = "Terms of Service";
 "lng_terms_header" = "Terms of Service";
+"lng_terms_age#one" = "I confirm that I am {count} or over";
+"lng_terms_age#other" = "I confirm that I am {count} or over";
 "lng_terms_agree" = "Agree & Continue";
+"lng_terms_decline" = "Decline";
+"lng_terms_signup_sorry" = "We're very sorry, but this means you can't sign up for Telegram.\n\nUnlike others, we don't use your data for ad targeting or other commercial purposes. Telegram only stores the information it needs to function as a feature-rich cloud service. You can adjust how we use your data in Privacy & Security settings.\n\nBut if you're generally not OK with Telegram's modest needs, it won't be possible for us to provide this service.";
+"lng_terms_update_sorry" = "We're very sorry, but this means we must part ways here. Unlike others, we don't use your data for ad targeting or other commercial purposes. Telegram only stores the information it needs to function as a feature-rich cloud service. You can adjust how we use your data in Privacy & Security settings.\n\nBut if you're generally not OK with Telegram's modest needs, it won't be possible for us to provide this service. You can deactivate your account now — or look around some more and deactivate it later if you feel you're not happy with the way we use your data. How does that sound?";
+"lng_terms_decline_and_delete" = "Decline & Delete";
+"lng_terms_back" = "Back";
+"lng_terms_delete_warning" = "Warning, this will irreversibly delete your Telegram account along with all the data you store in the Telegram cloud.\n\nWe will provide a tool to download your data before June, 23 – so you may want to wait a little before deleting.";
+"lng_terms_delete_now" = "Delete now";
+"lng_terms_agree_to_proceed" = "Please agree and proceed to {bot}.";
+
+"lng_date_input_day" = "Day";
+"lng_date_input_month" = "Month";
+"lng_date_input_year" = "Year";
+
+"lng_passport_title" = "Telegram passport";
+"lng_passport_request1" = "{bot} requests access to your personal data";
+"lng_passport_request2" = "to sign you up for their services";
+"lng_passport_create_password" = "Please create a password which will be used\nto encrypt your personal data.";
+"lng_passport_about_password" = "This password will also be required whenever\nyou log in to a new device.";
+"lng_passport_password_create" = "Create a password";
+"lng_passport_link_sent" = "A confirmation link was sent to your email\n{email}";
+"lng_passport_stop_password_sure" = "Are you sure you want to cancel setting up your password?";
+"lng_passport_password_placeholder" = "Your password";
+"lng_passport_next" = "Next";
+"lng_passport_password_wrong" = "The password you entered is not valid.";
+"lng_passport_header" = "Requested information";
+"lng_passport_identity_title" = "Identity document";
+"lng_passport_identity_description" = "Upload a scan of your passport or another ID";
+"lng_passport_identity_passport" = "Passport";
+"lng_passport_identity_passport_upload" = "Upload a scan of your passport";
+"lng_passport_identity_card" = "Identity card";
+"lng_passport_identity_card_upload" = "Upload a scan of your identity card";
+"lng_passport_identity_license" = "Driver's license";
+"lng_passport_identity_license_upload" = "Upload a scan of your driver's license";
+"lng_passport_identity_internal" = "Internal passport";
+"lng_passport_identity_internal_upload" = "Upload a scan of your internal passport";
+"lng_passport_identity_about" = "The document must contain your photograph, first and last name, date of birth, document number, country of issue, and expiry date.";
+"lng_passport_address_title" = "Residential address";
+"lng_passport_address_description" = "Upload a proof of your address";
+"lng_passport_address_bill" = "Utility bill";
+"lng_passport_address_bill_upload" = "Upload a scan of your utility bill";
+"lng_passport_address_statement" = "Bank statement";
+"lng_passport_address_statement_upload" = "Upload a scan of your bank statement";
+"lng_passport_address_agreement" = "Tenancy agreement";
+"lng_passport_address_agreement_upload" = "Upload a scan of your tenancy agreement";
+"lng_passport_address_registration" = "Passport registration";
+"lng_passport_address_registration_upload" = "Upload a scan of your passport registration";
+"lng_passport_address_temporary" = "Temporary registration";
+"lng_passport_address_temporary_upload" = "Upload a scan of your temporary registration";
+"lng_passport_address_about" = "To confirm your address, please upload a scan or photo of the selected document (all pages).";
+"lng_passport_document_type" = "Please choose the type of your document:";
+"lng_passport_upload_document" = "Upload document";
+"lng_passport_phone_title" = "Phone number";
+"lng_passport_phone_description" = "Enter your phone number";
+"lng_passport_email_title" = "Email";
+"lng_passport_email_description" = "Enter your email address";
+"lng_passport_accept_allow" = "You accept the {policy} and allow their {bot} to send you messages.";
+"lng_passport_allow" = "You allow {bot} to send you messages.";
+"lng_passport_policy" = "{bot} privacy policy";
+"lng_passport_authorize" = "Authorize";
+"lng_passport_form_error" = "Could not get authorization form.";
+"lng_passport_save_value" = "Save";
+"lng_passport_saving" = "Saving...";
+"lng_passport_uploading" = "Uploading...";
+"lng_passport_scan_index" = "Scan {index}";
+"lng_passport_upload_scans" = "Upload scans";
+"lng_passport_upload_more" = "Upload additional scans";
+"lng_passport_selfie_title" = "Selfie";
+"lng_passport_selfie_name" = "Photo";
+"lng_passport_selfie_description" = "Upload a photo of yourself holding your document. Make sure the ID and your face are clearly visible.";
+"lng_passport_upload_selfie" = "Upload selfie";
+"lng_passport_front_side_title" = "Front side";
+"lng_passport_front_side_name" = "Scan";
+"lng_passport_front_side_description" = "Upload front side of your document.";
+"lng_passport_upload_front_side" = "Upload front side scan";
+"lng_passport_reverse_side_title" = "Reverse side";
+"lng_passport_reverse_side_name" = "Scan";
+"lng_passport_reverse_side_description" = "Upload reverse side of your document.";
+"lng_passport_upload_reverse_side" = "Upload reverse side scan";
+"lng_passport_personal_details" = "Personal details";
+"lng_passport_personal_details_enter" = "Enter your personal details";
+"lng_passport_choose_image" = "Choose scan image";
+"lng_passport_delete_scan_undo" = "Undo";
+"lng_passport_scan_uploaded" = "Uploaded on {date}";
+"lng_passport_first_name" = "Name";
+"lng_passport_last_name" = "Surname";
+"lng_passport_birth_date" = "Date of birth";
+"lng_passport_gender" = "Gender";
+"lng_passport_gender_male" = "Male";
+"lng_passport_gender_female" = "Female";
+"lng_passport_country" = "Country";
+"lng_passport_residence_country" = "Residence";
+"lng_passport_country_choose" = "Choose country";
+"lng_passport_document_number" = "Card Number";
+"lng_passport_expiry_date" = "Expiry date";
+"lng_passport_address" = "Address";
+"lng_passport_address_enter" = "Enter your address";
+"lng_passport_street" = "Street";
+"lng_passport_city" = "City";
+"lng_passport_state" = "State";
+"lng_passport_postcode" = "Postcode";
+"lng_passport_use_existing" = "USE {existing}";
+"lng_passport_use_existing_phone" = "Use the same phone number as on Telegram.";
+"lng_passport_new_phone" = "Or enter a new phone number";
+"lng_passport_new_phone_code" = "Note: You will receive a confirmation code on the phone number you provide.";
+"lng_passport_use_existing_email" = "Use the same email address as on Telegram.";
+"lng_passport_new_email" = "Or enter a new email";
+"lng_passport_new_email_code" = "Note: You will receive a confirmation code to the email address you provide.";
+"lng_passport_confirm_phone" = "We've sent an SMS with a confirmation code to your phone {phone}.";
+"lng_passport_confirm_email" = "We've sent a confirmation code to your email {email}.";
+"lng_passport_sure_cancel" = "If you continue, your changes will be lost.";
+"lng_passport_scans_limit_reached" = "Sorry, that's too many scans for one document.";
+"lng_passport_delete_document" = "Delete document";
+"lng_passport_delete_document_sure" = "Are you sure you want to delete this document?";
+"lng_passport_delete_details" = "Delete personal details";
+"lng_passport_delete_details_sure" = "Are you sure you want to delete your personal details?";
+"lng_passport_delete_address" = "Delete address information";
+"lng_passport_delete_address_sure" = "Are you sure you want to delete your address information?";
+"lng_passport_delete_email" = "Delete email";
+"lng_passport_delete_email_sure" = "Are you sure you want to delete your email address?";
+"lng_passport_delete_phone" = "Delete phone number";
+"lng_passport_delete_phone_sure" = "Are you sure you want to delete your phone number?";
+"lng_passport_success" = "Authorization successfull!";
+"lng_passport_stop_sure" = "Are you sure you want to stop this authorization?";
+"lng_passport_stop" = "Stop";
+"lng_passport_restart_sure" = "An unexpected error has occurred. Perhaps some changes were made from a different Telegram application. Would you like to restart this authorization?";
+"lng_passport_restart" = "Restart";
+"lng_passport_error_too_large" = "This file is too large.";
+"lng_passport_error_bad_size" = "This image has bad dimensions.";
+"lng_passport_error_cant_read" = "Can't read this file. Please choose an image.";
+"lng_passport_bad_name" = "Use latin characters only.";
 
 // Wnd specific
 

Telegram/Resources/langs/lang_es.strings

@@ -193,19 +193,19 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_signin_title" = "Contraseña";
 "lng_signin_desc" = "Por favor, pon tu contraseña.";
-"lng_signin_recover_desc" = "Por favor, pon el código desde el e-mail\n{email}";
+"lng_signin_recover_desc" = "Por favor, pon el código desde el email\n{email}";
 "lng_signin_password" = "Tu contraseña";
-"lng_signin_code" = "Código desde el e-mail";
+"lng_signin_code" = "Código desde el email";
 "lng_signin_recover" = "¿Olvidaste la contraseña?";
 "lng_signin_recover_title" = "Restablecer contraseña";
 "lng_signin_hint" = "Pista: {password_hint}";
 "lng_signin_recover_hint" = "El código fue enviado a {recover_email}";
 "lng_signin_bad_password" = "Pusiste la contraseña equivocada.";
 "lng_signin_wrong_code" = "Has ingresado un código inválido.";
-"lng_signin_try_password" = "¿Tienes problemas para acceder a tu e-mail?";
+"lng_signin_try_password" = "¿Tienes problemas para acceder a tu email?";
 "lng_signin_password_removed" = "Tu contraseña fue desactivada.\nPuedes configurar una nueva en Ajustes.";
-"lng_signin_no_email_forgot" = "Como no estableciste un e-mail de recuperación \ncuando configuraste tu contraseña, las opciones restantes son recordar tu contraseña o restablecer tu cuenta.";
-"lng_signin_cant_email_forgot" = "Si no puedes acceder a tu e-mail, las opciones restantes son recordar tu contraseña o restablecer tu cuenta.";
+"lng_signin_no_email_forgot" = "Como no estableciste un email de recuperación \ncuando configuraste tu contraseña, las opciones restantes son recordar tu contraseña o restablecer tu cuenta.";
+"lng_signin_cant_email_forgot" = "Si no puedes acceder a tu email, las opciones restantes son recordar tu contraseña o restablecer tu cuenta.";
 "lng_signin_reset_account" = "Restablecer tu cuenta";
 "lng_signin_sure_reset" = "¡Advertencia!\n\n¡Perderás todos tus chats y mensajes, junto con la multimedia y archivos compartidos!\n\n¿Quieres restablecer tu cuenta?";
 "lng_signin_reset" = "Restablecer";
@@ -406,12 +406,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_cloud_password_hint" = "Pon una pista para la contraseña";
 "lng_cloud_password_change_hint" = "Pon una pista para la contraseña";
 "lng_cloud_password_bad" = "La contraseña y la pista no pueden ser iguales.";
-"lng_cloud_password_email" = "Pon un e-mail de recuperación";
-"lng_cloud_password_bad_email" = "E-mail incorrecto. Por favor, prueba otro.";
+"lng_cloud_password_email" = "Pon un email de recuperación";
+"lng_cloud_password_bad_email" = "email incorrecto. Por favor, prueba otro.";
 "lng_cloud_password_about" = "Necesitarás la contraseña al iniciar sesión, además del código de activación.";
-"lng_cloud_password_about_recover" = "¡Advertencia! ¿No quieres añadir un e-mail \nde recuperación para la contraseña?\n\nSi olvidas tu contraseña, perderás\nel acceso a tu cuenta de Telegram.";
-"lng_cloud_password_skip_email" = "Omitir e-mail";
-"lng_cloud_password_almost" = "Un enlace de confirmación fue enviado \nal e-mail que estableciste. La verificación en dos pasos se activará en cuanto sigas ese enlace.";
+"lng_cloud_password_about_recover" = "¡Advertencia! ¿No quieres añadir un email \nde recuperación para la contraseña?\n\nSi olvidas tu contraseña, perderás\nel acceso a tu cuenta de Telegram.";
+"lng_cloud_password_skip_email" = "Omitir email";
+"lng_cloud_password_almost" = "Un enlace de confirmación fue enviado \nal email que estableciste. La verificación en dos pasos se activará en cuanto sigas ese enlace.";
 "lng_cloud_password_was_set" = "Verificación en dos pasos activada.";
 "lng_cloud_password_updated" = "Tu contraseña fue actualizada.";
 "lng_cloud_password_removed" = "Verificación en dos pasos desactivada.";
@@ -1044,7 +1044,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_context_copy_link" = "Copiar enlace";
 "lng_context_copy_post_link" = "Copiar enlace de la publicación";
-"lng_context_copy_email" = "Copiar e-mail";
+"lng_context_copy_email" = "Copiar email";
 "lng_context_copy_hashtag" = "Copiar hashtag";
 "lng_context_copy_mention" = "Copiar alias";
 "lng_context_save_image" = "Guardar como...";

Telegram/Resources/langs/lang_it.strings

@@ -193,19 +193,19 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_signin_title" = "Verifica password";
 "lng_signin_desc" = "Per favore inserisci la tua password.";
-"lng_signin_recover_desc" = "Per favore inserisci il codice dall'e-mail\n{email}";
+"lng_signin_recover_desc" = "Per favore inserisci il codice dall'email\n{email}";
 "lng_signin_password" = "La tua password";
-"lng_signin_code" = "Codice dall'e-mail";
+"lng_signin_code" = "Codice dall'email";
 "lng_signin_recover" = "Password dimenticata?";
 "lng_signin_recover_title" = "Ripristino password";
 "lng_signin_hint" = "Suggerimento: {password_hint}";
 "lng_signin_recover_hint" = "Il codice è stato inviato a {recover_email}";
 "lng_signin_bad_password" = "Hai inserito una password errata.";
 "lng_signin_wrong_code" = "Hai inserito un codice non valido.";
-"lng_signin_try_password" = "Hai problemi ad accedere alla tua e-mail?";
+"lng_signin_try_password" = "Hai problemi ad accedere alla tua email?";
 "lng_signin_password_removed" = "La tua password è stata disattivata.\nNe puoi impostare una nuova dalle Impostazioni.";
 "lng_signin_no_email_forgot" = "Siccome non hai fornito un'email di recupero quando hai inserito la password, non ti resta che ricordarti la password o ripristinare il tuo account.";
-"lng_signin_cant_email_forgot" = "Se non puoi recuperare l'accesso all'e-mail, non ti resta che ricordarti la password o ripristinare il tuo account.";
+"lng_signin_cant_email_forgot" = "Se non puoi recuperare l'accesso all'email, non ti resta che ricordarti la password o ripristinare il tuo account.";
 "lng_signin_reset_account" = "Ripristina il tuo account";
 "lng_signin_sure_reset" = "Attenzione!\n\nPerderai tutte le chat e i messaggi, insieme a tutti i media e i file condivisi!\n\nVuoi ripristinare il tuo account?";
 "lng_signin_reset" = "Ripristina";
@@ -407,11 +407,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_cloud_password_change_hint" = "Inserisci un nuovo suggerimento";
 "lng_cloud_password_bad" = "Password e suggerimento devono essere diversi.";
 "lng_cloud_password_email" = "Inserisci email di recupero";
-"lng_cloud_password_bad_email" = "E-mail non valida, riprova con un'altra.";
+"lng_cloud_password_bad_email" = "email non valida, riprova con un'altra.";
 "lng_cloud_password_about" = "La password sarà richiesta quando ti connetti da un nuovo dispositivo insieme al codice.";
-"lng_cloud_password_about_recover" = "Attenzione! Sicuro di non voler\naggiungere un'e-mail di recupero?\n\nSe dimentichi la tua password, perderai\nl'accesso al tuo account Telegram.";
-"lng_cloud_password_skip_email" = "Salta e-mail";
-"lng_cloud_password_almost" = "Abbiamo inviato un link di conferma\nall'e-mail che ci hai fornito. La verifica in due passaggi sarà attivata non appena aprirai quel link.";
+"lng_cloud_password_about_recover" = "Attenzione! Sicuro di non voler\naggiungere un'email di recupero?\n\nSe dimentichi la tua password, perderai\nl'accesso al tuo account Telegram.";
+"lng_cloud_password_skip_email" = "Salta email";
+"lng_cloud_password_almost" = "Abbiamo inviato un link di conferma\nall'email che ci hai fornito. La verifica in due passaggi sarà attivata non appena aprirai quel link.";
 "lng_cloud_password_was_set" = "Verifica in due passaggi abilitata.";
 "lng_cloud_password_updated" = "La tua password è stata aggiornata.";
 "lng_cloud_password_removed" = "La verifica in due passaggi è stata disattivata.";

Telegram/Resources/langs/lang_nl.strings

@@ -193,19 +193,19 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_signin_title" = "Cloud-wachtwoord:";
 "lng_signin_desc" = "Cloud-wachtwoord invoeren";
-"lng_signin_recover_desc" = "Voer de code uit de e-mail in\n{email}";
+"lng_signin_recover_desc" = "Voer de code uit de email in\n{email}";
 "lng_signin_password" = "Je cloud-wachtwoord";
-"lng_signin_code" = "Code uit de e-mail";
+"lng_signin_code" = "Code uit de email";
 "lng_signin_recover" = "Wachtwoord vergeten?";
 "lng_signin_recover_title" = "Wachtwoord reset";
 "lng_signin_hint" = "Hint: {password_hint}";
 "lng_signin_recover_hint" = "De code is verstuurd naar {recover_email}";
 "lng_signin_bad_password" = "Ongeldig wachtwoord.";
 "lng_signin_wrong_code" = "Je hebt een ongeldige code ingevoerd.";
-"lng_signin_try_password" = "Kun je je e-mail niet benaderen?";
+"lng_signin_try_password" = "Kun je je email niet benaderen?";
 "lng_signin_password_removed" = "Je cloud-wachtwoord is uitgeschakeld.\nVia instellingen kun je een nieuwe instellen.";
-"lng_signin_no_email_forgot" = "Omdat je geen herstel-e-mailadres hebt opgegeven voor je wachtwoord zul je bij verlies van je wachtwoord je account moeten resetten.";
-"lng_signin_cant_email_forgot" = "Als je geen toegang meer hebt tot je e-mail en je ingestelde wachtwoord zul je je account moeten resetten.";
+"lng_signin_no_email_forgot" = "Omdat je geen herstel-emailadres hebt opgegeven voor je wachtwoord zul je bij verlies van je wachtwoord je account moeten resetten.";
+"lng_signin_cant_email_forgot" = "Als je geen toegang meer hebt tot je email en je ingestelde wachtwoord zul je je account moeten resetten.";
 "lng_signin_reset_account" = "Account resetten";
 "lng_signin_sure_reset" = "Let op:\n\nAl je chats, berichten en alle andere data gaan verloren als je verder gaat!\n\nEcht je account resetten?";
 "lng_signin_reset" = "Reset";
@@ -406,12 +406,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_cloud_password_hint" = "Wachtwoordhint invoeren";
 "lng_cloud_password_change_hint" = "Wachtwoordhint invoeren";
 "lng_cloud_password_bad" = "De hint moet anders zijn dan je wachtwoord.";
-"lng_cloud_password_email" = "Herstel-e-mailadres invoeren";
-"lng_cloud_password_bad_email" = "Ongeldig e-mailadres, probeer een andere.";
+"lng_cloud_password_email" = "Herstel-emailadres invoeren";
+"lng_cloud_password_bad_email" = "Ongeldig emailadres, probeer een andere.";
 "lng_cloud_password_about" = "Dit wachtwoord is nodig als je inlogt vanaf een nieuw apparaat, naast de SMS-code.";
 "lng_cloud_password_about_recover" = "Let op: Echt geen herstel-emailadres\nopgeven voor je wachtwoord?\n\nBij verlies van je wachtwoord ben je\nook de toegang tot Telegram kwijt.";
-"lng_cloud_password_skip_email" = "E-mail overslaan";
-"lng_cloud_password_almost" = "Een bevestigingslink is naar het e-mailadres verstuurd. \ntwee-staps-verificatie is actief na het klikken van de e-mail-link.";
+"lng_cloud_password_skip_email" = "email overslaan";
+"lng_cloud_password_almost" = "Een bevestigingslink is naar het emailadres verstuurd. \ntwee-staps-verificatie is actief na het klikken van de email-link.";
 "lng_cloud_password_was_set" = "Twee-staps-verificatie ingeschakeld.";
 "lng_cloud_password_updated" = "Je cloud-wachtwoord is gewijzigd.";
 "lng_cloud_password_removed" = "Twee-staps-verificatie uitgeschakeld.";
@@ -1044,7 +1044,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_context_copy_link" = "Link kopiëren";
 "lng_context_copy_post_link" = "Berichtlink kopiëren";
-"lng_context_copy_email" = "E-mailadres kopiëren";
+"lng_context_copy_email" = "emailadres kopiëren";
 "lng_context_copy_hashtag" = "Hashtag kopiëren";
 "lng_context_copy_mention" = "Gebruikersnaam kopiëren";
 "lng_context_save_image" = "Afbeelding opslaan als...";

Telegram/Resources/langs/lang_pt_BR.strings

@@ -193,19 +193,19 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_signin_title" = "Verificar senha";
 "lng_signin_desc" = "Por favor, insira sua senha.";
-"lng_signin_recover_desc" = "Por favor, insira o código de seu e-mail\n{email}";
+"lng_signin_recover_desc" = "Por favor, insira o código de seu email\n{email}";
 "lng_signin_password" = "Sua senha";
-"lng_signin_code" = "Código do e-mail";
+"lng_signin_code" = "Código do email";
 "lng_signin_recover" = "Esqueceu sua senha?";
 "lng_signin_recover_title" = "Redefinir senha";
 "lng_signin_hint" = "Dica: {password_hint}";
 "lng_signin_recover_hint" = "Código enviado para {recover_email}";
 "lng_signin_bad_password" = "Você colocou uma senha errada.";
 "lng_signin_wrong_code" = "Você inseriu um código inválido";
-"lng_signin_try_password" = "Problemas ao acessar seu e-mail?";
+"lng_signin_try_password" = "Problemas ao acessar seu email?";
 "lng_signin_password_removed" = "Sua senha da nuvem foi desativada.\nVocê pode definir uma nova em Configurações.";
-"lng_signin_no_email_forgot" = "Se você não providenciar um e-mail\nde recuperação ao configurar sua senha, suas opções restantes serão lembrar sua senha ou apagar sua conta.";
-"lng_signin_cant_email_forgot" = "Se você não pode restaurar o acesso ao e-mail, suas opções restantes serão lembrar sua senha ou apagar sua conta.";
+"lng_signin_no_email_forgot" = "Se você não providenciar um email\nde recuperação ao configurar sua senha, suas opções restantes serão lembrar sua senha ou apagar sua conta.";
+"lng_signin_cant_email_forgot" = "Se você não pode restaurar o acesso ao email, suas opções restantes serão lembrar sua senha ou apagar sua conta.";
 "lng_signin_reset_account" = "Apagar sua conta";
 "lng_signin_sure_reset" = "Atenção!\n\nVocê perderá todos seus chats e mensagens, juntamente com quaisquer mídias e arquivos!\n\nVocê deseja apagar sua conta?";
 "lng_signin_reset" = "Apagar";
@@ -406,11 +406,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_cloud_password_hint" = "Insira uma dica de senha";
 "lng_cloud_password_change_hint" = "Insira uma dica de senha";
 "lng_cloud_password_bad" = "Senha e dica de senha não podem ser iguais.";
-"lng_cloud_password_email" = "E-mail de recuperação";
-"lng_cloud_password_bad_email" = "E-mail incorreto, por favor, tente outro.";
+"lng_cloud_password_email" = "email de recuperação";
+"lng_cloud_password_bad_email" = "email incorreto, por favor, tente outro.";
 "lng_cloud_password_about" = "Essa senha será requisitada quando você entrar em um novo dispositivo, após o seu PIN.";
 "lng_cloud_password_about_recover" = "Atenção! Você tem certeza que não quer\nadicionar um email para recuperação de senha?\n\nSe você esquecer sua senha, perderá\nseu acesso a sua conta no Telegram.";
-"lng_cloud_password_skip_email" = "Pular e-mail";
+"lng_cloud_password_skip_email" = "Pular email";
 "lng_cloud_password_almost" = "Link de confirmação enviado para\no email fornecido. A verificação em duas etapas será ativada assim que você abrir o link.";
 "lng_cloud_password_was_set" = "Verificação em duas etapas ativada.";
 "lng_cloud_password_updated" = "Sua senha da nuvem foi atualizada.";

Telegram/Resources/scheme.tl

@@ -191,6 +191,7 @@ inputPhoto#fb95c6c4 id:long access_hash:long = InputPhoto;
 inputFileLocation#14637196 volume_id:long local_id:int secret:long = InputFileLocation;
 inputEncryptedFileLocation#f5235d55 id:long access_hash:long = InputFileLocation;
 inputDocumentFileLocation#430f0724 id:long access_hash:long version:int = InputFileLocation;
+inputSecureFileLocation#cbc7ee28 id:long access_hash:long = InputFileLocation;
 
 inputAppEvent#770656a8 time:double type:string peer:long data:string = InputAppEvent;
 
@@ -280,6 +281,8 @@ messageActionPhoneCall#80e11a7f flags:# call_id:long reason:flags.0?PhoneCallDis
 messageActionScreenshotTaken#4792929b = MessageAction;
 messageActionCustomAction#fae69f56 message:string = MessageAction;
 messageActionBotAllowed#abe9affe domain:string = MessageAction;
+messageActionSecureValuesSentMe#1b287353 values:Vector<SecureValue> credentials:SecureCredentialsEncrypted = MessageAction;
+messageActionSecureValuesSent#d95c6154 types:Vector<SecureValueType> = MessageAction;
 
 dialog#e4def5db flags:# pinned:flags.2?true peer:Peer top_message:int read_inbox_max_id:int read_outbox_max_id:int unread_count:int unread_mentions_count:int notify_settings:PeerNotifySettings pts:flags.0?int draft:flags.1?DraftMessage = Dialog;
 
@@ -295,7 +298,7 @@ geoPoint#2049d70c long:double lat:double = GeoPoint;
 
 auth.checkedPhone#811ea28e phone_registered:Bool = auth.CheckedPhone;
 
-auth.sentCode#5e002502 flags:# phone_registered:flags.0?true type:auth.SentCodeType phone_code_hash:string next_type:flags.1?auth.CodeType timeout:flags.2?int = auth.SentCode;
+auth.sentCode#38faab5f flags:# phone_registered:flags.0?true type:auth.SentCodeType phone_code_hash:string next_type:flags.1?auth.CodeType timeout:flags.2?int terms_of_service:flags.3?help.TermsOfService = auth.SentCode;
 
 auth.authorization#cd050916 flags:# tmp_sessions:flags.0?int user:User = auth.Authorization;
 
@@ -583,12 +586,12 @@ authorization#7bf2e6f6 hash:long flags:int device_model:string platform:string s
 
 account.authorizations#1250abde authorizations:Vector<Authorization> = account.Authorizations;
 
-account.noPassword#96dabc18 new_salt:bytes email_unconfirmed_pattern:string = account.Password;
-account.password#7c18141c current_salt:bytes new_salt:bytes hint:string has_recovery:Bool email_unconfirmed_pattern:string = account.Password;
+account.noPassword#5ea182f6 new_salt:bytes new_secure_salt:bytes secure_random:bytes email_unconfirmed_pattern:string = account.Password;
+account.password#ca39b447 flags:# has_recovery:flags.0?true has_secure_values:flags.1?true current_salt:bytes new_salt:bytes new_secure_salt:bytes secure_random:bytes hint:string email_unconfirmed_pattern:string = account.Password;
 
-account.passwordSettings#b7b72ab3 email:string = account.PasswordSettings;
+account.passwordSettings#7bd9c3f1 email:string secure_salt:bytes secure_secret:bytes secure_secret_id:long = account.PasswordSettings;
 
-account.passwordInputSettings#86916deb flags:# new_salt:flags.0?bytes new_password_hash:flags.0?bytes hint:flags.0?string email:flags.1?string = account.PasswordInputSettings;
+account.passwordInputSettings#21ffa60d flags:# new_salt:flags.0?bytes new_password_hash:flags.0?bytes hint:flags.0?string email:flags.1?string new_secure_salt:flags.2?bytes new_secure_secret:flags.2?bytes new_secure_secret_id:flags.2?long = account.PasswordInputSettings;
 
 auth.passwordRecovery#137948a5 email_pattern:string = auth.PasswordRecovery;
 
@@ -676,7 +679,7 @@ channels.channelParticipantsNotModified#f0173fe9 = channels.ChannelParticipants;
 
 channels.channelParticipant#d0d9b163 participant:ChannelParticipant users:Vector<User> = channels.ChannelParticipant;
 
-help.termsOfService#f1ee3e90 text:string = help.TermsOfService;
+help.termsOfService#780a0310 flags:# popup:flags.0?true id:DataJSON text:string entities:Vector<MessageEntity> min_age_confirm:flags.1?int = help.TermsOfService;
 
 foundGif#162ecc1f url:string thumb_url:string content_url:string content_type:string w:int h:int = FoundGif;
 foundGifCached#9c750409 url:string photo:Photo document:Document = FoundGif;
@@ -961,6 +964,56 @@ inputClientProxy#75588b3f address:string port:int = InputClientProxy;
 help.proxyDataEmpty#e09e1fb8 expires:int = help.ProxyData;
 help.proxyDataPromo#2bf7ee23 expires:int peer:Peer chats:Vector<Chat> users:Vector<User> = help.ProxyData;
 
+help.termsOfServiceUpdateEmpty#e3309f7f expires:int = help.TermsOfServiceUpdate;
+help.termsOfServiceUpdate#28ecf961 expires:int terms_of_service:help.TermsOfService = help.TermsOfServiceUpdate;
+
+inputSecureFileUploaded#3334b0f0 id:long parts:int md5_checksum:string file_hash:bytes secret:bytes = InputSecureFile;
+inputSecureFile#5367e5be id:long access_hash:long = InputSecureFile;
+
+secureFileEmpty#64199744 = SecureFile;
+secureFile#e0277a62 id:long access_hash:long size:int dc_id:int date:int file_hash:bytes secret:bytes = SecureFile;
+
+secureData#8aeabec3 data:bytes data_hash:bytes secret:bytes = SecureData;
+
+securePlainPhone#7d6099dd phone:string = SecurePlainData;
+securePlainEmail#21ec5a5f email:string = SecurePlainData;
+
+secureValueTypePersonalDetails#9d2a81e3 = SecureValueType;
+secureValueTypePassport#3dac6a00 = SecureValueType;
+secureValueTypeDriverLicense#6e425c4 = SecureValueType;
+secureValueTypeIdentityCard#a0d0744b = SecureValueType;
+secureValueTypeInternalPassport#99a48f23 = SecureValueType;
+secureValueTypeAddress#cbe31e26 = SecureValueType;
+secureValueTypeUtilityBill#fc36954e = SecureValueType;
+secureValueTypeBankStatement#89137c0d = SecureValueType;
+secureValueTypeRentalAgreement#8b883488 = SecureValueType;
+secureValueTypePassportRegistration#99e3806a = SecureValueType;
+secureValueTypeTemporaryRegistration#ea02ec33 = SecureValueType;
+secureValueTypePhone#b320aadb = SecureValueType;
+secureValueTypeEmail#8e3ca7ee = SecureValueType;
+
+secureValue#b4b4b699 flags:# type:SecureValueType data:flags.0?SecureData front_side:flags.1?SecureFile reverse_side:flags.2?SecureFile selfie:flags.3?SecureFile files:flags.4?Vector<SecureFile> plain_data:flags.5?SecurePlainData hash:bytes = SecureValue;
+
+inputSecureValue#67872e8 flags:# type:SecureValueType data:flags.0?SecureData front_side:flags.1?InputSecureFile reverse_side:flags.2?InputSecureFile selfie:flags.3?InputSecureFile files:flags.4?Vector<InputSecureFile> plain_data:flags.5?SecurePlainData = InputSecureValue;
+
+secureValueHash#ed1ecdb0 type:SecureValueType hash:bytes = SecureValueHash;
+
+secureValueErrorData#e8a40bd9 type:SecureValueType data_hash:bytes field:string text:string = SecureValueError;
+secureValueErrorFrontSide#be3dfa type:SecureValueType file_hash:bytes text:string = SecureValueError;
+secureValueErrorReverseSide#868a2aa5 type:SecureValueType file_hash:bytes text:string = SecureValueError;
+secureValueErrorSelfie#e537ced6 type:SecureValueType file_hash:bytes text:string = SecureValueError;
+secureValueErrorFile#7a700873 type:SecureValueType file_hash:bytes text:string = SecureValueError;
+secureValueErrorFiles#666220e9 type:SecureValueType file_hash:Vector<bytes> text:string = SecureValueError;
+
+secureCredentialsEncrypted#33f0ea47 data:bytes hash:bytes secret:bytes = SecureCredentialsEncrypted;
+
+account.authorizationForm#cb976d53 flags:# selfie_required:flags.1?true required_types:Vector<SecureValueType> values:Vector<SecureValue> errors:Vector<SecureValueError> users:Vector<User> privacy_policy_url:flags.0?string = account.AuthorizationForm;
+
+account.sentEmailCode#811f854f email_pattern:string length:int = account.SentEmailCode;
+
+help.deepLinkInfoEmpty#66afa166 = help.DeepLinkInfo;
+help.deepLinkInfo#6a4ee832 flags:# update_app:flags.0?true message:string entities:flags.1?Vector<MessageEntity> = help.DeepLinkInfo;
+
 ---functions---
 
 invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
@@ -1016,9 +1069,20 @@ account.getTmpPassword#4a82327e password_hash:bytes period:int = account.TmpPass
 account.getWebAuthorizations#182e6d6f = account.WebAuthorizations;
 account.resetWebAuthorization#2d01b9ef hash:long = Bool;
 account.resetWebAuthorizations#682d2594 = Bool;
+account.getAllSecureValues#b288bc7d = Vector<SecureValue>;
+account.getSecureValue#73665bc2 types:Vector<SecureValueType> = Vector<SecureValue>;
+account.saveSecureValue#899fe31d value:InputSecureValue secure_secret_id:long = SecureValue;
+account.deleteSecureValue#b880bc4b types:Vector<SecureValueType> = Bool;
+account.getAuthorizationForm#b86ba8e1 bot_id:int scope:string public_key:string = account.AuthorizationForm;
+account.acceptAuthorization#e7027c94 bot_id:int scope:string public_key:string value_hashes:Vector<SecureValueHash> credentials:SecureCredentialsEncrypted = Bool;
+account.sendVerifyPhoneCode#823380b4 flags:# allow_flashcall:flags.0?true phone_number:string current_number:flags.0?Bool = auth.SentCode;
+account.verifyPhone#4dd3a7f6 phone_number:string phone_code_hash:string phone_code:string = Bool;
+account.sendVerifyEmailCode#7011509f email:string = account.SentEmailCode;
+account.verifyEmail#ecba39db email:string code:string = Bool;
 
 users.getUsers#d91a548 id:Vector<InputUser> = Vector<User>;
 users.getFullUser#ca30a5b1 id:InputUser = UserFull;
+users.setSecureValueErrors#90c894b5 id:InputUser errors:Vector<SecureValueError> = Bool;
 
 contacts.getStatuses#c4a353ee = Vector<ContactStatus>;
 contacts.getContacts#c023849f hash:int = contacts.Contacts;
@@ -1158,11 +1222,13 @@ help.saveAppLog#6f02f748 events:Vector<InputAppEvent> = Bool;
 help.getInviteText#4d392343 = help.InviteText;
 help.getSupport#9cdf08cd = help.Support;
 help.getAppChangelog#9010ef6f prev_app_version:string = Updates;
-help.getTermsOfService#8e59b7e7 country_iso2:string = help.TermsOfService;
 help.setBotUpdatesStatus#ec22cfcd pending_updates_count:int message:string = Bool;
 help.getCdnConfig#52029342 = CdnConfig;
 help.getRecentMeUrls#3dc0f114 referer:string = help.RecentMeUrls;
 help.getProxyData#3d7758e1 = help.ProxyData;
+help.getTermsOfServiceUpdate#2ca51fd1 = help.TermsOfServiceUpdate;
+help.acceptTermsOfService#ee72f79a id:DataJSON = Bool;
+help.getDeepLinkInfo#3fedc75f path:string = help.DeepLinkInfo;
 
 channels.readHistory#cc104937 channel:InputChannel max_id:int = Bool;
 channels.deleteMessages#84c1fd4e channel:InputChannel id:Vector<int> = messages.AffectedMessages;
@@ -1226,4 +1292,4 @@ langpack.getStrings#2e1ee318 lang_code:string keys:Vector<string> = Vector<LangP
 langpack.getDifference#b2e4d7d from_version:int = LangPackDifference;
 langpack.getLanguages#800fd57d = Vector<LangPackLanguage>;
 
-// LAYER 79
+// LAYER 81

Telegram/Resources/uwp/AppX/AppxManifest.xml

@@ -9,7 +9,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="1.2.25.0" />
+    Version="1.3.3.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>

Telegram/Resources/winrc/Telegram.rc

@@ -34,8 +34,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,25,0
- PRODUCTVERSION 1,2,25,0
+ FILEVERSION 1,3,3,0
+ PRODUCTVERSION 1,3,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -52,10 +52,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram Messenger LLP"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "1.2.25.0"
+            VALUE "FileVersion", "1.3.3.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2018"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "1.2.25.0"
+            VALUE "ProductVersion", "1.3.3.0"
         END
     END
     BLOCK "VarFileInfo"

Telegram/Resources/winrc/Updater.rc

@@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,25,0
- PRODUCTVERSION 1,2,25,0
+ FILEVERSION 1,3,3,0
+ PRODUCTVERSION 1,3,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -43,10 +43,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram Messenger LLP"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "1.2.25.0"
+            VALUE "FileVersion", "1.3.3.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2018"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "1.2.25.0"
+            VALUE "ProductVersion", "1.3.3.0"
         END
     END
     BLOCK "VarFileInfo"

Telegram/SourceFiles/_other/packer.h

@@ -17,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include <zlib.h>
 
+extern "C" {
 #include <openssl/bn.h>
 #include <openssl/rsa.h>
 #include <openssl/pem.h>
@@ -24,6 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <openssl/err.h>
 #include <openssl/aes.h>
 #include <openssl/evp.h>
+} // extern "C"
 
 #ifdef Q_OS_WIN // use Lzma SDK for win
 #include <LzmaLib.h>
@@ -34,6 +36,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <string>
 #include <iostream>
 #include <exception>
+
 using std::string;
 using std::wstring;
-using std::cout;
+using std::cout;

Telegram/SourceFiles/apiwrap.cpp

@@ -35,6 +35,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "auth_session.h"
 #include "boxes/confirm_box.h"
 #include "window/notifications_manager.h"
+#include "window/window_lock_widgets.h"
 #include "window/window_controller.h"
 #include "chat_helpers/message_field.h"
 #include "chat_helpers/stickers.h"
@@ -149,7 +150,7 @@ ApiWrap::ApiWrap(not_null<AuthSession*> session)
 
 void ApiWrap::requestChangelog(
 		const QString &sinceVersion,
-		base::lambda<void(const MTPUpdates &result)> callback) {
+		Fn<void(const MTPUpdates &result)> callback) {
 	request(MTPhelp_GetAppChangelog(
 		MTP_string(sinceVersion)
 	)).done(
@@ -233,6 +234,78 @@ void ApiWrap::proxyPromotionDone(const MTPhelp_ProxyData &proxy) {
 	}
 }
 
+void ApiWrap::requestDeepLinkInfo(
+		const QString &path,
+		Fn<void(const MTPDhelp_deepLinkInfo &result)> callback) {
+	request(_deepLinkInfoRequestId).cancel();
+	_deepLinkInfoRequestId = request(MTPhelp_GetDeepLinkInfo(
+		MTP_string(path)
+	)).done([=](const MTPhelp_DeepLinkInfo &result) {
+		_deepLinkInfoRequestId = 0;
+		if (result.type() == mtpc_help_deepLinkInfo) {
+			callback(result.c_help_deepLinkInfo());
+		}
+	}).fail([=](const RPCError &error) {
+		_deepLinkInfoRequestId = 0;
+	}).send();
+}
+
+void ApiWrap::requestTermsUpdate() {
+	if (_termsUpdateRequestId) {
+		return;
+	}
+	const auto now = getms(true);
+	if (_termsUpdateSendAt && now < _termsUpdateSendAt) {
+		App::CallDelayed(_termsUpdateSendAt - now, _session, [=] {
+			requestTermsUpdate();
+		});
+		return;
+	}
+
+	constexpr auto kTermsUpdateTimeoutMin = 10 * TimeMs(1000);
+	constexpr auto kTermsUpdateTimeoutMax = 86400 * TimeMs(1000);
+
+	_termsUpdateRequestId = request(MTPhelp_GetTermsOfServiceUpdate(
+	)).done([=](const MTPhelp_TermsOfServiceUpdate &result) {
+		_termsUpdateRequestId = 0;
+
+		const auto requestNext = [&](auto &&data) {
+			_termsUpdateSendAt = getms(true) + snap(
+				TimeMs(data.vexpires.v - unixtime()),
+				kTermsUpdateTimeoutMin,
+				kTermsUpdateTimeoutMax);
+			requestTermsUpdate();
+		};
+		switch (result.type()) {
+		case mtpc_help_termsOfServiceUpdateEmpty: {
+			const auto &data = result.c_help_termsOfServiceUpdateEmpty();
+			requestNext(data);
+		} break;
+		case mtpc_help_termsOfServiceUpdate: {
+			const auto &data = result.c_help_termsOfServiceUpdate();
+			const auto &terms = data.vterms_of_service;
+			const auto &fields = terms.c_help_termsOfService();
+			Messenger::Instance().lockByTerms(
+				Window::TermsLock::FromMTP(fields));
+			requestNext(data);
+		} break;
+		default: Unexpected("Type in requestTermsUpdate().");
+		}
+	}).fail([=](const RPCError &error) {
+		_termsUpdateRequestId = 0;
+		_termsUpdateSendAt = getms(true) + kTermsUpdateTimeoutMin;
+		requestTermsUpdate();
+	}).send();
+}
+
+void ApiWrap::acceptTerms(bytes::const_span id) {
+	request(MTPhelp_AcceptTermsOfService(
+		MTP_dataJSON(MTP_bytes(id))
+	)).done([=](const MTPBool &result) {
+		requestTermsUpdate();
+	}).send();
+}
+
 void ApiWrap::applyUpdates(
 		const MTPUpdates &updates,
 		uint64 sentMessageRandomId) {
@@ -260,7 +333,7 @@ void ApiWrap::savePinnedOrder() {
 //void ApiWrap::toggleChannelGrouping(
 //		not_null<ChannelData*> channel,
 //		bool group,
-//		base::lambda<void()> callback) {
+//		Fn<void()> callback) {
 //	if (const auto already = _channelGroupingRequests.take(channel)) {
 //		request(already->first).cancel();
 //	}
@@ -1403,7 +1476,7 @@ void ApiWrap::deleteAllFromUserSend(
 
 void ApiWrap::requestChannelMembersForAdd(
 		not_null<ChannelData*> channel,
-		base::lambda<void(const MTPchannels_ChannelParticipants&)> callback) {
+		Fn<void(const MTPchannels_ChannelParticipants&)> callback) {
 	_channelMembersForAddCallback = std::move(callback);
 	if (_channelMembersForAdd == channel) {
 		return;
@@ -2397,12 +2470,6 @@ std::vector<not_null<DocumentData*>> *ApiWrap::stickersByEmoji(
 			auto &entry = _stickersByEmoji[emoji];
 			entry.list.clear();
 			entry.list.reserve(data.vstickers.v.size());
-			for (const auto &sticker : data.vstickers.v) {
-				const auto document = _session->data().document(sticker);
-				if (document->sticker()) {
-					entry.list.push_back(document);
-				}
-			}
 			entry.hash = data.vhash.v;
 			entry.received = getms(true);
 			_session->data().notifyStickersUpdated();
@@ -2607,10 +2674,10 @@ void ApiWrap::readFeaturedSets() {
 void ApiWrap::parseChannelParticipants(
 		not_null<ChannelData*> channel,
 		const MTPchannels_ChannelParticipants &result,
-		base::lambda<void(
+		Fn<void(
 			int availableCount,
 			const QVector<MTPChannelParticipant> &list)> callbackList,
-		base::lambda<void()> callbackNotModified) {
+		Fn<void()> callbackNotModified) {
 	TLHelp::VisitChannelParticipants(result, base::overload([&](
 			const MTPDchannels_channelParticipants &data) {
 		App::feedUsers(data.vusers);
@@ -2644,10 +2711,10 @@ void ApiWrap::refreshChannelAdmins(
 void ApiWrap::parseRecentChannelParticipants(
 		not_null<ChannelData*> channel,
 		const MTPchannels_ChannelParticipants &result,
-		base::lambda<void(
+		Fn<void(
 			int availableCount,
 			const QVector<MTPChannelParticipant> &list)> callbackList,
-		base::lambda<void()> callbackNotModified) {
+		Fn<void()> callbackNotModified) {
 	parseChannelParticipants(channel, result, [&](
 			int availableCount,
 			const QVector<MTPChannelParticipant> &list) {
@@ -3526,12 +3593,12 @@ void ApiWrap::sendAction(const SendOptions &options) {
 void ApiWrap::forwardMessages(
 		HistoryItemsList &&items,
 		const SendOptions &options,
-		base::lambda_once<void()> &&successCallback) {
+		FnMut<void()> &&successCallback) {
 	Expects(!items.empty());
 
 	struct SharedCallback {
 		int requestsLeft = 0;
-		base::lambda_once<void()> callback;
+		FnMut<void()> callback;
 	};
 	const auto shared = successCallback
 		? std::make_shared<SharedCallback>()

Telegram/SourceFiles/apiwrap.h

@@ -63,10 +63,10 @@ public:
 	//void toggleChannelGrouping( // #feed
 	//	not_null<ChannelData*> channel,
 	//	bool group,
-	//	base::lambda<void()> callback);
+	//	Fn<void()> callback);
 	//void ungroupAllFromFeed(not_null<Data::Feed*> feed);
 
-	using RequestMessageDataCallback = base::lambda<void(ChannelData*, MsgId)>;
+	using RequestMessageDataCallback = Fn<void(ChannelData*, MsgId)>;
 	void requestMessageData(
 		ChannelData *channel,
 		MsgId msgId,
@@ -92,12 +92,17 @@ public:
 
 	void requestChangelog(
 		const QString &sinceVersion,
-		base::lambda<void(const MTPUpdates &result)> callback);
+		Fn<void(const MTPUpdates &result)> callback);
 	void refreshProxyPromotion();
+	void requestDeepLinkInfo(
+		const QString &path,
+		Fn<void(const MTPDhelp_deepLinkInfo &result)> callback);
+	void requestTermsUpdate();
+	void acceptTerms(bytes::const_span termsId);
 
 	void requestChannelMembersForAdd(
 		not_null<ChannelData*> channel,
-		base::lambda<void(const MTPchannels_ChannelParticipants&)> callback);
+		Fn<void(const MTPchannels_ChannelParticipants&)> callback);
 	void processFullPeer(PeerData *peer, const MTPmessages_ChatFull &result);
 	void processFullPeer(UserData *user, const MTPUserFull &result);
 
@@ -203,17 +208,17 @@ public:
 	void parseChannelParticipants(
 		not_null<ChannelData*> channel,
 		const MTPchannels_ChannelParticipants &result,
-		base::lambda<void(
+		Fn<void(
 			int availableCount,
 			const QVector<MTPChannelParticipant> &list)> callbackList,
-		base::lambda<void()> callbackNotModified = nullptr);
+		Fn<void()> callbackNotModified = nullptr);
 	void parseRecentChannelParticipants(
 		not_null<ChannelData*> channel,
 		const MTPchannels_ChannelParticipants &result,
-		base::lambda<void(
+		Fn<void(
 			int availableCount,
 			const QVector<MTPChannelParticipant> &list)> callbackList,
-		base::lambda<void()> callbackNotModified = nullptr);
+		Fn<void()> callbackNotModified = nullptr);
 
 	struct SendOptions {
 		SendOptions(not_null<History*> history) : history(history) {
@@ -232,7 +237,7 @@ public:
 	void forwardMessages(
 		HistoryItemsList &&items,
 		const SendOptions &options,
-		base::lambda_once<void()> &&successCallback = nullptr);
+		FnMut<void()> &&successCallback = nullptr);
 	void shareContact(
 		const QString &phone,
 		const QString &firstName,
@@ -459,11 +464,11 @@ private:
 
 	ChannelData *_channelMembersForAdd = nullptr;
 	mtpRequestId _channelMembersForAddRequestId = 0;
-	base::lambda<void(
+	Fn<void(
 		const MTPchannels_ChannelParticipants&)> _channelMembersForAddCallback;
 	base::flat_map<
 		not_null<ChannelData*>,
-		std::pair<mtpRequestId,base::lambda<void()>>> _channelGroupingRequests;
+		std::pair<mtpRequestId,Fn<void()>>> _channelGroupingRequests;
 
 	using KickRequest = std::pair<
 		not_null<ChannelData*>,
@@ -482,10 +487,10 @@ private:
 	QMap<uint64, QPair<uint64, mtpRequestId> > _stickerSetRequests;
 
 	QMap<ChannelData*, mtpRequestId> _channelAmInRequests;
-	std::map<not_null<UserData*>, mtpRequestId> _blockRequests;
-	std::map<not_null<PeerData*>, mtpRequestId> _exportInviteRequests;
-	std::map<PeerId, mtpRequestId> _notifySettingRequests;
-	std::map<not_null<History*>, mtpRequestId> _draftsSaveRequestIds;
+	base::flat_map<not_null<UserData*>, mtpRequestId> _blockRequests;
+	base::flat_map<not_null<PeerData*>, mtpRequestId> _exportInviteRequests;
+	base::flat_map<PeerId, mtpRequestId> _notifySettingRequests;
+	base::flat_map<not_null<History*>, mtpRequestId> _draftsSaveRequestIds;
 	base::Timer _draftsSaveTimer;
 
 	base::flat_set<mtpRequestId> _stickerSetDisenableRequests;
@@ -578,4 +583,9 @@ private:
 	base::flat_set<not_null<const PeerData*>> _updateNotifySettingsPeers;
 	base::Timer _updateNotifySettingsTimer;
 
+	mtpRequestId _deepLinkInfoRequestId = 0;
+
+	TimeMs _termsUpdateSendAt = 0;
+	mtpRequestId _termsUpdateRequestId = 0;
+
 };

Telegram/SourceFiles/app.cpp

@@ -140,50 +140,6 @@ namespace App {
 		return nullptr;
 	}
 
-	bool passcoded() {
-		if (auto window = wnd()) {
-			return window->passcodeWidget();
-		}
-		return false;
-	}
-
-namespace {
-	bool loggedOut() {
-		if (Global::LocalPasscode()) {
-			Global::SetLocalPasscode(false);
-			Global::RefLocalPasscodeChanged().notify();
-		}
-		Media::Player::mixer()->stopAndClear();
-		if (auto w = wnd()) {
-			w->tempDirDelete(Local::ClearManagerAll);
-			w->setupIntro();
-		}
-		histories().clear();
-		Messenger::Instance().authSessionDestroy();
-		Local::reset();
-		Window::Theme::Background()->reset();
-
-		cSetOtherOnline(0);
-		clearStorageImages();
-		return true;
-	}
-} // namespace
-
-	void logOut() {
-		if (auto mtproto = Messenger::Instance().mtp()) {
-			mtproto->logout(rpcDone([] {
-				return loggedOut();
-			}), rpcFail([] {
-				return loggedOut();
-			}));
-		} else {
-			// We log out because we've forgotten passcode.
-			// So we just start mtproto from scratch.
-			Messenger::Instance().startMtp();
-			loggedOut();
-		}
-	}
-
 	namespace {
 		// we should get a full restriction in "{fulltype}: {reason}" format and we
 		// need to find a "-all" tag in {fulltype}, otherwise ignore this restriction
@@ -715,7 +671,7 @@ namespace {
 					auto h = App::historyLoaded(chat->id);
 					bool found = !h || !h->lastKeyboardFrom;
 					auto botStatus = -1;
-					for (auto i = chat->participants.begin(), e = chat->participants.end(); i != e;) {
+					for (auto i = chat->participants.begin(); i != chat->participants.end();) {
 						auto [user, version] = *i;
 						if (version < pversion) {
 							i = chat->participants.erase(i);
@@ -1150,7 +1106,7 @@ namespace {
 		return i.value();
 	}
 
-	void enumerateUsers(base::lambda<void(not_null<UserData*>)> action) {
+	void enumerateUsers(Fn<void(not_null<UserData*>)> action) {
 		for_const (const auto peer, peersData) {
 			if (const auto user = peer->asUser()) {
 				action(user);
@@ -1159,7 +1115,7 @@ namespace {
 	}
 
 	void enumerateChatsChannels(
-			base::lambda<void(not_null<PeerData*>)> action) {
+			Fn<void(not_null<PeerData*>)> action) {
 		for_const (const auto peer, peersData) {
 			if (!peer->isUser()) {
 				action(peer);

Telegram/SourceFiles/app.h

@@ -66,9 +66,6 @@ enum RoundCorners {
 namespace App {
 	MainWindow *wnd();
 	MainWidget *main();
-	bool passcoded();
-
-	void logOut();
 
 	QString formatPhone(QString phone);
 
@@ -135,9 +132,9 @@ namespace App {
 	inline ChannelData *channelLoaded(ChannelId channelId) {
 		return channel(channelId, PeerData::FullLoaded);
 	}
-	void enumerateUsers(base::lambda<void(not_null<UserData*>)> action);
+	void enumerateUsers(Fn<void(not_null<UserData*>)> action);
 	void enumerateChatsChannels(
-		base::lambda<void(not_null<PeerData*>)> action);
+		Fn<void(not_null<PeerData*>)> action);
 
 	UserData *self();
 	PeerData *peerByName(const QString &username);

Telegram/SourceFiles/application.cpp

@@ -22,6 +22,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace {
 
+constexpr auto kEmptyPidForCommandResponse = 0ULL;
+
 QChar _toHex(ushort v) {
 	v = v & 0x000F;
 	return QChar::fromLatin1((v >= 10) ? ('a' + (v - 10)) : ('0' + v));
@@ -62,6 +64,27 @@ QString _escapeFrom7bit(const QString &str) {
 
 } // namespace
 
+bool StartUrlRequiresActivate(const QString &url) {
+	const auto urlTrimmed = url.trimmed();
+	if (!urlTrimmed.startsWith(qstr("tg://"), Qt::CaseInsensitive)
+		|| Messenger::Instance().locked()) {
+		return true;
+	}
+	const auto command = urlTrimmed.midRef(qstr("tg://").size());
+
+	using namespace qthelp;
+	const auto matchOptions = RegExOption::CaseInsensitive;
+	const auto authMatch = regex_match(
+		qsl("^passport/?\\?(.+)(#|$)"),
+		command,
+		matchOptions);
+	const auto authLegacyMatch = regex_match(
+		qsl("^resolve/?\\?domain=telegrampassport&(.+)(#|$)"),
+		command,
+		matchOptions);
+	return !authMatch->hasMatch() && !authLegacyMatch->hasMatch();
+}
+
 Application::Application(
 		not_null<Core::Launcher*> launcher,
 		int &argc,
@@ -121,8 +144,9 @@ void Application::socketConnected() {
 	}
 	if (!cStartUrl().isEmpty()) {
 		commands += qsl("OPEN:") + _escapeTo7bit(cStartUrl()) + ';';
+	} else {
+		commands += qsl("CMD:show;");
 	}
-	commands += qsl("CMD:show;");
 
 	DEBUG_LOG(("Application Info: writing commands %1").arg(commands));
 	_localSocket.write(commands.toLatin1());
@@ -147,7 +171,9 @@ void Application::socketReading() {
 	_localSocketReadData.append(_localSocket.readAll());
 	if (QRegularExpression("RES:(\\d+);").match(_localSocketReadData).hasMatch()) {
 		uint64 pid = _localSocketReadData.mid(4, _localSocketReadData.length() - 5).toULongLong();
-		psActivateProcess(pid);
+		if (pid != kEmptyPidForCommandResponse) {
+			psActivateProcess(pid);
+		}
 		LOG(("Show command response received, pid = %1, activating and quitting...").arg(pid));
 		return App::quit();
 	}
@@ -248,16 +274,26 @@ void Application::readClients() {
 				QStringRef cmd(&cmds, from, to - from);
 				if (cmd.startsWith(qsl("CMD:"))) {
 					Sandbox::execExternal(cmds.mid(from + 4, to - from - 4));
-					QByteArray response(qsl("RES:%1;").arg(QCoreApplication::applicationPid()).toLatin1());
+					const auto response = qsl("RES:%1;").arg(QCoreApplication::applicationPid()).toLatin1();
 					i->first->write(response.data(), response.size());
 				} else if (cmd.startsWith(qsl("SEND:"))) {
 					if (cSendPaths().isEmpty()) {
 						toSend.append(_escapeFrom7bit(cmds.mid(from + 5, to - from - 5)));
 					}
 				} else if (cmd.startsWith(qsl("OPEN:"))) {
+					auto activateRequired = true;
 					if (cStartUrl().isEmpty()) {
 						startUrl = _escapeFrom7bit(cmds.mid(from + 5, to - from - 5)).mid(0, 8192);
+						activateRequired = StartUrlRequiresActivate(startUrl);
 					}
+					if (activateRequired) {
+						Sandbox::execExternal("show");
+					}
+					const auto responsePid = activateRequired
+						? QCoreApplication::applicationPid()
+						: kEmptyPidForCommandResponse;
+					const auto response = qsl("RES:%1;").arg(responsePid).toLatin1();
+					i->first->write(response.data(), response.size());
 				} else {
 					LOG(("Application Error: unknown command %1 passed in local socket").arg(QString(cmd.constData(), cmd.length())));
 				}

Telegram/SourceFiles/application.h

@@ -12,6 +12,8 @@ class Launcher;
 class UpdateChecker;
 } // namespace Core
 
+bool StartUrlRequiresActivate(const QString &url);
+
 class Application : public QApplication {
 	Q_OBJECT
 

Telegram/SourceFiles/auth_session.cpp

@@ -281,14 +281,19 @@ AuthSession::AuthSession(UserId userId)
 	_saveDataTimer.setCallback([=] {
 		Local::writeUserSettings();
 	});
-	subscribe(Messenger::Instance().passcodedChanged(), [=] {
+	Messenger::Instance().passcodeLockChanges(
+	) | rpl::start_with_next([=] {
 		_shouldLockAt = 0;
+	}, _lifetime);
+	Messenger::Instance().lockChanges(
+	) | rpl::start_with_next([=] {
 		notifications().updateAll();
-	});
+	}, _lifetime);
 	subscribe(Global::RefConnectionTypeChanged(), [=] {
 		_api->refreshProxyPromotion();
 	});
 	_api->refreshProxyPromotion();
+	_api->requestTermsUpdate();
 
 	Window::Theme::Background()->start();
 }
@@ -314,7 +319,7 @@ bool AuthSession::validateSelf(const MTPUser &user) {
 		return false;
 	} else if (user.c_user().vid.v != userId()) {
 		LOG(("Auth Error: wrong self user received."));
-		App::logOutDelayed();
+		crl::on_main(this, [] { Messenger::Instance().logOut(); });
 		return false;
 	}
 	return true;
@@ -327,7 +332,10 @@ void AuthSession::saveSettingsDelayed(TimeMs delay) {
 }
 
 void AuthSession::checkAutoLock() {
-	if (!Global::LocalPasscode() || App::passcoded()) return;
+	if (!Global::LocalPasscode()
+		|| Messenger::Instance().passcodeLocked()) {
+		return;
+	}
 
 	Messenger::Instance().checkLocalTime();
 	auto now = getms(true);
@@ -336,7 +344,7 @@ void AuthSession::checkAutoLock() {
 	auto notPlayingVideoForMs = now - settings().lastTimeVideoPlayedAt();
 	auto checkTimeMs = qMin(idleForMs, notPlayingVideoForMs);
 	if (checkTimeMs >= shouldLockInMs || (_shouldLockAt > 0 && now > _shouldLockAt + kAutoLockTimeoutLateMs)) {
-		Messenger::Instance().setupPasscode();
+		Messenger::Instance().lockByPasscode();
 	} else {
 		_shouldLockAt = now + (shouldLockInMs - checkTimeMs);
 		_autoLockTimer.callOnce(shouldLockInMs - checkTimeMs);

Telegram/SourceFiles/base/flat_map.h

@@ -13,6 +13,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace base {
 
+using std::begin;
+using std::end;
+
 template <
 	typename Key,
 	typename Type,
@@ -414,8 +417,9 @@ public:
 		if (range.first == range.second) {
 			return 0;
 		}
+		const auto result = (range.second - range.first);
 		impl().erase(range.first, range.second);
-		return (range.second - range.first);
+		return result;
 	}
 
 	iterator erase(const_iterator where) {
@@ -424,6 +428,9 @@ public:
 	iterator erase(const_iterator from, const_iterator till) {
 		return impl().erase(from._impl, till._impl);
 	}
+	int erase(const Key &key) {
+		return removeAll(key);
+	}
 
 	iterator findFirst(const Key &key) {
 		if (empty()

Telegram/SourceFiles/base/flat_set.h

@@ -12,6 +12,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace base {
 
+using std::begin;
+using std::end;
+
 template <typename Type, typename Compare = std::less<>>
 class flat_set;
 
@@ -294,8 +297,9 @@ public:
 		if (range.first == range.second) {
 			return 0;
 		}
+		const auto result = (range.second - range.first);
 		impl().erase(range.first, range.second);
-		return (range.second - range.first);
+		return result;
 	}
 
 	iterator erase(const_iterator where) {
@@ -304,6 +308,9 @@ public:
 	iterator erase(const_iterator from, const_iterator till) {
 		return impl().erase(from._impl, till._impl);
 	}
+	int erase(const Type &value) {
+		return removeAll(value);
+	}
 
 	iterator findFirst(const Type &value) {
 		if (empty()

Telegram/SourceFiles/base/lambda.h

@@ -1,487 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#pragma once
-
-#include <memory>
-
-#ifndef CUSTOM_LAMBDA_WRAP
-
-#include <functional>
-#include "base/unique_function.h"
-
-namespace base {
-
-template <typename Function>
-using lambda = std::function<Function>;
-
-template <typename Function>
-using lambda_once = unique_function<Function>;
-
-namespace lambda_internal {
-
-template <typename Lambda>
-struct lambda_call_type {
-	using type = decltype(&Lambda::operator());
-};
-
-} // namespace lambda_internal
-
-template <typename Lambda>
-using lambda_call_type_t
-	= typename lambda_internal::lambda_call_type<Lambda>::type;
-
-} // namespace base
-
-#else // CUSTOM_LAMBDA_WRAP
-
-#ifndef Assert
-#define LambdaAssertDefined
-#define Assert(v) ((v) ? ((void)0) : std::abort())
-#endif // Assert
-
-#ifndef Unexpected
-#define LambdaUnexpectedDefined
-#define Unexpected(v) std::abort()
-#endif // Unexpected
-
-namespace base {
-
-template <typename Function> class lambda_once;
-template <typename Function> class lambda;
-
-// Get lambda type from a lambda template parameter.
-
-namespace lambda_internal {
-
-template <typename FunctionType>
-struct type_resolver;
-
-template <typename Lambda, typename R, typename ...Args>
-struct type_resolver<R(Lambda::*)(Args...) const> {
-	using type = lambda<R(Args...)>;
-	static constexpr auto is_mutable = false;
-};
-
-template <typename Lambda, typename R, typename ...Args>
-struct type_resolver<R(Lambda::*)(Args...)> {
-	using type = lambda_once<R(Args...)>;
-	static constexpr auto is_mutable = true;
-};
-
-template <typename Lambda>
-struct type_helper {
-	using type = typename type_resolver<decltype(&Lambda::operator())>::type;
-	static constexpr auto is_mutable = type_resolver<decltype(&Lambda::operator())>::is_mutable;
-};
-
-} // namespace lambda_internal
-
-template <typename Lambda>
-using lambda_type = typename lambda_internal::type_helper<std::decay_t<Lambda>>::type;
-
-namespace lambda_internal {
-
-constexpr auto kFullStorageSize = 32U;
-static_assert(kFullStorageSize % sizeof(void*) == 0, "Invalid pointer size!");
-
-constexpr auto kStorageSize = kFullStorageSize - sizeof(void*);
-using alignment = std::max_align_t;
-
-template <typename Lambda>
-constexpr bool is_large = (sizeof(std::decay_t<Lambda>) > kStorageSize);
-
-[[noreturn]] inline void bad_construct_copy(void *lambda, const void *source) {
-	Unexpected("base::lambda bad_construct_copy() called!");
-}
-
-template <typename Return, typename ...Args>
-[[noreturn]] Return bad_const_call(const void *lambda, Args...) {
-	Unexpected("base::lambda bad_const_call() called!");
-}
-
-template <typename Return, typename ...Args>
-struct vtable_base {
-	using construct_copy_other_type = void(*)(void *, const void *); // dst, src
-	using construct_move_other_type = void(*)(void *, void *); // dst, src
-	using const_call_type = Return(*)(const void *, Args...);
-	using call_type = Return(*)(void *, Args...);
-	using destruct_type = void(*)(const void *);
-
-	vtable_base() = delete;
-	vtable_base(const vtable_base &other) = delete;
-	vtable_base &operator=(const vtable_base &other) = delete;
-
-	vtable_base(
-		construct_copy_other_type construct_copy_other,
-		construct_move_other_type construct_move_other,
-		const_call_type const_call,
-		call_type call,
-		destruct_type destruct)
-		: construct_copy_other(construct_copy_other)
-		, construct_move_other(construct_move_other)
-		, const_call(const_call)
-		, call(call)
-		, destruct(destruct) {
-	}
-
-	const construct_copy_other_type construct_copy_other;
-	const construct_move_other_type construct_move_other;
-	const const_call_type const_call;
-	const call_type call;
-	const destruct_type destruct;
-
-};
-
-template <typename Lambda, bool IsLarge, typename Return, typename ...Args> struct vtable_once_impl;
-
-template <typename Lambda, typename Return, typename ...Args>
-struct vtable_once_impl<Lambda, true, Return, Args...> : public vtable_base<Return, Args...> {
-	using JustLambda = std::decay_t<Lambda>;
-	using LambdaPtr = std::unique_ptr<JustLambda>;
-	using Parent = vtable_base<Return, Args...>;
-	static void construct_move_other_method(void *storage, void *source) {
-		auto source_lambda_ptr = static_cast<LambdaPtr*>(source);
-		new (storage) LambdaPtr(std::move(*source_lambda_ptr));
-	}
-	static Return call_method(void *storage, Args... args) {
-		return (**static_cast<LambdaPtr*>(storage))(std::forward<Args>(args)...);
-	}
-	static void destruct_method(const void *storage) {
-		static_cast<const LambdaPtr*>(storage)->~LambdaPtr();
-	}
-	vtable_once_impl() : Parent(
-		&bad_construct_copy,
-		&vtable_once_impl::construct_move_other_method,
-		&bad_const_call<Return, Args...>,
-		&vtable_once_impl::call_method,
-		&vtable_once_impl::destruct_method) {
-	}
-
-	// Used directly.
-	static void construct_move_lambda_method(void *storage, void *source) {
-		auto source_lambda = static_cast<JustLambda*>(source);
-		new (storage) LambdaPtr(std::make_unique<JustLambda>(static_cast<JustLambda&&>(*source_lambda)));
-	}
-
-protected:
-	vtable_once_impl(
-		typename Parent::construct_copy_other_type construct_copy_other,
-		typename Parent::const_call_type const_call
-	) : Parent(
-		construct_copy_other,
-		&vtable_once_impl::construct_move_other_method,
-		const_call,
-		&vtable_once_impl::call_method,
-		&vtable_once_impl::destruct_method) {
-	}
-
-};
-
-template <typename Lambda, typename Return, typename ...Args>
-struct vtable_once_impl<Lambda, false, Return, Args...> : public vtable_base<Return, Args...> {
-	using JustLambda = std::decay_t<Lambda>;
-	using Parent = vtable_base<Return, Args...>;
-	static void construct_move_other_method(void *storage, void *source) {
-		auto source_lambda = static_cast<JustLambda*>(source);
-		new (storage) JustLambda(static_cast<JustLambda&&>(*source_lambda));
-	}
-	static Return call_method(void *storage, Args... args) {
-		return (*static_cast<JustLambda*>(storage))(std::forward<Args>(args)...);
-	}
-	static void destruct_method(const void *storage) {
-		static_cast<const JustLambda*>(storage)->~JustLambda();
-	}
-	vtable_once_impl() : Parent(
-		&bad_construct_copy,
-		&vtable_once_impl::construct_move_other_method,
-		&bad_const_call<Return, Args...>,
-		&vtable_once_impl::call_method,
-		&vtable_once_impl::destruct_method) {
-	}
-
-	// Used directly.
-	static void construct_move_lambda_method(void *storage, void *source) {
-		auto source_lambda = static_cast<JustLambda*>(source);
-		new (storage) JustLambda(static_cast<JustLambda&&>(*source_lambda));
-	}
-
-protected:
-	vtable_once_impl(
-		typename Parent::construct_copy_other_type construct_copy_other,
-		typename Parent::const_call_type const_call
-	) : Parent(
-		construct_copy_other,
-		&vtable_once_impl::construct_move_other_method,
-		const_call,
-		&vtable_once_impl::call_method,
-		&vtable_once_impl::destruct_method) {
-	}
-
-};
-
-template <typename Lambda, typename Return, typename ...Args>
-struct vtable_once : public vtable_once_impl<Lambda, is_large<Lambda>, Return, Args...> {
-	static const vtable_once instance;
-};
-
-template <typename Lambda, typename Return, typename ...Args>
-const vtable_once<Lambda, Return, Args...> vtable_once<Lambda, Return, Args...>::instance = {};
-
-template <typename Lambda, bool IsLarge, typename Return, typename ...Args> struct vtable_impl;
-
-template <typename Lambda, typename Return, typename ...Args>
-struct vtable_impl<Lambda, true, Return, Args...> : public vtable_once_impl<Lambda, true, Return, Args...> {
-	using JustLambda = std::decay_t<Lambda>;
-	using LambdaPtr = std::unique_ptr<JustLambda>;
-	using Parent = vtable_once_impl<Lambda, true, Return, Args...>;
-	static void construct_copy_other_method(void *storage, const void *source) {
-		auto source_lambda = static_cast<const LambdaPtr*>(source);
-		new (storage) LambdaPtr(std::make_unique<JustLambda>(*source_lambda->get()));
-	}
-	static Return const_call_method(const void *storage, Args... args) {
-		auto lambda_ptr = static_cast<const LambdaPtr*>(storage)->get();
-		return (*static_cast<const JustLambda*>(lambda_ptr))(std::forward<Args>(args)...);
-	}
-	vtable_impl() : Parent(
-		&vtable_impl::construct_copy_other_method,
-		&vtable_impl::const_call_method
-	) {
-	}
-
-};
-
-template <typename Lambda, typename Return, typename ...Args>
-struct vtable_impl<Lambda, false, Return, Args...> : public vtable_once_impl<Lambda, false, Return, Args...> {
-	using JustLambda = std::decay_t<Lambda>;
-	using Parent = vtable_once_impl<Lambda, false, Return, Args...>;
-	static void construct_copy_other_method(void *storage, const void *source) {
-		auto source_lambda = static_cast<const JustLambda*>(source);
-		new (storage) JustLambda(static_cast<const JustLambda &>(*source_lambda));
-	}
-	static Return const_call_method(const void *storage, Args... args) {
-		return (*static_cast<const JustLambda*>(storage))(std::forward<Args>(args)...);
-	}
-	vtable_impl() : Parent(
-		&vtable_impl::construct_copy_other_method,
-		&vtable_impl::const_call_method
-	) {
-	}
-
-};
-
-template <typename Lambda, typename Return, typename ...Args>
-struct vtable : public vtable_impl<Lambda, is_large<Lambda>, Return, Args...> {
-	static const vtable instance;
-};
-
-template <typename Lambda, typename Return, typename ...Args>
-const vtable<Lambda, Return, Args...> vtable<Lambda, Return, Args...>::instance = {};
-
-} // namespace lambda_internal
-
-template <typename Return, typename ...Args>
-class lambda_once<Return(Args...)> {
-	using VTable = lambda_internal::vtable_base<Return, Args...>;
-
-public:
-	using return_type = Return;
-
-	lambda_once() {
-		data_.vtable = nullptr;
-	}
-	lambda_once(const lambda_once &other) = delete;
-	lambda_once &operator=(const lambda_once &other) = delete;
-
-	// Move construct / assign from the same type.
-	lambda_once(lambda_once &&other) {
-		if ((data_.vtable = other.data_.vtable)) {
-			data_.vtable->construct_move_other(data_.storage, other.data_.storage);
-		}
-	}
-	lambda_once &operator=(lambda_once &&other) {
-		if (this != &other) {
-			if (data_.vtable) {
-				data_.vtable->destruct(data_.storage);
-			}
-			if ((data_.vtable = other.data_.vtable)) {
-				data_.vtable->construct_move_other(data_.storage, other.data_.storage);
-				data_.vtable->destruct(other.data_.storage);
-				other.data_.vtable = nullptr;
-			}
-		}
-		return *this;
-	}
-
-	// Move construct / assign from a derived type.
-	lambda_once(lambda<Return(Args...)> &&other) {
-		if ((data_.vtable = other.data_.vtable)) {
-			data_.vtable->construct_move_other(data_.storage, other.data_.storage);
-			data_.vtable->destruct(other.data_.storage);
-			other.data_.vtable = nullptr;
-		}
-	}
-	lambda_once &operator=(lambda<Return(Args...)> &&other) {
-		if (this != &other) {
-			if (data_.vtable) {
-				data_.vtable->destruct(data_.storage);
-			}
-			if ((data_.vtable = other.data_.vtable)) {
-				data_.vtable->construct_move_other(data_.storage, other.data_.storage);
-				data_.vtable->destruct(other.data_.storage);
-				other.data_.vtable = nullptr;
-			}
-		}
-		return *this;
-	}
-
-	// Copy construct / assign from a derived type.
-	lambda_once(const lambda<Return(Args...)> &other) {
-		if ((data_.vtable = other.data_.vtable)) {
-			data_.vtable->construct_copy_other(data_.storage, other.data_.storage);
-		}
-	}
-	lambda_once &operator=(const lambda<Return(Args...)> &other) {
-		if (this != &other) {
-			if (data_.vtable) {
-				data_.vtable->destruct(data_.storage);
-			}
-			if ((data_.vtable = other.data_.vtable)) {
-				data_.vtable->construct_copy_other(data_.storage, other.data_.storage);
-			}
-		}
-		return *this;
-	}
-
-	// Copy / move construct / assign from an arbitrary type.
-	template <typename Lambda, typename = std::enable_if_t<std::is_convertible<decltype(std::declval<Lambda>()(std::declval<Args>()...)),Return>::value>>
-	lambda_once(Lambda other) {
-		data_.vtable = &lambda_internal::vtable_once<Lambda, Return, Args...>::instance;
-		lambda_internal::vtable_once<Lambda, Return, Args...>::construct_move_lambda_method(data_.storage, &other);
-	}
-	template <typename Lambda, typename = std::enable_if_t<std::is_convertible<decltype(std::declval<Lambda>()(std::declval<Args>()...)),Return>::value>>
-	lambda_once &operator=(Lambda other) {
-		if (data_.vtable) {
-			data_.vtable->destruct(data_.storage);
-		}
-		data_.vtable = &lambda_internal::vtable_once<Lambda, Return, Args...>::instance;
-		lambda_internal::vtable_once<Lambda, Return, Args...>::construct_move_lambda_method(data_.storage, &other);
-		return *this;
-	}
-
-	void swap(lambda_once &other) {
-		if (this != &other) {
-			std::swap(*this, other);
-		}
-	}
-
-	template <
-		typename ...OtherArgs,
-		typename = std::enable_if_t<(sizeof...(Args) == sizeof...(OtherArgs))>>
-	inline Return operator()(OtherArgs&&... args) {
-		Assert(data_.vtable != nullptr);
-		return data_.vtable->call(
-			data_.storage,
-			std::forward<OtherArgs>(args)...);
-	}
-
-	explicit operator bool() const {
-		return (data_.vtable != nullptr);
-	}
-
-	~lambda_once() {
-		if (data_.vtable) {
-			data_.vtable->destruct(data_.storage);
-		}
-	}
-
-protected:
-	struct Private {
-	};
-	lambda_once(const VTable *vtable, const Private &) {
-		data_.vtable = vtable;
-	}
-
-	struct Data {
-		char storage[lambda_internal::kStorageSize];
-		const VTable *vtable;
-	};
-	union {
-		lambda_internal::alignment alignment_;
-		char raw_[lambda_internal::kFullStorageSize];
-		Data data_;
-	};
-
-};
-
-template <typename Return, typename ...Args>
-class lambda<Return(Args...)> final : public lambda_once<Return(Args...)> {
-	using Parent = lambda_once<Return(Args...)>;
-
-public:
-	lambda() = default;
-
-	// Move construct / assign from the same type.
-	lambda(lambda<Return(Args...)> &&other) : Parent(std::move(other)) {
-	}
-	lambda &operator=(lambda<Return(Args...)> &&other) {
-		Parent::operator=(std::move(other));
-		return *this;
-	}
-
-	// Copy construct / assign from the same type.
-	lambda(const lambda<Return(Args...)> &other) : Parent(other) {
-	}
-	lambda &operator=(const lambda<Return(Args...)> &other) {
-		Parent::operator=(other);
-		return *this;
-	}
-
-	// Copy / move construct / assign from an arbitrary type.
-	template <typename Lambda, typename = std::enable_if_t<std::is_convertible<decltype(std::declval<Lambda>()(std::declval<Args>()...)),Return>::value>>
-	lambda(Lambda other) : Parent(&lambda_internal::vtable<Lambda, Return, Args...>::instance, typename Parent::Private()) {
-		lambda_internal::vtable<Lambda, Return, Args...>::construct_move_lambda_method(this->data_.storage, &other);
-	}
-	template <typename Lambda, typename = std::enable_if_t<std::is_convertible<decltype(std::declval<Lambda>()(std::declval<Args>()...)),Return>::value>>
-	lambda &operator=(Lambda other) {
-		if (this->data_.vtable) {
-			this->data_.vtable->destruct(this->data_.storage);
-		}
-		this->data_.vtable = &lambda_internal::vtable<Lambda, Return, Args...>::instance;
-		lambda_internal::vtable<Lambda, Return, Args...>::construct_move_lambda_method(this->data_.storage, &other);
-		return *this;
-	}
-
-	template <
-		typename ...OtherArgs,
-		typename = std::enable_if_t<(sizeof...(Args) == sizeof...(OtherArgs))>>
-	inline Return operator()(OtherArgs&&... args) const {
-		Assert(this->data_.vtable != nullptr);
-		return this->data_.vtable->const_call(
-			this->data_.storage,
-			std::forward<OtherArgs>(args)...);
-	}
-
-	void swap(lambda &other) {
-		if (this != &other) {
-			std::swap(*this, other);
-		}
-	}
-
-};
-
-} // namespace base
-
-#ifdef LambdaAssertDefined
-#undef Assert
-#endif // LambdaAssertDefined
-
-#ifdef LambdaUnexpectedDefined
-#undef Unexpected
-#endif // LambdaUnexpectedDefined
-
-#endif // CUSTOM_LAMBDA_WRAP

Telegram/SourceFiles/base/lambda_guard.h

@@ -1,114 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#pragma once
-
-#include <QPointer>
-#include "base/weak_ptr.h"
-
-// Guard lambda call by QObject* or has_weak_ptr* pointers.
-
-namespace base {
-namespace lambda_internal {
-
-template <typename Lambda>
-class guard_with_QObject {
-public:
-	template <typename OtherLambda>
-	guard_with_QObject(const QObject *object, OtherLambda &&other)
-	: _guard(object)
-	, _callable(std::forward<OtherLambda>(other)) {
-	}
-
-	template <
-		typename ...OtherArgs,
-		typename Return = decltype(std::declval<Lambda>()(std::declval<OtherArgs>()...))>
-	Return operator()(OtherArgs &&...args) {
-		return _guard
-			? _callable(std::forward<OtherArgs>(args)...)
-			: Return();
-	}
-
-	template <
-		typename ...OtherArgs,
-		typename Return = decltype(std::declval<Lambda>()(std::declval<OtherArgs>()...))>
-	Return operator()(OtherArgs &&...args) const {
-		return _guard
-			? _callable(std::forward<OtherArgs>(args)...)
-			: Return();
-	}
-
-private:
-	QPointer<const QObject> _guard;
-	Lambda _callable;
-
-};
-
-template <typename Lambda>
-class guard_with_weak {
-public:
-	template <typename OtherLambda>
-	guard_with_weak(
-		const base::has_weak_ptr *object,
-		OtherLambda &&other)
-	: _guard(base::make_weak(object))
-	, _callable(std::forward<OtherLambda>(other)) {
-	}
-
-	template <
-		typename ...OtherArgs,
-		typename Return = decltype(std::declval<Lambda>()(std::declval<OtherArgs>()...))>
-	Return operator()(OtherArgs &&...args) {
-		return _guard
-			? _callable(std::forward<OtherArgs>(args)...)
-			: Return();
-	}
-
-	template <
-		typename ...OtherArgs,
-		typename Return = decltype(std::declval<Lambda>()(std::declval<OtherArgs>()...))>
-	Return operator()(OtherArgs &&...args) const {
-		return _guard
-			? _callable(std::forward<OtherArgs>(args)...)
-			: Return();
-	}
-
-private:
-	base::weak_ptr<const base::has_weak_ptr> _guard;
-	Lambda _callable;
-
-};
-
-template <typename Lambda>
-struct lambda_call_type<guard_with_QObject<Lambda>> {
-	using type = lambda_call_type_t<Lambda>;
-};
-
-template <typename Lambda>
-struct lambda_call_type<guard_with_weak<Lambda>> {
-	using type = lambda_call_type_t<Lambda>;
-};
-
-} // namespace lambda_internal
-
-template <typename Lambda>
-inline auto lambda_guarded(const QObject *object, Lambda &&lambda) {
-	using Guarded = lambda_internal::guard_with_QObject<
-		std::decay_t<Lambda>>;
-	return Guarded(object, std::forward<Lambda>(lambda));
-}
-
-template <typename Lambda>
-inline auto lambda_guarded(
-		const base::has_weak_ptr *object,
-		Lambda &&lambda) {
-	using Guarded = lambda_internal::guard_with_weak<
-		std::decay_t<Lambda>>;
-	return Guarded(object, std::forward<Lambda>(lambda));
-}
-
-} // namespace base

Telegram/SourceFiles/base/observer.h

@@ -15,19 +15,19 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace base {
 namespace internal {
 
-using ObservableCallHandlers = base::lambda<void()>;
+using ObservableCallHandlers = Fn<void()>;
 void RegisterPendingObservable(ObservableCallHandlers *handlers);
 void UnregisterActiveObservable(ObservableCallHandlers *handlers);
 void UnregisterObservable(ObservableCallHandlers *handlers);
 
 template <typename EventType>
 struct SubscriptionHandlerHelper {
-	using type = base::lambda<void(parameter_type<EventType>)>;
+	using type = Fn<void(parameter_type<EventType>)>;
 };
 
 template <>
 struct SubscriptionHandlerHelper<void> {
-	using type = base::lambda<void()>;
+	using type = Fn<void()>;
 };
 
 template <typename EventType>

Telegram/SourceFiles/base/openssl_help.h

@@ -7,10 +7,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "base/bytes.h"
+
+extern "C" {
 #include <openssl/bn.h>
 #include <openssl/sha.h>
 #include <openssl/rand.h>
-#include "base/bytes.h"
+#include <openssl/aes.h>
+#include <openssl/crypto.h>
+} // extern "C"
 
 namespace openssl {
 
@@ -61,7 +66,7 @@ public:
 	explicit BigNum(unsigned int word) : BigNum() {
 		setWord(word);
 	}
-	explicit BigNum(base::const_byte_span bytes) : BigNum() {
+	explicit BigNum(bytes::const_span bytes) : BigNum() {
 		setBytes(bytes);
 	}
 
@@ -70,7 +75,7 @@ public:
 			_failed = true;
 		}
 	}
-	void setBytes(base::const_byte_span bytes) {
+	void setBytes(bytes::const_span bytes) {
 		if (!BN_bin2bn(
 				reinterpret_cast<const unsigned char*>(bytes.data()),
 				bytes.size(),
@@ -162,12 +167,12 @@ public:
 		return failed() ? 0 : BN_num_bytes(raw());
 	}
 
-	base::byte_vector getBytes() const {
+	bytes::vector getBytes() const {
 		if (failed()) {
-			return base::byte_vector();
+			return {};
 		}
 		auto length = BN_num_bytes(raw());
-		auto result = base::byte_vector(length, gsl::byte());
+		auto result = bytes::vector(length);
 		auto resultSize = BN_bn2bin(
 			raw(),
 			reinterpret_cast<unsigned char*>(result.data()));
@@ -207,20 +212,35 @@ inline BigNum operator-(const BigNum &a, const BigNum &b) {
 	return result;
 }
 
-inline base::byte_array<SHA256_DIGEST_LENGTH> Sha256(base::const_byte_span bytes) {
-	auto result = base::byte_array<SHA256_DIGEST_LENGTH>();
-	SHA256(reinterpret_cast<const unsigned char*>(bytes.data()), bytes.size(), reinterpret_cast<unsigned char*>(result.data()));
+inline bytes::vector Sha512(bytes::const_span data) {
+	auto result = bytes::vector(SHA512_DIGEST_LENGTH);
+	SHA512(
+		reinterpret_cast<const unsigned char*>(data.data()),
+		data.size(),
+		reinterpret_cast<unsigned char*>(result.data()));
 	return result;
 }
 
-inline base::byte_array<SHA_DIGEST_LENGTH> Sha1(base::const_byte_span bytes) {
-	auto result = base::byte_array<SHA_DIGEST_LENGTH>();
-	SHA1(reinterpret_cast<const unsigned char*>(bytes.data()), bytes.size(), reinterpret_cast<unsigned char*>(result.data()));
+inline bytes::vector Sha256(bytes::const_span data) {
+	auto result = bytes::vector(SHA256_DIGEST_LENGTH);
+	SHA256(
+		reinterpret_cast<const unsigned char*>(data.data()),
+		data.size(),
+		reinterpret_cast<unsigned char*>(result.data()));
 	return result;
 }
 
-inline int FillRandom(base::byte_span bytes) {
-	return RAND_bytes(reinterpret_cast<unsigned char*>(bytes.data()), bytes.size());
+inline bytes::vector Sha1(bytes::const_span data) {
+	auto result = bytes::vector(SHA_DIGEST_LENGTH);
+	SHA1(
+		reinterpret_cast<const unsigned char*>(data.data()),
+		data.size(),
+		reinterpret_cast<unsigned char*>(result.data()));
+	return result;
+}
+
+inline void AddRandomSeed(bytes::const_span data) {
+	RAND_seed(data.data(), data.size());
 }
 
 } // namespace openssl

Telegram/SourceFiles/base/optional.h

@@ -87,6 +87,15 @@ public:
 		return _impl >= other._impl;
 	}
 
+	template <typename T, typename... Args>
+	T &set(Args &&...args) {
+		_impl.template set<T>(std::forward<Args>(args)...);
+		return get_unchecked<T>();
+	}
+	void clear() {
+		_impl.template set<none_type>();
+	}
+
 	template <typename T>
 	decltype(auto) is() const {
 		return _impl.template is<T>();
@@ -146,28 +155,34 @@ using optional_chain_result_t = typename optional_chain_result<Type>::type;
 
 template <typename Type>
 class optional : public optional_variant<Type> {
+	using parent = optional_variant<Type>;
+
 public:
-	using optional_variant<Type>::optional_variant;
+	using parent::parent;
 
 	Type &operator*() {
-		auto result = get_if<Type>(this);
-		Expects(result != nullptr);
-		return *result;
+		Expects(parent::template is<Type>());
+
+		return parent::template get_unchecked<Type>();
 	}
 	const Type &operator*() const {
-		auto result = get_if<Type>(this);
-		Expects(result != nullptr);
-		return *result;
+		Expects(parent::template is<Type>());
+
+		return parent::template get_unchecked<Type>();
 	}
 	Type *operator->() {
-		auto result = get_if<Type>(this);
-		Expects(result != nullptr);
-		return result;
+		Expects(parent::template is<Type>());
+
+		return std::addressof(parent::template get_unchecked<Type>());
 	}
 	const Type *operator->() const {
-		auto result = get_if<Type>(this);
-		Expects(result != nullptr);
-		return result;
+		Expects(parent::template is<Type>());
+
+		return std::addressof(parent::template get_unchecked<Type>());
+	}
+	template <typename ...Args>
+	Type &emplace(Args &&...args) {
+		return parent::template set<Type>(std::forward<Args>(args)...);
 	}
 
 };

Telegram/SourceFiles/base/qthelp_url.cpp

@@ -44,4 +44,15 @@ bool is_ipv6(const QString &ip) {
 	return ip.indexOf('.') < 0 && ip.indexOf(':') >= 0;
 }
 
+QString url_append_query_or_hash(const QString &url, const QString &add) {
+	const auto query = url.lastIndexOf('?');
+	if (query < 0) {
+		return url + '?' + add;
+	}
+	const auto hash = url.lastIndexOf('#');
+	return url
+		+ (query >= 0 && query > url.lastIndexOf('#') ? '&' : '?')
+		+ add;
+}
+
 } // namespace qthelp

Telegram/SourceFiles/base/qthelp_url.h

@@ -22,7 +22,11 @@ enum class UrlParamNameTransform {
 	ToLower,
 };
 // Parses a string like "p1=v1&p2=v2&..&pn=vn" to a map.
-QMap<QString, QString> url_parse_params(const QString &params, UrlParamNameTransform transform = UrlParamNameTransform::NoTransform);
+QMap<QString, QString> url_parse_params(
+	const QString &params,
+	UrlParamNameTransform transform = UrlParamNameTransform::NoTransform);
+
+QString url_append_query_or_hash(const QString &url, const QString &add);
 
 bool is_ipv6(const QString &ip);
 

Telegram/SourceFiles/base/timer.cpp

@@ -19,13 +19,13 @@ QObject *TimersAdjuster() {
 
 Timer::Timer(
 	not_null<QThread*> thread,
-	base::lambda<void()> callback)
+	Fn<void()> callback)
 : Timer(std::move(callback)) {
 	moveToThread(thread);
 }
 
 
-Timer::Timer(base::lambda<void()> callback)
+Timer::Timer(Fn<void()> callback)
 : QObject(nullptr)
 , _callback(std::move(callback))
 , _type(Qt::PreciseTimer)
@@ -114,7 +114,7 @@ void Timer::timerEvent(QTimerEvent *e) {
 
 int DelayedCallTimer::call(
 		TimeMs timeout,
-		lambda_once<void()> callback,
+		FnMut<void()> callback,
 		Qt::TimerType type) {
 	Expects(timeout >= 0);
 

Telegram/SourceFiles/base/timer.h

@@ -7,7 +7,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "base/lambda.h"
 #include "base/observer.h"
 
 namespace base {
@@ -16,15 +15,15 @@ class Timer final : private QObject {
 public:
 	explicit Timer(
 		not_null<QThread*> thread,
-		base::lambda<void()> callback = nullptr);
-	explicit Timer(base::lambda<void()> callback = nullptr);
+		Fn<void()> callback = nullptr);
+	explicit Timer(Fn<void()> callback = nullptr);
 
 	static Qt::TimerType DefaultType(TimeMs timeout) {
 		constexpr auto kThreshold = TimeMs(1000);
 		return (timeout > kThreshold) ? Qt::CoarseTimer : Qt::PreciseTimer;
 	}
 
-	void setCallback(base::lambda<void()> callback) {
+	void setCallback(Fn<void()> callback) {
 		_callback = std::move(callback);
 	}
 
@@ -74,7 +73,7 @@ private:
 		return static_cast<Repeat>(_repeat);
 	}
 
-	base::lambda<void()> _callback;
+	Fn<void()> _callback;
 	TimeMs _next = 0;
 	int _timeout = 0;
 	int _timerId = 0;
@@ -87,7 +86,7 @@ private:
 
 class DelayedCallTimer final : private QObject {
 public:
-	int call(TimeMs timeout, lambda_once<void()> callback) {
+	int call(TimeMs timeout, FnMut<void()> callback) {
 		return call(
 			timeout,
 			std::move(callback),
@@ -96,7 +95,7 @@ public:
 
 	int call(
 		TimeMs timeout,
-		lambda_once<void()> callback,
+		FnMut<void()> callback,
 		Qt::TimerType type);
 	void cancel(int callId);
 
@@ -104,7 +103,7 @@ protected:
 	void timerEvent(QTimerEvent *e) override;
 
 private:
-	base::flat_map<int, lambda_once<void()>> _callbacks;
+	base::flat_map<int, FnMut<void()>> _callbacks;
 
 };
 

Telegram/SourceFiles/base/unique_function.h

@@ -7,6 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include <functional>
+
 #ifndef Unexpected
 #define Unexpected(message) std::abort()
 #define UniqueFunctionUnexpected
@@ -47,7 +49,7 @@ public:
 	}
 
 	template <typename ...Args>
-	decltype(auto) operator()(Args &&...args) const {
+	decltype(auto) operator()(Args &&...args) {
 		return _value(std::forward<Args>(args)...);
 	}
 
@@ -59,7 +61,7 @@ private:
 		Unexpected("Attempt to copy-assign a move-only type.");
 	}
 
-	mutable Callable _value;
+	Callable _value;
 
 };
 

Telegram/SourceFiles/boxes/abstract_box.cpp

@@ -20,8 +20,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mainwindow.h"
 
 QPointer<Ui::RoundButton> BoxContent::addButton(
-		base::lambda<QString()> textFactory,
-		base::lambda<void()> clickCallback) {
+		Fn<QString()> textFactory,
+		Fn<void()> clickCallback) {
 	return addButton(
 		std::move(textFactory),
 		std::move(clickCallback),
@@ -29,11 +29,11 @@ QPointer<Ui::RoundButton> BoxContent::addButton(
 }
 
 QPointer<Ui::RoundButton> BoxContent::addLeftButton(
-		base::lambda<QString()> textFactory,
-		base::lambda<void()> clickCallback) {
+		Fn<QString()> textFactory,
+		Fn<void()> clickCallback) {
 	return getDelegate()->addLeftButton(
-		std::move(textFactory), 
-		std::move(clickCallback), 
+		std::move(textFactory),
+		std::move(clickCallback),
 		st::defaultBoxButton);
 }
 
@@ -76,6 +76,8 @@ void BoxContent::finishPrepare() {
 
 void BoxContent::finishScrollCreate() {
 	Expects(_scroll != nullptr);
+
+	_scroll->show();
 	updateScrollAreaGeometry();
 	connect(_scroll, SIGNAL(scrolled()), this, SLOT(onScroll()));
 	connect(_scroll, SIGNAL(innerResized()), this, SLOT(onInnerResize()));
@@ -188,6 +190,14 @@ void BoxContent::resizeEvent(QResizeEvent *e) {
 	}
 }
 
+void BoxContent::keyPressEvent(QKeyEvent *e) {
+	if (e->key() == Qt::Key_Escape && !_closeByEscape) {
+		e->accept();
+	} else {
+		RpWidget::keyPressEvent(e);
+	}
+}
+
 void BoxContent::updateScrollAreaGeometry() {
 	auto newScrollHeight = height() - _innerTopSkip - _innerBottomSkip;
 	auto changed = (_scroll->height() != newScrollHeight);
@@ -225,8 +235,9 @@ void BoxContent::paintEvent(QPaintEvent *e) {
 	}
 }
 
-AbstractBox::AbstractBox(QWidget *parent, Window::Controller *controller, object_ptr<BoxContent> content) : LayerWidget(parent)
-, _controller(controller)
+AbstractBox::AbstractBox(not_null<Window::LayerStackWidget*> layer, object_ptr<BoxContent> content)
+: LayerWidget(layer)
+, _layer(layer)
 , _content(std::move(content)) {
 	subscribe(Lang::Current().updated(), [this] { refreshLang(); });
 	_content->setParent(this);
@@ -287,7 +298,7 @@ void AbstractBox::parentResized() {
 	update();
 }
 
-void AbstractBox::setTitle(base::lambda<TextWithEntities()> titleFactory) {
+void AbstractBox::setTitle(Fn<TextWithEntities()> titleFactory) {
 	_titleFactory = std::move(titleFactory);
 	refreshTitle();
 }
@@ -308,11 +319,19 @@ void AbstractBox::refreshTitle() {
 	}
 }
 
-void AbstractBox::setAdditionalTitle(base::lambda<QString()> additionalFactory) {
+void AbstractBox::setAdditionalTitle(Fn<QString()> additionalFactory) {
 	_additionalTitleFactory = std::move(additionalFactory);
 	refreshAdditionalTitle();
 }
 
+void AbstractBox::setCloseByOutsideClick(bool close) {
+	_closeByOutsideClick = close;
+}
+
+bool AbstractBox::closeByOutsideClick() const {
+	return _closeByOutsideClick;
+}
+
 void AbstractBox::refreshAdditionalTitle() {
 	_additionalTitle = _additionalTitleFactory ? _additionalTitleFactory() : QString();
 	update();
@@ -328,6 +347,13 @@ bool AbstractBox::hasTitle() const {
 	return (_title != nullptr) || !_additionalTitle.isEmpty();
 }
 
+void AbstractBox::showBox(
+		object_ptr<BoxContent> box,
+		LayerOptions options,
+		anim::type animated) {
+	_layer->showBox(std::move(box), options, animated);
+}
+
 void AbstractBox::updateSize() {
 	setDimensions(width(), _maxContentHeight);
 }
@@ -363,7 +389,7 @@ void AbstractBox::clearButtons() {
 	_leftButton.destroy();
 }
 
-QPointer<Ui::RoundButton> AbstractBox::addButton(base::lambda<QString()> textFactory, base::lambda<void()> clickCallback, const style::RoundButton &st) {
+QPointer<Ui::RoundButton> AbstractBox::addButton(Fn<QString()> textFactory, Fn<void()> clickCallback, const style::RoundButton &st) {
 	_buttons.push_back(object_ptr<Ui::RoundButton>(this, std::move(textFactory), st));
 	auto result = QPointer<Ui::RoundButton>(_buttons.back());
 	result->setClickedCallback(std::move(clickCallback));
@@ -372,7 +398,7 @@ QPointer<Ui::RoundButton> AbstractBox::addButton(base::lambda<QString()> textFac
 	return result;
 }
 
-QPointer<Ui::RoundButton> AbstractBox::addLeftButton(base::lambda<QString()> textFactory, base::lambda<void()> clickCallback, const style::RoundButton &st) {
+QPointer<Ui::RoundButton> AbstractBox::addLeftButton(Fn<QString()> textFactory, Fn<void()> clickCallback, const style::RoundButton &st) {
 	_leftButton = object_ptr<Ui::RoundButton>(this, std::move(textFactory), st);
 	auto result = QPointer<Ui::RoundButton>(_leftButton);
 	result->setClickedCallback(std::move(clickCallback));
@@ -436,11 +462,13 @@ void AbstractBox::keyPressEvent(QKeyEvent *e) {
 	}
 }
 
-BoxContentDivider::BoxContentDivider(QWidget *parent) : RpWidget(parent) {
+BoxContentDivider::BoxContentDivider(QWidget *parent)
+: BoxContentDivider(parent, st::rightsDividerHeight) {
 }
 
-int BoxContentDivider::resizeGetHeight(int newWidth) {
-	return st::rightsDividerHeight;
+BoxContentDivider::BoxContentDivider(QWidget *parent, int height)
+: RpWidget(parent) {
+	resize(width(), height);
 }
 
 void BoxContentDivider::paintEvent(QPaintEvent *e) {

Telegram/SourceFiles/boxes/abstract_box.h

@@ -23,28 +23,39 @@ class FlatLabel;
 class FadeShadow;
 } // namespace Ui
 
-namespace Window {
-class Controller;
-} // namespace Window
+class BoxContent;
 
 class BoxContentDelegate {
 public:
-	virtual Window::Controller *controller() const = 0;
-
 	virtual void setLayerType(bool layerType) = 0;
-	virtual void setTitle(base::lambda<TextWithEntities()> titleFactory) = 0;
-	virtual void setAdditionalTitle(base::lambda<QString()> additionalFactory) = 0;
+	virtual void setTitle(Fn<TextWithEntities()> titleFactory) = 0;
+	virtual void setAdditionalTitle(Fn<QString()> additionalFactory) = 0;
+	virtual void setCloseByOutsideClick(bool close) = 0;
 
 	virtual void clearButtons() = 0;
-	virtual QPointer<Ui::RoundButton> addButton(base::lambda<QString()> textFactory, base::lambda<void()> clickCallback, const style::RoundButton &st) = 0;
-	virtual QPointer<Ui::RoundButton> addLeftButton(base::lambda<QString()> textFactory, base::lambda<void()> clickCallback, const style::RoundButton &st) = 0;
+	virtual QPointer<Ui::RoundButton> addButton(Fn<QString()> textFactory, Fn<void()> clickCallback, const style::RoundButton &st) = 0;
+	virtual QPointer<Ui::RoundButton> addLeftButton(Fn<QString()> textFactory, Fn<void()> clickCallback, const style::RoundButton &st) = 0;
 	virtual void updateButtonsPositions() = 0;
 
+	virtual void showBox(
+		object_ptr<BoxContent> box,
+		LayerOptions options,
+		anim::type animated) = 0;
 	virtual void setDimensions(int newWidth, int maxHeight) = 0;
 	virtual void setNoContentMargin(bool noContentMargin) = 0;
 	virtual bool isBoxShown() const = 0;
 	virtual void closeBox() = 0;
 
+	template <typename BoxType>
+	QPointer<BoxType> show(
+			object_ptr<BoxType> content,
+			LayerOptions options = LayerOption::KeepOther,
+			anim::type animated = anim::type::normal) {
+		auto result = QPointer<BoxType>(content.data());
+		showBox(std::move(content), options, animated);
+		return result;
+	}
+
 };
 
 class BoxContent : public Ui::RpWidget, protected base::Subscriber {
@@ -62,28 +73,34 @@ public:
 		getDelegate()->closeBox();
 	}
 
-	void setTitle(base::lambda<QString()> titleFactory) {
+	void setTitle(Fn<QString()> titleFactory) {
 		if (titleFactory) {
 			getDelegate()->setTitle([titleFactory] { return TextWithEntities { titleFactory(), EntitiesInText() }; });
 		} else {
-			getDelegate()->setTitle(base::lambda<TextWithEntities()>());
+			getDelegate()->setTitle(Fn<TextWithEntities()>());
 		}
 	}
-	void setTitle(base::lambda<TextWithEntities()> titleFactory) {
+	void setTitle(Fn<TextWithEntities()> titleFactory) {
 		getDelegate()->setTitle(std::move(titleFactory));
 	}
-	void setAdditionalTitle(base::lambda<QString()> additional) {
+	void setAdditionalTitle(Fn<QString()> additional) {
 		getDelegate()->setAdditionalTitle(std::move(additional));
 	}
+	void setCloseByEscape(bool close) {
+		_closeByEscape = close;
+	}
+	void setCloseByOutsideClick(bool close) {
+		getDelegate()->setCloseByOutsideClick(close);
+	}
 
 	void scrollToWidget(not_null<QWidget*> widget);
 
 	void clearButtons() {
 		getDelegate()->clearButtons();
 	}
-	QPointer<Ui::RoundButton> addButton(base::lambda<QString()> textFactory, base::lambda<void()> clickCallback);
-	QPointer<Ui::RoundButton> addLeftButton(base::lambda<QString()> textFactory, base::lambda<void()> clickCallback);
-	QPointer<Ui::RoundButton> addButton(base::lambda<QString()> textFactory, base::lambda<void()> clickCallback, const style::RoundButton &st) {
+	QPointer<Ui::RoundButton> addButton(Fn<QString()> textFactory, Fn<void()> clickCallback);
+	QPointer<Ui::RoundButton> addLeftButton(Fn<QString()> textFactory, Fn<void()> clickCallback);
+	QPointer<Ui::RoundButton> addButton(Fn<QString()> textFactory, Fn<void()> clickCallback, const style::RoundButton &st) {
 		return getDelegate()->addButton(std::move(textFactory), std::move(clickCallback), st);
 	}
 	void updateButtonsGeometry() {
@@ -94,7 +111,12 @@ public:
 		setFocus();
 	}
 
-	base::Observable<void> boxClosing;
+	rpl::producer<> boxClosing() const {
+		return _boxClosingStream.events();
+	}
+	void notifyBoxClosing() {
+		_boxClosingStream.fire({});
+	}
 
 	void setDelegate(BoxContentDelegate *newDelegate) {
 		_delegate = newDelegate;
@@ -103,10 +125,6 @@ public:
 		finishPrepare();
 	}
 
-	Window::Controller *controller() {
-		return getDelegate()->controller();
-	}
-
 public slots:
 	void onScrollToY(int top, int bottom = -1);
 
@@ -167,6 +185,11 @@ protected:
 
 	void resizeEvent(QResizeEvent *e) override;
 	void paintEvent(QPaintEvent *e) override;
+	void keyPressEvent(QKeyEvent *e) override;
+
+	not_null<BoxContentDelegate*> getDelegate() const {
+		return _delegate;
+	}
 
 private slots:
 	void onScroll();
@@ -184,14 +207,11 @@ private:
 	void updateShadowsVisibility();
 	object_ptr<TWidget> doTakeInnerWidget();
 
-	BoxContentDelegate *getDelegate() const {
-		Expects(_delegate != nullptr);
-		return _delegate;
-	}
 	BoxContentDelegate *_delegate = nullptr;
 
 	bool _preparing = false;
 	bool _noContentMargin = false;
+	bool _closeByEscape = true;
 	int _innerTopSkip = 0;
 	int _innerBottomSkip = 0;
 	object_ptr<Ui::ScrollArea> _scroll = { nullptr };
@@ -201,6 +221,8 @@ private:
 	object_ptr<QTimer> _draggingScrollTimer = { nullptr };
 	int _draggingScrollDelta = 0;
 
+	rpl::event_stream<> _boxClosingStream;
+
 };
 
 class AbstractBox
@@ -208,20 +230,23 @@ class AbstractBox
 	, public BoxContentDelegate
 	, protected base::Subscriber {
 public:
-	AbstractBox(QWidget *parent, Window::Controller *controller, object_ptr<BoxContent> content);
+	AbstractBox(
+		not_null<Window::LayerStackWidget*> layer,
+		object_ptr<BoxContent> content);
 
-	Window::Controller *controller() const override {
-		return _controller;
-	}
 	void parentResized() override;
 
 	void setLayerType(bool layerType) override;
-	void setTitle(base::lambda<TextWithEntities()> titleFactory) override;
-	void setAdditionalTitle(base::lambda<QString()> additionalFactory) override;
+	void setTitle(Fn<TextWithEntities()> titleFactory) override;
+	void setAdditionalTitle(Fn<QString()> additionalFactory) override;
+	void showBox(
+		object_ptr<BoxContent> box,
+		LayerOptions options,
+		anim::type animated) override;
 
 	void clearButtons() override;
-	QPointer<Ui::RoundButton> addButton(base::lambda<QString()> textFactory, base::lambda<void()> clickCallback, const style::RoundButton &st) override;
-	QPointer<Ui::RoundButton> addLeftButton(base::lambda<QString()> textFactory, base::lambda<void()> clickCallback, const style::RoundButton &st) override;
+	QPointer<Ui::RoundButton> addButton(Fn<QString()> textFactory, Fn<void()> clickCallback, const style::RoundButton &st) override;
+	QPointer<Ui::RoundButton> addLeftButton(Fn<QString()> textFactory, Fn<void()> clickCallback, const style::RoundButton &st) override;
 	void updateButtonsPositions() override;
 
 	void setDimensions(int newWidth, int maxHeight) override;
@@ -240,6 +265,9 @@ public:
 		closeLayer();
 	}
 
+	void setCloseByOutsideClick(bool close) override;
+	bool closeByOutsideClick() const override;
+
 protected:
 	void keyPressEvent(QKeyEvent *e) override;
 	void resizeEvent(QResizeEvent *e) override;
@@ -249,7 +277,7 @@ protected:
 		_content->setInnerFocus();
 	}
 	void closeHook() override {
-		_content->boxClosing.notify(true);
+		_content->notifyBoxClosing();
 	}
 
 private:
@@ -268,7 +296,7 @@ private:
 	int countRealHeight() const;
 	void updateSize();
 
-	Window::Controller *_controller = nullptr;
+	not_null<Window::LayerStackWidget*> _layer;
 	int _fullHeight = 0;
 
 	bool _noContentMargin = false;
@@ -276,12 +304,13 @@ private:
 	object_ptr<BoxContent> _content;
 
 	object_ptr<Ui::FlatLabel> _title = { nullptr };
-	base::lambda<TextWithEntities()> _titleFactory;
+	Fn<TextWithEntities()> _titleFactory;
 	QString _additionalTitle;
-	base::lambda<QString()> _additionalTitleFactory;
+	Fn<QString()> _additionalTitleFactory;
 	int _titleLeft = 0;
 	int _titleTop = 0;
 	bool _layerType = false;
+	bool _closeByOutsideClick = true;
 
 	std::vector<object_ptr<Ui::RoundButton>> _buttons;
 	object_ptr<Ui::RoundButton> _leftButton = { nullptr };
@@ -291,9 +320,9 @@ private:
 class BoxContentDivider : public Ui::RpWidget {
 public:
 	BoxContentDivider(QWidget *parent);
+	BoxContentDivider(QWidget *parent, int height);
 
 protected:
-	int resizeGetHeight(int newWidth) override;
 	void paintEvent(QPaintEvent *e) override;
 
 };

Telegram/SourceFiles/boxes/add_contact_box.cpp

@@ -57,7 +57,7 @@ QString PeerFloodErrorText(PeerFloodType type) {
 
 class RevokePublicLinkBox::Inner : public TWidget, private MTP::Sender {
 public:
-	Inner(QWidget *parent, base::lambda<void()> revokeCallback);
+	Inner(QWidget *parent, Fn<void()> revokeCallback);
 
 protected:
 	void mouseMoveEvent(QMouseEvent *e) override;
@@ -85,7 +85,7 @@ private:
 	int _rowHeight = 0;
 	int _revokeWidth = 0;
 
-	base::lambda<void()> _revokeCallback;
+	Fn<void()> _revokeCallback;
 	mtpRequestId _revokeRequestId = 0;
 	QPointer<ConfirmBox> _weakRevokeConfirmBox;
 
@@ -592,7 +592,7 @@ SetupChannelBox::SetupChannelBox(QWidget*, ChannelData *channel, bool existing)
 , _aboutPublicWidth(st::boxWideWidth - st::boxPadding.left() - st::boxButtonPadding.right() - st::newGroupPadding.left() - st::defaultRadio.diameter - st::defaultBoxCheckbox.textPosition.x())
 , _aboutPublic(st::defaultTextStyle, lang(channel->isMegagroup() ? lng_create_public_group_about : lng_create_public_channel_about), _defaultOptions, _aboutPublicWidth)
 , _aboutPrivate(st::defaultTextStyle, lang(channel->isMegagroup() ? lng_create_private_group_about : lng_create_private_channel_about), _defaultOptions, _aboutPublicWidth)
-, _link(this, st::setupChannelLink, base::lambda<QString()>(), channel->username, true) {
+, _link(this, st::setupChannelLink, Fn<QString()>(), channel->username, true) {
 }
 
 void SetupChannelBox::prepare() {
@@ -617,11 +617,13 @@ void SetupChannelBox::prepare() {
 			rtlupdate(_invitationLink);
 		}
 	}));
-	subscribe(boxClosing, [this] {
+
+	boxClosing() | rpl::start_with_next([=] {
 		if (!_existing) {
 			AddParticipantsBoxController::Start(_channel);
 		}
-	});
+	}, lifetime());
+
 	updateMaxHeight();
 }
 
@@ -817,7 +819,7 @@ void SetupChannelBox::privacyChanged(Privacy value) {
 	if (value == Privacy::Public) {
 		if (_tooMuchUsernames) {
 			_privacyGroup->setValue(Privacy::Private);
-			Ui::show(Box<RevokePublicLinkBox>(base::lambda_guarded(this, [this] {
+			Ui::show(Box<RevokePublicLinkBox>(crl::guard(this, [this] {
 				_tooMuchUsernames = false;
 				_privacyGroup->setValue(Privacy::Public);
 				check();
@@ -1387,7 +1389,7 @@ void EditChannelBox::onSaveInvitesDone(const MTPUpdates &result) {
 	closeBox();
 }
 
-RevokePublicLinkBox::Inner::Inner(QWidget *parent, base::lambda<void()> revokeCallback) : TWidget(parent)
+RevokePublicLinkBox::Inner::Inner(QWidget *parent, Fn<void()> revokeCallback) : TWidget(parent)
 , _rowHeight(st::contactsPadding.top() + st::contactsPhotoSize + st::contactsPadding.bottom())
 , _revokeWidth(st::normalFont->width(lang(lng_channels_too_much_public_revoke)))
 , _revokeCallback(std::move(revokeCallback)) {
@@ -1423,7 +1425,7 @@ RevokePublicLinkBox::Inner::Inner(QWidget *parent, base::lambda<void()> revokeCa
 	}).send();
 }
 
-RevokePublicLinkBox::RevokePublicLinkBox(QWidget*, base::lambda<void()> revokeCallback)
+RevokePublicLinkBox::RevokePublicLinkBox(QWidget*, Fn<void()> revokeCallback)
 : _aboutRevoke(this, lang(lng_channels_too_much_public_about), Ui::FlatLabel::InitType::Simple, st::aboutRevokePublicLabel)
 , _revokeCallback(std::move(revokeCallback)) {
 }
@@ -1482,7 +1484,7 @@ void RevokePublicLinkBox::Inner::mouseReleaseEvent(QMouseEvent *e) {
 		auto text_method = pressed->isMegagroup() ? lng_channels_too_much_public_revoke_confirm_group : lng_channels_too_much_public_revoke_confirm_channel;
 		auto text = text_method(lt_link, Messenger::Instance().createInternalLink(pressed->userName()), lt_group, pressed->name);
 		auto confirmText = lang(lng_channels_too_much_public_revoke);
-		_weakRevokeConfirmBox = Ui::show(Box<ConfirmBox>(text, confirmText, base::lambda_guarded(this, [this, pressed]() {
+		_weakRevokeConfirmBox = Ui::show(Box<ConfirmBox>(text, confirmText, crl::guard(this, [this, pressed]() {
 			if (_revokeRequestId) return;
 			_revokeRequestId = request(MTPchannels_UpdateUsername(pressed->asChannel()->inputChannel, MTP_string(""))).done([this](const MTPBool &result) {
 				if (_weakRevokeConfirmBox) {

Telegram/SourceFiles/boxes/add_contact_box.h

@@ -281,7 +281,7 @@ private:
 
 class RevokePublicLinkBox : public BoxContent, public RPCSender {
 public:
-	RevokePublicLinkBox(QWidget*, base::lambda<void()> revokeCallback);
+	RevokePublicLinkBox(QWidget*, Fn<void()> revokeCallback);
 
 protected:
 	void prepare() override;
@@ -295,6 +295,6 @@ private:
 	QPointer<Inner> _inner;
 
 	int _innerTop = 0;
-	base::lambda<void()> _revokeCallback;
+	Fn<void()> _revokeCallback;
 
 };

Telegram/SourceFiles/boxes/background_box.cpp

@@ -20,7 +20,7 @@ class BackgroundBox::Inner : public TWidget, public RPCSender, private base::Sub
 public:
 	Inner(QWidget *parent);
 
-	void setBackgroundChosenCallback(base::lambda<void(int index)> callback) {
+	void setBackgroundChosenCallback(Fn<void(int index)> callback) {
 		_backgroundChosenCallback = std::move(callback);
 	}
 
@@ -36,7 +36,7 @@ private:
 	void gotWallpapers(const MTPVector<MTPWallPaper> &result);
 	void updateWallpapers();
 
-	base::lambda<void(int index)> _backgroundChosenCallback;
+	Fn<void(int index)> _backgroundChosenCallback;
 
 	int _bgCount = 0;
 	int _rows = 0;

Telegram/SourceFiles/boxes/boxes.style

@@ -119,6 +119,7 @@ boxLabel: FlatLabel(defaultFlatLabel) {
 }
 boxDividerLabel: FlatLabel(boxLabel) {
 	minWidth: 245px;
+	align: align(topleft);
 	textFg: windowSubTextFg;
 	style: defaultTextStyle;
 }
@@ -784,3 +785,9 @@ proxyAboutPadding: margins(22px, 7px, 22px, 14px);
 proxyAboutSponsorPadding: margins(22px, 7px, 22px, 0px);
 
 markdownLinkFieldPadding: margins(22px, 0px, 22px, 10px);
+
+termsContent: FlatLabel(defaultFlatLabel) {
+	minWidth: 285px;
+}
+termsPadding: margins(23px, 4px, 16px, 16px);
+termsAgePadding: margins(23px, 16px, 16px, 0px);

Telegram/SourceFiles/boxes/calendar_box.cpp

@@ -192,7 +192,7 @@ public:
 		return st::calendarPadding.top() + innerHeight + st::calendarPadding.bottom();
 	}
 
-	void setDateChosenCallback(base::lambda<void(QDate)> callback) {
+	void setDateChosenCallback(Fn<void(QDate)> callback) {
 		_dateChosenCallback = std::move(callback);
 	}
 
@@ -219,7 +219,7 @@ private:
 
 	std::map<int, std::unique_ptr<Ui::RippleAnimation>> _ripples;
 
-	base::lambda<void(QDate)> _dateChosenCallback;
+	Fn<void(QDate)> _dateChosenCallback;
 
 	static constexpr auto kEmptySelection = -kDaysInWeek;
 	int _selected = kEmptySelection;
@@ -440,7 +440,7 @@ void CalendarBox::Title::paintEvent(QPaintEvent *e) {
 	p.drawTextLeft((width() - _textWidth) / 2, (height() - st::calendarTitleFont->height) / 2, width(), _text, _textWidth);
 }
 
-CalendarBox::CalendarBox(QWidget*, QDate month, QDate highlighted, base::lambda<void(QDate date)> callback)
+CalendarBox::CalendarBox(QWidget*, QDate month, QDate highlighted, Fn<void(QDate date)> callback)
 : _context(std::make_unique<Context>(month, highlighted))
 , _inner(this, _context.get())
 , _title(this, _context.get())

Telegram/SourceFiles/boxes/calendar_box.h

@@ -15,7 +15,7 @@ class IconButton;
 
 class CalendarBox : public BoxContent {
 public:
-	CalendarBox(QWidget*, QDate month, QDate highlighted, base::lambda<void(QDate date)> callback);
+	CalendarBox(QWidget*, QDate month, QDate highlighted, Fn<void(QDate date)> callback);
 
 	void setMinDate(QDate date);
 	void setMaxDate(QDate date);
@@ -44,6 +44,6 @@ private:
 	object_ptr<Ui::IconButton> _previous;
 	object_ptr<Ui::IconButton> _next;
 
-	base::lambda<void(QDate date)> _callback;
+	Fn<void(QDate date)> _callback;
 
 };

Telegram/SourceFiles/boxes/change_phone_box.cpp

@@ -144,9 +144,9 @@ void ChangePhoneBox::EnterPhone::submit() {
 	hideError();
 
 	auto phoneNumber = _phone->getLastText().trimmed();
-	_requestId = MTP::send(MTPaccount_SendChangePhoneCode(MTP_flags(0), MTP_string(phoneNumber), MTP_bool(false)), rpcDone(base::lambda_guarded(this, [this, phoneNumber](const MTPauth_SentCode &result) {
+	_requestId = MTP::send(MTPaccount_SendChangePhoneCode(MTP_flags(0), MTP_string(phoneNumber), MTP_bool(false)), rpcDone(crl::guard(this, [this, phoneNumber](const MTPauth_SentCode &result) {
 		return sendPhoneDone(phoneNumber, result);
-	})), rpcFail(base::lambda_guarded(this, [this, phoneNumber](const RPCError &error) {
+	})), rpcFail(crl::guard(this, [this, phoneNumber](const RPCError &error) {
 		return sendPhoneFail(phoneNumber, error);
 	})));
 }
@@ -213,7 +213,7 @@ ChangePhoneBox::EnterCode::EnterCode(QWidget*, const QString &phone, const QStri
 , _hash(hash)
 , _codeLength(codeLength)
 , _callTimeout(callTimeout)
-, _call(this, [this] { sendCall(); }, [this] { updateCall(); }) {
+, _call([this] { sendCall(); }, [this] { updateCall(); }) {
 }
 
 void ChangePhoneBox::EnterCode::prepare() {
@@ -265,13 +265,13 @@ void ChangePhoneBox::EnterCode::submit() {
 			Ui::hideLayer();
 		}
 		Ui::Toast::Show(lang(lng_change_phone_success));
-	}), rpcFail(base::lambda_guarded(this, [this](const RPCError &error) {
+	}), rpcFail(crl::guard(this, [this](const RPCError &error) {
 		return sendCodeFail(error);
 	})));
 }
 
 void ChangePhoneBox::EnterCode::sendCall() {
-	MTP::send(MTPauth_ResendCode(MTP_string(_phone), MTP_string(_hash)), rpcDone(base::lambda_guarded(this, [this] {
+	MTP::send(MTPauth_ResendCode(MTP_string(_phone), MTP_string(_hash)), rpcDone(crl::guard(this, [this] {
 		_call.callDone();
 	})));
 }

Telegram/SourceFiles/boxes/confirm_box.cpp

@@ -33,7 +33,7 @@ TextParseOptions _confirmBoxTextOptions = {
 	Qt::LayoutDirectionAuto, // dir
 };
 
-ConfirmBox::ConfirmBox(QWidget*, const QString &text, base::lambda_once<void()> confirmedCallback, base::lambda_once<void()> cancelledCallback)
+ConfirmBox::ConfirmBox(QWidget*, const QString &text, FnMut<void()> confirmedCallback, FnMut<void()> cancelledCallback)
 : _confirmText(lang(lng_box_ok))
 , _cancelText(lang(lng_cancel))
 , _confirmStyle(st::defaultBoxButton)
@@ -43,7 +43,7 @@ ConfirmBox::ConfirmBox(QWidget*, const QString &text, base::lambda_once<void()>
 	init(text);
 }
 
-ConfirmBox::ConfirmBox(QWidget*, const QString &text, const QString &confirmText, base::lambda_once<void()> confirmedCallback, base::lambda_once<void()> cancelledCallback)
+ConfirmBox::ConfirmBox(QWidget*, const QString &text, const QString &confirmText, FnMut<void()> confirmedCallback, FnMut<void()> cancelledCallback)
 : _confirmText(confirmText)
 , _cancelText(lang(lng_cancel))
 , _confirmStyle(st::defaultBoxButton)
@@ -53,7 +53,17 @@ ConfirmBox::ConfirmBox(QWidget*, const QString &text, const QString &confirmText
 	init(text);
 }
 
-ConfirmBox::ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const style::RoundButton &confirmStyle, base::lambda_once<void()> confirmedCallback, base::lambda_once<void()> cancelledCallback)
+ConfirmBox::ConfirmBox(QWidget*, const TextWithEntities &text, const QString &confirmText, FnMut<void()> confirmedCallback, FnMut<void()> cancelledCallback)
+: _confirmText(confirmText)
+, _cancelText(lang(lng_cancel))
+, _confirmStyle(st::defaultBoxButton)
+, _text(st::boxWidth - st::boxPadding.left() - st::boxButtonPadding.right())
+, _confirmedCallback(std::move(confirmedCallback))
+, _cancelledCallback(std::move(cancelledCallback)) {
+	init(text);
+}
+
+ConfirmBox::ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const style::RoundButton &confirmStyle, FnMut<void()> confirmedCallback, FnMut<void()> cancelledCallback)
 : _confirmText(confirmText)
 , _cancelText(lang(lng_cancel))
 , _confirmStyle(confirmStyle)
@@ -63,7 +73,7 @@ ConfirmBox::ConfirmBox(QWidget*, const QString &text, const QString &confirmText
 	init(text);
 }
 
-ConfirmBox::ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const QString &cancelText, base::lambda_once<void()> confirmedCallback, base::lambda_once<void()> cancelledCallback)
+ConfirmBox::ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const QString &cancelText, FnMut<void()> confirmedCallback, FnMut<void()> cancelledCallback)
 : _confirmText(confirmText)
 , _cancelText(cancelText)
 , _confirmStyle(st::defaultBoxButton)
@@ -73,7 +83,7 @@ ConfirmBox::ConfirmBox(QWidget*, const QString &text, const QString &confirmText
 	init(text);
 }
 
-ConfirmBox::ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const style::RoundButton &confirmStyle, const QString &cancelText, base::lambda_once<void()> confirmedCallback, base::lambda_once<void()> cancelledCallback)
+ConfirmBox::ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const style::RoundButton &confirmStyle, const QString &cancelText, FnMut<void()> confirmedCallback, FnMut<void()> cancelledCallback)
 : _confirmText(confirmText)
 , _cancelText(cancelText)
 , _confirmStyle(st::defaultBoxButton)
@@ -83,7 +93,7 @@ ConfirmBox::ConfirmBox(QWidget*, const QString &text, const QString &confirmText
 	init(text);
 }
 
-ConfirmBox::ConfirmBox(const InformBoxTag &, const QString &text, const QString &doneText, base::lambda<void()> closedCallback)
+ConfirmBox::ConfirmBox(const InformBoxTag &, const QString &text, const QString &doneText, Fn<void()> closedCallback)
 : _confirmText(doneText)
 , _confirmStyle(st::defaultBoxButton)
 , _informative(true)
@@ -93,8 +103,18 @@ ConfirmBox::ConfirmBox(const InformBoxTag &, const QString &text, const QString
 	init(text);
 }
 
-base::lambda_once<void()> ConfirmBox::generateInformCallback(base::lambda<void()> closedCallback) {
-	return base::lambda_guarded(this, [this, closedCallback] {
+ConfirmBox::ConfirmBox(const InformBoxTag &, const TextWithEntities &text, const QString &doneText, Fn<void()> closedCallback)
+: _confirmText(doneText)
+, _confirmStyle(st::defaultBoxButton)
+, _informative(true)
+, _text(st::boxWidth - st::boxPadding.left() - st::boxButtonPadding.right())
+, _confirmedCallback(generateInformCallback(closedCallback))
+, _cancelledCallback(generateInformCallback(closedCallback)) {
+	init(text);
+}
+
+FnMut<void()> ConfirmBox::generateInformCallback(Fn<void()> closedCallback) {
+	return crl::guard(this, [this, closedCallback] {
 		closeBox();
 		if (closedCallback) {
 			closedCallback();
@@ -106,16 +126,22 @@ void ConfirmBox::init(const QString &text) {
 	_text.setText(st::boxLabelStyle, text, _informative ? _confirmBoxTextOptions : _textPlainOptions);
 }
 
+void ConfirmBox::init(const TextWithEntities &text) {
+	_text.setMarkedText(st::boxLabelStyle, text, _confirmBoxTextOptions);
+}
+
 void ConfirmBox::prepare() {
 	addButton([this] { return _confirmText; }, [this] { confirmed(); }, _confirmStyle);
 	if (!_informative) {
 		addButton([this] { return _cancelText; }, [this] { _cancelled = true; closeBox(); });
 	}
-	subscribe(boxClosing, [this] {
+
+	boxClosing() | rpl::start_with_next([=] {
 		if (!_confirmed && (!_strictCancel || _cancelled) && _cancelledCallback) {
 			_cancelledCallback();
 		}
-	});
+	}, lifetime());
+
 	textUpdated();
 }
 
@@ -215,10 +241,16 @@ void ConfirmBox::paintEvent(QPaintEvent *e) {
 	}
 }
 
-InformBox::InformBox(QWidget*, const QString &text, base::lambda<void()> closedCallback) : ConfirmBox(ConfirmBox::InformBoxTag(), text, lang(lng_box_ok), std::move(closedCallback)) {
+InformBox::InformBox(QWidget*, const QString &text, Fn<void()> closedCallback) : ConfirmBox(ConfirmBox::InformBoxTag(), text, lang(lng_box_ok), std::move(closedCallback)) {
 }
 
-InformBox::InformBox(QWidget*, const QString &text, const QString &doneText, base::lambda<void()> closedCallback) : ConfirmBox(ConfirmBox::InformBoxTag(), text, doneText, std::move(closedCallback)) {
+InformBox::InformBox(QWidget*, const QString &text, const QString &doneText, Fn<void()> closedCallback) : ConfirmBox(ConfirmBox::InformBoxTag(), text, doneText, std::move(closedCallback)) {
+}
+
+InformBox::InformBox(QWidget*, const TextWithEntities &text, Fn<void()> closedCallback) : ConfirmBox(ConfirmBox::InformBoxTag(), text, lang(lng_box_ok), std::move(closedCallback)) {
+}
+
+InformBox::InformBox(QWidget*, const TextWithEntities &text, const QString &doneText, Fn<void()> closedCallback) : ConfirmBox(ConfirmBox::InformBoxTag(), text, doneText, std::move(closedCallback)) {
 }
 
 MaxInviteBox::MaxInviteBox(QWidget*, not_null<ChannelData*> channel) : BoxContent()

Telegram/SourceFiles/boxes/confirm_box.h

@@ -18,11 +18,12 @@ class EmptyUserpic;
 class InformBox;
 class ConfirmBox : public BoxContent, public ClickHandlerHost {
 public:
-	ConfirmBox(QWidget*, const QString &text, base::lambda_once<void()> confirmedCallback = base::lambda_once<void()>(), base::lambda_once<void()> cancelledCallback = base::lambda_once<void()>());
-	ConfirmBox(QWidget*, const QString &text, const QString &confirmText, base::lambda_once<void()> confirmedCallback = base::lambda_once<void()>(), base::lambda_once<void()> cancelledCallback = base::lambda_once<void()>());
-	ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const style::RoundButton &confirmStyle, base::lambda_once<void()> confirmedCallback = base::lambda_once<void()>(), base::lambda_once<void()> cancelledCallback = base::lambda_once<void()>());
-	ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const QString &cancelText, base::lambda_once<void()> confirmedCallback = base::lambda_once<void()>(), base::lambda_once<void()> cancelledCallback = base::lambda_once<void()>());
-	ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const style::RoundButton &confirmStyle, const QString &cancelText, base::lambda_once<void()> confirmedCallback = base::lambda_once<void()>(), base::lambda_once<void()> cancelledCallback = base::lambda_once<void()>());
+	ConfirmBox(QWidget*, const QString &text, FnMut<void()> confirmedCallback = FnMut<void()>(), FnMut<void()> cancelledCallback = FnMut<void()>());
+	ConfirmBox(QWidget*, const QString &text, const QString &confirmText, FnMut<void()> confirmedCallback = FnMut<void()>(), FnMut<void()> cancelledCallback = FnMut<void()>());
+	ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const style::RoundButton &confirmStyle, FnMut<void()> confirmedCallback = FnMut<void()>(), FnMut<void()> cancelledCallback = FnMut<void()>());
+	ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const QString &cancelText, FnMut<void()> confirmedCallback = FnMut<void()>(), FnMut<void()> cancelledCallback = FnMut<void()>());
+	ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const style::RoundButton &confirmStyle, const QString &cancelText, FnMut<void()> confirmedCallback = FnMut<void()>(), FnMut<void()> cancelledCallback = FnMut<void()>());
+	ConfirmBox(QWidget*, const TextWithEntities &text, const QString &confirmText, FnMut<void()> confirmedCallback = nullptr, FnMut<void()> cancelledCallback = nullptr);
 
 	void updateLink();
 
@@ -50,12 +51,14 @@ protected:
 private:
 	struct InformBoxTag {
 	};
-	ConfirmBox(const InformBoxTag &, const QString &text, const QString &doneText, base::lambda<void()> closedCallback);
-	base::lambda_once<void()> generateInformCallback(base::lambda<void()> closedCallback);
+	ConfirmBox(const InformBoxTag &, const QString &text, const QString &doneText, Fn<void()> closedCallback);
+	ConfirmBox(const InformBoxTag &, const TextWithEntities &text, const QString &doneText, Fn<void()> closedCallback);
+	FnMut<void()> generateInformCallback(Fn<void()> closedCallback);
 	friend class InformBox;
 
 	void confirmed();
 	void init(const QString &text);
+	void init(const TextWithEntities &text);
 	void textUpdated();
 	void updateHover();
 
@@ -74,15 +77,17 @@ private:
 	bool _confirmed = false;
 	bool _cancelled = false;
 	bool _strictCancel = false;
-	base::lambda_once<void()> _confirmedCallback;
-	base::lambda_once<void()> _cancelledCallback;
+	FnMut<void()> _confirmedCallback;
+	FnMut<void()> _cancelledCallback;
 
 };
 
 class InformBox : public ConfirmBox {
 public:
-	InformBox(QWidget*, const QString &text, base::lambda<void()> closedCallback = base::lambda<void()>());
-	InformBox(QWidget*, const QString &text, const QString &doneText, base::lambda<void()> closedCallback = base::lambda<void()>());
+	InformBox(QWidget*, const QString &text, Fn<void()> closedCallback = nullptr);
+	InformBox(QWidget*, const QString &text, const QString &doneText, Fn<void()> closedCallback = nullptr);
+	InformBox(QWidget*, const TextWithEntities &text, Fn<void()> closedCallback = nullptr);
+	InformBox(QWidget*, const TextWithEntities &text, const QString &doneText, Fn<void()> closedCallback = nullptr);
 
 };
 
@@ -168,7 +173,7 @@ public:
 		bool suggestModerateActions);
 	DeleteMessagesBox(QWidget*, MessageIdsList &&selected);
 
-	void setDeleteConfirmedCallback(base::lambda<void()> callback) {
+	void setDeleteConfirmedCallback(Fn<void()> callback) {
 		_deleteConfirmedCallback = std::move(callback);
 	}
 
@@ -194,7 +199,7 @@ private:
 	object_ptr<Ui::Checkbox> _reportSpam = { nullptr };
 	object_ptr<Ui::Checkbox> _deleteAll = { nullptr };
 
-	base::lambda<void()> _deleteConfirmedCallback;
+	Fn<void()> _deleteConfirmedCallback;
 
 };
 

Telegram/SourceFiles/boxes/confirm_phone_box.cpp

@@ -76,15 +76,14 @@ void SentCodeField::fix() {
 	}
 }
 
-SentCodeCall::SentCodeCall(QObject *parent, base::lambda_once<void()> callCallback, base::lambda<void()> updateCallback)
-: _timer(parent)
-, _call(std::move(callCallback))
+SentCodeCall::SentCodeCall(FnMut<void()> callCallback, Fn<void()> updateCallback)
+: _call(std::move(callCallback))
 , _update(std::move(updateCallback)) {
-	_timer->connect(_timer, &QTimer::timeout, [this] {
+	_timer.setCallback([=] {
 		if (_status.state == State::Waiting) {
 			if (--_status.timeout <= 0) {
 				_status.state = State::Calling;
-				_timer->stop();
+				_timer.cancel();
 				if (_call) {
 					_call();
 				}
@@ -99,7 +98,7 @@ SentCodeCall::SentCodeCall(QObject *parent, base::lambda_once<void()> callCallba
 void SentCodeCall::setStatus(const Status &status) {
 	_status = status;
 	if (_status.state == State::Waiting) {
-		_timer->start(1000);
+		_timer.callEach(1000);
 	}
 }
 
@@ -130,7 +129,7 @@ void ConfirmPhoneBox::start(const QString &phone, const QString &hash) {
 ConfirmPhoneBox::ConfirmPhoneBox(QWidget*, const QString &phone, const QString &hash)
 : _phone(phone)
 , _hash(hash)
-, _call(this, [this] { sendCall(); }, [this] { update(); }) {
+, _call([this] { sendCall(); }, [this] { update(); }) {
 }
 
 void ConfirmPhoneBox::sendCall() {

Telegram/SourceFiles/boxes/confirm_phone_box.h

@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "boxes/abstract_box.h"
+#include "base/timer.h"
 #include "ui/widgets/input_fields.h"
 
 namespace Ui {
@@ -17,15 +18,15 @@ class FlatLabel;
 
 class SentCodeField : public Ui::InputField {
 public:
-	SentCodeField(QWidget *parent, const style::InputField &st, base::lambda<QString()> placeholderFactory = base::lambda<QString()>(), const QString &val = QString()) : Ui::InputField(parent, st, std::move(placeholderFactory), val) {
+	SentCodeField(QWidget *parent, const style::InputField &st, Fn<QString()> placeholderFactory = Fn<QString()>(), const QString &val = QString()) : Ui::InputField(parent, st, std::move(placeholderFactory), val) {
 		connect(this, &Ui::InputField::changed, [this] { fix(); });
 	}
 
-	void setAutoSubmit(int length, base::lambda<void()> submitCallback) {
+	void setAutoSubmit(int length, Fn<void()> submitCallback) {
 		_autoSubmitLength = length;
 		_submitCallback = std::move(submitCallback);
 	}
-	void setChangedCallback(base::lambda<void()> changedCallback) {
+	void setChangedCallback(Fn<void()> changedCallback) {
 		_changedCallback = std::move(changedCallback);
 	}
 
@@ -36,14 +37,16 @@ private:
 	bool _fixing = false;
 
 	int _autoSubmitLength = 0;
-	base::lambda<void()> _submitCallback;
-	base::lambda<void()> _changedCallback;
+	Fn<void()> _submitCallback;
+	Fn<void()> _changedCallback;
 
 };
 
 class SentCodeCall {
 public:
-	SentCodeCall(QObject *parent, base::lambda_once<void()> callCallback, base::lambda<void()> updateCallback);
+	SentCodeCall(
+		FnMut<void()> callCallback,
+		Fn<void()> updateCallback);
 
 	enum class State {
 		Waiting,
@@ -75,9 +78,9 @@ public:
 
 private:
 	Status _status;
-	object_ptr<QTimer> _timer;
-	base::lambda_once<void()> _call;
-	base::lambda<void()> _update;
+	base::Timer _timer;
+	FnMut<void()> _call;
+	Fn<void()> _update;
 
 };
 

Telegram/SourceFiles/boxes/connection_box.cpp

@@ -125,8 +125,8 @@ public:
 	ProxyBox(
 		QWidget*,
 		const ProxyData &data,
-		base::lambda<void(ProxyData)> callback,
-		base::lambda<void(ProxyData)> shareCallback);
+		Fn<void(ProxyData)> callback,
+		Fn<void(ProxyData)> shareCallback);
 
 protected:
 	void prepare() override;
@@ -148,8 +148,8 @@ private:
 		not_null<Ui::VerticalLayout*> parent,
 		const QString &text) const;
 
-	base::lambda<void(ProxyData)> _callback;
-	base::lambda<void(ProxyData)> _shareCallback;
+	Fn<void(ProxyData)> _callback;
+	Fn<void(ProxyData)> _shareCallback;
 
 	object_ptr<Ui::VerticalLayout> _content;
 
@@ -415,7 +415,7 @@ void ProxyRow::showMenu() {
 	_menuToggle->installEventFilter(_menu);
 	const auto addAction = [&](
 			const QString &text,
-			base::lambda<void()> callback) {
+			Fn<void()> callback) {
 		return _menu->addAction(text, std::move(callback));
 	};
 	addAction(lang(lng_proxy_menu_edit), [=] {
@@ -592,7 +592,7 @@ int ProxiesBox::rowHeight() const {
 }
 
 void ProxiesBox::addNewProxy() {
-	Ui::show(_controller->addNewItemBox(), LayerOption::KeepOther);
+	getDelegate()->show(_controller->addNewItemBox());
 }
 
 void ProxiesBox::applyView(View &&view) {
@@ -660,7 +660,7 @@ void ProxiesBox::setupButtons(int id, not_null<ProxyRow*> button) {
 
 	button->editClicks(
 	) | rpl::start_with_next([=] {
-		Ui::show(_controller->editItemBox(id), LayerOption::KeepOther);
+		getDelegate()->show(_controller->editItemBox(id));
 	}, button->lifetime());
 
 	button->shareClicks(
@@ -677,8 +677,8 @@ void ProxiesBox::setupButtons(int id, not_null<ProxyRow*> button) {
 ProxyBox::ProxyBox(
 	QWidget*,
 	const ProxyData &data,
-	base::lambda<void(ProxyData)> callback,
-	base::lambda<void(ProxyData)> shareCallback)
+	Fn<void(ProxyData)> callback,
+	Fn<void(ProxyData)> shareCallback)
 : _callback(std::move(callback))
 , _shareCallback(std::move(shareCallback))
 , _content(this) {

Telegram/SourceFiles/boxes/download_path_box.cpp

@@ -83,20 +83,25 @@ void DownloadPathBox::radioChanged(Directory value) {
 }
 
 void DownloadPathBox::onEditPath() {
-	auto initialPath = [] {
+	const auto initialPath = [] {
 		if (!Global::DownloadPath().isEmpty() && Global::DownloadPath() != qstr("tmp")) {
 			return Global::DownloadPath().left(Global::DownloadPath().size() - (Global::DownloadPath().endsWith('/') ? 1 : 0));
 		}
 		return QString();
-	};
-	FileDialog::GetFolder(lang(lng_download_path_choose), initialPath(), base::lambda_guarded(this, [this](const QString &result) {
+	}();
+	const auto handleFolder = [=](const QString &result) {
 		if (!result.isEmpty()) {
 			_path = result + '/';
 			_pathBookmark = psDownloadPathBookmark(_path);
 			setPathText(QDir::toNativeSeparators(_path));
 			_group->setValue(Directory::Custom);
 		}
-	}));
+	};
+	FileDialog::GetFolder(
+		this,
+		lang(lng_download_path_choose),
+		initialPath,
+		crl::guard(this, handleFolder));
 }
 
 void DownloadPathBox::save() {

Telegram/SourceFiles/boxes/edit_caption_box.cpp

@@ -241,7 +241,7 @@ void EditCaptionBox::paintEvent(QPaintEvent *e) {
 		}
 		if (_gifPreview && _gifPreview->started()) {
 			auto s = QSize(_thumbw, _thumbh);
-			auto paused = controller()->isGifPausedAtLeastFor(Window::GifPauseReason::Layer);
+			auto paused = _controller->isGifPausedAtLeastFor(Window::GifPauseReason::Layer);
 			auto frame = _gifPreview->current(s.width(), s.height(), s.width(), s.height(), ImageRoundRadius::None, RectPart::None, paused ? 0 : getms());
 			p.drawPixmap(_thumbx, st::boxPhotoPadding.top(), frame);
 		} else {

Telegram/SourceFiles/boxes/edit_caption_box.h

@@ -21,6 +21,10 @@ namespace Ui {
 class InputField;
 } // namespace Ui
 
+namespace Window {
+class Controller;
+} // namespace Window
+
 class EditCaptionBox : public BoxContent, public RPCSender {
 public:
 	EditCaptionBox(

Telegram/SourceFiles/boxes/edit_color_box.cpp

@@ -632,14 +632,17 @@ EditColorBox::EditColorBox(QWidget*, const QString &title, QColor current) : Box
 void EditColorBox::prepare() {
 	setTitle([=] { return _title; });
 
-	const auto changed = [=] { fieldChanged(); };
-	connect(_hueField, &Ui::MaskedInputField::changed, changed);
-	connect(_saturationField, &Ui::MaskedInputField::changed, changed);
-	connect(_brightnessField, &Ui::MaskedInputField::changed, changed);
-	connect(_redField, &Ui::MaskedInputField::changed, changed);
-	connect(_greenField, &Ui::MaskedInputField::changed, changed);
-	connect(_blueField, &Ui::MaskedInputField::changed, changed);
-	connect(_result, &Ui::MaskedInputField::changed, changed);
+	const auto hsvChanged = [=] { updateFromHSVFields(); };
+	const auto rgbChanged = [=] { updateFromRGBFields(); };
+	connect(_hueField, &Ui::MaskedInputField::changed, hsvChanged);
+	connect(_saturationField, &Ui::MaskedInputField::changed, hsvChanged);
+	connect(_brightnessField, &Ui::MaskedInputField::changed, hsvChanged);
+	connect(_redField, &Ui::MaskedInputField::changed, rgbChanged);
+	connect(_greenField, &Ui::MaskedInputField::changed, rgbChanged);
+	connect(_blueField, &Ui::MaskedInputField::changed, rgbChanged);
+	connect(_result, &Ui::MaskedInputField::changed, [=] {
+		updateFromResultField();
+	});
 
 	const auto submitted = [=] { fieldSubmitted(); };
 	connect(_hueField, &Ui::MaskedInputField::submitted, submitted);
@@ -659,11 +662,13 @@ void EditColorBox::prepare() {
 	subscribe(_picker->changed(), [=] { updateFromControls(); });
 	subscribe(_hueSlider->changed(), [=] { updateFromControls(); });
 	subscribe(_opacitySlider->changed(), [=] { updateFromControls(); });
-	subscribe(boxClosing, [=] {
+
+	boxClosing() | rpl::start_with_next([=] {
 		if (_cancelCallback) {
 			_cancelCallback();
 		}
-	});
+	}, lifetime());
+
 	updateFromControls();
 }
 
@@ -672,29 +677,6 @@ void EditColorBox::setInnerFocus() {
 	_result->selectAll();
 }
 
-void EditColorBox::fieldChanged() {
-	auto emitter = sender();
-	auto checkHSVSender = [this, emitter](QObject *field) {
-		if (emitter == field) {
-			updateFromHSVFields();
-		}
-	};
-	auto checkRGBSender = [this, emitter](QObject *field) {
-		if (emitter == field) {
-			updateFromRGBFields();
-		}
-	};
-	checkHSVSender(_hueField);
-	checkHSVSender(_saturationField);
-	checkHSVSender(_brightnessField);
-	checkRGBSender(_redField);
-	checkRGBSender(_greenField);
-	checkRGBSender(_blueField);
-	if (emitter == _result) {
-		updateFromResultField();
-	}
-}
-
 void EditColorBox::fieldSubmitted() {
 	Ui::MaskedInputField *fields[] = {
 		_hueField,
@@ -718,7 +700,7 @@ void EditColorBox::fieldSubmitted() {
 }
 
 void EditColorBox::saveColor() {
-	_cancelCallback = base::lambda<void()>();
+	_cancelCallback = Fn<void()>();
 	if (_saveCallback) {
 		_saveCallback(_new.toRgb());
 	}

Telegram/SourceFiles/boxes/edit_color_box.h

@@ -13,11 +13,11 @@ class EditColorBox : public BoxContent {
 public:
 	EditColorBox(QWidget*, const QString &title, QColor current = QColor(255, 255, 255));
 
-	void setSaveCallback(base::lambda<void(QColor)> callback) {
+	void setSaveCallback(Fn<void(QColor)> callback) {
 		_saveCallback = std::move(callback);
 	}
 
-	void setCancelCallback(base::lambda<void()> callback) {
+	void setCancelCallback(Fn<void()> callback) {
 		_cancelCallback = std::move(callback);
 	}
 
@@ -37,7 +37,6 @@ protected:
 
 private:
 	void saveColor();
-	void fieldChanged();
 	void fieldSubmitted();
 
 	void updateFromColor(QColor color);
@@ -86,7 +85,7 @@ private:
 	QRect _currentRect;
 	QRect _newRect;
 
-	base::lambda<void(QColor)> _saveCallback;
-	base::lambda<void()> _cancelCallback;
+	Fn<void(QColor)> _saveCallback;
+	Fn<void()> _cancelCallback;
 
 };

Telegram/SourceFiles/boxes/edit_participant_box.cpp

@@ -66,7 +66,6 @@ class EditParticipantBox::Inner : public TWidget {
 public:
 	Inner(
 		QWidget *parent,
-		not_null<Window::Controller*> controller,
 		not_null<ChannelData*> channel,
 		not_null<UserData*> user,
 		bool hasAdminRights);
@@ -101,7 +100,6 @@ private:
 
 EditParticipantBox::Inner::Inner(
 	QWidget *parent,
-	not_null<Window::Controller*> controller,
 	not_null<ChannelData*> channel,
 	not_null<UserData*> user,
 	bool hasAdminRights)
@@ -110,7 +108,6 @@ EditParticipantBox::Inner::Inner(
 , _user(user)
 , _userPhoto(
 	this,
-	controller,
 	_user,
 	Ui::UserpicButton::Role::Custom,
 	st::rightsPhotoButton)
@@ -184,7 +181,6 @@ EditParticipantBox::EditParticipantBox(QWidget*, not_null<ChannelData*> channel,
 void EditParticipantBox::prepare() {
 	_inner = setInnerWidget(object_ptr<Inner>(
 		this,
-		controller(),
 		_channel,
 		_user,
 		hasAdminRights()));

Telegram/SourceFiles/boxes/edit_participant_box.h

@@ -58,7 +58,7 @@ class EditAdminBox : public EditParticipantBox {
 public:
 	EditAdminBox(QWidget*, not_null<ChannelData*> channel, not_null<UserData*> user, const MTPChannelAdminRights &rights);
 
-	void setSaveCallback(base::lambda<void(MTPChannelAdminRights, MTPChannelAdminRights)> callback) {
+	void setSaveCallback(Fn<void(MTPChannelAdminRights, MTPChannelAdminRights)> callback) {
 		_saveCallback = std::move(callback);
 	}
 
@@ -79,7 +79,7 @@ private:
 
 	const MTPChannelAdminRights _oldRights;
 	std::vector<std::pair<Flag, Flag>> _dependencies;
-	base::lambda<void(MTPChannelAdminRights, MTPChannelAdminRights)> _saveCallback;
+	Fn<void(MTPChannelAdminRights, MTPChannelAdminRights)> _saveCallback;
 
 	std::map<Flags, QPointer<Ui::Checkbox>> _checkboxes;
 	QPointer<Ui::FlatLabel> _aboutAddAdmins;
@@ -93,7 +93,7 @@ class EditRestrictedBox : public EditParticipantBox {
 public:
 	EditRestrictedBox(QWidget*, not_null<ChannelData*> channel, not_null<UserData*> user, bool hasAdminRights, const MTPChannelBannedRights &rights);
 
-	void setSaveCallback(base::lambda<void(MTPChannelBannedRights, MTPChannelBannedRights)> callback) {
+	void setSaveCallback(Fn<void(MTPChannelBannedRights, MTPChannelBannedRights)> callback) {
 		_saveCallback = std::move(callback);
 	}
 
@@ -123,7 +123,7 @@ private:
 	const MTPChannelBannedRights _oldRights;
 	TimeId _until = 0;
 	std::vector<std::pair<Flag, Flag>> _dependencies;
-	base::lambda<void(MTPChannelBannedRights, MTPChannelBannedRights)> _saveCallback;
+	Fn<void(MTPChannelBannedRights, MTPChannelBannedRights)> _saveCallback;
 
 	std::map<Flags, QPointer<Ui::Checkbox>> _checkboxes;
 

Telegram/SourceFiles/boxes/edit_privacy_box.cpp

@@ -22,7 +22,7 @@ namespace {
 
 class PrivacyExceptionsBoxController : public ChatsListBoxController {
 public:
-	PrivacyExceptionsBoxController(base::lambda<QString()> titleFactory, const std::vector<not_null<UserData*>> &selected);
+	PrivacyExceptionsBoxController(Fn<QString()> titleFactory, const std::vector<not_null<UserData*>> &selected);
 	void rowClicked(not_null<PeerListRow*> row) override;
 
 	std::vector<not_null<UserData*>> getResult() const;
@@ -32,12 +32,12 @@ protected:
 	std::unique_ptr<Row> createRow(not_null<History*> history) override;
 
 private:
-	base::lambda<QString()> _titleFactory;
+	Fn<QString()> _titleFactory;
 	std::vector<not_null<UserData*>> _selected;
 
 };
 
-PrivacyExceptionsBoxController::PrivacyExceptionsBoxController(base::lambda<QString()> titleFactory, const std::vector<not_null<UserData*>> &selected)
+PrivacyExceptionsBoxController::PrivacyExceptionsBoxController(Fn<QString()> titleFactory, const std::vector<not_null<UserData*>> &selected)
 : _titleFactory(std::move(titleFactory))
 , _selected(selected) {
 }
@@ -163,11 +163,11 @@ int EditPrivacyBox::countDefaultHeight(int newWidth) {
 }
 
 void EditPrivacyBox::editExceptionUsers(Exception exception) {
-	auto controller = std::make_unique<PrivacyExceptionsBoxController>(base::lambda_guarded(this, [this, exception] {
+	auto controller = std::make_unique<PrivacyExceptionsBoxController>(crl::guard(this, [this, exception] {
 		return _controller->exceptionBoxTitle(exception);
 	}), exceptionUsers(exception));
 	auto initBox = [this, exception, controller = controller.get()](not_null<PeerListBox*> box) {
-		box->addButton(langFactory(lng_settings_save), base::lambda_guarded(this, [this, box, exception, controller] {
+		box->addButton(langFactory(lng_settings_save), crl::guard(this, [this, box, exception, controller] {
 			exceptionUsers(exception) = controller->getResult();
 			exceptionLink(exception)->entity()->setText(exceptionLinkText(exception));
 			auto removeFrom = ([exception] {
@@ -295,7 +295,7 @@ void EditPrivacyBox::createWidgets() {
 	clearButtons();
 	addButton(langFactory(lng_settings_save), [this] {
 		auto someAreDisallowed = (_option != Option::Everyone) || !_neverUsers.empty();
-		_controller->confirmSave(someAreDisallowed, base::lambda_guarded(this, [this] {
+		_controller->confirmSave(someAreDisallowed, crl::guard(this, [this] {
 			Auth().api().savePrivacy(_controller->key(), collectResult());
 			closeBox();
 		}));

Telegram/SourceFiles/boxes/edit_privacy_box.h

@@ -49,7 +49,7 @@ public:
 		virtual QString exceptionBoxTitle(Exception exception) = 0;
 		virtual QString exceptionsDescription() = 0;
 
-		virtual void confirmSave(bool someAreDisallowed, base::lambda_once<void()> saveCallback) {
+		virtual void confirmSave(bool someAreDisallowed, FnMut<void()> saveCallback) {
 			saveCallback();
 		}
 

Telegram/SourceFiles/boxes/mute_settings_box.cpp

@@ -32,7 +32,6 @@ void MuteSettingsBox::prepare() {
 
 	const auto icon = object_ptr<Ui::UserpicButton>(
 		this,
-		controller(),
 		_peer,
 		Ui::UserpicButton::Role::Custom,
 		st::mutePhotoButton);

Telegram/SourceFiles/boxes/passcode_box.cpp

@@ -7,13 +7,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "boxes/passcode_box.h"
 
+#include "base/bytes.h"
 #include "lang/lang_keys.h"
 #include "boxes/confirm_box.h"
 #include "mainwindow.h"
 #include "storage/localstorage.h"
-#include "styles/style_boxes.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/input_fields.h"
+#include "passport/passport_encryption.h"
+#include "styles/style_boxes.h"
 
 PasscodeBox::PasscodeBox(QWidget*, bool turningOff)
 : _turningOff(turningOff)
@@ -26,12 +28,22 @@ PasscodeBox::PasscodeBox(QWidget*, bool turningOff)
 , _recover(this, lang(lng_signin_recover)) {
 }
 
-PasscodeBox::PasscodeBox(QWidget*, const QByteArray &newSalt, const QByteArray &curSalt, bool hasRecovery, const QString &hint, bool turningOff)
+PasscodeBox::PasscodeBox(
+	QWidget*,
+	const QByteArray &newSalt,
+	const QByteArray &curSalt,
+	bool hasRecovery,
+	bool notEmptyPassport,
+	const QString &hint,
+	const QByteArray &newSecureSecretSalt,
+	bool turningOff)
 : _turningOff(turningOff)
 , _cloudPwd(true)
 , _newSalt(newSalt)
 , _curSalt(curSalt)
+, _newSecureSecretSalt(newSecureSecretSalt)
 , _hasRecovery(hasRecovery)
+, _notEmptyPassport(notEmptyPassport)
 , _about(st::boxWidth - st::boxPadding.left() * 1.5)
 , _oldPasscode(this, st::defaultInputField, langFactory(lng_cloud_password_enter_old))
 , _newPasscode(this, st::defaultInputField, langFactory(curSalt.isEmpty() ? lng_cloud_password_enter_first : lng_cloud_password_enter_new))
@@ -185,11 +197,11 @@ void PasscodeBox::setInnerFocus() {
 	}
 }
 
-void PasscodeBox::setPasswordDone(const MTPBool &result) {
+void PasscodeBox::setPasswordDone() {
 	_setRequest = 0;
 	emit reloadPassword();
 	auto text = lang(_reenterPasscode->isHidden() ? lng_cloud_password_removed : (_oldPasscode->isHidden() ? lng_cloud_password_was_set : lng_cloud_password_updated));
-	Ui::show(Box<InformBox>(text));
+	getDelegate()->show(Box<InformBox>(text), LayerOption::CloseOther);
 }
 
 void PasscodeBox::closeReplacedBy() {
@@ -243,7 +255,9 @@ bool PasscodeBox::setPasswordFail(const RPCError &error) {
 		_recoverEmail->showError();
 		update();
 	} else if (err == qstr("EMAIL_UNCONFIRMED")) {
-		Ui::show(Box<InformBox>(lang(lng_cloud_password_almost)));
+		getDelegate()->show(
+			Box<InformBox>(lang(lng_cloud_password_almost)),
+			LayerOption::CloseOther);
 		emit reloadPassword();
 	}
 	return true;
@@ -306,29 +320,15 @@ void PasscodeBox::save(bool force) {
 		}
 		if (!_recoverEmail->isHidden() && email.isEmpty() && !force) {
 			_skipEmailWarning = true;
-			_replacedBy = Ui::show(Box<ConfirmBox>(lang(lng_cloud_password_about_recover), lang(lng_cloud_password_skip_email), st::attentionBoxButton, base::lambda_guarded(this, [this] {
+			_replacedBy = getDelegate()->show(Box<ConfirmBox>(lang(lng_cloud_password_about_recover), lang(lng_cloud_password_skip_email), st::attentionBoxButton, crl::guard(this, [this] {
 				save(true);
-			})), LayerOption::KeepOther);
+			})));
+		} else if (_newPasscode->isHidden()) {
+			clearCloudPassword(old);
+		} else if (_oldPasscode->isHidden()) {
+			setNewCloudPassword(pwd);
 		} else {
-			QByteArray newPasswordData = pwd.isEmpty() ? QByteArray() : (_newSalt + pwd.toUtf8() + _newSalt);
-			QByteArray newPasswordHash = pwd.isEmpty() ? QByteArray() : QByteArray(32, Qt::Uninitialized);
-			if (pwd.isEmpty()) {
-				hint = QString();
-				email = QString();
-			} else {
-				hashSha256(newPasswordData.constData(), newPasswordData.size(), newPasswordHash.data());
-			}
-			QByteArray oldPasswordData = _oldPasscode->isHidden() ? QByteArray() : (_curSalt + old.toUtf8() + _curSalt);
-			QByteArray oldPasswordHash = _oldPasscode->isHidden() ? QByteArray() : QByteArray(32, Qt::Uninitialized);
-			if (!_oldPasscode->isHidden()) {
-				hashSha256(oldPasswordData.constData(), oldPasswordData.size(), oldPasswordHash.data());
-			}
-			auto flags = MTPDaccount_passwordInputSettings::Flag::f_new_salt | MTPDaccount_passwordInputSettings::Flag::f_new_password_hash | MTPDaccount_passwordInputSettings::Flag::f_hint;
-			if (_oldPasscode->isHidden() || _newPasscode->isHidden()) {
-				flags |= MTPDaccount_passwordInputSettings::Flag::f_email;
-			}
-			MTPaccount_PasswordInputSettings settings(MTP_account_passwordInputSettings(MTP_flags(flags), MTP_bytes(_newSalt), MTP_bytes(newPasswordHash), MTP_string(hint), MTP_string(email)));
-			_setRequest = MTP::send(MTPaccount_UpdatePasswordSettings(MTP_bytes(oldPasswordHash), settings), rpcDone(&PasscodeBox::setPasswordDone), rpcFail(&PasscodeBox::setPasswordFail));
+			changeCloudPassword(old, pwd);
 		}
 	} else {
 		cSetPasscodeBadTries(0);
@@ -338,6 +338,212 @@ void PasscodeBox::save(bool force) {
 	}
 }
 
+void PasscodeBox::clearCloudPassword(const QString &oldPassword) {
+	Expects(!_oldPasscode->isHidden());
+
+	const auto send = [=] {
+		sendClearCloudPassword(oldPassword);
+	};
+	if (_notEmptyPassport) {
+		const auto box = std::make_shared<QPointer<BoxContent>>();
+		const auto confirmed = [=] {
+			send();
+			if (*box) {
+				(*box)->closeBox();
+			}
+		};
+		*box = getDelegate()->show(Box<ConfirmBox>(
+			lang(lng_cloud_password_passport_losing),
+			lang(lng_continue),
+			confirmed));
+	} else {
+		send();
+	}
+}
+
+void PasscodeBox::sendClearCloudPassword(const QString &oldPassword) {
+	const auto passwordUtf = oldPassword.toUtf8();
+	const auto oldPasswordData = (_curSalt + passwordUtf + _curSalt);
+	auto oldPasswordHash = QByteArray(32, Qt::Uninitialized);
+	hashSha256(oldPasswordData.constData(), oldPasswordData.size(), oldPasswordHash.data());
+	const auto newPasswordData = QByteArray();
+	const auto newPasswordHash = QByteArray();
+	const auto hint = QString();
+	const auto email = QString();
+	const auto flags = MTPDaccount_passwordInputSettings::Flag::f_new_salt
+		| MTPDaccount_passwordInputSettings::Flag::f_new_password_hash
+		| MTPDaccount_passwordInputSettings::Flag::f_hint
+		| MTPDaccount_passwordInputSettings::Flag::f_email;
+	_setRequest = request(MTPaccount_UpdatePasswordSettings(
+		MTP_bytes(oldPasswordHash),
+		MTP_account_passwordInputSettings(
+			MTP_flags(flags),
+			MTP_bytes(_newSalt),
+			MTP_bytes(newPasswordHash),
+			MTP_string(hint),
+			MTP_string(email),
+			MTPbytes(), // new_secure_salt
+			MTPbytes(), // new_secure_secret
+			MTPlong()) // new_secure_secret_id
+	)).done([=](const MTPBool &result) {
+		setPasswordDone();
+	}).fail([=](const RPCError &error) {
+		setPasswordFail(error);
+	}).send();
+}
+
+void PasscodeBox::setNewCloudPassword(const QString &newPassword) {
+	const auto newPasswordData = (_newSalt + newPassword.toUtf8() + _newSalt);
+	auto newPasswordHash = QByteArray(32, Qt::Uninitialized);
+	hashSha256(newPasswordData.constData(), newPasswordData.size(), newPasswordHash.data());
+	const auto oldPasswordData = QByteArray();
+	const auto oldPasswordHash = QByteArray();
+	const auto hint = _passwordHint->getLastText();
+	const auto email = _recoverEmail->getLastText().trimmed();
+	const auto flags = MTPDaccount_passwordInputSettings::Flag::f_new_salt
+		| MTPDaccount_passwordInputSettings::Flag::f_new_password_hash
+		| MTPDaccount_passwordInputSettings::Flag::f_hint
+		| MTPDaccount_passwordInputSettings::Flag::f_email;
+	_setRequest = request(MTPaccount_UpdatePasswordSettings(
+		MTP_bytes(oldPasswordHash),
+		MTP_account_passwordInputSettings(
+			MTP_flags(flags),
+			MTP_bytes(_newSalt),
+			MTP_bytes(newPasswordHash),
+			MTP_string(hint),
+			MTP_string(email),
+			MTPbytes(), // new_secure_salt
+			MTPbytes(), // new_secure_secret
+			MTPlong()) // new_secure_secret_id
+	)).done([=](const MTPBool &result) {
+		setPasswordDone();
+	}).fail([=](const RPCError &error) {
+		setPasswordFail(error);
+	}).send();
+}
+
+void PasscodeBox::changeCloudPassword(
+		const QString &oldPassword,
+		const QString &newPassword) {
+	const auto passwordUtf = oldPassword.toUtf8();
+	const auto oldPasswordData = (_curSalt + passwordUtf + _curSalt);
+	auto oldPasswordHash = QByteArray(32, Qt::Uninitialized);
+	hashSha256(oldPasswordData.constData(), oldPasswordData.size(), oldPasswordHash.data());
+	_setRequest = request(MTPaccount_GetPasswordSettings(
+		MTP_bytes(oldPasswordHash)
+	)).done([=](const MTPaccount_PasswordSettings &result) {
+		_setRequest = 0;
+
+		Expects(result.type() == mtpc_account_passwordSettings);
+		const auto &data = result.c_account_passwordSettings();
+
+		if (data.vsecure_secret.v.isEmpty()) {
+			const auto empty = QByteArray();
+			sendChangeCloudPassword(oldPasswordHash, newPassword, empty);
+			return;
+		}
+		const auto secret = Passport::DecryptSecureSecret(
+			bytes::make_span(data.vsecure_salt.v),
+			bytes::make_span(data.vsecure_secret.v),
+			bytes::make_span(passwordUtf));
+		if (secret.empty()) {
+			LOG(("API Error: Failed to decrypt secure secret."));
+			suggestSecretReset(oldPasswordHash, newPassword);
+		} else if (Passport::CountSecureSecretId(secret) != data.vsecure_secret_id.v) {
+			LOG(("API Error: Wrong secure secret id."));
+			suggestSecretReset(oldPasswordHash, newPassword);
+		} else {
+			sendChangeCloudPassword(
+				oldPasswordHash,
+				newPassword,
+				QByteArray::fromRawData(
+					reinterpret_cast<const char*>(secret.data()),
+					secret.size()));
+		}
+	}).fail([=](const RPCError &error) {
+		setPasswordFail(error);
+	}).send();
+}
+
+void PasscodeBox::suggestSecretReset(
+		const QByteArray &oldPasswordHash,
+		const QString &newPassword) {
+	const auto box = std::make_shared<QPointer<BoxContent>>();
+	const auto resetSecretAndSave = [=] {
+		using Flag = MTPDaccount_passwordInputSettings::Flag;
+		_setRequest = request(MTPaccount_UpdatePasswordSettings(
+			MTP_bytes(oldPasswordHash),
+			MTP_account_passwordInputSettings(
+				MTP_flags(Flag::f_new_secure_salt
+					| Flag::f_new_secure_secret
+					| Flag::f_new_secure_secret_id),
+				MTPbytes(), // new_salt
+				MTPbytes(), // new_password_hash
+				MTPstring(), // hint
+				MTPstring(), // email
+				MTP_bytes(QByteArray()), // new_secure_salt
+				MTP_bytes(QByteArray()), // new_secure_secret
+				MTP_long(0)) // new_secure_secret_id
+		)).done([=](const MTPBool &result) {
+			_setRequest = 0;
+			const auto empty = QByteArray();
+			if (*box) {
+				(*box)->closeBox();
+			}
+			sendChangeCloudPassword(oldPasswordHash, newPassword, empty);
+		}).fail([=](const RPCError &error) {
+			_setRequest = 0;
+		}).send();
+	};
+	*box = getDelegate()->show(Box<ConfirmBox>(
+		Lang::Hard::PassportCorrupted(),
+		Lang::Hard::PassportCorruptedReset(),
+		[=] { resetSecretAndSave(); }));
+}
+
+void PasscodeBox::sendChangeCloudPassword(
+		const QByteArray &oldPasswordHash,
+		const QString &newPassword,
+		const QByteArray &secureSecret) {
+	const auto passwordUtf = newPassword.toUtf8();
+	const auto newPasswordData = (_newSalt + passwordUtf + _newSalt);
+	auto newPasswordHash = QByteArray(32, Qt::Uninitialized);
+	hashSha256(newPasswordData.constData(), newPasswordData.size(), newPasswordHash.data());
+	const auto hint = _passwordHint->getLastText();
+	auto flags = MTPDaccount_passwordInputSettings::Flag::f_new_salt
+		| MTPDaccount_passwordInputSettings::Flag::f_new_password_hash
+		| MTPDaccount_passwordInputSettings::Flag::f_hint;
+	auto newSecureSecret = bytes::vector();
+	auto newSecureSecretId = 0ULL;
+	if (!secureSecret.isEmpty()) {
+		flags |= MTPDaccount_passwordInputSettings::Flag::f_new_secure_salt
+			| MTPDaccount_passwordInputSettings::Flag::f_new_secure_secret
+			| MTPDaccount_passwordInputSettings::Flag::f_new_secure_secret_id;
+		newSecureSecretId = Passport::CountSecureSecretId(
+			bytes::make_span(secureSecret));
+		newSecureSecret = Passport::EncryptSecureSecret(
+			bytes::make_span(_newSecureSecretSalt),
+			bytes::make_span(secureSecret),
+			bytes::make_span(passwordUtf));
+	}
+	_setRequest = request(MTPaccount_UpdatePasswordSettings(
+		MTP_bytes(oldPasswordHash),
+		MTP_account_passwordInputSettings(
+			MTP_flags(flags),
+			MTP_bytes(_newSalt),
+			MTP_bytes(newPasswordHash),
+			MTP_string(hint),
+			MTPstring(), // email is not changing
+			MTP_bytes(_newSecureSecretSalt),
+			MTP_bytes(newSecureSecret),
+			MTP_long(newSecureSecretId))
+	)).done([=](const MTPBool &result) {
+		setPasswordDone();
+	}).fail([=](const RPCError &error) {
+		setPasswordFail(error);
+	}).send();
+}
+
 void PasscodeBox::badOldPasscode() {
 	_oldPasscode->selectAll();
 	_oldPasscode->setFocus();
@@ -376,7 +582,12 @@ void PasscodeBox::emailChanged() {
 void PasscodeBox::recoverByEmail() {
 	if (_pattern.isEmpty()) {
 		_pattern = "-";
-		MTP::send(MTPauth_RequestPasswordRecovery(), rpcDone(&PasscodeBox::recoverStarted), rpcFail(&PasscodeBox::recoverStartFail));
+		request(MTPauth_RequestPasswordRecovery(
+		)).done([=](const MTPauth_PasswordRecovery &result) {
+			recoverStarted(result);
+		}).fail([=](const RPCError &error) {
+			recoverStartFail(error);
+		}).send();
 	} else {
 		recover();
 	}
@@ -389,9 +600,9 @@ void PasscodeBox::recoverExpired() {
 void PasscodeBox::recover() {
 	if (_pattern == "-") return;
 
-	const auto box = Ui::show(
-		Box<RecoverBox>(_pattern),
-		LayerOption::KeepOther);
+	const auto box = getDelegate()->show(Box<RecoverBox>(
+		_pattern,
+		_notEmptyPassport));
 	connect(box, &RecoverBox::reloadPassword, this, &PasscodeBox::reloadPassword);
 	connect(box, &RecoverBox::recoveryExpired, this, &PasscodeBox::recoverExpired);
 	_replacedBy = box;
@@ -410,8 +621,12 @@ bool PasscodeBox::recoverStartFail(const RPCError &error) {
 	return true;
 }
 
-RecoverBox::RecoverBox(QWidget*, const QString &pattern)
+RecoverBox::RecoverBox(
+	QWidget*,
+	const QString &pattern,
+	bool notEmptyPassport)
 : _pattern(st::normalFont->elided(lng_signin_recover_hint(lt_recover_email, pattern), st::boxWidth - st::boxPadding.left() * 1.5))
+, _notEmptyPassport(notEmptyPassport)
 , _recoverCode(this, st::defaultInputField, langFactory(lng_signin_code)) {
 }
 
@@ -464,7 +679,27 @@ void RecoverBox::submit() {
 		return;
 	}
 
-	_submitRequest = MTP::send(MTPauth_RecoverPassword(MTP_string(code)), rpcDone(&RecoverBox::codeSubmitDone, true), rpcFail(&RecoverBox::codeSubmitFail));
+	const auto send = crl::guard(this, [=] {
+		_submitRequest = MTP::send(
+			MTPauth_RecoverPassword(MTP_string(code)),
+			rpcDone(&RecoverBox::codeSubmitDone, true),
+			rpcFail(&RecoverBox::codeSubmitFail));
+	});
+	if (_notEmptyPassport) {
+		const auto box = std::make_shared<QPointer<BoxContent>>();
+		const auto confirmed = [=] {
+			send();
+			if (*box) {
+				(*box)->closeBox();
+			}
+		};
+		*box = getDelegate()->show(Box<ConfirmBox>(
+			lang(lng_cloud_password_passport_losing),
+			lang(lng_continue),
+			confirmed));
+	} else {
+		send();
+	}
 }
 
 void RecoverBox::codeChanged() {
@@ -476,7 +711,9 @@ void RecoverBox::codeSubmitDone(bool recover, const MTPauth_Authorization &resul
 	_submitRequest = 0;
 
 	emit reloadPassword();
-	Ui::show(Box<InformBox>(lang(lng_cloud_password_removed)));
+	getDelegate()->show(
+		Box<InformBox>(lang(lng_cloud_password_removed)),
+		LayerOption::CloseOther);
 }
 
 bool RecoverBox::codeSubmitFail(const RPCError &error) {
@@ -494,7 +731,9 @@ bool RecoverBox::codeSubmitFail(const RPCError &error) {
 	const QString &err = error.type();
 	if (err == qstr("PASSWORD_EMPTY")) {
 		emit reloadPassword();
-		Ui::show(Box<InformBox>(lang(lng_cloud_password_removed)));
+		getDelegate()->show(
+			Box<InformBox>(lang(lng_cloud_password_removed)),
+			LayerOption::CloseOther);
 		return true;
 	} else if (err == qstr("PASSWORD_RECOVERY_NA")) {
 		closeBox();
@@ -511,7 +750,7 @@ bool RecoverBox::codeSubmitFail(const RPCError &error) {
 		_recoverCode->showError();
 		return true;
 	}
-	if (cDebug()) { // internal server error
+	if (Logs::DebugEnabled()) { // internal server error
 		_error =  err + ": " + error.description();
 	} else {
 		_error = Lang::Hard::ServerError();

Telegram/SourceFiles/boxes/passcode_box.h

@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "boxes/abstract_box.h"
+#include "mtproto/sender.h"
 
 namespace Ui {
 class InputField;
@@ -15,12 +16,20 @@ class PasswordInput;
 class LinkButton;
 } // namespace Ui
 
-class PasscodeBox : public BoxContent, public RPCSender {
+class PasscodeBox : public BoxContent, private MTP::Sender {
 	Q_OBJECT
 
 public:
 	PasscodeBox(QWidget*, bool turningOff);
-	PasscodeBox(QWidget*, const QByteArray &newSalt, const QByteArray &curSalt, bool hasRecovery, const QString &hint, bool turningOff = false);
+	PasscodeBox(
+		QWidget*,
+		const QByteArray &newSalt,
+		const QByteArray &curSalt,
+		bool hasRecovery,
+		bool notEmptyPassport,
+		const QString &hint,
+		const QByteArray &newSecureSecretSalt,
+		bool turningOff = false);
 
 signals:
 	void reloadPassword();
@@ -43,13 +52,30 @@ private:
 	void recoverByEmail();
 	void recoverExpired();
 
-	void setPasswordDone(const MTPBool &result);
+	void setPasswordDone();
 	bool setPasswordFail(const RPCError &error);
 
 	void recoverStarted(const MTPauth_PasswordRecovery &result);
 	bool recoverStartFail(const RPCError &error);
 
 	void recover();
+	void clearCloudPassword(const QString &oldPassword);
+	void setNewCloudPassword(const QString &newPassword);
+	void changeCloudPassword(
+		const QString &oldPassword,
+		const QString &newPassword);
+	void sendChangeCloudPassword(
+		const QByteArray &oldPasswordHash,
+		const QString &newPassword,
+		const QByteArray &secureSecret);
+	void suggestSecretReset(
+		const QByteArray &oldPasswordHash,
+		const QString &newPassword);
+	void resetSecretAndChangePassword(
+		const QByteArray &oldPasswordHash,
+		const QString &newPassword);
+	void sendClearCloudPassword(const QString &oldPassword);
+
 	QString _pattern;
 
 	QPointer<BoxContent> _replacedBy;
@@ -57,8 +83,9 @@ private:
 	bool _cloudPwd = false;
 	mtpRequestId _setRequest = 0;
 
-	QByteArray _newSalt, _curSalt;
+	QByteArray _newSalt, _curSalt, _newSecureSecretSalt;
 	bool _hasRecovery = false;
+	bool _notEmptyPassport = false;
 	bool _skipEmailWarning = false;
 
 	int _aboutHeight = 0;
@@ -80,7 +107,7 @@ class RecoverBox : public BoxContent, public RPCSender {
 	Q_OBJECT
 
 public:
-	RecoverBox(QWidget*, const QString &pattern);
+	RecoverBox(QWidget*, const QString &pattern, bool notEmptyPassport);
 
 signals:
 	void reloadPassword();
@@ -102,6 +129,7 @@ private:
 	mtpRequestId _submitRequest = 0;
 
 	QString _pattern;
+	bool _notEmptyPassport = false;
 
 	object_ptr<Ui::InputField> _recoverCode;
 

Telegram/SourceFiles/boxes/peer_list_box.cpp

@@ -31,7 +31,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 PeerListBox::PeerListBox(
 	QWidget*,
 	std::unique_ptr<PeerListController> controller,
-	base::lambda<void(not_null<PeerListBox*>)> init)
+	Fn<void(not_null<PeerListBox*>)> init)
 : _controller(std::move(controller))
 , _init(std::move(init)) {
 	Expects(_controller != nullptr);
@@ -525,7 +525,7 @@ void PeerListRow::lazyInitialize(const style::PeerListItem &st) {
 	refreshStatus();
 }
 
-void PeerListRow::createCheckbox(base::lambda<void()> updateCallback) {
+void PeerListRow::createCheckbox(Fn<void()> updateCallback) {
 	_checkbox = std::make_unique<Ui::RoundImageCheckbox>(
 		st::contactsPhotoCheckbox,
 		std::move(updateCallback),
@@ -1022,7 +1022,7 @@ void PeerListContent::contextMenuEvent(QContextMenuEvent *e) {
 	if (const auto row = getRow(_contexted.index)) {
 		_contextMenu = _controller->rowContextMenu(row);
 		if (_contextMenu) {
-			_contextMenu->setDestroyedCallback(base::lambda_guarded(
+			_contextMenu->setDestroyedCallback(crl::guard(
 				this,
 				[this] {
 					setContexted(Selected());
@@ -1564,3 +1564,9 @@ void PeerListContent::handleNameChanged(const Notify::PeerUpdate &update) {
 		}
 	}
 }
+
+PeerListContent::~PeerListContent() {
+	if (_contextMenu) {
+		_contextMenu->setDestroyedCallback(nullptr);
+	}
+}

Telegram/SourceFiles/boxes/peer_list_box.h

@@ -37,7 +37,7 @@ struct PeerUpdate;
 inline auto PaintUserpicCallback(
 	not_null<PeerData*> peer,
 	bool respectSavedMessagesChat)
-->base::lambda<void(Painter &p, int x, int y, int outerWidth, int size)> {
+->Fn<void(Painter &p, int x, int y, int outerWidth, int size)> {
 	if (respectSavedMessagesChat && peer->isSelf()) {
 		return [](Painter &p, int x, int y, int outerWidth, int size) {
 			Ui::EmptyUserpic::PaintSavedMessages(p, x, y, outerWidth, size);
@@ -95,7 +95,7 @@ public:
 	virtual QMargins actionMargins() const {
 		return QMargins();
 	}
-	virtual void addActionRipple(QPoint point, base::lambda<void()> updateCallback) {
+	virtual void addActionRipple(QPoint point, Fn<void()> updateCallback) {
 	}
 	virtual void stopLastActionRipple() {
 	}
@@ -200,7 +200,7 @@ protected:
 	}
 
 private:
-	void createCheckbox(base::lambda<void()> updateCallback);
+	void createCheckbox(Fn<void()> updateCallback);
 	void setCheckedInternal(bool checked, SetStyle style);
 	void paintDisabledCheckUserpic(
 		Painter &p,
@@ -236,8 +236,8 @@ struct PeerListState;
 
 class PeerListDelegate {
 public:
-	virtual void peerListSetTitle(base::lambda<QString()> title) = 0;
-	virtual void peerListSetAdditionalTitle(base::lambda<QString()> title) = 0;
+	virtual void peerListSetTitle(Fn<QString()> title) = 0;
+	virtual void peerListSetAdditionalTitle(Fn<QString()> title) = 0;
 	virtual void peerListSetDescription(object_ptr<Ui::FlatLabel> description) = 0;
 	virtual void peerListSetSearchLoading(object_ptr<Ui::FlatLabel> loading) = 0;
 	virtual void peerListSetSearchNoResults(object_ptr<Ui::FlatLabel> noResults) = 0;
@@ -258,8 +258,8 @@ public:
 	virtual void peerListScrollToTop() = 0;
 	virtual int peerListFullRowsCount() = 0;
 	virtual PeerListRow *peerListFindRow(PeerListRowId id) = 0;
-	virtual void peerListSortRows(base::lambda<bool(const PeerListRow &a, const PeerListRow &b)> compare) = 0;
-	virtual int peerListPartitionRows(base::lambda<bool(const PeerListRow &a)> border) = 0;
+	virtual void peerListSortRows(Fn<bool(const PeerListRow &a, const PeerListRow &b)> compare) = 0;
+	virtual int peerListPartitionRows(Fn<bool(const PeerListRow &a)> border) = 0;
 
 	template <typename PeerDataRange>
 	void peerListAddSelectedRows(PeerDataRange &&range) {
@@ -484,6 +484,8 @@ public:
 		return _scrollToRequests.events();
 	}
 
+	~PeerListContent();
+
 protected:
 	int resizeGetHeight(int newWidth) override;
 	void visibleTopBottomUpdated(
@@ -699,7 +701,7 @@ public:
 		_content->setSearchMode(mode);
 	}
 	void peerListSortRows(
-			base::lambda<bool(const PeerListRow &a, const PeerListRow &b)> compare) override {
+			Fn<bool(const PeerListRow &a, const PeerListRow &b)> compare) override {
 		_content->reorderRows([&](
 				auto &&begin,
 				auto &&end) {
@@ -709,7 +711,7 @@ public:
 		});
 	}
 	int peerListPartitionRows(
-			base::lambda<bool(const PeerListRow &a)> border) override {
+			Fn<bool(const PeerListRow &a)> border) override {
 		auto result = 0;
 		_content->reorderRows([&](
 				auto &&begin,
@@ -747,13 +749,13 @@ public:
 	PeerListBox(
 		QWidget*,
 		std::unique_ptr<PeerListController> controller,
-		base::lambda<void(not_null<PeerListBox*>)> init);
+		Fn<void(not_null<PeerListBox*>)> init);
 
-	void peerListSetTitle(base::lambda<QString()> title) override {
+	void peerListSetTitle(Fn<QString()> title) override {
 		setTitle(std::move(title));
 	}
 	void peerListSetAdditionalTitle(
-			base::lambda<QString()> title) override {
+			Fn<QString()> title) override {
 		setAdditionalTitle(std::move(title));
 	}
 	void peerListSetSearchMode(PeerListSearchMode mode) override;
@@ -791,7 +793,7 @@ private:
 	object_ptr<Ui::SlideWrap<Ui::MultiSelect>> _select = { nullptr };
 
 	std::unique_ptr<PeerListController> _controller;
-	base::lambda<void(PeerListBox*)> _init;
+	Fn<void(PeerListBox*)> _init;
 	bool _scrollBottomFixed = false;
 
 };

Telegram/SourceFiles/boxes/peer_list_controllers.cpp

@@ -507,7 +507,7 @@ void AddParticipantsBoxController::Start(
 		base::flat_set<not_null<UserData*>> &&alreadyIn,
 		bool justCreated) {
 	auto initBox = [channel, justCreated](not_null<PeerListBox*> box) {
-		auto subscription = std::make_shared<base::Subscription>();
+		auto subscription = std::make_shared<rpl::lifetime>();
 		box->addButton(langFactory(lng_participant_invite), [box, channel, subscription] {
 			auto rows = box->peerListCollectSelectedRows();
 			if (!rows.empty()) {
@@ -528,9 +528,9 @@ void AddParticipantsBoxController::Start(
 		});
 		box->addButton(langFactory(justCreated ? lng_create_group_skip : lng_cancel), [box] { box->closeBox(); });
 		if (justCreated) {
-			*subscription = box->boxClosing.add_subscription([channel] {
+			box->boxClosing() | rpl::start_with_next([=] {
 				Ui::showPeerHistory(channel, ShowAtTheEndMsgId);
-			});
+			}, *subscription);
 		}
 	};
 	Ui::show(Box<PeerListBox>(std::make_unique<AddParticipantsBoxController>(channel, std::move(alreadyIn)), std::move(initBox)));
@@ -901,7 +901,7 @@ void AddBotToGroupBoxController::prepareViewHook() {
 }
 
 ChooseRecipientBoxController::ChooseRecipientBoxController(
-	base::lambda_once<void(not_null<PeerData*>)> callback)
+	FnMut<void(not_null<PeerData*>)> callback)
 : _callback(std::move(callback)) {
 }
 

Telegram/SourceFiles/boxes/peer_list_controllers.h

@@ -230,7 +230,7 @@ private:
 class ChooseRecipientBoxController : public ChatsListBoxController {
 public:
 	ChooseRecipientBoxController(
-		base::lambda_once<void(not_null<PeerData*>)> callback);
+		FnMut<void(not_null<PeerData*>)> callback);
 
 	void rowClicked(not_null<PeerListRow*> row) override;
 
@@ -244,6 +244,6 @@ protected:
 		not_null<History*> history) override;
 
 private:
-	base::lambda_once<void(not_null<PeerData*>)> _callback;
+	FnMut<void(not_null<PeerData*>)> _callback;
 
 };

Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp

@@ -42,8 +42,8 @@ constexpr auto kMaxGroupChannelTitle = 255; // See also add_contact_box.
 constexpr auto kMaxChannelDescription = 255; // See also add_contact_box.
 
 class Controller
-	: private MTP::Sender
-	, private base::has_weak_ptr {
+	: public base::has_weak_ptr
+	, private MTP::Sender {
 public:
 	Controller(
 		not_null<BoxContent*> box,
@@ -101,7 +101,7 @@ private:
 		base::optional<bool> everyoneInvites;
 	};
 
-	base::lambda<QString()> computeTitle() const;
+	Fn<QString()> computeTitle() const;
 	object_ptr<Ui::RpWidget> createPhotoAndTitleEdit();
 	object_ptr<Ui::RpWidget> createTitleEdit();
 	object_ptr<Ui::RpWidget> createPhotoEdit();
@@ -159,7 +159,7 @@ private:
 	void saveInvites();
 	void saveSignatures();
 	void savePhoto();
-	void pushSaveStage(base::lambda_once<void()> &&lambda);
+	void pushSaveStage(FnMut<void()> &&lambda);
 	void continueSave();
 	void cancelSave();
 
@@ -174,7 +174,7 @@ private:
 	UsernameState _usernameState = UsernameState::Normal;
 	rpl::event_stream<rpl::producer<QString>> _usernameResultTexts;
 
-	std::deque<base::lambda_once<void()>> _saveStagesQueue;
+	std::deque<FnMut<void()>> _saveStagesQueue;
 	Saving _savingData;
 
 };
@@ -195,7 +195,7 @@ Controller::Controller(
 	});
 }
 
-base::lambda<QString()> Controller::computeTitle() const {
+Fn<QString()> Controller::computeTitle() const {
 	return langFactory(_isGroup
 			? lng_edit_group
 			: lng_edit_channel_title);
@@ -277,7 +277,6 @@ object_ptr<Ui::RpWidget> Controller::createPhotoEdit() {
 		_wrap,
 		object_ptr<Ui::UserpicButton>(
 			_wrap,
-			_box->controller(),
 			_peer,
 			Ui::UserpicButton::Role::ChangePhoto,
 			st::defaultUserpicButton),
@@ -435,7 +434,7 @@ object_ptr<Ui::RpWidget> Controller::createUsernameEdit() {
 		object_ptr<Ui::UsernameInput>(
 			container,
 			st::setupChannelLink,
-			base::lambda<QString()>(),
+			Fn<QString()>(),
 			channel->username,
 			true));
 	_controls.username->heightValue(
@@ -566,7 +565,7 @@ void Controller::checkUsernameAvailability() {
 
 void Controller::askUsernameRevoke() {
 	_controls.privacy->setValue(Privacy::Private);
-	auto revokeCallback = base::lambda_guarded(this, [this] {
+	auto revokeCallback = crl::guard(this, [this] {
 		_usernameState = UsernameState::Normal;
 		_controls.privacy->setValue(Privacy::Public);
 		checkUsernameAvailability();
@@ -645,7 +644,7 @@ void Controller::revokeInviteLink() {
 
 void Controller::exportInviteLink(const QString &confirmation) {
 	auto boxPointer = std::make_shared<QPointer<ConfirmBox>>();
-	auto callback = base::lambda_guarded(this, [=] {
+	auto callback = crl::guard(this, [=] {
 		if (auto strong = *boxPointer) {
 			strong->closeBox();
 		}
@@ -1186,7 +1185,7 @@ void Controller::save() {
 	}
 }
 
-void Controller::pushSaveStage(base::lambda_once<void()> &&lambda) {
+void Controller::pushSaveStage(FnMut<void()> &&lambda) {
 	_saveStagesQueue.push_back(std::move(lambda));
 }
 

Telegram/SourceFiles/boxes/peers/manage_peer_box.cpp

@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/labels.h"
 #include "history/admin_log/history_admin_log_section.h"
 #include "window/window_controller.h"
+#include "mainwindow.h"
 #include "profile/profile_channel_controllers.h"
 #include "info/profile/info_profile_button.h"
 #include "info/profile/info_profile_icon.h"
@@ -23,7 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace {
 
-base::lambda<QString()> ManagePeerTitle(
+Fn<QString()> ManagePeerTitle(
 		not_null<ChannelData*> channel) {
 	return langFactory(channel->isMegagroup()
 		? lng_manage_group_title
@@ -88,9 +89,9 @@ bool HasRecentActions(not_null<ChannelData*> channel) {
 }
 
 void ShowRecentActions(
-		not_null<Window::Controller*> controller,
+		not_null<Window::Navigation*> navigation,
 		not_null<ChannelData*> channel) {
-	controller->showSection(AdminLog::SectionMemento(channel));
+	navigation->showSection(AdminLog::SectionMemento(channel));
 }
 
 bool HasEditInfoBox(not_null<ChannelData*> channel) {
@@ -104,7 +105,7 @@ bool HasEditInfoBox(not_null<ChannelData*> channel) {
 }
 
 void FillManageBox(
-		not_null<Window::Controller*> controller,
+		not_null<Window::Navigation*> navigation,
 		not_null<ChannelData*> channel,
 		not_null<Ui::VerticalLayout*> content) {
 	using Profile::ParticipantsBoxController;
@@ -123,7 +124,7 @@ void FillManageBox(
 		AddButton(
 			content,
 			Lang::Viewer(lng_manage_peer_recent_actions),
-			[=] { ShowRecentActions(controller, channel); },
+			[=] { ShowRecentActions(navigation, channel); },
 			st::infoIconRecentActions);
 	}
 	if (channel->canViewMembers()) {
@@ -134,7 +135,7 @@ void FillManageBox(
 				| ToPositiveNumberString(),
 			[=] {
 				ParticipantsBoxController::Start(
-					controller,
+					navigation,
 					channel,
 					ParticipantsBoxController::Role::Members);
 			},
@@ -148,7 +149,7 @@ void FillManageBox(
 				| ToPositiveNumberString(),
 			[=] {
 				ParticipantsBoxController::Start(
-					controller,
+					navigation,
 					channel,
 					ParticipantsBoxController::Role::Admins);
 			},
@@ -163,7 +164,7 @@ void FillManageBox(
 					| ToPositiveNumberString(),
 				[=] {
 					ParticipantsBoxController::Start(
-						controller,
+						navigation,
 						channel,
 						ParticipantsBoxController::Role::Restricted);
 				},
@@ -176,7 +177,7 @@ void FillManageBox(
 				| ToPositiveNumberString(),
 			[=] {
 				ParticipantsBoxController::Start(
-					controller,
+					navigation,
 					channel,
 					ParticipantsBoxController::Role::Kicked);
 			},
@@ -218,7 +219,7 @@ void ManagePeerBox::prepare() {
 
 void ManagePeerBox::setupContent() {
 	auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
-	FillManageBox(controller(), _channel, content);
+	FillManageBox(App::wnd()->controller(), _channel, content);
 	widthValue(
 	) | rpl::start_with_next([=](int width) {
 		content->resizeToWidth(width);

Telegram/SourceFiles/boxes/send_files_box.cpp

@@ -125,7 +125,7 @@ public:
 	bool isPointAfter(QPoint position) const;
 	void moveInAlbum(QPoint to);
 	QPoint center() const;
-	void suggestMove(float64 delta, base::lambda<void()> callback);
+	void suggestMove(float64 delta, Fn<void()> callback);
 	void finishAnimations();
 
 private:
@@ -220,6 +220,7 @@ AlbumThumb::AlbumThumb(
 	if (_nameWidth > availableFileWidth) {
 		_name = st::semiboldFont->elided(
 			_name,
+			availableFileWidth,
 			Qt::ElideMiddle);
 		_nameWidth = st::semiboldFont->width(_name);
 	}
@@ -519,7 +520,7 @@ QPoint AlbumThumb::center() const {
 	return realGeometry.center();
 }
 
-void AlbumThumb::suggestMove(float64 delta, base::lambda<void()> callback) {
+void AlbumThumb::suggestMove(float64 delta, Fn<void()> callback) {
 	if (_suggestedMove != delta) {
 		_suggestedMoveAnimation.start(
 			std::move(callback),
@@ -888,7 +889,7 @@ rpl::producer<int> SingleFilePreview::desiredHeightValue() const {
 	return rpl::single(st::boxPhotoPadding.top() + h + st::msgShadow);
 }
 
-base::lambda<QString()> FieldPlaceholder(const Storage::PreparedList &list) {
+Fn<QString()> FieldPlaceholder(const Storage::PreparedList &list) {
 	return langFactory(list.files.size() > 1
 		? lng_photos_comment
 		: lng_photo_caption);
@@ -1360,7 +1361,7 @@ void SendFilesBox::prepareSingleFilePreview() {
 	Expects(_list.files.size() == 1);
 
 	const auto &file = _list.files[0];
-	const auto media = SingleMediaPreview::Create(this, controller(), file);
+	const auto media = SingleMediaPreview::Create(this, _controller, file);
 	if (media) {
 		if (!media->canSendAsPhoto()) {
 			_compressConfirm = CompressConfirm::None;
@@ -1423,18 +1424,16 @@ void SendFilesBox::setupShadows(
 }
 
 void SendFilesBox::prepare() {
-	Expects(controller() != nullptr);
-
 	_send = addButton(langFactory(lng_send_button), [this] { send(); });
 	addButton(langFactory(lng_cancel), [this] { closeBox(); });
 	setupCaption();
 	initSendWay();
 	preparePreview();
-	subscribe(boxClosing, [this] {
+	boxClosing() | rpl::start_with_next([=] {
 		if (!_confirmed && _cancelledCallback) {
 			_cancelledCallback();
 		}
-	});
+	}, lifetime());
 }
 
 void SendFilesBox::initSendWay() {

Telegram/SourceFiles/boxes/send_files_box.h

@@ -26,6 +26,10 @@ class InputField;
 struct GroupMediaLayout;
 } // namespace Ui
 
+namespace Window {
+class Controller;
+} // namespace Window
+
 enum class SendFilesWay {
 	Album,
 	Photos,
@@ -42,14 +46,14 @@ public:
 		CompressConfirm compressed);
 
 	void setConfirmedCallback(
-		base::lambda<void(
+		Fn<void(
 			Storage::PreparedList &&list,
 			SendFilesWay way,
 			TextWithTags &&caption,
 			bool ctrlShiftEnter)> callback) {
 		_confirmedCallback = std::move(callback);
 	}
-	void setCancelledCallback(base::lambda<void()> callback) {
+	void setCancelledCallback(Fn<void()> callback) {
 		_cancelledCallback = std::move(callback);
 	}
 
@@ -103,12 +107,12 @@ private:
 	CompressConfirm _compressConfirmInitial = CompressConfirm::None;
 	CompressConfirm _compressConfirm = CompressConfirm::None;
 
-	base::lambda<void(
+	Fn<void(
 		Storage::PreparedList &&list,
 		SendFilesWay way,
 		TextWithTags &&caption,
 		bool ctrlShiftEnter)> _confirmedCallback;
-	base::lambda<void()> _cancelledCallback;
+	Fn<void()> _cancelledCallback;
 	bool _confirmed = false;
 
 	object_ptr<Ui::InputField> _caption = { nullptr };

Telegram/SourceFiles/boxes/sessions_box.cpp

@@ -28,15 +28,15 @@ void SessionsBox::prepare() {
 
 	setDimensions(st::boxWideWidth, st::sessionsHeight);
 
+	_inner = setInnerWidget(object_ptr<Inner>(this, &_list, &_current), st::sessionsScroll);
+	_inner->resize(width(), st::noContactsHeight);
+
 	connect(_inner, SIGNAL(oneTerminated()), this, SLOT(onOneTerminated()));
 	connect(_inner, SIGNAL(allTerminated()), this, SLOT(onAllTerminated()));
 	connect(_inner, SIGNAL(terminateAll()), this, SLOT(onTerminateAll()));
 	connect(App::wnd(), SIGNAL(checkNewAuthorization()), this, SLOT(onCheckNewAuthorization()));
 	connect(_shortPollTimer, SIGNAL(timeout()), this, SLOT(onShortPollAuthorizations()));
 
-	_inner = setInnerWidget(object_ptr<Inner>(this, &_list, &_current), st::sessionsScroll);
-	_inner->resize(width(), st::noContactsHeight);
-
 	setLoading(true);
 
 	MTP::send(MTPaccount_GetAuthorizations(), rpcDone(&SessionsBox::gotAuthorizations));
@@ -71,8 +71,9 @@ void SessionsBox::gotAuthorizations(const MTPaccount_Authorizations &result) {
 	_shortPollRequest = 0;
 	setLoading(false);
 
-	auto availCurrent = st::boxWideWidth - st::sessionPadding.left() - st::sessionTerminateSkip;
-	auto availOther = availCurrent - st::sessionTerminate.iconPosition.x();// -st::sessionTerminate.width - st::sessionTerminateSkip;
+	const auto availCurrent = st::boxWideWidth - st::sessionPadding.left() - st::sessionTerminateSkip;
+	const auto availOther = availCurrent - st::sessionTerminate.iconPosition.x();
+	const auto availInfo = availCurrent - st::sessionTerminate.width;
 
 	_list.clear();
 	if (result.type() != mtpc_account_authorizations) {
@@ -165,8 +166,8 @@ void SessionsBox::gotAuthorizations(const MTPaccount_Authorizations &result) {
 				data.nameWidth = st::sessionNameFont->width(data.name);
 			}
 			data.infoWidth = st::sessionInfoFont->width(data.info);
-			if (data.infoWidth > availOther) {
-				data.info = st::sessionInfoFont->elided(data.info, availOther);
+			if (data.infoWidth > availInfo) {
+				data.info = st::sessionInfoFont->elided(data.info, availInfo);
 				data.infoWidth = st::sessionInfoFont->width(data.info);
 			}
 			data.ipWidth = st::sessionInfoFont->width(data.ip);
@@ -243,8 +244,8 @@ void SessionsBox::Inner::paintEvent(QPaintEvent *e) {
 		return;
 	}
 
+	p.translate(0, st::sessionCurrentPadding.top());
 	if (r.y() <= st::sessionCurrentHeight) {
-		p.translate(0, st::sessionCurrentPadding.top());
 		p.setFont(st::sessionNameFont);
 		p.setPen(st::sessionNameFg);
 		p.drawTextLeft(x, st::sessionPadding.top(), w, _current->name, _current->nameWidth);
@@ -297,7 +298,7 @@ void SessionsBox::Inner::onTerminate() {
 	for (auto i = _terminateButtons.begin(), e = _terminateButtons.end(); i != e; ++i) {
 		if (i.value()->isOver()) {
 			if (_terminateBox) _terminateBox->deleteLater();
-			_terminateBox = Ui::show(Box<ConfirmBox>(lang(lng_settings_reset_one_sure), lang(lng_settings_reset_button), st::attentionBoxButton, base::lambda_guarded(this, [this, terminating = i.key()] {
+			_terminateBox = Ui::show(Box<ConfirmBox>(lang(lng_settings_reset_one_sure), lang(lng_settings_reset_button), st::attentionBoxButton, crl::guard(this, [this, terminating = i.key()] {
 				if (_terminateBox) {
 					_terminateBox->closeBox();
 					_terminateBox = nullptr;
@@ -315,7 +316,7 @@ void SessionsBox::Inner::onTerminate() {
 
 void SessionsBox::Inner::onTerminateAll() {
 	if (_terminateBox) _terminateBox->deleteLater();
-	_terminateBox = Ui::show(Box<ConfirmBox>(lang(lng_settings_reset_sure), lang(lng_settings_reset_button), st::attentionBoxButton, base::lambda_guarded(this, [this] {
+	_terminateBox = Ui::show(Box<ConfirmBox>(lang(lng_settings_reset_sure), lang(lng_settings_reset_button), st::attentionBoxButton, crl::guard(this, [this] {
 		if (_terminateBox) {
 			_terminateBox->closeBox();
 			_terminateBox = nullptr;

Telegram/SourceFiles/boxes/share_box.cpp

@@ -551,7 +551,7 @@ void ShareBox::Inner::paintChat(
 	chat->name.drawLeftElided(p, x + nameLeft, y + nameTop, nameWidth, outerWidth, 2, style::al_top, 0, -1, 0, true);
 }
 
-ShareBox::Inner::Chat::Chat(PeerData *peer, base::lambda<void()> updateCallback)
+ShareBox::Inner::Chat::Chat(PeerData *peer, Fn<void()> updateCallback)
 : peer(peer)
 , checkbox(st::sharePhotoCheckbox, updateCallback, PaintUserpicCallback(peer, true))
 , name(st::sharePhotoCheckbox.imageRadius * 2) {
@@ -699,7 +699,7 @@ void ShareBox::Inner::peerUnselected(not_null<PeerData*> peer) {
 	}
 }
 
-void ShareBox::Inner::setPeerSelectedChangedCallback(base::lambda<void(PeerData *peer, bool selected)> callback) {
+void ShareBox::Inner::setPeerSelectedChangedCallback(Fn<void(PeerData *peer, bool selected)> callback) {
 	_peerSelectedChangedCallback = std::move(callback);
 }
 

Telegram/SourceFiles/boxes/share_box.h

@@ -31,9 +31,9 @@ class ShareBox : public BoxContent, public RPCSender {
 	Q_OBJECT
 
 public:
-	using CopyCallback = base::lambda<void()>;
-	using SubmitCallback = base::lambda<void(const QVector<PeerData*> &)>;
-	using FilterCallback = base::lambda<bool(PeerData*)>;
+	using CopyCallback = Fn<void()>;
+	using SubmitCallback = Fn<void(const QVector<PeerData*> &)>;
+	using FilterCallback = Fn<bool(PeerData*)>;
 	ShareBox(QWidget*, CopyCallback &&copyCallback, SubmitCallback &&submitCallback, FilterCallback &&filterCallback);
 
 protected:
@@ -103,7 +103,7 @@ class ShareBox::Inner : public TWidget, public RPCSender, private base::Subscrib
 public:
 	Inner(QWidget *parent, ShareBox::FilterCallback &&filterCallback);
 
-	void setPeerSelectedChangedCallback(base::lambda<void(PeerData *peer, bool selected)> callback);
+	void setPeerSelectedChangedCallback(Fn<void(PeerData *peer, bool selected)> callback);
 	void peerUnselected(not_null<PeerData*> peer);
 
 	QVector<PeerData*> selected() const;
@@ -148,7 +148,7 @@ private:
 	int displayedChatsCount() const;
 
 	struct Chat {
-		Chat(PeerData *peer, base::lambda<void()> updateCallback);
+		Chat(PeerData *peer, Fn<void()> updateCallback);
 
 		PeerData *peer;
 		Ui::RoundImageCheckbox checkbox;
@@ -201,7 +201,7 @@ private:
 	using SelectedChats = OrderedSet<PeerData*>;
 	SelectedChats _selected;
 
-	base::lambda<void(PeerData *peer, bool selected)> _peerSelectedChangedCallback;
+	Fn<void(PeerData *peer, bool selected)> _peerSelectedChangedCallback;
 
 	ChatData *data(Dialogs::Row *row);
 

Telegram/SourceFiles/boxes/sticker_set_box.cpp

@@ -381,7 +381,7 @@ void StickerSetBox::Inner::paintEvent(QPaintEvent *e) {
 				p.setOpacity(1);
 
 			}
-			bool goodThumb = !doc->thumb->isNull() && ((doc->thumb->width() >= 128) || (doc->thumb->height() >= 128));
+			const auto goodThumb = doc->hasGoodStickerThumb();
 			if (goodThumb) {
 				doc->thumb->load();
 			} else {
@@ -389,7 +389,9 @@ void StickerSetBox::Inner::paintEvent(QPaintEvent *e) {
 					doc->automaticLoad(0);
 				}
 				if (doc->sticker()->img->isNull() && doc->loaded(DocumentData::FilePathResolveChecked)) {
-					doc->sticker()->img = doc->data().isEmpty() ? ImagePtr(doc->filepath()) : ImagePtr(doc->data());
+					doc->sticker()->img = doc->data().isEmpty()
+						? ImagePtr(doc->filepath())
+						: ImagePtr(doc->data());
 				}
 			}
 
@@ -429,7 +431,7 @@ bool StickerSetBox::Inner::official() const {
 	return _loaded && _setShortName.isEmpty();
 }
 
-base::lambda<TextWithEntities()> StickerSetBox::Inner::title() const {
+Fn<TextWithEntities()> StickerSetBox::Inner::title() const {
 	auto text = TextWithEntities { _setTitle };
 	if (_loaded) {
 		if (_pack.isEmpty()) {

Telegram/SourceFiles/boxes/sticker_set_box.h

@@ -52,7 +52,7 @@ public:
 	bool loaded() const;
 	bool notInstalled() const;
 	bool official() const;
-	base::lambda<TextWithEntities()> title() const;
+	Fn<TextWithEntities()> title() const;
 	QString shortName() const;
 
 	void install();

Telegram/SourceFiles/boxes/stickers_box.cpp

@@ -274,7 +274,9 @@ void StickersBox::prepare() {
 	if (_installed.widget()) {
 		connect(_installed.widget(), SIGNAL(draggingScrollDelta(int)), this, SLOT(onDraggingScrollDelta(int)));
 		if (!_megagroupSet) {
-			subscribe(boxClosing, [this] { saveChanges(); });
+			boxClosing() | rpl::start_with_next([=] {
+				saveChanges();
+			}, lifetime());
 		}
 	}
 

Telegram/SourceFiles/boxes/stickers_box.h

@@ -154,10 +154,10 @@ public:
 	void setFullOrder(const Stickers::Order &order);
 	void setRemovedSets(const Stickers::Order &removed);
 
-	void setInstallSetCallback(base::lambda<void(uint64 setId)> callback) {
+	void setInstallSetCallback(Fn<void(uint64 setId)> callback) {
 		_installSetCallback = std::move(callback);
 	}
-	void setLoadMoreCallback(base::lambda<void()> callback) {
+	void setLoadMoreCallback(Fn<void()> callback) {
 		_loadMoreCallback = std::move(callback);
 	}
 
@@ -280,8 +280,8 @@ private:
 	anim::value _aboveShadowFadeOpacity;
 	BasicAnimation _a_shifting;
 
-	base::lambda<void(uint64 setId)> _installSetCallback;
-	base::lambda<void()> _loadMoreCallback;
+	Fn<void(uint64 setId)> _installSetCallback;
+	Fn<void()> _loadMoreCallback;
 
 	int _visibleTop = 0;
 	int _visibleBottom = 0;

Telegram/SourceFiles/calls/calls.style

@@ -20,6 +20,7 @@ CallSignalBars {
 
 callWidth: 300px;
 callHeight: 470px;
+callRadius: 6px;
 callShadow: Shadow {
 	left: icon {{ "call_shadow_left", windowShadowFg }};
 	topLeft: icon {{ "call_shadow_top_left", windowShadowFg }};

Telegram/SourceFiles/calls/calls_box_controller.cpp

@@ -44,6 +44,7 @@ public:
 	}
 	void addItem(not_null<HistoryItem*> item) {
 		Expects(canAddItem(item));
+
 		_items.push_back(item);
 		ranges::sort(_items, [](not_null<HistoryItem*> a, auto b) {
 			return (a->id > b->id);
@@ -78,7 +79,7 @@ public:
 		int availableWidth,
 		int outerWidth,
 		bool selected) override;
-	void addActionRipple(QPoint point, base::lambda<void()> updateCallback) override;
+	void addActionRipple(QPoint point, Fn<void()> updateCallback) override;
 	void stopLastActionRipple() override;
 
 	int nameIconWidth() const override {
@@ -191,7 +192,7 @@ BoxController::Row::Type BoxController::Row::ComputeType(
 	return Type::In;
 }
 
-void BoxController::Row::addActionRipple(QPoint point, base::lambda<void()> updateCallback) {
+void BoxController::Row::addActionRipple(QPoint point, Fn<void()> updateCallback) {
 	if (!_actionRipple) {
 		auto mask = Ui::RippleAnimation::ellipseMask(QSize(st::callReDial.rippleAreaSize, st::callReDial.rippleAreaSize));
 		_actionRipple = std::make_unique<Ui::RippleAnimation>(st::callReDial.ripple, std::move(mask), std::move(updateCallback));

Telegram/SourceFiles/calls/calls_call.cpp

@@ -37,6 +37,7 @@ namespace {
 constexpr auto kMinLayer = 65;
 constexpr auto kMaxLayer = 75;
 constexpr auto kHangupTimeoutMs = 5000;
+constexpr auto kSha256Size = 32;
 
 using tgvoip::Endpoint;
 
@@ -62,8 +63,9 @@ void ConvertEndpoint(
 }
 
 constexpr auto kFingerprintDataSize = 256;
-uint64 ComputeFingerprint(
-		const std::array<gsl::byte, kFingerprintDataSize> &authKey) {
+uint64 ComputeFingerprint(bytes::const_span authKey) {
+	Expects(authKey.size() == kFingerprintDataSize);
+
 	auto hash = openssl::Sha1(authKey);
 	return (gsl::to_integer<uint64>(hash[19]) << 56)
 		| (gsl::to_integer<uint64>(hash[18]) << 48)
@@ -133,7 +135,7 @@ Call::Call(
 	}
 }
 
-void Call::generateModExpFirst(base::const_byte_span randomSeed) {
+void Call::generateModExpFirst(bytes::const_span randomSeed) {
 	auto first = MTP::CreateModExp(_dhConfig.g, _dhConfig.p, randomSeed);
 	if (first.modexp.empty()) {
 		LOG(("Call Error: Could not compute mod-exp first."));
@@ -141,7 +143,7 @@ void Call::generateModExpFirst(base::const_byte_span randomSeed) {
 		return;
 	}
 
-	_randomPower = first.randomPower;
+	_randomPower = std::move(first.randomPower);
 	if (_type == Type::Incoming) {
 		_gb = std::move(first.modexp);
 	} else {
@@ -157,7 +159,7 @@ bool Call::isIncomingWaiting() const {
 	return (_state == State::Starting) || (_state == State::WaitingIncoming);
 }
 
-void Call::start(base::const_byte_span random) {
+void Call::start(bytes::const_span random) {
 	// Save config here, because it is possible that it changes between
 	// different usages inside the same call.
 	_dhConfig = _delegate->getDhConfig();
@@ -179,6 +181,7 @@ void Call::start(base::const_byte_span random) {
 void Call::startOutgoing() {
 	Expects(_type == Type::Outgoing);
 	Expects(_state == State::Requesting);
+	Expects(_gaHash.size() == kSha256Size);
 
 	request(MTPphone_RequestCall(
 		_user->inputUser,
@@ -311,12 +314,8 @@ void Call::redial() {
 }
 
 QString Call::getDebugLog() const {
-	constexpr auto kDebugLimit = 4096;
-	auto bytes = base::byte_vector(kDebugLimit, gsl::byte {});
-	_controller->GetDebugString(reinterpret_cast<char*>(bytes.data()), bytes.size());
-	auto end = std::find(bytes.begin(), bytes.end(), gsl::byte {});
-	auto size = (end - bytes.begin());
-	return QString::fromUtf8(reinterpret_cast<const char*>(bytes.data()), size);
+	const auto debug = _controller->GetDebugString();
+	return QString::fromUtf8(debug.data(), debug.size());
 }
 
 void Call::startWaitingTrack() {
@@ -342,12 +341,13 @@ bool Call::isKeyShaForFingerprintReady() const {
 	return (_keyFingerprint != 0);
 }
 
-base::byte_array<Call::kSha256Size> Call::getKeyShaForFingerprint() const {
+bytes::vector Call::getKeyShaForFingerprint() const {
 	Expects(isKeyShaForFingerprintReady());
 	Expects(!_ga.empty());
-	auto encryptedChatAuthKey = base::byte_vector(_authKey.size() + _ga.size(), gsl::byte {});
-	base::copy_bytes(gsl::make_span(encryptedChatAuthKey).subspan(0, _authKey.size()), _authKey);
-	base::copy_bytes(gsl::make_span(encryptedChatAuthKey).subspan(_authKey.size(), _ga.size()), _ga);
+
+	auto encryptedChatAuthKey = bytes::vector(_authKey.size() + _ga.size(), gsl::byte {});
+	bytes::copy(gsl::make_span(encryptedChatAuthKey).subspan(0, _authKey.size()), _authKey);
+	bytes::copy(gsl::make_span(encryptedChatAuthKey).subspan(_authKey.size(), _ga.size()), _ga);
 	return openssl::Sha256(encryptedChatAuthKey);
 }
 
@@ -367,13 +367,13 @@ bool Call::handleUpdate(const MTPPhoneCall &call) {
 		}
 		_id = data.vid.v;
 		_accessHash = data.vaccess_hash.v;
-		auto gaHashBytes = bytesFromMTP(data.vg_a_hash);
-		if (gaHashBytes.size() != _gaHash.size()) {
-			LOG(("Call Error: Wrong g_a_hash size %1, expected %2.").arg(gaHashBytes.size()).arg(_gaHash.size()));
+		auto gaHashBytes = bytes::make_span(data.vg_a_hash.v);
+		if (gaHashBytes.size() != kSha256Size) {
+			LOG(("Call Error: Wrong g_a_hash size %1, expected %2.").arg(gaHashBytes.size()).arg(kSha256Size));
 			finish(FinishType::Failed);
 			return true;
 		}
-		base::copy_bytes(gsl::make_span(_gaHash), gaHashBytes);
+		_gaHash = bytes::make_vector(gaHashBytes);
 	} return true;
 
 	case mtpc_phoneCallEmpty: {
@@ -453,7 +453,7 @@ bool Call::handleUpdate(const MTPPhoneCall &call) {
 void Call::confirmAcceptedCall(const MTPDphoneCallAccepted &call) {
 	Expects(_type == Type::Outgoing);
 
-	auto firstBytes = bytesFromMTP(call.vg_b);
+	auto firstBytes = bytes::make_span(call.vg_b.v);
 	auto computedAuthKey = MTP::CreateAuthKey(firstBytes, _randomPower, _dhConfig.p);
 	if (computedAuthKey.empty()) {
 		LOG(("Call Error: Could not compute mod-exp final."));
@@ -493,13 +493,13 @@ void Call::confirmAcceptedCall(const MTPDphoneCallAccepted &call) {
 void Call::startConfirmedCall(const MTPDphoneCall &call) {
 	Expects(_type == Type::Incoming);
 
-	auto firstBytes = bytesFromMTP(call.vg_a_or_b);
+	auto firstBytes = bytes::make_span(call.vg_a_or_b.v);
 	if (_gaHash != openssl::Sha256(firstBytes)) {
 		LOG(("Call Error: Wrong g_a hash received."));
 		finish(FinishType::Failed);
 		return;
 	}
-	_ga = base::byte_vector(firstBytes.begin(), firstBytes.end());
+	_ga = bytes::vector(firstBytes.begin(), firstBytes.end());
 
 	auto computedAuthKey = MTP::CreateAuthKey(firstBytes, _randomPower, _dhConfig.p);
 	if (computedAuthKey.empty()) {
@@ -520,8 +520,8 @@ void Call::createAndStartController(const MTPDphoneCall &call) {
 		return;
 	}
 
-	voip_config_t config = { 0 };
-	config.data_saving = tgvoip::DATA_SAVING_NEVER;
+	tgvoip::VoIPController::Config config;
+	config.dataSaving = tgvoip::DATA_SAVING_NEVER;
 #ifdef Q_OS_MAC
 	config.enableAEC = (QSysInfo::macVersion() < QSysInfo::MV_10_7);
 #else // Q_OS_MAC
@@ -529,18 +529,18 @@ void Call::createAndStartController(const MTPDphoneCall &call) {
 #endif // Q_OS_MAC
 	config.enableNS = true;
 	config.enableAGC = true;
-	config.init_timeout = Global::CallConnectTimeoutMs() / 1000;
-	config.recv_timeout = Global::CallPacketTimeoutMs() / 1000;
-	if (cDebug()) {
+	config.initTimeout = Global::CallConnectTimeoutMs() / 1000;
+	config.recvTimeout = Global::CallPacketTimeoutMs() / 1000;
+	if (Logs::DebugEnabled()) {
 		auto callLogFolder = cWorkingDir() + qsl("DebugLogs");
 		auto callLogPath = callLogFolder + qsl("/last_call_log.txt");
 		auto callLogNative = QFile::encodeName(QDir::toNativeSeparators(callLogPath));
-		auto callLogBytesSrc = gsl::as_bytes(gsl::make_span(callLogNative));
-		auto callLogBytesDst = gsl::as_writeable_bytes(gsl::make_span(config.logFilePath));
+		auto callLogBytesSrc = bytes::make_span(callLogNative);
+		auto callLogBytesDst = bytes::make_span(config.logFilePath);
 		if (callLogBytesSrc.size() + 1 <= callLogBytesDst.size()) { // +1 - zero-terminator
 			QFile(callLogPath).remove();
 			QDir().mkpath(callLogFolder);
-			base::copy_bytes(callLogBytesDst, callLogBytesSrc);
+			bytes::copy(callLogBytesDst, callLogBytesSrc);
 		}
 	}
 
@@ -571,7 +571,7 @@ void Call::createAndStartController(const MTPDphoneCall &call) {
 	}
 	_controller->implData = static_cast<void*>(this);
 	_controller->SetRemoteEndpoints(endpoints, true, protocol.vmax_layer.v);
-	_controller->SetConfig(&config);
+	_controller->SetConfig(config);
 	_controller->SetEncryptionKey(reinterpret_cast<char*>(_authKey.data()), (_type == Type::Outgoing));
 	_controller->SetCallbacks(callbacks);
 	if (Global::UseProxy() && Global::UseProxyForCalls()) {

Telegram/SourceFiles/calls/calls_call.h

@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/weak_ptr.h"
 #include "base/timer.h"
+#include "base/bytes.h"
 #include "mtproto/sender.h"
 #include "mtproto/auth_key.h"
 
@@ -27,7 +28,7 @@ namespace Calls {
 struct DhConfig {
 	int32 version = 0;
 	int32 g = 0;
-	std::vector<gsl::byte> p;
+	bytes::vector p;
 };
 
 class Call : public base::has_weak_ptr, private MTP::Sender {
@@ -48,8 +49,6 @@ public:
 
 	};
 
-	static constexpr auto kRandomPowerSize = 256;
-	static constexpr auto kSha256Size = 32;
 	static constexpr auto kSoundSampleMs = 100;
 
 	enum class Type {
@@ -66,7 +65,7 @@ public:
 	}
 	bool isIncomingWaiting() const;
 
-	void start(base::const_byte_span random);
+	void start(bytes::const_span random);
 	bool handleUpdate(const MTPPhoneCall &call);
 
 	enum State {
@@ -116,7 +115,7 @@ public:
 	void redial();
 
 	bool isKeyShaForFingerprintReady() const;
-	std::array<gsl::byte, kSha256Size> getKeyShaForFingerprint() const;
+	bytes::vector getKeyShaForFingerprint() const;
 
 	QString getDebugLog() const;
 
@@ -152,7 +151,7 @@ private:
 	void startIncoming();
 	void startWaitingTrack();
 
-	void generateModExpFirst(base::const_byte_span randomSeed);
+	void generateModExpFirst(bytes::const_span randomSeed);
 	void handleControllerStateChange(
 		tgvoip::VoIPController *controller,
 		int state);
@@ -191,10 +190,10 @@ private:
 	base::Observable<bool> _muteChanged;
 
 	DhConfig _dhConfig;
-	std::vector<gsl::byte> _ga;
-	std::vector<gsl::byte> _gb;
-	std::array<gsl::byte, kSha256Size> _gaHash;
-	std::array<gsl::byte, kRandomPowerSize> _randomPower;
+	bytes::vector _ga;
+	bytes::vector _gb;
+	bytes::vector _gaHash;
+	bytes::vector _randomPower;
 	MTP::AuthKey::Data _authKey;
 	MTPPhoneCallProtocol _protocol;
 

Telegram/SourceFiles/calls/calls_emoji_fingerprint.cpp

@@ -99,7 +99,7 @@ const ushort Offsets[] = {
 620, 622, 624, 626, 628, 630, 632, 634, 636, 638, 640, 641,
 642, 643, 644, 646, 648, 650, 652, 654, 656, 658 };
 
-uint64 ComputeEmojiIndex(base::const_byte_span bytes) {
+uint64 ComputeEmojiIndex(bytes::const_span bytes) {
 	Expects(bytes.size() == 8);
 	return ((gsl::to_integer<uint64>(bytes[0]) & 0x7F) << 56)
 		| (gsl::to_integer<uint64>(bytes[1]) << 48)

Telegram/SourceFiles/calls/calls_instance.cpp

@@ -126,26 +126,26 @@ void Instance::refreshDhConfig() {
 	Expects(_currentCall != nullptr);
 	request(MTPmessages_GetDhConfig(
 		MTP_int(_dhConfig.version),
-		MTP_int(Call::kRandomPowerSize)
+		MTP_int(MTP::ModExpFirst::kRandomPowerSize)
 	)).done([this, call = base::make_weak(_currentCall)](
 			const MTPmessages_DhConfig &result) {
-		auto random = base::const_byte_span();
+		auto random = bytes::const_span();
 		switch (result.type()) {
 		case mtpc_messages_dhConfig: {
 			auto &config = result.c_messages_dhConfig();
-			if (!MTP::IsPrimeAndGood(bytesFromMTP(config.vp), config.vg.v)) {
+			if (!MTP::IsPrimeAndGood(bytes::make_span(config.vp.v), config.vg.v)) {
 				LOG(("API Error: bad p/g received in dhConfig."));
 				callFailed(call.get());
 				return;
 			}
 			_dhConfig.g = config.vg.v;
-			_dhConfig.p = byteVectorFromMTP(config.vp);
-			random = bytesFromMTP(config.vrandom);
+			_dhConfig.p = bytes::make_vector(config.vp.v);
+			random = bytes::make_span(config.vrandom.v);
 		} break;
 
 		case mtpc_messages_dhConfigNotModified: {
 			auto &config = result.c_messages_dhConfigNotModified();
-			random = bytesFromMTP(config.vrandom);
+			random = bytes::make_span(config.vrandom.v);
 			if (!_dhConfig.g || _dhConfig.p.empty()) {
 				LOG(("API Error: dhConfigNotModified on zero version."));
 				callFailed(call.get());
@@ -156,7 +156,7 @@ void Instance::refreshDhConfig() {
 		default: Unexpected("Type in messages.getDhConfig");
 		}
 
-		if (random.size() != Call::kRandomPowerSize) {
+		if (random.size() != MTP::ModExpFirst::kRandomPowerSize) {
 			LOG(("API Error: dhConfig random bytes wrong size: %1").arg(random.size()));
 			callFailed(call.get());
 			return;
@@ -186,7 +186,7 @@ void Instance::refreshServerConfig() {
 		_lastServerConfigUpdateTime = getms(true);
 
 		auto configUpdate = std::map<std::string, std::string>();
-		auto bytes = bytesFromMTP(result.c_dataJSON().vdata);
+		auto bytes = bytes::make_span(result.c_dataJSON().vdata.v);
 		auto error = QJsonParseError { 0, QJsonParseError::NoError };
 		auto document = QJsonDocument::fromJson(QByteArray::fromRawData(reinterpret_cast<const char*>(bytes.data()), bytes.size()), &error);
 		if (error.error != QJsonParseError::NoError) {

Telegram/SourceFiles/calls/calls_panel.cpp

@@ -71,7 +71,7 @@ SignalBars::SignalBars(
 	QWidget *parent,
 	not_null<Call*> call,
 	const style::CallSignalBars &st,
-	base::lambda<void()> displayedChangedCallback)
+	Fn<void()> displayedChangedCallback)
 : RpWidget(parent)
 , _st(st)
 , _displayedChangedCallback(std::move(displayedChangedCallback)) {
@@ -600,7 +600,7 @@ void Panel::createBottomImage() {
 		p.setBrush(st::callBg);
 		p.setPen(Qt::NoPen);
 		PainterHighQualityEnabler hq(p);
-		p.drawRoundedRect(myrtlrect(_padding.left(), -st::historyMessageRadius, st::callWidth, bottomHeight - _padding.bottom() + st::historyMessageRadius), st::historyMessageRadius, st::historyMessageRadius);
+		p.drawRoundedRect(myrtlrect(_padding.left(), -st::callRadius, st::callWidth, bottomHeight - _padding.bottom() + st::callRadius), st::callRadius, st::callRadius);
 	}
 	_bottomCache = App::pixmapFromImageInPlace(std::move(image));
 }
@@ -620,7 +620,7 @@ void Panel::createDefaultCacheImage() {
 		p.setBrush(st::callBg);
 		p.setPen(Qt::NoPen);
 		PainterHighQualityEnabler hq(p);
-		p.drawRoundedRect(myrtlrect(inner), st::historyMessageRadius, st::historyMessageRadius);
+		p.drawRoundedRect(myrtlrect(inner), st::callRadius, st::callRadius);
 	}
 	_cache = App::pixmapFromImageInPlace(std::move(cache));
 }

Telegram/SourceFiles/calls/calls_panel.h

@@ -32,7 +32,7 @@ public:
 		QWidget *parent,
 		not_null<Call*> call,
 		const style::CallSignalBars &st,
-		base::lambda<void()> displayedChangedCallback = nullptr);
+		Fn<void()> displayedChangedCallback = nullptr);
 
 	bool isDisplayed() const;
 
@@ -44,7 +44,7 @@ private:
 
 	const style::CallSignalBars &_st;
 	int _count = Call::kSignalBarStarting;
-	base::lambda<void()> _displayedChangedCallback;
+	Fn<void()> _displayedChangedCallback;
 
 };
 

Telegram/SourceFiles/calls/calls_top_bar.cpp

@@ -108,7 +108,8 @@ void TopBar::initControls() {
 	setInfoLabels();
 	_info->setClickedCallback([this] {
 		if (auto call = _call.get()) {
-			if (cDebug() && (_info->clickModifiers() & Qt::ControlModifier)) {
+			if (Logs::DebugEnabled()
+				&& (_info->clickModifiers() & Qt::ControlModifier)) {
 				Ui::show(Box<DebugInfoBox>(_call));
 			} else {
 				Current().showInfoPanel(call);

Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp

@@ -615,7 +615,10 @@ QRect EmojiListWidget::emojiRect(int section, int sel) {
 
 void EmojiListWidget::onColorSelected(EmojiPtr emoji) {
 	if (emoji->hasVariants()) {
-		cRefEmojiVariants().insert(emoji->nonColoredId(), emoji->variantIndex(emoji));
+		cRefEmojiVariants().insert(
+			emoji->nonColoredId(),
+			emoji->variantIndex(emoji));
+		Auth().saveSettingsDelayed();
 	}
 	if (_pickerSel >= 0) {
 		auto section = (_pickerSel / MatrixRowShift);

Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp

@@ -367,7 +367,7 @@ SuggestionsController::SuggestionsController(QWidget *parent, not_null<QTextEdit
 }
 
 void SuggestionsController::setReplaceCallback(
-	base::lambda<void(
+	Fn<void(
 		int from,
 		int till,
 		const QString &replacement)> callback) {

Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.h

@@ -68,7 +68,7 @@ public:
 	SuggestionsController(QWidget *parent, not_null<QTextEdit*> field);
 
 	void raise();
-	void setReplaceCallback(base::lambda<void(
+	void setReplaceCallback(Fn<void(
 		int from,
 		int till,
 		const QString &replacement)> callback);
@@ -91,7 +91,7 @@ private:
 	bool _ignoreCursorPositionChange = false;
 	bool _textChangeAfterKeyPress = false;
 	QPointer<QTextEdit> _field;
-	base::lambda<void(
+	Fn<void(
 		int from,
 		int till,
 		const QString &replacement)> _replaceCallback;

Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp

@@ -558,7 +558,7 @@ void FieldAutocompleteInner::paintEvent(QPaintEvent *e) {
 					App::roundRect(p, QRect(tl, st::stickerPanSize), st::emojiPanHover, StickerHoverCorners);
 				}
 
-				bool goodThumb = !sticker->thumb->isNull() && ((sticker->thumb->width() >= 128) || (sticker->thumb->height() >= 128));
+				const auto goodThumb = sticker->hasGoodStickerThumb();
 				if (goodThumb) {
 					sticker->thumb->load();
 				} else {

Telegram/SourceFiles/chat_helpers/message_field.cpp

@@ -57,7 +57,7 @@ public:
 		QWidget*,
 		const QString &text,
 		const QString &link,
-		base::lambda<void(QString, QString)> callback);
+		Fn<void(QString, QString)> callback);
 
 	void setInnerFocus() override;
 
@@ -67,8 +67,8 @@ protected:
 private:
 	QString _startText;
 	QString _startLink;
-	base::lambda<void(QString, QString)> _callback;
-	base::lambda<void()> _setInnerFocus;
+	Fn<void(QString, QString)> _callback;
+	Fn<void()> _setInnerFocus;
 
 };
 
@@ -120,7 +120,7 @@ EditLinkBox::EditLinkBox(
 	QWidget*,
 	const QString &text,
 	const QString &link,
-	base::lambda<void(QString, QString)> callback)
+	Fn<void(QString, QString)> callback)
 : _startText(text)
 , _startLink(link)
 , _callback(std::move(callback)) {
@@ -307,7 +307,7 @@ void SetClipboardWithEntities(
 	}
 }
 
-base::lambda<bool(
+Fn<bool(
 	Ui::InputField::EditLinkSelection selection,
 	QString text,
 	QString link,

Telegram/SourceFiles/chat_helpers/message_field.h

@@ -27,7 +27,7 @@ void SetClipboardWithEntities(
 	const TextWithEntities &forClipboard,
 	QClipboard::Mode mode = QClipboard::Clipboard);
 
-base::lambda<bool(
+Fn<bool(
 	Ui::InputField::EditLinkSelection selection,
 	QString text,
 	QString link,

Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp

@@ -266,14 +266,23 @@ void StickersListWidget::Footer::preloadImages() {
 void StickersListWidget::Footer::validateSelectedIcon(
 		uint64 setId,
 		ValidateIconAnimations animations) {
-	auto newSelected = 0;
+	auto favedIconIndex = -1;
+	auto newSelected = -1;
 	for (auto i = 0, l = _icons.size(); i != l; ++i) {
-		if (_icons[i].setId == setId) {
+		if (_icons[i].setId == setId
+			|| (_icons[i].setId == Stickers::FavedSetId
+				&& setId == Stickers::RecentSetId)) {
 			newSelected = i;
 			break;
+		} else if (_icons[i].setId == Stickers::FavedSetId) {
+			favedIconIndex = i;
 		}
 	}
-	setSelectedIcon(newSelected, animations);
+	setSelectedIcon(
+		(newSelected >= 0
+			? newSelected
+			: (favedIconIndex >= 0) ? favedIconIndex : 0),
+		animations);
 }
 
 void StickersListWidget::Footer::setSelectedIcon(
@@ -923,7 +932,7 @@ void StickersListWidget::refreshSearchRows() {
 }
 
 void StickersListWidget::refreshSearchRows(
-		const std::vector<Stickers::Set*> *cloudSets) {
+		const std::vector<uint64> *cloudSets) {
 	clearSelection();
 
 	_searchSets.clear();
@@ -988,9 +997,12 @@ void StickersListWidget::fillLocalSearchRows(const QString &query) {
 }
 
 void StickersListWidget::fillCloudSearchRows(
-		const std::vector<Stickers::Set*> &sets) {
-	for (const auto set : sets) {
-		addSearchRow(set);
+		const std::vector<uint64> &cloudSets) {
+	const auto &sets = Auth().data().stickerSets();
+	for (const auto setId : cloudSets) {
+		if (const auto it = sets.find(setId); it != sets.end()) {
+			addSearchRow(&*it);
+		}
 	}
 }
 
@@ -1040,7 +1052,7 @@ void StickersListWidget::searchResultsDone(
 	if (it == _searchCache.cend()) {
 		it = _searchCache.emplace(
 			_searchQuery,
-			std::vector<Stickers::Set*>()).first;
+			std::vector<uint64>()).first;
 	}
 	auto &d = result.c_messages_foundStickerSets();
 	for_const (const auto &stickerSet, d.vsets.v) {
@@ -1075,7 +1087,7 @@ void StickersListWidget::searchResultsDone(
 			if (set->stickers.empty() && set->covers.empty()) {
 				continue;
 			}
-			it->second.push_back(set);
+			it->second.push_back(set->id);
 		}
 	}
 	showSearchResults();
@@ -1306,7 +1318,7 @@ void StickersListWidget::paintSticker(Painter &p, Set &set, int y, int index, bo
 		App::roundRect(p, QRect(tl, _singleSize), st::emojiPanHover, StickerHoverCorners);
 	}
 
-	auto goodThumb = !sticker->thumb->isNull() && ((sticker->thumb->width() >= 128) || (sticker->thumb->height() >= 128));
+	const auto goodThumb = sticker->hasGoodStickerThumb();
 	if (goodThumb) {
 		sticker->thumb->load();
 	} else {
@@ -1755,9 +1767,7 @@ void StickersListWidget::preloadImages() {
 			auto sticker = sets[i].pack.at(j);
 			if (!sticker || !sticker->sticker()) continue;
 
-			bool goodThumb = !sticker->thumb->isNull()
-				&& ((sticker->thumb->width() >= 128)
-					|| (sticker->thumb->height() >= 128));
+			const auto goodThumb = sticker->hasGoodStickerThumb();
 			if (goodThumb) {
 				sticker->thumb->load();
 			} else {
@@ -2011,7 +2021,7 @@ void StickersListWidget::fillIcons(QList<StickerIcon> &icons) {
 	}
 	if (i != _mySets.size() && _mySets[i].id == Stickers::RecentSetId) {
 		++i;
-		if (!icons.empty() && icons.back().setId != Stickers::FavedSetId) {
+		if (icons.empty() || icons.back().setId != Stickers::FavedSetId) {
 			icons.push_back(StickerIcon(Stickers::RecentSetId));
 		}
 	}
@@ -2336,7 +2346,7 @@ void StickersListWidget::removeMegagroupSet(bool locally) {
 		return;
 	}
 	_removingSetId = Stickers::MegagroupSetId;
-	Ui::show(Box<ConfirmBox>(lang(lng_stickers_remove_group_set), base::lambda_guarded(this, [this, group = _megagroupSet] {
+	Ui::show(Box<ConfirmBox>(lang(lng_stickers_remove_group_set), crl::guard(this, [this, group = _megagroupSet] {
 		Expects(group->mgInfo != nullptr);
 		if (group->mgInfo->stickerSet.type() != mtpc_inputStickerSetEmpty) {
 			Auth().api().setGroupStickerSet(group, MTP_inputStickerSetEmpty());
@@ -2344,7 +2354,7 @@ void StickersListWidget::removeMegagroupSet(bool locally) {
 		Ui::hideLayer();
 		_removingSetId = 0;
 		emit checkForHide();
-	}), base::lambda_guarded(this, [this] {
+	}), crl::guard(this, [this] {
 		_removingSetId = 0;
 		emit checkForHide();
 	})));
@@ -2356,7 +2366,7 @@ void StickersListWidget::removeSet(uint64 setId) {
 	if (it != sets.cend()) {
 		_removingSetId = it->id;
 		auto text = lng_stickers_remove_pack(lt_sticker_pack, it->title);
-		Ui::show(Box<ConfirmBox>(text, lang(lng_stickers_remove_pack_confirm), base::lambda_guarded(this, [this] {
+		Ui::show(Box<ConfirmBox>(text, lang(lng_stickers_remove_pack_confirm), crl::guard(this, [this] {
 			Ui::hideLayer();
 			auto &sets = Auth().data().stickerSetsRef();
 			auto it = sets.find(_removingSetId);
@@ -2393,7 +2403,7 @@ void StickersListWidget::removeSet(uint64 setId) {
 			}
 			_removingSetId = 0;
 			emit checkForHide();
-		}), base::lambda_guarded(this, [this] {
+		}), crl::guard(this, [this] {
 			_removingSetId = 0;
 			emit checkForHide();
 		})));

Telegram/SourceFiles/chat_helpers/stickers_list_widget.h

@@ -243,9 +243,9 @@ private:
 	void showSearchResults();
 	void searchResultsDone(const MTPmessages_FoundStickerSets &result);
 	void refreshSearchRows();
-	void refreshSearchRows(const std::vector<Stickers::Set*> *cloudSets);
+	void refreshSearchRows(const std::vector<uint64> *cloudSets);
 	void fillLocalSearchRows(const QString &query);
-	void fillCloudSearchRows(const std::vector<Stickers::Set*> &sets);
+	void fillCloudSearchRows(const std::vector<uint64> &cloudSets);
 	void addSearchRow(not_null<const Stickers::Set*> set);
 
 	ChannelData *_megagroupSet = nullptr;
@@ -284,7 +284,7 @@ private:
 	QTimer _previewTimer;
 	bool _previewShown = false;
 
-	std::map<QString, std::vector<Stickers::Set*>> _searchCache;
+	std::map<QString, std::vector<uint64>> _searchCache;
 	std::vector<std::pair<uint64, QStringList>> _searchIndex;
 	base::Timer _searchRequestTimer;
 	QString _searchQuery, _searchNextQuery;

Telegram/SourceFiles/chat_helpers/tabbed_section.cpp

@@ -14,7 +14,7 @@ namespace ChatHelpers {
 
 TabbedMemento::TabbedMemento(
 	object_ptr<TabbedSelector> selector,
-	base::lambda<void(object_ptr<TabbedSelector>)> returnMethod)
+	Fn<void(object_ptr<TabbedSelector>)> returnMethod)
 : _selector(std::move(selector))
 , _returnMethod(std::move(returnMethod)) {
 }
@@ -46,14 +46,14 @@ TabbedSection::TabbedSection(
 	parent,
 	controller,
 	object_ptr<TabbedSelector>(this, controller),
-	base::lambda<void(object_ptr<TabbedSelector>)>()) {
+	Fn<void(object_ptr<TabbedSelector>)>()) {
 }
 
 TabbedSection::TabbedSection(
 	QWidget *parent,
 	not_null<Window::Controller*> controller,
 	object_ptr<TabbedSelector> selector,
-	base::lambda<void(object_ptr<TabbedSelector>)> returnMethod)
+	Fn<void(object_ptr<TabbedSelector>)> returnMethod)
 : Window::SectionWidget(parent, controller)
 , _selector(std::move(selector))
 , _returnMethod(std::move(returnMethod)) {
@@ -67,8 +67,8 @@ TabbedSection::TabbedSection(
 			_cancelledCallback();
 		}
 	});
-	_selector->setAfterShownCallback(base::lambda<void(SelectorTab)>());
-	_selector->setBeforeHidingCallback(base::lambda<void(SelectorTab)>());
+	_selector->setAfterShownCallback(Fn<void(SelectorTab)>());
+	_selector->setBeforeHidingCallback(Fn<void(SelectorTab)>());
 
 	setAttribute(Qt::WA_OpaquePaintEvent, true);
 }

Telegram/SourceFiles/chat_helpers/tabbed_section.h

@@ -18,7 +18,7 @@ class TabbedMemento : public Window::SectionMemento {
 public:
 	TabbedMemento(
 		object_ptr<TabbedSelector> selector,
-		base::lambda<void(object_ptr<TabbedSelector>)> returnMethod);
+		Fn<void(object_ptr<TabbedSelector>)> returnMethod);
 	TabbedMemento(TabbedMemento &&other) = default;
 	TabbedMemento &operator=(TabbedMemento &&other) = default;
 
@@ -32,7 +32,7 @@ public:
 
 private:
 	object_ptr<TabbedSelector> _selector;
-	base::lambda<void(object_ptr<TabbedSelector>)> _returnMethod;
+	Fn<void(object_ptr<TabbedSelector>)> _returnMethod;
 
 };
 
@@ -45,11 +45,11 @@ public:
 		QWidget *parent,
 		not_null<Window::Controller*> controller,
 		object_ptr<TabbedSelector> selector,
-		base::lambda<void(object_ptr<TabbedSelector>)> returnMethod);
+		Fn<void(object_ptr<TabbedSelector>)> returnMethod);
 
 	void beforeHiding();
 	void afterShown();
-	void setCancelledCallback(base::lambda<void()> callback) {
+	void setCancelledCallback(Fn<void()> callback) {
 		_cancelledCallback = std::move(callback);
 	}
 
@@ -77,8 +77,8 @@ protected:
 
 private:
 	object_ptr<TabbedSelector> _selector;
-	base::lambda<void()> _cancelledCallback;
-	base::lambda<void(object_ptr<TabbedSelector>)> _returnMethod;
+	Fn<void()> _cancelledCallback;
+	Fn<void(object_ptr<TabbedSelector>)> _returnMethod;
 
 };
 

Telegram/SourceFiles/chat_helpers/tabbed_selector.h

@@ -63,10 +63,10 @@ public:
 		return _a_slide.animating();
 	}
 
-	void setAfterShownCallback(base::lambda<void(SelectorTab)> callback) {
+	void setAfterShownCallback(Fn<void(SelectorTab)> callback) {
 		_afterShownCallback = std::move(callback);
 	}
-	void setBeforeHidingCallback(base::lambda<void(SelectorTab)> callback) {
+	void setBeforeHidingCallback(Fn<void(SelectorTab)> callback) {
 		_beforeHidingCallback = std::move(callback);
 	}
 
@@ -187,8 +187,8 @@ private:
 	std::array<Tab, Tab::kCount> _tabs;
 	SelectorTab _currentTabType = SelectorTab::Emoji;
 
-	base::lambda<void(SelectorTab)> _afterShownCallback;
-	base::lambda<void(SelectorTab)> _beforeHidingCallback;
+	Fn<void(SelectorTab)> _afterShownCallback;
+	Fn<void(SelectorTab)> _beforeHidingCallback;
 
 	rpl::event_stream<> _showRequests;
 

Telegram/SourceFiles/codegen/scheme/codegen_scheme.py

@@ -55,8 +55,9 @@ addChildParentFlags('MTPDchannelForbidden', 'MTPDchannel');
 parentFlagsCheck = {};
 
 countedTypeIdExceptions = {};
-countedTypeIdExceptions[77] = countedTypeIdExceptions[78] = countedTypeIdExceptions[79] = {}
-countedTypeIdExceptions[77]['channel'] = countedTypeIdExceptions[78]['channel'] = countedTypeIdExceptions[79]['channel'] = True
+for i in range(77, 82):
+  countedTypeIdExceptions[i] = {}
+  countedTypeIdExceptions[i]['channel'] = True
 countedTypeIdExceptions['ipPortSecret'] = True
 countedTypeIdExceptions['accessPointRule'] = True
 countedTypeIdExceptions['help_configSimple'] = True
@@ -114,6 +115,7 @@ for line in lines:
     if (not nametype):
       if (not re.match(r'vector#1cb5c415 \{t:Type\} # \[ t \] = Vector t;', line)):
         print('Bad line found: ' + line);
+        sys.exit(1);
       continue;
 
     name = nametype.group(1);
@@ -160,7 +162,7 @@ for line in lines:
         vectemplate = templ.group(2);
         if (re.match(r'^[A-Z]', vectemplate) or re.match(r'^[a-zA-Z0-9]+_[A-Z]', vectemplate)):
           restype = templ.group(1) + 'MTP' + vectemplate.replace('.', '_') + '>';
-        elif (vectemplate == 'int' or vectemplate == 'long' or vectemplate == 'string'):
+        elif (vectemplate == 'int' or vectemplate == 'long' or vectemplate == 'string' or vectemplate == 'bytes'):
           restype = templ.group(1) + 'MTP' + vectemplate.replace('.', '_') + '>';
         else:
           foundmeta = '';
@@ -175,10 +177,10 @@ for line in lines:
             ptype = templ.group(1) + 'MTP' + foundmeta.replace('.', '_') + '>';
           else:
             print('Bad vector param: ' + vectemplate);
-            continue;
+            sys.exit(1);
       else:
         print('Bad template type: ' + restype);
-        continue;
+        sys.exit(1);
     resType = restype.replace('.', '_');
     if (restype.find('.') >= 0):
       parts = re.match(r'([a-z]+)\.([A-Z][A-Za-z0-9<>\._]+)', restype)
@@ -186,13 +188,13 @@ for line in lines:
         restype = parts.group(1) + '_' + parts.group(2)[0:1].lower() + parts.group(2)[1:];
       else:
         print('Bad result type name with dot: ' + restype);
-        continue;
+        sys.exit(1);
     else:
       if (re.match(r'^[A-Z]', restype)):
         restype = restype[:1].lower() + restype[1:];
       else:
         print('Bad result type name: ' + restype);
-        continue;
+        sys.exit(1);
 
     boxed[resType] = restype;
     boxed[Name] = name;
@@ -216,7 +218,7 @@ for line in lines:
       pnametype = re.match(r'([a-z_][a-z0-9_]*):([A-Za-z0-9<>\._]+|![a-zA-Z]+|\#|[a-z_][a-z0-9_]*\.[0-9]+\?[A-Za-z0-9<>\._]+)$', param);
       if (not pnametype):
         print('Bad param found: "' + param + '" in line: ' + line);
-        continue;
+        sys.exit(1);
       pname = pnametype.group(1);
       ptypewide = pnametype.group(2);
       if (re.match(r'^!([a-zA-Z]+)$', ptypewide)):
@@ -225,7 +227,7 @@ for line in lines:
           ptype = 'TQueryType';
         else:
           print('Bad template param name: "' + param + '" in line: ' + line);
-          continue;
+          sys.exit(1);
       elif (ptypewide == '#'):
         hasFlags = pname;
         if funcsNow:
@@ -238,7 +240,7 @@ for line in lines:
           pmasktype = re.match(r'([a-z_][a-z0-9_]*)\.([0-9]+)\?([A-Za-z0-9<>\._]+)', ptype);
           if (not pmasktype or pmasktype.group(1) != hasFlags):
             print('Bad param found: "' + param + '" in line: ' + line);
-            continue;
+            sys.exit(1);
           ptype = pmasktype.group(3);
           if (ptype.find('<') >= 0):
             templ = re.match(r'^([vV]ector<)([A-Za-z0-9\._]+)>$', ptype);
@@ -246,7 +248,7 @@ for line in lines:
               vectemplate = templ.group(2);
               if (re.match(r'^[A-Z]', vectemplate) or re.match(r'^[a-zA-Z0-9]+_[A-Z]', vectemplate)):
                 ptype = templ.group(1) + 'MTP' + vectemplate.replace('.', '_') + '>';
-              elif (vectemplate == 'int' or vectemplate == 'long' or vectemplate == 'string'):
+              elif (vectemplate == 'int' or vectemplate == 'long' or vectemplate == 'string' or vectemplate == 'bytes'):
                 ptype = templ.group(1) + 'MTP' + vectemplate.replace('.', '_') + '>';
               else:
                 foundmeta = '';
@@ -261,10 +263,10 @@ for line in lines:
                   ptype = templ.group(1) + 'MTP' + foundmeta.replace('.', '_') + '>';
                 else:
                   print('Bad vector param: ' + vectemplate);
-                  continue;
+                  sys.exit(1);
             else:
               print('Bad template type: ' + ptype);
-              continue;
+              sys.exit(1);
           if (not pname in conditions):
             conditionsList.append(pname);
             conditions[pname] = pmasktype.group(2);
@@ -276,7 +278,7 @@ for line in lines:
             vectemplate = templ.group(2);
             if (re.match(r'^[A-Z]', vectemplate) or re.match(r'^[a-zA-Z0-9]+_[A-Z]', vectemplate)):
               ptype = templ.group(1) + 'MTP' + vectemplate.replace('.', '_') + '>';
-            elif (vectemplate == 'int' or vectemplate == 'long' or vectemplate == 'string'):
+            elif (vectemplate == 'int' or vectemplate == 'long' or vectemplate == 'string' or vectemplate == 'bytes'):
               ptype = templ.group(1) + 'MTP' + vectemplate.replace('.', '_') + '>';
             else:
               foundmeta = '';
@@ -291,16 +293,16 @@ for line in lines:
                 ptype = templ.group(1) + 'MTP' + foundmeta.replace('.', '_') + '>';
               else:
                 print('Bad vector param: ' + vectemplate);
-                continue;
+                sys.exit(1);
           else:
             print('Bad template type: ' + ptype);
-            continue;
+            sys.exit(1);
       prmsList.append(pname);
       prms[pname] = ptype.replace('.', '_');
 
     if (isTemplate == '' and resType == 'X'):
       print('Bad response type "X" in "' + name +'" in line: ' + line);
-      continue;
+      sys.exit(1);
 
     if funcsNow:
       methodBodies = ''
@@ -673,7 +675,9 @@ for restype in typesList:
 
       forwards += 'class MTPD' + name + ';\n'; # data class forward declaration
 
-      dataText += ', '.join(prmsStr) + ') : ' + ', '.join(prmsInit) + ' {\n\t}\n';
+      dataText += ', '.join(prmsStr) + ');\n';
+
+      constructsBodies += 'MTPD' + name + '::MTPD' + name + '(' + ', '.join(prmsStr) + ') : ' + ', '.join(prmsInit) + ' {\n}\n';
 
       dataText += '\n';
       for paramName in prmsList: # fields declaration
@@ -744,20 +748,11 @@ for restype in typesList:
   typesText += ' {\n';
   typesText += 'public:\n';
   typesText += '\tMTP' + restype + '()'; # default constructor
-  inits = [];
-  if not (withType):
-    if (withData):
-      inits.append('TypeDataOwner(' + newFast + ')');
   if (withData and not withType):
     typesText += ';\n';
-    methods += '\nMTP' + restype + '::MTP' + restype + '()';
-    if (inits):
-      methods += ' : ' + ', '.join(inits);
-    methods += ' {\n}\n';
+    methods += '\nMTP' + restype + '::MTP' + restype + '() : TypeDataOwner(' + newFast + ') {\n}\n';
   else:
-    if (inits):
-      typesText += ' : ' + ', '.join(inits);
-    typesText += ' {\n\t}\n';
+    typesText += ' = default;\n';
 
   if (withData):
     typesText += getters;
@@ -850,12 +845,12 @@ for childName in parentFlagsList:
 #
 #    if (not flag in parentFlagsCheck[parentName]):
 #      print('Flag ' + flag + ' not found in ' + parentName + ' which should be a flags-parent of ' + childName);
-#      error
+#      sys.exit(1);
 #
     if (flag in parentFlagsCheck[parentName]):
       if (parentFlagsCheck[childName][flag] != parentFlagsCheck[parentName][flag]):
         print('Flag ' + flag + ' has different value in ' + parentName + ' which should be a flags-parent of ' + childName);
-        error
+        sys.exit(1);
     else:
       parentFlagsCheck[parentName][flag] = parentFlagsCheck[childName][flag];
   flagOperators += 'inline ' + parentName + '::Flags mtpCastFlags(' + childName + '::Flags flags) { return static_cast<' + parentName + '::Flag>(flags.value()); }\n';

Telegram/SourceFiles/config.h

@@ -54,8 +54,6 @@ enum {
 
 	AVBlockSize = 4096, // 4Kb for ffmpeg blocksize
 
-	SaveWindowPositionTimeout = 1000, // 1 sec
-
 	AutoSearchTimeout = 900, // 0.9 secs
 	SearchPerPage = 50,
 	SearchManyPerPage = 100,
@@ -222,25 +220,6 @@ static const char *ApiHash = "344583e45741c457fe1862106095a5eb";
 static const char *BetaPrivateKey = "";
 #endif
 
-inline const char *cApiDeviceModel() {
-#ifdef Q_OS_WIN
-	return "PC";
-#elif defined Q_OS_MAC
-	return "Mac";
-#elif defined Q_OS_LINUX
-	return "PC";
-#endif
-}
-inline const char *cApiSystemVersion() {
-#ifdef Q_OS_WIN
-	return "Windows";
-#elif defined Q_OS_MAC
-	return "OS X";
-#elif defined Q_OS_LINUX
-	return "Linux";
-#endif
-}
-
 extern QString gKeyFile;
 inline const QString &cDataFile() {
 	if (!gKeyFile.isEmpty()) return gKeyFile;

Telegram/SourceFiles/core/basic_types.h

@@ -11,12 +11,24 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <exception>
 #include <memory>
 #include <ctime>
+#include <functional>
 
+#include <crl/crl.h>
 #include "base/build_config.h"
 #include "base/ordered_set.h"
+#include "base/unique_function.h"
+#include "base/functors.h"
+
+namespace func = base::functors;
 
 using gsl::not_null;
 
+template <typename Signature>
+using Fn = std::function<Signature>;
+
+template <typename Signature>
+using FnMut = base::unique_function<Signature>;
+
 //using uchar = unsigned char; // Qt has uchar
 using int16 = qint16;
 using uint16 = quint16;
@@ -28,4 +40,4 @@ using float32 = float;
 using float64 = double;
 
 #define qsl(s) QStringLiteral(s)
-#define qstr(s) QLatin1String(s, sizeof(s) - 1)
+#define qstr(s) QLatin1String((s), sizeof(s) - 1)

Telegram/SourceFiles/core/changelogs.cpp

@@ -177,7 +177,7 @@ void Changelogs::requestCloudLogs() {
 	};
 	_session->api().requestChangelog(
 		FormatVersionPrecise(_oldVersion),
-		base::lambda_guarded(this, callback));
+		crl::guard(this, callback));
 }
 
 void Changelogs::addLocalLogs() {