Update Japanese & README

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -6,7 +6,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thanks for reporting bug to Nullgram
+        Thanks for reporting bug to Nnngram
         For further processing please fill in blanks.
   - type: textarea
     attributes:
@@ -43,7 +43,7 @@ body:
       required: true
   - type: input
     attributes:
-      label: Nullgram Version
+      label: Nnngram Version
       placeholder:  vX.X.X.XXXXXXX
     validations:
       required: true
@@ -52,7 +52,7 @@ body:
     attributes:
       label: Version requirement
       options:
-        - label: I am using latest debug CI version of Nullgram and enable verbose log/我正在使用最新 CI 调试版本且启用详细日志
+        - label: I am using latest debug CI version of Nnngram and enable verbose log/我正在使用最新 CI 调试版本且启用详细日志
           required: true
   - type: textarea
     id: logs

.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
   - name: channel
-    url: https://t.me/NullgramClient
+    url: https://t.me/nagram_channel
     about: Our Telegram Channel 
   - name: smart-question
     url: http://www.catb.org/~esr/faqs/smart-questions.html

.github/Privacy-Policy.md

@@ -1 +1 @@
-> Nullgram will not share any user data or device information with anyone. It is based on the official Telegram, so in order to learn more about it, please check [Telegram Privacy Policy](https://telegram.org/privacy)
+> Nnngram will not share any user data or device information with anyone. It is based on the official Telegram, so in order to learn more about it, please check [Telegram Privacy Policy](https://telegram.org/privacy)

.github/workflows/ci.yml

@@ -3,19 +3,20 @@ name: Build CI
 on:
   push:
     branches:
-      - master
+      - main
     paths-ignore:
         - '**.md'
         - '**.txt'
         - '.github/**'
         - '!.github/workflows/**'
         - "TMessagesProj/src/main/res/values**/**"
+        - '.gitignore'
   workflow_dispatch:
 
 jobs:
   build:
     name: Gradle Build
-    if: ${{ github.event_name != 'pull_request' && success() && github.ref == 'refs/heads/master' }}
+    if: ${{ github.event_name != 'pull_request' && success() && github.ref == 'refs/heads/main' }}
     runs-on: ubuntu-latest
     env:
       CCACHE_COMPILERCHECK: "%compiler% -dumpmachine; %compiler% -dumpversion"
@@ -33,6 +34,9 @@ jobs:
         uses: jwlawson/actions-setup-cmake@v1.12
         with:
           cmake-version: '3.22.1'
+      - name: Get short SHA
+        run: |
+          echo "SHA7=$(echo ${GITHUB_SHA} | cut -c1-7)" >> $GITHUB_ENV
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
@@ -67,123 +71,67 @@ jobs:
             sudo rm -rf /usr/local/share/chromium
             sudo rm -rf /usr/local/lib/node_modules
             df -h
-            
+
             sudo apt-get install bison gcc make curl ninja-build -y
             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: |
           echo -e "RELEASE_KEY_PASSWORD=${{ secrets.RELEASE_KEY_PASSWORD }}\nRELEASE_KEY_ALIAS=${{ secrets.RELEASE_KEY_ALIAS }}\nRELEASE_STORE_PASSWORD=${{ secrets.RELEASE_STORE_PASSWORD }}">>local.properties
-          cat > service_account_credentials.json << EOF
-          ${{ secrets.ANDROID_PUBLISHER_CREDENTIALS }}"
-          EOF
-          mkdir TMessagesProj/config/
-          echo ${{ secrets.KEYSTORE }} | base64 -d > TMessagesProj/config/release.keystore
-          echo ${{ secrets.GOOGLE_SERVICES_JSON }} | base64 -d > TMessagesProj/google-services.json
+          mkdir -p TMessagesProj/config/
+          echo "${{ secrets.KEYSTORE }}" | base64 -d > TMessagesProj/config/release.keystore
+          echo "${{ secrets.GOOGLE_SERVICES_JSON }}" | base64 -d > TMessagesProj/google-services.json
           ./gradlew :TMessagesProj:assembleRelease :TMessagesProj:uploadCrashlyticsSymbolFileRelease
           echo "APK_FILE=$(find TMessagesProj/build/outputs/apk -name '*arm64*.apk')" >> $GITHUB_ENV
-          echo "APK_FILE_ARMV7=$(find TMessagesProj/build/outputs/apk -name '*arm32*.apk')" >> $GITHUB_ENV
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@master
         name: Upload apk (arm64-v8a)
         with:
-          name: Nullgram-arm64-v8a
+          name: Nnngram-arm64-v8a-${{ env.SHA7 }}
           path: ${{ env.APK_FILE }}
-      - uses: actions/upload-artifact@v3
-        name: Upload apk (armeabi-v7a)
-        with:
-          name: Nullgram-armeabi-v7a
-          path: ${{ env.APK_FILE_ARMV7 }}
+
       - name: Upload mapping
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@master
         with:
           name: mapping
           path: TMessagesProj/build/outputs/mapping
 
-
-  play-build:
-    name: Gradle Build (play store)
-    runs-on: ubuntu-latest
-    # if: ${{ github.event_name != 'pull_request' && success() && github.ref == 'refs/heads/master' }}
-    if: false
-    env:
-      CCACHE_COMPILERCHECK: "%compiler% -dumpmachine; %compiler% -dumpversion"
-      CCACHE_NOHASHDIR: "true"
-      CCACHE_MAXSIZE: "5G"
-      CCACHE_HARDLINK: "true"
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Check out submodules
+      - name: Debug Build (Telegram)
         run: |
-          git -c submodule."libs/rust".update=none submodule update --init --recursive
-      - name: Setup cmake
-        uses: jwlawson/actions-setup-cmake@v1.12
-        with:
-          cmake-version: '3.22.1'
-      - name: Setup Java
-        uses: actions/setup-java@v3
+          echo -e "RELEASE_KEY_PASSWORD=${{ secrets.RELEASE_KEY_PASSWORD }}\nRELEASE_KEY_ALIAS=${{ secrets.RELEASE_KEY_ALIAS }}\nRELEASE_STORE_PASSWORD=${{ secrets.RELEASE_STORE_PASSWORD }}">>local.properties
+          mkdir -p TMessagesProj/config/
+          echo "${{ secrets.KEYSTORE }}" | base64 -d > TMessagesProj/config/release.keystore
+          echo "${{ secrets.GOOGLE_SERVICES_JSON }}" | base64 -d > TMessagesProj/google-services.json
+          sed -i 's@xyz.nextalone.nnngram@org.telegram.messenger@' TMessagesProj/build.gradle.kts
+          sed -i 's@xyz.nextalone.nnngram@org.telegram.messenger@' TMessagesProj/google-services.json
+          ./gradlew TMessagesProj:assembleRelease
+          find TMessagesProj/build/outputs/apk -name '*arm64*.apk' -exec mv {} TMessagesProj/build/outputs/apk/Nnngram-arm64-v8a-${{ env.SHA7 }}-Telegram.apk \;
+          echo "APK_FILE=$(find TMessagesProj/build/outputs/apk -name '*arm64*.apk')" >> $GITHUB_ENV
+
+      - uses: actions/upload-artifact@master
+        name: Upload apk (arm64-v8a) (Telegram)
         with:
-          distribution: 'temurin'
-          java-version: '17'
-          cache: 'gradle'
-      - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2.4.2
-      - name: Set up ccache
-        uses: hendrikmuhs/ccache-action@v1.2
+          name: Nnngram-arm64-v8a-${{ env.SHA7 }}-Telegram
+          path: ${{ env.APK_FILE }}
+
+      - name: Upload mapping
+        uses: actions/upload-artifact@master
         with:
-          key: ccache
-          restore-keys: ccache
-      - name: Setup Android SDK Tools
-        uses: android-actions/setup-android@v2
-      - name: Prepare Environment
-        run: |
-            echo "Removing large packages"
-            sudo apt-get remove -y '^dotnet-.*' aspnetcore-targeting-pack-6.0 aspnetcore-targeting-pack-7.0
-            sudo apt-get remove -y '^llvm-.*'
-            sudo apt-get remove -y 'php.*'
-            sudo apt-get remove -y '^mongodb-.*'
-            sudo apt-get remove -y '^mysql-.*'
-            sudo apt-get remove -y azure-cli google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri
-            sudo apt-get autoremove -y
-            sudo apt-get clean
-            echo "Removing large directories"
-            sudo rm -rf /usr/share/dotnet/
-            sudo rm -rf /usr/local/graalvm/
-            sudo rm -rf /usr/local/.ghcup/
-            sudo rm -rf /usr/local/share/powershell
-            sudo rm -rf /usr/local/share/chromium
-            sudo rm -rf /usr/local/lib/node_modules
-            df -h
-
-            sudo apt-get install bison gcc make curl ninja-build -y
-            echo "y" | sdkmanager --install "ndk;27.0.12077973" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
-            echo "sdk.dir=${ANDROID_HOME}" >> local.properties
+          name: mapping-Telegram
+          path: TMessagesProj/build/outputs/mapping
 
-      - name: Debug Build
-        run: |
-          echo -e "RELEASE_KEY_PASSWORD=${{ secrets.RELEASE_KEY_PASSWORD }}\nRELEASE_KEY_ALIAS=${{ secrets.RELEASE_KEY_ALIAS }}\nRELEASE_STORE_PASSWORD=${{ secrets.RELEASE_STORE_PASSWORD }}">>local.properties
-          cat > service_account_credentials.json << EOF
-          ${{ secrets.ANDROID_PUBLISHER_CREDENTIALS }}"
-          EOF
-          mkdir TMessagesProj/config/
-          echo ${{ secrets.KEYSTORE }} | base64 -d > TMessagesProj/config/release.keystore
-          echo ${{ secrets.GOOGLE_SERVICES_JSON }} | base64 -d > TMessagesProj/google-services.json
-          ./gradlew :TMessagesProj:publishPlayBundle
 
 
-
   upload:
     name: Upload Release
-    if: ${{ github.event_name != 'pull_request' && success() && github.ref == 'refs/heads/master' }}
+    if: ${{ github.event_name != 'pull_request' && success() && github.ref == 'refs/heads/main' }}
     runs-on: ubuntu-latest
     needs:
       - build
       - telegram-bot-api
     steps:
       - name: Donwload Artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@master
         with:
           path: artifacts
       - name: Download Telegram Bot API Binary
@@ -195,6 +143,7 @@ jobs:
       - name: find apk
         run: |
             mkdir apks
+            find artifacts -name "*Telegram.apk" -exec rm {} \;
             find artifacts -name "*.apk" -exec cp {} apks \;
             echo "APK_FILE_UPLOAD=$(find apks -name '*arm64*.apk')" >> $GITHUB_ENV
       - name: Get Apk Info
@@ -207,27 +156,28 @@ jobs:
         run: |
           chmod +x telegram-bot-api-binary
           ./telegram-bot-api-binary --api-id=21724 --api-hash=3e0cb5efcd52300aec5994fdfc5bdc16 --local 2>&1 > /dev/null &
-          curl https://raw.githubusercontent.com/qwq233/qwq233/master/uploadCI.py -o uploadCI.py
+          curl https://raw.githubusercontent.com/PreviousAlone/ActionScript/main/uploadCI.py -o uploadCI.py
           python uploadCI.py
         env:
+            CHAT_ID: ${{ secrets.TELEGRAM_CHATID }}
             TELEGRAM_TOKEN: ${{ secrets.TELEGRAM_TOKEN }}
-            VERSION_CODE: ${{steps.apk.outputs.versionCode}}
-            VERSION_NAME: ${{steps.apk.outputs.versionNum}}
+            VERSION_CODE: ${{ steps.apk.outputs.versionCode }}
+            VERSION_NAME: ${{ steps.apk.outputs.versionNum }}
             COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
 
   telegram-bot-api:
     name: Telegram Bot API
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Clone Telegram Bot API
         run: |
           git clone --recursive https://github.com/tdlib/telegram-bot-api.git
           git status telegram-bot-api >> telegram-bot-api-status
       - name: Cache Bot API Binary
         id: cache-bot-api
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: telegram-bot-api-binary
           key: CI-telegram-bot-api-${{ hashFiles('telegram-bot-api-status') }}

.github/workflows/pr.yml

@@ -3,7 +3,7 @@ name: Build CI (Pull Request)
 on:
   pull_request:
     branches:
-      - master
+      - main
     paths-ignore:
         - '**.md'
         - '**.txt'

.gitignore

@@ -8,3 +8,9 @@ local.properties
 service_account_credentials.json
 Tools/Utils.java
 test.py
+.project
+.settings
+.classpath
+History.md
+apks
+dprint.json