Revert "perf: remove mini flag"

This reverts commit 3e36e54.
LiuYi0526 · Feb 19, 2024 · 3e440e9 · 3e440e9
1 parent 4b46b1a
commit 3e440e9
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 14 deletions.
diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
@@ -430,8 +430,26 @@ jobs:
           echo $full64nogcm
           echo $full32nogcm
 
-          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 apk3=@"${full64}" --form apk4=@"${full32}" --form apk5=@"${mini64nogcm}" --form apk6=@"${mini32nogcm}" --form apk7=@"${full64nogcm}" --form apk8=@"${full32nogcm}" --form-string media="[{\"type\": \"document\",\"media\": \"attach://apk1\",\"caption\": \"\",\"parse_mode\": \"Markdown\"},{\"type\": \"document\",\"media\": \"attach://apk2\",\"caption\": \"\",\"parse_mode\": \"Markdown\"},{\"type\": \"document\",\"media\": \"attach://apk3\",\"caption\": \"\",\"parse_mode\": \"Markdown\"},{\"type\": \"document\",\"media\": \"attach://apk4\",\"caption\": \"\",\"parse_mode\": \"Markdown\"},{\"type\": \"document\",\"media\": \"attach://apk5\",\"caption\": \"\",\"parse_mode\": \"Markdown\"},{\"type\": \"document\",\"media\": \"attach://apk6\",\"caption\": \"\",\"parse_mode\": \"Markdown\"},{\"type\": \"document\",\"media\": \"attach://apk7\",\"caption\": \"\",\"parse_mode\": \"Markdown\"},{\"type\": \"document\",\"media\": \"attach://apk8\",\"caption\": \"Test version, [${{ github.event.head_commit.message }}](${{ github.event.head_commit.url }})\",\"parse_mode\": \"Markdown\"}]" --verbose >/dev/null
-
+          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 apk3=@"${full64}" \
+          --form apk4=@"${full32}" \
+          --form apk5=@"${mini64nogcm}" \
+          --form apk6=@"${mini32nogcm}" \
+          --form apk7=@"${full64nogcm}" \
+          --form apk8=@"${full32nogcm}" \
+          --form-string media="[{\"type\": \"document\",\"media\": \"attach://apk1\",\"caption\": \"\",\"parse_mode\": \"Markdown\"}, \
+          {\"type\": \"document\",\"media\": \"attach://apk2\",\"caption\": \"\",\"parse_mode\": \"Markdown\"}, \
+          {\"type\": \"document\",\"media\": \"attach://apk3\",\"caption\": \"\",\"parse_mode\": \"Markdown\"}, \
+          {\"type\": \"document\",\"media\": \"attach://apk4\",\"caption\": \"\",\"parse_mode\": \"Markdown\"}, \
+          {\"type\": \"document\",\"media\": \"attach://apk5\",\"caption\": \"\",\"parse_mode\": \"Markdown\"}, \
+          {\"type\": \"document\",\"media\": \"attach://apk6\",\"caption\": \"\",\"parse_mode\": \"Markdown\"}, \
+          {\"type\": \"document\",\"media\": \"attach://apk7\",\"caption\": \"\",\"parse_mode\": \"Markdown\"}, \
+          {\"type\": \"document\",\"media\": \"attach://apk8\",\"caption\": $(echo "Test version, [${{ github.event.head_commit.message }}](${{ github.event.head_commit.url }})" | jq -Rsa .),\"parse_mode\": \"Markdown\"}]" \
+          --verbose >/dev/null
+        
           pkill telegram-bot
   telegram-bot-api:
     name: Telegram Bot API

diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle
@@ -307,12 +307,7 @@ android {
 
     applicationVariants.all { variant ->
         variant.outputs.all { output ->
-            String gramName = "Nagram"
-            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
+            outputFileName = outputFileName.replace("TMessagesProj", "Nagram-v" + versionName).replace("-release", "")
         }
     }
 

diff --git a/TMessagesProj/src/main/AndroidManifest.xml b/TMessagesProj/src/main/AndroidManifest.xml
@@ -385,6 +385,20 @@
                 <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" />

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
@@ -3951,11 +3951,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;
                     });
@@ -10601,7 +10601,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("Nagram v" + BuildConfig.VERSION_NAME + "(" + BuildConfig.VERSION_CODE + ") " + Build.SUPPORTED_ABIS[0].toLowerCase(Locale.ROOT) + " " + BuildConfig.BUILD_TYPE);
+                    cell.setText("Nagram v" + BuildConfig.VERSION_NAME + "(" + BuildConfig.VERSION_CODE + ") " + Build.SUPPORTED_ABIS[0].toLowerCase(Locale.ROOT) + " " + BuildConfig.FLAVOR + " " + BuildConfig.BUILD_TYPE);
 
                     cell.getTextView().setPadding(0, AndroidUtilities.dp(14), 0, AndroidUtilities.dp(14));
                     view = cell;