Merge branch 'celzero:main' into v055n

README.md

@@ -14,8 +14,6 @@ In other words, Rethink DNS + Firewall has three primary modes, VPN, DNS, and Fi
 ![3](https://github.com/celzero/rethink-app/assets/56958445/c74f3485-7197-4e5b-860f-c2b11c556cee)
 ![4](https://github.com/celzero/rethink-app/assets/56958445/a2032d44-f07c-45e9-801b-7abe0cac0ead)
 ![5](https://github.com/celzero/rethink-app/assets/56958445/b9973e69-d45e-4be9-bd42-b80fb2768ec5)
-![6](https://github.com/celzero/rethink-app/assets/56958445/27a45c02-7046-41b1-89bb-7fe3624ed717)
-![7](https://github.com/celzero/rethink-app/assets/56958445/7246da25-6541-405e-b2a4-444dbb5c60f4)
 
 ### VPN / Proxifier
 Rethink supports forwarding TCP and UDP connections over SOCKS5, HTTP CONNECT, and WireGuard tunnels. Split-tunneling further helps run multiple such tunnels at the same time and lets users route different apps over different tunnels. For example, one could route Firefox over SOCKS5 connecting to Tor, Netflix over WireGuard connecting through any popular VPN provider, and Telegram or WhatsApp over censorship-resistant HTTP CONNECT endpoints at the same time.
@@ -101,12 +99,9 @@ We aren't there yet, may never will be but these are some tenets for the project
 - Practice what you preach: Be obsessively private and secure.
 
 ## Backstory
-[<img src="http://fossunited.org/files/fossunited-badge.svg"
+[<img src="https://fossunited.org/files/fossunited-white.svg"
      alt="FOSS United"
      height="40">](https://fossunited.org/grants)&emsp;
-[<img src="https://uploads-ssl.webflow.com/621553456a1d6199c3872a37/625d74f87ccfb1bacb0422c9_osomprivacy-p-800.png"
-     alt="OSOM Products Inc"
-     height="40">](https://osomprivacy.com/)&emsp;
 [<img src="https://rethinkdns.com/ico/moz-builders-2000x550.png"
      alt="Mozilla Builders"
      height="40">](https://builders.mozilla.community/old/alumni.html)&emsp;

app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <group android:scaleX="0.46698114"
+      android:scaleY="0.46698114"
+      android:translateX="299.4717"
+      android:translateY="272.90567">
+    <path
+        android:pathData="M405.5,11.9c-7.7,2.7 -20.5,7.3 -28.5,10.1 -8,2.9 -18.8,6.7 -24,8.5 -5.2,1.9 -14,5 -19.5,7 -5.5,2 -18.1,6.5 -28,10 -20.1,7.1 -42.7,15.1 -61.5,21.8 -6.9,2.5 -21,7.5 -31.5,11.1 -10.4,3.7 -22.6,8 -27,9.6 -4.4,1.6 -13.8,5 -21,7.5 -16.9,5.9 -38.3,13.6 -41.5,14.8 -1.4,0.6 -2.9,1.1 -3.5,1.3 -0.5,0.1 -8,2.7 -16.5,5.7 -41.5,14.6 -54,19.1 -59.5,21.2 -3.3,1.2 -11.2,4.1 -17.6,6.4 -13.2,4.8 -18.5,8.8 -22.2,16.8l-2.2,4.8 0,92.5c0,93.8 0.2,99.2 4.1,138 4.9,48.8 15.6,101.1 30.9,150.4 6.1,19.7 18.4,53.2 24.7,67.6 4,9 4.7,10.6 7.8,18 2.8,6.5 21.5,44.7 24.8,50.5 16.4,29 29.8,51.1 39.7,65.2 2.7,4 7.3,10.5 10,14.5 2.8,3.9 8.4,11.6 12.5,17.1 4.1,5.5 8.4,11.2 9.5,12.7 3.1,4 9.5,12 13.5,16.6 1.9,2.2 4.4,5.2 5.4,6.5 11.5,14.7 47.5,52.4 70.6,73.9 17.3,16.1 54.2,46.6 67.5,55.7 2.2,1.6 4.5,3.3 5,3.9 0.6,0.5 2.8,2.2 5,3.7 2.2,1.4 6,4.1 8.5,5.8 16.4,11.8 52.4,34.6 68.1,43.3 7.2,3.9 13.3,5.2 20.2,4.2 3.7,-0.6 17.7,-7.9 34.6,-18.1 0.9,-0.6 3.4,-2.1 5.6,-3.4 5.1,-3.1 41.5,-27.2 43.5,-28.8 0.8,-0.7 7.1,-5.4 13.9,-10.4 13.5,-10.1 17.4,-14.5 19.7,-22.6 3.5,-12.2 -3.4,-25.7 -16.1,-31.5 -6.7,-3 -16.9,-3 -24,0.1 -2.7,1.2 -5.2,2.6 -5.5,3 -2,2.8 -39.5,28.5 -62.6,42.9 -14.5,9.1 -13.5,8.9 -22.4,3.4 -23.5,-14.7 -37.3,-24.2 -61,-41.6 -40.5,-29.8 -90.5,-76.8 -124.6,-117.1 -18,-21.3 -36.2,-45.7 -53.6,-72 -8.4,-12.7 -23.8,-38 -23.8,-39.1 0,-0.3 -0.8,-1.8 -1.9,-3.2 -7.1,-10.1 -29.7,-57.7 -41.5,-87.5 -27.3,-69 -42.2,-135.4 -48.7,-217.2 -1.2,-15.7 -2.2,-169.4 -1.1,-171 0.4,-0.6 2.3,-1.6 4.2,-2.2 1.9,-0.6 9.8,-3.4 17.5,-6.1 21.7,-7.9 59,-21.1 69.5,-24.7 5.2,-1.9 14,-5 19.5,-7 5.5,-2 15,-5.4 21,-7.5 6.1,-2.1 16.2,-5.7 22.5,-8 6.3,-2.3 16.5,-5.9 22.5,-8 6.1,-2.1 23.2,-8.2 38,-13.5 14.9,-5.3 29.5,-10.5 32.5,-11.5 3,-1 13.8,-4.8 24,-8.5 10.2,-3.7 22.8,-8.2 28,-10 5.2,-1.8 21.7,-7.6 36.5,-13 20.7,-7.4 27.8,-9.6 30.5,-9.2 1.9,0.2 7.8,2 13,4 5.2,1.9 17.8,6.5 28,10.1 10.2,3.6 19.4,7 20.5,7.5 1.8,0.8 26.9,9.8 47,16.8 3.9,1.3 22.1,7.8 40.5,14.5 18.4,6.6 38.9,14 45.5,16.4 6.6,2.3 21,7.5 32,11.4 11,4 25.6,9.2 32.5,11.7 6.9,2.4 15.4,5.5 19,6.8 3.6,1.3 14.8,5.4 25,9 10.2,3.6 21.4,7.6 25,8.9 3.6,1.4 12.8,4.7 20.5,7.4l14,5 0.3,57.9c0.7,131.9 -4.9,185.1 -27.8,265.3 -2.6,9.1 -2.2,15.7 1.3,22.7 6.5,12.6 20.6,18.2 35.5,13.8 5.8,-1.7 13.7,-8.3 16.4,-13.7 1.8,-3.6 7.5,-23.4 8.3,-28.8 0,-0.3 0.3,-1 0.6,-1.5 0.4,-0.6 1.4,-4.6 2.4,-9 1,-4.4 2.8,-12.5 4.1,-18 4.5,-19.4 11.3,-59.8 13.4,-80.5 4.2,-39.9 4.2,-42 4.7,-137.5 0.5,-93.3 0.4,-94 -1.6,-99.5 -2.4,-6.3 -8.8,-13.5 -14.1,-15.8 -3.7,-1.6 -25.2,-9.4 -54.5,-19.7 -9.9,-3.5 -23.2,-8.2 -29.5,-10.5 -6.3,-2.3 -12.6,-4.5 -14,-5 -1.4,-0.5 -8.1,-2.9 -15,-5.3 -6.9,-2.5 -14.1,-5.1 -16,-5.7 -1.9,-0.7 -8.2,-2.9 -14,-5 -5.8,-2.2 -18.8,-6.8 -29,-10.4 -34.9,-12.2 -41.5,-14.6 -43.5,-15.5 -1.1,-0.5 -6,-2.3 -11,-4 -4.9,-1.6 -14.2,-4.9 -20.5,-7.2 -6.3,-2.2 -16.4,-5.8 -22.5,-7.9 -6,-2.1 -16.2,-5.7 -22.5,-8 -6.3,-2.3 -15.8,-5.7 -21,-7.5 -8.6,-3 -27.5,-9.7 -66.5,-23.7 -27.3,-9.8 -27.2,-9.8 -47,-2.9z"
+        android:fillColor="#000000"
+        android:strokeColor="#00000000"
+        tools:ignore="VectorPath" />
+    <path
+        android:pathData="M592.3,520.5c-6.6,2 -12.6,5.9 -19.1,12.5 -22.8,22.8 -40.1,72.4 -43.7,125.6l-0.7,10.2 -8.1,1.6c-22.2,4.4 -42.9,20.2 -55.6,42.1 -15.4,26.8 -14.6,61.6 1.8,78.8 15.4,16.3 42.8,12.2 68.5,-10.3 3.1,-2.7 6,-5 6.4,-5 0.4,-0 2,2.5 3.6,5.6 3.7,7 12.3,14.8 19.3,17.4 12.8,4.8 25.6,0.9 49.5,-14.9 11.9,-7.8 10.8,-7.9 12.3,0.9 0.8,5.2 4.3,11.6 7.2,13.6 6.8,4.4 16.3,3.4 21.2,-2.2 1.7,-1.9 11.8,-20.9 22.6,-42.3 10.7,-21.4 19.9,-39.3 20.5,-39.6 2.1,-1.3 2.2,0.4 0.6,12.2 -4.9,34.8 -2.1,59.5 7.8,69.8 4.2,4.4 4.4,4.5 10.8,4.5 11.3,-0 26,-5.7 39.8,-15.4l6.5,-4.5 1.4,2.7c5.1,10 15.6,16.4 30,18.4 25.9,3.6 68.9,-8.3 99.8,-27.5l8.2,-5.1 0.3,-15.5c0.2,-8.6 0.2,-15.9 0,-16.3 -0.1,-0.3 -2.6,1 -5.5,2.9 -6,4.1 -44.8,23.4 -45.7,22.8 -0.4,-0.2 -1,-5.7 -1.3,-12.2 -0.4,-6.5 -1.5,-15.2 -2.6,-19.3 -7.9,-30.3 -8,-27.6 0.4,-37.6 9.7,-11.7 11.7,-14.9 12.2,-19.6 0.5,-5.7 -1.3,-8.8 -6.7,-11.6 -6.1,-3 -14.7,-3 -21.5,0.1 -6.3,3 -11.5,8.7 -28.6,31.2 -20.4,27 -25.7,33.2 -37,43 -16.9,14.6 -22.5,20.6 -23.3,24.8 -1.2,6.6 -10.9,9.4 -15.2,4.4 -6.4,-7.5 -6,-26.8 1.6,-65.4 1.7,-8.4 3,-17 3,-19.1 0,-8.9 -4.8,-18 -10.7,-20.3 -7.3,-2.8 -19.1,0.8 -25,7.6 -2.1,2.4 -9.6,15.2 -16.7,28.4 -9.8,18.5 -13.3,24.1 -14.7,24.1 -2.3,-0 -2.4,1.6 0.6,-17.3 3.4,-21.8 3.9,-28.4 2.6,-33.4 -1.7,-6.2 -4.8,-9.3 -9.8,-10 -8.9,-1.2 -16.1,2.6 -19.8,10.3 -2.2,4.7 -6.9,27.9 -9.5,47.4 -2.7,20.2 -3,22.3 -3.7,21.7 -0.3,-0.3 -3.2,1.6 -6.5,4.4 -8.3,6.9 -19.8,14.5 -27.1,18 -15.1,7.1 -21.7,1.5 -21.7,-18.6 0,-15.3 2.2,-22.3 18.9,-59.2 26,-57.7 35.2,-89.4 35.3,-122.3 0,-6.9 -0.5,-15.3 -1.2,-18.5 -4,-19.6 -16.3,-28.9 -31.7,-24zM596.9,553.9c6.8,6.8 1.9,44.7 -10.6,82.1 -5.8,17.5 -20.3,54 -21.4,54 -2.1,-0 -0.2,-35.7 3.2,-63 5.5,-44.4 13.6,-70.1 23.3,-74 3,-1.3 3.4,-1.2 5.5,0.9zM530.1,706.3c0,8.4 0.4,19.5 0.8,24.7l0.8,9.5 -3.8,8.1c-7.4,15.6 -14.6,22.4 -24,22.4 -10.3,-0 -15.3,-5.6 -15.2,-17.1 0.1,-16.3 8,-34.6 21.3,-49.1 6.4,-7.1 17.4,-15.3 19.1,-14.2 0.5,0.3 0.9,7.4 1,15.7zM817.1,736.2c3.9,16.1 2.8,30.7 -2.9,37.2 -4.7,5.2 -14.6,7 -21.7,3.7 -4.5,-2 -15.5,-11.6 -15.5,-13.6 0,-1.4 35.4,-36.5 36.8,-36.5 0.6,-0 2,4.2 3.3,9.2z"
+        android:fillColor="#000000"
+        android:strokeColor="#00000000"
+        tools:ignore="VectorPath" />
+  </group>
+</vector>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background" />
-    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
-    <monochrome android:drawable="@mipmap/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background" />
-    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
-    <monochrome android:drawable="@mipmap/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>