Fix building for Android.

levlam · levlam · commit 3cd93569871c · 2024-07-05T12:58:01.000+03:00
diff --git a/td/telegram/SendCodeHelper.cpp b/td/telegram/SendCodeHelper.cpp
@@ -229,11 +229,8 @@ SendCodeHelper::AuthenticationCodeInfo SendCodeHelper::get_sent_authentication_c
       }
       if ((code_type->flags_ & telegram_api::auth_sentCodeTypeFirebaseSms::PLAY_INTEGRITY_NONCE_MASK) != 0) {
         return AuthenticationCodeInfo{AuthenticationCodeInfo::Type::FirebaseAndroidPlayIntegrity, code_type->length_,
-<<<<<<< HEAD
-                                      code_type->play_integrity_nonce_.as_slice().str()};
-=======
-                                      std::move(nonce), 0, code_type->play_integrity_project_id_};
->>>>>>> 1062f39ce (Add firebaseDeviceVerificationParametersPlayIntegrity.cloud_project_number.)
+                                      code_type->play_integrity_nonce_.as_slice().str(), 0,
+                                      code_type->play_integrity_project_id_};
       }
 #elif TD_DARWIN
       if ((code_type->flags_ & telegram_api::auth_sentCodeTypeFirebaseSms::RECEIPT_MASK) != 0) {

Original file line number	Diff line number	Diff line change
`@@ -229,11 +229,8 @@ SendCodeHelper::AuthenticationCodeInfo SendCodeHelper::get_sent_authentication_c`
`229`	`229`	`}`
`230`	`230`	`if ((code_type->flags_ & telegram_api::auth_sentCodeTypeFirebaseSms::PLAY_INTEGRITY_NONCE_MASK) != 0) {`
`231`	`231`	`return AuthenticationCodeInfo{AuthenticationCodeInfo::Type::FirebaseAndroidPlayIntegrity, code_type->length_,`
`232`		`-<<<<<<< HEAD`
`233`		`- code_type->play_integrity_nonce_.as_slice().str()};`
`234`		`-=======`
`235`		`- std::move(nonce), 0, code_type->play_integrity_project_id_};`
`236`		`->>>>>>> 1062f39ce (Add firebaseDeviceVerificationParametersPlayIntegrity.cloud_project_number.)`
	`232`	`+ code_type->play_integrity_nonce_.as_slice().str(), 0,`
	`233`	`+ code_type->play_integrity_project_id_};`
`237`	`234`	`}`
`238`	`235`	`#elif TD_DARWIN`
`239`	`236`	`if ((code_type->flags_ & telegram_api::auth_sentCodeTypeFirebaseSms::RECEIPT_MASK) != 0) {`