diff --git a/.github/workflows/build-pre-release-unsigned.yaml b/.github/workflows/build-pre-release.yaml similarity index 70% rename from .github/workflows/build-pre-release-unsigned.yaml rename to .github/workflows/build-pre-release.yaml index 197725f8..554dc752 100644 --- a/.github/workflows/build-pre-release-unsigned.yaml +++ b/.github/workflows/build-pre-release.yaml @@ -1,4 +1,4 @@ -name: build_prerelease +name: build_pre_release on: workflow_dispatch: @@ -31,7 +31,21 @@ jobs: restore-keys: | ${{ runner.os }}-go- - - name: PreRelease Build + - name: Signing properties + env: + SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }} + SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }} + SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }} + run: | + touch signing.properties + echo keystore.password="$SIGNING_STORE_PASSWORD" > signing.properties + echo key.alias="$SIGNING_KEY_ALIAS" >> signing.properties + echo key.password="$SIGNING_KEY_PASSWORD" >> signing.properties + + echo "cat signing.properties" + cat signing.properties + + - name: Pre-release Build if: success() uses: gradle/gradle-build-action@v2 with: @@ -43,6 +57,7 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} tag: Prerelease-${{ github.ref_name }} deleteOnlyFromDrafts: false + - name: Tag Repo uses: richardsimko/update-tag@v1 with: diff --git a/design/src/main/res/values-zh-rHK/strings.xml b/design/src/main/res/values-zh-rHK/strings.xml index d1d2bc0e..0f179650 100644 --- a/design/src/main/res/values-zh-rHK/strings.xml +++ b/design/src/main/res/values-zh-rHK/strings.xml @@ -200,15 +200,13 @@ 重新安裝 Github Releases 無法啓動 VPN 組件 - 如果您覺得本應用對您有幫助歡迎在 [幫助] 中給予開發者一點捐贈 - 捐贈 應用已更新 設置已被清除，舊的配置文件需要再次保存。 配置文件需要在激活之前保存 僅在本次會話中有效 導入 源代碼 - Clash 核心 + Clash Meta 核心 Name Server 策略 阻止本地迴環 阻止本地迴環連接 diff --git a/design/src/main/res/values-zh-rTW/strings.xml b/design/src/main/res/values-zh-rTW/strings.xml index b96b6bcf..cb893436 100644 --- a/design/src/main/res/values-zh-rTW/strings.xml +++ b/design/src/main/res/values-zh-rTW/strings.xml @@ -200,15 +200,13 @@ 重新安裝 Github Releases 無法啟動 VPN 元件 - 如果您覺得本應用對您有幫助歡迎在 [協助] 中給予開發人員一些捐助 - 捐助 應用已更新 設定已被清除，舊版設定檔需要再次儲存。 設定檔需要在啟用之前儲存 僅在本次工作階段中有效 匯入 原始碼 - Clash 核心 + Clash Meta 核心 Name Server 政策 攔截本地回送 攔截本地回送連結 diff --git a/design/src/main/res/values-zh/strings.xml b/design/src/main/res/values-zh/strings.xml index 63b2bb5f..83dbe520 100644 --- a/design/src/main/res/values-zh/strings.xml +++ b/design/src/main/res/values-zh/strings.xml @@ -201,8 +201,6 @@ 重新安装 Github Releases 无法启动 VPN 组件 - 如果您觉得本应用对您有帮助欢迎在 [帮助] 中给予开发者一点捐赠 - 捐赠 应用已更新 设置已被清除，旧的配置文件需要再次保存。 配置文件需要在激活之前保存 diff --git a/design/src/main/res/values/strings.xml b/design/src/main/res/values/strings.xml index 3f277cf3..6e3a8c03 100644 --- a/design/src/main/res/values/strings.xml +++ b/design/src/main/res/values/strings.xml @@ -268,9 +268,6 @@ Invalid log file Unable to start VPN component - - - App Updated The settings have been reseted and the old profiles needs to be saved again. diff --git a/service/src/main/AndroidManifest.xml b/service/src/main/AndroidManifest.xml index f336ccd4..11beae54 100644 --- a/service/src/main/AndroidManifest.xml +++ b/service/src/main/AndroidManifest.xml @@ -14,12 +14,12 @@ diff --git a/service/src/main/java/com/github/kr328/clash/service/FilesProvider.kt b/service/src/main/java/com/github/kr328/clash/service/FilesProvider.kt index d88e9f30..fce65d5f 100644 --- a/service/src/main/java/com/github/kr328/clash/service/FilesProvider.kt +++ b/service/src/main/java/com/github/kr328/clash/service/FilesProvider.kt @@ -162,7 +162,7 @@ class FilesProvider : DocumentsProvider() { add(Root.COLUMN_ROOT_ID, DEFAULT_ROOT_ID) add(Root.COLUMN_FLAGS, flags) add(Root.COLUMN_ICON, R.drawable.ic_logo_service) - add(Root.COLUMN_TITLE, context!!.getString(R.string.clash_for_android)) + add(Root.COLUMN_TITLE, context!!.getString(R.string.clash_meta_for_android)) add(Root.COLUMN_SUMMARY, context!!.getString(R.string.profiles_and_providers)) add(Root.COLUMN_DOCUMENT_ID, "/") add(Root.COLUMN_MIME_TYPES, D.MIME_TYPE_DIR) diff --git a/service/src/main/java/com/github/kr328/clash/service/document/Picker.kt b/service/src/main/java/com/github/kr328/clash/service/document/Picker.kt index 4436bc68..dae06a8b 100644 --- a/service/src/main/java/com/github/kr328/clash/service/document/Picker.kt +++ b/service/src/main/java/com/github/kr328/clash/service/document/Picker.kt @@ -40,7 +40,7 @@ class Picker(private val context: Context) { if (path.uuid == null) { return VirtualDocument( "", - context.getString(R.string.clash_for_android), + context.getString(R.string.clash_meta_for_android), DocumentsContract.Document.MIME_TYPE_DIR, 0, 0, diff --git a/service/src/main/res/values-zh-rHK/strings.xml b/service/src/main/res/values-zh-rHK/strings.xml index 835cedde..a105e891 100644 --- a/service/src/main/res/values-zh-rHK/strings.xml +++ b/service/src/main/res/values-zh-rHK/strings.xml @@ -4,7 +4,7 @@ 正在運行 更新 %s 成功 "更新 %1$s: %2$s " - Clash for Android + Clash Meta for Android 配置文件和外部資源 配置文件.yaml 外部資源文件列表 diff --git a/service/src/main/res/values-zh-rTW/strings.xml b/service/src/main/res/values-zh-rTW/strings.xml index b46937fd..0512b1a6 100644 --- a/service/src/main/res/values-zh-rTW/strings.xml +++ b/service/src/main/res/values-zh-rTW/strings.xml @@ -4,7 +4,7 @@ 正在運作 更新 %s 成功 "更新 %1$s: %2$s " - Clash for Android + Clash Meta for Android 設定檔和外部資源 設定檔.yaml 外部資源文件列表 diff --git a/service/src/main/res/values-zh/strings.xml b/service/src/main/res/values-zh/strings.xml index 80a79b16..77b87e9c 100644 --- a/service/src/main/res/values-zh/strings.xml +++ b/service/src/main/res/values-zh/strings.xml @@ -4,7 +4,7 @@ 正在运行 更新 %s 成功 "更新 %1$s: %2$s " - Clash for Android + Clash Meta for Android 配置文件和外部资源 配置文件.yaml 外部资源文件列表 diff --git a/service/src/main/res/values/strings.xml b/service/src/main/res/values/strings.xml index 9eb0fb34..903b825a 100644 --- a/service/src/main/res/values/strings.xml +++ b/service/src/main/res/values/strings.xml @@ -12,7 +12,7 @@ Update %1$s: %2$s Running Loading - Clash for Android + Clash Meta for Android Profiles and Providers Configuration.yaml Provider Files