v057

app/build.gradle

@@ -15,26 +15,28 @@ plugins {
 }
 
 // apply Google Services and Firebase Crashlytics plugins conditionally
-// strategy: For command-line builds, check task names. For IDE, always apply plugins
-// but they'll only process play/website variants (Firebase deps are scoped to those variants)
+// firebase (google-services + crashlytics) is scoped to the play flavour only.
+// website and fdroid builds are de-googled w.r.t. Firebase (the Google Play Developer
+// API model classes remain available to website as plain dependencies).
 def taskNames = gradle.startParameter.taskNames.join(',').toLowerCase()
-def apkBuild = taskNames.contains("full")
+def playBuild = taskNames.contains("play")
 def fdroidBuild = taskNames.contains("fdroid")
 // for alpha builds generate universal apk only
 def alphaBuild = taskNames.contains("alpha")
 
 // check for fdroidserver value is set in system env
 def fdroidBuildServer = System.getenv("fdroidserver")
 def isFdroidBuildServer = fdroidBuildServer != null && !fdroidBuildServer.isEmpty() && fdroidBuildServer != "null"
-def deGoogled = !apkBuild || fdroidBuild || isFdroidBuildServer || alphaBuild
+// firebase tooling applies only to play builds; everything else is de-googled
+def deGoogled = !playBuild || fdroidBuild || isFdroidBuildServer || alphaBuild
 def shouldSplit = !alphaBuild
 
 // Pass -PwebsiteDegoogled=true when building the fdroid flavor with our own keys.
 // Official F-Droid builds omit this flag and will be labeled as "fdroid".
 def isWebsiteDegoogled = project.hasProperty("websiteDegoogled") &&
         project.property("websiteDegoogled").toString().toBoolean()
 
-// add google-services.json only for play/website builds.
+// add google-services.json only for play builds.
 // local dev : copy from the sibling ../firebase/{debug,release} dir (gitignored, outside repo).
 // CI        : secret is written to app/src/google-services.json
 //             by the GitHub Actions; so no local copy is needed there.
@@ -75,20 +77,20 @@ if (!deGoogled) {
         }
     }
 } else {
-    logger.info("skipping google-services.json for de-googled/F-Droid build")
+    logger.info("skipping google-services.json for de-googled build (website/fdroid have no Firebase)")
 }
 
 println("app-task names: '$taskNames'")
-println("gradle deGoogled? $deGoogled (fdroidBuild: $fdroidBuild, fdroidBuildServer: $isFdroidBuildServer, apkBuild: $apkBuild)")
+println("gradle deGoogled? $deGoogled (playBuild: $playBuild, fdroidBuild: $fdroidBuild, fdroidBuildServer: $isFdroidBuildServer)")
 println("gradle alphaBuild? $alphaBuild, should split? $shouldSplit")
 
-// don't apply firebase plugins for fdroid CLI builds
+// don't apply firebase plugins for non-play builds (website/fdroid are de-googled)
 if (!deGoogled) {
     apply plugin: 'com.google.gms.google-services'
     apply plugin: 'com.google.firebase.crashlytics'
-    println("app firebase plugins applied")
+    println("app firebase plugins applied (play build)")
 } else {
-    println("app firebase plugins SKIPPED")
+    println("app firebase plugins SKIPPED (non-play build)")
 }
 
 def keystorePropertiesFile = rootProject.file("keystore.properties")
@@ -228,11 +230,15 @@ android {
 
     buildTypes {
         release {
-            // modified as part of #352, now webview is removed from app, flipping back
-            // the setting to true
-            minifyEnabled true
-            shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            // AGP 9.3 DSL: enables both code and resource optimization and
+            // includes the default Android keep rules (equivalent to
+            // proguard-android-optimize.txt, which the webview removal in #352
+            // allowed flipping back on). Project keep rules live in
+            // src/main/keepRules/*.keep (see developer.android.com/topic/
+            // performance/app-optimization/enable-app-optimization).
+            optimization {
+                enable = true // Enables code and resource optimizations.
+            }
             ndk {
                 // Use SYMBOL_TABLE to reduce symbol file size significantly
                 debugSymbolLevel 'SYMBOL_TABLE'
@@ -261,19 +267,20 @@ android {
         alpha {
             // archive.is/y8uCB
             applicationIdSuffix ".alpha"
-            minifyEnabled true
-            shrinkResources true
+            optimization {
+                enable = true // Enables code and resource optimizations (AGP 9.3 DSL).
+            }
             signingConfig signingConfigs.alpha
             resValue "string", "app_name", "Rethink(α)"
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
         releaseDebug {
              // for testing release build with debug signing config
             initWith buildTypes.release
-            minifyEnabled true
-            shrinkResources true
+            // set explicitly; initWith may not copy the optimization block
+            optimization {
+                enable = true // Enables code and resource optimizations (AGP 9.3 DSL).
+            }
             signingConfig signingConfigs.debug
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             ndk {
                 // Use SYMBOL_TABLE to reduce symbol file size significantly
                 debugSymbolLevel 'SYMBOL_TABLE'
@@ -291,7 +298,7 @@ android {
     }
 
     // fix: injectCrashlyticsBuildIds task has a buffer overflow bug
-    // apply crashlytics configuration to firebase builds only
+    // apply crashlytics configuration to play (firebase) builds only
     if (!deGoogled) {
         // workaround for crashlytics gradle plugin bug with large native symbols
         afterEvaluate {
@@ -339,12 +346,6 @@ android {
         targetCompatibility JavaVersion.VERSION_17
     }
 
-    packagingOptions {
-        jniLibs {
-            keepDebugSymbols += ['**/*.so']
-        }
-    }
-
     // required for google play developer api model classes
     packaging {
         resources.excludes += "META-INF/INDEX.LIST"
@@ -740,6 +741,8 @@ dependencies {
     // The version v3-rev20240301-2.0.0 cited in the API docs does not exist on Maven Central;
     // v3-rev20260318-2.0.0 is the closest available release with the same model classes.
     // ref: github.com/googleapis/google-api-java-client-services/tree/main/clients/google-api-services-androidpublisher/v3
+    // scoped to play + website only (server order-history / billing backend).
+    // Not included in fdroid (and hence Izzy) builds;
     playImplementation('com.google.apis:google-api-services-androidpublisher:v3-rev20260318-2.0.0') {
         // Exclude Apache HTTP transport, conflicts with Android's built-in HTTP stack
         exclude group: 'com.google.http-client', module: 'google-http-client-apache-v2'
@@ -753,18 +756,13 @@ dependencies {
         exclude group: 'com.google.oauth-client'
     }
 
-
     lintChecks 'com.android.security.lint:lint:1.0.4'
 
     // battery optimization permission helper
     implementation 'com.waseemsabir:betterypermissionhelper:1.0.3'
 
-    // Firebase dependencies for error reporting (website and play variants only)
-    websiteImplementation platform('com.google.firebase:firebase-bom:34.17.0')
-    websiteImplementation 'com.google.firebase:firebase-crashlytics'
-    websiteImplementation 'com.google.firebase:firebase-crashlytics-ndk'
-
-    playImplementation platform('com.google.firebase:firebase-bom:34.17.0')
+    // Firebase dependencies for error reporting (play flavour only)
+    playImplementation platform('com.google.firebase:firebase-bom:34.18.0')
     playImplementation 'com.google.firebase:firebase-crashlytics'
     playImplementation 'com.google.firebase:firebase-crashlytics-ndk'
 }

app/src/fdroid/java/com/celzero/bravedns/iab/stripe/RetrofitInstance.kt

@@ -2,13 +2,17 @@ package com.celzero.bravedns.iab.stripe
 
 import com.celzero.bravedns.customdownloader.RetrofitManager
 import okhttp3.OkHttpClient
+import java.net.Proxy
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 
 object RetrofitInstance {
     private const val BASE_URL = "https://api.stripe.com/"
 
-    private val client = OkHttpClient.Builder().build()
+    // NO_PROXY: never consult ProxySelector.getDefault(), which throws
+    // IllegalArgumentException("port out of range:-1") when the device has a global
+    // HTTP proxy configured without a port (http(s).proxyPort system property is -1).
+    private val client = OkHttpClient.Builder().proxy(Proxy.NO_PROXY).build()
 
     /*val api: StripeApiService by lazy {
         RetrofitManager.getStripeBaseBuilder(0)

app/src/full/AndroidManifest.xml

@@ -127,12 +127,21 @@
         <activity
             android:name=".ui.activity.TcpProxyMainActivity"
             android:finishOnTaskLaunch="true" />
+        <activity
+            android:name=".ui.activity.WgIncludeAppsActivity"
+            android:finishOnTaskLaunch="true" />
+        <activity
+            android:name=".ui.activity.RpnBypassAppsActivity"
+            android:finishOnTaskLaunch="true" />
         <activity
             android:name=".ui.activity.UniversalFirewallSettingsActivity"
             android:finishOnTaskLaunch="true" />
         <activity
             android:name=".ui.activity.ConfigureOtherDnsActivity"
             android:finishOnTaskLaunch="true" />
+        <activity
+            android:name=".ui.activity.SmartDnsListActivity"
+            android:finishOnTaskLaunch="true" />
         <activity
             android:name=".ui.activity.BlockFreeDnsActivity"
             android:finishOnTaskLaunch="true" />

app/src/full/res/color/chip_toggle_stroke.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Toggle-chip outline (Allowed/Blocked on the home logs card): a quiet
+     grey border (theme outline color) marks the selected chip; unselected
+     chips have no stroke so the border alone reads as the selection state. -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:color="?attr/colorOutline" />
+    <item android:color="@android:color/transparent" />
+</selector>

app/src/full/res/color/chip_toggle_text.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Toggle-chip text (Allowed/Blocked on the home logs card): selection is
+     conveyed by full-contrast text on the selected chip and a dimmed label
+     on the unselected one; no green/red tinting. -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:color="?attr/primaryTextColor" />
+    <item android:color="?attr/primaryLightColorText" />
+</selector>

app/src/full/res/color/time_segment_fill.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- segment fill: filled primary pill when checked, invisible otherwise -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:color="?attr/colorPrimary" />
+    <item android:color="@android:color/transparent" />
+</selector>

app/src/full/res/color/time_segment_stroke.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- segment stroke: matches the fill on the checked pill, invisible otherwise -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:color="?attr/colorPrimary" />
+    <item android:color="@android:color/transparent" />
+</selector>

app/src/full/res/color/time_segment_text_color.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- segment label colors: filled primary on the checked pill, muted otherwise -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:color="?attr/colorOnPrimary" />
+    <item android:color="?attr/primaryLightColorText" />
+</selector>

app/src/full/res/drawable/bg_activity_avatar.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- circular avatar background used by the per-app activity list;
+     tinted at bind time with the theme's colorPrimary (low alpha) -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@android:color/transparent" />
+</shape>

app/src/full/res/drawable/bg_status_dot.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- small status dot used by connection rows in the activity detail sheet -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <size
+        android:width="8dp"
+        android:height="8dp" />
+    <solid android:color="#FF4081" />
+</shape>