Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
.envrc
.direnv/

# FVM Version Cache
.fvm/
5 changes: 5 additions & 0 deletions client/android/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,17 @@ android {
buildTypes {
release {
// let r0adkll/sign-android-release@v1 in CI do the signing
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
}
}
}

dependencies {
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
implementation("com.google.android.gms:play-services-cronet:18.1.1")
implementation(files("../../../lib/tunnel.aar"))
}

Expand Down
3 changes: 3 additions & 0 deletions client/android/app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# ProGuard rules for cronet_http
-keep class io.flutter.plugins.cronet_http.** { *; }
-keep class org.chromium.net.** { *; }
2 changes: 2 additions & 0 deletions client/lib/open/api.dart
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ class _ProxyApi {
if (Platform.isAndroid) {
final android = await deviceInfo.androidInfo;
platformInfo = ClientPlatformInfo(
osFamily: 'android',
osType: 'Android',
version: android.version.release,
codename: android.version.codename,
Expand All @@ -80,6 +81,7 @@ class _ProxyApi {
} else if (Platform.isIOS) {
final ios = await deviceInfo.iosInfo;
platformInfo = ClientPlatformInfo(
osFamily: 'ios',
osType: 'iOS',
version: ios.systemVersion,
architecture: 'arm64',
Expand Down