djoeni 3 lat temu
rodzic
commit
46519a6cf8

+ 17 - 2
.github/workflows/build-pre-release-unsigned.yaml → .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:

+ 1 - 3
design/src/main/res/values-zh-rHK/strings.xml

@@ -200,15 +200,13 @@
     <string name="reinstall">重新安裝</string>
     <string name="github_releases">Github Releases</string>
     <string name="unable_to_start_vpn">無法啓動 VPN 組件</string>
-    <string name="request_donate_tips">如果您覺得本應用對您有幫助歡迎在 [幫助] 中給予開發者一點捐贈</string>
-    <string name="request_donate">捐贈</string>
     <string name="version_updated">應用已更新</string>
     <string name="version_updated_tips">設置已被清除,舊的配置文件需要再次保存。</string>
     <string name="active_unsaved_tips">配置文件需要在激活之前保存</string>
     <string name="mode_switch_tips">僅在本次會話中有效</string>
     <string name="import_">導入</string>
     <string name="sources">源代碼</string>
-    <string name="clash_meta_core">Clash 核心</string>
+    <string name="clash_meta_core">Clash Meta 核心</string>
     <string name="name_server_policy">Name Server 策略</string>
     <string name="block_loopback">阻止本地迴環</string>
     <string name="block_loopback_summary">阻止本地迴環連接</string>

+ 1 - 3
design/src/main/res/values-zh-rTW/strings.xml

@@ -200,15 +200,13 @@
     <string name="reinstall">重新安裝</string>
     <string name="github_releases">Github Releases</string>
     <string name="unable_to_start_vpn">無法啟動 VPN 元件</string>
-    <string name="request_donate_tips">如果您覺得本應用對您有幫助歡迎在 [協助] 中給予開發人員一些捐助</string>
-    <string name="request_donate">捐助</string>
     <string name="version_updated">應用已更新</string>
     <string name="version_updated_tips">設定已被清除,舊版設定檔需要再次儲存。</string>
     <string name="active_unsaved_tips">設定檔需要在啟用之前儲存</string>
     <string name="mode_switch_tips">僅在本次工作階段中有效</string>
     <string name="import_">匯入</string>
     <string name="sources">原始碼</string>
-    <string name="clash_meta_core">Clash 核心</string>
+    <string name="clash_meta_core">Clash Meta 核心</string>
     <string name="name_server_policy">Name Server 政策</string>
     <string name="block_loopback">攔截本地回送</string>
     <string name="block_loopback_summary">攔截本地回送連結</string>

+ 0 - 2
design/src/main/res/values-zh/strings.xml

@@ -201,8 +201,6 @@
     <string name="reinstall">重新安装</string>
     <string name="github_releases">Github Releases</string>
     <string name="unable_to_start_vpn">无法启动 VPN 组件</string>
-    <string name="request_donate_tips">如果您觉得本应用对您有帮助欢迎在 [帮助] 中给予开发者一点捐赠</string>
-    <string name="request_donate">捐赠</string>
     <string name="version_updated">应用已更新</string>
     <string name="version_updated_tips">设置已被清除,旧的配置文件需要再次保存。</string>
     <string name="active_unsaved_tips">配置文件需要在激活之前保存</string>

+ 0 - 3
design/src/main/res/values/strings.xml

@@ -268,9 +268,6 @@
     <string name="invalid_log_file">Invalid log file</string>
     <string name="unable_to_start_vpn">Unable to start VPN component</string>
 
-    <string name="request_donate" />
-    <string name="request_donate_tips" />
-
     <string name="version_updated">App Updated</string>
     <string name="version_updated_tips">The settings have been reseted and the old profiles needs to be saved again.</string>
 

+ 2 - 2
service/src/main/AndroidManifest.xml

@@ -14,12 +14,12 @@
         <service
             android:name=".ClashService"
             android:exported="false"
-            android:label="@string/clash_for_android"
+            android:label="@string/clash_meta_for_android"
             android:process=":background" />
         <service
             android:name=".TunService"
             android:exported="false"
-            android:label="@string/clash_for_android"
+            android:label="@string/clash_meta_for_android"
             android:permission="android.permission.BIND_VPN_SERVICE"
             android:process=":background">
             <intent-filter>

+ 1 - 1
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)

+ 1 - 1
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,

+ 1 - 1
service/src/main/res/values-zh-rHK/strings.xml

@@ -4,7 +4,7 @@
     <string name="running">正在運行</string>
     <string name="format_update_complete">更新 %s 成功</string>
     <string name="format_update_failure">"更新 %1$s: %2$s "</string>
-    <string name="clash_for_android">Clash for Android</string>
+    <string name="clash_meta_for_android">Clash Meta for Android</string>
     <string name="profiles_and_providers">配置文件和外部資源</string>
     <string name="configuration_yaml">配置文件.yaml</string>
     <string name="provider_files">外部資源文件列表</string>

+ 1 - 1
service/src/main/res/values-zh-rTW/strings.xml

@@ -4,7 +4,7 @@
     <string name="running">正在運作</string>
     <string name="format_update_complete">更新 %s 成功</string>
     <string name="format_update_failure">"更新 %1$s: %2$s "</string>
-    <string name="clash_for_android">Clash for Android</string>
+    <string name="clash_meta_for_android">Clash Meta for Android</string>
     <string name="profiles_and_providers">設定檔和外部資源</string>
     <string name="configuration_yaml">設定檔.yaml</string>
     <string name="provider_files">外部資源文件列表</string>

+ 1 - 1
service/src/main/res/values-zh/strings.xml

@@ -4,7 +4,7 @@
     <string name="running">正在运行</string>
     <string name="format_update_complete">更新 %s 成功</string>
     <string name="format_update_failure">"更新 %1$s: %2$s "</string>
-    <string name="clash_for_android">Clash for Android</string>
+    <string name="clash_meta_for_android">Clash Meta for Android</string>
     <string name="profiles_and_providers">配置文件和外部资源</string>
     <string name="configuration_yaml">配置文件.yaml</string>
     <string name="provider_files">外部资源文件列表</string>

+ 1 - 1
service/src/main/res/values/strings.xml

@@ -12,7 +12,7 @@
     <string name="format_update_failure">Update %1$s: %2$s</string>
     <string name="running">Running</string>
     <string name="loading">Loading</string>
-    <string name="clash_for_android">Clash for Android</string>
+    <string name="clash_meta_for_android">Clash Meta for Android</string>
     <string name="profiles_and_providers">Profiles and Providers</string>
     <string name="configuration_yaml">Configuration.yaml</string>
     <string name="provider_files">Provider Files</string>