Skip to content

Commit

Permalink
Merge branch 'dev' into m_10.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@omg-xtao
omg-xtao committed Feb 18, 2024
2 parents 77d2562 + eef95b3 commit 8c7bdde
Show file tree
Hide file tree
Showing 30 changed files with 41 additions and 1,429 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/debug.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,14 +347,14 @@ jobs:
curl http://127.0.0.1:8081/ || start
curl http://127.0.0.1:8081/ || start
# send release via telegram bot api
export mini64=$(find artifacts -name "*mini-arm64-v8a.apk")
export mini32=$(find artifacts -name "*mini-armeabi-v7a.apk")
export full64=$(find artifacts -name "*full-arm64-v8a.apk")
export full32=$(find artifacts -name "*full-armeabi-v7a.apk")
export mini64nogcm=$(find artifacts -name "*mini-arm64-v8aNoGcm.apk")
export mini32nogcm=$(find artifacts -name "*mini-armeabi-v7aNoGcm.apk")
export full64nogcm=$(find artifacts -name "*full-arm64-v8aNoGcm.apk")
export full32nogcm=$(find artifacts -name "*full-armeabi-v7aNoGcm.apk")
export mini64=$(find artifacts -name "*arm64-v8a.apk")
export mini32=$(find artifacts -name "*armeabi-v7a.apk")
# export full64=$(find artifacts -name "*full-arm64-v8a.apk")
# export full32=$(find artifacts -name "*full-armeabi-v7a.apk")
export mini64nogcm=$(find artifacts -name "*arm64-v8aNoGcm.apk")
export mini32nogcm=$(find artifacts -name "*armeabi-v7aNoGcm.apk")
# export full64nogcm=$(find artifacts -name "*full-arm64-v8aNoGcm.apk")
# export full32nogcm=$(find artifacts -name "*full-armeabi-v7aNoGcm.apk")
echo $mini64
echo $mini32
Expand Down
13 changes: 9 additions & 4 deletions .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,10 +264,15 @@ jobs:
curl http://127.0.0.1:8081/ || start
curl http://127.0.0.1:8081/ || start
# send release via telegram bot api
export mini64=$(find artifacts -name "*mini-arm64-v8a*")
export mini32=$(find artifacts -name "*mini-armeabi-v7a*")
# export full64=$(find artifacts -name "*full-arm64-v8a*")
# export full32=$(find artifacts -name "*full-armeabi-v7a*")
export mini64=$(find artifacts -name "*arm64-v8a.apk")
export mini32=$(find artifacts -name "*armeabi-v7a.apk")
# export full64=$(find artifacts -name "*full-arm64-v8a.apk")
# export full32=$(find artifacts -name "*full-armeabi-v7a.apk")
# export mini64nogcm=$(find artifacts -name "*arm64-v8aNoGcm.apk")
# export mini32nogcm=$(find artifacts -name "*armeabi-v7aNoGcm.apk")
# export full64nogcm=$(find artifacts -name "*full-arm64-v8aNoGcm.apk")
# export full32nogcm=$(find artifacts -name "*full-armeabi-v7aNoGcm.apk")
echo $mini64
curl --http0.9 http://127.0.0.1:8081/bot${{ secrets.HELPER_BOT_TOKEN }}/sendMediaGroup --form-string chat_id=${{ secrets.HELPER_BOT_TARGET }} --form apk1=@"${mini64}" --form apk2=@"${mini32}" --form-string media="[{\"type\": \"document\",\"media\": \"attach://apk1\",\"caption\": \"\",\"parse_mode\": \"Markdown\"},{\"type\": \"document\",\"media\": \"attach://apk2\",\"caption\": \"${{ github.event.head_commit.message }}\",\"parse_mode\": \"Markdown\"}]" --verbose >/dev/null
Expand Down
27 changes: 0 additions & 27 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,30 +13,3 @@
path = TMessagesProj/jni/libvpx
url = https://github.com/webmproject/libvpx
ignore = dirty

[submodule "ss-rust/src/main/rust/shadowsocks-rust"]
path = ss-rust/src/main/rust/shadowsocks-rust
url = https://github.com/shadowsocks/shadowsocks-rust.git

[submodule "shadowsocksr-libev"]
path = ssr-libev/src/main/jni/shadowsocks-libev
url = https://github.com/shadowsocksRb/shadowsocksr-libev.git
[submodule "ssr-libev/src/main/jni/libancillary"]
path = ssr-libev/src/main/jni/libancillary
url = https://github.com/shadowsocks/libancillary.git
[submodule "ssr-libev/src/main/jni/mbedtls"]
path = ssr-libev/src/main/jni/mbedtls
url = https://github.com/ARMmbed/mbedtls
[submodule "ssr-libev/src/main/jni/pcre"]
path = ssr-libev/src/main/jni/pcre
url = https://android.googlesource.com/platform/external/pcre
[submodule "ssr-libev/src/main/jni/libsodium"]
path = ssr-libev/src/main/jni/libsodium
url = https://github.com/jedisct1/libsodium.git
branch = stable
[submodule "ssr-libev/src/main/jni/re2"]
path = ssr-libev/src/main/jni/re2
url = https://github.com/google/re2.git
[submodule "v2ray"]
path = v2ray
url = https://github.com/nekohasekai/AndroidLibV2rayLite
7 changes: 6 additions & 1 deletion TMessagesProj/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,12 @@ android {

applicationVariants.all { variant ->
variant.outputs.all { output ->
outputFileName = outputFileName.replace("TMessagesProj", "PagerGram-v" + versionName + "(" + versionCode + ")").replace("-release", "")
String gramName = "PagerGram"
String first = String.format("%s-v%s(%s)", gramName, versionName, versionCode)
String name = outputFileName.replace("TMessagesProj", first)
name = name.replace("-release", "")
name = name.replace("-mini", "")
outputFileName = name
}
}

Expand Down
14 changes: 0 additions & 14 deletions TMessagesProj/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -385,20 +385,6 @@
<data android:host="t.me" android:scheme="http" />
<data android:host="t.me" android:scheme="https" />
</intent-filter>
<intent-filter android:icon="@mipmap/ic_launcher_nagram" android:roundIcon="@mipmap/ic_launcher_nagram_round" android:priority="1" android:enabled="${is_full_version}">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.DEFAULT" />

<data android:scheme="vmess" />
<data android:scheme="vmess1" />
<data android:scheme="ss" />
<data android:scheme="ssr" />
<data android:scheme="ws" />
<data android:scheme="wss" />
<data android:scheme="trojan" />

</intent-filter>
<intent-filter android:icon="@mipmap/ic_launcher_nagram" android:roundIcon="@mipmap/ic_launcher_nagram_round" android:priority="1">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.BROWSABLE" />
Expand Down
15 changes: 12 additions & 3 deletions TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3210,9 +3210,18 @@ public boolean canToggleSearch() {

// na: Added ability to open Saved Messages on long click on search top button
searchItem.setOnLongClickListener(v -> {
Bundle args = new Bundle();
args.putLong("user_id", getUserConfig().getClientUserId());
presentFragment(new ChatActivity(args));
if (MessagesController.getInstance(UserConfig.selectedAccount).savedViewAsChats) {
Bundle args = new Bundle();
args.putLong("dialog_id", UserConfig.getInstance(currentAccount).getClientUserId());
args.putInt("type", MediaActivity.TYPE_MEDIA);
args.putInt("start_from", SharedMediaLayout.TAB_SAVED_DIALOGS);
MediaActivity mediaActivity = new MediaActivity(args, null);
presentFragment(mediaActivity);
} else {
Bundle args = new Bundle();
args.putLong("user_id", UserConfig.getInstance(currentAccount).getClientUserId());
presentFragment(new ChatActivity(args));
}
return true;
});

Expand Down
12 changes: 6 additions & 6 deletions TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3942,11 +3942,11 @@ public void openExceptions() {
switchBuilder.doRadioCheck(radioButtonCell);
return Unit.INSTANCE;
});
switchBuilder.addRadioItem(LocaleController.getString("AutoCheckUpdatePreview", R.string.AutoCheckUpdatePreview), NekoXConfig.autoUpdateReleaseChannel == 3, (radioButtonCell) -> {
NekoXConfig.setAutoUpdateReleaseChannel(3);
switchBuilder.doRadioCheck(radioButtonCell);
return Unit.INSTANCE;
});
// switchBuilder.addRadioItem(LocaleController.getString("AutoCheckUpdatePreview", R.string.AutoCheckUpdatePreview), NekoXConfig.autoUpdateReleaseChannel == 3, (radioButtonCell) -> {
// NekoXConfig.setAutoUpdateReleaseChannel(3);
// switchBuilder.doRadioCheck(radioButtonCell);
// return Unit.INSTANCE;
// });
showDialog(switchBuilder.create());
return Unit.INSTANCE;
});
Expand Down Expand Up @@ -10592,7 +10592,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
cell.getTextView().setMovementMethod(null);
cell.setBackground(Theme.getThemedDrawable(mContext, R.drawable.greydivider_bottom, Theme.key_windowBackgroundGrayShadow));

cell.setText("PagerGram v" + BuildConfig.VERSION_NAME + "(" + BuildConfig.VERSION_CODE + ") " + Build.SUPPORTED_ABIS[0].toLowerCase(Locale.ROOT) + " " + BuildConfig.FLAVOR + " " + BuildConfig.BUILD_TYPE);
cell.setText("PagerGram v" + BuildConfig.VERSION_NAME + "(" + BuildConfig.VERSION_CODE + ") " + Build.SUPPORTED_ABIS[0].toLowerCase(Locale.ROOT) + " " + BuildConfig.BUILD_TYPE);

cell.getTextView().setPadding(0, AndroidUtilities.dp(14), 0, AndroidUtilities.dp(14));
view = cell;
Expand Down
91 changes: 0 additions & 91 deletions TMessagesProj/src/main/res/values-es/strings_na.xml
View file

This file was deleted.

1 change: 0 additions & 1 deletion ss-rust/.gitignore
View file

This file was deleted.

77 changes: 0 additions & 77 deletions ss-rust/build.gradle.kts
View file

This file was deleted.

3 changes: 0 additions & 3 deletions ss-rust/src/main/AndroidManifest.xml
View file

This file was deleted.

18 changes: 0 additions & 18 deletions ss-rust/src/main/rust/linker-wrapper.py
View file

This file was deleted.

1 change: 0 additions & 1 deletion ss-rust/src/main/rust/shadowsocks-rust
Submodule shadowsocks-rust deleted from f805b5
1 change: 0 additions & 1 deletion ssr-libev/.gitignore
View file

This file was deleted.

Loading

0 comments on commit 8c7bdde

Please sign in to comment.