Skip to content

Commit aac8179

Browse files
build: настройка сборки release, меню обновлений
- В AppConfig.APP_API_URL прописан репозиторий kiktor12358/v2whitelist для работы UpdateCheckerManager - В боковое меню (drawer) добавлен пункт 'Проверить обновления' - В build.gradle удалена дебаг-подпись (isMinifyEnabled = false пока оставлен для стабильности) - В GitHub Actions (android_build.yml) добавлена генерация release.keystore для автоматического подписания релизных APK
1 parent d53703b commit aac8179

6 files changed

Lines changed: 18 additions & 3 deletions

File tree

.github/workflows/android_build.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,18 @@ jobs:
5959
run: chmod +x gradlew
6060
working-directory: V2rayNG
6161

62+
- name: Generate Release Keystore
63+
run: |
64+
keytool -genkey -v -keystore release.keystore -alias v2whitelist -keyalg RSA -keysize 2048 -validity 10000 -storepass v2whitelist -keypass v2whitelist -dname "CN=v2whitelist, OU=v2whitelist, O=v2whitelist, L=Unknown, ST=Unknown, C=Unknown"
65+
working-directory: V2rayNG
66+
6267
- name: Build with Gradle
63-
run: ./gradlew assembleRelease
68+
run: |
69+
./gradlew assembleRelease \
70+
-Pandroid.injected.signing.store.file=$PWD/release.keystore \
71+
-Pandroid.injected.signing.store.password=v2whitelist \
72+
-Pandroid.injected.signing.key.alias=v2whitelist \
73+
-Pandroid.injected.signing.key.password=v2whitelist
6474
working-directory: V2rayNG
6575

6676
- name: Create Release and Upload APK

V2rayNG/app/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ android {
4141
buildTypes {
4242
release {
4343
isMinifyEnabled = false
44-
signingConfig = signingConfigs.getByName("debug")
4544
proguardFiles(
4645
getDefaultProguardFile("proguard-android-optimize.txt"),
4746
"proguard-rules.pro"

V2rayNG/app/src/main/java/com/kiktor/v2whitelist/AppConfig.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ object AppConfig {
109109
const val GITHUB_DOWNLOAD_URL = "$GITHUB_URL/%s/releases/latest/download"
110110
const val ANDROID_PACKAGE_NAME_LIST_URL = "$GITHUB_RAW_URL/2dust/androidpackagenamelist/master/proxy.txt"
111111
const val APP_URL = "$GITHUB_URL/2dust/v2rayNG"
112-
const val APP_API_URL = "https://api.github.com/repos/2dust/v2rayNG/releases"
112+
const val APP_API_URL = "https://api.github.com/repos/kiktor12358/v2whitelist/releases"
113113
const val APP_ISSUES_URL = "$APP_URL/issues"
114114
const val APP_WIKI_MODE = "$APP_URL/wiki/Mode"
115115
const val APP_PRIVACY_POLICY = "$GITHUB_RAW_URL/2dust/v2rayNG/master/CR.md"

V2rayNG/app/src/main/java/com/kiktor/v2whitelist/ui/MainActivity.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ class MainActivity : HelperBaseActivity(), NavigationView.OnNavigationItemSelect
206206
when (item.itemId) {
207207
R.id.per_app_proxy_settings -> requestActivityLauncher.launch(Intent(this, PerAppProxyActivity::class.java))
208208
R.id.settings -> requestActivityLauncher.launch(Intent(this, SettingsActivity::class.java))
209+
R.id.check_update -> startActivity(Intent(this, CheckUpdateActivity::class.java))
209210
R.id.logcat -> startActivity(Intent(this, LogcatActivity::class.java))
210211
}
211212

V2rayNG/app/src/main/res/menu/menu_drawer.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
</group>
1616

1717
<group android:id="@+id/group_id2">
18+
<item
19+
android:id="@+id/check_update"
20+
android:icon="@drawable/ic_check_update_24dp"
21+
android:title="@string/title_check_update" />
1822
<item
1923
android:id="@+id/logcat"
2024
android:icon="@drawable/ic_logcat_24dp"

V2rayNG/app/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -449,5 +449,6 @@
449449
<string name="btn_label_logs">Логи</string>
450450
<string name="btn_label_update">Обновить</string>
451451
<string name="btn_label_about">О проекте</string>
452+
<string name="title_check_update">Проверить обновления</string>
452453
<string name="tv_server_name">Сервер: %s</string>
453454
</resources>

0 commit comments

Comments
 (0)