Skip to content

Commit

Permalink
upstream: bump version to v11.0.0
Browse files Browse the repository at this point in the history
Signed-off-by: qwq233 <qwq233@qwq2333.top>
  • Loading branch information
qwq233 committed Aug 14, 2024
2 parents 2d717a3 + 3409cb1 commit 518ed03
Show file tree
Hide file tree
Showing 366 changed files with 38,749 additions and 7,690 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
df -h
sudo apt-get install bison gcc make curl ninja-build -y
echo "y" | sdkmanager --install "ndk;26.3.11579264" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
echo "y" | sdkmanager --install "ndk;27.0.12077973" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
echo "sdk.dir=${ANDROID_HOME}" >> local.properties
- name: Debug Build
run: |
Expand Down Expand Up @@ -150,7 +150,7 @@ jobs:
df -h
sudo apt-get install bison gcc make curl ninja-build -y
echo "y" | sdkmanager --install "ndk;26.3.11579264" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
echo "y" | sdkmanager --install "ndk;27.0.12077973" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
echo "sdk.dir=${ANDROID_HOME}" >> local.properties
- name: Debug Build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
df -h
sudo apt-get install bison gcc make curl ninja-build ccache -y
echo "y" | sdkmanager --install "ndk;26.3.11579264" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
echo "y" | sdkmanager --install "ndk;27.0.12077973" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
echo "sdk.dir=${ANDROID_HOME}" >> local.properties
- name: Debug Build
run: |
Expand Down
1 change: 0 additions & 1 deletion TMessagesProj/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ dependencies {
implementation(libs.gson)
implementation(libs.process.phoenix)
implementation(libs.hiddenapibypass)
implementation(libs.lottie)

implementation(libs.kotlin.stdlib.common)
implementation(libs.kotlin.stdlib)
Expand Down
4 changes: 3 additions & 1 deletion TMessagesProj/jni/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ elseif(${ANDROID_ABI} STREQUAL "arm64-v8a")
rlottie/src/vector/pixman/pixman-arma64-neon-asm.S)
endif()


#flac
add_library(flac STATIC
exoplayer/libFLAC/bitmath.c
Expand Down Expand Up @@ -230,7 +231,8 @@ add_library(${NATIVE_LIB} SHARED
exoplayer/ffmpeg_jni.cc
fast-edge.cpp
genann.c
secureid_ocr.cpp)
secureid_ocr.cpp
)

target_compile_options(${NATIVE_LIB} PUBLIC
-ffast-math -Os -funroll-loops -ffast-math -fno-strict-aliasing -fno-math-errno)
Expand Down
Binary file modified TMessagesProj/jni/ffmpeg/arm64-v8a/libavcodec.a
Binary file not shown.
Binary file modified TMessagesProj/jni/ffmpeg/arm64-v8a/libavformat.a
Binary file not shown.
Binary file modified TMessagesProj/jni/ffmpeg/arm64-v8a/libavresample.a
Binary file not shown.
Binary file modified TMessagesProj/jni/ffmpeg/arm64-v8a/libavutil.a
Binary file not shown.
Binary file modified TMessagesProj/jni/ffmpeg/arm64-v8a/libswresample.a
Binary file not shown.
Binary file modified TMessagesProj/jni/ffmpeg/arm64-v8a/libswscale.a
Binary file not shown.
Binary file modified TMessagesProj/jni/ffmpeg/arm64-v8a/libvpx.a
Binary file not shown.
Binary file modified TMessagesProj/jni/ffmpeg/armeabi-v7a/libavcodec.a
Binary file not shown.
Binary file modified TMessagesProj/jni/ffmpeg/armeabi-v7a/libavformat.a
Binary file not shown.
Binary file modified TMessagesProj/jni/ffmpeg/armeabi-v7a/libavresample.a
Binary file not shown.
Binary file modified TMessagesProj/jni/ffmpeg/armeabi-v7a/libavutil.a
Binary file not shown.
Binary file modified TMessagesProj/jni/ffmpeg/armeabi-v7a/libswresample.a
Binary file not shown.
Binary file modified TMessagesProj/jni/ffmpeg/armeabi-v7a/libswscale.a
Binary file not shown.
Binary file modified TMessagesProj/jni/ffmpeg/armeabi-v7a/libvpx.a
Binary file not shown.
Binary file modified TMessagesProj/jni/ffmpeg/x86/libavcodec.a
Binary file not shown.
Binary file modified TMessagesProj/jni/ffmpeg/x86/libavformat.a
Binary file not shown.
Binary file modified TMessagesProj/jni/ffmpeg/x86/libavresample.a
Binary file not shown.
Binary file modified TMessagesProj/jni/ffmpeg/x86/libavutil.a
Binary file not shown.
Binary file modified TMessagesProj/jni/ffmpeg/x86/libswresample.a
Binary file not shown.
Binary file modified TMessagesProj/jni/ffmpeg/x86/libswscale.a
Binary file not shown.
Binary file modified TMessagesProj/jni/ffmpeg/x86/libvpx.a
Binary file not shown.
Binary file modified TMessagesProj/jni/ffmpeg/x86_64/libavcodec.a
Binary file not shown.
Binary file modified TMessagesProj/jni/ffmpeg/x86_64/libavformat.a
Binary file not shown.
Binary file modified TMessagesProj/jni/ffmpeg/x86_64/libavresample.a
Binary file not shown.
Binary file modified TMessagesProj/jni/ffmpeg/x86_64/libavutil.a
Binary file not shown.
Binary file modified TMessagesProj/jni/ffmpeg/x86_64/libswresample.a
Binary file not shown.
Binary file modified TMessagesProj/jni/ffmpeg/x86_64/libswscale.a
Binary file not shown.
Binary file modified TMessagesProj/jni/ffmpeg/x86_64/libvpx.a
Binary file not shown.
6 changes: 6 additions & 0 deletions TMessagesProj/jni/tgnet/ApiScheme.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,9 @@ void TL_user::readParams(NativeByteBuffer *stream, int32_t instanceNum, bool &er
profile_color_color = stream->readInt32(&error);
profile_color_background_emoji_id = stream->readInt64(&error);
}
if ((flags2 & 4096) != 0) {
bot_active_users = stream->readInt32(&error);
}
}

void TL_user::serializeToStream(NativeByteBuffer *stream) {
Expand Down Expand Up @@ -605,6 +608,9 @@ void TL_user::serializeToStream(NativeByteBuffer *stream) {
stream->writeInt32(profile_color_color);
stream->writeInt32(profile_color_background_emoji_id);
}
if ((flags2 & 4096) != 0) {
stream->writeInt32(bot_active_users);
}
}

InputPeer *InputPeer::TLdeserialize(NativeByteBuffer *stream, uint32_t constructor, int32_t instanceNum, bool &error) {
Expand Down
3 changes: 2 additions & 1 deletion TMessagesProj/jni/tgnet/ApiScheme.h
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,7 @@ class User : public TLObject {
int64_t color_background_emoji_id;
int32_t profile_color_color;
int64_t profile_color_background_emoji_id;
int32_t bot_active_users;

static User *TLdeserialize(NativeByteBuffer *stream, uint32_t constructor, int32_t instanceNum, bool &error);
};
Expand All @@ -404,7 +405,7 @@ class TL_userEmpty : public User {
class TL_user : public User {

public:
static const uint32_t constructor = 0x215c4438;
static const uint32_t constructor = 0x83314fca;

void readParams(NativeByteBuffer *stream, int32_t instanceNum, bool &error);
void serializeToStream(NativeByteBuffer *stream);
Expand Down
38 changes: 20 additions & 18 deletions TMessagesProj/jni/voip/webrtc/pc/legacy_stats_collector.cc
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,9 @@ struct TypeForAdd {

typedef TypeForAdd<bool> BoolForAdd;
typedef TypeForAdd<float> FloatForAdd;
typedef TypeForAdd<double> DoubleForAdd;
typedef TypeForAdd<int64_t> Int64ForAdd;
typedef TypeForAdd<int> IntForAdd;
typedef TypeForAdd<int32_t> IntForAdd;

StatsReport* AddTrackReport(StatsCollection* reports,
const std::string& track_id) {
Expand Down Expand Up @@ -177,7 +178,7 @@ void ExtractStats(const cricket::VoiceReceiverInfo& info,
StatsReport* report,
bool use_standard_bytes_stats) {
ExtractCommonReceiveProperties(info, report);
const FloatForAdd floats[] = {
const DoubleForAdd floats[] = {
{StatsReport::kStatsValueNameExpandRate, info.expand_rate},
{StatsReport::kStatsValueNameSecondaryDecodedRate,
info.secondary_decoded_rate},
Expand Down Expand Up @@ -242,7 +243,7 @@ void ExtractStats(const cricket::VoiceSenderInfo& info,

SetAudioProcessingStats(report, info.apm_statistics);

const FloatForAdd floats[] = {
const DoubleForAdd floats[] = {
{StatsReport::kStatsValueNameTotalAudioEnergy, info.total_input_energy},
{StatsReport::kStatsValueNameTotalSamplesDuration,
info.total_input_duration}};
Expand Down Expand Up @@ -339,7 +340,7 @@ void ExtractStats(const cricket::VideoReceiverInfo& info,
{StatsReport::kStatsValueNamePlisSent, info.plis_sent},
{StatsReport::kStatsValueNameRenderDelayMs, info.render_delay_ms},
{StatsReport::kStatsValueNameTargetDelayMs, info.target_delay_ms},
{StatsReport::kStatsValueNameFramesDecoded, info.frames_decoded},
{StatsReport::kStatsValueNameFramesDecoded, (int32_t) info.frames_decoded},
};

for (const auto& i : ints)
Expand Down Expand Up @@ -383,15 +384,15 @@ void ExtractStats(const cricket::VideoSenderInfo& info,
info.encode_usage_percent},
{StatsReport::kStatsValueNameFirsReceived, info.firs_rcvd},
{StatsReport::kStatsValueNameFrameHeightSent, info.send_frame_height},
{StatsReport::kStatsValueNameFrameRateInput, round(info.framerate_input)},
{StatsReport::kStatsValueNameFrameRateInput, (int32_t) round(info.framerate_input)},
{StatsReport::kStatsValueNameFrameRateSent, info.framerate_sent},
{StatsReport::kStatsValueNameFrameWidthSent, info.send_frame_width},
{StatsReport::kStatsValueNameNacksReceived, info.nacks_rcvd},
{StatsReport::kStatsValueNameNacksReceived, (int32_t) info.nacks_rcvd},
{StatsReport::kStatsValueNamePacketsLost, info.packets_lost},
{StatsReport::kStatsValueNamePacketsSent, info.packets_sent},
{StatsReport::kStatsValueNamePlisReceived, info.plis_rcvd},
{StatsReport::kStatsValueNameFramesEncoded, info.frames_encoded},
{StatsReport::kStatsValueNameHugeFramesSent, info.huge_frames_sent},
{StatsReport::kStatsValueNameFramesEncoded, (int32_t) info.frames_encoded},
{StatsReport::kStatsValueNameHugeFramesSent, (int32_t) info.huge_frames_sent},
};

for (const auto& i : ints)
Expand Down Expand Up @@ -780,19 +781,20 @@ StatsReport* LegacyStatsCollector::AddConnectionInfoReport(
AddCandidateReport(remote_candidate_stats, false)->id());

const Int64ForAdd int64s[] = {
{StatsReport::kStatsValueNameBytesReceived, info.recv_total_bytes},
{StatsReport::kStatsValueNameBytesSent, info.sent_total_bytes},
{StatsReport::kStatsValueNamePacketsSent, info.sent_total_packets},
{StatsReport::kStatsValueNameRtt, info.rtt},
{StatsReport::kStatsValueNameBytesReceived,
(int64_t) info.recv_total_bytes},
{StatsReport::kStatsValueNameBytesSent, (int64_t) info.sent_total_bytes},
{StatsReport::kStatsValueNamePacketsSent, (int64_t) info.sent_total_packets},
{StatsReport::kStatsValueNameRtt, (int64_t) info.rtt},
{StatsReport::kStatsValueNameSendPacketsDiscarded,
info.sent_discarded_packets},
(int64_t) info.sent_discarded_packets},
{StatsReport::kStatsValueNameSentPingRequestsTotal,
info.sent_ping_requests_total},
(int64_t) info.sent_ping_requests_total},
{StatsReport::kStatsValueNameSentPingRequestsBeforeFirstResponse,
info.sent_ping_requests_before_first_response},
{StatsReport::kStatsValueNameSentPingResponses, info.sent_ping_responses},
{StatsReport::kStatsValueNameRecvPingRequests, info.recv_ping_requests},
{StatsReport::kStatsValueNameRecvPingResponses, info.recv_ping_responses},
(int64_t) info.sent_ping_requests_before_first_response},
{StatsReport::kStatsValueNameSentPingResponses, (int64_t) info.sent_ping_responses},
{StatsReport::kStatsValueNameRecvPingRequests, (int64_t) info.recv_ping_requests},
{StatsReport::kStatsValueNameRecvPingResponses, (int64_t) info.recv_ping_responses},
};
for (const auto& i : int64s)
report->AddInt64(i.name, i.value);
Expand Down
6 changes: 5 additions & 1 deletion TMessagesProj/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,10 @@
android:requestLegacyExternalStorage="true"
android:preserveLegacyExternalStorage="true"
android:allowAudioPlaybackCapture="true"
tools:replace="android:supportsRtl">
tools:replace="android:supportsRtl"
android:usesCleartextTraffic="true"
>
<!-- usesCleartextTraffic for browser supporting opening http:// links -->

<activity-alias
android:enabled="true"
Expand Down Expand Up @@ -332,6 +335,7 @@
<category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.DEFAULT" />
<data android:scheme="tg" />
<data android:scheme="tonsite" />
</intent-filter>
<intent-filter>
<action android:name="org.telegram.messenger.CREATE_STICKER_PACK"/>
Expand Down
2 changes: 1 addition & 1 deletion TMessagesProj/src/main/assets/currencies.json

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions TMessagesProj/src/main/assets/darkblue.attheme
Original file line number Diff line number Diff line change
Expand Up @@ -441,5 +441,8 @@ code_string=-7806088
code_operator=2147483647
code_number=-10887465
code_comment=2147483647
iv_background=-16777216
iv_backgroundGray=-14737633
iv_navigationBackground=-16777216
table_background=177390847
table_border=436207615
Binary file modified TMessagesProj/src/main/assets/fonts/num.otf
Binary file not shown.
3 changes: 3 additions & 0 deletions TMessagesProj/src/main/assets/night.attheme
Original file line number Diff line number Diff line change
Expand Up @@ -466,5 +466,8 @@ code_string=-7806088
code_operator=2147483647
code_number=-10887465
code_comment=2147483647
iv_background=-16777216
iv_backgroundGray=-14737633
iv_navigationBackground=-16777216
table_background=177390847
table_border=436207615
3 changes: 2 additions & 1 deletion TMessagesProj/src/main/assets/shaders/fragment4.glsl
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ uniform sampler2D u_BackgroundTexture;
uniform float f_xOffset;
uniform float f_alpha;
uniform mat4 world;
uniform float white;

varying vec3 vNormal;
varying vec2 vUV;
Expand Down Expand Up @@ -89,5 +90,5 @@ void main() {
clamp(flecksSpec * abs(vNormal.z) * (flecksNormal.z), 0.2, 0.3) - .2
);

gl_FragColor = color * f_alpha;
gl_FragColor = mix(color * f_alpha, vec4(1.0), white);
}
Loading

0 comments on commit 518ed03

Please sign in to comment.