v057

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,6 +127,9 @@
         <activity
             android:name=".ui.activity.TcpProxyMainActivity"
             android:finishOnTaskLaunch="true" />
+        <activity
+            android:name=".ui.activity.WgIncludeAppsActivity"
+            android:finishOnTaskLaunch="true" />
         <activity
             android:name=".ui.activity.UniversalFirewallSettingsActivity"
             android:finishOnTaskLaunch="true" />

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- allowed-chip fill: positive chip color while selected, themed base
+     otherwise. Kept as a state-list so the chip visibly unselects when the
+     Blocked chip is picked (ChipGroup single-selection). -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:color="?attr/chipBgColorPositive" />
+    <item android:color="?attr/homeScreenBtnBackground" />
+</selector>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- blocked-chip fill: soft pink pill while selected, themed base otherwise -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:color="#29FF4081" />
+    <item android:color="?attr/homeScreenBtnBackground" />
+</selector>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- allowed-chip outline: positive chip color stroke only while selected -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:color="?attr/chipTextPositive" />
+    <item android:color="@android:color/transparent" />
+</selector>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- blocked-chip outline: theme accent stroke only while selected -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:color="?attr/accentBad" />
+    <item android:color="@android:color/transparent" />
+</selector>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- allowed-chip text: positive chip color while selected, dimmed base
+     text otherwise, so the unchecked state reads as inactive -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:color="?attr/chipTextPositive" />
+    <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>